diff mbox series

[meta-oe,PATCHv2] polkit: upgrade 122 -> 123

Message ID 20230918012542.13650-1-f_l_k@t-online.de
State Under Review
Headers show
Series [meta-oe,PATCHv2] polkit: upgrade 122 -> 123 | expand

Commit Message

Markus Volk Sept. 18, 2023, 1:25 a.m. UTC 
- Add a patch to disable an offensive hardening option
  that causes polkit to segfault

- better safety with deeper resctiction of the configuration files
- better safety with restricting the daemon's owner under systemd
- better safety with the systemd unit sandboxing
- less thread races during upload of the configuration

- glib, gobject, gio >= 2.32
- mozjs-102 OR duktape
- gobject-introspection >= 0.6.2 (optional)
- pam (optional)
- ConsoleKit OR systemd
- gettext
- meson

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...ce.in-disable-MemoryDenyWriteExecute.patch | 33 +++++++++++++++++++
 .../polkit/{polkit_122.bb => polkit_123.bb}   |  7 ++--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-extended/polkit/polkit/0001-polkit.service.in-disable-MemoryDenyWriteExecute.patch
 rename meta-oe/recipes-extended/polkit/{polkit_122.bb => polkit_123.bb} (89%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/polkit/polkit/0001-polkit.service.in-disable-MemoryDenyWriteExecute.patch b/meta-oe/recipes-extended/polkit/polkit/0001-polkit.service.in-disable-MemoryDenyWriteExecute.patch
new file mode 100644
index 000000000..9a097274a
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/polkit/0001-polkit.service.in-disable-MemoryDenyWriteExecute.patch
@@ -0,0 +1,33 @@ 
+From 046d853818f18bac5df4dfc007151e06fd64a5b3 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Sun, 17 Sep 2023 23:26:59 +0200
+Subject: [PATCH] polkit.service.in: disable MemoryDenyWriteExecute
+
+A few momths ago some hardening options have been added to polkit.service.in
+https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/177/diffs?commit_id=afecbd53696e32bbadd60f431fc7d285f3edd265
+
+and polkitd segfaults with MemoryDenyWriteExecute=yes, at least in my environment
+
+Upstream-Status: Inappropriate [needs further investigation]
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ data/polkit.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/polkit.service.in b/data/polkit.service.in
+index 2113ff7..42dfd90 100644
+--- a/data/polkit.service.in
++++ b/data/polkit.service.in
+@@ -14,7 +14,7 @@ Group=@polkitd_user@
+ IPAddressDeny=any
+ LimitMEMLOCK=0
+ LockPersonality=yes
+-MemoryDenyWriteExecute=yes
++#MemoryDenyWriteExecute=yes
+ NoNewPrivileges=yes
+ PrivateDevices=yes
+ PrivateNetwork=yes
+-- 
+2.41.0
+
diff --git a/meta-oe/recipes-extended/polkit/polkit_122.bb b/meta-oe/recipes-extended/polkit/polkit_123.bb
similarity index 89%
rename from meta-oe/recipes-extended/polkit/polkit_122.bb
rename to meta-oe/recipes-extended/polkit/polkit_123.bb
index 290640626..4fc23559f 100644
--- a/meta-oe/recipes-extended/polkit/polkit_122.bb
+++ b/meta-oe/recipes-extended/polkit/polkit_123.bb
@@ -4,10 +4,13 @@  HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit"
 LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb"
 
-SRC_URI = "git://gitlab.freedesktop.org/polkit/polkit.git;protocol=https;branch=master"
+SRC_URI = " \
+	git://gitlab.freedesktop.org/polkit/polkit.git;protocol=https;branch=master \
+	file://0001-polkit.service.in-disable-MemoryDenyWriteExecute.patch \
+"
 
 S = "${WORKDIR}/git"
-SRCREV = "da87c5698019897dd731bb2cbb54ebd9c9481f52"
+SRCREV = "fc8b07e71d99f88a29258cde99b913b44da1846d"
 
 DEPENDS = "expat glib-2.0"