diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/libnm0.symbols | 36 | ||||
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 18 | ||||
| -rw-r--r-- | debian/patches/libnm-docs-fix-gtk-doc-generation-for-settings.patch | 100 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
5 files changed, 155 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index df51e32d..58e5cea8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +network-manager (1.42.0-1) unstable; urgency=medium + + * New upstream version 1.42.0 + * Rebase patches + * Update symbols file for libnm0 + * Cherry-pick upstream patch to fix regression in gtk-doc generation + + -- Michael Biebl <biebl@debian.org> Fri, 10 Feb 2023 17:38:16 +0100 + network-manager (1.40.12-1ubuntu1) lunar; urgency=medium * Resynchronize on Debian, remaining changes: diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index 9d8bf21c..947f3520 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -32,6 +32,7 @@ libnm.so.0 libnm0 #MINVER# 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_4@libnm_1_40_4 1.40.4 + libnm_1_42_0@libnm_1_42_0 1.42.0 libnm_1_4_0@libnm_1_4_0 1.4.0 libnm_1_6_0@libnm_1_6_0 1.6.0 libnm_1_8_0@libnm_1_8_0 1.8.0 @@ -164,6 +165,7 @@ libnm.so.0 libnm0 #MINVER# nm_client_get_state@libnm_1_0_0 1.0.0 nm_client_get_type@libnm_1_0_0 1.0.0 nm_client_get_version@libnm_1_0_0 1.0.0 + nm_client_get_version_info@libnm_1_42_0 1.42.0 nm_client_instance_flags_get_type@libnm_1_24_0 1.24.0 nm_client_load_connections@libnm_1_0_0 1.0.0 nm_client_load_connections_async@libnm_1_0_0 1.0.0 @@ -184,6 +186,8 @@ libnm.so.0 libnm0 #MINVER# nm_client_save_hostname_async@libnm_1_0_0 1.0.0 nm_client_save_hostname_finish@libnm_1_0_0 1.0.0 nm_client_set_logging@libnm_1_0_0 1.0.0 + nm_client_wait_shutdown@libnm_1_42_0 1.42.0 + nm_client_wait_shutdown_finish@libnm_1_42_0 1.42.0 nm_client_wimax_get_enabled@libnm_1_0_0 1.0.0 nm_client_wimax_hardware_get_enabled@libnm_1_0_0 1.0.0 nm_client_wimax_set_enabled@libnm_1_0_0 1.0.0 @@ -366,6 +370,7 @@ libnm.so.0 libnm0 #MINVER# nm_device_ip_tunnel_get_type@libnm_1_2_0 1.2.0 nm_device_is_real@libnm_1_2_0 1.2.0 nm_device_is_software@libnm_1_0_0 1.0.0 + nm_device_loopback_get_type@libnm_1_42_0 1.42.0 nm_device_macsec_get_cipher_suite@libnm_1_6_0 1.6.0 nm_device_macsec_get_encoding_sa@libnm_1_6_0 1.6.0 nm_device_macsec_get_encrypt@libnm_1_6_0 1.6.0 @@ -407,6 +412,7 @@ libnm.so.0 libnm0 #MINVER# nm_device_reapply@libnm_1_2_0 1.2.0 nm_device_reapply_async@libnm_1_2_0 1.2.0 nm_device_reapply_finish@libnm_1_2_0 1.2.0 + nm_device_reapply_flags_get_type@libnm_1_42_0 1.42.0 nm_device_set_autoconnect@libnm_1_0_0 1.0.0 nm_device_set_managed@libnm_1_2_0 1.2.0 nm_device_state_get_type@libnm_1_0_0 1.0.0 @@ -643,6 +649,14 @@ libnm.so.0 libnm0 #MINVER# nm_object_get_path@libnm_1_0_0 1.0.0 nm_object_get_type@libnm_1_0_0 1.0.0 nm_radio_flags_get_type@libnm_1_38_0 1.38.0 + nm_range_cmp@libnm_1_42_0 1.42.0 + nm_range_from_str@libnm_1_42_0 1.42.0 + nm_range_get_range@libnm_1_42_0 1.42.0 + nm_range_get_type@libnm_1_42_0 1.42.0 + nm_range_new@libnm_1_42_0 1.42.0 + nm_range_ref@libnm_1_42_0 1.42.0 + nm_range_to_str@libnm_1_42_0 1.42.0 + nm_range_unref@libnm_1_42_0 1.42.0 nm_remote_connection_commit_changes@libnm_1_0_0 1.0.0 nm_remote_connection_commit_changes_async@libnm_1_0_0 1.0.0 nm_remote_connection_commit_changes_finish@libnm_1_0_0 1.0.0 @@ -1015,6 +1029,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ip_config_clear_routes@libnm_1_0_0 1.0.0 nm_setting_ip_config_clear_routing_rules@libnm_1_18_0 1.18.0 nm_setting_ip_config_get_address@libnm_1_0_0 1.0.0 + nm_setting_ip_config_get_auto_route_ext_gw@libnm_1_42_0 1.42.0 nm_setting_ip_config_get_dad_timeout@libnm_1_2_0 1.1.91 nm_setting_ip_config_get_dhcp_hostname@libnm_1_0_0 1.0.0 nm_setting_ip_config_get_dhcp_hostname_flags@libnm_1_22_0 1.22.0 @@ -1062,6 +1077,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ip_tunnel_get_encapsulation_limit@libnm_1_40_4 1.40.4 nm_setting_ip_tunnel_get_flags@libnm_1_12_0 1.12.0 nm_setting_ip_tunnel_get_flow_label@libnm_1_40_4 1.40.4 + nm_setting_ip_tunnel_get_fwmark@libnm_1_42_0 1.42.0 nm_setting_ip_tunnel_get_input_key@libnm_1_2_0 1.2.0 nm_setting_ip_tunnel_get_local@libnm_1_2_0 1.2.0 nm_setting_ip_tunnel_get_mode@libnm_1_2_0 1.2.0 @@ -1075,6 +1091,9 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ip_tunnel_get_type@libnm_1_2_0 1.2.0 nm_setting_ip_tunnel_new@libnm_1_2_0 1.2.0 nm_setting_lookup_type@libnm_1_0_0 1.0.0 + nm_setting_loopback_get_mtu@libnm_1_42_0 1.42.0 + nm_setting_loopback_get_type@libnm_1_42_0 1.42.0 + nm_setting_loopback_new@libnm_1_42_0 1.42.0 nm_setting_mac_randomization_get_type@libnm_1_2_0 1.2.0 nm_setting_macsec_get_encrypt@libnm_1_6_0 1.6.0 nm_setting_macsec_get_mka_cak@libnm_1_6_0 1.6.0 @@ -1148,6 +1167,8 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ovs_bridge_new@libnm_1_10_0 1.10.0 nm_setting_ovs_dpdk_get_devargs@libnm_1_20_0 1.20.0 nm_setting_ovs_dpdk_get_n_rxq@libnm_1_36_0 1.36.0 + nm_setting_ovs_dpdk_get_n_rxq_desc@libnm_1_42_0 1.42.0 + nm_setting_ovs_dpdk_get_n_txq_desc@libnm_1_42_0 1.42.0 nm_setting_ovs_dpdk_get_type@libnm_1_20_0 1.20.0 nm_setting_ovs_dpdk_new@libnm_1_20_0 1.20.0 nm_setting_ovs_external_ids_check_key@libnm_1_30_0 1.30.0 @@ -1158,19 +1179,31 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ovs_external_ids_new@libnm_1_30_0 1.30.0 nm_setting_ovs_external_ids_set_data@libnm_1_30_0 1.30.0 nm_setting_ovs_interface_get_interface_type@libnm_1_10_0 1.10.0 + nm_setting_ovs_interface_get_ofport_request@libnm_1_42_0 1.42.0 nm_setting_ovs_interface_get_type@libnm_1_10_0 1.10.0 nm_setting_ovs_interface_new@libnm_1_10_0 1.10.0 + nm_setting_ovs_other_config_get_data@libnm_1_42_0 1.42.0 + nm_setting_ovs_other_config_get_data_keys@libnm_1_42_0 1.42.0 + nm_setting_ovs_other_config_get_type@libnm_1_42_0 1.42.0 + nm_setting_ovs_other_config_new@libnm_1_42_0 1.42.0 + nm_setting_ovs_other_config_set_data@libnm_1_42_0 1.42.0 nm_setting_ovs_patch_get_peer@libnm_1_10_0 1.10.0 nm_setting_ovs_patch_get_type@libnm_1_10_0 1.10.0 nm_setting_ovs_patch_new@libnm_1_10_0 1.10.0 + nm_setting_ovs_port_add_trunk@libnm_1_42_0 1.42.0 + nm_setting_ovs_port_clear_trunks@libnm_1_42_0 1.42.0 nm_setting_ovs_port_get_bond_downdelay@libnm_1_10_0 1.10.0 nm_setting_ovs_port_get_bond_mode@libnm_1_10_0 1.10.0 nm_setting_ovs_port_get_bond_updelay@libnm_1_10_0 1.10.0 nm_setting_ovs_port_get_lacp@libnm_1_10_0 1.10.0 + nm_setting_ovs_port_get_num_trunks@libnm_1_42_0 1.42.0 nm_setting_ovs_port_get_tag@libnm_1_10_0 1.10.0 + nm_setting_ovs_port_get_trunk@libnm_1_42_0 1.42.0 nm_setting_ovs_port_get_type@libnm_1_10_0 1.10.0 nm_setting_ovs_port_get_vlan_mode@libnm_1_10_0 1.10.0 nm_setting_ovs_port_new@libnm_1_10_0 1.10.0 + nm_setting_ovs_port_remove_trunk@libnm_1_42_0 1.42.0 + nm_setting_ovs_port_remove_trunk_by_value@libnm_1_42_0 1.42.0 nm_setting_ppp_get_baud@libnm_1_0_0 1.0.0 nm_setting_ppp_get_crtscts@libnm_1_0_0 1.0.0 nm_setting_ppp_get_lcp_echo_failure@libnm_1_0_0 1.0.0 @@ -1310,6 +1343,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_vlan_get_num_priorities@libnm_1_0_0 1.0.0 nm_setting_vlan_get_parent@libnm_1_0_0 1.0.0 nm_setting_vlan_get_priority@libnm_1_0_0 1.0.0 + nm_setting_vlan_get_protocol@libnm_1_42_0 1.42.0 nm_setting_vlan_get_type@libnm_1_0_0 1.0.0 nm_setting_vlan_new@libnm_1_0_0 1.0.0 nm_setting_vlan_remove_priority@libnm_1_0_0 1.0.0 @@ -1579,6 +1613,7 @@ libnm.so.0 libnm0 #MINVER# nm_utils_bond_mode_int_to_string@libnm_1_2_0 1.2.0 nm_utils_bond_mode_string_to_int@libnm_1_2_0 1.2.0 nm_utils_check_virtual_device_compatibility@libnm_1_0_0 1.0.0 + nm_utils_ensure_gtypes@libnm_1_42_0 1.42.0 nm_utils_enum_from_str@libnm_1_0_6 1.0.6 nm_utils_enum_from_str@libnm_1_2_0 1.2.0 nm_utils_enum_get_values@libnm_1_2_0 1.2.0 @@ -1653,6 +1688,7 @@ libnm.so.0 libnm0 #MINVER# nm_utils_wifi_is_channel_valid@libnm_1_0_0 1.0.0 nm_utils_wifi_strength_bars@libnm_1_0_0 1.0.0 nm_utils_wpa_psk_valid@libnm_1_0_0 1.0.0 + nm_version_info_capability_get_type@libnm_1_42_0 1.42.0 nm_vlan_flags_get_type@libnm_1_0_0 1.0.0 nm_vlan_priority_map_get_type@libnm_1_0_0 1.0.0 nm_vpn_connection_get_banner@libnm_1_0_0 1.0.0 diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index ddbfcc9d..7a110977 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -12,10 +12,10 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 1 file changed, 115 insertions(+) diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c -index 822df7a..0992373 100644 +index 6654729..cb6ac7e 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c -@@ -52,6 +52,8 @@ +@@ -53,6 +53,8 @@ #define DEVICE_STATE_PRUNE_RATELIMIT_MAX 100u @@ -24,7 +24,7 @@ index 822df7a..0992373 100644 /*****************************************************************************/ typedef struct { -@@ -195,6 +197,10 @@ typedef struct { +@@ -197,6 +199,10 @@ typedef struct { GFileMonitor *fw_monitor; guint fw_changed_id; @@ -35,7 +35,7 @@ index 822df7a..0992373 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -1502,6 +1508,27 @@ find_best_device_state(NMManager *manager) +@@ -1529,6 +1535,27 @@ find_best_device_state(NMManager *manager) return best_state; } @@ -63,7 +63,7 @@ index 822df7a..0992373 100644 static void nm_manager_update_metered(NMManager *self) { -@@ -1548,6 +1575,9 @@ nm_manager_update_state(NMManager *self) +@@ -1575,6 +1602,9 @@ nm_manager_update_state(NMManager *self) else new_state = find_best_device_state(self); @@ -73,7 +73,7 @@ index 822df7a..0992373 100644 if (new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; } -@@ -6941,6 +6971,62 @@ impl_manager_get_logging(NMDBusObject *obj, +@@ -6972,6 +7002,62 @@ impl_manager_get_logging(NMDBusObject *obj, g_variant_new("(ss)", nm_logging_level_to_string(), nm_logging_domains_to_string())); } @@ -136,7 +136,7 @@ index 822df7a..0992373 100644 typedef struct { NMManager *self; GDBusMethodInvocation *context; -@@ -7237,6 +7323,9 @@ nm_manager_start(NMManager *self, GError **error) +@@ -7264,6 +7350,9 @@ nm_manager_start(NMManager *self, GError **error) nm_clear_g_source(&priv->devices_inited_id); priv->devices_inited_id = g_idle_add_full(G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL); @@ -146,7 +146,7 @@ index 822df7a..0992373 100644 return TRUE; } -@@ -8112,6 +8201,22 @@ nm_manager_init(NMManager *self) +@@ -8139,6 +8228,22 @@ nm_manager_init(NMManager *self) _LOGW(LOGD_CORE, "failed to monitor kernel firmware directory '%s'.", KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 822df7a..0992373 100644 priv->metered = NM_METERED_UNKNOWN; priv->sleep_devices = g_hash_table_new(nm_direct_hash, NULL); } -@@ -8399,6 +8504,16 @@ dispose(GObject *object) +@@ -8429,6 +8534,16 @@ dispose(GObject *object) g_clear_object(&priv->fw_monitor); } diff --git a/debian/patches/libnm-docs-fix-gtk-doc-generation-for-settings.patch b/debian/patches/libnm-docs-fix-gtk-doc-generation-for-settings.patch new file mode 100644 index 00000000..afb66d14 --- /dev/null +++ b/debian/patches/libnm-docs-fix-gtk-doc-generation-for-settings.patch @@ -0,0 +1,100 @@ +From: Thomas Haller <thaller@redhat.com> +Date: Fri, 10 Feb 2023 16:31:50 +0100 +Subject: 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 928ea5e..7a10848 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 5e742b6..01c9b66 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', diff --git a/debian/patches/series b/debian/patches/series index c2344eb9..ba6f6133 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ Force-online-state-with-unmanaged-devices.patch +libnm-docs-fix-gtk-doc-generation-for-settings.patch # Ubuntu patches Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch |