Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (78857c8ab54b8561c462c6c24ca755eaffa6b596)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (78857c8ab54b8561c462c6c24ca755eaffa6b596)
  • Date: Mon, 11 Jul 2022 16:12:48 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

gnome2-libs/policykit/BUILD
| 8 -
gnome2-libs/policykit/CONFIGURE
| 13 -
gnome2-libs/policykit/DEPENDS
| 43 +----
gnome2-libs/policykit/DETAILS
| 7
gnome2-libs/policykit/HISTORY
| 6

gnome2-libs/policykit/patches/0001-pkexec-local-privilege-escalation-CVE-2021-4034.patch
| 79 ----------
6 files changed, 32 insertions(+), 124 deletions(-)

New commits:
commit 78857c8ab54b8561c462c6c24ca755eaffa6b596
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

policykit-121

diff --git a/gnome2-libs/policykit/BUILD b/gnome2-libs/policykit/BUILD
index 1dd41a5..c594ecf 100755
--- a/gnome2-libs/policykit/BUILD
+++ b/gnome2-libs/policykit/BUILD
@@ -1,10 +1,4 @@
create_account polkituser &&
create_account polkitd &&
-
-if [[ "$POLICYKIT_AFW" == "linux-pam" ]]; then
- OPTS="--with-authfw=pam $OPTS"
-else
- OPTS="--with-authfw=$POLICYKIT_AFW $OPTS"
-fi &&
-
+OPTS+=" systemdsystemunitdir=/usr/lib/systemd"
default_build
diff --git a/gnome2-libs/policykit/CONFIGURE b/gnome2-libs/policykit/CONFIGURE
index 33c555e..b0e1d14 100755
--- a/gnome2-libs/policykit/CONFIGURE
+++ b/gnome2-libs/policykit/CONFIGURE
@@ -1,7 +1,6 @@
-if spell_ok linux-pam; then
- config_query_list POLICYKIT_AFW "Which Authentication framework?" \
- linux-pam shadow
-else
- config_query_list POLICYKIT_AFW "Which Authentication framework?" \
- shadow linux-pam
-fi
+source $GRIMOIRE/MESON_CONFIGURE &&
+persistent_remove POLICYKIT_AFW &&
+
+config_query_list POLKIT_AFW "Which Authentication framework?" linux-pam
shadow &&
+config_query_list POLKIT_JS "Which JS engine?" duktape
mozjs &&
+config_query_list POLKIT_SES "which session tracker?" elogind
consolekit
diff --git a/gnome2-libs/policykit/DEPENDS b/gnome2-libs/policykit/DEPENDS
index 31c5989..408999a 100755
--- a/gnome2-libs/policykit/DEPENDS
+++ b/gnome2-libs/policykit/DEPENDS
@@ -1,37 +1,24 @@
+depends meson &&
+depends python3 &&
+depends ninja-build-system &&
depends pkgconfig &&
depends dbus &&
depends dbus-glib &&
depends expat &&
-depends shadow &&
-depends mozjs &&
-
-if [[ "$POLICYKIT_AFW" != "none" ]]; then
- depends $POLICYKIT_AFW
-fi &&
-
-if [[ "$POLICYKIT_AFW" == "shadow" ]]; then
-# depends automake &&
- runtime_depends CONSOLE-MANAGER
-fi &&
-
-optional_depends intltool '--enable-nls' '--disable-nls' 'NLS support' &&
-optional_depends gobject-introspection \
- "--enable-introspection" \
- "--disable-introspection" \
- "Enable GObject introspection?" &&
-
-optional_depends gtk-doc \
- "--enable-gtk-doc" \
- "--disable-gtk-doc" \
- "Build Devhelp files?" &&
-
-optional_depends docbook-xsl \
- '--enable-man-pages' \
- '--disable-man-pages' \
- 'to build manual pages' &&
+optional_depends gobject-introspection introspection={true,false} 'Enable
GObject introspection?' &&
+optional_depends gtk-doc gtk_doc={true,false} 'Build Devhelp files?' &&
+optional_depends docbook-xsl man={true,false} 'build manual pages' &&
if is_depends_enabled $SPELL docbook-xsl; then
depends libxslt
fi &&

