[tor-commits] [orbot/master] adding patch for iptables building on x86

[n8fr8 at torproject.org]

commit 77d1b824119272a1ba9f0d2aff0890f84c34deac
Author: Nathan Freitas <nathan at freitas.net>
Date:   Wed May 13 12:17:54 2015 -0400

    adding patch for iptables building on x86
---
 external/Makefile         |    3 +++
 external/iptables-patch-4 |   10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/external/Makefile b/external/Makefile
index b32fb91..39752e3 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -186,12 +186,15 @@ iptables/Makefile:
 	cp iptables-patch-1 iptables
 	cp iptables-patch-2 iptables
 	cp iptables-patch-3 iptables
+	cp iptables-patch-4 iptables
 	-cd iptables && \
 	 	patch -N -p1 --reject-file=- < iptables-patch-1
 	-cd iptables && \
 	 	patch -N -p1 --reject-file=- < iptables-patch-2
 	-cd iptables && \
 	 	patch -N -p1 --reject-file=- < iptables-patch-3
+	-cd iptables && \
+	 	patch -N -p0 --reject-file=- < iptables-patch-4
 	cd iptables && ./autogen.sh
 	cp config.sub iptables
 	cp config.guess iptables
diff --git a/external/iptables-patch-4 b/external/iptables-patch-4
new file mode 100644
index 0000000..59b7671
--- /dev/null
+++ b/external/iptables-patch-4
@@ -0,0 +1,10 @@
+--- extensions/libipt_ULOG.c	2015-05-13 11:59:59.752055326 -0400
++++ extensions/libipt_ULOG.new.c	2015-05-13 12:09:29.410078607 -0400
+@@ -12,6 +12,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <xtables.h>
++#define ffs(i) __builtin_ffs(i)
+ /* For 64bit kernel / 32bit userspace */
+ #include <linux/netfilter_ipv4/ipt_ULOG.h>
+