From ff1d900d6ed28ff7771ec1312b2c00e8c2314975 Mon Sep 17 00:00:00 2001 From: cfconrad <> Date: Oct 08 2020 15:34:15 +0000 Subject: Update wpa_supplicant to rev 81 via SR 839970 https://build.opensuse.org/request/show/839970 by user cfconrad + dimstar_suse --- diff --git a/.files b/.files index fe27ad9..c84a51d 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 9a90f2c..65eb703 100644 --- a/.rev +++ b/.rev @@ -656,4 +656,12 @@ 836233 + + 475f244da492e8d3f09ab96629651696 + 2.9 + + dimstar_suse + + 839970 + diff --git a/wpa_supplicant-p2p_iname_size.diff b/wpa_supplicant-p2p_iname_size.diff new file mode 100644 index 0000000..9431ca7 --- /dev/null +++ b/wpa_supplicant-p2p_iname_size.diff @@ -0,0 +1,15 @@ +diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c +index e94bffe52..17c25889c 100644 +--- a/wpa_supplicant/p2p_supplicant.c ++++ b/wpa_supplicant/p2p_supplicant.c +@@ -3929,6 +3929,10 @@ int wpas_p2p_add_p2pdev_interface(struct wpa_supplicant *wpa_s, + wpa_s->ifname); + if (os_snprintf_error(sizeof(ifname), ret)) + return -1; ++ /* Cut length at the maximum size. Note that we don't need to ensure ++ * collision free names here as the created interface is not a netdev. ++ */ ++ ifname[IFNAMSIZ-1] = '\0'; + force_name[0] = '\0'; + wpa_s->pending_interface_type = WPA_IF_P2P_DEVICE; + ret = wpa_drv_if_add(wpa_s, WPA_IF_P2P_DEVICE, ifname, NULL, NULL, diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes index 339046b..c48fb5e 100644 --- a/wpa_supplicant.changes +++ b/wpa_supplicant.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 6 15:20:18 UTC 2020 - Florian + +- Add wpa_supplicant-p2p_iname_size.diff -- Limit P2P_DEVICE name to appropriate ifname size + (https://patchwork.ozlabs.org/project/hostap/patch/20200825062902.124600-1-benjamin@sipsolutions.net/) + +------------------------------------------------------------------- Tue Sep 22 13:06:32 UTC 2020 - Clemens Famulla-Conrad - Fix spec file for SLE12, use make %{?_smp_mflags} instead of %make_build diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index 38183a5..0756f16 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -41,6 +41,7 @@ Patch4: wpa_supplicant-getrandom.patch Patch5: wpa_supplicant-dump-certificate-as-PEM-in-debug-mode.diff Patch6: restore-old-dbus-interface.patch Patch7: CVE-2019-16275.patch +Patch8: wpa_supplicant-p2p_iname_size.diff BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: systemd-rpm-macros