Fix bindist issues, bug#534770

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

4 files changed, 139 insertions, 9 deletions

diff --git a/app-crypt/xca/ChangeLog b/app-crypt/xca/ChangeLog
index fbb993ff340c..f051a455bc7a 100644
--- a/app-crypt/xca/ChangeLog
+++ b/app-crypt/xca/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/xca
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/ChangeLog,v 1.46 2014/12/21 20:07:18 alonbl Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/ChangeLog,v 1.47 2015/01/09 21:28:43 alonbl Exp $
+
+  09 Jan 2015; Alon Bar-Lev <alonbl@gentoo.org> +files/xca-1.1.0-ec.patch,
+  xca-1.1.0.ebuild:
+  Fix bindist issues, bug#534770
 
 *xca-1.1.0 (21 Dec 2014)
 
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 709e361f1d37..b3b9186309c7 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -7,19 +7,20 @@ AUX xca-0.9.1-ldflags.patch 270 SHA256 70c2f38a077c795b50d569c2e2230b3ba1d993623
 AUX xca-0.9.3-desktop.patch 555 SHA256 7c40fceb51e712dc1f5943515226c4e830d150525bb6fefd2ea1fcb195823b2f SHA512 9c03447ce611a67950f54e55ac6fbb0a9638a9647c67680174ffcf1ab77cf4dcaddf3e058b5dc70179be49bc3c8c22ec76c1263f30e8609ba607e05cdcc52dbd WHIRLPOOL d1bea9621a08809ddc30a1ec6c6ac0211436fa3bacdfbd5b2aea667609fdc58b2e787fdf1dc6bcd075916ab17c26602d5c9dcca0cae54ba1112832f85679869a
 AUX xca-0.9.3-openssl.patch 1272 SHA256 815804e524a4b63d387715af18746f21fa54ce2cd2a9a0047617b82a5a1b2447 SHA512 18ccc710f4b2b4e3eb6d4a79539840db1250ef96327313be4732f5dc24d012e85808b4ddc7e845923fbe25a512305295754a2561a3c427a281606c55f59e1d40 WHIRLPOOL 6722d12a744910539ace6cf4e4443efa2d7a6a391f4e8e316a4743913aa25faf2a0055876b697e186e2f9dc668b2abd904ba0eff0c93a9aa7dd71b36a285715c
 AUX xca-1.0.0-desktop.patch 386 SHA256 922e42a46dc08b194e4fc94437eaf1c6ba998b016c963a3b352db79b66ced4f4 SHA512 44e046563247d9f4e0d3d2c9db25fcb5d65944946ae563dcc61308193cc4e79daa575ba638dbe7f9346e60380f59a5e7bbd5aed6922b64128ff9562b1a10ca6a WHIRLPOOL 5e370d2fed01e56b1d042c4db28282303f763bf53850e04e4ef23ab6ebeda9e86c0414567e83d4c838fcb58e29709373dc54758294ed4f4203b9403cf14a7b45
+AUX xca-1.1.0-ec.patch 3592 SHA256 9392cfe834977f7a865ed80d35b5e817021582403e18de0244a01c9b69e4d2ed SHA512 8f0651dbacf97ee652be204e31bb1766a95d8271a26c84de42147c64fed8143079bc7d41de11f7c5d868100b05d160e50727e0018d4e8df243958e97612fc1e3 WHIRLPOOL a6d72b74580d1670eb919372d21a0f5a51caeb8b441e0f6b027ef50ca307b5bb30be17291f2f446e928a5df45be4a1143c21cbde628167ff0edc422ba2e6d21c
 DIST xca-0.9.3.tar.gz 755165 SHA256 6842b50c8b4478070d8af743cb72aee1f53a2c4ff2b8285fcec5f856119cc6ba SHA512 ec9ad88a9b3a48b72a5c00d6bb8893cb1fab5841bfb91d310730795a47909ff0428ab4df2ffa55abfe964efbd07eff5871b4cb5711f6c6d82351f64e718610bf WHIRLPOOL 3eadb63a9b3c8b4266b7f79226fdf70cfc27bdbea89e5ae3c3fd902d2720c5c8ff9634f856bec614c7a4313f73ed01aa8b009ac20f5481f2999a44a6a7423ae3
 DIST xca-1.0.0.tar.gz 802432 SHA256 44fea2f97ab166bcc98ebd7483279aa3cfb7085d11b3d5d439583ed3d57538df SHA512 6237141a7aba98ec885f267923f3fdd38977490400dd86dd7ed366ad7b9abe7baae6488addba3b409fe0aa765e7f5d9d480802b8614b5071b167d9db18cff7a9 WHIRLPOOL 3f922a6debae55284e39dab86cac561dd2b256f17961664bf1f291a7d72b6ae5000207906da11aac8576f20ad211e78be34d9cbcec9c426057eae8c130e1f53d
 DIST xca-1.1.0.tar.gz 854925 SHA256 997b62b523f6581f0d96a5f5ba2fa31dcdd2b3cf1ffe924f5c69a931b0dd44df SHA512 c22a594c61f63c71e8bc7c38ccdfabe05903a33bf5116630ca4c5072b725e551a128b10f624d01a464695d739fb9d77a510b3ced99fedc5d5378cb5fd563d954 WHIRLPOOL 1b58ec3dce44e0eb101265f7b1e68695ea2121c795f7d5f6a5349c812469c50f618ce34a5985991432b49a910b2c34fd3eb8e88ac735078a6e063801f1731be0
 EBUILD xca-0.9.3-r1.ebuild 1410 SHA256 e548d4616868cf9490e0e30b7cae0c14165e19bc9ae636e3f0db40305ace5a76 SHA512 5db6cb1c637266a02837b86ff2dba1d1f204b3f36212f40f9676e5c528ef49a5bc7f1cc4f8fb040b4009b2b42fa2dae8a7415749dcd465e67e59b155bf314b77 WHIRLPOOL f0c982a3c2d60b067e014646b0777cc608cc4767c41f30513558ad7ba702406c9406e654579e50171c516add95b1bdad6326009d10d745cbe46d358e0b359966
 EBUILD xca-0.9.3-r2.ebuild 1457 SHA256 3bd974adf5e5f7baf4e5529b4b685581ce6b72b39e242c6fae613cee4244348d SHA512 5fc108a0e4779a2b54d45f04fd2d4156947c3e4667e9688944ccdb83d5dfeee057caaed2ac28b56f1ae28c05b346dd99f65b97633f72fdfc403988f421c29695 WHIRLPOOL f848c4bde60397433ce7360df5227d0be20d821520860cceae34081af7a08dd37fe6008c6eb06e41c7e436167c68c4a216b7ffc2a25c669aa80c599833aa9158
 EBUILD xca-1.0.0.ebuild 1413 SHA256 e577fa4c2e50989c1b524653ede5fedd0032557467dcb8fdef9fa723ede4e9cc SHA512 ca62a235aa8ac83ac681665084c540ab0f612da335862b9bd7da15c2096fd23f6b535421b1b8209a0f4206ff5aefe0f631e8f43ab08dcddcf9e725ac4b00d314 WHIRLPOOL 4a9f5b9cb40bf27c4eb6ad94541f6720f2e0958cada4fd694c9d12f121f359e1fa6c5227fc2c53a4f6fd0cfff07be435efea5336a80a0a03e98aefbe626ee631
-EBUILD xca-1.1.0.ebuild 986 SHA256 e7e3e160004f660dad9fe79fec2d4612d258b66fbd22c428e39edc340d366d8c SHA512 b8521d3b643a3c16e7c0d4aff7ff058f285161ce08c0d45fc44241773d1aca45bcf0178f4630ceba4ea818f7a207597f171b5cdf9cd21cbfe28044cda6d5e482 WHIRLPOOL 94490b1e8a25de4135bb386803d68d19762f62ae228b293645b65d76fd99e1ee6208937264154827b49c7f6772a08bf9f514f1ed5c09468059947ba652dd5f7d
-MISC ChangeLog 7449 SHA256 b15f77a2ef5b0799dc65a3b27a5349571231deb8eaf999b69719f2e8e25cd2b9 SHA512 59abed4795e8aa957b3a745c46a282645535d8028c7b174e1569e076b9721721b60f14256733ecd0eac0623c6debc34446cac75b357a8471c85878b555050212 WHIRLPOOL 643f477d9f6944222a1c873744f70b77c8e184c7292455a03def2757275d6c2a8c28092276b875c0810ceb4bddd95443fad5ef3b1aace429e19ae096aecc2865
+EBUILD xca-1.1.0.ebuild 1022 SHA256 6ed52d81210aad60b6841c6dfd4f00e213a6f1cf7bc3b3660dbd928e232eddc8 SHA512 91b37074aeda23f1938b13c38e359586399ca1d72186aca5d79f5cedd79c0ed5e8c137e4be364e4ad70d542859816e305d018600fbb2e2feff435e2a12f7a7a6 WHIRLPOOL a78035c421e3ebe4f8f9764f897d22fa0f2a39cbe33ea441a679ebe2f645688112e73d7c429f1a5bc720ac643cf265958c73fb5ec3ae1cb07b43b57e4625d5fb
+MISC ChangeLog 7578 SHA256 807d6cb88a98ce6778890c9282bb3e9cfaaca15ddbcefad00bcb09f01a474491 SHA512 3cb70231b49d348013de2f7ff6e54c7d089ba4b7e9fbeb7052637ff2ee602be1dfb2b613f562088e9f35904e171396afa0ac7fd9a66a8e5b17d136ac8f3b9ace WHIRLPOOL d3ca166555f82fdce87247b522717f61141b284d1f110dba627cb27bb57b39253a28e2ba84ec07ddfd532a9c5069c02aa6b736b11086e1add5b6df8e190b2b32
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSXKHwACgkQXYk9GL8g3FF9hwD+LnLG8mLs8M8KDwB8vwXPBC6K
-NTngQ/KZbYlwUnRdfM4A/2jZUeuilWAyE4qVckN0ziM7r5gM+/zIlvDPaefMbsWn
-=j2Fy
+iF0EAREIAAYFAlSwSBUACgkQXYk9GL8g3FEG3QD/Q+F956Ua8HfaI9dM7oYVRfyD
+w2zl1Ii0j6clgbB2gCAA916bb6Q1E5QhS61WXucMek9sGzF56HISnfxYFeAlh0A=
+=YX+h
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/xca/files/xca-1.1.0-ec.patch b/app-crypt/xca/files/xca-1.1.0-ec.patch
new file mode 100644
index 000000000000..617f7a14c31e
--- /dev/null
+++ b/app-crypt/xca/files/xca-1.1.0-ec.patch
@@ -0,0 +1,124 @@
+From ca758f29c89d87581b244c652f7a14c8306cc994 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Wed, 7 Jan 2015 14:43:37 +0200
+Subject: [PATCH] Add more EC conditionals
+
+Upstream bug:
+https://sourceforge.net/p/xca/patches/16/
+
+---
+ lib/pki_scard.cpp   | 12 ++++++++++++
+ widgets/MW_help.cpp |  2 +-
+ widgets/NewKey.cpp  |  2 +-
+ 3 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/lib/pki_scard.cpp b/lib/pki_scard.cpp
+index 444c81d..547c932 100644
+--- a/lib/pki_scard.cpp
++++ b/lib/pki_scard.cpp
+@@ -237,7 +237,9 @@ pk11_attlist pki_scard::objectAttributesNoId(EVP_PKEY *pk, bool priv) const
+ 	QByteArray ba;
+ 	RSA *rsa = pk->pkey.rsa;
+ 	DSA *dsa = pk->pkey.dsa;
++#ifndef OPENSSL_NO_EC
+ 	EC_KEY *ec = pk->pkey.ec;
++#endif
+ 
+ 	pk11_attlist attrs(pk11_attr_ulong(CKA_CLASS,
+ 			priv ? CKO_PRIVATE_KEY : CKO_PUBLIC_KEY));
+@@ -254,6 +256,7 @@ pk11_attlist pki_scard::objectAttributesNoId(EVP_PKEY *pk, bool priv) const
+ 			pk11_attr_data(CKA_SUBPRIME, dsa->q, false) <<
+ 			pk11_attr_data(CKA_BASE, dsa->g, false);
+ 		break;
++#ifndef OPENSSL_NO_EC
+ 	case EVP_PKEY_EC:
+ 		ba = i2d_bytearray(I2D_VOID(i2d_ECPKParameters),
+ 				EC_KEY_get0_group(ec));
+@@ -261,6 +264,7 @@ pk11_attlist pki_scard::objectAttributesNoId(EVP_PKEY *pk, bool priv) const
+ 		attrs << pk11_attr_ulong(CKA_KEY_TYPE, CKK_EC) <<
+ 			pk11_attr_data(CKA_EC_PARAMS, ba);
+ 		break;
++#endif
+ 	default:
+ 		throw errorEx(QString("Unkown Keytype %d").arg(pk->type));
+ 
+@@ -330,7 +334,9 @@ void pki_scard::store_token(slotid slot, EVP_PKEY *pkey)
+ 	QByteArray ba;
+ 	RSA *rsa = pkey->pkey.rsa;
+ 	DSA *dsa = pkey->pkey.dsa;
++#ifndef OPENSSL_NO_EC
+ 	EC_KEY *ec = pkey->pkey.ec;
++#endif
+ 	pk11_attlist pub_atts;
+ 	pk11_attlist priv_atts;
+ 	QList<CK_OBJECT_HANDLE> objects;
+@@ -381,6 +387,7 @@ void pki_scard::store_token(slotid slot, EVP_PKEY *pkey)
+ 		priv_atts << pk11_attr_data(CKA_VALUE, dsa->priv_key, false);
+ 		pub_atts << pk11_attr_data(CKA_VALUE, dsa->pub_key, false);
+ 		break;
++#ifndef OPENSSL_NO_EC
+ 	case EVP_PKEY_EC: {
+ 		/* Public Key */
+ 		BIGNUM *point;
+@@ -410,6 +417,7 @@ void pki_scard::store_token(slotid slot, EVP_PKEY *pkey)
+ 					EC_KEY_get0_private_key(ec));
+ 		break;
+ 	}
++#endif
+ 	default:
+ 		throw errorEx(QString("Unkown Keytype %d").arg(pkey->type));
+ 
+@@ -459,11 +467,13 @@ QList<int> pki_scard::possibleHashNids()
+ 			case CKM_DSA_SHA1:        nids << NID_sha1; break;
+ 			}
+ 			break;
++#ifndef OPENSSL_NO_EC
+ 		case EVP_PKEY_EC:
+ 			switch (mechanism) {
+ 			case CKM_ECDSA_SHA1:      nids << NID_sha1; break;
+ 			}
+ 			break;
++#endif
+ 		}
+ 	}
+ 	if (nids.count() == 0) {
+@@ -473,7 +483,9 @@ QList<int> pki_scard::possibleHashNids()
+ 				NID_sha384 << NID_sha512 << NID_ripemd160;
+ 			break;
+ 		case EVP_PKEY_DSA:
++#ifndef OPENSSL_NO_EC
+ 		case EVP_PKEY_EC:
++#endif
+ 			nids << NID_sha1;
+ 			break;
+ 		}
+diff --git a/widgets/MW_help.cpp b/widgets/MW_help.cpp
+index 67faa2a..c13c309 100644
+--- a/widgets/MW_help.cpp
++++ b/widgets/MW_help.cpp
+@@ -65,7 +65,7 @@ void MainWindow::about()
+ 	}
+ #endif
+ #else
+-	brainpool = "(Elliptic Curve Cryptography support disabled)"
++	brainpool = "(Elliptic Curve Cryptography support disabled)";
+ #endif
+ 	openssl = SSLeay_version(SSLEAY_VERSION);
+ 	qt = qVersion();
+diff --git a/widgets/NewKey.cpp b/widgets/NewKey.cpp
+index 824456d..0dba2c2 100644
+--- a/widgets/NewKey.cpp
++++ b/widgets/NewKey.cpp
+@@ -79,8 +79,8 @@ class keyListItem
+ 				 */
+ 				ec_flags = CKF_EC_F_P | CKF_EC_F_2M;
+ 			}
+-		}
+ #endif
++		}
+ 		printname = QString("%1 #%2 (%3 Key of %4 - %5 bits)").
+ 			arg(ti.label()).arg(ti.serial()).
+ 			arg(tl->name).
+-- 
+2.0.5
+
diff --git a/app-crypt/xca/xca-1.1.0.ebuild b/app-crypt/xca/xca-1.1.0.ebuild
index a7e8eaee2809..b83bc9ea4a85 100644
--- a/app-crypt/xca/xca-1.1.0.ebuild
+++ b/app-crypt/xca/xca-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/xca-1.1.0.ebuild,v 1.1 2014/12/21 20:07:18 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/xca-1.1.0.ebuild,v 1.2 2015/01/09 21:28:43 alonbl Exp $
 
 EAPI="5"
 
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.0.0-desktop.patch
+	epatch "${FILESDIR}"/${P}-ec.patch
 }
 
 src_configure() {