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

openssh: bump version.

Browse Source
This commit is contained in:
Jerome Duval
2020-02-15 19:01:25 +01:00
parent 98ce167537
commit 8a0cfdfa8e
2 changed files with 64 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
net-misc/openssh/openssh-8.1p1.recipe → net-misc/openssh/openssh-8.2p1.recipe
View File

@@ -14,16 +14,16 @@ scp, and ftp with sftp. Also included is sshd (the server side of the \
package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, \
ssh-keyscan, ssh-keygen and sftp-server."
HOMEPAGE="http://www.openssh.com/"
COPYRIGHT="2005-2019 Tatu Ylonen et al."
COPYRIGHT="2005-2020 Tatu Ylonen et al."
LICENSE="OpenSSH"
REVISION="3"
REVISION="1"
SOURCE_URI="http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz"
CHECKSUM_SHA256="02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff"
CHECKSUM_SHA256="43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671"
PATCHES="sshd_config.patch
pathnames.patch
bzero.patch
define_bsd_source.patch
ssh-copy-id.patch"
ssh-copy-id.patch
sha2-gcc2-build-fix.patch"
ADDITIONAL_FILES="
sshd_keymaker.sh
fix_openssh_config_paths.sh
@@ -156,7 +156,7 @@ INSTALL()
-e "s|$libExecDir/openssh/|$LIB_DIR/openssh/|" \
$sysconfDir/ssh/sshd_config
mkdir -p $dataDir/openssh
mkdir -p $dataDir/openssh/empty
cp $sysconfDir/ssh/ssh_config $dataDir/openssh/ssh_config.default
cp $sysconfDir/ssh/sshd_config $dataDir/openssh/sshd_config.default
}

58
net-misc/openssh/patches/sha2-gcc2-build-fix.patch Normal file
View File

@@ -0,0 +1,58 @@
From 92ed1dcaa05f0f425b809a7e1972cad5689c6634 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 15 Feb 2020 20:53:00 +0100
Subject: [PATCH] gcc2 build fix
---
openbsd-compat/sha2.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/openbsd-compat/sha2.c b/openbsd-compat/sha2.c
index e36cc24..235d279 100644
--- a/openbsd-compat/sha2.c
+++ b/openbsd-compat/sha2.c
@@ -616,11 +616,13 @@ SHA256Final(u_int8_t digest[SHA256_DIGEST_LENGTH], SHA2_CTX *context)
SHA256Pad(context);
#if BYTE_ORDER == LITTLE_ENDIAN
+{
int i;
/* Convert TO host byte order */
for (i = 0; i < 8; i++)
BE_32_TO_8(digest + i * 4, context->state.st32[i]);
+}
#else
memcpy(digest, context->state.st32, SHA256_DIGEST_LENGTH);
#endif
@@ -897,11 +899,13 @@ SHA512Final(u_int8_t digest[SHA512_DIGEST_LENGTH], SHA2_CTX *context)
SHA512Pad(context);
#if BYTE_ORDER == LITTLE_ENDIAN
+{
int i;
/* Convert TO host byte order */
for (i = 0; i < 8; i++)
BE_64_TO_8(digest + i * 8, context->state.st64[i]);
+}
#else
memcpy(digest, context->state.st64, SHA512_DIGEST_LENGTH);
#endif
@@ -954,11 +958,13 @@ SHA384Final(u_int8_t digest[SHA384_DIGEST_LENGTH], SHA2_CTX *context)
SHA384Pad(context);
#if BYTE_ORDER == LITTLE_ENDIAN
+{
int i;
/* Convert TO host byte order */
for (i = 0; i < 6; i++)
BE_64_TO_8(digest + i * 8, context->state.st64[i]);
+}
#else
memcpy(digest, context->state.st64, SHA384_DIGEST_LENGTH);
#endif
--
2.24.0