git: 8149d705ebaa - main - security/wpa_supplicant: Update to 2.11

The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8149d705ebaa724e7957b9e1e85bf13897ac22bf

commit 8149d705ebaa724e7957b9e1e85bf13897ac22bf
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-07-21 12:11:08 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-07-21 13:06:30 +0000

    security/wpa_supplicant: Update to 2.11
---
 security/wpa_supplicant/Makefile                   |  3 +-
 security/wpa_supplicant/distinfo                   |  6 +-
 .../patch-src_l2__packet_l2__packet__freebsd.c     | 72 +++-------------------
 .../files/patch-src_utils_os__unix.c               |  4 +-
 .../files/patch-wpa__supplicant_pasn__supplicant.c | 14 -----
 5 files changed, 13 insertions(+), 86 deletions(-)

diff --git a/security/wpa_supplicant/Makefile b/security/wpa_supplicant/Makefile
index fbb215fe0e82..4cd123fc48c6 100644
--- a/security/wpa_supplicant/Makefile
+++ b/security/wpa_supplicant/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	wpa_supplicant
-PORTVERSION=	2.10
-PORTREVISION=	10
+PORTVERSION=	2.11
 CATEGORIES=	security net
 MASTER_SITES=	https://w1.fi/releases/
 
diff --git a/security/wpa_supplicant/distinfo b/security/wpa_supplicant/distinfo
index 5cdea91002ec..dbb8c846cb3b 100644
--- a/security/wpa_supplicant/distinfo
+++ b/security/wpa_supplicant/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642435837
-SHA256 (wpa_supplicant-2.10.tar.gz) = 20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f
-SIZE (wpa_supplicant-2.10.tar.gz) = 3511622
+TIMESTAMP = 1721563533
+SHA256 (wpa_supplicant-2.11.tar.gz) = 912ea06f74e30a8e36fbb68064d6cdff218d8d591db0fc5d75dee6c81ac7fc0a
+SIZE (wpa_supplicant-2.11.tar.gz) = 3841433
diff --git a/security/wpa_supplicant/files/patch-src_l2__packet_l2__packet__freebsd.c b/security/wpa_supplicant/files/patch-src_l2__packet_l2__packet__freebsd.c
index 1575ae69bd85..2ec52fcdcd85 100644
--- a/security/wpa_supplicant/files/patch-src_l2__packet_l2__packet__freebsd.c
+++ b/security/wpa_supplicant/files/patch-src_l2__packet_l2__packet__freebsd.c
@@ -1,72 +1,14 @@
---- src/l2_packet/l2_packet_freebsd.c.orig	2022-01-16 12:51:29.000000000 -0800
-+++ src/l2_packet/l2_packet_freebsd.c	2023-09-11 22:19:01.713695000 -0700
-@@ -8,7 +8,8 @@
+--- src/l2_packet/l2_packet_freebsd.c.orig	2023-10-30 10:53:18.000000000 -0700
++++ src/l2_packet/l2_packet_freebsd.c	2023-10-30 14:10:36.396969000 -0700
+@@ -8,7 +8,10 @@
   */
  
  #include "includes.h"
 -#if defined(__APPLE__) || defined(__GLIBC__)
-+#include <sys/param.h>
-+#if defined(__APPLE__) || defined(__GLIBC__) || defined(__FreeBSD_version)
++#if defined(__FreeBSD__) \
++ || defined(__DragonFly__) \
++ || defined(__APPLE__) \
++ || defined(__GLIBC__)
  #include <net/bpf.h>
  #endif /* __APPLE__ */
  #include <pcap.h>
