mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-19 15:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

openssh: Fix syntax error on x32

Browse Source 
Fix compilation error during openssh x32 build due to syntax error.

(From OE-Core rev: 74d41b4870bec88015c079444daad0a68f69abe9)

Signed-off-by: sweeaun <swee.aun.khor@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
sweeaun
2017-08-28 15:14:07 -07:00
committed by Richard Purdie
parent bc2e0b2e9b
commit 94fe1dd8b6
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
meta/recipes-connectivity/openssh/openssh/0001-openssh-Fix-syntax-error-on-x32.patch Normal file
View File

@@ -0,0 +1,33 @@
From a7e359d4ba345aa2a13c07f1057184e9b4e598a2 Mon Sep 17 00:00:00 2001
From: sweeaun <swee.aun.khor@intel.com>
Date: Tue, 22 Aug 2017 11:19:48 -0700
Subject: [PATCH] openssh: Fix syntax error on x32
Upstream-Status: Backport
This bug has been fixed in v_7.5 branch https://github.com/openssh/
openssh-portable/tree/V_7_5 and master branch https://github.com/
openssh/openssh-portable/tree/master.
Fix compilation error during openssh x32 build due to syntax error.
Signed-off-by: sweeaun <swee.aun.khor@intel.com>
---
sandbox-seccomp-filter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
index 3a1aedc..a8d472a 100644
--- a/sandbox-seccomp-filter.c
+++ b/sandbox-seccomp-filter.c
@@ -235,7 +235,7 @@ static const struct sock_filter preauth_insns[] = {
* x86-64 syscall under some circumstances, e.g.
* https://bugs.debian.org/849923
*/
- SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT);
+ SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT),
#endif
/* Default deny */
--
2.7.4

1
meta/recipes-connectivity/openssh/openssh_7.5p1.bb
View File

@@ -26,6 +26,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
file://openssh-7.1p1-conditional-compile-des-in-cipher.patch \
file://openssh-7.1p1-conditional-compile-des-in-pkcs11.patch \
file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \
file://0001-openssh-Fix-syntax-error-on-x32.patch \
"
PAM_SRC_URI = "file://sshd"