There are 36 commits since 7.8p1, and 4 of them about openssl 1.1.x fix
git log --oneline V_7_8_P1..master | grep openssl
cce8cbe Fix openssl-1.1 fallout for --without-openssl.
a3fd807 upstream: missed a bit of openssl-1.0.x API in this unittest
86e0a9f upstream: use only openssl-1.1.x API here too
482d23b upstream: hold our collective noses and use the openssl-1.1.x API in
That's the reason to upgrade rather than backport
//Hongxu
On 2018年09月19日 11:22, Hongxu Jia wrote:
- Convert from tarball to git repository which support
openssl 1.1.x
- There is no specific minor version that contains the
openssl fix (it was merged to master a few days agao),
but their next minor version will be p2.
Signed-off-by: Hongxu Jia <[email protected]>
---
.../openssh/{openssh_7.8p1.bb => openssh_7.8p2.bb} | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-connectivity/openssh/{openssh_7.8p1.bb =>
openssh_7.8p2.bb} (94%)
diff --git a/meta/recipes-connectivity/openssh/openssh_7.8p1.bb
b/meta/recipes-connectivity/openssh/openssh_7.8p2.bb
similarity index 94%
rename from meta/recipes-connectivity/openssh/openssh_7.8p1.bb
rename to meta/recipes-connectivity/openssh/openssh_7.8p2.bb
index f4b295f..b74461e 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.8p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.8p2.bb
@@ -8,11 +8,10 @@ SECTION = "console/network"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENCE;md5=429658c6612f3a9b1293782366ab29d8"
-# openssl 1.1 patches are proposed at https://github.com/openssh/openssh-portable/pull/48
-DEPENDS = "zlib openssl10"
+DEPENDS = "zlib openssl"
DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
+SRC_URI = "git://github.com/openssh/openssh-portable;branch=master \
file://sshd_config \
file://ssh_config \
file://init \
@@ -29,8 +28,9 @@ SRC_URI =
"http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
PAM_SRC_URI = "file://sshd"
-SRC_URI[md5sum] = "ce1d090fa6239fd38eb989d5e983b074"
-SRC_URI[sha256sum] =
"1a484bb15152c183bb2514e112aa30dd34138c3cfb032eee5490a66c507144ca"
+SRCREV = "cce8cbe0ed7d1ba3a575310e0b63c193326ae616"
+
+S = "${WORKDIR}/git"
inherit useradd update-rc.d update-alternatives systemd
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
