diff options
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh_9.6p1.bb')
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_9.6p1.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb index d941664b41..3c507cf911 100644 --- a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb | |||
@@ -22,11 +22,13 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar | |||
22 | file://sshdgenkeys.service \ | 22 | file://sshdgenkeys.service \ |
23 | file://volatiles.99_sshd \ | 23 | file://volatiles.99_sshd \ |
24 | file://run-ptest \ | 24 | file://run-ptest \ |
25 | file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \ | ||
26 | file://sshd_check_keys \ | 25 | file://sshd_check_keys \ |
27 | file://add-test-support-for-busybox.patch \ | 26 | file://add-test-support-for-busybox.patch \ |
28 | file://0001-regress-banner.sh-log-input-and-output-files-on-erro.patch \ | 27 | file://0001-regress-banner.sh-log-input-and-output-files-on-erro.patch \ |
29 | file://0001-systemd-Add-optional-support-for-systemd-sd_notify.patch \ | 28 | file://0001-notify-systemd-on-listen-and-reload.patch \ |
29 | file://CVE-2024-6387.patch \ | ||
30 | file://CVE-2024-39894.patch \ | ||
31 | file://0001-Fix-missing-header-for-systemd-notification.patch \ | ||
30 | " | 32 | " |
31 | SRC_URI[sha256sum] = "910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c" | 33 | SRC_URI[sha256sum] = "910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c" |
32 | 34 | ||
@@ -53,7 +55,6 @@ SYSTEMD_PACKAGES = "${PN}-sshd" | |||
53 | SYSTEMD_SERVICE:${PN}-sshd = "${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','sshd.socket', '', d)} ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','sshd.service', '', d)}" | 55 | SYSTEMD_SERVICE:${PN}-sshd = "${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','sshd.socket', '', d)} ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','sshd.service', '', d)}" |
54 | 56 | ||
55 | inherit autotools-brokensep ptest pkgconfig | 57 | inherit autotools-brokensep ptest pkgconfig |
56 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | ||
57 | 58 | ||
58 | # systemd-sshd-socket-mode means installing sshd.socket | 59 | # systemd-sshd-socket-mode means installing sshd.socket |
59 | # and systemd-sshd-service-mode corresponding to sshd.service | 60 | # and systemd-sshd-service-mode corresponding to sshd.service |
@@ -76,7 +77,6 @@ EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ | |||
76 | --sysconfdir=${sysconfdir}/ssh \ | 77 | --sysconfdir=${sysconfdir}/ssh \ |
77 | --with-xauth=${bindir}/xauth \ | 78 | --with-xauth=${bindir}/xauth \ |
78 | --disable-strip \ | 79 | --disable-strip \ |
79 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)} \ | ||
80 | " | 80 | " |
81 | 81 | ||
82 | # musl doesn't implement wtmp/utmp and logwtmp | 82 | # musl doesn't implement wtmp/utmp and logwtmp |