diff --git a/security/wpa_supplicant/Makefile b/security/wpa_supplicant/Makefile index ec6d4fd694dc..1de61895073a 100644 --- a/security/wpa_supplicant/Makefile +++ b/security/wpa_supplicant/Makefile @@ -1,244 +1,249 @@ PORTNAME= wpa_supplicant -PORTVERSION= 2.11 -PORTREVISION= 7 +PORTVERSION= 2.12 CATEGORIES= security net MASTER_SITES= https://w1.fi/releases/ MAINTAINER= cy@FreeBSD.org COMMENT= Supplicant (client) for WPA/802.1x protocols WWW= https://w1.fi/wpa_supplicant/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/README USES= cpe gmake pkgconfig:build readline ssl CPE_VENDOR= w1.fi USE_LDCONFIG= yes BUILD_WRKSRC= ${WRKSRC}/wpa_supplicant INSTALL_WRKSRC= ${WRKSRC}/src +CPPFLAGS+= -Wno-incompatible-function-pointer-types CFLAGS+= ${CPPFLAGS} # USES=readline only augments CPPFLAGS and LDFLAGS +CFLAGS+= -Wno-undefined-internal CFLAGS+= -I${OPENSSLINC} CFLAGS+= -Wno-deprecated-declarations LDFLAGS+= -L${OPENSSLLIB} -lutil MAKE_ENV= V=1 SUB_FILES= pkg-message PORTDOCS= README ChangeLog CFG= ${BUILD_WRKSRC}/.config .if !exists(/etc/rc.d/wpa_supplicant) USE_RC_SUBR= wpa_supplicant .endif OPTIONS_MULTI= DRV EAP OPTIONS_MULTI_DRV= BSD WIRED NDIS TEST NONE #ROBOSWITCH OPTIONS_MULTI_EAP= TLS PEAP TTLS MD5 MSCHAPV2 GTC LEAP OTP PSK FAST \ SIM PWD PAX AKA AKA_PRIME SAKE GPSK TNC IKEV2 EKE OPTIONS_DEFINE= WPS WPS_ER WPS_NOREG WPS_NFC WPS_UPNP PKCS12 SMARTCARD \ HT_OVERRIDES VHT_OVERRIDES TLSV12 IEEE80211W \ IEEE80211R DEBUG_FILE DEBUG_SYSLOG PRIVSEP \ DELAYED_MIC IEEE80211N IEEE80211AC INTERWORKING \ - IEEE8021X_EAPOL EAPOL_TEST IPV6 \ - HS20 NO_ROAMING P2P TDLS DBUS MATCH DOCS \ - SIM_SIMULATOR USIM_SIMULATOR WEP PASN LIBWPA + IEEE8021X_EAPOL EAPOL_TEST IPV6 LIBWPA\ + HS20 NO_ROAMING P2P PASN TDLS DBUS MATCH DOCS \ + SIM_SIMULATOR USIM_SIMULATOR WNM MBO RSN_PREAUTH WEP OPTIONS_DEFAULT= BSD WIRED \ TLS PEAP TTLS MD5 MSCHAPV2 GTC LEAP OTP PSK \ WPS PKCS12 SMARTCARD IEEE80211R DEBUG_SYSLOG \ INTERWORKING HS20 DBUS MATCH IEEE80211R IEEE80211W \ IEEE8021X_EAPOL WPS_ER WPS_NFC WPS_UPNP \ - FAST PWD PAX SAKE GPSK TNC IKEV2 EKE WEP PASN LIBWPA IPV6 + FAST PWD PAX SAKE GPSK TNC IKEV2 EKE \ + WNM MBO RSN_PREAUTH WEP PASN IPV6 LIBWPA OPTIONS_SUB= WPS_DESC= Wi-Fi Protected Setup WPS_ER_DESC= Enable WPS External Registrar WPS_NOREG_DESC= Disable open network credentials when registrar WPS_NFC_DESC= Near Field Communication (NFC) configuration WPS_UPNP_DESC= Universal Plug and Play support PKCS12_DESC= PKCS\#12 (PFS) support SMARTCARD_DESC= Private key on smartcard support HT_OVERRIDES_DESC= Disable HT/HT40, mask MCS rates, etc VHT_OVERRIDES_DESC= Disable VHT, mask MCS rates, etc TLSV12_DESC= Build with TLS v1.2 instead of TLS v1.0 IEEE80211AC_DESC= Very High Throughput, AP mode (IEEE 802.11ac) IEEE80211N_DESC= High Throughput, AP mode (IEEE 802.11n) IEEE80211R_DESC= Fast BSS Transition (IEEE 802.11r-2008) IEEE80211W_DESC= Management Frame Protection (IEEE 802.11w) IEEE8021X_EAPOL_DESC= EAP over LAN support EAPOL_TEST_DESC= Development testing IPV6_DESC= Development testing IPv6 support DEBUG_FILE_DESC= Support for writing debug log to a file DEBUG_SYSLOG_DESC= Send debug messages to syslog instead of stdout PRIVSEP_DESC= Privilege separation DELAYED_MIC_DESC= Mitigate TKIP attack, random delay on MIC errors INTERWORKING_DESC= Improve ext. network interworking (IEEE 802.11u) HS20_DESC= Hotspot 2.0 NO_ROAMING_DESC= Disable roaming P2P_DESC= Peer-to-Peer support +PASN_DESC= Pre-Association Security Negotiation TDLS_DESC= Tunneled Direct Link Setup MATCH_DESC= Interface match mode DRV_DESC= Driver options BSD_DESC= BSD net80211 interface NDIS_DESC= Windows NDIS interface WIRED_DESC= Wired ethernet interface ROBOSWITCH_DESC= Broadcom Roboswitch interface TEST_DESC= Development testing interface NONE_DESC= The 'no driver' interface, e.g. WPS ER only EAP_DESC= Extensible Authentication Protocols TLS_DESC= Transport Layer Security PEAP_DESC= Protected Extensible Authentication Protocol TTLS_DESC= Tunneled Transport Layer Security MD5_DESC= MD5 hash (deprecated, no key generation) MSCHAPV2_DESC= Microsoft CHAP version 2 (RFC 2759) GTC_DESC= Generic Token Card LEAP_DESC= Lightweight Extensible Authentication Protocol OTP_DESC= One-Time Password PSK_DESC= Pre-Shared key FAST_DESC= Flexible Authentication via Secure Tunneling AKA_DESC= Autentication and Key Agreement (UMTS) AKA_PRIME_DESC= AKA Prime variant (RFC 5448) EKE_DESC= Encrypted Key Exchange WEP_DESC= WEP support SIM_DESC= Subscriber Identity Module SIM_SIMULATOR_DESC= SIM simulator (Milenage) for EAP-SIM USIM_SIMULATOR_DESC= SIM simulator (Milenage) for EAP-AKA IKEV2_DESC= Internet Key Exchange version 2 PWD_DESC= Shared password (RFC 5931) PAX_DESC= Password Authenticated Exchange SAKE_DESC= Shared-Secret Authentication & Key Establishment GPSK_DESC= Generalized Pre-Shared Key TNC_DESC= Trusted Network Connect -PASN_DESC= Pre-Association Security Negotiation +WNM_DESC= Wireless Network Monitoring +MBO_DESC= Multi Band Operation (Enables WNM) +RSN_PREAUTH= RSN Preauthentication LIBWPA_DESC= libwpa_client Shared Library PRIVSEP_PLIST_FILES= sbin/wpa_priv DBUS_PLIST_FILES= share/dbus-1/system-services/fi.w1.wpa_supplicant1.service \ etc/dbus-1/system.d/dbus-wpa_supplicant.conf -LIBWPA_PLIST_FILES= lib/libwpa_client.so \ - lib/libwpa_client.so.2 \ - include/wpa_ctrl.h .include -.if ${PORT_OPTIONS:MNDIS} && ${PORT_OPTIONS:MPRIVSEP} -BROKEN= Fails to compile with both NDIS and PRIVSEP +.if ! ${PORT_OPTIONS:MPASN} +BROKEN= PASN is now a hard requirement .endif -.if ${PORT_OPTIONS:MIEEE80211AC} && ${PORT_OPTIONS:MIEEE80211N} -BROKEN= Fails to compile with both IEEE80211AC and IEEE80211N +.if ${PORT_OPTIONS:MNDIS} && ${PORT_OPTIONS:MPRIVSEP} +BROKEN= Fails to compile with both NDIS and PRIVSEP .endif .if ${PORT_OPTIONS:MSIM} || ${PORT_OPTIONS:MAKA} || ${PORT_OPTIONS:MAKA_PRIME} LIB_DEPENDS+= libpcsclite.so:devel/pcsc-lite CFLAGS+= -I${LOCALBASE}/include/PCSC LDFLAGS+= -L${LOCALBASE}/lib .endif .if ${PORT_OPTIONS:MDBUS} LIB_DEPENDS+= libdbus-1.so:devel/dbus .endif post-patch: @${CP} ${FILESDIR}/Packet32.[ch] ${FILESDIR}/ntddndis.h \ ${WRKSRC}/src/utils # Set driver(s) + # SAE and ENC_ASSOC are always required. + @${ECHO_CMD} CONFIG_SAE=y >> ${CFG} + @${ECHO_CMD} CONFIG_ENC_ASSOC=y >> ${CFG} .for item in BSD NDIS WIRED ROBOSWITCH TEST NONE . if ${PORT_OPTIONS:M${item}} @${ECHO_CMD} CONFIG_DRIVER_${item}=y >> ${CFG} . endif .endfor # Set EAP protocol(s) .for item in MD5 MSCHAPV2 TLS PEAP TTLS FAST GTC OTP PSK PWD PAX LEAP SIM \ AKA AKA_PRIME SAKE GPSK TNC IKEV2 EKE WEP . if ${PORT_OPTIONS:M${item}} @${ECHO_CMD} CONFIG_EAP_${item:tu}=y >> ${CFG} . endif .endfor .if ${PORT_OPTIONS:MSIM} || ${PORT_OPTIONS:MAKA} || ${PORT_OPTIONS:MAKA_PRIME} @${ECHO_CMD} CONFIG_PCSC=y >> ${CFG} .endif +.if ${PORT_OPTIONS:MMBO} + @${ECHO_CMD} CONFIG_WNM=y >> ${CFG} +.endif .for simple in WPS WPS_ER WPS_NFC WPS_UPNP PKCS12 SMARTCARD HT_OVERRIDES \ VHT_OVERRIDES TLSV12 IEEE80211AC IEEE80211N IEEE80211R IEEE80211W \ - IEEE8021X_EAPOL EAPOL_TEST IPV6\ - INTERWORKING DEBUG_FILE DEBUG_SYSLOG HS20 NO_ROAMING PRIVSEP P2P TDLS \ - PASN + IEEE8021X_EAPOL EAPOL_TEST IPV6 \ + INTERWORKING DEBUG_FILE DEBUG_SYSLOG HS20 NO_ROAMING PRIVSEP P2P \ + PASN TDLS WNM MBO RSN_PREAUTH . if ${PORT_OPTIONS:M${simple}} @${ECHO_CMD} CONFIG_${simple}=y >> ${CFG} +. if ${simple} == "IEEE80211N" + @${ECHO_CMD} CONFIG_IEEE80211BE=y >> ${CFG} + @${ECHO_CMD} CONFIG_IEEE80211AX=y >> ${CFG} + @${ECHO_CMD} CONFIG_IEEE80211AC=y >> ${CFG} + @${ECHO_CMD} CONFIG_AP=y >> ${CFG} + @${ECHO_CMD} NEED_AP_MLME=y >> ${CFG} +. endif . endif .endfor .for item in READLINE PEERKEY @${ECHO_CMD} CONFIG_${item}=y >> ${CFG} .endfor .if ${PORT_OPTIONS:MIEEE80211AC} || ${PORT_OPTIONS:MIEEE80211N} @${ECHO_CMD} CONFIG_AP=y >> ${CFG} .endif .if ${PORT_OPTIONS:MGPSK} # GPSK desired, assume highest SHA desired too @${ECHO_CMD} CONFIG_EAP_GPSK_SHA256=y >> ${CFG} .endif .if ${PORT_OPTIONS:MWPS_NOREG} @${ECHO_CMD} CONFIG_WPS_REG_DISABLE_OPEN=y >> ${CFG} .endif .if ${PORT_OPTIONS:MDELAYED_MIC} @${ECHO_CMD} CONFIG_DELAYED_MIC_ERROR_REPORT=y >> ${CFG} .endif .if ${PORT_OPTIONS:MDBUS} @${ECHO_CMD} CONFIG_CTRL_IFACE_DBUS_NEW=y >> ${CFG} @${ECHO_CMD} CONFIG_CTRL_IFACE_DBUS_INTRO=y >> ${CFG} .endif .if ${PORT_OPTIONS:MMATCH} @${ECHO_CMD} CONFIG_MATCH_IFACE=y >> ${CFG} .endif .if ${PORT_OPTIONS:MUSIM_SIMULATOR} @${ECHO_CMD} CONFIG_USIM_SIMULATOR=y >> ${CFG} .endif .if ${PORT_OPTIONS:MSIM_SIMULATOR} @${ECHO_CMD} CONFIG_SIM_SIMULATOR=y >> ${CFG} -.endif -.if ${PORT_OPTIONS:MLIBWPA} - @${ECHO_CMD} CONFIG_BUILD_WPA_CLIENT_SO=y >> ${CFG} .endif @${ECHO_CMD} CONFIG_OS=unix >> ${CFG} @${ECHO_CMD} CONFIG_CTRL_IFACE=unix >> ${CFG} @${ECHO_CMD} CONFIG_BACKEND=file >> ${CFG} @${ECHO_CMD} CONFIG_L2_PACKET=freebsd >> ${CFG} @${ECHO_CMD} CONFIG_TLS=openssl >> ${CFG} post-build-EAPOL_TEST-on: cd ${BUILD_WRKSRC} && ${GMAKE} eapol_test do-install: (cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} wpa_supplicant wpa_cli \ wpa_passphrase ${STAGEDIR}${PREFIX}/sbin) ${INSTALL_DATA} ${BUILD_WRKSRC}/wpa_supplicant.conf \ ${STAGEDIR}${PREFIX}/etc/wpa_supplicant.conf.sample do-install-EAPOL_TEST-on: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/eapol_test ${STAGEDIR}${PREFIX}/sbin do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${BUILD_WRKSRC} && \ ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) do-install-PRIVSEP-on: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/wpa_priv ${STAGEDIR}${PREFIX}/sbin do-install-DBUS-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/system-services/ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/ ${INSTALL_DATA} ${BUILD_WRKSRC}/dbus/fi.w1.wpa_supplicant1.service \ ${STAGEDIR}${PREFIX}/share/dbus-1/system-services/ ${INSTALL_DATA} ${BUILD_WRKSRC}/dbus/dbus-wpa_supplicant.conf \ ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/ -do-install-LIBWPA-on: - ${INSTALL_LIB} ${BUILD_WRKSRC}/libwpa_client.so \ - ${STAGEDIR}${PREFIX}/lib/libwpa_client.so.2 - ${LN} -s libwpa_client.so.2 ${STAGEDIR}${PREFIX}/lib/libwpa_client.so - ${INSTALL_DATA} ${INSTALL_WRKSRC}/common/wpa_ctrl.h \ - ${STAGEDIR}${PREFIX}/include - .include diff --git a/security/wpa_supplicant/distinfo b/security/wpa_supplicant/distinfo index dbb8c846cb3b..249b2a0e03d6 100644 --- a/security/wpa_supplicant/distinfo +++ b/security/wpa_supplicant/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1721563533 -SHA256 (wpa_supplicant-2.11.tar.gz) = 912ea06f74e30a8e36fbb68064d6cdff218d8d591db0fc5d75dee6c81ac7fc0a -SIZE (wpa_supplicant-2.11.tar.gz) = 3841433 +TIMESTAMP = 1786259259 +SHA256 (wpa_supplicant-2.12.tar.gz) = 08e23937e16d0155e55cab2b51f51fbe10d80a1aa91c4e15442645059b737ef6 +SIZE (wpa_supplicant-2.12.tar.gz) = 4247413 diff --git a/security/wpa_supplicant/files/patch-src_utils_os__unix.c b/security/wpa_supplicant/files/patch-src_utils_os__unix.c index 3feccd7f0b28..be7cf80db233 100644 --- a/security/wpa_supplicant/files/patch-src_utils_os__unix.c +++ b/security/wpa_supplicant/files/patch-src_utils_os__unix.c @@ -1,14 +1,16 @@ ---- src/utils/os_unix.c.orig 2024-07-20 18:04:37 UTC -+++ src/utils/os_unix.c -@@ -103,9 +103,11 @@ int os_get_reltime(struct os_reltime *t) - break; +--- src/utils/os_unix.c.orig 2026-08-07 06:10:53.000000000 -0700 ++++ src/utils/os_unix.c 2026-08-10 07:55:55.825032000 -0700 +@@ -124,11 +124,13 @@ #endif + #ifdef CLOCK_MONOTONIC +#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME == CLOCK_MONOTONIC) - case CLOCK_MONOTONIC: + if (clock_id == CLOCK_MONOTONIC) { clock_id = CLOCK_REALTIME; - break; -+#endif + continue; + } #endif - case CLOCK_REALTIME: - return -1; ++#endif + + /* No additional clockid_t values to fall back to */ + return -1; diff --git a/security/wpa_supplicant/files/patch-wpa__supplicant_main.c b/security/wpa_supplicant/files/patch-wpa__supplicant_main.c index f9db90635a4c..cc1a8a0aeadb 100644 --- a/security/wpa_supplicant/files/patch-wpa__supplicant_main.c +++ b/security/wpa_supplicant/files/patch-wpa__supplicant_main.c @@ -1,33 +1,23 @@ ---- wpa_supplicant/main.c.orig 2024-07-20 18:04:37 UTC -+++ wpa_supplicant/main.c -@@ -67,7 +67,7 @@ static void usage(void) +--- wpa_supplicant/main.c.orig 2026-08-07 06:10:53.000000000 -0700 ++++ wpa_supplicant/main.c 2026-08-10 07:46:07.856385000 -0700 +@@ -70,7 +70,7 @@ " -c = Configuration file\n" " -C = ctrl_interface parameter (only used if -c is not)\n" " -d = increase debugging verbosity (-dd even more)\n" - " -D = driver name (can be multiple drivers: nl80211,wext)\n" + " -D = driver name (can be multiple drivers: bsd,wired)\n" " -e = entropy file\n" #ifdef CONFIG_DEBUG_FILE " -f = log output to debug file instead of stdout\n" -@@ -106,8 +106,7 @@ static void usage(void) - " -W = wait for a control interface monitor before starting\n"); - - printf("example:\n" -- " wpa_supplicant -D%s -iwlan0 -c/etc/wpa_supplicant.conf\n", -- wpa_drivers[0] ? wpa_drivers[0]->name : "nl80211"); -+ " wpa_supplicant -Dbsd -iwlan0 -c/etc/wpa_supplicant.conf\n"); - #endif /* CONFIG_NO_STDOUT_DEBUG */ - } - -@@ -199,6 +198,11 @@ int main(int argc, char *argv[]) - iface_count = 1; +@@ -211,6 +211,11 @@ wpa_supplicant_fd_workaround(1); -+ + +#ifdef CONFIG_DRIVER_NDIS + void driver_ndis_init_ops(void); + driver_ndis_init_ops(); +#endif /* CONFIG_DRIVER_NDIS */ - ++ for (;;) { c = getopt(argc, argv, + "b:Bc:C:D:de:f:g:G:hi:I:KLMm:No:O:p:P:qsTtuvWyz:");