Update to 1.43.6 release (development)

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

.gitignore

@@ -413,3 +413,21 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.37.91.tar.xz
 /NetworkManager-1.37.92.tar.xz
 /NetworkManager-1.38.0.tar.xz
+/NetworkManager-1.39.8.tar.xz
+/NetworkManager-1.39.10.tar.xz
+/NetworkManager-1.39.11.tar.xz
+/NetworkManager-1.39.90.tar.xz
+/NetworkManager-1.40.0.tar.xz
+/NetworkManager-1.41.3.tar.xz
+/NetworkManager-1.41.4.tar.xz
+/NetworkManager-1.41.5.tar.xz
+/NetworkManager-1.41.6.tar.xz
+/NetworkManager-1.41.7.tar.xz
+/NetworkManager-1.41.8.tar.xz
+/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

NetworkManager.spec

@@ -1,20 +1,22 @@
-
 %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.38.0
+%global real_version 1.43.6
 %global rpm_version %{real_version}
-%global release_version 2
+%global release_version 1
 %global snapshot %{nil}
 %global git_sha %{nil}
+%global bcond_default_debug 0
+%global bcond_default_lto %{nil}
+%global bcond_default_test 0
 
 %global obsoletes_device_plugins     1:0.9.9.95-1
 %global obsoletes_ppp_plugin         1:1.5.3
 %global obsoletes_initscripts_updown 1:1.36.0-0.6
-%global obsoletes_ifcfg_rh           1:1.36.2-1
+%global obsoletes_ifcfg_rh           1:1.36.2
 
 %global nmlibdir %{_prefix}/lib/%{name}
 %global nmplugindir %{_libdir}/%{name}/%{version}-%{release}
@@ -38,18 +40,6 @@
 
 ###############################################################################
 
-%if "x__BCOND_DEFAULT_DEBUG__" == "x1" || "x__BCOND_DEFAULT_DEBUG__" == "x0"
-%global bcond_default_debug __BCOND_DEFAULT_DEBUG__
-%else
-%global bcond_default_debug 0
-%endif
-
-%if "x__BCOND_DEFAULT_TEST__" == "x1" || "x__BCOND_DEFAULT_TEST__" == "x0"
-%global bcond_default_test __BCOND_DEFAULT_TEST__
-%else
-%global bcond_default_test 0
-%endif
-
 %bcond_with meson
 %bcond_without adsl
 %bcond_without bluetooth
@@ -71,23 +61,31 @@
 %else
 %bcond_with    test
 %endif
+%if "%{?bcond_default_lto}" == ""
 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
 %bcond_without lto
 %else
 %bcond_with    lto
 %endif
+%else
+%if %{bcond_default_lto}
+%bcond_without lto
+%else
+%bcond_with    lto
+%endif
+%endif
 %bcond_with    sanitizer
 %if 0%{?fedora}
 %bcond_without connectivity_fedora
 %else
 %bcond_with connectivity_fedora
 %endif
-%if 0%{?rhel} && 0%{?rhel} > 7
+%if 0%{?rhel} && 0%{?rhel} >= 8
 %bcond_without connectivity_redhat
 %else
 %bcond_with connectivity_redhat
 %endif
-%if 0%{?fedora} > 28 || 0%{?rhel} > 7
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
 %bcond_without crypto_gnutls
 %else
 %bcond_with crypto_gnutls
@@ -97,7 +95,7 @@
 %else
 %bcond_without iwd
 %endif
-%if 0%{?fedora} > 31 || 0%{?rhel} > 7
+%if 0%{?fedora} >= 32 || 0%{?rhel} >= 8
 %bcond_without firewalld_zone
 %else
 %bcond_with firewalld_zone
@@ -105,7 +103,7 @@
 
 ###############################################################################
 
-%if 0%{?fedora} || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} >= 8
 %global dbus_version 1.9.18
 %global dbus_sys_dir %{_datadir}/dbus-1/system.d
 %else
@@ -127,15 +125,15 @@
 %global with_modem_manager_1 0
 %endif
 
-%if 0%{?fedora} >= 31 || 0%{?rhel} > 7
+%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
 %global dhcp_default internal
 %else
 %global dhcp_default dhclient
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} >= 8
 %global logging_backend_default journal
-%if 0%{?fedora} || 0%{?rhel} > 8
+%if 0%{?fedora} || 0%{?rhel} >= 9
 %global dns_rc_manager_default auto
 %else
 %global dns_rc_manager_default symlink
@@ -145,19 +143,19 @@
 %global dns_rc_manager_default file
 %endif
 
-%if 0%{?rhel} > 8 || 0%{?fedora} > 32
+%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
 %global config_plugins_default_ifcfg_rh 0
 %else
 %global config_plugins_default_ifcfg_rh 1
 %endif
 
