New upstream version 1.22.0 upstream/1.22.0

1 files changed, 217 insertions, 24 deletions

diff --git a/configure b/configure
index 9ba5a8ce..dcb40dba 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.20.8.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.22.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.20.8'
-PACKAGE_STRING='NetworkManager 1.20.8'
+PACKAGE_VERSION='1.22.0'
+PACKAGE_STRING='NetworkManager 1.22.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -693,6 +693,8 @@ BUILD_NMTUI_FALSE
 BUILD_NMTUI_TRUE
 NEWT_LIBS
 NEWT_CFLAGS
+BUILD_NM_CLOUD_SETUP_FALSE
+BUILD_NM_CLOUD_SETUP_TRUE
 BUILD_NMCLI_FALSE
 BUILD_NMCLI_TRUE
 READLINE_LIBS
@@ -726,6 +728,8 @@ BLUEZ5_LIBS
 BLUEZ5_CFLAGS
 WITH_MODEM_MANAGER_1_FALSE
 WITH_MODEM_MANAGER_1_TRUE
+MOBILE_BROADBAND_PROVIDER_INFO_LIBS
+MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS
 MM_GLIB_LIBS
 MM_GLIB_CFLAGS
 PPPD_PATH
@@ -1094,6 +1098,7 @@ with_kernel_firmware_dir
 with_libpsl
 enable_concheck
 with_nmcli
+with_nm_cloud_setup
 with_nmtui
 enable_more_warnings
 enable_more_asserts
@@ -1166,6 +1171,8 @@ NSS_CFLAGS
 NSS_LIBS
 MM_GLIB_CFLAGS
 MM_GLIB_LIBS
+MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS
+MOBILE_BROADBAND_PROVIDER_INFO_LIBS
 BLUEZ5_CFLAGS
 BLUEZ5_LIBS
 LIBPSL_CFLAGS
@@ -1719,7 +1726,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.20.8 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.22.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1789,7 +1796,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.20.8:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.22.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1823,7 +1830,8 @@ Optional Features:
   --enable-teamdctl       enable Teamd control support
   --enable-json-validation
                           Enable JSON validation in libnm
-  --enable-polkit=yes|no  set default value for auth-polkit configuration
+  --enable-polkit=yes|no|root-only
+                          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
@@ -1946,6 +1954,9 @@ Optional Packages:
                           [default=/lib/firmware]
   --with-libpsl=yes|no    Link against libpsl
   --with-nmcli=yes|no     Build nmcli
