diff options
author | Remko van der Vossen | 2009-03-07 16:07:06 +0100 |
---|---|---|
committer | Arwed von Merkatz | 2009-03-11 19:49:20 +0100 |
commit | ef4216e080b33d20adad2df26b75267f23c60d85 (patch) | |
tree | 220e6a468a6fd35e999b7c296aa23b3e2f4c21a6 | |
parent | e9ee05ec690769c975b8f3785df3ebf7c7a57a1d (diff) |
iptables: xtables compile fix, fixes bug 15015.
(cherry picked from commit d2887a34132c0d803f0255f30a7fcb660c914fda)
-rw-r--r-- | net/iptables/HISTORY | 6 | ||||
-rwxr-xr-x | net/iptables/PRE_BUILD | 3 | ||||
-rw-r--r-- | net/iptables/iptables-xtables-compile-fix.patch | 11 |
3 files changed, 18 insertions, 2 deletions
diff --git a/net/iptables/HISTORY b/net/iptables/HISTORY index c87cd9359c..4135211feb 100644 --- a/net/iptables/HISTORY +++ b/net/iptables/HISTORY @@ -1,3 +1,9 @@ +2009-03-07 Remko van der Vossen <wich@sourcemage.org> + * PRE_BUILD, iptables-xtables-compile-fix.patch: fixed compilation, + patch in include for netinet/in.h which defines the proper + identifiers, makeing the #ifndefs work as intended, taken from the + iptables git repo. Fixes bug 15015. + 2008-10-14 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 1.4.2; renewed desc * PRE_BUILD: fixed compilation (SCTP is already defined in the headers) diff --git a/net/iptables/PRE_BUILD b/net/iptables/PRE_BUILD index 7e6ab59e33..823807b336 100755 --- a/net/iptables/PRE_BUILD +++ b/net/iptables/PRE_BUILD @@ -1,5 +1,4 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && -# fixed compilation with SCTP (check in next release) -sed -i "11,13d" include/xtables.h.in +patch -p1 < "$SPELL_DIRECTORY/iptables-xtables-compile-fix.patch" diff --git a/net/iptables/iptables-xtables-compile-fix.patch b/net/iptables/iptables-xtables-compile-fix.patch new file mode 100644 index 0000000000..4c775ceb9a --- /dev/null +++ b/net/iptables/iptables-xtables-compile-fix.patch @@ -0,0 +1,11 @@ +diff -Naur iptables-1.4.2.orig/include/xtables.h.in iptables-1.4.2/include/xtables.h.in +--- iptables-1.4.2.orig/include/xtables.h.in 2008-10-08 18:31:58.000000000 +0200 ++++ iptables-1.4.2/include/xtables.h.in 2009-03-07 15:37:49.000000000 +0100 +@@ -4,6 +4,7 @@ + #include <sys/socket.h> /* PF_* */ + #include <sys/types.h> + #include <stdbool.h> ++#include <netinet/in.h> + #include <net/if.h> + #include <linux/types.h> + #include <linux/netfilter/x_tables.h> |