summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2019-02-26 12:54:37 +0300
committerSergey Popov <pinkbyte@gentoo.org>2019-02-26 12:54:37 +0300
commit1f3fafce7f1c7c2a2c06a2ac8bd43347de4d929f (patch)
tree0d2ce19e91f8e6774a778719604a6b0e781587e7
parentnet-print/foomatic-db: Remove old (diff)
downloadgentoo-1f3fafce7f1c7c2a2c06a2ac8bd43347de4d929f.tar.gz
gentoo-1f3fafce7f1c7c2a2c06a2ac8bd43347de4d929f.tar.bz2
gentoo-1f3fafce7f1c7c2a2c06a2ac8bd43347de4d929f.zip
dev-db/sqlcipher: fix building with LibreSSL 2.8
Signed-off-by: Sergey Popov <pinkbyte@gentoo.org> Reported-by: Dmitry Grigoriev <dimgel@mail.ru> Closes: https://bugs.gentoo.org/678502 Package-Manager: Portage-2.3.51, Repoman-2.3.10
-rw-r--r--dev-db/sqlcipher/files/sqlcipher-3.4.2-libressl-2.8.patch11
-rw-r--r--dev-db/sqlcipher/sqlcipher-3.4.2.ebuild5
2 files changed, 15 insertions, 1 deletions
diff --git a/dev-db/sqlcipher/files/sqlcipher-3.4.2-libressl-2.8.patch b/dev-db/sqlcipher/files/sqlcipher-3.4.2-libressl-2.8.patch
new file mode 100644
index 000000000000..da4c55eddfa0
--- /dev/null
+++ b/dev-db/sqlcipher/files/sqlcipher-3.4.2-libressl-2.8.patch
@@ -0,0 +1,11 @@
+--- a/src/crypto_openssl.c 2017-12-21 14:31:28.000000000 -0500
++++ b/src/crypto_openssl.c 2019-02-22 12:33:54.110516410 -0500
+@@ -47,7 +47,7 @@
+ static unsigned int openssl_init_count = 0;
+ static sqlite3_mutex* openssl_rand_mutex = NULL;
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x2080000L
+ static HMAC_CTX *HMAC_CTX_new(void)
+ {
+ HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));
diff --git a/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild b/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
index fd967068f3ca..e660467e442a 100644
--- a/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
+++ b/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -36,6 +36,9 @@ REQUIRED_USE="
DOCS=( README.md )
src_prepare() {
+ # bug #678502
+ eapply "${FILESDIR}/${P}-libressl-2.8.patch"
+
append-cflags -DSQLITE_HAS_CODEC
eapply_user
eautoreconf