1*e231d58cSAndrew GeisslerFrom 79fd11f1d8e4827ae8aee03420a5c92038fe4ef5 Mon Sep 17 00:00:00 2001
2*e231d58cSAndrew GeisslerFrom: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3*e231d58cSAndrew GeisslerDate: Wed, 26 Feb 2020 20:25:06 +0100
4*e231d58cSAndrew GeisslerSubject: [PATCH] Install polkit action unconditionally - executable pkexec is
5*e231d58cSAndrew Geissler not in our sysroot
6*e231d58cSAndrew GeisslerMIME-Version: 1.0
7*e231d58cSAndrew GeisslerContent-Type: text/plain; charset=UTF-8
8*e231d58cSAndrew GeisslerContent-Transfer-Encoding: 8bit
9*e231d58cSAndrew Geissler
10*e231d58cSAndrew GeisslerUpstream-Status: Inappropriate [OE-specific]
11*e231d58cSAndrew Geissler
12*e231d58cSAndrew GeisslerSigned-off-by: Andreas Müller <schnitzeltony@gmail.com>
13*e231d58cSAndrew Geissler---
14*e231d58cSAndrew Geissler configure.ac | 17 +----------------
15*e231d58cSAndrew Geissler 1 file changed, 1 insertion(+), 16 deletions(-)
16*e231d58cSAndrew Geissler
17*e231d58cSAndrew Geisslerdiff --git a/configure.ac b/configure.ac
18*e231d58cSAndrew Geisslerindex 43503ac..b339ee5 100644
19*e231d58cSAndrew Geissler--- a/configure.ac
20*e231d58cSAndrew Geissler+++ b/configure.ac
21*e231d58cSAndrew Geissler@@ -24,22 +24,7 @@ dnl======================
22*e231d58cSAndrew Geissler dnl Find graphical privilege escalation program
23*e231d58cSAndrew Geissler dnl======================
24*e231d58cSAndrew Geissler dnl Check for pkexec >= 0.102 for it's ability to run X11 apps.
25*e231d58cSAndrew Geissler-AM_CONDITIONAL([INSTALL_POLKIT_ACTIONS], false)
26*e231d58cSAndrew Geissler-PKEXEC_REQUIRED_VERSION='0.102'
27*e231d58cSAndrew Geissler-AC_MSG_CHECKING([for pkexec >= $PKEXEC_REQUIRED_VERSION])
28*e231d58cSAndrew Geissler-PKEXEC_REQUIRED_INT=`echo "$PKEXEC_REQUIRED_VERSION" | $AWK -F. '{print $1 * 10000 + $2}'`
29*e231d58cSAndrew Geissler-PKEXEC_VERSION_OUTPUT=`pkexec --version 2> /dev/null` ||
30*e231d58cSAndrew Geissler-	AC_MSG_RESULT([not found])
31*e231d58cSAndrew Geissler-if test "x$PKEXEC_VERSION_OUTPUT" != 'x'; then
32*e231d58cSAndrew Geissler-	PKEXEC_FOUND_VERSION=`echo "$PKEXEC_VERSION_OUTPUT" | head -1 | cut -d' ' -f3`
33*e231d58cSAndrew Geissler-	PKEXEC_FOUND_INT=`echo "$PKEXEC_FOUND_VERSION" | $AWK -F. '{print $1 * 10000 + $2}'`
34*e231d58cSAndrew Geissler-	AC_MSG_RESULT([$PKEXEC_FOUND_VERSION found])
35*e231d58cSAndrew Geissler-	if test "$PKEXEC_FOUND_INT" -ge "$PKEXEC_REQUIRED_INT"; then
36*e231d58cSAndrew Geissler-		GKSUPROG='pkexec --disable-internal-agent'
37*e231d58cSAndrew Geissler-		AC_SUBST([GKSUPROG])
38*e231d58cSAndrew Geissler-		AM_CONDITIONAL([INSTALL_POLKIT_ACTIONS], true)
39*e231d58cSAndrew Geissler-	fi
40*e231d58cSAndrew Geissler-fi
41*e231d58cSAndrew Geissler+AM_CONDITIONAL([INSTALL_POLKIT_ACTIONS], true)
42*e231d58cSAndrew Geissler
43*e231d58cSAndrew Geissler dnl Check for alternative graphical privilege escalation programs.
44*e231d58cSAndrew Geissler if test "x$GKSUPROG" = 'x'; then
45*e231d58cSAndrew Geissler--
46*e231d58cSAndrew Geissler2.21.0
47*e231d58cSAndrew Geissler
48