summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2012-02-06 20:17:52 +0000
committerJeremy Olexa <darkside@gentoo.org>2012-02-06 20:17:52 +0000
commit53b0f56f301cb58f7cf144b8fd16ef873a820312 (patch)
treeb4186d3f67d51b277550f976f9564023dcfd9fc7 /net-misc
parentx11-misc/spnavcfg: 0.2.1 (bug #390427) (diff)
downloadgentoo-2-53b0f56f301cb58f7cf144b8fd16ef873a820312.tar.gz
gentoo-2-53b0f56f301cb58f7cf144b8fd16ef873a820312.tar.bz2
gentoo-2-53b0f56f301cb58f7cf144b8fd16ef873a820312.zip
[Bug 402441] net-misc/openssh: Add output to say that ECDSA will not work when openssl[bindist] is present
(Portage version: 2.1.10.41/cvs/Linux i686)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/openssh/ChangeLog8
-rw-r--r--net-misc/openssh/openssh-5.9_p1-r3.ebuild5
2 files changed, 9 insertions, 4 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index fb2e9579dd6b..c5d28297e310 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/openssh
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.431 2011/12/14 19:52:12 mgorny Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.432 2012/02/06 20:17:52 darkside Exp $
+
+ 06 Feb 2012; Jeremy Olexa <darkside@gentoo.org> openssh-5.9_p1-r3.ebuild:
+ [Bug 402441] net-misc/openssh: Add output to say that ECDSA will not work
+ when openssl[bindist] is present
14 Dec 2011; Michał Górny <mgorny@gentoo.org> openssh-5.9_p1-r3.ebuild,
+files/sshd.service, +files/sshd.socket, +files/sshd_at.service:
diff --git a/net-misc/openssh/openssh-5.9_p1-r3.ebuild b/net-misc/openssh/openssh-5.9_p1-r3.ebuild
index a929a984e85d..0917d465043d 100644
--- a/net-misc/openssh/openssh-5.9_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-5.9_p1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r3.ebuild,v 1.5 2011/12/14 19:52:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r3.ebuild,v 1.6 2012/02/06 20:17:52 darkside Exp $
EAPI="2"
inherit eutils flag-o-matic multilib autotools pam systemd
@@ -182,6 +182,7 @@ src_install() {
# not all openssl installs support ecc, or are functional #352645
if ! grep -q '#define OPENSSL_HAS_ECC 1' config.h ; then
+ elog "dev-libs/openssl was built with 'bindist' - disabling ecdsa support"
dosed 's:&& gen_key ecdsa::' /etc/init.d/sshd || die
fi