From 0cf187c299ecc7d681e185a5af1896aadac38d09 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 1 Jul 2024 07:17:25 +0000 Subject: [PATCH] net-libs/nghttp2: Sync with Gentoo It's from Gentoo commit 206ba6af31f6fccbb45b5ac076a09aa8e5e8480f. --- .../portage-stable/net-libs/nghttp2/Manifest | 6 +- .../net-libs/nghttp2/nghttp2-1.57.0.ebuild | 58 ------------------- .../net-libs/nghttp2/nghttp2-1.58.0.ebuild | 58 ------------------- .../net-libs/nghttp2/nghttp2-1.61.0.ebuild | 2 +- ...p2-1.60.0.ebuild => nghttp2-1.62.0.ebuild} | 5 ++ ...p2-1.59.0.ebuild => nghttp2-1.62.1.ebuild} | 11 ++-- .../net-libs/nghttp2/nghttp2-9999.ebuild | 12 ++-- 7 files changed, 22 insertions(+), 130 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.57.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.58.0.ebuild rename sdk_container/src/third_party/portage-stable/net-libs/nghttp2/{nghttp2-1.60.0.ebuild => nghttp2-1.62.0.ebuild} (89%) rename sdk_container/src/third_party/portage-stable/net-libs/nghttp2/{nghttp2-1.59.0.ebuild => nghttp2-1.62.1.ebuild} (86%) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest index baeb21f5bc..435aaceea6 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest @@ -1,5 +1,3 @@ -DIST nghttp2-1.57.0.tar.xz 1543568 BLAKE2B 6fad0f922477f896db14319433569b99cf599217335b5af189cc7b460f78996a801845927040d4f529151bbcc572b2cf4d8d28eae2647fad1fd35f796fd4afb8 SHA512 d914eb48afd1ea182c1b2a454bf5e7963a7e28165f1d6d29bb83dd61a1b611c8c469e72a7a22daf23b8037f6e5ae9d4e791150b7d135746c1a5ec71ceb777f92 -DIST nghttp2-1.58.0.tar.xz 1546332 BLAKE2B db51bf6a0307f1465f4fcda7555b3a720800ee09aa8d26533fb6726f9b56a137435f5ea745f8fa5f927c8638e2a8fd371b04825e23c6a802070cebcfb654d256 SHA512 97b70727c633be1168df6a5b48617dde113b1d1e34176ec8bf22f4449041af2f73b2ada438d14336c9712271ec6bfc7525f000c8ca6a7a9f8d06db01b876dd1c -DIST nghttp2-1.59.0.tar.xz 1546956 BLAKE2B 0a1471c3686fcf8a896183e71e7a1c000e9397fc1831054dc87ab8860ff5d8ce2ec5ede0ba916edc7fcf94f3361b2f91e623303cbb1f6c08310f5bfbfe6cebfe SHA512 0725f302957520893ac454997adc6d6e71dc9b520c62390477fe8c5dd5c64d02415023266814cfec859bf562159e4a42eeb7d7312c5871739a3d57ed7430820b -DIST nghttp2-1.60.0.tar.xz 1587004 BLAKE2B 8f2ab1aead261823fd2b15e54f0404c118a13f269c0f1c5d2cdc3f344e35338bcf64acfe58bed8ffbcda3843935c7168650dfc8bef17c1cdfacb684261bb2727 SHA512 5e6365d9118596d41848930de70f4a918d72463920184df60a7e1678c3a6c9cf1416236888e7e34395c87f41bba00a114994ba5a6e73f6a389769abf1b5cc842 DIST nghttp2-1.61.0.tar.xz 1645808 BLAKE2B e78fb94cc9234260447f0d3610e58e22f9eadc2dd8b79eec3c1bb10d5c03ad3a87f83d54e560e5bbdef5d60086c00b465caabca145485ecd636aa35a2cda616f SHA512 01e930d7caf464699505f92b76e2bc8192d168612dc564d2546812c42afea2fb81d552d70e8a5fed35e2bf5deadbec8eda095af94a2484bca41542988afce52a +DIST nghttp2-1.62.0.tar.xz 1646596 BLAKE2B 156fe3cd401e89cb9416c3281318f955abe86909d249108781f8eaeb0ff3df791f083ae6fc7bfe04350b91ffeaf8d8799d138d9d7cc9f5121a344f69f7473915 SHA512 1674e269dcf1067312056e5ea0e7108a48a177888fbaae5a194bddcc9640babc996d86e74e3160cd0dc4a360f0440441116259f3b44a3ca5fea081cdff7e7c88 +DIST nghttp2-1.62.1.tar.xz 1606084 BLAKE2B 460152f08b4ebd98453b95b737e0729648b95e808e845114a47a23e39fb3c68bf5d165d71467fbca8069fd5e64a63eeedd025919af4e2186da083caa21b93130 SHA512 d5d6b068712e9b467547b0e5380465b8540317134f3f26c2b0c60eb9c604be2f37b4517a98b371d5f5fb668ce2ee35603ddd944224f11e96382aa541a6a17b4c diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.57.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.57.0.ebuild deleted file mode 100644 index fbbc7b2036..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.57.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -DESCRIPTION="HTTP/2 C Library" -HOMEPAGE="https://nghttp2.org/" -SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0/1.14" # 1. -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml" - -RESTRICT="!test? ( test )" - -SSL_DEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}] -" -RDEPEND=" - hpack-tools? ( >=dev-libs/jansson-2.5:= ) - jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] ) - utils? ( - ${SSL_DEPEND} - >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}] - net-dns/c-ares:=[${MULTILIB_USEDEP}] - ) - systemd? ( >=sys-apps/systemd-209 ) - xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" -BDEPEND="virtual/pkgconfig" - -multilib_src_configure() { - local mycmakeargs=( - -DENABLE_EXAMPLES=OFF - -DENABLE_FAILMALLOC=OFF - -DENABLE_WERROR=OFF - -DENABLE_THREADS=ON - -DENABLE_DEBUG=$(usex debug) - -DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools) - $(cmake_use_find_package hpack-tools Jansson) - -DWITH_JEMALLOC=$(multilib_native_usex jemalloc) - -DENABLE_STATIC_LIB=$(usex static-libs) - $(cmake_use_find_package systemd Systemd) - $(cmake_use_find_package test CUnit) - -DENABLE_APP=$(multilib_native_usex utils) - -DWITH_LIBXML2=$(multilib_native_usex xml) - ) - cmake_src_configure -} - -multilib_src_test() { - eninja check -} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.58.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.58.0.ebuild deleted file mode 100644 index c028ca91bb..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.58.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -DESCRIPTION="HTTP/2 C Library" -HOMEPAGE="https://nghttp2.org/" -SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0/1.14" # 1. -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml" - -RESTRICT="!test? ( test )" - -SSL_DEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}] -" -RDEPEND=" - hpack-tools? ( >=dev-libs/jansson-2.5:= ) - jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] ) - utils? ( - ${SSL_DEPEND} - >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}] - net-dns/c-ares:=[${MULTILIB_USEDEP}] - ) - systemd? ( >=sys-apps/systemd-209 ) - xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" -BDEPEND="virtual/pkgconfig" - -multilib_src_configure() { - local mycmakeargs=( - -DENABLE_EXAMPLES=OFF - -DENABLE_FAILMALLOC=OFF - -DENABLE_WERROR=OFF - -DENABLE_THREADS=ON - -DENABLE_DEBUG=$(usex debug) - -DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools) - $(cmake_use_find_package hpack-tools Jansson) - -DWITH_JEMALLOC=$(multilib_native_usex jemalloc) - -DENABLE_STATIC_LIB=$(usex static-libs) - $(cmake_use_find_package systemd Systemd) - $(cmake_use_find_package test CUnit) - -DENABLE_APP=$(multilib_native_usex utils) - -DWITH_LIBXML2=$(multilib_native_usex xml) - ) - cmake_src_configure -} - -multilib_src_test() { - eninja check -} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.61.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.61.0.ebuild index 5accde584b..3f8e52d142 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.61.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.61.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz LICENSE="MIT" SLOT="0/1.14" # 1. -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml" REQUIRED_USE="test? ( static-libs )" diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.60.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.62.0.ebuild similarity index 89% rename from sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.60.0.ebuild rename to sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.62.0.ebuild index 4b3b74750d..52ec575055 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.60.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.62.0.ebuild @@ -14,6 +14,7 @@ SLOT="0/1.14" # 1. KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml" +REQUIRED_USE="test? ( static-libs )" RESTRICT="!test? ( test )" SSL_DEPEND=" @@ -34,9 +35,12 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" multilib_src_configure() { + #TODO: enable HTTP3 + #requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3 local mycmakeargs=( -DENABLE_EXAMPLES=OFF -DENABLE_FAILMALLOC=OFF + -DENABLE_HTTP3=OFF -DENABLE_WERROR=OFF -DENABLE_THREADS=ON -DENABLE_DEBUG=$(usex debug) @@ -44,6 +48,7 @@ multilib_src_configure() { $(cmake_use_find_package hpack-tools Jansson) -DWITH_JEMALLOC=$(multilib_native_usex jemalloc) -DBUILD_STATIC_LIBS=$(usex static-libs) + -DBUILD_TESTING=$(usex test) $(cmake_use_find_package systemd Systemd) -DENABLE_APP=$(multilib_native_usex utils) -DWITH_LIBXML2=$(multilib_native_usex xml) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.59.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.62.1.ebuild similarity index 86% rename from sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.59.0.ebuild rename to sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.62.1.ebuild index cf8309087f..52ec575055 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.59.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.62.1.ebuild @@ -14,6 +14,7 @@ SLOT="0/1.14" # 1. KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml" +REQUIRED_USE="test? ( static-libs )" RESTRICT="!test? ( test )" SSL_DEPEND=" @@ -30,23 +31,25 @@ RDEPEND=" ) systemd? ( >=sys-apps/systemd-209 ) xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" multilib_src_configure() { + #TODO: enable HTTP3 + #requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3 local mycmakeargs=( -DENABLE_EXAMPLES=OFF -DENABLE_FAILMALLOC=OFF + -DENABLE_HTTP3=OFF -DENABLE_WERROR=OFF -DENABLE_THREADS=ON -DENABLE_DEBUG=$(usex debug) -DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools) $(cmake_use_find_package hpack-tools Jansson) -DWITH_JEMALLOC=$(multilib_native_usex jemalloc) - -DENABLE_STATIC_LIB=$(usex static-libs) + -DBUILD_STATIC_LIBS=$(usex static-libs) + -DBUILD_TESTING=$(usex test) $(cmake_use_find_package systemd Systemd) - $(cmake_use_find_package test CUnit) -DENABLE_APP=$(multilib_native_usex utils) -DWITH_LIBXML2=$(multilib_native_usex xml) ) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-9999.ebuild index e999a44f22..4ff41e17c6 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,23 +29,25 @@ RDEPEND=" ) systemd? ( >=sys-apps/systemd-209 ) xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" multilib_src_configure() { + #TODO: enable HTTP3 + #requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3 local mycmakeargs=( -DENABLE_EXAMPLES=OFF -DENABLE_FAILMALLOC=OFF + -DENABLE_HTTP3=OFF -DENABLE_WERROR=OFF -DENABLE_THREADS=ON -DENABLE_DEBUG=$(usex debug) -DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools) $(cmake_use_find_package hpack-tools Jansson) -DWITH_JEMALLOC=$(multilib_native_usex jemalloc) - -DENABLE_STATIC_LIB=$(usex static-libs) + -DBUILD_STATIC_LIBS=$(usex static-libs) + -DBUILD_TESTING=$(usex test) $(cmake_use_find_package systemd Systemd) - $(cmake_use_find_package test CUnit) -DENABLE_APP=$(multilib_native_usex utils) -DWITH_LIBXML2=$(multilib_native_usex xml) )