From 114b0c1e39c7c4672f98d1e7221c4a2728a62291b44aae32d9ffeff5fc0d573f Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 4 Jan 2012 18:35:14 +0000
Subject: [PATCH] libnetfilter_conntrack 1.0.0

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_conntrack?expand=0&rev=16
---
 libnetfilter_conntrack-0.9.1+git18.tar.xz |   3 ---
 libnetfilter_conntrack-1.0.0.tar.bz2      |   3 +++
 libnetfilter_conntrack-1.0.0.tar.bz2.sig  | Bin 0 -> 543 bytes
 libnetfilter_conntrack.changes            |  15 ++++++++++++---
 libnetfilter_conntrack.spec               |  19 +++++++++++--------
 5 files changed, 26 insertions(+), 14 deletions(-)
 delete mode 100644 libnetfilter_conntrack-0.9.1+git18.tar.xz
 create mode 100644 libnetfilter_conntrack-1.0.0.tar.bz2
 create mode 100644 libnetfilter_conntrack-1.0.0.tar.bz2.sig

diff --git a/libnetfilter_conntrack-0.9.1+git18.tar.xz b/libnetfilter_conntrack-0.9.1+git18.tar.xz
deleted file mode 100644
index 6cf9494..0000000
--- a/libnetfilter_conntrack-0.9.1+git18.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31d4b34f61d67c1769824afce3b2bd36ee50f156a046d1979a432460b7bc8fe9
-size 52584
diff --git a/libnetfilter_conntrack-1.0.0.tar.bz2 b/libnetfilter_conntrack-1.0.0.tar.bz2
new file mode 100644
index 0000000..82537cb
--- /dev/null
+++ b/libnetfilter_conntrack-1.0.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a09a61ad26a43190a1858cb0391198ae3c952a9bdc4488e63dcb5c59aa3d608
+size 380555
diff --git a/libnetfilter_conntrack-1.0.0.tar.bz2.sig b/libnetfilter_conntrack-1.0.0.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..c0cdea44db57f9a11239a881f3f0c9b028d6e9444ce695ce5f92b73b82c2b11c
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0RjL91p-e5f2{xt2@s?aABnqPSj;V=5B?=9bG$8Sr@=Iq=wpf`
zI7UHIH6th{VAm#tA*`1mPC-o8?6o-WbQ2;slRt1Q<MHn+cB<!ymKV*Z#<UG5)Ji^Q
zQf+lZ$~A$XkPEs0FRdW;V<nK)Z69#!dn2eU*KHOVEY-|ab$1I`?SCzoPFY006h=A0
zBII#NckM)WnfrVyv{6cQUf!IQB3V8(XIxS}C14T#WgBUZ9g&X9zTD2z075I->F@-q
zBK<!ycU_iHw)x>HWN@}3Gj;=Ta3OH+@DPTxee;3MRSW<R(~_PFzJps8<T=Ki*`<2(
zuv4Y<;<Lk+7l1Uy!_u6@u1uW?!7ihAwhGrq7>n5ij=F<Ps;&9bTN8dNwc^}q^gA1+
z<GMp$g85D%tUy+uF=0@o2O6Qx&a4Qara(zi0&9pv_kI!~P~mtIq)0RgL-GKBC0*=b
zAO*mJjH`Fyb)_(*g5?YlT)t7-&-|UAXI>8pze>q`sxk5rHGAYE+?;vY;6uDr84Hh3
z(}_IvlqwZ=>&_S=wW~x2TW~hYqNN@Z`RCu+s_s<mg6O16bW6mQ*kDrx=%#8V9yIDE
zveG4IBM(wy1EyuZTaTWn`upk5=|G6NW7l0P`C%%;hu}1}w$Y->XijtO&(P<DyuOtK
hF_zp<&JDc#@#&?P@_tkQNO44f_ZqvhHUn)wQ4oJJ0hs^*

literal 0
HcmV?d00001

diff --git a/libnetfilter_conntrack.changes b/libnetfilter_conntrack.changes
index e5f5ac4..b37d518 100644
--- a/libnetfilter_conntrack.changes
+++ b/libnetfilter_conntrack.changes
@@ -1,8 +1,17 @@
 -------------------------------------------------------------------
-Sun Jan  1 00:01:48 UTC 2012 - jengelh@medozas.de
+Wed Jan  4 18:28:21 UTC 2012 - jengelh@medozas.de
 
-- Update to newer git snapshot 1.0.1+git18
-* license clarifications
+- Update to new upstream release 1.0.0
+* build and compilation updates
+* expect: fix missing parsing of master tuple
+* expect: nfexp_snprintf prints expectation timeout if present
+* expect: nfexp_snprintf displays mask and master tuple information
+* expect: add nfexp_send()
+* expect: support CTA_EXPECT_HELP_NAME
+* src: clarify licensing terms of library (GPLv2+)
+* conntrack: fix size of CTA_PROTOINFO_TCP_FLAGS_ORIGINAL in ARM
+* conntrack: fix set operation for master IPv6 src and dst
+* expect: add nfexp_cmp
 
 -------------------------------------------------------------------
 Thu Dec 29 21:17:48 UTC 2011 - jengelh@medozas.de
diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec
index cdb81fb..cf397d7 100644
--- a/libnetfilter_conntrack.spec
+++ b/libnetfilter_conntrack.spec
@@ -19,19 +19,22 @@
 
 Name:           libnetfilter_conntrack
 %define lname	%{name}3
-Version:        0.9.1+git18
+Version:        1.0.0
 Release:        0
 License:        GPL-2.0+
 Group:          Productivity/Networking/Security
 Url:            http://netfilter.org/projects/libnetfilter_conntrack/
 
 #Git-Clone:	git://git.netfilter.org/libnetfilter_conntrack
-#DL-Source:	http://netfilter.org/projects/%name/files/%name-%version.tar.bz2
-Source:         %name-%version.tar.xz
+%define git_snapshot 0
+Source:         ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/%name-%version.tar.bz2
+Source2:        ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/%name-%version.tar.bz2.sig
 Source3:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if %git_snapshot
 BuildRequires:  autoconf automake >= 1.6 libtool
-BuildRequires:  pkgconfig >= 0.23 pkgconfig(libnfnetlink) >= 1.0.0 xz
+%endif
+BuildRequires:  pkgconfig >= 0.23 pkgconfig(libnfnetlink) >= 1.0.0
 Summary:        Userspace library for the in-kernel connection tracking state table
 
 %description
@@ -68,10 +71,10 @@ used by conntrack-tools among many other applications.
 %setup -q
 
 %build
-if [ ! -e configure ]; then
-	./autogen.sh;
+if [ "%git_snapshot" -ne 0 ] || [ ! -e configure ]; then
+	autoreconf -fi;
 fi;
-%configure --disable-static --includedir=%_includedir/%name-%version
+%configure --disable-static --includedir=%_includedir/%name
 make %{?_smp_mflags}
 
 %install
@@ -88,7 +91,7 @@ rm -f "%buildroot/%_libdir"/*.la;
 
 %files devel
 %defattr(-,root,root)
-%_includedir/libnetfilter_conntrack*
+%_includedir/libnetfilter_conntrack
 %_libdir/libnetfilter_conntrack.so
 %_libdir/pkgconfig/libnetfilter_conntrack.pc