forked from pool/xtables-addons
Jan Engelhardt
15b9c2864d
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=69
57 lines
1.3 KiB
Diff
57 lines
1.3 KiB
Diff
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
|
|
|