[arch-commits] Commit in iptables/trunk (PKGBUILD iptables-1.4.12-fixresore.patch)

[Evangelos Foutras]

    Date: Wednesday, July 25, 2012 @ 02:38:18
  Author: foutrelis
Revision: 164052

upgpkg: iptables 1.4.14-3

Fix FS#30419 / upstream bug #774: iptables-restore can't parse the quoted parameter correctly.

Added:
  iptables/trunk/iptables-1.4.12-fixresore.patch
Modified:
  iptables/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   17 ++++++++++++-----
 iptables-1.4.12-fixresore.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-25 06:08:06 UTC (rev 164051)
+++ PKGBUILD	2012-07-25 06:38:18 UTC (rev 164052)
@@ -4,7 +4,7 @@
 
 pkgname=iptables
 pkgver=1.4.14
-pkgrel=2
+pkgrel=3
 pkgdesc='Linux kernel packet control tool'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -23,10 +23,11 @@
         empty-nat.rules
         empty-raw.rules
         empty-security.rules
-	0503-extension_cppflags.patch
-	iptables.service
-	ip6tables.service
-	iptables-flush)
+        0503-extension_cppflags.patch
+        iptables-1.4.12-fixresore.patch
+        iptables.service
+        ip6tables.service
+        iptables-flush)
 backup=(etc/conf.d/iptables)
 sha1sums=('daf2972b81e52f562a644798013e946c88319ea3'
           '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
@@ -40,6 +41,7 @@
           '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
           'ebbd1424a1564fd45f455a81c61ce348f0a14c2e'
           '44626980a52e49f345a0b1e1ca03060f3a35763c'
+          '7c018d48445ae41c0b9f345747e54b94cb0997b3'
           '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9'
           'f1f16f44c6a5547b6f251d13007fe6585761e8b0'
           'e7abda09c61142121b6695928d3b71ccd8fdf73a')
@@ -52,6 +54,11 @@
 
   patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch
 
+  # Fix scope issue exposed by gcc 4.7 (patch by fryasu)
+  # http://bugzilla.netfilter.org/show_bug.cgi?id=774
+  # (This will most likely be fixed in iptables 1.4.15)
+  patch -Np1 -i ${srcdir}/iptables-1.4.12-fixresore.patch
+
  ./configure --prefix=/usr \
      --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
      --with-xtlibdir=/usr/lib/iptables \

Added: iptables-1.4.12-fixresore.patch
===================================================================
--- iptables-1.4.12-fixresore.patch	                        (rev 0)
+++ iptables-1.4.12-fixresore.patch	2012-07-25 06:38:18 UTC (rev 164052)
@@ -0,0 +1,28 @@
+diff -Nur iptables-1.4.12.2/iptables/ip6tables-restore.c iptables-1.4.12.2-fixrestore/iptables/ip6tables-restore.c
+--- iptables-1.4.12.2/iptables/ip6tables-restore.c	2012-01-03 02:19:09.000000000 +0900
++++ iptables-1.4.12.2-fixrestore/iptables/ip6tables-restore.c	2012-03-01 10:56:10.000000000 +0900
+@@ -380,9 +380,9 @@
+ 			quote_open = 0;
+ 			escaped = 0;
+ 			param_len = 0;
++			char param_buffer[1024];
+ 
+ 			for (curchar = parsestart; *curchar; curchar++) {
+-				char param_buffer[1024];
+ 
+ 				if (quote_open) {
+ 					if (escaped) {
+diff -Nur iptables-1.4.12.2/iptables/iptables-restore.c iptables-1.4.12.2-fixrestore/iptables/iptables-restore.c
+--- iptables-1.4.12.2/iptables/iptables-restore.c	2012-01-03 02:19:09.000000000 +0900
++++ iptables-1.4.12.2-fixrestore/iptables/iptables-restore.c	2012-03-01 10:56:00.000000000 +0900
+@@ -377,9 +377,9 @@
+ 			quote_open = 0;
+ 			escaped = 0;
+ 			param_len = 0;
++			char param_buffer[1024];
+ 
+ 			for (curchar = parsestart; *curchar; curchar++) {
+-				char param_buffer[1024];
+ 
+ 				if (quote_open) {
+ 					if (escaped) {