[Devil-linux-commit] build/scripts dhcpcd,1.12.2.1,1.12.2.2 shadow,1.16.2.1,1.16.2.2 zlib,1.10.2.1,1.10.2.2

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

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

Modified Files:
      Tag: rel-1-2-patches
	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: shadow
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/shadow,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -d -r1.16.2.1 -r1.16.2.2
--- shadow	7 Nov 2004 21:43:29 -0000	1.16.2.1
+++ shadow	12 Aug 2005 00:37:43 -0000	1.16.2.2
@@ -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 || exit 1
 		make $PMAKE || exit 1
 		strip_debug
 
@@ -45,7 +45,7 @@
 		chmod 700 $WORKDIR/tmp/bin/login || exit 1
 		chmod 4550 $WORKDIR/tmp/bin/su || exit 1
 		chgrp wheel $WORKDIR/tmp/bin/su || exit 1
-		chmod -c go-rx $WORKDIR/tmp/usr/sbin/{chpasswd,group*,grp[cu]*,logoutd,mkpasswd,newusers,pw[cu]*,user*} || exit 1
+		chmod -c go-rx $WORKDIR/tmp/usr/sbin/{chpasswd,group*,grp[cu]*,logoutd,newusers,pw[cu]*,user*} || exit 1
 		copy_man ./man
 		rm -rf $WORKDIR/tmp/usr/share
 		rm -rf $WORKDIR/tmp/lib/*.a

Index: zlib
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/zlib,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- zlib	20 Jul 2005 14:32:19 -0000	1.10.2.1
+++ zlib	12 Aug 2005 00:37:43 -0000	1.10.2.2
@@ -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.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- dhcpcd	8 May 2005 16:08:03 -0000	1.12.2.1
+++ dhcpcd	12 Aug 2005 00:37:43 -0000	1.12.2.2
@@ -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,6 +38,7 @@
 		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
@@ -45,8 +47,8 @@
         ;;
 
     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
     	;;