[Astlinux-commits] SF.net SVN: astlinux:[7176] branches/1.0/package/arnofw/ arnofw-enable-iptables-lock-wait.patch

[<abe...@us...>]

Revision: 7176
          http://sourceforge.net/p/astlinux/code/7176
Author:   abelbeck
Date:     2015-08-03 22:34:50 +0000 (Mon, 03 Aug 2015)
Log Message:
-----------
arnofw, update patch to match upstream fix, no functional change

Modified Paths:
--------------
    branches/1.0/package/arnofw/arnofw-enable-iptables-lock-wait.patch

Modified: branches/1.0/package/arnofw/arnofw-enable-iptables-lock-wait.patch
===================================================================
--- branches/1.0/package/arnofw/arnofw-enable-iptables-lock-wait.patch	2015-08-03 18:32:01 UTC (rev 7175)
+++ branches/1.0/package/arnofw/arnofw-enable-iptables-lock-wait.patch	2015-08-03 22:34:50 UTC (rev 7176)
@@ -1,38 +1,64 @@
---- arno-iptables-firewall_2.0.1e/share/arno-iptables-firewall/environment.orig	2015-08-02 08:31:33.000000000 -0500
-+++ arno-iptables-firewall_2.0.1e/share/arno-iptables-firewall/environment	2015-08-02 08:33:37.000000000 -0500
-@@ -291,7 +291,7 @@
+From 8a5f13173cbc21b4c21b0fc97370f9882ef4cd94 Mon Sep 17 00:00:00 2001
+From: Lonnie Abelbeck <lo...@ab...>
+Date: Mon, 3 Aug 2015 17:11:00 -0500
+Subject: [PATCH] fixed: Issue #17, Enable xtables lock "wait" option found in
+ iptables 1.4.20+
+
+---
+ share/arno-iptables-firewall/environment | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/share/arno-iptables-firewall/environment b/share/arno-iptables-firewall/environment
+index 0fe708f..bc2d24e 100644
+--- a/share/arno-iptables-firewall/environment
++++ b/share/arno-iptables-firewall/environment
+@@ -296,7 +296,7 @@ ip4tables()
  {
    local result retval IFS=' '
  
 -  result=`$IP4TABLES "$@" 2>&1`
-+  result=`$IP4TABLES -w "$@" 2>&1`
++  result=`$IP4TABLES${IPTABLES_OPTIONS:+ $IPTABLES_OPTIONS} "$@" 2>&1`
    retval=$?
  
    if [ $retval -ne 0 ]; then
-@@ -318,7 +318,7 @@
+@@ -323,7 +323,7 @@ ip6tables()
  {
    local result retval IFS=' '
  
 -  result=`$IP6TABLES "$@" 2>&1`
-+  result=`$IP6TABLES -w "$@" 2>&1`
++  result=`$IP6TABLES${IPTABLES_OPTIONS:+ $IPTABLES_OPTIONS} "$@" 2>&1`
    retval=$?
  
    if [ $retval -ne 0 ]; then
-@@ -417,7 +417,7 @@
+@@ -422,7 +422,7 @@ try_ip4tables()
  {
    local IFS=' '
  
 -  $IP4TABLES "$@" >/dev/null 2>&1
-+  $IP4TABLES -w "$@" >/dev/null 2>&1
++  $IP4TABLES${IPTABLES_OPTIONS:+ $IPTABLES_OPTIONS} "$@" >/dev/null 2>&1
  }
  
  
-@@ -425,7 +425,7 @@
+@@ -430,7 +430,7 @@ try_ip6tables()
  {
    local IFS=' '
  
 -  $IP6TABLES "$@" >/dev/null 2>&1
-+  $IP6TABLES -w "$@" >/dev/null 2>&1
++  $IP6TABLES${IPTABLES_OPTIONS:+ $IPTABLES_OPTIONS} "$@" >/dev/null 2>&1
  }
  
  
+@@ -1672,6 +1672,13 @@ if [ -z "$DIG" ]; then
+   NSLOOKUP="$(find_command /usr/bin/nslookup)"
+ fi
+ 
++# Enable xtables lock "wait" option found in iptables 1.4.20+
++if $IP4TABLES -w --version >/dev/null 2>&1; then
++  IPTABLES_OPTIONS="-w"
++else
++  IPTABLES_OPTIONS=""
++fi
++
+ # Setup IPv6 detected environment variable
+ if sysctl_key net.ipv6.conf; then
+   IPV6_DETECTED=1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.