Merge ~nteodosio/network-manager:ubuntu/master into network-manager:ubuntu/master

Proposed by Nathan Teodosio
Status: Merged
Merged at revision: c8ef397fce467cc9d2cae0a9ea634dad846f3921
Proposed branch: ~nteodosio/network-manager:ubuntu/master
Merge into: network-manager:ubuntu/master
Diff against target: 6315 lines (+2111/-777)
97 files modified
Makefile.am (+14/-2)
Makefile.in (+142/-114)
NEWS (+19/-0)
config.h.in (+3/-0)
config.h.meson (+3/-0)
configure (+37/-16)
configure.ac (+16/-6)
debian/changelog (+12/-0)
docs/api/Makefile.in (+1/-0)
docs/api/html/NetworkManager.conf.html (+1/-1)
docs/api/html/index.html (+1/-1)
docs/api/html/ix01.html (+1/-1)
docs/api/html/nm-settings-dbus.html (+16/-3)
docs/api/html/nm-settings-ifcfg-rh.html (+17/-5)
docs/api/html/nm-settings-nmcli.html (+17/-3)
docs/api/html/settings-bond-port.html (+10/-2)
docs/api/settings-spec.xml (+1/-1)
docs/api/version.xml (+1/-1)
docs/libnm/Makefile.in (+1/-0)
docs/libnm/html/NMSecretAgentOld.html (+13/-13)
docs/libnm/html/NMSettingBondPort.html (+44/-0)
docs/libnm/html/api-index-full.html (+20/-0)
docs/libnm/html/index.html (+1/-1)
docs/libnm/html/libnm-nm-version-macros.html (+11/-1)
docs/libnm/html/libnm-nm-version.html (+10/-0)
docs/libnm/html/libnm.devhelp2 (+4/-0)
docs/libnm/html/usage.html (+19/-19)
docs/libnm/libnm-sections.txt (+4/-0)
docs/libnm/version.xml (+1/-1)
man/NetworkManager-dispatcher.8 (+2/-2)
man/NetworkManager-wait-online.service.8 (+2/-2)
man/NetworkManager.8 (+3/-3)
man/NetworkManager.conf.5 (+4/-4)
man/NetworkManager.conf.xml (+1/-1)
man/nm-cloud-setup.8 (+3/-3)
man/nm-initrd-generator.8 (+3/-3)
man/nm-online.1 (+3/-3)
man/nm-openvswitch.7 (+3/-3)
man/nm-settings-dbus.5 (+18/-4)
man/nm-settings-dbus.xml (+7/-3)
man/nm-settings-ifcfg-rh.5 (+18/-6)
man/nm-settings-ifcfg-rh.xml (+6/-4)
man/nm-settings-keyfile.5 (+3/-3)
man/nm-settings-keyfile.xml (+1/-1)
man/nm-settings-nmcli.5 (+17/-4)
man/nm-settings-nmcli.xml (+5/-3)
man/nmcli-examples.7 (+3/-3)
man/nmcli.1 (+3/-3)
man/nmtui.1 (+3/-3)
meson.build (+12/-3)
po/NetworkManager.pot (+215/-197)
src/core/devices/nm-device-bond.c (+58/-30)
src/core/devices/nm-device.c (+21/-3)
src/core/devices/team/nm-device-team.c (+2/-16)
src/core/devices/wifi/nm-device-wifi-p2p.c (+2/-2)
src/core/nm-firewall-utils.c (+2/-2)
src/core/nm-l3-ipv6ll.c (+22/-12)
src/core/platform/nm-fake-platform.c (+27/-1)
src/core/platform/tests/test-link.c (+50/-3)
src/core/ppp/meson.build (+5/-1)
src/core/ppp/nm-ppp-manager.c (+3/-3)
src/core/ppp/nm-ppp-mgr.c (+1/-1)
src/core/ppp/nm-ppp-status.h (+22/-15)
src/core/ppp/nm-pppd-compat.c (+308/-0)
src/core/ppp/nm-pppd-compat.h (+64/-0)
src/core/ppp/nm-pppd-plugin.c (+78/-120)
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c (+29/-6)
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c (+2/-0)
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h (+1/-1)
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c (+28/-8)
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband1 (+12/-0)
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband2 (+12/-0)
src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c (+63/-22)
src/libnm-base/nm-base.h (+1/-0)
src/libnm-client-impl/libnm.ver (+5/-0)
src/libnm-client-impl/tests/test-gir.py (+8/-14)
src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in (+4/-0)
src/libnm-core-impl/nm-connection.c (+31/-8)
src/libnm-core-impl/nm-setting-bond-port.c (+48/-2)
src/libnm-core-impl/nm-setting-infiniband.c (+40/-14)
src/libnm-core-impl/tests/test-general.c (+57/-5)
src/libnm-core-intern/nm-core-internal.h (+2/-0)
src/libnm-core-public/nm-setting-bond-port.h (+4/-0)
src/libnm-core-public/nm-version-macros.h (+2/-1)
src/libnm-core-public/nm-version-macros.h.in (+1/-0)
src/libnm-core-public/nm-version.h (+6/-0)
src/libnm-glib-aux/nm-shared-utils.h (+8/-0)
src/libnm-platform/nm-linux-platform.c (+100/-6)
src/libnm-platform/nm-platform.c (+119/-2)
src/libnm-platform/nm-platform.h (+37/-7)
src/libnmc-setting/nm-meta-setting-desc.c (+6/-0)
src/libnmc-setting/settings-docs.h (+2/-1)
src/libnmc-setting/settings-docs.h.in (+2/-1)
src/nm-cloud-setup/main.c (+33/-16)
src/nm-cloud-setup/nm-cloud-setup-utils.c (+2/-0)
src/nm-cloud-setup/nmcs-provider-aliyun.c (+2/-1)
src/nmcli/gen-metadata-nm-settings-nmcli.xml.in (+4/-1)
Reviewer Review Type Date Requested Status
Sebastien Bacher Pending
Review via email: mp+448879@code.staging.launchpad.net

