From 38fee7a76fe481b3b7c0f080618d36fd0f486859867d0be3cbdace1101ac2e7b Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 31 Mar 2013 19:33:08 +0000
Subject: [PATCH] Xtables-addons-2.2

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

diff --git a/xtables-addons-2.1.tar.xz b/xtables-addons-2.1.tar.xz
deleted file mode 100644
index 5ad9933..0000000
--- a/xtables-addons-2.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d788bf647d96cfbcc2e61c3a32702cfdde40fea857407d2674731b41ac3ae79
-size 316412
diff --git a/xtables-addons-2.1.tar.xz.asc b/xtables-addons-2.1.tar.xz.asc
deleted file mode 100644
index a6a55aa..0000000
--- a/xtables-addons-2.1.tar.xz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iF4EABEIAAYFAlDb8rQACgkQkb3j62iiDkXpAgD7BDs0M3M+Gx4NYTG/tSygfmob
-0berBlFfJsvZsDz2x3AA/RyNLrcMV9rW2Hfg+7yTLrqETE+be26uYjPpCUiwC3jr
-=mN7a
------END PGP SIGNATURE-----
diff --git a/xtables-addons-2.2.tar.xz b/xtables-addons-2.2.tar.xz
new file mode 100644
index 0000000..561300f
--- /dev/null
+++ b/xtables-addons-2.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bafaf53b896272adcf17f240339c866eff07d30b51be8893a08deaf69f8f13ef
+size 316840
diff --git a/xtables-addons-2.2.tar.xz.asc b/xtables-addons-2.2.tar.xz.asc
new file mode 100644
index 0000000..b027b6b
--- /dev/null
+++ b/xtables-addons-2.2.tar.xz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EABEIAAYFAlFYi0kACgkQkb3j62iiDkWNSwD/aspLnF6XRGdHkIaafJL7ibMR
+4Eo55JA1IgD9jHgVcUMA/iZaEzoLuE/WbmVLmuZJyzklryLvZCKV/ZoOTLGJ+Uux
+=IRHw
+-----END PGP SIGNATURE-----
diff --git a/xtables-addons.changes b/xtables-addons.changes
index af32ded..8572638 100644
--- a/xtables-addons.changes
+++ b/xtables-addons.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Mar 31 19:15:44 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 2.2
+* support for Linux 3.9
+* avoid iptaccount being optimized away (bnc#807155)
+
 -------------------------------------------------------------------
 Thu Feb 28 06:02:46 UTC 2013 - coolo@suse.com
 
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 2ce4aa4..a8b9f9d 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -21,7 +21,7 @@ Name:           xtables-addons
 %define kernel37 1
 %endif
 %if 0%{?kernel37}
-Version:        2.1
+Version:        2.2
 Release:        0
 %else
 Version:        1.47.1
@@ -40,8 +40,8 @@ Source3:        %name-preamble
 Source4:        %name.keyring
 Source5:        %name-1.47.1.tar.xz
 Source6:        %name-1.47.1.tar.xz.asc
-Source7:        %name-2.1.tar.xz
-Source8:        %name-2.1.tar.xz.asc
+Source7:        %name-2.2.tar.xz
+Source8:        %name-2.2.tar.xz.asc
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1230
@@ -113,7 +113,7 @@ for flavor in %flavors_to_build; do
 	cp -a "%name-%version" "%name-$flavor-%version";
 	pushd "%name-$flavor-%version/";
 	%configure --with-kbuild="/usr/src/linux-obj/%_target_cpu/$flavor";
-	make %{?_smp_mflags};
+	make %{?_smp_mflags} V=1;
 	popd;
 done;