rpms/rpmlint
7
0
Fork 0
Code Issues Pull Requests Releases Activity

buildid fixes

Browse Source
This commit is contained in:
Tom Callaway 2017-07-17 09:57:13 -04:00
parent 33b1bd9b4d
commit 2e06474450
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
rpmlint-1.9-buildid-fixes.patch Normal file
View File

@ -0,0 +1,33 @@
diff -up rpmlint-rpmlint-1.9/BinariesCheck.py.buildid rpmlint-rpmlint-1.9/BinariesCheck.py
--- rpmlint-rpmlint-1.9/BinariesCheck.py.buildid 2017-07-17 09:45:17.415365410 -0400
+++ rpmlint-rpmlint-1.9/BinariesCheck.py 2017-07-17 09:45:28.719085854 -0400
@@ -294,7 +294,7 @@ usr_lib_regex = re.compile('^/usr/lib(64
bin_regex = re.compile('^(/usr(/X11R6)?)?/s?bin/')
soversion_regex = re.compile('.*?([0-9][.0-9]*)\\.so|.*\\.so\\.([0-9][.0-9]*).*')
reference_regex = re.compile('\.la$|^/usr/lib(64)?/pkgconfig/')
-usr_lib_exception_regex = re.compile(Config.getOption('UsrLibBinaryException', '^/usr/lib(64)?/(perl|python|ruby|menu|pkgconfig|ocaml|lib[^/]+\.(so|l?a)$|bonobo/servers/)'))
+usr_lib_exception_regex = re.compile(Config.getOption('UsrLibBinaryException', r'^/usr/lib(64)?/(perl|python|ruby|menu|pkgconfig|ocaml|lib[^/]+\.(so|l?a)$|bonobo/servers/|\.build-id)'))
srcname_regex = re.compile('(.*?)-[0-9]')
invalid_dir_ref_regex = re.compile('/(home|tmp)(\W|$)')
ocaml_mixed_regex = re.compile('^Caml1999X0\d\d$')
diff -up rpmlint-rpmlint-1.9/FilesCheck.py.buildid rpmlint-rpmlint-1.9/FilesCheck.py
--- rpmlint-rpmlint-1.9/FilesCheck.py.buildid 2017-07-17 09:45:37.733862908 -0400
+++ rpmlint-rpmlint-1.9/FilesCheck.py 2017-07-17 09:46:33.053494782 -0400
@@ -505,7 +505,7 @@ class FilesCheck(AbstractCheck.AbstractC
printError(pkg, 'version-control-internal-file', f)
elif f.endswith('/.htaccess'):
printError(pkg, 'htaccess-file', f)
- elif hidden_file_regex.search(f) and not f.startswith("/etc/skel/"):
+ elif hidden_file_regex.search(f) and not f.startswith("/etc/skel/") and not f.endswith("/.build-id"):
printWarning(pkg, 'hidden-file-or-dir', f)
elif manifest_perl_regex.search(f):
printWarning(pkg, 'manifest-in-perl-module', f)
@@ -879,7 +879,7 @@ class FilesCheck(AbstractCheck.AbstractC
printError(pkg, 'non-standard-dir-perm', f, "%o" % perm)
if pkg.name not in filesys_packages and f in STANDARD_DIRS:
printError(pkg, 'standard-dir-owned-by-package', f)
- if hidden_file_regex.search(f):
+ if hidden_file_regex.search(f) and not f.endswith("/.build-id"):
printWarning(pkg, 'hidden-file-or-dir', f)
# symbolic link check

8
rpmlint.spec
View File

@ -16,7 +16,7 @@
Name: rpmlint
Version: 1.9
Release: 10%{?dist}
Release: 11%{?dist}
Summary: Tool for checking common errors in RPM packages
Group: Development/Tools
License: GPLv2
@ -48,6 +48,8 @@ Patch3: rpmlint-1.9-py35magic.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1439941
Patch4: rpmlint-1.9-py3_b2s.patch
Patch5: rpmlint-1.9-py3_test_b2s.patch
# https://github.com/rpm-software-management/rpmlint/commit/4ec1b845a681ce65c02e4db72c6b7ee99fe1b622
Patch6: rpmlint-1.9-buildid-fixes.patch
BuildArch: noarch
%if %{with python3}
BuildRequires: python3-devel
@ -104,6 +106,7 @@ and source packages as well as spec files can be checked.
%patch3 -p1 -b .py35magic
%patch4 -p1 -b .py3b2s
%patch5 -p1 -b .py35b2s_test
%patch6 -p1 -b .buildid
sed -i -e /MenuCheck/d Config.py
cp -p config config.example
install -pm 644 %{SOURCE3} config
@ -153,6 +156,9 @@ make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8}
%{_mandir}/man1/rpmlint.1*
%changelog
* Mon Jul 17 2017 Tom Callaway <spot@fedoraproject.org> - 1.9-11
- apply upstream fix for buildid
* Thu Jul 13 2017 Petr Pisar <ppisar@redhat.com> - 1.9-10
- perl dependency renamed to perl-interpreter
<https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules>