Fix building with OpenSSL >= 1.0.0 wrt #326797 by Diego E. 'FPettenò.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 21 insertions, 2 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index b4634c8b10e7..2538d07dabcc 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.153 2010/03/29 06:44:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.154 2010/07/11 03:01:48 ssuominen Exp $
+
+  11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  pwlib-1.10.10-r2.ebuild, +files/pwlib-1.10.10-openssl-1.patch:
+  Fix building with OpenSSL >= 1.0.0 wrt #326797 by Diego E. 'FPettenò.
 
   29 Mar 2010; Jeroen Roovers <jer@gentoo.org> pwlib-1.10.10-r2.ebuild:
   Stable for HPPA (bug #307739).
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
new file mode 100644
index 000000000000..170949495765
--- /dev/null
+++ b/dev-libs/pwlib/files/pwlib-1.10.10-openssl-1.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/326797
+
+--- src/ptclib/pssl.cxx
++++ src/ptclib/pssl.cxx
+@@ -888,7 +888,7 @@
+   InitialisationMutex.Signal();
+ 
+   // create the new SSL context
+-  SSL_METHOD * meth = SSLv23_method();
++  const SSL_METHOD * meth = SSLv23_method();
+   context  = SSL_CTX_new(meth);
+   if (context == NULL)
+     PSSLAssert("Error creating context: ");
diff --git a/dev-libs/pwlib/pwlib-1.10.10-r2.ebuild b/dev-libs/pwlib/pwlib-1.10.10-r2.ebuild
index 4367d0fc6c13..2de54d6e899b 100644
--- a/dev-libs/pwlib/pwlib-1.10.10-r2.ebuild
+++ b/dev-libs/pwlib/pwlib-1.10.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r2.ebuild,v 1.7 2010/03/29 06:44:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r2.ebuild,v 1.8 2010/07/11 03:01:48 ssuominen Exp $
 
 EAPI="1"
 
@@ -53,6 +53,8 @@ src_unpack() {
 	# security - we obviousl need to patch..
 	epatch "${FILESDIR}"/pwlib-1.10.1-vsprintf.patch
 
+	epatch "${FILESDIR}"/${P}-openssl-1.patch
+
 	eautoconf || die "autoconf failed"
 }