4 files changed, 113 insertions, 2 deletions
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index f05ebea89145..f3975ab89b74 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,3 +1,5 @@
+AUX neon-0.32.4-dash.patch 1623 BLAKE2B 2fd32e83980e666bfd00eb77e6862c31e32fd09c7de96b67c1026949a8c71a3fcb8eda4e1d208bf066640c650aed0ba3c8370a261feb188e044e22d5a04cae52 SHA512 0abb34501dbed1d78a0b520528ad8aafd51be7413d99a5fbd41e7cd5fd97156b1d5de67f607f5943237d4a924247c0d45749bb05846fcdfc3f0ab5d38e97c326
+AUX neon-0.32.4-libressl.patch 2504 BLAKE2B 9da49e993145110b798711b5059857d21a4f24ee3fa0cad290bd6773446716c3bbb29c4eca59c1c944ec461998ec230ea7f0689fdaf20d97967952e598e4d45f SHA512 e17d1d7ac3faa2faf25f541d20c6c21659d43d98db908076a246b6d39cabe520efac76f40df0f6a4162c6f36599a91318000d739b162a741cdbd846b97ab7875
 DIST neon-0.32.4.tar.gz 895482 BLAKE2B 917f17739976e159bf91f7c594e59c96bb8b92e39c19f5c881354c11951233d3157f6871e4ebc073d493170844e516acc36be4787dbe2005c33b1ec84ae0d364 SHA512 82bcd1555f047d26cc5ccd67d2fef8dea4eb5a4cc45ca8030d2f3c356eee03fd78efd7ef45f516948e89f1089686731046b3fe48e73b3d84c65848ef6d86bd7a
-EBUILD neon-0.32.4.ebuild 2507 BLAKE2B 539e57647df773b04c9d05c6aa5cbdfa58fda61d0a86dc8f40acd1ecbe01762a59cd11be85edec49aeff67a2f53ebd98d10c6c290165a2e4ffccb39cb4938457 SHA512 22a24a6bb72415585f75016264b6b1328c5323db2bf7fa8ef001cb350086db0de51790880381f9801461eecf92554fbd0edf566cd990b113f774b4a9b772b45c
+EBUILD neon-0.32.4.ebuild 2618 BLAKE2B 5aad9b1a1c6b7ad603845bc41d71bb0d74bd190f7f3ea2e0ed5beb219ce0b8b2515b81f49c007231d435f5cf6d986cf05ee4959c1059648d4b9637bf5520598c SHA512 dd3517ad85b061836ce2ffd22e673c43136f3fcd57a29ee0f40cba06157ebf4cc80efa716f6316f5e44259ac7e4760cf0743a0624febe9958164d775b59bf3a3
 MISC metadata.xml 1219 BLAKE2B 2d80de452aeeeae8734661146b0b648625b8a9b7e894d245f9369fa29e37beba2dc2296d5bb61d66c555cffb24efcb1b37bf0d43c7f84db5395e105380045570 SHA512 21b29abf1945d60aa9ab20916508c6800cb67823f8706bc4198279f727854c0a8956c3f223af30c5149a9f23c9ebedaabe26afe35712fda490f268fe954ec1dc
