diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2017-05-07 09:18:20 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2017-05-07 09:18:20 +0200 |
| commit | 5a5419a9ce62e34b4def43afecb274bcb61ad627 (patch) | |
| tree | 5db5e389e09b48748c6ffaa4c689b67662d61dde /net-misc/ntp/files | |
| parent | sys-libs/libfaketime: Rev bump to add multilib support and GCC-6 compatibility (diff) | |
| download | gentoo-5a5419a9ce62e34b4def43afecb274bcb61ad627.tar.gz gentoo-5a5419a9ce62e34b4def43afecb274bcb61ad627.tar.bz2 gentoo-5a5419a9ce62e34b4def43afecb274bcb61ad627.zip | |
net-misc/ntp: Rev bump to fix regression caused by libressl patch
LibreSSL support was silently added via commit ce3be83baf which caused
a regression for building ntp without SSL (see Gentoo-Bug 600668).
Acked-by: Lars Wendler <polynomial-c@gentoo.org>
Gentoo-Bug: https://bugs.gentoo.org/600668
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'net-misc/ntp/files')
| -rw-r--r-- | net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch | 39 |
1 files changed, 39 insertions, 0 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 new file mode 100644 index 000000000000..1b532c6d8931 --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch @@ -0,0 +1,39 @@ +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) |