projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "iptables: update to 1.4.18" due to toolchain-issue:
[openwrt/svn-archive/archive.git]
/
package
/
network
/
utils
/
iptables
/
patches
/
300-musl_fixes.patch
diff --git
a/package/network/utils/iptables/patches/300-musl_fixes.patch
b/package/network/utils/iptables/patches/300-musl_fixes.patch
index 039af7ce0a3548f537aa29ea82aebfedad166b21..e329aa9ed80846d6bc7affe34ac7a1de16ff1ae9 100644
(file)
--- a/
package/network/utils/iptables/patches/300-musl_fixes.patch
+++ b/
package/network/utils/iptables/patches/300-musl_fixes.patch
@@
-1,18
+1,18
@@
--- a/extensions/libip6t_ipv6header.c
+++ b/extensions/libip6t_ipv6header.c
--- a/extensions/libip6t_ipv6header.c
+++ b/extensions/libip6t_ipv6header.c
-@@ -1
0,6 +10
,9 @@ on whether they contain certain headers
- #include <
netdb
.h>
- #include <xtables.h>
+@@ -1
5,6 +15
,9 @@ on whether they contain certain headers
+ #include <
sys/types
.h>
+
#include <linux/netfilter_ipv6/ip6t_ipv6header.h>
+#ifndef IPPROTO_HOPOPTS
+# define IPPROTO_HOPOPTS 0
+#endif
#include <linux/netfilter_ipv6/ip6t_ipv6header.h>
+#ifndef IPPROTO_HOPOPTS
+# define IPPROTO_HOPOPTS 0
+#endif
- enum {
- O_HEADER = 0,
+ /* This maybe required
+ #include <linux/in.h>
--- a/extensions/libxt_TCPOPTSTRIP.c
+++ b/extensions/libxt_TCPOPTSTRIP.c
--- a/extensions/libxt_TCPOPTSTRIP.c
+++ b/extensions/libxt_TCPOPTSTRIP.c
-@@ -1
2,6 +12
,21 @@
+@@ -1
6,6 +16
,21 @@
#ifndef TCPOPT_MD5SIG
# define TCPOPT_MD5SIG 19
#endif
#ifndef TCPOPT_MD5SIG
# define TCPOPT_MD5SIG 19
#endif
@@
-33,7
+33,7
@@
+#endif
enum {
+#endif
enum {
-
O_STRIP_OPTION =
0,
+
FLAG_STRIP = 1 <<
0,
--- a/include/libiptc/ipt_kernel_headers.h
+++ b/include/libiptc/ipt_kernel_headers.h
@@ -5,7 +5,6 @@
--- a/include/libiptc/ipt_kernel_headers.h
+++ b/include/libiptc/ipt_kernel_headers.h
@@ -5,7 +5,6 @@
@@
-82,9
+82,9
@@
#include <linux/netfilter_ipv4.h>
#include <linux/netfilter_ipv4.h>
---- a/ip
tables/ip
6tables-restore.c
-+++ b/ip
tables/ip
6tables-restore.c
-@@ -
9,7 +9
,7 @@
+--- a/ip6tables-restore.c
++++ b/ip6tables-restore.c
+@@ -
11,7 +11
,7 @@
*/
#include <getopt.h>
*/
#include <getopt.h>
@@
-93,8
+93,8
@@
#include <stdbool.h>
#include <string.h>
#include <stdio.h>
#include <stdbool.h>
#include <string.h>
#include <stdio.h>
---- a/ip
tables/ip
6tables-save.c
-+++ b/ip
tables/ip
6tables-save.c
+--- a/ip6tables-save.c
++++ b/ip6tables-save.c
@@ -6,7 +6,7 @@
* This code is distributed under the terms of GNU GPL v2
*/
@@ -6,7 +6,7 @@
* This code is distributed under the terms of GNU GPL v2
*/
@@
-104,9
+104,9
@@
#include <stdio.h>
#include <fcntl.h>
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
#include <stdlib.h>
---- a/iptables
/iptables
-restore.c
-+++ b/iptables
/iptables
-restore.c
-@@ -
6,7 +6
,7 @@
+--- a/iptables-restore.c
++++ b/iptables-restore.c
+@@ -
8,7 +8
,7 @@
*/
#include <getopt.h>
*/
#include <getopt.h>
@@
-115,8
+115,8
@@
#include <stdbool.h>
#include <string.h>
#include <stdio.h>
#include <stdbool.h>
#include <string.h>
#include <stdio.h>
---- a/iptables
/iptables
-save.c
-+++ b/iptables
/iptables
-save.c
+--- a/iptables-save.c
++++ b/iptables-save.c
@@ -6,7 +6,7 @@
*
*/
@@ -6,7 +6,7 @@
*
*/
@@
-126,9
+126,9
@@
#include <stdio.h>
#include <fcntl.h>
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
#include <stdlib.h>
---- a/iptables
/iptables
-xml.c
-+++ b/iptables
/iptables
-xml.c
-@@ -
7,7 +7
,7 @@
+--- a/iptables-xml.c
++++ b/iptables-xml.c
+@@ -
9,7 +9
,7 @@
*/
#include <getopt.h>
*/
#include <getopt.h>