From nobody Mon Oct 30 21:22:48 2023 X-Original-To: dev-commits-ports-all@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 4SK5pK2yvXz4yRhH; Mon, 30 Oct 2023 21:22:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SK5pK21Lgz4LQL; Mon, 30 Oct 2023 21:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698700969; 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=X0PPBKEsdEuHu2WbgfIUcxnhmj1PK3l74Lwwbd48VyQ=; b=V70TwGQY895Qq1kelZeKSUhLJ3bAwWttZVdNuRs1/pRBX690x8sGRh52mmCIisnHLDrrvt itA2c46mqj7iARxD7ozb88tTUeaJf4XZWztV8nleo5q2+ypDattfolmiR1UdpoDt/COs/c S219B4al7hEsYTujytymLwH9d3btPUfbuD8fJqENidZV+hPc8wZS+Zp5gU3TwlvyZYqDeG WcXz72ytwVDnBSvt3ZGp++MpUdJ1Q/Ar49jeBbVIRpEUV3pthO45H7RPV53smo/a3cAA+g rfMe6LDcxi6gVx0TL9lpvtoXmXbnqWjxnhTByw6kxS7rb6/DzhDAqUpwG7y+pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698700969; 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=X0PPBKEsdEuHu2WbgfIUcxnhmj1PK3l74Lwwbd48VyQ=; b=rkP4WRUw4kzYhtJTlEseNyrl15yVlGMiO4rRZEyG8XrGpySaeMiwzalXNyHMMvlkWE1mF/ XUDaXqYnGDQg3yxM98YWzukXj2JVe8U8eQTxByVJ8ZAiWYsn84jet/Ybe28msnQTznWcoD LKkxsZapIrWhmJFjsFR1nXUl8Tl6KnnqPRpOgmHetQllCZKH95ArvV28hoP0gjf8dcnAka 5TvEUFB3Exec44xwDUz7185cZACEnGABQEIq+eTUifVPu3V1GswxX6LB5G6Nk/2qgxxbgY RhBlVgDGYAjyVMHcad6P8j7ocAHaLceSqvya6+OH/w/uvLMNxmRvX5pxWRc+sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698700969; a=rsa-sha256; cv=none; b=mDkD7mDiAvETsiKr2ZXf5yJUM5Or2cBxlIjbkf+g8efJ8wLbsBD4QW+caAko/j3byLktzB s3gUZRPimASie3TqllYLq+5LITbfEToA+JHFtj5Oh9RNqkhm4ZPgkR0BCPU1j5bvGSxiIU LVRSKJsKqQeBXE+/PsFJoNMUt2mScXXFdIhbIeJZRWuwdHnE6ReteDcZXQscjY0nGvLjzz qk5+5o2iz63GL7mqEcWvsvITYLkX7tmzpwlN+EfP6UpKd9Qq7SOwWdDXWBsOaH69WiiJqa 1Y41q3OrvYkM6DXxPpkc8IKsYwMJck1yVmPye5Ihc6271Vt3uWJYxnDPjVtHWw== 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 4SK5pK0dBPzcgN; Mon, 30 Oct 2023 21:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39ULMm4k078909; Mon, 30 Oct 2023 21:22:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ULMmhZ078906; Mon, 30 Oct 2023 21:22:48 GMT (envelope-from git) Date: Mon, 30 Oct 2023 21:22:48 GMT Message-Id: <202310302122.39ULMmhZ078906@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: 42ad49fd150a - main - net/hostapd-devel: Update to the latest GH commit List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 42ad49fd150a7f7be655fba294db5b173d5d5f12 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=42ad49fd150a7f7be655fba294db5b173d5d5f12 commit 42ad49fd150a7f7be655fba294db5b173d5d5f12 Author: Cy Schubert AuthorDate: 2023-10-30 21:15:46 +0000 Commit: Cy Schubert CommitDate: 2023-10-30 21:22:39 +0000 net/hostapd-devel: Update to the latest GH commit Update to the latest w1.fi commit, proxied through my GH account. --- net/hostapd-devel/Makefile | 5 +- net/hostapd-devel/distinfo | 6 +- .../patch-src_l2__packet_l2__packet__freebsd.c | 64 +--------------------- 3 files changed, 7 insertions(+), 68 deletions(-) diff --git a/net/hostapd-devel/Makefile b/net/hostapd-devel/Makefile index f5347f5c7873..9fab3e93958f 100644 --- a/net/hostapd-devel/Makefile +++ b/net/hostapd-devel/Makefile @@ -1,6 +1,5 @@ PORTNAME= hostapd PORTVERSION= ${COMMIT_DATE} -PORTREVISION= 3 CATEGORIES= net PKGNAMESUFFIX= -devel @@ -11,8 +10,8 @@ WWW= https://w1.fi/hostapd/ 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 diff --git a/net/hostapd-devel/distinfo b/net/hostapd-devel/distinfo index aea8eaeabd38..927ce2b22091 100644 --- a/net/hostapd-devel/distinfo +++ b/net/hostapd-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1696992505 -SHA256 (cschuber-hostap-2023.10.05-2d4be0019_GH0.tar.gz) = 79621569d1cafe506293ae3a76ee964655f22094f85297eff9d0e73851bbfb52 -SIZE (cschuber-hostap-2023.10.05-2d4be0019_GH0.tar.gz) = 5116272 +TIMESTAMP = 1698698885 +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/net/hostapd-devel/files/patch-src_l2__packet_l2__packet__freebsd.c b/net/hostapd-devel/files/patch-src_l2__packet_l2__packet__freebsd.c index 5cef27d8a415..2ec52fcdcd85 100644 --- a/net/hostapd-devel/files/patch-src_l2__packet_l2__packet__freebsd.c +++ b/net/hostapd-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:21:57.799201000 -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 #endif /* __APPLE__ */ #include -@@ -20,6 +23,7 @@ - #include - #endif /* __sun__ */ - -+#include - #include - #include - #include -@@ -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;