Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv15875
Modified Files:
libnetfilter_conntrack libnfnetlink strongswan vblade
patch-o-matic
Added Files:
sqlite
Log Message:
- updated kernel-patches-2.6.tar.bz2
- updated pom-addon/TARPIT.tar.bz2
- updated aoe6 to 62
- updated busybox to 1.11.1
- updated conntrack-tools to 0.9.7
- updated dnsmasq to 2.43
- updated freeradius-server to 2.0.5
- updated hdparm to 8.9
- updated IMQ-iptables to 1.4.1
- updated ipset to 2.3.3a
- updated iptables to 1.4.1.1
- updated jfsutils to 1.1.13
- updated libnetfilter_conntrack to 0.0.94
- updated libnfnetlink to 0.0.38
- updated mppe-mppc patch
- updated nagios to 3.0.2
- updated netfilter-layer7 to v2.19
- updated openldap to 2.4.10
- updated kernel to 2.6.25.11
- updated patch-o-matic-ng to 20080612
- updated quagga to 0.99.10
- updated squid to 3.0.STABLE8
- updated strongswan to 4.2.4
- updated vblade to 18
- added sqlite 3.5.9
Index: vblade
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/vblade,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vblade 14 May 2008 11:46:51 -0000 1.4
+++ vblade 24 Jul 2008 22:03:12 -0000 1.5
@@ -26,7 +26,7 @@
case $1 in
build )
if [ "$CONFIG_VBLADE" = "y" ]; then
- patch -p1 < contrib/vblade-*-socketfilter*diff || exit 1
+ #patch -p1 < contrib/vblade-*-socketfilter*diff || exit 1
make || exit 1
strip_debug
fi
Index: libnetfilter_conntrack
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/libnetfilter_conntrack,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libnetfilter_conntrack 14 May 2008 11:46:51 -0000 1.3
+++ libnetfilter_conntrack 24 Jul 2008 22:03:12 -0000 1.4
@@ -25,7 +25,7 @@
case $1 in
build )
- ./autogen.sh || exit 1
+ ./autogen.sh
delete_str ./libnetfilter_conntrack.pc.in "^URL: " || exit 1
./configure --prefix=/usr || exit 1
make $PMAKE all || exit 1
Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- patch-o-matic 11 May 2008 14:12:03 -0000 1.36
+++ patch-o-matic 24 Jul 2008 22:03:12 -0000 1.37
@@ -44,7 +44,7 @@
echo applying iptables netfilter layer 7 patch
pushd $IPTABLES_DIR > /dev/null
# patch -p1 < ../netfilter-layer7-*/iptables-layer7-*.patch || exit 1
- patch -p1 < ../netfilter-layer7-*/iptables-1.4*2.6.20forward-layer7*.patch || exit 1
+ patch -p1 < ../netfilter-layer7-*/iptables-1.4.1*2.6.20forward-layer7*.patch || exit 1
chmod +x extensions/.layer7-test || exit 1
popd > /dev/null
touch $KERNEL_DIR/.done_layer7
--- NEW FILE: sqlite ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/sqlite,v $
# $Revision: 1.1 $
# $Date: 2008/07/24 22:03:12 $
#
# http://www.devil-linux.org
# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3
### BEGIN INIT INFO
# Provides: sqlite
# 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
case $1 in
build )
if [ "$CONFIG_SQLITE" = "y" ]; then
./configure --prefix=/usr || exit 1
make || exit 1
strip_debug
# we have to install this immediately, because this is a library and could be needed by other sources
make install || exit 1
fi
;;
install )
if [ "$CONFIG_SQLITE" = "y" ]; then
cp -a /usr/bin/sqlite* $CDDIR/usr/bin/ || exit 1
fi
;;
* )
echo "ERROR ($0)"
echo "please add parameter so I know what to do"
exit 1
;;
esac
Index: strongswan
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/strongswan,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- strongswan 14 May 2008 11:46:51 -0000 1.4
+++ strongswan 24 Jul 2008 22:03:12 -0000 1.5
@@ -10,7 +10,7 @@
### BEGIN INIT INFO
# Provides: strongswan
-# Required-Start: $basebuildtools $libs curl openldap
+# Required-Start: $basebuildtools $libs curl openldap sqlite
# Required-Stop:
# Default-Start: 1 2
# Default-Stop:
@@ -34,10 +34,14 @@
OPTIONS="$OPTIONS --enable-mysql "
fi
+if [ "$CONFIG_SQLITE" != "y" ]; then
+ OPTIONS="$OPTIONS --disable-sqlite "
+fi
+
case $1 in
build )
if [ "$CONFIG_STRONGSWAN" = "y" ]; then
- ./configure --prefix=/usr --sysconfdir=/etc --enable-cisco-quirks --enable-smp $OPTIONS || exit 1
+ ./configure --prefix=/usr --sysconfdir=/etc --enable-cisco-quirks --enable-smp $OPTIONS || exit 1
make $PMAKE || exit 1
strip_debug
fi
Index: libnfnetlink
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/libnfnetlink,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libnfnetlink 14 May 2008 11:46:51 -0000 1.2
+++ libnfnetlink 24 Jul 2008 22:03:12 -0000 1.3
@@ -25,7 +25,7 @@
case $1 in
build )
- ./autogen.sh || exit 1
+ ./autogen.sh
delete_str ./libnfnetlink.pc.in "^URL: " || exit 1
./configure --prefix=/usr || exit 1
make $PMAKE all || exit 1
|