Description of the change

The package built fine but dpkg-gensymbols produced

--->
--- debian/libnm0.symbols (libnm0_1.42.8-1ubuntu1_amd64)
+++ dpkg-gensymbolsJ74Ga5 2023-08-09 16:40:41.732200574 +0200
@@ -31,6 +31,7 @@
  libnm_1_36_0@libnm_1_36_0 1.36.0
  libnm_1_38_0@libnm_1_38_0 1.38.0
  libnm_1_40_0@libnm_1_40_0 1.40.0
+ libnm_1_40_20_bondp@libnm_1_40_20_bondp 1.42.8-1ubuntu1
  libnm_1_40_4@libnm_1_40_4 1.40.4
  libnm_1_42_0@libnm_1_42_0 1.42.0
  libnm_1_42_2@libnm_1_42_2 1.42.2
@@ -818,6 +819,7 @@
  nm_setting_bond_get_type@libnm_1_0_0 1.0.0
  nm_setting_bond_get_valid_options@libnm_1_0_0 1.0.0
  nm_setting_bond_new@libnm_1_0_0 1.0.0
+ nm_setting_bond_port_get_prio@libnm_1_40_20_bondp 1.42.8-1ubuntu1
  nm_setting_bond_port_get_queue_id@libnm_1_34_0 1.34.0
  nm_setting_bond_port_get_type@libnm_1_34_0 1.34.0
  nm_setting_bond_port_new@libnm_1_34_0 1.34.0
<---

This symbol was backported to 1.40.20 according to [1].

It is unclear to me why this was not included on Debian's 1.42.8-1, so I'm underlining here that I did alter the symbols file.

[1] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/bc0818fe1339bfd25b1b30cd7e86772cc8bee9c5

To post a comment you must log in.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches