Merge tag '1.33.0' into packaging.

Unit 1.33.0 release.

11 files changed, 20 insertions, 19 deletions

diff --git a/pkg/contrib/Makefile b/pkg/contrib/Makefile
index 7e3b8b97..0f412b20 100644
--- a/pkg/contrib/Makefile
+++ b/pkg/contrib/Makefile
@@ -51,7 +51,7 @@ XZ ?= $(error XZ (LZMA) compressor not found)
 endif
 
 ifeq ($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),)
-SHA512SUM = sha512sum --check
+SHA512SUM = sha512sum -c -
 else ifeq ($(shell shasum --version >/dev/null 2>&1 || echo FAIL),)
 SHA512SUM = shasum -a 512 --check
 else ifeq ($(shell openssl version >/dev/null 2>&1 || echo FAIL),)
@@ -89,10 +89,10 @@ checksum = \
 		(cd $(TARBALLS) && $(1))
 CHECK_SHA512 = $(call checksum,$(SHA512SUM),SHA512,.sum-)
 UNPACK = $(RM) -R $@ \
-	$(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xvzfo $(f)) \
-	$(foreach f,$(filter %.tar.bz2,$^), && tar xvjfo $(f)) \
-	$(foreach f,$(filter %.tar.xz,$^), && tar xvJfo $(f)) \
-	$(foreach f,$(filter %.zip,$^), && unzip $(f))
+	$(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xzfo $(f)) \
+	$(foreach f,$(filter %.tar.bz2,$^), && tar xjfo $(f)) \
+	$(foreach f,$(filter %.tar.xz,$^), && tar xJfo $(f)) \
+	$(foreach f,$(filter %.zip,$^), && unzip -q $(f))
 UNPACK_DIR = $(patsubst %.tar,%,$(basename $(notdir $<)))
 APPLY = (cd $(UNPACK_DIR) && patch -fp1) <
 MOVE = mv $(UNPACK_DIR) $@ && touch $@
diff --git a/pkg/contrib/src/njs/Makefile b/pkg/contrib/src/njs/Makefile
index 6a4fdf9d..643ae703 100644
--- a/pkg/contrib/src/njs/Makefile
+++ b/pkg/contrib/src/njs/Makefile
@@ -1,7 +1,7 @@
 # njs
 
 include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/version
-NJS_URL := https://hg.nginx.org/njs/archive/$(NJS_VERSION).tar.gz
+NJS_URL := https://github.com/nginx/njs/archive/$(NJS_VERSION).tar.gz
 
 PKGS += njs
 
