From abf4cef82047c1b1e5e9e119684c987f4c2422886bc5cecb5cc938cd1e162726 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 4 Jan 2012 20:18:10 +0000
Subject: [PATCH] conntrack-tools 1.0.1

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

diff --git a/conntrack-tools-1.0.0.tar.bz2 b/conntrack-tools-1.0.0.tar.bz2
deleted file mode 100644
index 8835a33..0000000
--- a/conntrack-tools-1.0.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe36b044bb494d1810a6d73f0b4ccd25b6e81f72a2fc63c44da79ceebe4817b0
-size 440061
diff --git a/conntrack-tools-1.0.0.tar.bz2.sig b/conntrack-tools-1.0.0.tar.bz2.sig
deleted file mode 100644
index 659032919e6702040799b469f77c511332874fd0cb503f8d5a69163ee0e4c83d..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmV-O0Jr~$Mg#y60ssaD0!?YIRR9VJ5J89dWi1JZ=44X<o;U%;(F_8EsbWZ6PuXK5
eXQ~>QP5_=PMtN>5+>8Co#ta8Tff_xUG=@75#u$$P

diff --git a/conntrack-tools-1.0.1.tar.bz2 b/conntrack-tools-1.0.1.tar.bz2
new file mode 100644
index 0000000..b2d134f
--- /dev/null
+++ b/conntrack-tools-1.0.1.tar.bz2
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..258aad8fd554070860e0efbc231d7ba1b27937c9212de9a2f3ad54905c1c4d09
GIT binary patch
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!(

literal 0
HcmV?d00001

diff --git a/conntrack-tools.changes b/conntrack-tools.changes
index 8cd8066..ff1ba82 100644
--- a/conntrack-tools.changes
+++ b/conntrack-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan  4 20:16:48 UTC 2012 - jengelh@medozas.de
+
+- Update to new upstream release 1.0.1
+* add support for mark masks
+
 -------------------------------------------------------------------
 Sat Sep 17 23:49:42 UTC 2011 - jengelh@medozas.de
 
diff --git a/conntrack-tools.spec b/conntrack-tools.spec
index 90ea036..5279e23 100644
--- a/conntrack-tools.spec
+++ b/conntrack-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package conntrack-tools
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,17 +18,19 @@
 
 
 Name:           conntrack-tools
-Version:        1.0.0
+Version:        1.0.1
 Release:        1
-License:        GPLv2+
+License:        GPL-2.0+
 Group:          Productivity/Networking/Security
 Url:            http://conntrack-tools.netfilter.org/
-Source:         http://www.netfilter.org/projects/conntrack-tools/files/%name-%version.tar.bz2
-Source2:        http://www.netfilter.org/projects/conntrack-tools/files/%name-%version.tar.bz2.sig
+
+#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
-BuildRequires:  libnetfilter_conntrack-devel >= 0.9.1
-BuildRequires:  libnfnetlink-devel >= 1.0.0 pkg-config >= 0.19
+BuildRequires:  bison flex pkgconfig >= 0.23
+BuildRequires:  pkgconfig(libnetfilter_conntrack) >= 0.9.1
+BuildRequires:  pkgconfig(libnfnetlink) >= 1.0.0
 Summary:        Userspace tools for interacting with the Connection Tracking System
 
 %description
@@ -42,8 +44,6 @@ conntrackd covers the specific aspects of stateful firewalls to
 enable highly available scenarios, and can be used as statistics
 collector as well.
 
-%define debug_package_requires %name = %version-%release
-
 %prep
 %setup -q