Accepting request 98813 from security:netfilter

- Update to newer git snapshot (v1.4.12.2-28-g2117f2b,
  but master branch), tag locally as 1.4.12.90.
* ships missing pkgconfig files, compile fix for libnfnetlink
* libxt_NFQUEUE: fix --queue-bypass ipt-save output
* libxt_connbytes: fix handling of --connbytes FROM
* libxt_recent: Add support for --reap option
- split iptables-devel into libiptc-devel and libxtables-devel

OBS-URL: https://build.opensuse.org/request/show/98813
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iptables?expand=0&rev=40

iptables-1.4.12.1+16.tar.xz

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

iptables-1.4.12.90.tar.xz

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

iptables.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jan  2 21:30:38 UTC 2012 - jengelh@medozas.de
+
+- Update to newer git snapshot (v1.4.12.2-28-g2117f2b,
+  but master branch), tag locally as 1.4.12.90.
+* ships missing pkgconfig files, compile fix for libnfnetlink
+* libxt_NFQUEUE: fix --queue-bypass ipt-save output
+* libxt_connbytes: fix handling of --connbytes FROM
+* libxt_recent: Add support for --reap option
+- split iptables-devel into libiptc-devel and libxtables-devel
+
 -------------------------------------------------------------------
 Wed Dec 28 09:50:23 UTC 2011 - puzel@suse.com
 

iptables.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package iptables
 #
-# 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,59 +15,110 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+
 Name:           iptables
-Version:        1.4.12.1+16
+%define lname_ipq	libipq0
-Release:        0
+%define lname_iptc	libiptc0
-%define xt_sover	7
+%define lname_xt	libxtables7
-Summary:        IP Packet Filter Administration
+Version:        1.4.12.90
+Release:        1
+Summary:        IP Packet Filter Administration utilities
 License:        GPL-2.0+
 Group:          Productivity/Networking/Security
+
+Url:            http://netfilter.org/
 #DL-URL:	ftp://ftp.netfilter.org/pub/iptables/
 #Git-Web:	http://git.netfilter.org/
 #Git-Clone:	git://git.netfilter.org/iptables
 Source:         %name-%version.tar.xz
 Patch1:         iptables-batch.patch
 Patch2:         iptables-apply-mktemp-fix.patch
-Url:            http://netfilter.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}
 BuildRequires:  sgmltool
 %endif
 %if 0%{?fedora_version} || 0%{?centos_version}
 BuildRequires:  sgml-common
-Provides:       iptables-ipv6 = %version-%release
-Obsoletes:      iptables-ipv6 < %version-%release
 %endif
-BuildRequires:  automake
+BuildRequires:  autoconf automake fdupes libtool
-BuildRequires:  fdupes
+BuildRequires:  pkgconfig >= 0.23 pkgconfig(libnfnetlink) >= 1.0.0
-BuildRequires:  libnfnetlink-devel
-BuildRequires:  pkgconfig
 BuildRequires:  xz
 
 %description
-Iptables is used to set up, maintain, and inspect the tables of IP
+iptables is used to set up, maintain, and inspect the tables of IP
 packet filter rules in the Linux kernel. This version requires kernel
 2.4.0 or newer.
 
-%package devel
+%package -n %lname_ipq
-Summary:        Libraries, Headers and Development Man Pages for iptables
+Summary:        Library to interface with the (old) ip_queue kernel mechanism
-Group:          Development/Libraries/C and C++
-Requires:       %name = %version
-Requires:       libxtables%xt_sover = %version
-
-%description devel
-These libraries are needed to compile
-- additional third-party extensions
-- programs using libipq
-
-%package -n libxtables%xt_sover
-Summary:        Library for functions shared between iptables
 Group:          System/Libraries
 