diff --git a/pkg/contrib/src/njs/SHA512SUMS b/pkg/contrib/src/njs/SHA512SUMS
index 43766487..175c46ee 100644
--- a/pkg/contrib/src/njs/SHA512SUMS
+++ b/pkg/contrib/src/njs/SHA512SUMS
@@ -1 +1 @@
-cc3110a0c6866dfc03d19c58745e5b75aa9792999db45bc55a752f7b04db8ae51322bfe0156b873109c8477c6c1a030c851c770697cf6791c6e89fb2fed0a2c5  njs-0.8.2.tar.gz
+09fb37d609f5cb97b0af5eb097a017233af2eacb2d38071346b49f5e03b5e37280eebb360fc824acba0c600c44d234e2d11fa55f4bc913319491d7789a94171c  njs-0.8.5.tar.gz
diff --git a/pkg/contrib/src/njs/version b/pkg/contrib/src/njs/version
index 00453419..ebfb5987 100644
--- a/pkg/contrib/src/njs/version
+++ b/pkg/contrib/src/njs/version
@@ -1 +1 @@
-NJS_VERSION := 0.8.2
+NJS_VERSION := 0.8.5
diff --git a/pkg/contrib/src/wasi-sysroot/Makefile b/pkg/contrib/src/wasi-sysroot/Makefile
index fcfb8df3..a02a6591 100644
--- a/pkg/contrib/src/wasi-sysroot/Makefile
+++ b/pkg/contrib/src/wasi-sysroot/Makefile
@@ -12,6 +12,7 @@ $(TARBALLS)/wasi-sysroot-$(WASI_SYSROOT_VERSION_MAJOR).$(WASI_SYSROOT_VERSION_MI
 
 wasi-sysroot: wasi-sysroot-$(WASI_SYSROOT_VERSION_MAJOR).$(WASI_SYSROOT_VERSION_MINOR).tar.gz .sum-wasi-sysroot
 	$(UNPACK)
+	$(MOVE)
 
 .wasi-sysroot: wasi-sysroot
 	touch $@
diff --git a/pkg/contrib/src/wasi-sysroot/SHA512SUMS b/pkg/contrib/src/wasi-sysroot/SHA512SUMS
index a1e71fff..ffb6e23f 100644
--- a/pkg/contrib/src/wasi-sysroot/SHA512SUMS
+++ b/pkg/contrib/src/wasi-sysroot/SHA512SUMS
@@ -1 +1 @@
-ad4ad629d02f01f3d2eb977dd0bc43091b0f11ed1b5dd9fdb3580e4cf49c132f6cb4982ae80eabf638f0d08d0c4c7df40cceb2be8f9d2c29abc35b8564ffda42  wasi-sysroot-20.0.tar.gz
+6bf138fc90feccc0cfa2683d164a0c8cfb973b5105675ff53b87628d8775676a8eb383d225ca4b55d6f0f800d167a605ee569978a2048b3dab8d01672a408d7a  wasi-sysroot-24.0.tar.gz
diff --git a/pkg/contrib/src/wasi-sysroot/version b/pkg/contrib/src/wasi-sysroot/version
index 919c7098..ed18dd4b 100644
--- a/pkg/contrib/src/wasi-sysroot/version
+++ b/pkg/contrib/src/wasi-sysroot/version
@@ -1,2 +1,2 @@
-WASI_SYSROOT_VERSION_MAJOR := 20
+WASI_SYSROOT_VERSION_MAJOR := 24
 WASI_SYSROOT_VERSION_MINOR := 0
diff --git a/pkg/contrib/src/wasmtime/Makefile b/pkg/contrib/src/wasmtime/Makefile
index 11797fee..2a6e8abf 100644
--- a/pkg/contrib/src/wasmtime/Makefile
+++ b/pkg/contrib/src/wasmtime/Makefile
@@ -11,10 +11,6 @@ else
 CARGO = $(error Cargo (Rust package manager) not found)
 endif
 
-ifeq ($(shell uname -s),Linux)
-WASMTIME_ARGS=-Clink-arg=-Wl,-soname,libwasmtime.so
-endif
-
 $(TARBALLS)/wasmtime-v$(WASMTIME_VERSION)-src.tar.gz:
 	$(call download_pkg,$(WASMTIME_URL),wasmtime)
 
@@ -25,6 +21,11 @@ wasmtime: wasmtime-v$(WASMTIME_VERSION)-src.tar.gz .sum-wasmtime
 	$(MOVE)
 
 .wasmtime: wasmtime
-	cd $< && $(CARGO) rustc --release -p wasmtime-c-api -- $(WASMTIME_ARGS)
-	cp $</crates/c-api/wasm-c-api/include/wasm.h $</crates/c-api/include/
+	cd $< && cmake \
+				-DCMAKE_INSTALL_LIBDIR=lib \
+				-S crates/c-api \
+				-B target/c-api \
+				--install-prefix "$(TOPSRC)/wasmtime/artifacts"
+	cd $< && cmake --build target/c-api
+	cd $< && cmake --install target/c-api
 	touch $@
diff --git a/pkg/contrib/src/wasmtime/SHA512SUMS b/pkg/contrib/src/wasmtime/SHA512SUMS
index 35e0e47f..fc1ba863 100644
--- a/pkg/contrib/src/wasmtime/SHA512SUMS
+++ b/pkg/contrib/src/wasmtime/SHA512SUMS
@@ -1 +1 @@
-4b67ba0742da0558efffe1dbde5512dc5f0201fad25f1027d277758e76778b2add11528dbe3f5b7759f2386859b52aea3a0526abaa481c2ed91eb56c5a531b49  wasmtime-v11.0.1-src.tar.gz
+2ce3979f772176350a2c4694cfd24c241c426d453d99f8620424b25ef1373ea5be06370c8199f3bd5a46f0ba1a4cd4b702a359efc969d5eaf1e9e78543c5900a  wasmtime-v24.0.0-src.tar.gz
diff --git a/pkg/contrib/src/wasmtime/version b/pkg/contrib/src/wasmtime/version
index 1debf1ff..d418b456 100644
--- a/pkg/contrib/src/wasmtime/version
+++ b/pkg/contrib/src/wasmtime/version
@@ -1 +1 @@
-WASMTIME_VERSION := 11.0.1
+WASMTIME_VERSION := 24.0.0
diff --git a/pkg/contrib/tarballs/.hgignore b/pkg/contrib/tarballs/.gitignore
index 8d876d7b..441875c5 100644
--- a/pkg/contrib/tarballs/.hgignore
+++ b/pkg/contrib/tarballs/.gitignore
@@ -1,3 +1,2 @@
-syntax:glob
 *.tar.*
 *.githash