[Devil-linux-commit] build/scripts ZoneMinder, 1.4, 1.5 util-linux, 1.54, 1.55

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

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

Modified Files:
	ZoneMinder util-linux 
Log Message:
updated zoneminder and util-linux


Index: util-linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- util-linux	6 Oct 2015 00:59:18 -0000	1.54
+++ util-linux	21 Dec 2015 00:22:56 -0000	1.55
@@ -16,16 +16,11 @@
 
 case $1 in
     build )
-	patch_from_file 1 $(find_src_dir loop-AES)/util-linux-2.26.2.diff || exit 1
-	
-	./configure --enable-arch --enable-partx --enable-write --disable-wall || exit 1
+	patch_from_file 1 $(find_src_dir loop-AES)/util-linux-2.27.1.diff || exit 1
 
-	#if [ "${CONFIG_GCC_HARDENED}" = "y" ]; then
-	#    make $PMAKE LDFLAGS="-pie" || exit 1
-	#else
-	    make $PMAKE || exit 1
-	#fi
+	./configure --enable-arch --enable-partx --enable-write --disable-wall || exit 1
 
+	make $PMAKE || exit 1
 
 	# we need some of the tools later, so let's install it
 	make install || exit 1

Index: ZoneMinder
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ZoneMinder,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ZoneMinder	24 Oct 2015 20:56:44 -0000	1.4
+++ ZoneMinder	21 Dec 2015 00:22:56 -0000	1.5
@@ -16,7 +16,7 @@
 
 case $1 in
     build )
-	if [ "$CONFIG_ZONEMINDER" = "y" ] && [ "$CONFIG_GRSECURITY" = "n" ] ; then
+	if [ "$CONFIG_ZONEMINDER" = "y" ] ; then
 		./bootstrap.sh || exit 1
 		EXTRACFG=""
 		if [ "$CONFIG_CPU" = "x86_64" ]; then
@@ -34,7 +34,7 @@
 	;;
 
     install )
-	if [ "$CONFIG_ZONEMINDER" = "y" ] && [ "$CONFIG_GRSECURITY" = "n" ] ; then
+	if [ "$CONFIG_ZONEMINDER" = "y" ]; then
 		rm -rf $TMPDIR || exit 1
 		mkdir -p $TMPDIR || exit 1
 		make install DESTDIR=$TMPDIR || exit 1