From 9993814d14fa693dc8641c31bca70223895d2055 Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Fri, 16 Feb 2024 18:22:35 +0000 Subject: NJS: loader should be registered using njs_vm_set_module_loader() This change makes NJS module incompatible with NJS older than 0.8.3. Therefore, the configuration version check has been adjusted accordingly. This change was introduced in NJS 0.8.3 here: --- pkg/contrib/src/njs/SHA512SUMS | 2 +- pkg/contrib/src/njs/version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/contrib') diff --git a/pkg/contrib/src/njs/SHA512SUMS b/pkg/contrib/src/njs/SHA512SUMS index 43766487..47dbee05 100644 --- a/pkg/contrib/src/njs/SHA512SUMS +++ b/pkg/contrib/src/njs/SHA512SUMS @@ -1 +1 @@ -cc3110a0c6866dfc03d19c58745e5b75aa9792999db45bc55a752f7b04db8ae51322bfe0156b873109c8477c6c1a030c851c770697cf6791c6e89fb2fed0a2c5 njs-0.8.2.tar.gz +1cec9a322c40aa2b4ec6eb5bea78d7442880b0cff3a41ad171a3dc3157a6990baec6c8b9eda99ee02a9e51c0b933f13ef17431079a5ff409aaf84b912c7f4df7 njs-0.8.3.tar.gz diff --git a/pkg/contrib/src/njs/version b/pkg/contrib/src/njs/version index 00453419..8b8d5b91 100644 --- a/pkg/contrib/src/njs/version +++ b/pkg/contrib/src/njs/version @@ -1 +1 @@ -NJS_VERSION := 0.8.2 +NJS_VERSION := 0.8.3 -- cgit From c38bcee10334a35548cdf54064ff7c11a0d66ed3 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Fri, 17 May 2024 17:49:59 -0700 Subject: contrib: be quiet on unpack The lists of files being unpacked are mostly useless but take a significant amount of lines and bytes in e.g. CI jobs. E.g. in rhel9 packaging job, it's 39680 lines just for the unpacking of wasmtime-v11.0.1-src, as compared to total 48945 lines of output. --- pkg/contrib/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkg/contrib') diff --git a/pkg/contrib/Makefile b/pkg/contrib/Makefile index 7e3b8b97..d4f072d2 100644 --- a/pkg/contrib/Makefile +++ b/pkg/contrib/Makefile @@ -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 $@ -- cgit From 4f776da929af3d0c97dae2e439853cbbd0965c1b Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Tue, 18 Jun 2024 11:30:13 -0700 Subject: contrib: updated njs to 0.8.4 While at it, follow the njs move to github to fetch sources. --- pkg/contrib/src/njs/Makefile | 2 +- pkg/contrib/src/njs/SHA512SUMS | 2 +- pkg/contrib/src/njs/version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/contrib') 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 47dbee05..fb49aa98 100644 --- a/pkg/contrib/src/njs/SHA512SUMS +++ b/pkg/contrib/src/njs/SHA512SUMS @@ -1 +1 @@ -1cec9a322c40aa2b4ec6eb5bea78d7442880b0cff3a41ad171a3dc3157a6990baec6c8b9eda99ee02a9e51c0b933f13ef17431079a5ff409aaf84b912c7f4df7 njs-0.8.3.tar.gz +450f6866141f6f370767149c8749e84c4373f401d6d2237ca85365a851ebe7bdbd8a3c25e85a55747673e8bef2238a979dd237d5fc5c641b2f3f2cf7f26dffc8 njs-0.8.4.tar.gz diff --git a/pkg/contrib/src/njs/version b/pkg/contrib/src/njs/version index 8b8d5b91..54ff4620 100644 --- a/pkg/contrib/src/njs/version +++ b/pkg/contrib/src/njs/version @@ -1 +1 @@ -NJS_VERSION := 0.8.3 +NJS_VERSION := 0.8.4 -- cgit From d62a5e2c3749a927e1f5283c1ad2178d665cd399 Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Mon, 27 May 2024 16:41:55 +0100 Subject: contrib: updated njs to 0.8.5 njs changed strings API so now instead of njs_vm_value_string_set() used njs_vm_value_string_create() as a drop-in replacement. Link: --- pkg/contrib/src/njs/SHA512SUMS | 2 +- pkg/contrib/src/njs/version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/contrib') diff --git a/pkg/contrib/src/njs/SHA512SUMS b/pkg/contrib/src/njs/SHA512SUMS index fb49aa98..175c46ee 100644 --- a/pkg/contrib/src/njs/SHA512SUMS +++ b/pkg/contrib/src/njs/SHA512SUMS @@ -1 +1 @@ -450f6866141f6f370767149c8749e84c4373f401d6d2237ca85365a851ebe7bdbd8a3c25e85a55747673e8bef2238a979dd237d5fc5c641b2f3f2cf7f26dffc8 njs-0.8.4.tar.gz +09fb37d609f5cb97b0af5eb097a017233af2eacb2d38071346b49f5e03b5e37280eebb360fc824acba0c600c44d234e2d11fa55f4bc913319491d7789a94171c njs-0.8.5.tar.gz diff --git a/pkg/contrib/src/njs/version b/pkg/contrib/src/njs/version index 54ff4620..ebfb5987 100644 --- a/pkg/contrib/src/njs/version +++ b/pkg/contrib/src/njs/version @@ -1 +1 @@ -NJS_VERSION := 0.8.4 +NJS_VERSION := 0.8.5 -- cgit From 6ca27c326622432c12050c3162dedc5e458adbd5 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Wed, 26 Jun 2024 21:25:33 -0700 Subject: contrib: make sha512sum check compatible with FreeBSD 14+ FreeBSD introduced sha512sum binary in version 14, but with slightly incompatible flags as compared to Linux version. This change makes it work in both worlds. --- pkg/contrib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/contrib') diff --git a/pkg/contrib/Makefile b/pkg/contrib/Makefile index d4f072d2..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),) -- cgit From 778d81ccd9e5f98ab899f2fb3cf01448f0daf8c9 Mon Sep 17 00:00:00 2001 From: Andrew Clayton Date: Wed, 28 Aug 2024 00:13:25 +0100 Subject: Remove .hgignore files Probably not needed now... Signed-off-by: Andrew Clayton --- pkg/contrib/tarballs/.hgignore | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 pkg/contrib/tarballs/.hgignore (limited to 'pkg/contrib') diff --git a/pkg/contrib/tarballs/.hgignore b/pkg/contrib/tarballs/.hgignore deleted file mode 100644 index 8d876d7b..00000000 --- a/pkg/contrib/tarballs/.hgignore +++ /dev/null @@ -1,3 +0,0 @@ -syntax:glob -*.tar.* -*.githash -- cgit From 0951778d48846a043c033425da8a0f732bc0c8a9 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Wed, 28 Aug 2024 09:20:41 -0700 Subject: Added .gitignore for pkg/contrib/tarballs This directory is needed for contribs to function. --- pkg/contrib/tarballs/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 pkg/contrib/tarballs/.gitignore (limited to 'pkg/contrib') diff --git a/pkg/contrib/tarballs/.gitignore b/pkg/contrib/tarballs/.gitignore new file mode 100644 index 00000000..441875c5 --- /dev/null +++ b/pkg/contrib/tarballs/.gitignore @@ -0,0 +1,2 @@ +*.tar.* +*.githash -- cgit From 9998918dbbc52c279b9c74cc34f6c67f6cdba1df Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Thu, 5 Sep 2024 20:22:14 +0000 Subject: Packages: bump wasmtime to 24.0.0 and wasi-sysroot to 24.0. Wasm module is now not built for Amazon Linux 2, Debian 11 and Ubuntu 2.0.04, since it requires cmake version newer than what's available on those OSes. wasm-wasi-component is not affected. --- pkg/contrib/src/wasi-sysroot/Makefile | 1 + pkg/contrib/src/wasi-sysroot/SHA512SUMS | 2 +- pkg/contrib/src/wasi-sysroot/version | 2 +- pkg/contrib/src/wasmtime/Makefile | 13 +++++++------ pkg/contrib/src/wasmtime/SHA512SUMS | 2 +- pkg/contrib/src/wasmtime/version | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) (limited to 'pkg/contrib') 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 $