From: Sergey Matveev <stargrave@stargrave.org>
Date: Sat, 15 Jun 2024 16:33:06 +0000 (+0300)
Subject: HTTP/2 support in cURL
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6f77c3a002a85aad002de880ecd9f819606370980013d0036d5e71c58ee35e73;p=bass.git

HTTP/2 support in cURL
---

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index 185ab71..70c331d 100644
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -132,6 +132,7 @@
 /nasm-2.16.01.tar.xz
 /ncurses-6.4.tar.gz
 /nettle-3.9.1.tar.gz
+/nghttp2-1.62.1.tar.xz
 /ninja-v1.12.1.tar.zst
 /ninja.git/
 /npth-1.7.tar.bz2
diff --git a/build/distfiles/nghttp2-1.62.1.tar.xz.meta4 b/build/distfiles/nghttp2-1.62.1.tar.xz.meta4
new file mode 100644
index 0000000..04202e6
--- /dev/null
+++ b/build/distfiles/nghttp2-1.62.1.tar.xz.meta4
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="nghttp2-1.62.1.tar.xz">
+    <hash type="blake3-256">77b1c0fed8e97db0aa7d6e1a5ed16e5a053093ed0006b7c747dca290d694f3af</hash>
+    <hash type="blake2b-512">460152f08b4ebd98453b95b737e0729648b95e808e845114a47a23e39fb3c68bf5d165d71467fbca8069fd5e64a63eeedd025919af4e2186da083caa21b93130</hash>
+    <hash type="blake2b-256">c4658d18d41e22fd63b41a2bdbe1986657cf4dc11a12396e6a54075c7ca39e03</hash>
+    <hash type="skein-512">55d0542cff8ade9559820b90277fa5a378504e4ef08aea7863b9ea4e6d8d4a34abc05240ec8a56df83c2f826b7f4c55f5b7d93506c60c0c048c95982d68ca19c</hash>
+    <hash type="shake128">7f4458289060c1dde8ab5da6677667c8d54b5b6f3d28c77ef6da7de894b89468</hash>
+    <hash type="shake256">8a4240e2a7a24fdc8073c72619dbe014ef901d12f23a5970d5e81fdf451f54f12628c97dd938635de3cbeba59d717ed747daeca06a82c6ad676bcc09069828cd</hash>
+    <hash type="sha-512">d5d6b068712e9b467547b0e5380465b8540317134f3f26c2b0c60eb9c604be2f37b4517a98b371d5f5fb668ce2ee35603ddd944224f11e96382aa541a6a17b4c</hash>
+    <hash type="sha-256">2345d4dc136fda28ce243e0bb21f2e7e8ef6293d62c799abbf6f633a6887af72</hash>
+    <hash type="streebog-512">2387dfef6caf894376c141ac466e5f269f700d8b56a83608a080e7cd3181efb3cd34b3958e63a50fcc549d970b598fbb2ce1a9f25d2e06eb0ba5691662ff7c5f</hash>
+    <hash type="streebog-256">85acc8354ad8fa35f40ab22a84e5cf1b512c7717e6598f873048a435da30bb5e</hash>
+    <hash type="xxh3-128">10447b225ce228ae48048868774264f8</hash>
+    <signature mediatype="application/pgp-signature"><![CDATA[
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEUWtiKRjRXEeKseo6UzmivoLgfewFAmZJm48ACgkQUzmivoLg
+fezkKQ//ckpW4fclZ95IPGYWDMmzsuXpeUeY1+SqD92neSKGqMzOcIYrdObBbSO7
+DDPVl2Vi+iW1nw20jztx9HT/J8Chl9qkThj1mzowwHGS7GaNLIJBbDSnI/Rnbp9z
+zDvoHrgr7vQjfIigutzTZ+k38k1phfg5mDQkIEF6/55m1/yZKycGL9RtWCUC6xVU
+JCYrz4vCu1VpwzvEMa/rNp5DmQ0o9lIf/Frq6Ki6OCayGgcXBazX3qqqdlWXJswW
+dMO15eCwJQGz1b0I26v1BfdIpntU87Z5NaASN/s7ONjvkbwb+7Tedh33P5PzrLik
+5MaKVS5YHXWWwK8u20lu35hvv3/lor5RW0PO5p50kApxvqa3qP8r2hn/f6sbaZyS
+6LQmmT6KxEgaw2tiqGSjKmnvPHwxt4SGtFc7bAtr9gOD3/HknRI3T5NidMs1HluX
+CnD8G88UmgfbHfGP7GaEm9Wh/AD+G+dksixdkXyIa+btypuZpzOJcF885Sv5d0t6
+bhGoBTZyQ+k1u+LoKrtwbWS00Hn4XmFx06nMvJFeuetmuuZlBlWhTdYE22UVX8/P
++5b+sVMgPQ5MPFb0ldQfj3pyanalflZ/zUixZY/c+bGCgS0u5fre3GNcT66zuIH9
+V+rGSnN+RchVPKUoWan9BXZRyFga5Fiefu1ARP8f2vaDBRate6Q=
+=dcEC
+-----END PGP SIGNATURE-----
+]]></signature>
+    <size>1606084</size>
+    <url>https://github.com/nghttp2/nghttp2/releases/download/v1.62.1/nghttp2-1.62.1.tar.xz</url>
+  </file>
+</metalink>
diff --git a/build/skel/www/curl-with-tls-8.7.1.do b/build/skel/www/curl-with-tls-8.7.1.do
index 697cf41..1674658 100644
--- a/build/skel/www/curl-with-tls-8.7.1.do
+++ b/build/skel/www/curl-with-tls-8.7.1.do
@@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
 bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1"
