From 50437ee56b4331d2bec5869db6ba0661e30304e1f284dcd251e013c182c1d19f Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 7 Apr 2011 15:13:26 +0000
Subject: [PATCH] Xtables-addons 1.34

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=24
---
 xtables-addons-1.33.tar.xz     |  3 ---
 xtables-addons-1.33.tar.xz.asc |  7 -------
 xtables-addons-1.34.tar.xz     |  3 +++
 xtables-addons-1.34.tar.xz.asc |  7 +++++++
 xtables-addons-preamble        |  1 +
 xtables-addons.changes         | 10 ++++++++++
 xtables-addons.spec            | 16 ++++++++--------
 7 files changed, 29 insertions(+), 18 deletions(-)
 delete mode 100644 xtables-addons-1.33.tar.xz
 delete mode 100644 xtables-addons-1.33.tar.xz.asc
 create mode 100644 xtables-addons-1.34.tar.xz
 create mode 100644 xtables-addons-1.34.tar.xz.asc
 create mode 100644 xtables-addons-preamble

diff --git a/xtables-addons-1.33.tar.xz b/xtables-addons-1.33.tar.xz
deleted file mode 100644
index 0d35c58..0000000
--- a/xtables-addons-1.33.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 93a2a67..0000000
--- a/xtables-addons-1.33.tar.xz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEABECAAYFAk1I3TIACgkQ92gFgoRMQ2DpEACfXR2K1l39ai3ArgHYq2c/tZG6
-TnAAnRQhrF4kYrLPwMUKagZI2+M6FLN+
-=d/PD
------END PGP SIGNATURE-----
diff --git a/xtables-addons-1.34.tar.xz b/xtables-addons-1.34.tar.xz
new file mode 100644
index 0000000..07379e8
--- /dev/null
+++ b/xtables-addons-1.34.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e258efc2da84d3254869d18035b7a3436fcde824cae938571733293ec1f43933
+size 418684
diff --git a/xtables-addons-1.34.tar.xz.asc b/xtables-addons-1.34.tar.xz.asc
new file mode 100644
index 0000000..08a12f6
--- /dev/null
+++ b/xtables-addons-1.34.tar.xz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEABECAAYFAk2dzeEACgkQ92gFgoRMQ2CBjQCfVXcoAIuTwdgSCEyYgtsbQzCs
+qvgAmwSnpyWbz9//530DQ1cqA0Qk5tXM
+=kieI
+-----END PGP SIGNATURE-----
diff --git a/xtables-addons-preamble b/xtables-addons-preamble
new file mode 100644
index 0000000..ace95d0
--- /dev/null
+++ b/xtables-addons-preamble
@@ -0,0 +1 @@
+Requires: kernel-%1
diff --git a/xtables-addons.changes b/xtables-addons.changes
index bdfedf4..6720cb3 100644
--- a/xtables-addons.changes
+++ b/xtables-addons.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Apr  7 15:11:31 UTC 2011 - jengelh@medozas.de
+
+- Update to new upstream release 1.34
+* xt_pknock: avoid crash when hash TFM could not be allocated
+* xt_pknock: avoid inversion of rule lookup that led to warnings
+* xt_DNETMAP: add missing module alias
+* xt_DNETMAP: support for kernels below 2.6.34
+- Add kmp preamble file
+
 -------------------------------------------------------------------
 Wed Feb  2 04:28:55 UTC 2011 - jengelh@medozas.de
 
diff --git a/xtables-addons.spec b/xtables-addons.spec
index fb1747f..009585d 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package xtables-addons (Version 1.32)
+# spec file for package xtables-addons
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 
 Name:           xtables-addons
-Version:        1.33
+Version:        1.34
 Release:        1
 Group:          Productivity/Networking/Security
 Summary:        IP Packet Filter Administration Extensions
@@ -26,16 +26,17 @@ License:        GPL
 Url:            http://xtables-addons.sf.net/
 Source:         %name-%version.tar.xz
 Source2:        %name-%version.tar.xz.asc
+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:  %kernel_module_package_buildreqs
-BuildRequires:  iptables-devel >= 1.4.3, libmnl-devel >= 1
-BuildRequires:  pkg-config >= 0.23, xz
+BuildRequires:  iptables-devel >= 1.4.3 libmnl-devel >= 1
+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.4
+Provides:       ipset = 5.4
 %else
 Provides:       ipset = 4.5
 %endif
@@ -43,7 +44,7 @@ Recommends:     xtables-geoip
 
 %define xtlibdir %(pkg-config xtables --variable=xtlibdir)
 
-%kernel_module_package
+%kernel_module_package -p %name-preamble
 
 %description
 Xtables is used to set up, maintain, and inspect the tables of IP
@@ -75,7 +76,6 @@ if [ ! -e configure ]; then
 fi;
 %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