diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2008-10-03 22:29:31 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2008-10-03 22:29:31 +0000 |
| commit | 0564b5fc6c5458b14f3f3f03f45246c7c501c00e (patch) | |
| tree | a3842125443e08b0e91b1d0580ea0834524302e9 /app-crypt/qca-ossl | |
| parent | Add myself as maintainer. (diff) | |
| download | gentoo-2-0564b5fc6c5458b14f3f3f03f45246c7c501c00e.tar.gz gentoo-2-0564b5fc6c5458b14f3f3f03f45246c7c501c00e.tar.bz2 gentoo-2-0564b5fc6c5458b14f3f3f03f45246c7c501c00e.zip | |
Fix compilation failure w/ openssl-0.9.8i by commenting out some ifdeffed code. Bug 239449.
(Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc8 x86_64)
Diffstat (limited to 'app-crypt/qca-ossl')
| -rw-r--r-- | app-crypt/qca-ossl/files/qca-ossl-openssl-0.9.8i.patch | 29 | ||||
| -rw-r--r-- | app-crypt/qca-ossl/qca-ossl-2.0.0_beta3.ebuild | 7 |
2 files changed, 34 insertions, 2 deletions
diff --git a/app-crypt/qca-ossl/files/qca-ossl-openssl-0.9.8i.patch b/app-crypt/qca-ossl/files/qca-ossl-openssl-0.9.8i.patch new file mode 100644 index 000000000000..deceb34b59e3 --- /dev/null +++ b/app-crypt/qca-ossl/files/qca-ossl-openssl-0.9.8i.patch @@ -0,0 +1,29 @@ +http://websvn.kde.org/trunk/kdesupport/qca/plugins/qca-ossl/qca-ossl.cpp?r1=848615&r2=864423&view=patch + +--- qca-ossl/qca-ossl.cpp 2008/08/18 09:08:51 848615 ++++ qca-ossl/qca-ossl.cpp 2008/09/24 19:22:26 864423 +@@ -6616,9 +6616,11 @@ + #ifdef SHA512_DIGEST_LENGTH + list += "sha512"; + #endif ++/* + #ifdef OBJ_whirlpool + list += "whirlpool"; + #endif ++*/ + return list; + } + +@@ -6863,10 +6865,12 @@ + else if ( type == "sha512" ) + return new opensslHashContext( EVP_sha512(), this, type); + #endif ++/* + #ifdef OBJ_whirlpool + else if ( type == "whirlpool" ) + return new opensslHashContext( EVP_whirlpool(), this, type); + #endif ++*/ + else if ( type == "pbkdf1(sha1)" ) + return new opensslPbkdf1Context( EVP_sha1(), this, type ); + else if ( type == "pbkdf1(md2)" ) diff --git a/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3.ebuild b/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3.ebuild index 6675b8ebd93b..61e6a0464e6a 100644 --- a/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3.ebuild +++ b/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3.ebuild,v 1.13 2008/09/20 10:05:03 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3.ebuild,v 1.14 2008/10/03 22:29:30 loki_val Exp $ -inherit eutils qt4 +inherit base eutils qt4 MY_P="${P/_/-}" QCA_VER="${PV%.*}" @@ -22,6 +22,8 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}/${PN}-openssl-0.9.8i.patch" ) + pkg_setup() { if use debug && ! built_with_use ">=app-crypt/qca-${QCA_VER}" debug; then echo @@ -45,6 +47,7 @@ src_compile() { || die "configure failed" eqmake4 ${PN}.pro + sed -i -e '/strip/d' Makefile || die "sed failed" emake || die "emake failed" } |