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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 24 insertions, 4 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/Manifest b/dev-libs/pwlib/Manifest
index 326d27e24a9a..ed702e5082d6 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -1,9 +1,10 @@
 AUX pwlib-1.10.1-vsprintf.patch 405 RMD160 83d78ae27b7813ca7fb82c9fb46ff90d8feff911 SHA1 94de3a7a19482a8cda6844e72a19b6738ae3987c SHA256 1bc01ffe75840552d115737a7b68a35e9e02cc88518e82eff127c57c50155d14
+AUX pwlib-1.10.10-openssl-1.patch 355 RMD160 68a941c380728ebd7324ce56cbdb9566b13545e3 SHA1 3abc12122ffff822c7d528e7fe5eb6c171e43e24 SHA256 c7177cb3e1ac31430e98e60b4d4335f29d389617501c3959c565de11d0537950
 AUX pwlib-1.10.2-asm.patch 986 RMD160 9884754a5d29c34c9b030f95c528c67c41ea3eb5 SHA1 d3ea2aaca29edc3c0861cafbad1db0a4bab80d16 SHA256 52099f9eba393af85ceac985ad284b20bfa052a39219607bb51d7e169c240dc2
 AUX pwlib-1.8.7-instplugins.diff 1044 RMD160 722bc5e665f787e14f9d0e54679c8ba3fcc5e7e6 SHA1 90ccb7e33024dbb36e635b5b47ee0f67a9af7c05 SHA256 39e0b892ae1aa82af87a92a71c8ba78a84ee18984732856ce2f228a6d4340552
 AUX pwlib-1.9.3-sdl-configure.patch 1403 RMD160 240822a74944a5f54f147023b50966c72a232f24 SHA1 4d65a4a4c0663ac3c8a281ad6bfbe06a86727f1c SHA256 467c44ad1d8d2c6f76e712e908476d3a1f948d5e3b1412546f1fb0b776068052
 DIST pwlib-1.10.10.tar.gz 2266255 RMD160 b9e2f3f79911c377dc2d2fbef62d3628aa8364f7 SHA1 ebadd7403695c73fae69488a50a34d15763fd245 SHA256 90a04544e1a6eb4957f92f4845c94950ec3612e0378d1e281c3607548f5092f6
 EBUILD pwlib-1.10.10-r1.ebuild 4607 RMD160 4578f5f5cb31ed68397b13defdd689e6d6e4a419 SHA1 af87b89431854c08521f0324b0039f2d3d5d878b SHA256 a6c219493fdc3bda081326e4c8be509254bc6d7134197aefa20943f0d5d9a2eb
-EBUILD pwlib-1.10.10-r2.ebuild 4599 RMD160 bbc9587e7742baadc7aea49825afa26010ad72d8 SHA1 b1f1ca27891a470f74aad16a75f606c9b8b5b33f SHA256 0b05c8e76488567aeb98afe9d0d191335472a44eeef34767c3ad9e7c78020296
-MISC ChangeLog 22526 RMD160 da49e708f6581fbe924086123eb9a7c68bbc8fb5 SHA1 9fe20cd6dac96c4ee54c5a05041fb39f23275dc0 SHA256 549d613bf4374519206768d036bc32249c5b80f065ec611530cf3f30e0791b86
+EBUILD pwlib-1.10.10-r2.ebuild 4649 RMD160 b4dda3d8f8bc8f2dee43e254057625e81a3e1ef1 SHA1 6b07d18e7740a6414f1f80d6eac68207ef66806f SHA256 825caa4be37741d5ea0fb7667649e7b36ee090f086937af0c8a6db223ac37c73
+MISC ChangeLog 22725 RMD160 4a346ebbde87bc3095bd85b3ad0da31dca401108 SHA1 e3000c794727c6c2ee57b7874ae6a00293a09b55 SHA256 b8a487ab8212aad06f40ed76e7a1f58899a66fddebd40800269f109c28de115d
 MISC metadata.xml 180 RMD160 0b6819d0803da88fe59d34e2ac87c912f3f394b4 SHA1 ea8327baa11d4021618e506d58ba07697e66af2a SHA256 1645c6addf8e8d8229a395cdeb8b13ab70607d30a2e14cec3d0de29b60ea37c5
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"
 }