Fixing iptables commands in scripts

Package-Manager: portage-2.2_rc29/cvs/Linux i686

3 files changed, 40 insertions, 11 deletions

diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog
index 34e3b808aafa..8a42f2aafc96 100644
--- a/net-misc/miniupnpd/ChangeLog
+++ b/net-misc/miniupnpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/miniupnpd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.5 2009/04/16 17:33:31 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.6 2009/04/19 21:12:03 gurligebis Exp $
+
+  19 Apr 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  files/miniupnpd-20090214-iptables_path.diff:
+  Fixing iptables commands in scripts
 
 *miniupnpd-20090214 (16 Apr 2009)
 
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 823f3f26860e..8e341d79e12e 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX miniupnpd-20090214-conf.d 41 RMD160 6ce4c17365bbb0b993613c9bd7392fa97545cd21 SHA1 7e1d95a80f62a01928ac49497127e98755ca7d08 SHA256 8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3
 AUX miniupnpd-20090214-init.d 626 RMD160 5ef339c5847953da917429dbb9109b7caa50f5e1 SHA1 acf22a603d5cc34aaeb5b9d2c12fdb28ae46b027 SHA256 81d7c1c13cdc5e83a9f9b628e3ce7e42e0ea6ce43df5f8b56ca3e534ffa4205e
 AUX miniupnpd-20090214-iptables.diff 757 RMD160 7921a9782b4f8bb98060661b3a4c13f2186ba6ba SHA1 342d1493e9385659b9950d30f4df52d5a3f9e080 SHA256 14f474f20265ca2d38da57d54401cfac0e088a51e8885fe17705d49ea8eef99d
 AUX miniupnpd-20090214-iptables_compile.diff 313 RMD160 c5ebf80db28460afe7bb06ec96b12ba96c1670bd SHA1 d54f4eb632c984f1df1ec48d9e494e79199cbafc SHA256 87b986d7a802b306bd07e38f3ded799846c59446d1a690e6cc00505130b637ea
-AUX miniupnpd-20090214-iptables_path.diff 1684 RMD160 0da2623469bbc17e97a39c1c00966870155cdfe5 SHA1 615dbab6a03ab93dbc1a37dc95ae82ffe9cca931 SHA256 3ac1d754c858f638ad6f36448c525a182ae8d1e336bf6f7fff3bab01844f59e9
+AUX miniupnpd-20090214-iptables_path.diff 2309 RMD160 e244817a4f7f4f7dc4abfaef44df017734f3c21a SHA1 23b92910e58238cf31ad77cb746f28bb36bcb608 SHA256 6fecac3acd2f773110a8f22db931d2b77dd75ec1894e15b33e0747f0aa66154c
 DIST miniupnpd-20090214.tar.gz 82921 RMD160 61fc48b32d8d842cc526231f102a5f8e30677191 SHA1 7006b1bc7e0df4493536369fb5a5c01a1c9669a1 SHA256 347c057d61226673df9811126830d4f279cbad3bd9efce1875ef4a561356a56f
 EBUILD miniupnpd-20090214.ebuild 1131 RMD160 54956b35aa13f9ab1d703bcba32d8f0ce34e85a2 SHA1 6159fbaeff5497c2231531b9648576d839f479f2 SHA256 4f7228c513f846c12042af0a1a771669e0a52a206c93ee38e351e91b74ab1e2a
-MISC ChangeLog 1820 RMD160 50ce91db5ecb3f53959b955161978e4337830cd5 SHA1 7bb60a10af461fafe8cbd491d711a54ea70a57c2 SHA256 c5e0994ee88e4915eb6aa944a79b24cd03c9e377c13224837a988b01cc6be140
+MISC ChangeLog 1968 RMD160 5eafb56a7a94900d48f9c1185d8ae269154baad1 SHA1 0aefc52ab5376166b0698d0763e7c885aadf607b SHA256 de0dce6db2d0ad730ef88f3266950e78fe17aec582eb6c85fcfdb71e99d15602
 MISC metadata.xml 401 RMD160 b4f2959a8b2aa1f97df19bbc675decd518ae1457 SHA1 aded6feda295e161854ba5c305bd0711d0f1ca13 SHA256 18377435ab021c2ab7967a14249da4a0c1c89a027b38e3ade7f73ae430448380
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknrk64ACgkQsR7PQhRXYEl4VACePD9Uzg4HsGkPSIaowT4f5iez
+SocAnRHDjnbSvIq/N722/torKfRQs38g
+=RS+r
+-----END PGP SIGNATURE-----
diff --git a/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_path.diff b/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_path.diff
index 2b7042d78989..05b02efb09b2 100644
--- a/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_path.diff
+++ b/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_path.diff
@@ -1,6 +1,6 @@
 diff -aurp old/netfilter/iptables_display.sh new/netfilter/iptables_display.sh
