Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
FL-3563: update net-tools with linux-headers patch
- Loading branch information
Oleg Vinichenko
committed
Feb 20, 2017
1 parent
fbae4b9
commit acb2f55
Showing
3 changed files
with
129 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
...s/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| From ea3935bd7c0f36c86c40e5785326698fa3336c6a Mon Sep 17 00:00:00 2001 | ||
| From: Mike Frysinger <vapier@gentoo.org> | ||
| 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 <ck@bl4ckb0x.de> | ||
| --- | ||
| 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 <arpa/inet.h> | ||
| #include <net/if.h> | ||
| #include <net/if_arp.h> | ||
| +/* 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 <linux/types.h> | ||
| +#include <linux/ip.h> | ||
| #include <linux/if_tunnel.h> | ||
|
|
||
| #include "config.h" | ||
| -- | ||
| 2.9.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| # 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="*" | ||
| 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] ) | ||
| !<sys-apps/openrc-0.9.9.3" | ||
|
|
||
| maint_pkg_create() { | ||
| cd /usr/local/src/net-tools | ||
| #git-update | ||
| local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S) | ||
| local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60} | ||
| local p="${PN}-${pv}" | ||
| git archive --prefix="${p}/" master | tar xf - -C "${T}" | ||
| pushd "${T}" >/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" | ||
| } | ||
|
|
||
| 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 '<sys-kernel/linux-headers-3.5' | ||
| set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6' | ||
| set_opt HAVE_SELINUX use selinux | ||
| set_opt HAVE_ARP_TOOLS use arp | ||
| set_opt HAVE_HOSTNAME_TOOLS use hostname | ||
| set_opt HAVE_HOSTNAME_SYMLINKS use nis | ||
| set_opt HAVE_PLIP_TOOLS use plipconfig | ||
| set_opt HAVE_SERIAL_TOOLS use slattach | ||
| if use static ; then | ||
| append-flags -static | ||
| append-ldflags -static | ||
| fi | ||
| tc-export AR CC | ||
| yes "" | ./configure.sh config.in || die | ||
| } | ||
|
|
||
| src_install() { | ||
| # We need to use emake by hand to pass ED. #567300 | ||
| emake DESTDIR="${ED}" install | ||
| dodoc README THANKS TODO | ||
| dosym /bin/ifconfig /sbin/ifconfig | ||
| } |