diff options
| author |   orbea <orbea@riseup.net> | 2022-03-17 08:35:03 -0700 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-03-17 21:31:18 +0000 |
| commit | e6d014bfdc8b8b5e4a35e66b25762f7e4e0a1f06 (patch) | |
| tree | acfde6bd9c796da21bafaaaaf5683e11fded6f75 /net-misc/ntp | |
| parent | dev-libs/libltdl: add 'bump with sys-devel/libtool' note (diff) | |
| download | gentoo-e6d014bfdc8b8b5e4a35e66b25762f7e4e0a1f06.tar.gz gentoo-e6d014bfdc8b8b5e4a35e66b25762f7e4e0a1f06.tar.bz2 gentoo-e6d014bfdc8b8b5e4a35e66b25762f7e4e0a1f06.zip | |
net-misc/ntp: Remove libressl patch
This also fixes the build for libressl-3.5
Signed-off-by: orbea <orbea@riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/24623
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_p10-fix-build-wo-ssl-or-libressl.patch | 39 | ||||
| -rw-r--r-- | net-misc/ntp/ntp-4.2.8_p15.ebuild | 1 |
2 files changed, 0 insertions, 40 deletions
diff --git a/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch b/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch deleted file mode 100644 index 1b532c6d8931..000000000000 --- a/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix building with libressl or without SSL. - -Origin: http://bugs.ntp.org/attachment.cgi?id=1481 - -LibreSSL fix from Joe Kappus (https://bugs.gentoo.org/show_bug.cgi?id=600668#c2) - ---- a/include/libssl_compat.h -+++ b/include/libssl_compat.h -@@ -37,7 +37,7 @@ - #endif - - /* ----------------------------------------------------------------- */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - /* ----------------------------------------------------------------- */ - - # include <openssl/objects.h> ---- a/libntp/libssl_compat.c -+++ b/libntp/libssl_compat.c -@@ -26,7 +26,7 @@ - /* ----------------------------------------------------------------- */ - - /* ----------------------------------------------------------------- */ --#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - /* ----------------------------------------------------------------- */ - - #include "libssl_compat.h" ---- a/libntp/ssl_init.c -+++ b/libntp/ssl_init.c -@@ -21,7 +21,7 @@ - - int ssl_init_done; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - static void - atexit_ssl_cleanup(void) diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild index 7e9d8bc04c23..470ab81b0ace 100644 --- a/net-misc/ntp/ntp-4.2.8_p15.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild @@ -44,7 +44,6 @@ 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 "${FILESDIR}"/${PN}-4.2.8_p15-glibc-2.34.patch |