Add scoring for new cpe check

Add check for release packages.
Validating that the cpeid is defined and set to the same value in all places.
2026-01-13 13:34:12 +01:00 · 2025-12-08 15:40:59 +01:00 · 2025-08-20 17:55:06 +02:00
7 changed files with 220 additions and 323 deletions
--- a/5
+++ b/5
@@ -3,7 +3,7 @@
    <param name="versionformat">2.7.0+git%cd.%h</param>
    <param name="url">https://github.com/rpm-software-management/rpmlint.git</param>
    <param name="scm">git</param>
-    <param name="revision">opensuse</param>
+    <param name="revision">opensuse-slfo-main</param>
    <param name="changesgenerate">enable</param>
  </service>
  <service name="recompress" mode="manual">
@@ -11,7 +11,4 @@
    <param name="file">*.tar</param>
  </service>
  <service name="set_version" mode="manual" />
-  <service name="format_spec_file" mode="manual">
-    <param name="specfile">rpmlint.spec</param>
-  </service>
 </services>
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                <param name="url">https://github.com/rpm-software-management/rpmlint.git</param>
-              <param name="changesrevision">a7f0a67c0ffa5dfa534d28513d1589eab0a9db88</param></service></servicedata>
+              <param name="changesrevision">9a0c1954fa97d2de5478b270c399dde6b3548034</param></service></servicedata>
--- a/product-check.patch
+++ b/product-check.patch
@@ -0,0 +1,140 @@
+commit 6de31f91b3b5910930c83003dd5bf06f8ce6f689
+Author: Adrian Schröter <adrian@suse.de>
+Date:   Tue Nov 11 16:40:44 2025 +0100
+
+    Add (open)SUSE product check
+    
+    Currently validating that the provided cpeid by rpm provides
+    is matching the one registered by the installed .prod file.
+    
+    /etc/os-release CPE_NAME is also validated for operating systems.
+    cpe 2.3 and 2.2 compability is accepted here.
+
+diff --git a/configs/openSUSE/scoring.toml b/configs/openSUSE/scoring.toml
+index e487510f..33aadb3b 100644
+--- a/configs/openSUSE/scoring.toml
+++ b/configs/openSUSE/scoring.toml
+@@ -2,6 +2,7 @@
+ arch-dependent-file-in-usr-share = 590
+ arch-independent-package-contains-binary-or-object = 499
+ binary-in-etc = 900
+cpe_name-mismatch = 10000
+ devel-file-in-non-devel-package = 50
+ dir-or-file-in-var-lock = 10000
+ dir-or-file-in-var-run = 10000
+diff --git a/rpmlint/checks/ProductCheck.py b/rpmlint/checks/ProductCheck.py
+new file mode 100644
+index 00000000..8ddeeb53
+--- /dev/null
+++ b/rpmlint/checks/ProductCheck.py
+@@ -0,0 +1,76 @@
+from xml.dom.minidom import parse
+from urllib.parse import unquote
+
+from rpmlint.checks.AbstractCheck import AbstractFilesCheck
+
+
+class ProductCheck(AbstractFilesCheck):
+    """
+    Validate that product files are correct. currently only cpeid.
+    """
+
+    def __init__(self, config, output):
+        super().__init__(config, output, r'/etc/products.d/.*\.prod$')
+
+    def check_file(self, pkg, filename):
+        cpeid_provider_found = None
+        cpeid_xml_found = None
+        for provide in pkg.provides:
+            if provide.name == 'product-cpeid()' and len(provide.version) > 1:
+                if cpeid_provider_found:
+                    self.output.add_info('E', pkg, 'product-cpeid-multiple-provider', 'multiple product-cpeid() provider, this is not specified yet', filename)
+                    return
+                cpeid_provider_found = unquote(provide.version[1])
+
+        if not cpeid_provider_found:
+            self.output.add_info('E', pkg, 'product-cpeid-no-provider', 'no product-cpeid() provider', filename)
+            return
+
+        lf = pkg.dir_name() + filename
+
+        try:
+            xml = parse(lf)
+        except xml.parsers.expat.ExpatError:
+            self.output.add_info('E', pkg, 'product-parsing-exception', 'Failed to parse: ', lf)
+            return
+
+        cpeids = xml.getElementsByTagName('cpeid')
+        if len(cpeids) != 1:
+            self.output.add_info('E', pkg, 'product-cpeid-unavailable', 'cpeid must be defined as singleton in prod file', lf)
+            return
+
+        cpeid_xml_found = cpeids[0].firstChild.data
+
+        if not cpeid_xml_found:
+            self.output.add_info('E', pkg, 'product-cpeid-no-prod-definition', 'no cpeid defined in prod file', lf)
+            return
+
+        if cpeid_xml_found != cpeid_provider_found:
+            self.output.add_info('E', pkg, 'product-cpeid-provider-mismatch', 'cpeid defined different in prod file to rpm provides', lf)
+
+        for file in pkg.files:
+            if file != "/etc/os-release":
+                continue
+
+            # Found base system
+            with open(pkg.dir_name() + '/etc/os-release', encoding='utf8') as f:
+                cpe_name = None
+                for line in f:
+                    if line.startswith("CPE_NAME="):
+                        cpe_name = line[10:].strip().strip('"').strip("'")
+
+                if not cpe_name:
+                    self.output.add_info('E', pkg, 'product-cpe_name-missing', 'no CPE_NAME defined in /etc/os-release file')
+                    return
+
+                if cpe_name != cpeid_xml_found and cpe_name.startswith("cpe:2.3:"):
+                    # convert to 2.2 style for now for comparing
+                    cpe_name = "cpe:/" + cpe_name.removeprefix("cpe:2.3:")
+                    while True:
+                        new_cpe_name = cpe_name.removesuffix(":*")
+                        if new_cpe_name == cpe_name:
+                            break
+                        cpe_name = new_cpe_name
+
+                if cpe_name != cpeid_xml_found:
+                    self.output.add_info('E', pkg, 'product-cpe_name-mismatch', 'CPE_NAME defined in /etc/os-release file is not matching', cpe_name, " vs ", cpeid_xml_found)
+diff --git a/rpmlint/configdefaults.toml b/rpmlint/configdefaults.toml
+index e95d25ea..95cc5152 100644
+--- a/rpmlint/configdefaults.toml
+++ b/rpmlint/configdefaults.toml
+@@ -20,6 +20,7 @@ Checks = [
+     "MixedOwnershipCheck",
+     "PkgConfigCheck",
+     "PostCheck",
+    "ProductCheck",
+     "PythonCheck",
+     "SignatureCheck",
+     "SourceCheck",
+diff --git a/rpmlint/descriptions/ProductCheck.toml b/rpmlint/descriptions/ProductCheck.toml
+new file mode 100644
+index 00000000..bf12c526
+--- /dev/null
+++ b/rpmlint/descriptions/ProductCheck.toml
+@@ -0,0 +1,4 @@
+product-parsing-exception="""
+The package provides an invalid product definition
+"""
+
+diff --git a/test/test_lint.py b/test/test_lint.py
+index 59b7ca84..38ca7c3d 100644
+--- a/test/test_lint.py
+++ b/test/test_lint.py
+@@ -50,6 +50,7 @@ basic_tests = [
+     'MixedOwnershipCheck',
+     'PkgConfigCheck',
+     'PostCheck',
+    'ProductCheck',
+     'PythonCheck',
+     'SignatureCheck',
+     'SourceCheck',
--- a/rpmlint-2.7.0+git20250710.a7f0a67c.tar.xz
+++ b/rpmlint-2.7.0+git20250710.a7f0a67c.tar.xz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:700eee3503bf9184995cf09690eb190a12e7a7978aca49c0ac3a687648ecd876
-size 6081852
--- a/rpmlint-2.7.0+git20250721.325a5b71.tar.xz
+++ b/rpmlint-2.7.0+git20250721.325a5b71.tar.xz
--- a/rpmlint.changes
+++ b/rpmlint.changes
@@ -1,175 +1,74 @@
 -------------------------------------------------------------------
-Thu Jul 10 13:28:53 UTC 2025 - Filippo Bonazzi <filippo.bonazzi@suse.com>
+Wed Nov 19 16:35:23 UTC 2025 - Adrian Schröter <adrian@suse.de>

- Update to version 2.7.0+git20250710.a7f0a67c:
-  * systemd-tmpfiles whitelist: additional dir for nix (bsc#1246162)
+- Add product check. This will validate correct cpeid data in
+  all places of release packages.
+  product-check.patch

 -------------------------------------------------------------------
-Tue Jul 08 14:19:28 UTC 2025 - Filippo Bonazzi <filippo.bonazzi@suse.com>
+Mon Jul 21 13:28:51 UTC 2025 - matthias.gerstner@suse.com

- Update to version 2.7.0+git20250708.79f54ece:
-  * polkit-rules-whitelist: add sssd realmd rules (bsc#1245697)
+- Update to version 2.7.0+git20250721.325a5b71:
+  * whitelistings: add libcgroup PAM module and setgid binary (bsc#1231381,
+    bsc#1246785)

 -------------------------------------------------------------------
-Mon Jun 23 11:13:23 UTC 2025 - Filippo Bonazzi <filippo.bonazzi@suse.com>
+Wed Jul 09 10:13:18 UTC 2025 - Filippo Bonazzi <filippo.bonazzi@suse.com>

- Update to version 2.7.0+git20250623.0a78a92e:
+- Update to version 2.7.0+git20250709.e7f5b2ac:
+  * dbus-services: backport supergfxctl (bsc#1246107)
+
+-------------------------------------------------------------------
+Mon Jun 23 10:58:39 UTC 2025 - Wolfgang Frisch <wolfgang.frisch@suse.com>
+
+- Update to version 2.7.0+git20250623.c7a8c058:
  * Fix libgpiod whitelisting package name (bsc#1244702)

 -------------------------------------------------------------------
-Thu Jun 19 11:34:07 UTC 2025 - Filippo Bonazzi <filippo.bonazzi@suse.com>
+Thu Jun 19 11:43:28 UTC 2025 - Filippo Bonazzi <filippo.bonazzi@suse.com>

- Update to version 2.7.0+git20250619.9a463f74:
+- Update to version 2.7.0+git20250619.e0dba6a4:
  * dbus-services: whitelist libgpiod (bsc#1244702)

 -------------------------------------------------------------------
-Tue Jun 10 09:45:34 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
+Thu Jun 05 13:06:36 UTC 2025 - matthias.gerstner@suse.com

- Update to version 2.7.0+git20250610.de7cb57e:
-  * AlternativesCheck: Fix .conf files regex
-  * BinariesCheck: also consider /usr/etc
-  * LogrotateCheck: consider configuration files in /usr/etc; add badness
-  * sysctl-whitelist: properly document the most recent review bug
-
-------------------------------------------------------------------
-Tue Jun 03 11:54:46 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
-
- Update to version 2.7.0+git20250603.a9db0eb9:
-  * BuildRootAndDateCheck: More specific buildroot check
-  * Add openQA users to users-groups.toml
-
-------------------------------------------------------------------
-Mon Jun 02 15:08:09 UTC 2025 - Johannes Segitz <jsegitz@suse.com>
-
- Update to version 2.7.0+git20250602.ed1e5f38:
+- Update to version 2.7.0+git20250605.92c974d2:
  * sysctl-whitelist: adjust 50-coredump.conf digest for systemd (bsc#1243959)
-  * SUIDPermissionsCheck: Check for permctl instead of chkstat

 -------------------------------------------------------------------
-Fri May 23 12:20:12 UTC 2025 - matthias.gerstner@suse.com
+Thu Jun 05 11:01:10 UTC 2025 - matthias.gerstner@suse.com

- Update to version 2.7.0+git20250523.2bcb1b9f:
-  * permissions-whitelist: add exim drop-in file (bsc#1240755)
-  * SpecCheck: warn also for py3_install macro usage
-  * SpecCheck: Add new warning for setup.py install usage
-  * test: Fix spellchecking
-  * When Declarative BuildSystem is used, assume patches are auto-applied
-  * SpecCheck: Add shared-dir-glob-in-files warning
-  * Tests: Accept long GPG key ids (for RPM 6)
-  * Avoid unnecessary backslashes
-  * Fixup fallback regexp for buildroot detection
-  * SpecCheck: Report rpm warnings on spec files
+- Update to version 2.7.0+git20250605.36f4961c:
+  * dbus-services: whitelist kio-admin (bsc#1229913)

 -------------------------------------------------------------------
-Thu May 15 11:16:41 UTC 2025 - Filippo Bonazzi <filippo.bonazzi@suse.com>
+Thu May 15 11:18:52 UTC 2025 - matthias.gerstner@suse.com

- Update to version 2.7.0+git20250515.1368c7ea:
-  * systemd-tmpfiles: add nix socket directory (bsc#1243206)
-
-------------------------------------------------------------------
-Mon May 05 16:47:01 UTC 2025 - Filippo Bonazzi <filippo.bonazzi@suse.com>
-
- Update to version 2.7.0+git20250505.8f450e38:
+- Update to version 2.7.0+git20250515.12417858:
  * polkit-rules-whitelist: adjust systemd-network package name (bsc#1242056)
  * dbus-services: adjust systemd-networkd and systemd-resolved (bsc#1242056)

 -------------------------------------------------------------------
-Tue Mar 25 08:57:01 UTC 2025 - wolfgang.frisch@suse.com
+Tue Apr 15 08:00:36 UTC 2025 - Filippo Bonazzi <filippo.bonazzi@suse.com>

- Update to version 2.7.0+git20250325.dd508d6:
-  * CI: Disable failing CI images
-  * polkit-rules: whitelist gdm WiFi connection setup rules (bsc#1239719)
-  * Fix grammatical direction for unstripped-binary-or-object message
+- Update to version 2.7.0+git20250415.3ceb6571:
+  * CI: exclude test/files from pyupgrade
+  * flake8: Skip test files from flake8
  * Release 2.7.0
-
-------------------------------------------------------------------
-Tue Feb 25 12:59:17 UTC 2025 - matthias.gerstner@suse.com
-
- Update to version 2.6.1+git20250225.61788d7b:
-  * dbus-services: whitelist kio-admin (bsc#1229913)
-
-------------------------------------------------------------------
-Mon Feb 17 14:39:32 UTC 2025 - matthias.gerstner@suse.com
-
- Update to version 2.6.1+git20250217.bfa2b434:
-  * dbus-services: whitelist systemd-sysupdated (bsc#1237106)
-
-------------------------------------------------------------------
-Wed Feb 12 16:01:16 UTC 2025 - wolfgang.frisch@suse.com
-
- Update to version 2.6.1+git20250212.0f39729:
-  * dbus-services: whitelist timekpr-next (bsc#1234134)
-
-------------------------------------------------------------------
-Mon Feb 10 13:17:54 UTC 2025 - matthias.gerstner@suse.com
-
- Update to version 2.6.1+git20250210.a7561ed8:
-  * dbus-services: adjust iio-sensor-proxy digest (bsc#1236290)
-  * CI: add opensuse-slfo-* branches
+  * test: exclude test files from ruff check
+  * Fix grammatical direction for unstripped-binary-or-object message
  * Add declarative build support to SpecCheck
  * FilesCheck: Update FSF address check
  * Handle the missing buildroot in rpm 4.20 gracefully
  * %{autochangelog} in the changelog section should not cause a warning
-
-------------------------------------------------------------------
-Tue Feb 04 11:32:13 UTC 2025 - matthias.gerstner@suse.com
-
- Update to version 2.6.1+git20250204.53a229c0:
-  * dbus-services: drop no longer needed temporary sssd-dbus entry
-  * dbus-services: adjust sssd-dbus hash (bsc#1235724)
-
-------------------------------------------------------------------
-Fri Jan 31 14:06:59 UTC 2025 - filippo.bonazzi@suse.com
-
- Update to version 2.6.1+git20250131.362f064:
-  * dbus-services: drop RemoteDesktop.service which is no longer packages.
-  * dbus-services: drop no longer packaged kcm_sddm service
-  * dbus-services: drop no longer packages scmon Pkcs11Monitor.conf
-
-------------------------------------------------------------------
-Tue Jan 28 10:27:56 UTC 2025 - matthias.gerstner@suse.com
-
- Update to version 2.6.1+git20250128.c5fd1e77:
-  * dbus-services: tuned-ppd: add new org.freedesktop.UPower names
-
-------------------------------------------------------------------
-Thu Jan 09 14:33:30 UTC 2025 - matthias.gerstner@suse.com
-
- Update to version 2.6.1+git20250109.dfc27180:
-  * whitelistings: add sssd permissions drop-in file for helper caps (bsc#1233131)
-
-------------------------------------------------------------------
-Fri Dec 06 13:01:31 UTC 2024 - matthias.gerstner@suse.com
-
- Update to version 2.6.1+git20241206.0bc429f2:
-  * dbus-services: fix mistake in sddm-kalpa whitelisting (bsc#1232647)
-
-------------------------------------------------------------------
-Fri Nov 29 13:47:15 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.6.1+git20241129.0f107c1:
-  * dbus-services: whitelist tuned-ppd (bsc#1232412)
- Add format_spec_file service in manual mode
- Convert existing services from disabled to manual mode
-
-------------------------------------------------------------------
-Tue Nov 19 10:21:14 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.6.1+git20241119.2e09c30:
-  * dbus-services: whitelist supergfxctl (bsc#1232776)
-
-------------------------------------------------------------------
-Fri Nov 15 14:27:47 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.6.1+git20241115.da2ed92:
-  * polkit-rules-whitelist: adjust package name for sssd (bsc#1230051)
+  * SUIDPermissionsCheck: Escape path for regular expression
+  * false positive: systemd-service-without-service_del_postun
+  * SUIDPermissionsCheck: chkstat to permctl rename
  * SpecCheck: Update suse-update-desktop-file-deprecated message
  * FilesCheck: Do not error about non-readable %ghost
  * test: Mocking TagsCheck binaries
-  * CI: exclude test/files from pyupgrade
-  * test: exclude test files from ruff check
  * test: Fix flake8 issues
-  * flake8: Skip test files from flake8
  * test: Move doc pacakges to mock
  * test: Normalize mock_zypp_syntax
  * test: Normalize mock_xinetd
@@ -196,53 +95,10 @@ Fri Nov 15 14:27:47 UTC 2024 - filippo.bonazzi@suse.com
  * test: Normalize mock_appdata
  * test: Use skipif instead of early return in test_extract_fail
  * Remove fPing binary not needed anymore
-
-------------------------------------------------------------------
-Mon Nov 11 13:15:05 UTC 2024 - dimstar@opensuse.org
-
- Update to version 2.6.1+git20241111.4884f6a:
-  * SUIDPermissionsCheck: Escape path for regular expression
-  * false positive: systemd-service-without-service_del_postun
-
-------------------------------------------------------------------
-Thu Nov 07 15:28:46 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.6.1+git20241107.1b69a23:
-  * dbus-services: whitelist sddm-kalpa (bsc#1232647)
-  * dbus-services: replace generic comment for sddm
-  * SUIDPermissionsCheck: chkstat to permctl rename
-
-------------------------------------------------------------------
-Thu Oct 24 11:33:51 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.6.1+git20241024.1f09e50:
-  * whitelistings: add libcgroup PAM module and setgid binary (bsc#1231381)
-
-------------------------------------------------------------------
-Mon Oct 21 07:38:46 UTC 2024 - wolfgang.frisch@suse.com
-
- Update to version 2.6.1+git20241017.b725184:
-  * dbus-services: deepin-system-monitor (bsc#1230018)
-
-------------------------------------------------------------------
-Wed Oct 16 12:47:08 UTC 2024 - matthias.gerstner@suse.com
-
- Update to version 2.6.1+git20241016.ae941eb7:
-  * dbus-services: adjust gnome-remote-desktop to version 47 (bsc#1230406)
-  * Add new warning about the usage of %suse_update_desktop_file
-
-------------------------------------------------------------------
-Fri Sep 20 15:22:43 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.6.1+git20240918.5cb5647:
-  * opensuse: explain pull requests more precisely
  * Fix pam-module test binary package
  * Fix tests with new rpm2cpio command
-  * openSUSE: strict policy to ERR on patch-macro-old-format
-  * Add traefik user and group
+  * Add new warning about the usage of %suse_update_desktop_file
  * test: Fix test_extract_fail when running as root
-  * Update users-groups.toml 3proxy (#1267)
-  * Add user and group sssd
  * Test: Add missing test file for test_files.py
  * Remove not needed binary rpm
  * Replace bin in test_files.py
@@ -265,7 +121,6 @@ Fri Sep 20 15:22:43 UTC 2024 - filippo.bonazzi@suse.com
  * Replace bin in test_pkgconfig.py
  * Replace bin in test_FHS.py
  * Remove not needed test files
-  * Replace bin in test_mixed_ownership.py
  * Replace bin in test_build_root.py
  * Replace bin in test_dbus_policy.py
  * Fix for bug detected in test_appdata.py
@@ -274,49 +129,43 @@ Fri Sep 20 15:22:43 UTC 2024 - filippo.bonazzi@suse.com
  * Replace bin in test_lib_dependency.py
  * Replace bin in test_erlang.py
  * Delete not needed files
-  * Update users-groups.toml
  * Replace bin in test_mixed_ownership.py

 -------------------------------------------------------------------
-Wed Sep 18 09:07:27 UTC 2024 - filippo.bonazzi@suse.com
+Tue Feb 18 09:00:07 UTC 2025 - matthias.gerstner@suse.com

- Update to version 2.6.1+git20240918.9e0efea:
-  * dbus-services: gdm: temporarily whitelist old version (bsc#1230466)
-  * dbus-services: sssd: temporarily whitelist old version (bsc#1230051)
-  * sysctl-whitelist: traefik: increase socket buffers (bsc#1230555)
+- Update to version 2.6.1+git20250217.37bf4ada:
+  * dbus-services: whitelist systemd-sysupdated (bsc#1237106)

 -------------------------------------------------------------------
-Thu Sep 12 16:00:23 UTC 2024 - filippo.bonazzi@suse.com
+Tue Feb 04 13:13:06 UTC 2025 - matthias.gerstner@suse.com

- Update to version 2.6.1+git20240912.cce07f4:
-  * dbus-services: gdm update (bsc#1230466)
-  * pam-modules: pam_limits.so moved from `pam` to `pam-extra` (bsc#1230447)
-  * polkit-rules: add whitelisting for sssd smartcard access (bsc#1230051)
-  * dbus-services: adjust digests for sssd (bsc#1230051)
+- switch _service from "disabled" to "manual" to harmonize with other
+  codestreams.
+- switch to new opensuse-slfo-main branch to allow selective backporting of
+  required whitelisting changes.
+- Update to version 2.6.1+git20250204.699be0cd:
+  * dbus-services: tuned-ppd: add new org.freedesktop.UPower names
+  * dbus-services: whitelist tuned-ppd (bsc#1232412)
+  * CI: add opensuse-slfo-* branches

 -------------------------------------------------------------------
-Tue Sep 03 11:16:39 UTC 2024 - wolfgang.frisch@suse.com
-
- Update to version 2.6.1+git20240903.3c1fddf:
-  * configs/openSUSE/users-groups.toml: add nqptp (boo#1213060)
-
-------------------------------------------------------------------
-Fri Aug 09 09:23:19 UTC 2024 - filippo.bonazzi@suse.com
+Fri Aug 09 07:38:50 UTC 2024 - filippo.bonazzi@suse.com

 - Update to version 2.6.1+git20240807.9387990:
  * dbus-services: systemd: remove outdated hashes (bsc#1225317)
-
-------------------------------------------------------------------
-Fri Aug 02 06:25:53 UTC 2024 - daniel.garcia@suse.com
-
- Update to version 2.6.1+git20240802.da40b67:
  * Release 2.6.1
  * FilesCheck: Fix zero perm check with binaries
  * FilesCheck: Fix zero permission check with folder
  * Update openSUSE's licenses.toml

 -------------------------------------------------------------------
-Thu Aug 01 13:37:28 UTC 2024 - filippo.bonazzi@suse.com
+Wed Aug  7 13:06:15 UTC 2024 - Filippo Bonazzi <filippo.bonazzi@suse.com>
+
+- Fix rpmlint-test dependency on python3-tomli
+
+-------------------------------------------------------------------
+Thu Aug 01 13:42:49 UTC 2024 - filippo.bonazzi@suse.com

 - Update to version 2.6.0+git20240801.f3e815d:
  * sysctl-whitelist: kernel.pid_max entry moved (bsc#1228731)
@@ -333,143 +182,50 @@ Thu Aug 01 13:37:28 UTC 2024 - filippo.bonazzi@suse.com
  * FilesCheck: zero-perms differentiate between ghost and normal files
  * FilesCheck: warn about files with zero perms
  * Create Mock packages for tests in config_files, i18n, tmp_file and zypp_syntax (#1235)
-  * users-groups.toml: add caddy
-  * PythonCheck: simplify requirement check using metadata
-
-------------------------------------------------------------------
-Mon Jun 24 14:18:13 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.5.0+git20240624.609e1aa:
  * sysctl-whitelist: move 50-coredump.conf to systemd main package (bsc#1226865)
  * sysctl-whitelist: aaa_base: new sub-package to disable YAMA (bsc#1226460)
  * sysctl-whitelist: aaa_base: adjust 50-default.conf digest (bsc#1226464)
-
-------------------------------------------------------------------
-Wed Jun 19 13:14:23 UTC 2024 - wolfgang.frisch@suse.com
-
- Update to version 2.5.0+git20240619.f4bc3a6:
  * dbus-services: systemd: keep the old whitelisting temporarily (bsc#1225317)
  * dbus-services: whitelist kdeplasma6-addons kameleonhelper (bsc#1226306)
  * dbus-services: adjust backintime whitelisting to etc->usr move (bsc#1226446)
-
-------------------------------------------------------------------
-Thu Jun 13 16:22:35 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.5.0+git20240613.c7bc651:
+  * users-groups.toml: add caddy
  * whitelistings: systemd v256 (bsc#1225317)
-
-------------------------------------------------------------------
-Tue Jun 11 15:05:20 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.5.0+git20240611.11134e8:
  * whitelist valkey (bsc#1226083)
-
-------------------------------------------------------------------
-Wed May 22 14:19:15 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.5.0+git20240522.59c66e6:
  * whitelistings: add gnome-remote-desktop Polkit and D-Bus components (bsc#1222159)
-
-------------------------------------------------------------------
-Tue May 14 16:17:30 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.5.0+git20240514.fd06b07:
  * zypper-plugins: adjust permissions-zypp-plugin to new permctl name
+  * PythonCheck: simplify requirement check using metadata
  * dbus-services: remove deepin-api entry until packaging issues are resolved
  * whitelistings: drop no longer needed KDE5 whitelistings
  * dbus-services: drop no longer present nfs-ganesha entry
  * whitelistings: drop no longer needed pam_dbus entries
-
-------------------------------------------------------------------
-Tue Apr 16 11:53:26 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.5.0+git20240416.97c8fad:
  * pam-modules: whitelist pam_oslogin_admin.so (bsc#1222457)
  * Revert "pam-modules: whitelist pam_lastlog2 now moved to util-linux (bsc#1222329)"
+  * dbus-services: whitelist dnf5daemon-server (bsc#1218327)
+  * pam-modules: whitelist pam_lastlog2 now moved to util-linux (bsc#1222329)
  * Clarify what the real intent is of this check
+  * dbus-services: power-profiles-daemon: reinstate legacy D-Bus whitelisting (bsc#1219957)
+  * Revert "dbus-services: Still provide old GDM whitelisting (bsc#1218922)"
  * openSUSE: Add netdata user/group
  * Add forgejo group and user
  * remove comment in setup.cfg
-  * test: mocked package in test_xinetd.py
-
-------------------------------------------------------------------
-Mon Apr 08 10:27:25 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.5.0+git20240408.62c3097:
-  * dbus-services: whitelist dnf5daemon-server (bsc#1218327)
-
-------------------------------------------------------------------
-Fri Apr 05 14:59:47 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.5.0+git20240405.5171234:
-  * pam-modules: whitelist pam_lastlog2 now moved to util-linux (bsc#1222329)
-
-------------------------------------------------------------------
-Wed Apr 03 10:55:05 UTC 2024 - wolfgang.frisch@suse.com
-
- Update to version 2.5.0+git20240403.33599c3:
-  * dbus-services: power-profiles-daemon: reinstate legacy D-Bus whitelisting (bsc#1219957)
-  * Revert "dbus-services: Still provide old GDM whitelisting (bsc#1218922)"
-
-------------------------------------------------------------------
-Mon Mar 25 14:01:12 UTC 2024 - wolfgang.frisch@suse.com
-
- Update to version 2.5.0+git20240325.982d664:
  * dbus-services: power-profiles-daemon (bsc#1219956) (#1197)
+  * test: mocked package in test_xinetd.py
  * SpecCheck: Add no-%check-section warning
  * Bump upper bound of suse_version to include ALP & current Factory
  * test: add mocks folder and mocks for duplicates check
+  * dbus-services: Still provide old GDM whitelisting (bsc#1218922)
+  * dbus-services: whitelist sddm-kcm6 (bsc#1217188)
+  * whitelistings: merge redundant systemd vs. systemd-mini entries
+  * pam-modules: also whitelisted pam_system_loadkey for systemd-mini (bsc#1220249)
+  * dbus-services: adjust gdm whitelisting (bsc#1218922)
  * pkg: remove unicode type reference in is_utf8_bytestr exception
  * Refactored the is_utf8_bytestr function
  * readme: More specific title for building section
  * test: imporve fixtures in test_duplicates.py
-  * Add building documentation
-  * Update README.md
-
-------------------------------------------------------------------
-Mon Mar 11 12:15:52 UTC 2024 - Ben Greiner <code@bnavigator.de>
-
- Also fix the runtime requirement syntax
-
-------------------------------------------------------------------
-Sun Mar 10 12:48:45 UTC 2024 - Ben Greiner <code@bnavigator.de>
-
- Fix tomli requirement: It was never pulled in by obs explicitly
-  but declared required in rpmbuild. Pytest removed the requirement
-  that masked this issue.We actually don't need it with
-  python >= 3.11
-
-------------------------------------------------------------------
-Fri Mar 08 12:28:46 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.5.0+git20240308.ec22ec6:
-  * dbus-services: Still provide old GDM whitelisting (bsc#1218922)
-
-------------------------------------------------------------------
-Wed Mar 06 11:28:13 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.5.0+git20240306.d765521:
-  * dbus-services: whitelist sddm-kcm6 (bsc#1217188)
-
-------------------------------------------------------------------
-Tue Mar 05 14:48:17 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.5.0+git20240305.3e99616:
-  * whitelistings: merge redundant systemd vs. systemd-mini entries
-  * pam-modules: also whitelisted pam_system_loadkey for systemd-mini (bsc#1220249)
-  * dbus-services: adjust gdm whitelisting (bsc#1218922)
-
-------------------------------------------------------------------
-Fri Mar 01 14:03:27 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.5.0+git20240229.92123b5:
  * dbus-services: whitelist drkonqi KDE6 update (bsc#1220190)
+  * Add building documentation
  * pam-modules: whitelist pam_systemd_loadkey.so (bsc#1220249)
-
-------------------------------------------------------------------
-Mon Feb 26 16:42:21 UTC 2024 - filippo.bonazzi@suse.com
-
- Update to version 2.5.0+git20240226.8b18627:
+  * Update README.md
  * dbus-services: whitelist kde-inotify-survey with KDE6 changes (bsc#1217191)
  * dbus-services whitelist: adjust kde6 digests after fix in kauth6 (bsc#1220215)
  * CI: Reenable mageia-cauldron in packit
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package rpmlint
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,13 +23,15 @@
 %define name_suffix -%{flavor}
 %endif
 Name:           rpmlint%{name_suffix}
-Version:        2.7.0+git20250710.a7f0a67c
+Version:        2.7.0+git20250721.325a5b71
 Release:        0
 Summary:        RPM file correctness checker
 License:        GPL-2.0-or-later
 URL:            https://github.com/rpm-software-management/rpmlint
 Source0:        rpmlint-%{version}.tar.xz
 Patch0:         disable-flake-and-cov.patch
+# PATCH-FIX-UPSTREAM https://github.com/rpm-software-management/rpmlint/pull/1405
+Patch1:         product-check.patch
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildRequires:  python3-pip
@@ -51,10 +53,12 @@ BuildRequires:  python3-pytest-xdist
 BuildRequires:  python3-python-magic
 BuildRequires:  python3-pyxdg
 BuildRequires:  python3-rpm
+%if 0%{?python3_version_nodots} < 311
+BuildRequires:  python3-tomli
+%endif
 BuildRequires:  python3-tomli-w
 BuildRequires:  python3-zstandard
 BuildRequires:  xz
-BuildRequires:  (python3-tomli if python3-base < 3.11)
 %ifarch x86_64
 BuildRequires:  glibc-32bit
 %endif
Author	SHA256	Message	Date
Adrian Schröter	95cec41f25	Add scoring for new cpe check	2026-01-13 13:34:12 +01:00
Adrian Schröter	a9b0068b03	Add check for release packages. Validating that the cpeid is defined and set to the same value in all places.	2025-12-08 15:40:59 +01:00
Adrian Schröter	5ed4651140	Sync changes to SLFO-1.2 branch	2025-08-20 17:55:06 +02:00