vapier 15/04/25 01:47:55 Modified: metadata.xml iputils-99999999.ebuild ChangeLog Added: iputils-20121221-r2.ebuild Log: Add fix from upstream for checking tftpd set*id calls. Add USE flags to control all the utils (other than ping) as they are all fairly uncommon. Drop ipg entirely as it is a pretty useless script. Re-add support for traceroute via the new USE flag. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.4 net-misc/iputils/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/metadata.xml?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/metadata.xml?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/metadata.xml?r1=1.3&r2=1.4 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/iputils/metadata.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- metadata.xml 9 Jun 2013 23:01:13 -0000 1.3 +++ metadata.xml 25 Apr 2015 01:47:55 -0000 1.4 @@ -3,6 +3,13 @@ <pkgmetadata> <herd>base-system</herd> <use> + <flag name="arping">Build and install arping -- tool for sending ARP requests to peers (see also <pkg>net-analyzer/arping</pkg>)</flag> + <flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag> + <flag name="rarpd">Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems</flag> + <flag name="rdisc">Build and install rdisc -- server for the client side of the ICMP router discover protocol</flag> + <flag name="tftpd">Build and install tftpd -- server for the Trivial File Transfer Protocol (see also <pkg>net-ftp/tftp-hpa</pkg>)</flag> + <flag name="tracepath">Build and install tracepath -- tool for tracing network paths for discovering MTU values</flag> + <flag name="traceroute">Build and install traceroute -- tool for tracing network paths (see also <pkg>net-analyzer/traceroute</pkg>)</flag> <flag name="SECURITY_HAZARD">Allow non-root users to flood (ping -f). This is generally a very bad idea.</flag> </use> <upstream> 1.18 net-misc/iputils/iputils-99999999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild?rev=1.18&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild?rev=1.18&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild?r1=1.17&r2=1.18 Index: iputils-99999999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- iputils-99999999.ebuild 25 Apr 2015 01:05:42 -0000 1.17 +++ iputils-99999999.ebuild 25 Apr 2015 01:47:55 -0000 1.18 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.17 2015/04/25 01:05:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.18 2015/04/25 01:47:55 vapier Exp $ # For released versions, we precompile the man/html pages and store # them in a tarball on our mirrors. This avoids ugly issues while @@ -24,7 +24,7 @@ LICENSE="BSD-4" SLOT="0" -IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static" +IUSE="arping caps clockdiff doc gnutls idn ipv6 rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute" LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn[static-libs(+)] ) @@ -35,7 +35,8 @@ ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) )" -RDEPEND="!net-misc/rarpd +RDEPEND="rarpd? ( !net-misc/rarpd ) + traceroute? ( !net-misc/traceroute ) !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) @@ -56,9 +57,24 @@ epatch "${FILESDIR}"/${PN}-99999999-openssl.patch #335436 epatch "${FILESDIR}"/${PN}-99999999-tftpd-syslog.patch epatch "${FILESDIR}"/${PN}-20121221-makefile.patch + epatch "${FILESDIR}"/${PN}-20121221-parallel-doc.patch epatch "${FILESDIR}"/${PN}-20121221-strtod.patch #472592 use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch +} + +src_configure() { use static && append-ldflags -static + + IPV4_TARGETS=( + ping + $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done) + ) + IPV6_TARGETS=( + ping6 + $(usex tracepath 'tracepath6' '') + $(usex traceroute 'traceroute6' '') + ) + use ipv6 || IPV6_TARGETS=() } src_compile() { @@ -68,38 +84,54 @@ USE_IDN=$(usex idn) \ USE_GNUTLS=$(usex gnutls) \ USE_CRYPTO=$(usex ssl) \ - $(use ipv6 || echo IPV6_TARGETS=) + IPV4_TARGETS="${IPV4_TARGETS[*]}" \ + IPV6_TARGETS="${IPV6_TARGETS[*]}" if [[ ${PV} == "99999999" ]] ; then - emake -j1 html man + emake html man fi } -ipv6() { usex ipv6 "$*" '' ; } - src_install() { into / - dobin arping ping $(ipv6 ping6) + dobin ping $(usex ipv6 'ping6' '') + use ipv6 && dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8 + doman doc/ping.8 + into /usr - dobin clockdiff - dosbin rarpd rdisc ipg tftpd tracepath $(ipv6 tracepath6) - newinitd "${FILESDIR}"/rarpd.init.d rarpd - newconfd "${FILESDIR}"/rarpd.conf.d rarpd + local u + for u in arping clockdiff rarpd rdisc tftpd tracepath ; do + if use ${u} ; then + dosbin ${u} + doman doc/${u}.8 + fi + done + + if use tracepath && use ipv6 ; then + dosbin tracepath6 + dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8 + fi + + if use traceroute && use ipv6 ; then + dosbin traceroute6 + doman doc/traceroute6.8 + fi + + if use rarpd ; then + newinitd "${FILESDIR}"/rarpd.init.d rarpd + newconfd "${FILESDIR}"/rarpd.conf.d rarpd + fi dodoc INSTALL RELNOTES - use ipv6 \ - && dosym ping.8 /usr/share/man/man8/ping6.8 \ - || rm -f doc/*6.8 - rm -f doc/{setkey,traceroute6}.8 - doman doc/*.8 use doc && dohtml doc/*.html } pkg_postinst() { fcaps cap_net_raw \ - bin/{ar,}ping \ - $(ipv6 bin/ping6) \ - usr/bin/clockdiff + bin/ping \ + $(usex ipv6 'bin/ping6' '') \ + $(usex arping 'usr/bin/arping' '') \ + $(usex clockdiff 'usr/bin/clockdiff' '') } 1.143 net-misc/iputils/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/ChangeLog?rev=1.143&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/ChangeLog?rev=1.143&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/ChangeLog?r1=1.142&r2=1.143 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- ChangeLog 25 Apr 2015 01:05:42 -0000 1.142 +++ ChangeLog 25 Apr 2015 01:47:55 -0000 1.143 @@ -1,6 +1,18 @@ # ChangeLog for net-misc/iputils # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.142 2015/04/25 01:05:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.143 2015/04/25 01:47:55 vapier Exp $ + +*iputils-20121221-r2 (25 Apr 2015) + + 25 Apr 2015; Mike Frysinger <[email protected]> + +files/iputils-20121221-parallel-doc.patch, + +files/iputils-20121221-tftpd-setid.patch, + +files/iputils-20121221-tftpd-syslog.patch, +iputils-20121221-r2.ebuild, + iputils-99999999.ebuild, metadata.xml: + Add fix from upstream for checking tftpd set*id calls. Add USE flags to + control all the utils (other than ping) as they are all fairly uncommon. Drop + ipg entirely as it is a pretty useless script. Re-add support for traceroute + via the new USE flag. 25 Apr 2015; Mike Frysinger <[email protected]> +files/rarpd.conf.d, +files/rarpd.init.d, iputils-99999999.ebuild: 1.1 net-misc/iputils/iputils-20121221-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-20121221-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-20121221-r2.ebuild?rev=1.1&content-type=text/plain Index: iputils-20121221-r2.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r2.ebuild,v 1.1 2015/04/25 01:47:55 vapier Exp $ # For released versions, we precompile the man/html pages and store # them in a tarball on our mirrors. This avoids ugly issues while # building stages, and when the jade/sgml packages are broken (which # seems to be more common than would be nice). EAPI="4" inherit flag-o-matic eutils toolchain-funcs fcaps if [[ ${PV} == "99999999" ]] ; then EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils" inherit git-2 else SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2 mirror://gentoo/iputils-s${PV}-manpages.tar.bz2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils"; LICENSE="BSD-4" SLOT="0" IUSE="arping caps clockdiff doc gnutls idn ipv6 rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute" LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn[static-libs(+)] ) ipv6? ( ssl? ( gnutls? ( net-libs/gnutls[openssl(+)] net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) )" RDEPEND="rarpd? ( !net-misc/rarpd ) traceroute? ( !net-misc/traceroute ) !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) virtual/os-headers" if [[ ${PV} == "99999999" ]] ; then DEPEND+=" app-text/openjade dev-perl/SGMLSpm app-text/docbook-sgml-dtd app-text/docbook-sgml-utils " fi S=${WORKDIR}/${PN}-s${PV} src_prepare() { epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436 epatch "${FILESDIR}"/${PN}-20121221-crypto-build.patch epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347 epatch "${FILESDIR}"/${PN}-20121221-tftpd-setid.patch epatch "${FILESDIR}"/${PN}-20121221-tftpd-syslog.patch epatch "${FILESDIR}"/${PN}-20121221-makefile.patch epatch "${FILESDIR}"/${PN}-20121221-parallel-doc.patch epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff epatch "${FILESDIR}"/${PN}-20121221-strtod.patch #472592 use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch } src_configure() { use static && append-ldflags -static IPV4_TARGETS=( ping $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done) ) IPV6_TARGETS=( ping6 $(usex tracepath 'tracepath6' '') $(usex traceroute 'traceroute6' '') ) use ipv6 || IPV6_TARGETS=() } src_compile() { tc-export CC emake \ USE_CAP=$(usex caps) \ USE_IDN=$(usex idn) \ USE_GNUTLS=$(usex gnutls) \ USE_CRYPTO=$(usex ssl) \ IPV4_TARGETS="${IPV4_TARGETS[*]}" \ IPV6_TARGETS="${IPV6_TARGETS[*]}" if [[ ${PV} == "99999999" ]] ; then emake html man fi } src_install() { into / dobin ping $(usex ipv6 'ping6' '') use ipv6 && dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8 doman doc/ping.8 into /usr local u for u in arping clockdiff rarpd rdisc tftpd tracepath ; do if use ${u} ; then dosbin ${u} doman doc/${u}.8 fi done if use tracepath && use ipv6 ; then dosbin tracepath6 dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8 fi if use traceroute && use ipv6 ; then dosbin traceroute6 doman doc/traceroute6.8 fi if use rarpd ; then newinitd "${FILESDIR}"/rarpd.init.d rarpd newconfd "${FILESDIR}"/rarpd.conf.d rarpd fi dodoc INSTALL RELNOTES use doc && dohtml doc/*.html } pkg_postinst() { fcaps cap_net_raw \ bin/ping \ $(usex ipv6 'bin/ping6' '') \ $(usex arping 'usr/bin/arping' '') \ $(usex clockdiff 'usr/bin/clockdiff' '') }
