From 52e582c95e8a436ccf388d844d682b78b36c7ab8 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Wed, 3 Jun 2020 14:32:26 +0000
Subject: [PATCH] Update to nghttp2-1.41.0, and reinstate system nghttp2 for
 node.js

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23239 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genlib/nodejs.xml          | 10 ++++------
 introduction/welcome/changelog.xml |  7 +++++++
 networking/netlibs/nghttp2.xml     |  9 +++++----
 packages.ent                       |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/general/genlib/nodejs.xml b/general/genlib/nodejs.xml
index 7e888d0716..806dbdc65f 100644
--- a/general/genlib/nodejs.xml
+++ b/general/genlib/nodejs.xml
@@ -92,10 +92,9 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="c-ares"/>,
-      <xref linkend="icu"/>, and
-      <xref linkend="libuv"/>
-     <!-- currently FTBFS with system nghttp2, g++ scope error
-      <xref linkend="nghttp2"/>-->
+      <xref linkend="icu"/>,
+      <xref linkend="libuv"/>, and
+      <xref linkend="nghttp2"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -118,13 +117,12 @@
       Build <application>Node.js</application> by running the following
       commands:
     </para>
-<!-- with gcc-10.1 and v12.18.0, this fails to build with system nghttp2
-            \-\-shared-nghttp2               \-->
 
 <screen><userinput>./configure --prefix=/usr                  \
             --shared-cares                 \
             --shared-libuv                 \
             --shared-openssl               \
+            --shared-nghttp2               \
             --shared-zlib                  \
             --with-intl=system-icu         &amp;&amp;
 make</userinput></screen>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 8ad8cc953c..396ddfa0c1 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,13 @@
     <listitem>
       <para>June 3rd, 2020</para>
       <itemizedlist>
+        <listitem>
+          <para>[pierre] - Reinstate system nghttp2 for node.js-12.18.0.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to nghttp2-1.41.0 (security fixes). Fixes
+          <ulink url="&blfs-ticket-root;13629">#13629</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Update to node.js-12.18.0 (security fixes). Fixes
           <ulink url="&blfs-ticket-root;13628">#13628</ulink>.</para>
diff --git a/networking/netlibs/nghttp2.xml b/networking/netlibs/nghttp2.xml
index 67b5c1cf68..a7ab181287 100644
--- a/networking/netlibs/nghttp2.xml
+++ b/networking/netlibs/nghttp2.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY nghttp2-download-http "https://github.com/nghttp2/nghttp2/releases/download/v&nghttp2-version;/nghttp2-&nghttp2-version;.tar.xz">
   <!ENTITY nghttp2-download-ftp  " ">
-  <!ENTITY nghttp2-md5sum        "8d1a6b96760254e4dd142d7176e8fb7c">
+  <!ENTITY nghttp2-md5sum        "549db3507a7637b28ca467c7f3e9e023">
   <!ENTITY nghttp2-size          "1.6 MB">
-  <!ENTITY nghttp2-buildsize     "17 MB">
+  <!ENTITY nghttp2-buildsize     "19 MB">
   <!ENTITY nghttp2-time          "0.1 SBU">
 ]>
 
@@ -168,8 +168,9 @@ make</userinput></screen>
           libnghttp2.so
         </seg>
         <seg>
-          /usr/include/nghttp2 and
-          /usr/share/nghttp2
+          /usr/include/nghttp2,
+          /usr/share/nghttp2, and
+          /usr/share/doc/nghttp2-&nghttp2-version;
         </seg>
       </seglistitem>
     </segmentedlist>
diff --git a/packages.ent b/packages.ent
index 023bf3b6cb..6f2453b58a 100644
--- a/packages.ent
+++ b/packages.ent
@@ -622,7 +622,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY libsoup-version              "2.70.0">
 <!ENTITY libtirpc-version             "1.2.6">
 <!ENTITY neon-version                 "0.31.1">
-<!ENTITY nghttp2-version              "1.40.0">
+<!ENTITY nghttp2-version              "1.41.0">
 <!ENTITY rpcsvc-proto-version         "1.4.1">
 <!ENTITY serf-version                 "1.3.9">
 <!ENTITY uhttpmock-version            "0.5.2">