From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 11/24] openssh: applied upstream fix for "cert not yet valid" test
Date: Mon, 20 Jan 2020 18:24:57 +0100 [thread overview]
Message-ID: <20200120172510.22648-11-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20200120172510.22648-1-alex.kanavin@gmail.com>
From: "Mingde (Matthew) Zeng" <matthew.zeng@windriver.com>
applied upstream fix for openssh's "cert not yet valid" test
Upstream Status: Backport:
https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381
Signed-off-by: Mingde (Matthew) Zeng<matthew.zeng@windriver.com>
---
...pplied-upstream-fix-for-openssh-test.patch | 60 +++++++++++++++++++
.../openssh/openssh_8.1p1.bb | 1 +
2 files changed, 61 insertions(+)
create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch
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
new file mode 100644
index 00000000000..7171ec0834e
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch
@@ -0,0 +1,60 @@
+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_8.1p1.bb b/meta/recipes-connectivity/openssh/openssh_8.1p1.bb
index f8be7ba178d..8e7896cf4a3 100644
--- a/meta/recipes-connectivity/openssh/openssh_8.1p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_8.1p1.bb
@@ -26,6 +26,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
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"
--
2.17.1
next prev parent reply other threads:[~2020-01-20 17:25 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-20 17:24 [PATCH 01/24] python3: update to 3.8.1 Alexander Kanavin
2020-01-20 17:24 ` [PATCH 02/24] python3: do not compile .pyc in parallel during do_install() Alexander Kanavin
2020-01-20 17:24 ` [PATCH 03/24] python3: correctly process ptest output with sed Alexander Kanavin
2020-01-20 17:24 ` [PATCH 04/24] gstreamer1.0-python: add a patch to fix python 3.8 builds Alexander Kanavin
2020-01-20 17:24 ` [PATCH 05/24] nss: update to 3.49.1 Alexander Kanavin
2020-01-21 12:04 ` Andreas Müller
2020-01-21 12:47 ` Richard Purdie
2020-01-21 19:35 ` Khem Raj
2020-01-21 20:22 ` Richard Purdie
2020-01-21 22:02 ` Khem Raj
2020-01-22 8:13 ` Khem Raj
2020-01-20 17:24 ` [PATCH 06/24] libcap: update to 2.31 Alexander Kanavin
2020-01-20 17:24 ` [PATCH 07/24] selftest: check maintainers.inc for entries without recipes Alexander Kanavin
2020-01-20 17:24 ` [PATCH 08/24] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
2020-01-20 17:24 ` [PATCH 09/24] ptests: exclude mdadm from ptesting Alexander Kanavin
2020-01-20 17:24 ` [PATCH 10/24] ptests: exclude lttng-tools Alexander Kanavin
2020-01-20 17:37 ` Jonathan Rajotte-Julien
2020-01-20 17:44 ` Alexander Kanavin
2020-01-24 12:47 ` Alexander Kanavin
2020-01-24 15:35 ` Jonathan Rajotte-Julien
2020-01-20 22:46 ` Richard Purdie
2020-01-20 17:24 ` Alexander Kanavin [this message]
2020-01-20 17:24 ` [PATCH 12/24] openssh: explicitly skip unit tests Alexander Kanavin
2020-01-20 17:24 ` [PATCH 13/24] parted: fix more ptests Alexander Kanavin
2020-01-20 17:25 ` [PATCH 14/24] qemu.inc: add vfat to MACHINE_FEATURES Alexander Kanavin
2020-01-20 17:25 ` [PATCH 15/24] rt-tests: exclude another development version (1.6) Alexander Kanavin
2020-01-20 17:25 ` [PATCH 16/24] btrfs-tools: upgrade 5.4 -> 5.4.1 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 17/24] libpipeline: upgrade 1.5.1 -> 1.5.2 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 18/24] msmtp: upgrade 1.8.6 -> 1.8.7 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 19/24] ffmpeg: upgrade 4.2.1 -> 4.2.2 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 20/24] epiphany: upgrade 3.34.2 -> 3.34.3.1 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 21/24] libwebp: upgrade 1.0.3 -> 1.1.0 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 22/24] createrepo-c: upgrade 0.15.4 -> 0.15.5 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 23/24] libsecret: upgrade 0.19.1 -> 0.20.0 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 24/24] meson: update 0.52.1 -> 0.53.0 Alexander Kanavin
2020-01-21 8:24 ` Richard Purdie
2020-01-21 18:44 ` Khem Raj
2020-01-23 15:48 ` Alexander Kanavin
2020-01-23 15:52 ` Khem Raj
2020-01-20 17:32 ` ✗ patchtest: failure for "python3: update to 3.8.1..." and 23 more Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200120172510.22648-11-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox