CVS commit: pkgsrc/www/firefox

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri Apr 28 18:56:22 UTC 2023

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo
Added Files:
        pkgsrc/www/firefox/patches: patch-Cargo.lock patch-Cargo.toml
            patch-third-party_rust_authenticator_src_transport_netbsd_device.rs

Log Message:
firefox: fix webauthn support on netbsd with patch committed upstream

PKGREVISION++


To generate a diff of this commit:
cvs rdiff -u -r1.552 -r1.553 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.495 -r1.496 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/firefox/patches/patch-Cargo.lock \
    pkgsrc/www/firefox/patches/patch-Cargo.toml \
    pkgsrc/www/firefox/patches/patch-third-party_rust_authenticator_src_transport_netbsd_device.rs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.552 pkgsrc/www/firefox/Makefile:1.553
--- pkgsrc/www/firefox/Makefile:1.552   Wed Apr 19 08:11:46 2023
+++ pkgsrc/www/firefox/Makefile Fri Apr 28 18:56:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.552 2023/04/19 08:11:46 adam Exp $
+# $NetBSD: Makefile,v 1.553 2023/04/28 18:56:22 maya Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            112.0
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=       .1
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.495 pkgsrc/www/firefox/distinfo:1.496
--- pkgsrc/www/firefox/distinfo:1.495   Tue Apr 18 14:00:11 2023
+++ pkgsrc/www/firefox/distinfo Fri Apr 28 18:56:22 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.495 2023/04/18 14:00:11 ryoon Exp $
+$NetBSD: distinfo,v 1.496 2023/04/28 18:56:22 maya Exp $
 
 BLAKE2s (firefox-112.0.1.source.tar.xz) = e0ea6615a9eb3b64e8888527ab2b17d1ea530bbd9f98aae36981dc8f51cc7aef
 SHA512 (firefox-112.0.1.source.tar.xz) = 23a5cd9c1f165275d8ca7465bebce86018441c72292421f4ed56d7ad8ada9402dc8d22a08467d9d0ef3ef8c62338006dfa3bcbddf12cb8a59eafa0bd7d0cda50
@@ -6,6 +6,8 @@ Size (firefox-112.0.1.source.tar.xz) = 5
 BLAKE2s (nodejs-output-111.0.tgz) = 5e61c766822fdb7f5ef9e358de2ed00ba1c5074a2dad1e1d491772532f2bfe09
 SHA512 (nodejs-output-111.0.tgz) = 79ff7d122c48453a10312918b315acbe8dff6695042311be1b4aaa69c59fb77c7c14affc4f24fe23d9a6707d4c4dccf90c063e0f3af7de5807cdc45df5d0829e
 Size (nodejs-output-111.0.tgz) = 208870 bytes
+SHA1 (patch-Cargo.lock) = 36e15ec468dda2102469354276cb9e46b1a734ac
+SHA1 (patch-Cargo.toml) = e5478a9268b5891b42573b1954ff584877c75bc1
 SHA1 (patch-browser_app_profile_firefox.js) = 18041d7fe211d61578863cfc53349278925f8e56
 SHA1 (patch-build_moz.configure_rust.configure) = 25ddfacd29cebbc6db005dbe61a2a7446d480678
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = 9d1f15ff487efa9202114d19ed5668b4e7aa032a
@@ -30,6 +32,7 @@ SHA1 (patch-modules_fdlibm_src_math__pri
 SHA1 (patch-mozglue_misc_Uptime.cpp) = daefe25ef1ebc8e4d3735017b9e8ac68c4710a00
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = b0d1f6a6e0eb852b0fd0238ad3f8ed3166c60a50
 SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4
+SHA1 (patch-third-party_rust_authenticator_src_transport_netbsd_device.rs) = cb914efb0bd1b9a46dde1661230c7e09e49fc9e0
 SHA1 (patch-third__party_js_cfworker_build.sh) = 46cdf97b99cf01080f290ae8d9a33b5f869fc3e4
 SHA1 (patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc) = 455be625b5de2f6f1f4b2dbb6c8cb33ca16c2583
 SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc) = 8848fb05c1e8b45234f74db71602a8a84c0404a4

