diff --git a/build-aux/flatpak/org.gnome.Sysprof3.json b/build-aux/flatpak/org.gnome.Sysprof3.json index b6b9fec7..edf94112 100644 --- a/build-aux/flatpak/org.gnome.Sysprof3.json +++ b/build-aux/flatpak/org.gnome.Sysprof3.json @@ -46,14 +46,30 @@ "*.a" ], "modules" : [ + { + "name": "intltool", + "cleanup": [ "*" ], + "sources": [ + { + "type": "archive", + "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz", + "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd" + } + ] + }, { "name" : "polkit", "config-opts" : [ "--disable-polkitd", "--disable-man-pages", "--disable-introspection", - "--enable-libsystemd-login=no", - "--with-systemdsystemunitdir=no" + "--disable-examples", + "--disable-gtk-doc", + "--disable-libelogind", + "--disable-libsystemd-login", + "--with-systemdsystemunitdir=no", + "--with-authdb=dummy", + "--with-authfw=none" ], "rm-configure" : true, "cleanup" : [ @@ -67,8 +83,8 @@ "sources" : [ { "type" : "archive", - "url" : "http://www.freedesktop.org/software/polkit/releases/polkit-0.113.tar.gz", - "sha256" : "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81" + "url" : "https://www.freedesktop.org/software/polkit/releases/polkit-0.116.tar.gz", + "sha256" : "88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1" }, { "type" : "patch", diff --git a/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch b/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch index f201c204..651f53ba 100644 --- a/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch +++ b/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch @@ -1,62 +1,56 @@ -From dab179770380918462d0d76e08b11e4abe55c933 Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Thu, 8 Sep 2016 16:15:54 -0400 -Subject: [PATCH] build: Add option to build without polkitd +From 1073a44277316348d40d86ecec908f1d4812f360 Mon Sep 17 00:00:00 2001 +From: Christian Hergert +Date: Mon, 27 May 2019 11:49:09 -0700 +Subject: [PATCH] flatpak: make polkit suitable for use within flatpak -This is for any consumer that needs libpolkit but does -not need polkitd. For example an application running in -flatpak. +This is based on patches from Patrick Griffis with additional fixes +to allow us to disable use of PAM within Flaptak. --- - configure.ac | 29 ++++++++++++++++++++--------- - src/Makefile.am | 6 +++++- - test/Makefile.am | 6 +++++- - 3 files changed, 30 insertions(+), 11 deletions(-) + configure.ac | 20 ++++++++++++++++---- + src/Makefile.am | 6 +++++- + src/polkitagent/Makefile.am | 5 +++++ + test/Makefile.am | 6 +++++- + 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 97d4222..a08785c 100644 +index 5cedb4e..729d78d 100644 --- a/configure.ac +++ b/configure.ac -@@ -129,20 +129,30 @@ AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_30], - AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [G_ENCODE_VERSION(2,34)], - [Notify us when we'll need to transition away from g_type_init()]) +@@ -79,11 +79,13 @@ PKG_CHECK_MODULES(GLIB, [gmodule-2.0 gio-unix-2.0 >= 2.30.0]) + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) +-PKG_CHECK_MODULES(LIBJS, [mozjs-60]) ++AS_IF([test x${enable_polkitd} = yes], [ ++ PKG_CHECK_MODULES(LIBJS, [mozjs-60]) + +-AC_SUBST(LIBJS_CFLAGS) +-AC_SUBST(LIBJS_CXXFLAGS) +-AC_SUBST(LIBJS_LIBS) ++ AC_SUBST(LIBJS_CFLAGS) ++ AC_SUBST(LIBJS_CXXFLAGS) ++ AC_SUBST(LIBJS_LIBS) ++]) + + EXPAT_LIB="" + AC_ARG_WITH(expat, [ --with-expat= Use expat from here], +@@ -236,6 +238,15 @@ if test "x$with_systemdsystemunitdir" != "xno"; then + fi + AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$systemdsystemunitdir"]) + ++dnl --------------------------------------------------------------------------- ++dnl - Disable polkitd when using library alone ++dnl --------------------------------------------------------------------------- + +AC_ARG_ENABLE([polkitd], + [AS_HELP_STRING([--disable-polkitd], [Do not build polkitd])], + [enable_polkitd=$enableval], [enable_polkitd=yes]) +AM_CONDITIONAL(BUILD_POLKITD, [test x${enable_polkitd} = yes]) + -+ - AC_ARG_WITH(mozjs, AS_HELP_STRING([--with-mozjs=@<:@mozjs185/mozjs-17.0|auto@:>@], - [Specify version of Spidermonkey to use]),, - with_mozjs=auto) --AS_IF([test x${with_mozjs} != xauto], [ -- PKG_CHECK_MODULES(LIBJS, ${with_mozjs}) --], [ -- PKG_CHECK_MODULES(LIBJS, [mozjs185], have_mozjs185=yes, have_mozjs185=no) -- AS_IF([test x${have_mozjs185} = xno], [ -- PKG_CHECK_MODULES(LIBJS, [mozjs-17.0], have_mozjs17=yes, -- [AC_MSG_ERROR([Could not find mozjs185 or mozjs-17.0; see http://ftp.mozilla.org/pub/mozilla.org/js/])]) -+ -+AS_IF([test x${enable_polkitd} = yes], [ -+ AS_IF([test x${with_mozjs} != xauto], [ -+ PKG_CHECK_MODULES(LIBJS, ${with_mozjs}) -+ ], [ -+ PKG_CHECK_MODULES(LIBJS, [mozjs185], have_mozjs185=yes, have_mozjs185=no) -+ AS_IF([test x${have_mozjs185} = xno], [ -+ PKG_CHECK_MODULES(LIBJS, [mozjs-17.0], have_mozjs17=yes, -+ [AC_MSG_ERROR([Could not find mozjs185 or mozjs-17.0; see http://ftp.mozilla.org/pub/mozilla.org/js/])]) -+ ]) - ]) -+ AC_SUBST(LIBJS_CFLAGS) -+ AC_SUBST(LIBJS_LIBS) - ]) --AC_SUBST(LIBJS_CFLAGS) --AC_SUBST(LIBJS_LIBS) - - EXPAT_LIB="" - AC_ARG_WITH(expat, [ --with-expat= Use expat from here], -@@ -605,6 +615,7 @@ echo " + dnl --------------------------------------------------------------------------- + dnl - User for running polkitd + dnl --------------------------------------------------------------------------- +@@ -579,6 +590,7 @@ echo " Session tracking: ${SESSION_TRACKING} PAM support: ${have_pam} systemdsystemunitdir: ${systemdsystemunitdir} @@ -79,6 +73,43 @@ index 09fc7b3..c6fe91b 100644 if BUILD_EXAMPLES SUBDIRS += examples +diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am +index 49720db..633f9d4 100644 +--- a/src/polkitagent/Makefile.am ++++ b/src/polkitagent/Makefile.am +@@ -79,6 +79,7 @@ libpolkit_agent_1_la_LIBADD = \ + + libpolkit_agent_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)' + ++if !POLKIT_AUTHFW_NONE + libprivdir = $(prefix)/lib/polkit-1 + libpriv_PROGRAMS = polkit-agent-helper-1 + +@@ -113,6 +114,8 @@ polkit_agent_helper_1_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(NULL) + ++endif # !POLKIT_AUTHFW_NONE ++ + if HAVE_INTROSPECTION + + girdir = $(INTROSPECTION_GIRDIR) +@@ -142,6 +145,7 @@ include $(INTROSPECTION_MAKEFILE) + + endif # HAVE_INTROSPECTION + ++if !POLKIT_AUTHFW_NONE + # polkit-agent-helper-1 need to be setuid root because it's used to + # authenticate not only the invoking user, but possibly also root + # and/or other users. +@@ -149,6 +153,7 @@ endif # HAVE_INTROSPECTION + install-data-hook: + -chown root $(DESTDIR)$(libprivdir)/polkit-agent-helper-1 + -chmod 4755 $(DESTDIR)$(libprivdir)/polkit-agent-helper-1 ++endif # !POLKIT_AUTHFW_NONE + + EXTRA_DIST = polkitagentmarshal.list polkitagentenumtypes.h.template polkitagentenumtypes.c.template + CLEANFILES = $(gir_DATA) $(typelibs_DATA) diff --git a/test/Makefile.am b/test/Makefile.am index 59d0680..d43b0fe 100644 --- a/test/Makefile.am @@ -97,5 +128,5 @@ index 59d0680..d43b0fe 100644 libpolkit_test_helper_la_SOURCES = polkittesthelper.c polkittesthelper.h libpolkit_test_helper_la_LIBADD = $(GLIB_LIBS) -- -2.9.3 +2.21.0