From: Samuli Suominen <ssuominen@gentoo.org>
Date: Wed, 14 Jul 2010 08:16:35 +0000 (+0000)
Subject: Fix building with OpenSSL >= 1.0.0 wrt #327769 by Diego E. Pettenò.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=727c031cf0287b8be3f1e7dff4155a75539231f5;p=gentoo.git

Fix building with OpenSSL >= 1.0.0 wrt #327769 by Diego E. Pettenò.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/dev-libs/poco/ChangeLog b/dev-libs/poco/ChangeLog
index acf720853218..e484332ba5a8 100644
--- a/dev-libs/poco/ChangeLog
+++ b/dev-libs/poco/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/poco
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.7 2009/08/08 12:27:55 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.8 2010/07/14 08:16:34 ssuominen Exp $
+
+  14 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> poco-1.3.3_p1.ebuild,
+  +files/1.3.3_p1-openssl-1.patch:
+  Fix building with OpenSSL >= 1.0.0 wrt #327769 by Diego E. Pettenò.
 
   08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> poco-1.3.3_p1.ebuild:
   Replace FEATURES test check with USE test check wrt #278751.
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 3917e5b68112..2dc04cb0412b 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -1,8 +1,9 @@
 AUX 1.3.3_p1-gcc44.patch 529 RMD160 03d16847116d6dbbc1feaddb68eada16622bc8d1 SHA1 d2bf6f1d85ad8dcd113df97297656f0195f9c04f SHA256 19bfb607bcc49e600950d4bca0f3d5bf1d33d547b148cbe42f97906130980822
 AUX 1.3.3_p1-gentoo.patch 3357 RMD160 0b4f1e17a5c7c1963d0342b7aff00f2db2a3fe59 SHA1 10301073e1b2cd77d35b5ab2b965e03d0de1176d SHA256 2590e03757c8eab863cbdd5db1ff10a6f7734f18925415b430f4bdddadbe4040
+AUX 1.3.3_p1-openssl-1.patch 402 RMD160 6b25f98e685b7bfc3281092fda22707051602e52 SHA1 3f239f9d28a68489aeb90c09cbd2f8647e36269e SHA256 076b0b024a225656989520b7d921e6e182f9cb7ff91d97205954a341081ecc2b
 AUX 1.3.3_p1-unbundle_libs.patch 8075 RMD160 690b95724a05d9a3c64fcb907d6b4322bc5a2f71 SHA1 dbd2250d3650c144de1794058d3eec15a815ccba SHA256 63ae188d12bdef000eeb33ce79b045f01d6ab5d2c112079877d1735861f3496f
 DIST poco-1.3.3-doc.tar.gz 924194 RMD160 0a9a5ba3117076bc163a0674ca47630d4346dc9e SHA1 cfdea5d3b4c3b15dcc300a7e5c2a60525e9bed8a SHA256 5edcc2216807c05ba236d4d8423c05c1f4645438196816db33380a4a2f543167
 DIST poco-1.3.3p1-all.tar.bz2 2011910 RMD160 bcdf37b0dc1d8cae84c020a34dcf2c838f92053a SHA1 59f3af74b105e6357af9e5d41c7d7579d2300a3c SHA256 9b011301f9111b21c37684fc3c2f8a85356300f003b1f827ae2de196e2c11909
-EBUILD poco-1.3.3_p1.ebuild 3338 RMD160 13fbc47aed40b5c08d17907d8f00f737acf59d0e SHA1 7ff3b9b8929ecda434ff59751e5c7feceb2132e9 SHA256 59de066bf5c5b01f063dd9e08f38589fe2c3f073ad76739020104d24d2c9a173
-MISC ChangeLog 1429 RMD160 2aab5b2a7c98bbefe84e6d93527b6f82bc18d0e5 SHA1 05a0ea06cae68fb472b890175319c6c568a7e7f1 SHA256 6c6fccad2ef20f9e56cf350e0906c0e71f0420829e1a4856dcbec6d5124933ea
+EBUILD poco-1.3.3_p1.ebuild 3378 RMD160 e48e383c4ffb268338c88ea522d3343d214ff98a SHA1 a662d5faebf8283eb4388b381b26f24793968026 SHA256 20628a5cfc5462059a7bbed55fcc2ff3af1b2ffe129af499a762ca0c9cff91f8
+MISC ChangeLog 1612 RMD160 8320bd55b498896da0b1034a89459fab782ca998 SHA1 9c9d5be7f63e0149c6d58be29efa567255662ef9 SHA256 0c37b4c04ea55d05861dcd6a980e101633d15552d40a20ebec9babd2485148fd
 MISC metadata.xml 1214 RMD160 ad53912d3b0bfe957afb93f48a14acb8a63065ac SHA1 0540a52d1fb89cb295e74a76ff82b5a9aa9e17d2 SHA256 db4e1800aef5727137536db629841d0fe719018f9c5cb7fd8dd332fbe8c78e1c
diff --git a/dev-libs/poco/files/1.3.3_p1-openssl-1.patch b/dev-libs/poco/files/1.3.3_p1-openssl-1.patch
new file mode 100644
index 000000000000..2377edd85a63
--- /dev/null
+++ b/dev-libs/poco/files/1.3.3_p1-openssl-1.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/327769
+
+--- NetSSL_OpenSSL/src/SecureSocketImpl.cpp
++++ NetSSL_OpenSSL/src/SecureSocketImpl.cpp
+@@ -430,7 +430,11 @@
+ 
+ 			if (!strcmp(extstr, "subjectAltName"))
+ 			{
++				#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++				const X509V3_EXT_METHOD* meth = X509V3_EXT_get(ext);
++				#else
+ 				X509V3_EXT_METHOD* meth = X509V3_EXT_get(ext);
++				#endif
+ 				if (!meth)
+ 					break;
+ 
diff --git a/dev-libs/poco/poco-1.3.3_p1.ebuild b/dev-libs/poco/poco-1.3.3_p1.ebuild
index f87663cbc89f..f71b3800c905 100644
--- a/dev-libs/poco/poco-1.3.3_p1.ebuild
+++ b/dev-libs/poco/poco-1.3.3_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/poco-1.3.3_p1.ebuild,v 1.3 2009/08/08 12:27:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/poco-1.3.3_p1.ebuild,v 1.4 2010/07/14 08:16:34 ssuominen Exp $
 
 EAPI="2"
 
@@ -34,7 +34,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PV}-gentoo.patch \
 		"${FILESDIR}"/${PV}-unbundle_libs.patch \
-		"${FILESDIR}"/${PV}-gcc44.patch
+		"${FILESDIR}"/${PV}-gcc44.patch \
+		"${FILESDIR}"/${PV}-openssl-1.patch
 }
 
 src_configure() {