Added files:

Index: pkgsrc/www/firefox/patches/patch-Cargo.lock
diff -u /dev/null pkgsrc/www/firefox/patches/patch-Cargo.lock:1.1
--- /dev/null   Fri Apr 28 18:56:22 2023
+++ pkgsrc/www/firefox/patches/patch-Cargo.lock Fri Apr 28 18:56:22 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-Cargo.lock,v 1.1 2023/04/28 18:56:22 maya Exp $
+
+Enable patching authenticator-rs
+
+--- Cargo.lock.orig    2023-04-14 16:27:56.000000000 +0000
++++ Cargo.lock
+@@ -380,8 +380,6 @@ dependencies = [
+ [[package]]
+ name = "authenticator"
+ version = "0.4.0-alpha.10"
+-source = "registry+https://github.com/rust-lang/crates.io-index";
+-checksum = "2238116278e3a069a5148ce1efaa73d750a0d7341e011235a0ddb3e7079cb1be"
+ dependencies = [
+  "base64",
+  "bitflags",
Index: pkgsrc/www/firefox/patches/patch-Cargo.toml
diff -u /dev/null pkgsrc/www/firefox/patches/patch-Cargo.toml:1.1
--- /dev/null   Fri Apr 28 18:56:22 2023
+++ pkgsrc/www/firefox/patches/patch-Cargo.toml Fri Apr 28 18:56:22 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-Cargo.toml,v 1.1 2023/04/28 18:56:22 maya Exp $
+
+Enable patching authenticator-rs
+
+--- Cargo.toml.orig    2023-04-14 16:27:55.000000000 +0000
++++ Cargo.toml
+@@ -188,3 +188,6 @@ uniffi_bindgen = "=0.23.0"
+ uniffi_build = "=0.23.0"
+ uniffi_macros = "=0.23.0"
+ weedle2 = "=4.0.0"
++
++[patch.crates-io.authenticator]
++path = "third_party/rust/authenticator"
Index: pkgsrc/www/firefox/patches/patch-third-party_rust_authenticator_src_transport_netbsd_device.rs
diff -u /dev/null pkgsrc/www/firefox/patches/patch-third-party_rust_authenticator_src_transport_netbsd_device.rs:1.1
--- /dev/null   Fri Apr 28 18:56:22 2023
+++ pkgsrc/www/firefox/patches/patch-third-party_rust_authenticator_src_transport_netbsd_device.rs      Fri Apr 28 18:56:22 2023
@@ -0,0 +1,46 @@
+$NetBSD: patch-third-party_rust_authenticator_src_transport_netbsd_device.rs,v 1.1 2023/04/28 18:56:22 maya Exp $
+
+Apply already-upstreamed fix to authenticator-rs:
+https://github.com/mozilla/authenticator-rs/pull/234
+
+Fixing netbsd support
+
+--- third_party/rust/authenticator/src/transport/netbsd/device.rs.orig 2023-04-14 16:28:09.000000000 +0000
++++ third_party/rust/authenticator/src/transport/netbsd/device.rs
+@@ -40,7 +40,19 @@ impl Device {
+             buf[6] = 0;
+             buf[7] = 1; // one byte
+ 
+-            self.write_all(&buf)?;
++            // Write ping request.  Each write to the device contains
++            // exactly one report id byte[*] followed by exactly as
++            // many bytes as are in a report, and will be consumed all
++            // at once by /dev/uhidN.  So we use plain write, not
++            // write_all to issue writes in a loop.
++            //
++            // [*] This is only for the internal authenticator-rs API,
++            // not for the USB HID protocol, which for a device with
++            // only one report id excludes the report id byte from the
++            // interrupt in/out pipe transfer format.
++            if self.write(&buf)? != buf.len() {
++                return Err(io_err("write ping failed"));
++            }
+ 
+             // Wait for response
+             let mut pfd: libc::pollfd = unsafe { mem::zeroed() };
+@@ -55,8 +67,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(());
+         }