From 7d682cbc0e73475ed19563cdc4898044148261250006c008e1233e3246eea4c5 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 26 May 2012 18:47:50 +0000
Subject: [PATCH] conntrack-tools 1.2.0

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/conntrack-tools?expand=0&rev=21
---
 conntrack-tools-1.0.1.tar.bz2     |   3 ---
 conntrack-tools-1.0.1.tar.bz2.sig | Bin 543 -> 0 bytes
 conntrack-tools-1.2.0.tar.bz2     |   3 +++
 conntrack-tools-1.2.0.tar.bz2.sig | Bin 0 -> 543 bytes
 conntrack-tools.changes           |   8 ++++++++
 conntrack-tools.spec              |  17 ++++++++++-------
 6 files changed, 21 insertions(+), 10 deletions(-)
 delete mode 100644 conntrack-tools-1.0.1.tar.bz2
 delete mode 100644 conntrack-tools-1.0.1.tar.bz2.sig
 create mode 100644 conntrack-tools-1.2.0.tar.bz2
 create mode 100644 conntrack-tools-1.2.0.tar.bz2.sig

diff --git a/conntrack-tools-1.0.1.tar.bz2 b/conntrack-tools-1.0.1.tar.bz2
deleted file mode 100644
index b2d134f..0000000
--- a/conntrack-tools-1.0.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e5769a17ed17e1e8886a1807af00acda4cceec996d194f0519d922e41655380
-size 444640
diff --git a/conntrack-tools-1.0.1.tar.bz2.sig b/conntrack-tools-1.0.1.tar.bz2.sig
deleted file mode 100644
index 258aad8fd554070860e0efbc231d7ba1b27937c9212de9a2f3ad54905c1c4d09..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0RjL91p-e5gB}112@s?aABnqPSj<Wh5CD!IALB$;1%>AI$d!Ct
zWc~b{K@6fc{2G!DkD?_C@rJ=9J`2e=6g77?4w-+d=bB)9tYnvM=Xms&b*j7ZY$r9x
z48lfJ2}<WKMtEhD<>)s;I(huO_B6x2uS8`Il`KKGFHzMJ#FGi5b}gmr%sOt~dNa$p
z4EDIDo?L$Fe8|Wcg&Y0&X<Hrv(h{1gSFk{b4`AYTj>_`pI%Cixh=N`sE{NL}e|GrX
z0?X_<vpqEJUYYr3D~hz{#%46-G%gI;UJE42JlIG6dorCt_DPCJyhP}O^W9v*mG&@e
zv=ekGtj<B$Wh1q+8g2SMP|emEAN`fhNHByGn=_*}OT;<&!V7Z!6eF2N?kOQc0?p(t
zk?ADwUQNyk#;a@E+!J<0Pdh3rp^c$1j0o5)Gq5Yt{R~TeR_X1eD+{@G<C%Sm@}o@g
zxTKVZ7~*Y5<8CUpOnnJy8X$Q)jw=T)GF~IhFM~kQX<2$(u_9P0eu|xS@kfx81eiHM
zEzQioUrYR|-J<Q?^$osdIUdgNS~|L%f~0H(lyFO1?-Je6t&!v?4LQ&tAG~T**8_gA
za*2U<w@-IklVo*Ob#My1*YB>0_JQPl9IoY>F!T<p02eY4xuyDy4IIEfnB0K$*%0TE
h?Zf}XWyXUSfz4ZHld?`4Djpl!+mRduJ3cnpD~WyO07C!(

diff --git a/conntrack-tools-1.2.0.tar.bz2 b/conntrack-tools-1.2.0.tar.bz2
new file mode 100644
index 0000000..d1b61ee
--- /dev/null
+++ b/conntrack-tools-1.2.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7332b6fda82460bb4f07e93ce67e676b81a955d5738f3b67ca2f1063ddd4dc67
+size 475109
diff --git a/conntrack-tools-1.2.0.tar.bz2.sig b/conntrack-tools-1.2.0.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..b255e8cc112e815e57c253f4a77105b03027a2d3cda4bc2fe9048be0bbb28220
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0RjL91p-gN|N8(62@s?aABnqPSj_hl5B@STKVEw5sI!u@1ngAc
z@1y3pgJgu8fc+<<0{logE_q1jAnKQVPLcPqnyL*HOtE5t-|2QsxDyo~3DuusbXQ8!
z+E-iBfOiu|XJWr<;^>&W&p$w=_Qnl{&yog2q9LqH2QlOLH5TQ-DI8r)Y+oshD+6aW
zZ;I@Yl|-4gc8t7ywW`Lx`5+x-mLom;MGu9zN0)U1hL#gp*0{{r(V4hD-B%v9<_Xzd
zlwycyYVaHVej8`a<S$LL^&GEJgVkb{0&LGKew(_J8d^8miEzoEc+`+V=*`RdJ%a0x
z#_=FA=BM=^bWxANYMZ<tbl05WBqKDSC3L43c6)g)&Th1!15N~7C-v%oF-_{{u`}<m
zc6ssJf%)qoBd-t_h^dA(256LNav>fMufyA9YBx6(prnyj+GCJ>YFIAC&j7{Fhx19`
zY;AuI(ND|*4Y)zQR%N2wAZyG41pb@3q|U;U%aAX7j)9VgoX`P*8mudfvgQuX!%rYs
z8b>?;FbUs|j<OX3kkbTwMgi`N?@MnEVl9Y^II1`%PkKI*pUvi)Rx`>|%rp&XG}CMh
z&OsnUS?Rj&lzB&V3~=<_!w9g>Lbhd3d%=KYgA4M+ZiEOl1R(qFFIK^~w)J<;^#1z%
h<DG&2pV+M;&Bt{plq{hf&-Vxq=9M>$8;wyK0M@bs2S)$^

literal 0
HcmV?d00001

diff --git a/conntrack-tools.changes b/conntrack-tools.changes
index ff1ba82..9d8c58b 100644
--- a/conntrack-tools.changes
+++ b/conntrack-tools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat May 26 18:38:34 UTC 2012 - jengelh@inai.de
+
+- Update to new upstream release 1.2.0
+* Add support for NAT expectations, synchronization of expectation
+  class, helper names and expect functions. Filtering by mark is
+  now allowed.
+
 -------------------------------------------------------------------
 Wed Jan  4 20:16:48 UTC 2012 - jengelh@medozas.de
 
diff --git a/conntrack-tools.spec b/conntrack-tools.spec
index 5279e23..ad87e80 100644
--- a/conntrack-tools.spec
+++ b/conntrack-tools.spec
@@ -16,22 +16,25 @@
 #
 
 
-
 Name:           conntrack-tools
-Version:        1.0.1
-Release:        1
-License:        GPL-2.0+
-Group:          Productivity/Networking/Security
+Version:        1.2.0
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  bison flex pkgconfig >= 0.23
-BuildRequires:  pkgconfig(libnetfilter_conntrack) >= 0.9.1
+BuildRequires:  bison
+BuildRequires:  flex
+BuildRequires:  pkgconfig >= 0.21
+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
+License:        GPL-2.0+
+Group:          Productivity/Networking/Security
 
 %description
 The conntrack-tools are a set of tools targeted at system