From e3faa41fa3b3f5076f96c38e12dfa41b6e3b2e1e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 10 Feb 2023 11:55:36 +0100 Subject: New upstream version 1.42.0 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 21d4dc2c..651c17ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.42.0-1) UNRELEASED; urgency=medium + + * New upstream version 1.42.0 + + -- Michael Biebl Fri, 10 Feb 2023 11:55:33 +0100 + network-manager (1.40.12-1) unstable; urgency=medium * New upstream version 1.40.12 -- cgit 1.3.0-6-gf8a5 From 1725aa9676071a46c396ec27ef3184c6d8064fae Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 10 Feb 2023 11:56:00 +0100 Subject: Rebase patches --- .../Force-online-state-with-unmanaged-devices.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'debian') 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); } -- cgit 1.3.0-6-gf8a5 From 369a7d4becd21fb3e0c36d2909a33d9af93d0e3f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 10 Feb 2023 17:13:52 +0100 Subject: Update symbols file for libnm0 --- debian/libnm0.symbols | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'debian') 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 -- cgit 1.3.0-6-gf8a5 From fdad53b6960054a317650c03de35314c61cb89ef Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 10 Feb 2023 17:23:01 +0100 Subject: Cherry-pick upstream patch to fix regression in gtk-doc generation --- ...-docs-fix-gtk-doc-generation-for-settings.patch | 100 +++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 101 insertions(+) create mode 100644 debian/patches/libnm-docs-fix-gtk-doc-generation-for-settings.patch (limited to 'debian') 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 +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 a2d7e06d..44b4e480 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ Force-online-state-with-unmanaged-devices.patch +libnm-docs-fix-gtk-doc-generation-for-settings.patch -- cgit 1.3.0-6-gf8a5 From ed857ba34efc2ec899f2e3fbd8e35324561a55b2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 10 Feb 2023 17:38:31 +0100 Subject: Release version 1.42.0-1 to unstable --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 651c17ba..cfc13877 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -network-manager (1.42.0-1) UNRELEASED; urgency=medium +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 Fri, 10 Feb 2023 11:55:33 +0100 + -- Michael Biebl Fri, 10 Feb 2023 17:38:16 +0100 network-manager (1.40.12-1) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From 7e0cb6f12d7b09f91c22d0942fdcc23a86a16411 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 23 Feb 2023 17:15:23 +0100 Subject: New upstream version 1.42.2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cfc13877..b61e4089 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.42.2-1) UNRELEASED; urgency=medium + + * New upstream version 1.42.2 + + -- Michael Biebl Thu, 23 Feb 2023 17:15:18 +0100 + network-manager (1.42.0-1) unstable; urgency=medium * New upstream version 1.42.0 -- cgit 1.3.0-6-gf8a5 From 8e2937b7792c8fe2698b8ca79f1f4108bdd76c96 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 23 Feb 2023 17:18:17 +0100 Subject: Drop patches merged upstream --- ...-docs-fix-gtk-doc-generation-for-settings.patch | 100 --------------------- debian/patches/series | 1 - 2 files changed, 101 deletions(-) delete mode 100644 debian/patches/libnm-docs-fix-gtk-doc-generation-for-settings.patch (limited to 'debian') 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 deleted file mode 100644 index afb66d14..00000000 --- a/debian/patches/libnm-docs-fix-gtk-doc-generation-for-settings.patch +++ /dev/null @@ -1,100 +0,0 @@ -From: Thomas Haller -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 44b4e480..a2d7e06d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ Force-online-state-with-unmanaged-devices.patch -libnm-docs-fix-gtk-doc-generation-for-settings.patch -- cgit 1.3.0-6-gf8a5 From 80ded9902bbdb5723f33ae55890f15bea60c56f7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 23 Feb 2023 17:53:25 +0100 Subject: Update symbols file for libnm0 --- debian/libnm0.symbols | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index 947f3520..ce5311d1 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -33,6 +33,7 @@ libnm.so.0 libnm0 #MINVER# 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_42_2@libnm_1_42_2 1.42.2 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 @@ -56,6 +57,7 @@ libnm.so.0 libnm0 #MINVER# nm_activation_state_flags_get_type@libnm_1_10_0 1.10.0 nm_active_connection_get_connection@libnm_1_0_0 1.0.0 nm_active_connection_get_connection_type@libnm_1_0_0 1.0.0 + nm_active_connection_get_controller@libnm_1_42_2 1.42.2 nm_active_connection_get_default6@libnm_1_0_0 1.0.0 nm_active_connection_get_default@libnm_1_0_0 1.0.0 nm_active_connection_get_devices@libnm_1_0_0 1.0.0 @@ -1054,6 +1056,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ip_config_get_num_dns_searches@libnm_1_0_0 1.0.0 nm_setting_ip_config_get_num_routes@libnm_1_0_0 1.0.0 nm_setting_ip_config_get_num_routing_rules@libnm_1_18_0 1.18.0 + nm_setting_ip_config_get_replace_local_rule@libnm_1_42_2 1.42.2 nm_setting_ip_config_get_required_timeout@libnm_1_30_8 1.34.0 nm_setting_ip_config_get_required_timeout@libnm_1_32_4 1.32.12 nm_setting_ip_config_get_route@libnm_1_0_0 1.0.0 -- cgit 1.3.0-6-gf8a5 From d43f8a6d8c5c49b67e88235a6dbc85c905e1cbb2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 23 Feb 2023 17:53:57 +0100 Subject: Release version 1.42.2-1 to unstable --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b61e4089..cd978cf1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -network-manager (1.42.2-1) UNRELEASED; urgency=medium +network-manager (1.42.2-1) unstable; urgency=medium * New upstream version 1.42.2 + * Drop patches merged upstream + * Update symbols file for libnm0 - -- Michael Biebl Thu, 23 Feb 2023 17:15:18 +0100 + -- Michael Biebl Thu, 23 Feb 2023 17:53:42 +0100 network-manager (1.42.0-1) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From 557c2330c1499c44b21d8cee7ee980c7ecef1f40 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 3 Mar 2023 17:40:01 +0100 Subject: dnsmasq: process both global and per-device configuration Cherry-pick upstream patch to fix a regression introduced in 1.42 when using the dnsmasq DNS backend and a global DNS configuration. Closes: #1031891 --- ...-both-global-and-per-device-configuration.patch | 30 +++++++++++++ ...umentation-about-global-DNS-configuration.patch | 51 ++++++++++++++++++++++ debian/patches/series | 2 + 3 files changed, 83 insertions(+) create mode 100644 debian/patches/dnsmasq-process-both-global-and-per-device-configuration.patch create mode 100644 debian/patches/man-update-documentation-about-global-DNS-configuration.patch (limited to 'debian') diff --git a/debian/patches/dnsmasq-process-both-global-and-per-device-configuration.patch b/debian/patches/dnsmasq-process-both-global-and-per-device-configuration.patch new file mode 100644 index 00000000..0f0fdbc3 --- /dev/null +++ b/debian/patches/dnsmasq-process-both-global-and-per-device-configuration.patch @@ -0,0 +1,30 @@ +From: Beniamino Galvani +Date: Thu, 2 Mar 2023 18:02:48 +0100 +Subject: dnsmasq: process both global and per-device configuration + +The global configuration now can be valid when there are no global +domains defined. The dnsmasq backend must process it and then, if +there is no global default domain, also process the per-connection +settings. + +Fixes: 1f0d1d78d2a2 ('dns-manager: always apply options from [global-dns]') +(cherry picked from commit 5c0a927e0fd983a963f49cf8dccba6a82c95ef94) +(cherry picked from commit 89888f85aa5c6f115d2dda1888b4e5ce0946c634) +--- + src/core/dns/nm-dns-dnsmasq.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/core/dns/nm-dns-dnsmasq.c b/src/core/dns/nm-dns-dnsmasq.c +index 8ae1bb9..05aeff4 100644 +--- a/src/core/dns/nm-dns-dnsmasq.c ++++ b/src/core/dns/nm-dns-dnsmasq.c +@@ -922,7 +922,8 @@ create_update_args(NMDnsDnsmasq *self, + + if (global_config) + add_global_config(self, &servers, global_config); +- else { ++ ++ if (!global_config || !nm_global_dns_config_lookup_domain(global_config, "*")) { + c_list_for_each_entry (ip_data, ip_data_lst_head, ip_data_lst) + add_ip_config(self, &servers, ip_data); + } diff --git a/debian/patches/man-update-documentation-about-global-DNS-configuration.patch b/debian/patches/man-update-documentation-about-global-DNS-configuration.patch new file mode 100644 index 00000000..d5e88bb1 --- /dev/null +++ b/debian/patches/man-update-documentation-about-global-DNS-configuration.patch @@ -0,0 +1,51 @@ +From: Beniamino Galvani +Date: Thu, 2 Mar 2023 22:15:46 +0100 +Subject: man: update documentation about global DNS configuration + +Now the settings in the [global-dns] section are used *in addition* to +connection-specific ones. Only the global domains sections, when +valid, override connection settings. Update the man page to clarify +that. + +Fixes: 1f0d1d78d2a2 ('dns-manager: always apply options from [global-dns]') +(cherry picked from commit f57a848da5aa1a18cdcec22e9564462dea68a53f) +(cherry picked from commit 82134e4f832ff68e5fd8f9968cae32c6aed82ea6) +--- + man/NetworkManager.conf.xml | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml +index 2c1fc85..0dcf805 100644 +--- a/man/NetworkManager.conf.xml ++++ b/man/NetworkManager.conf.xml +@@ -1453,8 +1453,8 @@ managed=1 + + + <literal>global-dns</literal> section +- This section specifies global DNS settings that override +- connection-specific configuration. ++ This section specifies DNS settings that are applied ++ globally, in addition to connection-specific ones. + + + +@@ -1482,10 +1482,15 @@ managed=1 + Sections with a name starting with the "global-dns-domain-" + prefix allow to define global DNS configuration for specific + domains. The part of section name after "global-dns-domain-" +- specifies the domain name a section applies to. More specific +- domains have the precedence over less specific ones and the +- default domain is represented by the wildcard "*". A default +- domain section is mandatory. ++ specifies the domain name a section applies to (for example, a ++ section could be named "global-dns-domain-foobar.com"). More ++ specific domains have the precedence over less specific ones and ++ the default domain is represented by the wildcard "*". ++ ++ To be valid, global DNS domains must include a section for the ++ default domain "*". When the global DNS domains are valid, the ++ name servers and domains defined globally override the ones from ++ active connections. + + + diff --git a/debian/patches/series b/debian/patches/series index a2d7e06d..17887c89 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ Force-online-state-with-unmanaged-devices.patch +dnsmasq-process-both-global-and-per-device-configuration.patch +man-update-documentation-about-global-DNS-configuration.patch -- cgit 1.3.0-6-gf8a5 From 22d6ee88e62404d127054bfee20c28da1ee324ce Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 3 Mar 2023 17:57:54 +0100 Subject: Release version 1.42.2-2 to unstable --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cd978cf1..d12ec10a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +network-manager (1.42.2-2) unstable; urgency=medium + + * dnsmasq: process both global and per-device configuration. + Cherry-pick upstream patch to fix a regression introduced in 1.42 when + using the dnsmasq DNS backend and a global DNS configuration. + (Closes: #1031891) + + -- Michael Biebl Fri, 03 Mar 2023 17:57:30 +0100 + network-manager (1.42.2-1) unstable; urgency=medium * New upstream version 1.42.2 -- cgit 1.3.0-6-gf8a5 From 3f8dccc77211f252c073a40e58cdefb429679901 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 9 Mar 2023 19:08:28 +0100 Subject: New upstream version 1.42.4 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d12ec10a..f3d39c9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.42.4-1) UNRELEASED; urgency=medium + + * New upstream version 1.42.4 + + -- Michael Biebl Thu, 09 Mar 2023 19:08:26 +0100 + network-manager (1.42.2-2) unstable; urgency=medium * dnsmasq: process both global and per-device configuration. -- cgit 1.3.0-6-gf8a5 From 20b517af57c5966a0c1d32eb4706c192eebaa73f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 9 Mar 2023 19:09:20 +0100 Subject: Rebase patches Remove patches that have been merged upstream. --- ...-both-global-and-per-device-configuration.patch | 30 ------------- ...umentation-about-global-DNS-configuration.patch | 51 ---------------------- debian/patches/series | 2 - 3 files changed, 83 deletions(-) delete mode 100644 debian/patches/dnsmasq-process-both-global-and-per-device-configuration.patch delete mode 100644 debian/patches/man-update-documentation-about-global-DNS-configuration.patch (limited to 'debian') diff --git a/debian/patches/dnsmasq-process-both-global-and-per-device-configuration.patch b/debian/patches/dnsmasq-process-both-global-and-per-device-configuration.patch deleted file mode 100644 index 0f0fdbc3..00000000 --- a/debian/patches/dnsmasq-process-both-global-and-per-device-configuration.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Beniamino Galvani -Date: Thu, 2 Mar 2023 18:02:48 +0100 -Subject: dnsmasq: process both global and per-device configuration - -The global configuration now can be valid when there are no global -domains defined. The dnsmasq backend must process it and then, if -there is no global default domain, also process the per-connection -settings. - -Fixes: 1f0d1d78d2a2 ('dns-manager: always apply options from [global-dns]') -(cherry picked from commit 5c0a927e0fd983a963f49cf8dccba6a82c95ef94) -(cherry picked from commit 89888f85aa5c6f115d2dda1888b4e5ce0946c634) ---- - src/core/dns/nm-dns-dnsmasq.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/core/dns/nm-dns-dnsmasq.c b/src/core/dns/nm-dns-dnsmasq.c -index 8ae1bb9..05aeff4 100644 ---- a/src/core/dns/nm-dns-dnsmasq.c -+++ b/src/core/dns/nm-dns-dnsmasq.c -@@ -922,7 +922,8 @@ create_update_args(NMDnsDnsmasq *self, - - if (global_config) - add_global_config(self, &servers, global_config); -- else { -+ -+ if (!global_config || !nm_global_dns_config_lookup_domain(global_config, "*")) { - c_list_for_each_entry (ip_data, ip_data_lst_head, ip_data_lst) - add_ip_config(self, &servers, ip_data); - } diff --git a/debian/patches/man-update-documentation-about-global-DNS-configuration.patch b/debian/patches/man-update-documentation-about-global-DNS-configuration.patch deleted file mode 100644 index d5e88bb1..00000000 --- a/debian/patches/man-update-documentation-about-global-DNS-configuration.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Beniamino Galvani -Date: Thu, 2 Mar 2023 22:15:46 +0100 -Subject: man: update documentation about global DNS configuration - -Now the settings in the [global-dns] section are used *in addition* to -connection-specific ones. Only the global domains sections, when -valid, override connection settings. Update the man page to clarify -that. - -Fixes: 1f0d1d78d2a2 ('dns-manager: always apply options from [global-dns]') -(cherry picked from commit f57a848da5aa1a18cdcec22e9564462dea68a53f) -(cherry picked from commit 82134e4f832ff68e5fd8f9968cae32c6aed82ea6) ---- - man/NetworkManager.conf.xml | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml -index 2c1fc85..0dcf805 100644 ---- a/man/NetworkManager.conf.xml -+++ b/man/NetworkManager.conf.xml -@@ -1453,8 +1453,8 @@ managed=1 - - - <literal>global-dns</literal> section -- This section specifies global DNS settings that override -- connection-specific configuration. -+ This section specifies DNS settings that are applied -+ globally, in addition to connection-specific ones. - - - -@@ -1482,10 +1482,15 @@ managed=1 - Sections with a name starting with the "global-dns-domain-" - prefix allow to define global DNS configuration for specific - domains. The part of section name after "global-dns-domain-" -- specifies the domain name a section applies to. More specific -- domains have the precedence over less specific ones and the -- default domain is represented by the wildcard "*". A default -- domain section is mandatory. -+ specifies the domain name a section applies to (for example, a -+ section could be named "global-dns-domain-foobar.com"). More -+ specific domains have the precedence over less specific ones and -+ the default domain is represented by the wildcard "*". -+ -+ To be valid, global DNS domains must include a section for the -+ default domain "*". When the global DNS domains are valid, the -+ name servers and domains defined globally override the ones from -+ active connections. - - - diff --git a/debian/patches/series b/debian/patches/series index 17887c89..a2d7e06d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ Force-online-state-with-unmanaged-devices.patch -dnsmasq-process-both-global-and-per-device-configuration.patch -man-update-documentation-about-global-DNS-configuration.patch -- cgit 1.3.0-6-gf8a5 From 7fa37164212d5cf5f65fdf87f8391282c615bcd7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 9 Mar 2023 19:10:35 +0100 Subject: Use execute_before instead of override for dh_install --- debian/rules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 140dbbe7..307641f9 100755 --- a/debian/rules +++ b/debian/rules @@ -57,9 +57,8 @@ override_dh_auto_configure: --disable-modify-system \ --disable-ovs -override_dh_install: +execute_before_dh_install: find debian/tmp -name '*.la' -print -delete - dh_install override_dh_makeshlibs: dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/ -X/usr/lib/pppd/ -- cgit 1.3.0-6-gf8a5 From b488b783e17c844bd9e111263711e5203e66cf82 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 9 Mar 2023 19:37:39 +0100 Subject: Small indentation/formatting fixes Gbp-Dch: Ignore --- debian/org.freedesktop.NetworkManager.rules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/org.freedesktop.NetworkManager.rules b/debian/org.freedesktop.NetworkManager.rules index 83b05767..9e2b20d7 100644 --- a/debian/org.freedesktop.NetworkManager.rules +++ b/debian/org.freedesktop.NetworkManager.rules @@ -1,7 +1,7 @@ polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.NetworkManager.settings.modify.system" && - subject.local && subject.active && - (subject.isInGroup ("sudo") || subject.isInGroup ("netdev"))) { - return polkit.Result.YES; - } + if (action.id == "org.freedesktop.NetworkManager.settings.modify.system" && + subject.local && subject.active && + (subject.isInGroup ("sudo") || subject.isInGroup ("netdev"))) { + return polkit.Result.YES; + } }); -- cgit 1.3.0-6-gf8a5 From 12e1ee797bbf0b10d1fd5afd4b947484769f2b9f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 9 Mar 2023 19:47:33 +0100 Subject: Release version 1.42.4-1 to unstable --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f3d39c9f..c3104033 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -network-manager (1.42.4-1) UNRELEASED; urgency=medium +network-manager (1.42.4-1) unstable; urgency=medium * New upstream version 1.42.4 + * Rebase patches + * Use execute_before instead of override for dh_install - -- Michael Biebl Thu, 09 Mar 2023 19:08:26 +0100 + -- Michael Biebl Thu, 09 Mar 2023 19:42:33 +0100 network-manager (1.42.2-2) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5