[gentoo-commits] proj/hardened-dev:musl commit in: net-misc/iputils/

[gentoo-commits] proj/hardened-dev:musl commit in: net-misc/iputils/

[Anthony G. Basile]

commit:     332127528f48142d43e330ba4466ede67b7b1831
Author:     Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sat May  2 18:29:56 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat May  2 23:42:59 2015 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-dev.git/commit/?id=33212752

net-misc/iputils: sync with tree -r1

 net-misc/iputils/iputils-20121221-r99.ebuild | 43 ++++++++++++++++------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/net-misc/iputils/iputils-20121221-r99.ebuild b/net-misc/iputils/iputils-20121221-r99.ebuild
index 9e53b7a..bccdd55 100644
--- a/net-misc/iputils/iputils-20121221-r99.ebuild
+++ b/net-misc/iputils/iputils-20121221-r99.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.ebuild,v 1.16 2014/01/18 05:37:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild,v 1.17 2015/04/25 00:34:24 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
@@ -28,10 +28,13 @@ IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
 
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn[static-libs(+)] )
-	ipv6? (
-		gnutls? ( net-libs/gnutls[static-libs(+)] )
-		ssl? ( dev-libs/openssl:0[static-libs(+)] )
-	)"
+	ipv6? ( ssl? (
+		gnutls? (
+			net-libs/gnutls[openssl(+)]
+			net-libs/gnutls[static-libs(+)]
+		)
+		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
+	) )"
 RDEPEND="!net-misc/rarpd
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
@@ -67,8 +70,7 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC
-	append-cppflags -I.
-	emake -j1 \
+	emake \
 		USE_CAP=$(usex caps) \
 		USE_IDN=$(usex idn) \
 		USE_GNUTLS=$(usex gnutls) \
@@ -80,25 +82,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
+}