summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <patrick.mclean@sony.com>2018-12-07 17:49:25 -0800
committerPatrick McLean <chutzpah@gentoo.org>2018-12-07 17:49:25 -0800
commita5d46eb9f6f5d33ab892827f4321626574629528 (patch)
tree7898a5610c434131bc81861ae9c17c7e6b18927d /net-misc/ntp
parentnet-misc/openssh: Fix X509+libressl-2.8 and remove /run in 7.9_p1 (diff)
downloadgentoo-a5d46eb9f6f5d33ab892827f4321626574629528.tar.gz
gentoo-a5d46eb9f6f5d33ab892827f4321626574629528.tar.bz2
gentoo-a5d46eb9f6f5d33ab892827f4321626574629528.zip
net-misc/ntp: add patch to 4.2.8_p12 for libressl-2.8 compat
Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'net-misc/ntp')
-rw-r--r--net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch16
-rw-r--r--net-misc/ntp/ntp-4.2.8_p12.ebuild3
2 files changed, 18 insertions, 1 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
new file mode 100644
index 000000000000..7ec2ee678b0e
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch
@@ -0,0 +1,16 @@
+--- 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 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 /* LIBRESSL_VERSION_NUMBER < 0x20800000L */
+
+ /* ----------------------------------------------------------------- */
+ #endif /* OPENSSL_VERSION_NUMBER < v1.1.0 */
diff --git a/net-misc/ntp/ntp-4.2.8_p12.ebuild b/net-misc/ntp/ntp-4.2.8_p12.ebuild
index 179de05fc600..39fa971f10b0 100644
--- a/net-misc/ntp/ntp-4.2.8_p12.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -42,6 +42,7 @@ 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_p12-libressl-2.8.patch
)
pkg_setup() {