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

[Bartłomiej Piotrowski]

    Date: Monday, March 14, 2016 @ 13:39:46
  Author: bpiotrowski
Revision: 261449

upgpkg: iptables 1.6.0-1

new upstream release

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

----------------------------+
 PKGBUILD                   |   15 ++------
 iptables_upstream940.patch |   79 -------------------------------------------
 2 files changed, 5 insertions(+), 89 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-14 12:09:57 UTC (rev 261448)
+++ PKGBUILD	2016-03-14 12:39:46 UTC (rev 261449)
@@ -3,16 +3,15 @@
 # Contributor: Thomas Baechler <thomas at archlinux.org>
 
 pkgname=iptables
-pkgver=1.4.21
-pkgrel=3
+pkgver=1.6.0
+pkgrel=1
 pkgdesc='Linux kernel packet control tool'
 arch=('i686' 'x86_64')
 license=('GPL2')
 url='http://www.netfilter.org/projects/iptables/index.html'
-depends=('glibc' 'bash')
+depends=('glibc' 'bash' 'libnftnl')
 makedepends=('linux-api-headers')
 source=(http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2{,.sig} \
-        iptables_upstream940.patch
         empty.rules
         simple_firewall.rules
         empty-filter.rules
@@ -23,9 +22,8 @@
         iptables.service
         ip6tables.service
         iptables-flush)
-sha1sums=('85d4160537546a23a7e42bc26dd7ee62a0ede4c8'
+sha1sums=('21a694e75b0d6863cc001f85fb15915d12b8cc22'
           'SKIP'
-          '4914485dd940840849a9ddbefef0aa87e1505019'
           '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
           'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec'
           'd9f9f06b46b4187648e860afa0552335aafe3ce4'
@@ -36,7 +34,7 @@
           '49be9443fc302dd0fda78b63d64e884cadb61603'
           '635ba179aeed0c06af0c8b0dba3935f6267e608b'
           'e7abda09c61142121b6695928d3b71ccd8fdf73a')
-validpgpkeys=('57FF5E9C9AA67A860B557AF7A4111F89BB5F58CC') # Netfilter Core Team
+validpgpkeys=('C09DB2063F1D7034BA6152ADAB4655A126D292E4') # Netfilter Core Team
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -43,9 +41,6 @@
 
   # use system one
   rm include/linux/types.h
-  
-  # https://bugzilla.netfilter.org/show_bug.cgi?id=940
-  patch -Np1 -i "${srcdir}/iptables_upstream940.patch"
 }
 
 build() {

Deleted: iptables_upstream940.patch
===================================================================
--- iptables_upstream940.patch	2016-03-14 12:09:57 UTC (rev 261448)
+++ iptables_upstream940.patch	2016-03-14 12:39:46 UTC (rev 261449)
@@ -1,79 +0,0 @@
-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
-
-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 | 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..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",
- 		       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",
- 		       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..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",
- 		       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",
- 		       xtables_ip6addr_to_numeric(&info->dst_pfx.in6),
- 		       info->dst_pfx_len);
- }
--- 
-2.3.4
-