commit:     ae6d6aa22d074c04cd9caefe1ca02bf615bfd86f
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Tue Apr 17 02:06:38 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Apr 17 02:11:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=ae6d6aa2

estrip, install-qa-check.d/10ignored-flags: fix bug 653352

Update detection of ELF files to work with >=sys-apps/file-5.33.

Bug: https://bugs.gentoo.org/653352

 bin/estrip                             | 3 ++-
 bin/install-qa-check.d/10ignored-flags | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/estrip b/bin/estrip
index 030d9e8bf..5709b862c 100755
--- a/bin/estrip
+++ b/bin/estrip
@@ -427,7 +427,8 @@ do
                                ${STRIP} -g "${x}"
                        fi
                fi
-       elif [[ ${f} == *"SB executable"* || ${f} == *"SB shared object"* ]] ; 
then
+       elif [[ ${f} == *"SB executable"* || ${f} == *"SB pie executable"* ||
+               ${f} == *"SB shared object"* ]] ; then
                process_elf "${x}" "${inode_link}" ${PORTAGE_STRIP_FLAGS}
        elif [[ ${f} == *"SB relocatable"* ]] ; then
                process_elf "${x}" "${inode_link}" ${SAFE_STRIP_FLAGS}

diff --git a/bin/install-qa-check.d/10ignored-flags 
b/bin/install-qa-check.d/10ignored-flags
index 28aec6787..dc160e182 100644
--- a/bin/install-qa-check.d/10ignored-flags
+++ b/bin/install-qa-check.d/10ignored-flags
@@ -32,7 +32,7 @@ ignored_flag_check() {
                        # similar to how prepstrip uses it.
                        f=$(file "${x}") || continue
                        [[ -z ${f} ]] && continue
-                       if [[ ${f} == *"SB executable"* ||
+                       if [[ ${f} == *"SB executable"* || ${f} == *"SB pie 
executable"* ||
                                ${f} == *"SB shared object"* ]] ; then
                                echo "${x}" >> "${T}"/scanelf-ignored-CFLAGS.log
                        fi

Reply via email to