diff options
| author | Siddharth Doshi <sdoshi@mvista.com> | 2024-08-22 21:47:21 +0530 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2024-09-09 06:08:10 -0700 |
| commit | 3c8d846bf03839d56e94da6b78c5935a730c69d9 (patch) | |
| tree | 1a9e02f2ec944fd546a7f39989b00314d983fe4d /meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb | |
| parent | 50cd89849b38e1695071ab0a0e7b31fdd6916fde (diff) | |
| download | poky-3c8d846bf03839d56e94da6b78c5935a730c69d9.tar.gz | |
wpa-supplicant: Upgrade 2.10 -> 2.11
License-Update:
===============
- README: Change in copyright years as per https://w1.fi/cgit/hostap/commit/README?id=d945ddd368085f255e68328f2d3b020ceea359af
- wpa_supplicant/wpa_supplicant.c: Change in copyright years as per https://w1.fi/cgit/hostap/commit/wpa_supplicant/wpa_supplicant.c?id=d945ddd368085f255e68328f2d3b020ceea359af
CVE's Fixed:
===========
- CVE-2024-5290 wpa_supplicant: wpa_supplicant loading arbitrary shared objects allowing privilege escalation
- CVE-2023-52160 wpa_supplicant: potential authorization bypass
Changes between 2.10 -> 2.11:
============================
https://w1.fi/cgit/hostap/commit/wpa_supplicant/ChangeLog?id=d945ddd368085f255e68328f2d3b020ceea359af
Note:
=====
Patches
0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch,
0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch,
0001-Install-wpa_passphrase-when-not-disabled.patch,
0001-PEAP-client-Update-Phase-2-authentication-requiremen.patch (CVE-2023-52160)
are already fixed and hence removing them.
(From OE-Core rev: 35c2b5f56bca789b9723a144fda0a130a67a860c)
Signed-off-by: Siddharth Doshi <sdoshi@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 824eb0641dc6001a5e9ad7a685e60c472c9fdce8)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb')
| -rw-r--r-- | meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb | 138 |
1 files changed, 0 insertions, 138 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb deleted file mode 100644 index 22028ce957..0000000000 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +++ /dev/null | |||
| @@ -1,138 +0,0 @@ | |||
| 1 | SUMMARY = "Client for Wi-Fi Protected Access (WPA)" | ||
| 2 | DESCRIPTION = "wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with support for WPA and WPA2 (IEEE 802.11i / RSN). Supplicant is the IEEE 802.1X/WPA component that is used in the client stations. It implements key negotiation with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver." | ||
| 3 | HOMEPAGE = "http://w1.fi/wpa_supplicant/" | ||
| 4 | BUGTRACKER = "http://w1.fi/security/" | ||
| 5 | SECTION = "network" | ||
| 6 | LICENSE = "BSD-3-Clause" | ||
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=5ebcb90236d1ad640558c3d3cd3035df \ | ||
| 8 | file://README;beginline=1;endline=56;md5=e3d2f6c2948991e37c1ca4960de84747 \ | ||
| 9 | file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=76306a95306fee9a976b0ac1be70f705" | ||
| 10 | |||
| 11 | DEPENDS = "dbus libnl" | ||
| 12 | |||
| 13 | SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ | ||
| 14 | file://wpa-supplicant.sh \ | ||
| 15 | file://wpa_supplicant.conf \ | ||
| 16 | file://wpa_supplicant.conf-sane \ | ||
| 17 | file://99_wpa_supplicant \ | ||
| 18 | file://0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch \ | ||
| 19 | file://0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch \ | ||
| 20 | file://0001-Install-wpa_passphrase-when-not-disabled.patch \ | ||
| 21 | file://0001-PEAP-client-Update-Phase-2-authentication-requiremen.patch \ | ||
| 22 | " | ||
| 23 | SRC_URI[sha256sum] = "20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f" | ||
| 24 | |||
| 25 | S = "${WORKDIR}/wpa_supplicant-${PV}" | ||
| 26 | |||
| 27 | inherit pkgconfig systemd | ||
| 28 | |||
| 29 | PACKAGECONFIG ?= "openssl" | ||
| 30 | PACKAGECONFIG[gnutls] = ",,gnutls libgcrypt" | ||
| 31 | PACKAGECONFIG[openssl] = ",,openssl" | ||
| 32 | |||
| 33 | CVE_PRODUCT = "wpa_supplicant" | ||
| 34 | |||
| 35 | EXTRA_OEMAKE = "'LIBDIR=${libdir}' 'INCDIR=${includedir}' 'BINDIR=${sbindir}'" | ||
| 36 | |||
| 37 | do_configure () { | ||
| 38 | ${MAKE} -C wpa_supplicant clean | ||
| 39 | sed -e '/^CONFIG_TLS=/d' <wpa_supplicant/defconfig >wpa_supplicant/.config | ||
| 40 | |||
| 41 | if ${@ bb.utils.contains('PACKAGECONFIG', 'openssl', 'true', 'false', d) }; then | ||
| 42 | echo 'CONFIG_TLS=openssl' >>wpa_supplicant/.config | ||
| 43 | elif ${@ bb.utils.contains('PACKAGECONFIG', 'gnutls', 'true', 'false', d) }; then | ||
| 44 | echo 'CONFIG_TLS=gnutls' >>wpa_supplicant/.config | ||
| 45 | sed -i -e 's/\(^CONFIG_DPP=\)/#\1/' \ | ||
| 46 | -e 's/\(^CONFIG_EAP_PWD=\)/#\1/' \ | ||
| 47 | -e 's/\(^CONFIG_SAE=\)/#\1/' wpa_supplicant/.config | ||
| 48 | fi | ||
| 49 | |||
| 50 | # For rebuild | ||
| 51 | rm -f wpa_supplicant/*.d wpa_supplicant/dbus/*.d | ||
| 52 | } | ||
| 53 | |||
| 54 | do_compile () { | ||
| 55 | oe_runmake -C wpa_supplicant | ||
| 56 | if [ -z "${DISABLE_STATIC}" ]; then | ||
| 57 | oe_runmake -C wpa_supplicant libwpa_client.a | ||
| 58 | fi | ||
| 59 | } | ||
| 60 | |||
| 61 | do_install () { | ||
| 62 | oe_runmake -C wpa_supplicant DESTDIR="${D}" install | ||
| 63 | |||
| 64 | install -d ${D}${docdir}/wpa_supplicant | ||
| 65 | install -m 644 wpa_supplicant/README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant | ||
| 66 | |||
| 67 | install -d ${D}${sysconfdir} | ||
| 68 | install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf | ||
| 69 | |||
| 70 | install -d ${D}${sysconfdir}/network/if-pre-up.d/ | ||
| 71 | install -d ${D}${sysconfdir}/network/if-post-down.d/ | ||
| 72 | install -d ${D}${sysconfdir}/network/if-down.d/ | ||
| 73 | install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant | ||
| 74 | ln -sf ../if-pre-up.d/wpa-supplicant ${D}${sysconfdir}/network/if-post-down.d/wpa-supplicant | ||
| 75 | |||
| 76 | install -d ${D}/${sysconfdir}/dbus-1/system.d | ||
| 77 | install -m 644 ${S}/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d | ||
| 78 | install -d ${D}/${datadir}/dbus-1/system-services | ||
| 79 | install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services | ||
| 80 | |||
| 81 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | ||
| 82 | install -d ${D}/${systemd_system_unitdir} | ||
| 83 | install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_system_unitdir} | ||
| 84 | fi | ||
| 85 | |||
| 86 | install -d ${D}/etc/default/volatiles | ||
| 87 | install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles | ||
| 88 | |||
| 89 | install -d ${D}${includedir} | ||
| 90 | install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir} | ||
| 91 | |||
| 92 | if [ -z "${DISABLE_STATIC}" ]; then | ||
| 93 | install -d ${D}${libdir} | ||
| 94 | install -m 0644 wpa_supplicant/libwpa_client.a ${D}${libdir} | ||
| 95 | fi | ||
| 96 | } | ||
| 97 | |||
| 98 | pkg_postinst:${PN} () { | ||
| 99 | # If we're offline, we don't need to do this. | ||
| 100 | if [ "x$D" = "x" ]; then | ||
| 101 | killall -q -HUP dbus-daemon || true | ||
| 102 | fi | ||
| 103 | } | ||
| 104 | |||
| 105 | PACKAGE_BEFORE_PN += "${PN}-passphrase ${PN}-cli" | ||
| 106 | PACKAGES =+ "${PN}-lib" | ||
| 107 | PACKAGES += "${PN}-plugins" | ||
| 108 | ALLOW_EMPTY:${PN}-plugins = "1" | ||
| 109 | |||
| 110 | PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" | ||
| 111 | NOAUTOPACKAGEDEBUG = "1" | ||
| 112 | |||
| 113 | FILES:${PN}-passphrase = "${sbindir}/wpa_passphrase" | ||
| 114 | FILES:${PN}-cli = "${sbindir}/wpa_cli" | ||
| 115 | FILES:${PN}-lib = "${libdir}/libwpa_client*${SOLIBSDEV}" | ||
| 116 | FILES:${PN} += "${datadir}/dbus-1/system-services/* ${systemd_system_unitdir}/*" | ||
| 117 | FILES:${PN}-dbg += "${sbindir}/.debug ${libdir}/.debug" | ||
| 118 | |||
| 119 | CONFFILES:${PN} += "${sysconfdir}/wpa_supplicant.conf" | ||
| 120 | |||
| 121 | RRECOMMENDS:${PN} = "${PN}-passphrase ${PN}-cli ${PN}-plugins" | ||
| 122 | |||
| 123 | SYSTEMD_SERVICE:${PN} = "wpa_supplicant.service" | ||
| 124 | SYSTEMD_AUTO_ENABLE = "disable" | ||
| 125 | |||
| 126 | python split_wpa_supplicant_libs () { | ||
| 127 | libdir = d.expand('${libdir}/wpa_supplicant') | ||
| 128 | dbglibdir = os.path.join(libdir, '.debug') | ||
| 129 | |||
| 130 | split_packages = do_split_packages(d, libdir, r'^(.*)\.so', '${PN}-plugin-%s', 'wpa_supplicant %s plugin', prepend=True) | ||
| 131 | split_dbg_packages = do_split_packages(d, dbglibdir, r'^(.*)\.so', '${PN}-plugin-%s-dbg', 'wpa_supplicant %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg') | ||
| 132 | |||
| 133 | if split_packages: | ||
| 134 | pn = d.getVar('PN') | ||
| 135 | d.setVar('RRECOMMENDS:' + pn + '-plugins', ' '.join(split_packages)) | ||
| 136 | d.appendVar('RRECOMMENDS:' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) | ||
| 137 | } | ||
| 138 | PACKAGESPLITFUNCS += "split_wpa_supplicant_libs" | ||
