diff --git a/.gitignore b/.gitignore index 6131b48..9453ab7 100644 --- a/.gitignore +++ b/.gitignore @@ -427,3 +427,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.41.90.tar.xz /NetworkManager-1.41.91.tar.xz /NetworkManager-1.42.0.tar.xz +/NetworkManager-1.42.2.tar.xz diff --git a/1000-libnm-docs-fix-gtk-doc-generation-for-settings.patch b/1000-libnm-docs-fix-gtk-doc-generation-for-settings.patch deleted file mode 100644 index f36ac49..0000000 --- a/1000-libnm-docs-fix-gtk-doc-generation-for-settings.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 25efc7198de6283c7d62f991cd76d1b4ec7c1eb4 Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Fri, 10 Feb 2023 16:31:50 +0100 -Subject: [PATCH 1/1] libnm/docs: fix gtk-doc generation for settings - -Marking "nm-core-types.h" as to be ignored by gtk-doc, causes many files -to have the wrong names: - - /docs/libnm/html/{NMConnection.html => libnm-NMConnection.html} - /docs/libnm/html/{NMSetting.html => libnm-NMSetting.html} - /docs/libnm/html/{NMSetting6Lowpan.html => libnm-NMSetting6Lowpan.html} - /docs/libnm/html/{NMSetting8021x.html => libnm-NMSetting8021x.html} - /docs/libnm/html/{NMSettingAdsl.html => libnm-NMSettingAdsl.html} - /docs/libnm/html/{NMSettingBluetooth.html => libnm-NMSettingBluetooth.html} - /docs/libnm/html/{NMSettingBond.html => libnm-NMSettingBond.html} - /docs/libnm/html/{NMSettingBondPort.html => libnm-NMSettingBondPort.html} - /docs/libnm/html/{NMSettingBridge.html => libnm-NMSettingBridge.html} - /docs/libnm/html/{NMSettingBridgePort.html => libnm-NMSettingBridgePort.html} - /docs/libnm/html/{NMSettingCdma.html => libnm-NMSettingCdma.html} - /docs/libnm/html/{NMSettingConnection.html => libnm-NMSettingConnection.html} - /docs/libnm/html/{NMSettingDcb.html => libnm-NMSettingDcb.html} - /docs/libnm/html/{NMSettingDummy.html => libnm-NMSettingDummy.html} - /docs/libnm/html/{NMSettingEthtool.html => libnm-NMSettingEthtool.html} - /docs/libnm/html/{NMSettingGeneric.html => libnm-NMSettingGeneric.html} - /docs/libnm/html/{NMSettingGsm.html => libnm-NMSettingGsm.html} - /docs/libnm/html/{NMSettingHostname.html => libnm-NMSettingHostname.html} - /docs/libnm/html/{NMSettingIP4Config.html => libnm-NMSettingIP4Config.html} - /docs/libnm/html/{NMSettingIP6Config.html => libnm-NMSettingIP6Config.html} - /docs/libnm/html/{NMSettingIPConfig.html => libnm-NMSettingIPConfig.html} - /docs/libnm/html/{NMSettingIPTunnel.html => libnm-NMSettingIPTunnel.html} - /docs/libnm/html/{NMSettingInfiniband.html => libnm-NMSettingInfiniband.html} - /docs/libnm/html/{NMSettingMacsec.html => libnm-NMSettingMacsec.html} - /docs/libnm/html/{NMSettingMacvlan.html => libnm-NMSettingMacvlan.html} - /docs/libnm/html/{NMSettingMatch.html => libnm-NMSettingMatch.html} - /docs/libnm/html/{NMSettingOlpcMesh.html => libnm-NMSettingOlpcMesh.html} - /docs/libnm/html/{NMSettingOvsBridge.html => libnm-NMSettingOvsBridge.html} - /docs/libnm/html/{NMSettingOvsDpdk.html => libnm-NMSettingOvsDpdk.html} - /docs/libnm/html/{NMSettingOvsExternalIDs.html => libnm-NMSettingOvsExternalIDs.html} - /docs/libnm/html/{NMSettingOvsInterface.html => libnm-NMSettingOvsInterface.html} - /docs/libnm/html/{NMSettingOvsPatch.html => libnm-NMSettingOvsPatch.html} - /docs/libnm/html/{NMSettingOvsPort.html => libnm-NMSettingOvsPort.html} - /docs/libnm/html/{NMSettingPpp.html => libnm-NMSettingPpp.html} - /docs/libnm/html/{NMSettingPppoe.html => libnm-NMSettingPppoe.html} - /docs/libnm/html/{NMSettingProxy.html => libnm-NMSettingProxy.html} - /docs/libnm/html/{NMSettingSerial.html => libnm-NMSettingSerial.html} - /docs/libnm/html/{NMSettingSriov.html => libnm-NMSettingSriov.html} - /docs/libnm/html/{NMSettingTCConfig.html => libnm-NMSettingTCConfig.html} - /docs/libnm/html/{NMSettingTeam.html => libnm-NMSettingTeam.html} - /docs/libnm/html/{NMSettingTeamPort.html => libnm-NMSettingTeamPort.html} - /docs/libnm/html/{NMSettingTun.html => libnm-NMSettingTun.html} - /docs/libnm/html/{NMSettingUser.html => libnm-NMSettingUser.html} - /docs/libnm/html/{NMSettingVeth.html => libnm-NMSettingVeth.html} - /docs/libnm/html/{NMSettingVlan.html => libnm-NMSettingVlan.html} - /docs/libnm/html/{NMSettingVpn.html => libnm-NMSettingVpn.html} - /docs/libnm/html/{NMSettingVrf.html => libnm-NMSettingVrf.html} - /docs/libnm/html/{NMSettingVxlan.html => libnm-NMSettingVxlan.html} - /docs/libnm/html/{NMSettingWifiP2P.html => libnm-NMSettingWifiP2P.html} - /docs/libnm/html/{NMSettingWimax.html => libnm-NMSettingWimax.html} - /docs/libnm/html/{NMSettingWireGuard.html => libnm-NMSettingWireGuard.html} - /docs/libnm/html/{NMSettingWired.html => libnm-NMSettingWired.html} - /docs/libnm/html/{NMSettingWireless.html => libnm-NMSettingWireless.html} - /docs/libnm/html/{NMSettingWirelessSecurity.html => libnm-NMSettingWirelessSecurity.html} - /docs/libnm/html/{NMSettingWpan.html => libnm-NMSettingWpan.html} - /docs/libnm/html/{NMSimpleConnection.html => libnm-NMSimpleConnection.html} - -Revert that part of the change. Even if this regresses other problems. - -Fixes: 1330292d057c ('docs/libnm: fix gtkdoc-scan ignore lists') -(cherry picked from commit f0e3ca09c9d3a3196bee232307e42f008eb4baf2) -(cherry picked from commit 51b67d43275af5d7ab50d9b293b60d425925ac9b) ---- - docs/libnm/Makefile.am | 2 -- - docs/libnm/meson.build | 2 -- - 2 files changed, 4 deletions(-) - -diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am -index 928ea5ee1d5e..7a10848f0ab3 100644 ---- a/docs/libnm/Makefile.am -+++ b/docs/libnm/Makefile.am -@@ -38,8 +38,6 @@ CFILE_GLOB=$(top_srcdir)/src/libnm-core-impl/*.c $(top_srcdir)/src/libnm-client- - - # Header files to ignore when scanning. - IGNORE_HFILES= \ -- nm-core-types.h \ -- \ - nm-dbus-helpers.h \ - nm-default-libnm.h \ - nm-device-private.h \ -diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build -index 5e742b6c3eab..01c9b6695963 100644 ---- a/docs/libnm/meson.build -+++ b/docs/libnm/meson.build -@@ -1,8 +1,6 @@ - # SPDX-License-Identifier: LGPL-2.1-or-later - - private_headers = [ -- 'nm-core-types.h', -- - 'nm-dbus-helpers.h', - 'nm-default-libnm.h', - 'nm-device-private.h', --- -2.39.1 - diff --git a/NetworkManager.spec b/NetworkManager.spec index a8bbccc..612c571 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -4,7 +4,7 @@ %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global epoch_version 1 -%global real_version 1.42.0 +%global real_version 1.42.2 %global rpm_version %{real_version} %global release_version 1 %global snapshot %{nil} @@ -203,7 +203,6 @@ Source7: readme-ifcfg-rh.txt # Bugfixes that are only relevant until next rebase of the package. # Patch1001: 1001-some.patch -Patch1000: 1000-libnm-docs-fix-gtk-doc-generation-for-settings.patch Requires(post): systemd %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -1252,6 +1251,13 @@ fi %changelog +* Thu Feb 23 2023 Beniamino Galvani - 1:1.42.2-1 +- Update to 1.42.2 release +- fix hostname lookup from IPv6 address (rh #2167816) +- add new connection property to remove the autogenerated local route rule (rh #2167805) +- fix race condition while setting the MAC of a OVS interface (rh #2168477) +- expose the DHCP IAID in the lease information (rh #2169869) + * Fri Feb 10 2023 Thomas Haller - 1:1.42.0-1 - Update to 1.42.0 release diff --git a/sources b/sources index bcb4e98..fd926a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-1.42.0.tar.xz) = d6c57f79e1de669537501855545d0861044f07780fde61cbb643a955e84a3ca4e417cfb1978c277a1bca9002778dafda5387c28da1b4a58f9f320adaa553210c +SHA512 (NetworkManager-1.42.2.tar.xz) = 6142aaa7da2ae0dc3c8c75dbf51619ff969ace61c8a2d4a72aa83c4eff69e8389b262941e1667d71cbb55fb0653b14798a3c169b39dfcfa084109ef9fb3a335a