From 15b9c2864da2c5e93ef48f687cc349f2260c7f00568ff9dd8bf2fe6391769b82 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 21 Dec 2012 05:06:10 +0000
Subject: [PATCH] Reenable DNETMAP

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=69
---
 ...MAP-fix-compile-error-with-Linux-3.7.patch | 56 +++++++++++++++++++
 xtables-addons.changes                        |  1 +
 xtables-addons.spec                           |  5 ++
 3 files changed, 62 insertions(+)
 create mode 100644 0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch

diff --git a/0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch b/0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch
new file mode 100644
index 0000000..76d050f
--- /dev/null
+++ b/0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch
@@ -0,0 +1,56 @@
+From 29141b6e954a027954dcad82d175cff9d743c4df Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Fri, 21 Dec 2012 05:45:15 +0100
+Subject: [PATCH] xt_DNETMAP: fix compile error with Linux 3.7
+
+---
+ doc/changelog.txt       |    2 ++
+ extensions/xt_DNETMAP.c |    3 +--
+ mconfig                 |    2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/doc/changelog.txt b/doc/changelog.txt
+index 1f525c1..7f652d9 100644
+--- a/doc/changelog.txt
++++ b/doc/changelog.txt
+@@ -1,6 +1,8 @@
+ 
+ HEAD
+ ====
++Fixes:
++- DNETMAP: fix compile error with Linux 3.7
+ 
+ 
+ v2.0 (2012-11-12)
+diff --git a/extensions/xt_DNETMAP.c b/extensions/xt_DNETMAP.c
+index 62ad9cd..18d48de 100644
+--- a/extensions/xt_DNETMAP.c
++++ b/extensions/xt_DNETMAP.c
+@@ -27,10 +27,9 @@
+ #include <linux/netfilter_ipv4.h>
+ #include <linux/netfilter/x_tables.h>
+ #include <linux/version.h>
+-#include <net/netfilter/nf_nat_rule.h>
+ #include <net/net_namespace.h>
+ #include <net/netns/generic.h>
+-#include <linux/netfilter/nf_nat.h>
++#include <net/netfilter/nf_nat.h>
+ #include "compat_xtables.h"
+ #include "xt_DNETMAP.h"
+ 
+diff --git a/mconfig b/mconfig
+index 6386498..6418bb4 100644
+--- a/mconfig
++++ b/mconfig
+@@ -4,7 +4,7 @@ build_ACCOUNT=m
+ build_CHAOS=m
+ build_DELUDE=m
+ build_DHCPMAC=m
+-build_DNETMAP=
++build_DNETMAP=m
+ build_ECHO=m
+ build_IPMARK=m
+ build_LOGMARK=m
+-- 
+1.7.10.4
+
diff --git a/xtables-addons.changes b/xtables-addons.changes
index 4815f50..a506153 100644
--- a/xtables-addons.changes
+++ b/xtables-addons.changes
@@ -3,6 +3,7 @@ Fri Dec 21 02:08:44 UTC 2012 - jengelh@inai.de
 
 - Always ship all source tarballs to make osc validator happy
 - Enable version 2.0 for openSUSE:Factory which now has kernel 3.7
+- Add 0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch
 
 -------------------------------------------------------------------
 Mon Dec  3 15:17:18 CET 2012 - sbrabec@suse.cz
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 0ce82ca..874ed40 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -42,11 +42,15 @@ Source5:        %name-1.47.1.tar.xz
 Source6:        %name-1.47.1.tar.xz.asc
 Source7:        %name-2.0.tar.xz
 Source8:        %name-2.0.tar.xz.asc
+Patch1:         0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1230
 BuildRequires:  gpg-offline
 %endif
+%if 0%{?kernel37}
+BuildRequires:  linux-glibc-devel >= 3.7
+%endif
 %if %git_snapshot
 BuildRequires:  autoconf
 BuildRequires:  automake >= 1.10b
@@ -100,6 +104,7 @@ main kernel/iptables packages.
 echo "Version: %version. Repository: %_repository. SUSE_v: %{?suse_version}"
 %if 0%{?kernel37}
 %setup -Tqb7
+%patch -P 1 -p1
 %else
 %setup -Tqb5
 %endif