-%if 0%{?rhel} > 9 || 0%{?fedora} > 35
+%if 0%{?fedora} >= 36 || 0%{?rhel} >= 10
 %global split_ifcfg_rh 1
 %else
 %global split_ifcfg_rh 0
 %endif
 
-%if 0%{?rhel} > 8 || 0%{?fedora} > 35
+%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9
 %global ifcfg_warning 1
 %else
 %global ifcfg_warning 0
@@ -201,7 +199,7 @@ Source7: readme-ifcfg-rh.txt
 #Patch1: 0001-some.patch
 
 Requires(post): systemd
-%if 0%{?fedora} || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Requires(post): systemd-udev
 %endif
 Requires(post): /usr/sbin/update-alternatives
@@ -247,8 +245,7 @@ BuildRequires: meson
 BuildRequires: automake
 BuildRequires: autoconf
 %endif
-BuildRequires: intltool
-BuildRequires: gettext-devel
+BuildRequires: gettext-devel >= 0.19.8
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: glib2-devel >= 2.40.0
@@ -261,7 +258,6 @@ BuildRequires: gnutls-devel >= 2.12
 %else
 BuildRequires: nss-devel >= 3.11.7
 %endif
-BuildRequires: dhclient
 BuildRequires: readline-devel
 BuildRequires: audit-libs-devel
 %if %{with regen_docs}
@@ -290,14 +286,20 @@ BuildRequires: mobile-broadband-provider-info-devel
 BuildRequires: newt-devel
 %endif
 BuildRequires: /usr/bin/dbus-launch
-%if 0%{?fedora} > 27 || 0%{?rhel} > 7
+%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
 BuildRequires: python3
 BuildRequires: python3-gobject-base
 BuildRequires: python3-dbus
+BuildRequires: python3-pexpect
 %else
 BuildRequires: python2
 BuildRequires: pygobject3-base
 BuildRequires: dbus-python
+BuildRequires: pexpect
+%if 0%{?rhel} >= 7 && %{with meson}
+BuildRequires: python36-dbus
+BuildRequires: python36-gobject
+%endif
 %endif
 BuildRequires: libselinux-devel
 BuildRequires: polkit-devel
@@ -312,7 +314,7 @@ BuildRequires: libubsan
 BuildRequires: firewalld-filesystem
 %endif
 BuildRequires: iproute
-%if 0%{?fedora} || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} >= 8
 BuildRequires: iproute-tc
 %endif
 
@@ -401,7 +403,7 @@ Requires: wireless-regdb
 Requires: crda
 %endif
 
-%if %{with iwd} && (0%{?fedora} > 24 || 0%{?rhel} > 7)
+%if %{with iwd} && (0%{?fedora} >= 25 || 0%{?rhel} >= 8)
 Requires: (wpa_supplicant >= %{wpa_supplicant_version} or iwd)
 Suggests: wpa_supplicant
 %else
@@ -614,8 +616,9 @@ Preferably use nmcli instead.
 %if %{with test}
 	--werror \
 %endif
-	-Dnft=/usr/sbin/nft \
-	-Diptables=/usr/sbin/iptables \
+	-Dnft=%{_sbindir}/nft \
+	-Diptables=%{_sbindir}/iptables \
+	-Ddhclient=%{_sbindir}/dhclient \
 	-Ddhcpcanon=no \
 	-Ddhcpcd=no \
 	-Dconfig_dhcp_default=%{dhcp_default} \
@@ -680,6 +683,7 @@ Preferably use nmcli instead.
 %else
 	-Ddocs=false \
 %endif
+	-Dqt=false \
 %if %{with team}
 	-Dteamdctl=true \
 %else
@@ -707,6 +711,7 @@ Preferably use nmcli instead.
 %endif
 	-Dsession_tracking=systemd \
 	-Dsuspend_resume=systemd \
+	-Dsystemdsystemunitdir=%{_unitdir} \
 	-Dsystem_ca_path=/etc/pki/tls/cert.pem \
 	-Ddbus_conf_dir=%{dbus_sys_dir} \
 	-Dtests=yes \
@@ -714,8 +719,11 @@ Preferably use nmcli instead.
 	-Difcfg_rh=true \
 	-Difupdown=false \
 %if %{with ppp}
-	-Dpppd_plugin_dir=%{_libdir}/pppd/%{ppp_version} \
 	-Dppp=true \
+	-Dpppd="%{_sbindir}/pppd" \
+	-Dpppd_plugin_dir="%{_libdir}/pppd/%{ppp_version}" \
+%else
+	-Dppp=false \
 %endif
 %if %{with firewalld_zone}
 	-Dfirewalld_zone=true \
@@ -739,14 +747,13 @@ Preferably use nmcli instead.
 gtkdocize
 %endif
 autoreconf --install --force
-intltoolize --automake --copy --force
 %configure \
 	--with-runstatedir=%{_rundir} \
-	--disable-silent-rules \
-	--disable-static \
-	--with-nft=/usr/sbin/nft \
-	--with-iptables=/usr/sbin/iptables \
-	--with-dhclient=yes \
+	--enable-silent-rules=no \
+	--enable-static=no \
+	--with-nft=%{_sbindir}/nft \
+	--with-iptables=%{_sbindir}/iptables \
+	--with-dhclient=%{_sbindir}/dhclient \
 	--with-dhcpcd=no \
 	--with-dhcpcanon=no \
 	--with-config-dhcp-default=%{dhcp_default} \
@@ -758,26 +765,26 @@ intltoolize --automake --copy --force
 %if %{with sanitizer}
 	--with-address-sanitizer=exec \
 %if 0%{?fedora} || 0%{?rhel} >= 8
-	--enable-undefined-sanitizer \
+	--enable-undefined-sanitizer=yes \
 %else
-	--disable-undefined-sanitizer \
+	--enable-undefined-sanitizer=no \
 %endif
 %else
 	--with-address-sanitizer=no \
-	--disable-undefined-sanitizer \
+	--enable-undefined-sanitizer=no \
 %endif
 %if %{with debug}
-	--enable-more-logging \
+	--enable-more-logging=yes \
 	--with-more-asserts=10000 \
 %else
-	--disable-more-logging \
-	--without-more-asserts \
+	--enable-more-logging=no \
+	--with-more-asserts=0 \
 %endif
-	--enable-ld-gc \
+	--enable-ld-gc=yes \
 %if %{with lto}
-	--enable-lto \
+	--enable-lto=yes \
 %else
-	--disable-lto \
+	--enable-lto=no \
 %endif
 	--with-libaudit=yes-disabled-by-default \
 %if 0%{?with_modem_manager_1}
@@ -816,11 +823,11 @@ intltoolize --automake --copy --force
 	--with-nm-cloud-setup=no \
 %endif
 	--enable-vala=yes \
-	--enable-introspection \
+	--enable-introspection=yes \
 %if %{with regen_docs}
-	--enable-gtk-doc \
+	--enable-gtk-doc=yes \
 %else
-	--disable-gtk-doc \
+	--enable-gtk-doc=no \
 %endif
 %if %{with team}
 	--enable-teamdctl=yes \
@@ -835,15 +842,16 @@ intltoolize --automake --copy --force
 	--with-selinux=yes \
 	--enable-polkit=yes \
 	--enable-modify-system=yes \
-	--enable-concheck \
+	--enable-concheck=yes \
 %if 0%{?fedora}
-	--with-libpsl \
+	--with-libpsl=yes \
 %else
-	--without-libpsl \
+	--with-libpsl=no \
 %endif
 	--with-ebpf=%{ebpf_enabled} \
 	--with-session-tracking=systemd \
 	--with-suspend-resume=systemd \
+	--with-systemdsystemunitdir=%{_unitdir} \
 	--with-system-ca-path=/etc/pki/tls/cert.pem \
 	--with-dbus-sys-dir=%{dbus_sys_dir} \
 	--with-tests=yes \
@@ -856,13 +864,16 @@ intltoolize --automake --copy --force
 	--enable-ifcfg-rh=yes \
 	--enable-ifupdown=no \
 %if %{with ppp}
-	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
 	--enable-ppp=yes \
+	--with-pppd="%{_sbindir}/pppd" \
+	--with-pppd-plugin-dir="%{_libdir}/pppd/%{ppp_version}" \
+%else
+	--enable-ppp=no \
 %endif
 %if %{with firewalld_zone}
-	--enable-firewalld-zone \
+	--enable-firewalld-zone=yes \
 %else
-	--disable-firewalld-zone \
+	--enable-firewalld-zone=no \
 %endif
 	--with-dist-version=%{version}-%{release} \
 %if %{?config_plugins_default_ifcfg_rh}
@@ -915,7 +926,7 @@ rm -f %{buildroot}%{nmplugindir}/*.la
 # Ensure the documentation timestamps are constant to avoid multilib conflicts
 find %{buildroot}%{_datadir}/gtk-doc -exec touch --reference configure.ac '{}' \+
 
-%if 0%{?__debug_package}
+%if 0%{?__debug_package} && ! 0%{?flatpak}
 mkdir -p %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version}
 cp valgrind.suppressions %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version}
 %endif
@@ -1072,10 +1083,10 @@ fi
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man7/nmcli-examples.7*
-%{_mandir}/man8/nm-initrd-generator.8.gz
-%{_mandir}/man8/NetworkManager.8.gz
-%{_mandir}/man8/NetworkManager-dispatcher.8.gz
-%{_mandir}/man8/NetworkManager-wait-online.service.8.gz
+%{_mandir}/man8/nm-initrd-generator.8*
+%{_mandir}/man8/NetworkManager.8*
+%{_mandir}/man8/NetworkManager-dispatcher.8*
+%{_mandir}/man8/NetworkManager-wait-online.service.8*
 %dir %{_localstatedir}/lib/NetworkManager
 %dir %{_sysconfdir}/sysconfig/network-scripts
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
@@ -1085,9 +1096,6 @@ fi
 %if %{with firewalld_zone}
 %{_prefix}/lib/firewalld/zones/nm-shared.xml
 %endif
-%if 0%{?ifcfg_warning}
-%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
-%endif
 # systemd stuff
 %{_unitdir}/NetworkManager.service
 %{_unitdir}/NetworkManager-wait-online.service
@@ -1095,6 +1103,9 @@ fi
 %{_unitdir}/nm-priv-helper.service
 %dir %{_datadir}/doc/NetworkManager/examples
 %{_datadir}/doc/NetworkManager/examples/server.conf
+%if 0%{?ifcfg_warning}
+%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
+%endif
 %doc NEWS AUTHORS README.md CONTRIBUTING.md
 %license COPYING
 %license COPYING.LGPL
@@ -1234,6 +1245,77 @@ 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
+- Update to 1.41.91 release (release candidate)
+
+* Fri Jan 20 2023 Fernando Fernandez Mancera <ffmancera@riseup.net> - 1:1.41.90-1
+- Update to 1.42-rc1 (1.41.90) (release candidate)
+- Upstream sync specfile
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.41.8-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Jan 16 2023 Beniamino Galvani <bgalvani@redhat.com> - 1:1.41.8-1
+- Update to 1.41.8 release (development)
+
+* Thu Dec 15 2022 Lubomir Rintel <lkundrak@v3.sk> - 1:1.41.7-1
+- Update to 1.41.7 release (development)
+
+* Wed Nov 30 2022 Thomas Haller <thaller@redhat.com> - 1:1.41.6-1
+- Update to 1.41.6 release (development)
+
+* Fri Nov 18 2022 Thomas Haller <thaller@redhat.com> - 1:1.41.5-1
+- Update to 1.41.5 release (development)
+
+* Thu Nov  3 2022 Thomas Haller <thaller@redhat.com> - 1:1.41.4-2
+- fix generating stable UUIDs for keyfile (gitlab#1130)
+
+* Wed Nov  2 2022 Wen Liang <wenliang@redhat.com> - 1:1.41.4-1
+- Upgrade to 1.41.4 release
+
+* Tue Oct 18 2022 Beniamino Galvani <bgalvani@redhat.com> - 1:1.41.3-1
+- Upgrade to 1.41.3 release
+
+* Fri Aug 26 2022 Thomas Haller <thaller@redhat.com> - 1:1.40.0-1
+- Upgrade to 1.40.0 release
+
+* Tue Aug 16 2022 Ana Cabral <acabral@redhat.com> - 1:1.39.90-1
+- Upgrade to 1.40-rc1 (1.39.90) (release candidate)
+- Upstream sync
+
+* Thu Jul 28 2022 Beniamino Galvani <bgalvani@redhat.com> - 1:1.39.11-1
+- Update to 1.39.11 release (development)
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.39.10-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jul 14 2022 Vojtech Bubela <vbubela@redhat.com> - 1:1.39.10-1
+- Update to 1.39.10 release (development)
+
+* Thu Jun 30 2022 Lubomir Rintel <lkundrak@v3.sk> - 1:1.39.8-1
+- Update to 1.39.8 release (development)
+
 * Mon May 30 2022 Ana Cabral <acabral@redhat.com> - 1:1.38.0-2
 - rpm: include an informational file in ifcfg files directory
 

sources

@@ -1 +1 @@
-SHA512 (NetworkManager-1.38.0.tar.xz) = 0f1532b4ea1aeb9d5dd922ee005eef325d39ba3526884793aaaed2eae61737f6a6e95644077f2b45ace569df79246d3d6404272cce02ca7e02b3632aee882940
+SHA512 (NetworkManager-1.43.6.tar.xz) = e1d898d3e6154018defcf189bc017a962ed93b9f5d7bafd90642cd70f9bbd4885874b24f716d524e52cf9e44c7ba338e3c416e78bd7b6ec6eaa1cb5066244504