From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- net-misc/iputils/Manifest | 9 +- net-misc/iputils/iputils-20171016_pre.ebuild | 178 --------------------------- net-misc/iputils/iputils-20180629.ebuild | 8 +- net-misc/iputils/iputils-99999999.ebuild | 8 +- net-misc/iputils/metadata.xml | 3 +- 5 files changed, 12 insertions(+), 194 deletions(-) delete mode 100644 net-misc/iputils/iputils-20171016_pre.ebuild (limited to 'net-misc/iputils') diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index 440f75f23c6d..56690952f9ec 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -5,11 +5,8 @@ AUX iputils-99999999-musl.patch 1799 BLAKE2B d178697fd3f3dad9977b15d5a48f3742408 AUX iputils-99999999-tracepath46.patch 824 BLAKE2B c964390aad46b75bda363ca77a87f90856a5a7f23e7b66bacd640034e09b07620f413bde16c1879659d2f01ea9d99ace664141907406239e58841e0ffcda3097 SHA512 65638246a73334640b02a136aa55a4a709d7c4639c57b7634d5595ec40d4bc9c41068a1469a76d22d0a216e9a2c8a52f7840432c435f40ee7035981494d0a443 AUX rarpd.conf.d 250 BLAKE2B 5370ad1151911132ffff03952bc74ba2727eb71fb824b0d3f6ccd6dfad3aafd9c6ab2e0a4171ce2b34fd716d982362778c88154e5028db48836d4cc6c62b7c69 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338 AUX rarpd.init.d 583 BLAKE2B 527579b7cc8211af9910702ff730b0911cd84dc2efe8c5272b78e8be5bf656ee7a938a3c3cdaa6a1b8e51fa221f6ff71f3cef4e48b932995b0e66a35a5d7a838 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada -DIST iputils-20171016_pre.tar.gz 195254 BLAKE2B 1170db29d53dd8285b11d4df7b7da2ea3bd2be3599a3f0df85ca7e64247f2a534d03e43a2b6267ba4b9c0b65fcc58045151833ae2c1035a839ed728a389804af SHA512 570896fc58d945e08032134701ab6ea02bbf6fff420437bc5f89687cdcce6f3c1c64418a4c5ff54ca3cdc582bae2c95e196b2c8368eba2b163ebf88490aabf99 DIST iputils-20180629.tar.gz 195094 BLAKE2B 81bf6ef427eac0769ea3f95c20294b46c81f9c619551234eb265b3a428998a96cf3df0cdc7499f9eea280c1999e899e87c3f4a863141de251a9c509840bc83b3 SHA512 16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476 -DIST iputils-manpages-20171016_pre.tar.xz 29764 BLAKE2B 47def1413b2cdcfba7f924dd7a045063c289c244ba8fb4dc43caf2a8d52032b57ee6d86ee4dffd5351faa3124d4c83a33ca3365866568c2164b374eed9d70ec0 SHA512 31b4b0b4e46d7c98530577392c636e4397917cbe415762145a119e68e3223bc85b9d5afcfe61ae01584a35f6a1a772adffc52deeedc722c474179fa1d208d8d9 DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a -EBUILD iputils-20171016_pre.ebuild 4082 BLAKE2B 8c9aedbe404bd31ddcb466b93eb6272eebba0e3fa18f7a0de285dd7aa007894614a47a9cab018f6c5546a172ca3ae240b7fdcf6196eb3cdd7a6fcfc6d34cd652 SHA512 08f92d29d3baeb0eadac360b5a7f81e550d264fda70945b416d38ae39239e75ef201587d7466d6a9431df1a4be28c62e59d11b685fc811f40f1c755bbae2637d -EBUILD iputils-20180629.ebuild 3957 BLAKE2B ba1c3f2756dbbfc6a597757faac29b5c6f0764fb0b2033f2696c4261e5247dd281dcb86f95794e0ef89e3d07683242a08daab3acedccf5911219417b5b569f2c SHA512 a36103a6be134a2d8fd1d7469ecf061b423088a8241715066074aeafacd0ab613ac3cef4689b1c2aae21d12b0ebeb39354f0205c63aef6dbd797b64542e0c6ca -EBUILD iputils-99999999.ebuild 3939 BLAKE2B 9b6d7d78854369cba6255685f634ed526bf97d4a195a0bec0271f8f40a63aa671f26168dd33e99bf9c1db8398acee79205a025b04edf7865d67a76fd1190b756 SHA512 22ba0bcb65f8b13800f2a14f901fc0140c02f4d22c2e96624a381b59d3ba9fe5f385cf6e4bb6d3a32659d6b3aa9dc2bfb8f26b67e3c9f50ffe41094cf4712734 -MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc +EBUILD iputils-20180629.ebuild 3961 BLAKE2B e0b5f36700a92f1f726ad6f90f940c4aca7794eba84876fadc1a8ba0b845da2f6a8481c51176a15a0a422d0016b3976aa186b64ac264c33903adad770758806d SHA512 7d2eaf95e383649321de12fcd6570f481c33ca0c806a9d25a0465ff4ea924e2f56d767a4e95bc0b19ad5d27102f7f4f87954de38143eef2656b4a3d6115db9a1 +EBUILD iputils-99999999.ebuild 3942 BLAKE2B 5c5a4245c40fb6a140a63213d84dc23dae7edd44804606ae2bddf4d7083fa8d988e2a88ab35559a1ceb0c4b5cdabee02348c0d6d264bf46128ed974c42b86e81 SHA512 1b7f88def1b6b3f42e1f81c9a2b2daff7c72ea7c67f348b011103b846b2de6cced4caf94b956e0e5e3d830430450f9aaf9795b7aa4d53fae75b1ed3a1446c899 +MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e diff --git a/net-misc/iputils/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild deleted file mode 100644 index 8d1bbffafa10..000000000000 --- a/net-misc/iputils/iputils-20171016_pre.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# 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 reduces depedencies. -# To regenerate man/html pages emerge iputils-99999999[doc] with -# EGIT_COMMIT set to release tag and tar ${S}/doc folder. - -EAPI="6" - -inherit flag-o-matic toolchain-funcs fcaps - -MY_COMMIT="67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf" - -PATCHES=( - "${FILESDIR}"/${PN}-99999999-tracepath46.patch - "${FILESDIR}"/${PN}-99999999-musl.patch -) - -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="https://github.com/iputils/iputils.git" - inherit git-r3 -else - SRC_URI="https://github.com/iputils/iputils/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" - 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="https://wiki.linuxfoundation.org/networking/iputils" - -LICENSE="BSD GPL-2+ rdisc" -SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl 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? ( - gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) - nettle? ( dev-libs/nettle[static-libs(+)] ) - openssl? ( - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - ) )" -RDEPEND="arping? ( !net-misc/arping ) - rarpd? ( !net-misc/rarpd ) - traceroute? ( !net-analyzer/traceroute ) - !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - virtual/os-headers -" -if [[ ${PV} == "99999999" ]] ; then - DEPEND+="app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - " -fi - -REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )" - -[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" - -S="${WORKDIR}/${PN}-${MY_COMMIT}" - -src_prepare() { - use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch ) - - default -} - -src_configure() { - use static && append-ldflags -static - - TARGETS=( - ping - $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done) - ) - if use ipv6 ; then - TARGETS+=( - $(usex traceroute 'traceroute6' '') - ) - fi - - myconf=( - USE_CRYPTO=no - USE_GCRYPT=no - USE_NETTLE=no - ) - - if use ipv6 && use ssl ; then - myconf=( - USE_CRYPTO=$(usex openssl) - USE_GCRYPT=$(usex gcrypt) - USE_NETTLE=$(usex nettle) - ) - fi -} - -src_compile() { - tc-export CC - emake \ - USE_CAP=$(usex caps) \ - USE_IDN=$(usex idn) \ - IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \ - TARGETS="${TARGETS[*]}" \ - ${myconf[@]} - - if [[ ${PV} == "99999999" ]] ; then - emake man - - use doc && emake html - fi -} - -src_install() { - into / - dobin ping - dosym ping /bin/ping4 - if use ipv6 ; then - dosym ping /bin/ping6 - dosym ping.8 /usr/share/man/man8/ping6.8 - fi - doman doc/ping.8 - - if use arping ; then - dobin arping - doman doc/arping.8 - fi - - into /usr - - if use tracepath ; then - dosbin tracepath - doman doc/tracepath.8 - dosym tracepath /usr/sbin/tracepath4 - fi - - local u - for u in clockdiff rarpd rdisc tftpd ; do - if use ${u} ; then - case ${u} in - clockdiff) dobin ${u};; - *) dosbin ${u};; - esac - doman doc/${u}.8 - fi - done - - if use tracepath && use ipv6 ; then - dosym tracepath /usr/sbin/tracepath6 - dosym tracepath.8 /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.md - - use doc && dodoc doc/*.html -} - -pkg_postinst() { - fcaps cap_net_raw \ - bin/ping \ - $(usex arping 'bin/arping' '') \ - $(usex clockdiff 'usr/bin/clockdiff' '') -} diff --git a/net-misc/iputils/iputils-20180629.ebuild b/net-misc/iputils/iputils-20180629.ebuild index a667ae038ad9..9624d0deee75 100644 --- a/net-misc/iputils/iputils-20180629.ebuild +++ b/net-misc/iputils/iputils-20180629.ebuild @@ -32,7 +32,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" LICENSE="BSD GPL-2+ rdisc" SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute" +IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6" LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn2:=[static-libs(+)] ) @@ -51,7 +51,7 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) " RDEPEND="arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) - traceroute? ( !net-analyzer/traceroute ) + traceroute6? ( !net-analyzer/traceroute ) !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) @@ -82,7 +82,7 @@ src_configure() { ) if use ipv6 ; then TARGETS+=( - $(usex traceroute 'traceroute6' '') + $(usex traceroute6 'traceroute6' '') ) fi @@ -156,7 +156,7 @@ src_install() { dosym tracepath.8 /usr/share/man/man8/tracepath6.8 fi - if use traceroute && use ipv6 ; then + if use traceroute6 && use ipv6 ; then dosbin traceroute6 doman doc/traceroute6.8 fi diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index ccc540e0855c..848259357631 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # For released versions, we precompile the man/html pages and store @@ -25,7 +25,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" LICENSE="BSD GPL-2+ rdisc" SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute" +IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6" LIB_DEPEND=" caps? ( sys-libs/libcap[static-libs(+)] ) @@ -46,7 +46,7 @@ LIB_DEPEND=" RDEPEND=" arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) - traceroute? ( !net-analyzer/traceroute ) + traceroute6? ( !net-analyzer/traceroute ) !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) " DEPEND=" @@ -88,7 +88,7 @@ src_configure() { -DENABLE_RDISC_SERVER="$(usex rdisc true false)" -DBUILD_TFTPD="$(usex tftpd true false)" -DBUILD_TRACEPATH="$(usex tracepath true false)" - -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute true false) false)" + -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)" -DBUILD_NINFOD="false" -DNINFOD_MESSAGES="false" -DBUILD_HTML_MANS="$(usex doc true false)" diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml index 8fb0527115b6..6d135dfdb422 100644 --- a/net-misc/iputils/metadata.xml +++ b/net-misc/iputils/metadata.xml @@ -10,12 +10,11 @@ Build and install clockdiff -- tool for comparing clocks via ICMP packets Use dev-libs/libgcrypt for md5 support Use dev-libs/nettle for md5 support - Use dev-libs/openssl for md5 support Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems Build and install rdisc -- server for the client side of the ICMP router discover protocol Build and install tftpd -- server for the Trivial File Transfer Protocol (see also net-ftp/tftp-hpa) Build and install tracepath -- tool for tracing network paths for discovering MTU values - Build and install traceroute -- tool for tracing network paths (see also net-analyzer/traceroute) + Build and install deprecated traceroute6 tool. It's recommended to use net-analyzer/traceroute instead. Allow non-root users to flood (ping -f). This is generally a very bad idea. -- cgit v1.2.3