From 029e5044861c203150364502d63dba53c85a39b96a65bbb608440de8739119c5 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 29 Sep 2010 07:19:28 +0000
Subject: [PATCH] Try updating to 1.29

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=14
---
 xtables-addons-1.28.tar.xz     |  3 ---
 xtables-addons-1.29.tar.xz     |  3 +++
 xtables-addons-1.29.tar.xz.asc |  7 +++++++
 xtables-addons.spec            | 15 +++++++++++++--
 4 files changed, 23 insertions(+), 5 deletions(-)
 delete mode 100644 xtables-addons-1.28.tar.xz
 create mode 100644 xtables-addons-1.29.tar.xz
 create mode 100644 xtables-addons-1.29.tar.xz.asc

diff --git a/xtables-addons-1.28.tar.xz b/xtables-addons-1.28.tar.xz
deleted file mode 100644
index 3d2fdbd..0000000
--- a/xtables-addons-1.28.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d06d6d1d8b8adeae7c9edee20ffd3f2a754eb0b187e8b9f397666e26a7dbbcc
-size 333440
diff --git a/xtables-addons-1.29.tar.xz b/xtables-addons-1.29.tar.xz
new file mode 100644
index 0000000..10d9840
--- /dev/null
+++ b/xtables-addons-1.29.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db3714bef7f95724701483596b6367e6b4c89c9fee2dddb9de7faa8284a80a07
+size 336748
diff --git a/xtables-addons-1.29.tar.xz.asc b/xtables-addons-1.29.tar.xz.asc
new file mode 100644
index 0000000..1644167
--- /dev/null
+++ b/xtables-addons-1.29.tar.xz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEABECAAYFAkyijrAACgkQ92gFgoRMQ2BitgCeMlH0XT3hL95mYoJFMMgdK+3e
+bMUAnjpR7rapSrTgO2bJgIT98gVScGj3
+=WN9R
+-----END PGP SIGNATURE-----
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 31b9fff..7b26113 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -18,13 +18,14 @@
 
 
 Name:           xtables-addons
-Version:        1.28
+Version:        1.29
 Release:        1
 Group:          Productivity/Networking/Security
 Summary:        IP Packet Filter Administration Extensions
 License:        GPL
 Url:            http://xtables-addons.sf.net/
 Source:         %name-%version.tar.xz
+Source2:	%name-%version.tar.xz.asc
 #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
@@ -33,7 +34,7 @@ BuildRequires:  iptables-devel >= 1.4.3
 BuildRequires:  pkg-config >= 0.23, xz
 Recommends:     %name-kmp
 # Yes, we've got a lot of good stuff!
-Provides:       ipset = 4.2
+Provides:       ipset = 4.3
 Recommends:     xtables-geoip
 %kernel_module_package
 
@@ -64,6 +65,16 @@ if [ ! -e configure ]; then
 	./autogen.sh;
 fi;
 
+# No easy way to detect whether they are already shipped by iptables or linux.
+# Better remove than overlapping modules.
+
+%if 0%{?suse_version} > 1130
+# xt_TEE included since 2.6.35
+perl -i -pe 's{^build_TEE=.*}{build_TEE=}' mconfig;
+# xt_CHECKSUM included since 2.6.36
+perl -i -pe 's{^build_CHECKSUM=.*}{build_CHECKSUM=}' mconfig;
+%endif
+
 %build
 pushd ../;
 for flavor in %flavors_to_build; do