[Devil-linux-commit] build/scripts cron,1.22,1.23 dhcpcd,1.13,1.14 shadow,1.21,1.22 zlib,1.11,1.12

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21508/scripts

Modified Files:
	cron dhcpcd shadow zlib 
Log Message:
- updated clamav to 0.86.2
- updated cpqarrayd to 2.2
- updated dhcpcd to 2.0.0
- updated fetchmail to 6.2.5.2
- updated frox to 0.7.18
- updated gnupg to 1.4.2
- updated mc to 4.6.1
- updated net-snmp to 5.1.3.1
- updated pcre to 6.2
- updated postfix to 2.2.5
- updated pptpd to 1.2.3
- updated pptp-linux to 1.6.0
- updated shadow to 4.0.11.1
- updated util-linux to 2.12q
- updated zlib to 1.2.3


Index: cron
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cron,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- cron	5 Aug 2005 18:22:38 -0000	1.22
+++ cron	12 Aug 2005 00:45:26 -0000	1.23
@@ -35,12 +35,12 @@
 
     install )
         if [ "$CONFIG_CRON" = "y" ]; then
-	    rm -rf $TMPDIR
-	    mkdir -p $TMPDIR/usr/sbin
-	    mkdir -p $TMPDIR/usr/bin
-	    make install DESTDIR=$TMPDIR
+	    rm -rf $WORKDIR/tmp
+	    mkdir -p $WORKDIR/tmp/usr/sbin
+	    mkdir -p $WORKDIR/tmp/usr/bin
+	    make install DESTDIR=$WORKDIR/tmp
 	    mkdir -p $ETCDIR/etc/cron.d || exit 1
-	    cp -dpR $TMPDIR/usr $CDDIR || exit 1
+	    cp -dpR $WORKDIR/tmp/usr $CDDIR || exit 1
 	    cp -p $MYDIR/scripts/crontab $ETCDIR/etc/ || exit 1
 	    cp -p $MYDIR/scripts/cron $ETCDIR/etc/init.d || exit 1
 	    cp -p $MYDIR/scripts/cron.interval $CDDIR/usr/sbin/ || exit 1
@@ -52,7 +52,7 @@
 	    echo "START_$MYNAME=no" >> $CONFIGFILE
 	    echo >> $CONFIGFILE
 	    echo "HELP_$MYNAME=\"$MYNAME is a periodic command scheduler.\"" >> $SOFTWAREHELP
-	    rm -rf $TMPDIR || exit 1
+	    rm -rf $WORKDIR/tmp || exit 1
 	    copy_man
 	fi
     	;;

Index: shadow
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/shadow,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- shadow	12 Dec 2004 21:48:09 -0000	1.21
+++ shadow	12 Aug 2005 00:45:26 -0000	1.22
@@ -25,7 +25,7 @@
 
 case $1 in
     build )
-		./configure --prefix=/usr --disable-nls --with-gnu-ld --enable-shared || exit 1
+		./configure --prefix=/usr --disable-nls --with-gnu-ld --enable-shared --enable-shadowgrp --enable-shadowgrp || exit 1
 		make $PMAKE || exit 1
 		strip_debug
 
@@ -45,7 +45,7 @@
 		chmod 700 $TMPDIR/bin/login || exit 1
 		chmod 4550 $TMPDIR/bin/su || exit 1
 		chgrp wheel $TMPDIR/bin/su || exit 1
-		chmod -c go-rx $TMPDIR/usr/sbin/{chpasswd,group*,grp[cu]*,logoutd,mkpasswd,newusers,pw[cu]*,user*} || exit 1
+		chmod -c go-rx $TMPDIR/usr/sbin/{chpasswd,group*,grp[cu]*,logoutd,newusers,pw[cu]*,user*} || exit 1
 		copy_man ./man
 		rm -rf $TMPDIR/usr/share
 		rm -rf $TMPDIR/lib/*.a

Index: zlib
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/zlib,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- zlib	20 Jul 2005 14:41:04 -0000	1.11
+++ zlib	12 Aug 2005 00:45:26 -0000	1.12
@@ -25,14 +25,14 @@
 
 case $1 in
     build )
-	if [ ! -f devil-linux-zlib-patches.done ]; then
-		for PATCH in $(ls ../zlib-patches/*)
-		do
-			echo applying patch: $PATCH
-			patch -i $PATCH -p0 || exit 1
-		done
-		touch devil-linux-zlib-patches.done
-	fi
+	#if [ ! -f devil-linux-zlib-patches.done ]; then
+	#	for PATCH in $(ls ../zlib-patches/*)
+	#	do
+	#		echo applying patch: $PATCH
+	#		patch -i $PATCH -p0 || exit 1
+	#	done
+	#	touch devil-linux-zlib-patches.done
+	#fi
     	./configure --prefix=/usr || exit 1
         make $PMAKE all || exit 1
         strip_debug

Index: dhcpcd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dhcpcd,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- dhcpcd	8 May 2005 16:24:18 -0000	1.13
+++ dhcpcd	12 Aug 2005 00:45:26 -0000	1.14
@@ -27,6 +27,7 @@
     build )
 	if [ ! -f pathnames.h.org ]; then
 		echo -n patching dhcpcd...
+		cd src
 		cp pathnames.h pathnames.h.org
 		ORGPATH=/etc/dhcpc
 		NEWPATH=/etc/sysconfig/network/scripts
@@ -37,16 +38,17 @@
 		sed -e "s|$ORGPATH|$NEWPATH|" dhcpcd.exe > dhcpcd.exe2
 		mv dhcpcd.exe2 dhcpcd.exe
 		echo done
+		cd ..
 	fi
 	./configure --prefix=/usr || exit 1
 	make $PMAKE all || exit 1
-	strip_debug
 	make install || exit 1
+	strip_debug
         ;;
 
     install )
-        copy_files ./dhcpcd $CDDIR/usr/sbin/ || exit 1
-        copy_files ./dhcpcd.exe $ETCDIR/etc/sysconfig/network/scripts/ || exit 1
+        copy_files ./src/dhcpcd $CDDIR/usr/sbin/ || exit 1
+        copy_files ./src/dhcpcd.exe $ETCDIR/etc/sysconfig/network/scripts/ || exit 1
 	chmod 755 $ETCDIR/etc/sysconfig/network/scripts/dhcpcd.exe || exit 1
 	copy_man
     	;;