nghttp2: update to 1.35.1.

This commit is contained in:
Rasmus Thomsen 2018-11-23 02:21:41 -02:00 committed by maxice8
parent 7d3093e6df
commit e5d1f675ee
2 changed files with 38 additions and 4 deletions

View file

@ -0,0 +1,28 @@
From 2c1570595e365a18c85fd1b12c8f56516742b664 Mon Sep 17 00:00:00 2001
From: Jeff 'Raid' Baitis <jeff@baitis.net>
Date: Sun, 2 Dec 2018 13:30:42 -0800
Subject: [PATCH] Fix for compilation against modern LibreSSL
---
src/shrpx_tls.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/shrpx_tls.cc b/src/shrpx_tls.cc
index 9aa789d07..2a8f28744 100644
--- src/shrpx_tls.cc
+++ src/shrpx_tls.cc
@@ -364,11 +364,11 @@ int tls_session_new_cb(SSL *ssl, SSL_SESSION *session) {
namespace {
SSL_SESSION *tls_session_get_cb(SSL *ssl,
-#if OPENSSL_1_1_API
+#if OPENSSL_1_1_API || LIBRESSL_2_7_API
const unsigned char *id,
-#else // !OPENSSL_1_1_API
+#else // !(OPENSSL_1_1_API || LIBRESSL_2_7_API)
unsigned char *id,
-#endif // !OPENSSL_1_1_API
+#endif // !(OPENSSL_1_1_API || LIBRESSL_2_7_API)
int idlen, int *copy) {
auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
auto handler = static_cast<ClientHandler *>(conn->data);

View file

@ -1,17 +1,23 @@
# Template file for 'nghttp2'
pkgname=nghttp2
version=1.34.0
version=1.35.1
revision=1
build_style=gnu-configure
configure_args="--without-libxml2 --without-jemalloc --without-spdylay"
configure_args="--without-libxml2 --without-jemalloc --without-spdylay
--disable-examples"
hostmakedepends="pkg-config"
makedepends="zlib-devel libressl-devel libevent-devel jansson-devel"
makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
libev-devel c-ares-devel"
short_desc="HTTP/2 C Library"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="MIT"
homepage="https://nghttp2.org"
distfiles="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
checksum=ecb0c013141495e24bd6deca022b5a92097a7848a0c17c4e5af1243a97fa622e
checksum=9b7f5b09c3ca40a46118240bf476a5babf4bd93a1e4fde2337c308c4c5c3263a
if [ "$XBPS_CHECK_PKGS" ]; then
makedepends+=" cppunit-devel"
fi
post_install() {
rm -rf ${DESTDIR}/usr/share/man