rpm/rpmlint
SHA256
1
0
Fork 0
forked from pool/rpmlint
Code Pull Requests Activity

- update libtool-wrapper-check.diff to handle inaccessible files

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=634
This commit is contained in:
Dirk Mueller 2018-11-16 10:03:48 +00:00 committed by Git OBS Bridge
parent 547dd42eea
commit e33e073565
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libtool-wrapper-check.diff
View File

@ -1,6 +1,8 @@
Index: rpmlint-rpmlint-1.10/BinariesCheck.py
===================================================================
--- rpmlint-rpmlint-1.10.orig/BinariesCheck.py
+++ rpmlint-rpmlint-1.10/BinariesCheck.py
@@ -367,8 +367,15 @@ class BinariesCheck(AbstractCheck.Abstra
@@ -367,8 +367,21 @@ class BinariesCheck(AbstractCheck.Abstra
is_ar = 'current ar archive' in pkgfile.magic
is_ocaml_native = 'Objective caml native' in pkgfile.magic
is_lua_bytecode = 'Lua bytecode' in pkgfile.magic
@ -8,15 +10,21 @@
is_binary = is_elf or is_ar or is_ocaml_native or is_lua_bytecode
+ if is_shell:
+ with open(pkgfile.path, 'rb') as inputf:
+ if (b'This wrapper script should never '
+ b'be moved out of the build directory' in inputf.read(2048)):
+ printError(pkg, 'libtool-wrapper-in-package', fname)
+ file_start = None
+ try:
+ with open(pkgfile.path, 'rb') as inputf:
+ file_start = inputf.read(2048)
+ except IOError:
+ pass
+ if (file_start and
+ b'This wrapper script should never '
+ b'be moved out of the build directory' in file_start):
+ printError(pkg, 'libtool-wrapper-in-package', fname)
+
if not is_binary:
if reference_regex.search(fname):
lines = pkg.grep(invalid_dir_ref_regex, fname)
@@ -637,6 +644,15 @@ to list code compiled without -fPIC.
@@ -637,6 +650,15 @@ to list code compiled without -fPIC.
Another common mistake that causes this problem is linking with
``gcc -Wl,-shared'' instead of ``gcc -shared''.''',

2
rpmlint-tests.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
# icecream 0

5
rpmlint.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Nov 16 10:02:30 UTC 2018 - Dirk Mueller <dmueller@suse.com>
- update libtool-wrapper-check.diff to handle inaccessible files
-------------------------------------------------------------------
Thu Nov 8 12:59:15 UTC 2018 - jsegitz@suse.com

2
rpmlint.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#