conntrack-tools 1.2.1

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/conntrack-tools?expand=0&rev=23

b641e7f-nfct_timeout-api.diff

@@ -1,40 +0,0 @@
-parent 318756cd4df1cb7760bf32d3e1d3756c41d1858b (conntrack-tools-1.2.0)
-commit b641e7fe34095d3b3f925685835f907e57b3c2c6
-Author: Jan Engelhardt <jengelh@inai.de>
-Date:   Sat May 26 20:57:48 2012 +0200
-
-nfct-extensions/timeout: adjust for changed nfct_timeout_snprintf API
-
-Despite requiring libnetfilter_cttimeout >= 1.0.0, it did not
-use the new API.
-
-nfct-extensions/timeout.c: In function 'nfct_timeout_cb':
-nfct-extensions/timeout.c:99:2: error: too few arguments to function
-	'nfct_timeout_snprintf'
-In file included from nfct-extensions/timeout.c:26:0:
-/usr/include/libnetfilter_cttimeout-1.0.0/libnetfilter_cttimeout/
-	libnetfilter_cttimeout.h:114:5: note: declared here
-
-114: int nfct_timeout_snprintf(char *buf, size_t size,
-	const struct nfct_timeout *, unsigned int type, unsigned int flags);
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
----
- src/nfct-extensions/timeout.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/nfct-extensions/timeout.c b/src/nfct-extensions/timeout.c
-index a1a5c52..5b32023 100644
---- a/src/nfct-extensions/timeout.c
-+++ b/src/nfct-extensions/timeout.c
-@@ -96,7 +96,7 @@ static int nfct_timeout_cb(const struct nlmsghdr *nlh, void *data)
- 		goto err_free;
- 	}
- 
--	nfct_timeout_snprintf(buf, sizeof(buf), t, 0);
-+	nfct_timeout_snprintf(buf, sizeof(buf), t, NFCT_TIMEOUT_O_DEFAULT, 0);
- 	printf("%s\n", buf);
- 
- err_free:
--- 
-# Created with git-export-patch

conntrack-tools-1.2.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7332b6fda82460bb4f07e93ce67e676b81a955d5738f3b67ca2f1063ddd4dc67
-size 475109

conntrack-tools-1.2.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9131e073d6f4ed225a6bb9cdb281b88711f82ffca1382a58dcd5dc9e2581be3e
+size 475133

conntrack-tools.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Sat May 26 18:38:34 UTC 2012 - jengelh@inai.de
 
-- Update to new upstream release 1.2.0
+- Update to new upstream release 1.2.1
 * Add support for NAT expectations, synchronization of expectation
   class, helper names and expect functions. Filtering by mark is
   now allowed.

conntrack-tools.spec

@@ -17,14 +17,13 @@
 
 
 Name:           conntrack-tools
-Version:        1.2.0
+Version:        1.2.1
 Release:        0
 Url:            http://conntrack-tools.netfilter.org/
 
 #Git-Clone:	git://git.netfilter.org/conntrack-tools
 Source:         http://netfilter.org/projects/conntrack-tools/files/%name-%version.tar.bz2
 Source2:        http://netfilter.org/projects/conntrack-tools/files/%name-%version.tar.bz2.sig
-Patch1:         b641e7f-nfct_timeout-api.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  flex >= 2.5.33
@@ -50,7 +49,6 @@ collector as well.
 
 %prep
 %setup -q
-%patch -P 1 -p1
 
 %build
 %configure --disable-static