| 1 |
commit: 9a28e54de3798ec4ce92508cc2c4c67b985f817f |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 14 19:17:22 2019 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 14 19:17:38 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a28e54d |
| 7 |
|
| 8 |
net-libs/gnutls: fix build failure |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=675424 |
| 11 |
Thanks: Toralf Förster |
| 12 |
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> |
| 13 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 14 |
|
| 15 |
net-libs/gnutls/files/gnutls-3.6.5-build.patch | 31 ++++++++++++++++++++++++++ |
| 16 |
net-libs/gnutls/gnutls-3.6.5.ebuild | 4 ++++ |
| 17 |
2 files changed, 35 insertions(+) |
| 18 |
|
| 19 |
diff --git a/net-libs/gnutls/files/gnutls-3.6.5-build.patch b/net-libs/gnutls/files/gnutls-3.6.5-build.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..00c11da4ae7 |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-libs/gnutls/files/gnutls-3.6.5-build.patch |
| 24 |
@@ -0,0 +1,31 @@ |
| 25 |
+From b7fdb4125e4eebc5af2155b6d36cf17339a3abf5 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Dmitry Eremin-Solenikov <dbaryshkov@×××××.com> |
| 27 |
+Date: Tue, 25 Dec 2018 14:44:11 +0300 |
| 28 |
+Subject: [PATCH] tests: cipher-openssl-compat: don't call |
| 29 |
+ EVP_CIPHER_CTX_init() |
| 30 |
+ |
| 31 |
+There is no need to call EVP_CIPHER_CTX_init() after |
| 32 |
+EVP_CIPHER_CTX_new(). |
| 33 |
+ |
| 34 |
+Fixes #658 |
| 35 |
+ |
| 36 |
+Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@×××××.com> |
| 37 |
+--- |
| 38 |
+ tests/slow/cipher-openssl-compat.c | 1 - |
| 39 |
+ 1 file changed, 1 deletion(-) |
| 40 |
+ |
| 41 |
+diff --git a/tests/slow/cipher-openssl-compat.c b/tests/slow/cipher-openssl-compat.c |
| 42 |
+index a4cb3522d..64adf25a4 100644 |
| 43 |
+--- a/tests/slow/cipher-openssl-compat.c |
| 44 |
++++ b/tests/slow/cipher-openssl-compat.c |
| 45 |
+@@ -106,7 +106,6 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher, |
| 46 |
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L |
| 47 |
+ if (gcipher == GNUTLS_CIPHER_AES_128_CCM |
| 48 |
+ || gcipher == GNUTLS_CIPHER_AES_256_CCM) { |
| 49 |
+- assert(EVP_CIPHER_CTX_init(ctx)==1); |
| 50 |
+ assert(EVP_CipherInit_ex(ctx, evp_cipher, 0, 0, 0, 0) > |
| 51 |
+ 0); |
| 52 |
+ |
| 53 |
+-- |
| 54 |
+2.19.2 |
| 55 |
+ |
| 56 |
|
| 57 |
diff --git a/net-libs/gnutls/gnutls-3.6.5.ebuild b/net-libs/gnutls/gnutls-3.6.5.ebuild |
| 58 |
index 0e4f46b96b2..883584c16a7 100644 |
| 59 |
--- a/net-libs/gnutls/gnutls-3.6.5.ebuild |
| 60 |
+++ b/net-libs/gnutls/gnutls-3.6.5.ebuild |
| 61 |
@@ -53,6 +53,10 @@ DOCS=( |
| 62 |
|
| 63 |
HTML_DOCS=() |
| 64 |
|
| 65 |
+PATCHES=( |
| 66 |
+ "${FILESDIR}/${P}-build.patch" |
| 67 |
+) |
| 68 |
+ |
| 69 |
pkg_setup() { |
| 70 |
# bug#520818 |
| 71 |
export TZ=UTC |
Archives