-@@ -20,6 +21,7 @@
- #include <sys/sysctl.h>
- #endif /* __sun__ */
- 
-+#include <net/ethernet.h>
- #include <net/if.h>
- #include <net/if_dl.h>
- #include <net/route.h>
-@@ -76,24 +78,33 @@
- {
- 	struct l2_packet_data *l2 = eloop_ctx;
- 	pcap_t *pcap = sock_ctx;
--	struct pcap_pkthdr hdr;
-+	struct pcap_pkthdr *hdr;
- 	const u_char *packet;
- 	struct l2_ethhdr *ethhdr;
- 	unsigned char *buf;
- 	size_t len;
- 
--	packet = pcap_next(pcap, &hdr);
-+	if (pcap_next_ex(pcap, &hdr, &packet) == -1) {
-+		wpa_printf(MSG_ERROR, "Error reading packet, has device disappeared?");
-+		packet = NULL;
-+		eloop_terminate();
-+	}
- 
--	if (!l2->rx_callback || !packet || hdr.caplen < sizeof(*ethhdr))
-+	if (!l2->rx_callback || !packet || hdr->caplen < sizeof(*ethhdr))
- 		return;
- 
- 	ethhdr = (struct l2_ethhdr *) packet;
- 	if (l2->l2_hdr) {
- 		buf = (unsigned char *) ethhdr;
--		len = hdr.caplen;
-+		len = hdr->caplen;
- 	} else {
- 		buf = (unsigned char *) (ethhdr + 1);
--		len = hdr.caplen - sizeof(*ethhdr);
-+		len = hdr->caplen - sizeof(*ethhdr);
-+		/* handle 8021Q encapsulated frames */
-+		if (ethhdr->h_proto == htons(ETH_P_8021Q)) {
-+			buf += ETHER_VLAN_ENCAP_LEN;
-+			len -= ETHER_VLAN_ENCAP_LEN;
-+		}
- 	}
- 	l2->rx_callback(l2->rx_callback_ctx, ethhdr->h_source, buf, len);
- }
-@@ -122,10 +133,10 @@
- 	os_snprintf(pcap_filter, sizeof(pcap_filter),
- 		    "not ether src " MACSTR " and "
- 		    "( ether dst " MACSTR " or ether dst " MACSTR " ) and "
--		    "ether proto 0x%x",
-+		    "( ether proto 0x%x or ( vlan 0 and ether proto 0x%x ) )",
- 		    MAC2STR(l2->own_addr), /* do not receive own packets */
- 		    MAC2STR(l2->own_addr), MAC2STR(pae_group_addr),
--		    protocol);
-+		    protocol, protocol);
- 	if (pcap_compile(l2->pcap, &pcap_fp, pcap_filter, 1, pcap_netp) < 0) {
- 		fprintf(stderr, "pcap_compile: %s\n", pcap_geterr(l2->pcap));
- 		return -1;
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 612df647489e..d3ebadbba827 100644
--- a/security/wpa_supplicant/files/patch-src_utils_os__unix.c
+++ b/security/wpa_supplicant/files/patch-src_utils_os__unix.c
@@ -1,5 +1,5 @@
---- src/utils/os_unix.c.orig	2022-01-16 12:51:29.000000000 -0800
-+++ src/utils/os_unix.c	2024-06-01 22:03:18.774245000 -0700
+--- src/utils/os_unix.c.orig	2024-05-10 09:57:55.000000000 -0700
++++ src/utils/os_unix.c	2024-06-01 22:18:54.999484000 -0700
 @@ -103,10 +103,12 @@
  			break;
  #endif
diff --git a/security/wpa_supplicant/files/patch-wpa__supplicant_pasn__supplicant.c b/security/wpa_supplicant/files/patch-wpa__supplicant_pasn__supplicant.c
deleted file mode 100644
index f8a71213a120..000000000000
--- a/security/wpa_supplicant/files/patch-wpa__supplicant_pasn__supplicant.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- wpa_supplicant/pasn_supplicant.c.orig	2021-04-10 02:48:08.000000000 -0700
-+++ wpa_supplicant/pasn_supplicant.c	2021-04-12 10:44:14.939212000 -0700
-@@ -1079,7 +1079,11 @@
- 	pasn->group = group;
- 	pasn->freq = freq;
- 
-+#ifdef CONFIG_TESTING_OPTIONS
- 	if (wpa_s->conf->force_kdk_derivation ||
-+#else
-+	if (
-+#endif
- 	    (wpa_s->drv_flags2 & WPA_DRIVER_FLAGS2_SEC_LTF &&
- 	     ieee802_11_rsnx_capab(beacon_rsnxe, WLAN_RSNX_CAPAB_SECURE_LTF)))
- 		pasn->kdk_len = WPA_KDK_MAX_LEN;