[Devil-linux-commit] build/scripts mod_fcgid, NONE, 1.1 mod_spdy, 1.1, 1.2 php, 1.35, 1.36

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

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

Modified Files:
	mod_spdy php 
Added Files:
	mod_fcgid 
Log Message:
- build mod_spdy only on 64 bit
- updated openssl to 1.0.1f
- added mod_fcgid 2.3.9
- enabled PHP CGI


Index: php
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- php	23 Feb 2014 20:14:29 -0000	1.35
+++ php	29 Mar 2014 13:44:45 -0000	1.36
@@ -21,7 +21,7 @@
 		IMAPDIR=$(find_src_dir imap)
 		if [ "$CONFIG_PHP" = "y" ]; then
 			PARAMS="--sysconfdir=/etc --with-config-file-path=/etc --prefix=/usr --enable-inline-optimization"
-			PARAMS="$PARAMS --enable-pcntl --disable-cgi "
+			PARAMS="$PARAMS --enable-pcntl --enable-cgi "
 			PARAMS="$PARAMS --enable-discard-path --with-zlib --with-bz2 --enable-calendar --with-gmp"
 			PARAMS="$PARAMS --enable-dba --with-gdbm --with-db4 --with-xsl=/usr --with-dom-exslt"
 			PARAMS="$PARAMS --enable-ftp --enable-soap --enable-wddx --enable-exif"
@@ -94,7 +94,9 @@
 			rm -rf $TMPDIR
 			mkdir -p $TMPDIR/etc
 			cp -dpR $ETCDIR/etc/apache2 $TMPDIR/etc
+
 			make install INSTALL_ROOT=$TMPDIR
+			
 			replace_str $TMPDIR/etc/apache2/httpd.conf ${WORKDIR#*/}/tmp/usr /usr
 			replace_str $TMPDIR/etc/apache2/httpd.conf ${TMPDIR#*/}/usr /usr
 			rm $TMPDIR/etc/apache2/httpd.conf.bak

Index: mod_spdy
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/mod_spdy,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mod_spdy	9 Aug 2012 12:45:12 -0000	1.1
+++ mod_spdy	29 Mar 2014 13:44:45 -0000	1.2
@@ -13,7 +13,7 @@
 
 case $1 in
 	build )
-	    if [ "$CONFIG_HTTPD" = "y" ]; then
+	    if [ "$CONFIG_HTTPD" = "y" ] && [ "$CONFIG_CPU" = "x86_64" ]; then
 		if [ "$CONFIG_MOD_SPDY" = "y" ]; then
 			make BUILDTYPE=Release || exit 1
 		fi
@@ -21,7 +21,7 @@
 		;;
 
 	install )
-	    if [ "$CONFIG_HTTPD" = "y" ]; then
+	    if [ "$CONFIG_HTTPD" = "y" ] && [ "$CONFIG_CPU" = "x86_64" ]; then
 		if [ "$CONFIG_MOD_SPDY" = "y" ]; then
 			cp out/Release/libmod_diagnostics.so $CDDIR/usr/lib/apache2/modules/mod_diagnostics.so || exit 1
 			cp out/Release/libmod_spdy.so $CDDIR/usr/lib/apache2/modules/mod_spdy.so || exit 1

--- NEW FILE: mod_fcgid ---
#!/bin/bash
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

# get the directoryname of the script
MYDIR=${0%/*}

# source functions and config
source $MYDIR/settings

case $1 in
	build )
	    if [ "$CONFIG_MOD_FCGID" = "y" ]; then
		./configure.apxs
		make || exit 1
	    fi
		;;

	install )
	    if [ "$CONFIG_MOD_FCGID" = "y" ]; then
		cp modules/fcgid/.libs/mod_fcgid.so $CDDIR/usr/lib/apache2/modules/mod_fcgid.so || exit 1
		#apxs -e -a -S SYSCONFDIR=$ETCDIR/etc/apache2 -n mod_fcgid /usr/lib/apache2/modules/mod_fcgid.so
	    fi
		;;

	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac