Update to 1.43.6 release (development)

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

.gitignore

@@ -427,3 +427,7 @@ 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.43.3.tar.xz
+/NetworkManager-1.43.4.tar.xz
+/NetworkManager-1.43.5.tar.xz
+/NetworkManager-1.43.6.tar.xz

0001-libnm-docs-fix-gtk-doc-generation-for-settings.patch

@@ -1,104 +0,0 @@
-From 25efc7198de6283c7d62f991cd76d1b4ec7c1eb4 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-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
-

NetworkManager.spec

@@ -1,10 +1,10 @@
 %global wpa_supplicant_version 1:1.1
 
-%global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
+%global ppp_version %(pkg-config --modversion pppd 2>/dev/null || sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
 %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.43.6
 %global rpm_version %{real_version}
 %global release_version 1
 %global snapshot %{nil}
@@ -197,7 +197,6 @@ Source6: 70-nm-connectivity.conf
 Source7: readme-ifcfg-rh.txt
 
 #Patch1: 0001-some.patch
-Patch1: 0001-libnm-docs-fix-gtk-doc-generation-for-settings.patch
 
 Requires(post): systemd
 %if 0%{?fedora} || 0%{?rhel} >= 8
@@ -720,9 +719,9 @@ Preferably use nmcli instead.
 	-Difcfg_rh=true \
 	-Difupdown=false \
 %if %{with ppp}
-	-Dpppd_plugin_dir="%{_libdir}/pppd/%{ppp_version}" \
-	-Dpppd="%{_sbindir}/pppd" \
 	-Dppp=true \
+	-Dpppd="%{_sbindir}/pppd" \
+	-Dpppd_plugin_dir="%{_libdir}/pppd/%{ppp_version}" \
 %else
 	-Dppp=false \
 %endif
@@ -1246,10 +1245,28 @@ fi
 
 
 %changelog
+* Thu Apr 20 2023 Beniamino Galvani <bgalvani@redhat.com> - 1:1.43.6-1
+- Update to 1.43.6 release (development)
+
+* Tue Apr 18 2023 Adam Williamson <awilliam@redhat.com> - 1:1.43.5-3
+- Fix ppp version discovery
+
+* Tue Apr 18 2023 Adam Williamson <awilliam@redhat.com> - 1:1.43.5-2
+- Rebuild for ppp 2.5.0
+
+* Wed Apr  5 2023 Lubomir Rintel <lkundrak@v3.sk> - 1:1.43.5-1
+- Update to 1.43.5 release (development)
+
+* Wed Mar 22 2023 Thomas Haller <thaller@redhat.com> - 1:1.43.4-1
+- Update to 1.43.4 release (development)
+
+* Wed Mar  8 2023 Lubomir Rintel <lkundrak@v3.sk> - 1:1.43.3-1
+- Update to an early 1.44 snapshot
+
 * Fri Feb 10 2023 Thomas Haller <thaller@redhat.com> - 1:1.42.0-1
 - Upgrade to 1.42.0 release
 
-* Thu Jan 26 2023 Lubomir Rintel <lkundrak@v3.sk> - - 1:1.41.91-1
+* Thu Jan 26 2023 Lubomir Rintel <lkundrak@v3.sk> - 1:1.41.91-1
 - Update to 1.41.91 release (release candidate)
 
 * Fri Jan 20 2023 Fernando Fernandez Mancera <ffmancera@riseup.net> - 1:1.41.90-1

sources

@@ -1 +1 @@
-SHA512 (NetworkManager-1.42.0.tar.xz) = d6c57f79e1de669537501855545d0861044f07780fde61cbb643a955e84a3ca4e417cfb1978c277a1bca9002778dafda5387c28da1b4a58f9f320adaa553210c
+SHA512 (NetworkManager-1.43.6.tar.xz) = e1d898d3e6154018defcf189bc017a962ed93b9f5d7bafd90642cd70f9bbd4885874b24f716d524e52cf9e44c7ba338e3c416e78bd7b6ec6eaa1cb5066244504