new revision that solves 122288

(Portage version: 2.1_pre4-r1)

5 files changed, 106 insertions, 16 deletions

diff --git a/app-crypt/qca-tls/ChangeLog b/app-crypt/qca-tls/ChangeLog
index 76ed3b2c21c3..61a6057fc571 100644
--- a/app-crypt/qca-tls/ChangeLog
+++ b/app-crypt/qca-tls/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/qca-tls
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/ChangeLog,v 1.33 2005/07/29 22:45:05 dragonheart Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/ChangeLog,v 1.34 2006/02/13 10:50:15 humpback Exp $
+
+*qca-tls-1.0-r3 (13 Feb 2006)
+
+  13 Feb 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/qca-openssl-0.9.8.patch, +qca-tls-1.0-r3.ebuild:
+  Added netbsd patch for openssl 0.9.8. Closes bug #122288 thanks to Michael
+  Cramer for reporting this.
 
   29 Jul 2005; Daniel Black <dragonheart@gentoo.org> qca-tls-1.0.ebuild:
   removed die from epatch || die
diff --git a/app-crypt/qca-tls/Manifest b/app-crypt/qca-tls/Manifest
index 35f7795c70b8..7ab9104562f4 100644
--- a/app-crypt/qca-tls/Manifest
+++ b/app-crypt/qca-tls/Manifest
@@ -1,17 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c1a7417586f320d8e12289168be49369 ChangeLog 3416
-MD5 5c94bbf537afbc17dc95e1a2c254d929 qca-tls-1.0.ebuild 1007
-MD5 b5393a27b5b3d74649028c3befaf49fe metadata.xml 226
-MD5 1b70f644c551d8bff8d884d7dd0d85e2 qca-tls-1.0-r2.ebuild 1012
+RMD160 5081ac2cd8fbbd59c19090b5447ad413b1c1510a ChangeLog 3416
+SHA256 1c1910f8dba16d36bd4e618be7b6f0796bbe6e7c3b01b534c95884164adb8901 ChangeLog 3416
 MD5 5398cdc5d090333de8881b20f3d10f8e files/digest-qca-tls-1.0 63
-MD5 f87721e55c7f47d133faa99241219ae5 files/qca-pathfix.patch 301
+RMD160 0b9eae164219886ca5751b130a1ccf81746aa76c files/digest-qca-tls-1.0 63
+SHA256 cdf86cb416f6e9effcf9474572b224e968dd7bc6b4a923912dc2bcd7b84c9a87 files/digest-qca-tls-1.0 63
 MD5 5398cdc5d090333de8881b20f3d10f8e files/digest-qca-tls-1.0-r2 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC6rF/mdTrptrqvGERAk4lAJ0VrpMGGe9ef2Kf0iJtsoX2fg0sAQCfe7Os
