From owner-svn-ports-head@freebsd.org Wed Jan 20 17:14:17 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3CC3A4FCA88; Wed, 20 Jan 2021 17:14:17 +0000 (UTC) (envelope-from cy@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 4DLXF51CrZz3KGk; Wed, 20 Jan 2021 17:14:17 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1C97B1CBF8; Wed, 20 Jan 2021 17:14:17 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10KHEGdM028570; Wed, 20 Jan 2021 17:14:16 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10KHEGJq028566; Wed, 20 Jan 2021 17:14:16 GMT (envelope-from cy@FreeBSD.org) Message-Id: <202101201714.10KHEGJq028566@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 20 Jan 2021 17:14:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r562150 - in head: net/hostapd net/hostapd/files security/wpa_supplicant security/wpa_supplicant/files X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in head: net/hostapd net/hostapd/files security/wpa_supplicant security/wpa_supplicant/files X-SVN-Commit-Revision: 562150 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jan 2021 17:14:17 -0000 Author: cy Date: Wed Jan 20 17:14:16 2021 New Revision: 562150 URL: https://svnweb.freebsd.org/changeset/ports/562150 Log: This is the ports version of src commit d70886d063166786ded0007af8cdcbf57b7b4827. wpa_supplicant uses PF_ROUTE to return the routing table in order to determine the length of the routing table buffer. As of 81728a538d24 wpa_supplicant is started before the routing table has been populated resulting in the length of zero to be returned. This causes wpa_supplicant to loop endlessly. (The workaround is to kill and restart wpa_supplicant as by the time it is restarted the routing table is populated.) (Personally, I was not able to reproduce this unless wlan0 was a member of lagg0. However, others experienced this problem on standalone wlan0.) PR: 252844 Submitted by: shu Reported by: shu Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D28249 Modified: head/net/hostapd/Makefile (contents, props changed) head/net/hostapd/files/patch-src_drivers_driver__bsd.c (contents, props changed) head/security/wpa_supplicant/Makefile (contents, props changed) head/security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c (contents, props changed) Modified: head/net/hostapd/Makefile ============================================================================== --- head/net/hostapd/Makefile Wed Jan 20 17:13:25 2021 (r562149) +++ head/net/hostapd/Makefile Wed Jan 20 17:14:16 2021 (r562150) @@ -3,7 +3,7 @@ PORTNAME= hostapd PORTVERSION= 2.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= https://w1.fi/releases/ Modified: head/net/hostapd/files/patch-src_drivers_driver__bsd.c ============================================================================== --- head/net/hostapd/files/patch-src_drivers_driver__bsd.c Wed Jan 20 17:13:25 2021 (r562149) +++ head/net/hostapd/files/patch-src_drivers_driver__bsd.c Wed Jan 20 17:14:16 2021 (r562150) @@ -1,5 +1,14 @@ ---- src/drivers/driver_bsd.c.orig2 2019-08-07 06:25:25.000000000 -0700 -+++ src/drivers/driver_bsd.c 2020-05-19 21:11:18.891164000 -0700 +--- src/drivers/driver_bsd.c.orig 2019-08-07 06:25:25.000000000 -0700 ++++ src/drivers/driver_bsd.c 2021-01-20 08:04:07.589603000 -0800 +@@ -649,7 +649,7 @@ + len = 2048; + } + +- return len; ++ return (len == 0) ? 2048 : len; + } + + #ifdef HOSTAPD @@ -665,7 +665,11 @@ static int bsd_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr, u16 reason_code); Modified: head/security/wpa_supplicant/Makefile ============================================================================== --- head/security/wpa_supplicant/Makefile Wed Jan 20 17:13:25 2021 (r562149) +++ head/security/wpa_supplicant/Makefile Wed Jan 20 17:14:16 2021 (r562150) @@ -2,7 +2,7 @@ PORTNAME= wpa_supplicant PORTVERSION= 2.9 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= security net MASTER_SITES= https://w1.fi/releases/ Modified: head/security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c ============================================================================== --- head/security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c Wed Jan 20 17:13:25 2021 (r562149) +++ head/security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c Wed Jan 20 17:14:16 2021 (r562150) @@ -1,5 +1,14 @@ --- src/drivers/driver_bsd.c.orig 2019-08-07 06:25:25.000000000 -0700 -+++ src/drivers/driver_bsd.c 2020-05-19 18:17:48.607660000 -0700 ++++ src/drivers/driver_bsd.c 2021-01-20 08:00:59.210974000 -0800 +@@ -649,7 +649,7 @@ + len = 2048; + } + +- return len; ++ return (len == 0) ? 2048 : len; + } + + #ifdef HOSTAPD @@ -1336,14 +1336,18 @@ drv = bsd_get_drvindex(global, ifm->ifm_index); if (drv == NULL)