New upstream version 1.27.90 upstream/1.27.90

1 files changed, 87 insertions, 79 deletions

diff --git a/configure b/configure
index 7a26e3a8..cc35e400 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.26.2.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.27.90.
 #
 # 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.26.2'
-PACKAGE_STRING='NetworkManager 1.26.2'
+PACKAGE_VERSION='1.27.90'
+PACKAGE_STRING='NetworkManager 1.27.90'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -642,6 +642,9 @@ HAVE_DOCS_FALSE
 HAVE_DOCS_TRUE
 BUILD_DOCS_FALSE
 BUILD_DOCS_TRUE
+WITH_PYTHON_BLACK_FALSE
+WITH_PYTHON_BLACK_TRUE
+BLACK
 XSLTPROC
 PERL
 GTK_DOC_USE_REBASE_FALSE
@@ -757,8 +760,6 @@ NM_MODIFY_SYSTEM_POLICY
 POLKIT_LIBS
 POLKIT_CFLAGS
 NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT
-WITH_JSON_VALIDATION_FALSE
-WITH_JSON_VALIDATION_TRUE
 WITH_TEAMDCTL_FALSE
 WITH_TEAMDCTL_TRUE
 LIBTEAMDCTL_LIBS
@@ -1070,7 +1071,6 @@ with_ebpf
 with_selinux
 with_libaudit
 enable_teamdctl
-enable_json_validation
 enable_polkit
 enable_modify_system
 enable_firewalld_zone
@@ -1726,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.26.2 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.27.90 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1796,7 +1796,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.26.2:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.27.90:";;
    esac
   cat <<\_ACEOF
 
@@ -1828,8 +1828,6 @@ Optional Features:
                           Enable introspection for this build
   --enable-qt             enable Qt examples
   --enable-teamdctl       enable Teamd control support
-  --enable-json-validation
-                          Enable JSON validation in libnm
   --enable-polkit=yes|no|root-only
                           set default value for auth-polkit configuration
                           option. This value can be overwritten by NM
@@ -1939,7 +1937,7 @@ Optional Packages:
   --with-resolvconf=yes|no|path
                           Enable resolvconf support
   --with-netconfig=yes|no Enable SUSE netconfig support
-  --with-config-dns-rc-manager-default=symlink|file|netconfig|resolvconf
+  --with-config-dns-rc-manager-default=auto|symlink|file|netconfig|resolvconf
                           Configure default value for main.rc-manager setting
   --with-iptables=/path/to/iptables
                           path to iptables
@@ -2144,7 +2142,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.26.2
+NetworkManager configure 1.27.90
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2917,7 +2915,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.26.2, which was
+It was created by NetworkManager $as_me 1.27.90, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3787,7 +3785,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.26.2'
+ VERSION='1.27.90'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17970,9 +17968,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 NM_MAJOR_VERSION=1
-NM_MINOR_VERSION=26
-NM_MICRO_VERSION=2
-NM_VERSION=1.26.2
+NM_MINOR_VERSION=27
+NM_MICRO_VERSION=90
+NM_VERSION=1.27.90
 
 
 
@@ -17980,7 +17978,7 @@ NM_VERSION=1.26.2
 
 
 
