diff options
| author |   Patrick McLean <chutzpah@gentoo.org> | 2017-03-30 17:12:55 -0700 |
|---|---|---|
| committer | Patrick McLean <chutzpah@gentoo.org> | 2017-03-30 17:12:55 -0700 |
| commit | ce3be83bafb6e93161bf5808ffe097d53655f6b0 (patch) | |
| tree | 91e56688238b1489a787d7ec15f0391f82499b7f /net-misc/ntp | |
| parent | dev-libs/wlc: add missing virtual/libudev depend (diff) | |
| download | gentoo-ce3be83bafb6e93161bf5808ffe097d53655f6b0.tar.gz gentoo-ce3be83bafb6e93161bf5808ffe097d53655f6b0.tar.bz2 gentoo-ce3be83bafb6e93161bf5808ffe097d53655f6b0.zip | |
net-misc/ntp: Add patch to build 4.2.8_p10 with libressl
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'net-misc/ntp')
| -rw-r--r-- | net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch | 35 | ||||
| -rw-r--r-- | net-misc/ntp/ntp-4.2.8_p10.ebuild | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch b/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch new file mode 100644 index 000000000000..98ca61af4595 --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch @@ -0,0 +1,35 @@ +diff -ur a/include/libssl_compat.h ntp-4.2.8p10/include/libssl_compat.h +--- ntp-4.2.8p10.orig/include/libssl_compat.h 2017-03-21 06:04:20.000000000 -0700 ++++ ntp-4.2.8p10/include/libssl_compat.h 2017-03-30 16:34:03.892173084 -0700 +@@ -37,7 +37,7 @@ + #endif + + /* ----------------------------------------------------------------- */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER) + /* ----------------------------------------------------------------- */ + + # include <openssl/objects.h> +diff -ur ntp-4.2.8p10.orig/libntp/a_md5encrypt.c ntp-4.2.8p10/libntp/a_md5encrypt.c +--- ntp-4.2.8p10.orig/libntp/a_md5encrypt.c 2017-02-01 01:47:13.000000000 -0800 ++++ ntp-4.2.8p10/libntp/a_md5encrypt.c 2017-03-30 16:55:49.830229507 -0700 +@@ -11,6 +11,7 @@ + #include "ntp.h" + #include "ntp_md5.h" /* provides OpenSSL digest API */ + #include "isc/string.h" ++#include "libssl_compat.h" + /* + * MD5authencrypt - generate message digest + * +diff -ur ntp-4.2.8p10.orig/libntp/libssl_compat.c ntp-4.2.8p10/libntp/libssl_compat.c +--- ntp-4.2.8p10.orig/libntp/libssl_compat.c 2017-02-01 01:47:13.000000000 -0800 ++++ ntp-4.2.8p10/libntp/libssl_compat.c 2017-03-30 16:52:17.287543795 -0700 +@@ -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" diff --git a/net-misc/ntp/ntp-4.2.8_p10.ebuild b/net-misc/ntp/ntp-4.2.8_p10.ebuild index 31948a88e5bf..9b7c99d2262f 100644 --- a/net-misc/ntp/ntp-4.2.8_p10.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p10.ebuild @@ -40,6 +40,7 @@ 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-ntpq-fpic.patch + "${FILESDIR}"/${PN}-4.2.8_p10-libressl.patch ) pkg_setup() { |