From 292acff229a7058ea5a9ab97007215f110d41e6e Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Fri, 28 Aug 2020 18:58:09 +0200
Subject: [PATCH] nghttp2: update to 1.41.0

---
 nghttp2/build.sh       | 18 ++++++++++--------
 nghttp2/meta/ChangeLog |  3 +++
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/nghttp2/build.sh b/nghttp2/build.sh
index 0825779..d9435d3 100755
--- a/nghttp2/build.sh
+++ b/nghttp2/build.sh
@@ -6,7 +6,7 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=nghttp2
-version=1.40.0
+version=1.41.0
 pkgver=1
 source[0]=https://github.com/${topdir}/${topdir}/releases/download/v${version}/${topdir}-${version}.tar.xz
 # If there are no patches, simply comment this
@@ -22,18 +22,19 @@ configure_args+=(--disable-static --enable-lib-only)
 make_build_target="V=1"
 # No python deps from packaged scripts
 ignore_deps="TGCpy27"
+# No symbol visibility support
+ac_overrides="ax_cv_check_cflags___fvisibility_hidden=no"
+# gcc 4.x causes linking to fail despite building everything PIC:
+# "ld: fatal: relocations remain against allocatable but non-writable sections"
+# Rather than using -mimpure-text we drop back to gcc 3.4 since it just works
+if [ "$arch" = "i386" ]; then
+    export CC=/usr/tgcware/gcc34/bin/gcc
+fi
 
 reg prep
 prep()
 {
     generic_prep
-    if [ "$arch" = "i386" ]; then
-      # Replacing Wl,-z text with -mimpure-text is a workaround to avoid
-      # "ld: fatal: relocations remain against allocatable but non-writable sections"
-      # when linking libnghttp2
-      setdir source
-      sed -i 's|\$wl-z \${wl}text|-mimpure-text|g' configure
-    fi
 }
 
 reg build
@@ -61,6 +62,7 @@ install()
 
     compat nghttp2 1.37.0 1 1
     compat nghttp2 1.38.0 1 1
+    compat nghttp2 1.40.0 1 1
 }
 
 reg pack
diff --git a/nghttp2/meta/ChangeLog b/nghttp2/meta/ChangeLog
index 07a9a3d..b500c36 100644
--- a/nghttp2/meta/ChangeLog
+++ b/nghttp2/meta/ChangeLog
@@ -1,5 +1,8 @@
 CHANGELOG
 ---------
+* Fri Aug 28 2020 Tom G. Christensen <swpkg@jupiterrise.com> - 1.41.0-1
+- Update to 1.41.0 (fixes CVE-2020-11080)
+
 * Thu Jan 30 2020 Tom G. Christensen <swpkg@jupiterrise.com> - 1.40.0-1
 - Update to 1.40.0