summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-03-20 06:32:21 +0000
committerMike Frysinger <vapier@gentoo.org>2014-03-20 06:32:21 +0000
commit0efbdb496b81bd1f9cdc96bcfbe9d62088e7eb88 (patch)
tree529773928695b93ac8c3eccaa07a494a66d6a9c5 /net-misc/openssh
parentFix openssl version check to accept dev/beta/release versions. (diff)
downloadgentoo-2-0efbdb496b81bd1f9cdc96bcfbe9d62088e7eb88.tar.gz
gentoo-2-0efbdb496b81bd1f9cdc96bcfbe9d62088e7eb88.tar.bz2
gentoo-2-0efbdb496b81bd1f9cdc96bcfbe9d62088e7eb88.zip
link in upstream bug url
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/ChangeLog6
-rw-r--r--net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch2
2 files changed, 7 insertions, 1 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index fe3291f38aa3..553cb32e1d74 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/openssh
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.505 2014/03/20 05:48:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.506 2014/03/20 06:32:21 vapier Exp $
+
+ 20 Mar 2014; Mike Frysinger <vapier@gentoo.org>
+ files/openssh-6.6_p1-openssl-ignore-status.patch:
+ link in upstream bug url
20 Mar 2014; Mike Frysinger <vapier@gentoo.org>
+files/openssh-6.6_p1-openssl-ignore-status.patch, openssh-6.6_p1.ebuild:
diff --git a/net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch b/net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch
index 2f614104de4e..6db6b97dbead 100644
--- a/net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch
+++ b/net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch
@@ -2,6 +2,8 @@ the last nibble of the openssl version represents the status. that is,
whether it is a beta or release. when it comes to version checks in
openssh, this component does not matter, so ignore it.
+https://bugzilla.mindrot.org/show_bug.cgi?id=2212
+
--- a/entropy.c
+++ b/entropy.c
@@ -216,7 +216,7 @@ seed_rng(void)