-NM_GIT_SHA=c3c6c426dfca621fa71dceacbba2789b9f8ce144
+NM_GIT_SHA=4adf6afda5ebc19a0f1bc2be7e3c2869c35f138e
 
 if test """" != "no-config-h" ; then
 
@@ -20908,7 +20906,7 @@ fi
 if test -z "$enable_ifupdown" -a -f /etc/debian_version; then :
   enable_ifupdown=yes
 fi
-# Otherwise plugins default to "no"
+# Otherwise, plugins default to "no"
 if test -z "$enable_ifcfg_rh"; then :
   enable_ifcfg_rh=no
 fi
@@ -24011,12 +24009,12 @@ if test -n "$JANSSON_CFLAGS"; then
     pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson >= 2.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "jansson >= 2.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson >= 2.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "jansson >= 2.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_JANSSON_CFLAGS=`$PKG_CONFIG --cflags "jansson >= 2.5" 2>/dev/null`
+  pkg_cv_JANSSON_CFLAGS=`$PKG_CONFIG --cflags "jansson >= 2.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -24028,12 +24026,12 @@ if test -n "$JANSSON_LIBS"; then
     pkg_cv_JANSSON_LIBS="$JANSSON_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson >= 2.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "jansson >= 2.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson >= 2.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "jansson >= 2.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_JANSSON_LIBS=`$PKG_CONFIG --libs "jansson >= 2.5" 2>/dev/null`
+  pkg_cv_JANSSON_LIBS=`$PKG_CONFIG --libs "jansson >= 2.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -24054,9 +24052,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson >= 2.5" 2>&1`
+	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson >= 2.7" 2>&1`
         else
-	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson >= 2.5" 2>&1`
+	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson >= 2.7" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$JANSSON_PKG_ERRORS" >&5
@@ -24190,6 +24188,8 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 else
+	have_jansson=no
+	JANSSON_SONAME=
 
 $as_echo "#define WITH_JANSSON 0" >>confdefs.h
 
@@ -24306,35 +24306,6 @@ else
 fi
 
 
-# Jansson for team configuration validation
-# Check whether --enable-json-validation was given.
-if test "${enable_json_validation+set}" = set; then :
-  enableval=$enable_json_validation; enable_json_validation=${enableval}
-else
-  enable_json_validation=${have_jansson}
-fi
-
-if test "${enable_json_validation}" = "no"; then
-
-$as_echo "#define WITH_JSON_VALIDATION 0" >>confdefs.h
-
-else
-	if test "$have_jansson" = "no"; then
-		as_fn_error $? "jansson is needed for team configuration validation. Use --disable-json-validation to build without it." "$LINENO" 5
-	fi
-
-$as_echo "#define WITH_JSON_VALIDATION 1" >>confdefs.h
-
-fi
- if test "${enable_json_validation}" != "no"; then
-  WITH_JSON_VALIDATION_TRUE=
-  WITH_JSON_VALIDATION_FALSE='#'
-else
-  WITH_JSON_VALIDATION_TRUE='#'
-  WITH_JSON_VALIDATION_FALSE=
-fi
-
-
 # we usually compile with polkit support. --enable-polkit=yes|no only sets the
 # default configuration for main.auth-polkit. User can always enable/disable polkit
 # authorization via config.
@@ -25418,19 +25389,20 @@ if test "${with_config_dns_rc_manager_default+set}" = set; then :
 fi
 
 if test "$config_dns_rc_manager_default" != "" -a \
+        "$config_dns_rc_manager_default" != auto -a \
         "$config_dns_rc_manager_default" != file -a \
         "$config_dns_rc_manager_default" != symlink -a \
         "$config_dns_rc_manager_default" != netconfig -a \
         "$config_dns_rc_manager_default" != resolvconf; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown --with-config-dns-rc-manager-default=$config_dns_rc_manager_default setting." >&5
 $as_echo "$as_me: WARNING: Unknown --with-config-dns-rc-manager-default=$config_dns_rc_manager_default setting." >&2;}
-	config_dns_rc_manager_default=
+	config_dns_rc_manager_default=auto
 fi
 # Use netconfig by default on SUSE
 if test -z "$with_netconfig" -a -f /etc/SuSE-release; then :
   with_netconfig=yes
 fi
-# Otherwise default to "no"
+# Otherwise, default to "no"
 if test -z "$with_resolvconf"; then :
   with_resolvconf=no
 fi
@@ -25490,11 +25462,6 @@ test -n "$with_resolvconf" || with_resolvconf="'yes'"
 		as_fn_error $? "cannot find resolvconf in path. Set the path explicitly via --with-resolvconf=PATH." "$LINENO" 5
 	fi
 fi
-if test "$with_resolvconf" != "no"; then
-	if test -z "$config_dns_rc_manager_default"; then :
-  config_dns_rc_manager_default=resolvconf
-fi
-fi
 
 if test "$with_netconfig" = "yes"; then
 	for ac_prog in netconfig
@@ -25548,15 +25515,6 @@ test -n "$with_netconfig" || with_netconfig="yes"
 		as_fn_error $? "cannot find netconfig in path. Set the path explicitly via --with-netconfig=PATH." "$LINENO" 5
 	fi
 fi
-if test "$with_netconfig" != "no"; then
-	if test -z "$config_dns_rc_manager_default"; then :
-  config_dns_rc_manager_default=netconfig
-fi
-fi
-
-if test -z "$config_dns_rc_manager_default"; then :
-  config_dns_rc_manager_default=symlink
-fi
 
 if test "$with_resolvconf" != "no"; then
 
@@ -28685,6 +28643,56 @@ else
 	have_introspection=no
 fi
 
+# check for python black. And check if all files are formatted with python black
+# Extract the first word of "black", so it can be a program name with args.
+set dummy black; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_BLACK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $BLACK in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BLACK="$BLACK" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BLACK="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+BLACK=$ac_cv_path_BLACK
+if test -n "$BLACK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BLACK" >&5
+$as_echo "$BLACK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test "${BLACK}" != ""; then
+  WITH_PYTHON_BLACK_TRUE=
+  WITH_PYTHON_BLACK_FALSE='#'
+else
+  WITH_PYTHON_BLACK_TRUE='#'
+  WITH_PYTHON_BLACK_FALSE=
+fi
+
+
 # check for pregenerated manpages and documentation to be installed
 use_pregen_docs=no
 if test "$build_docs" != "yes" -a \
@@ -28936,10 +28944,6 @@ if test -z "${WITH_TEAMDCTL_TRUE}" && test -z "${WITH_TEAMDCTL_FALSE}"; then
   as_fn_error $? "conditional \"WITH_TEAMDCTL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${WITH_JSON_VALIDATION_TRUE}" && test -z "${WITH_JSON_VALIDATION_FALSE}"; then
-  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_FIREWALLD_ZONE_TRUE}" && test -z "${WITH_FIREWALLD_ZONE_FALSE}"; then
   as_fn_error $? "conditional \"WITH_FIREWALLD_ZONE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -29032,6 +29036,10 @@ if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"
   as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_PYTHON_BLACK_TRUE}" && test -z "${WITH_PYTHON_BLACK_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_PYTHON_BLACK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${BUILD_DOCS_TRUE}" && test -z "${BUILD_DOCS_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_DOCS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -29437,7 +29445,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.26.2, which was
+This file was extended by NetworkManager $as_me 1.27.90, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29503,7 +29511,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.26.2
+NetworkManager config.status 1.27.90
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -31654,6 +31662,7 @@ echo "  nmcli: $build_nmcli"
 echo "  nmtui: $build_nmtui"
 echo "  nm-cloud-setup: $with_nm_cloud_setup"
 echo "  iwd: $ac_with_iwd"
+echo "  jansson: $have_jansson${JANSSON_SONAME:+ (soname: $JANSSON_SONAME)}"
 echo
 
 echo "Configuration plugins (main.plugins=${config_plugins_default})"
@@ -31686,7 +31695,6 @@ echo "  valgrind: $with_valgrind   $with_valgrind_suppressions"
 echo "  code coverage: $enable_code_coverage"
 echo "  LTO: $enable_lto"
 echo "  linker garbage collection: $enable_ld_gc"
-echo "  JSON validation for libnm: $enable_json_validation"
 echo "  crypto: $with_crypto (have-gnutls: $have_crypto_gnutls, have-nss: $have_crypto_nss)"
 echo "  sanitizers: $sanitizers"
 echo "  Mozilla Public Suffix List: $with_libpsl"