New upstream version 1.24.2 upstream/1.24.2

1 files changed, 57 insertions, 13 deletions

diff --git a/configure b/configure
index bcd0bc6c..e0b3a099 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.24.0.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.24.2.
 #
 # 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.24.0'
-PACKAGE_STRING='NetworkManager 1.24.0'
+PACKAGE_VERSION='1.24.2'
+PACKAGE_STRING='NetworkManager 1.24.2'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -751,6 +751,8 @@ NSS_LIBS
 NSS_CFLAGS
 GNUTLS_LIBS
 GNUTLS_CFLAGS
+WITH_FIREWALLD_ZONE_FALSE
+WITH_FIREWALLD_ZONE_TRUE
 NM_MODIFY_SYSTEM_POLICY
 POLKIT_LIBS
 POLKIT_CFLAGS
@@ -1071,6 +1073,7 @@ enable_teamdctl
 enable_json_validation
 enable_polkit
 enable_modify_system
+enable_firewalld_zone
 with_crypto
 with_dbus_sys_dir
 enable_ppp
@@ -1723,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.24.0 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.24.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1793,7 +1796,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.24.0:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.24.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1832,6 +1835,7 @@ Optional Features:
                           option. This value can be overwritten by NM
                           configuration. 'disabled' is an alias for 'no'
   --enable-modify-system  Allow users to modify system connections
+  --enable-firewalld-zone Install and use firewalld zone for shared mode
   --enable-ppp            enable PPP/PPPoE support
   --enable-bluez5-dun     enable Bluez5 DUN support
   --enable-ovs            enable Open vSwitch support
@@ -2140,7 +2144,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.24.0
+NetworkManager configure 1.24.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2913,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.24.0, which was
+It was created by NetworkManager $as_me 1.24.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3783,7 +3787,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.24.0'
+ VERSION='1.24.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17967,8 +17971,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 NM_MAJOR_VERSION=1
 NM_MINOR_VERSION=24
-NM_MICRO_VERSION=0
-NM_VERSION=1.24.0
+NM_MICRO_VERSION=2
+NM_VERSION=1.24.2
 
 
 
@@ -17976,7 +17980,7 @@ NM_VERSION=1.24.0
 
 
 
-NM_GIT_SHA=ea141ba8f8d1cf72e3bd752199c1076821fffdf9
+NM_GIT_SHA=972453d7352e92f4f988e00d6f43636835a1ae91
 
 if test """" != "no-config-h" ; then
 
@@ -24451,6 +24455,32 @@ else
 fi
 
 
+# Check whether --enable-firewalld-zone was given.
+if test "${enable_firewalld_zone+set}" = set; then :
+  enableval=$enable_firewalld_zone; enable_firewalld_zone=${enableval}
+else
+  enable_firewalld_zone=yes
+fi
+
+
+if test "${enable_firewalld_zone}" = "yes"; then
+
+$as_echo "#define WITH_FIREWALLD_ZONE 1" >>confdefs.h
+
+else
+
+$as_echo "#define WITH_FIREWALLD_ZONE 0" >>confdefs.h
+
+fi
+ if test "${enable_firewalld_zone}" = "yes"; then
+  WITH_FIREWALLD_ZONE_TRUE=
+  WITH_FIREWALLD_ZONE_FALSE='#'
+else
+  WITH_FIREWALLD_ZONE_TRUE='#'
+  WITH_FIREWALLD_ZONE_FALSE=
+fi
+
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5
@@ -27219,6 +27249,10 @@ $as_echo "#define ASAN_BUILD 1" >>confdefs.h
 	else
 		sanitizers="${sanitizers}address(executables-only) "
 	fi
+elif test "$with_address_sanitizer" = "" -o "$with_address_sanitizer" = no; then
+	with_address_sanitizer=no
+else
+	as_fn_error $? "\"Invalid asan option --with-address-sanitizer=$with_address_sanitizer\"" "$LINENO" 5
 fi
 
 # Check whether --enable-undefined-sanitizer was given.
@@ -27269,6 +27303,10 @@ fi
 	sanitizer_exec_ldflags="$sanitizer_exec_ldflags -Wc,-fsanitize=undefined"
 	sanitizer_lib_ldflags="$sanitizer_lib_ldflags -Wc,-fsanitize=undefined"
 	sanitizers="${sanitizers}undefined-behavior "
+elif test "$enable_undefined_sanitizer" = "" -o "$enable_undefined_sanitizer" = no; then
+	enable_undefined_sanitizer=no
+else
+	as_fn_error $? "\"Invalid asan option --enable-undefined-sanitizer=$enable_undefined_sanitizer\"" "$LINENO" 5
 fi
 
 if test -n "$sanitizers"; then
@@ -28630,6 +28668,10 @@ 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_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
+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
@@ -29123,7 +29165,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.24.0, which was
+This file was extended by NetworkManager $as_me 1.24.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29189,7 +29231,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.24.0
+NetworkManager config.status 1.24.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -31310,6 +31352,7 @@ echo "  nmlibdir: $nmlibdir"
 echo "  nmdatadir: $nmdatadir"
 echo "  nmstatedir: $nmstatedir"
 echo "  nmrundir: $nmrundir"
+echo "  system-ca-path: $with_system_ca_path"
 echo
 
 echo "Platform:"
@@ -31362,6 +31405,7 @@ echo "Miscellaneous:"
 echo "  have introspection: $have_introspection"
 echo "  build documentation and manpages: $build_docs"
 echo "  install pregenerated documentation and manpages: $use_pregen_docs"
+echo "  install and use firewalld shared zone: $enable_firewalld_zone"
 echo "  tests: $enable_tests"
 echo "  more-asserts: $more_asserts"
 echo "  more-logging: $enable_more_logging"