From b1d309d0432488873b039b82ab9444c8163b0cec Mon Sep 17 00:00:00 2001 From: Oleg Borodin Date: Mon, 8 Jan 2024 23:40:02 +0200 Subject: [PATCH] updated --- edit/emacs/pkg-plist.amd64 | 11 +++---- lang/go121/Makefile | 2 +- lang/go121/distinfo.amd64 | 6 ++-- lang/go121/pkg-plist.aarch64 | 6 +++- lang/go121/pkg-plist.amd64 | 4 +++ lang/node16/Makefile | 13 +++++--- ...config_archs_linux-elf_no-asm_openssl.gypi | 4 +-- ...atch-deps_openssl_openssl-cl__no__asm.gypi | 6 ++-- .../patch-deps_openssl_openssl__no__asm.gypi | 6 ++-- lang/node16/files/patch-node.gypi | 4 +-- .../files/patch-src_crypto_crypto__util.cc | 15 +++++++++ lang/node18/Makefile | 32 +++++++++++------- lang/node18/distinfo | 6 ++-- lang/node18/files/extra-patch-common.gypi | 33 +++++++++++-------- ...fig_archs_linux-elf_no-asm_openssl-cl.gypi | 2 +- ...config_archs_linux-elf_no-asm_openssl.gypi | 4 +-- ...atch-deps_openssl_openssl-cl__no__asm.gypi | 2 +- .../patch-deps_openssl_openssl__no__asm.gypi | 6 ++-- ...s_v8_src_base_platform_platform-freebsd.cc | 2 +- .../patch-deps_v8_src_codegen_arm_cpu-arm.cc | 2 +- ...ch-deps_v8_src_codegen_ppc_constants-ppc.h | 2 +- .../patch-deps_v8_src_libsampler_sampler.cc | 2 +- lang/node18/files/patch-node.gypi | 4 +-- lang/node18/files/patch-openssl3 | 15 +++++++++ lang/node18/files/patch-src_cares__wrap.h | 4 +-- .../files/patch-tools_v8__gypfiles_v8.gyp | 2 +- lang/python38/pkg-plist | 8 ++--- lang/python39/pkg-plist | 8 ++--- 28 files changed, 133 insertions(+), 78 deletions(-) create mode 100644 lang/node16/files/patch-src_crypto_crypto__util.cc create mode 100644 lang/node18/files/patch-openssl3 diff --git a/edit/emacs/pkg-plist.amd64 b/edit/emacs/pkg-plist.amd64 index 43717f62..0a844668 100644 --- a/edit/emacs/pkg-plist.amd64 +++ b/edit/emacs/pkg-plist.amd64 @@ -4,10 +4,10 @@ bin/emacs bin/emacsclient bin/etags include/emacs-module.h -libexec/emacs/28.2/amd64-pc-freebsd12/emacs.pdmp -libexec/emacs/28.2/amd64-pc-freebsd12/hexl -libexec/emacs/28.2/amd64-pc-freebsd12/movemail -libexec/emacs/28.2/amd64-pc-freebsd12/rcs2log +libexec/emacs/28.2/amd64-pc-freebsd13/emacs.pdmp +libexec/emacs/28.2/amd64-pc-freebsd13/hexl +libexec/emacs/28.2/amd64-pc-freebsd13/movemail +libexec/emacs/28.2/amd64-pc-freebsd13/rcs2log man/man1/ctags.1.gz man/man1/ebrowse.1.gz man/man1/emacs.1.gz @@ -4024,7 +4024,6 @@ share/info/calc.info.gz share/info/ccmode.info.gz share/info/cl.info.gz share/info/dbus.info.gz -share/info/dir share/info/dired-x.info.gz share/info/ebrowse.info.gz share/info/ede.info.gz @@ -4081,7 +4080,7 @@ share/info/viper.info.gz share/info/widget.info.gz share/info/wisent.info.gz share/info/woman.info.gz -@dir libexec/emacs/28.2/amd64-pc-freebsd12 +@dir libexec/emacs/28.2/amd64-pc-freebsd13 @dir libexec/emacs/28.2 @dir libexec/emacs @dir share/emacs/28.2/etc/charsets diff --git a/lang/go121/Makefile b/lang/go121/Makefile index 0684a6fd..8cd2055b 100644 --- a/lang/go121/Makefile +++ b/lang/go121/Makefile @@ -2,7 +2,7 @@ # $FreeBSD: head/lang/go/Makefile 470619 2018-05-22 14:32:09Z jlaffaye $ PORTNAME= go -PORTVERSION= 1.21.4 +PORTVERSION= 1.21.5 CATEGORIES= lang MASTER_SITES= https://golang.org/dl/ MASTER_SITES+= https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap diff --git a/lang/go121/distinfo.amd64 b/lang/go121/distinfo.amd64 index 5072c6df..ab9e22f5 100644 --- a/lang/go121/distinfo.amd64 +++ b/lang/go121/distinfo.amd64 @@ -1,5 +1,5 @@ -TIMESTAMP = 1701068328 -SHA256 (go1.21.4.src.tar.gz) = 47b26a83d2b65a3c1c1bcace273b69bee49a7a7b5168a7604ded3d26a37bd787 -SIZE (go1.21.4.src.tar.gz) = 26979154 +TIMESTAMP = 1704405110 +SHA256 (go1.21.5.src.tar.gz) = 285cbbdf4b6e6e62ed58f370f3f6d8c30825d6e56c5853c66d3c23bcdb09db19 +SIZE (go1.21.5.src.tar.gz) = 26986890 SHA256 (go-freebsd-amd64-go1.20.tar.xz) = 170f612c4b8a59400f27d642aab37afa831fe2d6df3e7473dec2d4574a59a46c SIZE (go-freebsd-amd64-go1.20.tar.xz) = 34684360 diff --git a/lang/go121/pkg-plist.aarch64 b/lang/go121/pkg-plist.aarch64 index 0d48f2b4..2400074b 100644 --- a/lang/go121/pkg-plist.aarch64 +++ b/lang/go121/pkg-plist.aarch64 @@ -2311,6 +2311,7 @@ lib/go/src/cmd/go/testdata/script/mod_doc.txt lib/go/src/cmd/go/testdata/script/mod_domain_root.txt lib/go/src/cmd/go/testdata/script/mod_dot.txt lib/go/src/cmd/go/testdata/script/mod_download_concurrent_read.txt +lib/go/src/cmd/go/testdata/script/mod_download_exec_toolchain.txt lib/go/src/cmd/go/testdata/script/mod_download_git_bareRepository.txt lib/go/src/cmd/go/testdata/script/mod_download_git_decorate_full.txt lib/go/src/cmd/go/testdata/script/mod_download_hash.txt @@ -2439,6 +2440,7 @@ lib/go/src/cmd/go/testdata/script/mod_init_glide.txt lib/go/src/cmd/go/testdata/script/mod_init_invalid_major.txt lib/go/src/cmd/go/testdata/script/mod_init_path.txt lib/go/src/cmd/go/testdata/script/mod_init_tidy.txt +lib/go/src/cmd/go/testdata/script/mod_insecure_issue63845.txt lib/go/src/cmd/go/testdata/script/mod_install_hint.txt lib/go/src/cmd/go/testdata/script/mod_install_pkg_version.txt lib/go/src/cmd/go/testdata/script/mod_install_versioned.txt @@ -11591,6 +11593,8 @@ lib/go/test/fixedbugs/issue6295.dir/p1.go lib/go/test/fixedbugs/issue6295.dir/p2.go lib/go/test/fixedbugs/issue6295.go lib/go/test/fixedbugs/issue6298.go +lib/go/test/fixedbugs/issue63657.go +lib/go/test/fixedbugs/issue63955.go lib/go/test/fixedbugs/issue6399.go lib/go/test/fixedbugs/issue6402.go lib/go/test/fixedbugs/issue6403.go @@ -12585,7 +12589,7 @@ lib/go/VERSION @dir lib/go/misc/wasm @dir lib/go/misc @dir lib/go/pkg/include -@dir lib/go/pkg/tool/freebsd_arm64 +@dir lib/go/pkg/tool/freebsd_amd64 @dir lib/go/pkg/tool @dir lib/go/pkg @dir lib/go/src/archive/tar/testdata diff --git a/lang/go121/pkg-plist.amd64 b/lang/go121/pkg-plist.amd64 index ed178c74..7326c07a 100644 --- a/lang/go121/pkg-plist.amd64 +++ b/lang/go121/pkg-plist.amd64 @@ -2311,6 +2311,7 @@ lib/go/src/cmd/go/testdata/script/mod_doc.txt lib/go/src/cmd/go/testdata/script/mod_domain_root.txt lib/go/src/cmd/go/testdata/script/mod_dot.txt lib/go/src/cmd/go/testdata/script/mod_download_concurrent_read.txt +lib/go/src/cmd/go/testdata/script/mod_download_exec_toolchain.txt lib/go/src/cmd/go/testdata/script/mod_download_git_bareRepository.txt lib/go/src/cmd/go/testdata/script/mod_download_git_decorate_full.txt lib/go/src/cmd/go/testdata/script/mod_download_hash.txt @@ -2439,6 +2440,7 @@ lib/go/src/cmd/go/testdata/script/mod_init_glide.txt lib/go/src/cmd/go/testdata/script/mod_init_invalid_major.txt lib/go/src/cmd/go/testdata/script/mod_init_path.txt lib/go/src/cmd/go/testdata/script/mod_init_tidy.txt +lib/go/src/cmd/go/testdata/script/mod_insecure_issue63845.txt lib/go/src/cmd/go/testdata/script/mod_install_hint.txt lib/go/src/cmd/go/testdata/script/mod_install_pkg_version.txt lib/go/src/cmd/go/testdata/script/mod_install_versioned.txt @@ -11591,6 +11593,8 @@ lib/go/test/fixedbugs/issue6295.dir/p1.go lib/go/test/fixedbugs/issue6295.dir/p2.go lib/go/test/fixedbugs/issue6295.go lib/go/test/fixedbugs/issue6298.go +lib/go/test/fixedbugs/issue63657.go +lib/go/test/fixedbugs/issue63955.go lib/go/test/fixedbugs/issue6399.go lib/go/test/fixedbugs/issue6402.go lib/go/test/fixedbugs/issue6403.go diff --git a/lang/node16/Makefile b/lang/node16/Makefile index 509a411e..c3d0b1c2 100644 --- a/lang/node16/Makefile +++ b/lang/node16/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS+= libuv.so:devel/libuv CONFLICTS_INSTALL= node[4568]-[0-9]* ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 -USES= compiler:c++11-lib gmake python:2.7,build pkgconfig localbase shebangfix +USES= compiler:c++11-lib gmake python:build pkgconfig localbase shebangfix HAS_CONFIGURE= yes USE_LDCONFIG= yes @@ -34,10 +34,13 @@ CONFIGURE_ARGS+=--openssl-no-asm CONFIGURE_ENV+= PKG_CONFIG_PATH=/usr/libdata/pkgconfig:${LOCALBASE}/lib/pkgconfig -SHEBANG_FILES= deps/v8/tools/*.py \ - deps/v8/third_party/inspector_protocol/*.py \ - tools/*.py \ - tools/inspector_protocol/*.py +#SHEBANG_FILES= deps/v8/tools/*.py \ +# deps/v8/third_party/inspector_protocol/*.py \ +# tools/*.py \ +# tools/inspector_protocol/*.py + +SHEBANG_FILES= deps/v8/third_party/inspector_protocol/*.py deps/v8/tools/*.py \ + tools/*.py tools/inspector_protocol/*.py MAKE_ENV+= CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX} diff --git a/lang/node16/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi b/lang/node16/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi index 1da46abc..aad8ab03 100644 --- a/lang/node16/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi +++ b/lang/node16/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi @@ -1,6 +1,6 @@ ---- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2021-03-17 20:16:25 UTC +--- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2023-03-28 21:14:18 UTC +++ deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi -@@ -698,7 +698,7 @@ +@@ -699,7 +699,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ diff --git a/lang/node16/files/patch-deps_openssl_openssl-cl__no__asm.gypi b/lang/node16/files/patch-deps_openssl_openssl-cl__no__asm.gypi index 8966d6b4..3aa5573e 100644 --- a/lang/node16/files/patch-deps_openssl_openssl-cl__no__asm.gypi +++ b/lang/node16/files/patch-deps_openssl_openssl-cl__no__asm.gypi @@ -1,4 +1,4 @@ ---- deps/openssl/openssl-cl_no_asm.gypi.orig 2020-09-08 12:17:10 UTC +--- deps/openssl/openssl-cl_no_asm.gypi.orig 2023-03-28 21:14:18 UTC +++ deps/openssl/openssl-cl_no_asm.gypi @@ -1,4 +1,5 @@ { @@ -6,8 +6,8 @@ 'conditions': [ ['target_arch=="ppc" and OS=="aix"', { 'includes': ['config/archs/aix-gcc/no-asm/openssl-cl.gypi'], -@@ -47,7 +48,7 @@ - 'includes': ['config/archs/linux64-mips64/no-asm/openssl-cl.gypi'], +@@ -49,7 +50,7 @@ + 'includes': ['config/archs/linux64-riscv64/no-asm/openssl-cl.gypi'], }, { # Other architectures don't use assembly - 'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'], diff --git a/lang/node16/files/patch-deps_openssl_openssl__no__asm.gypi b/lang/node16/files/patch-deps_openssl_openssl__no__asm.gypi index 1fef0c4c..fbce5b5a 100644 --- a/lang/node16/files/patch-deps_openssl_openssl__no__asm.gypi +++ b/lang/node16/files/patch-deps_openssl_openssl__no__asm.gypi @@ -1,7 +1,7 @@ ---- deps/openssl/openssl_no_asm.gypi.orig 2020-09-08 12:17:11 UTC +--- deps/openssl/openssl_no_asm.gypi.orig 2023-03-28 21:14:18 UTC +++ deps/openssl/openssl_no_asm.gypi -@@ -48,7 +48,7 @@ - 'includes': ['config/archs/linux64-mips64/no-asm/openssl.gypi'], +@@ -50,7 +50,7 @@ + 'includes': ['config/archs/linux64-riscv64/no-asm/openssl.gypi'], }, { # Other architectures don't use assembly - 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'], diff --git a/lang/node16/files/patch-node.gypi b/lang/node16/files/patch-node.gypi index ff86f35a..9b726fef 100644 --- a/lang/node16/files/patch-node.gypi +++ b/lang/node16/files/patch-node.gypi @@ -1,6 +1,6 @@ ---- node.gypi.orig 2021-03-03 05:40:19 UTC +--- node.gypi.orig 2023-03-28 21:14:21 UTC +++ node.gypi -@@ -319,6 +319,9 @@ +@@ -338,6 +338,9 @@ [ 'node_use_openssl=="true"', { 'defines': [ 'HAVE_OPENSSL=1' ], 'conditions': [ diff --git a/lang/node16/files/patch-src_crypto_crypto__util.cc b/lang/node16/files/patch-src_crypto_crypto__util.cc new file mode 100644 index 00000000..e31cabd1 --- /dev/null +++ b/lang/node16/files/patch-src_crypto_crypto__util.cc @@ -0,0 +1,15 @@ +--- src/crypto/crypto_util.cc.orig 2023-06-12 06:44:17 UTC ++++ src/crypto/crypto_util.cc +@@ -194,10 +194,12 @@ void InitCryptoOnce() { + // No-op with OPENSSL_NO_COMP builds of OpenSSL. + sk_SSL_COMP_zero(SSL_COMP_get_compression_methods()); + ++#if OPENSSL_VERSION_MAJOR < 3 + #ifndef OPENSSL_NO_ENGINE + ERR_load_ENGINE_strings(); + ENGINE_load_builtin_engines(); + #endif // !OPENSSL_NO_ENGINE ++#endif // OPENSSL_VERSION_MAJOR < 3 + + NodeBIO::GetMethod(); + } diff --git a/lang/node18/Makefile b/lang/node18/Makefile index 31773ab6..962bf71d 100644 --- a/lang/node18/Makefile +++ b/lang/node18/Makefile @@ -1,7 +1,7 @@ # $FreeBSD: head/www/node/Makefile 453790 2017-11-09 02:31:47Z jbeich $ PORTNAME= node -PORTVERSION= 18.13.0 +PORTVERSION= 18.18.2 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ @@ -16,7 +16,7 @@ LIB_DEPENDS+= libuv.so:devel/libuv CONFLICTS_INSTALL= node[4568]-[0-9]* ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 -USES= compiler:c++11-lib gmake python:2.7,build pkgconfig localbase shebangfix +USES= compiler:c++11-lib gmake python:build pkgconfig localbase shebangfix HAS_CONFIGURE= yes USE_LDCONFIG= yes @@ -24,14 +24,23 @@ USE_LDCONFIG= yes PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} REINPLACE_ARGS= -i '' -CONFIGURE_ARGS+= --prefix=${PREFIX_RELDEST} -CONFIGURE_ARGS+= --without-npm -CONFIGURE_ARGS+= --shared-cares -CONFIGURE_ARGS+= --shared-libuv -CONFIGURE_ARGS+= --shared-zlib -#CONFIGURE_ARGS+= --with-intl=system-icu +#CONFIGURE_ARGS+= --prefix=${PREFIX_RELDEST} +#CONFIGURE_ARGS+= --without-npm +#CONFIGURE_ARGS+= --shared-cares +#CONFIGURE_ARGS+= --shared-libuv +#CONFIGURE_ARGS+= --shared-zlib +##CONFIGURE_ARGS+= --with-intl=system-icu +#CONFIGURE_ARGS+=--openssl-no-asm + +CONFIGURE_ARGS= --prefix=${PREFIX:S|^${DESTDIR}||} \ + --shared-cares \ + --shared-libuv \ + --shared-nghttp2 \ + --shared-zlib \ + --without-npm CONFIGURE_ARGS+=--openssl-no-asm + CONFIGURE_ENV+= PKG_CONFIG_PATH=/usr/libdata/pkgconfig:${LOCALBASE}/lib/pkgconfig SHEBANG_FILES= deps/v8/tools/*.py \ @@ -39,7 +48,6 @@ SHEBANG_FILES= deps/v8/tools/*.py \ tools/*.py \ tools/inspector_protocol/*.py - MAKE_ENV+= CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX} @@ -53,9 +61,9 @@ MAKE_ENV+= CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX} #CXXFLAGS+= -D_GLIBCXX_USE_C99 #.endif -#post-patch: -# ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ -# ${WRKSRC}/deps/v8/gypfiles/v8.gyp +post-patch: + ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/tools/v8_gypfiles/v8.gyp + post-configure: # Post-process Makefile and *.mk files created by node-gyp and remove diff --git a/lang/node18/distinfo b/lang/node18/distinfo index ca52a9a0..d452223d 100644 --- a/lang/node18/distinfo +++ b/lang/node18/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679764985 -SHA256 (node-v18.13.0.tar.gz) = 61ae68446438c2479e466d551b6e8c898097d56722957b1a8466ec8476a590d2 -SIZE (node-v18.13.0.tar.gz) = 84593514 +TIMESTAMP = 1704716893 +SHA256 (node-v18.18.2.tar.gz) = 509cd2cfc3a515bf2257ed3886b9fac64aeaac2a70ea59c0a6e02e2dbb722132 +SIZE (node-v18.18.2.tar.gz) = 86108679 diff --git a/lang/node18/files/extra-patch-common.gypi b/lang/node18/files/extra-patch-common.gypi index 8e817a29..0f921bf1 100644 --- a/lang/node18/files/extra-patch-common.gypi +++ b/lang/node18/files/extra-patch-common.gypi @@ -1,13 +1,20 @@ ---- common.gypi.orig 2019-10-01 15:32:40.000000000 +0200 -+++ common.gypi 2019-10-16 12:47:09.236138000 +0200 -@@ -390,8 +390,8 @@ - 'ldflags': [ '-m32' ], - }], - [ 'target_arch=="ppc64" and OS!="aix"', { -- 'cflags': [ '-m64', '-mminimal-toc' ], -- 'ldflags': [ '-m64' ], -+ 'cflags': [ '-m64' ], -+ 'ldflags': [ '-m64' ], - }], - [ 'target_arch=="s390x"', { - 'cflags': [ '-m64', '-march=z196' ], +--- common.gypi.orig 2023-09-18 05:18:10 UTC ++++ common.gypi +@@ -426,7 +426,7 @@ + 'ldflags': [ '-m32' ], + }], + [ 'host_arch=="ppc64" and OS not in "aix os400"', { +- 'cflags': [ '-m64', '-mminimal-toc' ], ++ 'cflags': [ '-m64' ], + 'ldflags': [ '-m64' ], + }], + [ 'host_arch=="s390x" and OS=="linux"', { +@@ -450,7 +450,7 @@ + 'ldflags': [ '-m32' ], + }], + [ 'target_arch=="ppc64" and OS not in "aix os400"', { +- 'cflags': [ '-m64', '-mminimal-toc' ], ++ 'cflags': [ '-m64' ], + 'ldflags': [ '-m64' ], + }], + [ 'target_arch=="s390x" and OS=="linux"', { diff --git a/lang/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi b/lang/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi index f637cc2e..9a24f139 100644 --- a/lang/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi +++ b/lang/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi @@ -1,4 +1,4 @@ ---- deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi.orig 2021-10-19 00:48:28 UTC +--- deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi.orig 2023-04-12 04:09:13 UTC +++ deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi @@ -13,7 +13,7 @@ '-Wall -O3 -fomit-frame-pointer', diff --git a/lang/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi b/lang/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi index 271bebf2..43f4e2a7 100644 --- a/lang/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi +++ b/lang/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi @@ -1,6 +1,6 @@ ---- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2021-10-19 00:48:28 UTC +--- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2023-04-12 04:09:13 UTC +++ deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi -@@ -980,7 +980,7 @@ +@@ -977,7 +977,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ diff --git a/lang/node18/files/patch-deps_openssl_openssl-cl__no__asm.gypi b/lang/node18/files/patch-deps_openssl_openssl-cl__no__asm.gypi index c2508ad0..178d0502 100644 --- a/lang/node18/files/patch-deps_openssl_openssl-cl__no__asm.gypi +++ b/lang/node18/files/patch-deps_openssl_openssl-cl__no__asm.gypi @@ -1,4 +1,4 @@ ---- deps/openssl/openssl-cl_no_asm.gypi.orig 2022-07-26 14:30:08 UTC +--- deps/openssl/openssl-cl_no_asm.gypi.orig 2023-04-12 04:09:13 UTC +++ deps/openssl/openssl-cl_no_asm.gypi @@ -1,4 +1,5 @@ { diff --git a/lang/node18/files/patch-deps_openssl_openssl__no__asm.gypi b/lang/node18/files/patch-deps_openssl_openssl__no__asm.gypi index 1fef0c4c..aa336fd9 100644 --- a/lang/node18/files/patch-deps_openssl_openssl__no__asm.gypi +++ b/lang/node18/files/patch-deps_openssl_openssl__no__asm.gypi @@ -1,7 +1,7 @@ ---- deps/openssl/openssl_no_asm.gypi.orig 2020-09-08 12:17:11 UTC +--- deps/openssl/openssl_no_asm.gypi.orig 2023-04-12 04:09:14 UTC +++ deps/openssl/openssl_no_asm.gypi -@@ -48,7 +48,7 @@ - 'includes': ['config/archs/linux64-mips64/no-asm/openssl.gypi'], +@@ -44,7 +44,7 @@ + 'includes': ['config/archs/linux64-riscv64/no-asm/openssl.gypi'], }, { # Other architectures don't use assembly - 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'], diff --git a/lang/node18/files/patch-deps_v8_src_base_platform_platform-freebsd.cc b/lang/node18/files/patch-deps_v8_src_base_platform_platform-freebsd.cc index 3e173b28..1983570b 100644 --- a/lang/node18/files/patch-deps_v8_src_base_platform_platform-freebsd.cc +++ b/lang/node18/files/patch-deps_v8_src_base_platform_platform-freebsd.cc @@ -1,4 +1,4 @@ ---- deps/v8/src/base/platform/platform-freebsd.cc.orig 2020-06-30 17:49:16 UTC +--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2023-04-12 04:09:14 UTC +++ deps/v8/src/base/platform/platform-freebsd.cc @@ -82,8 +82,8 @@ std::vector OS::GetSharedLib lib_name = std::string(path); diff --git a/lang/node18/files/patch-deps_v8_src_codegen_arm_cpu-arm.cc b/lang/node18/files/patch-deps_v8_src_codegen_arm_cpu-arm.cc index 4bbfd3df..4a34f196 100644 --- a/lang/node18/files/patch-deps_v8_src_codegen_arm_cpu-arm.cc +++ b/lang/node18/files/patch-deps_v8_src_codegen_arm_cpu-arm.cc @@ -1,4 +1,4 @@ ---- deps/v8/src/codegen/arm/cpu-arm.cc.orig 2022-04-19 16:03:40 UTC +--- deps/v8/src/codegen/arm/cpu-arm.cc.orig 2023-04-12 04:09:15 UTC +++ deps/v8/src/codegen/arm/cpu-arm.cc @@ -2,12 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be diff --git a/lang/node18/files/patch-deps_v8_src_codegen_ppc_constants-ppc.h b/lang/node18/files/patch-deps_v8_src_codegen_ppc_constants-ppc.h index 449278ef..2bf7c381 100644 --- a/lang/node18/files/patch-deps_v8_src_codegen_ppc_constants-ppc.h +++ b/lang/node18/files/patch-deps_v8_src_codegen_ppc_constants-ppc.h @@ -1,4 +1,4 @@ ---- deps/v8/src/codegen/ppc/constants-ppc.h.orig 2020-06-30 17:49:17 UTC +--- deps/v8/src/codegen/ppc/constants-ppc.h.orig 2023-04-12 04:09:15 UTC +++ deps/v8/src/codegen/ppc/constants-ppc.h @@ -36,7 +36,7 @@ #endif diff --git a/lang/node18/files/patch-deps_v8_src_libsampler_sampler.cc b/lang/node18/files/patch-deps_v8_src_libsampler_sampler.cc index 4a1f24a4..73288a58 100644 --- a/lang/node18/files/patch-deps_v8_src_libsampler_sampler.cc +++ b/lang/node18/files/patch-deps_v8_src_libsampler_sampler.cc @@ -1,4 +1,4 @@ ---- deps/v8/src/libsampler/sampler.cc.orig 2021-10-19 00:48:30 UTC +--- deps/v8/src/libsampler/sampler.cc.orig 2023-04-12 04:09:15 UTC +++ deps/v8/src/libsampler/sampler.cc @@ -497,6 +497,10 @@ void SignalHandler::FillRegisterState(void* context, R state->pc = reinterpret_cast(mcontext.__gregs[_REG_PC]); diff --git a/lang/node18/files/patch-node.gypi b/lang/node18/files/patch-node.gypi index f48b5b10..d76ca9ef 100644 --- a/lang/node18/files/patch-node.gypi +++ b/lang/node18/files/patch-node.gypi @@ -1,6 +1,6 @@ ---- node.gypi.orig 2021-10-19 00:48:32 UTC +--- node.gypi.orig 2023-04-12 04:09:19 UTC +++ node.gypi -@@ -319,6 +319,9 @@ +@@ -349,6 +349,9 @@ [ 'node_use_openssl=="true"', { 'defines': [ 'HAVE_OPENSSL=1' ], 'conditions': [ diff --git a/lang/node18/files/patch-openssl3 b/lang/node18/files/patch-openssl3 new file mode 100644 index 00000000..9066f5b9 --- /dev/null +++ b/lang/node18/files/patch-openssl3 @@ -0,0 +1,15 @@ +--- src/crypto/crypto_util.cc.orig 2023-04-12 04:09:19 UTC ++++ src/crypto/crypto_util.cc +@@ -195,10 +195,12 @@ void InitCryptoOnce() { + // No-op with OPENSSL_NO_COMP builds of OpenSSL. + sk_SSL_COMP_zero(SSL_COMP_get_compression_methods()); + ++#if OPENSSL_VERSION_MAJOR < 3 + #ifndef OPENSSL_NO_ENGINE + ERR_load_ENGINE_strings(); + ENGINE_load_builtin_engines(); + #endif // !OPENSSL_NO_ENGINE ++#endif + } + + void GetFipsCrypto(const FunctionCallbackInfo& args) { diff --git a/lang/node18/files/patch-src_cares__wrap.h b/lang/node18/files/patch-src_cares__wrap.h index 7f57f6d8..ab73ea7d 100644 --- a/lang/node18/files/patch-src_cares__wrap.h +++ b/lang/node18/files/patch-src_cares__wrap.h @@ -1,6 +1,6 @@ ---- src/cares_wrap.h.orig 2021-08-18 22:13:12 UTC +--- src/cares_wrap.h.orig 2023-04-12 04:09:19 UTC +++ src/cares_wrap.h -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ # include #endif // __POSIX__ diff --git a/lang/node18/files/patch-tools_v8__gypfiles_v8.gyp b/lang/node18/files/patch-tools_v8__gypfiles_v8.gyp index 374f7703..32853c6b 100644 --- a/lang/node18/files/patch-tools_v8__gypfiles_v8.gyp +++ b/lang/node18/files/patch-tools_v8__gypfiles_v8.gyp @@ -1,4 +1,4 @@ ---- tools/v8_gypfiles/v8.gyp.orig 2022-05-17 11:37:47 UTC +--- tools/v8_gypfiles/v8.gyp.orig 2023-04-12 04:09:21 UTC +++ tools/v8_gypfiles/v8.gyp @@ -977,7 +977,7 @@ }], diff --git a/lang/python38/pkg-plist b/lang/python38/pkg-plist index c6f89b9d..5408356f 100644 --- a/lang/python38/pkg-plist +++ b/lang/python38/pkg-plist @@ -186,9 +186,9 @@ lib/python3.8/__pycache__/_sitebuiltins.cpython-38.pyc lib/python3.8/__pycache__/_strptime.cpython-38.opt-1.pyc lib/python3.8/__pycache__/_strptime.cpython-38.opt-2.pyc lib/python3.8/__pycache__/_strptime.cpython-38.pyc -lib/python3.8/__pycache__/_sysconfigdata__freebsd12_.cpython-38.opt-1.pyc -lib/python3.8/__pycache__/_sysconfigdata__freebsd12_.cpython-38.opt-2.pyc -lib/python3.8/__pycache__/_sysconfigdata__freebsd12_.cpython-38.pyc +lib/python3.8/__pycache__/_sysconfigdata__freebsd13_.cpython-38.opt-1.pyc +lib/python3.8/__pycache__/_sysconfigdata__freebsd13_.cpython-38.opt-2.pyc +lib/python3.8/__pycache__/_sysconfigdata__freebsd13_.cpython-38.pyc lib/python3.8/__pycache__/_threading_local.cpython-38.opt-1.pyc lib/python3.8/__pycache__/_threading_local.cpython-38.opt-2.pyc lib/python3.8/__pycache__/_threading_local.cpython-38.pyc @@ -672,7 +672,7 @@ lib/python3.8/_pydecimal.py lib/python3.8/_pyio.py lib/python3.8/_sitebuiltins.py lib/python3.8/_strptime.py -lib/python3.8/_sysconfigdata__freebsd12_.py +lib/python3.8/_sysconfigdata__freebsd13_.py lib/python3.8/_threading_local.py lib/python3.8/_weakrefset.py lib/python3.8/abc.py diff --git a/lang/python39/pkg-plist b/lang/python39/pkg-plist index 23e8671a..f3221784 100644 --- a/lang/python39/pkg-plist +++ b/lang/python39/pkg-plist @@ -211,9 +211,9 @@ lib/python3.9/__pycache__/_sitebuiltins.cpython-39.pyc lib/python3.9/__pycache__/_strptime.cpython-39.opt-1.pyc lib/python3.9/__pycache__/_strptime.cpython-39.opt-2.pyc lib/python3.9/__pycache__/_strptime.cpython-39.pyc -lib/python3.9/__pycache__/_sysconfigdata__freebsd12_.cpython-39.opt-1.pyc -lib/python3.9/__pycache__/_sysconfigdata__freebsd12_.cpython-39.opt-2.pyc -lib/python3.9/__pycache__/_sysconfigdata__freebsd12_.cpython-39.pyc +lib/python3.9/__pycache__/_sysconfigdata__freebsd13_.cpython-39.opt-1.pyc +lib/python3.9/__pycache__/_sysconfigdata__freebsd13_.cpython-39.opt-2.pyc +lib/python3.9/__pycache__/_sysconfigdata__freebsd13_.cpython-39.pyc lib/python3.9/__pycache__/_threading_local.cpython-39.opt-1.pyc lib/python3.9/__pycache__/_threading_local.cpython-39.opt-2.pyc lib/python3.9/__pycache__/_threading_local.cpython-39.pyc @@ -698,7 +698,7 @@ lib/python3.9/_pydecimal.py lib/python3.9/_pyio.py lib/python3.9/_sitebuiltins.py lib/python3.9/_strptime.py -lib/python3.9/_sysconfigdata__freebsd12_.py +lib/python3.9/_sysconfigdata__freebsd13_.py lib/python3.9/_threading_local.py lib/python3.9/_weakrefset.py lib/python3.9/abc.py