From 667f41ed7c5d7226add370ffd64991f12c0c76aa Mon Sep 17 00:00:00 2001
From: ver4a <ver4a@uncontrol.me>
Date: Thu, 17 Apr 2025 01:26:56 +0200
Subject: [PATCH] fix: Treat /usr/bin and /usr/sbin as same directory

These two directories have been merged in F42, given that the current
regex to exclude some packages from sbin is no longer valid and needs to
exclude both their bin and sbin paths.

https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin
---
 Dockerfile.kde-nvidia-ver4a | 2 +-
 Dockerfile.kde-ver4a        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.kde-nvidia-ver4a b/Dockerfile.kde-nvidia-ver4a
index c18e9ad..9b4d64f 100644
--- a/Dockerfile.kde-nvidia-ver4a
+++ b/Dockerfile.kde-nvidia-ver4a
@@ -24,7 +24,7 @@ RUN dnf5 -y autoremove
 
 # Remove setuid/setgid binaries
 # Except for polkit-agent-helper-1, it's currently required for interactive authentication with polkit.
-RUN find /usr -mindepth 1 -type f -perm /6000 -regextype posix-extended -not -regex '^/usr/lib/polkit-1/polkit-agent-helper-1$|^/usr/sbin/unix_chkpwd$|^/usr/bin/fusermount[0-9]?$' -exec sh -c "chmod ug-s '{}' && echo \"Removed setuid/setgid bit(s) from '{}'\"" \;
+RUN find /usr -mindepth 1 -type f -perm /6000 -regextype posix-extended -not -regex '^/usr/lib/polkit-1/polkit-agent-helper-1$|^/usr/s?bin/unix_chkpwd$|^/usr/s?bin/fusermount[0-9]?$' -exec sh -c "chmod ug-s '{}' && echo \"Removed setuid/setgid bit(s) from '{}'\"" \;
 
 # https://github.com/ostreedev/ostree-rs-ext/issues/159
 RUN ostree container commit
diff --git a/Dockerfile.kde-ver4a b/Dockerfile.kde-ver4a
index 8e7ec7a..a9abf0c 100644
--- a/Dockerfile.kde-ver4a
+++ b/Dockerfile.kde-ver4a
@@ -24,7 +24,7 @@ RUN dnf5 -y autoremove
 
 # Remove setuid/setgid binaries
 # Except for polkit-agent-helper-1, it's currently required for interactive authentication with polkit.
-RUN find /usr -mindepth 1 -type f -perm /6000 -regextype posix-extended -not -regex '^/usr/lib/polkit-1/polkit-agent-helper-1$|^/usr/sbin/unix_chkpwd$|^/usr/bin/fusermount[0-9]?$' -exec sh -c "chmod ug-s '{}' && echo \"Removed setuid/setgid bit(s) from '{}'\"" \;
+RUN find /usr -mindepth 1 -type f -perm /6000 -regextype posix-extended -not -regex '^/usr/lib/polkit-1/polkit-agent-helper-1$|^/usr/s?bin/unix_chkpwd$|^/usr/s?bin/fusermount[0-9]?$' -exec sh -c "chmod ug-s '{}' && echo \"Removed setuid/setgid bit(s) from '{}'\"" \;
 
 # https://github.com/ostreedev/ostree-rs-ext/issues/159
 RUN ostree container commit