commit: a49d637e7c3222e9dfaec735795278d8e21159e9
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Fri Nov 11 20:44:09 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Fri Nov 11 20:44:09 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a49d637e
sys-apps/net-tools: Update to 1.60_p20161110235919
Drop 1.60_p20141019041918 which is old because the new stable version doesn't
have any issues with musl.
sys-apps/net-tools/Manifest | 5 --
.../files/net-tools-fix-header-assumptions.patch | 93 ----------------------
.../files/net-tools-fix-missing-iphdr.patch | 11 +++
sys-apps/net-tools/metadata.xml | 4 +
...build => net-tools-1.60_p20161110235919.ebuild} | 58 +++++++-------
5 files changed, 42 insertions(+), 129 deletions(-)
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 863b0c2..e69de29 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,5 +0,0 @@
-AUX net-tools-fix-header-assumptions.patch 3462 SHA256
bea5145e5a69bcea835bcb9a71cadcef55651b253c6e4552f007e37e16d60a1a SHA512
e14293a16d0111cb50f205d4a861f94b9525ce75311f8e3aeed1231ffc877d4d2715074d64419c72473c27cb4c2535ad4af17f911dc7ece71d2e941bce44297a
WHIRLPOOL
f6b378db90711d82d55cda0ee1903b32102f97854897236562f69a42470d7288ab7bbb4b166927086b758b237c1d091d7b1f392d1e798de06d875b6b0e293433
-DIST net-tools-1.60_p20141019041918-patches-1.tar.xz 3352 SHA256
12e79c866c532ba75c0367397f664799f90ab8901bc906429b67939e8e6b354f SHA512
139f8c2990e5be44c17c2c5c4a900d2d2a8cdb5c067a8fe822b20b964045a24bc1138f7656291bc4db80ecddaa24e2e2655c018925d7b214651284443df550f9
WHIRLPOOL
3e33a3d5e0209360c7d90e4741a1b2be662e3c9d1c8a1f8a7283bff98642934fd26da296c5ed4a064915fa1a1006ee8f94fedc07d86bda48ed9624fc9946d190
-DIST net-tools-1.60_p20141019041918.tar.xz 197684 SHA256
22d1fb8acfa0b1e92d3c5dd3f544770b107df72f32f5b16232e65045c5efd2d0 SHA512
5fb02e181f3fec0a62a8ec8f1e6b0549d711d70d292491a2721d7f19f1a3b07d41fd0c8f503809435cd1a1b1999bcf5690402acc51f06ac6d626e11fef590e2e
WHIRLPOOL
c34f0c7363cc445e2457ccbf796947b60f74a063ed299840f755c6c023b8eb2cd46cdf42e1f9ca7530170e0b32dd14477e64ce50ec089e4a8b5d3e6bf65456ec
-EBUILD net-tools-1.60_p20141019041918-r99.ebuild 2653 SHA256
f4f9887eb7403304db5a8c9fe23143bbb3740d18351002bd90c1b741b7b14a65 SHA512
0a61fb1789e12f7f68bc8455eac2324c2600c112216dd7cc78c5aa01469bad4a35c747535c6307475520d8a5c23afdd476935a682b4a7f2c08108094e924c25d
WHIRLPOOL
8207fa7c8de879c0812ea07b523fc7e2e080415326081efd4cbd289bc08c937af3d61f24205c3d9651b3a71e2d72b02d6310df7a97f2d7ed7726fe6ec9f63ee9
-MISC metadata.xml 448 SHA256
74b7822475f1090ce105ee03d9c77ffa36a2b6c19d91de7e7ee24857891efa69 SHA512
95caf3f6c8f625ddce92d7eea082ea9e01fc10770dfb1a18e8f5419c895c67f5549ea084d01e0abb61903ddd77fc3af461445f302abcc6b9bd9411c557ff6748
WHIRLPOOL
2cccc4e638c5d4ca4505e30c790b260a70646e5b661c926a4d23695f1ff4faa18410e0df074fdc21876cfe5902937c673a17cb1290d19e0a10e33262deaaf99a
diff --git a/sys-apps/net-tools/files/net-tools-fix-header-assumptions.patch
b/sys-apps/net-tools/files/net-tools-fix-header-assumptions.patch
deleted file mode 100644
index f56dffc..0000000
--- a/sys-apps/net-tools/files/net-tools-fix-header-assumptions.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -Naur net-tools-1.60_p20120127084908.orig/lib/inet6_gr.c
net-tools-1.60_p20120127084908/lib/inet6_gr.c
---- net-tools-1.60_p20120127084908.orig/lib/inet6_gr.c 2012-01-27
08:49:08.000000000 +0000
-+++ net-tools-1.60_p20120127084908/lib/inet6_gr.c 2014-01-21
19:18:50.557199377 +0000
-@@ -23,9 +23,6 @@
- #include <string.h>
- #include <stdio.h>
- #include <unistd.h>
--#ifndef __GLIBC__
--#include <netinet6/ipv6_route.h> /* glibc doesn't have this */
--#endif
- #include "version.h"
- #include "net-support.h"
- #include "pathnames.h"
-diff -Naur net-tools-1.60_p20120127084908.orig/lib/inet6_sr.c
net-tools-1.60_p20120127084908/lib/inet6_sr.c
---- net-tools-1.60_p20120127084908.orig/lib/inet6_sr.c 2012-01-27
08:49:08.000000000 +0000
-+++ net-tools-1.60_p20120127084908/lib/inet6_sr.c 2014-01-21
19:19:23.307201208 +0000
-@@ -23,11 +23,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <unistd.h>
--#ifdef __GLIBC__
- #include <net/route.h>
--#else
--#include <netinet6/ipv6_route.h> /* glibc does not have this */
--#endif
- #include "version.h"
- #include "net-support.h"
- #include "pathnames.h"
-diff -Naur net-tools-1.60_p20120127084908.orig/lib/inet_sr.c
net-tools-1.60_p20120127084908/lib/inet_sr.c
---- net-tools-1.60_p20120127084908.orig/lib/inet_sr.c 2012-01-27
08:49:08.000000000 +0000
-+++ net-tools-1.60_p20120127084908/lib/inet_sr.c 2014-01-21
20:41:59.223478324 +0000
-@@ -26,6 +26,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <unistd.h>
-+#include <asm-generic/param.h>
- #include "version.h"
- #include "net-support.h"
- #include "pathnames.h"
-diff -Naur net-tools-1.60_p20120127084908.orig/lib/util-ank.c
net-tools-1.60_p20120127084908/lib/util-ank.c
---- net-tools-1.60_p20120127084908.orig/lib/util-ank.c 2012-01-27
08:49:08.000000000 +0000
-+++ net-tools-1.60_p20120127084908/lib/util-ank.c 2014-01-21
20:42:56.876481548 +0000
-@@ -25,6 +25,7 @@
- #include <netdb.h>
- #include <arpa/inet.h>
- #include <resolv.h>
-+#include <limits.h>
-
- #include "intl.h"
- #include "util-ank.h"
-diff -Naur net-tools-1.60_p20120127084908.orig/mii-tool.c
net-tools-1.60_p20120127084908/mii-tool.c
---- net-tools-1.60_p20120127084908.orig/mii-tool.c 2012-01-27
08:49:08.000000000 +0000
-+++ net-tools-1.60_p20120127084908/mii-tool.c 2014-01-21 20:54:31.563520392
+0000
-@@ -47,10 +47,6 @@
- #include <net/if.h>
- #include <linux/sockios.h>
-
--#ifndef __GLIBC__
--#include <linux/if_arp.h>
--#include <linux/if_ether.h>
--#endif
- #include <linux/mii.h>
- #include <linux/sockios.h>
- #include "version.h"
-diff -Naur net-tools-1.60_p20120127084908.orig/netstat.c
net-tools-1.60_p20120127084908/netstat.c
---- net-tools-1.60_p20120127084908.orig/netstat.c 2012-01-27
08:49:08.000000000 +0000
-+++ net-tools-1.60_p20120127084908/netstat.c 2014-01-21 20:43:34.023483625
+0000
-@@ -88,6 +88,7 @@
- #include <sys/stat.h>
- #include <net/if.h>
- #include <dirent.h>
-+#include <asm-generic/param.h>
-
- #if HAVE_SELINUX
- #include <selinux/selinux.h>
-diff -Naur net-tools-1.60_p20120127084908.orig/slattach.c
net-tools-1.60_p20120127084908/slattach.c
---- net-tools-1.60_p20120127084908.orig/slattach.c 2012-01-27
08:49:08.000000000 +0000
-+++ net-tools-1.60_p20120127084908/slattach.c 2014-01-21 20:44:46.953487703
+0000
-@@ -45,14 +45,7 @@
- #include <unistd.h>
- #include <getopt.h>
- #include <linux/if_slip.h>
--
--#if defined(__GLIBC__)
--#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 0
--# include <termbits.h>
--#else
- # include <termios.h>
--#endif
--#endif
-
- #include "pathnames.h"
- #include "net-support.h"
diff --git a/sys-apps/net-tools/files/net-tools-fix-missing-iphdr.patch
b/sys-apps/net-tools/files/net-tools-fix-missing-iphdr.patch
new file mode 100644
index 0000000..812f79f
--- /dev/null
+++ b/sys-apps/net-tools/files/net-tools-fix-missing-iphdr.patch
@@ -0,0 +1,11 @@
+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-10
15:59:19.000000000 -0800
++++ net-tools-1.60_p20161110235919/iptunnel.c 2016-11-11 12:38:47.646508006
-0800
+@@ -29,6 +29,7 @@
+ #include <arpa/inet.h>
+ #include <net/if.h>
+ #include <net/if_arp.h>
++#include <netinet/ip.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
index 1dff328..d539cc5 100644
--- a/sys-apps/net-tools/metadata.xml
+++ b/sys-apps/net-tools/metadata.xml
@@ -6,7 +6,11 @@
<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="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>
<upstream>
<remote-id type="sourceforge">net-tools</remote-id>
diff --git a/sys-apps/net-tools/net-tools-1.60_p20141019041918-r99.ebuild
b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
similarity index 55%
rename from sys-apps/net-tools/net-tools-1.60_p20141019041918-r99.ebuild
rename to sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
index 003df51..9fb8a74 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20141019041918-r99.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
@@ -2,18 +2,17 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="3"
+EAPI="5"
-inherit flag-o-matic toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
-
EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
+ EGIT_REPO_URI="git://git.code.sf.net/p/net-tools/code"
+ EGIT_PROJECT="${PN}"
inherit git-2
else
- PATCH_VER="1"
- SRC_URI="mirror://gentoo/${P}.tar.xz
- mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
- KEYWORDS="amd64 arm ~mips ppc x86"
+ 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"
@@ -21,13 +20,19 @@ HOMEPAGE="http://net-tools.sourceforge.net/";
LICENSE="GPL-2"
SLOT="0"
-IUSE="nls old-output selinux static"
+IUSE="+arp +hostname ipv6 nis nls plipconfig selinux slattach static"
+REQUIRED_USE="nis? ( hostname )"
-RDEPEND="!<sys-apps/openrc-0.9.9.3
- selinux? ( sys-libs/libselinux )"
+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
@@ -37,18 +42,11 @@ maint_pkg_create() {
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
- local patches="${p}-patches-${PATCH_VER:-1}"
- local d="${T}/${patches}"
- mkdir "${d}"
- git format-patch -o "${d}" master..gentoo > /dev/null
- echo "From http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git";
> "${d}"/README
- tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
- rm -rf "${d}"
-
du -b "${T}"/*.tar.xz
}
@@ -65,20 +63,21 @@ set_opt() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-fix-header-assumptions.patch
- if [[ -n ${PATCH_VER} ]] ; then
- use old-output ||
EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
- EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
"${WORKDIR}"/${P}-patches-${PATCH_VER}
- fi
+ epatch "${FILESDIR}"/${PN}-fix-missing-iphdr.patch
}
src_configure() {
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_AFECONET 0
- set_opt SELINUX use selinux
+ 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
@@ -88,10 +87,7 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${ED}" install || die
- dodoc README README.ipv6 TODO
-}
-
-pkg_postinst() {
- einfo "etherwake and such have been split into net-misc/ethercard-diag"
+ # We need to use emake by hand to pass ED. #567300
+ emake DESTDIR="${ED}" install
+ dodoc README THANKS TODO
}