-rdeps="crypto/gnutls-3.7.10 dns/libidn2-2.3.7"
+rdeps="crypto/gnutls-3.7.10 dns/libidn2-2.3.7 www/libnghttp2-1.62.1"
 ver=${NAME#curl-with-tls-}
 redo-ifchange $bdeps "$DISTFILES"/curl-$ver.tar.xz $rdeps
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
@@ -17,6 +17,7 @@ cd curl-$ver
 ./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh \
     --with-gnutls \
     --enable-http \
+    --enable-nghttp2 \
     --enable-ftp \
     --enable-proxy \
     --enable-tftp \
diff --git a/build/skel/www/libnghttp2-1.62.1.do b/build/skel/www/libnghttp2-1.62.1.do
new file mode 100644
index 0000000..5337cad
--- /dev/null
+++ b/build/skel/www/libnghttp2-1.62.1.do
@@ -0,0 +1,21 @@
+[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../..
+sname=$1.do . "$BASS_ROOT"/lib/rc
+. "$BASS_ROOT"/build/skel/common.rc
+
+bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1"
+redo-ifchange $bdeps "$DISTFILES"/${NAME#lib}.tar.xz
+hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
+. "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
+"$BASS_ROOT"/build/bin/pkg-inst $bdeps
+. ./rc
+$TAR xf "$DISTFILES"/${NAME#lib}.tar.xz
+"$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
+
+cd ${NAME#lib}
+./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh >&2
+patch <"$BASS_ROOT"/build/skel/www/libnghttp2-only-lib.patch >&2
+make -j$MAKE_JOBS >&2
+make install >&2
+
+cd "$SKELBINS"/$ARCH
+"$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh
diff --git a/build/skel/www/libnghttp2-only-lib.patch b/build/skel/www/libnghttp2-only-lib.patch
new file mode 100644
index 0000000..dd5bdc6
--- /dev/null
+++ b/build/skel/www/libnghttp2-only-lib.patch
@@ -0,0 +1,12 @@
+--- Makefile.orig	2024-06-15 19:28:07.062504000 +0300
++++ Makefile	2024-06-15 19:28:57.777348000 +0300
+@@ -449,8 +449,7 @@
+ # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-SUBDIRS = lib third-party src bpf examples tests integration-tests \
+-	doc contrib script
++SUBDIRS = lib
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ dist_doc_DATA = README.rst