summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-07-11 04:07:19 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-07-11 04:07:19 +0000
commit24829820c63c142ff2bb75d8e0f71b201f7d8c47 (patch)
treec1b41e43ea454ca24210374bb6e22ecf00905c26 /dev-libs/pwlib
parentFix quoting... (diff)
downloadgentoo-2-24829820c63c142ff2bb75d8e0f71b201f7d8c47.tar.gz
gentoo-2-24829820c63c142ff2bb75d8e0f71b201f7d8c47.tar.bz2
gentoo-2-24829820c63c142ff2bb75d8e0f71b201f7d8c47.zip
Missing #ifdef in patch, thanks to Michael Sterrett for noticing.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/pwlib')
-rw-r--r--dev-libs/pwlib/ChangeLog6
-rw-r--r--dev-libs/pwlib/files/pwlib-1.10.10-openssl-1.patch7
2 files changed, 10 insertions, 3 deletions
diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index 722ffef53f06..9a4e241e07c6 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/pwlib
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.155 2010/07/11 03:08:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.156 2010/07/11 04:07:18 ssuominen Exp $
+
+ 11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+ files/pwlib-1.10.10-openssl-1.patch:
+ Missing #ifdef in patch, thanks to Michael Sterrett for noticing.
11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
pwlib-1.10.10-r2.ebuild, +files/pwlib-1.10.10-openssl-1.patch:
diff --git a/dev-libs/pwlib/files/pwlib-1.10.10-openssl-1.patch b/dev-libs/pwlib/files/pwlib-1.10.10-openssl-1.patch
index 170949495765..01c592832ff1 100644
--- a/dev-libs/pwlib/files/pwlib-1.10.10-openssl-1.patch
+++ b/dev-libs/pwlib/files/pwlib-1.10.10-openssl-1.patch
@@ -2,12 +2,15 @@ http://bugs.gentoo.org/326797
--- src/ptclib/pssl.cxx
+++ src/ptclib/pssl.cxx
-@@ -888,7 +888,7 @@
+@@ -888,7 +888,11 @@
InitialisationMutex.Signal();
// create the new SSL context
-- SSL_METHOD * meth = SSLv23_method();
++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ const SSL_METHOD * meth = SSLv23_method();
++ #else
+ SSL_METHOD * meth = SSLv23_method();
++ #endif
context = SSL_CTX_new(meth);
if (context == NULL)
PSSLAssert("Error creating context: ");