haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

openssh: Add another GCC2 patch.

Browse Source
This commit is contained in:
Augustin Cavalier
2020-04-11 14:00:50 -04:00
parent 6187dcea94
commit 1868a2cfb9
2 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net-misc/openssh/openssh-8.2p1.recipe
View File

@@ -16,14 +16,15 @@ ssh-keyscan, ssh-keygen and sftp-server."
HOMEPAGE="http://www.openssh.com/"
COPYRIGHT="2005-2020 Tatu Ylonen et al."
LICENSE="OpenSSH"
REVISION="2"
SOURCE_URI="http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz"
REVISION="3"
SOURCE_URI="https://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz"
CHECKSUM_SHA256="43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671"
PATCHES="sshd_config.patch
pathnames.patch
bzero.patch
ssh-copy-id.patch
sha2-gcc2-build-fix.patch"
sha2-gcc2-build-fix.patch
pkcs11-gcc2-build-fix.patch"
ADDITIONAL_FILES="
sshd_keymaker.sh
fix_openssh_config_paths.sh

32
net-misc/openssh/patches/pkcs11-gcc2-build-fix.patch Normal file
View File

@@ -0,0 +1,32 @@
From f41470d95341ab803010de2687fe5aa166378f41 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Sat, 11 Apr 2020 13:58:14 -0400
Subject: [PATCH] GCC2 build fix.
---
ssh-pkcs11-client.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ssh-pkcs11-client.c b/ssh-pkcs11-client.c
index 8a0ffef..cd75bf2 100644
--- a/ssh-pkcs11-client.c
+++ b/ssh-pkcs11-client.c
@@ -248,6 +248,7 @@ pkcs11_start_helper_methods(void)
return (0);
#ifdef HAVE_EC_KEY_METHOD_NEW
+ {
int (*orig_sign)(int, const unsigned char *, int, unsigned char *,
unsigned int *, const BIGNUM *, const BIGNUM *, EC_KEY *) = NULL;
if (helper_ecdsa != NULL)
@@ -257,6 +258,7 @@ pkcs11_start_helper_methods(void)
return (-1);
EC_KEY_METHOD_get_sign(helper_ecdsa, &orig_sign, NULL, NULL);
EC_KEY_METHOD_set_sign(helper_ecdsa, orig_sign, NULL, ecdsa_do_sign);
+ }
#endif /* HAVE_EC_KEY_METHOD_NEW */
if ((helper_rsa = RSA_meth_dup(RSA_get_default_method())) == NULL)
--
2.24.1