public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/musl:master commit in: sys-apps/net-tools/, sys-apps/net-tools/files/
@ 2016-11-11 20:45 Aric Belsito
  0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2016-11-11 20:45 UTC (permalink / raw
  To: gentoo-commits

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
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/net-tools/, sys-apps/net-tools/files/
@ 2016-11-12  1:25 Aric Belsito
  0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2016-11-12  1:25 UTC (permalink / raw
  To: gentoo-commits

commit:     51982ff069705ef922f8314a94a1a9c08927ff70
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sat Nov 12 01:23:55 2016 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sat Nov 12 01:23:55 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=51982ff0

sys-apps/net-tools: Add 1.60_p20161110235919

Redefinition of symbols with linux-headers-4.8

 sys-apps/net-tools/Manifest                        |  4 +
 .../net-tools/files/net-tools-fix-headers.patch    | 11 +++
 sys-apps/net-tools/metadata.xml                    | 18 +++++
 .../net-tools-1.60_p20161110235919.ebuild          | 93 ++++++++++++++++++++++
 4 files changed, 126 insertions(+)

diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
new file mode 100644
index 0000000..a2f7202
--- /dev/null
+++ b/sys-apps/net-tools/Manifest
@@ -0,0 +1,4 @@
+AUX net-tools-fix-missing-iphdr.patch 440 SHA256 afb19b145fb04d5a2c8924bd166521584660da5b65a7ccd9479adcffc10f0d5e SHA512 a1e2b961407a2baa9399d72c3b401fa683b883187c23a287b8b50b15bc6486e5e25713d4e08217dbda54d10789a74deecdd4bf97699f9adc2e9938076bc85705 WHIRLPOOL 24d88e1efea221810565f6b460b8e94d1ff6167fe340dc755be31f1decf77987d9b3d0aa7bea73f0e1ecf02e1f756f24c014cfc9c5fea0b7a4c793140f07994b
+DIST net-tools-1.60_p20161110235919.tar.xz 227552 SHA256 d9b52abb6bbf3305fde1fe414059602371a7819b214206312f6b16a2fde46fcd SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01 WHIRLPOOL 413553072466cee79c1f231742d6256f97d9a9e84647ee27aed97cf01eee16fd621c67fa67523174bcc0dd0c5f6181d2f6fcc698e3268fc9996eb2cbc7db1070
+EBUILD net-tools-1.60_p20161110235919.ebuild 2494 SHA256 dd2388e454d03e0c06c55fc8ac0952afb8630629c3004b2597f5107e13e7f1eb SHA512 61a5d11e8e49d9b11b114c65686f478f1c0f781c208aaf39bd4539d614f47c48ace7180be1c051c539c5a2dc68702769dedac5f1c551eba154f6206defba66b1 WHIRLPOOL 74f6a616df62b34a38eb42c0f36db68e44bae581a206af54049f64e97e03958fefa54a2c296cf065f529905247a0c9fbfc97a1a745be531b2dff9726f53d93b5
+MISC metadata.xml 793 SHA256 2a9d27804bddb600311bd8d4edf07afaacac012b6a7a793169ed5bd483573b28 SHA512 f253af424192fc88818ddf125a7f2b6bc6ababe6bdd875db0fad0779aaae31a02062cc12788074ec1bf4063cdd20c15ca3f1a464af8b1f18f0b708672575e9ea WHIRLPOOL 8decaf2b8727ce6f5499c818f254db3b8291b04e73774d2b706179bb9fc39d9fdeb2b49c4e3d0e4afdcd32e3a0195ebceffe1b3d51dd894d50bf07828b6990b6

diff --git a/sys-apps/net-tools/files/net-tools-fix-headers.patch b/sys-apps/net-tools/files/net-tools-fix-headers.patch
new file mode 100644
index 0000000..d2b7fd0
--- /dev/null
+++ b/sys-apps/net-tools/files/net-tools-fix-headers.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-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
new file mode 100644
index 0000000..d539cc5
--- /dev/null
+++ b/sys-apps/net-tools/metadata.xml
@@ -0,0 +1,18 @@
+<?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="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>
+</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
new file mode 100644
index 0000000..80c8e9d
--- /dev/null
+++ b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}"/${PN}-fix-headers.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_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
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/net-tools/, sys-apps/net-tools/files/
@ 2017-03-02 18:40 Aric Belsito
  0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2017-03-02 18:40 UTC (permalink / raw
  To: gentoo-commits

commit:     230c0365e3a9de3c6d792e66fc60391425d7c6ec
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Mar  2 18:21:09 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Mar  2 18:40:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=230c0365

sys-apps/net-tools: sync with upstream

appease repoman

 sys-apps/net-tools/Manifest                        |  5 ++--
 ...235919-fix-building-w-older-linux-headers.patch | 32 ++++++++++++++++++++++
 sys-apps/net-tools/metadata.xml                    |  1 -
 .../net-tools-1.60_p20161110235919.ebuild          |  5 +++-
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 35ba16e..4cf5e36 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,4 +1,5 @@
+AUX net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch 947 SHA256 82c038f251a5bec7c5f3b22026b968dcaea396c7599c8a847b5d79f08f6dfe38 SHA512 a334bdac0dd86d94c1db9b841db3742df72d0d69d45f618b867839b0d2c99ade47b74e98f423e574af053de7a8478f04b77282ba04f437b5a9e271ea77878c50 WHIRLPOOL f4372049a06740e7054d55000bcbf5d765c8576c33d730e2a8277175e40d7f681fc82f83cbf17d95a27ed9fc4a23f4d4be1c32db0495f3b8970d5a6dc2240e0d
 AUX net-tools-fix-headers.patch 462 SHA256 e010c3fba22db3b040f5b68b791ecc3ee4892702650b1a5737a3ad6a67a2d247 SHA512 e4bf76c0f3988445d2d7bb49c8ae2aaf24d066b1060806e38c5d2764dbbe5141de58dc0d58fe34894bcde987b758178dfcff5334fcc2dabc8ec019753e931f16 WHIRLPOOL 26325db6f3d36a59f6bdee72781d19bde51c832b5d892f75ba1df77aae14beed7f4c99d4070f43af6a92e288ee070c92ef4cca11290294539d113d2f00b59b5e
 DIST net-tools-1.60_p20161110235919.tar.xz 227552 SHA256 d9b52abb6bbf3305fde1fe414059602371a7819b214206312f6b16a2fde46fcd SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01 WHIRLPOOL 413553072466cee79c1f231742d6256f97d9a9e84647ee27aed97cf01eee16fd621c67fa67523174bcc0dd0c5f6181d2f6fcc698e3268fc9996eb2cbc7db1070
-EBUILD net-tools-1.60_p20161110235919.ebuild 2488 SHA256 d45e6cb73dd928791c314f7f59636b215df3a87a8bce1756893717b039a485a5 SHA512 553802110461a53a7fd63d53fe11e5317f8617d68a96d77abc77a231e527239a1a2ff3729e8dc13e66797b97dc6482b106ab2ee5eca31bdbb9a8cb231966261f WHIRLPOOL f73005497bc1e1c257bd9166cdfeb0d76391f21ce6287e7308d6e804d537941e86a1a8a69a638786c1210fa50907b618cdafa52a76eb82b0ea890b7acb6d7396
-MISC metadata.xml 793 SHA256 2a9d27804bddb600311bd8d4edf07afaacac012b6a7a793169ed5bd483573b28 SHA512 f253af424192fc88818ddf125a7f2b6bc6ababe6bdd875db0fad0779aaae31a02062cc12788074ec1bf4063cdd20c15ca3f1a464af8b1f18f0b708672575e9ea WHIRLPOOL 8decaf2b8727ce6f5499c818f254db3b8291b04e73774d2b706179bb9fc39d9fdeb2b49c4e3d0e4afdcd32e3a0195ebceffe1b3d51dd894d50bf07828b6990b6
+EBUILD net-tools-1.60_p20161110235919.ebuild 2625 SHA256 3b66724157da9f8841e011863d3d71586b4988a4871d832f25ca4e40e36e9f0f SHA512 06bf7af9d22c18a88fc055ddcc86204236eef810888b6dae2d526e13daa6405d985f4b1a654a9e209920cc12841dac5be35040001f5d4d786fd3572fb042faef WHIRLPOOL 57dccddbe0e3f965b92feefac47b54a9e77fef03c7e7bf2aed6d1149561df12b4cf8b485b2df93d20e87ef5eaf2adc0db68bba4c9784f7cdd466e43e03a1f288
+MISC metadata.xml 687 SHA256 45ba9bb6b36c67c8defd1fb62b6a72c6a173c4aa37ccbbb391e161580bf7a938 SHA512 ef16e4cde591fcc5815fb7fee106e007bea128f52b05a71d050956df586e8037e58d6eb3bdd00ef4a0b9d55ddaea4c29d6a0ce12409a515e638452fc932e2037 WHIRLPOOL 90a45c8083bc23d64ab3f3f3d4799803952c40b49cd27d965ee2be9c08df3debd42adcc090ec8e810953ac47f14eeeb3b96176c2a09d0cd72158e14c05ef0640

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
new file mode 100644
index 0000000..0109940
--- /dev/null
+++ b/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch
@@ -0,0 +1,32 @@
+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,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/metadata.xml b/sys-apps/net-tools/metadata.xml
index d539cc5..5335830 100644
--- a/sys-apps/net-tools/metadata.xml
+++ b/sys-apps/net-tools/metadata.xml
@@ -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-1.60_p20161110235919.ebuild
index 80c8e9d..fea4979 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 
@@ -64,9 +63,13 @@ set_opt() {
 
 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'


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/net-tools/, sys-apps/net-tools/files/
@ 2018-12-20 18:41 Anthony G. Basile
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2018-12-20 18:41 UTC (permalink / raw
  To: gentoo-commits

commit:     e90fedffa23e37c8a97ac56e6a52cd16c42c63c8
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 20 18:41:23 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Dec 20 18:41:23 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=e90fedff

sys-apps/net-tools: fix the header patch

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../net-tools/files/net-tools-fix-headers-r1.patch    | 19 +++++++++++++++++++
 .../net-tools/net-tools-1.60_p20180626073013.ebuild   |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

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
new file mode 100644
index 0000000..f4ce1f6
--- /dev/null
+++ b/sys-apps/net-tools/files/net-tools-fix-headers-r1.patch
@@ -0,0 +1,19 @@
+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/net-tools-1.60_p20180626073013.ebuild b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
index 117b7b2..88255ba 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
@@ -33,7 +33,7 @@ RDEPEND+="
 	!<sys-apps/openrc-0.9.9.3"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-fix-headers.patch"
+	"${FILESDIR}/${PN}-fix-headers-r1.patch"
 	)
 
 maint_pkg_create() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-20 18:41 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-02 18:40 [gentoo-commits] proj/musl:master commit in: sys-apps/net-tools/, sys-apps/net-tools/files/ Aric Belsito
  -- strict thread matches above, loose matches on Subject: below --
2018-12-20 18:41 Anthony G. Basile
2016-11-12  1:25 Aric Belsito
2016-11-11 20:45 Aric Belsito

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox