diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 34 | ||||
| -rw-r--r-- | debian/libnm0.symbols | 39 | ||||
| -rw-r--r-- | debian/org.freedesktop.NetworkManager.rules | 10 | ||||
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 18 | ||||
| -rwxr-xr-x | debian/rules | 3 |
5 files changed, 88 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog index 5ef3f89e..55b71372 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,37 @@ +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 <biebl@debian.org> Thu, 09 Mar 2023 19:42:33 +0100 + +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 <biebl@debian.org> Fri, 03 Mar 2023 17:57:30 +0100 + +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 <biebl@debian.org> Thu, 23 Feb 2023 17:53:42 +0100 + +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-1~bpo11+1) bullseye-backports; urgency=medium * Rebuild for bullseye-backports diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index 9d8bf21c..ce5311d1 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -32,6 +32,8 @@ 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_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 @@ -55,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 @@ -164,6 +167,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 +188,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 +372,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 +414,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 +651,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 +1031,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 @@ -1039,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 @@ -1062,6 +1080,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 +1094,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 +1170,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 +1182,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 +1346,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 +1616,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 +1691,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/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; + } }); 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/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/ |