diff --git a/config b/config index c1c74f7..623d8a0 100644 --- a/config +++ b/config @@ -468,6 +468,7 @@ setOption('StandardGroups', ( 'sshd', 'suse-ncc', 'svn', + 'synapse', 'sys', 'systemd-journal', 'systemd-journal-gateway', @@ -650,6 +651,7 @@ setOption('StandardUsers', ( 'statd', 'suse-ncc', 'svn', + 'synapse', 'systemd-journal-gateway' 'tftp', 'tomcat', diff --git a/rpmlint-tests-sle15.patch b/rpmlint-tests-sle15.patch new file mode 100644 index 0000000..f302b5d --- /dev/null +++ b/rpmlint-tests-sle15.patch @@ -0,0 +1,28 @@ +From af1ec4e64647ec4b6bf550ba822165c563a40ad6 Mon Sep 17 00:00:00 2001 +From: Ludwig Nussel +Date: Wed, 9 May 2018 13:50:54 +0200 +Subject: [PATCH] Revert "polkit: adjust reference output to match + corresponding change in rpmlint-checks" + +This reverts commit f4dfbdc2cc367245537df410353a64d67cbcc519. +--- + tests/polkit.ref | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/polkit.ref b/tests/polkit.ref +index fb214ea..22dd180 100644 +--- a/tests/polkit.ref ++++ b/tests/polkit.ref +@@ -1,6 +1,6 @@ + polkit: I: polkit-cant-acquire-privilege org.opensuse.test.bar (no:auth_admin:auth_admin) ++polkit: W: polkit-untracked-privilege org.opensuse.test.bar (no:auth_admin:auth_admin) ++polkit: W: polkit-untracked-privilege org.opensuse.test.foo (auth_admin:auth_admin:auth_admin) + polkit: E: polkit-unauthorized-privilege (Badness: 10000) org.opensuse.test.baz (auth_admin:auth_admin:auth_self) + polkit: E: polkit-unauthorized-privilege (Badness: 10000) org.opensuse.test.baz2 (auth_admin:auth_admin:yes) +-polkit: E: polkit-untracked-privilege (Badness: 10000) org.opensuse.test.bar (no:auth_admin:auth_admin) +-polkit: E: polkit-untracked-privilege (Badness: 10000) org.opensuse.test.foo (auth_admin:auth_admin:auth_admin) +-1 packages and 0 specfiles checked; 4 errors, 0 warnings. ++1 packages and 0 specfiles checked; 2 errors, 2 warnings. +-- +2.16.3 + diff --git a/rpmlint-tests.changes b/rpmlint-tests.changes index f0b989c..12979c4 100644 --- a/rpmlint-tests.changes +++ b/rpmlint-tests.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 9 11:48:47 UTC 2018 - lnussel@suse.de + +- add rpmlint-tests-sle15.patch to fix rpmlint-tests build for + sle/leap 15 + ------------------------------------------------------------------- Tue Feb 20 14:13:28 UTC 2018 - opensuse-packaging@opensuse.org diff --git a/rpmlint-tests.spec b/rpmlint-tests.spec index 3ec944d..81c99eb 100644 --- a/rpmlint-tests.spec +++ b/rpmlint-tests.spec @@ -32,6 +32,7 @@ Group: Development/Tools/Building BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.opensuse.org/ Source: rpmlint-tests-%version.tar.xz +Patch0: rpmlint-tests-sle15.patch %description This package doesn't actually contain any files and is not meant to @@ -40,6 +41,9 @@ regression tests against rpmlint(-mini). %prep %setup -q +%if 0%{?sle_version} >= 1500 +%patch0 -p1 +%endif %build mkdir rpms diff --git a/rpmlint.changes b/rpmlint.changes index 8497673..9070bf3 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 4 17:06:53 UTC 2018 - okurz@suse.com + +- Add 'synapse' user and group. + ------------------------------------------------------------------- Wed May 2 14:44:59 UTC 2018 - mchandras@suse.de