Update of /cvsroot/devil-linux/build/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23485/scripts
Modified Files:
dosfstools webmin
Log Message:
- updated dosfstools 3.0.6
- updated stunnel-4.28
- updated sysstat-9.0.6
- updated libcap 2.17
- updated curl-7.19.7
- updated fetchmail-6.3.13
- updated openssl-0.9.8l
- updated php-5.2.11
- updated webmin sysstats to 1.4
Index: webmin
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/webmin,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- webmin 5 Jun 2009 18:01:50 -0000 1.8
+++ webmin 15 Nov 2009 13:42:45 -0000 1.9
@@ -48,6 +48,14 @@
echo unpacking $FILE
tar -xjf $FILE || exit 1
done
+
+ # unpack all the sub-modules of systats
+ for FILE in $(ls sysstats/modules/*gz)
+ do
+ echo unpacking sysstats module $FILE
+ tar -C sysstats/modules/ -xzf $FILE || exit 1
+ done
+ rm -f sysstats/modules/*gz
# let's make sure we get all path names for perl fixed
echo "Correcting path to perl"
@@ -60,7 +68,6 @@
if [ "$CONFIG_WEBMIN" = "y" ]; then
rm acl/Authen-SolarisRBAC-0.1/blib/arch/auto/Authen/SolarisRBAC/SolarisRBAC.so
rm acl/Authen-SolarisRBAC-0.1/SolarisRBAC.o
- #find -exec perl -i -p -e 's%#!/usr/local/bin/perl%#!/usr/bin/perl%g' {} \;
mkdir -p $CDDIR/usr/libexec/webmin || exit 1
mkdir -p $CDDIR/var/webmin || exit 1
mkdir -p $ETCDIR/etc/pam.d || exit 1
@@ -105,6 +112,15 @@
change_param /etc/webmin/dovecot/config dovecot /usr/sbin/dovecot
change_param /etc/webmin/dovecot/config dovecot_config /etc/dovecot/dovecot.conf
change_param /etc/webmin/dovecot/config init_script /etc/init.d/dovecot
+
+ #configuring webmin sysstats
+ for FILE in $(find sysstats/modules/ -name config.txt)
+ do
+ RELFILE=${FILE/$(pwd)\///}
+ RELDIR=${RELFILE%/*}
+ mkdir $ETCDIR/etc/webmin/${RELDIR}
+ cp ${RELFILE} $ETCDIR/etc/webmin/${RELDIR}/config
+ done
rm /etc/webmin/*cache
cp -dpvR /etc/webmin $ETCDIR/etc/ || exit 1
Index: dosfstools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dosfstools,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dosfstools 18 Sep 2004 17:47:00 -0000 1.11
+++ dosfstools 15 Nov 2009 13:42:44 -0000 1.12
@@ -30,14 +30,6 @@
case $1 in
build )
if [ "$CONFIG_DOSFSTOOLS" = "y" ]; then
- if [ ! -f dosfsutils-patches.done ]; then
- bzcat $DL_DIR/src/dosfstools-2.10-llseek.patch.bz2 | patch -p1 || exit 1
- if [ "$CONFIG_LINUX_VERSION" = "2.6" ]; then
- bzcat $DL_DIR/src/dosfstools-2.10-kernel-2.6-1.patch.bz2 | patch -p1 || exit 1
- fi
- touch dosfsutils-patches.done
- fi
-
make $PMAKE || exit 1
strip_debug
fi
@@ -45,7 +37,7 @@
install )
if [ "$CONFIG_DOSFSTOOLS" = "y" ]; then
- make install PREFIX=$CDDIR/usr MANDIR=$CDDIR/usr/share/man/man8 || exit 1
+ make install PREFIX=$CDDIR/usr MANDIR=$CDDIR/usr/share/man || exit 1
fi
;;
|
