diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 37 | ||||
| -rw-r--r-- | debian/libnm0.symbols | 43 | ||||
| -rw-r--r-- | debian/network-manager-config-connectivity-debian.postinst | 2 | ||||
| -rw-r--r-- | debian/network-manager.init | 92 | ||||
| -rw-r--r-- | debian/network-manager.links | 1 | ||||
| -rw-r--r-- | debian/network-manager.maintscript | 1 | ||||
| -rw-r--r-- | debian/network-manager.postinst | 3 | ||||
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 14 | ||||
| -rw-r--r-- | debian/patches/Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch | 38 |
9 files changed, 99 insertions, 132 deletions
diff --git a/debian/changelog b/debian/changelog index 6591f6b7..5fb7b76b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,4 @@ -network-manager (1.24.2-1ubuntu2) groovy; urgency=medium - - * debian/20-connectivity-ubuntu.conf: Add trailing dot to make - connectivity-check.ubuntu.com. absolute and reduce NXDOMAIN - warning noise, thanks MarchH (lp: #1880258) - - -- Sebastien Bacher <seb128@ubuntu.com> Mon, 29 Jun 2020 16:20:07 +0200 - -network-manager (1.24.2-1ubuntu1) groovy; urgency=medium +network-manager (1.25.91-1ubuntu1) UNRELEASED; urgency=medium * Resynchronize on Debian, remaining changes: - Use systemd-resolved instead of dnsmasq @@ -24,8 +16,6 @@ network-manager (1.24.2-1ubuntu1) groovy; urgency=medium + 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 @@ -46,7 +36,30 @@ network-manager (1.24.2-1ubuntu1) groovy; urgency=medium + Read-system-connections-from-run.patch - debian/tests/urfkill-integration - don't stop/start network manager - -- Sebastien Bacher <seb128@debian.org> Tue, 23 Jun 2020 18:08:44 +0200 + -- Sebastien Bacher <seb128@ubuntu.com> Thu, 02 Jul 2020 10:31:37 +0200 + +network-manager (1.25.91-1) unstable; urgency=medium + + * New upstream version 1.25.91 (1.26 rc2) + * Remove SysV init script + + -- Michael Biebl <biebl@debian.org> Thu, 02 Jul 2020 01:17:08 +0200 + +network-manager (1.25.90-1) unstable; urgency=medium + + * New upstream version 1.25.90 (1.26 rc1) + * Rebase patches + * Update symbols file for libnm0 + + -- Michael Biebl <biebl@debian.org> Sun, 28 Jun 2020 19:29:43 +0200 + +network-manager (1.24.2-1ubuntu2) groovy; urgency=medium + + * debian/20-connectivity-ubuntu.conf: Add trailing dot to make + connectivity-check.ubuntu.com. absolute and reduce NXDOMAIN + warning noise, thanks MarchH (lp: #1880258) + + -- Sebastien Bacher <seb128@ubuntu.com> Mon, 29 Jun 2020 16:20:07 +0200 network-manager (1.24.2-1) unstable; urgency=medium diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index b297ffd7..bec7e850 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -18,6 +18,7 @@ libnm.so.0 libnm0 #MINVER# 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_26_0@libnm_1_26_0 1.25.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 @@ -321,6 +322,7 @@ libnm.so.0 libnm0 #MINVER# nm_device_get_metered@libnm_1_2_0 1.1.90 nm_device_get_mtu@libnm_1_0_0 1.0.0 nm_device_get_nm_plugin_missing@libnm_1_2_0 1.1.90 + nm_device_get_path@libnm_1_26_0 1.25.90 nm_device_get_physical_port_id@libnm_1_0_0 1.0.0 nm_device_get_product@libnm_1_0_0 1.0.0 nm_device_get_setting_type@libnm_1_0_0 1.0.0 @@ -483,7 +485,9 @@ libnm.so.0 libnm0 #MINVER# nm_dns_entry_get_type@libnm_1_6_0 1.5.90 nm_dns_entry_get_vpn@libnm_1_6_0 1.5.90 nm_dns_entry_unref@libnm_1_6_0 1.5.90 + nm_ethtool_optname_is_coalesce@libnm_1_26_0 1.25.90 nm_ethtool_optname_is_feature@libnm_1_14_8 1.19.90 + nm_ethtool_optname_is_ring@libnm_1_26_0 1.25.90 nm_ip_address_cmp_flags_get_type@libnm_1_22_0 1.22.0 nm_ip_address_cmp_full@libnm_1_22_0 1.22.0 nm_ip_address_equal@libnm_1_0_0 1.0.0 @@ -769,10 +773,19 @@ libnm.so.0 libnm0 #MINVER# 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_hash_max@libnm_1_26_0 1.25.90 + nm_setting_bridge_get_multicast_last_member_count@libnm_1_26_0 1.25.90 + nm_setting_bridge_get_multicast_last_member_interval@libnm_1_26_0 1.25.90 + nm_setting_bridge_get_multicast_membership_interval@libnm_1_26_0 1.25.90 nm_setting_bridge_get_multicast_querier@libnm_1_24_0 1.23.90 + nm_setting_bridge_get_multicast_querier_interval@libnm_1_26_0 1.25.90 + nm_setting_bridge_get_multicast_query_interval@libnm_1_26_0 1.25.90 + nm_setting_bridge_get_multicast_query_response_interval@libnm_1_26_0 1.25.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_multicast_startup_query_count@libnm_1_26_0 1.25.90 + nm_setting_bridge_get_multicast_startup_query_interval@libnm_1_26_0 1.25.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 nm_setting_bridge_get_stp@libnm_1_0_0 1.0.0 @@ -826,6 +839,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_connection_get_mdns@libnm_1_12_0 1.11.3 nm_setting_connection_get_metered@libnm_1_0_6 1.0.6 nm_setting_connection_get_metered@libnm_1_2_0 1.1.90 + nm_setting_connection_get_mud_url@libnm_1_26_0 1.25.90 nm_setting_connection_get_multi_connect@libnm_1_14_0 1.13.90 nm_setting_connection_get_num_permissions@libnm_1_0_0 1.0.0 nm_setting_connection_get_num_secondaries@libnm_1_0_0 1.0.0 @@ -1016,19 +1030,48 @@ libnm.so.0 libnm0 #MINVER# nm_setting_macvlan_get_type@libnm_1_2_0 1.1.90 nm_setting_macvlan_mode_get_type@libnm_1_2_0 1.1.90 nm_setting_macvlan_new@libnm_1_2_0 1.1.90 + nm_setting_match_add_driver@libnm_1_26_0 1.25.90 nm_setting_match_add_interface_name@libnm_1_14_0 1.13.90 + nm_setting_match_add_kernel_command_line@libnm_1_26_0 1.25.90 + nm_setting_match_add_path@libnm_1_26_0 1.25.90 + nm_setting_match_clear_drivers@libnm_1_26_0 1.25.90 nm_setting_match_clear_interface_names@libnm_1_14_0 1.13.90 + nm_setting_match_clear_kernel_command_lines@libnm_1_26_0 1.25.90 + nm_setting_match_clear_paths@libnm_1_26_0 1.25.90 + nm_setting_match_get_driver@libnm_1_26_0 1.25.90 + nm_setting_match_get_drivers@libnm_1_26_0 1.25.90 nm_setting_match_get_interface_name@libnm_1_14_0 1.13.90 nm_setting_match_get_interface_names@libnm_1_14_0 1.13.90 + nm_setting_match_get_kernel_command_line@libnm_1_26_0 1.25.90 + nm_setting_match_get_kernel_command_lines@libnm_1_26_0 1.25.90 + nm_setting_match_get_num_drivers@libnm_1_26_0 1.25.90 nm_setting_match_get_num_interface_names@libnm_1_14_0 1.13.90 + nm_setting_match_get_num_kernel_command_lines@libnm_1_26_0 1.25.90 + nm_setting_match_get_num_paths@libnm_1_26_0 1.25.90 + nm_setting_match_get_path@libnm_1_26_0 1.25.90 + nm_setting_match_get_paths@libnm_1_26_0 1.25.90 nm_setting_match_get_type@libnm_1_14_0 1.13.90 + nm_setting_match_remove_driver@libnm_1_26_0 1.25.90 + nm_setting_match_remove_driver_by_value@libnm_1_26_0 1.25.90 nm_setting_match_remove_interface_name@libnm_1_14_0 1.13.90 nm_setting_match_remove_interface_name_by_value@libnm_1_14_0 1.13.90 + nm_setting_match_remove_kernel_command_line@libnm_1_26_0 1.25.90 + nm_setting_match_remove_kernel_command_line_by_value@libnm_1_26_0 1.25.90 + nm_setting_match_remove_path@libnm_1_26_0 1.25.90 + nm_setting_match_remove_path_by_value@libnm_1_26_0 1.25.90 nm_setting_olpc_mesh_get_channel@libnm_1_0_0 1.0.0 nm_setting_olpc_mesh_get_dhcp_anycast_address@libnm_1_0_0 1.0.0 nm_setting_olpc_mesh_get_ssid@libnm_1_0_0 1.0.0 nm_setting_olpc_mesh_get_type@libnm_1_0_0 1.0.0 nm_setting_olpc_mesh_new@libnm_1_0_0 1.0.0 + nm_setting_option_clear_by_name@libnm_1_26_0 1.25.90 + nm_setting_option_get@libnm_1_26_0 1.25.90 + nm_setting_option_get_all_names@libnm_1_26_0 1.25.90 + nm_setting_option_get_boolean@libnm_1_26_0 1.25.90 + nm_setting_option_get_uint32@libnm_1_26_0 1.25.90 + nm_setting_option_set@libnm_1_26_0 1.25.90 + nm_setting_option_set_boolean@libnm_1_26_0 1.25.90 + nm_setting_option_set_uint32@libnm_1_26_0 1.25.90 nm_setting_ovs_bridge_get_fail_mode@libnm_1_10_0 1.9.90 nm_setting_ovs_bridge_get_mcast_snooping_enable@libnm_1_10_0 1.9.90 nm_setting_ovs_bridge_get_rstp_enable@libnm_1_10_0 1.9.90 diff --git a/debian/network-manager-config-connectivity-debian.postinst b/debian/network-manager-config-connectivity-debian.postinst index eb087aa4..576f8898 100644 --- a/debian/network-manager-config-connectivity-debian.postinst +++ b/debian/network-manager-config-connectivity-debian.postinst @@ -3,7 +3,7 @@ set -e if [ "$1" = configure ]; then - invoke-rc.d network-manager force-reload || true + nmcli general reload 2>/dev/null || true fi #DEBHELPER# diff --git a/debian/network-manager.init b/debian/network-manager.init deleted file mode 100644 index ac9c584c..00000000 --- a/debian/network-manager.init +++ /dev/null @@ -1,92 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: network-manager -# Required-Start: $remote_fs dbus udev -# Required-Stop: $remote_fs dbus udev -# Should-Start: $syslog -# Should-Stop: $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: network connection manager -# Description: Daemon for automatically switching network -# connections to the best available connection. -### END INIT INFO - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="network connection manager" -NAME="NetworkManager" - -DAEMON=/usr/sbin/$NAME - -PIDFILE=/run/$NAME/$NAME.pid - -SCRIPTNAME=/etc/init.d/network-manager - -# Gracefully exit if the package has been removed. -test -x $DAEMON || exit 0 - -. /lib/lsb/init-functions - -test -f /etc/default/NetworkManager && . /etc/default/NetworkManager - -# -# Function that starts the daemon/service. -# -d_start() { - start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --exec $DAEMON -- $DAEMON_OPTS -} - -# -# Function that stops the daemon/service. -# -d_stop() { - start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ - --exec $DAEMON -} - -d_reload() { - start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE \ - --exec $DAEMON -} - -case "$1" in - start) - log_daemon_msg "Starting $DESC" "$NAME" - d_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_progress_msg "already started" - log_end_msg 0 ;; - *) log_end_msg 1 ;; - esac - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - d_stop - case "$?" in - 0) log_end_msg 0 ;; - 1) log_progress_msg "already stopped" - log_end_msg 0 ;; - *) log_end_msg 1 ;; - esac - ;; - reload|force-reload) - log_daemon_msg "Reloading $DESC" "$NAME" - d_reload - log_end_msg $? - ;; - restart) - $0 stop - $0 start - ;; - status) - status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/network-manager.links b/debian/network-manager.links index d37ab78d..60ddb3ee 100644 --- a/debian/network-manager.links +++ b/debian/network-manager.links @@ -1,2 +1 @@ /usr/share/apport/package-hooks/source_network-manager.py /usr/share/apport/package-hooks/source_network-manager-applet.py -lib/systemd/system/NetworkManager.service lib/systemd/system/network-manager.service diff --git a/debian/network-manager.maintscript b/debian/network-manager.maintscript index 673456df..bb7498aa 100644 --- a/debian/network-manager.maintscript +++ b/debian/network-manager.maintscript @@ -1,3 +1,4 @@ mv_conffile /etc/NetworkManager/dispatcher.d/01ifupdown /etc/NetworkManager/dispatcher.d/01-ifupdown 1.8.0-5~ rm_conffile /etc/dbus-1/system.d/nm-dispatcher.conf 1.14.4-4~ rm_conffile /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf 1.14.4-4~ +rm_conffile /etc/init.d/network-manager 1.25.91-1~ diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index a4ea9a21..446a5513 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -69,6 +69,9 @@ case "$1" in chmod 0600 /var/lib/NetworkManager/secret_key fi fi + if dpkg --compare-versions "$2" lt-nl "1.25.91-1"; then + update-rc.d -f network-manager remove || true + fi ;; abort-upgrade|abort-deconfigure|abort-remove) diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 776e9a95..344f9152 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 bbe5012..b303ec4 100644 +index ae78b7c..81bbbe8 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -52,6 +52,8 @@ @@ -35,7 +35,7 @@ index bbe5012..b303ec4 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -1428,6 +1434,27 @@ find_best_device_state (NMManager *manager) +@@ -1430,6 +1436,27 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -63,7 +63,7 @@ index bbe5012..b303ec4 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -1474,6 +1501,9 @@ nm_manager_update_state (NMManager *self) +@@ -1476,6 +1503,9 @@ nm_manager_update_state (NMManager *self) else new_state = find_best_device_state (self); @@ -73,7 +73,7 @@ index bbe5012..b303ec4 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6534,6 +6564,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6548,6 +6578,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index bbe5012..b303ec4 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6715,6 +6801,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6731,6 +6817,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 bbe5012..b303ec4 100644 return TRUE; } -@@ -7562,6 +7651,22 @@ nm_manager_init (NMManager *self) +@@ -7585,6 +7674,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index bbe5012..b303ec4 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7841,6 +7946,16 @@ dispose (GObject *object) +@@ -7864,6 +7969,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch b/debian/patches/Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch index 8d67799f..d68739a3 100644 --- a/debian/patches/Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch +++ b/debian/patches/Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch @@ -13,23 +13,23 @@ diff --git a/src/org.freedesktop.NetworkManager.conf b/src/org.freedesktop.Netwo index 6be1feb..3dd2350 100644 --- a/src/org.freedesktop.NetworkManager.conf +++ b/src/org.freedesktop.NetworkManager.conf -@@ -36,6 +36,19 @@ - <allow own="org.freedesktop.NetworkManager.dnsmasq"/> - <allow send_destination="org.freedesktop.NetworkManager.dnsmasq"/> - </policy> -+ <policy user="whoopsie"> -+ <allow send_destination="org.freedesktop.NetworkManager"/> -+ <allow send_destination="org.freedesktop.NetworkManager" -+ send_interface="org.freedesktop.DBus.Introspectable"/> -+ <allow send_destination="org.freedesktop.NetworkManager" -+ send_interface="org.freedesktop.DBus.Properties"/> -+ <allow send_destination="org.freedesktop.NetworkManager" -+ send_interface="org.freedesktop.NetworkManager"/> -+ <allow send_destination="org.freedesktop.NetworkManager" -+ send_interface="org.freedesktop.NetworkManager.Connection.Active"/> -+ <allow send_destination="org.freedesktop.NetworkManager" -+ send_interface="org.freedesktop.NetworkManager.Device"/> -+ </policy> - <policy context="default"> - <deny own="org.freedesktop.NetworkManager"/> +@@ -37,6 +37,19 @@ + <allow own="org.freedesktop.NetworkManager.dnsmasq"/> + <allow send_destination="org.freedesktop.NetworkManager.dnsmasq"/> + </policy> ++ <policy user="whoopsie"> ++ <allow send_destination="org.freedesktop.NetworkManager"/> ++ <allow send_destination="org.freedesktop.NetworkManager" ++ send_interface="org.freedesktop.DBus.Introspectable"/> ++ <allow send_destination="org.freedesktop.NetworkManager" ++ send_interface="org.freedesktop.DBus.Properties"/> ++ <allow send_destination="org.freedesktop.NetworkManager" ++ send_interface="org.freedesktop.NetworkManager"/> ++ <allow send_destination="org.freedesktop.NetworkManager" ++ send_interface="org.freedesktop.NetworkManager.Connection.Active"/> ++ <allow send_destination="org.freedesktop.NetworkManager" ++ send_interface="org.freedesktop.NetworkManager.Device"/> ++ </policy> + <policy context="default"> + <deny own="org.freedesktop.NetworkManager"/> |