Changeset 34313

Timestamp:

2012-11-23T21:02:23+01:00 (5 years ago)

Author:

florian

Message:

[package] iptables: add some musl portability fixes

Signed-off-by: Florian Fainelli <florian@…>

Location:

trunk/package/network/utils/iptables/patches

Files:

• 011-recent-add-reap.patch (modified) (2 diffs)
• 020-iptables-disable-modprobe.patch (modified) (1 diff)
• 110-linux_3.2_compat.patch (modified) (1 diff)
• 200-configurable_builtin.patch (modified) (3 diffs)
• 300-musl_fixes.patch (added)

trunk/package/network/utils/iptables/patches/011-recent-add-reap.patch

@@ -80 +80 @@
  
  static void recent_save(const void *ip, const struct xt_entry_match *match)
-@@ -211,6 +229,8 @@ static void recent_save(const void *ip, 
+@@ -211,6 +229,8 @@ static void recent_save(const void *ip,
                 printf("--rsource ");
         if (info->side == XT_RECENT_DEST)
@@ -91 +91 @@
 --- a/extensions/libxt_recent.man
 +++ b/extensions/libxt_recent.man
-@@ -41,6 +41,11 @@ This option must be used in conjunction 
+@@ -41,6 +41,11 @@ This option must be used in conjunction
  \fB\-\-update\fP. When used, this will narrow the match to only happen when the
  address is in the list and was seen within the last given number of seconds.

trunk/package/network/utils/iptables/patches/020-iptables-disable-modprobe.patch

@@ -9 +9 @@
         char *argv[4];
         int status;
-@@ -348,6 +349,7 @@ int xtables_insmod(const char *modname, 
+@@ -348,6 +349,7 @@ int xtables_insmod(const char *modname,
         free(buf);
         if (WIFEXITED(status) && WEXITSTATUS(status) == 0)

trunk/package/network/utils/iptables/patches/110-linux_3.2_compat.patch

@@ -1 @@
---- iptables-1.4.10/include/linux/types.h.orig  2011-11-07 00:08:33.000000000 +0100
-+++ iptables-1.4.10/include/linux/types.h       2011-11-07 00:09:25.000000000 +0100
-@@ -34,5 +34,9 @@
+--- a/include/linux/types.h
++++ b/include/linux/types.h
+@@ -34,5 +34,9 @@ typedef __u64 __bitwise __be64;
  typedef __u16 __bitwise __sum16;
  typedef __u32 __bitwise __wsum;

trunk/package/network/utils/iptables/patches/200-configurable_builtin.patch

@@ -1 +1 @@
 --- a/extensions/GNUmakefile.in
 +++ b/extensions/GNUmakefile.in
-@@ -40,9 +40,24 @@
+@@ -40,9 +40,24 @@ pfx_build_mod := $(patsubst ${srcdir}/li
  pfx_build_mod := $(filter-out @blacklist_modules@,${pfx_build_mod})
  pf4_build_mod := $(filter-out @blacklist_modules@,${pf4_build_mod})
@@ -29 +29 @@
  pf4_solibs    := $(patsubst %,libipt_%.so,${pf4_build_mod})
  pf6_solibs    := $(patsubst %,libip6t_%.so,${pf6_build_mod})
-@@ -54,10 +69,10 @@
+@@ -54,10 +69,10 @@ pf6_solibs    := $(patsubst %,libip6t_%.
  targets := libext4.a libext6.a matches4.man matches6.man \
             targets4.man targets6.man
@@ -44 +44 @@
  .SECONDARY:
  
-@@ -107,8 +122,8 @@
+@@ -107,8 +122,8 @@ libext4.a: initext4.o ${libext4_objs}
  libext6.a: initext6.o ${libext6_objs}
         ${AM_VERBOSE_AR} ${AR} crs $@ $^;