diff options
| author |   Sam James <sam@gentoo.org> | 2021-05-03 19:31:07 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-05-03 19:45:35 +0100 |
| commit | 4694004c280b13ecc163de94aa67bd92a83af7b4 (patch) | |
| tree | 6070e3528fc65c557040a4d6c5ce338af16e1735 /net-misc/ntp | |
| parent | dev-python/m2crypto: drop obsolete LibreSSL patch (diff) | |
| download | gentoo-4694004c280b13ecc163de94aa67bd92a83af7b4.tar.gz gentoo-4694004c280b13ecc163de94aa67bd92a83af7b4.tar.bz2 gentoo-4694004c280b13ecc163de94aa67bd92a83af7b4.zip | |
net-misc/ntp: drop obsolete LibreSSL patch, restore no-SSL patch
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-misc/ntp')
| -rw-r--r-- | net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch | 16 | ||||
| -rw-r--r-- | net-misc/ntp/ntp-4.2.8_p15.ebuild | 1 |
2 files changed, 1 insertions, 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 182fcefe88b4..000000000000 --- 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 32042db3bd55..0809ce703a5f 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 ) |