SHA256
1
0
forked from pool/rpmlint

Accepting request 50830 from Base:System

Copy from Base:System/rpmlint based on submit request 50830 from user dirkmueller

OBS-URL: https://build.opensuse.org/request/show/50830
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=69
This commit is contained in:
OBS User autobuild 2010-10-15 15:16:45 +00:00 committed by Git OBS Bridge
parent 4d4e6f73c7
commit d23cb25d29
5 changed files with 28 additions and 13 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 15 16:41:59 CEST 2010 - dmueller@suse.de
- fix regression in suse-binariescheck.diff
-------------------------------------------------------------------
Tue Oct 12 14:58:55 UTC 2010 - lnussel@suse.de

View File

@ -23,7 +23,7 @@ Name: rpmlint
BuildRequires: rpm-python
Summary: Rpm correctness checker
Version: 0.99
Release: 1
Release: 2
Source0: %{name}-%{version}.tar.bz2
Source1: config
Source1001: config.in

View File

@ -1,6 +1,14 @@
--- BinariesCheck.py
+++ BinariesCheck.py
@@ -37,6 +37,9 @@
@@ -17,6 +17,7 @@
import AbstractCheck
import Config
import Pkg
+import os
DEFAULT_SYSTEM_LIB_PATHS = (
@@ -37,6 +38,9 @@
unused_regex = re.compile('^\s+(\S+)')
exit_call_regex = re.compile('\s+FUNC\s+.*?\s+(_?exit(?:@\S+)?)(?:\s|$)')
fork_call_regex = re.compile('\s+FUNC\s+.*?\s+(fork(?:@\S+)?)(?:\s|$)')
@ -10,7 +18,7 @@
def __init__(self, pkg, path, file, is_ar, is_shlib):
self.readelf_error = False
@@ -50,7 +53,10 @@
@@ -50,7 +54,10 @@
self.stack = False
self.exec_stack = False
self.exit_calls = []
@ -21,7 +29,7 @@
self.tail = ''
is_debug = path.endswith('.debug')
@@ -93,6 +99,11 @@
@@ -93,6 +100,11 @@
self.exec_stack = True
continue
@ -33,7 +41,7 @@
if is_shlib:
r = BinaryInfo.exit_call_regex.search(l)
if r:
@@ -103,6 +114,14 @@
@@ -103,6 +115,14 @@
fork_called = True
continue
@ -48,7 +56,7 @@
if self.non_pic:
self.non_pic = 'TEXTREL' in res[1]
@@ -270,6 +289,17 @@
@@ -270,6 +290,17 @@
is_shlib = so_regex.search(fname)
bin_info = BinaryInfo(pkg, pkgfile.path, fname, is_ar, is_shlib)
@ -66,7 +74,7 @@
if is_shlib:
has_lib = True
@@ -319,6 +349,10 @@
@@ -319,6 +350,10 @@
for ec in bin_info.exit_calls:
printWarning(pkg, 'shared-lib-calls-exit', fname, ec)
@ -77,7 +85,7 @@
# rpath ?
if bin_info.rpath:
for p in bin_info.rpath:
@@ -504,6 +538,14 @@
@@ -504,6 +539,14 @@
'ldd-failed',
'''Executing ldd on this file failed, all checks could not be run.''',
@ -92,7 +100,7 @@
'executable-stack',
'''The binary declares the stack as executable. Executable stack is usually an
error as it is only needed if the code contains GCC trampolines or similar
@@ -516,6 +558,10 @@
@@ -516,6 +559,10 @@
make the stack executable. Usual suspects include use of a non-GNU linker or
an old GNU linker version.''',

View File

@ -2,7 +2,7 @@ Index: TagsCheck.py
===================================================================
--- TagsCheck.py.orig
+++ TagsCheck.py
@@ -615,10 +615,10 @@ class TagsCheck(AbstractCheck.AbstractCh
@@ -631,10 +631,10 @@ class TagsCheck(AbstractCheck.AbstractCh
if pkg_config_regex.match(fname) and fname.endswith('.pc'):
has_pc = True
if has_so:

View File

@ -1,6 +1,8 @@
--- BinariesCheck.py
Index: BinariesCheck.py
===================================================================
--- BinariesCheck.py.orig
+++ BinariesCheck.py
@@ -195,6 +195,7 @@
@@ -196,6 +196,7 @@ usr_lib_exception_regex = re.compile(Con
srcname_regex = re.compile('(.*?)-[0-9]')
invalid_dir_ref_regex = re.compile('/(home|tmp)(\W|$)')
ocaml_mixed_regex = re.compile('^Caml1999X0\d\d$')
@ -8,7 +10,7 @@
def dir_base(path):
res = path_regex.search(path)
@@ -267,7 +268,7 @@
@@ -268,7 +269,7 @@ class BinariesCheck(AbstractCheck.Abstra
# arch dependent packages only from here on
# in /usr/share ?