summaryrefslogtreecommitdiff
path: root/i486-stage1/net-tools
diff options
context:
space:
mode:
Diffstat (limited to 'i486-stage1/net-tools')
-rw-r--r--i486-stage1/net-tools/DESCR11
-rw-r--r--i486-stage1/net-tools/net-tools-1.60-if_tunnel.patch11
2 files changed, 22 insertions, 0 deletions
diff --git a/i486-stage1/net-tools/DESCR b/i486-stage1/net-tools/DESCR
new file mode 100644
index 0000000..e0227f8
--- /dev/null
+++ b/i486-stage1/net-tools/DESCR
@@ -0,0 +1,11 @@
+# prepare configure for cross-compilation
+sed -i "s@make @make CC=$TARGET_ARCH-cc LD=$TARGET_ARCH-ld @g" PKGBUILD
+sed -i "s@make\$@make CC=$TARGET_ARCH-cc LD=$TARGET_ARCH-ld @g" PKGBUILD
+
+# git for release checkouts, using the one from host
+sed -i "/makedepends/s/git//g" PKGBUILD
+
+# apply patch for double definitons in ip.h
+sed -i 's@source=(@source=(net-tools-1.60-if_tunnel.patch @' PKGBUILD
+sed -i "s@sha1sums=(@sha1sums=('SKIP' @" PKGBUILD
+sed -i '2!N; /prepare() {/ a \ pushd ${srcdir}/${pkgname}; patch -Np1 < ${srcdir}/net-tools-1.60-if_tunnel.patch; popd' PKGBUILD
diff --git a/i486-stage1/net-tools/net-tools-1.60-if_tunnel.patch b/i486-stage1/net-tools/net-tools-1.60-if_tunnel.patch
new file mode 100644
index 0000000..82aa34b
--- /dev/null
+++ b/i486-stage1/net-tools/net-tools-1.60-if_tunnel.patch
@@ -0,0 +1,11 @@
+diff -rauN net-tools-1.60-115f1af2/iptunnel.c net-tools-1.60-115f1af2-no-ip-header-patch/iptunnel.c
+--- net-tools-1.60-115f1af2/iptunnel.c 2017-12-26 21:14:18.650935837 +0100
++++ net-tools-1.60-115f1af2-no-ip-header-patch/iptunnel.c 2017-12-26 21:15:45.088534518 +0100
+@@ -26,7 +26,6 @@
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
+-#include <netinet/ip.h>
+ #include <arpa/inet.h>
+ #include <net/if.h>
+ #include <net/if_arp.h>