summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/openssh/openssh_7.8p1+git.bb (renamed from meta/recipes-connectivity/openssh/openssh_7.8p1.bb)13
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_7.8p1.bb b/meta/recipes-connectivity/openssh/openssh_7.8p1+git.bb
index f4b295f2df..f54dfb5de4 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.8p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.8p1+git.bb
@@ -8,11 +8,10 @@ SECTION = "console/network"
8LICENSE = "BSD" 8LICENSE = "BSD"
9LIC_FILES_CHKSUM = "file://LICENCE;md5=429658c6612f3a9b1293782366ab29d8" 9LIC_FILES_CHKSUM = "file://LICENCE;md5=429658c6612f3a9b1293782366ab29d8"
10 10
11# openssl 1.1 patches are proposed at https://github.com/openssh/openssh-portable/pull/48 11DEPENDS = "zlib openssl"
12DEPENDS = "zlib openssl10"
13DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 12DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
14 13
15SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ 14SRC_URI = "git://github.com/openssh/openssh-portable;branch=master \
16 file://sshd_config \ 15 file://sshd_config \
17 file://ssh_config \ 16 file://ssh_config \
18 file://init \ 17 file://init \
@@ -29,8 +28,9 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
29 28
30PAM_SRC_URI = "file://sshd" 29PAM_SRC_URI = "file://sshd"
31 30
32SRC_URI[md5sum] = "ce1d090fa6239fd38eb989d5e983b074" 31SRCREV = "cce8cbe0ed7d1ba3a575310e0b63c193326ae616"
33SRC_URI[sha256sum] = "1a484bb15152c183bb2514e112aa30dd34138c3cfb032eee5490a66c507144ca" 32
33S = "${WORKDIR}/git"
34 34
35inherit useradd update-rc.d update-alternatives systemd 35inherit useradd update-rc.d update-alternatives systemd
36 36
@@ -80,7 +80,8 @@ do_configure_prepend () {
80do_compile_ptest() { 80do_compile_ptest() {
81 # skip regress/unittests/ binaries: this will silently skip 81 # skip regress/unittests/ binaries: this will silently skip
82 # unittests in run-ptests which is good because they are so slow. 82 # unittests in run-ptests which is good because they are so slow.
83 oe_runmake regress/modpipe regress/setuid-allowed regress/netcat 83 oe_runmake regress/modpipe regress/setuid-allowed regress/netcat \
84 regress/check-perm regress/mkdtemp
84} 85}
85 86
86do_install_append () { 87do_install_append () {