From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 28 Dec 2007 11:29:58 +0000 (-0000)
Subject: Bug #203323 - Fix the FEATURES=sfperms code so that it doesn't chmod
X-Git-Tag: v2.2_pre1~109
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e3e9352bd3622488a5c2524ddc7d071ae6b261cf;p=portage.git

Bug #203323 - Fix the FEATURES=sfperms code so that it doesn't chmod
g-r on binaries that are both setuid and setgid. In that case, just
chmod o-r.

svn path=/main/trunk/; revision=9061
---

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index d1b8c5eb3..d293fd769 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -429,15 +429,28 @@ preinst_sfperms() {
 	fi
 	# Smart FileSystem Permissions
 	if hasq sfperms $FEATURES; then
+		local i
 		for i in $(find "${D}" -type f -perm -4000); do
-			ebegin ">>> SetUID: [chmod go-r] $i "
-			chmod go-r "$i"
-			eend $?
+			if [ -n "$(find "$i" -perm -2000)" ] ; then
+				ebegin ">>> SetUID and SetGID: [chmod o-r] /${i#${D}}"
+				chmod o-r "$i"
+				eend $?
+			else
+				ebegin ">>> SetUID: [chmod go-r] /${i#${D}}"
+				chmod go-r "$i"
+				eend $?
+			fi
 		done
 		for i in $(find "${D}" -type f -perm -2000); do
-			ebegin ">>> SetGID: [chmod o-r] $i "
-			chmod o-r "$i"
-			eend $?
+			if [ -n "$(find "$i" -perm -4000)" ] ; then
+				# This case is already handled
+				# by the SetUID check above.
+				true
+			else
+				ebegin ">>> SetGID: [chmod o-r] /${i#${D}}"
+				chmod o-r "$i"
+				eend $?
+			fi
 		done
 	fi
 }