Accepting request 59732 from security:netfilter

Accepted submit request 59732 from user jengelh

OBS-URL: https://build.opensuse.org/request/show/59732
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xtables-addons?expand=0&rev=15

xtables-addons-1.31.tar.xz

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

xtables-addons-1.31.tar.xz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEABECAAYFAkzUUQ0ACgkQ92gFgoRMQ2C36QCcCGMNk6LgeyoIAecBy7QELE0b
-3gQAnA0MK5X9lBnaZf99nPPv8zG2CCOc
-=oora
------END PGP SIGNATURE-----

xtables-addons-1.33.tar.xz

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

xtables-addons-1.33.tar.xz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEABECAAYFAk1I3TIACgkQ92gFgoRMQ2DpEACfXR2K1l39ai3ArgHYq2c/tZG6
+TnAAnRQhrF4kYrLPwMUKagZI2+M6FLN+
+=d/PD
+-----END PGP SIGNATURE-----

xtables-addons.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb  2 04:28:55 UTC 2011 - jengelh@medozas.de
+
+- Update to new upstream release 1.33
+* IPv6 GeoIP support
+* New DNETMAP extension
+* Update to ipset 5.4-genl
+
 -------------------------------------------------------------------
 Fri Nov  5 18:50:05 UTC 2010 - jengelh@medozas.de
 

xtables-addons.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package xtables-addons (Version 1.31)
+# spec file for package xtables-addons (Version 1.32)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,7 +18,7 @@
 
 
 Name:           xtables-addons
-Version:        1.31
+Version:        1.33
 Release:        1
 Group:          Productivity/Networking/Security
 Summary:        IP Packet Filter Administration Extensions
@@ -30,12 +30,19 @@ Source2:        %name-%version.tar.xz.asc
 #Git-Web:	http://xtables-addons.git.sf.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  %kernel_module_package_buildreqs
-BuildRequires:  iptables-devel >= 1.4.3
+BuildRequires:  iptables-devel >= 1.4.3, libmnl-devel >= 1
-BuildRequires:  pkg-config >= 0.23 xz
+BuildRequires:  pkg-config >= 0.23, xz
 Recommends:     %name-kmp
 # Yes, we've got a lot of good stuff!
-Provides:       ipset = 4.4
+%if 0%{?suse_version} > 1130
+Provides:	ipset = 5.4
+%else
+Provides:       ipset = 4.5
+%endif
 Recommends:     xtables-geoip
+
+%define xtlibdir %(pkg-config xtables --variable=xtlibdir)
+
 %kernel_module_package
 
 %description
@@ -66,6 +73,12 @@ main kernel/iptables packages.
 if [ ! -e configure ]; then
 	./autogen.sh;
 fi;
+%if 0%{?suse_version} >= 1140
+# Has 2.6.37
+perl -i -pe 's{^build_DNETMAP=.*}{build_DNETMAP=m}' mconfig;
+perl -i -pe 's{^build_ipset4=.*}{build_ipset4=}' mconfig;
+perl -i -pe 's{^build_ipset5=.*}{build_ipset5=m}' mconfig;
+%endif
 pushd ../;
 for flavor in %flavors_to_build; do
 	cp -a "%name-%version" "%name-$flavor-%version";
@@ -101,7 +114,7 @@ rm -Rf "%buildroot";
 %doc %_mandir/*/*
 %_sbindir/*
 %_libdir/*.so.*
-%_libexecdir/xtables
+%xtlibdir
 %_libexecdir/xtables-addons
 
 %changelog