summaryrefslogtreecommitdiff
path: root/net-libs
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/Manifest.gzbin32777 -> 32776 bytes
-rw-r--r--net-libs/libssh2/Manifest3
-rw-r--r--net-libs/libssh2/files/libssh2-1.10.0-libressl.patch33
-rw-r--r--net-libs/libssh2/libssh2-1.10.0.ebuild6
-rw-r--r--net-libs/ngtcp2/Manifest2
-rw-r--r--net-libs/ngtcp2/ngtcp2-0.14.1.ebuild2
6 files changed, 42 insertions, 4 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 5d09651f1d32..6b088edeb134 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
Binary files differ
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index bf02a0eea0ec..062b43fd646f 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,5 +1,6 @@
+AUX libssh2-1.10.0-libressl.patch 1107 BLAKE2B 5ffb1ffb64da219203e71e335c5808036aaf414ffa1baa72567a33e8c60218a71996544bec3b0c56b448e2884df99c3017f9ac20b9ff6f44e0dc645c2bb1b8c8 SHA512 2e2e8db30b0c7c0d454f11f644630c5cef00ab46ca97104845943d6ab9806d99f952d1c194f9b28d5d0e565c86867d7d59bb9af0cde433017aeb0e8862124318
AUX libssh2-1.8.0-mansyntax_sh.patch 367 BLAKE2B 26d83db9af4f1c50cb29a1c560c87685a7d1148a4acb0faec90dd4fd9ae00fa4848eae5eab0d2977393a51c6c26930b8e367cc42e4d383d6c8b4d35f210b4137 SHA512 421ef6945e78004f3818c345cf072a50362a90deafd8aed57cdc21fbfda0848d528dd5233d8e5e844cb361532f6b5e4d2fbaa8b332c951a0cf8402b48ba150f2
DIST libssh2-1.10.0.tar.gz 965044 BLAKE2B 0e6f571cc723e0050bf7ba7492f361ef222547dcbc311019cb6762f01405b4906e0418207a7d484c5170bee5e6f666827a7ea0d0cf233f684f999f896ce0b415 SHA512 e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30
-EBUILD libssh2-1.10.0.ebuild 1302 BLAKE2B c25f35578ed9e9a2a8eeea886bfdef6f690d1705e41464beb35be47563a41cb3437abaaf14a520a5d0c358bbd2e391f1bdc9aaaf4c6e70f37826a9a980a8e15d SHA512 dd431760bc3e2b51c343f5a5bb1c0c9cc61d856c95ae8b5b8325269df4a6d0175023be714fcdaebd1ccd5ad7ae097e1637361b9410c2cb46065d3e8b7a487fd3
+EBUILD libssh2-1.10.0.ebuild 1358 BLAKE2B 24040093bd7454cd5e7412cd627957b29d1aa7e32a38ccbd82185e7114c63d60da6a0e083c35052c8b4475a8145ff7f3439374203548960615bf538d325b11fc SHA512 5b7e4af09893bc46ccc25167468b2e09dd44e2fcb187bb938fdc20a9f3293761b03a155d4ec55dd72803f17c34d698b61e1a02d927ccbc7d7c3db073650b31d6
EBUILD libssh2-9999.ebuild 1150 BLAKE2B 598389dc4f42bbd477f9eeddf17ced69ec81602520a313321836937f4ca3e56455867ee7ad860e2f04a3db52e0be19ea39078d4a6de59f6321033cda054de160 SHA512 ecd4f51a283abc70022b174b765975700f6c3233d0ddd606a068917343d9d2c2da45fba74a0809b34b34dea811af50af129e400bc77b646481f3f4f8e51295f8
MISC metadata.xml 625 BLAKE2B 5b2b547a4378190e5fd38b0e4047556da2eb827db4b311aab8fd9456f15a711948bad53951d5b6f1f00620292f938ae097ea43044ab9cc926db941245de22887 SHA512 2ec081036258736ae097981cc5a997c81b09d235ac7f79500128675c0d9df0d8d83d3f570d6dfccac3340d1018f0ad3511f7a8df7e67e8bf9b0a17d4c7332d10
diff --git a/net-libs/libssh2/files/libssh2-1.10.0-libressl.patch b/net-libs/libssh2/files/libssh2-1.10.0-libressl.patch
new file mode 100644
index 000000000000..9cecabd5d01e
--- /dev/null
+++ b/net-libs/libssh2/files/libssh2-1.10.0-libressl.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/903001
+https://github.com/libssh2/libssh2/pull/700
+https://github.com/libssh2/libssh2/commit/b952674f120748174ed2c0fb93e7bd78cf355cac
+
+From f0681a4573d7c7f7484d3157ddff7063a200295b Mon Sep 17 00:00:00 2001
+From: Viktor Szakats <commit@vsz.me>
+Date: Thu, 19 May 2022 13:25:06 +0000
+Subject: [PATCH] openssl: add support for LibreSSL 3.5.x
+
+LibreSSL 3.5.0 made more structures opaque, so let's enable existing
+support for that when building against these LibreSSL versions.
+
+Ref: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.5.0-relnotes.txt
+---
+ src/openssl.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/openssl.h b/src/openssl.h
+index 658b040..09bfd7c 100644
+--- a/src/openssl.h
++++ b/src/openssl.h
+@@ -57,8 +57,9 @@
+ #include <openssl/pem.h>
+ #include <openssl/rand.h>
+
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
+- !defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && \
++ !defined(LIBRESSL_VERSION_NUMBER)) || \
++ LIBRESSL_VERSION_NUMBER >= 0x3050000fL
+ # define HAVE_OPAQUE_STRUCTS 1
+ #endif
+
diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild b/net-libs/libssh2/libssh2-1.10.0.ebuild
index 0b459297cb05..00504d7654e5 100644
--- a/net-libs/libssh2/libssh2-1.10.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -30,6 +30,10 @@ DEPEND="
${RDEPEND}
"
+PATCHES=(
+ "${FILESDIR}"/${P}-libressl.patch #903001
+)
+
multilib_src_configure() {
local crypto_backend=OpenSSL
if use gcrypt; then
diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index d1a38bb2909b..8a7be033cb77 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -1,6 +1,6 @@
DIST ngtcp2-0.14.1.tar.xz 585788 BLAKE2B 68574767c701432e7558fa85cbad0d49934d220e292ceb82cdf19a715f247c6ec9b3a2b87def1176ade067a78c84bd3495936847a9a53fcadaff7b66971eca8d SHA512 52c55bc322d979d020ab3124a7cc0033d0f3e5649e3c8ee5f00aa64dbad83c4f199d50685704cc9372821e7fc81c59eea79f33894260b5dca171712d5b3899a0
DIST ngtcp2-0.15.0.tar.xz 589584 BLAKE2B af0d2e2263e9f23d07ad1c8637465ce78324f6f82614d14da55c50f64c35cbe972912de20a593c6f7483cf5db1ef4046618bb49639f0288a2fff8d82da06b4a6 SHA512 f57b0e8c88d2710fdee422c387b555d188197e54e97d99fae8b0beaa8eca2c6797e6a55efca34fb99ac65a86be1a224adfd17a0bcf314a27b5fcc24bb304f4bb
-EBUILD ngtcp2-0.14.1.ebuild 1204 BLAKE2B fd0b2a6e81d520ab8db695b0890e09f1af1bde5f983ca19a29f805e7b6ec3629d2cf5de336b02fb35227dda139ca5fa09c20f855eda573e9648e880bad08215f SHA512 cc407ada43fcc516e3d5fc77532c1fe29471ca9ebb9be94962887e4c51b120e16707070e449c253afbe2f5d4a1a16a1e1f8bcaa06ba922569b22524557158b13
+EBUILD ngtcp2-0.14.1.ebuild 1203 BLAKE2B 86097d800387aaa54520fc35b0ccd853c917efd6ba5146c9fd7412cf5cfb200220894c3b1913fbd83610b0e46a2b1e19bb79e94b8a83da283b3472272aea9712 SHA512 21813964a13f7bb518d9076411f711eb787ce6e838b070f17e260513c17812f6c0339bc063703a3a814886beafa9cb29dba03fcfe479d4f8ba01daf38a668e5b
EBUILD ngtcp2-0.15.0.ebuild 1205 BLAKE2B a444ae2277c73772ce81d0b0c1e3555a90f3092930a474f0a947bf00e208e461bc64e04a7a9e05c5226ed9c8cbc847dd6fb8793a62a434f40e1e67308a57187c SHA512 9374dd426c1d95a812550b296d6054b4617e5a58e3b8e0dc1c00edb5c8684419ee696ce6e8a94adafd5ad47113e9f8bbce4dd81e5d68a1bc8d5f690372dcbb50
EBUILD ngtcp2-9999.ebuild 1205 BLAKE2B a444ae2277c73772ce81d0b0c1e3555a90f3092930a474f0a947bf00e208e461bc64e04a7a9e05c5226ed9c8cbc847dd6fb8793a62a434f40e1e67308a57187c SHA512 9374dd426c1d95a812550b296d6054b4617e5a58e3b8e0dc1c00edb5c8684419ee696ce6e8a94adafd5ad47113e9f8bbce4dd81e5d68a1bc8d5f690372dcbb50
MISC metadata.xml 445 BLAKE2B d27a34331ff5bd772b6228ff26ca20440a3bf932ccc88720a33409f329d41165d5fad6750221bae1fed3386d6e8244458c1c5073df8b36251156598e599bb15e SHA512 c09f5ac61f3c3b16bda0f12c2f31188aaaba469fbfde31e71d4f9834609b4c8d0cb7152a688934ba0b90c491da4e8b707e6ad5e54d5965b4109cbdc29ee0a4a2
diff --git a/net-libs/ngtcp2/ngtcp2-0.14.1.ebuild b/net-libs/ngtcp2/ngtcp2-0.14.1.ebuild
index e347889c7720..15a312759fd6 100644
--- a/net-libs/ngtcp2/ngtcp2-0.14.1.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-0.14.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~hppa ~riscv ~x86"
+ KEYWORDS="amd64 ~hppa ~riscv x86"
fi
DESCRIPTION="Implementation of the IETF QUIC Protocol"