From f4b036afbb23618594caaf19ea3c33d51baa001d Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Tue, 13 Feb 2018 18:18:52 +0100
Subject: remoted if tunnel patch from nettools (is fixed upstreams)

---
 i486-stage1/net-tools/DESCR                          |  5 -----
 i486-stage1/net-tools/net-tools-1.60-if_tunnel.patch | 11 -----------
 2 files changed, 16 deletions(-)
 delete mode 100644 i486-stage1/net-tools/net-tools-1.60-if_tunnel.patch

(limited to 'i486-stage1')

diff --git a/i486-stage1/net-tools/DESCR b/i486-stage1/net-tools/DESCR
index e0227f8..c8ba1ed 100644
--- a/i486-stage1/net-tools/DESCR
+++ b/i486-stage1/net-tools/DESCR
@@ -4,8 +4,3 @@ 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
deleted file mode 100644
index 82aa34b..0000000
--- a/i486-stage1/net-tools/net-tools-1.60-if_tunnel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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>
-- 
cgit v1.2.3-70-g09d2