Move traceroute6 to the traceroute package. Move arping/clockdiff to bin. Use new file capabilities to allow people to execute arping/clockdiff/ping/ping6.

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 137 insertions, 28 deletions

diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index f89a42cb702e..6b48949e0f0c 100644
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/iputils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.108 2013/01/26 17:14:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.109 2013/01/27 18:04:28 vapier Exp $
+
+*iputils-20121221-r1 (27 Jan 2013)
+
+  27 Jan 2013; Mike Frysinger <vapier@gentoo.org> +iputils-20121221-r1.ebuild,
+  iputils-99999999.ebuild:
+  Move traceroute6 to the traceroute package.  Move arping/clockdiff to bin.
+  Use new file capabilities to allow people to execute
+  arping/clockdiff/ping/ping6.
 
   26 Jan 2013; Mike Frysinger <vapier@gentoo.org>
   files/iputils-20121221-makefile.patch:
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 830c37f98f32..a99587c1359a 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -23,24 +23,25 @@ DIST iputils-s20101006.tar.bz2 94386 SHA256 fd3af46c80ebb99607c2ca1f2a3608b6fe82
 DIST iputils-s20121221-manpages.tar.bz2 23778 SHA256 6fc7ed7d281b7a2ee00e4f75e5465c90498c685bcc988afdff74db4eaa736d1c SHA512 006be62e61bf1555c99dbd5aac270cbd8d1074a3016fdde3aeed47e5c9b1acd326aa30a596c532d6688827f7f61966a6e3141eaa3b6f4f943eb21ac227282d8c WHIRLPOOL da0ccb577c4b2189553419df2c093404752fb2865eb3e0bfececfc242d930ceb44f96b32d945cfdd0c9ca060359651b2ec8479db5cc9220cda412dfeee5e910d
 DIST iputils-s20121221.tar.bz2 155344 SHA256 450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f SHA512 693d240becd766c345c3af2053fc0699b9358e54d667d40738c21d731b70e779112d81476a220d8300ca54250120385414a13610d445996f95a90571047389f4 WHIRLPOOL 64529180eb4b8e2f7a60c18df7cac49e10a4b7702514252d418b16dcdc10a85ccb0a7f8beb51274cc9d708be2026c4c136e720986795fd39d314e4f9d5590ec9
 EBUILD iputils-20101006-r2.ebuild 2887 SHA256 1b9c683f1532748b27ef1d14c462ee254234c755629135371815c7930ebb395e SHA512 6a2accea1c49891e3bcb483dd16ea6d0801c6eb59babdbb1ff488f40c940b76d2a56cefb46208836c67f1b18de4d090a72e36e37893cc1bccd3f68da75afc356 WHIRLPOOL c8301bed7a59a1422a75a4afa6723e2535e2ce522f4c2edc1cd82b1005dfc678647fc00f7a411d8a3faa0fa170b212b8cd49dbc8ddb7fed4b46f64084d73d994
+EBUILD iputils-20121221-r1.ebuild 2723 SHA256 57ed47d44859d0bd95ea91c7f7e3e75fbba4e9d64aa00075dd7e2edbd870b4f2 SHA512 717d0628edbf3f197cde30983ff1545d71b8200413972d01c896b914d5057402f63dbecca1551838ee6ef2bc42995bb6719dd427fc6064f0ed65bf7d901ac925 WHIRLPOOL 9cd73eca01a96a5771e60cc1b3d5f1b4aba3aed37b6b8820eef0a70cba6cdf34bc23bb2fccaa31e6ad66ceb0ca3bdbcbba1e5331a207c2071005cded2625d189
 EBUILD iputils-20121221.ebuild 2689 SHA256 9e4bc46f5ce15609dde501b5e9bfc83e13bf74db3b48c54a3483641c5dfea218 SHA512 83f0659c953bab41ebdffbce752db1a8c9ebd5c281a698c9ee0d316da13256176033b9a7f1e69551f5d334125f8a8e31b9705fff0a804a807e548cae601eaf5f WHIRLPOOL 107391dcf29f7ec3f03d4bd7f8ab00af12cc5cbc9411ff36fb1d23d892ee255fe8c91606b4c565cd04c75e0d1a87dad606ecc561478ffaec276cc069ebdbf630
