Commit Graph

35 Commits

Author SHA1 Message Date
Qiang Chen c34300c72e openssh: fix sshd status command error prompt
sshd status command results in error prompt:

root@qemu0:~# /etc/init.d/sshd status
/usr/sbin/sshd (pid 1199) is running...
/etc/init.d/sshd: line 100: return: can only `return' from a
function or sourced script

"service --status-all" command also display wrong status for sshd.

This commit fix this error prompt and make service command display
right status for sshd.

(From OE-Core master rev: e7cf83ec3f39a7c41e38c6030b0d903fa7d37b2a)

(From OE-Core rev: 1b5409b5b060459f15c32c89b1983122b2126f84)

Signed-off-by: Qiang Chen <qiang.chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-12 17:00:13 +00:00
Ming Liu 3091150590 openssh: use volatiles for managing /var/run/sshd
It fixes the following failure:
"fatal: Missing privilege separation directory: /var/run/sshd"

when sshd is started through xinetd.

(From OE-Core rev: a343c32891aa46a7f7d5f0cc6d1266a387900dad)

Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-17 14:35:19 +01:00
Muhammad Shakeel c6d25fbd3f openssh: Add systemd support
-Remove dependency on meta-systemd

(From OE-Core rev: 6e6445d487c033913a29763f8e3a7a339d5b612d)

Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-10 23:15:15 +01:00
Jackie Huang b9f0fc6e98 openssh: add init.d/sshd status command for LSB compliance
(From OE-Core rev: d1e518b6942b945be7a4d44bc137a1441af8f837)

Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-26 11:47:17 +01:00
Chen Qi 2b204500bd openssh: fix for read-only rootfs
If the rootfs is read-only and the ssh keys are not available at system
start-up, the init script will generate ssh keys into /etc/ssh, thus
causing a 'read-only file system' error.

In order for Yocto based image to work correctly for read-only rootfs,
we use the following logic for openssh.

If the rootfs is read-only and there are pre-generated keys under /etc/ssh,
we use the pre-generated keys. Note the pre-generated keys are mainly for
debugging or development purpose.
If the rootfs is read-only and there are no pre-generated keys under
/etc/ssh, we use /var/run/ssh as the location for ssh keys. That is, at
system boot-up, the generated ssh keys will put into /var/run/ssh.

[YOCTO #4887]

(From OE-Core rev: 2ed44745024f04aa4e00ddba3009153c6b47c8e9)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-16 11:14:36 +01:00
Andrei Dinu 4e7d4aa5d4 openssh: Added Upstream Status to openssh-CVE-2011-4327
Updated Upstream Status to openssh patch.

(From OE-Core rev: 71d4a91ffa062a4ab9a2dc0ce97e7405f3d15de7)

Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>

[sgw - Fixed commit line]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-29 13:09:16 +01:00
Marc Ferland 6ecba81678 openssh: fix initscript restart command
start-stop-daemon should be called with '--oknodo' instead of
'-oknodo'.

(From OE-Core rev: 40f65a76b3291ae625c072a8efebbf134b15c367)

Signed-off-by: Marc Ferland <ferlandm@sonatest.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-02 22:23:47 +01:00
Roy.Li a83d489daf openssh: obey 'tcp-wrappers' PACKAGECONFIG
(From OE-Core rev: 4defab3588a5a5e6e3fcdb8007eade18120094f6)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-06-17 16:45:36 +01:00
Roy.Li 58256120e8 openssh: fix a unaligned memory access issue
Backport patch to fix segment fault due to unaligned memory access

(From OE-Core rev: c2ce8e3bc10aec4cb53faea091ad867bab405bb7)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-06-17 16:45:36 +01:00
Andrei Dinu 55316357e3 openssh : upgrade to 6.2p2
upgrade from 6.2p1 -> 6.2p2

(From OE-Core rev: 752ad432a248befe7d7b1dd799209f7bcbe9231e)

Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-06-11 15:38:02 +01:00
Andrei Dinu 5c704232d7 openssh : upgrade to 6.2p1
from 6.1p1 -> 6.2p1

(From OE-Core rev: 5f0400d2eb9e660fcb4780c2badbfb8856e64893)

Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-28 12:12:21 +01:00
Martin Jansa c47b773461 openssh: don't add update-rc.d to RDEPENDS
* sysvinit/systemd assumes that update-rc.d can be inhibited
* with systemd enabled, sysvinit scripts are missing in packages
  and update-rc.d needs to be put in BAD_RECOMMENDATIONS to prevent
  update-rc.d trying to install them in postinst
* update-rd.c shouldn't be in DEPENDS

(From OE-Core rev: e9e4a90c7e66abe2ab2c335d60ef91e869f48693)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-02 18:15:21 +01:00
Martin Jansa 04361bc8f2 openssh: fix RPROVIDES
(From OE-Core rev: 43ddc955727361458fec92731775a1fc7f29917c)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-04 23:31:02 +00:00
Andrei Dinu f3dfb7c200 openssh : upgrade to 6.1p1
(From OE-Core rev: 5534deb69b0a2835fbbf149a00d1f6ba61cc8160)

Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-28 14:49:04 +00:00
Li Wang b629d94030 openssh: CVE-2011-4327
A security flaw was found in the way ssh-keysign,
a ssh helper program for host based authentication,
attempted to retrieve enough entropy information on configurations that
lacked a built-in entropy pool in OpenSSL (a ssh-rand-helper program would
be executed to retrieve the entropy from the system environment).
A local attacker could use this flaw to obtain unauthorized access to host keys
via ptrace(2) process trace attached to the 'ssh-rand-helper' program.

https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2011-4327
http://www.openssh.com/txt/portable-keysign-rand-helper.adv

[YOCTO #3493]

(From OE-Core rev: bdce08215396e5ab99ada5fa0f62c3b002a44582)

Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-28 07:41:26 +00:00
Amy Fong 54b4c50a60 openssh: openssh's init fails to restart if sshd is not running
openssh: openssh's init fails to restart if sshd is not running

Because of "set -e", it's necessary to specify the -o (or --oknodo)
so that start-stop-daemon returns an exit status of 0 if no actions
are taken.

(From OE-Core rev: 7e44d2e8457c9c90932ce4f0fd95c67b74efb2e0)

Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-17 18:04:22 +01:00
Saul Wold 1e3bbf71fa openssh: cleanup update-alternatives deprecated code
(From OE-Core rev: 11c169a9b289b0412e512c37d380a99fd1630df5)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-15 14:26:26 +01:00
Javier Martinez Canillas 6c9d66b16f openssh: use ${localstatedir} instead of /var for packaging
It is considered good practice to use the build system provided
variables instead of directly specify hardcoded paths.

(From OE-Core rev: b7134e8f76026d15a5e35c6a2e5d77d5e48c2787)

Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-06 15:18:49 +01:00
Martin Jansa 79e4de8406 recipes: replace CONFLICTS with RCONFLICTS_${PN}
(From OE-Core rev: fbcda6eff010e0a39cc0145a514e7de99f475145)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-18 13:24:58 +01:00
Mark Hatle 6b20156b0c openssh: use new update-alternatives
(From OE-Core rev: b417ced0573acde896332827bcc13b0f7c5bd9fe)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-30 12:04:40 +01:00
Scott Garman e11c495886 openssh: upgrade to 6.0p1
LICENSE checksum changed due to a trivial difference in the credits
list.

(From OE-Core rev: ce1fc60b0044bccf6cf8432700d6c0b6f042dae2)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-08 14:49:14 +01:00
Saul Wold ebb15d2280 PR Bump for OpenSSL 1.0
(From OE-Core rev: 59923e66e85471acdb70d72082a8906c69b17720)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:15:06 +00:00
Scott Garman 8eb1010611 openssh: upgrade to 5.9p1
(From OE-Core rev: 47c7f5a6f022dca10ae63851c7d9c14ee06f0c0b)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-27 08:29:51 +01:00
Julian Pidancet 3010bc0106 Use useradd and update-rc.d classes in the OpenSSH recipe
The current sshd postinst and postrm scripts in the OpenSSH make the
package dependant of the adduser/addgroup scripts which may not be
available on all systems.

This patch replaces the sshd postinst and postrm scripts with proper
usage of the useradd and update-rc.d classes.

This patch had been modified from the previous proposed version to
use useradd long options for more clarity.

(From OE-Core rev: 6b7f399d595ef58e759dab211f4ece155119a680)

Signed-off-by: Julian Pidancet <julian.pidancet@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-10 10:00:08 +01:00
Martin Jansa 0a27b8b76d openssh: update init script to create ECDSA keys if needed
* Starting with openssh-5.8p1, the server will default to a newer key
  algorithm (ECDSA).

(From OE-Core rev: 998e3acf0d38007fde10f47f98b71192685e19b9)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-16 13:30:22 +01:00
Xiaofeng Yan f491a7ea0c openssh: Support PAM
Adding configuration file "sshd" in /etc/pam.d/ for supporting pam.

(From OE-Core rev: 8279f771a482d890ad897971cba1d656fdcaefe9)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-27 12:02:42 +01:00
Richard Purdie d099a9e751 openssh/dropbear: No need for each to PROVIDE ssh/sshd
Nothing in the system actually uses the PROVIDES field for these
recipes, its usually the runtime packages that are used. We can
therefore remove the PROVIDES and hence quieten the associated
warnings from bitbake.

If these recipes do really need the PROVIDES, they would be better
as virtuals and adding that to MULTI_PROVIDER_WHITELIST.

(From OE-Core rev: 84f3ae92ab4345cc99b47e021ff960857f803d45)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-07 10:57:51 +01:00
Richard Purdie 8511d1ec1b Drop PRIORITY variable
As discussed on the mailing list, this variable isn't useful and if wanted
would be better implemented by distros using pn-X overrides.

This patch executes:

find . -regex ".*\.\(bb\|inc\)$" | xargs sed -i '/^PRIORITY = ".*"$/d'

against the tree removing the referenced. Thanks to Phil Blundell for
the command.

(From OE-Core rev: d122343362669c683acc4af295971a62cbc823fc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-01 23:27:29 +01:00
Scott Garman 4555c2bd7b openssh: upgrade to v5.8p2
LICENCE checksum updated due to a one-line change in the file (RedHat
was added as a copyright holder).

(From OE-Core rev: 969cdde4541819ef5123a77391d870843aff0b55)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-07 21:38:34 +01:00
Qing He f93d6872f2 update patch upstream status
for the following recipes:
  pcmciautils openssl udev apt gdm

(From OE-Core rev: 552c9fa44c2a2bb94bcf83bff802773265a35a27)

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-17 15:14:47 +01:00
Tom Rini 9d424738eb openssh: Don't use ${libdir}exec
This is 1259e0289ce53198cc6c57a9616c8a1623be502a in OE.

[RP: Added PR bump]
(From OE-Core rev: 49e8503acb8424979b12ec6b5ea17421a1edc80c)

Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-17 15:14:44 +01:00
Scott Garman 0dbd791e5b recipes: Add Upstream-Status to various recipe patches
Add Upstream-Status tag to patches for the following recipes:

openssh
dbus-glib
expat
opensp
sgml-common
at
cpio (GPLv3 version)
libpam
icu

(From OE-Core rev: 0702602332ad63c2cfaa207516497bb0b75bfdf3)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-17 15:14:42 +01:00
Scott Garman 43a2d09800 openssh: allow the openssh meta package to be empty
This allows the openssh meta-package to be used in the
poky-ssh task. Otherwise there will be no package named
openssh to install during image creation.

(From OE-Core rev: 9f4747a1e7e04e0b08b7b402bd8dd7cf8ccd0166)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-10 18:46:04 -08:00
Mark Hatle 75732f5443 recipes-connectivity: Cleanup package descriptions and summaries
[BUGID #281]

Evaluate and update each package in recipes-connectivity to ensure they
have a consistent summary and description.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2010-10-11 22:15:48 +01:00
Scott Garman 436d590c4a openssh: new recipe addition
OpenSSH v5.6p1, derived from OpenEmbedded's recipe.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-09-02 09:52:31 +01:00