summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsweeaun <swee.aun.khor@intel.com>2017-08-28 15:14:07 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-30 11:14:25 +0100
commit94fe1dd8b65f1948d3c4d520e7bef9586cb784cf (patch)
treece9e001874d643ca6f34b478690bf3d9d135381d
parentbc2e0b2e9b95707d96c840dade12b00e1450ecc3 (diff)
downloadpoky-94fe1dd8b65f1948d3c4d520e7bef9586cb784cf.tar.gz
openssh: Fix syntax error on x32
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>
-rw-r--r--meta/recipes-connectivity/openssh/openssh/0001-openssh-Fix-syntax-error-on-x32.patch33
-rw-r--r--meta/recipes-connectivity/openssh/openssh_7.5p1.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/0001-openssh-Fix-syntax-error-on-x32.patch b/meta/recipes-connectivity/openssh/openssh/0001-openssh-Fix-syntax-error-on-x32.patch
new file mode 100644
index 0000000000..ce9e200d78
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/0001-openssh-Fix-syntax-error-on-x32.patch
@@ -0,0 +1,33 @@
1From a7e359d4ba345aa2a13c07f1057184e9b4e598a2 Mon Sep 17 00:00:00 2001
2From: sweeaun <swee.aun.khor@intel.com>
3Date: Tue, 22 Aug 2017 11:19:48 -0700
4Subject: [PATCH] openssh: Fix syntax error on x32
5
6Upstream-Status: Backport
7This bug has been fixed in v_7.5 branch https://github.com/openssh/
8openssh-portable/tree/V_7_5 and master branch https://github.com/
9openssh/openssh-portable/tree/master.
10
11Fix compilation error during openssh x32 build due to syntax error.
12
13Signed-off-by: sweeaun <swee.aun.khor@intel.com>
14---
15 sandbox-seccomp-filter.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
19index 3a1aedc..a8d472a 100644
20--- a/sandbox-seccomp-filter.c
21+++ b/sandbox-seccomp-filter.c
22@@ -235,7 +235,7 @@ static const struct sock_filter preauth_insns[] = {
23 * x86-64 syscall under some circumstances, e.g.
24 * https://bugs.debian.org/849923
25 */
26- SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT);
27+ SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT),
28 #endif
29
30 /* Default deny */
31--
322.7.4
33
diff --git a/meta/recipes-connectivity/openssh/openssh_7.5p1.bb b/meta/recipes-connectivity/openssh/openssh_7.5p1.bb
index 3b8fd7d1cc..e46b4c86ad 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.5p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.5p1.bb
@@ -26,6 +26,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
26 file://openssh-7.1p1-conditional-compile-des-in-cipher.patch \ 26 file://openssh-7.1p1-conditional-compile-des-in-cipher.patch \
27 file://openssh-7.1p1-conditional-compile-des-in-pkcs11.patch \ 27 file://openssh-7.1p1-conditional-compile-des-in-pkcs11.patch \
28 file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \ 28 file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \
29 file://0001-openssh-Fix-syntax-error-on-x32.patch \
29 " 30 "
30 31
31PAM_SRC_URI = "file://sshd" 32PAM_SRC_URI = "file://sshd"