[Devil-linux-commit] build/scripts fprobe-ulog, NONE, 1.1 iptables, 1.31, 1.32 patch-o-matic, 1.34, 1.35

[Serge L. <sma...@us...>]

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

Modified Files:
	iptables patch-o-matic 
Added Files:
	fprobe-ulog 
Log Message:

- updated eventlog to 0.2.7 
- updated syslog-ng to 2.0.7 
- added  fprobe-ulog  
- upadted freeradius to 1.1.7 
- updated iptables to 1.4.0 
- updated l7-protocols to 2008-01-16 
- updated libpam-pgsql to 0.6.3 
- updated netfilter-layer7 to 2.17 
- updated patch-o-matic-ng to 20080125 
- updated nss_ldap 
- updated pam_radiusto 1.3.17 
- updated postgresql to 8.2.6 
- updated samba to 3.0.28 
- updated squid to 2.6.STABLE18 



Index: iptables
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/iptables,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- iptables	1 May 2007 00:30:31 -0000	1.31
+++ iptables	1 Feb 2008 10:19:14 -0000	1.32
@@ -31,7 +31,7 @@
 	if [ ! -f .done_imq_patch ]; then
 		touch .done_imq_patch
 		bzcat $DL_DIR/src/IMQ-iptables*bz2 | patch -p1 || exit 1
-		chmod +x extensions/.IMQ-test
+		chmod +x extensions/.IMQ-test*
 	fi
 
 	replace_str Makefile "/usr/local" "/usr"
@@ -43,10 +43,14 @@
         ;;
 
     install )
+    # Make sure the links are present
+	ln -sf $KERNELDIR /lib/modules/$KERNELVERSION/build
+	ln -sf $KERNELDIR /lib/modules/$KERNELVERSION/source
+	
         rm -rf $TMPDIR || exit 1
         mkdir -p $TMPDIR/sbin || exit 1
         mkdir -p $TMPDIR/usr/share/man/man{1,2,5,8} || exit 1
-        make install DESTDIR=$TMPDIR || exit 1
+        make install KERNEL_DIR=$KERNELDIR DESTDIR=$TMPDIR || exit 1
 	copy_docs $TMPDIR
         copy_files $TMPDIR/usr/sbin $CDDIR/usr || exit 1
         copy_files $TMPDIR/usr/lib $CDDIR/usr || exit 1

Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- patch-o-matic	23 Oct 2007 18:06:29 -0000	1.34
+++ patch-o-matic	1 Feb 2008 10:19:14 -0000	1.35
@@ -42,7 +42,7 @@
 						
             		pushd  $IPTABLES_DIR > /dev/null
 #			patch -p1 < ../netfilter-layer7-*/iptables-layer7-*.patch || exit 1
-			patch -p1 < ../netfilter-layer7-*/iptables-*2.6.20forward-layer7*.patch || exit 1
+			patch -p1 < ../netfilter-layer7-*/iptables-1.4*2.6.20forward-layer7*.patch || exit 1
 		        chmod +x extensions/.layer7-test || exit 1
             		popd > /dev/null
 			touch $KERNEL_DIR/.done_layer7

--- NEW FILE: fprobe-ulog ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/fprobe-ulog,v $
# $Revision: 1.1 $
# $Date: 2008/02/01 10:19:14 $
#
# http://www.devil-linux.org

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

### BEGIN INIT INFO
# Provides:       fprobe-ulog
# Required-Start: $basebuildtools $libs
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    description
### END INIT INFO

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

# source functions and config
source $MYDIR/settings

MYNAME="FPROBE-ULOG"

case $1 in
    build )
	if [ "$CONFIG_FPROBE_ULOG" = "y" ]; then
		./configure --prefix=/usr --localstatedir=/var || exit 1
		make $PMAKE all || exit 1
		strip_debug
	fi
        ;;

    install )
	if [ "$CONFIG_FPROBE_ULOG" = "y" ]; then
                rm -rf $TMPDIR || exit 1
		mkdir -p $TMPDIR || exit 1
		DESTDIR=$TMPDIR  make install || exit 1
                copy_docs $TMPDIR
                cp -dpR $TMPDIR/* $CDDIR/ || exit 1
                rm -rf $TMPDIR || exit 1
	fi
        ;;

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