X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fnetwork%2Futils%2Fiptables%2Fpatches%2F300-musl_fixes.patch;h=039af7ce0a3548f537aa29ea82aebfedad166b21;hp=e329aa9ed80846d6bc7affe34ac7a1de16ff1ae9;hb=8acc87e0c02faebb9b5701b856f03cee2ed46309;hpb=5e83f7fc727833565c17e5300bb356fce2034b65

diff --git a/package/network/utils/iptables/patches/300-musl_fixes.patch b/package/network/utils/iptables/patches/300-musl_fixes.patch
index e329aa9ed8..039af7ce0a 100644
--- 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
-@@ -15,6 +15,9 @@ on whether they contain certain headers
- #include <sys/types.h>
- 
+@@ -10,6 +10,9 @@ on whether they contain certain headers
+ #include <netdb.h>
+ #include <xtables.h>
  #include <linux/netfilter_ipv6/ip6t_ipv6header.h>
 +#ifndef IPPROTO_HOPOPTS
 +#	define IPPROTO_HOPOPTS 0
 +#endif
  
- /* This maybe required 
- #include <linux/in.h>
+ enum {
+ 	O_HEADER = 0,
 --- a/extensions/libxt_TCPOPTSTRIP.c
 +++ b/extensions/libxt_TCPOPTSTRIP.c
-@@ -16,6 +16,21 @@
+@@ -12,6 +12,21 @@
  #ifndef TCPOPT_MD5SIG
  #	define TCPOPT_MD5SIG 19
  #endif
@@ -33,7 +33,7 @@
 +#endif
  
  enum {
- 	FLAG_STRIP = 1 << 0,
+ 	O_STRIP_OPTION = 0,
 --- 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>
  
---- a/ip6tables-restore.c
-+++ b/ip6tables-restore.c
-@@ -11,7 +11,7 @@
+--- a/iptables/ip6tables-restore.c
++++ b/iptables/ip6tables-restore.c
+@@ -9,7 +9,7 @@
   */
  
  #include <getopt.h>
@@ -93,8 +93,8 @@
  #include <stdbool.h>
  #include <string.h>
  #include <stdio.h>
---- a/ip6tables-save.c
-+++ b/ip6tables-save.c
+--- a/iptables/ip6tables-save.c
++++ b/iptables/ip6tables-save.c
 @@ -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>
---- a/iptables-restore.c
-+++ b/iptables-restore.c
-@@ -8,7 +8,7 @@
+--- a/iptables/iptables-restore.c
++++ b/iptables/iptables-restore.c
+@@ -6,7 +6,7 @@
   */
  
  #include <getopt.h>
@@ -115,8 +115,8 @@
  #include <stdbool.h>
  #include <string.h>
  #include <stdio.h>
---- a/iptables-save.c
-+++ b/iptables-save.c
+--- a/iptables/iptables-save.c
++++ b/iptables/iptables-save.c
 @@ -6,7 +6,7 @@
   *
   */
@@ -126,9 +126,9 @@
  #include <stdio.h>
  #include <fcntl.h>
  #include <stdlib.h>
---- a/iptables-xml.c
-+++ b/iptables-xml.c
-@@ -9,7 +9,7 @@
+--- a/iptables/iptables-xml.c
++++ b/iptables/iptables-xml.c
+@@ -7,7 +7,7 @@
   */
  
  #include <getopt.h>