aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/utils/iptables/patches/200-configurable_builtin.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-03-20 13:51:40 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-03-20 13:51:40 +0000
commit044c8c897f18d92e8ea8077a5d7e85aa32a36496 (patch)
tree529aa4384cd42c589e4044e307df716eff441d36 /package/network/utils/iptables/patches/200-configurable_builtin.patch
parent137c4262e831eaf2c50dbab3ee41e7fd412dfa8a (diff)
downloadmaster-187ad058-044c8c897f18d92e8ea8077a5d7e85aa32a36496.tar.gz
master-187ad058-044c8c897f18d92e8ea8077a5d7e85aa32a36496.tar.bz2
master-187ad058-044c8c897f18d92e8ea8077a5d7e85aa32a36496.zip
iptables: fix issues with the new musl version
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39964 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/utils/iptables/patches/200-configurable_builtin.patch')
-rw-r--r--package/network/utils/iptables/patches/200-configurable_builtin.patch12
1 files changed, 5 insertions, 7 deletions
diff --git a/package/network/utils/iptables/patches/200-configurable_builtin.patch b/package/network/utils/iptables/patches/200-configurable_builtin.patch
index ef426e2145..d35bc5a85d 100644
--- a/package/network/utils/iptables/patches/200-configurable_builtin.patch
+++ b/package/network/utils/iptables/patches/200-configurable_builtin.patch
@@ -1,8 +1,6 @@
-Index: iptables-1.4.19.1/extensions/GNUmakefile.in
-===================================================================
---- iptables-1.4.19.1.orig/extensions/GNUmakefile.in 2013-05-29 16:37:41.304675049 +0200
-+++ iptables-1.4.19.1/extensions/GNUmakefile.in 2013-05-29 16:37:41.296675048 +0200
-@@ -45,9 +45,24 @@
+--- a/extensions/GNUmakefile.in
++++ b/extensions/GNUmakefile.in
+@@ -45,9 +45,24 @@ pfx_symlinks := NOTRACK state
pfx_build_mod := $(filter-out @blacklist_modules@,${pfx_build_mod})
pf4_build_mod := $(filter-out @blacklist_modules@,${pf4_build_mod})
pf6_build_mod := $(filter-out @blacklist_modules@,${pf6_build_mod})
@@ -30,7 +28,7 @@ Index: iptables-1.4.19.1/extensions/GNUmakefile.in
pfx_solibs := $(patsubst %,libxt_%.so,${pfx_build_mod} ${pfx_symlinks})
pf4_solibs := $(patsubst %,libipt_%.so,${pf4_build_mod})
pf6_solibs := $(patsubst %,libip6t_%.so,${pf6_build_mod})
-@@ -58,11 +73,11 @@
+@@ -58,11 +73,11 @@ pf6_solibs := $(patsubst %,libip6t_%.
#
targets := libext.a libext4.a libext6.a matches.man targets.man
targets_install :=
@@ -47,7 +45,7 @@ Index: iptables-1.4.19.1/extensions/GNUmakefile.in
.SECONDARY:
-@@ -123,9 +138,9 @@
+@@ -126,9 +141,9 @@ libext4.a: initext4.o ${libext4_objs}
libext6.a: initext6.o ${libext6_objs}
${AM_VERBOSE_AR} ${AR} crs $@ $^;