summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorgutteridge <gutteridge@pkgsrc.org>2021-09-15 01:17:46 +0000
committergutteridge <gutteridge@pkgsrc.org>2021-09-15 01:17:46 +0000
commit2579263c10e1a91c56a4d8524a3e767bb80ca665 (patch)
tree09891264230f0dd2c289810b588d40afc16553b4 /lang
parent5d336820b59635816b2aabef9a7bdc42ac4710db (diff)
downloadpkgsrc-2579263c10e1a91c56a4d8524a3e767bb80ca665.tar.gz
mozjs78: update to 78.13.0
The full gamut of security fixes for this release is unknown, but, at minimum, CVE-2020-16042 is addressed. (A full change log seems elusive: the package's README points to a broken link, Mozilla advisories about "memory safety hazards" can point to bug reports that can't be viewed, etc.) This is the most current version that Debian has integrated, which is where our package points to. Successful build tests on: NetBSD amd64/9.2_STABLE (with both Rust 1.52.1 and 1.54) NetBSD i386/9.2_STABLE OmniOS r151036 Fedora Linux 34 was not testable, as our packaging of LLVM 12.0.1 fails to build on it. The upstream configuration continues to cap macOS build support at 10.15.4. I updated our existing patch to allow 10.15.7, but have no ability to test that OS, and no idea if 11.x would work. This is effectively a minor leaf package now, and may best be removed in future. I've updated this just in case issues emerge with the polkit switch to duktape, which will first appear in our 2021Q3 branch. (That is, I'm not aware of any issues, and definitely prefer duktape from a packaging perspective.)
Diffstat (limited to 'lang')
-rw-r--r--lang/mozjs78/Makefile5
-rw-r--r--lang/mozjs78/distinfo15
-rw-r--r--lang/mozjs78/patches/patch-.cargo_config.in17
-rw-r--r--lang/mozjs78/patches/patch-Cargo.lock15
-rw-r--r--lang/mozjs78/patches/patch-Cargo.toml17
-rw-r--r--lang/mozjs78/patches/patch-build_moz.configure_toolchain.configure10
6 files changed, 13 insertions, 66 deletions
diff --git a/lang/mozjs78/Makefile b/lang/mozjs78/Makefile
index 19e5a01eb68..ac996f28e24 100644
--- a/lang/mozjs78/Makefile
+++ b/lang/mozjs78/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2021/06/14 22:07:35 gutteridge Exp $
+# $NetBSD: Makefile,v 1.22 2021/09/15 01:17:46 gutteridge Exp $
-DISTNAME= mozjs78_78.4.0.orig
+DISTNAME= mozjs78_78.13.0.orig
PKGNAME= ${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION= 3
CATEGORIES= lang
MASTER_SITES= http://deb.debian.org/debian/pool/main/m/mozjs78/
EXTRACT_SUFX= .tar.xz
diff --git a/lang/mozjs78/distinfo b/lang/mozjs78/distinfo
index 60c7cdba1fe..ecf84622a0e 100644
--- a/lang/mozjs78/distinfo
+++ b/lang/mozjs78/distinfo
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.12 2021/05/02 07:25:12 prlw1 Exp $
+$NetBSD: distinfo,v 1.13 2021/09/15 01:17:46 gutteridge Exp $
-SHA1 (mozjs78_78.4.0.orig.tar.xz) = b2c1c241f70310d545f8a3c05b9c8c11676e56a8
-RMD160 (mozjs78_78.4.0.orig.tar.xz) = cef93b6116eff9f04beeaf3dda0a42cd811d0b18
-SHA512 (mozjs78_78.4.0.orig.tar.xz) = 05a0dd27cd8f330c69bf798f9025dd560e76a1a14628af4caeeae4f7573aef9371e19edb8a8e4cd28e92e189eb3a159b4ffedb1b1bd4b806e065de433cca6ffd
-Size (mozjs78_78.4.0.orig.tar.xz) = 58319040 bytes
-SHA1 (patch-.cargo_config.in) = 4ff4f59d8a614ad0abcc90f34fdf21461938c7f8
-SHA1 (patch-Cargo.lock) = e6096719b2df8d3eaaac777686ea83a7f1a0515d
-SHA1 (patch-Cargo.toml) = bb57fc798a7c34332fd6cae52a9c9d5dfe84f6c5
+SHA1 (mozjs78_78.13.0.orig.tar.xz) = a73fffc909aa038d51c418f6042ea7eda24ff201
+RMD160 (mozjs78_78.13.0.orig.tar.xz) = c4f3079b79328e8578b26547a0dcc56586b28bc3
+SHA512 (mozjs78_78.13.0.orig.tar.xz) = e47e69ae37df73db16f20d581c1b8cec7653e62578510bfd5b6c3dea8a86a28076f70633ae2d0e2c6f2e144f676c80faa51a8d64318ccc01c71e523b07bd542a
+Size (mozjs78_78.13.0.orig.tar.xz) = 60022692 bytes
SHA1 (patch-build_moz.configure_rust.configure) = 149301b4a8fb81f6c64d90672b3137ae6d68461f
-SHA1 (patch-build_moz.configure_toolchain.configure) = 930ed1aec1da8c10c80d8f31dfc5acbf2db31c5f
+SHA1 (patch-build_moz.configure_toolchain.configure) = 0a398dcd2855de94b25e5afd993c9f40cc323980
SHA1 (patch-js_moz.configure) = f3d762b293761e359ac7c389059aa228949a6f0b
SHA1 (patch-js_src_jit_AtomicOperations.h) = 19eba50673f8138bbb09c0eaca63923cadbadd26
SHA1 (patch-js_src_jit_ProcessExecutableMemory.cpp) = 84d629df0e7963755aa38ff9a1e29d60ed3adb4c
diff --git a/lang/mozjs78/patches/patch-.cargo_config.in b/lang/mozjs78/patches/patch-.cargo_config.in
deleted file mode 100644
index 5eb90fbb259..00000000000
--- a/lang/mozjs78/patches/patch-.cargo_config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-.cargo_config.in,v 1.1 2021/05/02 07:25:12 prlw1 Exp $
-
-Fix build, c.f., https://phabricator.services.mozilla.com/D100485
-
---- .cargo//config.in.orig 2020-11-04 10:51:54.000000000 +0000
-+++ .cargo//config.in
-@@ -3,9 +3,9 @@
- # Please do not edit.
-
- [source."https://github.com/shravanrn/nix/"]
--branch = "r0.13.1"
- git = "https://github.com/shravanrn/nix/"
- replace-with = "vendored-sources"
-+rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-
- [source."https://github.com/mozilla/rkv"]
- git = "https://github.com/mozilla/rkv"
diff --git a/lang/mozjs78/patches/patch-Cargo.lock b/lang/mozjs78/patches/patch-Cargo.lock
deleted file mode 100644
index fa171db4ab6..00000000000
--- a/lang/mozjs78/patches/patch-Cargo.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Cargo.lock,v 1.1 2021/05/02 07:25:12 prlw1 Exp $
-
-Fix build, c.f., https://phabricator.services.mozilla.com/D100485
-
---- Cargo.lock.orig 2020-11-04 10:51:54.000000000 +0000
-+++ Cargo.lock
-@@ -3200,7 +3200,7 @@ dependencies = [
- [[package]]
- name = "nix"
- version = "0.13.1"
--source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-+source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
- dependencies = [
- "bitflags",
- "cc",
diff --git a/lang/mozjs78/patches/patch-Cargo.toml b/lang/mozjs78/patches/patch-Cargo.toml
deleted file mode 100644
index 888d3141df5..00000000000
--- a/lang/mozjs78/patches/patch-Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Cargo.toml,v 1.2 2021/05/02 07:25:12 prlw1 Exp $
-
-Fix build, c.f., https://phabricator.services.mozilla.com/D100485
-
---- Cargo.toml.orig 2020-11-04 10:52:09.000000000 +0000
-+++ Cargo.toml
-@@ -60,8 +60,8 @@ panic = "abort"
- [patch.crates-io]
- packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
- rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
--nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
--spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
-+nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-+spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
- # failure's backtrace feature might break our builds, see bug 1608157.
- failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
- failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
diff --git a/lang/mozjs78/patches/patch-build_moz.configure_toolchain.configure b/lang/mozjs78/patches/patch-build_moz.configure_toolchain.configure
index ec5299fb9c4..b2486582549 100644
--- a/lang/mozjs78/patches/patch-build_moz.configure_toolchain.configure
+++ b/lang/mozjs78/patches/patch-build_moz.configure_toolchain.configure
@@ -1,15 +1,15 @@
-$NetBSD: patch-build_moz.configure_toolchain.configure,v 1.1 2020/12/05 12:03:26 nia Exp $
+$NetBSD: patch-build_moz.configure_toolchain.configure,v 1.2 2021/09/15 01:17:46 gutteridge Exp $
Builds fine on MacOS with newer toolchain
---- build/moz.configure/toolchain.configure.orig 2020-11-04 10:51:54.000000000 +0000
+--- build/moz.configure/toolchain.configure.orig 2021-08-28 12:40:42.000000000 +0000
+++ build/moz.configure/toolchain.configure
-@@ -141,7 +141,7 @@ with only_when(host_is_osx | target_is_o
- @imports(_from='biplist', _import='readPlist')
+@@ -142,7 +142,7 @@ with only_when(host_is_osx | target_is_o
+ @imports('plistlib')
def macos_sdk(sdk, host):
sdk_min_version = Version('10.11')
- sdk_max_version = Version('10.15.4')
-+ sdk_max_version = Version('10.15.6')
++ sdk_max_version = Version('10.15.7')
if sdk:
sdk = sdk[0]