summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Deranek <marcin.deranek@booking.com>2022-11-20 10:49:34 +0100
committerMarcin Deranek <marcin.deranek@booking.com>2022-11-20 10:49:34 +0100
commit8e327e0955805674be662b520a83ac465e3eea5b (patch)
tree4c0e92b49fb4787ffebcd14d9039806bf5362ce9
parenteb850707fcf80f6a397490bbeee12f21bafc8236 (diff)
downloadportage-8e327e0955805674be662b520a83ac465e3eea5b.tar.gz
portage-8e327e0955805674be662b520a83ac465e3eea5b.tar.bz2
portage-8e327e0955805674be662b520a83ac465e3eea5b.zip
app-admin/vaultwarden: Allow to use system sqlite
-rw-r--r--app-admin/vaultwarden/Manifest4
-rw-r--r--app-admin/vaultwarden/metadata.xml10
-rw-r--r--app-admin/vaultwarden/vaultwarden-1.26.0-r1.ebuild (renamed from app-admin/vaultwarden/vaultwarden-1.26.0.ebuild)11
3 files changed, 20 insertions, 5 deletions
diff --git a/app-admin/vaultwarden/Manifest b/app-admin/vaultwarden/Manifest
index a288bc5..a07049c 100644
--- a/app-admin/vaultwarden/Manifest
+++ b/app-admin/vaultwarden/Manifest
@@ -356,5 +356,5 @@ DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007
DIST winreg-0.7.0.crate 21225 BLAKE2B 5841db683dc0aa8b92de8ec43100403b029c8d3e544adcaab030d998e5af4644ea176ac0bcd97141d137450a7bd761a5291405202c445a326da7d4f240686230 SHA512 a0b7a2d239e30cea89a863b879831bc32b5f2988ef3f0586ddadda48827cafc82d3602d2f8df3c47dc1e80537149a1ca1dc1506f9fbf960d9ba081dff1bac731
DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
DIST yubico-0.11.0.crate 17112 BLAKE2B d58d5815b097fc5b4d43224ea4ea18f6dbc44a197f5b98cbc08c0703d79e6fdd03cd799231a892cbdefe801d9a13989dd814f0f922ad4c21b15d031c42f144e9 SHA512 334f5edf9d11119d9fc39994f3811b864661fa53fdfa0375e3cbfd84d44d09158ddcc4b97b8d8009c334ac6a84c66e29aa365508e9fa20e7d44a2f3c3f7792d3
-EBUILD vaultwarden-1.26.0.ebuild 8574 BLAKE2B 9fa89b415b73bccab472b9d9c431343e885de41af9b1106ae4364102a62dbaf36e1d5edbb9f4f06a649eee1dfa80bd9bce55a1ae5269e493ed8593f03d6cbddf SHA512 3497bf26060a4d523928fb9f74aa9471e52e69329138bbc5aa87b5ed43c0d621bcca503215de6adad98b4569fab05483b5caab1844ac2452f0c7a5c1ed5c9564
-MISC metadata.xml 255 BLAKE2B fec818e56877b2451e889c05ed95700632e02438bbe9ae515925548714246b19bdf3b141e0771f64b92483ade6734afe8828d0b177db1d76902c535871ea5551 SHA512 f5e088eef2af90b4f6129ca7ed31d833f61521a8fe6c60e5d5cb871601a85374bf330f445c298990760d51e5186ec8156a192ff30b42f8abc3cb82d329ccc803
+EBUILD vaultwarden-1.26.0-r1.ebuild 8753 BLAKE2B 083aa6ce69aea4a8b51263bfe6c9532c6865c52e6eeaad6b07a71a51db3ace43366fee18045ab5f2a99bceb7eb8d3c0c16235bf9e929417ba4f71cd31d4372c6 SHA512 e33ce30cb3d9fd250826768561a16b8377e5b68eae4cb520222bb3ace0000e2627b145bb50582dc9f1e748b4bd368699d95205444101ab2bf95d06f105a30979
+MISC metadata.xml 592 BLAKE2B d3f3916c830cf57932a1100b0b15ee187ba14b4a6ba5c7caef9ac36af439a3941498393a7552510ed968b176f7b3d53fc533d7073b49ffcbf341398bf5780c2c SHA512 50f1a5f0144165dacd4973aebc297a6ed34430c416dde46f9cd04e76acc4cb9e7bfc6b5cf93546914242d011e7443ba4862a14872b3dfab5146a07aa08aeb1a4
diff --git a/app-admin/vaultwarden/metadata.xml b/app-admin/vaultwarden/metadata.xml
index 1196209..e3ce965 100644
--- a/app-admin/vaultwarden/metadata.xml
+++ b/app-admin/vaultwarden/metadata.xml
@@ -5,4 +5,14 @@
<email>marcin.deranek@slonko.net</email>
<name>Marcin Deranek</name>
</maintainer>
+ <use>
+ <flag name="system-sqlite">Use the system SQLite instead of the bundled one</flag>
+ </use>
+ <upstream>
+ <maintainer status="active">
+ <name>Daniel GarcĂ­a</name>
+ </maintainer>
+ <bugs-to>https://github.com/dani-garcia/vaultwarden/issues</bugs-to>
+ <remote-id type="github">dani-garcia/vaultwarden</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-admin/vaultwarden/vaultwarden-1.26.0.ebuild b/app-admin/vaultwarden/vaultwarden-1.26.0-r1.ebuild
index 0989b98..459f855 100644
--- a/app-admin/vaultwarden/vaultwarden-1.26.0.ebuild
+++ b/app-admin/vaultwarden/vaultwarden-1.26.0-r1.ebuild
@@ -372,7 +372,7 @@ SRC_URI="
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="mysql postgres sqlite"
+IUSE="mysql postgres sqlite system-sqlite"
REQUIRED_USE="|| ( mysql postgres sqlite )"
@@ -385,12 +385,17 @@ DEPEND="
>=app-admin/vaultwarden-web-vault-2022.10.0
>=dev-lang/rust-1.60
dev-libs/openssl:0=
- sqlite? ( dev-db/sqlite )
+ sqlite? ( system-sqlite? ( dev-db/sqlite:3 ) )
"
RDEPEND="${DEPEND}"
src_prepare() {
- sed -i "/^multer/d" "${S}/Cargo.toml" || die
+ sed -i -e '/^multer/d' "${S}/Cargo.toml" || die
+ if use system-sqlite; then
+ sed -i \
+ -e 's/^\(libsqlite3-sys =.*\)features\s*=\s*\["bundled"\],/\1/g' \
+ "${S}/Cargo.toml" || die
+ fi
default
}