main/nghttp2: Update to 1.33.0

2 files changed, 130 insertions, 3 deletions

diff --git a/main/nghttp2/APKBUILD b/main/nghttp2/APKBUILD
index 0a0ccf0125..410003485a 100644
--- a/main/nghttp2/APKBUILD
+++ b/main/nghttp2/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=nghttp2
-pkgver=1.32.0
+pkgver=1.33.0
 pkgrel=0
 pkgdesc="Experimental HTTP/2 client, server and proxy"
 url="https://nghttp2.org"
@@ -9,12 +9,19 @@ arch="all"
 license="MIT"
 makedepends="libev-dev libressl-dev zlib-dev c-ares-dev autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="https://github.com/tatsuhiro-t/$pkgname/releases/download/v$pkgver/nghttp2-$pkgver.tar.xz"
+source="https://github.com/tatsuhiro-t/$pkgname/releases/download/v$pkgver/nghttp2-$pkgver.tar.xz
+remove-mruby-tests.patch"
 builddir="$srcdir"/$pkgname-$pkgver
 
 check() {
 	cd "$builddir"
 	make check
+	# integration tests require go, which is only available
+	# in community at the moment of writing. Disabling until
+	# go is moved into main
+#	cd "integration-tests"
+#	make itprep
+#	make it
 }
 
 build() {
@@ -43,4 +50,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ec7e417fbc5497861d2b6dde5145da1640b36441882824e85940e5ca6ac52ec444aa7123846960f7211dd96462eab421d39f9cc49454f3f52e0dcdb36402044e  nghttp2-1.32.0.tar.xz"
+sha512sums="eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74  nghttp2-1.33.0.tar.xz
+d3f6a66ad6522babb5ad2b3721d52c1c2af88e57ed2895cf87037da1032ca42dcb95dacc23ea277b9507b4116cec117b5c9a3313759dc56b48199b687b74dd9a  remove-mruby-tests.patch"
diff --git a/main/nghttp2/remove-mruby-tests.patch b/main/nghttp2/remove-mruby-tests.patch
new file mode 100644
index 0000000000..7154f85845
--- /dev/null
+++ b/main/nghttp2/remove-mruby-tests.patch
@@ -0,0 +1,119 @@
+Disables mruby tests when running the integration tests.
+This is only required after go is moved from community to main.
+
+--- a/integration-tests/nghttpx_http1_test.go
++++ b/integration-tests/nghttpx_http1_test.go
+@@ -471,6 +471,7 @@
+ // TestH1H1ReqPhaseSetHeader tests mruby request phase hook
+ // modifies request header fields.
+ func TestH1H1ReqPhaseSetHeader(t *testing.T) {
++	t.Skip("No mruby support")
+ 	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-set-header.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
+ 		if got, want := r.Header.Get("User-Agent"), "mruby"; got != want {
+ 			t.Errorf("User-Agent = %v; want %v", got, want)
+@@ -493,6 +494,7 @@
+ // TestH1H1ReqPhaseReturn tests mruby request phase hook returns
+ // custom response.
+ func TestH1H1ReqPhaseReturn(t *testing.T) {
++	t.Skip("No mruby support")
+ 	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
+ 		t.Fatalf("request should not be forwarded")
+ 	})
+@@ -529,6 +531,7 @@
+ // TestH1H1RespPhaseSetHeader tests mruby response phase hook modifies
+ // response header fields.
+ func TestH1H1RespPhaseSetHeader(t *testing.T) {
++	t.Skip("No mruby support")
+ 	st := newServerTester([]string{"--mruby-file=" + testDir + "/resp-set-header.rb"}, t, noopHandler)
+ 	defer st.Close()
+ 
+@@ -551,6 +554,7 @@
+ // TestH1H1RespPhaseReturn tests mruby response phase hook returns
+ // custom response.
+ func TestH1H1RespPhaseReturn(t *testing.T) {
++	t.Skip("No mruby support")
+ 	st := newServerTester([]string{"--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
+ 	defer st.Close()
+ 
+@@ -821,6 +825,7 @@
+ // TestH1H2ReqPhaseReturn tests mruby request phase hook returns
+ // custom response.
+ func TestH1H2ReqPhaseReturn(t *testing.T) {
++	t.Skip("No mruby support")
+ 	st := newServerTester([]string{"--http2-bridge", "--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
+ 		t.Fatalf("request should not be forwarded")
+ 	})
+@@ -857,6 +862,7 @@
+ // TestH1H2RespPhaseReturn tests mruby response phase hook returns
+ // custom response.
+ func TestH1H2RespPhaseReturn(t *testing.T) {
++	t.Skip("No mruby support")
+ 	st := newServerTester([]string{"--http2-bridge", "--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
+ 	defer st.Close()
+ 
+@@ -1119,6 +1125,7 @@
+ // TestH1ResponseBeforeRequestEnd tests the situation where response
+ // ends before request body finishes.
+ func TestH1ResponseBeforeRequestEnd(t *testing.T) {
++	t.Skip("No mruby support")
+ 	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
+ 		t.Fatal("request should not be forwarded")
+ 	})
+--- a/integration-tests/nghttpx_http2_test.go
++++ b/integration-tests/nghttpx_http2_test.go
+@@ -969,6 +969,7 @@
+ // TestH2H1ReqPhaseSetHeader tests mruby request phase hook
+ // modifies request header fields.
+ func TestH2H1ReqPhaseSetHeader(t *testing.T) {
++	t.Skip("No mruby support")
+ 	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-set-header.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
+ 		if got, want := r.Header.Get("User-Agent"), "mruby"; got != want {
+ 			t.Errorf("User-Agent = %v; want %v", got, want)
+@@ -991,6 +992,7 @@
+ // TestH2H1ReqPhaseReturn tests mruby request phase hook returns
+ // custom response.
+ func TestH2H1ReqPhaseReturn(t *testing.T) {
++	t.Skip("No mruby support")
+ 	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
+ 		t.Fatalf("request should not be forwarded")
+ 	})
+@@ -1027,6 +1029,7 @@
+ // TestH2H1RespPhaseSetHeader tests mruby response phase hook modifies
+ // response header fields.
+ func TestH2H1RespPhaseSetHeader(t *testing.T) {
++	t.Skip("No mruby support")
+ 	st := newServerTester([]string{"--mruby-file=" + testDir + "/resp-set-header.rb"}, t, noopHandler)
+ 	defer st.Close()
+ 
+@@ -1049,6 +1052,7 @@
+ // TestH2H1RespPhaseReturn tests mruby response phase hook returns
+ // custom response.
+ func TestH2H1RespPhaseReturn(t *testing.T) {
++	t.Skip("No mruby support")
+ 	st := newServerTester([]string{"--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
+ 	defer st.Close()
+ 
+@@ -2262,6 +2266,7 @@
+ // TestH2H2ReqPhaseReturn tests mruby request phase hook returns
+ // custom response.
+ func TestH2H2ReqPhaseReturn(t *testing.T) {
++	t.Skip("No mruby support")
+ 	st := newServerTester([]string{"--http2-bridge", "--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
+ 		t.Fatalf("request should not be forwarded")
+ 	})
+@@ -2298,6 +2303,7 @@
+ // TestH2H2RespPhaseReturn tests mruby response phase hook returns
+ // custom response.
+ func TestH2H2RespPhaseReturn(t *testing.T) {
++	t.Skip("No mruby support")
+ 	st := newServerTester([]string{"--http2-bridge", "--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
+ 	defer st.Close()
+ 
+@@ -2592,6 +2598,7 @@
+ // TestH2ResponseBeforeRequestEnd tests the situation where response
+ // ends before request body finishes.
+ func TestH2ResponseBeforeRequestEnd(t *testing.T) {
++	t.Skip("No mruby support")
+ 	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
+ 		t.Fatal("request should not be forwarded")
+ 	})