From 8fa9257878d3f1f32a84c57292d9036f938ff3db3a576e80c1202979f6884671 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 18 Apr 2014 17:20:33 +0000
Subject: [PATCH] Xtables-addons-2.5

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=87
---
 xtables-addons-2.4.tar.asc |  7 -------
 xtables-addons-2.4.tar.xz  |  3 ---
 xtables-addons-2.5.tar.asc |  7 +++++++
 xtables-addons-2.5.tar.xz  |  3 +++
 xtables-addons.changes     |  7 +++++++
 xtables-addons.spec        | 11 +++--------
 6 files changed, 20 insertions(+), 18 deletions(-)
 delete mode 100644 xtables-addons-2.4.tar.asc
 delete mode 100644 xtables-addons-2.4.tar.xz
 create mode 100644 xtables-addons-2.5.tar.asc
 create mode 100644 xtables-addons-2.5.tar.xz

diff --git a/xtables-addons-2.4.tar.asc b/xtables-addons-2.4.tar.asc
deleted file mode 100644
index 02935c3..0000000
--- a/xtables-addons-2.4.tar.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EABEIAAYFAlLOhtMACgkQkb3j62iiDkWt1wD+IfI5dWcLzUYWj5kvZSn6mM1O
-X9CMGpP2LuikEkIYQ1kA/jZdrHHHpV0tWekqGmttDdrcr9HgE80f8lrikBeFHyCz
-=Hdpm
------END PGP SIGNATURE-----
diff --git a/xtables-addons-2.4.tar.xz b/xtables-addons-2.4.tar.xz
deleted file mode 100644
index 557d6bf..0000000
--- a/xtables-addons-2.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c765a37ea9e8324832d68fd67fdfc2189db1cb9240f2b048aca6064ba9c13cdb
-size 312564
diff --git a/xtables-addons-2.5.tar.asc b/xtables-addons-2.5.tar.asc
new file mode 100644
index 0000000..4901af3
--- /dev/null
+++ b/xtables-addons-2.5.tar.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EABEIAAYFAlNRXegACgkQkb3j62iiDkWr0AEAo1+cUV+//TQGzq/AwOd0VF9L
+iO3e80ttZbqm8j6FaoABAKXDDdVZ++6PKFJW+NSWKXm20Fn/ffUZrdJC9ivEvS8h
+=Jb/x
+-----END PGP SIGNATURE-----
diff --git a/xtables-addons-2.5.tar.xz b/xtables-addons-2.5.tar.xz
new file mode 100644
index 0000000..c908bbd
--- /dev/null
+++ b/xtables-addons-2.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2aea0a6ff04d64abfe0cc80b4f23b97e058b4595ab2e29b50ef3fe30952e230d
+size 313732
diff --git a/xtables-addons.changes b/xtables-addons.changes
index 1943c4f..7c795c3 100644
--- a/xtables-addons.changes
+++ b/xtables-addons.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr 18 17:17:14 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 2.5
+* Support for Linux 3.14, 3.15
+* xt_quota2: support distinct network namespaces
+
 -------------------------------------------------------------------
 Thu Jan  9 11:24:26 UTC 2014 - jengelh@inai.de
 
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 71c0cb3..98b1a78 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -17,7 +17,7 @@
 
 
 Name:           xtables-addons
-Version:        2.4
+Version:        2.5
 Release:        0
 Summary:        IP Packet Filter Administration Extensions
 License:        GPL-2.0 and GPL-2.0+
@@ -29,13 +29,10 @@ Url:            http://xtables-addons.sf.net/
 #Git-Web:	http://xtables-addons.git.sf.net/
 Source3:        %name-preamble
 Source4:        %name.keyring
-Source7:        %name-2.4.tar.xz
-Source8:        %name-2.4.tar.asc
+Source7:        http://downloads.sf.net/%name/%name-%version.tar.xz
+Source8:        http://downloads.sf.net/%name/%name-%version.tar.asc
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} >= 1230
-BuildRequires:  gpg-offline
-%endif
 BuildRequires:  %kernel_module_package_buildreqs
 BuildRequires:  kernel-syms >= 3.7
 BuildRequires:  pkgconfig >= 0.21
@@ -69,8 +66,6 @@ contains extensions that were not, or are not yet, accepted in the
 main kernel/iptables packages.
 
 %prep
-xz -dk "%_sourcedir/%name-%version.tar.xz"
-%{?gpg_verify: %gpg_verify %_sourcedir/%name-%version.tar.asc}
 %setup -Tqb7
 
 %build