From 156818e945f6c0fe4e03dc7b9319aac47e1754c3d59f8ce4589f7aa66a45a1d1 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 30 Nov 2011 10:49:00 +0000
Subject: [PATCH] Update to 1.40

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

diff --git a/xtables-addons-1.39.tar.xz b/xtables-addons-1.39.tar.xz
deleted file mode 100644
index 5abfea2..0000000
--- a/xtables-addons-1.39.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef7a89405c97879efee9944237373c3ecff36e9512aba948e7b40ae005a8946b
-size 379928
diff --git a/xtables-addons-1.39.tar.xz.asc b/xtables-addons-1.39.tar.xz.asc
deleted file mode 100644
index 94915e3..0000000
--- a/xtables-addons-1.39.tar.xz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iF4EABEIAAYFAk56Ji4ACgkQkb3j62iiDkWjGQD/dxlK5Tl5hK+pBE21A3ooD2BB
-yw8lL14Skapi0fC+6M0A/jn1w9pp6nYdXwYS8erBAl6qwMx0Hf88JtQCrlZqz+kx
-=yLw2
------END PGP SIGNATURE-----
diff --git a/xtables-addons-1.40.tar.xz b/xtables-addons-1.40.tar.xz
new file mode 100644
index 0000000..dc810fa
--- /dev/null
+++ b/xtables-addons-1.40.tar.xz
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..b4a42e8
--- /dev/null
+++ b/xtables-addons-1.40.tar.xz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EABEIAAYFAk7WCKkACgkQkb3j62iiDkWC2AD+IGuKhNEGL+xj3wpOok3Q3rWn
+h3FkvzqP22P1A1mp12UBAJFxBCGbbrtlMPWCVFtmYU3x82liNvqKbiNVUapD9k4v
+=6AgM
+-----END PGP SIGNATURE-----
diff --git a/xtables-addons.changes b/xtables-addons.changes
index 6119903..e5438af 100644
--- a/xtables-addons.changes
+++ b/xtables-addons.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Nov 30 10:43:07 UTC 2011 - jengelh@medozas.de
+
+- update to new upstream release 1.40
+* xt_ECHO: fix kernel warning about RTAX_HOPLIMIT being used
+* xt_ipv4options: fix an infinite loop
+* Provides ipset 6.10: ICMP/ICMPv6 type/code parser bug fixed;
+  fix lookup of tcp port names
+
 -------------------------------------------------------------------
 Wed Sep 21 18:01:56 UTC 2011 - jengelh@medozas.de
 
diff --git a/xtables-addons.spec b/xtables-addons.spec
index f0f71e7..585b2f7 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -18,11 +18,11 @@
 
 
 Name:           xtables-addons
-Version:        1.39
+Version:        1.40
 Release:        1
 Group:          Productivity/Networking/Security
 Summary:        IP Packet Filter Administration Extensions
-License:        GPL
+License:        GPL-2.0, GPL-2.0+
 URL:            http://xtables-addons.sf.net/
 Source:         %name-%version.tar.xz
 Source2:        %name-%version.tar.xz.asc
@@ -30,11 +30,11 @@ 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.3 libmnl-devel >= 1
+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.9.1
+Provides:       ipset = 6.10
 %endif
 %if 0%{?suse_version}
 BuildRequires:  %kernel_module_package_buildreqs
@@ -58,7 +58,6 @@ main kernel/iptables packages.
 
 %package KMP
 Group:          System/Kernel
-License:        GPL
 Summary:        IP Packet Filter Administration Extensions
 
 %description KMP