[Devil-linux-commit] build/scripts openh323,1.9,1.9.2.1 openh323gk,1.10,1.10.2.1 pwlib,1.12.2.1,1.12.2.2

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

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

Modified Files:
      Tag: rel-1-2-patches
	openh323 openh323gk pwlib 
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.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- pwlib	12 Oct 2004 12:48:44 -0000	1.12.2.1
+++ pwlib	27 Dec 2005 15:45:33 -0000	1.12.2.2
@@ -32,7 +32,8 @@
 	    if [ "$CONFIG_PWLIB" = "y" ]; then
 		rm -f /usr/lib/libpt_linux_x86_r.so /usr/lib/libpt.so
 		export PWLIBDIR=$PWD
-		./configure --prefix=/usr || exit 1
+		# 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 $PMAKE || exit 1

Index: openh323gk
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openh323gk,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- openh323gk	4 Feb 2004 20:40:59 -0000	1.10
+++ openh323gk	27 Dec 2005 15:45:33 -0000	1.10.2.1
@@ -30,12 +30,9 @@
 case $1 in
 	build )
 	    if [ "$CONFIG_OPENH323GK" = "y" ]; then
-		old_kernel_includes
-		test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
-		pushd .. > /dev/null
-		export PWLIBDIR=$PWD/pwlib
-		export OPENH323DIR=$PWD/openh323
-	 	popd > /dev/null
+		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

Index: openh323
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openh323,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- openh323	1 Feb 2004 15:04:23 -0000	1.9
+++ openh323	27 Dec 2005 15:45:33 -0000	1.9.2.1
@@ -32,10 +32,7 @@
 	    if [ "$CONFIG_OPENH323" = "y" ]; then
 		rm -f /usr/lib/libopenh323*
 		export OPENH323DIR=$PWD
-		pushd .. > /dev/null
-		export PWLIBDIR=$PWD/pwlib
-		popd > /dev/null
-		test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
+		export PWLIBDIR=$(find_src_dir pwlib)
 		./configure --prefix=/usr || exit 1
 		# don't use parallel builds ($PMAKE)
 		make || exit 1