From: Samuli Suominen <ssuominen@gentoo.org>
Date: Sun, 11 Jul 2010 07:52:10 +0000 (+0000)
Subject: Fix building with OpenSSL >= 1.0.0 wrt #324959.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f90a98b9b418c9c7cecb0f27c68657e17ccd38db;p=gentoo.git

Fix building with OpenSSL >= 1.0.0 wrt #324959.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/dev-libs/libgeier/ChangeLog b/dev-libs/libgeier/ChangeLog
index 05699d502800..34dc122a7368 100644
--- a/dev-libs/libgeier/ChangeLog
+++ b/dev-libs/libgeier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libgeier
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgeier/ChangeLog,v 1.17 2010/07/10 15:17:24 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgeier/ChangeLog,v 1.18 2010/07/11 07:52:10 ssuominen Exp $
+
+  11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> libgeier-0.11.ebuild,
+  +files/libgeier-0.11-openssl-1.patch:
+  Fix building with OpenSSL >= 1.0.0 wrt #324959.
 
   10 Jul 2010; Christian Faulhammer <fauli@gentoo.org> libgeier-0.11.ebuild:
   stable x86, bug 319827
diff --git a/dev-libs/libgeier/Manifest b/dev-libs/libgeier/Manifest
index fb0adb905ac4..feb04bac3529 100644
--- a/dev-libs/libgeier/Manifest
+++ b/dev-libs/libgeier/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libgeier-0.11-openssl-1.patch 866 RMD160 2766379e0e20d441a5d308bd3a24ca7549f34a79 SHA1 e648e67380db58a201a2c0dddf2942e692fd1a3a SHA256 a5fb0b3522ec08cf3a767795b776dbabc5294439735dc34863480ff545c978e1
 DIST libgeier-0.11.tar.gz 463121 RMD160 67bfde8950098537b41dc0844590c62911802167 SHA1 3e4a152d49afbf49ed260f71c8215a67ed6b53e4 SHA256 be786ae40c9a30e4695d0361aa575b0bb2968e0185d30a3560d5ae3e964a62c4
-EBUILD libgeier-0.11.ebuild 718 RMD160 865d5e858d695e484c6105c9bb1cc2b0c213d734 SHA1 e4d47f2edda2b3970c79bc3604fbfc040f38a923 SHA256 ac439081688c61fbc044d4e7713cd665dcdb8931142ed19e78ac11ef2ca11e17
-MISC ChangeLog 2333 RMD160 1aea023a1adb3d1094e567fc131c77087fc28f11 SHA1 eaaf9b7c07881bd40715188310b5beffadb4c5fd SHA256 c8567cc74473cfbd5e469eaf65626e61c9d3f513c115f933e5290ef403488b8b
+EBUILD libgeier-0.11.ebuild 807 RMD160 b9cbd2d16ad2c2ca4676a4ff7381d97851c17672 SHA1 2a662f37852634beeedf8d0913428a0a57472612 SHA256 89b0312346d09afb632350febe08ee637978f23fc13e63951c0984ba80f8bc52
+MISC ChangeLog 2504 RMD160 106c3f627e5b764a16e4b965317e8138d10443fc SHA1 e91e1444971e8ae9229f23cf80401a0c557e7977 SHA256 e479f2d3b80365561c5ff94a7bf32af325350ff7a8b8d767aabb765dd5709c47
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkw4j2YACgkQNQqtfCuFneNk0wCghAmiqe8U4y/0LbV3OuVTK5cz
-Ak8An1c0x/yqZQjEg9v9yfBNCKLJNeV4
-=vmap
------END PGP SIGNATURE-----
diff --git a/dev-libs/libgeier/files/libgeier-0.11-openssl-1.patch b/dev-libs/libgeier/files/libgeier-0.11-openssl-1.patch
new file mode 100644
index 000000000000..28fff5733a0a
--- /dev/null
+++ b/dev-libs/libgeier/files/libgeier-0.11-openssl-1.patch
@@ -0,0 +1,29 @@
+http://bugs.gentoo.org/324959
+
+--- src/openssl/dsig-get-attr.c
++++ src/openssl/dsig-get-attr.c
+@@ -47,7 +47,11 @@
+ 			ASN1_TYPE *val = sk_ASN1_TYPE_value(attr->value.set,0);
+ 
+ 			if(val->type == V_ASN1_BMPSTRING)
++				#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++				return OPENSSL_uni2asc(val->value.bmpstring->data,
++				#else
+ 				return uni2asc(val->value.bmpstring->data,
++				#endif
+ 					       val->value.bmpstring->length);
+ 
+ 			if(val->type == V_ASN1_OCTET_STRING)
+--- src/openssl/pkcs7_encrypt.c
++++ src/openssl/pkcs7_encrypt.c
+@@ -269,6 +269,10 @@
+ 	char buf[512];
+ 	EVP_PKEY *elster_pubkey = X509_get_pubkey((X509 *)x509_cert);
+ 
++	#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
++	#endif
++
+ 	int len = EVP_PKEY_encrypt((unsigned char *) buf,
+ 				   key, EVP_CIPHER_key_length(cipher),
+ 				   elster_pubkey);
diff --git a/dev-libs/libgeier/libgeier-0.11.ebuild b/dev-libs/libgeier/libgeier-0.11.ebuild
index f750259f9983..1c696953b59f 100644
--- a/dev-libs/libgeier/libgeier-0.11.ebuild
+++ b/dev-libs/libgeier/libgeier-0.11.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgeier/libgeier-0.11.ebuild,v 1.4 2010/07/10 15:17:23 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgeier/libgeier-0.11.ebuild,v 1.5 2010/07/11 07:52:10 ssuominen Exp $
+
+EAPI=2
+inherit eutils
 
 DESCRIPTION="Libgeier provides a library to access the german digital tax project ELSTER."
 HOMEPAGE="http://www.taxbird.de/"
@@ -20,6 +23,10 @@ RDEPEND="dev-libs/libxml2
 DEPEND="${RDEPEND}
 	dev-lang/swig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-openssl-1.patch
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc README || die