| 1 |
commit: 4694004c280b13ecc163de94aa67bd92a83af7b4 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 3 18:31:07 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 3 18:45:35 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4694004c |
| 7 |
|
| 8 |
net-misc/ntp: drop obsolete LibreSSL patch, restore no-SSL patch |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch | 16 ---------------- |
| 13 |
net-misc/ntp/ntp-4.2.8_p15.ebuild | 1 + |
| 14 |
2 files changed, 1 insertion(+), 16 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
deleted file mode 100644 |
| 18 |
index 182fcefe88b..00000000000 |
| 19 |
--- a/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,16 +0,0 @@ |
| 22 |
---- ntp-4.2.8p12.orig/include/libssl_compat.h 2018-12-08 01:14:58.434733497 +0000 |
| 23 |
-+++ ntp-4.2.8p12/include/libssl_compat.h 2018-12-08 01:42:04.479474757 +0000 |
| 24 |
-@@ -107,10 +107,13 @@ |
| 25 |
- |
| 26 |
- #define OpenSSL_version_num SSLeay |
| 27 |
- #define OpenSSL_version SSLeay_version |
| 28 |
-+ |
| 29 |
-+# if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x20800000L |
| 30 |
- #define X509_get0_notBefore X509_get_notBefore |
| 31 |
- #define X509_getm_notBefore X509_get_notBefore |
| 32 |
- #define X509_get0_notAfter X509_get_notAfter |
| 33 |
- #define X509_getm_notAfter X509_get_notAfter |
| 34 |
-+#endif /* !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x20800000L */ |
| 35 |
- |
| 36 |
- /* ----------------------------------------------------------------- */ |
| 37 |
- #endif /* OPENSSL_VERSION_NUMBER < v1.1.0 */ |
| 38 |
|
| 39 |
diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild |
| 40 |
index 32042db3bd5..0809ce703a5 100644 |
| 41 |
--- a/net-misc/ntp/ntp-4.2.8_p15.ebuild |
| 42 |
+++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild |
| 43 |
@@ -44,6 +44,7 @@ S="${WORKDIR}/${MY_P}" |
| 44 |
PATCHES=( |
| 45 |
"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966 |
| 46 |
"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922 |
| 47 |
+ "${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch |
| 48 |
"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530 |
| 49 |
"${FILESDIR}"/${PN}-4.2.8_p15-gcc10.patch #759409 |
| 50 |
) |
Archives