From 46eedbedafdb0040c37884982d4c775ce277fb7b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Oct 2021 10:22:14 +0100 Subject: gentoo resync : 20.10.2021 --- net-misc/iputils/Manifest | 2 + .../files/iputils-20210722-fix-no-ipv6-ping.patch | 47 +++++ net-misc/iputils/iputils-20210722-r1.ebuild | 192 +++++++++++++++++++++ 3 files changed, 241 insertions(+) create mode 100644 net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch create mode 100644 net-misc/iputils/iputils-20210722-r1.ebuild (limited to 'net-misc/iputils') diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index 615a1da40136..57174f78a5af 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -1,9 +1,11 @@ +AUX iputils-20210722-fix-no-ipv6-ping.patch 2038 BLAKE2B ac403da299a9e407482396c1fb232bc16d388aec0f53954214ba9af982fb37f60140c179bd6a547a079bca63a9a9ccf1f0660ec6bee184a5db544959df94b103 SHA512 3d2bcc77d7e3cc433bdf9d7d84deb1471b6860167dbc0b0937b688762a183c7e8da5285a5c8fb09252322511601133721148f06edc64ee6f3e8f741d02182851 AUX iputils-20210722-optional-tests.patch 5276 BLAKE2B c485d39b06916acdaaec6f98ffeb718afbfd630af7220c7dfb408855a8862c2b121bbf4482621f633b86f1b94df78afc54157d99f2ff28cff833ae263aae5e78 SHA512 59d7ff881c03d7c03f5f41d2015f03175456487d9802999173f4705b3cfd7819957258e68a0b932fd9901f418bca866252d4a673d66f08b9e179a07ae84e8c40 DIST iputils-20210202.tar.gz 513055 BLAKE2B 37f3c10ff3918d40fe2eae1e4b19ed711b97c30cd2d682e42f484a11a28ab7c93975a51fbb7a8b1c1d725fc9051ae773bc2e81b9d80a2dd0e6ff55867d54875d SHA512 af600fe74e1b78c0da66c378f55eb468d62206aaae1864693f7ec79833c9c0de95843573d1792627695f08ecfcdb4e79c354065daf178d393fcc6ef9a8a5d526 DIST iputils-20210722.tar.gz 530745 BLAKE2B 4d6a2afaea1027e7992d374bbaa300f952f56225c998ecc6c3d332fef046dd8032e5afaff1cdc916d048f9d84cc8a85736a26a3176e66e111e02c9dbfcb0f195 SHA512 8f85bf468f8ef1e2832e9bbf9009552df4a6d723dd130fa0d5b2aa3bae617c972f936143c2370c3b4ce2ba2499828c91a299ee42cf81fa81aabe10552db2b328 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1 DIST iputils-manpages-20210722.tar.xz 19208 BLAKE2B 7d6b126debeee2a4e5437b7d26a9fee5c759ae72fa9b7acb1a04bb673f14af742f5580aad6ae1c34048933d95d09c4adcf024fabdc20851297131877cbfa10d0 SHA512 c1521e76f5b8cb99d7226ca1bd916b1861b6c0f9655ad0e396dd8d997be6cdc37ee0e81ac325ea4ebb3b349b394e7f1c45081ddc25b778fd294928a7b2dc0415 EBUILD iputils-20210202.ebuild 4210 BLAKE2B b090f1cd2ceff44eefe1491c796ee6851bfdc78aff2cdadadd808fdc554b6876e164d5d4c89819401e6f2c25b0177d9886700c3abaae042f52fbe707df156a29 SHA512 83f5a2327619765b9d768534ea688fde8099e45162209da26465ef6abe6f49483255ce9c1c862d3f9f2e18eeeffae7f3af0ca8291f2e0a744bee0f88669c3670 +EBUILD iputils-20210722-r1.ebuild 4589 BLAKE2B b87aacd353a2a9c3b55b981b17ca232a4b83641f2cb6a1517d0761c3c77995202aedd51709545068116ad11e75639cac6c3fd32a52f4921375bce161e74e383c SHA512 99aaa84707dc893fa3e9af8a4d326d342e098654efe28bbfccad1d7ca92ef0df7f2afa1d58a41bd8684169c7d009798ba456741df6322b398549268343b11879 EBUILD iputils-20210722.ebuild 4513 BLAKE2B 5d94157b66c766964d395df24eef93068f17ee892592e28412fa0f28596e30f07ce8c10654fd641fc8954a7faa9f97c677d09e20d6700ee3788e0ab56f2e6919 SHA512 32be9ad976dd770b14fa267a97171e21f44723afa4c413c1ba49819a6504e75b271c4f17c541f9d92d5791234960ecb7e75977a889cf0338ae95ede75ccc7b39 EBUILD iputils-99999999.ebuild 4440 BLAKE2B e752bc9085ee4a631a7c93b6f5a533bc2ea88009020aa336add86167cb68296a418e436af05469e06e8d11f6c49bf7bff9534e8258258d8eda5674e7011481bf SHA512 2b30c9bd6a5470381d016ab68338de9da471ebb0f351a19585543a33b77ab4f586a13590f592fc7b5c92a976d04ee9988c6da3d7d83ff15a55f295535021ac52 MISC metadata.xml 1510 BLAKE2B 773a096616c325fdef0d4fc5e5cc887d47ab3433be7efdcbfaf99e4d04f82d589ab759a7493e1cd10e80cc047c5288ee2200f7b21cfa24ab801f5b84688f5fd8 SHA512 4e207561d2d42f4bd07b6ded0729688883b6f8fa38d15734ab42ca66b1baac98bf283a71fb80f210f7a1732611e987e85084e615c4ef727126faa29acd154ae9 diff --git a/net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch b/net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch new file mode 100644 index 000000000000..61f9f5c03fd6 --- /dev/null +++ b/net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch @@ -0,0 +1,47 @@ +https://github.com/iputils/iputils/commit/79d713eab6181e219bf932b404706f6f59ff2539.patch +https://bugs.gentoo.org/818022 + +From: Byron Stanoszek +Date: Thu, 16 Sep 2021 23:38:54 +0200 +Subject: [PATCH] ping: Remove 'unsupported IPv6' warning on disabled IPv6 + +Regression was introduced in d141cb6 as introduced condition + +if ((errno == EAFNOSUPPORT && socktype == AF_INET6) || options & F_VERBOSE || requisite) + +was wrong, it should have been: + +if ((errno == EAFNOSUPPORT && family == AF_INET6 && requisite) || options & F_VERBOSE) + +but bug was hidden as `family == AF_INET6' was always false until +otherwise correct fix 904cdb6 ("ping: AF_INET6 is address family not +socket type [lgtm scan]") propagated the error. + +Tested on kernel booted with ipv6.disable=1 (disabling via sysctl, i.e. +sysctl -w net.ipv6.conf.all.disable_ipv6=1; sysctl -w net.ipv6.conf.default.disable_ipv6=1 +does not trigger the issue as it exit with "socket: Address family not +supported by protocol" - errno EADDRNOTAVAIL). + +Fixes: d141cb6 ("ping: work with older kernels that don't support ping sockets") +Closes: https://github.com/iputils/iputils/issues/293 +Closes: https://github.com/iputils/iputils/pull/370 + +Reported-by: lekto +Reviewed-by: Andrew Clayton +Reviewed-by: Petr Vorel +Signed-off-by: Byron Stanoszek +[ pvorel: create commit from Byron's patch on the issue, do analysis and wrote commit message ] +Signed-off-by: Petr Vorel +--- a/ping/ping.c ++++ b/ping/ping.c +@@ -150,8 +150,8 @@ static void create_socket(struct ping_rts *rts, socket_st *sock, int family, + /* Report error related to disabled IPv6 only when IPv6 also failed or in + * verbose mode. Report other errors always. + */ +- if ((errno == EAFNOSUPPORT && family == AF_INET6) || +- rts->opt_verbose || requisite) ++ if ((errno == EAFNOSUPPORT && family == AF_INET6 && requisite) || ++ rts->opt_verbose) + error(0, errno, "socket"); + if (requisite) + exit(2); diff --git a/net-misc/iputils/iputils-20210722-r1.ebuild b/net-misc/iputils/iputils-20210722-r1.ebuild new file mode 100644 index 000000000000..7d70dc9970a2 --- /dev/null +++ b/net-misc/iputils/iputils-20210722-r1.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2021 Gentoo Authors +# 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 dependencies. +# To regenerate man/html pages emerge iputils-99999999[doc] with +# EGIT_COMMIT set to release tag, all USE flags enabled and +# tar ${S}/doc folder. + +EAPI="7" + +PLOCALES="de fr ja pt_BR tr uk zh_CN" + +inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs + +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/${PV}.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 ~riscv ~s390 ~sparc ~x86 ~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 nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + test? ( sys-apps/iproute2 ) + nls? ( sys-devel/gettext ) +" + +LIB_DEPEND=" + caps? ( sys-libs/libcap[static-libs(+)] ) + idn? ( net-dns/libidn2:=[static-libs(+)] ) + nls? ( virtual/libintl[static-libs(+)] ) +" + +RDEPEND=" + traceroute6? ( !net-analyzer/traceroute ) + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) +" + +DEPEND=" + ${RDEPEND} + virtual/os-headers + static? ( ${LIB_DEPEND} ) +" + +if [[ ${PV} == "99999999" ]] ; then + BDEPEND+=" + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-ns-stylesheets + app-text/docbook-xsl-stylesheets + dev-libs/libxslt:0 + " +fi + +PATCHES=( + # Upstream; drop on bump + "${FILESDIR}"/${P}-optional-tests.patch + # Upstream; drop on bump + "${FILESDIR}"/${P}-fix-no-ipv6-ping.patch +) + +src_prepare() { + default + + plocale_get_locales > po/LINGUAS || die +} + +src_configure() { + use static && append-ldflags -static + + local emesonargs=( + -DUSE_CAP="$(usex caps true false)" + -DUSE_IDN="$(usex idn true false)" + -DBUILD_ARPING="$(usex arping true false)" + -DBUILD_CLOCKDIFF="$(usex clockdiff true false)" + -DBUILD_PING="true" + -DBUILD_RARPD="$(usex rarpd true false)" + -DBUILD_RDISC="$(usex rdisc true false)" + -DENABLE_RDISC_SERVER="$(usex rdisc true false)" + -DBUILD_TFTPD="$(usex tftpd true false)" + -DBUILD_TRACEPATH="$(usex tracepath true false)" + -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)" + -DBUILD_NINFOD="false" + -DNINFOD_MESSAGES="false" + -DNO_SETCAP_OR_SUID="true" + -Dsystemdunitdir="$(systemd_get_systemunitdir)" + -DUSE_GETTEXT="$(usex nls true false)" + $(meson_use !test SKIP_TESTS) + ) + + if [[ "${PV}" == 99999999 ]] ; then + emesonargs+=( + -DBUILD_HTML_MANS="$(usex doc true false)" + -DBUILD_MANS="true" + ) + else + emesonargs+=( + -DBUILD_HTML_MANS="false" + -DBUILD_MANS="false" + ) + fi + + meson_src_configure +} + +src_compile() { + tc-export CC + meson_src_compile +} + +src_test() { + if [[ ${EUID} != 0 ]]; then + einfo "Tests require root privileges; Skipping ..." + return + fi + + meson_src_test +} + +src_install() { + meson_src_install + + dodir /bin + local my_bin + for my_bin in $(usex arping arping '') ping ; do + mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die + done + dosym ping /bin/ping4 + + if use tracepath ; then + dosym tracepath /usr/bin/tracepath4 + fi + + if use ipv6 ; then + dosym ping /bin/ping6 + + if use tracepath ; then + dosym tracepath /usr/bin/tracepath6 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 + fi + fi + + if [[ "${PV}" != 99999999 ]] ; then + local -a man_pages + local -a html_man_pages + + while IFS= read -r -u 3 -d $'\0' my_bin + do + my_bin=$(basename "${my_bin}") + [[ -z "${my_bin}" ]] && continue + + if [[ -f "${S}/doc/${my_bin}.8" ]] ; then + man_pages+=( ${my_bin}.8 ) + fi + + if [[ -f "${S}/doc/${my_bin}.html" ]] ; then + html_man_pages+=( ${my_bin}.html ) + fi + done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null) + + pushd doc &>/dev/null || die + doman "${man_pages[@]}" + if use doc ; then + docinto html + dodoc "${html_man_pages[@]}" + fi + popd &>/dev/null || die + else + if use doc ; then + mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die + fi + fi +} + +pkg_postinst() { + fcaps cap_net_raw \ + bin/ping \ + $(usex arping 'bin/arping' '') \ + $(usex clockdiff 'usr/bin/clockdiff' '') +} -- cgit v1.2.3