summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/openssh/openssh/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch35
-rwxr-xr-xmeta/recipes-connectivity/openssh/openssh/run-ptest2
-rw-r--r--meta/recipes-connectivity/openssh/openssh_8.9p1.bb (renamed from meta/recipes-connectivity/openssh/openssh_8.8p1.bb)16
3 files changed, 45 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch b/meta/recipes-connectivity/openssh/openssh/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch
new file mode 100644
index 0000000000..847c0a143c
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch
@@ -0,0 +1,35 @@
1From f107467179428a0e3ea9e4aa9738ac12ff02822d Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Thu, 24 Feb 2022 16:04:18 +0000
4Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support
5
6GCC doesn't tell us whether this option is supported unless it runs into
7the situation where it would need to emit corresponding code.
8
9Upstream-Status: Backport
10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11---
12 m4/openssh.m4 | 3 +++
13 1 file changed, 3 insertions(+)
14
15diff --git a/m4/openssh.m4 b/m4/openssh.m4
16index 4f9c3792dc1..8c33c701b8b 100644
17--- a/m4/openssh.m4
18+++ b/m4/openssh.m4
19@@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{
20 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
21 #include <stdlib.h>
22 #include <stdio.h>
23+/* Trivial function to help test for -fzero-call-used-regs */
24+void f(int n) {}
25 int main(int argc, char **argv) {
26 (void)argv;
27 /* Some math to catch -ftrapv problems in the toolchain */
28@@ -21,6 +23,7 @@ int main(int argc, char **argv) {
29 float l = i * 2.1;
30 double m = l / 0.5;
31 long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
32+ f(0);
33 printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
34 /*
35 * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does
diff --git a/meta/recipes-connectivity/openssh/openssh/run-ptest b/meta/recipes-connectivity/openssh/openssh/run-ptest
index ae03e929b2..8a9b770d59 100755
--- a/meta/recipes-connectivity/openssh/openssh/run-ptest
+++ b/meta/recipes-connectivity/openssh/openssh/run-ptest
@@ -5,7 +5,7 @@ export SKIP_UNIT=1
5 5
6cd regress 6cd regress
7sed -i "/\t\tagent-ptrace /d" Makefile 7sed -i "/\t\tagent-ptrace /d" Makefile
8make -k .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \ 8make -k BUILDDIR=`pwd`/.. .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \
9 | sed -u -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g' 9 | sed -u -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g'
10 10
11SSHAGENT=`which ssh-agent` 11SSHAGENT=`which ssh-agent`
diff --git a/meta/recipes-connectivity/openssh/openssh_8.8p1.bb b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb
index 953c29dbf2..6c5c1912e8 100644
--- a/meta/recipes-connectivity/openssh/openssh_8.8p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb
@@ -5,8 +5,8 @@ Ssh (Secure Shell) is a program for logging into a remote machine \
5and for executing commands on a remote machine." 5and for executing commands on a remote machine."
6HOMEPAGE = "http://www.openssh.com/" 6HOMEPAGE = "http://www.openssh.com/"
7SECTION = "console/network" 7SECTION = "console/network"
8LICENSE = "BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & ISC & MIT" 8LICENSE = "BSD-2-Clause & BSD-3-Clause & ISC & MIT"
9LIC_FILES_CHKSUM = "file://LICENCE;md5=d9d2753bdef9f19466dc7bc959114b11" 9LIC_FILES_CHKSUM = "file://LICENCE;md5=8baf365614c9bdd63705f298c9afbfb9"
10 10
11DEPENDS = "zlib openssl virtual/crypt" 11DEPENDS = "zlib openssl virtual/crypt"
12DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 12DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -24,8 +24,9 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
24 file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \ 24 file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \
25 file://sshd_check_keys \ 25 file://sshd_check_keys \
26 file://add-test-support-for-busybox.patch \ 26 file://add-test-support-for-busybox.patch \
27 file://f107467179428a0e3ea9e4aa9738ac12ff02822d.patch \
27 " 28 "
28SRC_URI[sha256sum] = "4590890ea9bb9ace4f71ae331785a3a5823232435161960ed5fc86588f331fe9" 29SRC_URI[sha256sum] = "fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7"
29 30
30# This CVE is specific to OpenSSH with the pam opie which we don't build/use here 31# This CVE is specific to OpenSSH with the pam opie which we don't build/use here
31CVE_CHECK_IGNORE += "CVE-2007-2768" 32CVE_CHECK_IGNORE += "CVE-2007-2768"
@@ -76,6 +77,9 @@ EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
76# musl doesn't implement wtmp/utmp and logwtmp 77# musl doesn't implement wtmp/utmp and logwtmp
77EXTRA_OECONF:append:libc-musl = " --disable-wtmp --disable-lastlog" 78EXTRA_OECONF:append:libc-musl = " --disable-wtmp --disable-lastlog"
78 79
80# https://bugzilla.mindrot.org/show_bug.cgi?id=3398
81EXTRA_OECONF:append:powerpc = " --with-sandbox=no"
82
79# Since we do not depend on libbsd, we do not want configure to use it 83# Since we do not depend on libbsd, we do not want configure to use it
80# just because it finds libutil.h. But, specifying --disable-libutil 84# just because it finds libutil.h. But, specifying --disable-libutil
81# causes compile errors, so... 85# causes compile errors, so...
@@ -94,10 +98,7 @@ do_configure:prepend () {
94} 98}
95 99
96do_compile_ptest() { 100do_compile_ptest() {
97 # skip regress/unittests/ binaries: this will silently skip 101 oe_runmake regress-binaries regress-unit-binaries
98 # unittests in run-ptests which is good because they are so slow.
99 oe_runmake regress/modpipe regress/setuid-allowed regress/netcat \
100 regress/check-perm regress/mkdtemp
101} 102}
102 103
103do_install:append () { 104do_install:append () {
@@ -145,6 +146,7 @@ do_install:append () {
145do_install_ptest () { 146do_install_ptest () {
146 sed -i -e "s|^SFTPSERVER=.*|SFTPSERVER=${libexecdir}/sftp-server|" regress/test-exec.sh 147 sed -i -e "s|^SFTPSERVER=.*|SFTPSERVER=${libexecdir}/sftp-server|" regress/test-exec.sh
147 cp -r regress ${D}${PTEST_PATH} 148 cp -r regress ${D}${PTEST_PATH}
149 cp config.h ${D}${PTEST_PATH}
148} 150}
149 151
150ALLOW_EMPTY:${PN} = "1" 152ALLOW_EMPTY:${PN} = "1"