New upstream version 1.42.8 upstream/1.42.8

1 files changed, 37 insertions, 16 deletions

diff --git a/configure b/configure
index a784497c..9d2ebe54 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.6.
+# Generated by GNU Autoconf 2.71 for NetworkManager 1.42.8.
 #
 # 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.6'
-PACKAGE_STRING='NetworkManager 1.42.6'
+PACKAGE_VERSION='1.42.8'
+PACKAGE_STRING='NetworkManager 1.42.8'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -772,6 +772,7 @@ PPPD_PATH
 PPPD_PLUGIN_DIR
 WITH_PPP_FALSE
 WITH_PPP_TRUE
+PPPD_CFLAGS
 DBUS_SYS_DIR
 GLIB_MKENUMS
 GLIB_MAKEFILE
@@ -1744,7 +1745,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.6 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.42.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1816,7 +1817,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.42.6:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.42.8:";;
    esac
   cat <<\_ACEOF
 
@@ -2171,7 +2172,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.42.6
+NetworkManager configure 1.42.8
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2892,7 +2893,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.6, which was
+It was created by NetworkManager $as_me 1.42.8, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4388,7 +4389,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.42.6'
+ VERSION='1.42.8'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -19328,8 +19329,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 NM_MAJOR_VERSION=1
 NM_MINOR_VERSION=42
-NM_MICRO_VERSION=6
-NM_VERSION=1.42.6
+NM_MICRO_VERSION=8
+NM_VERSION=1.42.8
 
 
 
@@ -19337,7 +19338,7 @@ NM_VERSION=1.42.6
 
 
 
-NM_GIT_SHA=b6cc7c7e695ba3b1f2a5c95b0d6df418b8556e57
+NM_GIT_SHA=7c6da25396162ba05ffa71f00e227351dc1452b6
 
 if test """" != "no-config-h" ; then
 
@@ -26497,6 +26498,21 @@ fi
 
 
 # pppd
+NM_PPP_VERSION_2_5_OR_NEWER=0
+PPPD_VERSION=2.4.9
+if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pppd\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "pppd") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+
+	PPPD_VERSION=`$PKG_CONFIG --modversion pppd`
+	PPPD_CFLAGS=`$PKG_CONFIG --cflags pppd`
+	NM_PPP_VERSION_2_5_OR_NEWER=1
+
+fi
+
 # Check whether --enable-ppp was given.
 if test ${enable_ppp+y}
 then :
@@ -26506,7 +26522,8 @@ else $as_nop
 fi
 
 if test "${enable_ppp}" = "yes"; then
-	       for ac_header in pppd/pppd.h
+	if test -z "$PPPD_CFLAGS" ; then
+		       for ac_header in pppd/pppd.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "pppd/pppd.h" "ac_cv_header_pppd_pppd_h" "$ac_includes_default"
 if test "x$ac_cv_header_pppd_pppd_h" = xyes
@@ -26518,6 +26535,8 @@ else $as_nop
 fi
 
 done
+	fi
+	PPPD_CFLAGS="$PPPD_CFLAGS"
 
 
 printf "%s\n" "#define WITH_PPP 1" >>confdefs.h
@@ -26543,14 +26562,16 @@ then :
   withval=$with_pppd_plugin_dir;
 fi
 
-
 if test -n "$with_pppd_plugin_dir" ; then
 	PPPD_PLUGIN_DIR="$with_pppd_plugin_dir"
 else
-	PPPD_PLUGIN_DIR="${libdir}/pppd/2.4.5"
+	PPPD_PLUGIN_DIR="${libdir}/pppd/$PPPD_VERSION"
 fi
 
 
+printf "%s\n" "#define NM_PPP_VERSION_2_5_OR_NEWER $NM_PPP_VERSION_2_5_OR_NEWER" >>confdefs.h
+
+
 
 # Check whether --with-pppd was given.
 if test ${with_pppd+y}
@@ -32795,7 +32816,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.6, which was
+This file was extended by NetworkManager $as_me 1.42.8, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -32863,7 +32884,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.6
+NetworkManager config.status 1.42.8
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"