diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
| commit | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch) | |
| tree | c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /dev-db/sqlitestudio | |
| parent | 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff) | |
gentoo resync : 05.04.2019
Diffstat (limited to 'dev-db/sqlitestudio')
| -rw-r--r-- | dev-db/sqlitestudio/Manifest | 3 | ||||
| -rw-r--r-- | dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch | 32 | ||||
| -rw-r--r-- | dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild (renamed from dev-db/sqlitestudio/sqlitestudio-3.2.1.ebuild) | 1 |
3 files changed, 35 insertions, 1 deletions
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest index fe9ab4405fc1..7c59386a9bdd 100644 --- a/dev-db/sqlitestudio/Manifest +++ b/dev-db/sqlitestudio/Manifest @@ -1,3 +1,4 @@ +AUX sqlitestudio-3.2.1-libressl.patch 1248 BLAKE2B 7500c5231d03a2c1e2006631b77076a0cb6af49609446544f7e3901b748e87a2be03b232ef8f93714220542fff56f48e92c2de39d8a54889d7472b142071c71f SHA512 6fafceed80e8d072d06060f15787d855bfcfb55a502a73655beca043a73c45101bf5d3168781a2579c9e6aee5d924318240c886fe982cb0c833779d57be97405 DIST sqlitestudio-3.2.1.tar.gz 9405867 BLAKE2B 53cd8465a6140cf17c602094cceef2fdf74f513f33257b22e1a3d7adcb9c78d8eb2cdaff047920836a9d98429ba0025924ce608f2eab97319feabf063de4c9ee SHA512 9c07f0dc50bf35ad04d0cb06cfc1a306d3f0aa9446e7d737c8187c63cb7dd2c44fb4b960693f2c30a15ece3aac0878701874a9ce3cebfe0c6bf48df10814a574 -EBUILD sqlitestudio-3.2.1.ebuild 3702 BLAKE2B 0c948401a7134af8d8db54ff53689e7d13df1481ca47983c4ceecf0b7e47f69d0ce55df44da1a5dd57dad9cb6823b15287ef29ae72ba13a3eba657b92fedc2f9 SHA512 194b248204b5ffafbc05db47fe161b0177204b40030314e1e720a4163d9002ad1f64bd87d41191a413392bdd1cd833e48651158968bf4b06f9df5e48a4281120 +EBUILD sqlitestudio-3.2.1-r1.ebuild 3748 BLAKE2B ef74b59ba8bbf8d39a77e4a31d061fb2ed090b2181b3198449efd9d58c175c0e8547597a56dd94d7f3da88a299e678f8ebb2aa53396e5bfb129bb4d48dfa79ba SHA512 29fd5e1257f6ea0b0d56ddb9e44b4e6442a4ccfb67d9815b04a08605158f828bc7f9a28557f2a974fabc98fdff4782b807ed1c52a8a32ef6269a1339c076b2a2 MISC metadata.xml 427 BLAKE2B 937831b3acf561038a945599a81766c4fd1712d889b8bb0ba2c7b8c0d2414c547e270363b6ece7fd7956b66f1eec2e12bb4b83a2adf2718c14d0271d3c0f0155 SHA512 a6948ce576abceb4df085f103e097a720ef5f959c6f4bb79cc1f1d858e43cea625d5af3c5edf47f5e61c0a537368e60abd77ed3fcf39a9526543de315ef125b2 diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch new file mode 100644 index 000000000000..06552942e945 --- /dev/null +++ b/dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch @@ -0,0 +1,32 @@ +From 64542c8c5cb3ad9249fa353ff4472c405057d743 Mon Sep 17 00:00:00 2001 +From: Stefan Strogin <stefan.strogin@gmail.com> +Date: Mon, 25 Mar 2019 18:07:13 +0200 +Subject: [PATCH] #3505 Fix compilation with LibreSSL >=2.7.0 + +HMAC_CTX_{new,free} were provided by LibreSSL 2.7.0. +Do not redefine them, otherwise it breaks compilation. + +Upstream-Status: Accepted +[https://github.com/pawelsalawa/sqlitestudio/pull/3507] +Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com> +--- + Plugins/DbSqliteCipher/sqlcipher.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Plugins/DbSqliteCipher/sqlcipher.c b/Plugins/DbSqliteCipher/sqlcipher.c +index 4918cb6f..10c4e5a3 100644 +--- a/Plugins/DbSqliteCipher/sqlcipher.c ++++ b/Plugins/DbSqliteCipher/sqlcipher.c +@@ -21638,7 +21638,8 @@ static unsigned int openssl_external_init = 0; + static unsigned int openssl_init_count = 0; + static sqlcipher_sqlite3_mutex* openssl_rand_mutex = NULL; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + static HMAC_CTX *HMAC_CTX_new(void) + { + HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx)); +-- +2.21.0 + diff --git a/dev-db/sqlitestudio/sqlitestudio-3.2.1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild index bd8f78a3763d..f1b05ce7abeb 100644 --- a/dev-db/sqlitestudio/sqlitestudio-3.2.1.ebuild +++ b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild @@ -36,6 +36,7 @@ DEPEND="${RDEPEND} dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) " +PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) S="${WORKDIR}" core_build_dir="${S}/output/build" |