mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-17 18:06:59 +02:00
sys-apps/net-tools: Move back to portage-stable
We are going to update it to a newer version, which fixes the build system issue that was a reason for putting the package in overlay. This is to get rid of EAPI 5 in the package.
This commit is contained in:
Krzesimir Nowak
parent
85ad6e9aec
commit
f385014620
@ -1 +0,0 @@
|
||||
DIST net-tools-1.60_p20161110235919.tar.xz 227552 SHA256 d9b52abb6bbf3305fde1fe414059602371a7819b214206312f6b16a2fde46fcd SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01 WHIRLPOOL 413553072466cee79c1f231742d6256f97d9a9e84647ee27aed97cf01eee16fd621c67fa67523174bcc0dd0c5f6181d2f6fcc698e3268fc9996eb2cbc7db1070
|
||||
@ -1,33 +0,0 @@
|
||||
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
|
||||
@ -1,22 +0,0 @@
|
||||
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"
|
||||
@ -1,17 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>base-system@gentoo.org</email>
|
||||
<name>Gentoo Base System</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="arp">build the arp and rarp tools (for manipulating the ARP cache)</flag>
|
||||
<flag name="hostname">build the hostname and dnsdomainname tools</flag>
|
||||
<flag name="plipconfig">build the plipconfig tool (for working with old PLIP hardware)</flag>
|
||||
<flag name="slattach">build the slattach tool (for working with old serial ports)</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">net-tools</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -1,96 +0,0 @@
|
||||
# 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] )
|
||||
!<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"
|
||||
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 '<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
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user