diff --git a/xtables-addons-1.40.tar.xz b/xtables-addons-1.40.tar.xz deleted file mode 100644 index dc810fa..0000000 --- a/xtables-addons-1.40.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c57cd71e936c1bcd14492b49a5a24ef6ab5b6e8698cf301a08b5a4b158e6efbe -size 380488 diff --git a/xtables-addons-1.40.tar.xz.asc b/xtables-addons-1.40.tar.xz.asc deleted file mode 100644 index b4a42e8..0000000 --- a/xtables-addons-1.40.tar.xz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iF4EABEIAAYFAk7WCKkACgkQkb3j62iiDkWC2AD+IGuKhNEGL+xj3wpOok3Q3rWn -h3FkvzqP22P1A1mp12UBAJFxBCGbbrtlMPWCVFtmYU3x82liNvqKbiNVUapD9k4v -=6AgM ------END PGP SIGNATURE----- diff --git a/xtables-addons-1.41.tar.xz b/xtables-addons-1.41.tar.xz new file mode 100644 index 0000000..4b7942d --- /dev/null +++ b/xtables-addons-1.41.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c80435cd9ff564b331c9ed53b1d61f5dfba0f6c73ffc303e1a87fdf4c1e3132 +size 394016 diff --git a/xtables-addons-1.41.tar.xz.asc b/xtables-addons-1.41.tar.xz.asc new file mode 100644 index 0000000..cfa078d --- /dev/null +++ b/xtables-addons-1.41.tar.xz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iF4EABEIAAYFAk8EuCkACgkQkb3j62iiDkWU8gEAooh4+gVyAKHKtImtHy9A0cqy +kWr5xfKhA19ondzUeAEA/jYNbuO23edAIsivoanB7DaAB0RmS8Y/xjubYcsQ2wYV +=YQK6 +-----END PGP SIGNATURE----- diff --git a/xtables-addons-preamble b/xtables-addons-preamble index ace95d0..2a6d635 100644 --- a/xtables-addons-preamble +++ b/xtables-addons-preamble @@ -1 +1,3 @@ Requires: kernel-%1 +Enhances: kernel-%1 +Supplements: packageand(kernel-%1:xtables-addons) diff --git a/xtables-addons.changes b/xtables-addons.changes index e5438af..d71817f 100644 --- a/xtables-addons.changes +++ b/xtables-addons.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Jan 4 20:37:45 UTC 2012 - jengelh@medozas.de + +- update to new upstream release 1.41 +* support for Linux 3.2 + +------------------------------------------------------------------- +Fri Dec 30 23:35:33 UTC 2011 - jengelh@medozas.de + +- We have now a few of kernel versions that ipset can be compiled + against, so ipset has been separated out into a new RPM package, + and ipset-genl from xtables-addons is hereby subsequently + disabled. + ------------------------------------------------------------------- Wed Nov 30 10:43:07 UTC 2011 - jengelh@medozas.de diff --git a/xtables-addons.spec b/xtables-addons.spec index d1b409d..e0ffc9c 100644 --- a/xtables-addons.spec +++ b/xtables-addons.spec @@ -1,7 +1,7 @@ # # spec file for package xtables-addons # -# 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,24 +18,25 @@ Name: xtables-addons -Version: 1.40 -Release: 1 +Version: 1.41 +Release: 0 Group: Productivity/Networking/Security Summary: IP Packet Filter Administration Extensions License: GPL-2.0; GPL-2.0+ -URL: http://xtables-addons.sf.net/ +Url: http://xtables-addons.sf.net/ + +#Git-Clone: git://xtables-addons.git.sf.net/gitroot/xtables-addons/xtables-addons +#Git-Web: http://xtables-addons.git.sf.net/ +%define git_snapshot 0 Source: %name-%version.tar.xz Source2: %name-%version.tar.xz.asc Source3: %name-preamble -#Git-Clone: git://xtables-addons.git.sf.net/gitroot/xtables-addons/xtables-addons -#Git-Web: http://xtables-addons.git.sf.net/ + BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: iptables-devel >= 1.4.5 libmnl-devel >= 1 -BuildRequires: pkgconfig >= 0.23 xz -# Yes, we've got a lot of good stuff! -%if 0%{?suse_version} >= 1140 -Provides: ipset = 6.10 +%if %git_snapshot +BuildRequires: autoconf automake >= 1.10b libtool %endif +BuildRequires: pkgconfig >= 0.23 pkgconfig(xtables) >= 1.4.5 xz %if 0%{?suse_version} BuildRequires: %kernel_module_package_buildreqs Recommends: %name-kmp @@ -75,10 +76,8 @@ main kernel/iptables packages. if [ ! -e configure ]; then ./autogen.sh; fi; -%if 0%{?suse_version} < 1140 -# ipset6-genl needs >=2.6.35, which is usually not present before 11.4 +# ipset now in a separate RPM echo "build_ipset6=" >>mconfig; -%endif pushd ../; for flavor in %flavors_to_build; do cp -a "%name-%version" "%name-$flavor-%version";