[Devil-linux-commit] build/scripts build.sh, 1.109, 1.110 php, 1.29, 1.30

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

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26448/scripts

Modified Files:
	build.sh php 
Log Message:
- updated ImageMagick to 6.6.5-8
- updated openvpn to 2.1.4
- enabled stack-protector for php
- updated pecl modules
  - APC-3.1.5
  - LZF-1.5.2
  - imagick-3.0.1
  - memcache-3.0.5
  - pecl_http-1.7.0
  - rar-2.0.0
  - zip-1.10.2
  - removed all other modules


Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- build.sh	6 Nov 2010 21:36:46 -0000	1.109
+++ build.sh	19 Nov 2010 16:15:05 -0000	1.110
@@ -199,7 +199,6 @@
 			sort $DL_DIR/.config | uniq > $DISTDIR/DL-build-config || exit 1
 			cp $DL_DIR/scripts/scripts/custom-cd $DISTDIR || exit 1
 			cp $DL_DIR/scripts/scripts/install-on-usb $DISTDIR || exit 1
-			cp $DL_DIR/scripts/scripts/install-on-usb.bat $DISTDIR || exit 1
 			cp $DL_DIR/scripts/scripts/install-on-usb.exe $DISTDIR || exit 1
 			cp $WORKDIR/bootcd.iso $DISTDIR || exit 1
 			#if [ "$CONFIG_ZISOFS" = "y" ]; then

Index: php
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- php	19 Nov 2010 00:42:47 -0000	1.29
+++ php	19 Nov 2010 16:15:05 -0000	1.30
@@ -62,29 +62,29 @@
 			
 			rm ~/.pearrc
 			rm /etc/pear.conf
-			make CC="gcc -fno-stack-protector" all install || exit 1
+			rm -rf /usr/lib/php 
+			
+			#make CC="gcc -fno-stack-protector" all install || exit 1
+			make all install || exit 1
 			strip_debug
 
-			cp -dp php.ini-development /etc/php.ini || exit 1
+			cp -dp php.ini-production /etc/php.ini || exit 1
 
 			rm -rf DL_pecl &> /dev/null
 			mkdir -p DL_pecl || exit 1
 			mkdir -p DL_pecl/installroot/etc/ || exit 1
-			replace_str /etc/php.ini 'extension_dir = "./"' 'extension_dir = "/usr/lib/php/extensions"'
+			#replace_str /etc/php.ini 'extension_dir = "./"' 'extension_dir = "/usr/lib/php/extensions"'
 			pear config-set php_ini /etc/php.ini
 			pear config-set ext_dir /usr/lib/php/extensions
 			pear config-set cfg_dir /etc
 			for FILE in $(ls $DL_DIR/src/pecl/*.tgz)
-                        do
+			do
 				echo "compiling PECL extension $FILE"
 				F=${FILE##*/}
 				DIRNAME=${F%*.tgz}
 				PACKAGENAME=$(echo ${F%-*} | tr '[:upper:]' '[:lower:]')
 				yes  "" | pecl install --force --nodeps --offline $FILE || yes  "" | pear install --force --nodeps --offline $FILE
-                        done
-			set -x
-			find /usr/lib/php/extensions -name \*.so -exec mv '{}' /usr/lib/php/extensions/ \; || exit 1
-			find /usr/lib/php/extensions -type d | grep -v "^/usr/lib/php/extensions$" | xargs rm -rf
+            done
 		fi
 		;;