[Devil-linux-commit] build/scripts ImageMagick, 1.1.2.1, 1.1.2.2 patch-o-matic, 1.22.2.5, 1.22.2.6 sarg, 1.4, 1.4.2.1

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

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv27865/scripts

Modified Files:
      Tag: rel-1-2-patches
	ImageMagick patch-o-matic sarg 
Log Message:
- updated ImageMagick to 6.3.1-2
- updated clamav to 0.88.7
- updated ctags to 5.6
- updated dar to 2.3.2
- updated gnupg to 1.4.6
- updated gocr to 0.43
- updated gradm to 2.1.9-200610091102
- updated grsecurity to 2.1.9-2.4.33.4-200612141916
- updated l7-protocols to 2006-12-12
- updated libpng to 1.2.14
- updated linux to 2.4.33.5
- updated mdadm to 2.5.6
- updated net-snmp to 5.4
- updated netfilter-layer7 to v2.8
- updated python-ldap to 2.2.1
- updated rsync to 2.6.9
- updated sarg to 2.2.2
- updated stunnel to 4.20
- updated sysstat to 7.0.3
- updated tar to 1.16.1
- updated tftp-hpa to 0.45
- updated vobcopy to 1.0.1
- updated vtun to 3.0.0


Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.22.2.5
retrieving revision 1.22.2.6
diff -u -d -r1.22.2.5 -r1.22.2.6
--- patch-o-matic	13 Mar 2006 14:58:41 -0000	1.22.2.5
+++ patch-o-matic	20 Dec 2006 01:39:37 -0000	1.22.2.6
@@ -35,9 +35,15 @@
 		if [ "$CONFIG_NF_LAYER7" = "y" ]; then
 		
 		    if [ ! -f .done_layer7 ]; then
+		    
+			echo "Applying GRSecurity compatability patch for Layer7 patch"
+			pushd ../netfilter-layer7-* > /dev/null
+		        bzcat $DL_DIR/src/netfilter-layer7-v2.6-grsec.patch.bz2 | patch -p0 kernel-2.4-layer7-*.patch || exit 1
+            		popd > /dev/null
+
 			echo "Applying Layer7 patch"
             		pushd $KERNEL_DIR > /dev/null
-			patch -p1 -i ../netfilter-layer7-*/kernel-2.4-layer7-*grsec.patch || exit 1
+			patch -p1 -i ../netfilter-layer7-*/kernel-2.4-layer7-*.patch || exit 1
             		popd > /dev/null
 						
             		pushd  $IPTABLES_DIR > /dev/null

Index: ImageMagick
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ImageMagick,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- ImageMagick	27 Apr 2005 01:56:27 -0000	1.1.2.1
+++ ImageMagick	20 Dec 2006 01:39:37 -0000	1.1.2.2
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       ImageMagick
-# Required-Start: $basebuildtools $libs
+# Required-Start: $basebuildtools $libs perl
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:

Index: sarg
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/sarg,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- sarg	11 Jan 2004 14:43:05 -0000	1.4
+++ sarg	20 Dec 2006 01:39:37 -0000	1.4.2.1
@@ -28,10 +28,10 @@
 case $1 in
     build )
 	if [ "$CONFIG_SARG" = "y" ]; then
-		if [ ! -f sarg-patches.done ]; then
-			bzcat $DL_DIR/src/sarg-1.4.1-index.sort.patch.bz2 | patch -p0 || exit 1
-			touch sarg-patches.done
-		fi
+		#if [ ! -f sarg-patches.done ]; then
+		#	bzcat $DL_DIR/src/sarg-1.4.1-index.sort.patch.bz2 | patch -p0 || exit 1
+		#	touch sarg-patches.done
+		#fi
 		./configure --enable-bindir=$CDDIR/usr/bin --enable-sysconfdir=/etc/sarg --enable-mandir=$CDDIR/usr/share/man/man1 || exit 1
 		# Don't use $PMAKE
 		make || exit 1