From e26a572ff17f6d690145ea6dcfb40b8799eee656 Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Thu, 6 Jul 2017 08:20:04 +0300 Subject: [PATCH] dev-db/sqlcipher: fix building with libressl MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reported-by: Toralf Förster Gentoo-Bug: 622114 Package-Manager: Portage-2.3.5, Repoman-2.3.1 --- dev-db/sqlcipher/files/sqlcipher-3.4.1-libressl.patch | 11 +++++++++++ dev-db/sqlcipher/sqlcipher-3.4.1.ebuild | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 dev-db/sqlcipher/files/sqlcipher-3.4.1-libressl.patch diff --git a/dev-db/sqlcipher/files/sqlcipher-3.4.1-libressl.patch b/dev-db/sqlcipher/files/sqlcipher-3.4.1-libressl.patch new file mode 100644 index 000000000000..f12f1284514d --- /dev/null +++ b/dev-db/sqlcipher/files/sqlcipher-3.4.1-libressl.patch @@ -0,0 +1,11 @@ +--- a/src/crypto_openssl.c 2017-07-06 08:11:21.560000000 +0300 ++++ b/src/crypto_openssl.c 2017-07-06 08:11:32.180000000 +0300 +@@ -46,7 +46,7 @@ + static unsigned int openssl_init_count = 0; + static sqlite3_mutex* openssl_rand_mutex = NULL; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + static HMAC_CTX *HMAC_CTX_new(void) + { + HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx)); diff --git a/dev-db/sqlcipher/sqlcipher-3.4.1.ebuild b/dev-db/sqlcipher/sqlcipher-3.4.1.ebuild index 605697d2a084..398c9b506354 100644 --- a/dev-db/sqlcipher/sqlcipher-3.4.1.ebuild +++ b/dev-db/sqlcipher/sqlcipher-3.4.1.ebuild @@ -33,6 +33,9 @@ DOCS=( README.md ) src_prepare() { append-cflags -DSQLITE_HAS_CODEC + # bug #622114 + epatch "${FILESDIR}/${P}-libressl.patch" + eapply_user eautoreconf } -- 2.26.2