New upstream version 1.44.0 upstream/1.44.0

1 files changed, 138 insertions, 21 deletions

diff --git a/configure b/configure
index 9d2ebe54..685c5082 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.71 for NetworkManager 1.42.8.
+# Generated by GNU Autoconf 2.71 for NetworkManager 1.44.0.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -622,8 +622,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NetworkManager'
 PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='1.42.8'
-PACKAGE_STRING='NetworkManager 1.42.8'
+PACKAGE_VERSION='1.44.0'
+PACKAGE_STRING='NetworkManager 1.44.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -745,6 +745,7 @@ LIBPSL_CFLAGS
 KERNEL_FIRMWARE_DIR
 SYSTEM_CA_PATH
 DNSMASQ_PATH
+MODPROBE_PATH
 NFT_PATH
 IPTABLES_PATH
 NM_CONFIG_DEFAULT_MAIN_RC_MANAGER
@@ -818,6 +819,7 @@ SYSTEMD_INHIBIT_CFLAGS
 SYSTEMD_LOGIN_LIBS
 SYSTEMD_LOGIN_CFLAGS
 NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT
+NM_CONFIG_DEFAULT_MAIN_MIGRATE_IFCFG_RH_TEXT
 NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT
 SYSTEMD_JOURNAL_LIBS
 SYSTEMD_JOURNAL_CFLAGS
@@ -1070,6 +1072,7 @@ with_systemdsystemunitdir
 with_hostname_persist
 with_systemd_journal
 with_config_logging_backend_default
+with_config_migrate_ifcfg_rh_default
 with_config_wifi_backend_default
 with_systemd_logind
 with_consolekit
@@ -1101,6 +1104,7 @@ with_netconfig
 with_config_dns_rc_manager_default
 with_iptables
 with_nft
+with_modprobe
 with_dnsmasq
 with_system_ca_path
 with_kernel_firmware_dir
@@ -1745,7 +1749,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.42.8 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.44.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1817,7 +1821,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.42.8:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.44.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1842,6 +1846,7 @@ Optional Features:
   --disable-nls           do not use Native Language Support
   --disable-rpath         do not hardcode runtime library paths
   --enable-ifcfg-rh       enable ifcfg-rh configuration plugin (Fedora/RHEL)
+                          (deprecated)
   --enable-ifupdown       enable ifupdown configuration plugin (Debian/Ubuntu)
   --enable-code-coverage  Whether to enable code coverage support
   --enable-wifi           enable Wi-Fi support
@@ -1917,6 +1922,8 @@ Optional Packages:
                           Use systemd journal for logging
   --with-config-logging-backend-default=backend
                           Default value for logging.backend
+  --with-config-migrate-ifcfg-rh-default=yes|no
+                          Default value for main.migrate-ifcfg-rh
   --with-config-wifi-backend-default=backend
                           Default value for wifi.backend
   --with-systemd-logind=yes|no
@@ -1968,6 +1975,8 @@ Optional Packages:
                           path to iptables
   --with-nft=/usr/sbin/nft
                           path to nft
+  --with-modprobe=/sbin/modprobe
+                          path to modprobe
   --with-dnsmasq=/path/to/dnsmasq
                           path to dnsmasq
   --with-system-ca-path=/path/to/ssl/certs
@@ -1981,7 +1990,7 @@ Optional Packages:
   --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!)
+                          configuring networking in cloud
   --with-nmtui=yes|no     Build nmtui
   --with-more-asserts=level
                           Enable more assertions for debugging (0 = none, 100
@@ -2172,7 +2181,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.42.8
+NetworkManager configure 1.44.0
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2893,7 +2902,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.42.8, which was
+It was created by NetworkManager $as_me 1.44.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4389,7 +4398,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.42.8'
+ VERSION='1.44.0'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -19328,9 +19337,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 NM_MAJOR_VERSION=1
-NM_MINOR_VERSION=42
-NM_MICRO_VERSION=8
-NM_VERSION=1.42.8
+NM_MINOR_VERSION=44
+NM_MICRO_VERSION=0
+NM_VERSION=1.44.0
 
 
 
@@ -19338,7 +19347,7 @@ NM_VERSION=1.42.8
 
 
 
-NM_GIT_SHA=7c6da25396162ba05ffa71f00e227351dc1452b6
+NM_GIT_SHA=d56e49a4ecc2b03b46f3387b837afc87e99c4bfa
 
 if test """" != "no-config-h" ; then
 
@@ -19792,6 +19801,20 @@ then :
 
 fi
 
+       for ac_header in threads.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "threads.h" "ac_cv_header_threads_h" "$ac_includes_default"
+if test "x$ac_cv_header_threads_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_THREADS_H 1" >>confdefs.h
+
+else $as_nop
+
+printf "%s\n" "#define HAVE_THREADS_H 0" >>confdefs.h
+
+fi
+
+done
 
 ac_fn_check_decl "$LINENO" "getrandom" "ac_cv_have_decl_getrandom" "#include <sys/random.h>
 
@@ -22661,10 +22684,6 @@ then :
 fi
 
 # Default alternative plugins by distribution
-if test -z "$enable_ifcfg_rh" -a -d /etc/sysconfig/network-scripts
-then :
-  enable_ifcfg_rh=yes
-fi
 if test -z "$enable_ifupdown" -a -f /etc/debian_version
 then :
   enable_ifupdown=yes
@@ -24368,6 +24387,34 @@ NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT="$nm_config_logging_backend_default"
 
 
 
+# Check whether --with-config-migrate-ifcfg-rh-default was given.
+if test ${with_config_migrate_ifcfg_rh_default+y}
+then :
+  withval=$with_config_migrate_ifcfg_rh_default; nm_config_migrate_ifcfg_rh_default="$withval"
+else $as_nop
+  nm_config_migrate_ifcfg_rh_default="no"
+fi
+
+
+if test "$nm_config_migrate_ifcfg_rh_default" = yes; then
+	if test "$enable_ifcfg_rh" = no; then
+		as_fn_error $? "ifcfg-rh migration can be enabled by default only when the ifcfg-rh plugin is enabled" "$LINENO" 5
+	fi
+
+printf "%s\n" "#define NM_CONFIG_DEFAULT_MAIN_MIGRATE_IFCFG_RH \"true\"" >>confdefs.h
+
+	NM_CONFIG_DEFAULT_MAIN_MIGRATE_IFCFG_RH_TEXT='true'
+elif test "$nm_config_migrate_ifcfg_rh_default" = no; then
+
+printf "%s\n" "#define NM_CONFIG_DEFAULT_MAIN_MIGRATE_IFCFG_RH \"false\"" >>confdefs.h
+
+	NM_CONFIG_DEFAULT_MAIN_MIGRATE_IFCFG_RH_TEXT='false'
+else
+	as_fn_error $? "The value of --with-config-migrate-ifcfg-rh-default must be either \"yes\" or \"no\"." "$LINENO" 5
+fi
+
+
+
 # Check whether --with-config-wifi-backend-default was given.
 if test ${with_config_wifi_backend_default+y}
 then :
@@ -27549,6 +27596,71 @@ printf "%s\n" "#define NFT_PATH \"$NFT_PATH\"" >>confdefs.h
 
 
 
+# Check whether --with-modprobe was given.
+if test ${with_modprobe+y}
+then :
+  withval=$with_modprobe;
+fi
+
+if test "x${with_modprobe}" = x; then
+	# Extract the first word of "modprobe", so it can be a program name with args.
+set dummy modprobe; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_MODPROBE_PATH+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $MODPROBE_PATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MODPROBE_PATH="$MODPROBE_PATH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/sbin:/usr/sbin"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    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_MODPROBE_PATH="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$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
+MODPROBE_PATH=$ac_cv_path_MODPROBE_PATH
+if test -n "$MODPROBE_PATH"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MODPROBE_PATH" >&5
+printf "%s\n" "$MODPROBE_PATH" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+	if test "x$MODPROBE_PATH" = x; then
+		MODPROBE_PATH='/sbin/modprobe'
+	fi
+else
+	MODPROBE_PATH="$with_modprobe"
+fi
+
+printf "%s\n" "#define MODPROBE_PATH \"$MODPROBE_PATH\"" >>confdefs.h
+
+
+
+
 # Check whether --with-dnsmasq was given.
 if test ${with_dnsmasq+y}
 then :
@@ -27747,6 +27859,7 @@ else
 fi
 
 
+have_libcurl=''
 
 # Check whether --enable-concheck was given.
 if test ${enable_concheck+y}
@@ -28115,7 +28228,7 @@ else $as_nop
   with_nmcli=yes
 fi
 
-if test "$with_nmcli" == yes; then
+if test "$with_nmcli" = yes; then
     if test "$with_readline" = none; then
         { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -28123,7 +28236,7 @@ as_fn_error $? "nmcli requires readline library. Use --with-readline or --with-n
 See \`config.log' for more details" "$LINENO" 5; }
     fi
     build_nmcli=yes
-elif test "$with_nmcli" == no; then
+elif test "$with_nmcli" = no; then
     build_nmcli=no
 else
     as_fn_error $? "invalid --with-nmcli option. Valid options are --with-nmcli=yes|no" "$LINENO" 5
@@ -28145,6 +28258,7 @@ then :
 fi
 
 if test "$with_nm_cloud_setup" != no; then
+	if test "$have_libcurl" = ""; then
 
 pkg_failed=no
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBCURL" >&5
@@ -28216,6 +28330,7 @@ else
 printf "%s\n" "yes" >&6; }
 	have_libcurl=yes
 fi
+	fi
 	if test "$have_libcurl" != "yes"; then
 		as_fn_error $? "--with-nm-cloud-setup requires libcurl library." "$LINENO" 5
 	fi
@@ -32816,7 +32931,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.42.8, which was
+This file was extended by NetworkManager $as_me 1.44.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -32884,7 +32999,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-NetworkManager config.status 1.42.8
+NetworkManager config.status 1.44.0
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
@@ -35030,10 +35145,12 @@ echo "  iwd: $ac_with_iwd"
 echo "  jansson: $have_jansson${JANSSON_SONAME:+ (soname: $JANSSON_SONAME)}"
 echo "  iptables: $IPTABLES_PATH"
 echo "  nft: $NFT_PATH"
+echo "  modprobe: $MODPROBE_PATH"
 echo
 
 echo "Configuration plugins (main.plugins=${config_plugins_default})"
 echo "  ifcfg-rh: ${enable_ifcfg_rh}"
+echo "    default value of main.migrate-ifcfg-rh: ${nm_config_migrate_ifcfg_rh_default}"
 echo "  ifupdown: ${enable_ifupdown}"
 echo