Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master

1 files changed, 103 insertions, 73 deletions

diff --git a/configure b/configure
index 4d0ab63c..bcd0bc6c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for NetworkManager 1.22.10.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.24.0.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NetworkManager'
 PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='1.22.10'
-PACKAGE_STRING='NetworkManager 1.22.10'
+PACKAGE_VERSION='1.24.0'
+PACKAGE_STRING='NetworkManager 1.24.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -752,8 +752,6 @@ NSS_CFLAGS
 GNUTLS_LIBS
 GNUTLS_CFLAGS
 NM_MODIFY_SYSTEM_POLICY
-WITH_POLKIT_AGENT_FALSE
-WITH_POLKIT_AGENT_TRUE
 POLKIT_LIBS
 POLKIT_CFLAGS
 NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT
@@ -1072,7 +1070,6 @@ with_libaudit
 enable_teamdctl
 enable_json_validation
 enable_polkit
-enable_polkit_agent
 enable_modify_system
 with_crypto
 with_dbus_sys_dir
@@ -1726,7 +1723,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures NetworkManager 1.22.10 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.24.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1796,7 +1793,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.22.10:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.24.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1834,7 +1831,6 @@ Optional Features:
                           set default value for auth-polkit configuration
                           option. This value can be overwritten by NM
                           configuration. 'disabled' is an alias for 'no'
-  --enable-polkit-agent   enable polkit agent for clients
   --enable-modify-system  Allow users to modify system connections
   --enable-ppp            enable PPP/PPPoE support
   --enable-bluez5-dun     enable Bluez5 DUN support
@@ -2144,7 +2140,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.22.10
+NetworkManager configure 1.24.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2917,7 +2913,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by NetworkManager $as_me 1.22.10, which was
+It was created by NetworkManager $as_me 1.24.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3787,7 +3783,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.22.10'
+ VERSION='1.24.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17970,9 +17966,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 NM_MAJOR_VERSION=1
-NM_MINOR_VERSION=22
-NM_MICRO_VERSION=10
-NM_VERSION=1.22.10
+NM_MINOR_VERSION=24
+NM_MICRO_VERSION=0
+NM_VERSION=1.24.0
 
 
 
@@ -17980,7 +17976,7 @@ NM_VERSION=1.22.10
 
 
 
-NM_GIT_SHA=3216c292a670b6c91a932c94c26aed0c8dedaa38
+NM_GIT_SHA=ea141ba8f8d1cf72e3bd752199c1076821fffdf9
 
 if test """" != "no-config-h" ; then
 
@@ -18280,6 +18276,60 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+ac_fn_c_check_decl "$LINENO" "pidfd_open" "ac_cv_have_decl_pidfd_open" "
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+#include <sys/wait.h>
+
+"
+if test "x$ac_cv_have_decl_pidfd_open" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_PIDFD_OPEN $ac_have_decl
+_ACEOF
+
+
+ac_fn_c_check_decl "$LINENO" "pidfd_send_signal" "ac_cv_have_decl_pidfd_send_signal" "
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+#include <sys/wait.h>
+
+"
+if test "x$ac_cv_have_decl_pidfd_send_signal" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_PIDFD_SEND_SIGNAL $ac_have_decl
+_ACEOF
+
+
+ac_fn_c_check_decl "$LINENO" "rt_sigqueueinfo" "ac_cv_have_decl_rt_sigqueueinfo" "
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+#include <sys/wait.h>
+
+"
+if test "x$ac_cv_have_decl_rt_sigqueueinfo" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_RT_SIGQUEUEINFO $ac_have_decl
+_ACEOF
+
+
 for ac_header in sys/auxv.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/auxv.h" "ac_cv_header_sys_auxv_h" "$ac_includes_default"
@@ -21671,7 +21721,7 @@ fi
     INTROSPECTION_GIRDIR=
     INTROSPECTION_TYPELIBDIR=
 
-    if test "x$enable_introspection" == "xno"; then
+    if test "x$enable_introspection" = "xno"; then
       found_introspection="no"
     else
        if test -n "$PKG_CONFIG" && \
@@ -21704,7 +21754,7 @@ else
   found_introspection="no (not installed)"
 fi
 
-       if test "x$enable_introspection" == "xyes"; then
+       if test "x$enable_introspection" = "xyes"; then
           if test "x$found_introspection" != "xyes"; then
               as_fn_error $? "introspection enabled but can't be used" "$LINENO" 5
           fi
@@ -21905,7 +21955,7 @@ else
   enable_qt=${have_qt}
 fi
 
-if (test "${enable_qt}" = "yes"); then
+if test "${enable_qt}" = "yes"; then
 	if test x"$have_qt" = x"no"; then
 		as_fn_error $? "Qt development headers are required" "$LINENO" 5
 	fi
@@ -21972,11 +22022,11 @@ else
   with_udev_dir="yes"
 fi
 
-if (test "$with_udev_dir" != 'no'); then
-	if (test "$with_udev_dir" != 'yes' && printf '%s' "$with_udev_dir" | grep -v -q '^/'); then
+if test "$with_udev_dir" != 'no'; then
+	if test "$with_udev_dir" != 'yes' && printf '%s' "$with_udev_dir" | grep -v -q '^/'; then
 		as_fn_error $? "--with-udev-dir must be an absolute path or 'yes' or 'no'. Instead it is '$with_udev_dir'" "$LINENO" 5
 	fi
-	if (test "$with_udev_dir" = 'yes'); then
+	if test "$with_udev_dir" = 'yes'; then
 		with_udev_dir="\$(prefix)/lib/udev"
 	fi
 	UDEV_DIR="$with_udev_dir"
@@ -24233,7 +24283,7 @@ else
   enable_teamdctl=${have_team_prereq}
 fi
 
-if (test "${enable_teamdctl}" = "yes"); then
+if test "${enable_teamdctl}" = "yes"; then
 	if test "$have_teamdctl" = "no"; then
 		as_fn_error $? "Libteamdctl is required for team support" "$LINENO" 5
 	fi
@@ -24260,7 +24310,7 @@ else
   enable_json_validation=${have_jansson}
 fi
 
-if (test "${enable_json_validation}" == "no"); then
+if test "${enable_json_validation}" = "no"; then
 
 $as_echo "#define WITH_JSON_VALIDATION 0" >>confdefs.h
 
@@ -24291,7 +24341,7 @@ else
   enable_polkit=yes
 fi
 
-if test "${enable_polkit}" == "root-only" ; then
+if test "${enable_polkit}" = "root-only" ; then
 	enable_polkit='root-only'
 elif test "${enable_polkit}" != "no" -a "${enable_polkit}" != "disabled" ; then
 	enable_polkit=true
@@ -24377,32 +24427,16 @@ else
 $as_echo "yes" >&6; }
 	have_pk_agent=yes
 fi
-# Check whether --enable-polkit-agent was given.
-if test "${enable_polkit_agent+set}" = set; then :
-  enableval=$enable_polkit_agent; enable_polkit_agent=${enableval}
+if test x"$have_pk_agent" = x"no"; then
+	POLKIT_PACKAGE_PREFIX="/usr"
 else
-  enable_polkit_agent=${have_pk_agent}
+	POLKIT_PACKAGE_PREFIX=`$PKG_CONFIG --variable=prefix polkit-agent-1`
 fi
 
-if (test "${enable_polkit_agent}" = "yes"); then
-	if test x"$have_pk_agent" = x"no"; then
-		as_fn_error $? "Polkit agent is required" "$LINENO" 5
-	fi
-
-$as_echo "#define WITH_POLKIT_AGENT 1" >>confdefs.h
-
-else
-
-$as_echo "#define WITH_POLKIT_AGENT 0" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define POLKIT_PACKAGE_PREFIX "$POLKIT_PACKAGE_PREFIX"
+_ACEOF
 
-fi
- if test "${enable_polkit_agent}" = "yes"; then
-  WITH_POLKIT_AGENT_TRUE=
-  WITH_POLKIT_AGENT_FALSE='#'
-else
-  WITH_POLKIT_AGENT_TRUE='#'
-  WITH_POLKIT_AGENT_FALSE=
-fi
 
 
 # Check whether --enable-modify-system was given.
@@ -24646,7 +24680,7 @@ else
   enable_ppp=yes
 fi
 
-if (test "${enable_ppp}" = "yes"); then
+if test "${enable_ppp}" = "yes"; then
 	for ac_header in pppd/pppd.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "pppd/pppd.h" "ac_cv_header_pppd_pppd_h" "$ac_includes_default"
@@ -24760,7 +24794,7 @@ else
   with_modem_manager_1=auto
 fi
 
-if (test "${with_modem_manager_1}" != "no"); then
+if test "${with_modem_manager_1}" != "no"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MM_GLIB" >&5
@@ -24833,8 +24867,8 @@ $as_echo "yes" >&6; }
 	have_libmm_glib=yes
 fi
 
-	if (test "${have_libmm_glib}" = "no"); then
-		if (test "${with_modem_manager_1}" = "yes"); then
+	if test "${have_libmm_glib}" = "no"; then
+		if test "${with_modem_manager_1}" = "yes"; then
 			as_fn_error $? "Couldn't find libmm-glib" "$LINENO" 5
 		else
 			with_modem_manager_1="no"
@@ -25011,7 +25045,7 @@ else
   enable_bluez5_dun=${have_bluez5}
 fi
 
-if (test "${enable_bluez5_dun}" = "yes"); then
+if test "${enable_bluez5_dun}" = "yes"; then
 	if test x"$have_bluez5" = x"no"; then
 		as_fn_error $? "Bluez 5.x development headers are required" "$LINENO" 5
 	fi
@@ -25041,7 +25075,7 @@ else
   with_ofono=no
 fi
 
-if (test "${with_ofono}" = "yes"); then
+if test "${with_ofono}" = "yes"; then
 
 $as_echo "#define WITH_OFONO 1" >>confdefs.h
 
@@ -25115,8 +25149,8 @@ fi
 done
 test -n "$with_dhcpcanon" || with_dhcpcanon="no"
 
-    if test "$with_dhcpcanon" == "no"; then
-        if test "$with_dhcpcanon_" == yes; then
+    if test "$with_dhcpcanon" = "no"; then
+        if test "$with_dhcpcanon_" = yes; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dhcpcanon not found, assume path /sbin/dhcpcanon" >&5
 $as_echo "$as_me: WARNING: dhcpcanon not found, assume path /sbin/dhcpcanon" >&2;}
             with_dhcpcanon=/sbin/dhcpcanon
@@ -25215,8 +25249,8 @@ fi
 done
 test -n "$with_dhclient" || with_dhclient="no"
 
-	if test "$with_dhclient" == "no"; then
-		if test "$with_dhclient_" == yes; then
+	if test "$with_dhclient" = "no"; then
+		if test "$with_dhclient_" = yes; then
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dhclient not found, assume path /usr/sbin/dhclient" >&5
 $as_echo "$as_me: WARNING: dhclient not found, assume path /usr/sbin/dhclient" >&2;}
 			with_dhclient=/usr/sbin/dhclient
@@ -25293,8 +25327,8 @@ fi
 done
 test -n "$with_dhcpcd" || with_dhcpcd="no"
 
-	if test "$with_dhcpcd" == "no"; then
-		if test "$with_dhcpcd_" == yes; then
+	if test "$with_dhcpcd" = "no"; then
+		if test "$with_dhcpcd_" = yes; then
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dhcpcd not found, assume path /usr/sbin/dhcpcd" >&5
 $as_echo "$as_me: WARNING: dhcpcd not found, assume path /usr/sbin/dhcpcd" >&2;}
 			with_dhcpcd=/usr/sbin/dhcpcd
@@ -26292,7 +26326,7 @@ fi
 	fi
 	with_nm_cloud_setup=yes
 fi
- if test "$with_nm_cloud_setup" == yes; then
+ if test "$with_nm_cloud_setup" = yes; then
   BUILD_NM_CLOUD_SETUP_TRUE=
   BUILD_NM_CLOUD_SETUP_FALSE='#'
 else
@@ -26506,6 +26540,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 		      -Wno-missing-field-initializers \
 		      -Wno-pragmas \
 		      -Wno-sign-compare \
+		      -Wno-tautological-constant-out-of-range-compare \
 		      -Wno-unknown-pragmas \
 		      -Wno-unused-parameter \
 		      ; do
@@ -27191,7 +27226,7 @@ if test "${enable_undefined_sanitizer+set}" = set; then :
   enableval=$enable_undefined_sanitizer;
 fi
 
-if (test "${enable_undefined_sanitizer}" = "yes"); then
+if test "${enable_undefined_sanitizer}" = "yes"; then
 
   for flag in -fsanitize=undefined; do
 
@@ -27567,7 +27602,7 @@ if test "$enable_tests" != "yes" -a "$enable_tests" != "root"; then :
   enable_tests="no"
 fi
 # Search for tools
-if test "$with_valgrind" == "yes"; then :
+if test "$with_valgrind" = "yes"; then :
   for ac_prog in valgrind
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -27624,7 +27659,7 @@ else
   ENABLE_TESTS_FALSE=
 fi
 
- if test "$enable_tests" == "root"; then
+ if test "$enable_tests" = "root"; then
   REQUIRE_ROOT_TESTS_TRUE=
   REQUIRE_ROOT_TESTS_FALSE='#'
 else
@@ -27638,10 +27673,10 @@ if test "${with_valgrind_suppressions+set}" = set; then :
   withval=$with_valgrind_suppressions;
 fi
 
-if test "$with_valgrind" == no; then
+if test "$with_valgrind" = no; then
 	with_valgrind_suppressions=
 else
-	if test  "$with_valgrind_suppressions" == ""; then
+	if test  "$with_valgrind_suppressions" = ""; then
 		with_valgrind_suppressions='$(top_srcdir)/valgrind.suppressions'
 	fi
 fi
@@ -28238,7 +28273,7 @@ fi
 build_docs=no
 if test -n "$INTROSPECTION_MAKEFILE"; then
 	# If g-i is installed we know we have python, but we might not have pygobject
-	if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then
+	if ! "$PYTHON" -c 'from gi.repository import GObject' > /dev/null 2>&1; then
 		as_fn_error $? "\"--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)" "$LINENO" 5
 	fi
 
@@ -28595,10 +28630,6 @@ if test -z "${WITH_JSON_VALIDATION_TRUE}" && test -z "${WITH_JSON_VALIDATION_FAL
   as_fn_error $? "conditional \"WITH_JSON_VALIDATION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${WITH_POLKIT_AGENT_TRUE}" && test -z "${WITH_POLKIT_AGENT_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_POLKIT_AGENT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HAVE_CRYPTO_GNUTLS_TRUE}" && test -z "${HAVE_CRYPTO_GNUTLS_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_CRYPTO_GNUTLS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -29092,7 +29123,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by NetworkManager $as_me 1.22.10, which was
+This file was extended by NetworkManager $as_me 1.24.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29158,7 +29189,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-NetworkManager config.status 1.22.10
+NetworkManager config.status 1.24.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -31289,7 +31320,6 @@ if test "${enable_modify_system}" = "yes"; then
 else
 	echo "  policykit: main.auth-polkit=${enable_polkit} (restrictive modify.system)"
 fi
-echo "  polkit agent: ${enable_polkit_agent}"
 echo "  selinux: $have_selinux"
 echo "  systemd-journald: $have_systemd_journal (default: logging.backend=${nm_config_logging_backend_default})"
 echo "  hostname persist: ${hostname_persist}"