diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
| commit | a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch) | |
| tree | 8c764c1cc0576389ce22abd317bceba71ea5732d /dev-db/sqlcipher | |
| parent | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff) | |
gentoo resync : 04.05.2021
Diffstat (limited to 'dev-db/sqlcipher')
| -rw-r--r-- | dev-db/sqlcipher/Manifest | 5 | ||||
| -rw-r--r-- | dev-db/sqlcipher/files/sqlcipher-3.4.2-libressl-2.8.patch | 11 | ||||
| -rw-r--r-- | dev-db/sqlcipher/sqlcipher-3.4.2.ebuild | 8 | ||||
| -rw-r--r-- | dev-db/sqlcipher/sqlcipher-4.0.1.ebuild | 5 |
4 files changed, 6 insertions, 23 deletions
diff --git a/dev-db/sqlcipher/Manifest b/dev-db/sqlcipher/Manifest index 8dc32be6a753..066917cfd031 100644 --- a/dev-db/sqlcipher/Manifest +++ b/dev-db/sqlcipher/Manifest @@ -1,6 +1,5 @@ -AUX sqlcipher-3.4.2-libressl-2.8.patch 490 BLAKE2B 5ac29fbf1370f1ed1a28335d68f86dada605d6362521fbe4eb4decbd215c5eda04d7c62017979de829f46ac37a9f0718d8c748069173f4d0ff591664f51d83da SHA512 bea99e890d78f1b1417f3a81d612388ad3305d30cc576ef5b29d0726459570a231786551fd8ba4cc03ef8fd257ee985ce5933b7f2bcfc15867f6afc2f662f229 DIST sqlcipher-3.4.2.tar.gz 14743960 BLAKE2B 88ee265b02bb9a42734c2ef93070c8fd8e13d546d7cc85e7fbfd6e6046ccbf2626d75e14b19cbba379c99784c7311d0100de06235b99b4908c60c99890d8d7a2 SHA512 c620bf2b175e404afd60ebe76b5476f5a447ff5fcdfa31bebc3f4bd7f1ebfcd507ee423cd582c9b3d6431d8b57320171492da2586e1a739adb4f440e7443dc03 DIST sqlcipher-4.0.1.tar.gz 17006324 BLAKE2B 44e8eb4e1230c3625b4fe1b4af608cd8edc25f3c6adf7e11450c8f9ddb7970fea92ff0823f3a1e631d1b0acfbab6cf078c80e4645c535d66de57f1d73b55ff47 SHA512 0fb48326860a10e9849b2f56fae0c310deae124c7203b54d51f92d346782be795d505c29eafbdfb7206f5e7be54c0f7228fe50c45bd9d2b23cca976b263264fc -EBUILD sqlcipher-3.4.2.ebuild 1507 BLAKE2B 32fd411212dae9b1741e29cd743fa1e7b162b904dcb7118a68ab0b931d00e4c77a55c0f243cfc9517aef474b41f6017148efac0690029541af57e067122ff13b SHA512 ba6e99edf7e9e500c41224edee7858d9ded5adb59ecc88caae9e5f0c32c9dbeb343a73501715ab9c9f9d3a22a849dafb2e8c880b7fb129aec816c25ae0b6bd62 -EBUILD sqlcipher-4.0.1.ebuild 1661 BLAKE2B 569b13cebf390c3257f4b136539e9304cd2375b051be0f932ebb9b2b69fba3c316f5fba71c40b0d0ddcebcb6693c79feb6cb5c99cd6576b5794711acacca3516 SHA512 3123ed4dd6ab2c243bde0189e2343c04bc0381f4e3efe925ce89f994929c325b85d2635cd1e6b653e87c9c8a6960140cec353dec8c1f7c9e3e1cef08e049ae57 +EBUILD sqlcipher-3.4.2.ebuild 1365 BLAKE2B 933d675598bdb8012801b22ad767844968be7610513f4a5fc2aa32924c3ceb643b1ef4489ed93b8b279e4ba7016108ce85bc469b7fae5c6ab2db1ce4790d5720 SHA512 09ddf442ccb84e6be97d3a739fd96e9c41f2719339e73c2c61431e378ca841a0e460f18bb6a33a73141807b1cbd3118cab29024364d2886df84999062341b8de +EBUILD sqlcipher-4.0.1.ebuild 1581 BLAKE2B 032a1f9743e926ac051241b27c24e762b7e7360aab7eef8f9f137a838f9ff4142eacae709adec0ed37d8b0ddc37a0dbd1556cb88dfba4491938a4d1ddb1a2e8c SHA512 c1ea4418e572a28e240a41e7649ffd84418d50c5943f4c49a8097fe5e7e52cfd25f56827bcaa932695fa800efcc5fd3ee927720247747811296c2991fce14c78 MISC metadata.xml 341 BLAKE2B f5035fe38770437027936a72b9b7d66854fd6a19cf19f7140e409e8004297ed3da11aab122ba81b2f2b5d82302e8252462a7f185de0a998f79d348dd45e16c7e SHA512 b387658993279fb3c74c7647b36035f5c0e0e3e81a3cf4eab28f3dac19319f0b6958cfa16fab30295e5508c0810d601b0e2899710f57e992886f35c781e37dfa 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 deleted file mode 100644 index da4c55eddfa0..000000000000 --- a/dev-db/sqlcipher/files/sqlcipher-3.4.2-libressl-2.8.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 1f5bdc481350..d67124b09e38 100644 --- a/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild +++ b/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild @@ -13,14 +13,13 @@ LICENSE="BSD" SLOT="0" KEYWORDS="amd64 x86" -IUSE="libedit readline libressl static-libs tcl test" +IUSE="libedit readline static-libs tcl test" RESTRICT="!test? ( test )" # Tcl is always needed by buildsystem RDEPEND=" libedit? ( dev-libs/libedit[${MULTILIB_USEDEP}] ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] ) " @@ -37,9 +36,6 @@ REQUIRED_USE=" DOCS=( README.md ) src_prepare() { - # bug #678502 - eapply "${FILESDIR}/${P}-libressl-2.8.patch" - append-cflags -DSQLITE_HAS_CODEC default eautoreconf diff --git a/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild b/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild index e82a2ba8a159..9751b1c88489 100644 --- a/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild +++ b/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild @@ -13,13 +13,12 @@ LICENSE="BSD" SLOT="0" KEYWORDS="amd64 x86" -IUSE="debug libedit readline libressl static-libs tcl test" +IUSE="debug libedit readline static-libs tcl test" # Tcl is always needed by buildsystem RDEPEND=" libedit? ( dev-libs/libedit[${MULTILIB_USEDEP}] ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] ) " |