Accepting request 129444 from security:netfilter

- Update to new upstream release 1.2.2
* conntrackd: commit operation has to be synchronous
* conntrackd: implement selective flushing for -t and -F commands

OBS-URL: https://build.opensuse.org/request/show/129444
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/conntrack-tools?expand=0&rev=16

conntrack-tools-1.2.1.tar.bz2

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

conntrack-tools-1.2.2.tar.bz2

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

conntrack-tools.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul 31 12:10:49 UTC 2012 - jengelh@inai.de
+
+- Update to new upstream release 1.2.2
+* conntrackd: commit operation has to be synchronous
+* conntrackd: implement selective flushing for -t and -F commands
+
 -------------------------------------------------------------------
 Thu May 31 12:03:49 UTC 2012 - jengelh@inai.de
 

conntrack-tools.spec

@@ -17,25 +17,32 @@
 
 
 Name:           conntrack-tools
-Version:        1.2.1
+Version:        1.2.2
 Release:        0
 Url:            http://conntrack-tools.netfilter.org/
+Summary:        Userspace tools for interacting with the Connection Tracking System
+License:        GPL-2.0+
+Group:          Productivity/Networking/Security
 
 #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:         ct-null.diff
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  flex >= 2.5.33
 BuildRequires:  pkgconfig >= 0.21
+%if 0%{?suse_version} >= 1140
 BuildRequires:  pkgconfig(libmnl) >= 1.0.0
 BuildRequires:  pkgconfig(libnetfilter_conntrack) >= 1.0.1
 BuildRequires:  pkgconfig(libnetfilter_cttimeout) >= 1.0.0
 BuildRequires:  pkgconfig(libnfnetlink) >= 1.0.0
-Summary:        Userspace tools for interacting with the Connection Tracking System
+%else
-License:        GPL-2.0+
+BuildRequires:  libmnl-devel >= 1.0.0
-Group:          Productivity/Networking/Security
+BuildRequires:  libnetfilter_conntrack-devel >= 1.0.1
+BuildRequires:  libnetfilter_cttimeout-devel >= 1.0.0
+BuildRequires:  libnfnetlink-devel >= 1.0.0
+%endif
 
 %description
 The conntrack-tools are a set of tools targeted at system
@@ -50,7 +57,6 @@ collector as well.
 
 %prep
 %setup -q
-%patch -P 1 -p1
 
 %build
 %configure --disable-static

ct-null.diff

@@ -1,25 +0,0 @@
-
-[...]
-  CC     parse.o
-parse.c: In function 'msg2ct':
-parse.c:258:34: error: 'NULL' undeclared (first use in this function)
-parse.c:258:34: note: each undeclared identifier is reported only once for each function it appears in
-parse.c: In function 'msg2exp':
-parse.c:438:16: error: 'NULL' undeclared (first use in this function)
-
----
- src/parse.c |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: conntrack-tools/src/parse.c
-===================================================================
---- conntrack-tools.orig/src/parse.c
-+++ conntrack-tools/src/parse.c
-@@ -17,6 +17,7 @@
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
-+#include <stdio.h>
- #include "network.h"
- 
- #include <libnetfilter_conntrack/libnetfilter_conntrack.h>