SHA256
1
0
forked from pool/rpmlint

Accepting request 721999 from home:marxin:branches:devel:openSUSE:Factory:rpmlint

- Update add-check-for-a-non-zero-.text-segment-in-.a-archive.patch patch to align with:
  38fc30cafe99d38059ca54b98bc87f5544f0bb4e

OBS-URL: https://build.opensuse.org/request/show/721999
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=680
This commit is contained in:
Johannes Segitz 2019-08-09 12:11:33 +00:00 committed by Git OBS Bridge
parent 1750505949
commit 70a9e8bb97
2 changed files with 8 additions and 3 deletions

View File

@ -1,5 +1,5 @@
diff --git a/BinariesCheck.py b/BinariesCheck.py diff --git a/BinariesCheck.py b/BinariesCheck.py
index 36d73f8..562c56a 100644 index 36d73f8..0fb91db 100644
--- a/BinariesCheck.py --- a/BinariesCheck.py
+++ b/BinariesCheck.py +++ b/BinariesCheck.py
@@ -73,6 +73,10 @@ class BinaryInfo(object): @@ -73,6 +73,10 @@ class BinaryInfo(object):
@ -8,7 +8,7 @@ index 36d73f8..562c56a 100644
+ # [Nr] Name Type Address Off Size ES Flg Lk Inf Al + # [Nr] Name Type Address Off Size ES Flg Lk Inf Al
+ # [ 1] .text PROGBITS 0000000000000000 000040 000000 00 AX 0 0 1 + # [ 1] .text PROGBITS 0000000000000000 000040 000000 00 AX 0 0 1
+ section_regex = re.compile(r'.*\] (?P<section>[^\s]*)\s*\w+\s*\w*\s*\w*\w*\s*(?P<size>\w*)') + section_regex = re.compile(r'.*\] (?P<section>\S*)\s*\S+\s*\S*\s*\S*\s*(?P<size>\w*)')
+ +
def __init__(self, pkg, path, fname, is_ar, is_shlib): def __init__(self, pkg, path, fname, is_ar, is_shlib):
self.readelf_error = False self.readelf_error = False
@ -43,7 +43,7 @@ index 36d73f8..562c56a 100644
+ r = self.section_regex.search(line) + r = self.section_regex.search(line)
+ if r: + if r:
+ sn = r.group('section') + sn = r.group('section')
+ if sn == '.init_array' or sn == '.fini_array' or sn.startswith('.text'): + if sn == '.preinit_array' or sn == '.init_array' or sn == '.fini_array' or sn.startswith('.text'):
+ has_text_segment = True + has_text_segment = True
+ size = int(r.group('size'), 16) + size = int(r.group('size'), 16)
+ if size > 0: + if size > 0:

View File

@ -1,4 +1,9 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 9 12:01:03 UTC 2019 - Martin Liška <mliska@suse.cz>
- Update add-check-for-a-non-zero-.text-segment-in-.a-archive.patch patch to align with:
38fc30cafe99d38059ca54b98bc87f5544f0bb4e
-------------------------------------------------------------------
Thu Aug 8 13:14:36 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org> Thu Aug 8 13:14:36 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
- Add Development/Languages/Go group. - Add Development/Languages/Go group.