diff options
| author |   Patrick McLean <patrick.mclean@sony.com> | 2018-10-22 10:31:15 -0700 |
|---|---|---|
| committer |   Patrick McLean <chutzpah@gentoo.org> | 2018-10-22 10:31:30 -0700 |
| commit | 7e539010154b1efd978198ddd8902cfc0a5be957 (patch) | |
| tree | 4469a712d3d547979b0fc008bbb43f6f4a8292a4 /net-misc/openssh/files | |
| parent | sci-mathematics/wxmaxima: bump to 18.10.2 (diff) | |
| download | gentoo-7e539010154b1efd978198ddd8902cfc0a5be957.tar.gz gentoo-7e539010154b1efd978198ddd8902cfc0a5be957.tar.bz2 gentoo-7e539010154b1efd978198ddd8902cfc0a5be957.zip | |
net-misc/openssh: Fix openssl-1.0.2 patch to fix libressl as well
This also adds a patch to fix a bunch of QA warnings with USE=-ssl
Closes: https://bugs.gentoo.org/669052
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'net-misc/openssh/files')
| -rw-r--r-- | net-misc/openssh/files/openssh-7.9_p1-include-stdlib.patch | 48 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-7.9_p1-openssl-1.0.2-compat.patch | 4 |
2 files changed, 50 insertions, 2 deletions
diff --git a/net-misc/openssh/files/openssh-7.9_p1-include-stdlib.patch b/net-misc/openssh/files/openssh-7.9_p1-include-stdlib.patch new file mode 100644 index 000000000000..c5697c2b8bd1 --- /dev/null +++ b/net-misc/openssh/files/openssh-7.9_p1-include-stdlib.patch @@ -0,0 +1,48 @@ +diff --git a/auth-options.c b/auth-options.c +index b05d6d6f..d1f42f04 100644 +--- a/auth-options.c ++++ b/auth-options.c +@@ -26,6 +26,7 @@ + #include <stdarg.h> + #include <ctype.h> + #include <limits.h> ++#include <stdlib.h> + + #include "openbsd-compat/sys-queue.h" + +diff --git a/hmac.c b/hmac.c +index 1c879640..a29f32c5 100644 +--- a/hmac.c ++++ b/hmac.c +@@ -19,6 +19,7 @@ + + #include <sys/types.h> + #include <string.h> ++#include <stdlib.h> + + #include "sshbuf.h" + #include "digest.h" +diff --git a/krl.c b/krl.c +index 8e2d5d5d..c32e147a 100644 +--- a/krl.c ++++ b/krl.c +@@ -28,6 +28,7 @@ + #include <string.h> + #include <time.h> + #include <unistd.h> ++#include <stdlib.h> + + #include "sshbuf.h" + #include "ssherr.h" +diff --git a/mac.c b/mac.c +index 51dc11d7..3d11eba6 100644 +--- a/mac.c ++++ b/mac.c +@@ -29,6 +29,7 @@ + + #include <string.h> + #include <stdio.h> ++#include <stdlib.h> + + #include "digest.h" + #include "hmac.h" diff --git a/net-misc/openssh/files/openssh-7.9_p1-openssl-1.0.2-compat.patch b/net-misc/openssh/files/openssh-7.9_p1-openssl-1.0.2-compat.patch index 9fc6d0a9dcec..c1c310e8f14a 100644 --- a/net-misc/openssh/files/openssh-7.9_p1-openssl-1.0.2-compat.patch +++ b/net-misc/openssh/files/openssh-7.9_p1-openssl-1.0.2-compat.patch @@ -5,9 +5,9 @@ index 8b4a3627..590b66d1 100644 @@ -76,7 +76,7 @@ ssh_OpenSSL_add_all_algorithms(void) ENGINE_load_builtin_engines(); ENGINE_register_all_complete(); - + -#if OPENSSL_VERSION_NUMBER < 0x10001000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) OPENSSL_config(NULL); #else OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | |