diff --git a/0001-add-NM-to-support-wifi6.patch b/0001-add-NM-to-support-wifi6.patch index 26b45746bef243590905af2dc99ccbfa8efbb2a2..ce784f1140c21bf8decea6bc9f2d01d4dd281085 100644 --- a/0001-add-NM-to-support-wifi6.patch +++ b/0001-add-NM-to-support-wifi6.patch @@ -10,24 +10,25 @@ DESC:Support wireless networks connecting WIFI6 encryption methods, --- src/core/nm-core-utils.c | 9 ++++++++- src/core/nm-core-utils.h | 3 ++- - src/core/supplicant/nm-supplicant-interface.c | 7 ++++++- + src/core/supplicant/nm-supplicant-interface.c | 8 +++++++- src/libnm-core-public/nm-dbus-interface.h | 2 ++ - 4 files changed, 18 insertions(+), 3 deletions(-) + 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c index 5442efb..8e030a3 100644 --- a/src/core/nm-core-utils.c +++ b/src/core/nm-core-utils.c -@@ -4783,13 +4783,15 @@ get_max_rate_vht(const guint8 *bytes, guint len, guint32 *out_maxrate) - #define WLAN_EID_HT_CAPABILITY 45 +@@ -4906,6 +4906,7 @@ get_bandwidth_vht(const guint8 *bytes, guint len, guint32 *out_bandwidth) #define WLAN_EID_VHT_CAPABILITY 191 + #define WLAN_EID_VHT_OPERATION 192 #define WLAN_EID_VENDOR_SPECIFIC 221 +#define WLAN_EID_EXTENSION 255 void nm_wifi_utils_parse_ies(const guint8 *bytes, - gsize len, +@@ -4913,7 +4914,8 @@ nm_wifi_utils_parse_ies(const guint8 *bytes, guint32 *out_max_rate, + guint32 *out_bandwidth, gboolean *out_metered, - gboolean *out_owe_transition_mode) + gboolean *out_owe_transition_mode, @@ -35,21 +36,21 @@ index 5442efb..8e030a3 100644 { guint8 id, elem_len; guint32 m; -@@ -4797,6 +4799,7 @@ nm_wifi_utils_parse_ies(const guint8 *bytes, - NM_SET_OUT(out_max_rate, 0); +@@ -4922,6 +4924,7 @@ nm_wifi_utils_parse_ies(const guint8 *bytes, + NM_SET_OUT(out_bandwidth, 0); NM_SET_OUT(out_metered, FALSE); NM_SET_OUT(out_owe_transition_mode, FALSE); + NM_SET_OUT(out_he_support, FALSE); while (len) { if (len < 2) -@@ -4835,6 +4838,10 @@ nm_wifi_utils_parse_ies(const guint8 *bytes, +@@ -4968,6 +4971,10 @@ nm_wifi_utils_parse_ies(const guint8 *bytes, && bytes[3] == 0x1c) /* OUI type: OWE Transition Mode */ NM_SET_OUT(out_owe_transition_mode, TRUE); break; + case WLAN_EID_EXTENSION: + if (elem_len > 0 && bytes[0] == 0x23) -+ NM_SET_OUT(out_he_support, TRUE); ++ NM_SET_OUT(out_he_support, TRUE); + break; } @@ -58,9 +59,9 @@ diff --git a/src/core/nm-core-utils.h b/src/core/nm-core-utils.h index 5511250..551c6fa 100644 --- a/src/core/nm-core-utils.h +++ b/src/core/nm-core-utils.h -@@ -456,7 +456,8 @@ void nm_wifi_utils_parse_ies(const guint8 *bytes, - gsize len, +@@ -463,7 +463,8 @@ void nm_wifi_utils_parse_ies(const guint8 *bytes, guint32 *out_max_rate, + guint32 *out_bandwidth, gboolean *out_metered, - gboolean *out_owe_transition_mode); + gboolean *out_owe_transition_mode, @@ -72,20 +73,25 @@ diff --git a/src/core/supplicant/nm-supplicant-interface.c b/src/core/supplicant index 1852572..ddb6b2f 100644 --- a/src/core/supplicant/nm-supplicant-interface.c +++ b/src/core/supplicant/nm-supplicant-interface.c -@@ -764,10 +764,15 @@ _bss_info_properties_changed(NMSupplicantInterface *self, +@@ -764,6 +764,7 @@ _bss_info_properties_changed(NMSupplicantInterface *self, if (v_v) { gboolean p_owe_transition_mode; gboolean p_metered; + gboolean p_he_support; guint32 rate; + guint32 bandwidth; - arr_data = g_variant_get_fixed_array(v_v, &arr_len, 1); -- nm_wifi_utils_parse_ies(arr_data, arr_len, &rate, &p_metered, &p_owe_transition_mode); -+ nm_wifi_utils_parse_ies(arr_data, arr_len, &rate, &p_metered, &p_owe_transition_mode, &p_he_support); +@@ -773,7 +774,12 @@ _bss_info_properties_changed(NMSupplicantInterface *self, + &rate, + &bandwidth, + &p_metered, +- &p_owe_transition_mode); ++ &p_owe_transition_mode, ++ &p_he_support); + if (p_he_support) -+ bss_info->rsn_flags |= NM_802_11_AP_FLAGS_He; ++ bss_info->rsn_flags |= NM_802_11_AP_FLAGS_He; + else -+ bss_info->rsn_flags &= ~NM_802_11_AP_FLAGS_He; ++ bss_info->rsn_flags &= ~NM_802_11_AP_FLAGS_He; p_max_rate = NM_MAX(p_max_rate, rate); p_max_rate_has = TRUE; g_variant_unref(v_v); @@ -93,7 +99,7 @@ diff --git a/src/libnm-core-public/nm-dbus-interface.h b/src/libnm-core-public/n index b490e3b..9624618 100644 --- a/src/libnm-core-public/nm-dbus-interface.h +++ b/src/libnm-core-public/nm-dbus-interface.h -@@ -336,6 +336,7 @@ typedef enum /*< flags >*/ { +@@ -341,6 +341,7 @@ typedef enum /*< flags >*/ { * @NM_802_11_AP_FLAGS_WPS: access point supports some WPS method * @NM_802_11_AP_FLAGS_WPS_PBC: access point supports push-button WPS * @NM_802_11_AP_FLAGS_WPS_PIN: access point supports PIN-based WPS @@ -101,7 +107,7 @@ index b490e3b..9624618 100644 * * 802.11 access point flags. **/ -@@ -345,6 +346,7 @@ typedef enum /*< underscore_name=nm_802_11_ap_flags, flags >*/ { +@@ -350,6 +351,7 @@ typedef enum /*< underscore_name=nm_802_11_ap_flags, flags >*/ { NM_802_11_AP_FLAGS_WPS = 0x00000002, NM_802_11_AP_FLAGS_WPS_PBC = 0x00000004, NM_802_11_AP_FLAGS_WPS_PIN = 0x00000008, diff --git a/NetworkManager-1.44.2.tar.xz b/NetworkManager-1.48.6.tar.xz similarity index 43% rename from NetworkManager-1.44.2.tar.xz rename to NetworkManager-1.48.6.tar.xz index ce87f0aa7bf8308fcf5806e75a32e32433202dcb..2de18d9eab92489a881d353514e6b7cf68752524 100644 Binary files a/NetworkManager-1.44.2.tar.xz and b/NetworkManager-1.48.6.tar.xz differ diff --git a/NetworkManager.spec b/NetworkManager.spec index 5d536f1ddda551f8979923c363b37a49f1d55979..5846d37dd2e95911d7f9edd2847922e2f8630e47 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -2,7 +2,7 @@ %global wpa_supplicant_version 1:1.1 %global ppp_version %(pkg-config --modeversion pppd 2>/dev/null || sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad) %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) -%global real_version 1.42.8 +%global real_version 1.48.6 %global snapshot %{nil} %global git_sha %{nil} %global obsoletes_device_plugins 1:0.9.9.95-1 @@ -49,10 +49,10 @@ %global dhcp_default dhclient Name: NetworkManager -Version: 1.44.2 +Version: 1.48.6 Epoch: 1 -Release: 2 -Summary: 4 +Release: 1 +Summary: Network Link Manager and User Applications License: GPLv2+ URL: https://networkmanager.dev/ Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{version}.tar.xz @@ -327,10 +327,11 @@ autoreconf --install --force --with-resolvconf=no \ --with-netconfig=no \ %if %{with nm_cloud_setup} - --with-nm-cloud_setup=yes + --with-nm-cloud_setup=yes \ %else - --with-nm-cloud_setup=no + --with-nm-cloud_setup=no \ %endif + --disable-autotools-deprecation %make_build @@ -548,6 +549,12 @@ fi %{_datadir}/gtk-doc/html/NetworkManager/* %changelog +* Mon Jul 08 2024 liweigang - 1:1.48.6-1 +- Type: requirement +- CVE: NA +- SUG: NA +- DESC: update to 1.48.6 + * Tue Apr 9 2024 liuzhilin - 1:1.44.2-2 - add NM to support wifi6(fix dde-network-core build error) - Type:requirement