Attachment 250806 Details for Bug 278965 – Patch for nghttp2 v2

[patch] Patch for nghttp2 v2

nghttp2-nghttp2-1621.patch (text/plain), 4.53 KB, created by Daniel Engberg on 2024-05-19 10:47:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2024-05-19 10:47:26 UTC

Size: 4.53 KB

patch

obsolete

>diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile
>index 1be233b90a06..c36eeb3483b7 100644
>--- a/www/nghttp2/Makefile
>+++ b/www/nghttp2/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	nghttp2
>-PORTVERSION=	1.61.0
>+DISTVERSION=	1.62.1
> 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,36 +10,62 @@ 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++20-lang cpe localbase:ldflags pathfix \
>+		pkgconfig python:env shebangfix ssl tar:xz
>+SHEBANG_FILES=	script/fetch-ocsp-response
> 
>-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
> USE_RC_SUBR=	nghttpx
> 
>-SHEBANG_FILES=	script/fetch-ocsp-response
>+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
> 
> 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
>+APP_CMAKE_BOOL=		ENABLE_APP
>+APP_CMAKE_OFF=		-DCMAKE_DISABLE_FIND_PACKAGE_Libev:BOOL=True \
>+			-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:BOOL=True
>+
> EXAMPLES_BUILD_DEPENDS=	libevent>=2.0.8:devel/libevent
>-EXAMPLES_CMAKE_BOOL=	ENABLE_EXAMPLES
> 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
>+
>+.include <bsd.port.options.mk>
>+
>+.if ${OPSYS}_${OSREL:C/\\./-/} == FreeBSD_13-2
>+USES+=	llvm
>+.endif
> 
> post-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx/
>diff --git a/www/nghttp2/distinfo b/www/nghttp2/distinfo
>index 8579be1c53e4..c3dab3ff0f32 100644
>--- a/www/nghttp2/distinfo
>+++ b/www/nghttp2/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1712261836
>-SHA256 (nghttp2-1.61.0.tar.xz) = c0e660175b9dc429f11d25b9507a834fb752eea9135ab420bb7cb7e9dbcc9654
>-SIZE (nghttp2-1.61.0.tar.xz) = 1645808
>+TIMESTAMP = 1716115105
>+SHA256 (nghttp2-1.62.1.tar.xz) = 2345d4dc136fda28ce243e0bb21f2e7e8ef6293d62c799abbf6f633a6887af72
>+SIZE (nghttp2-1.62.1.tar.xz) = 1606084
>diff --git a/www/nghttp2/files/patch-CMakeLists.txt b/www/nghttp2/files/patch-CMakeLists.txt
>index 6332e9b92e37..646c5b733652 100644
>--- a/www/nghttp2/files/patch-CMakeLists.txt
>+++ b/www/nghttp2/files/patch-CMakeLists.txt
>@@ -1,6 +1,6 @@
>---- CMakeLists.txt.orig	2022-11-13 06:53:06 UTC
>+--- CMakeLists.txt.orig	2024-05-13 21:32:20 UTC
> +++ CMakeLists.txt
>-@@ -505,7 +505,7 @@ set(PKGLIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PR
>+@@ -430,7 +430,7 @@ install(FILES README.rst DESTINATION "${CMAKE_INSTALL_
>  
>  install(FILES README.rst DESTINATION "${CMAKE_INSTALL_DOCDIR}")
>  
>diff --git a/www/nghttp2/files/patch-src_template.h b/www/nghttp2/files/patch-src_template.h
>new file mode 100644
>index 000000000000..5c22f4a00ccc
>--- /dev/null
>+++ b/www/nghttp2/files/patch-src_template.h
>@@ -0,0 +1,11 @@
>+--- src/template.h.orig	2024-05-13 21:28:56 UTC
>++++ src/template.h
>+@@ -444,7 +444,7 @@ inline constexpr bool operator==(const StringRef &lhs,
>+          std::equal(std::begin(lhs), std::end(lhs), std::begin(rhs));
>+ }
>+ 
>+-#ifndef __APPLE__
>++#ifndef __FreeBSD__
>+ inline constexpr std::strong_ordering
>+ operator<=>(const StringRef &lhs, const StringRef &rhs) noexcept {
>+   return std::lexicographical_compare_three_way(std::begin(lhs), std::end(lhs),

Actions: View | Diff

Attachments on bug 278965: 250634 | 250806