commit: 351b380410e51e1ef532f4e27947b5ff00ab70de Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com> AuthorDate: Sat Mar 13 05:33:05 2021 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sat Mar 13 16:01:52 2021 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=351b3804
sys-apps/net-tools: remove from overlay Package-Manager: Portage-3.0.17, Repoman-3.0.2 RepoMan-Options: --force Manifest-Sign-Key: 0xA1919C830E9498E0 Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com> Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> sys-apps/net-tools/Manifest | 17 ---- ...235919-fix-building-w-older-linux-headers.patch | 32 -------- .../net-tools/files/net-tools-fix-headers-r1.patch | 19 ----- .../net-tools/files/net-tools-fix-headers.patch | 11 --- sys-apps/net-tools/metadata.xml | 17 ---- .../net-tools-1.60_p20161110235919.ebuild | 96 ---------------------- .../net-tools-1.60_p20170221182432.ebuild | 92 --------------------- .../net-tools-1.60_p20180626073013.ebuild | 94 --------------------- 8 files changed, 378 deletions(-) diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest deleted file mode 100644 index a20f17a..0000000 --- a/sys-apps/net-tools/Manifest +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -DIST net-tools-1.60_p20161110235919.tar.xz 227552 BLAKE2B 0dba75b7b7345be047bd8618811c6ea43f96f0d7c8a2c67cd03138b8f31dc47a641c7ff1e93fb1ad295423f9b82e3d222178c7c97233d4e3698355fed729f723 SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01 -DIST net-tools-1.60_p20170221182432.tar.xz 227924 BLAKE2B 2617d99da0fa188163bcade5584038fcf8c9c73c23c5577585c3452f4e7b93b2d0cae06ae6d8e5543e04bdd93c247cf4c555751905406b88dcd16dec26bebeca SHA512 38cf9a0e5a1b2494d1e8f491638f8e35cf04d630e9eae275cb1d0b997f2b73c62bdd40b0420e0f5f2aa212aefa7516ff773b6e3a19c0cbf442e785d2c7dad28e -DIST net-tools-1.60_p20180626073013.tar.xz 228276 BLAKE2B 1545533abf75cb960896994710a02f0e4f5534232057fa9c80d2ec54af84d068d3337a93e869e8377539584eebf4c4d8175e16f19bc12360946ab908b41b2f2f SHA512 3ea9036c2597e6da3a1d9a61a77bbe0b80c448d42a3cc59469f37255064d9e046b5f331155adac256f9812200342f72624ba1ea27a4ee3696b3c9ad53b6b86eb ------BEGIN PGP SIGNATURE----- - -iQEzBAEBCAAdFiEEDe3xqQRWi60fxFwoPcxEeC7QfhwFAlwK33EACgkQPcxEeC7Q -fhy26ggAo4xV951lQ7Koqmnldmrje/E5BnkD20vqUehcNgqp5AQmCpUxHd1gADoe -fNiWOo31OJoripGE2vQde7bZey19YcEW6LdItOkIxw03780ml20eoW31qiyMBgqH -s5qmatb2qgNXjyY1pLMIDj7N4cPkivzTUBKnrzokGoPFzWCb4fBYU4YFhImyGlcv -GoVPh4EDJYZV2wBYLUPjmjBLQhmwOTSkZoHMdGDePIRQRCJL82OtY8dNa9gmChdD -Zc33vNHwCO9A7x3v9jxOucOJcScv1QOxpp/leBqrw8YCJXnotndXzG4ZGdvvBtZ2 -Y/lM2zfc3VaFgTCTpg0Fpb7RvOqQ/g== -=6/WK ------END PGP SIGNATURE----- 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 0109940..0000000 --- a/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ea3935bd7c0f36c86c40e5785326698fa3336c6a Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vap...@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 <c...@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,6 +29,11 @@ - #include <arpa/inet.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/files/net-tools-fix-headers-r1.patch b/sys-apps/net-tools/files/net-tools-fix-headers-r1.patch deleted file mode 100644 index f4ce1f6..0000000 --- a/sys-apps/net-tools/files/net-tools-fix-headers-r1.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur net-tools-1.60_p20180626073013.orig/iptunnel.c net-tools-1.60_p20180626073013/iptunnel.c ---- net-tools-1.60_p20180626073013.orig/iptunnel.c 2018-06-26 07:30:13.000000000 -0000 -+++ net-tools-1.60_p20180626073013/iptunnel.c 2018-12-20 18:32:45.607928052 -0000 -@@ -25,14 +25,12 @@ - #include <fcntl.h> - #include <sys/socket.h> - #include <sys/ioctl.h> --#include <netinet/in.h> --#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/in.h> - #include <linux/types.h> - #include <linux/ip.h> - #include <linux/if_tunnel.h> diff --git a/sys-apps/net-tools/files/net-tools-fix-headers.patch b/sys-apps/net-tools/files/net-tools-fix-headers.patch deleted file mode 100644 index d2b7fd0..0000000 --- a/sys-apps/net-tools/files/net-tools-fix-headers.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur net-tools-1.60_p20161110235919.orig/iptunnel.c net-tools-1.60_p20161110235919/iptunnel.c ---- net-tools-1.60_p20161110235919.orig/iptunnel.c 2016-11-11 17:19:27.312541677 -0800 -+++ net-tools-1.60_p20161110235919/iptunnel.c 2016-11-11 17:21:46.730922004 -0800 -@@ -27,7 +27,6 @@ - #include <sys/ioctl.h> - #include <netinet/in.h> - #include <arpa/inet.h> --#include <net/if.h> - #include <net/if_arp.h> - #include <linux/types.h> - #include <linux/if_tunnel.h> diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml deleted file mode 100644 index 5335830..0000000 --- a/sys-apps/net-tools/metadata.xml +++ /dev/null @@ -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-sys...@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> diff --git a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild deleted file mode 100644 index 7245170..0000000 --- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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="amd64 arm arm64 ~mips ppc ppc64 x86" -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}"/${PN}-fix-headers.patch - 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 -} diff --git a/sys-apps/net-tools/net-tools-1.60_p20170221182432.ebuild b/sys-apps/net-tools/net-tools-1.60_p20170221182432.ebuild deleted file mode 100644 index 50859f9..0000000 --- a/sys-apps/net-tools/net-tools-1.60_p20170221182432.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.code.sf.net/p/net-tools/code" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"; - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" -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" - -PATCHES=( "${FILESDIR}"/${PN}-fix-headers.patch ) - -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 --exclude-vcs 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_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 -} diff --git a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild deleted file mode 100644 index c32eb68..0000000 --- a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://git.code.sf.net/p/net-tools/code"; - inherit git-r3 -else - SRC_URI="mirror://gentoo/${P}.tar.xz" - KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" -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" - -PATCHES=( - "${FILESDIR}/${PN}-fix-headers-r1.patch" - ) - -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 --exclude-vcs 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_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 -}