-e2OlmnNhA2ySdXnuoheNZVE=
-=PBi4
------END PGP SIGNATURE-----
+RMD160 0b9eae164219886ca5751b130a1ccf81746aa76c files/digest-qca-tls-1.0-r2 63
+SHA256 cdf86cb416f6e9effcf9474572b224e968dd7bc6b4a923912dc2bcd7b84c9a87 files/digest-qca-tls-1.0-r2 63
+MD5 6a110d8a70ca5a5876e078b5578450a8 files/digest-qca-tls-1.0-r3 235
+RMD160 caa9ef7d3015ac925b9067c823ecbffa9b4975b8 files/digest-qca-tls-1.0-r3 235
+SHA256 3bc2ae4212f442a10629098a158fd9cf8ace89dae3ea2cada94e6e0c7307ef5a files/digest-qca-tls-1.0-r3 235
+MD5 6b384d7a8a9789b70c2c0b8444179eea files/qca-openssl-0.9.8.patch 719
+RMD160 1beac361d71e129183d038dc3abd24a9339cab42 files/qca-openssl-0.9.8.patch 719
+SHA256 9879fa954ce63c107b568194e4a6ede4192d34f7a7cdb2ba14a5c95f20c287aa files/qca-openssl-0.9.8.patch 719
+MD5 f87721e55c7f47d133faa99241219ae5 files/qca-pathfix.patch 301
+RMD160 4cd979b5e28eabfa773ce0aa46d42e9209c46ded files/qca-pathfix.patch 301
+SHA256 12b86099556839cf1ad03fd56fa409e53bc120713ea0352a1ac6f7acb0e093d2 files/qca-pathfix.patch 301
+MD5 b5393a27b5b3d74649028c3befaf49fe metadata.xml 226
+RMD160 da1b2c8ba1ec28b4a0251ee5778e1308a5383d52 metadata.xml 226
+SHA256 e65360d3209b9067f6ffa4dae086e721ec97c01f2a06531e83add1511021a717 metadata.xml 226
+MD5 1b70f644c551d8bff8d884d7dd0d85e2 qca-tls-1.0-r2.ebuild 1012
+RMD160 3ddf912ae952476e21e6bd00c3c0f3e4d33e4c8e qca-tls-1.0-r2.ebuild 1012
+SHA256 e901d2187cedce8f2e8a36001ed30511cef79b166a5ee5994790d3767e9d10f2 qca-tls-1.0-r2.ebuild 1012
+MD5 98812c5f4da4943f67f9059d6ae5d574 qca-tls-1.0-r3.ebuild 1056
+RMD160 6df1e99eb9ca2d2d487960eefd4b6eec03d7316e qca-tls-1.0-r3.ebuild 1056
+SHA256 9193f67f6b2ea1883f43c7106a2e7cc67603a3745669027f16bd440515112794 qca-tls-1.0-r3.ebuild 1056
+MD5 5c94bbf537afbc17dc95e1a2c254d929 qca-tls-1.0.ebuild 1007
+RMD160 f9e6e540ac08e0613d89a631044d71f088e4651f qca-tls-1.0.ebuild 1007
+SHA256 3fce4f43c70d53fd01be4dfe68df0dbede72e7b78936326c5cd8d37a098cbdd5 qca-tls-1.0.ebuild 1007
diff --git a/app-crypt/qca-tls/files/digest-qca-tls-1.0-r3 b/app-crypt/qca-tls/files/digest-qca-tls-1.0-r3
new file mode 100644
index 000000000000..5c73b0dd50f5
--- /dev/null
+++ b/app-crypt/qca-tls/files/digest-qca-tls-1.0-r3
@@ -0,0 +1,3 @@
+MD5 886b1f60fc31de3b1a0bd93281e27b73 qca-tls-1.0.tar.bz2 23489
+RMD160 c553782e77ab54edde7e4f0676a3caad74dfa910 qca-tls-1.0.tar.bz2 23489
+SHA256 510edd7b1be3a4ac097b2b501fa908043aaa57f3efbab8e81cee0c8ae15af0cd qca-tls-1.0.tar.bz2 23489
diff --git a/app-crypt/qca-tls/files/qca-openssl-0.9.8.patch b/app-crypt/qca-tls/files/qca-openssl-0.9.8.patch
new file mode 100644
index 000000000000..2afb3079f6a7
--- /dev/null
+++ b/app-crypt/qca-tls/files/qca-openssl-0.9.8.patch
@@ -0,0 +1,26 @@
+--- qca-tls.cpp.orig	2005-12-27 22:22:32.000000000 +0000
++++ qca-tls.cpp
+@@ -454,7 +454,11 @@ public:
+ 			if(!r) {
+ 				// try this other public function, for whatever reason
+ 				p = (void *)in;
++#if OPENSSL_VERSION_NUMBER >= 0x00908000
++				r = d2i_RSA_PUBKEY(NULL, (const unsigned char **)&p, len);
++#else
+ 				r = d2i_RSA_PUBKEY(NULL, (unsigned char **)&p, len);
++#endif
+ 			}
+ 			if(r) {
+ 				if(pub) {
+@@ -798,7 +802,11 @@ public:
+ 
+ 	bool createFromDER(const char *in, unsigned int len)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x00908000
++		const unsigned char *p = (const unsigned char *)in;
++#else
+ 		unsigned char *p = (unsigned char *)in;
++#endif
+ 		X509 *t = d2i_X509(NULL, &p, len);
+ 		if(!t)
+ 			return false;
diff --git a/app-crypt/qca-tls/qca-tls-1.0-r3.ebuild b/app-crypt/qca-tls/qca-tls-1.0-r3.ebuild
new file mode 100644
index 000000000000..a1ad8243d268
--- /dev/null
+++ b/app-crypt/qca-tls/qca-tls-1.0-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/qca-tls-1.0-r3.ebuild,v 1.1 2006/02/13 10:50:15 humpback Exp $
+
+inherit eutils
+
+DESCRIPTION="plugin to provide SSL/TLS capability to programs that utilize the Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="http://delta.affinix.com/qca/"
+SRC_URI="http://delta.affinix.com/qca/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+#alpha amd64 and ppc64 need testing
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=app-crypt/qca-1.0
+	>=dev-libs/openssl-0.9.6i"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/qca-pathfix.patch
+	epatch ${FILESDIR}/qca-openssl-0.9.8.patch
+}
+
+src_compile() {
+	./configure || die "configure failed"
+	sed -i \
+		-e "/^CFLAGS/s:$: ${CFLAGS}:" \
+		-e "/^CXXFLAGS/s:$: ${CXXFLAGS}:" \
+		Makefile
+	emake || die "emake failed"
+}
+
+src_install() {
+	make INSTALL_ROOT="${D}" install || die "make install failed"
+	insinto /usr/include
+
+	dodoc README
+}