From nobody Sun Jul 21 13:06:50 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WRkFl2JNZz5RTRb; Sun, 21 Jul 2024 13:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WRkFk5m7Dz4QrK; Sun, 21 Jul 2024 13:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721567210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XXlahvU5NeiTJ9U8zilM3zo8STRnm2Q/36wKfxEW1bk=; b=D9+Ze/MMCTYMy/q1EfAyHO2COUgeCGyRrFwgIb1dGIXd7tSiTqAEnboAIBqt74Di8GMgXo RZ3WSupIUBL3EIDMdNF8IlqCA86szo2oHCxAxCxsTB5gwkEmoLES1ZbfIGKx8rz209/Vj7 lj55nsDyO7LX40IpY7Me+8dYyPn4WRpUGA3qt8VOnTm+sYNk1hJATUhH/MoGvr70tHY1Gv kvgLmH+NKEi/bRTaj8aSWw9VFRvFlE8/LcTz+Qel9d9aE0KhGQGe/t4iE1sUeHdBGCaCUU iENiCsF9ANYrYZZa90crKlsAGpk7+B1nKmyYLH39wegjINiqBqyaa7Ogq2HiNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721567210; a=rsa-sha256; cv=none; b=Ir9edMYUOJY5+VY4UgsWGCk+LYHt1/x1LI5Q95RavvRfSYPm0Z+64TUhoJb/8hBGT1W4nU yx83ZZ0UbA5LvqGTnfA5o+EYcT+E+y9G6iO1uT4cU5wEGVL9KxwgGqK0XMy17L+RcJU5q7 OeCrALrbvtogpsMMCxNQWzXxfWtpWKN5zEhZdgQuqfprmKSjVAryIgRwPQjJUXOrLAXSr6 rpyNj/wo0n+myfTg1AArDDRGZI+ciBDpSfBBu0GBZfIUmg4UVYCZfpA6B7DG1OYjrqvulz AfHVxyNK721acmG2zt1/WCrmy7ZINyxK0iWEjD3Q324ddc92WIyN/d7KNLcA2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721567210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XXlahvU5NeiTJ9U8zilM3zo8STRnm2Q/36wKfxEW1bk=; b=gnThmjH6TyA+7OaXcEB905a8x7+YdwQWZOSoD4j1uerf2kh+QFg1846JsDCq230ijI7QVE TEayH7nAPQ/LxsnvA5R5kMi1TRq7DMF1f910QM6IobKawpWmySkZeYnby+YUSTr16fRaSv 4oTNSBcofC6CWs2PZV6r8I2DkA8nCRtX8uDmnwhVKCe0PcfNzUSlZxrvYrDZsnzB/w4lqT OhKPfGU1Xt3fxZKnNSJI+x9tnK7S7OSb0vQEAPLZE158HHHchjzawterbyUjZVZDJfk5zH MHdwlUySvZDFtpFKmunKjmxHZC2+ZuEGsQgfpCFUxaFLiGkPonWIxGrut5Tzfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WRkFk57yxz11wh; Sun, 21 Jul 2024 13:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46LD6oY6006049; Sun, 21 Jul 2024 13:06:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46LD6oO6006046; Sun, 21 Jul 2024 13:06:50 GMT (envelope-from git) Date: Sun, 21 Jul 2024 13:06:50 GMT Message-Id: <202407211306.46LD6oO6006046@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 8149d705ebaa - main - security/wpa_supplicant: Update to 2.11 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8149d705ebaa724e7957b9e1e85bf13897ac22bf Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8149d705ebaa724e7957b9e1e85bf13897ac22bf commit 8149d705ebaa724e7957b9e1e85bf13897ac22bf Author: Cy Schubert AuthorDate: 2024-07-21 12:11:08 +0000 Commit: Cy Schubert 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 -+#if defined(__APPLE__) || defined(__GLIBC__) || defined(__FreeBSD_version) ++#if defined(__FreeBSD__) \ ++ || defined(__DragonFly__) \ ++ || defined(__APPLE__) \ ++ || defined(__GLIBC__) #include #endif /* __APPLE__ */ #include -@@ -20,6 +21,7 @@ - #include - #endif /* __sun__ */ - -+#include - #include - #include - #include -@@ -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;