From 8a3b918293c2a4071b09a6c0f6530b81ae9ade3654411377d9b2b9e2f11ee7f5 Mon Sep 17 00:00:00 2001
From: Johannes Segitz <jsegitz@suse.com>
Date: Fri, 23 Jul 2021 08:24:47 +0000
Subject: [PATCH] Accepting request 907887 from
 home:mgerstner:branches:Base:System

- Update to version 1550+20210722.ae1891d:
  * whitelist zypp-gui action (bsc#1188364)
  * introduce sub-directories for profiles in both /etc and /usr/etc
  * remove polkit-default-privs.d package specific directory
  * Moving polkit-default-privs.easy, polkit-default-privs.local and polkit-default-privs.restrictive from /etc /to /usr/etc directory

OBS-URL: https://build.opensuse.org/request/show/907887
OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit-default-privs?expand=0&rev=432
---
 _servicedata                                  |  2 +-
 ...default-privs-1550+20210715.b7d5b97.tar.xz |  3 --
 ...default-privs-1550+20210722.ae1891d.tar.xz |  3 ++
 polkit-default-privs.changes                  |  9 ++++++
 polkit-default-privs.spec                     | 32 +++++++++----------
 5 files changed, 29 insertions(+), 20 deletions(-)
 delete mode 100644 polkit-default-privs-1550+20210715.b7d5b97.tar.xz
 create mode 100644 polkit-default-privs-1550+20210722.ae1891d.tar.xz

diff --git a/_servicedata b/_servicedata
index fbc5273..7329136 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/polkit-default-privs.git</param>
-              <param name="changesrevision">b243c05b0f89046dbd2089d9b64afd501ad51d59</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">237941af1cbfe6a70b4fa424070e54628315b862</param></service></servicedata>
\ No newline at end of file
diff --git a/polkit-default-privs-1550+20210715.b7d5b97.tar.xz b/polkit-default-privs-1550+20210715.b7d5b97.tar.xz
deleted file mode 100644
index fe8dd20..0000000
--- a/polkit-default-privs-1550+20210715.b7d5b97.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72f02eb4577b89f8178a7869c41b373bdf71e6d84fd110389c91a553e461c147
-size 26364
diff --git a/polkit-default-privs-1550+20210722.ae1891d.tar.xz b/polkit-default-privs-1550+20210722.ae1891d.tar.xz
new file mode 100644
index 0000000..17c2933
--- /dev/null
+++ b/polkit-default-privs-1550+20210722.ae1891d.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c27446d9cf43a7ae262e0f4a53976bf358946ca94c4be1713e52006994dd931
+size 26468
diff --git a/polkit-default-privs.changes b/polkit-default-privs.changes
index f524ab7..516fd97 100644
--- a/polkit-default-privs.changes
+++ b/polkit-default-privs.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jul 22 09:19:53 UTC 2021 - matthias.gerstner@suse.com
+
+- Update to version 1550+20210722.ae1891d:
+  * whitelist zypp-gui action (bsc#1188364)
+  * introduce sub-directories for profiles in both /etc and /usr/etc
+  * remove polkit-default-privs.d package specific directory
+  * Moving polkit-default-privs.easy, polkit-default-privs.local and polkit-default-privs.restrictive from /etc /to /usr/etc directory
+
 -------------------------------------------------------------------
 Thu Jul 15 11:22:23 UTC 2021 - wolfgang.frisch@suse.com
 
diff --git a/polkit-default-privs.spec b/polkit-default-privs.spec
index 0c695c8..175d5f5 100644
--- a/polkit-default-privs.spec
+++ b/polkit-default-privs.spec
@@ -23,7 +23,7 @@
 %endif
 
 Name:           polkit-default-privs
-Version:        1550+20210715.b7d5b97
+Version:        1550+20210722.ae1891d
 Release:        0
 Summary:        SUSE PolicyKit default permissions
 License:        GPL-2.0-or-later
@@ -45,17 +45,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 profile selectable during runtime). This whitelist is
+# 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
@@ -75,19 +66,28 @@ valid rule file installations by other packages.
 make install DESTDIR=$RPM_BUILD_ROOT fillupdir="%{_fillupdir}"
 mkdir -p $RPM_BUILD_ROOT/etc/polkit-1/rules.d/
 > $RPM_BUILD_ROOT/etc/polkit-1/rules.d/90-default-privs.rules
+# TODO: this is a backward compatibility entry for the rpmlint-mini check for
+# polkit priv whitelistings. When rpmlint2 is fully in production we shouldn't
+# need this any more (apart from adjusting the rpmlint checker in rpmlint2
+# on the opensuse upstream branch).
+ln -s /usr/etc/polkit-default-privs/profiles/standard $RPM_BUILD_ROOT/etc/polkit-default-privs.standard
 
 %post
 %{fillup_only -ns security polkit_default_privs}
 /sbin/set_polkit_default_privs >/dev/null
 
 %files
+%define basedir %{_distconfdir}/polkit-default-privs
+%define profiledir %{basedir}/profiles
 %doc README.md
-%defattr(-,root,root,-)
 %ghost %attr(0644,root,root) /etc/polkit-1/rules.d/90-default-privs.rules
-%config /etc/polkit-default-privs.easy
-%config /etc/polkit-default-privs.standard
-%config /etc/polkit-default-privs.restrictive
-%config(noreplace) /etc/polkit-default-privs.local
+%dir %{basedir}
+%dir %{profiledir}
+%{profiledir}/easy
+%{profiledir}/standard
+%{profiledir}/restrictive
+%{basedir}/local.template
+%{_sysconfdir}/polkit-default-privs.standard
 /sbin/chkstat-polkit
 /sbin/set_polkit_default_privs
 %_mandir/man*/*