From f9ee5c8eb4b9fa868fd7d868b9f723eeda4520b4c8c5a509b9597957fed21cf7 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 26 May 2012 19:33:45 +0000
Subject: [PATCH] patch gb641e7f

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/conntrack-tools?expand=0&rev=22
---
 b641e7f-nfct_timeout-api.diff | 40 +++++++++++++++++++++++++++++++++++
 conntrack-tools.spec          |  8 ++++---
 2 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 b641e7f-nfct_timeout-api.diff

diff --git a/b641e7f-nfct_timeout-api.diff b/b641e7f-nfct_timeout-api.diff
new file mode 100644
index 0000000..d212ca5
--- /dev/null
+++ b/b641e7f-nfct_timeout-api.diff
@@ -0,0 +1,40 @@
+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
diff --git a/conntrack-tools.spec b/conntrack-tools.spec
index ad87e80..c4b73db 100644
--- a/conntrack-tools.spec
+++ b/conntrack-tools.spec
@@ -24,9 +24,10 @@ 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
+BuildRequires:  flex >= 2.5.33
 BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  pkgconfig(libmnl) >= 1.0.0
 BuildRequires:  pkgconfig(libnetfilter_conntrack) >= 1.0.1
@@ -49,6 +50,7 @@ collector as well.
 
 %prep
 %setup -q
+%patch -P 1 -p1
 
 %build
 %configure --disable-static
@@ -62,7 +64,7 @@ make %{?_smp_mflags}
 %doc AUTHORS TODO doc/stats/conntrackd.conf
 %_sbindir/conntrack
 %_sbindir/conntrackd
-%_mandir/man8/conntrack.8.gz
-%_mandir/man8/conntrackd.8.gz
+%_sbindir/nfct
+%_mandir/man8/*
 
 %changelog