diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-14 08:16:35 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-14 08:16:35 +0000 |
commit | 95995b685731709b97f27551e2612e53938d1264 (patch) | |
tree | 5f9d4da8f73bfeb8a2a8b4d27c37b2d621f99bc7 /dev-libs/poco | |
parent | Fix Manifest (diff) | |
download | gentoo-2-95995b685731709b97f27551e2612e53938d1264.tar.gz gentoo-2-95995b685731709b97f27551e2612e53938d1264.tar.bz2 gentoo-2-95995b685731709b97f27551e2612e53938d1264.zip |
Fix building with OpenSSL >= 1.0.0 wrt #327769 by Diego E. Pettenò.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/poco')
-rw-r--r-- | dev-libs/poco/ChangeLog | 8 | ||||
-rw-r--r-- | dev-libs/poco/files/1.3.3_p1-openssl-1.patch | 16 | ||||
-rw-r--r-- | dev-libs/poco/poco-1.3.3_p1.ebuild | 7 |
3 files changed, 26 insertions, 5 deletions
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/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() { |