From fd1089af14eb33b28a3253939f07593432e9e0d0 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 27 May 2012 10:10:17 +0000
Subject: [PATCH] - updated to 1.2.0 - added include patch (missing include for
 NULL) - added timeout patch (fixes nfct build with released version of
 libnetfilter_cttimeout)

Changed files:
    conntrack-tools-include.patch -> 1.3
    conntrack-tools-timeout.patch -> 1.1
    conntrack-tools.spec -> 1.27
---
 conntrack-tools-include.patch | 10 ++++++++++
 conntrack-tools-timeout.patch | 11 +++++++++++
 conntrack-tools.spec          | 20 +++++++++++++++-----
 3 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 conntrack-tools-include.patch
 create mode 100644 conntrack-tools-timeout.patch

diff --git a/conntrack-tools-include.patch b/conntrack-tools-include.patch
new file mode 100644
index 0000000..b637ad0
--- /dev/null
+++ b/conntrack-tools-include.patch
@@ -0,0 +1,10 @@
+--- conntrack-tools-1.2.0/src/parse.c.orig	2012-05-17 16:21:01.297929729 +0200
++++ conntrack-tools-1.2.0/src/parse.c	2012-05-27 10:57:22.129982817 +0200
+@@ -20,6 +20,7 @@
+ #include "network.h"
+ 
+ #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
++#include <stdlib.h>
+ 
+ #ifndef ssizeof
+ #define ssizeof(x) (int)sizeof(x)
diff --git a/conntrack-tools-timeout.patch b/conntrack-tools-timeout.patch
new file mode 100644
index 0000000..f9297ec
--- /dev/null
+++ b/conntrack-tools-timeout.patch
@@ -0,0 +1,11 @@
+--- conntrack-tools-1.2.0/src/nfct-extensions/timeout.c.orig	2012-05-26 15:53:14.933950376 +0200
++++ conntrack-tools-1.2.0/src/nfct-extensions/timeout.c	2012-05-27 12:02:29.216485520 +0200
+@@ -96,7 +96,7 @@
+ 		goto err_free;
+ 	}
+ 
+-	nfct_timeout_snprintf(buf, sizeof(buf), t, 0);
++	nfct_timeout_snprintf(buf, sizeof(buf), t, 0, 0);
+ 	printf("%s\n", buf);
+ 
+ err_free:
diff --git a/conntrack-tools.spec b/conntrack-tools.spec
index f80d068..16aec0d 100644
--- a/conntrack-tools.spec
+++ b/conntrack-tools.spec
@@ -1,28 +1,34 @@
 Summary:	The userspace connection tracking table administration program
 Summary(pl.UTF-8):	Program przestrzeni użytkownika do zarządzania tablicą śledzenia połączeń
 Name:		conntrack-tools
-Version:	1.0.1
-Release:	2
+Version:	1.2.0
+Release:	1
 License:	GPL v2
 Group:		Applications/Networking
 Source0:	http://www.netfilter.org/projects/conntrack-tools/files/%{name}-%{version}.tar.bz2
-# Source0-md5:	8a60f02a177fc31fe40cc992c4de90e2
+# Source0-md5:	8e20330d6ca3a3f23552aa900b1d467c
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.conf
 Patch0:		%{name}-limits.patch
+Patch1:		%{name}-include.patch
+Patch2:		%{name}-timeout.patch
 URL:		http://conntrack-tools.netfilter.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1.6
 BuildRequires:	bison
 BuildRequires:	flex >= 2.5.33
-BuildRequires:	libnetfilter_conntrack-devel >= 0.9.1
+BuildRequires:	libmnl-devel >= 1.0.0
+BuildRequires:	libnetfilter_conntrack-devel >= 1.0.1
+BuildRequires:	libnetfilter_cttimeout-devel >= 1.0.0
 BuildRequires:	libnfnetlink-devel >= 1.0.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.228
 Requires(post,preun):	/sbin/chkconfig
-Requires:	libnetfilter_conntrack >= 0.9.1
+Requires:	libmnl >= 1.0.0
+Requires:	libnetfilter_conntrack >= 1.0.1
+Requires:	libnetfilter_cttimeout >= 1.0.0
 Requires:	libnfnetlink >= 1.0.0
 Obsoletes:	conntrack
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,6 +59,8 @@ statystyk.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -91,8 +99,10 @@ fi
 %doc AUTHORS TODO
 %attr(755,root,root) %{_sbindir}/conntrack
 %attr(755,root,root) %{_sbindir}/conntrackd
+%attr(755,root,root) %{_sbindir}/nfct
 %{_mandir}/man8/conntrack.8*
 %{_mandir}/man8/conntrackd.8*
+%{_mandir}/man8/nfct.8*
 %attr(754,root,root) /etc/rc.d/init.d/conntrackd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conntrackd/conntrackd.conf
 %dir %{_sysconfdir}/conntrackd
-- 
2.44.0