From cabe37077a5117b5cd3e52596866f451b34d52c20a3b604e44b148384fc2ffa9 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 2 Feb 2011 04:49:19 +0000
Subject: [PATCH] Update to 1.33

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=22
---
 xtables-addons-1.32.tar.xz     |  3 ---
 xtables-addons-1.32.tar.xz.asc |  7 -------
 xtables-addons-1.33.tar.xz     |  3 +++
 xtables-addons-1.33.tar.xz.asc |  7 +++++++
 xtables-addons.changes         |  8 ++++++++
 xtables-addons.spec            | 12 +++++++-----
 6 files changed, 25 insertions(+), 15 deletions(-)
 delete mode 100644 xtables-addons-1.32.tar.xz
 delete mode 100644 xtables-addons-1.32.tar.xz.asc
 create mode 100644 xtables-addons-1.33.tar.xz
 create mode 100644 xtables-addons-1.33.tar.xz.asc

diff --git a/xtables-addons-1.32.tar.xz b/xtables-addons-1.32.tar.xz
deleted file mode 100644
index e485e57..0000000
--- a/xtables-addons-1.32.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:680538258b94d7dd53b70073ef63efe9b6ac5e8afa7081c456725f29bdc96f02
-size 407996
diff --git a/xtables-addons-1.32.tar.xz.asc b/xtables-addons-1.32.tar.xz.asc
deleted file mode 100644
index ba7fa08..0000000
--- a/xtables-addons-1.32.tar.xz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEABECAAYFAk0il1kACgkQ92gFgoRMQ2C9lACdGeGLu6Wn8WM2dDRgTuNkH5uu
-Z7AAn202UkPj4ROizb1rzyGY+VYz9HY0
-=qnzh
------END PGP SIGNATURE-----
diff --git a/xtables-addons-1.33.tar.xz b/xtables-addons-1.33.tar.xz
new file mode 100644
index 0000000..0d35c58
--- /dev/null
+++ b/xtables-addons-1.33.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d6bf0a28442bece8afce7581a6149cd866be634af4a4b7ef87b393126cad703
+size 418180
diff --git a/xtables-addons-1.33.tar.xz.asc b/xtables-addons-1.33.tar.xz.asc
new file mode 100644
index 0000000..93a2a67
--- /dev/null
+++ b/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-----
diff --git a/xtables-addons.changes b/xtables-addons.changes
index aa49796..bdfedf4 100644
--- a/xtables-addons.changes
+++ b/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
 
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 3abb0fa..fb1747f 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -18,7 +18,7 @@
 
 
 Name:           xtables-addons
-Version:        1.32
+Version:        1.33
 Release:        1
 Group:          Productivity/Networking/Security
 Summary:        IP Packet Filter Administration Extensions
@@ -35,7 +35,7 @@ BuildRequires:  pkg-config >= 0.23, xz
 Recommends:     %name-kmp
 # Yes, we've got a lot of good stuff!
 %if 0%{?suse_version} > 1130
-Provides:	ipset = 5.2
+Provides:	ipset = 5.4
 %else
 Provides:       ipset = 4.5
 %endif
@@ -73,9 +73,11 @@ main kernel/iptables packages.
 if [ ! -e configure ]; then
 	./autogen.sh;
 fi;
-%if 0%{?suse_version} > 1130
-perl -pe 's{^build_ipset4=.*}{build_ipset4=}' mconfig;
-perl -pe 's{^build_ipset5=.*}{build_ipset5=m}' mconfig;
+%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