[Devil-linux-commit] build/scripts Libnet,1.8,1.9 clamav,1.11,1.12 cyrus-sasl,1.14,1.15 expat,1.3,1.4 frox,1.3,1.4 gcc,1.25,1.26 glibc,1.37,1.38 mysql,1.18,1.19 openh323gk,1.11,1.12 ppp,1.15,1.16 quagga,1.4,1.5 shadow,1.19,1.20 util-linux,1.27,1.28 wvstreams,1.15,1.16

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

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

Modified Files:
	Libnet clamav cyrus-sasl expat frox gcc glibc mysql openh323gk 
	ppp quagga shadow util-linux wvstreams 
Log Message:
more updates to get kernel 2.6 working


Index: Libnet
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Libnet,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Libnet	26 Feb 2004 14:00:10 -0000	1.8
+++ Libnet	12 Nov 2004 01:23:57 -0000	1.9
@@ -26,7 +26,11 @@
 case $1 in
     build )
 	cd $(find_src_dir libnet) || exit 1
-	./configure --prefix=/usr --localstatedir=/var || exit 1
+	if [ ! -f .dl_patches_done ]; then
+	    bzcat $DL_DIR/src/libnet-*.diff.bz2 | patch -p0 || exit 1
+	    touch .dl_patches_done
+	fi
+	./configure --prefix=/usr --localstatedir=/var --with-pf_packet=yes|| exit 1
         make $PMAKE all || exit 1
 	strip_debug
 	# install it in local system, because other programs could need it

Index: gcc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/gcc,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- gcc	23 Sep 2004 21:50:01 -0000	1.25
+++ gcc	12 Nov 2004 01:23:57 -0000	1.26
@@ -9,7 +9,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       gcc
-# Required-Start: distcc prepare glibc_stage1 binutils
+# Required-Start: distcc prepare binutils
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -30,13 +30,14 @@
 		if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
 		    if [ ! -e ./.done_patch_protector ]; then
 			cd gcc
-			patch -p1 -i $WORKDIR/gcc-ssp/gcc_3_4_1.dif || exit 1
-			cp -rf $WORKDIR/gcc-ssp/gcc/* . || exit 1
+			patch -p1 -i $WORKDIR/protector.dif || exit 1
+			cp $WORKDIR/protector.c $WORKDIR/protector.h . || exit 1
+			patch -p1 -i $WORKDIR/protectonly.dif || exit 1
 			cd ..
 			touch ./.done_patch_protector
 
-			if [ ! -f $KERNELDIR/devil-linux-kernel-protector-patch.done ]; then
-			    touch $KERNELDIR/devil-linux-kernel-protector-patch.done
+			if [ ! -f devil-linux-kernel-protector-patch.done ]; then
+			    touch devil-linux-kernel-protector-patch.done
 			    if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
 	    		    	bzcat $DL_DIR/src/linux-2.4.*-protector-1.patch.bz2 | patch -p1 -d $KERNELDIR || exit 1
 			    else
@@ -47,12 +48,12 @@
 		    fi
 		fi
 
-		#if [ "$CONFIG_GCC_PIE" = "y" ]; then
-		#    if [ ! -e ./.done_patch_pie ]; then
-		#	bzcat $DL_DIR/src/gcc-3.3.2-pie-1.diff.bz2 | patch -p1 || exit 1
-		#	touch ./.done_patch_pie
-		#    fi
-		#fi
+		if [ "$CONFIG_GCC_PIE" = "y" ]; then
+		    if [ ! -e ./.done_patch_pie ]; then
+			bzcat $DL_DIR/src/gcc-3.3.2-pie-1.diff.bz2 | patch -p1 || exit 1
+			touch ./.done_patch_pie
+		    fi
+		fi
 
 		if [ ! -f gcc-patches.done ]; then
 			bzcat $DL_DIR/src/gcc-3*patch.bz2 | patch -p1 || exit 1
@@ -62,37 +63,33 @@
             	rm -rf ../gcc-build
 		    mkdir ../gcc-build || exit 1
 		cd ../gcc-build || exit 1
-		#../gcc-3*/configure --prefix=/usr --localstatedir=/var --enable-shared --enable-CONFIG_SHELL=/bin/bash \
-		#    --enable-threads=posix --with-slibdir=/lib  --enable-__cxa_atexit --enable-clocale=gnu \
-		#    --enable-languages=c,c++,objc --disable-nls $CONF_HOST || exit 1
-		../gcc-3*/configure --prefix=/usr \
-		    --libexecdir=/usr/lib --enable-shared --enable-threads=posix --enable-stack-protector \
-		    --enable-__cxa_atexit --enable-clocale=gnu --enable-languages=c,c++ $CONF_HOST || exit 1
-		    
+		../gcc-3*/configure --prefix=/usr --localstatedir=/var --enable-shared --enable-CONFIG_SHELL=/bin/bash \
+		    --enable-threads=posix --with-slibdir=/lib  --enable-__cxa_atexit --enable-clocale=gnu \
+		    --enable-languages=c,c++,objc --disable-nls $CONF_HOST || exit 1
 		make MAKE="make $PMAKE" $PMAKE bootstrap || exit 1
 		strip_debug
 
 		# install it, so we use the same version everywhere
-		make install || exit 1
+		make install-no-fixedincludes || exit 1
 		
-		#if [ "$CONFIG_GCC_ET_DYN" = "y" ]; then
-		#	pushd $(find_src_dir et_dyn) > /dev/null
-		#	cd linux || exit 1
-		#	GLIBC=$(find_src_dir glibc)
-		#	GLIBC=${GLIBC##*/}
-		#	cp $GLIBC/*.S . || exit 1
-		#	make || exit 1
-		#	GCCSPECDIR=$(dirname $(gcc --print-libgcc-file-name))
-		#	cp crt1S.o $GCCSPECDIR || exit 1
-		#	ln -sf crt1S.o $GCCSPECDIR/Scrt1.o || exit 1
-		#	popd > /dev/null
-		#	GCCVER=${GCCSPECDIR##*/}
-		#	test ! -f $GCCSPECDIR/specs.orig && cp $GCCSPECDIR/specs $GCCSPECDIR/specs.orig
-		#	echo $GCCSPECDIR/
-		#	bzcat $DL_DIR/src/gcc-$GCCVER-et_dyn-specs.bz2 > $GCCSPECDIR/specs.et_dyn || exit 1
-		#	ln -sf specs.orig $GCCSPECDIR/specs || exit 1
-		#	ln -sf specs.et_dyn $GCCSPECDIR/specs || exit 1
-		#fi
+		if [ "$CONFIG_GCC_ET_DYN" = "y" ]; then
+			pushd $(find_src_dir et_dyn) > /dev/null
+			cd linux || exit 1
+			GLIBC=$(find_src_dir glibc)
+			GLIBC=${GLIBC##*/}
+			cp $GLIBC/*.S . || exit 1
+			make || exit 1
+			GCCSPECDIR=$(dirname $(gcc --print-libgcc-file-name))
+			cp crt1S.o $GCCSPECDIR || exit 1
+			ln -sf crt1S.o $GCCSPECDIR/Scrt1.o || exit 1
+			popd > /dev/null
+			GCCVER=${GCCSPECDIR##*/}
+			test ! -f $GCCSPECDIR/specs.orig && cp $GCCSPECDIR/specs $GCCSPECDIR/specs.orig
+			echo $GCCSPECDIR/
+			bzcat $DL_DIR/src/gcc-$GCCVER-et_dyn-specs.bz2 > $GCCSPECDIR/specs.et_dyn || exit 1
+			ln -sf specs.orig $GCCSPECDIR/specs || exit 1
+			ln -sf specs.et_dyn $GCCSPECDIR/specs || exit 1
+		fi
 
 		;;
 
@@ -101,7 +98,7 @@
 			cd ../gcc-build || exit 1
 			rm -rf $WORKDIR/tmp || exit 1
 			mkdir -p $WORKDIR/tmp/usr/bin || exit 1
-			make DESTDIR=$WORKDIR/tmp install || exit 1
+			make DESTDIR=$WORKDIR/tmp install-no-fixedincludes || exit 1
 
 			rm -rf $WORKDIR/tmp/usr/share || exit 1
 			rm -rf $WORKDIR/tmp/usr/include || exit 1

Index: util-linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- util-linux	10 Sep 2004 23:16:25 -0000	1.27
+++ util-linux	12 Nov 2004 01:23:57 -0000	1.28
@@ -28,12 +28,12 @@
 		disable_et_dyn
 		if [ ! -f util-linux-patch.done ]; then
 			echo "patch 2.4 "
-			bzcat $SRCDIR/util-linux-2.12b.diff.bz2 | patch -p1 || exit 1
+			patch -p1 -i $(find_src_dir loop-AES)/util-linux-2.12*.diff || exit 1
 			touch util-linux-patch.done
 		fi
 		
 		# (from LFS) GCC-3.4.1 miscompiles sfdisk if the default optimisation level is used. The following command prevents the problematic optimisation pass from being used.
-		sed -i -e 's%^include ../MCONFIG%&\n\nCFLAGS:=$(CFLAGS) -fno-unit-at-a-time%' fdisk/Makefile
+		#sed -i -e 's%^include ../MCONFIG%&\n\nCFLAGS:=$(CFLAGS) -fno-unit-at-a-time%' fdisk/Makefile
 		
 		./configure || exit 1
 		replace_str defines.h "#define ENABLE_NLS" ""

Index: clamav
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/clamav,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- clamav	6 Sep 2004 20:31:33 -0000	1.11
+++ clamav	12 Nov 2004 01:23:57 -0000	1.12
@@ -43,7 +43,6 @@
 		copy_docs $WORKDIR/tmp
 		mkdir -p $DOCDIR/clamav || exit 1
 		cp -dpR docs/html $DOCDIR/clamav || exit 1
-		cp -dpR docs/DMS* $DOCDIR/clamav || exit 1
 
 		cp etc/*conf $ETCDIR/etc/ || exit 1
 

Index: glibc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/glibc,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- glibc	12 Oct 2004 01:20:40 -0000	1.37
+++ glibc	12 Nov 2004 01:23:57 -0000	1.38
@@ -28,10 +28,10 @@
 		touch /etc/ld.so.conf
 		#if [ "$CONFIG_GLIBC_NPTL" = "y" ]; then
 		    #tar -xjf $DL_DIR/src/nptl-*.tar.bz2 || exit 1
-		    ADDON=nptl
+		    #ADDON=nptl
 		#else
-		    ##tar -xjf $DL_DIR/src/glibc-linuxthreads-*.tar.bz2 || exit 1
-		    #ADDON=linuxthreads
+		    tar -xjf $DL_DIR/src/glibc-linuxthreads-*.tar.bz2 || exit 1
+		    ADDON=linuxthreads
 		#fi
 		if [ ! -f devil-linux-glibc-debian-patches.done ]; then
 			for PATCH in $(grep -v ^# ../glibc-patches/0list)
@@ -73,9 +73,16 @@
 		#else
 		#   KVER=$KERNELVERSION
 		#fi
-		KVER="2.6.0"
+		#KVER="2.6.0"
 		../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons=$ADDON --libexecdir=/usr/bin \
-		    --enable-kernel=$KVER --without-gd -without-cvs --with-tls --with-__thread || exit 1
+		    -without-cvs --with-tls --without-__thread || exit 1
+		#    -without-cvs --with-tls --with-__thread || exit 1  # use this one for nptl
+		
+		#  --with-headers=$KERNELDIR/include
+		# don set minimum kernel version, otherwise the 'prepare' run of glibc will fail
+		# fix this later and make it more intelligent    
+		# --enable-kernel=$KVER 
+		# --without-gd 
 
 		make $PMAKE || exit 1
 		#make || exit 1

Index: expat
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/expat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- expat	11 Jan 2004 14:43:04 -0000	1.3
+++ expat	12 Nov 2004 01:23:57 -0000	1.4
@@ -25,7 +25,7 @@
 
 case $1 in
 	build )
-		./buildconf.sh || exit 1
+		#./buildconf.sh || exit 1
 		./configure --prefix=/usr --localstatedir=/var || exit 1
 		make $PMAKE all || exit 1
 		strip_debug

Index: cyrus-sasl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cyrus-sasl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cyrus-sasl	27 Mar 2004 17:30:19 -0000	1.14
+++ cyrus-sasl	12 Nov 2004 01:23:57 -0000	1.15
@@ -29,7 +29,8 @@
 	build )
 		if [ "$CONFIG_CYRUS_SASL" = "y" ]; then
 			./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-krb4  --enable-shared --disable-static --with-saslauthd --with-pwcheck || exit 1
-			make $PMAKE all || exit 1
+			# parallel builds cause problems
+			make all || exit 1
 			strip_debug
 
 			# we have to install this immediately, because this is a library and could be needed by other sources

Index: quagga
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/quagga,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- quagga	25 May 2004 17:50:45 -0000	1.4
+++ quagga	12 Nov 2004 01:23:57 -0000	1.5
@@ -28,12 +28,13 @@
 case $1 in
     build )
 	if [ "$CONFIG_QUAGGA" = "y" ]; then
-		if [ ! -f devil-linux-quagga-patches.done ]; then
-			touch devil-linux-quagga-patches.done
-			bzcat $DL_DIR/src/ht-*-bgp-md5.patch.bz2  | patch -p0 || exit 1
-		fi
+		#if [ ! -f devil-linux-quagga-patches.done ]; then
+		#	touch devil-linux-quagga-patches.done
+		#	bzcat $DL_DIR/src/ht-*-bgp-md5.patch.bz2  | patch -p0 || exit 1
+		#fi
 		./configure --prefix=/usr --sysconfdir=/etc/zebra --localstatedir=/var/state/quagga --enable-snmp \
-			--enable-netlink --enable-vtysh --enable-tcp-md5 || exit 1
+			--enable-netlink --enable-vtysh || exit 1
+		#  --enable-tcp-md5
 		make $PMAKE || exit 1
 		strip_debug
 	fi

Index: frox
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/frox,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- frox	21 Aug 2004 19:17:46 -0000	1.3
+++ frox	12 Nov 2004 01:23:57 -0000	1.4
@@ -33,7 +33,7 @@
 			    --enable-virus-scan --enable-transparent-data \
 			    --enable-libiptc --enable-ccp --disable-run-as-root \
 			    --enable-configfile=/etc/frox || exit 1
-		make $PMAKE all || exit 1
+		make all || exit 1
 		strip_debug
 	fi
 	;;
@@ -49,7 +49,7 @@
 		gzip -c -9 < doc/frox.man > $WORKDIR/tmp/usr/share/man/man8/frox.conf.8.gz || exit 1
 		mkdir -p $WORKDIR/tmp/usr/share/man/man5 || exit 1
 		gzip -c -9 < doc/frox.conf.man > $WORKDIR/tmp/usr/share/man/man5/frox.5.gz || exit 1
-		copy_files $WORKDIR/tmp/etc $ETCDIR || exit 1
+		copy_files src/frox.conf $ETCDIR || exit 1
 		copy_files $WORKDIR/tmp/usr $CDDIR || exit 1
 
 		rm -rf $WORKDIR/tmp || exit 1

Index: openh323gk
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openh323gk,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- openh323gk	10 Sep 2004 23:16:24 -0000	1.11
+++ openh323gk	12 Nov 2004 01:23:57 -0000	1.12
@@ -12,7 +12,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       openh323gk
-# Required-Start: $basebuildtools $libs
+# Required-Start: $basebuildtools $libs mysql postgresql
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -30,6 +30,7 @@
 case $1 in
 	build )
 	    if [ "$CONFIG_OPENH323GK" = "y" ]; then
+		cd $(find_src_dir gnugk)
 		#old_kernel_includes
 		#test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
 		pushd .. > /dev/null

Index: ppp
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ppp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ppp	27 Mar 2004 17:30:19 -0000	1.15
+++ ppp	12 Nov 2004 01:23:57 -0000	1.16
@@ -34,6 +34,7 @@
 			fi
 			./configure || exit 1
 			replace_str pppd/Makefile "#CBCP=y" "CBCP=y"
+			replace_str pppd/Makefile "USE_PAM=y" "#USE_PAM=y"
 			make $PMAKE all || exit 1
 			strip_debug
 

Index: mysql
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/mysql,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mysql	10 Sep 2004 23:16:24 -0000	1.18
+++ mysql	12 Nov 2004 01:23:57 -0000	1.19
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       mysql
-# Required-Start: $basebuildtools db-4 ncurses zlib readline
+# Required-Start: $basebuildtools db-4 ncurses zlib readline openssl
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:

Index: shadow
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/shadow,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- shadow	10 Sep 2004 23:16:24 -0000	1.19
+++ shadow	12 Nov 2004 01:23:57 -0000	1.20
@@ -25,17 +25,12 @@
 
 case $1 in
     build )
-		if [ ! -f .patch.done ]; then
-			#bzcat $DL_DIR/src/shadow-4.0.4.1-malloc-1.patch.bz2 | patch -p1 || exit 1
-			touch .patch.done
-		fi	
-		./configure --prefix=/usr --disable-nls --with-gnu-ld --enable-shared --with-selinux || exit 1
+		./configure --prefix=/usr --disable-nls --with-gnu-ld --enable-shared || exit 1
 		make $PMAKE || exit 1
 		strip_debug
 
 		# we need this stuff later
 		make install || exit 1
-		cp -dpR etc/{limits,login.access,login.def*,useradd} /etc/ || exit 1
 		;;
 
     install )
@@ -51,7 +46,6 @@
 		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
-		mv $WORKDIR/tmp/bin/sg $WORKDIR/tmp/usr/bin || exit 1
 		copy_man ./man
 		rm -rf $WORKDIR/tmp/usr/share
 		rm -rf $WORKDIR/tmp/lib/*.a

Index: wvstreams
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/wvstreams,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- wvstreams	10 Sep 2004 23:16:25 -0000	1.15
+++ wvstreams	12 Nov 2004 01:23:57 -0000	1.16
@@ -34,7 +34,7 @@
 			done
 			touch .dl-patches.done 
 		fi
-		./configure --prefix=/usr --with-fam --with-gdbm --with-openssl --with-zlib || exit 1
+		./configure --prefix=/usr --with-fam --with-gdbm --with-zlib --with-openssl || exit 1
 		make || exit 1
 
 		strip_debug