pool/polkit
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 860113 from home:mgerstner:branches:Base:System

Browse Source 
move to libexec dir is still not complete:
- add polkit-adjust-libexec-path.patch: There is another hard coded reference
  of lib/ in the code that this patch addresses.
- also adjust invocation of %set_permissions and %verify_permissions to new
  libexec dir location.

OBS-URL: https://build.opensuse.org/request/show/860113
OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit?expand=0&rev=147
This commit is contained in:
Marcus Meissner 2021-01-04 10:16:58 +00:00 committed by Git OBS Bridge
parent 95fb60a5f1
commit 0baef1ca5f
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
polkit-adjust-libexec-path.patch Normal file
View File

@ -0,0 +1,13 @@
Index: polkit-0.118/src/polkitagent/polkitagentsession.c
===================================================================
--- polkit-0.118.orig/src/polkitagent/polkitagentsession.c
+++ polkit-0.118/src/polkitagent/polkitagentsession.c
@@ -596,7 +596,7 @@ polkit_agent_session_initiate (PolkitAge
goto error;
}
- helper_argv[0] = PACKAGE_PREFIX "/lib/polkit-1/polkit-agent-helper-1";
+ helper_argv[0] = PACKAGE_PREFIX "/libexec/polkit-1/polkit-agent-helper-1";
helper_argv[1] = passwd->pw_name;
helper_argv[2] = NULL;

10
polkit.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Jan 4 09:51:04 UTC 2021 - Matthias Gerstner <matthias.gerstner@suse.com>
move to libexec dir is still not complete:
- add polkit-adjust-libexec-path.patch: There is another hard coded reference
of lib/ in the code that this patch addresses.
- also adjust invocation of %set_permissions and %verify_permissions to new
libexec dir location.
-------------------------------------------------------------------
Tue Dec 29 08:39:01 UTC 2020 - Matthias Gerstner <matthias.gerstner@suse.com>

12
polkit.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package polkit
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -36,6 +36,8 @@ Patch1: polkit-gettext.patch
Patch2: pkexec.patch
# PATCH-FIX-OPENSUSE polkit-keyinit.patch meissner@ -- bsc#1144053 Please add "pam_keyinit.so" to the /etc/pam.d/polkit-1 configuration file
Patch3: polkit-keyinit.patch
# adjust path to polkit-agent-helper-1 (bsc#1180474)
Patch4: polkit-adjust-libexec-path.patch
BuildRequires: gcc-c++
BuildRequires: gtk-doc
@ -134,10 +136,10 @@ export SUID_LDFLAGS="-z now -pie"
%install
# install explicitly into libexec. upstream has some unflexible logic for
# these executable at the moment, but there is a PR# open to fix this:
# this executable at the moment, but there is a PR# open to fix this:
# https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/63
# once this has been resolved upstream and we update to a new release we can
# remove this.
# remove this and also patch4 above.
%make_install libprivdir=%{_libexecdir}/polkit-1
find %{buildroot} -type f -name "*.la" -delete -print
# create $HOME for polkit user
@ -158,12 +160,12 @@ exit 0
%post
%set_permissions %{_bindir}/pkexec
%set_permissions %{_prefix}/lib/polkit-1/polkit-agent-helper-1
%set_permissions %{_libexecdir}/polkit-1/polkit-agent-helper-1
%service_add_post polkit.service
%verifyscript
%verify_permissions -e %{_bindir}/pkexec
%verify_permissions -e %{_prefix}/lib/polkit-1/polkit-agent-helper-1
%verify_permissions -e %{_libexecdir}/lib/polkit-1/polkit-agent-helper-1
%post -n libpolkit0 -p /sbin/ldconfig
%postun -n libpolkit0 -p /sbin/ldconfig