summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2020-02-15 15:30:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-15 22:42:14 +0000
commit83771beb99462366e5eada75e2687ae6a1bd0890 (patch)
treec2e1f67257b97ece196121dcb91dcaeef6b0d4e0 /meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch
parent67aadc83dc78c824da49f7199b66899806b6cce9 (diff)
downloadpoky-83771beb99462366e5eada75e2687ae6a1bd0890.tar.gz
openssh: Upgrade 8.1p1 -> 8.2p1
Drop backports from upstream: 0001-Manually-applied-upstream-fix-for-openssh-test.patch 0001-seccomp-Allow-clock_gettime64-in-sandbox.patch openssh-8.1p1-seccomp-nanosleep.patch (From OE-Core rev: c9b5802bbe1de609450f509edf4721ab0a7a70aa) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch')
-rw-r--r--meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch b/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch
deleted file mode 100644
index 7c9d61c26d..0000000000
--- a/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1commit 7e929163ed40f9ce90060a3ca6df558c3d901379
2Author: Jakub Jelen <jjelen@redhat.com>
3Date: Wed Nov 13 12:57:05 2019 +0100
4
5seccomp: Allow clock_nanosleep() to make OpenSSH working with latest glibc
6sandbox-seccomp: Allow clock_nanosleep on ARM
7
8Upstream-Status: Backport [https://github.com/tcely/openssh-portable/pull/258]
9 [https://github.com/bobby0809/openssh-portable/pull/138]
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com
12
13--- a/sandbox-seccomp-filter.c
14+++ b/sandbox-seccomp-filter.c
15@@ -242,6 +242,12 @@ static const struct sock_filter preauth_
16 #ifdef __NR_nanosleep
17 SC_ALLOW(__NR_nanosleep),
18 #endif
19+#ifdef __NR_clock_nanosleep
20+ SC_ALLOW(__NR_clock_nanosleep),
21+#endif
22+#ifdef __NR_clock_nanosleep_time64
23+ SC_ALLOW(__NR_clock_nanosleep_time64),
24+#endif
25 #ifdef __NR__newselect
26 SC_ALLOW(__NR__newselect),
27 #endif