Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15938/scripts
Modified Files:
Tag: rel-1-2-patches
patch-o-matic perl
Log Message:
re-added netfilter patches which got recently removed from the
patch-o-matic-ng package
Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -u -d -r1.22.2.2 -r1.22.2.3
--- patch-o-matic 15 Nov 2005 16:00:54 -0000 1.22.2.2
+++ patch-o-matic 10 Dec 2005 15:33:47 -0000 1.22.2.3
@@ -30,19 +30,29 @@
export KERNEL_DIR=$KERNELDIR
IPTABLES_DIR=$(find_src_dir iptables)
export IPTABLES_DIR
-#L7
+
+ #L7
if [ "$CONFIG_NF_LAYER7" = "y" ]; then
- pushd $KERNEL_DIR > /dev/null
- patch -p1 < ../netfilter-layer7-*/kernel-2.4-layer7-*.patch || exit 1
- popd > /dev/null
+ if [ ! -f .done_layer7 ]; then
+ echo "Applying Layer7 patch"
+ pushd $KERNEL_DIR > /dev/null
+ patch -p1 < ../netfilter-layer7-*/kernel-2.4-layer7-*.patch || exit 1
+ popd > /dev/null
- pushd $IPTABLES_DIR > /dev/null
- patch -p1 < ../netfilter-layer7-*/iptables-layer7-*.patch || exit 1
- chmod +x extensions/.layer7-test || exit 1
- popd > /dev/null
+ pushd $IPTABLES_DIR > /dev/null
+ patch -p1 < ../netfilter-layer7-*/iptables-layer7-*.patch || exit 1
+ chmod +x extensions/.layer7-test || exit 1
+ popd > /dev/null
+ touch .done_layer7
+ fi
fi
+ for FILE in $(ls $DL_DIR/src/pom-addon/*.tar.bz2)
+ do
+ tar -vxjf $FILE -C patchlets || exit 1
+ done
+
# update the patch-o-matic.exclude file to make sure we have everything listed in there
for PDIR in $(ls -d -1 *); do
if [ -d "$PDIR" ]; then
Index: perl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/perl,v
retrieving revision 1.29.2.6
retrieving revision 1.29.2.7
diff -u -d -r1.29.2.6 -r1.29.2.7
--- perl 15 Nov 2005 15:44:38 -0000 1.29.2.6
+++ perl 10 Dec 2005 15:33:47 -0000 1.29.2.7
@@ -48,7 +48,7 @@
mkdir -p $WORKDIR/perl-ext || exit 1
cd $WORKDIR/perl-ext || exit 1
- for FILE in $(ls $DL_DIR/src/perl-ext/*.tar.gz $DL_DIR/src/perl-ext/*.tar.bz2)
+ for FILE in $(ls $DL_DIR/src/perl-ext/*.tar.gz)
do
tar -xzf $FILE || exit 1
done
|