-EBUILD iputils-99999999.ebuild 2633 SHA256 7f54a58cd9b028c627bbc406fe6f722d9528010c3621dd6327e9b49a2f56e24b SHA512 6aea77c5c0f2372cede36456d6586a9d25a94525ae103e1a6531ccc17d3e1467a8019fe000d83a3c2aff62c174c71eeb0022f3b44fb23b09a01621c02757f833 WHIRLPOOL b49042c05aa5f351abf85a657f5e7f3aad3c85d286823e04205f4b236f33b6bbe5454fdd7c4fabe9756de35452cc194c807d2259cb1eff7deafca8089394e23e
-MISC ChangeLog 16383 SHA256 eba8b7ad4c195fca17d13d7c9ffd23403ae2a5bcfda74919ffe771201b80638f SHA512 505002194223d87ea65e7e69e818a4d25afb2ba29488340e5dde0f879d809748f86de062b344047323f3de6df1619ddd263b6ef951200a6a1c0dbf630fa875a6 WHIRLPOOL 79665b357c3ede6cd6c696d6e7be11981e1ea19350db2897fb77445d3d96805f0d0293d6c3c3e5502e6ce8327f1e1dbb481a03999e078d3fc7b00446050afecd
+EBUILD iputils-99999999.ebuild 2664 SHA256 4f3e3f2f9f8d09262e93efb1776b9216911e163ae2e2a2e3347662a812b3be87 SHA512 13326fb83b483c1623e7ac4256f85a9bfda3fecb6ae8c5943e8e2cfdcfbd78b3d6250165df3e091c77662fba75a3d610b169fdf77a68b2c9975c21e34c756186 WHIRLPOOL 16727bfb83d71f68797de536f264b0284106c01108babded516df7cc011173ccf9a6deff62c6f11fcd964f3fffa184780a158221e58f94a27eb1bfa538001d8b
+MISC ChangeLog 16689 SHA256 8f4913ee81baae4f5d4d2e121ced919babf99831956d790e89eac955f3335b4f SHA512 172cfcf2d4ef9f68b945b01b33a354df8efa0f604990364d31aa609493d32acbdfd6ba8ecbe79cdc4dbe882eac14298ccc94f729cb849d420feb48ae28d0158d WHIRLPOOL c35538af7c3cadc6b62d9712fc91735289aa5b6241ce51872735a43cccac99d429b9684eb6c783c649e5743602be29aebdbf816793bdada854d846957dae4b7f
 MISC metadata.xml 299 SHA256 d028d4ba25f3ed29afbbf77abd924a617098bff71e6a0c37b7d6c0a24cd65a78 SHA512 25c1c360ecadd8f3cb4476635d94de097ef2d7c8a8e5b8305c1626246fc89e60b6cf7661002d85b37cd6f01594020e568f835d657e2318e417cd3859971d83f7 WHIRLPOOL adda1e0b6cd078dbf5740f575ff8d4a4ab108b3f06e192d6d948bf03a5d249013fb5d52d3069d8024e3c40b23d02f31ca219a2e91c1e28312324dd2f68eb7f11
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRBA75AAoJELEHsLL7fEFW7pIP/0hVJrM8twIOJI8nWMe5ujdR
-8TlRoI42oS4hGg54YZo6aIRz4nQaFy6zoJiVG9wQseHTKq8wXAhNir+Bh1r2H9Zc
-qiYydvf34s7MQ32OjAhwGiWiFMR4TEXX/SxJfSeQ49i5gFoJkuh/12/GVP5i+028
-G/sZ6TItv+uDxmTviDbtQKB0jWQEEvGaPGhGZ1XKpXr7SDS4O2pfv7TYiWnFeSXf
-iv0Gw0l1MFCu8U/FM06l/0YEWsIjIUBFg1t0g0pney+8qO0tB5s4oBaFRrja+pZy
-3HihKhJvARnxfRwcCoo55MxhNeCva2JgocXuNh+ewn5moCHHaAI+WrHLxqZMq4wy
-hEqNT0Dy2gJaVTHMU8Io4IusrkA4vh+PDroMyMj0thCqTLfQjZpmmsWwG/sT4VSn
-zbpHZyB6LG4s36BsPbpB/RbDtde03gMtHwi1GxbguPCLtpbgmhasnyOeH7tDoHr0
-xSG6qeXLJf3p3GuYtuk5bW+htpn1dQuv+8XBGHeTCoe5KTg+SXkGMoVuczRhFI4Z
-QRrq33G5rkTsxQKoI89UzGzFfnHksmWDl3Az8KmWmpK3DbXmZFd0I8utE2P2sQSr
-H+ccGzZioCzEiAHyiW+m/hc7sUiy6uDnIXa6HsV18vAgWzHRSHmlG7lr3PxDsTg9
-0wLAlrqhd9abpik/+N0A
-=z8so
+iQIcBAEBCAAGBQJRBWw4AAoJELEHsLL7fEFWQ7AP/1bPfR2Cd6/c5Md5XpTtjhZv
+jr4ZNCXBAZJ7acGFteT+tRDHKzek42z6pQHQ9w2VIzQlITFyLRF2O4Vgo7/DQltV
+To9jqiDnuYH/2d4tnEVxW94rhTqshMi/Mo+bjK5MvoyDyVci9Cdl/u9wn4UB7DHV
+RaYxLDwlLd8yKZjv7YtHNcy07QdjeCrN1+ebX5V3p9jyIMF1sLQ8XaRXammIYFwn
+6jaZyWwjsBAfRrhkqhUgQisqfrnku4sutnUsUJ30/2e88+d7sEOJMjdxogzmNoXy
+L0Z8Q1D/I5c6hHXMEV+M6TDDOE4DKU1LQ948TpHGqiY2uuw181fMHbhDWtWxwJim
+ExeLox/VUwIjHGIn0XWqwU1gKHed1JuC210HH/YY7G7deuQsNSeQS6kEFZ05cHVW
+TQCYW/9UZmnOMc8IcddPXpvcv37VYprvz/kHQ2PmZMyOj97SkjIRs7A3vN4oR0OX
+EMEhjQIfhXLatOEWqXA/bGoF5anPlVd9HYetlLlpt1HWxwP8OgriSZSwjleESTRX
+vWUgYnlatNN40gt8eRXo7LnOPs4cS8Nc+M/T6C/5M1z7tv3niSBjQNjemveDfB7E
+N95VXhVgvLHu9ClKU0grkPSe69a/mIprQx8UeHIymab208qmY0wE40764/pdA3RP
+/HHBD/elk0rTzls05jdD
+=5yXL
 -----END PGP SIGNATURE-----
