1 |
commit: eae87461f822494a5bae477f253469cef65978bf |
2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 20 19:06:31 2019 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 20 19:06:31 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=eae87461 |
7 |
|
8 |
dev-db/sqlcipher: drop as changes are carried in gentoo.git |
9 |
|
10 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
11 |
|
12 |
dev-db/sqlcipher/Manifest | 1 - |
13 |
.../sqlcipher/files/sqlcipher-libressl-2_7.patch | 31 ----------- |
14 |
dev-db/sqlcipher/metadata.xml | 11 ---- |
15 |
dev-db/sqlcipher/sqlcipher-3.4.2.ebuild | 63 ---------------------- |
16 |
4 files changed, 106 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/sqlcipher/Manifest b/dev-db/sqlcipher/Manifest |
19 |
deleted file mode 100644 |
20 |
index 300a266..0000000 |
21 |
--- a/dev-db/sqlcipher/Manifest |
22 |
+++ /dev/null |
23 |
@@ -1 +0,0 @@ |
24 |
-DIST sqlcipher-3.4.2.tar.gz 14743960 BLAKE2B 88ee265b02bb9a42734c2ef93070c8fd8e13d546d7cc85e7fbfd6e6046ccbf2626d75e14b19cbba379c99784c7311d0100de06235b99b4908c60c99890d8d7a2 SHA512 c620bf2b175e404afd60ebe76b5476f5a447ff5fcdfa31bebc3f4bd7f1ebfcd507ee423cd582c9b3d6431d8b57320171492da2586e1a739adb4f440e7443dc03 |
25 |
|
26 |
diff --git a/dev-db/sqlcipher/files/sqlcipher-libressl-2_7.patch b/dev-db/sqlcipher/files/sqlcipher-libressl-2_7.patch |
27 |
deleted file mode 100644 |
28 |
index d3c8db3..0000000 |
29 |
--- a/dev-db/sqlcipher/files/sqlcipher-libressl-2_7.patch |
30 |
+++ /dev/null |
31 |
@@ -1,31 +0,0 @@ |
32 |
-diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c |
33 |
-index a45db3b..4344076 100644 |
34 |
---- a/src/crypto_openssl.c |
35 |
-+++ b/src/crypto_openssl.c |
36 |
-@@ -47,7 +47,7 @@ static unsigned int openssl_external_init = 0; |
37 |
- static unsigned int openssl_init_count = 0; |
38 |
- static sqlite3_mutex* openssl_rand_mutex = NULL; |
39 |
- |
40 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
41 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) |
42 |
- static HMAC_CTX *HMAC_CTX_new(void) |
43 |
- { |
44 |
- HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx)); |
45 |
-@@ -117,7 +117,7 @@ static int sqlcipher_openssl_activate(void *ctx) { |
46 |
- |
47 |
- if(openssl_init_count == 0 && openssl_external_init == 0) { |
48 |
- /* if the library was not externally initialized, then should be now */ |
49 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
50 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) |
51 |
- OpenSSL_add_all_algorithms(); |
52 |
- #endif |
53 |
- } |
54 |
-@@ -154,7 +154,7 @@ static int sqlcipher_openssl_deactivate(void *ctx) { |
55 |
- Note: this code will only be reached if OpensSSL_add_all_algorithms() |
56 |
- is called by SQLCipher internally. This should prevent SQLCipher from |
57 |
- "cleaning up" openssl when it was initialized externally by the program */ |
58 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
59 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) |
60 |
- EVP_cleanup(); |
61 |
- #endif |
62 |
- } else { |
63 |
|
64 |
diff --git a/dev-db/sqlcipher/metadata.xml b/dev-db/sqlcipher/metadata.xml |
65 |
deleted file mode 100644 |
66 |
index 97d08da..0000000 |
67 |
--- a/dev-db/sqlcipher/metadata.xml |
68 |
+++ /dev/null |
69 |
@@ -1,11 +0,0 @@ |
70 |
-<?xml version="1.0" encoding="UTF-8"?> |
71 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
72 |
-<pkgmetadata> |
73 |
- <maintainer type="person"> |
74 |
- <email>pinkbyte@g.o</email> |
75 |
- <name>Sergey Popov</name> |
76 |
- </maintainer> |
77 |
- <upstream> |
78 |
- <remote-id type="github">sqlcipher/sqlcipher</remote-id> |
79 |
- </upstream> |
80 |
-</pkgmetadata> |
81 |
|
82 |
diff --git a/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild b/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild |
83 |
deleted file mode 100644 |
84 |
index e6a388f..0000000 |
85 |
--- a/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild |
86 |
+++ /dev/null |
87 |
@@ -1,63 +0,0 @@ |
88 |
-# Copyright 1999-2018 Gentoo Foundation |
89 |
-# Distributed under the terms of the GNU General Public License v2 |
90 |
- |
91 |
-EAPI=6 |
92 |
- |
93 |
-inherit autotools eutils flag-o-matic multilib-minimal |
94 |
- |
95 |
-DESCRIPTION="Full Database Encryption for SQLite" |
96 |
-HOMEPAGE="https://www.zetetic.net/sqlcipher/" |
97 |
-SRC_URI="https://github.com/sqlcipher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
98 |
- |
99 |
-LICENSE="BSD" |
100 |
-SLOT="0" |
101 |
-KEYWORDS="~amd64 ~x86" |
102 |
- |
103 |
-IUSE="libedit readline libressl static-libs tcl test" |
104 |
- |
105 |
-# Tcl is always needed by buildsystem |
106 |
-RDEPEND=" |
107 |
- libedit? ( dev-libs/libedit[${MULTILIB_USEDEP}] ) |
108 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
109 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
110 |
- readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) |
111 |
- tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] ) |
112 |
-" |
113 |
-DEPEND="${RDEPEND} |
114 |
- dev-lang/tcl:*" |
115 |
- |
116 |
-# Libedit and readline support are mutually exclusive |
117 |
-# Testsuite requires compilation with TCL, bug #582584 |
118 |
-REQUIRED_USE=" |
119 |
- libedit? ( !readline ) |
120 |
- test? ( tcl ) |
121 |
-" |
122 |
- |
123 |
-DOCS=( README.md ) |
124 |
- |
125 |
-src_prepare() { |
126 |
- append-cflags -DSQLITE_HAS_CODEC |
127 |
- |
128 |
- epatch "${FILESDIR}/sqlcipher-libressl-2_7.patch" |
129 |
- eapply_user |
130 |
- eautoreconf |
131 |
-} |
132 |
- |
133 |
-multilib_src_configure() { |
134 |
- ECONF_SOURCE=${S} \ |
135 |
- econf \ |
136 |
- --enable-fts3 \ |
137 |
- --enable-fts4 \ |
138 |
- --enable-fts5 \ |
139 |
- --enable-json1 \ |
140 |
- --enable-tempstore \ |
141 |
- $(use_enable libedit editline) \ |
142 |
- $(use_enable readline) \ |
143 |
- $(use_enable static-libs static) \ |
144 |
- $(use_enable tcl) |
145 |
-} |
146 |
- |
147 |
-multilib_src_install_all() { |
148 |
- prune_libtool_files |
149 |
- einstalldocs |
150 |
-} |