From nobody Fri Mar 24 21:24:02 2023 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 4PjwFG3cjmz418YN; Fri, 24 Mar 2023 21:24:02 +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 4PjwFG2vlvz3kYG; Fri, 24 Mar 2023 21:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679693042; 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=tjbK6p9Sj+BLATLIcI40PzAdSiekdgH91CSCAdO42nk=; b=qf3uXasOMyl1b26oA5uIm2+Uy80yr8MebcGnCPpayxetYNzAxwjHAMJPBfdQOd+9ejfP3g JdOC1VXFSOd1P1bJhNU1Ddy3koHbIAfpUE+8VK45j21nC9DG9nMtXhy58TIDFibNNmaYFn 2pKKMBTkVu+ZK41sM/htsGe8sScEr7KF2shHO91f8ssr+5xLhnjYrii1U23EdsgOY2MicS Naj0xe3cc5aZ1xcBhpnIps7LE8HLGWrAVW3iqxiv3kp4AyK+9F6x6k6WufNbl6dpjaoj4Q dj5d4sdvJDFUl5ALMUKLt69wYDU3ENDfCfBOllXAI0EIJC55cuYmfANXNhhIBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679693042; 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=tjbK6p9Sj+BLATLIcI40PzAdSiekdgH91CSCAdO42nk=; b=GbJFKlnubgTgFL+mQ8NR3DZd8an/cfAC0hGlnSqMGJfEZdUYj78eKVRVwG7r+B6jRlSQOF HQrv7vOxvSyn5ANSTYgu/ABKxGERVRcCH2UTEhO2QC4cxbZJQ23ZLFzHlY1d8f84z/IenU 0Kny98CeCwWqkEdvX0NoBitoRtnVvRTmV00EizOZWZsceouxXUJ3bwsWxwjijr8lhV+jWW xO8uorPBT/FgoniZTFPuzDGMxU8SpiW50QcGTMoQh3rns/k4IuBjeM4WSqoiFa4Nhq5QQj hvBVjrKjZxtwvvRvejAIdrpCoTLYZUv+7Mqsi3ziBVKmKW5my+xjvj0adKdeYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679693042; a=rsa-sha256; cv=none; b=kc4b9Pybdq3XvbftLqTOSMnrChF6jKrTYL9/pQnPhlyNsDmDOjd5Z/ehzHZHdg5SmYaez3 jDoskHwy3paFhapbB7enKCgdcgIyLL5yZSl3JhgJQsnQ8TbEg/nQbnrON3idT1S4ED/YUX JH2ImCY+SZfwD6k9Dj90QT8J92AKozmC+23v56Q1V8tI7bXkLK2N2/EvV52NmfSLikKeHN oeOywCKa8DL8e+MLh2gUWO0yVHUnxf0ynvtEhrzFB4VaJ86C7KifQ+xLkWZbiXfWBhuH1w exSRx14pAMja9SJ1RmsuIxnXxnRSNBv5SfIDd1hvPgCtgLipi1Dvt4aKwTUCZQ== 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 4PjwFG1yq7zYPB; Fri, 24 Mar 2023 21:24:02 +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 32OLO22k038151; Fri, 24 Mar 2023 21:24:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32OLO2hU038150; Fri, 24 Mar 2023 21:24:02 GMT (envelope-from git) Date: Fri, 24 Mar 2023 21:24:02 GMT Message-Id: <202303242124.32OLO2hU038150@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 388dd4e9e293 - main - www/firefox: Restore webauth/security key usage 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 388dd4e9e29324b86c19d656b5523013daa1837f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=388dd4e9e29324b86c19d656b5523013daa1837f commit 388dd4e9e29324b86c19d656b5523013daa1837f Author: Christoph Moench-Tegeder AuthorDate: 2023-03-24 21:23:18 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2023-03-24 21:23:18 +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 --- 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(()); + }