Attachment 243360 Details for Bug 272215 – Patch for nghttp2 v2

[patch] Patch for nghttp2 v2

nghttp2-cmake-1550.patch (text/plain), 3.26 KB, created by Daniel Engberg on 2023-07-12 19:51:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2023-07-12 19:51:25 UTC

Size: 3.26 KB

patch

obsolete

>diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile
>index 3dbfe6a50cb3..05c261282ced 100644
>--- a/www/nghttp2/Makefile
>+++ b/www/nghttp2/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	nghttp2
>-PORTVERSION=	1.54.0
>+DISTVERSION=	1.55.0
> CATEGORIES=	www net
>-MASTER_SITES=	https://github.com/nghttp2/nghttp2/releases/download/v${PORTVERSION}/
>+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
> 
> MAINTAINER=	sunpoet@FreeBSD.org
> COMMENT=	HTTP/2.0 C Library
>@@ -10,14 +10,28 @@ WWW=		https://nghttp2.org/
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BUILD_DEPENDS=	libnghttp2>=${PORTVERSION}:www/libnghttp2
>+BUILD_DEPENDS=	libnghttp2>=${DISTVERSION}:www/libnghttp2
> LIB_DEPENDS=	libnghttp2.so:www/libnghttp2
> 
>-USES=		cmake compiler:c++14-lang cpe localbase:ldflags pathfix pkgconfig python:env shebangfix ssl tar:xz
>+USES=		cmake compiler:c++14-lang cpe localbase:ldflags pathfix \
>+		pkgconfig python:env shebangfix ssl tar:xz
> 
> CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR=share/man
>-CMAKE_OFF=	ENABLE_DEBUG ENABLE_HTTP3 ENABLE_LIB_ONLY ENABLE_STATIC_CRT ENABLE_WERROR WITH_LIBBPF WITH_MRUBY WITH_NEVERBLEED
>-CMAKE_ON=	ENABLE_DOC ENABLE_FAILMALLOC ENABLE_THREADS
>+CMAKE_OFF=	ENABLE_DEBUG \
>+		ENABLE_HTTP3 \
>+		ENABLE_LIB_ONLY \
>+		ENABLE_STATIC_CRT \
>+		ENABLE_WERROR \
>+		WITH_LIBBPF \
>+		WITH_MRUBY \
>+		WITH_NEVERBLEED
>+CMAKE_ON=	ENABLE_DOC \
>+		ENABLE_FAILMALLOC \
>+		ENABLE_THREADS \
>+		CMAKE_DISABLE_FIND_PACKAGE_Jemalloc \
>+		CMAKE_DISABLE_FIND_PACKAGE_Libnghttp3 \
>+		CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2 \
>+		CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2_crypto_openssl
> USE_RC_SUBR=	nghttpx
> 
> SHEBANG_FILES=	script/fetch-ocsp-response
>@@ -25,21 +39,29 @@ SHEBANG_FILES=	script/fetch-ocsp-response
> OPTIONS_DEFINE=	APP EXAMPLES HPACK
> OPTIONS_DEFAULT=APP HPACK
> OPTIONS_SUB=	yes
>+
> APP_DESC=	Build h2load, nghttp, nghttpd and nghttpx
> 
> APP_BUILD_DEPENDS=	c-ares>=1.7.5:dns/c-ares \
> 			libev>=4.11:devel/libev
>-APP_CMAKE_BOOL=		ENABLE_APP
> APP_LIB_DEPENDS=	libcares.so:dns/c-ares \
> 			libev.so:devel/libev
> APP_USE=		GNOME=libxml2
> APP_USES=		gnome
>-EXAMPLES_CMAKE_BOOL=	ENABLE_EXAMPLES
>+APP_CMAKE_BOOL=		ENABLE_APP
>+APP_CMAKE_OFF=		-DCMAKE_DISABLE_FIND_PACKAGE_Libcares:BOOL=True \
>+			-DCMAKE_DISABLE_FIND_PACKAGE_Libev:BOOL=True \
>+			-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:BOOL=True
>+
> EXAMPLES_BUILD_DEPENDS=	libevent>=2.0.8:devel/libevent
> EXAMPLES_LIB_DEPENDS=	libevent_openssl.so:devel/libevent
>+EXAMPLES_CMAKE_BOOL=	ENABLE_EXAMPLES
>+EXAMPLES_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Libevent:BOOL=True
>+
> HPACK_BUILD_DEPENDS=	jansson>=2.5:devel/jansson
>-HPACK_CMAKE_BOOL=	ENABLE_HPACK_TOOLS
> HPACK_LIB_DEPENDS=	libjansson.so:devel/jansson
>+HPACK_CMAKE_BOOL=	ENABLE_HPACK_TOOLS
>+HPACK_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Jansson:BOOL=True
> 
> post-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx/
>diff --git a/www/nghttp2/distinfo b/www/nghttp2/distinfo
>index a2449a12f6f1..13706e8176ac 100644
>--- a/www/nghttp2/distinfo
>+++ b/www/nghttp2/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1688166098
>-SHA256 (nghttp2-1.54.0.tar.xz) = 20533c9354fbb6aa689b6aa0ddb77f91da1d242587444502832e1864308152df
>-SIZE (nghttp2-1.54.0.tar.xz) = 1541460
>+TIMESTAMP = 1689191095
>+SHA256 (nghttp2-1.55.0.tar.xz) = bc5b9d33fc08b195f0f2e685aa70bfd3f2f265a8d48039a701b7d67b375a783f
>+SIZE (nghttp2-1.55.0.tar.xz) = 1542356

Actions: View | Diff

Attachments on bug 272215: 242999 | 243360 | 243410