[arch-commits] Commit in nftables/trunk (001-fix-FS#47289.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Sunday, June 5, 2016 @ 23:07:42
  Author: seblu
Revision: 269063

upgpkg: nftables 1:0.6-1

Modified:
  nftables/trunk/PKGBUILD
Deleted:
  nftables/trunk/001-fix-FS#47289.patch

------------------------+
 001-fix-FS#47289.patch |   49 -----------------------------------------------
 PKGBUILD               |   10 +++------
 2 files changed, 4 insertions(+), 55 deletions(-)

Deleted: 001-fix-FS#47289.patch
===================================================================
--- 001-fix-FS#47289.patch	2016-06-05 21:05:25 UTC (rev 269062)
+++ 001-fix-FS#47289.patch	2016-06-05 21:07:42 UTC (rev 269063)
@@ -1,49 +0,0 @@
-From e6c83f45f522283c7afff4de7a71113116352dbf Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw at strlen.de>
-Date: Thu, 1 Oct 2015 00:13:02 +0200
-Subject: expression: provide clone operation for set element ops
-
-define addrs={ 1.2.3.4 }
-table ip filter {
-	chain input {
-		type filter hook input priority 0;
-		ip saddr $addrs accept
-	}
-}
-
-segfaults. Using saddr { 1.2.3.4 } instead of $addrs works.
-
-Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=801087
-Tested-by: Arturo Borrero Gonzalez <arturo.borrero.glez at gmail.com>
-Signed-off-by: Florian Westphal <fw at strlen.de>
----
- src/expression.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/expression.c b/src/expression.c
-index 3edc550..ab195e5 100644
---- a/src/expression.c
-+++ b/src/expression.c
-@@ -907,9 +907,19 @@ static void set_elem_expr_destroy(struct expr *expr)
- 	expr_free(expr->key);
- }
- 
-+static void set_elem_expr_clone(struct expr *new, const struct expr *expr)
-+{
-+	new->key = expr_clone(expr->key);
-+	new->expiration = expr->expiration;
-+	new->timeout = expr->timeout;
-+	if (expr->comment)
-+		new->comment = xstrdup(expr->comment);
-+}
-+
- static const struct expr_ops set_elem_expr_ops = {
- 	.type		= EXPR_SET_ELEM,
- 	.name		= "set element",
-+	.clone		= set_elem_expr_clone,
- 	.print		= set_elem_expr_print,
- 	.destroy	= set_elem_expr_destroy,
- };
--- 
-cgit v0.11.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-05 21:05:25 UTC (rev 269062)
+++ PKGBUILD	2016-06-05 21:07:42 UTC (rev 269063)
@@ -3,8 +3,8 @@
 
 pkgname=nftables
 epoch=1
-pkgver=0.5
-pkgrel=2
+pkgver=0.6
+pkgrel=1
 pkgdesc='Netfilter tables userspace tools'
 arch=('i686' 'x86_64')
 url='http://netfilter.org/projects/nftables/'
@@ -12,15 +12,13 @@
 depends=('libmnl' 'libnftnl' 'gmp' 'readline' 'ncurses')
 makedepends=('docbook2x')
 backup=('etc/nftables.conf')
-validpgpkeys=('57FF5E9C9AA67A860B557AF7A4111F89BB5F58CC') # Netfilter Core Team
+validpgpkeys=('C09DB2063F1D7034BA6152ADAB4655A126D292E4') # Netfilter Core Team
 source=("http://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.bz2"{,.sig}
-        '001-fix-FS#47289.patch'
         'nftables.conf'
         'nftables.service'
         'nftables-reload')
-sha1sums=('34cfe1daa33d7fd7087dd63199f64854dfb54064'
+sha1sums=('c0f90a208e0ab5d43d3e638350a4fe58e6f4366f'
           'SKIP'
-          '0e6df120039d71c4dbd6af36f38ab981926839e8'
           'a7146fad414f9e827e2e83b630308890c876b80d'
           '65833b9c5b777cfb3a0776060c569a727ce6f460'
           'd9f40e751b44dd9dc9fdb3b7eba3cc0a9b7e1b01')