[arch-commits] Commit in nodejs-lts-erbium/trunk (3 files)

[Bruno Pagani]

    Date: Wednesday, October 13, 2021 @ 23:24:56
  Author: archange
Revision: 1030067

upgpkg: nodejs-lts-erbium 12.22.7-1

(Includes FS#72412)

Added:
  nodejs-lts-erbium/trunk/ares_compat.patch
  nodejs-lts-erbium/trunk/libnghttp1.45.1_compat.patch
Modified:
  nodejs-lts-erbium/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   19 +++++++++++++------
 ares_compat.patch            |   19 +++++++++++++++++++
 libnghttp1.45.1_compat.patch |   22 ++++++++++++++++++++++
 3 files changed, 54 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-13 21:57:27 UTC (rev 1030066)
+++ PKGBUILD	2021-10-13 23:24:56 UTC (rev 1030067)
@@ -2,8 +2,8 @@
 # Contributor: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=nodejs-lts-erbium
-pkgver=12.22.4
-pkgrel=2
+pkgver=12.22.7
+pkgrel=1
 pkgdesc="Evented I/O for V8 javascript (LTS release: Erbium)"
 arch=(x86_64)
 url="https://nodejs.org/"
@@ -15,11 +15,15 @@
 conflicts=(nodejs)
 source=("${url}"/dist/v${pkgver}/node-v${pkgver}.tar.xz
         nodejs-shared-libuv-uvwasi.patch::https://patch-diff.githubusercontent.com/raw/nodejs/node/pull/39260.patch
-        python3.patch)
+        python3.patch
+        ares_compat.patch
+        libnghttp1.45.1_compat.patch)
 # https://nodejs.org/download/release/latest-erbium/SHASUMS256.txt.asc
-sha256sums=(44cd4eab131e5282fc923e9e720d983a0b44c12e4aa4f6c3598dc97ae1e4cd4c
+sha256sums=(cc6a23b44870679a94bd8f3c8d4e1f4b77bb2712a36888ab87463459e6785f6b
             05692e382d71b5b92d5b86d513b9bb01750548630506ffe5b6f1920cbc5861bd
-            20a0f718c94a4686dfc66edd994788759cbda65734cbc52082884f6d0913477d)
+            20a0f718c94a4686dfc66edd994788759cbda65734cbc52082884f6d0913477d
+            b8e79d3495f425079352f9e95c753b257e4d9b8ecdca468660711e6da0efa6bf
+            81f8a060b40786c02de400620da4060483d910fe7a6b68d8328f3747caf54619)
 validpgpkeys=(C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8  # Myles Borins <mylesborins at google.com>
               77984A986EBC2AA786BC0F66B01FBB92821C587A  # Gibson Fahnestock <gibfahn at gmail.com>
               B9AE9905FFD7803F25714661B63B535A4C206CA9  # Evan Lucas <evanlucas at me.com>
@@ -26,12 +30,15 @@
               DD8F2338BAE7501E3DD5AC78C273792F7D83545D  # Rod Vagg <rod at vagg.org>
               B9E2F5981AA6E0CD28160D9FF13993A75599653C  # Shelley Vohr <shelley.vohr at gmail.com>
               4ED778F539E3634C779C87C6D7062848A1AB005C  # Beth Griggs <Bethany.Griggs at uk.ibm.com>
-              C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C) # Richard Lau <rlau at redhat.com> 
+              C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C  # Richard Lau <rlau at redhat.com> 
+              74F12602B6F1C4E913FAA37AD3A89613643B6201) # Danielle Adams <adamzdanielle at gmail.com>
 
 prepare() {
   cd node-v${pkgver}
   patch -p1 < ../python3.patch
   patch -p1 < ../nodejs-shared-libuv-uvwasi.patch
+  patch -p1 < ../ares_compat.patch
+  patch -p1 < ../libnghttp1.45.1_compat.patch
 }
 
 build() {

Added: ares_compat.patch
===================================================================
--- ares_compat.patch	                        (rev 0)
+++ ares_compat.patch	2021-10-13 23:24:56 UTC (rev 1030067)
@@ -0,0 +1,19 @@
+--- a/src/cares_wrap.cc
++++ b/src/cares_wrap.cc
+@@ -39,7 +39,15 @@
+ # include <netdb.h>
+ #endif  // __POSIX__
+ 
+-# include <ares_nameser.h>
++#if defined(__ANDROID__) || \
++    defined(__MINGW32__) || \
++    defined(__OpenBSD__) || \
++    defined(_MSC_VER)
++
++# include <nameser.h>
++#else
++# include <arpa/nameser.h>
++#endif
+ 
+ // OpenBSD does not define these
+ #ifndef AI_ALL

Added: libnghttp1.45.1_compat.patch
===================================================================
--- libnghttp1.45.1_compat.patch	                        (rev 0)
+++ libnghttp1.45.1_compat.patch	2021-10-13 23:24:56 UTC (rev 1030067)
@@ -0,0 +1,22 @@
+--- a/test/parallel/test-http2-methods.js
++++ b/test/parallel/test-http2-methods.js
+@@ -8,7 +8,7 @@ const h2 = require('http2');
+ 
+ const server = h2.createServer();
+ 
+-const methods = [undefined, 'GET', 'POST', 'PATCH', 'FOO', 'A B C'];
++const methods = ['GET', 'POST', 'PATCH', 'FOO', 'A_B_C'];
+ let expected = methods.length;
+ 
+ // We use the lower-level API here
+--- a/test/parallel/test-http2-multiplex.js
++++ b/test/parallel/test-http2-multiplex.js
+@@ -29,7 +29,7 @@ server.listen(0, common.mustCall(() => {
+   });
+ 
+   function doRequest() {
+-    const req = client.request({ ':method': 'POST ' });
++    const req = client.request({ ':method': 'POST' });
+ 
+     let data = '';
+     req.setEncoding('utf8');