cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a couple of fixes from upstream:

Browse Source 
- Install 50-default.rules in /usr/share
- polkitbackendduktapeauthority.c: Print the error string we get back from duktape
This commit is contained in:
ajacoutot 2022-09-15 15:21:47 +00:00
parent 6d8513ca24
commit c1d5e94f69
4 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysutils/polkit/Makefile
View File

@ -3,6 +3,7 @@ COMMENT= framework for granting privileged operations to users
V= 121
DISTNAME= polkit-${V}
WRKDIST= ${WRKDIR}/polkit-v.${V}
REVISION= 0
SHARED_LIBS += polkit-gobject-1 2.0 # 0.0.0
SHARED_LIBS += polkit-agent-1 2.0 # 0.0.0

17
sysutils/polkit/patches/patch-src_polkitbackend_meson_build Normal file
View File

@ -0,0 +1,17 @@
From b6538f6e9cc956959494aff0eeade3a0b5733103 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Fri, 10 Jun 2022 14:20:51 +0100
Subject: [PATCH] Install 50-default.rules in /usr/share
Index: src/polkitbackend/meson.build
--- src/polkitbackend/meson.build.orig
+++ src/polkitbackend/meson.build
@@ -61,7 +61,7 @@ libpolkit_backend = static_library(
install_data(
'50-default.rules',
- install_dir: pk_pkgsysconfdir / 'rules.d',
+ install_dir: pk_pkgdatadir / 'rules.d',
)
program = 'polkitd'

17
sysutils/polkit/patches/patch-src_polkitbackend_polkitbackendduktapeauthority_c Normal file
View File

@ -0,0 +1,17 @@
From 138e4f4f0c3337981cb734f36a35ae578536c336 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Tue, 19 Jul 2022 16:58:09 +0300
Subject: [PATCH] polkitbackendduktapeauthority.c: Print the error string we get back from duktape
Index: src/polkitbackend/polkitbackendduktapeauthority.c
--- src/polkitbackend/polkitbackendduktapeauthority.c.orig
+++ src/polkitbackend/polkitbackendduktapeauthority.c
@@ -590,7 +590,7 @@ runaway_killer_thread_call_js (gpointer user_data)
if (duk_pcall_prop (cx, 0, 2) != DUK_EXEC_SUCCESS)
{
polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (ctx->authority),
- "Error evaluating admin rules: ",
+ "Error evaluating admin rules: %s",
duk_safe_to_string (cx, -1));
goto err;
}

3
sysutils/polkit/pkg/PLIST
View File

@ -71,8 +71,6 @@ share/examples/polkit/polkit-1/rules.d/
@sample ${SYSCONFDIR}/polkit-1/rules.d/
@mode
@owner
share/examples/polkit/polkit-1/rules.d/50-default.rules
@sample ${SYSCONFDIR}/polkit-1/rules.d/50-default.rules
share/gettext/its/polkit.its
share/gettext/its/polkit.loc
share/gir-1.0/
@ -101,6 +99,7 @@ share/polkit-1/
share/polkit-1/actions/
share/polkit-1/actions/org.freedesktop.policykit.policy
share/polkit-1/policyconfig-1.dtd
share/polkit-1/rules.d/50-default.rules
@mode 0700
@owner _polkitd
share/polkit-1/rules.d/