[Lunar-commits] <moonbase-core> iptables: Properly link against ip6tc

[Stefan Wold]

commit b446e79ac003ee49c28029234f4fb270f4786f2f
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Thu, 03 Jan 2013 06:20:13 -0800
URL: https://github.com/lunar-linux/moonbase-core/commit/b446e79ac003ee49c28029234f4fb270f4786f2f

iptables: Properly link against ip6tc

Adding missing && in BUILD or it doesn't abort properly if
something fail.
---
  security/iptables/BUILD   | +4/-2     
  security/iptables/DETAILS | +5/-2     
  2 files changed, 9 insertions(+), 4 deletions(-)

--- a/security/iptables/BUILD
+++ b/security/iptables/BUILD
@@ -1,5 +1,7 @@
 (
 
+  patch_it $SOURCE2 1 &&
+
   # save tables
   if module_installed iptables ; then
     iptables-save -c > /etc/config.d/iptables.sav
@@ -18,12 +20,12 @@
   if [ -f /etc/config.d/iptables.sav ] ; then
     cat /etc/config.d/iptables.sav | iptables-restore -c  &&
     rm /etc/config.d/iptables.sav
-  fi
+  fi &&
 
   # add empty iptables file for flushing
   if [ ! -f /etc/config.d/iptables-empty ]; then
     cp $SCRIPT_DIRECTORY/files/iptables-empty /etc/config.d/iptables-empty
-  fi
+  fi &&
   # little wrapper for systemd's usage
   # todo: should be detected by our package-management (installwatch?)
   #       tho i guess nobody uses lunar without installed iptables..
--- a/security/iptables/DETAILS
+++ b/security/iptables/DETAILS
@@ -1,13 +1,16 @@
           MODULE=iptables
          VERSION=1.4.17
           SOURCE=$MODULE-$VERSION.tar.bz2
+         SOURCE2=iptables-1.4.17-link_properly_with_ip6tc.patch
       SOURCE_URL=ftp://ftp.netfilter.org/pub/$MODULE
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:441cc487f1c92db17dbf496b4821246d032c84a8
+     SOURCE2_VFY=sha1:7ad0ebf9198151fc907c8f4213a74034bc0dd99b
         WEB_SITE=http://www.netfilter.org
          ENTERED=20010922
-         UPDATED=20121229
+         UPDATED=20130103
            SHORT="Tool to create netfilter rules"
-           PSAFE=no
+PSAFE=no
 
 cat << EOF
 iptables is built on top of netfilter: the new packet alteration