[gparted] Remove unnecessary autoconf check for pkexec --disable-internal-agent option (#776437)



commit 6f521c4d98e0fd6a33e40bd5910aacda89564126
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date:   Thu Aug 24 13:09:05 2017 +0100

    Remove unnecessary autoconf check for pkexec --disable-internal-agent option (#776437)
    
    The pkexec --disable-internal-agent option was introduced by this commit
    [1] in polkit 0.98 [2] which is before the minimum 0.102 version needed
    to run X11 apps.  Therefore the option will always be available.  Remove
    the unnecessary check.
    
    [1] https://cgit.freedesktop.org/polkit/commit/?id=f071d4561dfe8dd9cfd4e29fddec7bc82fd658aa
        pkexec: add --disable-internal-agent option
    
    [2] https://cgit.freedesktop.org/polkit/tree/NEWS?id=0.98#n25
        polkit NEWS entry for 0.98
    
    Bug 776437 - GParted fails to run as root under Wayland

 README       |    1 -
 configure.ac |   10 ++--------
 2 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/README b/README
index 216e326..374073f 100644
--- a/README
+++ b/README
@@ -166,7 +166,6 @@ c. Installing polkit's Action File
    ./configure.  These lines report that pkexec is being used:
 
       checking for pkexec >= 0.102... 0.112 found
-      checking how to run pkexec... pkexec --disable-internal-agent
 
    Where as either of these lines of ./configure output report that
    pkexec is not being used because either it was too old a version or
diff --git a/configure.ac b/configure.ac
index 3e77657..7d31f07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,8 +23,7 @@ PKG_CHECK_EXISTS
 dnl======================
 dnl Find graphical privilege escalation program
 dnl======================
-dnl Check for pkexec >= 0.102 for it's ability to run X11 apps and
-dnl whether the --disable-internal-agent option is available.
+dnl Check for pkexec >= 0.102 for it's ability to run X11 apps.
 AM_CONDITIONAL([INSTALL_POLKIT_ACTIONS], false)
 PKEXEC_REQUIRED_VERSION='0.102'
 AC_MSG_CHECKING([for pkexec >= $PKEXEC_REQUIRED_VERSION])
@@ -36,12 +35,7 @@ if test "x$PKEXEC_VERSION_OUTPUT" != 'x'; then
        PKEXEC_FOUND_INT=`echo "$PKEXEC_FOUND_VERSION" | $AWK -F. '{print $1 * 10000 + $2}'`
        AC_MSG_RESULT([$PKEXEC_FOUND_VERSION found])
        if test "$PKEXEC_FOUND_INT" -ge "$PKEXEC_REQUIRED_INT"; then
-               GKSUPROG='pkexec'
-               AC_MSG_CHECKING([how to run pkexec])
-               if pkexec --help 2>&1 | grep -q -- --disable-internal-agent; then
-                       GKSUPROG="$GKSUPROG --disable-internal-agent"
-               fi
-               AC_MSG_RESULT([$GKSUPROG])
+               GKSUPROG='pkexec --disable-internal-agent'
                AC_SUBST([GKSUPROG])
                AM_CONDITIONAL([INSTALL_POLKIT_ACTIONS], true)
        fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]