diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/net-tools/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/net-tools/Manifest new file mode 100644 index 0000000000..3555752d71 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/net-tools/Manifest @@ -0,0 +1 @@ +DIST net-tools-1.60_p20161110235919.tar.xz 227552 SHA256 d9b52abb6bbf3305fde1fe414059602371a7819b214206312f6b16a2fde46fcd SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01 WHIRLPOOL 413553072466cee79c1f231742d6256f97d9a9e84647ee27aed97cf01eee16fd621c67fa67523174bcc0dd0c5f6181d2f6fcc698e3268fc9996eb2cbc7db1070 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch new file mode 100644 index 0000000000..5e330ace02 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch @@ -0,0 +1,33 @@ +From ea3935bd7c0f36c86c40e5785326698fa3336c6a Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Mon, 14 Nov 2016 22:48:42 -0500 +Subject: [PATCH] iptunnel: fix building w/older linux headers + +While linux-4.8+ headers work, older ones are missing includes. +Dropping netinet/ip.h uncovered that mess, so add linux/ip.h. + +URL: https://bugs.gentoo.org/599542 +Reported-by: Conrad Kostecki +--- + iptunnel.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/iptunnel.c b/iptunnel.c +index 247ae10..d6e47e6 100644 +--- a/iptunnel.c ++++ b/iptunnel.c +@@ -29,7 +29,12 @@ + #include + #include + #include ++/* We only care about linux/if_tunnel.h. Unfortunately, older Linux headers ++ * (pre linux-4.8) did not include all the proper headers leading to missing ++ * structs and types. ++ */ + #include ++#include + #include + + #include "config.h" +-- +2.9.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-parallel-make.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-parallel-make.patch new file mode 100644 index 0000000000..e814a073dc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-parallel-make.patch @@ -0,0 +1,22 @@ +diff --git a/Makefile b/Makefile +index bf67bc6..b14cadf 100644 +--- a/Makefile ++++ b/Makefile +@@ -109,7 +109,7 @@ all: config.h version.h subdirs $(PROGS) + + config: cleanconfig config.h + +-install: all savebin installbin installdata ++install: all installbin installdata + + update: all installbin installdata + +@@ -205,7 +205,7 @@ ipmaddr: $(NET_LIB) ipmaddr.o + mii-tool: $(NET_LIB) mii-tool.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB) $(LDLIBS) + +-installbin: ++installbin: savebin + @echo + @echo "######################################################" + @echo "Notice: ifconfig and route are now installed into /bin" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/net-tools/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/net-tools/metadata.xml new file mode 100644 index 0000000000..533583070f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/net-tools/metadata.xml @@ -0,0 +1,17 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + build the arp and rarp tools (for manipulating the ARP cache) + build the hostname and dnsdomainname tools + build the plipconfig tool (for working with old PLIP hardware) + build the slattach tool (for working with old serial ports) + + + net-tools + + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild new file mode 100644 index 0000000000..5e8288d1c4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit flag-o-matic toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.code.sf.net/p/net-tools/code" + EGIT_PROJECT="${PN}" + inherit git-2 +else + SRC_URI="mirror://gentoo/${P}.tar.xz" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="Standard Linux networking tools" +HOMEPAGE="http://net-tools.sourceforge.net/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+arp +hostname ipv6 nis nls plipconfig selinux slattach static" +REQUIRED_USE="nis? ( hostname )" + +RDEPEND="selinux? ( sys-libs/libselinux )" +DEPEND="${RDEPEND} + selinux? ( virtual/pkgconfig ) + app-arch/xz-utils" +if [[ ${PV} == "9999" ]]; then + DEPEND+=" nls? ( sys-devel/gettext )" +fi +RDEPEND+=" + hostname? ( !sys-apps/coreutils[hostname] ) + !/dev/null + emake -C "${p}/po" dist + sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die + tar cf - ${p}/ | xz > ${p}.tar.xz + popd >/dev/null + + du -b "${T}"/*.tar.xz +} + +pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; } + +set_opt() { + local opt=$1 ans + shift + ans=$("$@" && echo y || echo n) + einfo "Setting option ${opt} to ${ans}" + sed -i \ + -e "/^bool.* ${opt} /s:[yn]$:${ans}:" \ + config.in || die +} + +src_prepare() { + epatch "${FILESDIR}/${P}-fix-building-w-older-linux-headers.patch" + epatch "${FILESDIR}/${P}-fix-parallel-make.patch" +} + +src_configure() { + # Clear out env vars from the user. #599602 + unset BASEDIR BINDIR SBINDIR + + set_opt I18N use nls + set_opt HAVE_AFINET6 use ipv6 + set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6' + set_opt HAVE_HWTR has_version '