diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 28 | ||||
| -rw-r--r-- | debian/libnm0.symbols | 2 | ||||
| -rw-r--r-- | debian/patches/git_wpa_sae.patch | 45 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 11 insertions, 65 deletions
diff --git a/debian/changelog b/debian/changelog index 92f79199..7dd3c50f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,28 +1,18 @@ -network-manager (1.20.4-2ubuntu3) focal; urgency=medium - - * d/t/killswitches-no-urfkill, d/t/urfkill-integration, - d/t/wpa-dhclient, d/t/nm.py, d/t/control: - - skip tests on s390 due to missing wireless kernel support - (LP: #1855009) - - skip tests on i386 since there is no i386 kernel anymore, - so we can't build our custom rfkill test module - (LP: #1855183) - - -- Dan Streetman <ddstreet@canonical.com> Wed, 04 Dec 2019 12:17:37 -0500 - -network-manager (1.20.4-2ubuntu2) eoan; urgency=medium +network-manager (1.20.6-1ubuntu1) UNRELEASED; urgency=medium + * New upstream version, merged from Debian * debian/patches/git_wpa_sae.patch: - - PMF can be used with SAE, allow it, fixes WPA3 handling - (lp: #1844422) + - removed, included in the new version - -- Sebastien Bacher <seb128@ubuntu.com> Fri, 11 Oct 2019 00:06:27 +0200 + -- Sebastien Bacher <seb128@ubuntu.com> Tue, 07 Jan 2020 16:53:10 +0100 -network-manager (1.20.4-2ubuntu1) eoan; urgency=medium +network-manager (1.20.6-1) unstable; urgency=medium - * New upstream version, merged from Debian + * New upstream version 1.20.6 + - Add support for iwd 1.0. (Closes: #944259) + * Update symbols file for libnm0 - -- Sebastien Bacher <seb128@ubuntu.com> Wed, 11 Sep 2019 11:16:12 +0200 + -- Michael Biebl <biebl@debian.org> Wed, 06 Nov 2019 22:32:54 +0100 network-manager (1.20.4-2) unstable; urgency=medium diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index f587facd..a31ac003 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -12,6 +12,7 @@ libnm.so.0 libnm0 #MINVER# libnm_1_16_0@libnm_1_16_0 1.16.0 libnm_1_18_0@libnm_1_18_0 1.18.0 libnm_1_20_0@libnm_1_20_0 1.19.90 + libnm_1_20_6@libnm_1_20_6 1.20.6 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 @@ -637,6 +638,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_802_1x_get_num_altsubject_matches@libnm_1_0_0 1.0.0 nm_setting_802_1x_get_num_eap_methods@libnm_1_0_0 1.0.0 nm_setting_802_1x_get_num_phase2_altsubject_matches@libnm_1_0_0 1.0.0 + nm_setting_802_1x_get_optional@libnm_1_20_6 1.20.6 nm_setting_802_1x_get_pac_file@libnm_1_0_0 1.0.0 nm_setting_802_1x_get_password@libnm_1_0_0 1.0.0 nm_setting_802_1x_get_password_flags@libnm_1_0_0 1.0.0 diff --git a/debian/patches/git_wpa_sae.patch b/debian/patches/git_wpa_sae.patch deleted file mode 100644 index a951fa64..00000000 --- a/debian/patches/git_wpa_sae.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e36c297fd8c6b1b57cd120739cc5ee8eab57aa08 Mon Sep 17 00:00:00 2001 -From: Beniamino Galvani <bgalvani@redhat.com> -Date: Wed, 9 Oct 2019 11:55:27 +0200 -Subject: [PATCH] supplicant: allow PMF with SAE - -PMF can be used with SAE, allow it. Actually, it is required according -to WPA3 specifications but there are implementations that don't -require it (hostapd can be configured in a such way); so let's not -make it mandatory for WPA3. - -Fixes: 6640fb4b3615 ('supplicant: add support for SAE key management') - -https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/257 ---- - src/supplicant/nm-supplicant-config.c | 4 ++-- - src/supplicant/tests/test-supplicant-config.c | 1 - - 2 files changed, 2 insertions(+), 3 deletions(-) - -Index: network-manager-1.20.4/src/supplicant/nm-supplicant-config.c -=================================================================== ---- network-manager-1.20.4.orig/src/supplicant/nm-supplicant-config.c -+++ network-manager-1.20.4/src/supplicant/nm-supplicant-config.c -@@ -881,8 +881,8 @@ nm_supplicant_config_add_setting_wireles - } - } - -- /* Don't try to enable PMF on non-WPA networks */ -- if (!NM_IN_STRSET (key_mgmt, "wpa-eap", "wpa-psk")) -+ /* Don't try to enable PMF on non-WPA/SAE networks */ -+ if (!NM_IN_STRSET (key_mgmt, "wpa-eap", "wpa-psk", "sae")) - pmf = NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE; - - /* Check if we actually support PMF */ -Index: network-manager-1.20.4/src/supplicant/tests/test-supplicant-config.c -=================================================================== ---- network-manager-1.20.4.orig/src/supplicant/tests/test-supplicant-config.c -+++ network-manager-1.20.4/src/supplicant/tests/test-supplicant-config.c -@@ -430,7 +430,6 @@ test_wifi_sae_psk (const char *psk) - NMTST_EXPECT_NM_INFO ("Config: added 'proto' value 'RSN'"); - NMTST_EXPECT_NM_INFO ("Config: added 'pairwise' value 'TKIP CCMP'"); - NMTST_EXPECT_NM_INFO ("Config: added 'group' value 'TKIP CCMP'"); -- NMTST_EXPECT_NM_INFO ("Config: added 'ieee80211w' value '0'"); - config_dict = build_supplicant_config (connection, 1500, 0, TRUE, TRUE); - - g_test_assert_expected_messages (); diff --git a/debian/patches/series b/debian/patches/series index 4f246a72..0a749301 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_wpa_sae.patch # Ubuntu patches Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch |