[Devil-linux-commit] build/scripts glibc,1.48,1.49 mysql,1.20,1.21

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

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

Modified Files:
	glibc mysql 
Log Message:
- updated clamav to 0.86.1
- updated eagle-usb to 2.3.2
- updated ethtool to 3
- updated groff to 1.19.1
- updated grub to 0.97
- updated lftp to 3.2.1
- updated libusb to 0.1.10a
- updated loop-AES to v3.0d
- updated mrtg to 2.12.1
- updated nasm to 0.98.39
- updated postfix to 2.2.4
- updated quota to 3.13
- updated razor-agents to 2.74
- updated sudo to 1.6.8p9


Index: glibc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/glibc,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- glibc	6 Feb 2005 04:15:49 -0000	1.48
+++ glibc	29 Jun 2005 14:42:40 -0000	1.49
@@ -25,8 +25,10 @@
 
 case $1 in
 	build )
+		#cd $DL_DIR/tmp/glibc-2* || exit 1
 		touch /etc/ld.so.conf
 		ADDON=nptl
+		tar -xjf $DL_DIR/src/glibc-libidn-*tar.bz2 || exit 1
 		if [ ! -f devil-linux-glibc-debian-patches.done ]; then
 			for PATCH in $(grep -v ^# ../glibc-patches/0list)
 			do
@@ -47,7 +49,7 @@
 		export CC="gcc -no-pie"
 		if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
 		    if [ ! -f devil-linux-glibc-ssp-patches.done ]; then
-			cp -v ../glibc-ssp/ssp.c sysdeps/unix/sysv/linux/ || exit 1
+			#cp -v ../glibc-ssp/ssp.c sysdeps/unix/sysv/linux/ || exit 1
 			for PATCH in $(ls ../glibc-ssp/*patch)
 			do
 				echo applying patch: $PATCH
@@ -62,9 +64,14 @@
 		mkdir ../glibc-build || exit 1
 		cd ../glibc-build || exit 1
 
-		export LD_ASSUME_KERNEL=2.2.5
+		#echo "libc_cv_forced_unwind=yes" > config.cache
+		#echo "libc_cv_c_cleanup=yes" >> config.cache
+		
+		#export LD_ASSUME_KERNEL=2.2.5
+		#../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons=$ADDON --libexecdir=/usr/bin \
+		#    -without-cvs --with-tls --with-__thread --enable-bind-now --cache-file=config.cache || exit 1
 		../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons=$ADDON --libexecdir=/usr/bin \
-		    -without-cvs --with-tls --with-__thread --enable-bind-now || exit 1
+		    -without-cvs --enable-bind-now || exit 1
 
 		make $PMAKE || exit 1
 		strip_debug || exit 1
@@ -75,6 +82,8 @@
 
 		# ok we need to do this a little tricky, otherwise all hell breaks loose
 		cd $TMPDIR || exit 1
+		mkdir -p $TMPDIR/etc || exit 1
+		touch $TMPDIR/etc/ld.so.conf
 		tar -cf glibc.tar * || exit 1
 		tar -C / -xf glibc.tar || exit 1
 		cd .. || exit 1

Index: mysql
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/mysql,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- mysql	12 Dec 2004 21:48:08 -0000	1.20
+++ mysql	29 Jun 2005 14:42:40 -0000	1.21
@@ -32,12 +32,13 @@
 		if [ ! "$CONFIG_MYSQL_SERVER" = "y" ]; then
 			FLAGS="--without-server"
 		fi
-		if [ ! -f dl-patches.done ]; then
-			bzcat $DL_DIR/src/mysql-4.0.20-nptl-1.patch.bz2 | patch -p1 || exit 1
-			touch dl-patches.done
-		fi
+		#if [ ! -f dl-patches.done ]; then
+		#	bzcat $DL_DIR/src/mysql-4.0.20-nptl-1.patch.bz2 | patch -p1 || exit 1
+		#	touch dl-patches.done
+		#fi
+		echo '/* Linuxthreads */' >> /usr/include/pthread.h
 		./configure --prefix=/usr --without-bench --without-docs --without-debug --enable-thread-safe-client --libdir=/usr/lib \
-			--with-openssl --with-mysqlfs --sysconfdir=/etc || exit 1
+			--with-openssl --with-mysqlfs --sysconfdir=/etc --with-pthread --with-named-thread-lib=-lpthread || exit 1
 		make $PMAKE all || exit 1
 		strip_debug
 		# install it, so other program can make use of it