Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at 2022-03-23 20:17:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old) and /work/SRC/openSUSE:Factory/.NetworkManager.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager" Wed Mar 23 20:17:15 2022 rev:238 rq:964243 version:1.36.4 Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes 2022-03-19 22:19:50.548717979 +0100 +++ /work/SRC/openSUSE:Factory/.NetworkManager.new.25692/NetworkManager.changes 2022-03-23 20:18:52.106479396 +0100 @@ -1,0 +2,11 @@ +Tue Mar 22 23:30:56 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com> + +- Update to version 1.36.4: + + The internal DHCPv4 client now discards NAKs packets coming + from servers different from the one that sent the offer. + + Fix activation of PPPoE connections with "pppoe.parent" unset. + + Fix potential libnm crash when the client object initialization + gets canceled. + + Other various fixes and improvements. + +------------------------------------------------------------------- Old: ---- NetworkManager-1.36.2.tar.xz New: ---- NetworkManager-1.36.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.mwNfnw/_old 2022-03-23 20:18:52.894479842 +0100 +++ /var/tmp/diff_new_pack.mwNfnw/_new 2022-03-23 20:18:52.902479846 +0100 @@ -57,7 +57,7 @@ %endif Name: NetworkManager -Version: 1.36.2 +Version: 1.36.4 Release: 0 Summary: Network Link Manager and user applications for it License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -134,10 +134,10 @@ Requires: mozilla-nss Requires: sysconfig-netconfig >= 0.80.5 Requires: wpa_supplicant >= 0.6.4 -Recommends: iproute2 -Recommends: iputils Recommends: dnsmasq +Recommends: iproute2 Recommends: iptables +Recommends: iputils Recommends: org.freedesktop.ModemManager # Provides required by sysconfig. The latter is used by older versions. Provides: dhcdbd = 1.14 ++++++ NetworkManager-1.36.2.tar.xz -> NetworkManager-1.36.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/NEWS new/NetworkManager-1.36.4/NEWS --- old/NetworkManager-1.36.2/NEWS 2022-03-07 10:09:54.000000000 +0100 +++ new/NetworkManager-1.36.4/NEWS 2022-03-22 18:15:39.000000000 +0100 @@ -1,3 +1,15 @@ +=============================================== +NetworkManager-1.36.4 +Overview of changes since NetworkManager-1.36.2 +=============================================== + +* The internal DHCPv4 client now discards NAKs packets coming + from servers different from the one that sent the offer. +* Fix activation of PPPoE connections with "pppoe.parent" unset. +* Fix potential libnm crash when the client object initialization gets + canceled. +* Other various fixes and improvements. + ============================================= NetworkManager-1.36.2 Overview of changes since NetworkManager-1.36 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/configure new/NetworkManager-1.36.4/configure --- old/NetworkManager-1.36.2/configure 2022-03-07 10:17:19.000000000 +0100 +++ new/NetworkManager-1.36.4/configure 2022-03-22 21:35:37.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NetworkManager 1.36.2. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.36.4. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.36.2' -PACKAGE_STRING='NetworkManager 1.36.2' +PACKAGE_VERSION='1.36.4' +PACKAGE_STRING='NetworkManager 1.36.4' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -1747,7 +1747,7 @@ # 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.36.2 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.36.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1819,7 +1819,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.36.2:";; + short | recursive ) echo "Configuration of NetworkManager 1.36.4:";; esac cat <<\_ACEOF @@ -2170,7 +2170,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.36.2 +NetworkManager configure 1.36.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2943,7 +2943,7 @@ 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.36.2, which was +It was created by NetworkManager $as_me 1.36.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3813,7 +3813,7 @@ # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.36.2' + VERSION='1.36.4' cat >>confdefs.h <<_ACEOF @@ -17997,8 +17997,8 @@ NM_MAJOR_VERSION=1 NM_MINOR_VERSION=36 -NM_MICRO_VERSION=2 -NM_VERSION=1.36.2 +NM_MICRO_VERSION=4 +NM_VERSION=1.36.4 @@ -18006,7 +18006,7 @@ -NM_GIT_SHA=ae06ec5207cec126ca767020238c32598b8bfc5d +NM_GIT_SHA=4e8e5bdfc2ab6b51b9f8626512089a1f0c94cce6 if test """" != "no-config-h" ; then @@ -30512,7 +30512,7 @@ # 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.36.2, which was +This file was extended by NetworkManager $as_me 1.36.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30578,7 +30578,7 @@ 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.36.2 +NetworkManager config.status 1.36.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/configure.ac new/NetworkManager-1.36.4/configure.ac --- old/NetworkManager-1.36.2/configure.ac 2022-03-07 10:17:06.000000000 +0100 +++ new/NetworkManager-1.36.4/configure.ac 2022-03-22 21:35:24.000000000 +0100 @@ -8,7 +8,7 @@ dnl - update number in meson.build m4_define([nm_major_version], [1]) m4_define([nm_minor_version], [36]) -m4_define([nm_micro_version], [2]) +m4_define([nm_micro_version], [4]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/docs/api/html/index.html new/NetworkManager-1.36.4/docs/api/html/index.html --- old/NetworkManager-1.36.2/docs/api/html/index.html 2022-03-07 10:18:32.000000000 +0100 +++ new/NetworkManager-1.36.4/docs/api/html/index.html 2022-03-22 21:36:51.000000000 +0100 @@ -16,7 +16,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">NetworkManager Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for NetworkManager 1.36.2 + for NetworkManager 1.36.4 The latest version of this documentation can be found on-line at <a class="ulink" href="https://networkmanager.dev/docs/api/latest/"; target="_top">https://networkmanager.dev/docs/api/latest/</a>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/docs/api/html/nmcli.html new/NetworkManager-1.36.4/docs/api/html/nmcli.html --- old/NetworkManager-1.36.2/docs/api/html/nmcli.html 2022-03-07 10:18:32.000000000 +0100 +++ new/NetworkManager-1.36.4/docs/api/html/nmcli.html 2022-03-22 21:36:51.000000000 +0100 @@ -1349,6 +1349,10 @@ <td><p>Connection that is being disconnected.</p></td> </tr> <tr> +<td><p><span class="term"><code class="option">connection-external</code></span></p></td> +<td><p>Connection representing configuration created externally to NetworkManager.</p></td> +</tr> +<tr> <td><p><span class="term"><code class="option">connection-invisible</code></span></p></td> <td><p>Connection whose details is the user not permitted to see.</p></td> </tr> @@ -1385,6 +1389,10 @@ <td><p>Device that is not connected.</p></td> </tr> <tr> +<td><p><span class="term"><code class="option">device-external</code></span></p></td> +<td><p>Device configured externally to NetworkManager.</p></td> +</tr> +<tr> <td><p><span class="term"><code class="option">device-firmware-missing</code></span></p></td> <td><p>Warning of a missing device firmware.</p></td> </tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/docs/api/version.xml new/NetworkManager-1.36.4/docs/api/version.xml --- old/NetworkManager-1.36.2/docs/api/version.xml 2022-03-07 10:17:28.000000000 +0100 +++ new/NetworkManager-1.36.4/docs/api/version.xml 2022-03-22 21:35:47.000000000 +0100 @@ -1 +1 @@ -1.36.2 +1.36.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/docs/libnm/html/index.html new/NetworkManager-1.36.4/docs/libnm/html/index.html --- old/NetworkManager-1.36.2/docs/libnm/html/index.html 2022-03-07 10:18:21.000000000 +0100 +++ new/NetworkManager-1.36.4/docs/libnm/html/index.html 2022-03-22 21:36:39.000000000 +0100 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for libnm 1.36.2 + for libnm 1.36.4 The latest version of this documentation can be found on-line at <a class="ulink" href="https://networkmanager.dev/docs/libnm/latest/"; target="_top">https://networkmanager.dev/docs/libnm/latest/</a>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/docs/libnm/html/usage.html new/NetworkManager-1.36.4/docs/libnm/html/usage.html --- old/NetworkManager-1.36.2/docs/libnm/html/usage.html 2022-03-07 10:18:21.000000000 +0100 +++ new/NetworkManager-1.36.4/docs/libnm/html/usage.html 2022-03-22 21:36:39.000000000 +0100 @@ -96,7 +96,7 @@ </p> <pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c</code></strong> <code class="prompt">$ </code><strong class="userinput"><code>./hello-nm</code></strong> - NetworkManager version: 1.36.2 + NetworkManager version: 1.36.4 <code class="prompt">$ </code></pre> <p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/docs/libnm/version.xml new/NetworkManager-1.36.4/docs/libnm/version.xml --- old/NetworkManager-1.36.2/docs/libnm/version.xml 2022-03-07 10:17:28.000000000 +0100 +++ new/NetworkManager-1.36.4/docs/libnm/version.xml 2022-03-22 21:35:47.000000000 +0100 @@ -1 +1 @@ -1.36.2 +1.36.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/NetworkManager-dispatcher.8 new/NetworkManager-1.36.4/man/NetworkManager-dispatcher.8 --- old/NetworkManager-1.36.2/man/NetworkManager-dispatcher.8 2022-03-07 10:17:29.000000000 +0100 +++ new/NetworkManager-1.36.4/man/NetworkManager-dispatcher.8 2022-03-22 21:35:48.000000000 +0100 @@ -2,9 +2,9 @@ .\" Title: NetworkManager-dispatcher .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2022 +.\" Date: 03/22/2022 .\" Manual: Network management daemons -.\" Source: NetworkManager-dispatcher 1.36.2 +.\" Source: NetworkManager-dispatcher 1.36.4 .\" Language: English .\" .TH "NETWORKMANAGER\-DISPATCHER" "8" "" "NetworkManager\-dispatcher 1\&" "Network management daemons" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/NetworkManager.8 new/NetworkManager-1.36.4/man/NetworkManager.8 --- old/NetworkManager-1.36.2/man/NetworkManager.8 2022-03-07 10:17:29.000000000 +0100 +++ new/NetworkManager-1.36.4/man/NetworkManager.8 2022-03-22 21:35:48.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: NetworkManager .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2022 +.\" Date: 03/22/2022 .\" Manual: Network management daemons -.\" Source: NetworkManager 1.36.2 +.\" Source: NetworkManager 1.36.4 .\" Language: English .\" -.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.36\&.2" "Network management daemons" +.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.36\&.4" "Network management daemons" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/NetworkManager.conf.5 new/NetworkManager-1.36.4/man/NetworkManager.conf.5 --- old/NetworkManager-1.36.2/man/NetworkManager.conf.5 2022-03-07 10:17:29.000000000 +0100 +++ new/NetworkManager-1.36.4/man/NetworkManager.conf.5 2022-03-22 21:35:48.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: NetworkManager.conf .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2022 +.\" Date: 03/22/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.36.2 +.\" Source: NetworkManager 1.36.4 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.36\&.2" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.36\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nm-cloud-setup.8 new/NetworkManager-1.36.4/man/nm-cloud-setup.8 --- old/NetworkManager-1.36.2/man/nm-cloud-setup.8 2022-03-07 10:17:29.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nm-cloud-setup.8 2022-03-22 21:35:48.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: nm-cloud-setup .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2022 +.\" Date: 03/22/2022 .\" Manual: Automatic Network Configuration in Cloud with NetworkManager -.\" Source: NetworkManager 1.36.2 +.\" Source: NetworkManager 1.36.4 .\" Language: English .\" -.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.36\&.2" "Automatic Network Configuratio" +.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.36\&.4" "Automatic Network Configuratio" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nm-initrd-generator.8 new/NetworkManager-1.36.4/man/nm-initrd-generator.8 --- old/NetworkManager-1.36.2/man/nm-initrd-generator.8 2022-03-07 10:17:29.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nm-initrd-generator.8 2022-03-22 21:35:48.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: nm-initrd-generator .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2022 +.\" Date: 03/22/2022 .\" Manual: System Administration -.\" Source: NetworkManager 1.36.2 +.\" Source: NetworkManager 1.36.4 .\" Language: English .\" -.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.36\&.2" "System Administration" +.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.36\&.4" "System Administration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nm-online.1 new/NetworkManager-1.36.4/man/nm-online.1 --- old/NetworkManager-1.36.2/man/nm-online.1 2022-03-07 10:17:29.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nm-online.1 2022-03-22 21:35:48.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: nm-online .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2022 +.\" Date: 03/22/2022 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.36.2 +.\" Source: NetworkManager 1.36.4 .\" Language: English .\" -.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.36\&.2" "General Commands Manual" +.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.36\&.4" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nm-openvswitch.7 new/NetworkManager-1.36.4/man/nm-openvswitch.7 --- old/NetworkManager-1.36.2/man/nm-openvswitch.7 2022-03-07 10:17:29.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nm-openvswitch.7 2022-03-22 21:35:48.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: nm-openvswitch .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2022 +.\" Date: 03/22/2022 .\" Manual: Open vSwitch support overview -.\" Source: NetworkManager 1.36.2 +.\" Source: NetworkManager 1.36.4 .\" Language: English .\" -.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.36\&.2" "Open vSwitch support overview" +.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.36\&.4" "Open vSwitch support overview" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nm-settings-dbus.5 new/NetworkManager-1.36.4/man/nm-settings-dbus.5 --- old/NetworkManager-1.36.2/man/nm-settings-dbus.5 2022-03-07 10:17:46.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nm-settings-dbus.5 2022-03-22 21:36:05.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: nm-settings-dbus .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2022 +.\" Date: 03/22/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.36.2 +.\" Source: NetworkManager 1.36.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.36\&.2" "Configuration" +.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.36\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nm-settings-dbus.xml new/NetworkManager-1.36.4/man/nm-settings-dbus.xml --- old/NetworkManager-1.36.2/man/nm-settings-dbus.xml 2022-03-07 10:17:45.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nm-settings-dbus.xml 2022-03-22 21:36:04.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";> -<refentry id="nm-settings-dbus"><refentryinfo><title>nm-settings-dbus</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-dbus</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.36.2</refmiscinfo></refmeta><refnamediv><refname>nm-settings-dbus</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles on the D-Bus API</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> +<refentry id="nm-settings-dbus"><refentryinfo><title>nm-settings-dbus</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-dbus</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.36.4</refmiscinfo></refmeta><refnamediv><refname>nm-settings-dbus</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles on the D-Bus API</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nm-settings-ifcfg-rh.5 new/NetworkManager-1.36.4/man/nm-settings-ifcfg-rh.5 --- old/NetworkManager-1.36.2/man/nm-settings-ifcfg-rh.5 2022-03-07 10:17:38.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nm-settings-ifcfg-rh.5 2022-03-22 21:35:57.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: nm-settings-ifcfg-rh .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2022 +.\" Date: 03/22/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.36.2 +.\" Source: NetworkManager 1.36.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.36\&.2" "Configuration" +.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.36\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nm-settings-ifcfg-rh.xml new/NetworkManager-1.36.4/man/nm-settings-ifcfg-rh.xml --- old/NetworkManager-1.36.2/man/nm-settings-ifcfg-rh.xml 2022-03-07 10:17:31.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nm-settings-ifcfg-rh.xml 2022-03-22 21:35:50.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";> -<refentry id="nm-settings-ifcfg-rh"><refentryinfo><title>nm-settings-ifcfg-rh</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.36.2</refmiscinfo></refmeta><refnamediv><refname>nm-settings-ifcfg-rh</refname><refpurpose>Description of <emphasis>ifcfg-rh</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> +<refentry id="nm-settings-ifcfg-rh"><refentryinfo><title>nm-settings-ifcfg-rh</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.36.4</refmiscinfo></refmeta><refnamediv><refname>nm-settings-ifcfg-rh</refname><refpurpose>Description of <emphasis>ifcfg-rh</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> NetworkManager is based on the concept of connection profiles that contain network configuration (see <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nm-settings-keyfile.5 new/NetworkManager-1.36.4/man/nm-settings-keyfile.5 --- old/NetworkManager-1.36.2/man/nm-settings-keyfile.5 2022-03-07 10:17:38.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nm-settings-keyfile.5 2022-03-22 21:35:57.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: nm-settings-keyfile .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2022 +.\" Date: 03/22/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.36.2 +.\" Source: NetworkManager 1.36.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.36\&.2" "Configuration" +.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.36\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nm-settings-keyfile.xml new/NetworkManager-1.36.4/man/nm-settings-keyfile.xml --- old/NetworkManager-1.36.2/man/nm-settings-keyfile.xml 2022-03-07 10:17:31.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nm-settings-keyfile.xml 2022-03-22 21:35:50.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";> -<refentry id="nm-settings-keyfile"><refentryinfo><title>nm-settings-keyfile</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.36.2</refmiscinfo></refmeta><refnamediv><refname>nm-settings-keyfile</refname><refpurpose>Description of <emphasis>keyfile</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> +<refentry id="nm-settings-keyfile"><refentryinfo><title>nm-settings-keyfile</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.36.4</refmiscinfo></refmeta><refnamediv><refname>nm-settings-keyfile</refname><refpurpose>Description of <emphasis>keyfile</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> NetworkManager is based on the concept of connection profiles that contain network configuration (see <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nm-settings-nmcli.5 new/NetworkManager-1.36.4/man/nm-settings-nmcli.5 --- old/NetworkManager-1.36.2/man/nm-settings-nmcli.5 2022-03-07 10:17:46.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nm-settings-nmcli.5 2022-03-22 21:36:05.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: nm-settings-nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2022 +.\" Date: 03/22/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.36.2 +.\" Source: NetworkManager 1.36.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.36\&.2" "Configuration" +.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.36\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nm-settings-nmcli.xml new/NetworkManager-1.36.4/man/nm-settings-nmcli.xml --- old/NetworkManager-1.36.2/man/nm-settings-nmcli.xml 2022-03-07 10:17:46.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nm-settings-nmcli.xml 2022-03-22 21:36:05.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";> -<refentry id="nm-settings-nmcli"><refentryinfo><title>nm-settings-nmcli</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-nmcli</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.36.2</refmiscinfo></refmeta><refnamediv><refname>nm-settings-nmcli</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles for nmcli</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> +<refentry id="nm-settings-nmcli"><refentryinfo><title>nm-settings-nmcli</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-nmcli</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.36.4</refmiscinfo></refmeta><refnamediv><refname>nm-settings-nmcli</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles for nmcli</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nmcli-examples.7 new/NetworkManager-1.36.4/man/nmcli-examples.7 --- old/NetworkManager-1.36.2/man/nmcli-examples.7 2022-03-07 10:17:29.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nmcli-examples.7 2022-03-22 21:35:48.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: nmcli-examples .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2022 +.\" Date: 03/22/2022 .\" Manual: Examples -.\" Source: NetworkManager 1.36.2 +.\" Source: NetworkManager 1.36.4 .\" Language: English .\" -.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.36\&.2" "Examples" +.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.36\&.4" "Examples" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nmcli.1 new/NetworkManager-1.36.4/man/nmcli.1 --- old/NetworkManager-1.36.2/man/nmcli.1 2022-03-07 10:17:29.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nmcli.1 2022-03-22 21:35:48.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2022 +.\" Date: 03/22/2022 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.36.2 +.\" Source: NetworkManager 1.36.4 .\" Language: English .\" -.TH "NMCLI" "1" "" "NetworkManager 1\&.36\&.2" "General Commands Manual" +.TH "NMCLI" "1" "" "NetworkManager 1\&.36\&.4" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1551,6 +1551,11 @@ Connection that is being disconnected\&. .RE .PP +\fBconnection\-external\fR +.RS 4 +Connection representing configuration created externally to NetworkManager\&. +.RE +.PP \fBconnection\-invisible\fR .RS 4 Connection whose details is the user not permitted to see\&. @@ -1596,6 +1601,11 @@ Device that is not connected\&. .RE .PP +\fBdevice\-external\fR +.RS 4 +Device configured externally to NetworkManager\&. +.RE +.PP \fBdevice\-firmware\-missing\fR .RS 4 Warning of a missing device firmware\&. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nmcli.xml new/NetworkManager-1.36.4/man/nmcli.xml --- old/NetworkManager-1.36.2/man/nmcli.xml 2022-01-14 09:55:53.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nmcli.xml 2022-03-22 18:05:33.000000000 +0100 @@ -1867,6 +1867,13 @@ </varlistentry> <varlistentry> + <term><option>connection-external</option></term> + <listitem> + <para>Connection representing configuration created externally to NetworkManager.</para> + </listitem> + </varlistentry> + + <varlistentry> <term><option>connection-invisible</option></term> <listitem> <para>Connection whose details is the user not permitted to see.</para> @@ -1929,6 +1936,13 @@ </listitem> </varlistentry> + <varlistentry> + <term><option>device-external</option></term> + <listitem> + <para>Device configured externally to NetworkManager.</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>device-firmware-missing</option></term> <listitem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/man/nmtui.1 new/NetworkManager-1.36.4/man/nmtui.1 --- old/NetworkManager-1.36.2/man/nmtui.1 2022-03-07 10:17:29.000000000 +0100 +++ new/NetworkManager-1.36.4/man/nmtui.1 2022-03-22 21:35:48.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: nmtui .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2022 +.\" Date: 03/22/2022 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.36.2 +.\" Source: NetworkManager 1.36.4 .\" Language: English .\" -.TH "NMTUI" "1" "" "NetworkManager 1\&.36\&.2" "General Commands Manual" +.TH "NMTUI" "1" "" "NetworkManager 1\&.36\&.4" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/meson.build new/NetworkManager-1.36.4/meson.build --- old/NetworkManager-1.36.2/meson.build 2022-03-07 10:17:06.000000000 +0100 +++ new/NetworkManager-1.36.4/meson.build 2022-03-22 21:35:24.000000000 +0100 @@ -6,7 +6,7 @@ # - add corresponding NM_VERSION_x_y_z macros in # "src/libnm-core-public/nm-version-macros.h.in" # - update number in configure.ac - version: '1.36.2', + version: '1.36.4', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/src/core/devices/nm-device-ethernet.c new/NetworkManager-1.36.4/src/core/devices/nm-device-ethernet.c --- old/NetworkManager-1.36.2/src/core/devices/nm-device-ethernet.c 2022-03-07 10:09:54.000000000 +0100 +++ new/NetworkManager-1.36.4/src/core/devices/nm-device-ethernet.c 2022-03-22 18:15:39.000000000 +0100 @@ -1160,14 +1160,12 @@ if (device_state < NM_DEVICE_STATE_IP_CONFIG) { if (callback_data->data.state >= NM_PPP_MGR_STATE_HAVE_IFINDEX) { - gs_free char *old_name = NULL; - gs_free_error GError *error = NULL; + gs_free char *old_name = NULL; - if (!nm_device_take_over_link(device, callback_data->data.ifindex, &old_name, &error)) { + if (!nm_device_set_ip_ifindex(device, callback_data->data.ifindex)) { _LOGW(LOGD_DEVICE | LOGD_PPP, - "could not take control of link %d: %s", - callback_data->data.ifindex, - error->message); + "could not set ip-ifindex %d", + callback_data->data.ifindex); _ppp_mgr_cleanup(self); nm_device_state_changed(device, NM_DEVICE_STATE_FAILED, @@ -1892,6 +1890,32 @@ return !!nm_device_get_initial_hw_address(device); } +static const char * +get_ip_method_auto(NMDevice *device, int addr_family) +{ + NMSettingConnection *s_con; + + s_con = nm_device_get_applied_setting(device, NM_TYPE_SETTING_CONNECTION); + g_return_val_if_fail(s_con, + NM_IS_IPv4(addr_family) ? NM_SETTING_IP4_CONFIG_METHOD_AUTO + : NM_SETTING_IP6_CONFIG_METHOD_AUTO); + + if (!nm_streq(nm_setting_connection_get_connection_type(s_con), + NM_SETTING_PPPOE_SETTING_NAME)) { + return NM_DEVICE_CLASS(nm_device_ethernet_parent_class) + ->get_ip_method_auto(device, addr_family); + } + + if (NM_IS_IPv4(addr_family)) { + /* We cannot do DHCPv4 on a PPP link, instead we get "auto" IP addresses + * by pppd. Return "manual" here, which has the suitable effect to a + * (zero) manual addresses in addition. */ + return NM_SETTING_IP6_CONFIG_METHOD_MANUAL; + } + + return NM_SETTING_IP6_CONFIG_METHOD_AUTO; +} + static gboolean can_reapply_change(NMDevice *device, const char *setting_name, @@ -2047,6 +2071,7 @@ device_class->act_stage2_config = act_stage2_config; device_class->act_stage3_ip_config = act_stage3_ip_config; device_class->get_configured_mtu = get_configured_mtu; + device_class->get_ip_method_auto = get_ip_method_auto; device_class->deactivate = deactivate; device_class->get_s390_subchannels = get_s390_subchannels; device_class->update_connection = update_connection; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/src/core/devices/nm-device-ppp.c new/NetworkManager-1.36.4/src/core/devices/nm-device-ppp.c --- old/NetworkManager-1.36.2/src/core/devices/nm-device-ppp.c 2022-02-23 16:40:42.000000000 +0100 +++ new/NetworkManager-1.36.4/src/core/devices/nm-device-ppp.c 2022-03-22 18:05:30.000000000 +0100 @@ -222,10 +222,9 @@ return NM_SETTING_IP6_CONFIG_METHOD_MANUAL; } - /* We can do autoconf6 on an PPP link, but we should already get an IPv6 - * address from pppd. Use that instead. We however do want to generate our - * (own) IPv6 link local address, so return "link-local". */ - return NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL; + /* We get a interface identifier via IPV6CP, used to construct a link-local + * address. Method auto means autoconf6 as usual.*/ + return NM_SETTING_IP6_CONFIG_METHOD_AUTO; } static gboolean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/src/core/devices/team/nm-device-team.c new/NetworkManager-1.36.4/src/core/devices/team/nm-device-team.c --- old/NetworkManager-1.36.2/src/core/devices/team/nm-device-team.c 2022-02-23 16:40:42.000000000 +0100 +++ new/NetworkManager-1.36.4/src/core/devices/team/nm-device-team.c 2022-03-22 18:05:30.000000000 +0100 @@ -957,7 +957,7 @@ NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE(device); gs_free char *tmp_str = NULL; gs_unref_object GFile *file = NULL; - GError *error; + gs_free_error GError *error = NULL; G_OBJECT_CLASS(nm_device_team_parent_class)->constructed(object); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/src/core/dhcp/nm-dhcp-client.c new/NetworkManager-1.36.4/src/core/dhcp/nm-dhcp-client.c --- old/NetworkManager-1.36.2/src/core/dhcp/nm-dhcp-client.c 2022-03-06 14:02:58.000000000 +0100 +++ new/NetworkManager-1.36.4/src/core/dhcp/nm-dhcp-client.c 2022-03-22 18:05:33.000000000 +0100 @@ -1209,6 +1209,7 @@ nm_clear_g_source_inst(&priv->no_lease_timeout_source); nm_clear_g_source_inst(&priv->ipv6_lladdr_timeout_source); + nm_clear_pointer(&priv->effective_client_id, g_bytes_unref); G_OBJECT_CLASS(nm_dhcp_client_parent_class)->dispose(object); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/src/core/dhcp/nm-dhcp-dhcpcd.c new/NetworkManager-1.36.4/src/core/dhcp/nm-dhcp-dhcpcd.c --- old/NetworkManager-1.36.2/src/core/dhcp/nm-dhcp-dhcpcd.c 2022-02-23 16:40:42.000000000 +0100 +++ new/NetworkManager-1.36.4/src/core/dhcp/nm-dhcp-dhcpcd.c 2022-03-22 18:05:33.000000000 +0100 @@ -70,7 +70,7 @@ const NMDhcpClientConfig *client_config; gs_unref_ptrarray GPtrArray *argv = NULL; pid_t pid; - GError *local; + GError *local = NULL; gs_free char *cmd_str = NULL; const char *dhcpcd_path; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/src/core/nm-connectivity.c new/NetworkManager-1.36.4/src/core/nm-connectivity.c --- old/NetworkManager-1.36.2/src/core/nm-connectivity.c 2022-03-07 10:09:54.000000000 +0100 +++ new/NetworkManager-1.36.4/src/core/nm-connectivity.c 2022-03-22 18:15:39.000000000 +0100 @@ -15,6 +15,7 @@ #include <linux/rtnetlink.h> #include "c-list/src/c-list.h" +#include "libnm-glib-aux/nm-str-buf.h" #include "libnm-platform/nmp-object.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-config.h" @@ -89,7 +90,7 @@ int addr_family; - guint timeout_id; + GSource *timeout_source; NMConnectivityState completed_state; const char *completed_reason; @@ -245,7 +246,7 @@ nm_clear_g_cancellable(&cb_data->concheck.resolve_cancellable); #endif - nm_clear_g_source(&cb_data->timeout_id); + nm_clear_g_source_inst(&cb_data->timeout_source); _LOG2D("check completed: %s; %s", nm_connectivity_state_to_string(state), log_message); @@ -633,9 +634,9 @@ &cb_data->handles_lst)); nm_assert(cb_data->completed_reason); - cb_data->timeout_id = 0; + nm_clear_g_source_inst(&cb_data->timeout_source); cb_data_complete(cb_data, cb_data->completed_state, cb_data->completed_reason); - return G_SOURCE_REMOVE; + return G_SOURCE_CONTINUE; } #if WITH_CONCHECK @@ -662,7 +663,7 @@ cb_data->concheck.curl_mhandle = mhandle; cb_data->concheck.curl_ehandle = ehandle; cb_data->concheck.request_headers = curl_slist_append(NULL, "Connection: close"); - cb_data->timeout_id = g_timeout_add_seconds(20, _timeout_cb, cb_data); + cb_data->timeout_source = nm_g_timeout_add_seconds_source(20, _timeout_cb, cb_data); curl_multi_setopt(mhandle, CURLMOPT_SOCKETFUNCTION, multi_socket_cb); curl_multi_setopt(mhandle, CURLMOPT_SOCKETDATA, cb_data); @@ -694,6 +695,7 @@ curl_easy_setopt(ehandle, CURLOPT_INTERFACE, cb_data->ifspec); curl_easy_setopt(ehandle, CURLOPT_RESOLVE, cb_data->concheck.hosts); curl_easy_setopt(ehandle, CURLOPT_IPRESOLVE, resolve); + curl_easy_setopt(ehandle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); curl_multi_add_handle(mhandle, ehandle); } @@ -709,7 +711,8 @@ int addr_family; gsize len = 0; gsize i; - gs_free_error GError *error = NULL; + gs_free_error GError *error = NULL; + nm_auto_str_buf NMStrBuf strbuf_hosts = NM_STR_BUF_INIT(0, FALSE); result = g_dbus_connection_call_finish(G_DBUS_CONNECTION(object), res, &error); if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) @@ -732,25 +735,35 @@ for (i = 0; i < no_addresses; i++) { gs_unref_variant GVariant *address = NULL; char str_addr[NM_UTILS_INET_ADDRSTRLEN]; - gs_free char *host_entry = NULL; const guchar *address_buf; g_variant_get_child(addresses, i, "(ii@ay)", &ifindex, &addr_family, &address); + if (!NM_IN_SET(addr_family, AF_INET, AF_INET6)) + continue; + if (cb_data->addr_family != AF_UNSPEC && cb_data->addr_family != addr_family) continue; address_buf = g_variant_get_fixed_array(address, &len, 1); - if ((addr_family == AF_INET && len != sizeof(struct in_addr)) - || (addr_family == AF_INET6 && len != sizeof(struct in6_addr))) + if (len != nm_utils_addr_family_to_size(addr_family)) continue; - host_entry = g_strdup_printf("%s:%s:%s", + if (strbuf_hosts.len == 0) { + nm_str_buf_append_printf(&strbuf_hosts, + "%s:%s:", cb_data->concheck.con_config->host, - cb_data->concheck.con_config->port ?: "80", - nm_utils_inet_ntop(addr_family, address_buf, str_addr)); - cb_data->concheck.hosts = curl_slist_append(cb_data->concheck.hosts, host_entry); - _LOG2T("adding '%s' to curl resolve list", host_entry); + cb_data->concheck.con_config->port ?: "80"); + } else + nm_str_buf_append_c(&strbuf_hosts, ','); + + nm_str_buf_append(&strbuf_hosts, nm_utils_inet_ntop(addr_family, address_buf, str_addr)); + } + if (strbuf_hosts.len > 0) { + const char *s = nm_str_buf_get_str(&strbuf_hosts); + + cb_data->concheck.hosts = curl_slist_append(NULL, s); + _LOG2T("set curl resolve list to '%s'", s); } do_curl_request(cb_data); @@ -874,7 +887,7 @@ _LOG2D("skip connectivity check due to %s", reason); cb_data->completed_state = state; cb_data->completed_reason = reason; - cb_data->timeout_id = g_idle_add(_idle_cb, cb_data); + cb_data->timeout_source = nm_g_idle_add_source(_idle_cb, cb_data); return cb_data; } } @@ -910,7 +923,7 @@ _LOG2D("start fake request (fail due to no D-Bus connection)"); cb_data->completed_state = NM_CONNECTIVITY_ERROR; cb_data->completed_reason = "no D-Bus connection"; - cb_data->timeout_id = g_idle_add(_idle_cb, cb_data); + cb_data->timeout_source = nm_g_idle_add_source(_idle_cb, cb_data); return cb_data; } @@ -953,7 +966,7 @@ cb_data->completed_reason = "fake result"; } _LOG2D("start fake request (%s)", cb_data->completed_reason); - cb_data->timeout_id = g_idle_add(_idle_cb, cb_data); + cb_data->timeout_source = nm_g_idle_add_source(_idle_cb, cb_data); return cb_data; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/src/core/supplicant/nm-supplicant-manager.c new/NetworkManager-1.36.4/src/core/supplicant/nm-supplicant-manager.c --- old/NetworkManager-1.36.2/src/core/supplicant/nm-supplicant-manager.c 2022-02-23 16:40:42.000000000 +0100 +++ new/NetworkManager-1.36.4/src/core/supplicant/nm-supplicant-manager.c 2022-03-22 18:15:39.000000000 +0100 @@ -993,6 +993,7 @@ " MESH%c" " FAST%c" " WFD%c" + " SUITEB192%c" "", NM_SUPPL_CAP_TO_CHAR(priv->capabilities, NM_SUPPL_CAP_TYPE_AP), NM_SUPPL_CAP_TO_CHAR(priv->capabilities, NM_SUPPL_CAP_TYPE_PMF), @@ -1002,7 +1003,8 @@ NM_SUPPL_CAP_TO_CHAR(priv->capabilities, NM_SUPPL_CAP_TYPE_SHA384), NM_SUPPL_CAP_TO_CHAR(priv->capabilities, NM_SUPPL_CAP_TYPE_MESH), NM_SUPPL_CAP_TO_CHAR(priv->capabilities, NM_SUPPL_CAP_TYPE_FAST), - NM_SUPPL_CAP_TO_CHAR(priv->capabilities, NM_SUPPL_CAP_TYPE_WFD)); + NM_SUPPL_CAP_TO_CHAR(priv->capabilities, NM_SUPPL_CAP_TYPE_WFD), + NM_SUPPL_CAP_TO_CHAR(priv->capabilities, NM_SUPPL_CAP_TYPE_SUITEB192)); nm_assert(g_hash_table_size(priv->supp_ifaces) == 0); nm_assert(c_list_is_empty(&priv->supp_lst_head)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/src/libnm-client-impl/nm-client.c new/NetworkManager-1.36.4/src/libnm-client-impl/nm-client.c --- old/NetworkManager-1.36.2/src/libnm-client-impl/nm-client.c 2022-03-06 14:02:58.000000000 +0100 +++ new/NetworkManager-1.36.4/src/libnm-client-impl/nm-client.c 2022-03-22 18:05:33.000000000 +0100 @@ -764,7 +764,7 @@ NMClientPrivate *_priv = NM_CLIENT_GET_PRIVATE(self); \ \ nm_assert(g_source_get_context(_source) == _priv->x_context); \ - nm_assert(g_main_context_is_owner(_priv->x_context)); \ + nm_assert(nm_g_main_context_can_acquire(_priv->x_context)); \ } \ } \ } \ @@ -778,7 +778,7 @@ \ nm_assert((g_main_context_get_thread_default() ?: g_main_context_default()) \ == _priv->x_context); \ - nm_assert(g_main_context_is_owner(_priv->x_context)); \ + nm_assert(nm_g_main_context_can_acquire(_priv->x_context)); \ } \ } \ G_STMT_END @@ -6261,7 +6261,6 @@ NMClientPrivate *priv; g_return_val_if_fail(NM_IS_CLIENT(client), NULL); - g_return_val_if_fail(length, NULL); priv = NM_CLIENT_GET_PRIVATE(client); @@ -7306,9 +7305,9 @@ static void _init_start_cancelled_cb(GCancellable *cancellable, gpointer user_data) { - NMClient *self = user_data; - NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE(self); - GError *error; + NMClient *self = user_data; + NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE(self); + GError *error = NULL; nm_assert(NM_IS_CLIENT(self)); nm_assert(priv->init_data); @@ -7328,8 +7327,8 @@ static gboolean _init_start_cancel_on_idle_cb(gpointer user_data) { - NMClient *self = user_data; - GError *error; + NMClient *self = user_data; + GError *error = NULL; nm_utils_error_set_cancelled(&error, FALSE, NULL); _init_start_complete(self, error); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/src/libnm-core-public/nm-version-macros.h new/NetworkManager-1.36.4/src/libnm-core-public/nm-version-macros.h --- old/NetworkManager-1.36.2/src/libnm-core-public/nm-version-macros.h 2022-03-07 10:17:28.000000000 +0100 +++ new/NetworkManager-1.36.4/src/libnm-core-public/nm-version-macros.h 2022-03-22 21:35:47.000000000 +0100 @@ -30,7 +30,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (2) +#define NM_MICRO_VERSION (4) /** * NM_CHECK_VERSION: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/src/libnm-glib-aux/nm-shared-utils.c new/NetworkManager-1.36.4/src/libnm-glib-aux/nm-shared-utils.c --- old/NetworkManager-1.36.2/src/libnm-glib-aux/nm-shared-utils.c 2022-03-07 10:09:54.000000000 +0100 +++ new/NetworkManager-1.36.4/src/libnm-glib-aux/nm-shared-utils.c 2022-03-22 18:05:33.000000000 +0100 @@ -6680,3 +6680,23 @@ while (source) g_main_context_iteration(context, TRUE); } + +/*****************************************************************************/ + +gboolean +nm_g_main_context_can_acquire(GMainContext *context) +{ + /* Fast path. Usually we don't pass contexts between threads + * and operate while iterating the context. Hence, usually we + * already acquired the context. Check that first. */ + if (g_main_context_is_owner(context)) + return TRUE; + + /* Either the context is not owned, or owned by somebody else. Only + * one way to find out. */ + if (!g_main_context_acquire(context)) + return FALSE; + + g_main_context_release(context); + return TRUE; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/src/libnm-glib-aux/nm-shared-utils.h new/NetworkManager-1.36.4/src/libnm-glib-aux/nm-shared-utils.h --- old/NetworkManager-1.36.2/src/libnm-glib-aux/nm-shared-utils.h 2022-03-07 10:09:54.000000000 +0100 +++ new/NetworkManager-1.36.4/src/libnm-glib-aux/nm-shared-utils.h 2022-03-22 18:05:33.000000000 +0100 @@ -1789,7 +1789,7 @@ /* A convenience function to attach a new timeout source to the default GMainContext. * In that sense it's very similar to g_idle_add() except that it returns a * reference to the new source. */ - return nm_g_source_attach(nm_g_idle_source_new(G_PRIORITY_DEFAULT, func, user_data, NULL), + return nm_g_source_attach(nm_g_idle_source_new(G_PRIORITY_DEFAULT_IDLE, func, user_data, NULL), NULL); } @@ -1931,6 +1931,8 @@ void nm_g_main_context_iterate_for_msec(GMainContext *context, guint timeout_msec); +gboolean nm_g_main_context_can_acquire(GMainContext *context); + /*****************************************************************************/ static inline int diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/src/n-dhcp4/src/n-dhcp4-c-connection.c new/NetworkManager-1.36.4/src/n-dhcp4/src/n-dhcp4-c-connection.c --- old/NetworkManager-1.36.2/src/n-dhcp4/src/n-dhcp4-c-connection.c 2022-01-14 09:55:53.000000000 +0100 +++ new/NetworkManager-1.36.4/src/n-dhcp4/src/n-dhcp4-c-connection.c 2022-03-22 18:05:30.000000000 +0100 @@ -705,6 +705,7 @@ message->userdata.start_time = offer->userdata.start_time; message->userdata.base_time = offer->userdata.base_time; message->userdata.client_addr = client.s_addr; + message->userdata.server_id = server.s_addr; n_dhcp4_incoming_get_xid(offer, &xid); n_dhcp4_outgoing_set_xid(message, xid); @@ -1224,6 +1225,24 @@ serv_addr, sizeof(serv_addr))); } + if (type == N_DHCP4_MESSAGE_NAK && + connection->request->userdata.server_id != INADDR_ANY) { + struct in_addr server; + + r = n_dhcp4_incoming_query_server_identifier(message, &server); + if (r) + return N_DHCP4_E_AGAIN; + + if (connection->request->userdata.server_id != server.s_addr) { + n_dhcp4_log(connection->log_queue, + LOG_DEBUG, + "discarded NAK with wrong server-id %s", + inet_ntop(AF_INET, &server, + serv_addr, sizeof(serv_addr))); + return N_DHCP4_E_AGAIN; + } + } + switch (type) { case N_DHCP4_MESSAGE_OFFER: case N_DHCP4_MESSAGE_ACK: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/src/n-dhcp4/src/n-dhcp4-private.h new/NetworkManager-1.36.4/src/n-dhcp4/src/n-dhcp4-private.h --- old/NetworkManager-1.36.2/src/n-dhcp4/src/n-dhcp4-private.h 2022-01-14 09:55:53.000000000 +0100 +++ new/NetworkManager-1.36.4/src/n-dhcp4/src/n-dhcp4-private.h 2022-03-22 18:05:30.000000000 +0100 @@ -202,6 +202,7 @@ uint8_t type; uint8_t message_type; uint32_t client_addr; + uint32_t server_id; uint64_t start_time; uint64_t base_time; uint64_t send_time; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/src/nm-cloud-setup/nm-http-client.c new/NetworkManager-1.36.4/src/nm-cloud-setup/nm-http-client.c --- old/NetworkManager-1.36.2/src/nm-cloud-setup/nm-http-client.c 2022-03-07 10:09:54.000000000 +0100 +++ new/NetworkManager-1.36.4/src/nm-cloud-setup/nm-http-client.c 2022-03-22 18:05:34.000000000 +0100 @@ -305,6 +305,7 @@ curl_easy_setopt(edata->ehandle, CURLOPT_WRITEFUNCTION, _get_writefunction_cb); curl_easy_setopt(edata->ehandle, CURLOPT_WRITEDATA, edata); curl_easy_setopt(edata->ehandle, CURLOPT_PRIVATE, edata); + curl_easy_setopt(edata->ehandle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); if (http_headers) { for (i = 0; http_headers[i]; ++i) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-1.36.2/src/nmcli/connections.c new/NetworkManager-1.36.4/src/nmcli/connections.c --- old/NetworkManager-1.36.2/src/nmcli/connections.c 2022-03-06 14:02:58.000000000 +0100 +++ new/NetworkManager-1.36.4/src/nmcli/connections.c 2022-03-22 18:05:34.000000000 +0100 @@ -4211,16 +4211,16 @@ if (option && option->check_and_set) { return option->check_and_set(nmc, connection, option, value, error); } else if (value || allow_reset) { - set_property(nmc->client, - connection, - setting_name, - property_name, - value, - !value ? NM_META_ACCESSOR_MODIFIER_DEL - : (inf_flags & NM_META_PROPERTY_INF_FLAG_MULTI - ? NM_META_ACCESSOR_MODIFIER_ADD - : NM_META_ACCESSOR_MODIFIER_SET), - error); + return set_property(nmc->client, + connection, + setting_name, + property_name, + value, + !value ? NM_META_ACCESSOR_MODIFIER_DEL + : (inf_flags & NM_META_PROPERTY_INF_FLAG_MULTI + ? NM_META_ACCESSOR_MODIFIER_ADD + : NM_META_ACCESSOR_MODIFIER_SET), + error); } return TRUE;
