From 555dfa331e295a3a687a7cc6870e1349ffed8f26 Mon Sep 17 00:00:00 2001
From: Michael Biebl
Date: Fri, 6 Sep 2019 09:25:17 +0200
Subject: New upstream version 1.20.2
---
NEWS | 17 +-
clients/common/settings-docs.h | 2 +-
clients/common/settings-docs.h.in | 2 +-
configure | 26 +-
configure.ac | 2 +-
data/84-nm-drivers.rules | 2 +-
docs/api/html/NetworkManager.conf.html | 12 +-
docs/api/html/NetworkManager.html | 4 +-
docs/api/html/ch01.html | 4 +-
docs/api/html/dbus-secret-agent.html | 4 +-
docs/api/html/dbus-types.html | 4 +-
docs/api/html/dbus-vpn-plugin.html | 4 +-
docs/api/html/dbus-vpn-types.html | 4 +-
...org.freedesktop.NetworkManager.AccessPoint.html | 4 +-
...rg.freedesktop.NetworkManager.AgentManager.html | 4 +-
...-org.freedesktop.NetworkManager.Checkpoint.html | 4 +-
...eedesktop.NetworkManager.Connection.Active.html | 4 +-
...org.freedesktop.NetworkManager.DHCP4Config.html | 4 +-
...org.freedesktop.NetworkManager.DHCP6Config.html | 4 +-
...org.freedesktop.NetworkManager.Device.Adsl.html | 4 +-
...reedesktop.NetworkManager.Device.Bluetooth.html | 4 +-
...org.freedesktop.NetworkManager.Device.Bond.html | 4 +-
...g.freedesktop.NetworkManager.Device.Bridge.html | 4 +-
...rg.freedesktop.NetworkManager.Device.Dummy.html | 4 +-
....freedesktop.NetworkManager.Device.Generic.html | 4 +-
...freedesktop.NetworkManager.Device.IPTunnel.html | 4 +-
...eedesktop.NetworkManager.Device.Infiniband.html | 4 +-
...g.freedesktop.NetworkManager.Device.Lowpan.html | 4 +-
...g.freedesktop.NetworkManager.Device.Macsec.html | 4 +-
....freedesktop.NetworkManager.Device.Macvlan.html | 4 +-
...rg.freedesktop.NetworkManager.Device.Modem.html | 4 +-
...freedesktop.NetworkManager.Device.OlpcMesh.html | 4 +-
...reedesktop.NetworkManager.Device.OvsBridge.html | 4 +-
...desktop.NetworkManager.Device.OvsInterface.html | 4 +-
....freedesktop.NetworkManager.Device.OvsPort.html | 4 +-
...-org.freedesktop.NetworkManager.Device.Ppp.html | 4 +-
...eedesktop.NetworkManager.Device.Statistics.html | 4 +-
...org.freedesktop.NetworkManager.Device.Team.html | 4 +-
...-org.freedesktop.NetworkManager.Device.Tun.html | 4 +-
...org.freedesktop.NetworkManager.Device.Veth.html | 4 +-
...org.freedesktop.NetworkManager.Device.Vlan.html | 4 +-
...rg.freedesktop.NetworkManager.Device.Vxlan.html | 4 +-
....freedesktop.NetworkManager.Device.WifiP2P.html | 4 +-
...reedesktop.NetworkManager.Device.WireGuard.html | 4 +-
...rg.freedesktop.NetworkManager.Device.Wired.html | 4 +-
...freedesktop.NetworkManager.Device.Wireless.html | 4 +-
...org.freedesktop.NetworkManager.Device.Wpan.html | 4 +-
...dbus-org.freedesktop.NetworkManager.Device.html | 4 +-
...-org.freedesktop.NetworkManager.DnsManager.html | 4 +-
...s-org.freedesktop.NetworkManager.IP4Config.html | 4 +-
...s-org.freedesktop.NetworkManager.IP6Config.html | 4 +-
.../gdbus-org.freedesktop.NetworkManager.PPP.html | 4 +-
...org.freedesktop.NetworkManager.SecretAgent.html | 4 +-
...desktop.NetworkManager.Settings.Connection.html | 4 +-
...us-org.freedesktop.NetworkManager.Settings.html | 4 +-
....freedesktop.NetworkManager.VPN.Connection.html | 4 +-
...-org.freedesktop.NetworkManager.VPN.Plugin.html | 4 +-
...org.freedesktop.NetworkManager.WifiP2PPeer.html | 4 +-
.../html/gdbus-org.freedesktop.NetworkManager.html | 4 +-
docs/api/html/index.html | 6 +-
docs/api/html/ix01.html | 1488 ++---
docs/api/html/license.html | 4 +-
docs/api/html/manpages.html | 4 +-
docs/api/html/nm-dbus-types.html | 4 +-
docs/api/html/nm-initrd-generator.html | 4 +-
docs/api/html/nm-online.html | 4 +-
docs/api/html/nm-openvswitch.html | 4 +-
docs/api/html/nm-settings-ifcfg-rh.html | 4 +-
docs/api/html/nm-settings-keyfile.html | 4 +-
docs/api/html/nm-settings.html | 6 +-
docs/api/html/nm-vpn-dbus-types.html | 4 +-
docs/api/html/nmcli-examples.html | 4 +-
docs/api/html/nmcli.html | 4 +-
docs/api/html/nmtui.html | 4 +-
docs/api/html/ref-dbus-access-points.html | 4 +-
docs/api/html/ref-dbus-active-connections.html | 4 +-
docs/api/html/ref-dbus-agent-manager.html | 4 +-
docs/api/html/ref-dbus-checkpoint.html | 4 +-
docs/api/html/ref-dbus-devices.html | 4 +-
docs/api/html/ref-dbus-dhcp4-configs.html | 4 +-
docs/api/html/ref-dbus-dhcp6-configs.html | 4 +-
docs/api/html/ref-dbus-dns-manager.html | 4 +-
docs/api/html/ref-dbus-ip4-configs.html | 4 +-
docs/api/html/ref-dbus-ip6-configs.html | 4 +-
docs/api/html/ref-dbus-manager.html | 4 +-
docs/api/html/ref-dbus-settings-manager.html | 4 +-
docs/api/html/ref-dbus-settings.html | 4 +-
docs/api/html/ref-dbus-wifi-p2p-peers.html | 4 +-
docs/api/html/ref-settings.html | 4 +-
docs/api/html/secret-agents.html | 4 +-
docs/api/html/secrets-flags.html | 4 +-
docs/api/html/settings-6lowpan.html | 4 +-
docs/api/html/settings-802-11-olpc-mesh.html | 4 +-
.../html/settings-802-11-wireless-security.html | 4 +-
docs/api/html/settings-802-11-wireless.html | 4 +-
docs/api/html/settings-802-1x.html | 4 +-
docs/api/html/settings-802-3-ethernet.html | 6 +-
docs/api/html/settings-adsl.html | 4 +-
docs/api/html/settings-bluetooth.html | 4 +-
docs/api/html/settings-bond.html | 4 +-
docs/api/html/settings-bridge-port.html | 4 +-
docs/api/html/settings-bridge.html | 4 +-
docs/api/html/settings-cdma.html | 4 +-
docs/api/html/settings-connection.html | 4 +-
docs/api/html/settings-dcb.html | 4 +-
docs/api/html/settings-dummy.html | 4 +-
docs/api/html/settings-ethtool.html | 4 +-
docs/api/html/settings-generic.html | 4 +-
docs/api/html/settings-gsm.html | 4 +-
docs/api/html/settings-infiniband.html | 4 +-
docs/api/html/settings-ip-tunnel.html | 4 +-
docs/api/html/settings-ipv4.html | 4 +-
docs/api/html/settings-ipv6.html | 4 +-
docs/api/html/settings-macsec.html | 4 +-
docs/api/html/settings-macvlan.html | 4 +-
docs/api/html/settings-match.html | 4 +-
docs/api/html/settings-ovs-bridge.html | 4 +-
docs/api/html/settings-ovs-dpdk.html | 4 +-
docs/api/html/settings-ovs-interface.html | 4 +-
docs/api/html/settings-ovs-patch.html | 4 +-
docs/api/html/settings-ovs-port.html | 4 +-
docs/api/html/settings-ppp.html | 4 +-
docs/api/html/settings-pppoe.html | 4 +-
docs/api/html/settings-proxy.html | 4 +-
docs/api/html/settings-serial.html | 4 +-
docs/api/html/settings-sriov.html | 4 +-
docs/api/html/settings-tc.html | 4 +-
docs/api/html/settings-team-port.html | 4 +-
docs/api/html/settings-team.html | 4 +-
docs/api/html/settings-tun.html | 4 +-
docs/api/html/settings-user.html | 4 +-
docs/api/html/settings-vlan.html | 4 +-
docs/api/html/settings-vpn.html | 4 +-
docs/api/html/settings-vxlan.html | 4 +-
docs/api/html/settings-wifi-p2p.html | 4 +-
docs/api/html/settings-wimax.html | 4 +-
docs/api/html/settings-wireguard.html | 4 +-
docs/api/html/settings-wpan.html | 4 +-
docs/api/html/spec.html | 4 +-
docs/api/html/style.css | 88 +-
docs/api/html/vpn-plugins.html | 4 +-
docs/api/settings-spec.xml | 2 +-
docs/api/version.xml | 2 +-
docs/libnm/Makefile.am | 4 +-
docs/libnm/Makefile.in | 3 +-
docs/libnm/html/NMAccessPoint.html | 4 +-
docs/libnm/html/NMActiveConnection.html | 8 +-
docs/libnm/html/NMCheckpoint.html | 4 +-
docs/libnm/html/NMClient.html | 48 +-
docs/libnm/html/NMConnection.html | 6 +-
docs/libnm/html/NMDevice.html | 6 +-
docs/libnm/html/NMDeviceAdsl.html | 4 +-
docs/libnm/html/NMDeviceBond.html | 6 +-
docs/libnm/html/NMDeviceBridge.html | 6 +-
docs/libnm/html/NMDeviceBt.html | 4 +-
docs/libnm/html/NMDeviceDummy.html | 4 +-
docs/libnm/html/NMDeviceEthernet.html | 4 +-
docs/libnm/html/NMDeviceGeneric.html | 4 +-
docs/libnm/html/NMDeviceIPTunnel.html | 4 +-
docs/libnm/html/NMDeviceInfiniband.html | 4 +-
docs/libnm/html/NMDeviceMacsec.html | 4 +-
docs/libnm/html/NMDeviceMacvlan.html | 4 +-
docs/libnm/html/NMDeviceModem.html | 4 +-
docs/libnm/html/NMDeviceOlpcMesh.html | 4 +-
docs/libnm/html/NMDeviceOvsBridge.html | 6 +-
docs/libnm/html/NMDeviceOvsInterface.html | 4 +-
docs/libnm/html/NMDeviceOvsPort.html | 6 +-
docs/libnm/html/NMDevicePpp.html | 4 +-
docs/libnm/html/NMDeviceTeam.html | 6 +-
docs/libnm/html/NMDeviceTun.html | 4 +-
docs/libnm/html/NMDeviceVlan.html | 4 +-
docs/libnm/html/NMDeviceVxlan.html | 4 +-
docs/libnm/html/NMDeviceWifi.html | 4 +-
docs/libnm/html/NMDeviceWifiP2P.html | 4 +-
docs/libnm/html/NMDeviceWimax.html | 4 +-
docs/libnm/html/NMDeviceWireGuard.html | 4 +-
docs/libnm/html/NMDhcpConfig.html | 4 +-
docs/libnm/html/NMIPConfig.html | 4 +-
docs/libnm/html/NMObject.html | 4 +-
docs/libnm/html/NMRemoteConnection.html | 4 +-
docs/libnm/html/NMSecretAgentOld.html | 30 +-
docs/libnm/html/NMSetting.html | 40 +-
docs/libnm/html/NMSetting6Lowpan.html | 4 +-
docs/libnm/html/NMSetting8021x.html | 4 +-
docs/libnm/html/NMSettingAdsl.html | 4 +-
docs/libnm/html/NMSettingBluetooth.html | 4 +-
docs/libnm/html/NMSettingBond.html | 4 +-
docs/libnm/html/NMSettingBridge.html | 4 +-
docs/libnm/html/NMSettingBridgePort.html | 4 +-
docs/libnm/html/NMSettingCdma.html | 4 +-
docs/libnm/html/NMSettingConnection.html | 8 +-
docs/libnm/html/NMSettingDcb.html | 4 +-
docs/libnm/html/NMSettingDummy.html | 4 +-
docs/libnm/html/NMSettingEthtool.html | 4 +-
docs/libnm/html/NMSettingGeneric.html | 4 +-
docs/libnm/html/NMSettingGsm.html | 4 +-
docs/libnm/html/NMSettingIP4Config.html | 4 +-
docs/libnm/html/NMSettingIP6Config.html | 4 +-
docs/libnm/html/NMSettingIPConfig.html | 16 +-
docs/libnm/html/NMSettingIPTunnel.html | 4 +-
docs/libnm/html/NMSettingInfiniband.html | 4 +-
docs/libnm/html/NMSettingMacsec.html | 10 +-
docs/libnm/html/NMSettingMacvlan.html | 4 +-
docs/libnm/html/NMSettingMatch.html | 4 +-
docs/libnm/html/NMSettingOlpcMesh.html | 4 +-
docs/libnm/html/NMSettingOvsBridge.html | 4 +-
docs/libnm/html/NMSettingOvsDpdk.html | 4 +-
docs/libnm/html/NMSettingOvsInterface.html | 4 +-
docs/libnm/html/NMSettingOvsPatch.html | 4 +-
docs/libnm/html/NMSettingOvsPort.html | 4 +-
docs/libnm/html/NMSettingPpp.html | 4 +-
docs/libnm/html/NMSettingPppoe.html | 4 +-
docs/libnm/html/NMSettingProxy.html | 4 +-
docs/libnm/html/NMSettingSerial.html | 4 +-
docs/libnm/html/NMSettingSriov.html | 4 +-
docs/libnm/html/NMSettingTCConfig.html | 4 +-
docs/libnm/html/NMSettingTeam.html | 14 +-
docs/libnm/html/NMSettingTeamPort.html | 4 +-
docs/libnm/html/NMSettingTun.html | 4 +-
docs/libnm/html/NMSettingUser.html | 4 +-
docs/libnm/html/NMSettingVlan.html | 14 +-
docs/libnm/html/NMSettingVpn.html | 4 +-
docs/libnm/html/NMSettingVxlan.html | 4 +-
docs/libnm/html/NMSettingWifiP2P.html | 4 +-
docs/libnm/html/NMSettingWimax.html | 4 +-
docs/libnm/html/NMSettingWireGuard.html | 4 +-
docs/libnm/html/NMSettingWired.html | 12 +-
docs/libnm/html/NMSettingWireless.html | 10 +-
docs/libnm/html/NMSettingWirelessSecurity.html | 4 +-
docs/libnm/html/NMSettingWpan.html | 4 +-
docs/libnm/html/NMSimpleConnection.html | 4 +-
docs/libnm/html/NMVpnConnection.html | 4 +-
docs/libnm/html/NMVpnEditor.html | 6 +-
docs/libnm/html/NMVpnEditorPlugin.html | 4 +-
docs/libnm/html/NMWifiP2PPeer.html | 4 +-
docs/libnm/html/NMWimaxNsp.html | 4 +-
docs/libnm/html/annotation-glossary.html | 4 +-
docs/libnm/html/api-index-full.html | 6 +-
docs/libnm/html/ch02.html | 4 +-
docs/libnm/html/ch03.html | 6 +-
docs/libnm/html/ch04.html | 4 +-
docs/libnm/html/ch05.html | 4 +-
docs/libnm/html/ch06.html | 4 +-
docs/libnm/html/index.html | 8 +-
docs/libnm/html/libnm-nm-dbus-interface.html | 336 +-
docs/libnm/html/libnm-nm-device-6lowpan.html | 4 +-
docs/libnm/html/libnm-nm-device-wpan.html | 4 +-
docs/libnm/html/libnm-nm-errors.html | 110 +-
docs/libnm/html/libnm-nm-utils.html | 4 +-
docs/libnm/html/libnm-nm-version.html | 4 +-
docs/libnm/html/libnm-nm-vpn-plugin-info.html | 4 +-
docs/libnm/html/libnm-nm-vpn-plugin-old.html | 4 +-
docs/libnm/html/libnm-nm-vpn-service-plugin.html | 4 +-
docs/libnm/html/object-tree.html | 4 +-
docs/libnm/html/ref-overview.html | 4 +-
docs/libnm/html/style.css | 88 +-
docs/libnm/html/usage.html | 42 +-
docs/libnm/libnm-sections.txt | 93 +
docs/libnm/meson.build | 4 +
docs/libnm/version.xml | 2 +-
libnm-core/nm-keyfile.c | 100 +-
libnm-core/nm-setting-wired.c | 2 +-
libnm-core/tests/test-setting.c | 69 +-
libnm/nm-property-docs.xml | 2 +-
libnm/nm-settings-docs.xml | 2 +-
man/NetworkManager.8 | 6 +-
man/NetworkManager.conf.5 | 14 +-
man/nm-initrd-generator.8 | 6 +-
man/nm-online.1 | 6 +-
man/nm-openvswitch.7 | 6 +-
man/nm-settings-ifcfg-rh.5 | 6 +-
man/nm-settings-ifcfg-rh.xml | 2 +-
man/nm-settings-keyfile.5 | 6 +-
man/nm-settings-keyfile.xml | 2 +-
man/nm-settings.5 | 8 +-
man/nm-settings.xml | 4 +-
man/nmcli-examples.7 | 6 +-
man/nmcli.1 | 6 +-
man/nmtui.1 | 6 +-
meson.build | 2 +-
po/ar.po | 2 +-
po/as.po | 2 +-
po/be@latin.po | 2 +-
po/bg.po | 2 +-
po/bn_IN.po | 2 +-
po/bs.po | 2 +-
po/ca.po | 2 +-
po/cs.po | 2 +-
po/da.po | 2 +-
po/de.po | 2 +-
po/dz.po | 2 +-
po/el.po | 2 +-
po/en_CA.po | 2 +-
po/en_GB.po | 2 +-
po/eo.po | 2 +-
po/es.po | 2 +-
po/et.po | 2 +-
po/eu.po | 2 +-
po/fi.po | 2 +-
po/fr.po | 4989 +++++++-------
po/gd.po | 2 +-
po/gl.po | 2 +-
po/gu.po | 2 +-
po/he.po | 2 +-
po/hi.po | 2 +-
po/hr.po | 2 +-
po/hu.po | 2 +-
po/id.po | 2 +-
po/it.po | 6 +-
po/ja.po | 7032 +++++++++-----------
po/ka.po | 2 +-
po/kn.po | 2 +-
po/ko.po | 6486 ++++++++----------
po/ku.po | 2 +-
po/lt.po | 2 +-
po/lv.po | 2 +-
po/mk.po | 2 +-
po/ml.po | 2 +-
po/mr.po | 2 +-
po/nb.po | 2 +-
po/ne.po | 2 +-
po/nl.po | 2 +-
po/oc.po | 2 +-
po/or.po | 2 +-
po/pa.po | 2 +-
po/pl.po | 6137 +++++------------
po/pt.po | 2 +-
po/pt_BR.po | 2 +-
po/ru.po | 2 +-
po/rw.po | 2 +-
po/sk.po | 2 +-
po/sl.po | 2 +-
po/sq.po | 2 +-
po/sr.po | 2 +-
po/sr@latin.po | 2 +-
po/sv.po | 2 +-
po/ta.po | 2 +-
po/te.po | 2 +-
po/th.po | 2 +-
po/tr.po | 2 +-
po/uk.po | 2 +-
po/vi.po | 2 +-
po/wa.po | 2 +-
po/zh_CN.po | 6152 ++++++++---------
po/zh_HK.po | 2 +-
po/zh_TW.po | 2 +-
shared/n-dhcp4/src/n-dhcp4-c-probe.c | 2 +-
shared/nm-utils/nm-test-utils.h | 23 +
shared/nm-version-macros.h | 3 +-
shared/nm-version-macros.h.in | 1 +
src/devices/bluetooth/nm-bluez5-manager.c | 4 +-
src/devices/nm-acd-manager.c | 2 +-
src/devices/nm-device.c | 7 +-
src/dhcp/nm-dhcp-nettools.c | 13 -
src/nm-audit-manager.h | 1 +
src/nm-core-utils.h | 4 +
src/nm-ip4-config.c | 4 +-
src/nm-manager.c | 29 +-
src/settings/nm-agent-manager.c | 2 +-
src/settings/nm-settings-connection.c | 4 +-
src/settings/nm-settings.c | 48 +-
.../plugins/ifupdown/nms-ifupdown-plugin.c | 2 +
src/settings/plugins/keyfile/nms-keyfile-writer.c | 71 +-
src/supplicant/nm-supplicant-interface.c | 35 +-
src/tests/test-core-with-expect.c | 5 +-
src/tests/test-ip4-config.c | 42 +
366 files changed, 15296 insertions(+), 19670 deletions(-)
diff --git a/NEWS b/NEWS
index 64aac1c4..ea6eee96 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,21 @@
+===============================================
+NetworkManager-1.20.2
+Overview of changes since NetworkManager-1.20.0
+===============================================
+
+This is a new stable release of NetworkManager. Notable changes include:
+
+* Don't ask wpa_supplicant to attempt to enable FT if the interface doesn't
+ support it.
+* Various bug fixes and improvements.
+* French, Japanese, Korean, Polish and Simplified Chinese translation updates.
+
=============================================
NetworkManager-1.20
Overview of changes since NetworkManager-1.18
=============================================
-This is a snapshot of NetworkManager 1.20 development series.
-The API is subject to change and not guaranteed to be compatible
-with the later release.
-USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE!
+This is a new stable release of NetworkManager. Notable changes include:
* The libnm-glib library, deprecated in favor of libnm since NetworkManager 1.0,
and disabled by default since NetworkManager 1.12, has now been removed.
diff --git a/clients/common/settings-docs.h b/clients/common/settings-docs.h
index 78908305..c4f16ad6 100644
--- a/clients/common/settings-docs.h
+++ b/clients/common/settings-docs.h
@@ -96,7 +96,7 @@
#define DESCRIBE_DOC_NM_SETTING_WIRED_S390_NETTYPE N_("s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing the different types of virtual network devices available on s390 systems.")
#define DESCRIBE_DOC_NM_SETTING_WIRED_S390_OPTIONS N_("Dictionary of key/value pairs of s390-specific device options. Both keys and values must be strings. Allowed keys include \"portno\", \"layer2\", \"portname\", \"protocol\", among others. Key names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).")
#define DESCRIBE_DOC_NM_SETTING_WIRED_S390_SUBCHANNELS N_("Identifies specific subchannels that this network device uses for communication with z/VM or s390 host. Like the \"mac-address\" property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.")
-#define DESCRIBE_DOC_NM_SETTING_WIRED_SPEED N_("When a value grater than 0 is set, configures the device to use the specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will be the only one advertised during link negotiation: this works only for BASE-T 802.3 specifications and is useful for enforcing gigabit speeds, as in this case link negotiation is mandatory. If the value is unset (0, the default), the link configuration will be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will advertise all the supported speeds. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" property when non-zero. Before specifying a speed value be sure your device supports it.")
+#define DESCRIBE_DOC_NM_SETTING_WIRED_SPEED N_("When a value greater than 0 is set, configures the device to use the specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will be the only one advertised during link negotiation: this works only for BASE-T 802.3 specifications and is useful for enforcing gigabit speeds, as in this case link negotiation is mandatory. If the value is unset (0, the default), the link configuration will be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will advertise all the supported speeds. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" property when non-zero. Before specifying a speed value be sure your device supports it.")
#define DESCRIBE_DOC_NM_SETTING_WIRED_WAKE_ON_LAN N_("The NMSettingWiredWakeOnLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager).")
#define DESCRIBE_DOC_NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD N_("If specified, the password used with magic-packet-based Wake-on-LAN, represented as an Ethernet MAC address. If NULL, no password will be required.")
#define DESCRIBE_DOC_NM_SETTING_ADSL_ENCAPSULATION N_("Encapsulation of ADSL connection. Can be \"vcmux\" or \"llc\".")
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index 78908305..c4f16ad6 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -96,7 +96,7 @@
#define DESCRIBE_DOC_NM_SETTING_WIRED_S390_NETTYPE N_("s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing the different types of virtual network devices available on s390 systems.")
#define DESCRIBE_DOC_NM_SETTING_WIRED_S390_OPTIONS N_("Dictionary of key/value pairs of s390-specific device options. Both keys and values must be strings. Allowed keys include \"portno\", \"layer2\", \"portname\", \"protocol\", among others. Key names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).")
#define DESCRIBE_DOC_NM_SETTING_WIRED_S390_SUBCHANNELS N_("Identifies specific subchannels that this network device uses for communication with z/VM or s390 host. Like the \"mac-address\" property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.")
-#define DESCRIBE_DOC_NM_SETTING_WIRED_SPEED N_("When a value grater than 0 is set, configures the device to use the specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will be the only one advertised during link negotiation: this works only for BASE-T 802.3 specifications and is useful for enforcing gigabit speeds, as in this case link negotiation is mandatory. If the value is unset (0, the default), the link configuration will be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will advertise all the supported speeds. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" property when non-zero. Before specifying a speed value be sure your device supports it.")
+#define DESCRIBE_DOC_NM_SETTING_WIRED_SPEED N_("When a value greater than 0 is set, configures the device to use the specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will be the only one advertised during link negotiation: this works only for BASE-T 802.3 specifications and is useful for enforcing gigabit speeds, as in this case link negotiation is mandatory. If the value is unset (0, the default), the link configuration will be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will advertise all the supported speeds. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" property when non-zero. Before specifying a speed value be sure your device supports it.")
#define DESCRIBE_DOC_NM_SETTING_WIRED_WAKE_ON_LAN N_("The NMSettingWiredWakeOnLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager).")
#define DESCRIBE_DOC_NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD N_("If specified, the password used with magic-packet-based Wake-on-LAN, represented as an Ethernet MAC address. If NULL, no password will be required.")
#define DESCRIBE_DOC_NM_SETTING_ADSL_ENCAPSULATION N_("Encapsulation of ADSL connection. Can be \"vcmux\" or \"llc\".")
diff --git a/configure b/configure
index b5f58427..1c609202 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.20.0.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.20.2.
#
# Report bugs to .
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='NetworkManager'
PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='1.20.0'
-PACKAGE_STRING='NetworkManager 1.20.0'
+PACKAGE_VERSION='1.20.2'
+PACKAGE_STRING='NetworkManager 1.20.2'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
PACKAGE_URL=''
@@ -1719,7 +1719,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.20.0 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.20.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1789,7 +1789,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of NetworkManager 1.20.0:";;
+ short | recursive ) echo "Configuration of NetworkManager 1.20.2:";;
esac
cat <<\_ACEOF
@@ -2127,7 +2127,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-NetworkManager configure 1.20.0
+NetworkManager configure 1.20.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2900,7 +2900,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.20.0, which was
+It was created by NetworkManager $as_me 1.20.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3770,7 +3770,7 @@ fi
# Define the identity of the package.
PACKAGE='NetworkManager'
- VERSION='1.20.0'
+ VERSION='1.20.2'
cat >>confdefs.h <<_ACEOF
@@ -17954,8 +17954,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
NM_MAJOR_VERSION=1
NM_MINOR_VERSION=20
-NM_MICRO_VERSION=0
-NM_VERSION=1.20.0
+NM_MICRO_VERSION=2
+NM_VERSION=1.20.2
@@ -17963,7 +17963,7 @@ NM_VERSION=1.20.0
-NM_GIT_SHA=c438f01b19e180fc15cb860321c3ba5cd821adfd
+NM_GIT_SHA=4ef27f896ec3c76cd6bfc3c8428557d211076049
if test """" != "no-config-h" ; then
@@ -28843,7 +28843,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.20.0, which was
+This file was extended by NetworkManager $as_me 1.20.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -28909,7 +28909,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.20.0
+NetworkManager config.status 1.20.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 2d0e9252..bed89fa3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ dnl "shared/nm-version-macros.h.in"
dnl - update number in meson.build
m4_define([nm_major_version], [1])
m4_define([nm_minor_version], [20])
-m4_define([nm_micro_version], [0])
+m4_define([nm_micro_version], [2])
m4_define([nm_version],
[nm_major_version.nm_minor_version.nm_micro_version])
diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules
index d246ef6c..e398cb9f 100644
--- a/data/84-nm-drivers.rules
+++ b/data/84-nm-drivers.rules
@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end"
# Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
DRIVERS=="?*", GOTO="nm_drivers_end"
-PROGRAM="/bin/sh -c 'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c"
+PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
LABEL="nm_drivers_end"
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
index e669367e..27f8b7a0 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
@@ -8,7 +8,7 @@
-
+
@@ -320,10 +320,10 @@ no-auto-default=*
rc-managerunmanaged
Note that the plugins dnsmasq, systemd-resolved
and unbound are caching local nameservers.
- Hence, when NetworkManager writes /var/run/NetworkManager/resolv.conf
+ Hence, when NetworkManager writes /run/NetworkManager/resolv.conf
and /etc/resolv.conf (according to rc-manager
setting below), the name server there will be localhost only.
- NetworkManager also writes a file /var/run/NetworkManager/no-stub-resolv.conf
+ NetworkManager also writes a file /run/NetworkManager/no-stub-resolv.conf
that contains the original name servers pushed to the DNS plugin.
@@ -336,12 +336,12 @@ no-auto-default=*
"symlink".
Regardless of this setting, NetworkManager will
always write resolv.conf to its runtime state directory
- /var/run/NetworkManager/resolv.conf.
+ /run/NetworkManager/resolv.conf.
symlink: If /etc/resolv.conf is
a regular file, NetworkManager will replace the file on update. If
/etc/resolv.conf is instead a symlink, NetworkManager
will leave it alone. Unless the symlink points to the internal file
- /var/run/NetworkManager/resolv.conf,
+ /run/NetworkManager/resolv.conf,
in which case the symlink will be updated to emit an inotify notification.
This allows the user to conveniently instruct NetworkManager not
to manage /etc/resolv.conf by replacing it with
@@ -1466,6 +1466,6 @@ interface-name:vboxnet*,except:interface-name:vboxnet2