Upgraded packages to latest upstream
Upgraded sys-apps/net-tools to v2.10
BUG=None
TEST=presubmit
RELEASE_NOTE=Upgraded sys-apps/net-tools to v2.10.
Change-Id: I87a8fca5e08fb2711fc6b5c37c175e2b1c740200
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/portage-stable/+/44579
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Chenglong Tang <chenglongtang@google.com>
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 3555752..60eabc5 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1 +1 @@
-DIST net-tools-1.60_p20161110235919.tar.xz 227552 SHA256 d9b52abb6bbf3305fde1fe414059602371a7819b214206312f6b16a2fde46fcd SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01 WHIRLPOOL 413553072466cee79c1f231742d6256f97d9a9e84647ee27aed97cf01eee16fd621c67fa67523174bcc0dd0c5f6181d2f6fcc698e3268fc9996eb2cbc7db1070
+DIST net-tools-2.10.tar.xz 229616 BLAKE2B 0d11a5c12f6447282c65ee74428c1b9f6da9fd6d26ca558813d002fac8a4f03fd25a26231a5f4e45f88d821e9a8281e3be1fea4a832bd09afbc2239634a1c25d SHA512 aa8f631772da6c16b165065fc5929a206504f2dce19e74a4ffc680f09b40f3a9180bd4bbeaac67e0b32693358b01383bae4fbfcb6061180c130e9e0801d536bf
diff --git a/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch b/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch
deleted file mode 100644
index 5e330ac..0000000
--- a/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch
+++ /dev/null
@@ -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
diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml
index cd601a1..ec740c5 100644
--- a/sys-apps/net-tools/metadata.xml
+++ b/sys-apps/net-tools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
@@ -8,7 +8,6 @@
<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="old-output">use old ifconfig output style (useful for when new output breaks scripts)</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>
diff --git a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild b/sys-apps/net-tools/net-tools-2.10.ebuild
similarity index 61%
rename from sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
rename to sys-apps/net-tools/net-tools-2.10.ebuild
index c54d8d9..38d6ca8 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
+++ b/sys-apps/net-tools/net-tools-2.10.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="7"
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
+ EGIT_REPO_URI="https://git.code.sf.net/p/net-tools/code"
+ inherit git-r3
else
- SRC_URI="mirror://gentoo/${P}.tar.xz"
+ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
KEYWORDS="*"
fi
@@ -22,34 +21,17 @@
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+="
+DEPEND="selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
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 ; }
+ nis? ( !net-nds/yp-tools )"
+BDEPEND="
+ selinux? ( virtual/pkgconfig )
+ app-arch/xz-utils
+"
+if [[ ${PV} == "9999" ]]; then
+ BDEPEND+=" nls? ( sys-devel/gettext )"
+fi
set_opt() {
local opt=$1 ans
@@ -61,10 +43,6 @@
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