-%description -n libxtables%xt_sover
+%description -n %lname_ipq
-This package contains shared functions exposed for integration with
+The Netfilter project provides a mechanism (ip_queue) for passing
+packets out of the stack for queueing to userspace, then receiving
+these packets back into the kernel with a verdict specifying what to
+do with the packets (such as ACCEPT or DROP). These packets may also
+be modified in userspace prior to reinjection back into the kernel.
+
+ip_queue/libipq is obsoleted by nf_queue/libnetfilter_queue!
+
+%package -n libipq-devel
+Summary:        Development files for the ip_queue kernel mechanism
+Group:          Development/Libraries/C and C++
+Requires:       %lname_ipq = %version
+
+%description -n libipq-devel
+The Netfilter project provides a mechanism (ip_queue) for passing
+packets out of the stack for queueing to userspace, then receiving
+these packets back into the kernel with a verdict specifying what to
+do with the packets (such as ACCEPT or DROP). These packets may also
+be modified in userspace prior to reinjection back into the kernel.
+
+ip_queue/libipq is obsoleted by nf_queue/libnetfilter_queue!
+
+%package -n %lname_iptc
+Summary:        Library for low-level ruleset generation and parsing
+Group:          System/Libraries
+
+%description -n %lname_iptc
+libiptc ("iptables cache") is used to retrieve from the kernel, parse,
+construct, and load new rulesets into the kernel.
+
+%package -n libiptc-devel
+Summary:        Development files for libiptc, a packet filter ruleset library
+Group:          Development/Libraries/C and C++
+Requires:       %lname_iptc = %version
+# NOT adding Obsoletes/Provides: iptables-devel, because that one has
+# been split into _two_ new pkgs (libxtables-devel, libiptc-devel).
+# NOTE: Please use pkgconfig(...) symbols for BuildRequires.
+
+%description -n libiptc-devel
+libiptc ("iptables cache") is used to retrieve from the kernel, parse,
+construct, and load new rulesets into the kernel.
+
+%package -n %lname_xt
+Summary:        iptables extension interface
+Group:          System/Libraries
+
+%description -n %lname_xt
+This library contains all the iptables code shared between iptables,
+ip6tables, their extensions, and for external integration for e.g.
 iproute2's m_xt.
 
+%package -n libxtables-devel
+Summary:        Libraries, Headers and Development Man Pages for iptables
+Group:          Development/Libraries/C and C++
+Requires:       %lname_xt = %version
+
+%description -n libxtables-devel
+This library contains all the iptables code shared between iptables,
+ip6tables, their extensions, and for external integration for e.g.
+
+Link your extension (iptables plugins) with $(pkg-config xtables
+--libs) and place the plugin in the directory given by $(pkg-config
+xtables --variable=xtlibdir).
+
 %prep
 %if 0%{?__xz:1}
 %setup -q
@@ -94,22 +145,26 @@ make DESTDIR=%buildroot install
 # iptables-apply is not installed by upstream Makefile
 install -m0755 iptables/iptables-apply %buildroot%_sbindir/
 install -m0644 iptables/iptables-apply.8 %buildroot%_mandir/man8/
-find "%buildroot" -iname "*.la" -delete
+rm -f "%buildroot/%_libdir"/*.la;
 %if 0%{?suse_version}
 %fdupes %buildroot
 %endif
 
-%post -p /sbin/ldconfig
+%post -n %lname_ipq -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n %lname_ipq -p /sbin/ldconfig
 
-%post -n libxtables%xt_sover -p /sbin/ldconfig
+%post -n %lname_iptc -p /sbin/ldconfig
 
-%postun -n libxtables%xt_sover -p /sbin/ldconfig
+%postun -n %lname_iptc -p /sbin/ldconfig
+
+%post -n %lname_xt -p /sbin/ldconfig
+
+%postun -n %lname_xt -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%doc COPYING INCOMPATIBILITIES
+%doc COPYING
 %doc %_mandir/man1/*
 %doc %_mandir/man8/*
 %_bindir/iptables*
@@ -118,18 +173,43 @@ find "%buildroot" -iname "*.la" -delete
 %_sbindir/xtables*
 %_sbindir/nfnl_osf
 %_libdir/xtables
-%_libdir/libip*.so.*
 %_datadir/xtables
 
-%files devel
+%files -n %lname_ipq
 %defattr(-,root,root)
-%doc %_mandir/man3/*
+%_libdir/libipq.so.0*
-%_includedir/*
-%_libdir/*.so
-%_libdir/pkgconfig/*.pc
 
-%files -n libxtables%xt_sover
+%files -n libipq-devel
 %defattr(-,root,root)
-%_libdir/libxtables.so.*
+%doc %_mandir/man3/libipq*
+%doc %_mandir/man3/ipq*
+%dir %_includedir/%name-%version
+%_includedir/%name-%version/libipq*
+%_libdir/libipq.so
+%_libdir/pkgconfig/libipq.pc
+
+%files -n %lname_iptc
+%defattr(-,root,root)
+%_libdir/libiptc.so.0*
+%_libdir/libip4tc.so.0*
+%_libdir/libip6tc.so.0*
+
+%files -n libiptc-devel
+%defattr(-,root,root)
+%dir %_includedir/%name-%version
+%_includedir/%name-%version/libiptc*
+%_libdir/libip*tc.so
+%_libdir/pkgconfig/libip*tc.pc
+
+%files -n %lname_xt
+%defattr(-,root,root)
+%_libdir/libxtables.so.7*
+
+%files -n libxtables-devel
+%defattr(-,root,root)
+%dir %_includedir/%name-%version
+%_includedir/%name-%version/xtables.h
+%_libdir/libxtables.so
+%_libdir/pkgconfig/xtables.pc
 
 %changelog