firefox: sync cargo checksum bits with lang/rust

1 files changed, 39 insertions, 21 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index f6d48fa2f20..c054e6328c6 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.431 2020/06/14 18:42:19 maya Exp $
+# $NetBSD: Makefile,v 1.432 2020/06/15 08:27:02 nia Exp $
 
 FIREFOX_VER=		${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=		77.0
@@ -70,28 +70,46 @@ MOZILLA_NAME=	Firefox
 MOZILLA_NAME=	Browser
 .endif
 
+#
+# Generate list of subst entries for various .cargo-checksum.json files.  These
+# are all handled together in one big substitution to simplify things rather
+# than one substitution entry per file, but are kept separate below to ease
+# updating and verification.
+#
+
+CKSUM_CRATES+=	third_party/rust/libc
+
+CKSUMS+=	4d9f7091af8e166943ac6f42ce85558909e5b6e61325039bff7adfbcf4b90212
+CKSUMS+=	7f3da734d5e2e9426051da4f406e46d9e9bed43ed2d7d048e8afc8af7ed44795
+
+CKSUMS+=	1cd66ed5967c788562d4ad626cfbeb1544f4b9267111de5f6790379b8327f28e
+CKSUMS+=	6ae549dd21581748b2f1d82880eaca3445c11e3354965e5b49b20342075a3e52
+
+CKSUMS+=	a3540eab4dbc52e006e84e288bad17e1dae3865fea49020e0ed8b5a7724a9532
+CKSUMS+=	5e58a2109f5eff0f497dfac150c161c1d517a2227b49e086da96c3d66522ac3a
+
+CKSUM_CRATES+=	third_party/rust/bindgen
+
+CKSUMS+=	5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd
+CKSUMS+=	8c92a52c0f859c7bec7bfbc36b9d18f904baab0c8c9dc1b3e7af34de1a0b0da4
+
+CKSUMS+=	b73865b6689d4f3546edd91909a47c329c4ae630ea97715d29bc683ae1dc17ad
+CKSUMS+=	efdada601d13c489451da9d65a78c42598841cebddf6f3a8012add2380628a51
+
+CKSUMS+=	34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db
+CKSUMS+=	e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe
+
+SUBST_CLASSES+=		cksum
+SUBST_STAGE.cksum=	pre-configure
+.for crate in ${CKSUM_CRATES}
+SUBST_FILES.cksum+=	${crate}/.cargo-checksum.json
+.endfor
+.for from to in ${CKSUMS}
+SUBST_SED.cksum+=	-e 's,${from},${to},g'
+.endfor
+
 post-extract:
 	mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S
-# XXX Hack taken from lang/rust.
-# patch(1) in NetBSD does not handle .cargo-checksum.json like long width file.
-# Replace checksum fields for following patches:
-# patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1
-# patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_other_mod.rs,v 1.1
-# patch-rust-1.39.0
-	${CP} ${WRKSRC}/third_party/rust/libc/.cargo-checksum.json \
-	      ${WRKSRC}/third_party/rust/libc/.cargo-checksum.json.orig
-	${CAT} ${WRKSRC}/third_party/rust/libc/.cargo-checksum.json.orig | \
-		${SED} -e 's/4d9f7091af8e166943ac6f42ce85558909e5b6e61325039bff7adfbcf4b90212/7f3da734d5e2e9426051da4f406e46d9e9bed43ed2d7d048e8afc8af7ed44795/' | \
-		${SED} -e 's/1cd66ed5967c788562d4ad626cfbeb1544f4b9267111de5f6790379b8327f28e/6ae549dd21581748b2f1d82880eaca3445c11e3354965e5b49b20342075a3e52/' | \
-		${SED} -e 's/a3540eab4dbc52e006e84e288bad17e1dae3865fea49020e0ed8b5a7724a9532/5e58a2109f5eff0f497dfac150c161c1d517a2227b49e086da96c3d66522ac3a/' \
-		> ${WRKSRC}/third_party/rust/libc/.cargo-checksum.json
-	${CP} ${WRKSRC}/third_party/rust/bindgen/.cargo-checksum.json \
-	      ${WRKSRC}/third_party/rust/bindgen/.cargo-checksum.json.orig
-	${CAT} ${WRKSRC}/third_party/rust/bindgen/.cargo-checksum.json.orig | \
-		${SED} -e 's/5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd/8c92a52c0f859c7bec7bfbc36b9d18f904baab0c8c9dc1b3e7af34de1a0b0da4/' | \
-		${SED} -e 's/b73865b6689d4f3546edd91909a47c329c4ae630ea97715d29bc683ae1dc17ad/efdada601d13c489451da9d65a78c42598841cebddf6f3a8012add2380628a51/' | \
-		${SED} -e 's/34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db/e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe/' \
-		> ${WRKSRC}/third_party/rust/bindgen/.cargo-checksum.json
 
 pre-configure:
 	cd ${WRKSRC} && autoconf