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-02-14 22:35:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager"
Mon Feb 14 22:35:57 2022 rev:233 rq:953947 version:1.34.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes
2021-09-29 20:18:34.478926046 +0200
+++ /work/SRC/openSUSE:Factory/.NetworkManager.new.1956/NetworkManager.changes
2022-02-14 22:36:02.505393456 +0100
@@ -1,0 +2,119 @@
+Wed Jan 26 21:06:29 UTC 2022 - Luciano Santos <luc1...@opensuse.org>
+
+- Packaging additions with Autotools replacement:
+ + Add Meson build requirement and replace Automake macros with
+ Meson equivalent ones as autotools will be deprecated in the
+ future.
+ + Options passed to Meson to mimmic our default preferences:
+ systemdsystemunitdir=%{_unitdir}, udev_dir=%{_udevdir},
+ dbus_conf_dir=%{_dbusconfdir}, iptables=%{_sbindir}/iptables,
+ dnsmasq=%{_sbindir}/dnsmasq, dnssec_trigger=%{_libexecdir}\
+ /dnssec-trigger-script, dist_version=%{version},
+ polkit_agent_helper_1=%{_libexecdir}/polkit-1\
+ /polkit-agent-helper-1, hostname_persist=suse, switchable
+ libaudit=%{libaudit_meson_opt}, iwd=true, pppd=%{_sbindir}\
+ /pppd, pppd_plugin_dir=%{_pppddir}, nm_cloud_setup=true,
+ bluez5_dun=true, netconfig=%{_sbindir}/netconfig,
+ dhclient=%{_sbindir}/dhclient, docs=true, switchable
+ tests=%{tests_meson_opt}, more_asserts=0, more_logging=false,
+ qt=false, and switchable teamdctl=true (teamctl is about to be
+ deprecated).
+ + Add conditionalized audit pkgconfig module build requirement to
+ allow easier feature testing, and pass
+ 'yes-disabled-by-default' to 'libaudit' Meson option. As an
+ observation: Meson defaults passing 'yes' to this feature.
+ + Add explicit c++_compiler build requirement to avoid build
+ abortion.
+ + Add explicit libselinux pkgconfig module build requirement
+ checked by Meson and was already being pulled in by some other
+ package.
+ + Add polkit-gobject-1 pkgconfig module build requirement checked
+ by Meson and needed for user auth-polkit support.
+ + Add mobile-broadband-provider-info pkgconfig module build
+ requirement checked by Meson and needed for ModemManager1
+ interface support.
+ + Add sed command to fix server.conf config file location from
+ defaultdocdir/NetworkManager/examples to
+ defaultdocdir/NetworkManager.
+ + Add useful %{_pppddir} and %{_dbusconfdir} macros to spec file,
+ while dropping no longed needed pppddir shell variable
+ definition and 'test -n "$pppddir" || exit 1' construct.
+ + Add "< 1.21" version to libnm-glib-vpn1, libnm-glib4, and
+ libnm-util2 < 1.21 to main package's Obsoletes tags, following
+ packaging good practices to avoid future unwated behavior
+ regarding versioning schemes.
+ + Replace %version macro with hardcoded "0.9.1" version to the
+ devel subpackage's %name-doc Obsoletes tag following packaging
+ good practices to avoid future unwanted behaviors regarding
+ versioning schemes (the doc subpackage was merged with the
+ devel one in the 0.9.0 release).
+ + Pass "%{?no_lang_C}" to %find_lang macro to avoid stripping
+ any English translations (the default language) from main
+ package.
+- Packaging deletions with Autotools replacement:
+ + Remove data/server.conf from %doc macro in files section as it
+ no longer works with Meson.
+ + Remove "rm" command on server.conf file following sed command
+ addition to fix the right location of the file.
+ + Remove no longer useful conditional build abortion depending
+ whether or not netconfig support was found
+ 'grep "with_netconfig='no'" config.log' since this file isn't
+ generated by Meson.
+ + Remove no longer needed "find" command for GNU Libtool LA files
+ deletion.
+ + Drop no longer needed libtool build requirement as Meson does
+ not use it.
+ + Drop redundant sysconfig-netconfig build requirement as it does
+ not add anything to the build anymore.
+ + Drop comment about suse-release build requirement not being
+ needed anymore, it's been deprecated for almost a decade now.
+ + Drop setBadness for 'dbus-file-unauthorized' in the rpmlintrc:
+ the new dbus file has been whitelisted already (bsc#1194799).
+
+-------------------------------------------------------------------
+Thu Jan 20 14:24:56 UTC 2022 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Split out NetworkManager-pppoe, needed to configure regular PPPoE
+ connections (Not very common, as most users have PPPoE routers
+ for the DSL connections).
+
+-------------------------------------------------------------------
+Fri Jan 14 17:50:43 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Update to version 1.34.0:
+ + initrd: wait for both IPv4 and IPv6 with "ip=dhcp,dhcp6"
+ + core: better handle sd-resolved errors when resolving hostnames
+ + nmcli: fix import WireGuard profile with DNS domain and address
+ family disabled
+ + ndisc: send router solicitations before expiry
+ + policy: send earlier the ip configs to the DNS manager
+ + core: support linking with LLD 13
+ + wireguard: importing wg-quick configuration files with nmcli
+ no longer sets a negative, exclusive "dns-priority". This plays
+ better with common split DNS setups that use systemd-resolved.
+ Adjust the "dns-priority" to your liking after import yourself.
+ + NetworkManager no longer listens for netlink events for traffic
+ control objects (qdiscs and filters).
+ + core: add internal nm-priv-helper service for separating
+ privileges and have a way to drop capabilities from
+ NetworkManager daemon.
+ + bond: add support for setting queue-id of bond port.
+ + dns: support configuring DNS over TLS (DoT) with
+ systemd-resolved.
+ + nmtui: add support for WireGuard profiles.
+ + nmcli: add aliases `nmcli device up|down` beside
+ connect|disconnect.
+ + conscious language: Deprecate 'Device.Slaves' D-Bus property in
+ favor of new 'Device.Ports' property. Depracate
+ 'nm_device_*_get_slaves()' in favor of 'nm_device_get_ports()'
+ in libnm.
+ + nmcli: invoking nmcli command without arguments will now show
+ 'default' instead of null address in route4 or route6 section.
+- Refresh patches with quilt.
+- Replace addFilter("suse-branding-unversioned-requires*") from
+ rpmlintrc, with the current branding-requires-unversioned.
+- Update our Supplements to current standard.
+- Add the new internal nm-priv-helper.service to pre(un)/post(un)
+ handling.
+
+-------------------------------------------------------------------
Old:
----
NetworkManager-1.32.12.tar.xz
New:
----
NetworkManager-1.34.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.RG6gTF/_old 2022-02-14 22:36:03.173395197 +0100
+++ /var/tmp/diff_new_pack.RG6gTF/_new 2022-02-14 22:36:03.173395197 +0100
@@ -1,7 +1,7 @@
#
# spec file for package NetworkManager
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,19 +16,58 @@
#
+# TODO for the 1.36 release:
+# Drop support for TEAMDCTL as it should have been deprecated by then.
+# And don't forget about its BuildRequire and meson option.
+
# Toggle this whenever enabling/disabling the
nm-probe-radius-server-cert.patch patch (as we export additional symbols)
# Like this, g-c-c and NM-applet, which consume this symbol, will block
updating NM if we have to disable the patch until
# they are touched too
%define with_cacert_patch 0
-%define _udevdir %(pkg-config --variable udevdir udev)
+%global _udevdir %(pkg-config --variable udevdir udev)
+%global _pppddir %(ls -d %{_libdir}/pppd/2.?.?)
+%global _dbusconfdir %{_datadir}/dbus-1/system.d
+
+### Handy switches for easy testing of experimental features:
+# (Remember that _with = OFF and _without = ON)
+
+# FIXME: We should find out how to run specific tests and avoid
+# tests that are doomed to fail in OBS.
+# From "test-client.py --help":
+# test-client.py MyTestCase.testSomething - run MyTestCase.testSomething
+# Summary of Failures:
+#07/74 check-local-exports-libnm FAIL 0.11s exit status 1
+#08/74 platform/test-address-linux FAIL 0.03s killed by signal 6 SIGABRT
+#10/74 platform/test-cleanup-linux FAIL 0.03s killed by signal 6 SIGABRT
+#12/74 platform/test-link-linux FAIL 0.03s killed by signal 6 SIGABRT
+#16/74 platform/test-route-linux FAIL 0.03s killed by signal 6 SIGABRT
+#17/74 platform/test-tc-linux FAIL 0.03s killed by signal 6 SIGABRT
+#24/74 test-l3cfg FAIL 0.10s killed by signal 6 SIGABRT
+#38/74 devices/test-acd FAIL 0.04s killed by signal 6 SIGABRT
+%bcond_with TESTS
+%if %{with TESTS}
+%define tests_meson_opt yes
+%else
+%define tests_meson_opt no
+%endif
+
+# Libaudit: yes-disabled-by-default enables support, but disables
+# it unless explicitly configured via NetworkManager.conf
+%bcond_without LIBAUDIT
+%if %{with LIBAUDIT}
+%define libaudit_meson_opt yes-disabled-by-default
+%else
+%define libaudit_meson_opt no
+%endif
+
Name: NetworkManager
-Version: 1.32.12
+Version: 1.34.0
Release: 0
Summary: Network Link Manager and user applications for it
License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Productivity/Networking/System
URL: https://www.gnome.org/projects/NetworkManager/
-Source0:
https://download.gnome.org/sources/NetworkManager/1.32/%{name}-%{version}.tar.xz
+Source0:
https://download.gnome.org/sources/NetworkManager/1.34/%{name}-%{version}.tar.xz
Source1: nfs
Source2: NetworkManager.conf
Source3: baselibs.conf
@@ -50,24 +89,18 @@
# PATCH-FIX-UPSTREAM nm-dhcp-use-valid-lease-on-timeout.patch
glfd#NetworkManager/NetworkManager!811, bsc#1183202 sck...@suse.com Support
valid lease file on dhcp timeout
Patch8: nm-dhcp-use-valid-lease-on-timeout.patch
+BuildRequires: c++_compiler
BuildRequires: dnsmasq
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: iptables
-BuildRequires: libtool
+BuildRequires: meson
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
BuildRequires: ppp-devel
-# Required for tests
BuildRequires: python3-dbus-python
-BuildRequires: python3-gobject
BuildRequires: readline-devel
BuildRequires: rp-pppoe
-# Do not use suse-release, it's very late in build chain and not needed
-# all it does is netconfig and ifconfig enablement
-#BuildRequires: suse-release
-# for /sbin/netconfig: integration with netconfig is required
-BuildRequires: sysconfig-netconfig
BuildRequires: wireless-tools
BuildRequires: perl(YAML)
BuildRequires: pkgconfig(bluez) >= 5
@@ -84,14 +117,28 @@
BuildRequires: pkgconfig(libnl-genl-3.0)
BuildRequires: pkgconfig(libnl-route-3.0)
BuildRequires: pkgconfig(libpsl) >= 0.1
+BuildRequires: pkgconfig(libselinux)
BuildRequires: pkgconfig(libsystemd) >= 209
+## TODO: teamdctl says: Retire me when I'm ready please!
BuildRequires: pkgconfig(libteam)
+##
BuildRequires: pkgconfig(libudev) >= 175
BuildRequires: pkgconfig(mm-glib) >= 0.7.991
+BuildRequires: pkgconfig(mobile-broadband-provider-info)
BuildRequires: pkgconfig(nss)
+BuildRequires: pkgconfig(polkit-gobject-1)
BuildRequires: pkgconfig(udev)
BuildRequires: pkgconfig(uuid)
BuildRequires: pkgconfig(vapigen)
+### Conditional BRs
+%if %{with LIBAUDIT}
+BuildRequires: pkgconfig(audit)
+%endif
+## Required for tests
+%if %{with TESTS}
+#BuildRequires: python3-gobject
+%endif
+##
Requires: NetworkManager-branding
Requires: dhcp-client
Requires: iproute2
@@ -99,20 +146,17 @@
Requires: mozilla-nss
Requires: sysconfig-netconfig >= 0.80.5
Requires: wpa_supplicant >= 0.6.4
-%requires_eq ppp
Recommends: dnsmasq
Recommends: iptables
Recommends: org.freedesktop.ModemManager
-# Recommend the rp-pppoe binary for PPP over Ethernet (common for ADSL)
connections.
-Recommends: rp-pppoe
# Provides required by sysconfig. The latter is used by older versions.
Provides: dhcdbd = 1.14
Provides: service(network)
Provides: sysvinit(network)
Obsoletes: dhcdbd < 1.14
-Obsoletes: libnm-glib-vpn1
-Obsoletes: libnm-glib4
-Obsoletes: libnm-util2
+Obsoletes: libnm-glib-vpn1 < 1.32
+Obsoletes: libnm-glib4 < 1.32
+Obsoletes: libnm-util2 < 1.32
%{?systemd_ordering}
%description
@@ -130,7 +174,7 @@
Requires: libnm0 = %{version}
Requires: typelib-1_0-NM-1_0 = %{version}
Provides: %{name}-doc = %{version}
-Obsoletes: %{name}-doc < %{version}
+Obsoletes: %{name}-doc < 0.9.1
%description devel
This package contains various headers accessing some NetworkManager
@@ -159,7 +203,7 @@
Summary: Default upstream configuration for
%{_sysconfdir}/NetworkManager/NetworkManager.conf
Group: Productivity/Networking/System
Requires: NetworkManager = %{version}
-Supplements: packageand(NetworkManager:branding-upstream)
+Supplements: (NetworkManager and branding-upstream)
Conflicts: NetworkManager-branding
Provides: NetworkManager-branding = %{version}
BuildArch: noarch
@@ -171,6 +215,19 @@
http://conncheck.opensuse.org. For, the version with connection
checking, install %{name}-branding-openSUSE.
+%package pppoe
+Summary: NetworkManager plugin for ADSL connections
+Requires: %{name} = %{version}
+Enhances: %{name}
+Supplements: (%{name} and rp-pppoe)
+Requires: rp-pppoe
+%requires_eq ppp
+
+%description pppoe
+NetworkManager plugin for ADSL connections.
+
+This package is needed to configure PPPoE interfaces
+
%lang_package
%prep
@@ -185,48 +242,49 @@
%patch7 -p1
%patch8 -p1
+# Fix server.conf's location, to end up in %%{_defaultdocdir}/%%{name},
+# rather then %%{_datadir}/doc/%%{name}/examples:
+sed -i -r "/install_dir: join_paths/s/(nm_datadir, 'doc)\
+(', nm_name), 'examples'/\1\/packages\2/" data/meson.build
+
%build
-NOCONFIGURE=1 ./autogen.sh
-pppddir=`ls -1d %{_libdir}/pppd/2*`
-test -n "$pppddir" || exit 1
export CFLAGS="%{optflags} -fno-strict-aliasing -fcommon"
export PYTHON=%{_bindir}/python3
-%configure \
- --disable-silent-rules \
- --with-hostname-persist=suse \
- --enable-ld-gc \
- --enable-lto \
- --disable-static \
- --with-crypto=nss \
- --enable-gtk-doc \
- --with-tests=yes \
- --with-netconfig=yes \
- --with-config-dns-rc-manager-default=netconfig \
- --enable-more-warnings=no \
- --with-pppd-plugin-dir=$pppddir \
- --with-dhclient=/sbin/dhclient \
- --with-dhcpcd=no \
- --with-udev-dir=%{_udevdir} \
- --with-modem-manager-1 \
- --enable-concheck \
- --enable-wifi=yes \
- --with-nmtui \
- --with-session-tracking=systemd \
- --with-suspend-resume=systemd \
- --with-iwd=yes
-# Fail if netconfig was not detected. Avoids future occurences of bnc#817592
-if grep "with_netconfig='no'" config.log; then
- print netconfig support was not found -- BUILD ABORTED
- false
-fi
-make %{?_smp_mflags} nmrundir="/run/%{name}"
-
-#check
-#make %{?_smp_mflags} check
+# TODO: teamdctl says: Retire me when I'm ready please!
+%meson \
+ -Dsystemdsystemunitdir=%{_unitdir} \
+ -Dudev_dir=%{_udevdir} \
+ -Ddbus_conf_dir=%{_dbusconfdir} \
+ -Diptables=%{_sbindir}/iptables \
+ -Ddnsmasq=%{_sbindir}/dnsmasq \
+ -Ddnssec_trigger=%{_libexecdir}/dnssec-trigger-script \
+ -Ddist_version=%{version} \
+ -Dpolkit_agent_helper_1=%{_libexecdir}/polkit-1/polkit-agent-helper-1 \
+ -Dhostname_persist=suse \
+ -Dlibaudit=%{libaudit_meson_opt} \
+ -Diwd=true \
+ -Dpppd=%{_sbindir}/pppd \
+ -Dpppd_plugin_dir=%{_pppddir} \
+ -Dnm_cloud_setup=true \
+ -Dbluez5_dun=true \
+ -Dnetconfig=%{_sbindir}/netconfig \
+ -Ddhclient=%{_sbindir}/dhclient \
+ -Ddocs=true \
+ -Dtests=%{tests_meson_opt} \
+ -Dmore_asserts=0 \
+ -Dmore_logging=false \
+ -Dqt=false \
+ -Dteamdctl=true \
+ %{nil}
+%meson_build
+
+%if %{with TESTS}
+%check
+%meson_test
+%endif
%install
-%make_install nmrundir="/run/%{name}"
-find %{buildroot} -type f -name "*.la" -delete -print
+%meson_install
%find_lang %{name}
%fdupes %{buildroot}%{_datadir}/gtk-doc/
mkdir -p %{buildroot}%{_bindir}
@@ -242,30 +300,27 @@
mkdir -p %{buildroot}%{_rpmmacrodir}
install -m 0644 %{SOURCE98} %{buildroot}%{_rpmmacrodir}/
-# We package this one as %%doc in the default location.
-rm %{buildroot}%{_datadir}/doc/NetworkManager/examples/server.conf
-
# drop on demand activation, it is handled as a system service
rm -f
%{buildroot}%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
%pre
-%service_add_pre NetworkManager.service NetworkManager-dispatcher.service
nm-cloud-setup.service
+%service_add_pre NetworkManager.service NetworkManager-dispatcher.service
nm-cloud-setup.service nm-priv-helper.service
%post
-%service_add_post NetworkManager.service NetworkManager-dispatcher.service
nm-cloud-setup.service
+%service_add_post NetworkManager.service NetworkManager-dispatcher.service
nm-cloud-setup.service nm-priv-helper.service
%preun
-%service_del_preun NetworkManager.service NetworkManager-dispatcher.service
nm-cloud-setup.service
+%service_del_preun NetworkManager.service NetworkManager-dispatcher.service
nm-cloud-setup.service nm-priv-helper.service
%postun
-%service_del_postun NetworkManager.service NetworkManager-dispatcher.service
nm-cloud-setup.service
+%service_del_postun NetworkManager.service NetworkManager-dispatcher.service
nm-cloud-setup.service nm-priv-helper.service
%post -n libnm0 -p /sbin/ldconfig
%postun -n libnm0 -p /sbin/ldconfig
%files
%license COPYING
-%doc ChangeLog NEWS AUTHORS README TODO data/server.conf
+%doc ChangeLog NEWS AUTHORS README TODO
%{_bindir}/nm-online
%{_bindir}/nmcli
%{_bindir}/nmtui*
@@ -291,26 +346,23 @@
%{_mandir}/man7/nmcli-examples.7%{?ext_man}
%{_mandir}/man8/NetworkManager.8%{?ext_man}
%{_mandir}/man8/nm-cloud-setup.8%{?ext_man}
-%{_mandir}/man8/nm-initrd-generator.8%{ext_man}
-%{_mandir}/man8/NetworkManager-dispatcher.8%{ext_man}
+%{_mandir}/man8/nm-initrd-generator.8%{?ext_man}
+%{_mandir}/man8/NetworkManager-dispatcher.8%{?ext_man}
%dir %{_libdir}/NetworkManager
%dir %{_libdir}/NetworkManager/%{version}
-%{_libdir}/NetworkManager/%{version}/libnm-device-plugin-adsl.so
%{_libdir}/NetworkManager/%{version}/libnm-device-plugin-bluetooth.so
%{_libdir}/NetworkManager/%{version}/libnm-device-plugin-ovs.so
%{_libdir}/NetworkManager/%{version}/libnm-device-plugin-team.so
%{_libdir}/NetworkManager/%{version}/libnm-device-plugin-wifi.so
%{_libdir}/NetworkManager/%{version}/libnm-device-plugin-wwan.so
-%{_libdir}/NetworkManager/%{version}/libnm-ppp-plugin.so
%{_libdir}/NetworkManager/%{version}/libnm-wwan.so
-%dir %{_libdir}/pppd/2.*
-%{_libdir}/pppd/2.*/nm-pppd-plugin.*
%{_libexecdir}/nm-cloud-setup
%{_libexecdir}/nm-daemon-helper
%{_libexecdir}/nm-dhcp-helper
%{_libexecdir}/nm-dispatcher
%{_libexecdir}/nm-iface-helper
%{_libexecdir}/nm-initrd-generator
+%{_libexecdir}/nm-priv-helper
%dir %{_sysconfdir}/NetworkManager
%dir %{_sysconfdir}/NetworkManager/VPN
%dir %{_sysconfdir}/NetworkManager/dispatcher.d
@@ -326,6 +378,7 @@
%{_udevdir}/rules.d/90-nm-thunderbolt.rules
%{_unitdir}/nm-cloud-setup.service
%{_unitdir}/nm-cloud-setup.timer
+%{_unitdir}/nm-priv-helper.service
%ghost %config(noreplace) %{_localstatedir}/log/NetworkManager
%dir %{_prefix}/lib/NetworkManager
%dir %{_prefix}/lib/NetworkManager/dispatcher.d
@@ -338,8 +391,11 @@
%dir %{_prefix}/lib/firewalld
%dir %{_prefix}/lib/firewalld/zones
%{_prefix}/lib/firewalld/zones/nm-shared.xml
-%{_datadir}/dbus-1/system.d/nm-dispatcher.conf
-%{_datadir}/dbus-1/system.d/org.freedesktop.NetworkManager.conf
+%{_dbusconfdir}/nm-dispatcher.conf
+%{_dbusconfdir}/org.freedesktop.NetworkManager.conf
+%{_datadir}/dbus-1/system-services/org.freedesktop.nm-priv-helper.service
+%{_dbusconfdir}/nm-priv-helper.conf
+%{_defaultdocdir}/NetworkManager/server.conf
%files devel
%{_includedir}/libnm/
@@ -364,4 +420,10 @@
%files branding-upstream
%config(noreplace) %{_sysconfdir}/NetworkManager/NetworkManager.conf
+%files pppoe
+%{_libdir}/NetworkManager/%{version}/libnm-device-plugin-adsl.so
+%{_libdir}/NetworkManager/%{version}/libnm-ppp-plugin.so
+%dir %{_libdir}/pppd/2.*
+%{_libdir}/pppd/2.*/nm-pppd-plugin.*
+
%changelog
++++++ 0001-Coerce-connectivity-LIMITED-to-NONE-when-device-is-d.patch ++++++
--- /var/tmp/diff_new_pack.RG6gTF/_old 2022-02-14 22:36:03.213395300 +0100
+++ /var/tmp/diff_new_pack.RG6gTF/_new 2022-02-14 22:36:03.213395300 +0100
@@ -12,11 +12,11 @@
src/devices/nm-device.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-Index: NetworkManager-1.32.0/src/core/devices/nm-device.c
+Index: NetworkManager-1.34.0/src/core/devices/nm-device.c
===================================================================
---- NetworkManager-1.32.0.orig/src/core/devices/nm-device.c
-+++ NetworkManager-1.32.0/src/core/devices/nm-device.c
-@@ -4292,7 +4292,8 @@ concheck_update_state(NMDevice *
+--- NetworkManager-1.34.0.orig/src/core/devices/nm-device.c
++++ NetworkManager-1.34.0/src/core/devices/nm-device.c
+@@ -4399,7 +4399,8 @@ concheck_update_state(NMDevice *
state = NM_CONNECTIVITY_LIMITED;
} else
state = NM_CONNECTIVITY_NONE;
++++++ NetworkManager-1.32.12.tar.xz -> NetworkManager-1.34.0.tar.xz ++++++
++++ 107086 lines of diff (skipped)
++++++ NetworkManager-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.RG6gTF/_old 2022-02-14 22:36:05.257400627 +0100
+++ /var/tmp/diff_new_pack.RG6gTF/_new 2022-02-14 22:36:05.261400638 +0100
@@ -1,6 +1,6 @@
-# We have an unversioned suse-branding-unversioned-requires
+# We have an unversioned branding-requires-unversioned
# NetworkManager-branding on purpose, hence filter it out.
-addFilter("suse-branding-unversioned-requires*");
+addFilter("branding-requires-unversioned*");
# Filter out warning about missing systemd-service-without-service
# post/pre/postun/preun, we do not want to enable this service by
++++++ nm-dhcp-use-valid-lease-on-timeout.patch ++++++
--- /var/tmp/diff_new_pack.RG6gTF/_old 2022-02-14 22:36:05.313400773 +0100
+++ /var/tmp/diff_new_pack.RG6gTF/_new 2022-02-14 22:36:05.317400784 +0100
@@ -19,11 +19,11 @@
src/core/dhcp/nm-dhcp-dhcpcd.c | 1 +
4 files changed, 12 insertions(+), 10 deletions(-)
-Index: NetworkManager-1.32.0/src/core/devices/nm-device.c
+Index: NetworkManager-1.34.0/src/core/devices/nm-device.c
===================================================================
---- NetworkManager-1.32.0.orig/src/core/devices/nm-device.c
-+++ NetworkManager-1.32.0/src/core/devices/nm-device.c
-@@ -9342,6 +9342,7 @@ dhcp4_state_changed(NMDhcpClient *client
+--- NetworkManager-1.34.0.orig/src/core/devices/nm-device.c
++++ NetworkManager-1.34.0/src/core/devices/nm-device.c
+@@ -9495,6 +9495,7 @@ dhcp4_notify(NMDhcpClient *client, const
switch (state) {
case NM_DHCP_STATE_BOUND:
case NM_DHCP_STATE_EXTENDED:
@@ -31,7 +31,7 @@
if (!ip4_config) {
_LOGW(LOGD_DHCP4, "failed to get IPv4 config in response to DHCP
event.");
dhcp4_fail(self, state);
-@@ -9388,9 +9389,6 @@ dhcp4_state_changed(NMDhcpClient *client
+@@ -9542,9 +9543,6 @@ dhcp4_notify(NMDhcpClient *client, const
dhcp4_fail(self, state);
}
break;
@@ -41,10 +41,10 @@
case NM_DHCP_STATE_EXPIRE:
/* Ignore expiry before we even have a lease (NAK, old lease, etc) */
if (priv->ip_state_4 == NM_DEVICE_IP_STATE_CONF)
-Index: NetworkManager-1.32.0/src/core/dhcp/nm-dhcp-client.c
+Index: NetworkManager-1.34.0/src/core/dhcp/nm-dhcp-client.c
===================================================================
---- NetworkManager-1.32.0.orig/src/core/dhcp/nm-dhcp-client.c
-+++ NetworkManager-1.32.0/src/core/dhcp/nm-dhcp-client.c
+--- NetworkManager-1.34.0.orig/src/core/dhcp/nm-dhcp-client.c
++++ NetworkManager-1.34.0/src/core/dhcp/nm-dhcp-client.c
@@ -20,6 +20,7 @@
#include "NetworkManagerUtils.h"
@@ -53,7 +53,7 @@
#include "nm-dhcp-utils.h"
#include "nm-dhcp-options.h"
#include "libnm-platform/nm-platform.h"
-@@ -446,14 +447,14 @@ nm_dhcp_client_set_state(NMDhcpClient *s
+@@ -473,14 +474,14 @@ nm_dhcp_client_set_state(NMDhcpClient *s
if (NM_IN_SET(new_state, NM_DHCP_STATE_BOUND, NM_DHCP_STATE_EXTENDED)) {
g_return_if_fail(NM_IS_IP_CONFIG_ADDR_FAMILY(ip_config,
priv->addr_family));
g_return_if_fail(options);
@@ -70,7 +70,7 @@
watch_cleanup(self);
/* The client may send same-state transitions for RENEW/REBIND events and
-@@ -552,8 +553,6 @@ nm_dhcp_client_watch_child(NMDhcpClient
+@@ -580,8 +581,6 @@ nm_dhcp_client_watch_child(NMDhcpClient
g_return_if_fail(priv->pid == -1);
priv->pid = pid;
@@ -79,7 +79,7 @@
g_return_if_fail(priv->watch_id == 0);
priv->watch_id = g_child_watch_add(pid, daemon_watch_cb, self);
}
-@@ -898,7 +897,9 @@ nm_dhcp_client_handle_event(gpointer
+@@ -953,7 +952,9 @@ nm_dhcp_client_handle_event(gpointer
if (new_state == NM_DHCP_STATE_NOOP)
return TRUE;
@@ -90,11 +90,11 @@
GVariantIter iter;
const char * name;
GVariant * value;
-Index: NetworkManager-1.32.0/src/core/dhcp/nm-dhcp-dhcpcanon.c
+Index: NetworkManager-1.34.0/src/core/dhcp/nm-dhcp-dhcpcanon.c
===================================================================
---- NetworkManager-1.32.0.orig/src/core/dhcp/nm-dhcp-dhcpcanon.c
-+++ NetworkManager-1.32.0/src/core/dhcp/nm-dhcp-dhcpcanon.c
-@@ -156,6 +156,7 @@ dhcpcanon_start(NMDhcpClient *client,
+--- NetworkManager-1.34.0.orig/src/core/dhcp/nm-dhcp-dhcpcanon.c
++++ NetworkManager-1.34.0/src/core/dhcp/nm-dhcp-dhcpcanon.c
+@@ -155,6 +155,7 @@ dhcpcanon_start(NMDhcpClient *client,
nm_assert(pid > 0);
_LOGI("dhcpcanon started with pid %d", pid);
nm_dhcp_client_watch_child(client, pid);
@@ -102,11 +102,11 @@
priv->pid_file = g_steal_pointer(&pid_file);
return TRUE;
}
-Index: NetworkManager-1.32.0/src/core/dhcp/nm-dhcp-dhcpcd.c
+Index: NetworkManager-1.34.0/src/core/dhcp/nm-dhcp-dhcpcd.c
===================================================================
---- NetworkManager-1.32.0.orig/src/core/dhcp/nm-dhcp-dhcpcd.c
-+++ NetworkManager-1.32.0/src/core/dhcp/nm-dhcp-dhcpcd.c
-@@ -155,6 +155,7 @@ ip4_start(NMDhcpClient *client, const ch
+--- NetworkManager-1.34.0.orig/src/core/dhcp/nm-dhcp-dhcpcd.c
++++ NetworkManager-1.34.0/src/core/dhcp/nm-dhcp-dhcpcd.c
+@@ -154,6 +154,7 @@ ip4_start(NMDhcpClient *client, const ch
nm_assert(pid > 0);
_LOGI("dhcpcd started with pid %d", pid);
nm_dhcp_client_watch_child(client, pid);