---- old/netfilter/iptables_display.sh	2008-10-27 20:53:09.000000000 +0000
-+++ new/netfilter/iptables_display.sh	2008-10-27 20:53:38.000000000 +0000
+--- old/netfilter/iptables_display.sh	2009-04-19 20:17:14.000000000 +0000
++++ new/netfilter/iptables_display.sh	2009-04-19 20:17:52.000000000 +0000
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # $Id: iptables_display.sh,v 1.3 2006/11/23 12:32:56 nanard Exp $
@@ -10,8 +10,8 @@ diff -aurp old/netfilter/iptables_display.sh new/netfilter/iptables_display.sh
  #display all chains relative to miniupnpd
  $IPTABLES -v -n -t nat -L PREROUTING
 diff -aurp old/netfilter/iptables_flush.sh new/netfilter/iptables_flush.sh
---- old/netfilter/iptables_flush.sh	2008-10-27 20:53:09.000000000 +0000
-+++ new/netfilter/iptables_flush.sh	2008-10-27 20:53:46.000000000 +0000
+--- old/netfilter/iptables_flush.sh	2009-04-19 20:17:14.000000000 +0000
++++ new/netfilter/iptables_flush.sh	2009-04-19 20:17:52.000000000 +0000
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # $Id: iptables_flush.sh,v 1.2 2006/11/23 12:32:57 nanard Exp $
@@ -21,8 +21,8 @@ diff -aurp old/netfilter/iptables_flush.sh new/netfilter/iptables_flush.sh
  #flush all rules owned by miniupnpd
  $IPTABLES -t nat -F MINIUPNPD
 diff -aurp old/netfilter/iptables_init.sh new/netfilter/iptables_init.sh
---- old/netfilter/iptables_init.sh	2008-10-27 20:53:09.000000000 +0000
-+++ new/netfilter/iptables_init.sh	2008-10-27 20:54:39.000000000 +0000
+--- old/netfilter/iptables_init.sh	2009-04-19 20:17:14.000000000 +0000
++++ new/netfilter/iptables_init.sh	2009-04-19 20:18:19.000000000 +0000
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # $Id: iptables_init.sh,v 1.4 2008/04/25 18:15:08 nanard Exp $
@@ -31,9 +31,16 @@ diff -aurp old/netfilter/iptables_init.sh new/netfilter/iptables_init.sh
  
  #change this parameters :
  EXTIF=eth0
+@@ -16,5 +16,5 @@ $IPTABLES -t nat -A PREROUTING -i $EXTIF
+ #adding the MINIUPNPD chain for filter
+ $IPTABLES -t filter -N MINIUPNPD
+ #adding the rule to MINIUPNPD
+-$IPTABLES -t filter -A FORWARD -i $EXTIF -o ! $EXTIF -j MINIUPNPD
++$IPTABLES -t filter -A FORWARD -i $EXTIF ! -o $EXTIF -j MINIUPNPD
+ 
 diff -aurp old/netfilter/iptables_removeall.sh new/netfilter/iptables_removeall.sh
---- old/netfilter/iptables_removeall.sh	2008-10-27 20:53:09.000000000 +0000
-+++ new/netfilter/iptables_removeall.sh	2008-10-27 20:54:48.000000000 +0000
+--- old/netfilter/iptables_removeall.sh	2009-04-19 20:17:14.000000000 +0000
++++ new/netfilter/iptables_removeall.sh	2009-04-19 20:18:27.000000000 +0000
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # $Id: iptables_removeall.sh,v 1.4 2008/04/25 18:15:09 nanard Exp $
@@ -42,3 +49,11 @@ diff -aurp old/netfilter/iptables_removeall.sh new/netfilter/iptables_removeall.
  
  #change this parameters :
  EXTIF=eth0
+@@ -16,6 +16,6 @@ $IPTABLES -t nat -X MINIUPNPD
+ #removing the MINIUPNPD chain for filter
+ $IPTABLES -t filter -F MINIUPNPD
+ #adding the rule to MINIUPNPD
+-$IPTABLES -t filter -D FORWARD -i $EXTIF -o ! $EXTIF -j MINIUPNPD
++$IPTABLES -t filter -D FORWARD -i $EXTIF ! -o $EXTIF -j MINIUPNPD
+ $IPTABLES -t filter -X MINIUPNPD
+