<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=gb2312">
<meta name="Generator" content="Microsoft Word 14 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:宋体;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:"\@宋体";
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
text-align:justify;
text-justify:inter-ideograph;
font-size:10.5pt;
font-family:"Calibri","sans-serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p.MsoPlainText, li.MsoPlainText, div.MsoPlainText
{mso-style-priority:99;
mso-style-link:"纯文本 Char";
margin:0cm;
margin-bottom:.0001pt;
font-size:10.5pt;
font-family:"Calibri","sans-serif";}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:"Calibri","sans-serif";
color:windowtext;}
span.Char
{mso-style-name:"纯文本 Char";
mso-style-priority:99;
mso-style-link:纯文本;
font-family:"Calibri","sans-serif";}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";}
/* Page Definitions */
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 90.0pt 72.0pt 90.0pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="ZH-CN" link="blue" vlink="purple" style="text-justify-trim:punctuation">
<div class="WordSection1">
<p class="MsoPlainText"><span lang="EN-US">Ping<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">If sysvinit is disabled from DISTRO_FEATURES,then /etc/init.d/sshd will be removed,and this will cause sshd daemon failed to start by systemd, So add it.<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">Signed-off-by: Li Xin <<a href="mailto:lixin.fnst@cn.fujitsu.com">lixin.fnst@cn.fujitsu.com</a>><o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">---<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">.../recipes-connectivity/openssh/openssh/sshd.service | 19 +++++++++++++++++++<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">meta/recipes-connectivity/openssh/openssh_7.1p2.bb | 9 +++++++--<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/openssh/openssh/sshd.service<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">diff --git a/meta/recipes-connectivity/openssh/openssh/sshd.service b/meta/recipes-connectivity/openssh/openssh/sshd.service<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">new file mode 100644<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">index 0000000..6c05f23<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">--- /dev/null<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+++ b/meta/recipes-connectivity/openssh/openssh/sshd.service<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">@@ -0,0 +1,19 @@<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+[Unit]<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+Description=OpenSSH server daemon<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+Documentation=man:sshd(8) man:sshd_config(5) After=network.target
<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+sshd-keygen.service Wants=sshd-keygen.service<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+[Service]<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+Type=forking<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"><a href="mailto:+PIDFile=@localstatedir@/run/sshd.pid">+PIDFile=@localstatedir@/run/sshd.pid</a><o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+EnvironmentFile=-@SYSCONFDIR@/sysconfig/sshd<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+ExecStart=@SBINDIR@/sshd $OPTIONS<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID KillMode=process
<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+Restart=on-failure RestartSec=42s<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+[Install]<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+WantedBy=multi-user.target<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">diff --git a/meta/recipes-connectivity/openssh/openssh_7.1p2.bb b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">index 3b5e28a..8b31b40 100644<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">--- a/meta/recipes-connectivity/openssh/openssh_7.1p2.bb<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+++ b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">@@ -23,7 +23,9 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"> <a href="file:///\\run-ptest">
file://run-ptest</a> \<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"> <a href="file:///\\CVE-2016-1907_upstream_commit.patch">
file://CVE-2016-1907_upstream_commit.patch</a> \<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"> <a href="file:///\\CVE-2016-1907_2.patch">
file://CVE-2016-1907_2.patch</a> \<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">- <a href="file:///\\CVE-2016-1907_3.patch">
file://CVE-2016-1907_3.patch</a> "<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+ <a href="file:///\\CVE-2016-1907_3.patch">
file://CVE-2016-1907_3.patch</a> \<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+ <a href="file:///\\sshd.service">
file://sshd.service</a>"<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"><o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"> PAM_SRC_URI = "<a href="file:///\\sshd">file://sshd</a>"<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"><o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">@@ -39,7 +41,7 @@ INITSCRIPT_NAME_${PN}-sshd = "sshd"<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9"<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"><o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"> SYSTEMD_PACKAGES = "${PN}-sshd"<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">-SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket"<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket sshd.service"<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"><o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"> inherit autotools-brokensep ptest<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"><o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">@@ -118,9 +120,12 @@ do_install_append () {<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"> install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"> install -c -m 0644 <a href="mailto:$%7bWORKDIR%7d/sshd@.service">
${WORKDIR}/sshd@.service</a> ${D}${systemd_unitdir}/system<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"> install -c -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+ install -c -m 0644 ${WORKDIR}/sshd.service
<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+${D}${systemd_unitdir}/system<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"> sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"> -e 's,@SBINDIR@,${sbindir},g' \<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"> -e 's,@BINDIR@,${bindir},g' \<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+ -e 's,@SYSCONFDIR@,${sysconfdir},g' \<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">+ -e 's,@localstatedir@,${localstatedir},g' \<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"> ${D}${systemd_unitdir}/system/sshd.socket ${D}${systemd_unitdir}/system/*.service<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">}<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"><o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">--<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">1.8.4.2<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">-- <o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">_______________________________________________<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US">Openembedded-core mailing list<o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"><a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><o:p></o:p></span></p>
<p class="MsoPlainText"><span lang="EN-US"><a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p>
</div>
</body>
</html>