public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: app-admin/vaultwarden/
@ 2024-02-26 20:26 Rahil Bhimjiani
  0 siblings, 0 replies; 8+ messages in thread
From: Rahil Bhimjiani @ 2024-02-26 20:26 UTC (permalink / raw
  To: gentoo-commits

commit:     56075f81a712bef841dd47d2b48d44a8e0e143b6
Author:     Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Mon Feb 26 17:40:15 2024 +0000
Commit:     Rahil Bhimjiani <rahil3108 <AT> gmail <DOT> com>
CommitDate: Mon Feb 26 20:24:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=56075f81

app-admin/vaultwarden: print instructions only on first install

also add symlink  /etc/conf.d/vaultwarden -> ../vaultwarden.env for
openrc users to find config at usual location

Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>

 app-admin/vaultwarden/vaultwarden-1.30.3.ebuild | 20 ++++++++++++++------
 app-admin/vaultwarden/vaultwarden-9999.ebuild   | 20 ++++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/app-admin/vaultwarden/vaultwarden-1.30.3.ebuild b/app-admin/vaultwarden/vaultwarden-1.30.3.ebuild
index 4cf733e1aa..27fdd5ac6d 100644
--- a/app-admin/vaultwarden/vaultwarden-1.30.3.ebuild
+++ b/app-admin/vaultwarden/vaultwarden-1.30.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cargo check-reqs systemd tmpfiles
+inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
 
 DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust"
 HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
@@ -53,6 +53,16 @@ PATCHES=(
 CHECKREQS_MEMORY=3G
 CHECKREQS_DISK_BUILD=2G
 
+DOC_CONTENTS="\n
+	Configuration file: /etc/${PN}.env\n
+	Data directory: /var/lib/${PN}\n
+	\n
+	MySQL & PostgreSQL users must set DATABASE_URL in config\n
+	\n
+	Default server: http://0.0.0.0:8000\n
+	Admin interface: http://0.0.0.0:8000/admin
+"
+
 src_unpack() {
 	if [[ ${PV} == 9999* ]]; then
 		# clone vaultwarden
@@ -96,17 +106,15 @@ src_install() {
 	newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
 	insinto /etc
 	newins .env.template "${PN}".env
+	dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
 	keepdir /var/lib/"${PN}"
 
+	readme.gentoo_create_doc
 	einstalldocs
 	dodoc -r ../"${PN}".wiki/*
 }
 
 pkg_postinst() {
 	tmpfiles_process "${PN}".conf
-	elog "Configuration file: /etc/${PN}.env"
-	elog "Data directory: /var/lib/${PN}"
-	use mysql || use postgres && elog "User must set DATABASE_URL in config "
-	elog "Default server: http://127.0.0.1:8000"
-	elog "Admin interface: http://127.0.0.1:8000/admin"
+	readme.gentoo_print_elog
 }

diff --git a/app-admin/vaultwarden/vaultwarden-9999.ebuild b/app-admin/vaultwarden/vaultwarden-9999.ebuild
index 4cf733e1aa..27fdd5ac6d 100644
--- a/app-admin/vaultwarden/vaultwarden-9999.ebuild
+++ b/app-admin/vaultwarden/vaultwarden-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cargo check-reqs systemd tmpfiles
+inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
 
 DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust"
 HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
@@ -53,6 +53,16 @@ PATCHES=(
 CHECKREQS_MEMORY=3G
 CHECKREQS_DISK_BUILD=2G
 
+DOC_CONTENTS="\n
+	Configuration file: /etc/${PN}.env\n
+	Data directory: /var/lib/${PN}\n
+	\n
+	MySQL & PostgreSQL users must set DATABASE_URL in config\n
+	\n
+	Default server: http://0.0.0.0:8000\n
+	Admin interface: http://0.0.0.0:8000/admin
+"
+
 src_unpack() {
 	if [[ ${PV} == 9999* ]]; then
 		# clone vaultwarden
@@ -96,17 +106,15 @@ src_install() {
 	newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
 	insinto /etc
 	newins .env.template "${PN}".env
+	dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
 	keepdir /var/lib/"${PN}"
 
+	readme.gentoo_create_doc
 	einstalldocs
 	dodoc -r ../"${PN}".wiki/*
 }
 
 pkg_postinst() {
 	tmpfiles_process "${PN}".conf
-	elog "Configuration file: /etc/${PN}.env"
-	elog "Data directory: /var/lib/${PN}"
-	use mysql || use postgres && elog "User must set DATABASE_URL in config "
-	elog "Default server: http://127.0.0.1:8000"
-	elog "Admin interface: http://127.0.0.1:8000/admin"
+	readme.gentoo_print_elog
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-admin/vaultwarden/
@ 2024-03-02 17:05 Rahil Bhimjiani
  0 siblings, 0 replies; 8+ messages in thread
From: Rahil Bhimjiani @ 2024-03-02 17:05 UTC (permalink / raw
  To: gentoo-commits

commit:     3e180e4fea8599a8326834beed01ae2c8752d2d1
Author:     Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Sat Mar  2 16:22:13 2024 +0000
Commit:     Rahil Bhimjiani <rahil3108 <AT> gmail <DOT> com>
CommitDate: Sat Mar  2 17:05:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3e180e4f

app-admin/vaultwarden: add 1.30.4

Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>

 app-admin/vaultwarden/Manifest                  |   3 +
 app-admin/vaultwarden/vaultwarden-1.30.4.ebuild | 120 ++++++++++++++++++++++++
 2 files changed, 123 insertions(+)

diff --git a/app-admin/vaultwarden/Manifest b/app-admin/vaultwarden/Manifest
index 341d6c7c3a..480588fe8d 100644
--- a/app-admin/vaultwarden/Manifest
+++ b/app-admin/vaultwarden/Manifest
@@ -1,3 +1,6 @@
 DIST vaultwarden-1.30.3-deps.tar.xz 46123852 BLAKE2B 3a72fb6b30cbaee9ecbafb1c2411c116f25cd4637ca060db604e33e0d27c8a837a045655388fef15f145049b99a4d946dde15c08bb57b002cb2d8e6325826a54 SHA512 fbe0c456f1f298f8588e22afc8b5fcdc4aec94c10a6474362555929940d35086906d703ba9474751e9bcb54ea56e807277975788eb2e1cf0bae4be323ac7886b
 DIST vaultwarden-1.30.3-docs.tar.xz 73696 BLAKE2B c78252c8ba6fc5efd1fc528e32bc608695f4d83749a85952f7b5daa6b8b874666f2dcfe5a9086f178ab27a806ac10070905eb7e4acb27890bc865873c0db7d3f SHA512 5144a79dfc2a8ec3ea2f62accb4635aa556bd7ec3f2b33b7943fd4443332ade44902550c4ea9c8bafa19ec7c0feed92754e3540b0696853dd7e7cee5971d8dc1
 DIST vaultwarden-1.30.3.tar.gz 608049 BLAKE2B f8d8a80c8dc7b6c710b0fbea19a14c7a73b150fb344173302e00395da5b6d0035f8c4b5c2cd80f2b573127a21ad4d5c440862fe2ab221ba733f85cb109387459 SHA512 2e1163300cc4e3bb2a66566fdfa65cc439920316615efd89d113121407f5456fed127dfa55be2a8cf77543083ace1ea56b6e15bc8a9678aa53e71435d6293642
+DIST vaultwarden-1.30.4-deps.tar.xz 46442248 BLAKE2B 2d6f81583fe16855073f7bf6bcd3e6ca62bdb794617592f0a0a58acd64fd47563fd99ad0c1c0d5ad0bebb5130954a21a79899faa5d536cf0e5df5d7af6b0cda5 SHA512 ea9cb986521646433a129627f5e9ce69de682a229dd553d5a555be1df766757b67f6779ab39f21b47f9aa224221e3d8b48ea0eefa959052b85f87711a6c13047
+DIST vaultwarden-1.30.4-docs.tar.xz 73864 BLAKE2B 5a7d71d639b19dedf997a3ab418be228795a03761b3d08cf4e2368ce72548d09dea3fb06b6f485d8b35240161982f1e74d3b4fb7a178714b0de3733ef7db17a4 SHA512 17917c8a365c5d32f1d83aaacdd0a9faac95241cc187d0237e584c34bbadeb1b11948fbcc5def104a091968b3845edcde57900f8f4d1536728664ef9d99467ae
+DIST vaultwarden-1.30.4.tar.gz 597933 BLAKE2B 24f9517173a4832cbd6b002831d4b09fe5b52531772e8f2aa1cca2517c50d39dc830ebb4f13d14851a52638891be2f9144d7ce38ca79813adcd3d62687812f6b SHA512 a84899ebe30129a62971d4391f4801d3a6eb63b22075a11e676a07f73d8ff0f431a4b8868bac37dc344678ff7de70959ed062c2c7fea4c254fe4f5286d56647e

diff --git a/app-admin/vaultwarden/vaultwarden-1.30.4.ebuild b/app-admin/vaultwarden/vaultwarden-1.30.4.ebuild
new file mode 100644
index 0000000000..27fdd5ac6d
--- /dev/null
+++ b/app-admin/vaultwarden/vaultwarden-1.30.4.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
+
+DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust"
+HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.git"
+else
+	SRC_URI="
+	https://github.com/dani-garcia/vaultwarden/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz
+	https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/wiki.tar.xz -> ${P}-docs.tar.xz
+"
+	KEYWORDS="~amd64"
+fi
+
+# main
+LICENSE="AGPL-3"
+# deps
+LICENSE+=" 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
+
+SLOT="0"
+IUSE="cli mysql postgres sqlite web"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	acct-user/vaultwarden
+	acct-group/vaultwarden
+	cli? ( || ( app-admin/bitwarden-cli app-admin/bitwarden-cli-bin  ) )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+	web? ( || ( www-apps/vaultwarden-web www-apps/vaultwarden-web-bin  ) )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="usr/bin/${PN}"
+ECARGO_VENDOR="${WORKDIR}/vendor"
+
+PATCHES=(
+	"${FILESDIR}"/vaultwarden-envfile-1.30.3.patch
+)
+
+CHECKREQS_MEMORY=3G
+CHECKREQS_DISK_BUILD=2G
+
+DOC_CONTENTS="\n
+	Configuration file: /etc/${PN}.env\n
+	Data directory: /var/lib/${PN}\n
+	\n
+	MySQL & PostgreSQL users must set DATABASE_URL in config\n
+	\n
+	Default server: http://0.0.0.0:8000\n
+	Admin interface: http://0.0.0.0:8000/admin
+"
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		# clone vaultwarden
+		git-r3_src_unpack
+
+		# clone vaultwarden.wiki
+		EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.wiki.git"
+		EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}.wiki"
+		git-r3_src_unpack
+
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+	use web && { sed -i -e 's|^WEB_VAULT_ENABLED=false|WEB_VAULT_ENABLED=true|g;' .env.template || die; }
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usev sqlite)
+		$(usev mysql)
+		$(usev postgres postgresql )
+	)
+	cargo_src_configure
+}
+
+src_compile() {
+	# https://github.com/dani-garcia/vaultwarden/blob/main/build.rs
+	[[ ${PV} != 9999* ]] && export VW_VERSION="${PV}"
+	cargo_src_compile
+}
+
+src_install() {
+	dobin target/*/"${PN}"
+	systemd_newunit "${FILESDIR}"/vaultwarden-1.30.3.service "${PN}".service
+	newinitd "${FILESDIR}"/vaultwarden-1.30.3.initd "${PN}"
+	newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
+	insinto /etc
+	newins .env.template "${PN}".env
+	dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
+	keepdir /var/lib/"${PN}"
+
+	readme.gentoo_create_doc
+	einstalldocs
+	dodoc -r ../"${PN}".wiki/*
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}".conf
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-admin/vaultwarden/
@ 2024-03-03  3:47 Rahil Bhimjiani
  0 siblings, 0 replies; 8+ messages in thread
From: Rahil Bhimjiani @ 2024-03-03  3:47 UTC (permalink / raw
  To: gentoo-commits

commit:     ee4baf9d322294fb5bc885c44d2bb496736c29a6
Author:     Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Sun Mar  3 03:39:47 2024 +0000
Commit:     Rahil Bhimjiani <rahil3108 <AT> gmail <DOT> com>
CommitDate: Sun Mar  3 03:41:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ee4baf9d

app-admin/vaultwarden: add hotfix 1.30.5

Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>

 app-admin/vaultwarden/Manifest                  |   1 +
 app-admin/vaultwarden/vaultwarden-1.30.5.ebuild | 120 ++++++++++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/app-admin/vaultwarden/Manifest b/app-admin/vaultwarden/Manifest
index 480588fe8d..e116fec631 100644
--- a/app-admin/vaultwarden/Manifest
+++ b/app-admin/vaultwarden/Manifest
@@ -4,3 +4,4 @@ DIST vaultwarden-1.30.3.tar.gz 608049 BLAKE2B f8d8a80c8dc7b6c710b0fbea19a14c7a73
 DIST vaultwarden-1.30.4-deps.tar.xz 46442248 BLAKE2B 2d6f81583fe16855073f7bf6bcd3e6ca62bdb794617592f0a0a58acd64fd47563fd99ad0c1c0d5ad0bebb5130954a21a79899faa5d536cf0e5df5d7af6b0cda5 SHA512 ea9cb986521646433a129627f5e9ce69de682a229dd553d5a555be1df766757b67f6779ab39f21b47f9aa224221e3d8b48ea0eefa959052b85f87711a6c13047
 DIST vaultwarden-1.30.4-docs.tar.xz 73864 BLAKE2B 5a7d71d639b19dedf997a3ab418be228795a03761b3d08cf4e2368ce72548d09dea3fb06b6f485d8b35240161982f1e74d3b4fb7a178714b0de3733ef7db17a4 SHA512 17917c8a365c5d32f1d83aaacdd0a9faac95241cc187d0237e584c34bbadeb1b11948fbcc5def104a091968b3845edcde57900f8f4d1536728664ef9d99467ae
 DIST vaultwarden-1.30.4.tar.gz 597933 BLAKE2B 24f9517173a4832cbd6b002831d4b09fe5b52531772e8f2aa1cca2517c50d39dc830ebb4f13d14851a52638891be2f9144d7ce38ca79813adcd3d62687812f6b SHA512 a84899ebe30129a62971d4391f4801d3a6eb63b22075a11e676a07f73d8ff0f431a4b8868bac37dc344678ff7de70959ed062c2c7fea4c254fe4f5286d56647e
+DIST vaultwarden-1.30.5.tar.gz 597882 BLAKE2B 8b7a8135cd4b454a7cd7016ee1b0efed09d4507ec28ff712b3d935ca006c524dc27e9de65c930a82e6cb0911cb9629ae1d5a9ee95531d3e5a171abae8ba99f72 SHA512 acf7c344840f9b19e3aa366dae794ca6daca9dfad10d2bfdfa08d195d00f553643b46f2f7fe9344d0949306f9dc892722af7aeb7a047986edc98b51ec0c143bb

diff --git a/app-admin/vaultwarden/vaultwarden-1.30.5.ebuild b/app-admin/vaultwarden/vaultwarden-1.30.5.ebuild
new file mode 100644
index 0000000000..4f7e0d4b4b
--- /dev/null
+++ b/app-admin/vaultwarden/vaultwarden-1.30.5.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
+
+DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust"
+HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.git"
+else
+	SRC_URI="
+	https://github.com/dani-garcia/vaultwarden/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/rahilarious/gentoo-distfiles/releases/download/${PN}-1.30.4/deps.tar.xz -> ${PN}-1.30.4-deps.tar.xz
+	https://github.com/rahilarious/gentoo-distfiles/releases/download/${PN}-1.30.4/wiki.tar.xz -> ${PN}-1.30.4-docs.tar.xz
+"
+	KEYWORDS="~amd64"
+fi
+
+# main
+LICENSE="AGPL-3"
+# deps
+LICENSE+=" 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
+
+SLOT="0"
+IUSE="cli mysql postgres sqlite web"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	acct-user/vaultwarden
+	acct-group/vaultwarden
+	cli? ( || ( app-admin/bitwarden-cli app-admin/bitwarden-cli-bin  ) )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+	web? ( || ( www-apps/vaultwarden-web www-apps/vaultwarden-web-bin  ) )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="usr/bin/${PN}"
+ECARGO_VENDOR="${WORKDIR}/vendor"
+
+PATCHES=(
+	"${FILESDIR}"/vaultwarden-envfile-1.30.3.patch
+)
+
+CHECKREQS_MEMORY=3G
+CHECKREQS_DISK_BUILD=2G
+
+DOC_CONTENTS="\n
+	Configuration file: /etc/${PN}.env\n
+	Data directory: /var/lib/${PN}\n
+	\n
+	MySQL & PostgreSQL users must set DATABASE_URL in config\n
+	\n
+	Default server: http://0.0.0.0:8000\n
+	Admin interface: http://0.0.0.0:8000/admin
+"
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		# clone vaultwarden
+		git-r3_src_unpack
+
+		# clone vaultwarden.wiki
+		EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.wiki.git"
+		EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}.wiki"
+		git-r3_src_unpack
+
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+	use web && { sed -i -e 's|^WEB_VAULT_ENABLED=false|WEB_VAULT_ENABLED=true|g;' .env.template || die; }
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usev sqlite)
+		$(usev mysql)
+		$(usev postgres postgresql )
+	)
+	cargo_src_configure
+}
+
+src_compile() {
+	# https://github.com/dani-garcia/vaultwarden/blob/main/build.rs
+	[[ ${PV} != 9999* ]] && export VW_VERSION="${PV}"
+	cargo_src_compile
+}
+
+src_install() {
+	dobin target/*/"${PN}"
+	systemd_newunit "${FILESDIR}"/vaultwarden-1.30.3.service "${PN}".service
+	newinitd "${FILESDIR}"/vaultwarden-1.30.3.initd "${PN}"
+	newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
+	insinto /etc
+	newins .env.template "${PN}".env
+	dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
+	keepdir /var/lib/"${PN}"
+
+	readme.gentoo_create_doc
+	einstalldocs
+	dodoc -r ../"${PN}".wiki/*
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}".conf
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-admin/vaultwarden/
@ 2024-11-18 12:41 Julien Roy
  0 siblings, 0 replies; 8+ messages in thread
From: Julien Roy @ 2024-11-18 12:41 UTC (permalink / raw
  To: gentoo-commits

commit:     7fcf0c2916182f6a4b0ac5e8055c4bbdabcc45f3
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sun Nov 17 05:14:31 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Mon Nov 18 12:40:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7fcf0c29

app-admin/vaultwarden: add 1.32.4

Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 app-admin/vaultwarden/Manifest                  |   3 +
 app-admin/vaultwarden/metadata.xml              |   4 +
 app-admin/vaultwarden/vaultwarden-1.32.4.ebuild | 128 ++++++++++++++++++++++++
 3 files changed, 135 insertions(+)

diff --git a/app-admin/vaultwarden/Manifest b/app-admin/vaultwarden/Manifest
index e116fec63..0b434a97f 100644
--- a/app-admin/vaultwarden/Manifest
+++ b/app-admin/vaultwarden/Manifest
@@ -5,3 +5,6 @@ DIST vaultwarden-1.30.4-deps.tar.xz 46442248 BLAKE2B 2d6f81583fe16855073f7bf6bcd
 DIST vaultwarden-1.30.4-docs.tar.xz 73864 BLAKE2B 5a7d71d639b19dedf997a3ab418be228795a03761b3d08cf4e2368ce72548d09dea3fb06b6f485d8b35240161982f1e74d3b4fb7a178714b0de3733ef7db17a4 SHA512 17917c8a365c5d32f1d83aaacdd0a9faac95241cc187d0237e584c34bbadeb1b11948fbcc5def104a091968b3845edcde57900f8f4d1536728664ef9d99467ae
 DIST vaultwarden-1.30.4.tar.gz 597933 BLAKE2B 24f9517173a4832cbd6b002831d4b09fe5b52531772e8f2aa1cca2517c50d39dc830ebb4f13d14851a52638891be2f9144d7ce38ca79813adcd3d62687812f6b SHA512 a84899ebe30129a62971d4391f4801d3a6eb63b22075a11e676a07f73d8ff0f431a4b8868bac37dc344678ff7de70959ed062c2c7fea4c254fe4f5286d56647e
 DIST vaultwarden-1.30.5.tar.gz 597882 BLAKE2B 8b7a8135cd4b454a7cd7016ee1b0efed09d4507ec28ff712b3d935ca006c524dc27e9de65c930a82e6cb0911cb9629ae1d5a9ee95531d3e5a171abae8ba99f72 SHA512 acf7c344840f9b19e3aa366dae794ca6daca9dfad10d2bfdfa08d195d00f553643b46f2f7fe9344d0949306f9dc892722af7aeb7a047986edc98b51ec0c143bb
+DIST vaultwarden-1.32.4-docs.tar.xz 703140 BLAKE2B 6bca8f3e03b73d2bc921cc7f91df7bf5199a6267f7cd34e5f183d04d29d29aeb6d6973c61611ee4a18bbe2e8d3627682c018a3af2411497c140f772c977bae5b SHA512 2e865e3cc68a58227b2d5d99fd2292a4f6ddecce3dccbda99c896a1a83afd2020d0252f2104988099a8f564e20b67e2b09ce82923594bf6bafa2c91736ee057b
+DIST vaultwarden-1.32.4-vendor.tar.xz 57601460 BLAKE2B d7e4a9f03848b93dc7c2619e1140c09112805e7cb61657310a4a3759eedd4e6b2c4cd948b7c64836c9455a79aa63e12a31e64237bfab7cdce07eaa7a0bdcd920 SHA512 0ccedfa75d2d45aab0bff81c27282f22c8b41f91d9de9e76d657e8722efff374ad2130a56ae9c197aad12fbdb7747904cace0246b3ec0ca3126c5ae4513b5584
+DIST vaultwarden-1.32.4.tar.gz 619528 BLAKE2B 7c559b984f889c86c9902e9bd07e6b63748f36e0532f90bca3715229de1c98fe2c4aa846a40c7dc946167fc9ad4da5294271d0cdefe9ff7a206d600554e356ed SHA512 2377ac9acdef157011c03a916ad07d8905550f41efd950f5afdb97bbf4a69ff1b372b5ebe18ca92edb0f02904330f95025b1ec376c5c3cad1388c61493eccb93

diff --git a/app-admin/vaultwarden/metadata.xml b/app-admin/vaultwarden/metadata.xml
index 3c4ab14ed..0ba50b32b 100644
--- a/app-admin/vaultwarden/metadata.xml
+++ b/app-admin/vaultwarden/metadata.xml
@@ -5,6 +5,10 @@
     <email>me@rahil.rocks</email>
     <name>Rahil Bhimjiani</name>
   </maintainer>
+  <maintainer type="person">
+    <email>julien@jroy.ca</email>
+    <name>Julien Roy</name>
+  </maintainer>
   <use>
     <flag name="cli">
       Install client with the Command-Line Interface

diff --git a/app-admin/vaultwarden/vaultwarden-1.32.4.ebuild b/app-admin/vaultwarden/vaultwarden-1.32.4.ebuild
new file mode 100644
index 000000000..b96d3cd77
--- /dev/null
+++ b/app-admin/vaultwarden/vaultwarden-1.32.4.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# https://github.com/dani-garcia/vaultwarden/issues/4649
+RUST_MAX_VER="1.82.0"
+
+inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
+
+DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust"
+HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.git"
+else
+	SRC_URI="
+	https://github.com/dani-garcia/vaultwarden/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://jroy.ca/dist/${P}-vendor.tar.xz
+	https://jroy.ca/dist/${P}-wiki.tar.xz -> ${P}-docs.tar.xz
+"
+	KEYWORDS="~amd64"
+fi
+
+# main
+LICENSE="AGPL-3"
+# deps
+LICENSE+=" 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
+
+SLOT="0"
+IUSE="cli mysql postgres +sqlite web"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	acct-user/vaultwarden
+	acct-group/vaultwarden
+	cli? ( || ( app-admin/bitwarden-cli app-admin/bitwarden-cli-bin  ) )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+	web? ( || ( www-apps/vaultwarden-web www-apps/vaultwarden-web-bin  ) )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="usr/bin/${PN}"
+ECARGO_VENDOR="${WORKDIR}/vendor"
+
+PATCHES=(
+	"${FILESDIR}"/vaultwarden-envfile-1.30.3.patch
+)
+
+CHECKREQS_MEMORY=3G
+CHECKREQS_DISK_BUILD=2G
+
+DOC_CONTENTS="\n
+	Configuration file: /etc/${PN}.env\n
+	Data directory: /var/lib/${PN}\n
+	\n
+	MySQL & PostgreSQL users must set DATABASE_URL in config\n
+	\n
+	Default server: http://0.0.0.0:8000\n
+	Admin interface: http://0.0.0.0:8000/admin
+"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	rust_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		# clone vaultwarden
+		git-r3_src_unpack
+
+		# clone vaultwarden.wiki
+		EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.wiki.git"
+		EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}.wiki"
+		git-r3_src_unpack
+
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+	use web && { sed -i -e 's|^WEB_VAULT_ENABLED=false|WEB_VAULT_ENABLED=true|g;' .env.template || die; }
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usev sqlite)
+		$(usev mysql)
+		$(usev postgres postgresql )
+	)
+	cargo_src_configure
+}
+
+src_compile() {
+	# https://github.com/dani-garcia/vaultwarden/blob/main/build.rs
+	[[ ${PV} != 9999* ]] && export VW_VERSION="${PV}"
+	cargo_src_compile
+}
+
+src_install() {
+	dobin target/*/*/"${PN}"
+	systemd_newunit "${FILESDIR}"/vaultwarden-1.30.3.service "${PN}".service
+	newinitd "${FILESDIR}"/vaultwarden-1.30.3.initd "${PN}"
+	newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
+	insinto /etc
+	newins .env.template "${PN}".env
+	dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
+	keepdir /var/lib/"${PN}"
+
+	readme.gentoo_create_doc
+	einstalldocs
+	dodoc -r ../"${PN}".wiki/*
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}".conf
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-admin/vaultwarden/
@ 2024-11-18 15:21 Julien Roy
  0 siblings, 0 replies; 8+ messages in thread
From: Julien Roy @ 2024-11-18 15:21 UTC (permalink / raw
  To: gentoo-commits

commit:     c336f7c0258082e12d87e69e64b91be799ed48cf
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Mon Nov 18 15:15:34 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Mon Nov 18 15:16:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c336f7c0

app-admin/vaultwarden: add 1.32.5

Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 app-admin/vaultwarden/Manifest                  |   3 +
 app-admin/vaultwarden/vaultwarden-1.32.5.ebuild | 128 ++++++++++++++++++++++++
 2 files changed, 131 insertions(+)

diff --git a/app-admin/vaultwarden/Manifest b/app-admin/vaultwarden/Manifest
index 0b434a97f..12188a027 100644
--- a/app-admin/vaultwarden/Manifest
+++ b/app-admin/vaultwarden/Manifest
@@ -8,3 +8,6 @@ DIST vaultwarden-1.30.5.tar.gz 597882 BLAKE2B 8b7a8135cd4b454a7cd7016ee1b0efed09
 DIST vaultwarden-1.32.4-docs.tar.xz 703140 BLAKE2B 6bca8f3e03b73d2bc921cc7f91df7bf5199a6267f7cd34e5f183d04d29d29aeb6d6973c61611ee4a18bbe2e8d3627682c018a3af2411497c140f772c977bae5b SHA512 2e865e3cc68a58227b2d5d99fd2292a4f6ddecce3dccbda99c896a1a83afd2020d0252f2104988099a8f564e20b67e2b09ce82923594bf6bafa2c91736ee057b
 DIST vaultwarden-1.32.4-vendor.tar.xz 57601460 BLAKE2B d7e4a9f03848b93dc7c2619e1140c09112805e7cb61657310a4a3759eedd4e6b2c4cd948b7c64836c9455a79aa63e12a31e64237bfab7cdce07eaa7a0bdcd920 SHA512 0ccedfa75d2d45aab0bff81c27282f22c8b41f91d9de9e76d657e8722efff374ad2130a56ae9c197aad12fbdb7747904cace0246b3ec0ca3126c5ae4513b5584
 DIST vaultwarden-1.32.4.tar.gz 619528 BLAKE2B 7c559b984f889c86c9902e9bd07e6b63748f36e0532f90bca3715229de1c98fe2c4aa846a40c7dc946167fc9ad4da5294271d0cdefe9ff7a206d600554e356ed SHA512 2377ac9acdef157011c03a916ad07d8905550f41efd950f5afdb97bbf4a69ff1b372b5ebe18ca92edb0f02904330f95025b1ec376c5c3cad1388c61493eccb93
+DIST vaultwarden-1.32.5-docs.tar.xz 703140 BLAKE2B 6bca8f3e03b73d2bc921cc7f91df7bf5199a6267f7cd34e5f183d04d29d29aeb6d6973c61611ee4a18bbe2e8d3627682c018a3af2411497c140f772c977bae5b SHA512 2e865e3cc68a58227b2d5d99fd2292a4f6ddecce3dccbda99c896a1a83afd2020d0252f2104988099a8f564e20b67e2b09ce82923594bf6bafa2c91736ee057b
+DIST vaultwarden-1.32.5-vendor.tar.xz 57885072 BLAKE2B 50d29fb4eee5031802ab8309017a288c7f08bcbdbfe7c0ed4e2008f716956a91dadcdbcebc177baa6663e10298e7e1638ac1077efb8bdcb36a5d7172a2ce282c SHA512 9f015a5b0a26eab7d5425ed2de6a6a7ebec3ccce78531db6cd625495fe17a750c0a748d98040ebccb48e04360f7515b40fb1bfa7cd75db63f0e0ce6a4e43584e
+DIST vaultwarden-1.32.5.tar.gz 623393 BLAKE2B 61bdf57c16f9eb7940c399bf29dbc06b8a46b5821ba1bc77745b0f9a81fc259acbb08c9a70bba7dbf03a8ebbc3e080fe07f76f97e13036b2b57beffea29e1ec2 SHA512 671988090220aa974900c83025b4e7c1fdb92975786126bdc86def6c04aa2485cc456157d2570a058d8496c2141d15edfa6615b0f481c769a054efcae7373869

diff --git a/app-admin/vaultwarden/vaultwarden-1.32.5.ebuild b/app-admin/vaultwarden/vaultwarden-1.32.5.ebuild
new file mode 100644
index 000000000..b96d3cd77
--- /dev/null
+++ b/app-admin/vaultwarden/vaultwarden-1.32.5.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# https://github.com/dani-garcia/vaultwarden/issues/4649
+RUST_MAX_VER="1.82.0"
+
+inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
+
+DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust"
+HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.git"
+else
+	SRC_URI="
+	https://github.com/dani-garcia/vaultwarden/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://jroy.ca/dist/${P}-vendor.tar.xz
+	https://jroy.ca/dist/${P}-wiki.tar.xz -> ${P}-docs.tar.xz
+"
+	KEYWORDS="~amd64"
+fi
+
+# main
+LICENSE="AGPL-3"
+# deps
+LICENSE+=" 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
+
+SLOT="0"
+IUSE="cli mysql postgres +sqlite web"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	acct-user/vaultwarden
+	acct-group/vaultwarden
+	cli? ( || ( app-admin/bitwarden-cli app-admin/bitwarden-cli-bin  ) )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+	web? ( || ( www-apps/vaultwarden-web www-apps/vaultwarden-web-bin  ) )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="usr/bin/${PN}"
+ECARGO_VENDOR="${WORKDIR}/vendor"
+
+PATCHES=(
+	"${FILESDIR}"/vaultwarden-envfile-1.30.3.patch
+)
+
+CHECKREQS_MEMORY=3G
+CHECKREQS_DISK_BUILD=2G
+
+DOC_CONTENTS="\n
+	Configuration file: /etc/${PN}.env\n
+	Data directory: /var/lib/${PN}\n
+	\n
+	MySQL & PostgreSQL users must set DATABASE_URL in config\n
+	\n
+	Default server: http://0.0.0.0:8000\n
+	Admin interface: http://0.0.0.0:8000/admin
+"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	rust_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		# clone vaultwarden
+		git-r3_src_unpack
+
+		# clone vaultwarden.wiki
+		EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.wiki.git"
+		EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}.wiki"
+		git-r3_src_unpack
+
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+	use web && { sed -i -e 's|^WEB_VAULT_ENABLED=false|WEB_VAULT_ENABLED=true|g;' .env.template || die; }
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usev sqlite)
+		$(usev mysql)
+		$(usev postgres postgresql )
+	)
+	cargo_src_configure
+}
+
+src_compile() {
+	# https://github.com/dani-garcia/vaultwarden/blob/main/build.rs
+	[[ ${PV} != 9999* ]] && export VW_VERSION="${PV}"
+	cargo_src_compile
+}
+
+src_install() {
+	dobin target/*/*/"${PN}"
+	systemd_newunit "${FILESDIR}"/vaultwarden-1.30.3.service "${PN}".service
+	newinitd "${FILESDIR}"/vaultwarden-1.30.3.initd "${PN}"
+	newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
+	insinto /etc
+	newins .env.template "${PN}".env
+	dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
+	keepdir /var/lib/"${PN}"
+
+	readme.gentoo_create_doc
+	einstalldocs
+	dodoc -r ../"${PN}".wiki/*
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}".conf
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-admin/vaultwarden/
@ 2025-01-13 16:43 Julien Roy
  2025-01-13 17:41 ` [gentoo-commits] repo/proj/guru:master " Julien Roy
  0 siblings, 1 reply; 8+ messages in thread
From: Julien Roy @ 2025-01-13 16:43 UTC (permalink / raw
  To: gentoo-commits

commit:     e9cd77576774faf558ce427f5cdac93ed8dc115d
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Mon Jan 13 16:18:02 2025 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Mon Jan 13 16:42:58 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e9cd7757

app-admin/vaultwarden: add 1.32.7

Closes: https://bugs.gentoo.org/944476
Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 app-admin/vaultwarden/Manifest                  |   3 +
 app-admin/vaultwarden/vaultwarden-1.32.7.ebuild | 137 ++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/app-admin/vaultwarden/Manifest b/app-admin/vaultwarden/Manifest
index 12188a027..b220395d9 100644
--- a/app-admin/vaultwarden/Manifest
+++ b/app-admin/vaultwarden/Manifest
@@ -11,3 +11,6 @@ DIST vaultwarden-1.32.4.tar.gz 619528 BLAKE2B 7c559b984f889c86c9902e9bd07e6b6374
 DIST vaultwarden-1.32.5-docs.tar.xz 703140 BLAKE2B 6bca8f3e03b73d2bc921cc7f91df7bf5199a6267f7cd34e5f183d04d29d29aeb6d6973c61611ee4a18bbe2e8d3627682c018a3af2411497c140f772c977bae5b SHA512 2e865e3cc68a58227b2d5d99fd2292a4f6ddecce3dccbda99c896a1a83afd2020d0252f2104988099a8f564e20b67e2b09ce82923594bf6bafa2c91736ee057b
 DIST vaultwarden-1.32.5-vendor.tar.xz 57885072 BLAKE2B 50d29fb4eee5031802ab8309017a288c7f08bcbdbfe7c0ed4e2008f716956a91dadcdbcebc177baa6663e10298e7e1638ac1077efb8bdcb36a5d7172a2ce282c SHA512 9f015a5b0a26eab7d5425ed2de6a6a7ebec3ccce78531db6cd625495fe17a750c0a748d98040ebccb48e04360f7515b40fb1bfa7cd75db63f0e0ce6a4e43584e
 DIST vaultwarden-1.32.5.tar.gz 623393 BLAKE2B 61bdf57c16f9eb7940c399bf29dbc06b8a46b5821ba1bc77745b0f9a81fc259acbb08c9a70bba7dbf03a8ebbc3e080fe07f76f97e13036b2b57beffea29e1ec2 SHA512 671988090220aa974900c83025b4e7c1fdb92975786126bdc86def6c04aa2485cc456157d2570a058d8496c2141d15edfa6615b0f481c769a054efcae7373869
+DIST vaultwarden-1.32.7-docs.tar.xz 703140 BLAKE2B 6bca8f3e03b73d2bc921cc7f91df7bf5199a6267f7cd34e5f183d04d29d29aeb6d6973c61611ee4a18bbe2e8d3627682c018a3af2411497c140f772c977bae5b SHA512 2e865e3cc68a58227b2d5d99fd2292a4f6ddecce3dccbda99c896a1a83afd2020d0252f2104988099a8f564e20b67e2b09ce82923594bf6bafa2c91736ee057b
+DIST vaultwarden-1.32.7-vendor.tar.xz 57393432 BLAKE2B 1dccb4ea8887de90b5dbdb56aa40f4f5d9d670c0b5b1adc19eebd48da05768bb7518fd04638b3630228761474d1ff5015001ca47a94d0ab0677d3ca426837d48 SHA512 6642638c4689b86f68ac7571bcc97139d201c84aa1bfefe78b1ccdb1bd2a6ff758f123a46c1eef14fc95888220ac184d9c911ed0ef18da352a2a80650a65e064
+DIST vaultwarden-1.32.7.tar.gz 628227 BLAKE2B aaf782cdea3c5ad1aca31ec7e40e70df731377d4f8bbd8b752a7aea1b26660feb69c65101fc4597bcbb48d37931e946a45a05d76be3050a538a04f78664db1df SHA512 906f082c9609a52161156b0f5330c197971ffae51d308f8df86f34841b91293394518079e353b06914e5a762555cda37038faa607d1c4893530fdd196688d196

diff --git a/app-admin/vaultwarden/vaultwarden-1.32.7.ebuild b/app-admin/vaultwarden/vaultwarden-1.32.7.ebuild
new file mode 100644
index 000000000..53e5a280f
--- /dev/null
+++ b/app-admin/vaultwarden/vaultwarden-1.32.7.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# https://github.com/dani-garcia/vaultwarden/issues/4649
+RUST_MAX_VER="1.83.0"
+
+inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
+
+DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust"
+HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.git"
+else
+	SRC_URI="
+		https://github.com/dani-garcia/vaultwarden/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+		https://jroy.ca/dist/${P}-vendor.tar.xz -> ${P}-vendor.tar.xz
+		https://jroy.ca/dist/${P}-wiki.tar.xz -> ${P}-docs.tar.xz
+	"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="AGPL-3"
+# Dependent crate licenses
+LICENSE+=" 0BSD Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-3.0"
+
+SLOT="0"
+IUSE="cli mysql postgres +sqlite web"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	acct-user/vaultwarden
+	acct-group/vaultwarden
+	dev-libs/openssl:=
+	cli? ( || ( app-admin/bitwarden-cli app-admin/bitwarden-cli-bin  ) )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+	web? ( || ( www-apps/vaultwarden-web www-apps/vaultwarden-web-bin  ) )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="usr/bin/${PN}"
+ECARGO_VENDOR="${WORKDIR}/vendor"
+
+PATCHES=(
+	"${FILESDIR}"/vaultwarden-envfile-1.30.3.patch
+)
+
+CHECKREQS_MEMORY=3G
+CHECKREQS_DISK_BUILD=2G
+
+DOC_CONTENTS="\n
+	Configuration file: /etc/${PN}.env\n
+	Data directory: /var/lib/${PN}\n
+	\n
+	MySQL & PostgreSQL users must set DATABASE_URL in config\n
+	\n
+	Default server: http://0.0.0.0:8000\n
+	Admin interface: http://0.0.0.0:8000/admin
+"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	rust_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		# clone vaultwarden
+		git-r3_src_unpack
+
+		# clone vaultwarden.wiki
+		EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.wiki.git"
+		EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}.wiki"
+		git-r3_src_unpack
+
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		mkdir "${CARGO_HOME}/gentoo" || die
+		ln -s "${WORKDIR}/vendor/"* "${CARGO_HOME}/gentoo/" || die
+		sed -i "${ECARGO_HOME}/config.toml" \
+			-e 's/work\/vendor/work\/cargo_home\/gentoo/' \
+			-e '/source.crates-io/d' \
+			-e '/replace-with = "gentoo"/d' \
+			-e '/local-registry = "\/nonexistent"/d' \
+			|| die
+		cat "${WORKDIR}/vendor/vendor-config.toml" >> "${ECARGO_HOME}/config.toml" || die
+	fi
+}
+
+src_prepare() {
+	default
+	use web && { sed -i -e 's|^WEB_VAULT_ENABLED=false|WEB_VAULT_ENABLED=true|g;' .env.template || die; }
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usev sqlite)
+		$(usev mysql)
+		$(usev postgres postgresql )
+	)
+	cargo_src_configure
+}
+
+src_compile() {
+	# https://github.com/dani-garcia/vaultwarden/blob/main/build.rs
+	[[ ${PV} != 9999* ]] && export VW_VERSION="${PV}"
+	cargo_src_compile --no-default-features
+}
+
+src_install() {
+	dobin target/*/*/"${PN}"
+	systemd_newunit "${FILESDIR}"/vaultwarden-1.30.3.service "${PN}".service
+	newinitd "${FILESDIR}"/vaultwarden-1.30.3.initd "${PN}"
+	newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
+	insinto /etc
+	newins .env.template "${PN}".env
+	dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
+	keepdir /var/lib/"${PN}"
+
+	readme.gentoo_create_doc
+	einstalldocs
+	dodoc -r ../"${PN}".wiki/*
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}".conf
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-admin/vaultwarden/
@ 2025-01-13 16:43 Julien Roy
  0 siblings, 0 replies; 8+ messages in thread
From: Julien Roy @ 2025-01-13 16:43 UTC (permalink / raw
  To: gentoo-commits

commit:     5298faf5b6b3e893811721cb178df822220dc247
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Mon Jan 13 16:18:42 2025 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Mon Jan 13 16:42:59 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5298faf5

app-admin/vaultwarden: drop 1.30.3-r1, 1.30.4-r1, 1.30.5-r1, 1.32.4

Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 app-admin/vaultwarden/Manifest                     |  10 --
 app-admin/vaultwarden/vaultwarden-1.30.3-r1.ebuild | 128 ---------------------
 app-admin/vaultwarden/vaultwarden-1.30.4-r1.ebuild | 128 ---------------------
 app-admin/vaultwarden/vaultwarden-1.30.5-r1.ebuild | 128 ---------------------
 app-admin/vaultwarden/vaultwarden-1.32.4.ebuild    | 128 ---------------------
 app-admin/vaultwarden/vaultwarden-1.32.7.ebuild    |   2 +-
 6 files changed, 1 insertion(+), 523 deletions(-)

diff --git a/app-admin/vaultwarden/Manifest b/app-admin/vaultwarden/Manifest
index b220395d9..5afd72359 100644
--- a/app-admin/vaultwarden/Manifest
+++ b/app-admin/vaultwarden/Manifest
@@ -1,13 +1,3 @@
-DIST vaultwarden-1.30.3-deps.tar.xz 46123852 BLAKE2B 3a72fb6b30cbaee9ecbafb1c2411c116f25cd4637ca060db604e33e0d27c8a837a045655388fef15f145049b99a4d946dde15c08bb57b002cb2d8e6325826a54 SHA512 fbe0c456f1f298f8588e22afc8b5fcdc4aec94c10a6474362555929940d35086906d703ba9474751e9bcb54ea56e807277975788eb2e1cf0bae4be323ac7886b
-DIST vaultwarden-1.30.3-docs.tar.xz 73696 BLAKE2B c78252c8ba6fc5efd1fc528e32bc608695f4d83749a85952f7b5daa6b8b874666f2dcfe5a9086f178ab27a806ac10070905eb7e4acb27890bc865873c0db7d3f SHA512 5144a79dfc2a8ec3ea2f62accb4635aa556bd7ec3f2b33b7943fd4443332ade44902550c4ea9c8bafa19ec7c0feed92754e3540b0696853dd7e7cee5971d8dc1
-DIST vaultwarden-1.30.3.tar.gz 608049 BLAKE2B f8d8a80c8dc7b6c710b0fbea19a14c7a73b150fb344173302e00395da5b6d0035f8c4b5c2cd80f2b573127a21ad4d5c440862fe2ab221ba733f85cb109387459 SHA512 2e1163300cc4e3bb2a66566fdfa65cc439920316615efd89d113121407f5456fed127dfa55be2a8cf77543083ace1ea56b6e15bc8a9678aa53e71435d6293642
-DIST vaultwarden-1.30.4-deps.tar.xz 46442248 BLAKE2B 2d6f81583fe16855073f7bf6bcd3e6ca62bdb794617592f0a0a58acd64fd47563fd99ad0c1c0d5ad0bebb5130954a21a79899faa5d536cf0e5df5d7af6b0cda5 SHA512 ea9cb986521646433a129627f5e9ce69de682a229dd553d5a555be1df766757b67f6779ab39f21b47f9aa224221e3d8b48ea0eefa959052b85f87711a6c13047
-DIST vaultwarden-1.30.4-docs.tar.xz 73864 BLAKE2B 5a7d71d639b19dedf997a3ab418be228795a03761b3d08cf4e2368ce72548d09dea3fb06b6f485d8b35240161982f1e74d3b4fb7a178714b0de3733ef7db17a4 SHA512 17917c8a365c5d32f1d83aaacdd0a9faac95241cc187d0237e584c34bbadeb1b11948fbcc5def104a091968b3845edcde57900f8f4d1536728664ef9d99467ae
-DIST vaultwarden-1.30.4.tar.gz 597933 BLAKE2B 24f9517173a4832cbd6b002831d4b09fe5b52531772e8f2aa1cca2517c50d39dc830ebb4f13d14851a52638891be2f9144d7ce38ca79813adcd3d62687812f6b SHA512 a84899ebe30129a62971d4391f4801d3a6eb63b22075a11e676a07f73d8ff0f431a4b8868bac37dc344678ff7de70959ed062c2c7fea4c254fe4f5286d56647e
-DIST vaultwarden-1.30.5.tar.gz 597882 BLAKE2B 8b7a8135cd4b454a7cd7016ee1b0efed09d4507ec28ff712b3d935ca006c524dc27e9de65c930a82e6cb0911cb9629ae1d5a9ee95531d3e5a171abae8ba99f72 SHA512 acf7c344840f9b19e3aa366dae794ca6daca9dfad10d2bfdfa08d195d00f553643b46f2f7fe9344d0949306f9dc892722af7aeb7a047986edc98b51ec0c143bb
-DIST vaultwarden-1.32.4-docs.tar.xz 703140 BLAKE2B 6bca8f3e03b73d2bc921cc7f91df7bf5199a6267f7cd34e5f183d04d29d29aeb6d6973c61611ee4a18bbe2e8d3627682c018a3af2411497c140f772c977bae5b SHA512 2e865e3cc68a58227b2d5d99fd2292a4f6ddecce3dccbda99c896a1a83afd2020d0252f2104988099a8f564e20b67e2b09ce82923594bf6bafa2c91736ee057b
-DIST vaultwarden-1.32.4-vendor.tar.xz 57601460 BLAKE2B d7e4a9f03848b93dc7c2619e1140c09112805e7cb61657310a4a3759eedd4e6b2c4cd948b7c64836c9455a79aa63e12a31e64237bfab7cdce07eaa7a0bdcd920 SHA512 0ccedfa75d2d45aab0bff81c27282f22c8b41f91d9de9e76d657e8722efff374ad2130a56ae9c197aad12fbdb7747904cace0246b3ec0ca3126c5ae4513b5584
-DIST vaultwarden-1.32.4.tar.gz 619528 BLAKE2B 7c559b984f889c86c9902e9bd07e6b63748f36e0532f90bca3715229de1c98fe2c4aa846a40c7dc946167fc9ad4da5294271d0cdefe9ff7a206d600554e356ed SHA512 2377ac9acdef157011c03a916ad07d8905550f41efd950f5afdb97bbf4a69ff1b372b5ebe18ca92edb0f02904330f95025b1ec376c5c3cad1388c61493eccb93
 DIST vaultwarden-1.32.5-docs.tar.xz 703140 BLAKE2B 6bca8f3e03b73d2bc921cc7f91df7bf5199a6267f7cd34e5f183d04d29d29aeb6d6973c61611ee4a18bbe2e8d3627682c018a3af2411497c140f772c977bae5b SHA512 2e865e3cc68a58227b2d5d99fd2292a4f6ddecce3dccbda99c896a1a83afd2020d0252f2104988099a8f564e20b67e2b09ce82923594bf6bafa2c91736ee057b
 DIST vaultwarden-1.32.5-vendor.tar.xz 57885072 BLAKE2B 50d29fb4eee5031802ab8309017a288c7f08bcbdbfe7c0ed4e2008f716956a91dadcdbcebc177baa6663e10298e7e1638ac1077efb8bdcb36a5d7172a2ce282c SHA512 9f015a5b0a26eab7d5425ed2de6a6a7ebec3ccce78531db6cd625495fe17a750c0a748d98040ebccb48e04360f7515b40fb1bfa7cd75db63f0e0ce6a4e43584e
 DIST vaultwarden-1.32.5.tar.gz 623393 BLAKE2B 61bdf57c16f9eb7940c399bf29dbc06b8a46b5821ba1bc77745b0f9a81fc259acbb08c9a70bba7dbf03a8ebbc3e080fe07f76f97e13036b2b57beffea29e1ec2 SHA512 671988090220aa974900c83025b4e7c1fdb92975786126bdc86def6c04aa2485cc456157d2570a058d8496c2141d15edfa6615b0f481c769a054efcae7373869

diff --git a/app-admin/vaultwarden/vaultwarden-1.30.3-r1.ebuild b/app-admin/vaultwarden/vaultwarden-1.30.3-r1.ebuild
deleted file mode 100644
index a934cd949..000000000
--- a/app-admin/vaultwarden/vaultwarden-1.30.3-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# https://github.com/dani-garcia/vaultwarden/issues/4649
-RUST_MAX_VER="1.77.1"
-
-inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
-
-DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust"
-HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.git"
-else
-	SRC_URI="
-	https://github.com/dani-garcia/vaultwarden/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz
-	https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/wiki.tar.xz -> ${P}-docs.tar.xz
-"
-	KEYWORDS="~amd64"
-fi
-
-# main
-LICENSE="AGPL-3"
-# deps
-LICENSE+=" 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
-
-SLOT="0"
-IUSE="cli mysql postgres sqlite web"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	acct-user/vaultwarden
-	acct-group/vaultwarden
-	cli? ( || ( app-admin/bitwarden-cli app-admin/bitwarden-cli-bin  ) )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )
-	web? ( || ( www-apps/vaultwarden-web www-apps/vaultwarden-web-bin  ) )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-QA_PRESTRIPPED="usr/bin/${PN}"
-ECARGO_VENDOR="${WORKDIR}/vendor"
-
-PATCHES=(
-	"${FILESDIR}"/vaultwarden-envfile-1.30.3.patch
-)
-
-CHECKREQS_MEMORY=3G
-CHECKREQS_DISK_BUILD=2G
-
-DOC_CONTENTS="\n
-	Configuration file: /etc/${PN}.env\n
-	Data directory: /var/lib/${PN}\n
-	\n
-	MySQL & PostgreSQL users must set DATABASE_URL in config\n
-	\n
-	Default server: http://0.0.0.0:8000\n
-	Admin interface: http://0.0.0.0:8000/admin
-"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	rust_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		# clone vaultwarden
-		git-r3_src_unpack
-
-		# clone vaultwarden.wiki
-		EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.wiki.git"
-		EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}.wiki"
-		git-r3_src_unpack
-
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	use web && { sed -i -e 's|^WEB_VAULT_ENABLED=false|WEB_VAULT_ENABLED=true|g;' .env.template || die; }
-}
-
-src_configure() {
-	local myfeatures=(
-		$(usev sqlite)
-		$(usev mysql)
-		$(usev postgres postgresql )
-	)
-	cargo_src_configure
-}
-
-src_compile() {
-	# https://github.com/dani-garcia/vaultwarden/blob/main/build.rs
-	[[ ${PV} != 9999* ]] && export VW_VERSION="${PV}"
-	cargo_src_compile
-}
-
-src_install() {
-	dobin target/*/"${PN}"
-	systemd_newunit "${FILESDIR}"/vaultwarden-1.30.3.service "${PN}".service
-	newinitd "${FILESDIR}"/vaultwarden-1.30.3.initd "${PN}"
-	newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
-	insinto /etc
-	newins .env.template "${PN}".env
-	dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
-	keepdir /var/lib/"${PN}"
-
-	readme.gentoo_create_doc
-	einstalldocs
-	dodoc -r ../"${PN}".wiki/*
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}".conf
-	readme.gentoo_print_elog
-}

diff --git a/app-admin/vaultwarden/vaultwarden-1.30.4-r1.ebuild b/app-admin/vaultwarden/vaultwarden-1.30.4-r1.ebuild
deleted file mode 100644
index a934cd949..000000000
--- a/app-admin/vaultwarden/vaultwarden-1.30.4-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# https://github.com/dani-garcia/vaultwarden/issues/4649
-RUST_MAX_VER="1.77.1"
-
-inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
-
-DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust"
-HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.git"
-else
-	SRC_URI="
-	https://github.com/dani-garcia/vaultwarden/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz
-	https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/wiki.tar.xz -> ${P}-docs.tar.xz
-"
-	KEYWORDS="~amd64"
-fi
-
-# main
-LICENSE="AGPL-3"
-# deps
-LICENSE+=" 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
-
-SLOT="0"
-IUSE="cli mysql postgres sqlite web"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	acct-user/vaultwarden
-	acct-group/vaultwarden
-	cli? ( || ( app-admin/bitwarden-cli app-admin/bitwarden-cli-bin  ) )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )
-	web? ( || ( www-apps/vaultwarden-web www-apps/vaultwarden-web-bin  ) )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-QA_PRESTRIPPED="usr/bin/${PN}"
-ECARGO_VENDOR="${WORKDIR}/vendor"
-
-PATCHES=(
-	"${FILESDIR}"/vaultwarden-envfile-1.30.3.patch
-)
-
-CHECKREQS_MEMORY=3G
-CHECKREQS_DISK_BUILD=2G
-
-DOC_CONTENTS="\n
-	Configuration file: /etc/${PN}.env\n
-	Data directory: /var/lib/${PN}\n
-	\n
-	MySQL & PostgreSQL users must set DATABASE_URL in config\n
-	\n
-	Default server: http://0.0.0.0:8000\n
-	Admin interface: http://0.0.0.0:8000/admin
-"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	rust_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		# clone vaultwarden
-		git-r3_src_unpack
-
-		# clone vaultwarden.wiki
-		EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.wiki.git"
-		EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}.wiki"
-		git-r3_src_unpack
-
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	use web && { sed -i -e 's|^WEB_VAULT_ENABLED=false|WEB_VAULT_ENABLED=true|g;' .env.template || die; }
-}
-
-src_configure() {
-	local myfeatures=(
-		$(usev sqlite)
-		$(usev mysql)
-		$(usev postgres postgresql )
-	)
-	cargo_src_configure
-}
-
-src_compile() {
-	# https://github.com/dani-garcia/vaultwarden/blob/main/build.rs
-	[[ ${PV} != 9999* ]] && export VW_VERSION="${PV}"
-	cargo_src_compile
-}
-
-src_install() {
-	dobin target/*/"${PN}"
-	systemd_newunit "${FILESDIR}"/vaultwarden-1.30.3.service "${PN}".service
-	newinitd "${FILESDIR}"/vaultwarden-1.30.3.initd "${PN}"
-	newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
-	insinto /etc
-	newins .env.template "${PN}".env
-	dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
-	keepdir /var/lib/"${PN}"
-
-	readme.gentoo_create_doc
-	einstalldocs
-	dodoc -r ../"${PN}".wiki/*
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}".conf
-	readme.gentoo_print_elog
-}

diff --git a/app-admin/vaultwarden/vaultwarden-1.30.5-r1.ebuild b/app-admin/vaultwarden/vaultwarden-1.30.5-r1.ebuild
deleted file mode 100644
index e793a68b4..000000000
--- a/app-admin/vaultwarden/vaultwarden-1.30.5-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# https://github.com/dani-garcia/vaultwarden/issues/4649
-RUST_MAX_VER="1.77.1"
-
-inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
-
-DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust"
-HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.git"
-else
-	SRC_URI="
-	https://github.com/dani-garcia/vaultwarden/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/rahilarious/gentoo-distfiles/releases/download/${PN}-1.30.4/deps.tar.xz -> ${PN}-1.30.4-deps.tar.xz
-	https://github.com/rahilarious/gentoo-distfiles/releases/download/${PN}-1.30.4/wiki.tar.xz -> ${PN}-1.30.4-docs.tar.xz
-"
-	KEYWORDS="~amd64"
-fi
-
-# main
-LICENSE="AGPL-3"
-# deps
-LICENSE+=" 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
-
-SLOT="0"
-IUSE="cli mysql postgres sqlite web"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	acct-user/vaultwarden
-	acct-group/vaultwarden
-	cli? ( || ( app-admin/bitwarden-cli app-admin/bitwarden-cli-bin  ) )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )
-	web? ( || ( www-apps/vaultwarden-web www-apps/vaultwarden-web-bin  ) )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-QA_PRESTRIPPED="usr/bin/${PN}"
-ECARGO_VENDOR="${WORKDIR}/vendor"
-
-PATCHES=(
-	"${FILESDIR}"/vaultwarden-envfile-1.30.3.patch
-)
-
-CHECKREQS_MEMORY=3G
-CHECKREQS_DISK_BUILD=2G
-
-DOC_CONTENTS="\n
-	Configuration file: /etc/${PN}.env\n
-	Data directory: /var/lib/${PN}\n
-	\n
-	MySQL & PostgreSQL users must set DATABASE_URL in config\n
-	\n
-	Default server: http://0.0.0.0:8000\n
-	Admin interface: http://0.0.0.0:8000/admin
-"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	rust_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		# clone vaultwarden
-		git-r3_src_unpack
-
-		# clone vaultwarden.wiki
-		EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.wiki.git"
-		EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}.wiki"
-		git-r3_src_unpack
-
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	use web && { sed -i -e 's|^WEB_VAULT_ENABLED=false|WEB_VAULT_ENABLED=true|g;' .env.template || die; }
-}
-
-src_configure() {
-	local myfeatures=(
-		$(usev sqlite)
-		$(usev mysql)
-		$(usev postgres postgresql )
-	)
-	cargo_src_configure
-}
-
-src_compile() {
-	# https://github.com/dani-garcia/vaultwarden/blob/main/build.rs
-	[[ ${PV} != 9999* ]] && export VW_VERSION="${PV}"
-	cargo_src_compile
-}
-
-src_install() {
-	dobin target/*/"${PN}"
-	systemd_newunit "${FILESDIR}"/vaultwarden-1.30.3.service "${PN}".service
-	newinitd "${FILESDIR}"/vaultwarden-1.30.3.initd "${PN}"
-	newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
-	insinto /etc
-	newins .env.template "${PN}".env
-	dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
-	keepdir /var/lib/"${PN}"
-
-	readme.gentoo_create_doc
-	einstalldocs
-	dodoc -r ../"${PN}".wiki/*
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}".conf
-	readme.gentoo_print_elog
-}

diff --git a/app-admin/vaultwarden/vaultwarden-1.32.4.ebuild b/app-admin/vaultwarden/vaultwarden-1.32.4.ebuild
deleted file mode 100644
index b96d3cd77..000000000
--- a/app-admin/vaultwarden/vaultwarden-1.32.4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# https://github.com/dani-garcia/vaultwarden/issues/4649
-RUST_MAX_VER="1.82.0"
-
-inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
-
-DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust"
-HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.git"
-else
-	SRC_URI="
-	https://github.com/dani-garcia/vaultwarden/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	https://jroy.ca/dist/${P}-vendor.tar.xz
-	https://jroy.ca/dist/${P}-wiki.tar.xz -> ${P}-docs.tar.xz
-"
-	KEYWORDS="~amd64"
-fi
-
-# main
-LICENSE="AGPL-3"
-# deps
-LICENSE+=" 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
-
-SLOT="0"
-IUSE="cli mysql postgres +sqlite web"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	acct-user/vaultwarden
-	acct-group/vaultwarden
-	cli? ( || ( app-admin/bitwarden-cli app-admin/bitwarden-cli-bin  ) )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )
-	web? ( || ( www-apps/vaultwarden-web www-apps/vaultwarden-web-bin  ) )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-QA_PRESTRIPPED="usr/bin/${PN}"
-ECARGO_VENDOR="${WORKDIR}/vendor"
-
-PATCHES=(
-	"${FILESDIR}"/vaultwarden-envfile-1.30.3.patch
-)
-
-CHECKREQS_MEMORY=3G
-CHECKREQS_DISK_BUILD=2G
-
-DOC_CONTENTS="\n
-	Configuration file: /etc/${PN}.env\n
-	Data directory: /var/lib/${PN}\n
-	\n
-	MySQL & PostgreSQL users must set DATABASE_URL in config\n
-	\n
-	Default server: http://0.0.0.0:8000\n
-	Admin interface: http://0.0.0.0:8000/admin
-"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	rust_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		# clone vaultwarden
-		git-r3_src_unpack
-
-		# clone vaultwarden.wiki
-		EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.wiki.git"
-		EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}.wiki"
-		git-r3_src_unpack
-
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	use web && { sed -i -e 's|^WEB_VAULT_ENABLED=false|WEB_VAULT_ENABLED=true|g;' .env.template || die; }
-}
-
-src_configure() {
-	local myfeatures=(
-		$(usev sqlite)
-		$(usev mysql)
-		$(usev postgres postgresql )
-	)
-	cargo_src_configure
-}
-
-src_compile() {
-	# https://github.com/dani-garcia/vaultwarden/blob/main/build.rs
-	[[ ${PV} != 9999* ]] && export VW_VERSION="${PV}"
-	cargo_src_compile
-}
-
-src_install() {
-	dobin target/*/*/"${PN}"
-	systemd_newunit "${FILESDIR}"/vaultwarden-1.30.3.service "${PN}".service
-	newinitd "${FILESDIR}"/vaultwarden-1.30.3.initd "${PN}"
-	newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
-	insinto /etc
-	newins .env.template "${PN}".env
-	dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
-	keepdir /var/lib/"${PN}"
-
-	readme.gentoo_create_doc
-	einstalldocs
-	dodoc -r ../"${PN}".wiki/*
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}".conf
-	readme.gentoo_print_elog
-}

diff --git a/app-admin/vaultwarden/vaultwarden-1.32.7.ebuild b/app-admin/vaultwarden/vaultwarden-1.32.7.ebuild
index 53e5a280f..b89cf7f55 100644
--- a/app-admin/vaultwarden/vaultwarden-1.32.7.ebuild
+++ b/app-admin/vaultwarden/vaultwarden-1.32.7.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="
 		https://github.com/dani-garcia/vaultwarden/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-		https://jroy.ca/dist/${P}-vendor.tar.xz -> ${P}-vendor.tar.xz
+		https://jroy.ca/dist/${P}-vendor.tar.xz
 		https://jroy.ca/dist/${P}-wiki.tar.xz -> ${P}-docs.tar.xz
 	"
 	KEYWORDS="~amd64"


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: app-admin/vaultwarden/
  2025-01-13 16:43 [gentoo-commits] repo/proj/guru:dev commit in: app-admin/vaultwarden/ Julien Roy
@ 2025-01-13 17:41 ` Julien Roy
  0 siblings, 0 replies; 8+ messages in thread
From: Julien Roy @ 2025-01-13 17:41 UTC (permalink / raw
  To: gentoo-commits

commit:     e9cd77576774faf558ce427f5cdac93ed8dc115d
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Mon Jan 13 16:18:02 2025 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Mon Jan 13 16:42:58 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e9cd7757

app-admin/vaultwarden: add 1.32.7

Closes: https://bugs.gentoo.org/944476
Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 app-admin/vaultwarden/Manifest                  |   3 +
 app-admin/vaultwarden/vaultwarden-1.32.7.ebuild | 137 ++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/app-admin/vaultwarden/Manifest b/app-admin/vaultwarden/Manifest
index 12188a027..b220395d9 100644
--- a/app-admin/vaultwarden/Manifest
+++ b/app-admin/vaultwarden/Manifest
@@ -11,3 +11,6 @@ DIST vaultwarden-1.32.4.tar.gz 619528 BLAKE2B 7c559b984f889c86c9902e9bd07e6b6374
 DIST vaultwarden-1.32.5-docs.tar.xz 703140 BLAKE2B 6bca8f3e03b73d2bc921cc7f91df7bf5199a6267f7cd34e5f183d04d29d29aeb6d6973c61611ee4a18bbe2e8d3627682c018a3af2411497c140f772c977bae5b SHA512 2e865e3cc68a58227b2d5d99fd2292a4f6ddecce3dccbda99c896a1a83afd2020d0252f2104988099a8f564e20b67e2b09ce82923594bf6bafa2c91736ee057b
 DIST vaultwarden-1.32.5-vendor.tar.xz 57885072 BLAKE2B 50d29fb4eee5031802ab8309017a288c7f08bcbdbfe7c0ed4e2008f716956a91dadcdbcebc177baa6663e10298e7e1638ac1077efb8bdcb36a5d7172a2ce282c SHA512 9f015a5b0a26eab7d5425ed2de6a6a7ebec3ccce78531db6cd625495fe17a750c0a748d98040ebccb48e04360f7515b40fb1bfa7cd75db63f0e0ce6a4e43584e
 DIST vaultwarden-1.32.5.tar.gz 623393 BLAKE2B 61bdf57c16f9eb7940c399bf29dbc06b8a46b5821ba1bc77745b0f9a81fc259acbb08c9a70bba7dbf03a8ebbc3e080fe07f76f97e13036b2b57beffea29e1ec2 SHA512 671988090220aa974900c83025b4e7c1fdb92975786126bdc86def6c04aa2485cc456157d2570a058d8496c2141d15edfa6615b0f481c769a054efcae7373869
+DIST vaultwarden-1.32.7-docs.tar.xz 703140 BLAKE2B 6bca8f3e03b73d2bc921cc7f91df7bf5199a6267f7cd34e5f183d04d29d29aeb6d6973c61611ee4a18bbe2e8d3627682c018a3af2411497c140f772c977bae5b SHA512 2e865e3cc68a58227b2d5d99fd2292a4f6ddecce3dccbda99c896a1a83afd2020d0252f2104988099a8f564e20b67e2b09ce82923594bf6bafa2c91736ee057b
+DIST vaultwarden-1.32.7-vendor.tar.xz 57393432 BLAKE2B 1dccb4ea8887de90b5dbdb56aa40f4f5d9d670c0b5b1adc19eebd48da05768bb7518fd04638b3630228761474d1ff5015001ca47a94d0ab0677d3ca426837d48 SHA512 6642638c4689b86f68ac7571bcc97139d201c84aa1bfefe78b1ccdb1bd2a6ff758f123a46c1eef14fc95888220ac184d9c911ed0ef18da352a2a80650a65e064
+DIST vaultwarden-1.32.7.tar.gz 628227 BLAKE2B aaf782cdea3c5ad1aca31ec7e40e70df731377d4f8bbd8b752a7aea1b26660feb69c65101fc4597bcbb48d37931e946a45a05d76be3050a538a04f78664db1df SHA512 906f082c9609a52161156b0f5330c197971ffae51d308f8df86f34841b91293394518079e353b06914e5a762555cda37038faa607d1c4893530fdd196688d196

diff --git a/app-admin/vaultwarden/vaultwarden-1.32.7.ebuild b/app-admin/vaultwarden/vaultwarden-1.32.7.ebuild
new file mode 100644
index 000000000..53e5a280f
--- /dev/null
+++ b/app-admin/vaultwarden/vaultwarden-1.32.7.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# https://github.com/dani-garcia/vaultwarden/issues/4649
+RUST_MAX_VER="1.83.0"
+
+inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
+
+DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust"
+HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.git"
+else
+	SRC_URI="
+		https://github.com/dani-garcia/vaultwarden/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+		https://jroy.ca/dist/${P}-vendor.tar.xz -> ${P}-vendor.tar.xz
+		https://jroy.ca/dist/${P}-wiki.tar.xz -> ${P}-docs.tar.xz
+	"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="AGPL-3"
+# Dependent crate licenses
+LICENSE+=" 0BSD Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-3.0"
+
+SLOT="0"
+IUSE="cli mysql postgres +sqlite web"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	acct-user/vaultwarden
+	acct-group/vaultwarden
+	dev-libs/openssl:=
+	cli? ( || ( app-admin/bitwarden-cli app-admin/bitwarden-cli-bin  ) )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+	web? ( || ( www-apps/vaultwarden-web www-apps/vaultwarden-web-bin  ) )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="usr/bin/${PN}"
+ECARGO_VENDOR="${WORKDIR}/vendor"
+
+PATCHES=(
+	"${FILESDIR}"/vaultwarden-envfile-1.30.3.patch
+)
+
+CHECKREQS_MEMORY=3G
+CHECKREQS_DISK_BUILD=2G
+
+DOC_CONTENTS="\n
+	Configuration file: /etc/${PN}.env\n
+	Data directory: /var/lib/${PN}\n
+	\n
+	MySQL & PostgreSQL users must set DATABASE_URL in config\n
+	\n
+	Default server: http://0.0.0.0:8000\n
+	Admin interface: http://0.0.0.0:8000/admin
+"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	rust_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		# clone vaultwarden
+		git-r3_src_unpack
+
+		# clone vaultwarden.wiki
+		EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.wiki.git"
+		EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}.wiki"
+		git-r3_src_unpack
+
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		mkdir "${CARGO_HOME}/gentoo" || die
+		ln -s "${WORKDIR}/vendor/"* "${CARGO_HOME}/gentoo/" || die
+		sed -i "${ECARGO_HOME}/config.toml" \
+			-e 's/work\/vendor/work\/cargo_home\/gentoo/' \
+			-e '/source.crates-io/d' \
+			-e '/replace-with = "gentoo"/d' \
+			-e '/local-registry = "\/nonexistent"/d' \
+			|| die
+		cat "${WORKDIR}/vendor/vendor-config.toml" >> "${ECARGO_HOME}/config.toml" || die
+	fi
+}
+
+src_prepare() {
+	default
+	use web && { sed -i -e 's|^WEB_VAULT_ENABLED=false|WEB_VAULT_ENABLED=true|g;' .env.template || die; }
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usev sqlite)
+		$(usev mysql)
+		$(usev postgres postgresql )
+	)
+	cargo_src_configure
+}
+
+src_compile() {
+	# https://github.com/dani-garcia/vaultwarden/blob/main/build.rs
+	[[ ${PV} != 9999* ]] && export VW_VERSION="${PV}"
+	cargo_src_compile --no-default-features
+}
+
+src_install() {
+	dobin target/*/*/"${PN}"
+	systemd_newunit "${FILESDIR}"/vaultwarden-1.30.3.service "${PN}".service
+	newinitd "${FILESDIR}"/vaultwarden-1.30.3.initd "${PN}"
+	newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
+	insinto /etc
+	newins .env.template "${PN}".env
+	dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
+	keepdir /var/lib/"${PN}"
+
+	readme.gentoo_create_doc
+	einstalldocs
+	dodoc -r ../"${PN}".wiki/*
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}".conf
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2025-01-13 17:41 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-13 16:43 [gentoo-commits] repo/proj/guru:dev commit in: app-admin/vaultwarden/ Julien Roy
2025-01-13 17:41 ` [gentoo-commits] repo/proj/guru:master " Julien Roy
  -- strict thread matches above, loose matches on Subject: below --
2025-01-13 16:43 [gentoo-commits] repo/proj/guru:dev " Julien Roy
2024-11-18 15:21 Julien Roy
2024-11-18 12:41 Julien Roy
2024-03-03  3:47 Rahil Bhimjiani
2024-03-02 17:05 Rahil Bhimjiani
2024-02-26 20:26 Rahil Bhimjiani

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox