Merge branch 'debian/master' into ubuntu/master

1 files changed, 42 insertions, 97 deletions

diff --git a/configure b/configure
index ec42b54e..591ee486 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.28.0.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.30.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.28.0'
-PACKAGE_STRING='NetworkManager 1.28.0'
+PACKAGE_VERSION='1.30.0'
+PACKAGE_STRING='NetworkManager 1.30.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -757,8 +757,6 @@ GNUTLS_CFLAGS
 WITH_FIREWALLD_ZONE_FALSE
 WITH_FIREWALLD_ZONE_TRUE
 NM_MODIFY_SYSTEM_POLICY
-POLKIT_LIBS
-POLKIT_CFLAGS
 NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT
 WITH_TEAMDCTL_FALSE
 WITH_TEAMDCTL_TRUE
@@ -1072,6 +1070,7 @@ with_selinux
 with_libaudit
 enable_teamdctl
 enable_polkit
+with_polkit_agent_helper_1
 enable_modify_system
 enable_firewalld_zone
 with_crypto
@@ -1163,8 +1162,6 @@ JANSSON_CFLAGS
 JANSSON_LIBS
 LIBTEAMDCTL_CFLAGS
 LIBTEAMDCTL_LIBS
-POLKIT_CFLAGS
-POLKIT_LIBS
 GNUTLS_CFLAGS
 GNUTLS_LIBS
 NSS_CFLAGS
@@ -1726,7 +1723,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.28.0 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.30.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1796,7 +1793,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.28.0:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.30.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1914,6 +1911,8 @@ Optional Packages:
                           yes-disabled-by-default enables support, but
                           disables it unless explicitly configured via
                           NetworkManager.conf
+  --with-polkit-agent-helper-1=/path/to/polkit-agent-helper-1
+                          Path to the polkit-agent-helper-1 binary from polkit
   --with-crypto=nss|gnutls
                           Cryptography library to use for certificate and key
                           operations
@@ -2037,9 +2036,6 @@ Some influential environment variables:
               C compiler flags for LIBTEAMDCTL, overriding pkg-config
   LIBTEAMDCTL_LIBS
               linker flags for LIBTEAMDCTL, overriding pkg-config
-  POLKIT_CFLAGS
-              C compiler flags for POLKIT, overriding pkg-config
-  POLKIT_LIBS linker flags for POLKIT, overriding pkg-config
   GNUTLS_CFLAGS
               C compiler flags for GNUTLS, overriding pkg-config
   GNUTLS_LIBS linker flags for GNUTLS, overriding pkg-config
@@ -2142,7 +2138,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.28.0
+NetworkManager configure 1.30.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2915,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.28.0, which was
+It was created by NetworkManager $as_me 1.30.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3785,7 +3781,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.28.0'
+ VERSION='1.30.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17968,9 +17964,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 NM_MAJOR_VERSION=1
-NM_MINOR_VERSION=28
+NM_MINOR_VERSION=30
 NM_MICRO_VERSION=0
-NM_VERSION=1.28.0
+NM_VERSION=1.30.0
 
 
 
@@ -17978,7 +17974,7 @@ NM_VERSION=1.28.0
 
 
 
-NM_GIT_SHA=6f32c5c10736d194322c760b108ce7d5de44d4a0
+NM_GIT_SHA=fc29a96097e0f11ab963c27036b6b8b3e1f3d42b
 
 if test """" != "no-config-h" ; then
 
@@ -18250,6 +18246,7 @@ _ACEOF
 
 ac_fn_c_check_decl "$LINENO" "reallocarray" "ac_cv_have_decl_reallocarray" "
 #include <malloc.h>
+#include <stdlib.h>
 
 "
 if test "x$ac_cv_have_decl_reallocarray" = xyes; then :
@@ -24332,88 +24329,33 @@ NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT="$enable_polkit"
 
 
 
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POLKIT" >&5
-$as_echo_n "checking for POLKIT... " >&6; }
-
-if test -n "$POLKIT_CFLAGS"; then
-    pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-agent-1 >= 0.97\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "polkit-agent-1 >= 0.97") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "polkit-agent-1 >= 0.97" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$POLKIT_LIBS"; then
-    pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-agent-1 >= 0.97\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "polkit-agent-1 >= 0.97") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "polkit-agent-1 >= 0.97" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
+# Check whether --with-polkit-agent-helper-1 was given.
+if test "${with_polkit_agent_helper_1+set}" = set; then :
+  withval=$with_polkit_agent_helper_1; POLKIT_AGENT_HELPER_1_PATH="$withval"
 else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
+  POLKIT_AGENT_HELPER_1_PATH=""
 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
-	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "polkit-agent-1 >= 0.97" 2>&1`
-        else
-	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "polkit-agent-1 >= 0.97" 2>&1`
+if test -z "$POLKIT_AGENT_HELPER_1_PATH" ; then
+    for p in /usr/libexec/polkit-agent-helper-1 \
+             /usr/lib/polkit-1/polkit-agent-helper-1 \
+             /usr/lib/policykit-1/polkit-agent-helper-1 ; do
+        if test -f "$p" ; then
+            POLKIT_AGENT_HELPER_1_PATH="$p"
+            break
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$POLKIT_PKG_ERRORS" >&5
-
-	have_pk_agent=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_pk_agent=no
-else
-	POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS
-	POLKIT_LIBS=$pkg_cv_POLKIT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_pk_agent=yes
+    done
 fi
-if test x"$have_pk_agent" = x"no"; then
-	POLKIT_PACKAGE_PREFIX="/usr"
-else
-	POLKIT_PACKAGE_PREFIX=`$PKG_CONFIG --variable=prefix polkit-agent-1`
+test -z "$POLKIT_AGENT_HELPER_1_PATH" && POLKIT_AGENT_HELPER_1_PATH=/usr/lib/polkit-1/polkit-agent-helper-1
+if test "$POLKIT_AGENT_HELPER_1_PATH" = "${POLKIT_AGENT_HELPER_1_PATH#/}" ; then
+    as_fn_error $? "\"polkit_agent_helper_1 must be an absolute path, but is '$POLKIT_AGENT_HELPER_1_PATH'\"" "$LINENO" 5
 fi
 
 cat >>confdefs.h <<_ACEOF
-#define POLKIT_PACKAGE_PREFIX "$POLKIT_PACKAGE_PREFIX"
+#define POLKIT_AGENT_HELPER_1_PATH "$POLKIT_AGENT_HELPER_1_PATH"
 _ACEOF
 
 
-
 # Check whether --enable-modify-system was given.
 if test "${enable_modify_system+set}" = set; then :
   enableval=$enable_modify_system;
@@ -26502,7 +26444,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 	if test "x$enable_lto" = xyes; then
 						_CFLAGS_MORE_WARNINGS_DISABLE_LTO="-Wno-stringop-overflow"
-	else
+
+									else
 		_CFLAGS_MORE_WARNINGS_DISABLE_LTO=
 	fi
 
@@ -26541,9 +26484,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 		      ; do
 
 	CFLAGS_SAVED="$CFLAGS"
-	CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wall $(printf '%s' "$option" | sed 's/^-Wno-/-W/')"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wall $(printf '%s' \"$option\" | sed 's/^-Wno-/-W/') works as expected" >&5
-$as_echo_n "checking whether -Wall $(printf '%s' \"$option\" | sed 's/^-Wno-/-W/') works as expected... " >&6; }
+	CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wall $(printf '%s' "$option" | sed -e 's/^-W\(no-\|no-error=\)/-W/')"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wall $(printf '%s' \"$option\" | sed -e 's/^-W\(no-\|no-error=\)/-W/') works as expected" >&5
+$as_echo_n "checking whether -Wall $(printf '%s' \"$option\" | sed -e 's/^-W\(no-\|no-error=\)/-W/') works as expected... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -28704,6 +28647,7 @@ if test "$build_docs" != "yes" -a \
         -f "$srcdir"/man/nmtui.1 -a \
         \
         -f "$srcdir"/man/nm-openvswitch.7 -a \
+        -f "$srcdir"/man/nm-cloud-setup.8 -a \
         \
         -f "$srcdir"/man/nm-settings-dbus.5 -a \
         -f "$srcdir"/man/nm-settings-ifcfg-rh.5 -a \
@@ -28737,7 +28681,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile shared/nm-version-macros.h libnm/libnm.pc po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile docs/api/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc"
+ac_config_files="$ac_config_files Makefile libnm-core/nm-version-macros.h libnm/libnm.pc po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile docs/api/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -29445,7 +29389,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.28.0, which was
+This file was extended by NetworkManager $as_me 1.30.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29511,7 +29455,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.28.0
+NetworkManager config.status 1.30.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -30034,7 +29978,7 @@ do
     "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
     "vapi") CONFIG_COMMANDS="$CONFIG_COMMANDS vapi" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "shared/nm-version-macros.h") CONFIG_FILES="$CONFIG_FILES shared/nm-version-macros.h" ;;
+    "libnm-core/nm-version-macros.h") CONFIG_FILES="$CONFIG_FILES libnm-core/nm-version-macros.h" ;;
     "libnm/libnm.pc") CONFIG_FILES="$CONFIG_FILES libnm/libnm.pc" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "data/org.freedesktop.NetworkManager.policy.in") CONFIG_FILES="$CONFIG_FILES data/org.freedesktop.NetworkManager.policy.in" ;;
@@ -31645,6 +31589,7 @@ if test "${enable_modify_system}" = "yes"; then
 else
 	echo "  policykit: main.auth-polkit=${enable_polkit} (restrictive modify.system)"
 fi
+echo "  polkit-agent-helper-1: $POLKIT_AGENT_HELPER_1_PATH"
 echo "  selinux: $have_selinux"
 echo "  systemd-journald: $have_systemd_journal (default: logging.backend=${nm_config_logging_backend_default})"
 echo "  hostname persist: ${hostname_persist}"