From 9622f459390c983052d91c6dd20b1306496fd9f8025d5718bcf6c88c13614f98 Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Fri, 19 Nov 2021 09:42:50 +0000 Subject: [PATCH 1/4] Accepting request 932422 from home:dimstar:Factory - Do not BuildRequire and Require polkit: technically, this is not required at all. In plus, it helps us a great deal in bootstrap scenarios, as polkit-default-privs is used by rpmlint, and thus pulled into every single buildroot. OBS-URL: https://build.opensuse.org/request/show/932422 OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit-default-privs?expand=0&rev=436 --- polkit-default-privs.changes | 8 ++++++++ polkit-default-privs.spec | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/polkit-default-privs.changes b/polkit-default-privs.changes index 2fde1e0..0e6c14c 100644 --- a/polkit-default-privs.changes +++ b/polkit-default-privs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Nov 19 07:23:40 UTC 2021 - Dominique Leuenberger + +- Do not BuildRequire and Require polkit: technically, this is not + required at all. In plus, it helps us a great deal in bootstrap + scenarios, as polkit-default-privs is used by rpmlint, and thus + pulled into every single buildroot. + ------------------------------------------------------------------- Fri Oct 8 09:28:28 UTC 2021 - Matthias Gerstner diff --git a/polkit-default-privs.spec b/polkit-default-privs.spec index 7b7356d..ae5146f 100644 --- a/polkit-default-privs.spec +++ b/polkit-default-privs.spec @@ -30,8 +30,6 @@ License: GPL-2.0-or-later Group: Productivity/Security Source: polkit-default-privs-%version.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: polkit -Requires: polkit Supplements: PolicyKit Supplements: libpolkit0 Supplements: polkit @@ -45,6 +43,8 @@ Predefined polkit profiles for different usage scenarios like desktop and server. These profiles define the kind of authentication required for various polkit actions used across applications. + + # use a separate package for the static whitelist (i.e. the one that isn't # part of the different profiles selectable during runtime). This whitelist is # of no use for users and only needed during rpmlint time. From e94016e3b852941a3f170f67809732c2ada7b2ba2e8cccca5a76342fcae6affc Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Fri, 19 Nov 2021 09:43:56 +0000 Subject: [PATCH 2/4] - remove traces of old polkit-whitelisting sub-package OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit-default-privs?expand=0&rev=437 --- polkit-default-privs.changes | 5 +++++ polkit-default-privs.spec | 14 -------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/polkit-default-privs.changes b/polkit-default-privs.changes index 0e6c14c..42c6199 100644 --- a/polkit-default-privs.changes +++ b/polkit-default-privs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 19 09:43:34 UTC 2021 - Matthias Gerstner + +- remove traces of old polkit-whitelisting sub-package + ------------------------------------------------------------------- Fri Nov 19 07:23:40 UTC 2021 - Dominique Leuenberger diff --git a/polkit-default-privs.spec b/polkit-default-privs.spec index ae5146f..fd761fd 100644 --- a/polkit-default-privs.spec +++ b/polkit-default-privs.spec @@ -43,20 +43,6 @@ Predefined polkit profiles for different usage scenarios like desktop and server. These profiles define the kind of authentication required for various polkit actions used across applications. - - -# use a separate package for the static whitelist (i.e. the one that isn't -# part of the different profiles selectable during runtime). This whitelist is -# of no use for users and only needed during rpmlint time. -%package -n polkit-whitelisting -Summary: Static polkit whitelists for processing by rpmlint-checks -Group: Productivity/Security - -%description -n polkit-whitelisting -This package contains static polkit whitelistings for polkit Java Script rule -files. The whitelistings will be processed by rpmlint-checks to determine -valid rule file installations by other packages. - %prep %setup -q From f8e4bbce3b6896cab706d545adff8151c959f906dec320041094287e8f8a6e79 Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Fri, 19 Nov 2021 09:52:44 +0000 Subject: [PATCH 3/4] explicitly own polkit dirs, otherwise build complains about unowned dirs OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit-default-privs?expand=0&rev=438 --- polkit-default-privs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/polkit-default-privs.spec b/polkit-default-privs.spec index fd761fd..192e3b3 100644 --- a/polkit-default-privs.spec +++ b/polkit-default-privs.spec @@ -60,8 +60,11 @@ mkdir -p $RPM_BUILD_ROOT/etc/polkit-1/rules.d/ %files %define basedir %{_distconfdir}/polkit-default-privs %define profiledir %{basedir}/profiles +%define confdir /etc/polkit-1 %doc README.md -%ghost %attr(0644,root,root) /etc/polkit-1/rules.d/90-default-privs.rules +%dir %{confdir} +%dir %{confdir}/rules.d +%ghost %attr(0644,root,root) %{confdir}/rules.d/90-default-privs.rules %dir %{basedir} %dir %{profiledir} %{profiledir}/easy From de7b3c6ea409e332eb2f8eaca719cf4b695cf67727847d3c7683b917155a232c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 19 Nov 2021 13:59:26 +0000 Subject: [PATCH 4/4] - Change Requires: polkit to Requires(pre): we need to be sure polkit is instaled first, as we could otherwise end up with wrong permissions on /etc/polkit-1/rules.d. OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit-default-privs?expand=0&rev=439 --- polkit-default-privs.changes | 15 +++++++-------- polkit-default-privs.spec | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/polkit-default-privs.changes b/polkit-default-privs.changes index 42c6199..2e3a194 100644 --- a/polkit-default-privs.changes +++ b/polkit-default-privs.changes @@ -1,16 +1,15 @@ +------------------------------------------------------------------- +Fri Nov 19 13:57:09 UTC 2021 - Dominique Leuenberger + +- Change Requires: polkit to Requires(pre): we need to be sure + polkit is instaled first, as we could otherwise end up with wrong + permissions on /etc/polkit-1/rules.d. + ------------------------------------------------------------------- Fri Nov 19 09:43:34 UTC 2021 - Matthias Gerstner - remove traces of old polkit-whitelisting sub-package -------------------------------------------------------------------- -Fri Nov 19 07:23:40 UTC 2021 - Dominique Leuenberger - -- Do not BuildRequire and Require polkit: technically, this is not - required at all. In plus, it helps us a great deal in bootstrap - scenarios, as polkit-default-privs is used by rpmlint, and thus - pulled into every single buildroot. - ------------------------------------------------------------------- Fri Oct 8 09:28:28 UTC 2021 - Matthias Gerstner diff --git a/polkit-default-privs.spec b/polkit-default-privs.spec index 192e3b3..3721faa 100644 --- a/polkit-default-privs.spec +++ b/polkit-default-privs.spec @@ -32,6 +32,8 @@ Source: polkit-default-privs-%version.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build Supplements: PolicyKit Supplements: libpolkit0 +BuildRequires: polkit +Requires(pre): polkit Supplements: polkit BuildArch: noarch # please open bugreports at bugzilla.suse.com @@ -62,8 +64,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/polkit-1/rules.d/ %define profiledir %{basedir}/profiles %define confdir /etc/polkit-1 %doc README.md -%dir %{confdir} -%dir %{confdir}/rules.d %ghost %attr(0644,root,root) %{confdir}/rules.d/90-default-privs.rules %dir %{basedir} %dir %{profiledir}