[gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/files/, net-misc/ntp/

["Sam James" <sam@gentoo.org>]

commit:     e6d014bfdc8b8b5e4a35e66b25762f7e4e0a1f06
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Mar 17 15:35:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 21:31:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6d014bf

net-misc/ntp: Remove libressl patch

This also fixes the build for libressl-3.5

Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/24623
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...tp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch | 39 ----------------------
 net-misc/ntp/ntp-4.2.8_p15.ebuild                  |  1 -
 2 files changed, 40 deletions(-)

diff --git a/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch b/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
deleted file mode 100644
index 1b532c6d8931..000000000000
--- a/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Fix building with libressl or without SSL.
-
-Origin: http://bugs.ntp.org/attachment.cgi?id=1481
-
-LibreSSL fix from Joe Kappus (https://bugs.gentoo.org/show_bug.cgi?id=600668#c2)
-
---- a/include/libssl_compat.h
-+++ b/include/libssl_compat.h
-@@ -37,7 +37,7 @@
- #endif
- 
- /* ----------------------------------------------------------------- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- /* ----------------------------------------------------------------- */
- 
- # include <openssl/objects.h>
---- a/libntp/libssl_compat.c
-+++ b/libntp/libssl_compat.c
-@@ -26,7 +26,7 @@
- /* ----------------------------------------------------------------- */
- 
- /* ----------------------------------------------------------------- */
--#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
- /* ----------------------------------------------------------------- */
- 
- #include "libssl_compat.h"
---- a/libntp/ssl_init.c
-+++ b/libntp/ssl_init.c
-@@ -21,7 +21,7 @@
- 
- int ssl_init_done;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- static void
- atexit_ssl_cleanup(void)

diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild
index 7e9d8bc04c23..470ab81b0ace 100644
--- a/net-misc/ntp/ntp-4.2.8_p15.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild
@@ -44,7 +44,6 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
 	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
-	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
 	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
 	"${FILESDIR}"/${PN}-4.2.8_p15-gcc10.patch #759409
 	"${FILESDIR}"/${PN}-4.2.8_p15-glibc-2.34.patch