commit:     968a5d9ecdb0493a43593615596b1108ad01b2d8
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 24 19:33:12 2025 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Dec  3 18:12:38 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=968a5d9e

app-emulation/qemu: suidctl compat

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 app-emulation/qemu/qemu-10.1.2.ebuild | 5 ++++-
 app-emulation/qemu/qemu-9999.ebuild   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app-emulation/qemu/qemu-10.1.2.ebuild 
b/app-emulation/qemu/qemu-10.1.2.ebuild
index ad5a1c7e7515..15f527943702 100644
--- a/app-emulation/qemu/qemu-10.1.2.ebuild
+++ b/app-emulation/qemu/qemu-10.1.2.ebuild
@@ -900,6 +900,9 @@ src_install() {
        pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
        popd >/dev/null || die
 
+       # suid in src_install to allow FEATURES=suidctl to work properly
+       fperms u+s /usr/libexec/qemu-bridge-helper
+
        # Install config file example for qemu-bridge-helper
        insinto "/etc/qemu"
        doins "${FILESDIR}/bridge.conf"
@@ -963,7 +966,7 @@ pkg_postinst() {
        xdg_icon_cache_update
 
        [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] 
&& \
-               fcaps -m u+s cap_net_admin 
"${EROOT}"/usr/libexec/qemu-bridge-helper
+               fcaps -M u-s cap_net_admin 
"${EROOT}"/usr/libexec/qemu-bridge-helper
 
        DISABLE_AUTOFORMATTING=true
        readme.gentoo_print_elog

diff --git a/app-emulation/qemu/qemu-9999.ebuild 
b/app-emulation/qemu/qemu-9999.ebuild
index bc2a24d8ee15..b3129596fbf4 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -899,6 +899,9 @@ src_install() {
        pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
        popd >/dev/null || die
 
+       # suid in src_install to allow FEATURES=suidctl to work properly
+       fperms u+s /usr/libexec/qemu-bridge-helper
+
        # Install config file example for qemu-bridge-helper
        insinto "/etc/qemu"
        doins "${FILESDIR}/bridge.conf"
@@ -962,7 +965,7 @@ pkg_postinst() {
        xdg_icon_cache_update
 
        [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] 
&& \
-               fcaps -m u+s cap_net_admin 
"${EROOT}"/usr/libexec/qemu-bridge-helper
+               fcaps -M u-s cap_net_admin 
"${EROOT}"/usr/libexec/qemu-bridge-helper
 
        DISABLE_AUTOFORMATTING=true
        readme.gentoo_print_elog

Reply via email to