From nobody Fri Mar 24 21:29:33 2023 X-Original-To: dev-commits-ports-branches@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 4PjwMf2lqvz418hR; Fri, 24 Mar 2023 21:29:34 +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 4PjwMf1R8Zz3kxT; Fri, 24 Mar 2023 21:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679693374; 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=GIV6Gx6lrWf1C8nWqDs0/W5BJvorJaqVvtNEjUpwOHU=; b=VnJeZFw+LwRPvRkqL81nptZhGqcqnPxXlXJTaR0Kakzbiow6EC7cZG+ugkDbkKZdLYwGTH GMtqDne0CkjAdZSujIlzBPHGFGnyyy3iDDpdrLiSmZRb7QYB5DTFIefa6qGrxPEreY87fA eO6A1X0JcHHOIWOisrbrULWb/B3GVnemmke4w+X7hIOBpkDjxtFWsF7MIYfUdf0Hm0jN1A oseWXu9kdUmEF+qnYr3NKlopHiewAH6ML2cdpfbU1da4DNY3nnkEZHL52mRIaw3IWgWKM3 5FFoLj9rXnSC5pJxajZlx5pIEZjYnjNl2F0kAc40zhEX0J1OIxW7rFg/VU3A3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679693374; 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=GIV6Gx6lrWf1C8nWqDs0/W5BJvorJaqVvtNEjUpwOHU=; b=KxF4BscktexkfNHX43diGyH5C4T8fSxbvZY5MMuNTYoej1qgh0Ik6EDb9nwhorGedphrnr EdZk+xsVNeiV0NEdkVKK7tI6P+51vfpWs9sq5e9gQUdBFhbQlalx5NSeyYNLbyJfByv3OO flfC5V36pVB27WB+idiYalSq+MEOyWlojStTS9/zmd8XQT1seMb/vD28nmqNMlwbvoTgA7 OeMUtm5Yf3Pv8iACrEftiFDnUqJ9hOgrF2mK86z6qBZ0xvwt6BWVDsMaFwVKaaWoYm9Olw NLdltdWpEYdIR2ofv2I70SaayGX2PaYok1p8/FY8DPOkGNBVMubS7BY5n0Ma5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679693374; a=rsa-sha256; cv=none; b=s6MJwlWFoCYmekfvZWCTYG4qWVjZG6ulAMBwGzegno3TOrAEV2wnsx9CwR0jkEGBN4uDCZ preBHkufxftfhDOkFluQlw53MfXXvJdcmL1qIDN8y35DjUjugOat8LuYalO/3U4YalnRhr qOfohaQfnjYACL9HRbUB6OZnQXdYdOdLhsqODttOAX/021FCeYDxN88isvIOcQ0dCiHDee 94GKPE++yAyd9c5NSN0OWwjxIyadHqn2ZbIv5dIMVvS6Ld4G8VVQNEFuSs1E07pwDtHUFf g3Ly6ObQlmPWLc5TvCc66rcdpYoOUtCmKbBUSh4dYOLluzATYmdqYNZ/esJJ9w== 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 4PjwMf0VVJzYjL; Fri, 24 Mar 2023 21:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32OLTXXI039070; Fri, 24 Mar 2023 21:29:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32OLTXnV039069; Fri, 24 Mar 2023 21:29:33 GMT (envelope-from git) Date: Fri, 24 Mar 2023 21:29:33 GMT Message-Id: <202303242129.32OLTXnV039069@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 376ed2486ab8 - 2023Q1 - www/firefox: Restore webauth/security key usage List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 376ed2486ab8224c6290e897f53c5360aa9fff92 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=376ed2486ab8224c6290e897f53c5360aa9fff92 commit 376ed2486ab8224c6290e897f53c5360aa9fff92 Author: Christoph Moench-Tegeder AuthorDate: 2023-03-24 21:23:18 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2023-03-24 21:29:11 +0000 www/firefox: Restore webauth/security key usage patch from upstream authenticator-rs https://github.com/mozilla/authenticator-rs/pull/238 PR: 270092 Reported By: Thibault Payet (cherry picked from commit 388dd4e9e29324b86c19d656b5523013daa1837f) --- www/firefox/Makefile | 2 +- www/firefox/files/patch-bug1824066 | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 8e433bfecc11..0fe303d40352 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,6 +1,6 @@ PORTNAME= firefox DISTVERSION= 111.0.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ diff --git a/www/firefox/files/patch-bug1824066 b/www/firefox/files/patch-bug1824066 new file mode 100644 index 000000000000..cce34e9eb196 --- /dev/null +++ b/www/firefox/files/patch-bug1824066 @@ -0,0 +1,37 @@ +commit c017c06d61545a86338a1cbc73967803c5a2a6bc +Author: John M. Schanck +Date: Thu Mar 23 12:13:44 2023 -0700 + + Apply pr234 patch to transports/freebsd + +diff --git third_party/rust/authenticator/src/transport/freebsd/device.rs third_party/rust/authenticator/src/transport/freebsd/device.rs +index 8f4de54..3a83be2 100644 +--- third_party/rust/authenticator/src/transport/freebsd/device.rs ++++ third_party/rust/authenticator/src/transport/freebsd/device.rs +@@ -41,7 +41,9 @@ impl Device { + buf[6] = 0; + buf[7] = 1; // one byte + +- self.write_all(&buf)?; ++ if self.write(&buf)? != buf.len() { ++ return Err(io_err("write ping failed")); ++ } + + // Wait for response + let mut pfd: libc::pollfd = unsafe { mem::zeroed() }; +@@ -56,8 +58,13 @@ impl Device { + continue; + } + +- // Read response +- self.read_exact(&mut buf)?; ++ // Read response. When reports come in they are all ++ // exactly the same size, with no report id byte because ++ // there is only one report. ++ let n = self.read(&mut buf[1..])?; ++ if n != buf.len() - 1 { ++ return Err(io_err("read pong failed")); ++ } + + return Ok(()); + }