summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Janda <felix.janda@posteo.de>2015-05-02 20:29:56 +0200
committerAnthony G. Basile <blueness@gentoo.org>2015-05-02 19:42:59 -0400
commit332127528f48142d43e330ba4466ede67b7b1831 (patch)
treef01d5723b629268df464e6d5ca65dcc4d61300e0
parentsys-apps/iproute2: bump to 3.19.0 (diff)
downloadhardened-dev-332127528f48142d43e330ba4466ede67b7b1831.tar.gz
hardened-dev-332127528f48142d43e330ba4466ede67b7b1831.tar.bz2
hardened-dev-332127528f48142d43e330ba4466ede67b7b1831.zip
net-misc/iputils: sync with tree -r1
-rw-r--r--net-misc/iputils/Manifest2
-rw-r--r--net-misc/iputils/iputils-20121221-r99.ebuild43
2 files changed, 25 insertions, 20 deletions
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index d269b7e8..61034fd1 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -15,5 +15,5 @@ AUX iputils-20121221-printf-size.patch 1671 SHA256 a1ed939d0e008bca06208ae34e3f1
AUX iputils-20121221-remove-rdisc-glibc-assumption.patch 770 SHA256 0639fca129c3e2ca57a7e0f0d3392474665e11f139cfa9362a365b3fca9593b2 SHA512 2ed65a0c0188cf6e06bfb5e3795fa720f7e7040533adbc1ce0c5ded435b823792790890826fc4250a6b2fba16576dc024c50d1faf9598f2fe36aadda77db8a36 WHIRLPOOL a656ae24a99bc5ee6356375be963324eb7fae6aa533e3a572f95bb4695200f2f66d2fa36e037a3c55ce95dcc1643bde4f80326c3cd32ccd53754dde639a1cbd8
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-20121221-r99.ebuild 3109 SHA256 f7eb7755fc4a959a19fb1aa5c41b91da45bcf388c66c60369d6d2891c39f2d65 SHA512 9daf2e298e70332706df09aa53e801a9cb127c1bb9fd4e1c0d597dfaeec31559bd44cf728e9135e12a9b78eda0d0b865a709ce32b8bce958a57da8453265b388 WHIRLPOOL 41771341b920afb27b2c41d04e19c8762c79b607a34952fc379a03e313e0aa7c0d257b86dca9a5e67a1b8df3f1593ae255a1bc017c92894a5079b3fe4e58c87a
+EBUILD iputils-20121221-r99.ebuild 3167 SHA256 ef88f7e5e925ddc3822ab5d655231f319ca704f2c895d6e30439a256910ef71e SHA512 f4bf6c5c5142ddf7c583e78f397a4ec86051398101eb79c710c08ea03eb341cdc0bbdd0c224225b165bf87cae053e9c5495cd271ddfa97d064c6a980a1cab1eb WHIRLPOOL 37919b7510ba487c3d4c68ba38b568e535932b674a3c634149e7fc9fa6beb07bfe71e5ce3a8c4eddf4a943b3773b2d1867822692bb4f60e1fce2a60462b9d6c8
MISC metadata.xml 386 SHA256 36462bcda28f18d127af12e2c6fdf58a813f3a5018a9151695892c1b706da52d SHA512 d7529383e575fbdbae4c96123530672192198cf1c4fc3a22097c42ddb3d179b8c99c67e274fbade85c68fc742d5792fb5286f40993f1099dc4694b1cf9942224 WHIRLPOOL 24417ef5492727316830ab0f208138c8ba41ae3e51b46e398297b1ed823f7d801e1cb4bb2ca6d87035f37a4072919073bd99dd8677cb67f3263258cb72184764
diff --git a/net-misc/iputils/iputils-20121221-r99.ebuild b/net-misc/iputils/iputils-20121221-r99.ebuild
index 9e53b7af..bccdd552 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
+}