From nobody Mon Feb 05 00:10:00 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TSmwT0LpGz597B9; Mon, 5 Feb 2024 00:10:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TSmwS5Yrjz4hLm; Mon, 5 Feb 2024 00:10:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707091800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wG63ZZuFYIhfxfvv4qJX2/dPtueagBv5sqxu+q+9ag0=; b=S3RSSKkZwYLswKEdNprBmo8HsQUj8Icp3fjkBMUr94tPflA5eQM9LzvT20Q0sHdPSkW+WE S0jjUL5VPatFHa7mc+NOoL5yKdUUTS1j9FQ5k3R13cmE7FNpn74Qz/hWFopo7tnigWbVc+ t11bxvKwnD8CbD3EId7huMI1Kj/LP+fV/GSB2Z4FA+PDBhNkSc6vypTQL5ASzX6qb2QFY5 GODd4CCLLbBvgwPzVyZYHddboe1RBLWIkg/7y0Z8PTEBh4A3PJh37kWLZth55uCxYxZa/4 PMTDsSLJT09NLfJ5zIbBxsGfzp2Hu1uIduRK5AVGEj4DMXq4G3d/GYdFTLQBAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707091800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wG63ZZuFYIhfxfvv4qJX2/dPtueagBv5sqxu+q+9ag0=; b=MreTRsutv+GFfKzMeqXuG3zXHDP0KuCXASUQtXFNZR7qWzECHbeeCjdN02yb9DoMeKyCoe haRkxbeQN8A4KjSxCVZXPKzUi5BpfHnfjAqJA1PetkUyWoDzt5kKq8CXkoEBzbWjHH8D1g F2f4RBRXy2dCoZjX+KzBAik9/tEI1n3S+jhChZG7bZ1JEy7NUV/MZeaE9Uum87nyTMSIYz 8HXsOYFEk32cag7GGmPNEjWWLRgC0Q3NsMLLlhC6p9OA5p5n+zmnnm4JSsiNz8NSHkV6+q opBQqW9bZTANSRZYssW2nYkvBrdRDdPdJYqGjJQPCeNXen0MYK65HHi3LHIdpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707091800; a=rsa-sha256; cv=none; b=K+MtVzY+08ocK4755poE/d4iqM2N2fQ7YFHTXkK/gh4937uQobj0xW0prcMO0Zw0pSRJHL VDwZRTxaXtKUVCO10oEhTI55RwAxnusbBOAtIe+vsbOZmP+6t4VwW+bxLfWoF8MoNY1jzE m2QaTatlT824dkUtp3thOMNxOUGNtXx0EsfYmtaa2a6wW65VvLVOQTAO3JaInB+weu/rBG tMb+TNVSLqUIvroRD2CPHKt7DepTXjvbvaUL8G+PDURejGU7uM6Sde6vgiTK6nn5N4KG4B dX/a8PlZsueaHhAMgNvq/UySFsohU1UQLmUAjvX07Ew1PNygZ7dmGE0IGKhw2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TSmwS4dWdzJKx; Mon, 5 Feb 2024 00:10:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4150A0K2006152; Mon, 5 Feb 2024 00:10:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4150A0rD006131; Mon, 5 Feb 2024 00:10:00 GMT (envelope-from git) Date: Mon, 5 Feb 2024 00:10:00 GMT Message-Id: <202402050010.4150A0rD006131@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 6f26e08fc9b7 - main - www/libnghttp2: Update to 1.59.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f26e08fc9b753a86b46d827e3bb3618304cce39 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=6f26e08fc9b753a86b46d827e3bb3618304cce39 commit 6f26e08fc9b753a86b46d827e3bb3618304cce39 Author: Daniel Engberg AuthorDate: 2024-02-04 23:05:48 +0000 Commit: Daniel Engberg CommitDate: 2024-02-05 00:09:53 +0000 www/libnghttp2: Update to 1.59.0 * Use CMake for consistency and faster builds * Fixes CVE-2023-44487 Changelog: https://github.com/nghttp2/nghttp2/releases/tag/v1.59.0 PR: 274402 Approved by: portmgr (maintainer timeout, 2+ weeks) --- www/libnghttp2/Makefile | 26 ++++++++++++++++++-------- www/libnghttp2/distinfo | 6 +++--- www/libnghttp2/files/patch-CMakeLists.txt | 11 +++++++++++ www/libnghttp2/files/patch-Makefile.in | 16 ---------------- www/libnghttp2/pkg-plist | 2 +- 5 files changed, 33 insertions(+), 28 deletions(-) diff --git a/www/libnghttp2/Makefile b/www/libnghttp2/Makefile index 1b713cb71894..98257399a7c2 100644 --- a/www/libnghttp2/Makefile +++ b/www/libnghttp2/Makefile @@ -1,7 +1,7 @@ PORTNAME= nghttp2 -PORTVERSION= 1.58.0 +DISTVERSION= 1.59.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}/ 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 diff --git a/www/libnghttp2/distinfo b/www/libnghttp2/distinfo index 50491ed33c0c..027be1ecc1a6 100644 --- a/www/libnghttp2/distinfo +++ b/www/libnghttp2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698848712 -SHA256 (nghttp2-1.58.0.tar.xz) = 4a68a3040da92fd9872c056d0f6b0cd60de8410de10b578f8ade9ecc14d297e0 -SIZE (nghttp2-1.58.0.tar.xz) = 1546332 +TIMESTAMP = 1705867821 +SHA256 (nghttp2-1.59.0.tar.xz) = fdc9bd71f5cf8d3fdfb63066b89364c10eb2fdeab55f3c6755cd7917b2ec4ffb +SIZE (nghttp2-1.59.0.tar.xz) = 1546956 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 11a346002fe9..265bfb64c957 100644 --- a/www/libnghttp2/pkg-plist +++ b/www/libnghttp2/pkg-plist @@ -3,5 +3,5 @@ include/nghttp2/nghttp2ver.h lib/libnghttp2.a lib/libnghttp2.so lib/libnghttp2.so.14 -lib/libnghttp2.so.14.25.1 +lib/libnghttp2.so.14.26.0 libdata/pkgconfig/libnghttp2.pc