[Devil-linux-commit] build/scripts openh323gk,1.13,1.14 pwlib,1.16,1.17 squidguard,1.4,1.5

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

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

Modified Files:
	openh323gk pwlib squidguard 
Log Message:
- updated db-4 to 4.3.28
- updated pcre to 6.1


Index: pwlib
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/pwlib,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- pwlib	29 Dec 2004 20:48:41 -0000	1.16
+++ pwlib	28 Jul 2005 15:54:39 -0000	1.17
@@ -35,13 +35,15 @@
             		FLAGS="-fno-stack-protector"
 		fi
 		rm -f /usr/lib/libpt_linux_x86_r.so /usr/lib/libpt.so
-		export PWLIBDIR=$PWD
+		#export PWLIBDIR=$PWD
 		./configure --prefix=/usr || exit 1
 		# parallel builds fails ($PMAKE)
 		make bothdepend || exit 1
-		make RPM_OPT_FLAGS="$FLAGS"  $PMAKE || exit 1
+		make RPM_OPT_FLAGS="$FLAGS" $PMAKE both || exit 1
 		strip_debug
 		make install || exit 1
+		cp -dp ./lib/* /usr/lib/
+		exit 0
 	    fi
         ;;
 

Index: openh323gk
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openh323gk,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- openh323gk	29 Dec 2004 03:14:27 -0000	1.13
+++ openh323gk	28 Jul 2005 15:54:39 -0000	1.14
@@ -31,12 +31,12 @@
 	build )
 	    if [ "$CONFIG_OPENH323GK" = "y" ]; then
 		cd $(find_src_dir gnugk)
-		pushd .. > /dev/null
-		export PWLIBDIR=$PWD/pwlib
-		export OPENH323DIR=$PWD/openh323
-	 	popd > /dev/null
+		CXX="gcc"
+		if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
+		    CXX="gcc -fno-stack-protector"
+		fi
 		./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || exit 1
-		make $PMAKE || exit 1
+		make CXX="$CXX" $PMAKE || exit 1
 		strip_debug
 	    fi
         ;;

Index: squidguard
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/squidguard,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- squidguard	12 Dec 2004 21:48:09 -0000	1.4
+++ squidguard	28 Jul 2005 15:54:39 -0000	1.5
@@ -32,7 +32,7 @@
 				zcat $DL_DIR/src/squidguard_1*diff.gz | patch -p1 || exit 1
 				touch .done_devil_patch
 			fi
-			./configure --verbose --prefix=/usr --with-sg-config=/etc/squidguard.conf --with-sg-logdir=/var/log --with-sg-dbhome=/var/lib/squidguard || exit 1
+			CC="gcc -lpthread" ./configure --verbose --prefix=/usr --with-sg-config=/etc/squidguard.conf --with-sg-logdir=/var/log --with-sg-dbhome=/var/lib/squidguard || exit 1
 			make $PMAKE all || exit 1
 			strip_debug
 		fi