Date: Tuesday, November 1, 2022 @ 18:58:20
  Author: foutrelis
Revision: 1340234

upgpkg: nodejs-lts-fermium 14.20.0-3: switch to openssl-1.1

Not compatible with OpenSSL 3.0 without (possibly extensive) patching.

Added:
  nodejs-lts-fermium/trunk/fix-test-tls-session-cache.patch
Modified:
  nodejs-lts-fermium/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   13 +++++++++++--
 fix-test-tls-session-cache.patch |   12 ++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-11-01 18:57:28 UTC (rev 1340233)
+++ PKGBUILD    2022-11-01 18:58:20 UTC (rev 1340234)
@@ -3,21 +3,26 @@
 
 pkgname=nodejs-lts-fermium
 pkgver=14.20.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Evented I/O for V8 javascript (LTS release: Fermium)"
 arch=(x86_64)
 url="https://nodejs.org/";
 license=(MIT)
-depends=(openssl zlib icu libuv c-ares brotli libnghttp2) # http-parser
+depends=(openssl-1.1 zlib icu libuv c-ares brotli libnghttp2) # http-parser
 makedepends=(python procps-ng)
+checkdepends=(openssl) # for openssl s_client
 optdepends=('npm: nodejs package manager')
 provides=("nodejs=$pkgver")
 conflicts=(nodejs)
 source=(${url}/dist/v${pkgver}/node-v${pkgver}.tar.xz
+        
${pkgname}-openssl3-fix-test-tls-no-sslv3.patch::https://github.com/nodejs/node/commit/0828a96c10d1.patch
+        fix-test-tls-session-cache.patch
         icu72.patch
         libnghttp1.45.1_compat.patch)
 # https://nodejs.org/download/release/latest-fermium/SHASUMS256.txt.asc
 sha256sums=('2b5098498889d1e6a9709d63f3d6f94e696a5ad8221618c5d51159cee363996a'
+            'bb5f91aeb0f87e7bcbed531fe8922beec1b51bd2ceeec91e9d25ede800817459'
+            'f38518f306f1a62e0cd04ec2607fb6733ff95ad4090acb07fa091dfd002985c6'
             '886d0edf868c39567124937f93a43fb3e92fa65b5244b8c608d6482ed217fa56'
             '81f8a060b40786c02de400620da4060483d910fe7a6b68d8328f3747caf54619')
 validpgpkeys=(C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8  # Myles Borins 
<[email protected]>
@@ -31,6 +36,8 @@
 
 prepare() {
   cd node-v${pkgver}
+  patch -p1 < ../${pkgname}-openssl3-fix-test-tls-no-sslv3.patch
+  patch -p0 < ../fix-test-tls-session-cache.patch
   patch -p1 < ../icu72.patch
   patch -p1 < ../libnghttp1.45.1_compat.patch
 }
@@ -37,6 +44,7 @@
 
 build() {
   cd node-v${pkgver}
+  CPPFLAGS+=" -I/usr/include/openssl-1.1" LDFLAGS+=" -L/usr/lib/openssl-1.1"
 
   ./configure \
     --prefix=/usr \
@@ -62,6 +70,7 @@
 
 package() {
   cd node-v${pkgver}
+  LDFLAGS+=" -L/usr/lib/openssl-1.1" # not sure why it gets reset in package()
   make DESTDIR="${pkgdir}" install
   install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/
 }

Added: fix-test-tls-session-cache.patch
===================================================================
--- fix-test-tls-session-cache.patch                            (rev 0)
+++ fix-test-tls-session-cache.patch    2022-11-01 18:58:20 UTC (rev 1340234)
@@ -0,0 +1,12 @@
+# Extracted from https://github.com/nodejs/node/commit/640fe943544d
+
+--- test/parallel/test-tls-session-cache.js.orig       2022-11-01 
17:03:41.226108382 +0000
++++ test/parallel/test-tls-session-cache.js    2022-11-01 17:05:41.634992504 
+0000
+@@ -50,6 +50,7 @@ function doTest(testOptions, callback) {
+     requestCert: true,
+     rejectUnauthorized: false,
+     secureProtocol: 'TLS_method',
++    ciphers: 'RSA@SECLEVEL=0'
+   };
+   let requestCount = 0;
+   let resumeCount = 0;

Reply via email to