diff --git a/net-misc/iputils/iputils-20121221-r1.ebuild b/net-misc/iputils/iputils-20121221-r1.ebuild
new file mode 100644
index 000000000000..dd6f85b4708f
--- /dev/null
+++ b/net-misc/iputils/iputils-20121221-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild,v 1.1 2013/01/27 18:04:28 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 ~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"
+SLOT="0"
+IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
+
+RDEPEND="!net-misc/rarpd
+	caps? ( sys-libs/libcap )
+	gnutls? ( net-libs/gnutls )
+	ssl? ( dev-libs/openssl )
+	idn? ( net-dns/libidn )"
+DEPEND="${RDEPEND}
+	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-makefile.patch
+	epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch
+	epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff
+	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	tc-export CC
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_IDN=$(usex idn) \
+		USE_GNUTLS=$(usex gnutls) \
+		USE_CRYPTO=$(usex ssl) \
+		$(use ipv6 || echo IPV6_TARGETS=)
+
+	if [[ ${PV} == "99999999" ]] ; then
+		emake -j1 html man
+	fi
+}
+
+ipv6() { usex ipv6 "$*" '' ; }
+
+src_install() {
+	into /
+	dobin arping ping $(ipv6 ping6)
+	into /usr
+	dobin clockdiff
+	dosbin rarpd rdisc ipg tftpd tracepath $(ipv6 tracepath6)
+
+	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
+}
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 694c550e8494..2e2dc19002b3 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.7 2013/01/25 05:28:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.8 2013/01/27 18:04:28 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
@@ -9,7 +9,7 @@
 
 EAPI="4"
 
-inherit flag-o-matic eutils toolchain-funcs
+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
@@ -69,25 +69,28 @@ src_compile() {
 	fi
 }
 
+ipv6() { usex ipv6 "$*" '' ; }
+
 src_install() {
 	into /
-	dobin ping
-	use ipv6 && dobin ping6
-	dosbin arping
+	dobin arping ping $(ipv6 ping6)
 	into /usr
-	dosbin tracepath
-	use ipv6 && dosbin trace{path,route}6
-	dosbin clockdiff rarpd rdisc ipg tftpd
-
-	fperms 4711 /bin/ping
-	use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6
+	dobin clockdiff
+	dosbin rarpd rdisc ipg tftpd tracepath $(ipv6 tracepath6)
 
 	dodoc INSTALL RELNOTES
 	use ipv6 \
 		&& dosym ping.8 /usr/share/man/man8/ping6.8 \
 		|| rm -f doc/*6.8
-	rm -f doc/setkey.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
+}