diff --git a/libnetfilter_conntrack-0.9.1.tar.bz2 b/libnetfilter_conntrack-0.9.1.tar.bz2 deleted file mode 100644 index ed0f231..0000000 --- a/libnetfilter_conntrack-0.9.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11d33e720a8da692933965fc1eca3dec758bb04d6c06038f4db98c79d9b955ea -size 292672 diff --git a/libnetfilter_conntrack-0.9.1.tar.bz2.sig b/libnetfilter_conntrack-0.9.1.tar.bz2.sig deleted file mode 100644 index ce83807..0000000 Binary files a/libnetfilter_conntrack-0.9.1.tar.bz2.sig and /dev/null differ 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 0000000..c0cdea4 Binary files /dev/null and b/libnetfilter_conntrack-1.0.0.tar.bz2.sig differ diff --git a/libnetfilter_conntrack.changes b/libnetfilter_conntrack.changes index 6ff8cee..b37d518 100644 --- a/libnetfilter_conntrack.changes +++ b/libnetfilter_conntrack.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed Jan 4 18:28:21 UTC 2012 - jengelh@medozas.de + +- 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 + +- SPDX format for License: tag +- Use separate include directory to catch compile errors + ------------------------------------------------------------------- Thu Feb 24 19:22:03 UTC 2011 - jengelh@medozas.de diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec index 950e9aa..cf397d7 100644 --- a/libnetfilter_conntrack.spec +++ b/libnetfilter_conntrack.spec @@ -1,7 +1,7 @@ # # spec file for package libnetfilter_conntrack # -# 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 @@ -15,22 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define soname 3 Name: libnetfilter_conntrack -Version: 0.9.1 -Release: 1 -License: GNU GPL v2 +%define lname %{name}3 +Version: 1.0.0 +Release: 0 +License: GPL-2.0+ Group: Productivity/Networking/Security Url: http://netfilter.org/projects/libnetfilter_conntrack/ -Source: http://netfilter.org/projects/%name/files/%name-%version.tar.bz2 -Source2: http://netfilter.org/projects/%name/files/%name-%version.tar.bz2.sig + +#Git-Clone: git://git.netfilter.org/libnetfilter_conntrack +%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 -BuildRequires: libnfnetlink-devel >= 1.0.0 -BuildRequires: linux-kernel-headers >= 2.6.18 pkg-config +%if %git_snapshot +BuildRequires: autoconf automake >= 1.6 libtool +%endif +BuildRequires: pkgconfig >= 0.23 pkgconfig(libnfnetlink) >= 1.0.0 Summary: Userspace library for the in-kernel connection tracking state table %description @@ -40,29 +44,23 @@ library libnetfilter_conntrack has been previously known as libnfnetlink_conntrack and libctnetlink. This library is currently used by conntrack-tools among many other applications. -%define debug_package_requires %{name}%{soname} = %{version}-%{release} - -%package -n %{name}%{soname} - - +%package -n %lname Group: System/Libraries Summary: Userspace library for the in-kernel connection tracking state table -%description -n %{name}%{soname} +%description -n %lname libnetfilter_conntrack is a userspace library providing a programming interface (API) to the in-kernel connection tracking state table. The library libnetfilter_conntrack has been previously known as libnfnetlink_conntrack and libctnetlink. This library is currently used by conntrack-tools among many other applications. -%package -n %{name}-devel - - +%package devel Group: Development/Libraries/C and C++ -Requires: %{name}%{soname} = %{version} +Requires: %lname = %version Summary: Userspace library for the in-kernel connection tracking state table -%description -n %{name}-devel +%description devel libnetfilter_conntrack is a userspace library providing a programming interface (API) to the in-kernel connection tracking state table. The library libnetfilter_conntrack has been previously known as @@ -73,28 +71,28 @@ used by conntrack-tools among many other applications. %setup -q %build -%configure --disable-static -%__make %{?_smp_mflags} +if [ "%git_snapshot" -ne 0 ] || [ ! -e configure ]; then + autoreconf -fi; +fi; +%configure --disable-static --includedir=%_includedir/%name +make %{?_smp_mflags} %install %makeinstall -find %{buildroot} -name "*.la" -delete +rm -f "%buildroot/%_libdir"/*.la; -%post -n %{name}%{soname} -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig -%postun -n %{name}%{soname} -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig -%clean -test "%{buildroot}" != "/" && %__rm -rf %{buildroot} - -%files -n %{name}%{soname} +%files -n %lname %defattr(-,root,root) -%{_libdir}/libnetfilter_conntrack.so.%{soname}* +%_libdir/libnetfilter_conntrack.so.3* -%files -n %{name}-devel +%files devel %defattr(-,root,root) -%{_includedir}/libnetfilter_conntrack -%{_libdir}/libnetfilter_conntrack.so -%{_libdir}/pkgconfig/libnetfilter_conntrack.pc +%_includedir/libnetfilter_conntrack +%_libdir/libnetfilter_conntrack.so +%_libdir/pkgconfig/libnetfilter_conntrack.pc %changelog