Date: Mon, 30 Oct 2023 21:22:47 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fe1ae3d1c37d - main - security/wpa_supplicant-devel: Update to latest GH commit Message-ID: <202310302122.39ULMlSK078858@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe1ae3d1c37d5baea3657329daa060df742e8a0b commit fe1ae3d1c37d5baea3657329daa060df742e8a0b Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2023-10-30 21:09:59 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2023-10-30 21:22:39 +0000 security/wpa_supplicant-devel: Update to latest GH commit Update to the latest w1.fi commit, proxied through my GH account. --- security/wpa_supplicant-devel/Makefile | 5 +- security/wpa_supplicant-devel/distinfo | 6 +- .../patch-src_l2__packet_l2__packet__freebsd.c | 64 +--------------------- 3 files changed, 7 insertions(+), 68 deletions(-) diff --git a/security/wpa_supplicant-devel/Makefile b/security/wpa_supplicant-devel/Makefile index 322d27a3335b..45f9039818d6 100644 --- a/security/wpa_supplicant-devel/Makefile +++ b/security/wpa_supplicant-devel/Makefile @@ -1,6 +1,5 @@ PORTNAME= wpa_supplicant PORTVERSION= ${COMMIT_DATE} -PORTREVISION= 4 CATEGORIES= security net PKGNAMESUFFIX= -devel @@ -11,8 +10,8 @@ WWW= https://w1.fi/wpa_supplicant/ USE_GITHUB= yes GH_ACCOUNT= cschuber GH_PROJECT= hostap -GH_TAGNAME= 2d4be0019 -COMMIT_DATE= 2023.10.05 +GH_TAGNAME= 77785da66 +COMMIT_DATE= 2023.10.30 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/README diff --git a/security/wpa_supplicant-devel/distinfo b/security/wpa_supplicant-devel/distinfo index 4a5abd89f8be..7d128a0a9b51 100644 --- a/security/wpa_supplicant-devel/distinfo +++ b/security/wpa_supplicant-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1696992513 -SHA256 (cschuber-hostap-2023.10.05-2d4be0019_GH0.tar.gz) = 79621569d1cafe506293ae3a76ee964655f22094f85297eff9d0e73851bbfb52 -SIZE (cschuber-hostap-2023.10.05-2d4be0019_GH0.tar.gz) = 5116272 +TIMESTAMP = 1698698882 +SHA256 (cschuber-hostap-2023.10.30-77785da66_GH0.tar.gz) = a7fd27b661bd3d52cd9a1c846e58ca162d08ba93be24fe5d13750baddade0d7a +SIZE (cschuber-hostap-2023.10.30-77785da66_GH0.tar.gz) = 5125026 diff --git a/security/wpa_supplicant-devel/files/patch-src_l2__packet_l2__packet__freebsd.c b/security/wpa_supplicant-devel/files/patch-src_l2__packet_l2__packet__freebsd.c index 74a89e71f0f8..2ec52fcdcd85 100644 --- a/security/wpa_supplicant-devel/files/patch-src_l2__packet_l2__packet__freebsd.c +++ b/security/wpa_supplicant-devel/files/patch-src_l2__packet_l2__packet__freebsd.c @@ -1,5 +1,5 @@ ---- src/l2_packet/l2_packet_freebsd.c.orig 2023-09-05 10:38:47.000000000 -0700 -+++ src/l2_packet/l2_packet_freebsd.c 2023-09-11 22:20:43.328481000 -0700 +--- 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 @@ */ @@ -12,63 +12,3 @@ #include <net/bpf.h> #endif /* __APPLE__ */ #include <pcap.h> -@@ -20,6 +23,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 +80,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 +135,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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310302122.39ULMlSK078858>