diff options
author | 2020-02-15 15:30:06 +0000 | |
---|---|---|
committer | 2020-02-15 22:41:45 +0000 | |
commit | c9b5802bbe1de609450f509edf4721ab0a7a70aa (patch) | |
tree | 7aa12397864fb34368e17dcc3e45a6317cc8d910 | |
parent | eb36ff94af8f8425a09ae4db150146d4e9e75b6b (diff) | |
download | openembedded-core-c9b5802bbe1de609450f509edf4721ab0a7a70aa.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
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch | 60 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch | 31 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch | 27 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_8.2p1.bb (renamed from meta/recipes-connectivity/openssh/openssh_8.1p1.bb) | 7 |
4 files changed, 2 insertions, 123 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch b/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch deleted file mode 100644 index 7171ec0834..0000000000 --- a/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0a68d6cfe255f8bcdd5f9db0d008a8f0a60b237a Mon Sep 17 00:00:00 2001 -From: "Mingde (Matthew) Zeng" <matthew.zeng@windriver.com> -Date: Wed, 15 Jan 2020 15:51:42 -0500 -Subject: [PATCH] Manually applied upstream fix for openssh test - -Upstream Status: Backport: - https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381 - -Signed-off-by: Mingde (Matthew) Zeng<matthew.zeng@windriver.com> ---- - regress/cert-hostkey.sh | 4 ++-- - regress/cert-userkey.sh | 5 ++--- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh -index 86ea6250..60e3ec02 100644 ---- a/regress/cert-hostkey.sh -+++ b/regress/cert-hostkey.sh -@@ -1,4 +1,4 @@ --# $OpenBSD: cert-hostkey.sh,v 1.18 2019/07/25 08:28:15 dtucker Exp $ -+# $OpenBSD: cert-hostkey.sh,v 1.23 2020/01/03 03:02:26 djm Exp $ - # Placed in the Public Domain. - - tid="certified host keys" -@@ -252,7 +252,7 @@ test_one() { - test_one "user-certificate" failure "-n $HOSTS" - test_one "empty principals" success "-h" - test_one "wrong principals" failure "-h -n foo" --test_one "cert not yet valid" failure "-h -V20200101:20300101" -+test_one "cert not yet valid" failure "-h -V20300101:20320101" - test_one "cert expired" failure "-h -V19800101:19900101" - test_one "cert valid interval" success "-h -V-1w:+2w" - test_one "cert has constraints" failure "-h -Oforce-command=false" -diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh -index 38c14a69..f0e30945 100644 ---- a/regress/cert-userkey.sh -+++ b/regress/cert-userkey.sh -@@ -1,4 +1,4 @@ --# $OpenBSD: cert-userkey.sh,v 1.21 2019/07/25 08:28:15 dtucker Exp $ -+# $OpenBSD: cert-userkey.sh,v 1.25 2020/01/03 03:02:26 djm Exp $ - # Placed in the Public Domain. - - tid="certified user keys" -@@ -338,7 +338,7 @@ test_one() { - test_one "correct principal" success "-n ${USER}" - test_one "host-certificate" failure "-n ${USER} -h" - test_one "wrong principals" failure "-n foo" --test_one "cert not yet valid" failure "-n ${USER} -V20200101:20300101" -+test_one "cert not yet valid" failure "-n ${USER} -V20300101:20320101" - test_one "cert expired" failure "-n ${USER} -V19800101:19900101" - test_one "cert valid interval" success "-n ${USER} -V-1w:+2w" - test_one "wrong source-address" failure "-n ${USER} -Osource-address=10.0.0.0/8" -@@ -399,4 +399,3 @@ done - - rm -f $OBJ/authorized_keys_$USER $OBJ/user_ca_key* $OBJ/cert_user_key* - rm -f $OBJ/authorized_principals_$USER -- --- -2.24.1 - diff --git a/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch b/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch deleted file mode 100644 index 78c493de86..0000000000 --- a/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch +++ /dev/null @@ -1,31 +0,0 @@ -From eae3e85322fa7c869f5822db4eda6348f2beb09e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 7 Jan 2020 16:26:45 -0800 -Subject: [PATCH] seccomp: Allow clock_gettime64() in sandbox. - -This helps sshd accept connections on mips platforms with -upcoming glibc ( 2.31 ) - -Upstream-Status: Accepted [https://github.com/openssh/openssh-portable/pull/161] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - sandbox-seccomp-filter.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c -index 3ef30c9..999c46c 100644 ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -248,6 +248,9 @@ static const struct sock_filter preauth_insns[] = { - #ifdef __NR_clock_nanosleep_time64 - SC_ALLOW(__NR_clock_nanosleep_time64), - #endif -+#ifdef __NR_clock_gettime64 -+ SC_ALLOW(__NR_clock_gettime64), -+#endif - #ifdef __NR__newselect - SC_ALLOW(__NR__newselect), - #endif --- -2.24.1 - 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 @@ -commit 7e929163ed40f9ce90060a3ca6df558c3d901379 -Author: Jakub Jelen <jjelen@redhat.com> -Date: Wed Nov 13 12:57:05 2019 +0100 - -seccomp: Allow clock_nanosleep() to make OpenSSH working with latest glibc -sandbox-seccomp: Allow clock_nanosleep on ARM - -Upstream-Status: Backport [https://github.com/tcely/openssh-portable/pull/258] - [https://github.com/bobby0809/openssh-portable/pull/138] - -Signed-off-by: Khem Raj <raj.khem@gmail.com - ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -242,6 +242,12 @@ static const struct sock_filter preauth_ - #ifdef __NR_nanosleep - SC_ALLOW(__NR_nanosleep), - #endif -+#ifdef __NR_clock_nanosleep -+ SC_ALLOW(__NR_clock_nanosleep), -+#endif -+#ifdef __NR_clock_nanosleep_time64 -+ SC_ALLOW(__NR_clock_nanosleep_time64), -+#endif - #ifdef __NR__newselect - SC_ALLOW(__NR__newselect), - #endif diff --git a/meta/recipes-connectivity/openssh/openssh_8.1p1.bb b/meta/recipes-connectivity/openssh/openssh_8.2p1.bb index 8e7896cf4a..d879efc201 100644 --- a/meta/recipes-connectivity/openssh/openssh_8.1p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_8.2p1.bb @@ -24,12 +24,9 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \ file://sshd_check_keys \ file://add-test-support-for-busybox.patch \ - file://openssh-8.1p1-seccomp-nanosleep.patch \ - file://0001-seccomp-Allow-clock_gettime64-in-sandbox.patch \ - file://0001-Manually-applied-upstream-fix-for-openssh-test.patch \ " -SRC_URI[md5sum] = "513694343631a99841e815306806edf0" -SRC_URI[sha256sum] = "02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff" +SRC_URI[md5sum] = "3076e6413e8dbe56d33848c1054ac091" +SRC_URI[sha256sum] = "43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671" PAM_SRC_URI = "file://sshd" |