Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2021-03-05 13:42:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmlint" Fri Mar 5 13:42:56 2021 rev:350 rq:876046 version:1.11 Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint-tests.changes 2020-08-03 14:12:46.248341737 +0200 +++ /work/SRC/openSUSE:Factory/.rpmlint.new.2378/rpmlint-tests.changes 2021-03-05 13:42:59.639497715 +0100 @@ -1,0 +2,9 @@ +Fri Feb 26 09:10:31 UTC 2021 - co...@suse.com + +- Update to version 84.87+git20210226.d6b66e2: + * GitHub Actions: work around the missing + * GitHub Actions: work around the missing `groupadd` + * rclink2: fix test reference output + * polkit: adjust polkit frobnicate action name + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2021-01-19 16:00:24.291217672 +0100 +++ /work/SRC/openSUSE:Factory/.rpmlint.new.2378/rpmlint.changes 2021-03-05 13:42:59.751497816 +0100 @@ -1,0 +2,28 @@ +Fri Feb 26 10:49:52 UTC 2021 - Stephan Kulow <co...@suse.com> + +- Add accept-licenses-with-plus.patch to accept any license ending + with a + (as indicated in the SPDX syntax) + +------------------------------------------------------------------- +Fri Feb 26 09:12:17 UTC 2021 - Stephan Kulow <co...@suse.com> + +- Remove licenses ending with + from valid license array + +------------------------------------------------------------------- +Mon Feb 22 13:26:48 UTC 2021 - Matthias Gerstner <matthias.gerst...@suse.com> + +- whitelist pam_sss_gss.so PAM module (bsc#1182509) + +------------------------------------------------------------------- +Wed Feb 3 21:24:59 UTC 2021 - ch...@computersalat.de + +- add 'otobo' group/id + +------------------------------------------------------------------- +Mon Feb 1 10:15:50 UTC 2021 - Stephan Kulow <co...@suse.com> + +- Update valid spdx license exceptions +- Allow the + version of all valid licenses (to avoid having to fix + the parser) + +------------------------------------------------------------------- Old: ---- rpmlint-tests-84.87+git20200724.ef05f7e.tar.xz New: ---- accept-licenses-with-plus.patch rpmlint-tests-84.87+git20210226.d6b66e2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint-tests.spec ++++++ --- /var/tmp/diff_new_pack.uJjdO3/_old 2021-03-05 13:43:00.983498936 +0100 +++ /var/tmp/diff_new_pack.uJjdO3/_new 2021-03-05 13:43:00.983498936 +0100 @@ -24,7 +24,7 @@ BuildRequires: rpmlint-mini Name: rpmlint-tests -Version: 84.87+git20200724.ef05f7e +Version: 84.87+git20210226.d6b66e2 Release: 0 Summary: rpmlint regression tests License: SUSE-Public-Domain ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.uJjdO3/_old 2021-03-05 13:43:01.003498955 +0100 +++ /var/tmp/diff_new_pack.uJjdO3/_new 2021-03-05 13:43:01.007498958 +0100 @@ -62,6 +62,7 @@ Patch77: suse-rpmlint-all-pie.patch Patch78: add-check-for-a-non-zero-.text-segment-in-.a-archive.patch Patch79: rpm415-workaround.diff +Patch80: accept-licenses-with-plus.patch BuildRequires: desktop-file-utils BuildRequires: obs-service-format_spec_file BuildRequires: python3-flake8 @@ -118,9 +119,9 @@ sed -i -e "s/\(#VALIDLICENSES\)/\1\n '$l',/" licenses.config done # add some deprecated licenses we allow for now -for l in AGPL-3.0 AGPL-3.0+ GFDL-1.1 GFDL-1.1+ GFDL-1.2 GFDL-1.2+ GFDL-1.3 GFDL-1.3+ GPL-3.0-with-GCC-exception \ +for l in AGPL-3.0 GFDL-1.1 GFDL-1.2 GFDL-1.3 GPL-3.0-with-GCC-exception \ GPL-2.0-with-classpath-exception GPL-2.0-with-font-exception SUSE-LGPL-2.1+-with-GCC-exception SUSE-NonFree \ - GPL-1.0+ GPL-1.0 GPL-2.0+ GPL-2.0 GPL-3.0+ GPL-3.0 LGPL-2.0 LGPL-2.0+ LGPL-2.1+ LGPL-2.1 LGPL-3.0+ LGPL-3.0; do + GPL-1.0 GPL-2.0 GPL-3.0 LGPL-2.0 LGPL-2.1 LGPL-3.0; do sed -i -e "s/\(#VALIDLICENSES\)/\1\n '$l',/" licenses.config done install -m 644 licenses.config %{buildroot}/%{_sysconfdir}/rpmlint/ ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.uJjdO3/_old 2021-03-05 13:43:01.071499017 +0100 +++ /var/tmp/diff_new_pack.uJjdO3/_new 2021-03-05 13:43:01.075499020 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/rpmlint-tests.git</param> - <param name="changesrevision">3d948bb4c8be26e2ec8922d4c3430b0e0451994b</param></service><service name="tar_scm"> + <param name="changesrevision">d6b66e2f3072f5962358e0101c3597316903cfd2</param></service><service name="tar_scm"> <param name="url">https://github.com/openSUSE/rpmlint-checks.git</param> - <param name="changesrevision">f62985c16ad7bc370ea08958a139d23aad4fd94b</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">8a60ef9ef02754556557db3708477f3568c13ff1</param></service></servicedata> \ No newline at end of file ++++++ accept-licenses-with-plus.patch ++++++ Index: rpmlint-rpmlint-1.11/TagsCheck.py =================================================================== --- rpmlint-rpmlint-1.11.orig/TagsCheck.py +++ rpmlint-rpmlint-1.11/TagsCheck.py @@ -845,12 +845,19 @@ class TagsCheck(AbstractCheck.AbstractCh return (x.strip() for x in (l for l in license_regex.split(license) if l)) + def is_valid_license(license): + if license in VALID_LICENSES: + return True + if license.endswith('+'): + return license[:-1] in VALID_LICENSES + return False + rpm_license = pkg[rpm.RPMTAG_LICENSE] if not rpm_license: printError(pkg, 'no-license') else: valid_license = True - if rpm_license not in VALID_LICENSES: + if not is_valid_license(rpm_license): license_string = rpm_license l1, lexception = split_license_exception(rpm_license) @@ -862,10 +869,10 @@ class TagsCheck(AbstractCheck.AbstractCh valid_license = False for l1 in split_license(license_string): - if l1 in VALID_LICENSES: + if is_valid_license(l1): continue for l2 in split_license(l1): - if l2 not in VALID_LICENSES: + if not is_valid_license(l2): printWarning(pkg, 'invalid-license', l2) valid_license = False if not valid_license: ++++++ config ++++++ --- /var/tmp/diff_new_pack.uJjdO3/_old 2021-03-05 13:43:01.099499042 +0100 +++ /var/tmp/diff_new_pack.uJjdO3/_new 2021-03-05 13:43:01.099499042 +0100 @@ -204,6 +204,7 @@ 'oinstall', 'openvswitch', 'orthanc', + 'otobo', 'otrs', 'ovirtagent', 'pcp', @@ -427,6 +428,7 @@ 'openvswitch', 'oracle', 'orthanc' + 'otobo', 'otrs', 'ovirtagent', 'partimag', @@ -942,6 +944,8 @@ "pam_malcontent.so", # pam (bsc#1171562) "pam_faillock.so", + # sssd gssapi extension (bsc#1182509) + "pam_sss_gss.so" )) # Output filters ++++++ rpmlint-checks-master.tar.xz ++++++ ++++++ rpmlint-tests-84.87+git20200724.ef05f7e.tar.xz -> rpmlint-tests-84.87+git20210226.d6b66e2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-84.87+git20200724.ef05f7e/.github/Dockerfile new/rpmlint-tests-84.87+git20210226.d6b66e2/.github/Dockerfile --- old/rpmlint-tests-84.87+git20200724.ef05f7e/.github/Dockerfile 2020-07-24 11:46:05.000000000 +0200 +++ new/rpmlint-tests-84.87+git20210226.d6b66e2/.github/Dockerfile 2021-02-26 10:08:54.000000000 +0100 @@ -2,7 +2,7 @@ # erlang is required for some tests # gcc-PIE is needed, because default GCC doesn't create PIE binaries and we don't want to trigger position-independent-executable-suggested -RUN zypper -q --color in -y --no-recommends rpmlint-Factory-strict rpmlint-Factory rpmlint-mini rpmbuild git erlang gcc-PIE colordiff +RUN zypper --color in -y --no-recommends shadow && PATH=/usr/sbin/:$PATH zypper --color in -y --no-recommends rpmlint-Factory-strict rpmlint-Factory rpmlint-mini rpmbuild git erlang gcc-PIE colordiff COPY integration_test.sh /integration_test.sh ENTRYPOINT ["/integration_test.sh"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-84.87+git20200724.ef05f7e/tests/polkit.spec new/rpmlint-tests-84.87+git20210226.d6b66e2/tests/polkit.spec --- old/rpmlint-tests-84.87+git20200724.ef05f7e/tests/polkit.spec 2020-07-24 11:46:05.000000000 +0200 +++ new/rpmlint-tests-84.87+git20210226.d6b66e2/tests/polkit.spec 2021-02-26 10:08:54.000000000 +0100 @@ -56,7 +56,7 @@ <allow_active>yes</allow_active> </defaults> </action> - <action id="org.gnome.policykit.examples.frobnicate"> + <action id="org.freedesktop.policykit.example.pkexec.run-frobnicate"> <defaults> <allow_any>yes</allow_any> <allow_inactive>yes</allow_inactive> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-84.87+git20200724.ef05f7e/tests/rclink2.ref new/rpmlint-tests-84.87+git20210226.d6b66e2/tests/rclink2.ref --- old/rpmlint-tests-84.87+git20200724.ef05f7e/tests/rclink2.ref 2020-07-24 11:46:05.000000000 +0200 +++ new/rpmlint-tests-84.87+git20210226.d6b66e2/tests/rclink2.ref 2021-02-26 10:08:54.000000000 +0100 @@ -1,5 +1,5 @@ rclink2: W: incoherent-init-script-name blah ('rclink2', 'rclink2d') rclink2: W: no-reload-entry /etc/init.d/blah rclink2: W: no-status-entry /etc/init.d/blah -rclink2: W: suse-deprecated-init-script /etc/init.d/blah -1 packages and 0 specfiles checked; 0 errors, 4 warnings. +rclink2: E: suse-deprecated-init-script (Badness: 10000) /etc/init.d/blah +1 packages and 0 specfiles checked; 1 errors, 3 warnings. ++++++ suse-spdx-license-exceptions.patch ++++++ --- /var/tmp/diff_new_pack.uJjdO3/_old 2021-03-05 13:43:01.295499220 +0100 +++ /var/tmp/diff_new_pack.uJjdO3/_new 2021-03-05 13:43:01.295499220 +0100 @@ -11,7 +11,7 @@ =================================================================== --- rpmlint-rpmlint-1.11.orig/TagsCheck.py +++ rpmlint-rpmlint-1.11/TagsCheck.py -@@ -140,6 +140,34 @@ DEFAULT_VALID_LICENSES = ( +@@ -140,6 +140,50 @@ DEFAULT_VALID_LICENSES = ( 'Shareware', ) @@ -20,6 +20,7 @@ + 'Autoconf-exception-2.0', + 'Autoconf-exception-3.0', + 'Bison-exception-2.2', ++ 'Bootloader-exception', + 'CLISP-exception-2.0', + 'Classpath-exception-2.0', + 'DigiRule-FOSS-exception', @@ -28,11 +29,26 @@ + 'Font-exception-2.0', + 'GCC-exception-2.0', + 'GCC-exception-3.1', ++ 'GPL-3.0-linking-exception', ++ 'GPL-3.0-linking-source-exception', ++ 'GPL-CC-1.0', ++ 'LGPL-3.0-linking-exception', ++ 'LLVM-exception', + 'LZMA-exception', + 'Libtool-exception', ++ 'Linux-syscall-note', + 'Nokia-Qt-exception-1.1', + 'OCCT-exception-1.0', ++ 'OCaml-LGPL-linking-exception', ++ 'OpenJDK-assembly-exception-1.0', ++ 'PS-or-PDF-font-exception-20170817', ++ 'Qt-GPL-exception-1.0', ++ 'Qt-LGPL-exception-1.1', + 'Qwt-exception-1.0', ++ 'SHL-2.0', ++ 'SHL-2.1', ++ 'Swift-exception', ++ 'Universal-FOSS-exception-1.0', + 'WxWindows-exception-3.1', + 'eCos-exception-2.0', + 'freertos-exception-2.0', @@ -46,7 +62,7 @@ BAD_WORDS = { 'alot': 'a lot', 'accesnt': 'accent', -@@ -408,6 +436,7 @@ VALID_GROUPS = Config.getOption('ValidGr +@@ -408,6 +452,7 @@ VALID_GROUPS = Config.getOption('ValidGr if VALID_GROUPS is None: # get defaults from rpm package only if it's not set VALID_GROUPS = Pkg.get_default_valid_rpmgroups() VALID_LICENSES = Config.getOption('ValidLicenses', DEFAULT_VALID_LICENSES) @@ -54,7 +70,7 @@ INVALID_REQUIRES = map(re.compile, Config.getOption('InvalidRequires', DEFAULT_INVALID_REQUIRES)) packager_regex = re.compile(Config.getOption('Packager')) changelog_version_regex = re.compile(r'[^>]([^ >]+)\s*$') -@@ -422,6 +451,7 @@ lib_package_regex = re.compile(r'(?:^(?: +@@ -422,6 +467,7 @@ lib_package_regex = re.compile(r'(?:^(?: leading_space_regex = re.compile(r'^\s+') pkg_config_regex = re.compile(r'^/usr/(?:lib\d*|share)/pkgconfig/') license_regex = re.compile(r'\(([^)]+)\)|\s(?:and|or|AND|OR)\s') @@ -62,7 +78,7 @@ invalid_version_regex = re.compile(r'([0-9](?:rc|alpha|beta|pre).*)', re.IGNORECASE) # () are here for grouping purpose in the regexp forbidden_words_regex = re.compile(r'(%s)' % Config.getOption('ForbiddenWords'), re.IGNORECASE) -@@ -795,6 +825,10 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -795,6 +841,10 @@ class TagsCheck(AbstractCheck.AbstractCh # printWarning(pkg, 'package-provides-itself') # break @@ -73,7 +89,7 @@ def split_license(license): return (x.strip() for x in (l for l in license_regex.split(license) if l)) -@@ -805,7 +839,17 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -805,7 +855,17 @@ class TagsCheck(AbstractCheck.AbstractCh else: valid_license = True if rpm_license not in VALID_LICENSES: @@ -92,7 +108,7 @@ if l1 in VALID_LICENSES: continue for l2 in split_license(l1): -@@ -1092,6 +1136,11 @@ your specfile.''', +@@ -1092,6 +1152,11 @@ your specfile.''', '''The value of the License tag was not recognized. Known values are: "%s".''' % '", "'.join(VALID_LICENSES),