| 1 |
commit: a5d46eb9f6f5d33ab892827f4321626574629528 |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Sat Dec 8 01:49:25 2018 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 8 01:49:25 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d46eb9 |
| 7 |
|
| 8 |
net-misc/ntp: add patch to 4.2.8_p12 for libressl-2.8 compat |
| 9 |
|
| 10 |
Copyright: Sony Interactive Entertainment Inc. |
| 11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 13 |
|
| 14 |
net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch | 16 ++++++++++++++++ |
| 15 |
net-misc/ntp/ntp-4.2.8_p12.ebuild | 3 ++- |
| 16 |
2 files changed, 18 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..7ec2ee678b0 |
| 21 |
--- /dev/null |
| 22 |
+++ b/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch |
| 23 |
@@ -0,0 +1,16 @@ |
| 24 |
+--- ntp-4.2.8p12.orig/include/libssl_compat.h 2018-12-08 01:14:58.434733497 +0000 |
| 25 |
++++ ntp-4.2.8p12/include/libssl_compat.h 2018-12-08 01:42:04.479474757 +0000 |
| 26 |
+@@ -107,10 +107,13 @@ |
| 27 |
+ |
| 28 |
+ #define OpenSSL_version_num SSLeay |
| 29 |
+ #define OpenSSL_version SSLeay_version |
| 30 |
++ |
| 31 |
++# if LIBRESSL_VERSION_NUMBER < 0x20800000L |
| 32 |
+ #define X509_get0_notBefore X509_get_notBefore |
| 33 |
+ #define X509_getm_notBefore X509_get_notBefore |
| 34 |
+ #define X509_get0_notAfter X509_get_notAfter |
| 35 |
+ #define X509_getm_notAfter X509_get_notAfter |
| 36 |
++#endif /* LIBRESSL_VERSION_NUMBER < 0x20800000L */ |
| 37 |
+ |
| 38 |
+ /* ----------------------------------------------------------------- */ |
| 39 |
+ #endif /* OPENSSL_VERSION_NUMBER < v1.1.0 */ |
| 40 |
|
| 41 |
diff --git a/net-misc/ntp/ntp-4.2.8_p12.ebuild b/net-misc/ntp/ntp-4.2.8_p12.ebuild |
| 42 |
index 179de05fc60..39fa971f10b 100644 |
| 43 |
--- a/net-misc/ntp/ntp-4.2.8_p12.ebuild |
| 44 |
+++ b/net-misc/ntp/ntp-4.2.8_p12.ebuild |
| 45 |
@@ -1,4 +1,4 @@ |
| 46 |
-# Copyright 1999-2018 Gentoo Foundation |
| 47 |
+# Copyright 1999-2018 Gentoo Authors |
| 48 |
# Distributed under the terms of the GNU General Public License v2 |
| 49 |
|
| 50 |
EAPI=6 |
| 51 |
@@ -42,6 +42,7 @@ PATCHES=( |
| 52 |
"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966 |
| 53 |
"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922 |
| 54 |
"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch |
| 55 |
+ "${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch |
| 56 |
) |
| 57 |
|
| 58 |
pkg_setup() { |
Archives