[Devil-linux-commit] build/scripts modsecurity-apache,1.3,1.4

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

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

Modified Files:
	modsecurity-apache 
Log Message:
updated modsecurity-apache to 2.7.5


Index: modsecurity-apache
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/modsecurity-apache,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- modsecurity-apache	8 Nov 2010 10:00:42 -0000	1.3
+++ modsecurity-apache	2 Sep 2013 14:11:09 -0000	1.4
@@ -19,12 +19,12 @@
 case $1 in
 	build )
 		if [ "$CONFIG_HTTPD" = "y" ] && [ "$CONFIG_MODSECURITY" = "y" ]; then
-			cd apache2 || exit 1
+			#cd apache2 || exit 1
 			./configure --prefix=/usr || exit 1
 			make all || exit 1
 			if [ "$CONFIG_CURL" = "y" ]; then
 				# mlogc needs curl to build
-				make -C mlogc-src all || exit 1
+				make -C mlogc all || exit 1
 			fi
 		fi
 		;;
@@ -32,12 +32,12 @@
 	install )
 		if [ "$CONFIG_HTTPD" = "y" ] && [ "$CONFIG_MODSECURITY" = "y" ]; then
 			cp -v apache2/.libs/mod_security2.so $CDDIR/usr/lib/apache2/modules/ || exit 1
-			mkdir -p $ETCDIR/etc/apache2/modsecurity_crs || exit 1
-			cp -vR rules/* $ETCDIR/etc/apache2/modsecurity_crs/ || exit 1
+			cp -v tools/rules-updater.pl $CDDIR/usr/bin/ || exit 1
+			cp -v modsecurity.conf-recommended $ETCDIR/etc/apache2/ || exit 1
 			if [ "$CONFIG_CURL" = "y" ]; then
-				cp -v apache2/mlogc-src/mlogc $CDDIR/usr/bin/ || exit 1
-				cp -v apache2/mlogc-src/mlogc-batch-load.pl $CDDIR/usr/bin/ || exit 1
-				cp -v apache2/mlogc-src/mlogc-default.conf $ETCDIR/etc/ || exit 1
+				cp -v mlogc/mlogc $CDDIR/usr/bin/ || exit 1
+				cp -v mlogc/mlogc-batch-load.pl $CDDIR/usr/bin/ || exit 1
+				cp -v mlogc/mlogc-default.conf $ETCDIR/etc/ || exit 1
 			fi
 		fi
 		;;