gentoo resync : 25.08.2018

3 files changed, 43 insertions, 5 deletions

diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index 74035d3eec9f..66da44492a54 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,7 +1,8 @@
+AUX pkcs11-helper-1.25.1-build.patch 932 BLAKE2B 792082e48c6566c47ec4b043ccd7762d2c94d8c6f6d7fe8233f91e8f17c2361cb1786644ad7e77f8f0c398cc8d86167f675257a9dbf62a40bd56f1e7c9cb6d40 SHA512 81494d947f62b9cf4aa45fe35a88afb0044a5b36fa89e7f175cb9ab4e1d17ffc6afc81a8da17ab18f087b47894460d0d8c26ca8024c98a73a4bc2a14bbf00346
 DIST pkcs11-helper-1.21.tar.bz2 417527 BLAKE2B 39b2b405ada79e0077c810b3537853051bbaf1cb4d79bedaedf04156066b573c9186ee587c869ed49053a0b471fa239447edef71184d421fb6ac2e65e3a58830 SHA512 064b04c1ece2db0757e14263955c0f7488edde5f5f4415ebda9c4370e608d7df681706ddefcdba2392e5642d00ebd4c211f15266bb39baf8da46ffaec4f3e572
 DIST pkcs11-helper-1.24.tar.bz2 425627 BLAKE2B 2489af89dc4be6d056facedecf38fc42079c18ee74ca4f9621cf11b1060e2f463318d0efc263df5009eab01771c98e44a3efe7246ccbdc8982a130592327beca SHA512 28e9b53dd36e4e3fa8e30b7ad76af3bcfce1947d228f07e607a26aa6b06ee3bf1fd6f5a0ebf8ec581a16074de7b21e53f3b225e1cb1f58d4ded7bff2c50a6376
-DIST pkcs11-helper-1.25.tar.bz2 425599 BLAKE2B 6272b5ff2d3eb2ea366ec2b9a6772f93877455b3349a51d696e0450ebd6c6947ced9a2565b2d11a4407abb80348aafabc8e56eb95bce720e3d01bb339fc2f8f7 SHA512 2b425d010cd0a7d6a21b3189f65d2db93d904e1634fa4b23df9a1417521d72fda7bcd595951295bbcdec8151dc5a167fdd7c4310a16474e404f578e2d20db69d
+DIST pkcs11-helper-1.25.1.tar.bz2 425719 BLAKE2B 527b387a981dbfd855d4eb0024dd7625388cda27c3a0e993b49315e311d46f1735afc8d436361ac1b75a7b3d7f1f712d7dda8eb546ab7adc3dc046bc85fd4c5a SHA512 a5954f4d07a166ed7e711b7a0aa84b454b25774b2fb187ca65bba439f59539c8074bda8ddd5f579d635fe0dc27d8415d8bd22707dc91327bbe05ce03e277b499
 EBUILD pkcs11-helper-1.21-r1.ebuild 993 BLAKE2B ab38240b1b8872fc624526b86b28efe4b947f586f36bbac74468e3e06b9bc640f2a5f82d7e419a2f27f74bb4595043a11f20c3bb3a78972ef76bcb45bf53218d SHA512 6c1b9cfc5ce449010a0c7fee9d7fcdfd45821b582aa68bbcb70aa0ed211528aafd6ae434388b16078663911069b014f6fe7cd2df79f71a93489410226b4e8272
 EBUILD pkcs11-helper-1.24.ebuild 1002 BLAKE2B 72f811926ec93cd90e805705b8642faa93150c13b9f1ecf6c0c9243375e2903e41642ef2463846ebd10aa7bd8515dfbcc295291b585833c7b0f8257960b6543a SHA512 884b85e55231f025b8f55e5b74b82eeab5d1803755b63dd767df7e336e7a9584b94aff1c4f71eaf9e8d5c8f1cfe5429d5beaaaa4856cf1d6aee49ba6617bbb25
-EBUILD pkcs11-helper-1.25.ebuild 1002 BLAKE2B 72f811926ec93cd90e805705b8642faa93150c13b9f1ecf6c0c9243375e2903e41642ef2463846ebd10aa7bd8515dfbcc295291b585833c7b0f8257960b6543a SHA512 884b85e55231f025b8f55e5b74b82eeab5d1803755b63dd767df7e336e7a9584b94aff1c4f71eaf9e8d5c8f1cfe5429d5beaaaa4856cf1d6aee49ba6617bbb25
+EBUILD pkcs11-helper-1.25.1.ebuild 1060 BLAKE2B ad7da4e7aba600cf143aebf0761bc44959a7a12003012d3c304c9722a2da5559171aab4741261c2c8ed1ebb0a437be41230e6a3b956677815f5abc67895c9e6f SHA512 273ad805064811f571195d9f240c3b856d460f3bdc548c6df29376b879dff75e962ea2a1cff6b6c17e136a24ca36a4f1326ddd7b7628fac8bf438590d2b05008
 MISC metadata.xml 442 BLAKE2B 83c40281896d78612f6e624c6335ade3b04be710debd1a8a40da1c569c84a66f6b61eceb07bc4f31d659d2ccc2d5c6fb6fa5ed3a22e5839656e210147a8ddc2e SHA512 ec42c4dd8aaba2001a76530f2cbe2869791f2d88c8ecaa323eb418ed6156751bb5cb143ecc1ba3901afcff42ba78ea099c42a3a2b3b8ae258bbaf9c8990116dc
diff --git a/dev-libs/pkcs11-helper/files/pkcs11-helper-1.25.1-build.patch b/dev-libs/pkcs11-helper/files/pkcs11-helper-1.25.1-build.patch
new file mode 100644
index 000000000000..a657dba14ce2
--- /dev/null
+++ b/dev-libs/pkcs11-helper/files/pkcs11-helper-1.25.1-build.patch
@@ -0,0 +1,33 @@
+From 0e2ae10ef9611beef92457171e8c78d8e936dfca Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Wed, 22 Aug 2018 20:24:19 +0300
+Subject: [PATCH] openssl: build with openssl ec disabled
+
+---
+ ChangeLog             | 1 +
+ lib/pkcs11h-openssl.c | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/pkcs11h-openssl.c b/lib/pkcs11h-openssl.c
+index c981e21..4ebc211 100644
+--- a/lib/pkcs11h-openssl.c
++++ b/lib/pkcs11h-openssl.c
+@@ -263,6 +263,7 @@ DSA_SIG_set0 (DSA_SIG *sig, BIGNUM *r, BIGNUM *s)
+ }
+ #endif
+ 
++#ifdef __ENABLE_EC
+ #ifndef HAVE_ECDSA_SIG_SET0
+ static int
+ ECDSA_SIG_set0 (ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
+@@ -275,7 +276,6 @@ ECDSA_SIG_set0 (ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
+ }
+ #endif
+ 
+-#ifdef __ENABLE_EC
+ #ifndef HAVE_EC_KEY_METHOD_GET_SIGN
+ void EC_KEY_METHOD_get_sign(const EC_KEY_METHOD *meth,
+ 	int (**psign)(int type, const unsigned char *dgst,
+-- 
+2.16.4
+
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
index 02e44a3a603b..f207f2094d9f 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc gnutls libressl nss static-libs"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+IUSE="bindist doc gnutls libressl nss static-libs"
 
 RDEPEND="
-	!libressl? ( >=dev-libs/openssl-0.9.7:= )
+	!libressl? ( >=dev-libs/openssl-0.9.7:=[bindist=] )
 	libressl? ( dev-libs/libressl )
 	gnutls? ( >=net-libs/gnutls-1.4.4 )
 	nss? ( dev-libs/nss )"
@@ -23,6 +23,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( >=app-doc/doxygen-1.4.7 )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
 src_configure() {
 	econf \
 		--disable-crypto-engine-polarssl \