diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2021-03-23 09:42:38 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-23 22:51:25 +0000 |
commit | 644954038dfd83019a529025a3d7c7cff4fb92f5 (patch) | |
tree | 2ad32466d7857ac62461a18804e2145ad8938cbe /meta/recipes-connectivity/openssh/openssh_8.4p1.bb | |
parent | a1f8ee382f2738eecd3fb705fede920a36650344 (diff) | |
download | poky-644954038dfd83019a529025a3d7c7cff4fb92f5.tar.gz |
openssh: upgrade 8.4p1 -> 8.5p1
0f90440ca70abab947acbd77795e9f130967956c.patch
removed since it is included in 8.5p1
License Updated :
2-clause BSD license and 4-clause BSD license added
(From OE-Core rev: 60ab470f8759539547a96f1b47299b7b16d6a630)
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh_8.4p1.bb')
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_8.4p1.bb | 180 |
1 files changed, 0 insertions, 180 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_8.4p1.bb b/meta/recipes-connectivity/openssh/openssh_8.4p1.bb deleted file mode 100644 index 128e2e318a..0000000000 --- a/meta/recipes-connectivity/openssh/openssh_8.4p1.bb +++ /dev/null | |||
@@ -1,180 +0,0 @@ | |||
1 | SUMMARY = "A suite of security-related network utilities based on \ | ||
2 | the SSH protocol including the ssh client and sshd server" | ||
3 | DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \ | ||
4 | Ssh (Secure Shell) is a program for logging into a remote machine \ | ||
5 | and for executing commands on a remote machine." | ||
6 | HOMEPAGE = "http://www.openssh.com/" | ||
7 | SECTION = "console/network" | ||
8 | LICENSE = "BSD & ISC & MIT" | ||
9 | LIC_FILES_CHKSUM = "file://LICENCE;md5=18d9e5a8b3dd1790d73502f50426d4d3" | ||
10 | |||
11 | DEPENDS = "zlib openssl virtual/crypt" | ||
12 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | ||
13 | |||
14 | SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ | ||
15 | file://sshd_config \ | ||
16 | file://ssh_config \ | ||
17 | file://init \ | ||
18 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | ||
19 | file://sshd.socket \ | ||
20 | file://sshd@.service \ | ||
21 | file://sshdgenkeys.service \ | ||
22 | file://volatiles.99_sshd \ | ||
23 | file://run-ptest \ | ||
24 | file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \ | ||
25 | file://sshd_check_keys \ | ||
26 | file://add-test-support-for-busybox.patch \ | ||
27 | file://0f90440ca70abab947acbd77795e9f130967956c.patch \ | ||
28 | " | ||
29 | SRC_URI[sha256sum] = "5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24" | ||
30 | |||
31 | # This CVE is specific to OpenSSH server, as used in Fedora and Red Hat Enterprise Linux 7 | ||
32 | # and when running in a Kerberos environment. As such it is not relevant to OpenEmbedded | ||
33 | CVE_CHECK_WHITELIST += "CVE-2014-9278" | ||
34 | |||
35 | PAM_SRC_URI = "file://sshd" | ||
36 | |||
37 | inherit manpages useradd update-rc.d update-alternatives systemd | ||
38 | |||
39 | USERADD_PACKAGES = "${PN}-sshd" | ||
40 | USERADD_PARAM_${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd --shell /bin/false --user-group sshd" | ||
41 | INITSCRIPT_PACKAGES = "${PN}-sshd" | ||
42 | INITSCRIPT_NAME_${PN}-sshd = "sshd" | ||
43 | INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9" | ||
44 | |||
45 | SYSTEMD_PACKAGES = "${PN}-sshd" | ||
46 | SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket" | ||
47 | |||
48 | inherit autotools-brokensep ptest | ||
49 | |||
50 | PACKAGECONFIG ??= "rng-tools" | ||
51 | PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5" | ||
52 | PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns" | ||
53 | PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" | ||
54 | PACKAGECONFIG[manpages] = "--with-mantype=man,--with-mantype=cat" | ||
55 | |||
56 | # Add RRECOMMENDS to rng-tools for sshd package | ||
57 | PACKAGECONFIG[rng-tools] = "" | ||
58 | |||
59 | EXTRA_AUTORECONF += "--exclude=aclocal" | ||
60 | |||
61 | # login path is hardcoded in sshd | ||
62 | EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ | ||
63 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ | ||
64 | --without-zlib-version-check \ | ||
65 | --with-privsep-path=${localstatedir}/run/sshd \ | ||
66 | --sysconfdir=${sysconfdir}/ssh \ | ||
67 | --with-xauth=${bindir}/xauth \ | ||
68 | --disable-strip \ | ||
69 | " | ||
70 | |||
71 | # musl doesn't implement wtmp/utmp and logwtmp | ||
72 | EXTRA_OECONF_append_libc-musl = " --disable-wtmp --disable-lastlog" | ||
73 | |||
74 | # Since we do not depend on libbsd, we do not want configure to use it | ||
75 | # just because it finds libutil.h. But, specifying --disable-libutil | ||
76 | # causes compile errors, so... | ||
77 | CACHED_CONFIGUREVARS += "ac_cv_header_bsd_libutil_h=no ac_cv_header_libutil_h=no" | ||
78 | |||
79 | # passwd path is hardcoded in sshd | ||
80 | CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd" | ||
81 | |||
82 | # We don't want to depend on libblockfile | ||
83 | CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no" | ||
84 | |||
85 | do_configure_prepend () { | ||
86 | export LD="${CC}" | ||
87 | install -m 0644 ${WORKDIR}/sshd_config ${B}/ | ||
88 | install -m 0644 ${WORKDIR}/ssh_config ${B}/ | ||
89 | } | ||
90 | |||
91 | do_compile_ptest() { | ||
92 | # skip regress/unittests/ binaries: this will silently skip | ||
93 | # unittests in run-ptests which is good because they are so slow. | ||
94 | oe_runmake regress/modpipe regress/setuid-allowed regress/netcat \ | ||
95 | regress/check-perm regress/mkdtemp | ||
96 | } | ||
97 | |||
98 | do_install_append () { | ||
99 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | ||
100 | install -D -m 0644 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd | ||
101 | sed -i -e 's:#UsePAM no:UsePAM yes:' ${D}${sysconfdir}/ssh/sshd_config | ||
102 | fi | ||
103 | |||
104 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then | ||
105 | sed -i -e 's:#X11Forwarding no:X11Forwarding yes:' ${D}${sysconfdir}/ssh/sshd_config | ||
106 | fi | ||
107 | |||
108 | install -d ${D}${sysconfdir}/init.d | ||
109 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd | ||
110 | rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin | ||
111 | rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run ${D}${localstatedir} | ||
112 | install -d ${D}/${sysconfdir}/default/volatiles | ||
113 | install -m 644 ${WORKDIR}/volatiles.99_sshd ${D}/${sysconfdir}/default/volatiles/99_sshd | ||
114 | install -m 0755 ${S}/contrib/ssh-copy-id ${D}${bindir} | ||
115 | |||
116 | # Create config files for read-only rootfs | ||
117 | install -d ${D}${sysconfdir}/ssh | ||
118 | install -m 644 ${D}${sysconfdir}/ssh/sshd_config ${D}${sysconfdir}/ssh/sshd_config_readonly | ||
119 | sed -i '/HostKey/d' ${D}${sysconfdir}/ssh/sshd_config_readonly | ||
120 | echo "HostKey /var/run/ssh/ssh_host_rsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly | ||
121 | echo "HostKey /var/run/ssh/ssh_host_ecdsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly | ||
122 | echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly | ||
123 | |||
124 | install -d ${D}${systemd_unitdir}/system | ||
125 | install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system | ||
126 | install -c -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system | ||
127 | install -c -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system | ||
128 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | ||
129 | -e 's,@SBINDIR@,${sbindir},g' \ | ||
130 | -e 's,@BINDIR@,${bindir},g' \ | ||
131 | -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \ | ||
132 | ${D}${systemd_unitdir}/system/sshd.socket ${D}${systemd_unitdir}/system/*.service | ||
133 | |||
134 | sed -i -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \ | ||
135 | ${D}${sysconfdir}/init.d/sshd | ||
136 | |||
137 | install -D -m 0755 ${WORKDIR}/sshd_check_keys ${D}${libexecdir}/${BPN}/sshd_check_keys | ||
138 | } | ||
139 | |||
140 | do_install_ptest () { | ||
141 | sed -i -e "s|^SFTPSERVER=.*|SFTPSERVER=${libexecdir}/sftp-server|" regress/test-exec.sh | ||
142 | cp -r regress ${D}${PTEST_PATH} | ||
143 | } | ||
144 | |||
145 | ALLOW_EMPTY_${PN} = "1" | ||
146 | |||
147 | PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" | ||
148 | FILES_${PN}-scp = "${bindir}/scp.${BPN}" | ||
149 | FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" | ||
150 | FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_unitdir}/system" | ||
151 | FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd ${sysconfdir}/pam.d/sshd" | ||
152 | FILES_${PN}-sshd += "${libexecdir}/${BPN}/sshd_check_keys" | ||
153 | FILES_${PN}-sftp = "${bindir}/sftp" | ||
154 | FILES_${PN}-sftp-server = "${libexecdir}/sftp-server" | ||
155 | FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" | ||
156 | FILES_${PN}-keygen = "${bindir}/ssh-keygen" | ||
157 | |||
158 | RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" | ||
159 | RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" | ||
160 | RRECOMMENDS_${PN}-sshd_append_class-target = "\ | ||
161 | ${@bb.utils.filter('PACKAGECONFIG', 'rng-tools', d)} \ | ||
162 | " | ||
163 | |||
164 | # gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies | ||
165 | RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils" | ||
166 | |||
167 | RPROVIDES_${PN}-ssh = "ssh" | ||
168 | RPROVIDES_${PN}-sshd = "sshd" | ||
169 | |||
170 | RCONFLICTS_${PN} = "dropbear" | ||
171 | RCONFLICTS_${PN}-sshd = "dropbear" | ||
172 | |||
173 | CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" | ||
174 | CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" | ||
175 | |||
176 | ALTERNATIVE_PRIORITY = "90" | ||
177 | ALTERNATIVE_${PN}-scp = "scp" | ||
178 | ALTERNATIVE_${PN}-ssh = "ssh" | ||
179 | |||
180 | BBCLASSEXTEND += "nativesdk" | ||