Skip to content

Commit 25d5839

Browse files
committed
openssh: update to githash 552a5c7
Do not build with ssl-engine support. LibreELEC openSSL build does not build with ssl-engine support. Option in deprecated in OpenSSL 3.x and droppend in OpenSSL 4.x Change log: - https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ChangeLog Release notes: - https://www.openssh.com/releasenotes.html#githash 552a5c7 Release notes: - https://www.openssh.com/txt/release-githash 552a5c7
1 parent 5097815 commit 25d5839

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

packages/network/openssh/package.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
44

55
PKG_NAME="openssh"
6-
PKG_VERSION="10.2p1"
7-
PKG_SHA256="ccc42c0419937959263fa1dbd16dafc18c56b984c03562d2937ce56a60f798b2"
6+
PKG_VERSION="552a5c786b60a9cfe0d2c157dd18f78950529513"
7+
PKG_SHA256="3fb8bccdb73db5d7b289fa99c8b777f0984568cc326c2bb92e0aa83f34230a49"
88
PKG_LICENSE="OSS"
99
PKG_SITE="https://www.openssh.com/"
1010
PKG_URL="https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/${PKG_NAME}-${PKG_VERSION}.tar.gz"
11+
PKG_URL="https://github.com/openssh/openssh-portable/archive/${PKG_VERSION}.tar.gz"
1112
PKG_DEPENDS_TARGET="toolchain openssl zlib"
1213
PKG_LONGDESC="An open re-implementation of the SSH package."
1314
PKG_TOOLCHAIN="autotools"
@@ -24,7 +25,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_rpc_types_h=no \
2425
--disable-wtmp \
2526
--disable-wtmpx \
2627
--without-rpath \
27-
--with-ssl-engine \
28+
--without-ssl-engine \
2829
--with-privsep-user=nobody \
2930
--disable-pututline \
3031
--disable-pututxline \

packages/network/openssh/patches/openssh-8.9p1-keydir.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ diff -u a/pathnames.h b/pathnames.h
9999
#define _PATH_SERVER_CONFIG_FILE SSHDIR "/sshd_config"
100100
#define _PATH_HOST_CONFIG_FILE SSHDIR "/ssh_config"
101101
-#define _PATH_HOST_ECDSA_KEY_FILE SSHDIR "/ssh_host_ecdsa_key"
102-
-#define _PATH_HOST_ED25519_KEY_FILE SSHDIR "/ssh_host_ed25519_key"
103102
-#define _PATH_HOST_RSA_KEY_FILE SSHDIR "/ssh_host_rsa_key"
103+
-#define _PATH_HOST_ED25519_KEY_FILE SSHDIR "/ssh_host_ed25519_key"
104104
-#define _PATH_DH_MODULI SSHDIR "/moduli"
105105
+#define _PATH_HOST_ECDSA_KEY_FILE KEYDIR "/ssh_host_ecdsa_key"
106-
+#define _PATH_HOST_ED25519_KEY_FILE KEYDIR "/ssh_host_ed25519_key"
107106
+#define _PATH_HOST_RSA_KEY_FILE KEYDIR "/ssh_host_rsa_key"
107+
+#define _PATH_HOST_ED25519_KEY_FILE KEYDIR "/ssh_host_ed25519_key"
108108
+#define _PATH_DH_MODULI KEYDIR "/moduli"
109109

110110
#ifndef _PATH_SSH_PROGRAM

0 commit comments

Comments
 (0)