From: sweeaun <[email protected]> Fix compilation error during openssh x32 build due to syntax error.
Signed-off-by: sweeaun <[email protected]> --- .../0001-openssh-Fix-syntax-error-on-x32.patch | 33 ++++++++++++++++++++++ meta/recipes-connectivity/openssh/openssh_7.5p1.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-openssh-Fix-syntax-error-on-x32.patch 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 0000000..ce9e200 --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh/0001-openssh-Fix-syntax-error-on-x32.patch @@ -0,0 +1,33 @@ +From a7e359d4ba345aa2a13c07f1057184e9b4e598a2 Mon Sep 17 00:00:00 2001 +From: sweeaun <[email protected]> +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 <[email protected]> +--- + 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 + diff --git a/meta/recipes-connectivity/openssh/openssh_7.5p1.bb b/meta/recipes-connectivity/openssh/openssh_7.5p1.bb index 3b8fd7d..e46b4c8 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 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" -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
