[Devil-linux-commit] build/scripts ZoneMinder,1.1,1.2

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

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

Modified Files:
	ZoneMinder 
Log Message:
for now, disable zoneminder when grsecurity is enabled


Index: ZoneMinder
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ZoneMinder,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ZoneMinder	21 Jun 2015 13:23:35 -0000	1.1
+++ ZoneMinder	1 Jul 2015 23:22:57 -0000	1.2
@@ -16,7 +16,7 @@
 
 case $1 in
     build )
-	if [ "$CONFIG_ZONEMINDER" = "y" ]; then
+	if [ "$CONFIG_ZONEMINDER" = "y" ] && [ "$CONFIG_GRSECURITY" = "n" ] ; then
 		./bootstrap.sh || exit 1
 		EXTRACFG=""
 		if [ "$CONFIG_CPU" = "x86_64" ]; then
@@ -31,7 +31,7 @@
 	;;
 
     install )
-	if [ "$CONFIG_ZONEMINDER" = "y" ]; then
+	if [ "$CONFIG_ZONEMINDER" = "y" ] && [ "$CONFIG_GRSECURITY" = "n" ] ; then
 		rm -rf $TMPDIR || exit 1
 		mkdir -p $TMPDIR || exit 1
 		make install DESTDIR=$TMPDIR || exit 1
@@ -65,4 +65,3 @@
         exit 1
         ;;
 esac
-