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>[email protected]</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 +}