+  --with-nm-cloud-setup=yes|no
+                          Build nm-cloud-setup, a tool for automatically
+                          configure networking in cloud (EXPERIMENTAL!)
   --with-nmtui=yes|no     Build nmtui
   --with-more-asserts=level
                           Enable more assertions for debugging (0 = none, 100
@@ -2040,6 +2051,12 @@ Some influential environment variables:
               C compiler flags for MM_GLIB, overriding pkg-config
   MM_GLIB_LIBS
               linker flags for MM_GLIB, overriding pkg-config
+  MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS
+              C compiler flags for MOBILE_BROADBAND_PROVIDER_INFO, overriding
+              pkg-config
+  MOBILE_BROADBAND_PROVIDER_INFO_LIBS
+              linker flags for MOBILE_BROADBAND_PROVIDER_INFO, overriding
+              pkg-config
   BLUEZ5_CFLAGS
               C compiler flags for BLUEZ5, overriding pkg-config
   BLUEZ5_LIBS linker flags for BLUEZ5, overriding pkg-config
@@ -2127,7 +2144,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.20.8
+NetworkManager configure 1.22.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2900,7 +2917,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.20.8, which was
+It was created by NetworkManager $as_me 1.22.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3770,7 +3787,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.20.8'
+ VERSION='1.22.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17953,9 +17970,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 NM_MAJOR_VERSION=1
-NM_MINOR_VERSION=20
-NM_MICRO_VERSION=8
-NM_VERSION=1.20.8
+NM_MINOR_VERSION=22
+NM_MICRO_VERSION=0
+NM_VERSION=1.22.0
 
 
 
@@ -17963,7 +17980,7 @@ NM_VERSION=1.20.8
 
 
 
-NM_GIT_SHA=4ef92efc07a929f13699a7d99b5af192b01948b1
+NM_GIT_SHA=7fe734f8bc0661ff476204a034eb987df43ee461
 
 if test """" != "no-config-h" ; then
 
@@ -24274,21 +24291,20 @@ else
   enable_polkit=yes
 fi
 
-if (test "${enable_polkit}" != "no" -a "${enable_polkit}" != "disabled"); 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
-
-$as_echo "#define NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT \"true\"" >>confdefs.h
-
-	NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT=true
-
 else
 	enable_polkit=false
+fi
 
-$as_echo "#define NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT \"false\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT "$enable_polkit"
+_ACEOF
 
-	NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT=false
+NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT="$enable_polkit"
 
-fi
 
 
 pkg_failed=no
@@ -24825,6 +24841,83 @@ fi
 		fi
 	else
 		with_modem_manager_1="yes"
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MOBILE_BROADBAND_PROVIDER_INFO" >&5
+$as_echo_n "checking for MOBILE_BROADBAND_PROVIDER_INFO... " >&6; }
+
+if test -n "$MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS"; then
+    pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS="$MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mobile-broadband-provider-info\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "mobile-broadband-provider-info") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS=`$PKG_CONFIG --cflags "mobile-broadband-provider-info" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$MOBILE_BROADBAND_PROVIDER_INFO_LIBS"; then
+    pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_LIBS="$MOBILE_BROADBAND_PROVIDER_INFO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mobile-broadband-provider-info\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "mobile-broadband-provider-info") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_LIBS=`$PKG_CONFIG --libs "mobile-broadband-provider-info" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        MOBILE_BROADBAND_PROVIDER_INFO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mobile-broadband-provider-info" 2>&1`
+        else
+	        MOBILE_BROADBAND_PROVIDER_INFO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mobile-broadband-provider-info" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$MOBILE_BROADBAND_PROVIDER_INFO_PKG_ERRORS" >&5
+
+	MOBILE_BROADBAND_PROVIDER_INFO_DATABASE="$prefix/share/mobile-broadband-provider-info/serviceproviders.xml"
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	MOBILE_BROADBAND_PROVIDER_INFO_DATABASE="$prefix/share/mobile-broadband-provider-info/serviceproviders.xml"
+else
+	MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS=$pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS
+	MOBILE_BROADBAND_PROVIDER_INFO_LIBS=$pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	MOBILE_BROADBAND_PROVIDER_INFO_DATABASE=`$PKG_CONFIG --variable=database mobile-broadband-provider-info`
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define MOBILE_BROADBAND_PROVIDER_INFO_DATABASE "$MOBILE_BROADBAND_PROVIDER_INFO_DATABASE"
+_ACEOF
+
 	fi
 fi
  if test "${with_modem_manager_1}" = "yes"; then
@@ -24836,6 +24929,9 @@ else
 fi
 
 
+
+
+
 # Bluez5 DUN support
 
 pkg_failed=no
@@ -26114,6 +26210,98 @@ fi
 
 
 
+# Check whether --with-nm-cloud-setup was given.
+if test "${with_nm_cloud_setup+set}" = set; then :
+  withval=$with_nm_cloud_setup;
+fi
+
+if test "$with_nm_cloud_setup" != no; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCURL" >&5
+$as_echo_n "checking for LIBCURL... " >&6; }
+
+if test -n "$LIBCURL_CFLAGS"; then
+    pkg_cv_LIBCURL_CFLAGS="$LIBCURL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.24.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcurl >= 7.24.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBCURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.24.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBCURL_LIBS"; then
+    pkg_cv_LIBCURL_LIBS="$LIBCURL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.24.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcurl >= 7.24.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBCURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.24.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBCURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.24.0" 2>&1`
+        else
+	        LIBCURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.24.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBCURL_PKG_ERRORS" >&5
+
+	have_libcurl=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_libcurl=no
+else
+	LIBCURL_CFLAGS=$pkg_cv_LIBCURL_CFLAGS
+	LIBCURL_LIBS=$pkg_cv_LIBCURL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_libcurl=yes
+fi
+	if test "$have_libcurl" != "yes"; then
+		as_fn_error $? "--with-nm-cloud-setup requires libcurl library." "$LINENO" 5
+	fi
+	with_nm_cloud_setup=yes
+fi
+ if test "$with_nm_cloud_setup" == yes; then
+  BUILD_NM_CLOUD_SETUP_TRUE=
+  BUILD_NM_CLOUD_SETUP_FALSE='#'
+else
+  BUILD_NM_CLOUD_SETUP_TRUE='#'
+  BUILD_NM_CLOUD_SETUP_FALSE=
+fi
+
+
+
 # Check whether --with-nmtui was given.
 if test "${with_nmtui+set}" = set; then :
   withval=$with_nmtui;
@@ -28398,6 +28586,10 @@ if test -z "${BUILD_NMCLI_TRUE}" && test -z "${BUILD_NMCLI_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_NMCLI\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${BUILD_NM_CLOUD_SETUP_TRUE}" && test -z "${BUILD_NM_CLOUD_SETUP_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_NM_CLOUD_SETUP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${BUILD_NMTUI_TRUE}" && test -z "${BUILD_NMTUI_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_NMTUI\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -28843,7 +29035,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.20.8, which was
+This file was extended by NetworkManager $as_me 1.22.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -28909,7 +29101,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.20.8
+NetworkManager config.status 1.22.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -31058,6 +31250,7 @@ echo "  libteamdctl: $enable_teamdctl"
 echo "  ovs: $enable_ovs"
 echo "  nmcli: $build_nmcli"
 echo "  nmtui: $build_nmtui"
+echo "  nm-cloud-setup: $with_nm_cloud_setup"
 echo "  iwd: $ac_with_iwd"
 echo