commit: 67362b18b2c01dfe7deb017f6e7e929138fa932e Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> AuthorDate: Thu Jun 27 23:00:15 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Thu Jun 27 23:13:50 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67362b18
net-misc/iputils: fix build with USE="-caps" Upstream patch. Without this change, attempting to emerge net-misc/iputils-20190515 with USE="-caps" without having had sys-libs/libcap installed for some other reason will fail during src_configure due to wrong type of arguments for add_install_script. Package-Manager: Portage-2.3.67, Repoman-2.3.16 Signed-off-by: Signed-off-by: Marty E. Plummer <hanetzer <AT> startmail.com> Closes: https://github.com/gentoo/gentoo/pull/12344 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> .../files/iputils-20190515-fix-setcap.patch | 67 ++++++++++++++++++++++ net-misc/iputils/iputils-20190515.ebuild | 4 +- 2 files changed, 70 insertions(+), 1 deletion(-) 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 00000000000..6e9c7c6a835 --- /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 <[email protected]> +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 ff6506c4be4..fab32c416ff 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 )
