mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 22:27:17 -08:00
net-misc/ntp: Remove libressl patch
This also fixes the build for libressl-3.5 Signed-off-by: orbea <orbea@riseup.net> Closes: https://github.com/gentoo/gentoo/pull/24623 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -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)
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user