Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13067 - main/trunk/bin
Date: Thu, 12 Mar 2009 02:40:31
Message-Id: E1LhaqT-0005YJ-9d@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-03-12 02:40:28 +0000 (Thu, 12 Mar 2009)
3 New Revision: 13067
4
5 Modified:
6 main/trunk/bin/misc-functions.sh
7 Log:
8 Use posix compatible find -perm arguments. Thanks to Timothy Redaelli
9 <drizzt@g.o> for reporting.
10
11
12 Modified: main/trunk/bin/misc-functions.sh
13 ===================================================================
14 --- main/trunk/bin/misc-functions.sh 2009-03-12 01:45:52 UTC (rev 13066)
15 +++ main/trunk/bin/misc-functions.sh 2009-03-12 02:40:28 UTC (rev 13067)
16 @@ -75,8 +75,8 @@
17 f=$(scanelf -qyRF '%r %p' "${D}" | grep -E "(${PORTAGE_BUILDDIR}|: |::|^:|^ )")
18 # Reject set*id binaries with $ORIGIN in RPATH #260331
19 x=$(
20 - find "${D}" -type f -perm /6000 -print0 | xargs -0 \
21 - scanelf -qyRF '%r %p' | grep '$ORIGIN'
22 + find "${D}" -type f \( -perm -u+s -o -perm -g+s \) -print0 | \
23 + xargs -0 scanelf -qyRF '%r %p' | grep '$ORIGIN'
24 )
25 if [[ -n ${f}${x} ]] ; then
26 vecho -ne '\a\n'