depends glib2 &&
-optional_depends elogind '--enable-libelogind' '--disable-libelogind'
'Elogind support'
+case $POLKIT_AFW in
+ pam) depends linux-pam auth='pam';;
+ shadow) depends shadow auth='shadow';;
+esac &&
+depends $POLKIT_JS js_engine=$POLKIT_JS &&
+case $POLKIT_SES in
+ elogind) depends elogind session_tracking='libelogind' ;;
+ consolekit) depends consolekit2 session_tracking='ConsoleKit' ;;
+esac
diff --git a/gnome2-libs/policykit/DETAILS b/gnome2-libs/policykit/DETAILS
index 7d72a95..1eb4101 100755
--- a/gnome2-libs/policykit/DETAILS
+++ b/gnome2-libs/policykit/DETAILS
@@ -1,9 +1,10 @@
+source $GRIMOIRE/MESON_FUNCTIONS
SPELL=policykit
- VERSION=0.118
+ VERSION=121
PATCHLEVEL=1
- SECURITY_PATCH=5
+ SECURITY_PATCH=6
SOURCE=polkit-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/polkit-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/polkit-v.$VERSION
SOURCE_URL[0]=https://www.freedesktop.org/software/polkit/releases/$SOURCE
SOURCE2=$SOURCE.sign
SOURCE2_URL[0]=${SOURCE_URL[0]}.sign
diff --git a/gnome2-libs/policykit/HISTORY b/gnome2-libs/policykit/HISTORY
index 8567d92..80cf41e 100644
--- a/gnome2-libs/policykit/HISTORY
+++ b/gnome2-libs/policykit/HISTORY
@@ -1,3 +1,9 @@
+2022-07-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 121 SECURITY_PATCH++
+ * DEPENDS BUILD: adapt to meson build
+ * CONFIGURE: offer duktape as a JS engine
+ * patches: deleted
+
2022-01-26 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: SECURITY_PATCH++, PATCHLEVEL++
* PRE_BUILD,
patches/0001-pkexec-local-privilege-escalation-CVE-2021-4034.patch:
diff --git
a/gnome2-libs/policykit/patches/0001-pkexec-local-privilege-escalation-CVE-2021-4034.patch

b/gnome2-libs/policykit/patches/0001-pkexec-local-privilege-escalation-CVE-2021-4034.patch
deleted file mode 100644
index 7ee53c4..0000000
---
a/gnome2-libs/policykit/patches/0001-pkexec-local-privilege-escalation-CVE-2021-4034.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 Mon Sep 17 00:00:00 2001
-From: Jan Rybar <jrybar AT redhat.com>
-Date: Tue, 25 Jan 2022 17:21:46 +0000
-Subject: [PATCH] pkexec: local privilege escalation (CVE-2021-4034)
-
----
- src/programs/pkcheck.c | 5 +++++
- src/programs/pkexec.c | 23 ++++++++++++++++++++---
- 2 files changed, 25 insertions(+), 3 deletions(-)
-
-diff --git a/src/programs/pkcheck.c b/src/programs/pkcheck.c
-index f1bb4e1..768525c 100644
---- a/src/programs/pkcheck.c
-+++ b/src/programs/pkcheck.c
-@@ -363,6 +363,11 @@ main (int argc, char *argv[])
- local_agent_handle = NULL;
- ret = 126;
-
-+ if (argc < 1)
-+ {
-+ exit(126);
-+ }
-+
- /* Disable remote file access from GIO. */
- setenv ("GIO_USE_VFS", "local", 1);
-
-diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
-index 7698c5c..84e5ef6 100644
---- a/src/programs/pkexec.c
-+++ b/src/programs/pkexec.c
-@@ -488,6 +488,15 @@ main (int argc, char *argv[])
- pid_t pid_of_caller;
- gpointer local_agent_handle;
-
-+
-+ /*
-+ * If 'pkexec' is called THIS wrong, someone's probably evil-doing. Don't
be nice, just bail out.
-+ */
-+ if (argc<1)
-+ {
-+ exit(127);
-+ }
-+
- ret = 127;
- authority = NULL;
- subject = NULL;
-@@ -614,10 +623,10 @@ main (int argc, char *argv[])
-
- path = g_strdup (pwstruct.pw_shell);
- if (!path)
-- {
-+ {
- g_printerr ("No shell configured or error retrieving pw_shell\n");
- goto out;
-- }
-+ }
- /* If you change this, be sure to change the if (!command_line)
- case below too */
- command_line = g_strdup (path);
-@@ -636,7 +645,15 @@ main (int argc, char *argv[])
- goto out;
- }
- g_free (path);
-- argv[n] = path = s;
-+ path = s;
-+
-+ /* argc<2 and pkexec runs just shell, argv is guaranteed to be
null-terminated.
-+ * /-less shell shouldn't happen, but let's be defensive and don't
write to null-termination
-+ */
-+ if (argv[n] != NULL)
-+ {
-+ argv[n] = path;
-+ }
- }
- if (access (path, F_OK) != 0)
- {
---
-2.34.1
-



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (78857c8ab54b8561c462c6c24ca755eaffa6b596), Treeve Jelbert, 07/11/2022

Archive powered by MHonArc 2.6.24.

Top of Page