tweak PKG_VERSION and md5sum, and remove a patch already upstream.
Naturally, removing the patch introduced fuzz in a subsequent patch that
touches extentions/xt_DNETMAP.c. This version fixes that. Actually
compile tested this time. Needs [PATCHv2 1/2] applied first.
Signed-off-by: Russell Senior <russ...@personaltelco.net>
---
net/xtables-addons/Makefile | 4 +-
.../patches/110-dnetmap-linux-3.7.patch | 22 -------------
net/xtables-addons/patches/310-uidgid.patch | 34 ++++++++++----------
3 files changed, 19 insertions(+), 41 deletions(-)
delete mode 100644 net/xtables-addons/patches/110-dnetmap-linux-3.7.patch
diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile
index 9bf39da..c66a227 100644
--- a/net/xtables-addons/Makefile
+++ b/net/xtables-addons/Makefile
@@ -10,9 +10,9 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=xtables-addons
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1)
-PKG_VERSION:=2.0
+PKG_VERSION:=2.1
PKG_RELEASE:=1
-PKG_MD5SUM:=26b1b1dbb4a8faff24597723ebde04c9
+PKG_MD5SUM:=b624fc57bbda9e15c33a6471e4ec75e1
else
PKG_VERSION:=1.45
PKG_RELEASE:=3
diff --git a/net/xtables-addons/patches/110-dnetmap-linux-3.7.patch
b/net/xtables-addons/patches/110-dnetmap-linux-3.7.patch
deleted file mode 100644
index f0aa6d4..0000000
--- a/net/xtables-addons/patches/110-dnetmap-linux-3.7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- xtables-addons-2.0/extensions/xt_DNETMAP.c~ 2012-11-12
18:03:51.000000000 +0000
-+++ xtables-addons-2.0/extensions/xt_DNETMAP.c 2012-12-20 00:06:10.656675731
+0000
-@@ -27,7 +27,7 @@
- #include <linux/netfilter_ipv4.h>
- #include <linux/netfilter/x_tables.h>
- #include <linux/version.h>
--#include <net/netfilter/nf_nat_rule.h>
-+#include <net/netfilter/nf_nat.h>
- #include <net/net_namespace.h>
- #include <net/netns/generic.h>
- #include <linux/netfilter/nf_nat.h>
---- xtables-addons-2.0/mconfig 2012-12-20 00:55:11.445085492 +0000
-+++ xtables-addons-2.0/mconfig~ 2012-12-20 00:54:29.000000000 +0000
-@@ -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
diff --git a/net/xtables-addons/patches/310-uidgid.patch
b/net/xtables-addons/patches/310-uidgid.patch
index 28ec96c..2cd8c7b 100644
--- a/net/xtables-addons/patches/310-uidgid.patch
+++ b/net/xtables-addons/patches/310-uidgid.patch
@@ -1,15 +1,15 @@
-diff -ru xtables-addons-2.0-orig/extensions/xt_DNETMAP.c
xtables-addons-2.0/extensions/xt_DNETMAP.c
---- xtables-addons-2.0-orig/extensions/xt_DNETMAP.c 2013-01-14
15:44:47.000000000 -0800
-+++ xtables-addons-2.0/extensions/xt_DNETMAP.c 2013-01-15 10:26:48.000000000
-0800
-@@ -31,6 +31,7 @@
+diff -ru xtables-addons-2.1-orig/extensions/xt_DNETMAP.c
xtables-addons-2.1/extensions/xt_DNETMAP.c
+--- xtables-addons-2.1-orig/extensions/xt_DNETMAP.c 2012-12-26
23:01:00.000000000 -0800
++++ xtables-addons-2.1/extensions/xt_DNETMAP.c 2013-01-15 11:14:22.000000000
-0800
+@@ -26,6 +26,7 @@
+ #include <linux/netfilter.h>
+ #include <linux/netfilter_ipv4.h>
+ #include <linux/netfilter/x_tables.h>
++#include <linux/uidgid.h>
+ #include <linux/version.h>
#include <net/net_namespace.h>
#include <net/netns/generic.h>
- #include <linux/netfilter/nf_nat.h>
-+#include <linux/uidgid.h>
- #include "compat_xtables.h"
- #include "xt_DNETMAP.h"
-
-@@ -329,8 +330,8 @@
+@@ -328,8 +329,8 @@
ret = -ENOMEM;
goto out;
}
@@ -20,7 +20,7 @@ diff -ru xtables-addons-2.0-orig/extensions/xt_DNETMAP.c
xtables-addons-2.0/exte
/* statistics */
pde_stat = create_proc_entry(p->proc_str_stat, proc_perms,
-@@ -342,8 +343,8 @@
+@@ -341,8 +342,8 @@
}
pde_stat->data = p;
pde_stat->read_proc = dnetmap_stat_proc_read;
@@ -31,9 +31,9 @@ diff -ru xtables-addons-2.0-orig/extensions/xt_DNETMAP.c
xtables-addons-2.0/exte
#endif
spin_lock_bh(&dnetmap_lock);
-diff -ru xtables-addons-2.0-orig/extensions/xt_condition.c
xtables-addons-2.0/extensions/xt_condition.c
---- xtables-addons-2.0-orig/extensions/xt_condition.c 2012-11-12
10:03:51.000000000 -0800
-+++ xtables-addons-2.0/extensions/xt_condition.c 2013-01-15
10:28:30.000000000 -0800
+diff -ru xtables-addons-2.1-orig/extensions/xt_condition.c
xtables-addons-2.1/extensions/xt_condition.c
+--- xtables-addons-2.1-orig/extensions/xt_condition.c 2012-12-26
23:01:00.000000000 -0800
++++ xtables-addons-2.1/extensions/xt_condition.c 2013-01-15
11:13:44.000000000 -0800
@@ -20,6 +20,7 @@
#include <linux/string.h>
#include <linux/version.h>
@@ -53,9 +53,9 @@ diff -ru xtables-addons-2.0-orig/extensions/xt_condition.c
xtables-addons-2.0/ex
mutex_unlock(&proc_lock);
info->condvar = var;
return 0;
-diff -ru xtables-addons-2.0-orig/extensions/xt_quota2.c
xtables-addons-2.0/extensions/xt_quota2.c
---- xtables-addons-2.0-orig/extensions/xt_quota2.c 2012-11-12
10:03:51.000000000 -0800
-+++ xtables-addons-2.0/extensions/xt_quota2.c 2013-01-15 10:30:20.000000000
-0800
+diff -ru xtables-addons-2.1-orig/extensions/xt_quota2.c
xtables-addons-2.1/extensions/xt_quota2.c
+--- xtables-addons-2.1-orig/extensions/xt_quota2.c 2012-12-26
23:01:00.000000000 -0800
++++ xtables-addons-2.1/extensions/xt_quota2.c 2013-01-15 11:13:44.000000000
-0800
@@ -17,6 +17,7 @@
#include <linux/skbuff.h>
#include <linux/spinlock.h>
--
1.7.2.2
--
Russell Senior, President
russ...@personaltelco.net
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
