SHA256
1
0
forked from pool/rpmlint

Accepting request 500576 from devel:openSUSE:Factory:rpmlint

1

OBS-URL: https://build.opensuse.org/request/show/500576
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=272
This commit is contained in:
Dominique Leuenberger 2017-06-05 16:48:55 +00:00 committed by Git OBS Bridge
commit 1e837ffea4
4 changed files with 73 additions and 1 deletions

View File

@ -0,0 +1,38 @@
diff --git a/usr/share/rpmlint/BinariesCheck.py b/tmp/BinariesCheck.py
index 6e50c03..460c003 100644
--- a/BinariesCheck.py
+++ b/BinariesCheck.py
@@ -64,8 +64,6 @@ class BinaryInfo:
setuid_call_regex = create_regexp_call(['setresuid', 'seteuid', 'setuid'])
setgroups_call_regex = create_regexp_call(['initgroups', 'setgroups'])
chroot_call_regex = create_regexp_call('chroot')
- # 401eb8: e8 c3 f0 ff ff callq 400f80 <chdir@plt>
- objdump_call_regex = re.compile(b'callq?\s(.*)')
forbidden_functions = Config.getOption("WarnOnFunction")
if forbidden_functions:
@@ -109,6 +107,12 @@ class BinaryInfo:
self.mktemp = False
is_debug = path.endswith('.debug')
+ if pkg.arch in ['armv6hl', 'armv7hl', 'aarch64']:
+ # 10450: ebffffec bl 10408 <chroot@plt>
+ BinaryInfo.objdump_call_regex = re.compile(b'\sbl\s+(.*)')
+ else: # x86_64, ix86
+ # 401eb8: e8 c3 f0 ff ff callq 400f80 <chdir@plt>
+ BinaryInfo.objdump_call_regex = re.compile(b'callq?\s(.*)')
cmd = ['env', 'LC_ALL=C', 'readelf', '-W', '-S', '-l', '-d', '-s']
cmd.append(path)
@@ -234,6 +238,11 @@ class BinaryInfo:
# check if chroot is near chdir (since otherwise, chroot is called
# without chdir)
if self.chroot and self.chdir:
+ if pkg.arch in ['ppc', 'ppc64', 'ppc64le']:
+ # On PPC, it is to difficult to find the actual invocations
+ # of chroot/chdir, if both exist assume chroot is fine
+ self.chroot_near_chdir = True
+ pass
p = subprocess.Popen(
['env', 'LC_ALL=C', 'objdump', '-d', path],
stdout=subprocess.PIPE, bufsize=-1)

12
config
View File

@ -115,6 +115,7 @@ setOption('StandardGroups', (
'games', 'games',
'gdm', 'gdm',
'geronimo', 'geronimo',
'grafana',
'guixbuild', 'guixbuild',
'haclient', 'haclient',
'haldaemon', 'haldaemon',
@ -192,6 +193,7 @@ setOption('StandardGroups', (
'powersave', 'powersave',
'privoxy', 'privoxy',
'prosody', 'prosody',
'prometheus',
'public', 'public',
'pulse', 'pulse',
'pulse-access', 'pulse-access',
@ -243,6 +245,7 @@ setOption('StandardGroups', (
'wireshark', 'wireshark',
'www', 'www',
'xok', 'xok',
'xymon',
'zeroinst', 'zeroinst',
'znc', 'znc',
'zope', 'zope',
@ -294,6 +297,7 @@ setOption('StandardUsers', (
'geronimo', 'geronimo',
'gnats', 'gnats',
'gnump3d', 'gnump3d',
'grafana',
'hacluster', 'hacluster',
'haldaemon', 'haldaemon',
'hsqldb', 'hsqldb',
@ -363,6 +367,7 @@ setOption('StandardUsers', (
'pound', 'pound',
'privoxy', 'privoxy',
'prosody', 'prosody',
'prometheus',
'pulse', 'pulse',
'puppet', 'puppet',
'qemu', 'qemu',
@ -404,6 +409,7 @@ setOption('StandardUsers', (
'vscan', 'vscan',
'wnn', 'wnn',
'wwwrun', 'wwwrun',
'xymon',
'yastws', 'yastws',
'zeroinst', 'zeroinst',
'znc', 'znc',
@ -747,7 +753,11 @@ setOption("DBUSServices.WhiteList", (
"net.launchpad.backintime.serviceHelper.service", "net.launchpad.backintime.serviceHelper.service",
# switchroo-control (bsc#1034309) # switchroo-control (bsc#1034309)
"net.hadess.SwitcherooControl.conf", "net.hadess.SwitcherooControl.conf",
"switcheroo-control.service" "switcheroo-control.service",
# openqa (bsc#1039290)
"org.opensuse.openqa.conf",
"openqa-scheduler.service",
"openqa-websockets.service"
)) ))
setOption("PAMModules.WhiteList", ( setOption("PAMModules.WhiteList", (

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Thu Jun 1 15:31:53 UTC 2017 - stefan.bruens@rwth-aachen.de
- Add BinariesCheck_fix_chroot_check_on_non_x86.patch
Check for correct invocation of chroot was only implemented for x86
-------------------------------------------------------------------
Wed May 31 13:24:22 UTC 2017 - jochen.becker@hrz.tu-darmstadt.de
- std-user and std-group 'xymon', added for building correct xymon client
-------------------------------------------------------------------
Wed May 31 13:16:51 UTC 2017 - krahmer@suse.com
- whitelisting openqa (bsc#1039290)
-------------------------------------------------------------------
Thu May 25 04:52:11 UTC 2017 - tserong@suse.com
- add 'prometheus' and 'grafana' standard users and groups
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 16 13:37:33 UTC 2017 - krahmer@suse.com Tue May 16 13:37:33 UTC 2017 - krahmer@suse.com

View File

@ -123,6 +123,8 @@ Patch664: issue_68_BinariesCheck_lower_memory-4.patch
# Fix a regression introduced by suse-shlib-devel-dependency.diff # Fix a regression introduced by suse-shlib-devel-dependency.diff
Patch67: suse-readd_terminator_in_regex.patch Patch67: suse-readd_terminator_in_regex.patch
Patch68: boo1027577-license_tag.patch Patch68: boo1027577-license_tag.patch
# Fix check for 'missing-call-to-chdir-with-chroot' on ARM, relax check on PPC
Patch69: BinariesCheck_fix_chroot_check_on_non_x86.patch
# PATCHLIST END # PATCHLIST END
# BuildArch must at the end. is a bug: https://bugzilla.suse.com/show_bug.cgi?id=926766 # BuildArch must at the end. is a bug: https://bugzilla.suse.com/show_bug.cgi?id=926766
BuildArch: noarch BuildArch: noarch