From a325960c04ff4135a6d96052b5b486304f3e8d22 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 16 Apr 2018 16:22:54 -0400 Subject: [PATCH] Update UsrLibBinaryException config to include .build-id In 2e06474 ("buildid fixes", 2017-07-17) an upstream patch was applied which added '.build-id' to the UsrLibBinaryException regex. Unfortunately, since fd3ffab ("add systemd to UsrLibBinaryException", 2014-06-25)), we override this setting in our rpmlint.config file and it was not updated to include '.build-id'. Update the regex to include (most) of the upstream changes, along with our addition of 'systemd' to the regex. This fixes spurious 'only-non-binary-in-usr-lib' warnings. --- rpmlint.config | 2 +- rpmlint.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rpmlint.config b/rpmlint.config index 7447203..1b1105c 100644 --- a/rpmlint.config +++ b/rpmlint.config @@ -337,7 +337,7 @@ setOption("ValidLicenses", ( setOption('SystemLibPaths', ('/lib', '/lib64', '/usr/lib', '/usr/lib64')) # Add systemd dir to ignored path for UsrLibBinaryException -setOption('UsrLibBinaryException', r'^/usr/lib/(perl|python|menu|pkgconfig|systemd|lib[^/]+\.(so|l?a)$)') +setOption('UsrLibBinaryException', r'^/usr/lib(64)?/(perl|python|ruby|menu|pkgconfig|ocaml|systemd|lib[^/]+\.(so|l?a)$|\.build-id)') # Get standard users and groups from the setup package's uidgid file setOption('StandardUsers', []) diff --git a/rpmlint.spec b/rpmlint.spec index 83f4114..a74d027 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -16,7 +16,7 @@ Name: rpmlint Version: 1.10 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools License: GPLv2 @@ -127,6 +127,9 @@ make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8} %{_mandir}/man1/rpmlint.1* %changelog +* Mon Apr 16 2018 Todd Zullinger - 1.10-9 +- Update UsrLibBinaryException config to include .build-id + * Sun Mar 04 2018 Till Maas - 1.10-8 - Update URL (RH #1547150)