Update upstream source from tag 'upstream/1.11.4'

Update to upstream version '1.11.4'
with Debian dir d0638aa2e32d5bae4e8daa021b9a66b7c4d6647e

1 files changed, 25 insertions, 40 deletions

diff --git a/configure b/configure
index d9c4e2f8..af82cd5f 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.11.3.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.11.4.
 #
 # 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.11.3'
-PACKAGE_STRING='NetworkManager 1.11.3'
+PACKAGE_VERSION='1.11.4'
+PACKAGE_STRING='NetworkManager 1.11.4'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -829,6 +829,7 @@ WITH_WEXT_FALSE
 WITH_WEXT_TRUE
 WITH_WIFI_FALSE
 WITH_WIFI_TRUE
+NM_DIST_VERSION
 GNOME_CODE_COVERAGE_RULES
 CODE_COVERAGE_LDFLAGS
 CODE_COVERAGE_CFLAGS
@@ -1726,7 +1727,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.11.3 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.11.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1796,7 +1797,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.11.3:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.11.4:";;
    esac
   cat <<\_ACEOF
 
@@ -2137,7 +2138,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.11.3
+NetworkManager configure 1.11.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2910,7 +2911,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.11.3, which was
+It was created by NetworkManager $as_me 1.11.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3780,7 +3781,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.11.3'
+ VERSION='1.11.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17964,8 +17965,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 NM_MAJOR_VERSION=1
 NM_MINOR_VERSION=11
-NM_MICRO_VERSION=3
-NM_VERSION=1.11.3
+NM_MICRO_VERSION=4
+NM_VERSION=1.11.4
 
 
 
@@ -17973,7 +17974,7 @@ NM_VERSION=1.11.3
 
 
 
-NM_GIT_SHA=5d5b9d7ce0fc314165cb9ffccedbb7c05a1f30b5
+NM_GIT_SHA=960632ee7bf3c4fcfe06f9222e70f15ac00f8b07
 
 if test """" != "no-config-h" ; then
 
@@ -21244,16 +21245,16 @@ DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage
 if test "${with_dist_version+set}" = set; then :
   withval=$with_dist_version; ac_distver=$withval
 else
-  ac_distver=""
+  ac_distver=$NM_VERSION
 fi
 
-if ! test x"$ac_distver" = x""; then
 
 cat >>confdefs.h <<_ACEOF
 #define NM_DIST_VERSION "$ac_distver"
 _ACEOF
 
-fi
+NM_DIST_VERSION="$ac_distver"
+
 
 # Check whether --enable-wifi was given.
 if test "${enable_wifi+set}" = set; then :
@@ -24710,15 +24711,12 @@ fi
 
 # Check whether --with-crypto was given.
 if test "${with_crypto+set}" = set; then :
-  withval=$with_crypto; ac_crypto=$withval
+  withval=$with_crypto; with_crypto=$withval
 else
-  ac_crypto=nss
+  with_crypto=nss
 fi
 
-
-with_nss=no
-with_gnutls=no
-if test x"$ac_crypto" = xnss; then
+if test "$with_crypto" = 'nss'; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5
@@ -24816,12 +24814,7 @@ fi
 	if test x"$?" != "x0"; then
 		as_fn_error $? "No usable NSS found" "$LINENO" 5
 	fi
-
-
-$as_echo "#define HAVE_NSS 1" >>confdefs.h
-
-	with_nss=yes
-elif test x"$ac_crypto" = xgnutls; then
+elif test "$with_crypto" = 'gnutls'; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5
@@ -24913,14 +24906,10 @@ else
 $as_echo "yes" >&6; }
 
 fi
-
-$as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
-
-	with_gnutls=yes
 else
 	as_fn_error $? "Please choose either 'nss' or 'gnutls' for certificate and crypto operations" "$LINENO" 5
 fi
- if test x"$with_nss" != xno; then
+ if test "$with_crypto" = 'nss'; then
   WITH_NSS_TRUE=
   WITH_NSS_FALSE='#'
 else
@@ -24928,7 +24917,7 @@ else
   WITH_NSS_FALSE=
 fi
 
- if test x"$with_gnutls" != xno; then
+ if test "$with_crypto" = 'gnutls'; then
   WITH_GNUTLS_TRUE=
   WITH_GNUTLS_FALSE='#'
 else
@@ -24937,11 +24926,6 @@ else
 fi
 
 
-# Shouldn't ever trigger this, but just in case...
-if test x"$ac_nss" = xno -a x"$ac_gnutls" = xno; then
-	as_fn_error $? "Could not find required development headers and libraries for '$ac_crypto'" "$LINENO" 5
-fi
-
 GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
 
 GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
@@ -27850,7 +27834,7 @@ else
 		with_valgrind_suppressions='$(top_srcdir)/valgrind.suppressions'
 	fi
 fi
-NM_LOG_COMPILER='LOG_COMPILER = "$(top_srcdir)/tools/run-nm-test.sh" --called-from-make "$(LIBTOOL)" "$(with_valgrind)" "'"$with_valgrind_suppressions"'" --launch-dbus=auto'
+NM_LOG_COMPILER='LOG_COMPILER = "$(top_srcdir)/tools/run-nm-test.sh" --called-from-make "$(abs_top_builddir)" "$(LIBTOOL)" "$(with_valgrind)" "'"$with_valgrind_suppressions"'" --launch-dbus=auto'
 
 
 
@@ -29293,7 +29277,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.11.3, which was
+This file was extended by NetworkManager $as_me 1.11.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29359,7 +29343,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.11.3
+NetworkManager config.status 1.11.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -31550,6 +31534,7 @@ 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"
 echo "  sanitizers: $sanitizers"
 echo "  Mozilla Public Suffix List: $with_libpsl"
 echo