From bfa834762794baefc8df6221a02881d0ee55d39a901d05177d7e0998e9d0e7b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Li=C5=A1ka?= Date: Tue, 12 Jul 2022 19:49:54 +0000 Subject: [PATCH 1/7] - Update to version 2.3.0+git20220712.d55ac43: * digest whitelists: remove now redundant sha256 algorithm specification * FileDigestCheck: use sha256 digest algorithm by default * dbus-services: adjust to PackageKit etc -> usr config file move (bsc#1201347) * dbus-services: adjust to cups etc -> usr config file move (bsc#1201346) * dbus-services: adjust to avahi etc -> usr config file move (bsc#1201345) * whitelistings: fill in some missing metadata * Improve syntax validation for digests. OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=929 --- _servicedata | 2 +- rpmlint-2.3.0+git20220711.46e6323.tar.xz | 3 --- rpmlint-2.3.0+git20220712.d55ac43.tar.xz | 3 +++ rpmlint.changes | 12 ++++++++++++ rpmlint.spec | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) delete mode 100644 rpmlint-2.3.0+git20220711.46e6323.tar.xz create mode 100644 rpmlint-2.3.0+git20220712.d55ac43.tar.xz diff --git a/_servicedata b/_servicedata index 51664c3..5f8b811 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/rpm-software-management/rpmlint.git - 43a2c9424d3978250229477fc28426610c79d9a7 \ No newline at end of file + 4b5fb11f9f4d2b193873a3d8296d6dce04bf1ad1 \ No newline at end of file diff --git a/rpmlint-2.3.0+git20220711.46e6323.tar.xz b/rpmlint-2.3.0+git20220711.46e6323.tar.xz deleted file mode 100644 index 623a034..0000000 --- a/rpmlint-2.3.0+git20220711.46e6323.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff3f5fa18ff5cbafd4503b100e5c97e4fce1402d36c4a2dbe6d7354eb22dcddc -size 6752068 diff --git a/rpmlint-2.3.0+git20220712.d55ac43.tar.xz b/rpmlint-2.3.0+git20220712.d55ac43.tar.xz new file mode 100644 index 0000000..6fab4ff --- /dev/null +++ b/rpmlint-2.3.0+git20220712.d55ac43.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5808c025582db4a257c5faf65a9d86f82bccb22c2e6604979f77a2bd016885b +size 6752280 diff --git a/rpmlint.changes b/rpmlint.changes index b54116b..d5ad885 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jul 12 19:49:39 UTC 2022 - mliska@suse.cz + +- Update to version 2.3.0+git20220712.d55ac43: + * digest whitelists: remove now redundant sha256 algorithm specification + * FileDigestCheck: use sha256 digest algorithm by default + * dbus-services: adjust to PackageKit etc -> usr config file move (bsc#1201347) + * dbus-services: adjust to cups etc -> usr config file move (bsc#1201346) + * dbus-services: adjust to avahi etc -> usr config file move (bsc#1201345) + * whitelistings: fill in some missing metadata + * Improve syntax validation for digests. + ------------------------------------------------------------------- Mon Jul 11 12:41:48 UTC 2022 - mliska@suse.cz diff --git a/rpmlint.spec b/rpmlint.spec index 948f3ff..67e374e 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -23,7 +23,7 @@ %define name_suffix -%{flavor} %endif Name: rpmlint%{name_suffix} -Version: 2.3.0+git20220711.46e6323 +Version: 2.3.0+git20220712.d55ac43 Release: 0 Summary: RPM file correctness checker License: GPL-2.0-or-later From 48ecd051b26e0d1583820f5dbd3e00fb219c1c6d26ba2937313cbf0d3bdcba6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Li=C5=A1ka?= Date: Tue, 12 Jul 2022 20:16:53 +0000 Subject: [PATCH 2/7] - Revert to version 2.3.0+git20220712.761ddf0. OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=930 --- _service | 2 +- _servicedata | 2 +- rpmlint-2.3.0+git20220712.761ddf0.tar.xz | 3 +++ rpmlint-2.3.0+git20220712.d55ac43.tar.xz | 3 --- rpmlint.changes | 5 +++++ rpmlint.spec | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 rpmlint-2.3.0+git20220712.761ddf0.tar.xz delete mode 100644 rpmlint-2.3.0+git20220712.d55ac43.tar.xz diff --git a/_service b/_service index 2087e88..9f1b8fb 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ 2.3.0+git%cd.%h https://github.com/rpm-software-management/rpmlint.git git - opensuse + 761ddf0910eaed2614433c57fc1a7c14b1983ee8 enable diff --git a/_servicedata b/_servicedata index 5f8b811..4e5dc54 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/rpm-software-management/rpmlint.git - 4b5fb11f9f4d2b193873a3d8296d6dce04bf1ad1 \ No newline at end of file + 761ddf0910eaed2614433c57fc1a7c14b1983ee8 \ No newline at end of file diff --git a/rpmlint-2.3.0+git20220712.761ddf0.tar.xz b/rpmlint-2.3.0+git20220712.761ddf0.tar.xz new file mode 100644 index 0000000..80f817f --- /dev/null +++ b/rpmlint-2.3.0+git20220712.761ddf0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20bfe965b97393e8c2f170976bda97404e77619117862c0d93466c82164453d2 +size 6752004 diff --git a/rpmlint-2.3.0+git20220712.d55ac43.tar.xz b/rpmlint-2.3.0+git20220712.d55ac43.tar.xz deleted file mode 100644 index 6fab4ff..0000000 --- a/rpmlint-2.3.0+git20220712.d55ac43.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5808c025582db4a257c5faf65a9d86f82bccb22c2e6604979f77a2bd016885b -size 6752280 diff --git a/rpmlint.changes b/rpmlint.changes index d5ad885..ebbe67f 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 12 20:15:59 UTC 2022 - mliska@suse.cz + +- Revert to version 2.3.0+git20220712.761ddf0. + ------------------------------------------------------------------- Tue Jul 12 19:49:39 UTC 2022 - mliska@suse.cz diff --git a/rpmlint.spec b/rpmlint.spec index 67e374e..19c2761 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -23,7 +23,7 @@ %define name_suffix -%{flavor} %endif Name: rpmlint%{name_suffix} -Version: 2.3.0+git20220712.d55ac43 +Version: 2.3.0+git20220712.761ddf0 Release: 0 Summary: RPM file correctness checker License: GPL-2.0-or-later From 226fb2015635cc9f4b12aac8ecdc9ffbb4febdbdce311fee4ae88671dd1483af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Li=C5=A1ka?= Date: Tue, 12 Jul 2022 20:38:35 +0000 Subject: [PATCH 3/7] - Add skip-rpmlint-for-rpmlint.patch patch that skip linter this package. OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=931 --- rpmlint.changes | 6 ++++++ rpmlint.spec | 1 + skip-rpmlint-for-rpmlint.patch | 37 ++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 skip-rpmlint-for-rpmlint.patch diff --git a/rpmlint.changes b/rpmlint.changes index ebbe67f..6eb2a61 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 12 20:38:18 UTC 2022 - Martin Liška + +- Add skip-rpmlint-for-rpmlint.patch patch that skip linter + this package. + ------------------------------------------------------------------- Tue Jul 12 20:15:59 UTC 2022 - mliska@suse.cz diff --git a/rpmlint.spec b/rpmlint.spec index 19c2761..c0668a0 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -30,6 +30,7 @@ License: GPL-2.0-or-later URL: https://github.com/rpm-software-management/rpmlint Source0: rpmlint-%{version}.tar.xz Patch0: disable-flake.patch +Patch1: skip-rpmlint-for-rpmlint.patch BuildRequires: fdupes BuildRequires: python3-setuptools BuildArch: noarch diff --git a/skip-rpmlint-for-rpmlint.patch b/skip-rpmlint-for-rpmlint.patch new file mode 100644 index 0000000..737cb53 --- /dev/null +++ b/skip-rpmlint-for-rpmlint.patch @@ -0,0 +1,37 @@ +diff --git a/rpmlint/lint.py b/rpmlint/lint.py +index 7afadbc3..df5437e4 100644 +--- a/rpmlint/lint.py ++++ b/rpmlint/lint.py +@@ -5,6 +5,7 @@ import operator + import os + from pathlib import Path + from pstats import Stats ++import re + import sys + from tempfile import gettempdir + import time +@@ -22,6 +23,8 @@ class Lint(object): + Generic object handling the basic rpmlint operations + """ + ++ rpmlint_package = re.compile(r'/home/abuild/rpmbuild/RPMS/noarch/rpmlint-\d') ++ + def __init__(self, options): + # initialize configuration + self.checks = {} +@@ -53,6 +56,15 @@ class Lint(object): + self.config.configuration['ExtractDir'] = gettempdir() + # initialize output buffer + self.output = Filter(self.config) ++ ++ # Do not run rpmlint on rpmlint package that easily leads ++ # to run-time error as old rpmlint (taken from rpmlint-mini) ++ # uses a modified configuration. ++ for file in self.options['rpmfile']: ++ if self.rpmlint_package.search(str(file)): ++ print('Skipping rpmlint for rpmlint package!') ++ sys.exit(3) ++ + # preload the check list if we not print config + # some of the config values are transformed e.g. to regular + # expressions From 6913f8c75daaf2982ace095dae2b613be421098b358ba9abd12c25bee3f48b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Li=C5=A1ka?= Date: Tue, 12 Jul 2022 20:42:19 +0000 Subject: [PATCH 4/7] Clean up changelog. OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=932 --- rpmlint.changes | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/rpmlint.changes b/rpmlint.changes index 6eb2a61..0dcc179 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -4,23 +4,6 @@ Tue Jul 12 20:38:18 UTC 2022 - Martin Liška - Add skip-rpmlint-for-rpmlint.patch patch that skip linter this package. -------------------------------------------------------------------- -Tue Jul 12 20:15:59 UTC 2022 - mliska@suse.cz - -- Revert to version 2.3.0+git20220712.761ddf0. - -------------------------------------------------------------------- -Tue Jul 12 19:49:39 UTC 2022 - mliska@suse.cz - -- Update to version 2.3.0+git20220712.d55ac43: - * digest whitelists: remove now redundant sha256 algorithm specification - * FileDigestCheck: use sha256 digest algorithm by default - * dbus-services: adjust to PackageKit etc -> usr config file move (bsc#1201347) - * dbus-services: adjust to cups etc -> usr config file move (bsc#1201346) - * dbus-services: adjust to avahi etc -> usr config file move (bsc#1201345) - * whitelistings: fill in some missing metadata - * Improve syntax validation for digests. - ------------------------------------------------------------------- Mon Jul 11 12:41:48 UTC 2022 - mliska@suse.cz From dcb83bd785cec7c343bc5097ecc6feb91b344894c86f03d40a99d423fe5755d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Li=C5=A1ka?= Date: Tue, 12 Jul 2022 20:43:32 +0000 Subject: [PATCH 5/7] Fix patch. OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=933 --- skip-rpmlint-for-rpmlint.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skip-rpmlint-for-rpmlint.patch b/skip-rpmlint-for-rpmlint.patch index 737cb53..6952bd9 100644 --- a/skip-rpmlint-for-rpmlint.patch +++ b/skip-rpmlint-for-rpmlint.patch @@ -30,7 +30,7 @@ index 7afadbc3..df5437e4 100644 + for file in self.options['rpmfile']: + if self.rpmlint_package.search(str(file)): + print('Skipping rpmlint for rpmlint package!') -+ sys.exit(3) ++ sys.exit(0) + # preload the check list if we not print config # some of the config values are transformed e.g. to regular From c647bc660095634f716268408327b11c50ad090f8a1d0ea489a4d83087ecdc58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Li=C5=A1ka?= Date: Thu, 14 Jul 2022 07:20:44 +0000 Subject: [PATCH 6/7] Revert changes. OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=934 --- _service | 2 +- rpmlint.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_service b/_service index 9f1b8fb..2087e88 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ 2.3.0+git%cd.%h https://github.com/rpm-software-management/rpmlint.git git - 761ddf0910eaed2614433c57fc1a7c14b1983ee8 + opensuse enable diff --git a/rpmlint.spec b/rpmlint.spec index c0668a0..3831e1f 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -23,7 +23,7 @@ %define name_suffix -%{flavor} %endif Name: rpmlint%{name_suffix} -Version: 2.3.0+git20220712.761ddf0 +Version: 2.3.0+git20220711.46e6323 Release: 0 Summary: RPM file correctness checker License: GPL-2.0-or-later From e3b3071e3ec969992ead7fc62281ca4c82a40bae211b2b2942a01e91eefbc7f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Li=C5=A1ka?= Date: Thu, 14 Jul 2022 07:22:37 +0000 Subject: [PATCH 7/7] - Update to version 2.3.0+git20220712.761ddf0: * Improve syntax validation for digests. OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=935 --- _service | 2 +- rpmlint.changes | 2 ++ rpmlint.spec | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/_service b/_service index 2087e88..9f1b8fb 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ 2.3.0+git%cd.%h https://github.com/rpm-software-management/rpmlint.git git - opensuse + 761ddf0910eaed2614433c57fc1a7c14b1983ee8 enable diff --git a/rpmlint.changes b/rpmlint.changes index 0dcc179..42198e0 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,6 +1,8 @@ ------------------------------------------------------------------- Tue Jul 12 20:38:18 UTC 2022 - Martin Liška +- Update to version 2.3.0+git20220712.761ddf0: + * Improve syntax validation for digests. - Add skip-rpmlint-for-rpmlint.patch patch that skip linter this package. diff --git a/rpmlint.spec b/rpmlint.spec index 3831e1f..c0668a0 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -23,7 +23,7 @@ %define name_suffix -%{flavor} %endif Name: rpmlint%{name_suffix} -Version: 2.3.0+git20220711.46e6323 +Version: 2.3.0+git20220712.761ddf0 Release: 0 Summary: RPM file correctness checker License: GPL-2.0-or-later