* [gentoo-commits] gentoo-x86 commit in net-misc/openssh/files: openssh-6.6_p1-openssl-ignore-status.patch
@ 2014-03-20 5:48 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2014-03-20 5:48 UTC (permalink / raw
To: gentoo-commits
vapier 14/03/20 05:48:24
Added: openssh-6.6_p1-openssl-ignore-status.patch
Log:
Fix openssl version check to accept dev/beta/release versions.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.1 net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch?rev=1.1&content-type=text/plain
Index: openssh-6.6_p1-openssl-ignore-status.patch
===================================================================
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.
--- a/entropy.c
+++ b/entropy.c
@@ -216,7 +216,7 @@ seed_rng(void)
* allow 1.0.1 to work with 1.0.0). Going backwards is only allowed
* within a patch series.
*/
- u_long version_mask = SSLeay() >= 0x1000000f ? ~0xffff0L : ~0xff0L;
+ u_long version_mask = SSLeay() >= 0x1000000f ? ~0xfffffL : ~0xff0L;
if (((SSLeay() ^ OPENSSL_VERSION_NUMBER) & version_mask) ||
(SSLeay() >> 12) < (OPENSSL_VERSION_NUMBER >> 12))
fatal("OpenSSL version mismatch. Built against %lx, you "
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/openssh/files: openssh-6.6_p1-openssl-ignore-status.patch
@ 2014-03-20 6:32 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2014-03-20 6:32 UTC (permalink / raw
To: gentoo-commits
vapier 14/03/20 06:32:21
Modified: openssh-6.6_p1-openssl-ignore-status.patch
Log:
link in upstream bug url
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.2 net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch?r1=1.1&r2=1.2
Index: openssh-6.6_p1-openssl-ignore-status.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/files/openssh-6.6_p1-openssl-ignore-status.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssh-6.6_p1-openssl-ignore-status.patch 20 Mar 2014 05:48:24 -0000 1.1
+++ openssh-6.6_p1-openssl-ignore-status.patch 20 Mar 2014 06:32:21 -0000 1.2
@@ -2,6 +2,8 @@
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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-20 6:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-20 5:48 [gentoo-commits] gentoo-x86 commit in net-misc/openssh/files: openssh-6.6_p1-openssl-ignore-status.patch Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2014-03-20 6:32 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox