[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlcipher/, dev-db/sqlcipher/files/

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlcipher/, dev-db/sqlcipher/files/

[Sergey Popov]

commit:     e26a572ff17f6d690145ea6dcfb40b8799eee656
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  6 05:20:04 2017 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Thu Jul  6 05:20:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e26a572f

dev-db/sqlcipher: fix building with libressl

Reported-by: Toralf Förster <toralf <AT> gentoo.org>
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(+)

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 00000000000..f12f1284514
--- /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 605697d2a08..398c9b50635 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
 }