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

[Ronald van Haren]

    Date: Wednesday, March 25, 2015 @ 10:58:11
  Author: ronald
Revision: 234690

upgpkg: iptables 1.4.21-3

use upstream applied patch which slightly differs

Modified:
  iptables/trunk/PKGBUILD
  iptables/trunk/iptables_upstream940.patch

----------------------------+
 PKGBUILD                   |    4 +--
 iptables_upstream940.patch |   57 +++++++++++++++++++++++++++++++------------
 2 files changed, 44 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-25 09:53:51 UTC (rev 234689)
+++ PKGBUILD	2015-03-25 09:58:11 UTC (rev 234690)
@@ -4,7 +4,7 @@
 
 pkgname=iptables
 pkgver=1.4.21
-pkgrel=2
+pkgrel=3
 pkgdesc='Linux kernel packet control tool'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -25,7 +25,7 @@
         iptables-flush)
 sha1sums=('85d4160537546a23a7e42bc26dd7ee62a0ede4c8'
           'SKIP'
-          'ae7f56344ae6b1fc5e1761ae2ca1d1be47815d44'
+          '4914485dd940840849a9ddbefef0aa87e1505019'
           '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
           'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec'
           'd9f9f06b46b4187648e860afa0552335aafe3ce4'

Modified: iptables_upstream940.patch
===================================================================
--- iptables_upstream940.patch	2015-03-25 09:53:51 UTC (rev 234689)
+++ iptables_upstream940.patch	2015-03-25 09:58:11 UTC (rev 234690)
@@ -1,52 +1,79 @@
-From 87cb94ba87208c369a349ff6b3767e2ba63d673c Mon Sep 17 00:00:00 2001
-From: Kazunori Kojima <kjm.kznr at gmail.com>
-Date: Wed, 14 May 2014 01:19:46 +0900
-Subject: [PATCH] extensions: S/DNPT: fix invalid output in save function
+From 2192c3a37a6470d353def75fb9c7c6593c3b9aec Mon Sep 17 00:00:00 2001
+From: Florian Westphal <fw at strlen.de>
+Date: Thu, 19 Feb 2015 12:28:18 +0100
+Subject: [PATCH] extensions: SNPT,DNPT: fix save/print output
 
-ip6tables-save output is invalid rule.
+wrong placement of ' ', i.e. we get
+-j SNPT--src-pfx dead::/64 --dst-pfx 1c3::/64
+
+Signed-off-by: Florian Westphal <fw at strlen.de>
 ---
- extensions/libip6t_DNPT.c | 4 ++--
- extensions/libip6t_SNPT.c | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ extensions/libip6t_DNPT.c | 8 ++++----
+ extensions/libip6t_SNPT.c | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/extensions/libip6t_DNPT.c b/extensions/libip6t_DNPT.c
-index a442de6..4659ec8 100644
+index a442de6..d045e44 100644
 --- a/extensions/libip6t_DNPT.c
 +++ b/extensions/libip6t_DNPT.c
+@@ -52,9 +52,9 @@ static void DNPT_print(const void *ip, const struct xt_entry_target *target,
+ {
+ 	const struct ip6t_npt_tginfo *npt = (const void *)target->data;
+ 
+-	printf("src-pfx %s/%u ", xtables_ip6addr_to_numeric(&npt->src_pfx.in6),
++	printf(" DNPT src-pfx %s/%u", xtables_ip6addr_to_numeric(&npt->src_pfx.in6),
+ 				 npt->src_pfx_len);
+-	printf("dst-pfx %s/%u ", xtables_ip6addr_to_numeric(&npt->dst_pfx.in6),
++	printf(" dst-pfx %s/%u", xtables_ip6addr_to_numeric(&npt->dst_pfx.in6),
+ 				 npt->dst_pfx_len);
+ }
+ 
 @@ -65,12 +65,12 @@ static void DNPT_save(const void *ip, const struct xt_entry_target *target)
  
  	if (memcmp(&info->src_pfx.in6, &zero_addr, sizeof(zero_addr)) != 0 ||
  	    info->src_pfx_len != 0)
 -		printf("--src-pfx %s/%u ",
-+		printf(" --src-pfx %s/%u ",
++		printf(" --src-pfx %s/%u",
  		       xtables_ip6addr_to_numeric(&info->src_pfx.in6),
  		       info->src_pfx_len);
  	if (memcmp(&info->dst_pfx.in6, &zero_addr, sizeof(zero_addr)) != 0 ||
  	    info->dst_pfx_len != 0)
 -		printf("--dst-pfx %s/%u ",
-+		printf(" --dst-pfx %s/%u ",
++		printf(" --dst-pfx %s/%u",
  		       xtables_ip6addr_to_numeric(&info->dst_pfx.in6),
  		       info->dst_pfx_len);
  }
 diff --git a/extensions/libip6t_SNPT.c b/extensions/libip6t_SNPT.c
-index 4f10de0..bd3ab28 100644
+index 4f10de0..65f787d 100644
 --- a/extensions/libip6t_SNPT.c
 +++ b/extensions/libip6t_SNPT.c
+@@ -52,9 +52,9 @@ static void SNPT_print(const void *ip, const struct xt_entry_target *target,
+ {
+ 	const struct ip6t_npt_tginfo *npt = (const void *)target->data;
+ 
+-	printf("src-pfx %s/%u ", xtables_ip6addr_to_numeric(&npt->src_pfx.in6),
++	printf(" SNPT src-pfx %s/%u", xtables_ip6addr_to_numeric(&npt->src_pfx.in6),
+ 				 npt->src_pfx_len);
+-	printf("dst-pfx %s/%u ", xtables_ip6addr_to_numeric(&npt->dst_pfx.in6),
++	printf(" dst-pfx %s/%u", xtables_ip6addr_to_numeric(&npt->dst_pfx.in6),
+ 				 npt->dst_pfx_len);
+ }
+ 
 @@ -65,12 +65,12 @@ static void SNPT_save(const void *ip, const struct xt_entry_target *target)
  
  	if (memcmp(&info->src_pfx.in6, &zero_addr, sizeof(zero_addr)) != 0 ||
  	    info->src_pfx_len != 0)
 -		printf("--src-pfx %s/%u ",
-+		printf(" --src-pfx %s/%u ",
++		printf(" --src-pfx %s/%u",
  		       xtables_ip6addr_to_numeric(&info->src_pfx.in6),
  		       info->src_pfx_len);
  	if (memcmp(&info->dst_pfx.in6, &zero_addr, sizeof(zero_addr)) != 0 ||
  	    info->dst_pfx_len != 0)
 -		printf("--dst-pfx %s/%u ",
-+		printf(" --dst-pfx %s/%u ",
++		printf(" --dst-pfx %s/%u",
  		       xtables_ip6addr_to_numeric(&info->dst_pfx.in6),
  		       info->dst_pfx_len);
  }
 -- 
-1.9.2
+2.3.4