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

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

commit:     4694004c280b13ecc163de94aa67bd92a83af7b4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  3 18:31:07 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  3 18:45:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4694004c

net-misc/ntp: drop obsolete LibreSSL patch, restore no-SSL patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch | 16 ----------------
 net-misc/ntp/ntp-4.2.8_p15.ebuild                   |  1 +
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch b/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch
deleted file mode 100644
index 182fcefe88b..00000000000
--- a/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ntp-4.2.8p12.orig/include/libssl_compat.h	2018-12-08 01:14:58.434733497 +0000
-+++ ntp-4.2.8p12/include/libssl_compat.h	2018-12-08 01:42:04.479474757 +0000
-@@ -107,10 +107,13 @@
- 
- #define OpenSSL_version_num	SSLeay
- #define OpenSSL_version		SSLeay_version
-+
-+# if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x20800000L
- #define X509_get0_notBefore	X509_get_notBefore
- #define X509_getm_notBefore	X509_get_notBefore
- #define X509_get0_notAfter	X509_get_notAfter
- #define X509_getm_notAfter	X509_get_notAfter
-+#endif /* !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x20800000L */
- 
- /* ----------------------------------------------------------------- */
- #endif /* OPENSSL_VERSION_NUMBER < v1.1.0 */

diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild
index 32042db3bd5..0809ce703a5 100644
--- a/net-misc/ntp/ntp-4.2.8_p15.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild
@@ -44,6 +44,7 @@ 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
 )