diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 91 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 10 | ||||
| -rw-r--r-- | debian/libnm0.symbols | 160 | ||||
| -rw-r--r-- | debian/network-manager.maintscript | 2 | ||||
| -rw-r--r-- | debian/network-manager.preinst | 43 | ||||
| -rw-r--r-- | debian/patches/Disable-general-with-expect.patch | 8 | ||||
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 18 | ||||
| -rw-r--r-- | debian/patches/Update-dnsmasq-parameters.patch | 16 | ||||
| -rw-r--r-- | debian/patches/git_ifupdown_iterator.patch | 30 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
11 files changed, 270 insertions, 110 deletions
diff --git a/debian/changelog b/debian/changelog index 4233292d..851c5dcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,94 @@ +network-manager (1.18.0-1ubuntu1) eoan; urgency=medium + + * Update to 1.18, merge on Debian, new version includes nwe support for + policy routing rules and for VLAN filtering for Linux bridge. + * Remaining Ubuntu 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/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 + - Revert "Add Conflicts to network-manager-dev against deprecated libraries" + This reverts commit b4acc5e03e2b821e1cccc69529bb70826c741942. We're still + building libnm-glib for now, so these packages have a use in Ubuntu. + * Removed delta, not needed anymore + - debian/network-manager.maintscript + + Remove /etc/dbus-1/system.d/nm-ofono.conf + + -- Sebastien Bacher <seb128@ubuntu.com> Fri, 10 May 2019 15:07:08 +0200 + +network-manager (1.18.0-1) experimental; urgency=medium + + * New upstream version 1.18.0 + * Rebase patches + * Update symbols file for libnm0 + + -- Michael Biebl <biebl@debian.org> Sun, 21 Apr 2019 22:28:56 +0200 + +network-manager (1.16.0-2) experimental; urgency=medium + + * Drop dependency on lsb-base. + It is only needed when booting with sysvinit and initscripts, but + initscripts already Depends on lsb-base (see #864999). + * Drop dpkg-dev (>= 1.17.14) Build-Depends. + No longer needed as even the version in oldstable is new enough. + + -- Michael Biebl <biebl@debian.org> Thu, 11 Apr 2019 11:07:57 +0200 + +network-manager (1.16.0-1) experimental; urgency=medium + + * New upstream version 1.16.0 + * Rebase patches + * Update symbols file for linm0 + * Drop migration code from pre-stretch + + -- Michael Biebl <biebl@debian.org> Wed, 27 Mar 2019 00:13:49 +0100 + +network-manager (1.14.6-2) unstable; urgency=medium + + * supplicant: fix setting pmf when the supplicant doesn't advertise support + + -- Michael Biebl <biebl@debian.org> Tue, 26 Feb 2019 21:23:14 +0100 + +network-manager (1.14.6-1) unstable; urgency=medium + + * New upstream version 1.14.6 + * Use debhelper-compat (= 12) Build-Depends and drop debian/compat + * Rebase patches + * Do not manage Docker bridge interfaces (Closes: #875127) + * Bump Standards-Version to 4.3.0 + + -- Michael Biebl <biebl@debian.org> Tue, 26 Feb 2019 19:33:53 +0100 + network-manager (1.16.0-0ubuntu2) disco; urgency=medium * debian/patches/git_ifupdown_iterator.patch: diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f72..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/control b/debian/control index 9bcbe75e..7fe0d510 100644 --- a/debian/control +++ b/debian/control @@ -6,9 +6,8 @@ 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 (>= 11.4~), +Build-Depends: debhelper-compat (= 12), automake (>= 1.12), - dpkg-dev (>= 1.17.14), pkg-config, intltool, libdbus-glib-1-dev (>= 0.100), @@ -43,12 +42,12 @@ Build-Depends: debhelper (>= 11.4~), valac (>= 0.17.1.24), dbus <!nocheck>, python-dbus <!nocheck> -Standards-Version: 4.2.1 +Standards-Version: 4.3.0 Rules-Requires-Root: no XS-Debian-Vcs-Git: https://salsa.debian.org/utopia-team/network-manager.git XS-Debian-Vcs-Browser: https://salsa.debian.org/utopia-team/network-manager -Vcs-Git: https://git.launchpad.net/network-manager -b disco -Vcs-Browser: https://git.launchpad.net/network-manager?h=disco +Vcs-Git: https://git.launchpad.net/network-manager -b eoan +Vcs-Browser: https://git.launchpad.net/network-manager?h=eoan Homepage: https://wiki.gnome.org/Projects/NetworkManager Package: network-manager @@ -57,7 +56,6 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libnm0 (= ${binary:Version}), - lsb-base, wpasupplicant, dbus, udev, diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index bd003330..81055a11 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -8,7 +8,8 @@ libnm.so.0 libnm0 #MINVER# libnm_1_12_0@libnm_1_12_0 1.11.3 libnm_1_12_2@libnm_1_12_2 1.12.2 libnm_1_14_0@libnm_1_14_0 1.13.90 - libnm_1_16_0@libnm_1_16_0 1.15.2 + libnm_1_16_0@libnm_1_16_0 1.16.0 + libnm_1_18_0@libnm_1_18_0 1.18.0 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 @@ -55,6 +56,21 @@ libnm.so.0 libnm0 #MINVER# nm_agent_manager_error_get_type@libnm_1_0_0 1.0.0 nm_agent_manager_error_quark@libnm_1_0_0 1.0.0 nm_bluetooth_capabilities_get_type@libnm_1_0_0 1.0.0 + nm_bridge_vlan_cmp@libnm_1_18_0 1.18.0 + nm_bridge_vlan_from_str@libnm_1_18_0 1.18.0 + nm_bridge_vlan_get_type@libnm_1_18_0 1.18.0 + nm_bridge_vlan_get_vid_range@libnm_1_18_0 1.18.0 + nm_bridge_vlan_is_pvid@libnm_1_18_0 1.18.0 + nm_bridge_vlan_is_sealed@libnm_1_18_0 1.18.0 + nm_bridge_vlan_is_untagged@libnm_1_18_0 1.18.0 + nm_bridge_vlan_new@libnm_1_18_0 1.18.0 + nm_bridge_vlan_new_clone@libnm_1_18_0 1.18.0 + nm_bridge_vlan_ref@libnm_1_18_0 1.18.0 + nm_bridge_vlan_seal@libnm_1_18_0 1.18.0 + nm_bridge_vlan_set_pvid@libnm_1_18_0 1.18.0 + nm_bridge_vlan_set_untagged@libnm_1_18_0 1.18.0 + nm_bridge_vlan_to_str@libnm_1_18_0 1.18.0 + nm_bridge_vlan_unref@libnm_1_18_0 1.18.0 nm_capability_get_type@libnm_1_6_0 1.5.90 nm_checkpoint_create_flags_get_type@libnm_1_12_0 1.11.3 nm_checkpoint_get_created@libnm_1_12_0 1.11.3 @@ -63,8 +79,8 @@ libnm.so.0 libnm0 #MINVER# nm_checkpoint_get_type@libnm_1_12_0 1.11.3 nm_client_activate_connection_async@libnm_1_0_0 1.0.0 nm_client_activate_connection_finish@libnm_1_0_0 1.0.0 - nm_client_add_and_activate_connection2@libnm_1_16_0 1.15.2 - nm_client_add_and_activate_connection2_finish@libnm_1_16_0 1.15.2 + nm_client_add_and_activate_connection2@libnm_1_16_0 1.16.0 + nm_client_add_and_activate_connection2_finish@libnm_1_16_0 1.16.0 nm_client_add_and_activate_connection_async@libnm_1_0_0 1.0.0 nm_client_add_and_activate_connection_finish@libnm_1_0_0 1.0.0 nm_client_add_connection_async@libnm_1_0_0 1.0.0 @@ -257,7 +273,7 @@ libnm.so.0 libnm0 #MINVER# nm_device_get_autoconnect@libnm_1_0_0 1.0.0 nm_device_get_available_connections@libnm_1_0_0 1.0.0 nm_device_get_capabilities@libnm_1_0_0 1.0.0 - nm_device_get_connectivity@libnm_1_16_0 1.15.2 + nm_device_get_connectivity@libnm_1_16_0 1.16.0 nm_device_get_description@libnm_1_0_0 1.0.0 nm_device_get_device_type@libnm_1_0_0 1.0.0 nm_device_get_dhcp4_config@libnm_1_0_0 1.0.0 @@ -392,6 +408,13 @@ libnm.so.0 libnm0 #MINVER# nm_device_wifi_get_mode@libnm_1_0_0 1.0.0 nm_device_wifi_get_permanent_hw_address@libnm_1_0_0 1.0.0 nm_device_wifi_get_type@libnm_1_0_0 1.0.0 + nm_device_wifi_p2p_get_hw_address@libnm_1_16_0 1.16.0 + nm_device_wifi_p2p_get_peers@libnm_1_16_0 1.16.0 + nm_device_wifi_p2p_get_type@libnm_1_16_0 1.16.0 + nm_device_wifi_p2p_start_find@libnm_1_16_0 1.16.0 + nm_device_wifi_p2p_start_find_finish@libnm_1_16_0 1.16.0 + nm_device_wifi_p2p_stop_find@libnm_1_16_0 1.16.0 + nm_device_wifi_p2p_stop_find_finish@libnm_1_16_0 1.16.0 nm_device_wifi_request_scan@libnm_1_0_0 1.0.0 nm_device_wifi_request_scan_async@libnm_1_0_0 1.0.0 nm_device_wifi_request_scan_finish@libnm_1_0_0 1.0.0 @@ -475,12 +498,57 @@ libnm.so.0 libnm0 #MINVER# nm_ip_route_set_next_hop_binary@libnm_1_0_0 1.0.0 nm_ip_route_set_prefix@libnm_1_0_0 1.0.0 nm_ip_route_unref@libnm_1_0_0 1.0.0 + nm_ip_routing_rule_as_string_flags_get_type@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_cmp@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_from_string@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_action@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_addr_family@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_destination_port_end@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_destination_port_start@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_from@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_from_len@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_fwmark@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_fwmask@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_iifname@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_invert@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_ipproto@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_oifname@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_priority@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_source_port_end@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_source_port_start@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_table@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_to@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_to_len@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_tos@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_type@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_is_sealed@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_new@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_new_clone@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_ref@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_seal@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_action@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_destination_port@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_from@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_fwmark@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_iifname@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_invert@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_ipproto@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_oifname@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_priority@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_source_port@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_table@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_to@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_tos@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_to_string@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_unref@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_validate@libnm_1_18_0 1.18.0 nm_ip_tunnel_flags_get_type@libnm_1_12_0 1.11.3 nm_ip_tunnel_mode_get_type@libnm_1_2_0 1.1.90 nm_lldp_neighbor_get_attr_names@libnm_1_2_0 1.1.90 nm_lldp_neighbor_get_attr_string_value@libnm_1_2_0 1.1.90 nm_lldp_neighbor_get_attr_type@libnm_1_2_0 1.1.90 nm_lldp_neighbor_get_attr_uint_value@libnm_1_2_0 1.1.90 + nm_lldp_neighbor_get_attr_value@libnm_1_18_0 1.18.0 nm_lldp_neighbor_get_type@libnm_1_2_0 1.1.90 nm_lldp_neighbor_new@libnm_1_2_0 1.1.90 nm_lldp_neighbor_ref@libnm_1_2_0 1.1.90 @@ -640,6 +708,8 @@ libnm.so.0 libnm0 #MINVER# nm_setting_bond_new@libnm_1_0_0 1.0.0 nm_setting_bond_remove_option@libnm_1_0_0 1.0.0 nm_setting_bond_validate_option@libnm_1_0_0 1.0.0 + nm_setting_bridge_add_vlan@libnm_1_18_0 1.18.0 + 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_forward_mask@libnm_1_10_0 1.9.90 @@ -647,15 +717,27 @@ libnm.so.0 libnm0 #MINVER# 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_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 nm_setting_bridge_get_stp@libnm_1_0_0 1.0.0 nm_setting_bridge_get_type@libnm_1_0_0 1.0.0 + 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_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 nm_setting_bridge_port_get_hairpin_mode@libnm_1_0_0 1.0.0 + nm_setting_bridge_port_get_num_vlans@libnm_1_18_0 1.18.0 nm_setting_bridge_port_get_path_cost@libnm_1_0_0 1.0.0 nm_setting_bridge_port_get_priority@libnm_1_0_0 1.0.0 nm_setting_bridge_port_get_type@libnm_1_0_0 1.0.0 + nm_setting_bridge_port_get_vlan@libnm_1_18_0 1.18.0 nm_setting_bridge_port_new@libnm_1_0_0 1.0.0 + nm_setting_bridge_port_remove_vlan@libnm_1_18_0 1.18.0 + nm_setting_bridge_port_remove_vlan_by_vid@libnm_1_18_0 1.18.0 + nm_setting_bridge_remove_vlan@libnm_1_18_0 1.18.0 + nm_setting_bridge_remove_vlan_by_vid@libnm_1_18_0 1.18.0 nm_setting_cdma_get_mtu@libnm_1_8_0 1.8.0 nm_setting_cdma_get_number@libnm_1_0_0 1.0.0 nm_setting_cdma_get_password@libnm_1_0_0 1.0.0 @@ -790,11 +872,13 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ip_config_add_dns_option@libnm_1_2_0 1.1.90 nm_setting_ip_config_add_dns_search@libnm_1_0_0 1.0.0 nm_setting_ip_config_add_route@libnm_1_0_0 1.0.0 + nm_setting_ip_config_add_routing_rule@libnm_1_18_0 1.18.0 nm_setting_ip_config_clear_addresses@libnm_1_0_0 1.0.0 nm_setting_ip_config_clear_dns@libnm_1_0_0 1.0.0 nm_setting_ip_config_clear_dns_options@libnm_1_2_0 1.1.90 nm_setting_ip_config_clear_dns_searches@libnm_1_0_0 1.0.0 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_dad_timeout@libnm_1_2_0 1.1.91 nm_setting_ip_config_get_dhcp_hostname@libnm_1_0_0 1.0.0 @@ -816,9 +900,11 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ip_config_get_num_dns_options@libnm_1_2_0 1.1.90 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_route@libnm_1_0_0 1.0.0 nm_setting_ip_config_get_route_metric@libnm_1_0_0 1.0.0 nm_setting_ip_config_get_route_table@libnm_1_10_0 1.9.90 + nm_setting_ip_config_get_routing_rule@libnm_1_18_0 1.18.0 nm_setting_ip_config_get_type@libnm_1_0_0 1.0.0 nm_setting_ip_config_has_dns_options@libnm_1_2_0 1.1.90 nm_setting_ip_config_remove_address@libnm_1_0_0 1.0.0 @@ -831,6 +917,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ip_config_remove_dns_search_by_value@libnm_1_0_0 1.0.0 nm_setting_ip_config_remove_route@libnm_1_0_0 1.0.0 nm_setting_ip_config_remove_route_by_value@libnm_1_0_0 1.0.0 + nm_setting_ip_config_remove_routing_rule@libnm_1_18_0 1.18.0 nm_setting_ip_tunnel_get_flags@libnm_1_12_0 1.11.3 nm_setting_ip_tunnel_get_input_key@libnm_1_2_0 1.1.90 nm_setting_ip_tunnel_get_local@libnm_1_2_0 1.1.90 @@ -1075,6 +1162,11 @@ libnm.so.0 libnm0 #MINVER# nm_setting_vxlan_get_ttl@libnm_1_2_0 1.1.90 nm_setting_vxlan_get_type@libnm_1_2_0 1.1.90 nm_setting_vxlan_new@libnm_1_2_0 1.1.90 + nm_setting_wifi_p2p_get_peer@libnm_1_16_0 1.16.0 + nm_setting_wifi_p2p_get_type@libnm_1_16_0 1.16.0 + nm_setting_wifi_p2p_get_wfd_ies@libnm_1_16_0 1.16.0 + nm_setting_wifi_p2p_get_wps_method@libnm_1_16_0 1.16.0 + nm_setting_wifi_p2p_new@libnm_1_16_0 1.16.0 nm_setting_wimax_get_mac_address@libnm_1_0_0 1.0.0 nm_setting_wimax_get_network_name@libnm_1_0_0 1.0.0 nm_setting_wimax_get_type@libnm_1_0_0 1.0.0 @@ -1110,6 +1202,21 @@ libnm.so.0 libnm0 #MINVER# nm_setting_wired_remove_s390_option@libnm_1_0_0 1.0.0 nm_setting_wired_wake_on_lan_get_type@libnm_1_0_6 1.0.6 nm_setting_wired_wake_on_lan_get_type@libnm_1_2_0 1.1.90 + nm_setting_wireguard_append_peer@libnm_1_16_0 1.16.0 + nm_setting_wireguard_clear_peers@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_fwmark@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_listen_port@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_mtu@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_peer@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_peer_by_public_key@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_peer_routes@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_peers_len@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_private_key@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_private_key_flags@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_type@libnm_1_16_0 1.16.0 + nm_setting_wireguard_new@libnm_1_16_0 1.16.0 + nm_setting_wireguard_remove_peer@libnm_1_16_0 1.16.0 + nm_setting_wireguard_set_peer@libnm_1_16_0 1.16.0 nm_setting_wireless_add_mac_blacklist_item@libnm_1_0_0 1.0.0 nm_setting_wireless_add_seen_bssid@libnm_1_0_0 1.0.0 nm_setting_wireless_ap_security_compatible@libnm_1_0_0 1.0.0 @@ -1218,12 +1325,15 @@ libnm.so.0 libnm0 #MINVER# nm_tc_action_unref@libnm_1_10_2 1.10.2 nm_tc_qdisc_dup@libnm_1_10_2 1.10.2 nm_tc_qdisc_equal@libnm_1_10_2 1.10.2 + nm_tc_qdisc_get_attribute@libnm_1_18_0 1.18.0 + nm_tc_qdisc_get_attribute_names@libnm_1_18_0 1.18.0 nm_tc_qdisc_get_handle@libnm_1_10_2 1.10.2 nm_tc_qdisc_get_kind@libnm_1_10_2 1.10.2 nm_tc_qdisc_get_parent@libnm_1_10_2 1.10.2 nm_tc_qdisc_get_type@libnm_1_10_2 1.10.2 nm_tc_qdisc_new@libnm_1_10_2 1.10.2 nm_tc_qdisc_ref@libnm_1_10_2 1.10.2 + nm_tc_qdisc_set_attribute@libnm_1_18_0 1.18.0 nm_tc_qdisc_set_handle@libnm_1_10_2 1.10.2 nm_tc_qdisc_unref@libnm_1_10_2 1.10.2 nm_tc_tfilter_dup@libnm_1_10_2 1.10.2 @@ -1249,8 +1359,8 @@ libnm.so.0 libnm0 #MINVER# nm_team_link_watcher_get_source_host@libnm_1_10_2 1.10.2 nm_team_link_watcher_get_target_host@libnm_1_10_2 1.10.2 nm_team_link_watcher_get_type@libnm_1_10_2 1.10.2 - nm_team_link_watcher_get_vlanid@libnm_1_16_0 1.15.2 - nm_team_link_watcher_new_arp_ping2@libnm_1_16_0 1.15.2 + nm_team_link_watcher_get_vlanid@libnm_1_16_0 1.16.0 + nm_team_link_watcher_new_arp_ping2@libnm_1_16_0 1.16.0 nm_team_link_watcher_new_arp_ping@libnm_1_10_2 1.10.2 nm_team_link_watcher_new_ethtool@libnm_1_10_2 1.10.2 nm_team_link_watcher_new_nsna_ping@libnm_1_10_2 1.10.2 @@ -1258,6 +1368,7 @@ libnm.so.0 libnm0 #MINVER# nm_team_link_watcher_unref@libnm_1_10_2 1.10.2 nm_ternary_get_type@libnm_1_14_0 1.13.90 nm_utils_ap_mode_security_valid@libnm_1_0_0 1.0.0 + nm_utils_base64secret_decode@libnm_1_16_0 1.16.0 nm_utils_bin2hexstr@libnm_1_0_0 1.0.0 nm_utils_bond_mode_int_to_string@libnm_1_2_0 1.1.90 nm_utils_bond_mode_string_to_int@libnm_1_2_0 1.1.90 @@ -1406,6 +1517,19 @@ libnm.so.0 libnm0 #MINVER# nm_vpn_service_plugin_shutdown@libnm_1_12_0 1.11.3 nm_vpn_service_state_get_type@libnm_1_0_0 1.0.0 nm_wep_key_type_get_type@libnm_1_0_0 1.0.0 + nm_wifi_p2p_peer_connection_valid@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_filter_connections@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_flags@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_hw_address@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_last_seen@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_manufacturer@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_model@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_model_number@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_name@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_serial@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_strength@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_type@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_wfd_ies@libnm_1_16_0 1.16.0 nm_wimax_nsp_connection_valid@libnm_1_0_0 1.0.0 nm_wimax_nsp_filter_connections@libnm_1_0_0 1.0.0 nm_wimax_nsp_get_name@libnm_1_0_0 1.0.0 @@ -1413,3 +1537,27 @@ libnm.so.0 libnm0 #MINVER# nm_wimax_nsp_get_signal_quality@libnm_1_0_0 1.0.0 nm_wimax_nsp_get_type@libnm_1_0_0 1.0.0 nm_wimax_nsp_network_type_get_type@libnm_1_0_0 1.0.0 + nm_wireguard_peer_append_allowed_ip@libnm_1_16_0 1.16.0 + nm_wireguard_peer_clear_allowed_ips@libnm_1_16_0 1.16.0 + nm_wireguard_peer_cmp@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_allowed_ip@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_allowed_ips_len@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_endpoint@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_persistent_keepalive@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_preshared_key@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_preshared_key_flags@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_public_key@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_type@libnm_1_16_0 1.16.0 + nm_wireguard_peer_is_sealed@libnm_1_16_0 1.16.0 + nm_wireguard_peer_is_valid@libnm_1_16_0 1.16.0 + nm_wireguard_peer_new@libnm_1_16_0 1.16.0 + nm_wireguard_peer_new_clone@libnm_1_16_0 1.16.0 + nm_wireguard_peer_ref@libnm_1_16_0 1.16.0 + nm_wireguard_peer_remove_allowed_ip@libnm_1_16_0 1.16.0 + nm_wireguard_peer_seal@libnm_1_16_0 1.16.0 + nm_wireguard_peer_set_endpoint@libnm_1_16_0 1.16.0 + nm_wireguard_peer_set_persistent_keepalive@libnm_1_16_0 1.16.0 + nm_wireguard_peer_set_preshared_key@libnm_1_16_0 1.16.0 + nm_wireguard_peer_set_preshared_key_flags@libnm_1_16_0 1.16.0 + nm_wireguard_peer_set_public_key@libnm_1_16_0 1.16.0 + nm_wireguard_peer_unref@libnm_1_16_0 1.16.0 diff --git a/debian/network-manager.maintscript b/debian/network-manager.maintscript index 1c8a42cf..673456df 100644 --- a/debian/network-manager.maintscript +++ b/debian/network-manager.maintscript @@ -1,5 +1,3 @@ -rm_conffile /etc/dbus-1/system.d/nm-avahi-autoipd.conf 1.1.90-2~ 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-ofono.conf 1.2.4-1~ 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~ diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst deleted file mode 100644 index 929d3e1c..00000000 --- a/debian/network-manager.preinst +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -set -e - -# This script can be called in the following ways: -# -# Before the package is installed: -# <new-preinst> install -# -# Before removed package is upgraded: -# <new-preinst> install <old-version> -# -# Before the package is upgraded: -# <new-preinst> upgrade <old-version> -# -# -# If postrm fails during upgrade or fails on failed upgrade: -# <old-preinst> abort-upgrade <new-version> - -case "$1" in - install|upgrade) - if dpkg --compare-versions "$2" lt-nl "1.0.0-4"; then - if [ -L /etc/systemd/system/dbus-org.freedesktop.NetworkManager.service ]; then - rm -f /etc/systemd/system/dbus-org.freedesktop.NetworkManager.service - fi - fi - - # Purge the state so the service gets properly enabled on upgrades - if dpkg --compare-versions "$2" lt-nl "1.2.2-2"; then - deb-systemd-helper purge NetworkManager-wait-online.service - fi - ;; - - abort-upgrade) - ;; - - *) - echo "$0 called with unknown argument \`$1'" 1>&2 - exit 1 - ;; -esac - -#DEBHELPER# diff --git a/debian/patches/Disable-general-with-expect.patch b/debian/patches/Disable-general-with-expect.patch index 317e67b5..77d88b41 100644 --- a/debian/patches/Disable-general-with-expect.patch +++ b/debian/patches/Disable-general-with-expect.patch @@ -7,11 +7,11 @@ which tends to fail on ppc64el and arm64 Makefile.am | 1 - 1 file changed, 1 deletion(-) -Index: network-manager-1.15.91/Makefile.am +Index: network-manager-1.18.0/Makefile.am =================================================================== ---- network-manager-1.15.91.orig/Makefile.am -+++ network-manager-1.15.91/Makefile.am -@@ -3651,7 +3651,6 @@ src_tests_ldadd = \ +--- network-manager-1.18.0.orig/Makefile.am ++++ network-manager-1.18.0/Makefile.am +@@ -3776,7 +3776,6 @@ src_tests_ldadd = \ check_programs += \ src/tests/test-general \ diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index a9e0b2cd..78650e05 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -11,10 +11,10 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 src/nm-manager.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) -Index: network-manager-1.15.91/src/nm-manager.c +Index: network-manager-1.18.0/src/nm-manager.c =================================================================== ---- network-manager-1.15.91.orig/src/nm-manager.c -+++ network-manager-1.15.91/src/nm-manager.c +--- network-manager-1.18.0.orig/src/nm-manager.c ++++ network-manager-1.18.0/src/nm-manager.c @@ -61,6 +61,8 @@ #include "nm-dispatcher.h" #include "NetworkManagerUtils.h" @@ -35,7 +35,7 @@ Index: network-manager-1.15.91/src/nm-manager.c guint timestamp_update_id; guint devices_inited_id; -@@ -1430,6 +1436,27 @@ find_best_device_state (NMManager *manag +@@ -1432,6 +1438,27 @@ find_best_device_state (NMManager *manag return best_state; } @@ -63,7 +63,7 @@ Index: network-manager-1.15.91/src/nm-manager.c static void nm_manager_update_metered (NMManager *self) { -@@ -1476,6 +1503,9 @@ nm_manager_update_state (NMManager *self +@@ -1478,6 +1505,9 @@ nm_manager_update_state (NMManager *self else new_state = find_best_device_state (self); @@ -73,7 +73,7 @@ Index: network-manager-1.15.91/src/nm-manager.c if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6482,6 +6512,62 @@ impl_manager_check_connectivity (NMDBusO +@@ -6499,6 +6529,62 @@ impl_manager_check_connectivity (NMDBusO } static void @@ -136,7 +136,7 @@ Index: network-manager-1.15.91/src/nm-manager.c start_factory (NMDeviceFactory *factory, gpointer user_data) { nm_device_factory_start (factory); -@@ -6649,6 +6735,9 @@ nm_manager_start (NMManager *self, GErro +@@ -6666,6 +6752,9 @@ nm_manager_start (NMManager *self, GErro 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: network-manager-1.15.91/src/nm-manager.c return TRUE; } -@@ -7508,6 +7597,22 @@ nm_manager_init (NMManager *self) +@@ -7525,6 +7614,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ Index: network-manager-1.15.91/src/nm-manager.c /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7783,6 +7888,16 @@ dispose (GObject *object) +@@ -7800,6 +7905,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 f7426077..d7385bb1 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.15.91/src/dns/nm-dns-dnsmasq.c +Index: network-manager-1.18.0/src/dns/nm-dns-dnsmasq.c =================================================================== ---- network-manager-1.15.91.orig/src/dns/nm-dns-dnsmasq.c -+++ network-manager-1.15.91/src/dns/nm-dns-dnsmasq.c +--- network-manager-1.18.0.orig/src/dns/nm-dns-dnsmasq.c ++++ network-manager-1.18.0/src/dns/nm-dns-dnsmasq.c @@ -337,8 +337,8 @@ start_dnsmasq (NMDnsDnsmasq *self) argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */ argv[idx++] = "--bind-interfaces"; @@ -25,11 +25,11 @@ Index: network-manager-1.15.91/src/dns/nm-dns-dnsmasq.c argv[idx++] = "--clear-on-reload"; /* clear cache when dns server changes */ argv[idx++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */ argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */ -Index: network-manager-1.15.91/src/dns/nm-dns-manager.c +Index: network-manager-1.18.0/src/dns/nm-dns-manager.c =================================================================== ---- network-manager-1.15.91.orig/src/dns/nm-dns-manager.c -+++ network-manager-1.15.91/src/dns/nm-dns-manager.c -@@ -1479,12 +1479,12 @@ update_dns (NMDnsManager *self, +--- network-manager-1.18.0.orig/src/dns/nm-dns-manager.c ++++ network-manager-1.18.0/src/dns/nm-dns-manager.c +@@ -1486,12 +1486,12 @@ update_dns (NMDnsManager *self, NM_CAST_STRV_CC (nameservers), NM_CAST_STRV_CC (options)); @@ -44,7 +44,7 @@ Index: network-manager-1.15.91/src/dns/nm-dns-manager.c if (NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) { /* systemd-resolved uses a different link-local address */ -@@ -1826,7 +1826,7 @@ nm_dns_manager_stop (NMDnsManager *self) +@@ -1833,7 +1833,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/git_ifupdown_iterator.patch b/debian/patches/git_ifupdown_iterator.patch deleted file mode 100644 index 09279eb4..00000000 --- a/debian/patches/git_ifupdown_iterator.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 00858afc4f0512e751f35a56e74dff2d5a4a4c07 Mon Sep 17 00:00:00 2001 -From: Yupeng Chang <changyp6@gmail.com> -Date: Tue, 2 Apr 2019 11:30:29 +0200 -Subject: [PATCH] ifupdown: fix connection iterator - -Fixes: 6aa66426a416 ('settings/ifupdown: merge eni_ifaces and connections hashes in plugin') - -https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/145 -https://bugzilla.redhat.com/show_bug.cgi?id=1694912 -(cherry picked from commit 1dd67583e3eecba09ee983ef6a443ded64303846) ---- - src/settings/plugins/ifupdown/nms-ifupdown-plugin.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c -index 99a594776..9c9b73f28 100644 ---- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c -+++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c -@@ -280,7 +280,7 @@ initialize (NMSettingsPlugin *plugin) - GHashTableIter iter; - - g_hash_table_iter_init (&iter, priv->eni_ifaces); -- while (g_hash_table_iter_next (&iter, NULL, (gpointer *) conn)) { -+ while (g_hash_table_iter_next (&iter, NULL, (gpointer) &conn)) { - if (conn) { - _nm_settings_plugin_emit_signal_connection_added (NM_SETTINGS_PLUGIN (self), - NM_SETTINGS_CONNECTION (conn)); --- -2.18.1 - diff --git a/debian/patches/series b/debian/patches/series index 527757da..f3f8df16 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch -git_ifupdown_iterator.patch # Ubuntu patches Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch Update-dnsmasq-parameters.patch |