Attachment 250807 Details for Bug 278964 – Patch for libnghttp2 v2

[patch] Patch for libnghttp2 v2

libnghttp2-libnghttp2-1621v2.patch (text/plain), 3.61 KB, created by Daniel Engberg on 2024-05-19 10:48:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2024-05-19 10:48:41 UTC

Size: 3.61 KB

patch

obsolete

>diff --git a/www/libnghttp2/Makefile b/www/libnghttp2/Makefile
>index 1e669cdffb16..4f6265e55eee 100644
>--- a/www/libnghttp2/Makefile
>+++ b/www/libnghttp2/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}/
> PKGNAMEPREFIX=	lib
> 
> MAINTAINER=	sunpoet@FreeBSD.org
>@@ -12,12 +12,22 @@ WWW=		https://nghttp2.org/ \
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		compiler:c++14-lang cpe libtool pathfix pkgconfig tar:xz
>-
>-CONFIGURE_ARGS=	--enable-lib-only
>-GNU_CONFIGURE=	yes
>-INSTALL_TARGET=	install-strip
>-USE_CXXSTD=	c++14
>+USES=		cmake cpe pathfix pkgconfig tar:xz
> USE_LDCONFIG=	yes
> 
>+CMAKE_OFF=	ENABLE_DOC \
>+		ENABLE_FAILMALLOC \
>+		ENABLE_HTTP3
>+CMAKE_ON=	ENABLE_LIB_ONLY \
>+		ENABLE_STATIC_LIB \
>+		CMAKE_DISABLE_FIND_PACKAGE_Jansson \
>+		CMAKE_DISABLE_FIND_PACKAGE_Jemalloc \
>+		CMAKE_DISABLE_FIND_PACKAGE_Libcares \
>+		CMAKE_DISABLE_FIND_PACKAGE_Libev \
>+		CMAKE_DISABLE_FIND_PACKAGE_Libevent \
>+		CMAKE_DISABLE_FIND_PACKAGE_Libnghttp3 \
>+		CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2 \
>+		CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2_crypto_openssl \
>+		CMAKE_DISABLE_FIND_PACKAGE_LibXml2
>+
> .include <bsd.port.mk>
>diff --git a/www/libnghttp2/distinfo b/www/libnghttp2/distinfo
>index 8579be1c53e4..576f0937cf8d 100644
>--- a/www/libnghttp2/distinfo
>+++ b/www/libnghttp2/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1712261836
>-SHA256 (nghttp2-1.61.0.tar.xz) = c0e660175b9dc429f11d25b9507a834fb752eea9135ab420bb7cb7e9dbcc9654
>-SIZE (nghttp2-1.61.0.tar.xz) = 1645808
>+TIMESTAMP = 1716115359
>+SHA256 (nghttp2-1.62.1.tar.xz) = 2345d4dc136fda28ce243e0bb21f2e7e8ef6293d62c799abbf6f633a6887af72
>+SIZE (nghttp2-1.62.1.tar.xz) = 1606084
>diff --git a/www/libnghttp2/files/patch-CMakeLists.txt b/www/libnghttp2/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..7d11bf640cd7
>--- /dev/null
>+++ b/www/libnghttp2/files/patch-CMakeLists.txt
>@@ -0,0 +1,11 @@
>+--- CMakeLists.txt.orig	2023-09-15 17:17:34 UTC
>++++ CMakeLists.txt
>+@@ -483,7 +483,7 @@ if(ENABLE_DOC)
>+   add_subdirectory(doc)
>+ endif()
>+ add_subdirectory(contrib)
>+-add_subdirectory(script)
>++#add_subdirectory(script)
>+ add_subdirectory(bpf)
>+ 
>+ 
>diff --git a/www/libnghttp2/files/patch-Makefile.in b/www/libnghttp2/files/patch-Makefile.in
>deleted file mode 100644
>index d4174dca7bda..000000000000
>--- a/www/libnghttp2/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,16 +0,0 @@
>---- Makefile.in.orig	2023-02-13 12:02:52 UTC
>-+++ Makefile.in
>-@@ -448,11 +448,10 @@ top_srcdir = @top_srcdir@
>- # 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
>-+dist_doc_DATA =
>- EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-env \
>- 	Dockerfile.android \
>- 	cmakeconfig.h.in \
>diff --git a/www/libnghttp2/pkg-plist b/www/libnghttp2/pkg-plist
>index e6e6a7de5732..a5bd1da07949 100644
>--- a/www/libnghttp2/pkg-plist
>+++ b/www/libnghttp2/pkg-plist
>@@ -1,7 +1,8 @@
> include/nghttp2/nghttp2.h
> include/nghttp2/nghttp2ver.h
>-lib/libnghttp2.a
>+lib/cmake/nghttp2/nghttp2-targets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/nghttp2/nghttp2-targets.cmake
> lib/libnghttp2.so
> lib/libnghttp2.so.14
>-lib/libnghttp2.so.14.28.0
>+lib/libnghttp2.so.14.28.1
> libdata/pkgconfig/libnghttp2.pc

Actions: View | Diff

Attachments on bug 278964: 250633 | 250807