diff --git a/net-libs/neon/files/neon-0.32.4-dash.patch b/net-libs/neon/files/neon-0.32.4-dash.patch
new file mode 100644
index 000000000000..cba1660ec62c
--- /dev/null
+++ b/net-libs/neon/files/neon-0.32.4-dash.patch
@@ -0,0 +1,43 @@
+https://bugs.gentoo.org/832851
+https://github.com/notroj/neon/pull/115
+https://github.com/notroj/neon/commit/e02ead4d990e49c912ef053c46b55713685119ee
+
+From e1bcf0e83012e0c1ff81c573d2650e1a4e40d955 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 6 May 2023 20:50:50 -0700
+Subject: [PATCH 1/2] test/makekeys.sh: fix POSIX compliance
+
+Not all shells provide 'echo -e' and using printf is more portable.
+
+One shell that will fail is dash(1).
+
+ssl................... 10/63 FAIL - dname_readable (certificate subject dname was `-e H\0350llo World, Neon Hackers Ltd, Cambridge, Cambridgeshire, GB' not `Hèllo World, Neon Hackers Ltd, Cambridge, Cambridgeshire, GB'
+
+Gentoo-Issue: https://bugs.gentoo.org/832851
+---
+ test/makekeys.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/makekeys.sh b/test/makekeys.sh
+index 88dc7b3..8ee90ae 100755
+--- a/test/makekeys.sh
++++ b/test/makekeys.sh
+@@ -123,15 +123,15 @@ csr_fields "Self-Signed" | \
+ ${MKCERT} -key server.key -out ssigned.pem
+ 
+ # default => T61String
+-csr_fields "`echo -e 'H\0350llo World'`" localhost |
++csr_fields "$(printf 'H%bllo World\n' '\0350')" localhost |
+ ${REQ} -new -key server.key -out t61subj.csr
+ 
+ STRMASK=pkix # => BMPString
+-csr_fields "`echo -e 'H\0350llo World'`" localhost |
++csr_fields "$(printf 'H%bllo World\n' '\0350')" localhost |
+ ${REQ} -new -key server.key -out bmpsubj.csr
+ 
+ STRMASK=utf8only # => UTF8String
+-csr_fields "`echo -e 'H\0350llo World'`" localhost |
++csr_fields "$(printf 'H%bllo World\n' '\0350')" localhost |
+ ${REQ} -new -key server.key -out utf8subj.csr
+ 
+ STRMASK=default
diff --git a/net-libs/neon/files/neon-0.32.4-libressl.patch b/net-libs/neon/files/neon-0.32.4-libressl.patch
new file mode 100644
index 000000000000..7c69ad6abfd8
--- /dev/null
+++ b/net-libs/neon/files/neon-0.32.4-libressl.patch
@@ -0,0 +1,61 @@
+https://bugs.gentoo.org/903001
+https://github.com/notroj/neon/pull/113
+https://github.com/notroj/neon/commit/18e868e4449cd46d494944ced798f9dcd01f65c5
+https://github.com/notroj/neon/pull/116
+https://github.com/notroj/neon/commit/231a1d3f3f427b823753dc2e53adcf9cafda619b
+https://github.com/notroj/neon/pull/118
+https://github.com/notroj/neon/commit/6f98a9c9bdd76fb3d367e3b01bcc45bea574c3d1
+
+From 233f17b86ebc2cd99d9deede484f4b0be586730f Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 27 Mar 2023 14:58:49 -0700
+Subject: [PATCH] ne_openssl: Fix the build with libressl
+
+* Libressl 3.7 currently doesn't provide EVP_sha512_256().
+* Libressl 3.4 added SSL_CTX_set_post_handshake_auth().
+---
+ src/ne_openssl.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+From 392e1380e1fa07675934ed25e8980ae18d0bccb4 Mon Sep 17 00:00:00 2001
+From: Joe Orton <jorton@redhat.com>
+Date: Tue, 9 May 2023 16:26:55 +0100
+Subject: [PATCH] * src/ne_openssl.c: Fix GCC warning with OpenSSL build.
+
+---
+ src/ne_openssl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+From 1e9483dbb43e82dde06bc84434c8b7124602adbc Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 29 May 2023 10:07:52 -0700
+Subject: [PATCH] ne_openssl: Update for LibreSSL 3.8.0
+
+EVP_sha512_256() was added in LibreSSL 3.8.0.
+---
+ src/ne_openssl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ne_openssl.c b/src/ne_openssl.c
+index d13c25a..bdb73e9 100644
+--- a/src/ne_openssl.c
++++ b/src/ne_openssl.c
+@@ -581,7 +581,7 @@ ne_ssl_context *ne_ssl_context_create(int mode)
+         /* enable workarounds for buggy SSL server implementations */
+         SSL_CTX_set_options(ctx->ctx, SSL_OP_ALL);
+         SSL_CTX_set_verify(ctx->ctx, SSL_VERIFY_PEER, verify_callback);
+-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x3040000fL || (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10101000L)
+         SSL_CTX_set_post_handshake_auth(ctx->ctx, 1);
+ #endif
+     } else if (mode == NE_SSL_CTX_SERVER) {
+@@ -1122,7 +1122,9 @@ static const EVP_MD *hash_to_md(unsigned int flags)
+     case NE_HASH_SHA256: return EVP_sha256();
+ #ifdef HAVE_OPENSSL11
+     case NE_HASH_SHA512: return EVP_sha512();
++#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x3080000fL
+     case NE_HASH_SHA512_256: return EVP_sha512_256();
++#endif
+ #endif
+     default: break;
+     }
diff --git a/net-libs/neon/neon-0.32.4.ebuild b/net-libs/neon/neon-0.32.4.ebuild
index c350863ad7d9..0f217f0a4475 100644
--- a/net-libs/neon/neon-0.32.4.ebuild
+++ b/net-libs/neon/neon-0.32.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2001-2022 Gentoo Authors
+# Copyright 2001-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -44,6 +44,11 @@ MULTILIB_CHOST_TOOLS=(
 
 DOCS=( AUTHORS BUGS NEWS README.md THANKS TODO )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.32.4-dash.patch #832851
+	"${FILESDIR}"/${PN}-0.32.4-libressl.patch #903001
+)
+
 src_prepare() {
 	if use gnutls; then
 		# Ignore failure of test pkcs11.