[Devil-linux-commit] build/scripts pwlib,1.17,1.18 openh323,1.14,1.15 openh323gk,1.16,1.17

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

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

Modified Files:
	pwlib openh323 openh323gk 
Log Message:
- updated LPRng to 3.8.28
- updated bash to 3.1
- updated beep to 1.2.2
- updated cvs to 1.12.13
- updated dnsmasq to 2.24
- updated fetchmail to 6.3.1
- updated file to 4.16
- updated gnugk to 2.2.3-2
- updated httpd to 2.2.0
- updated l7-protocols to 2005-12-16
- updated lftp to 3.3.5
- updated libtool to 1.5.22
- updated libxml2 to 2.6.22
- updated mtr to 0.69
- updated openh323 to Mimas_patch2
- updated openldap to 2.3.14
- updated pciutils to 2.2.1
- updated pcre to 6.4
- updated postfix to 2.2.6
- updated psmisc to 21.9
- updated pwlib to Mimas_patch2
- updated readline to 5.1
- updated sagator to 0.7.0
- updated samba to 3.0.21
- updated unzip to 552


Index: pwlib
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/pwlib,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- pwlib	28 Jul 2005 15:54:39 -0000	1.17
+++ pwlib	27 Dec 2005 15:46:15 -0000	1.18
@@ -30,20 +30,15 @@
 case $1 in
 	build )
 	    if [ "$CONFIG_PWLIB" = "y" ]; then
-        	FLAGS=""
-	        if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
-            		FLAGS="-fno-stack-protector"
-		fi
 		rm -f /usr/lib/libpt_linux_x86_r.so /usr/lib/libpt.so
-		#export PWLIBDIR=$PWD
-		./configure --prefix=/usr || exit 1
+		export PWLIBDIR=$PWD
+		# remove the --disable-openldap once a pwlib update comes out
+		./configure --prefix=/usr --disable-openldap || exit 1
 		# parallel builds fails ($PMAKE)
 		make bothdepend || exit 1
-		make RPM_OPT_FLAGS="$FLAGS" $PMAKE both || exit 1
+		make $PMAKE || 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.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- openh323gk	16 Oct 2005 01:00:59 -0000	1.16
+++ openh323gk	27 Dec 2005 15:46:15 -0000	1.17
@@ -12,7 +12,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       openh323gk
-# Required-Start: $basebuildtools $libs mysql postgresql
+# Required-Start: $basebuildtools $libs
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -30,22 +30,18 @@
 case $1 in
 	build )
 	    if [ "$CONFIG_OPENH323GK" = "y" ]; then
-		#cd $(find_src_dir gnugk)
-		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 CXX="$CXX" $PMAKE || exit 1
+		export PWLIBDIR=$(find_src_dir pwlib)
+		export OPENH323DIR=$(find_src_dir openh323)
+		./configure --prefix=/usr || exit 1
+		make $PMAKE opt || exit 1
 		strip_debug
 	    fi
         ;;
 
 	install )
 	    if [ "$CONFIG_OPENH323GK" = "y" ]; then
-		exit 1
 		mkdir -p $CDDIR/usr/sbin
-		cp -dp obj_*r/gnugk $CDDIR/usr/sbin || exit 1
+		cp -dp obj_*/gnugk $CDDIR/usr/sbin || exit 1
 		mkdir -p $DOCDIR/openh323gk/etc
 		cp -dpR docs $DOCDIR/openh323gk
 		cp -dpR etc $DOCDIR/openh323gk

Index: openh323
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openh323,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- openh323	27 Jul 2005 19:01:41 -0000	1.14
+++ openh323	27 Dec 2005 15:46:15 -0000	1.15
@@ -30,19 +30,12 @@
 case $1 in
 	build )
 	    if [ "$CONFIG_OPENH323" = "y" ]; then
-                FLAGS=""
-                if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
-                        FLAGS="-fno-stack-protector"
-                fi
-  		rm -f /usr/lib/libopenh323*
+		rm -f /usr/lib/libopenh323*
 		export OPENH323DIR=$PWD
-		pushd .. > /dev/null
 		export PWLIBDIR=$(find_src_dir pwlib)
-		popd > /dev/null
 		./configure --prefix=/usr || exit 1
 		# don't use parallel builds ($PMAKE)
-		make bothdepend || exit 1
-		make RPM_OPT_FLAGS="$FLAGS"  $PMAKE || exit 1
+		make || exit 1
 		strip_debug
 		make install || exit 1
 	    fi