diff options
Diffstat (limited to 'net-misc/iputils')
| -rw-r--r-- | net-misc/iputils/Manifest | 3 | ||||
| -rw-r--r-- | net-misc/iputils/files/iputils-20190515-fix-setcap.patch | 67 | ||||
| -rw-r--r-- | net-misc/iputils/iputils-20190515.ebuild | 4 |
3 files changed, 72 insertions, 2 deletions
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index 51571a4acb0b..e30caff7b87b 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -1,6 +1,7 @@ AUX iputils-20150815-nonroot-floodping.patch 406 BLAKE2B 18c9adf92bb64ddae4a62aaf280a858e1ade2d34938f29026bc62c6b0b43919c26a909f2997d7caaaa5e9c82f139c8bc2aefc752aceeff6fe5f15f0c7b53618c SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34 AUX iputils-20180629-fix-ping-on-musl.patch 1514 BLAKE2B 32085fa6a7b21a6d5d0d5bba9ca59931f01489dd69ef57f1422e95d3fb2cac151fbfd437b933feb00753a6d3f3eaa0c63ed7eea81021e8a1bb8b26ec7dd6584d SHA512 d78aeaf4c746412855344b248c518218570103c082afd6fe8ee0c38ae2bf9a33d34c85ce5a846accd6442f8ec0f7a8727b5b747bd8a5adada53e1188e6e770df AUX iputils-20180629-musl.patch 1718 BLAKE2B cd701f102a57743ba5494645c78b5c70004623530d8c82f20b2dc6b7d006c422fc23ac9493040ab9eccbcf87874b8db6ab394620a4ea61a7eb2e33e32761290f SHA512 0f623a1644592211b8935b6a7556a2a2c95151ac9b291e574bb1e9a5371fd72f27994867f8d599bca22a402627213807338d6cac17d17e7d175eab847658398d +AUX iputils-20190515-fix-setcap.patch 1706 BLAKE2B e90392bfe79201cbf88e2c6356b9f24d014e845cd65b29d66532dcabc8672df7f47e2bde0d6f267c4aff63f55bd4949ac91ab9d411c71c183586cbe47d6064f9 SHA512 769111d6bfd124d37125554993ea8c47dde2f6d917226597af9521db92fc31417b48648945bffb54f11201f230cb46d820f5a1ded027e1ee8e781d935841507b AUX rarpd.conf.d 250 BLAKE2B 5370ad1151911132ffff03952bc74ba2727eb71fb824b0d3f6ccd6dfad3aafd9c6ab2e0a4171ce2b34fd716d982362778c88154e5028db48836d4cc6c62b7c69 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338 AUX rarpd.init.d 583 BLAKE2B 527579b7cc8211af9910702ff730b0911cd84dc2efe8c5272b78e8be5bf656ee7a938a3c3cdaa6a1b8e51fa221f6ff71f3cef4e48b932995b0e66a35a5d7a838 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada DIST iputils-20180629.tar.gz 195094 BLAKE2B 81bf6ef427eac0769ea3f95c20294b46c81f9c619551234eb265b3a428998a96cf3df0cdc7499f9eea280c1999e899e87c3f4a863141de251a9c509840bc83b3 SHA512 16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476 @@ -8,6 +9,6 @@ DIST iputils-20190515.tar.gz 403228 BLAKE2B cebe2460ac4da5471a9b8e655bed1c1640f6 DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a DIST iputils-manpages-20190515.tar.xz 27556 BLAKE2B adf3eb5c7f3fd71fa24ff48daffd367ba6abc0377bca45ddc439803d177bf668f7dfc7bd3da7a06e89d9ffdd68f2bb0dbb9aa0ac150c98cd1f2b207a68d4fb46 SHA512 4013fe05c592ccc09d6b947ee59d56515bfe49e9a9d5610225d4a2b8c5034a7f1e8dc41c214cf03ce909d36bc5a8438541ad302cddeb1f0b4359a9b9c85ad4b2 EBUILD iputils-20180629.ebuild 3968 BLAKE2B 34a3f150c222ae7e39771337309a79db140b83f04c6c363a19111c1698ea136e7afcd3c348793e2b51fe0e3d353268cf7bc46a53815568c0bbf8b45ce200b1d9 SHA512 701b6b4fa3fcce5fe59ca72011143bd36744658ed94f15b6cad411115029701efe63798e6e61191d8819daa624a603807509299b9b54e9e46e67dc2c01f1574c -EBUILD iputils-20190515.ebuild 4868 BLAKE2B 26eb7037439ff9747d0bdfe0616d6373c09b5eacafd8c98cb659d88de8ce904931ec51ae81672ce3663807966acbffa6c0254db7d8ace62e45859d5c96ac8701 SHA512 598a5f21bd2418eda8b2cb0c5d45ab2dfb82f4b9695530a4e32f42072e57b0da9188df175aeaf93f206949a2771d76d77e2ecb2b67fdca181cdac86b66ff7f90 +EBUILD iputils-20190515.ebuild 4916 BLAKE2B c432eba2ed92debe453da5433a91c471cc4efda6ce8540820658421f07fde827a11f9f4efe281c60e9e83741a2823eda1a2bf6354c9d8c3b4be2f75a6e442e66 SHA512 2235ff71f13c2b8be707d2f14f7077adc315b080b6d38dc09d9299f7a398aaf0e7b9f72b7e44a207654619adc9fbf8ac590d2bdcba74c37d3bb1d0273a4e9ac2 EBUILD iputils-99999999.ebuild 4875 BLAKE2B da3098c6ec01c92e7e4b773188a70d020c43c37f6f9c1428c13f99a166589716e339eb3adabc4675c2a3b3e0840423f3eb47672ef431f13c848e4b4a218a3080 SHA512 0cbc2050d94d55a775d5d5ef8263e19b7016bce9c924ff4b5aed74bbd9ae0ee29079b3f536107f71683341ccee6044631ef3212ee01b26076e034c759d23974b MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e diff --git a/net-misc/iputils/files/iputils-20190515-fix-setcap.patch b/net-misc/iputils/files/iputils-20190515-fix-setcap.patch new file mode 100644 index 000000000000..6e9c7c6a8354 --- /dev/null +++ b/net-misc/iputils/files/iputils-20190515-fix-setcap.patch @@ -0,0 +1,67 @@ +From 473be6467f995865244e7e68b2fa587a4ee79551 Mon Sep 17 00:00:00 2001 +From: Michael Weiss <dev.primeos@gmail.com> +Date: Thu, 16 May 2019 09:44:27 +0000 +Subject: [PATCH] build-sys: Make setcap really optional + +The setcap dependency is marked as optional but meson.build depends on +setcap.path(): + +meson.build:246:7: ERROR: add_install_script args must be strings +--- + meson.build | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index 8af9e18..95c778a 100644 +--- a/meson.build ++++ b/meson.build +@@ -221,10 +221,13 @@ config_h = configure_file( + setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) + if get_option('NO_SETCAP_OR_SUID') + perm_type = 'none' ++ setcap_path = '/dev/null' + elif cap_dep.found() and setcap.found() + perm_type = 'caps' ++ setcap_path = setcap.path() + else + perm_type = 'setuid' ++ setcap_path = '/dev/null' + endif + + ############################################################ +@@ -243,7 +246,7 @@ if build_ping == true + join_paths(get_option('prefix'), get_option('bindir')), + 'ping', + perm_type, +- setcap.path() ++ setcap_path + ) + endif + +@@ -263,7 +266,7 @@ if build_traceroute6 == true + join_paths(get_option('prefix'), get_option('bindir')), + 'traceroute6', + perm_type, +- setcap.path() ++ setcap_path + ) + endif + +@@ -276,7 +279,7 @@ if build_clockdiff == true + join_paths(get_option('prefix'), get_option('bindir')), + 'clockdiff', + perm_type, +- setcap.path() ++ setcap_path + ) + endif + +@@ -306,7 +309,7 @@ if build_arping == true + join_paths(get_option('prefix'), get_option('bindir')), + 'arping', + perm_type, +- setcap.path() ++ setcap_path + ) + endif + diff --git a/net-misc/iputils/iputils-20190515.ebuild b/net-misc/iputils/iputils-20190515.ebuild index ff6506c4be4d..fab32c416ff0 100644 --- a/net-misc/iputils/iputils-20190515.ebuild +++ b/net-misc/iputils/iputils-20190515.ebuild @@ -71,7 +71,9 @@ fi [ "${PV}" == "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" -PATCHES=() +PATCHES=( + "${FILESDIR}"/${PN}-20190515-fix-setcap.patch +) src_prepare() { use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch ) |