diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 60 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/libnm0.symbols | 31 | ||||
| -rw-r--r-- | debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch | 40 | ||||
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 14 | ||||
| -rw-r--r-- | debian/patches/Update-dnsmasq-parameters.patch | 16 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
7 files changed, 107 insertions, 57 deletions
diff --git a/debian/changelog b/debian/changelog index b4b0a03a..f2150341 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,63 @@ +network-manager (1.24.0-1ubuntu1) UNRELEASED; urgency=medium + + * Resynchronize on Debian, remaining changes: + - Use systemd-resolved instead of dnsmasq + - debian/control: + + Depend on isc-dhcp-client instead of recommends + + Recommend network-manager-pptp + + Suggest avahi-autoipd for IPv4LL support + - debian/rules, debian/network-manager.postinst: + + Don't restart NetworkManager on upgrade but recommend restarting + the computer + - debian/rules, debian/network-manager.postinst: + + Don't install sysvinit scripts or migrate from sysvinit + - debian/network-manager.postinst: + + Don't add the netdev group. + + drop in an empty override file for NetworkManager to manage all + devices for upgrade from any version, as long as there is no + netplan configuration yet. + - debian/network-manager.maintscript + + Remove /etc/dbus-1/system.d/nm-ofono.conf + - debian/default-wifi-powersave-on.conf, debian/rules: + + Install a config file to enable WiFi powersave + - Enable build tests + - Add autopkgtests + - debian/source_network-manager.py, debian/network-manager.install, + debian/network-manager.links: Add apport hook + - Add network-manager-config-connectivity-ubuntu package + - NetworkManager.conf: disable MAC randomization feature. There is no + easy way for desktop users to disable this feature yet. And there are + reports that it doesn't work well with some systems. + - Update Vcs links to point to Ubuntu branch + - Add patches. See patch descriptions for more details: + + Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch + + Update-dnsmasq-parameters.patch + + Disable-general-with-expect.patch + + libnm-Check-self-still-NMManager-or-not.patch + + dns-manager-don-t-merge-split-DNS-search-domains.patch (but disabled) + + Read-system-connections-from-run.patch + - debian/tests/urfkill-integration - don't stop/start network manager + + -- Sebastien Bacher <seb128@ubuntu.com> Tue, 19 May 2020 17:07:30 +0200 + +network-manager (1.24.0-1) unstable; urgency=medium + + * New upstream version 1.24.0 + * Rebase patches + * Drop Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch + * Bump debhelper-compat to 13 + + -- Michael Biebl <biebl@debian.org> Sat, 09 May 2020 21:12:22 +0200 + +network-manager (1.23.90-1) unstable; urgency=medium + + * New upstream version 1.23.90 (1.24 rc1) + * Rebase patches + * Update symbols file for libnm0 + * Add Build-Depends-Package field to libnm0.symbols + + -- Michael Biebl <biebl@debian.org> Sun, 12 Apr 2020 00:46:53 +0200 + network-manager (1.22.10-1ubuntu3) groovy; urgency=medium * No-change rebuild to bump Groovy version number. diff --git a/debian/control b/debian/control index 149bb07b..8fcc6d53 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists. Uploaders: Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Aron Xu <aron@debian.org> -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), automake (>= 1.12), pkg-config, intltool, diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index f51b2a6b..b297ffd7 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -1,4 +1,5 @@ libnm.so.0 libnm0 #MINVER# +* Build-Depends-Package: libnm-dev libnm_1_0_0@libnm_1_0_0 1.0.0 libnm_1_0_4@libnm_1_0_4 1.0.4 libnm_1_0_6@libnm_1_0_6 1.0.6 @@ -16,6 +17,7 @@ libnm.so.0 libnm0 #MINVER# libnm_1_22_0@libnm_1_22_0 1.22.0 libnm_1_22_2@libnm_1_22_2 1.22.2 libnm_1_22_8@libnm_1_22_8 1.22.8 + libnm_1_24_0@libnm_1_24_0 1.23.90 libnm_1_2_0@libnm_1_2_0 1.1.90 libnm_1_2_4@libnm_1_2_4 1.2.4 libnm_1_4_0@libnm_1_4_0 1.4.0 @@ -108,6 +110,10 @@ libnm.so.0 libnm0 #MINVER# nm_client_connectivity_check_get_enabled@libnm_1_10_0 1.9.90 nm_client_connectivity_check_get_uri@libnm_1_20_0 1.19.90 nm_client_connectivity_check_set_enabled@libnm_1_10_0 1.9.90 + nm_client_dbus_call@libnm_1_24_0 1.23.90 + nm_client_dbus_call_finish@libnm_1_24_0 1.23.90 + nm_client_dbus_set_property@libnm_1_24_0 1.23.90 + nm_client_dbus_set_property_finish@libnm_1_24_0 1.23.90 nm_client_deactivate_connection@libnm_1_0_0 1.0.0 nm_client_deactivate_connection_async@libnm_1_0_0 1.0.0 nm_client_deactivate_connection_finish@libnm_1_0_0 1.0.0 @@ -132,16 +138,20 @@ libnm.so.0 libnm0 #MINVER# nm_client_get_dns_configuration@libnm_1_6_0 1.5.90 nm_client_get_dns_mode@libnm_1_6_0 1.5.90 nm_client_get_dns_rc_manager@libnm_1_6_0 1.5.90 + nm_client_get_instance_flags@libnm_1_24_0 1.23.90 nm_client_get_logging@libnm_1_0_0 1.0.0 nm_client_get_main_context@libnm_1_22_0 1.22.0 nm_client_get_metered@libnm_1_22_0 1.22.0 nm_client_get_nm_running@libnm_1_0_0 1.0.0 + nm_client_get_object_by_path@libnm_1_24_0 1.23.90 nm_client_get_permission_result@libnm_1_0_0 1.0.0 + nm_client_get_permissions_state@libnm_1_24_0 1.23.90 nm_client_get_primary_connection@libnm_1_0_0 1.0.0 nm_client_get_startup@libnm_1_0_0 1.0.0 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_instance_flags_get_type@libnm_1_24_0 1.23.90 nm_client_load_connections@libnm_1_0_0 1.0.0 nm_client_load_connections_async@libnm_1_0_0 1.0.0 nm_client_load_connections_finish@libnm_1_0_0 1.0.0 @@ -402,6 +412,8 @@ libnm.so.0 libnm0 #MINVER# nm_device_vlan_get_parent@libnm_1_0_0 1.0.0 nm_device_vlan_get_type@libnm_1_0_0 1.0.0 nm_device_vlan_get_vlan_id@libnm_1_0_0 1.0.0 + nm_device_vrf_get_table@libnm_1_24_0 1.23.90 + nm_device_vrf_get_type@libnm_1_24_0 1.23.90 nm_device_vxlan_get_ageing@libnm_1_2_0 1.1.90 nm_device_vxlan_get_dst_port@libnm_1_2_0 1.1.90 nm_device_vxlan_get_group@libnm_1_2_0 1.1.90 @@ -586,6 +598,7 @@ libnm.so.0 libnm0 #MINVER# nm_manager_reload_flags_get_type@libnm_1_22_0 1.22.0 nm_metered_get_type@libnm_1_0_6 1.0.6 nm_metered_get_type@libnm_1_2_0 1.1.90 + nm_object_get_client@libnm_1_24_0 1.23.90 nm_object_get_path@libnm_1_0_0 1.0.0 nm_object_get_type@libnm_1_0_0 1.0.0 nm_remote_connection_commit_changes@libnm_1_0_0 1.0.0 @@ -612,6 +625,12 @@ libnm.so.0 libnm0 #MINVER# nm_secret_agent_error_quark@libnm_1_0_0 1.0.0 nm_secret_agent_get_secrets_flags_get_type@libnm_1_0_0 1.0.0 nm_secret_agent_old_delete_secrets@libnm_1_0_0 1.0.0 + nm_secret_agent_old_destroy@libnm_1_24_0 1.23.90 + nm_secret_agent_old_enable@libnm_1_24_0 1.23.90 + nm_secret_agent_old_get_context_busy_watcher@libnm_1_24_0 1.23.90 + nm_secret_agent_old_get_dbus_connection@libnm_1_24_0 1.23.90 + nm_secret_agent_old_get_dbus_name_owner@libnm_1_24_0 1.23.90 + nm_secret_agent_old_get_main_context@libnm_1_24_0 1.23.90 nm_secret_agent_old_get_registered@libnm_1_0_0 1.0.0 nm_secret_agent_old_get_secrets@libnm_1_0_0 1.0.0 nm_secret_agent_old_get_type@libnm_1_0_0 1.0.0 @@ -649,6 +668,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_802_1x_get_client_cert_path@libnm_1_0_0 1.0.0 nm_setting_802_1x_get_client_cert_scheme@libnm_1_0_0 1.0.0 nm_setting_802_1x_get_client_cert_uri@libnm_1_6_0 1.5.90 + nm_setting_802_1x_get_domain_match@libnm_1_24_0 1.23.90 nm_setting_802_1x_get_domain_suffix_match@libnm_1_2_0 1.1.92 nm_setting_802_1x_get_eap_method@libnm_1_0_0 1.0.0 nm_setting_802_1x_get_identity@libnm_1_0_0 1.0.0 @@ -681,6 +701,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_802_1x_get_phase2_client_cert_path@libnm_1_0_0 1.0.0 nm_setting_802_1x_get_phase2_client_cert_scheme@libnm_1_0_0 1.0.0 nm_setting_802_1x_get_phase2_client_cert_uri@libnm_1_6_0 1.5.90 + nm_setting_802_1x_get_phase2_domain_match@libnm_1_24_0 1.23.90 nm_setting_802_1x_get_phase2_domain_suffix_match@libnm_1_2_0 1.1.92 nm_setting_802_1x_get_phase2_private_key_blob@libnm_1_0_0 1.0.0 nm_setting_802_1x_get_phase2_private_key_format@libnm_1_0_0 1.0.0 @@ -733,6 +754,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_bond_get_option@libnm_1_0_0 1.0.0 nm_setting_bond_get_option_by_name@libnm_1_0_0 1.0.0 nm_setting_bond_get_option_default@libnm_1_0_0 1.0.0 + nm_setting_bond_get_option_normalized@libnm_1_24_0 1.23.90 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 @@ -742,10 +764,14 @@ libnm.so.0 libnm0 #MINVER# nm_setting_bridge_clear_vlans@libnm_1_18_0 1.18.0 nm_setting_bridge_get_ageing_time@libnm_1_0_0 1.0.0 nm_setting_bridge_get_forward_delay@libnm_1_0_0 1.0.0 + nm_setting_bridge_get_group_address@libnm_1_24_0 1.23.90 nm_setting_bridge_get_group_forward_mask@libnm_1_10_0 1.9.90 nm_setting_bridge_get_hello_time@libnm_1_0_0 1.0.0 nm_setting_bridge_get_mac_address@libnm_1_0_0 1.0.0 nm_setting_bridge_get_max_age@libnm_1_0_0 1.0.0 + nm_setting_bridge_get_multicast_querier@libnm_1_24_0 1.23.90 + nm_setting_bridge_get_multicast_query_use_ifaddr@libnm_1_24_0 1.23.90 + nm_setting_bridge_get_multicast_router@libnm_1_24_0 1.23.90 nm_setting_bridge_get_multicast_snooping@libnm_1_2_0 1.1.90 nm_setting_bridge_get_num_vlans@libnm_1_18_0 1.18.0 nm_setting_bridge_get_priority@libnm_1_0_0 1.0.0 @@ -754,6 +780,8 @@ libnm.so.0 libnm0 #MINVER# nm_setting_bridge_get_vlan@libnm_1_18_0 1.18.0 nm_setting_bridge_get_vlan_default_pvid@libnm_1_18_0 1.18.0 nm_setting_bridge_get_vlan_filtering@libnm_1_18_0 1.18.0 + nm_setting_bridge_get_vlan_protocol@libnm_1_24_0 1.23.90 + nm_setting_bridge_get_vlan_stats_enabled@libnm_1_24_0 1.23.90 nm_setting_bridge_new@libnm_1_0_0 1.0.0 nm_setting_bridge_port_add_vlan@libnm_1_18_0 1.18.0 nm_setting_bridge_port_clear_vlans@libnm_1_18_0 1.18.0 @@ -1182,6 +1210,9 @@ libnm.so.0 libnm0 #MINVER# nm_setting_vpn_new@libnm_1_0_0 1.0.0 nm_setting_vpn_remove_data_item@libnm_1_0_0 1.0.0 nm_setting_vpn_remove_secret@libnm_1_0_0 1.0.0 + nm_setting_vrf_get_table@libnm_1_24_0 1.23.90 + nm_setting_vrf_get_type@libnm_1_24_0 1.23.90 + nm_setting_vrf_new@libnm_1_24_0 1.23.90 nm_setting_vxlan_get_ageing@libnm_1_2_0 1.1.90 nm_setting_vxlan_get_destination_port@libnm_1_2_0 1.1.90 nm_setting_vxlan_get_id@libnm_1_2_0 1.1.90 diff --git a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch deleted file mode 100644 index 098e89d7..00000000 --- a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Michael Biebl <biebl@debian.org> -Date: Sat, 12 Apr 2014 12:38:09 +0200 -Subject: Don't setup Sleep Monitor if not booted with systemd - -NetworkManager uses systemd for suspend/resume support. It listens for -the PrepareForSleep and Resume D-Bus signal sent by logind/systemd and -deactivates the interfaces on sleep and reactivates them on resume. -With a standalone logind we don't get a Resume signal and -NetworkManager remains in sleep mode where the devices are unmanaged. -As a workaround, skip the Sleep Monitor setup if not booted with -systemd. - -Closes: #742933 ---- - src/nm-sleep-monitor.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c -index c16dc07..cb2ca21 100644 ---- a/src/nm-sleep-monitor.c -+++ b/src/nm-sleep-monitor.c -@@ -10,6 +10,7 @@ - - #include <sys/stat.h> - #include <gio/gunixfdlist.h> -+#include <systemd/sd-daemon.h> - - #include "nm-core-internal.h" - #include "NetworkManagerUtils.h" -@@ -329,6 +330,10 @@ on_proxy_acquired (GObject *object, - static void - nm_sleep_monitor_init (NMSleepMonitor *self) - { -+ if (!sd_booted()) { -+ nm_log_warn (LOGD_SUSPEND, "Skipping Sleep Monitor setup, system not booted with systemd"); -+ return; -+ } - self->inhibit_fd = -1; - self->cancellable = g_cancellable_new (); - g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index c16fee62..776e9a95 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 1 file changed, 115 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c -index d7b2211..a89a8b7 100644 +index bbe5012..b303ec4 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -52,6 +52,8 @@ @@ -35,7 +35,7 @@ index d7b2211..a89a8b7 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -1427,6 +1433,27 @@ find_best_device_state (NMManager *manager) +@@ -1428,6 +1434,27 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -63,7 +63,7 @@ index d7b2211..a89a8b7 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -1473,6 +1500,9 @@ nm_manager_update_state (NMManager *self) +@@ -1474,6 +1501,9 @@ nm_manager_update_state (NMManager *self) else new_state = find_best_device_state (self); @@ -73,7 +73,7 @@ index d7b2211..a89a8b7 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6525,6 +6555,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6534,6 +6564,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index d7b2211..a89a8b7 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6706,6 +6792,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6715,6 +6801,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 d7b2211..a89a8b7 100644 return TRUE; } -@@ -7553,6 +7642,22 @@ nm_manager_init (NMManager *self) +@@ -7562,6 +7651,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index d7b2211..a89a8b7 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7832,6 +7937,16 @@ dispose (GObject *object) +@@ -7841,6 +7946,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/Update-dnsmasq-parameters.patch b/debian/patches/Update-dnsmasq-parameters.patch index 9787e983..c0f97963 100644 --- a/debian/patches/Update-dnsmasq-parameters.patch +++ b/debian/patches/Update-dnsmasq-parameters.patch @@ -10,10 +10,10 @@ See also: https://blueprints.launchpad.net/ubuntu/+spec/foundations-p-dns-resolv src/dns/nm-dns-manager.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) -Index: network-manager-1.22.2/src/dns/nm-dns-dnsmasq.c +Index: network-manager-1.24.0/src/dns/nm-dns-dnsmasq.c =================================================================== ---- network-manager-1.22.2.orig/src/dns/nm-dns-dnsmasq.c -+++ network-manager-1.22.2/src/dns/nm-dns-dnsmasq.c +--- network-manager-1.24.0.orig/src/dns/nm-dns-dnsmasq.c ++++ network-manager-1.24.0/src/dns/nm-dns-dnsmasq.c @@ -494,8 +494,8 @@ _gl_pid_spawn_next_step (void) argv[argv_idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */ argv[argv_idx++] = "--bind-interfaces"; @@ -25,11 +25,11 @@ Index: network-manager-1.22.2/src/dns/nm-dns-dnsmasq.c argv[argv_idx++] = "--clear-on-reload"; /* clear cache when dns server changes */ argv[argv_idx++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */ argv[argv_idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */ -Index: network-manager-1.22.2/src/dns/nm-dns-manager.c +Index: network-manager-1.24.0/src/dns/nm-dns-manager.c =================================================================== ---- network-manager-1.22.2.orig/src/dns/nm-dns-manager.c -+++ network-manager-1.22.2/src/dns/nm-dns-manager.c -@@ -1469,12 +1469,12 @@ update_dns (NMDnsManager *self, +--- network-manager-1.24.0.orig/src/dns/nm-dns-manager.c ++++ network-manager-1.24.0/src/dns/nm-dns-manager.c +@@ -1526,12 +1526,12 @@ plugin_skip: NM_CAST_STRV_CC (nameservers), NM_CAST_STRV_CC (options)); @@ -44,7 +44,7 @@ Index: network-manager-1.22.2/src/dns/nm-dns-manager.c if (NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) { /* systemd-resolved uses a different link-local address */ -@@ -1757,7 +1757,7 @@ nm_dns_manager_stop (NMDnsManager *self) +@@ -1825,7 +1825,7 @@ nm_dns_manager_stop (NMDnsManager *self) _LOGT ("stopping..."); /* If we're quitting, leave a valid resolv.conf in place, not one diff --git a/debian/patches/series b/debian/patches/series index f8150736..c25f5936 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ Force-online-state-with-unmanaged-devices.patch -Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch # Ubuntu patches Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch |