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-08-05 19:50:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old) and /work/SRC/openSUSE:Factory/.NetworkManager.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager" Fri Aug 5 19:50:13 2022 rev:244 rq:992695 version:1.38.2 Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes 2022-06-28 15:21:31.821866980 +0200 +++ /work/SRC/openSUSE:Factory/.NetworkManager.new.1521/NetworkManager.changes 2022-08-05 19:50:38.529400059 +0200 @@ -1,0 +2,12 @@ +Thu Jul 28 13:34:51 UTC 2022 - Frederic Crozat <[email protected]> + +- Create /etc/NetworkManager/conf.d by default, allowing easy + override for NetworkManager.conf file with drop-in. +- Move default config file to + /usr/lib/NetworkManager/NetworkManager.conf, as part of main + package. +- Branding upstream package is now just a config drop-in to + disable conncheck. +- Ensure /usr/lib/NetworkManager/conf.d is part of the package. + +------------------------------------------------------------------- New: ---- conncheck-disabled.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.tn9m3r/_old 2022-08-05 19:50:39.217401836 +0200 +++ /var/tmp/diff_new_pack.tn9m3r/_new 2022-08-05 19:50:39.221401846 +0200 @@ -67,6 +67,7 @@ Source1: nfs Source2: NetworkManager.conf Source3: baselibs.conf +Source4: conncheck-disabled.conf Source98: macros.NetworkManager Source99: NetworkManager-rpmlintrc @@ -195,7 +196,7 @@ NetworkManager library. %package branding-upstream -Summary: Default upstream configuration for %{_sysconfdir}/NetworkManager/NetworkManager.conf +Summary: Default upstream configuration for NetworkManager Group: Productivity/Networking/System Requires: NetworkManager = %{version} Supplements: (NetworkManager and branding-upstream) @@ -205,7 +206,7 @@ %description branding-upstream This package provides the default upstream configuration for -%{_sysconfdir}/NetworkManager/NetworkManager.conf. Specifically, +NetworkManager. Specifically, it is not configured for connection checking against http://conncheck.opensuse.org. For, the version with connection checking, install %{name}-branding-openSUSE. @@ -344,14 +345,16 @@ %find_lang %{name} %fdupes %{buildroot}%{_datadir}/gtk-doc/ mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/VPN +mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/{VPN,conf.d} mkdir -p %{buildroot}%{_localstatedir}/log/ -mkdir -p %{buildroot}%{_localstatedir}/lib/NetworkManager +mkdir -p %{buildroot}%{_localstatedir}/lib/NetworkManager/dispatcher.d mkdir -p %{buildroot}%{_prefix}/lib/NetworkManager/VPN touch %{buildroot}%{_localstatedir}/log/NetworkManager mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/system-connections install -m 0755 %{SOURCE1} %{buildroot}%{_prefix}/lib/NetworkManager/dispatcher.d/ -install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/NetworkManager/ +install -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/NetworkManager/ +chmod 0644 %{buildroot}%{_prefix}/lib/NetworkManager/NetworkManager.conf +install -m 0644 %{SOURCE4} %{buildroot}%{_prefix}/lib/NetworkManager/conf.d # Install RPM macros to be consumed by plugins mkdir -p %{buildroot}%{_rpmmacrodir} install -m 0644 %{SOURCE98} %{buildroot}%{_rpmmacrodir}/ @@ -420,6 +423,7 @@ %{_libexecdir}/nm-priv-helper %dir %{_sysconfdir}/NetworkManager %dir %{_sysconfdir}/NetworkManager/VPN +%dir %{_sysconfdir}/NetworkManager/conf.d %dir %{_sysconfdir}/NetworkManager/dispatcher.d %dir %{_sysconfdir}/NetworkManager/system-connections %attr(0755,root,root) %{_prefix}/lib/NetworkManager/dispatcher.d/nfs @@ -433,6 +437,8 @@ %{_unitdir}/nm-priv-helper.service %ghost %config(noreplace) %{_localstatedir}/log/NetworkManager %dir %{_prefix}/lib/NetworkManager +%{_prefix}/lib/NetworkManager/NetworkManager.conf +%dir %{_prefix}/lib/NetworkManager/conf.d %dir %{_prefix}/lib/NetworkManager/dispatcher.d %dir %{_prefix}/lib/NetworkManager/dispatcher.d/no-wait.d %dir %{_prefix}/lib/NetworkManager/dispatcher.d/pre-up.d @@ -468,7 +474,7 @@ %files lang -f %{name}.lang %files branding-upstream -%config(noreplace) %{_sysconfdir}/NetworkManager/NetworkManager.conf +%{_prefix}/lib/NetworkManager/conf.d/conncheck-disabled.conf %files pppoe %{_libdir}/NetworkManager/%{version}/libnm-device-plugin-adsl.so ++++++ NetworkManager.conf ++++++ --- /var/tmp/diff_new_pack.tn9m3r/_old 2022-08-05 19:50:39.281402001 +0200 +++ /var/tmp/diff_new_pack.tn9m3r/_new 2022-08-05 19:50:39.297402042 +0200 @@ -1,4 +1,53 @@ +# Configuration file for NetworkManager. +# +# See "man 5 NetworkManager.conf" for details. +# +# The directories /usr/lib/NetworkManager/conf.d/ and /run/NetworkManager/conf.d/ +# can contain additional .conf snippets installed by packages. These files are +# read before NetworkManager.conf and have thus lowest priority. +# The directory /etc/NetworkManager/conf.d/ can contain additional .conf +# snippets. Those snippets are merged last and overwrite the settings from this main +# file. +# +# The files within one conf.d/ directory are read in asciibetical order. +# +# You can prevent loading a file /usr/lib/NetworkManager/conf.d/NAME.conf +# by having a file NAME.conf in either /run/NetworkManager/conf.d/ or /etc/NetworkManager/conf.d/. +# Likewise, snippets from /run can be prevented from loading by placing +# a file with the same name in /etc/NetworkManager/conf.d/. +# +# If two files define the same key, the one that is read afterwards will overwrite +# the previous one. + [main] -plugins=keyfile -dhcp=dhclient +#plugins=keyfile + + +[logging] +# When debugging NetworkManager, enabling debug logging is of great help. +# +# Logfiles contain no passwords and little sensitive information. But please +# check before posting the file online. You can also personally hand over the +# logfile to a NM developer to treat it confidential. Meet us on #nm on Libera.Chat. +# +# You can also change the log-level at runtime via +# $ nmcli general logging level TRACE domains ALL +# However, usually it's cleaner to enable debug logging +# in the configuration and restart NetworkManager so that +# debug logging is enabled from the start. +# +# You will find the logfiles in syslog, for example via +# $ journalctl -u NetworkManager +# +# Please post full logfiles for bug reports without pre-filtering or truncation. +# Also, for debugging the entire `journalctl` output can be interesting. Don't +# limit unnecessarily with `journalctl -u`. Exceptions are if you are worried +# about private data. Check before posting logfiles! +# +# Note that debug logging of NetworkManager can be quite verbose. Some messages +# might be rate-limited by the logging daemon (see RateLimitIntervalSec, RateLimitBurst +# in man journald.conf). Please disable rate-limiting before collecting debug logs! +# +#level=TRACE +#domains=ALL ++++++ conncheck-disabled.conf ++++++ # Disable connectivity checking for NetworkManager. # See `man NetworkManager.conf`. # # Note that connectivity checking works badly with rp_filter set to # strict. Check "/proc/sys/net/ipv4/conf/*/rp_filter". [connectivity] enabled=false
