forked from pool/rpmlint
0003-Tighten-lib_regex-to-avoid-false-positive-in-python-.patch,
0001-Execute-chroot-tests-also-on-x86-rpms.patch OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=492
This commit is contained in:
parent
542af50a09
commit
24e9388d4b
37
0001-Execute-chroot-tests-also-on-x86-rpms.patch
Normal file
37
0001-Execute-chroot-tests-also-on-x86-rpms.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From 9140901be1ab2c41df6ec7b21bd68e2e695b201f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dirk Mueller <dirk@dmllr.de>
|
||||||
|
Date: Thu, 28 Sep 2017 23:59:34 +0200
|
||||||
|
Subject: [PATCH] Execute chroot tests also on x86 rpms
|
||||||
|
|
||||||
|
x86 and x86_64 are reasonably similar, so this is safe
|
||||||
|
to do.
|
||||||
|
---
|
||||||
|
BinariesCheck.py | 5 +++--
|
||||||
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/BinariesCheck.py b/BinariesCheck.py
|
||||||
|
index 887e0f0..26983bb 100644
|
||||||
|
--- a/BinariesCheck.py
|
||||||
|
+++ b/BinariesCheck.py
|
||||||
|
@@ -206,7 +206,8 @@ class BinaryInfo(object):
|
||||||
|
# without chdir)
|
||||||
|
# Currently this implementation works only on x86_64 due to reliance
|
||||||
|
# on x86_64 specific assembly. Skip it on other architectures
|
||||||
|
- if pkg.arch == 'x86_64' and self.chroot and self.chdir:
|
||||||
|
+ if ((pkg.arch.endswith('86') or pkg.arch == 'x86_64') and
|
||||||
|
+ self.chroot and self.chdir):
|
||||||
|
p = subprocess.Popen(('objdump', '-d', path),
|
||||||
|
stdout=subprocess.PIPE, bufsize=-1,
|
||||||
|
env=dict(os.environ, LC_ALL="C"))
|
||||||
|
@@ -531,7 +532,7 @@ class BinariesCheck(AbstractCheck.AbstractCheck):
|
||||||
|
printError(pkg, 'missing-call-to-setgroups-before-setuid',
|
||||||
|
fname)
|
||||||
|
|
||||||
|
- if pkg.arch == 'x86_64' and bin_info.chroot:
|
||||||
|
+ if ((pkg.arch.endswith('86') or pkg.arch == 'x86_64') and bin_info.chroot):
|
||||||
|
if not bin_info.chdir or not bin_info.chroot_near_chdir:
|
||||||
|
printError(pkg, 'missing-call-to-chdir-with-chroot', fname)
|
||||||
|
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
@ -71,7 +71,8 @@ Thu Sep 28 10:40:08 UTC 2017 - dmueller@suse.com
|
|||||||
- drop suse-readd_terminator_in_regex.patch: merged into original patch
|
- drop suse-readd_terminator_in_regex.patch: merged into original patch
|
||||||
- add suse-tests-without-badness.patch,
|
- add suse-tests-without-badness.patch,
|
||||||
0001-Extend-scm_regex-to-capture-more-SCM-system-files.patch,
|
0001-Extend-scm_regex-to-capture-more-SCM-system-files.patch,
|
||||||
0003-Tighten-lib_regex-to-avoid-false-positive-in-python-.patch
|
0003-Tighten-lib_regex-to-avoid-false-positive-in-python-.patch,
|
||||||
|
0001-Execute-chroot-tests-also-on-x86-rpms.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Sep 28 09:37:04 UTC 2017 - dmueller@suse.com
|
Thu Sep 28 09:37:04 UTC 2017 - dmueller@suse.com
|
||||||
|
@ -96,6 +96,7 @@ Patch57: check-for-self-provides.diff
|
|||||||
Patch58: add-check-for-tmpfiles-created-at-r.diff
|
Patch58: add-check-for-tmpfiles-created-at-r.diff
|
||||||
Patch59: 0001-Extend-scm_regex-to-capture-more-SCM-system-files.patch
|
Patch59: 0001-Extend-scm_regex-to-capture-more-SCM-system-files.patch
|
||||||
Patch60: 0003-Tighten-lib_regex-to-avoid-false-positive-in-python-.patch
|
Patch60: 0003-Tighten-lib_regex-to-avoid-false-positive-in-python-.patch
|
||||||
|
Patch61: 0001-Execute-chroot-tests-also-on-x86-rpms.patch
|
||||||
Patch70: rpmlint-all-pie.patch
|
Patch70: rpmlint-all-pie.patch
|
||||||
# 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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user