From nobody Sun Jul 21 13:06:51 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 4WRkFm2RmFz5RTJM; Sun, 21 Jul 2024 13:06:52 +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 4WRkFm0TqRz4QV8; Sun, 21 Jul 2024 13:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721567212; 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=TvRHbjo4pMFkTOM9T4IW7Jutd0fdGVWSV/+hKuDbLvk=; b=stFDrfY09IPk6YdCeSgQVLEi7KJFKTs2/TjiNuys+6+G8HjydgBcGoAZf3Ev3WqhC46QzG IDZn2kJU0Px8pt152b4nUAmb6GH4xW3WX/6GlVkOU7VmnYhwd48W0tvX/bqofL0TsY1xb7 RouemprPibK/4LAVee+lrj2fUG3m7lq0ywLiFMsltkfJOtgH9hX2RXRaHv1StROfN1d2qE X2RGsSHZdvNo7/ZVChAV7VsguOAyCUuaAYgDInAPfjKEGPtpA/6fb5/aLP7GJpNXv9orWI 2OdWxu9EBIPxDTBj2+5H4qmgtkDvhGS419xYbJe7V5BQHZDPK/DX6F0afoCV9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721567212; a=rsa-sha256; cv=none; b=iCunjF/Z+6k0eAtJCjfzOQ2kfym2Y4VvK+wHincHWlZGVK+AMicar9CmVHAE5sbEqn2Pk6 P4DWa8ZX3+CSorHRRwljBX/v3XmtbWT+u0idhxOuBgHqfM4rsiDgkQAJ0+LTfMEli7XAPl HFoUjKGVzqbWTm0nKKOt5XQHenFglHXtEOHU8YeGxxMQZC+YdTXwXcsD2LHNxeJe7QEKG0 zsc4yEf+tGIM10/zVgJBFDADa3I/Mk2QUieu/v59iAxVzZS/5R/Yq9RhFI7LBhcYLxF200 h3QI7o0GK87zkxVKRtDo9weVK9tZTUlKtj5PnMzpO3tXFeAb+TldSGlfKQbsUw== 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=1721567212; 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=TvRHbjo4pMFkTOM9T4IW7Jutd0fdGVWSV/+hKuDbLvk=; b=Vw51oxLSMq8xGPYsc3FMXMH2QGTi7EK8DZMUyPNhwld4bPJb0oI9XPL5ddzQlrnm00oI6S MOHBlm5PigWCFnMIpDSzNQtdNJJZflolLkDw/AhFp6shv2lgQSXbieo/OP4fjlV73z330V MhNbbpfO96DSXs7AKabyId8t/WS4kHetWJZ4yRJeex7tvnL53ZiOd4opDfv7Whr0InG2Ni R08k64kD4ern2PYcK7p8l0URxCF2hE9GbAZLEB84Uc13UHOSGKZlZQafAkNn3Vo8si+GbR V/gk8OCL8jdSbXG/FEAAxuSUlSCAH2s1XXEObfyJpOThmJpM4Cros8A+6CBTdQ== 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 4WRkFl6yFnz10nc; Sun, 21 Jul 2024 13:06:51 +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 46LD6p3v006090; Sun, 21 Jul 2024 13:06:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46LD6pZs006087; Sun, 21 Jul 2024 13:06:51 GMT (envelope-from git) Date: Sun, 21 Jul 2024 13:06:51 GMT Message-Id: <202407211306.46LD6pZs006087@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: 284379f1045c - main - net/hostapd: 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: 284379f1045c63c3f7b3fc47109241dc1e1a9441 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=284379f1045c63c3f7b3fc47109241dc1e1a9441 commit 284379f1045c63c3f7b3fc47109241dc1e1a9441 Author: Cy Schubert AuthorDate: 2024-07-21 12:15:53 +0000 Commit: Cy Schubert CommitDate: 2024-07-21 13:06:30 +0000 net/hostapd: Update to 2.11 --- net/hostapd/Makefile | 3 +- net/hostapd/distinfo | 6 +- net/hostapd/files/patch-src_ap_hostapd.c | 10 ++-- .../patch-src_l2__packet_l2__packet__freebsd.c | 64 +--------------------- net/hostapd/files/patch-src_utils_os__unix.c | 4 +- 5 files changed, 13 insertions(+), 74 deletions(-) diff --git a/net/hostapd/Makefile b/net/hostapd/Makefile index a9a1aebc0a0d..800a69ace4b8 100644 --- a/net/hostapd/Makefile +++ b/net/hostapd/Makefile @@ -1,6 +1,5 @@ PORTNAME= hostapd -PORTVERSION= 2.10 -PORTREVISION= 10 +PORTVERSION= 2.11 CATEGORIES= net MASTER_SITES= https://w1.fi/releases/ diff --git a/net/hostapd/distinfo b/net/hostapd/distinfo index 784e7e6d9238..9034618f0bb4 100644 --- a/net/hostapd/distinfo +++ b/net/hostapd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642436112 -SHA256 (hostapd-2.10.tar.gz) = 206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d -SIZE (hostapd-2.10.tar.gz) = 2440435 +TIMESTAMP = 1721564130 +SHA256 (hostapd-2.11.tar.gz) = 2b3facb632fd4f65e32f4bf82a76b4b72c501f995a4f62e330219fe7aed1747a +SIZE (hostapd-2.11.tar.gz) = 2708343 diff --git a/net/hostapd/files/patch-src_ap_hostapd.c b/net/hostapd/files/patch-src_ap_hostapd.c index 1eafe68ad485..5219cb3a0da8 100644 --- a/net/hostapd/files/patch-src_ap_hostapd.c +++ b/net/hostapd/files/patch-src_ap_hostapd.c @@ -1,8 +1,8 @@ ---- src/ap/hostapd.c.orig 2022-01-16 12:51:29.000000000 -0800 -+++ src/ap/hostapd.c 2024-02-26 20:24:39.350068000 -0800 -@@ -1698,6 +1698,20 @@ - { +--- src/ap/hostapd.c.orig 2024-02-18 01:24:29.000000000 -0800 ++++ src/ap/hostapd.c 2024-02-26 20:25:50.505205000 -0800 +@@ -2029,6 +2029,20 @@ iface->wait_channel_update = 0; + iface->is_no_ir = false; +#ifdef __FreeBSD + /* XXX hostapd_get_hw_features() is an inline that always returns -1 @@ -21,7 +21,7 @@ if (hostapd_get_hw_features(iface)) { /* Not all drivers support this yet, so continue without hw * feature data. */ -@@ -1744,6 +1758,7 @@ +@@ -2080,6 +2094,7 @@ if (iface->conf->ieee80211h) wpa_printf(MSG_DEBUG, "DFS support is enabled"); } diff --git a/net/hostapd/files/patch-src_l2__packet_l2__packet__freebsd.c b/net/hostapd/files/patch-src_l2__packet_l2__packet__freebsd.c index e0aa170fa91f..2ec52fcdcd85 100644 --- a/net/hostapd/files/patch-src_l2__packet_l2__packet__freebsd.c +++ b/net/hostapd/files/patch-src_l2__packet_l2__packet__freebsd.c @@ -1,5 +1,5 @@ ---- 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:21:12.054042000 -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; diff --git a/net/hostapd/files/patch-src_utils_os__unix.c b/net/hostapd/files/patch-src_utils_os__unix.c index 860682df6e05..140db6151f76 100644 --- a/net/hostapd/files/patch-src_utils_os__unix.c +++ b/net/hostapd/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:20:49.333716000 -0700 +--- src/utils/os_unix.c.orig 2024-05-10 09:57:55.000000000 -0700 ++++ src/utils/os_unix.c 2024-06-01 22:28:22.467129000 -0700 @@ -103,10 +103,12 @@ break; #endif