New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
New packages: vaultwarden-web-2022.8.1, vaultwarden-1.25.1 #37258
Merged
classabbyamp
merged 2 commits into
void-linux:master
from
TinfoilSubmarine:maint/vaultwarden
Sep 6, 2022
Merged
New packages: vaultwarden-web-2022.8.1, vaultwarden-1.25.1 #37258
classabbyamp
merged 2 commits into
void-linux:master
from
TinfoilSubmarine:maint/vaultwarden
Sep 6, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TinfoilSubmarine
force-pushed
the
maint/vaultwarden
branch
from
May 23, 2022 17:28
c96664e
to
b0c3631
Compare
srcpkgs/vaultwarden/patches/dashmap_available_parallelism.patch
Outdated
Show resolved
Hide resolved
TinfoilSubmarine
force-pushed
the
maint/vaultwarden
branch
3 times, most recently
from
May 24, 2022 11:58
aecac14
to
3f1e7fd
Compare
TinfoilSubmarine
force-pushed
the
maint/vaultwarden
branch
from
June 6, 2022 13:10
3f1e7fd
to
0551245
Compare
TinfoilSubmarine
changed the title
New packages: vaultwarden-web-2.28.1, vaultwarden-1.25.0
New packages: vaultwarden-web-2022.05.0, vaultwarden-1.25.0
Jun 6, 2022
TinfoilSubmarine
force-pushed
the
maint/vaultwarden
branch
from
June 7, 2022 18:13
0551245
to
84686ff
Compare
Removed all the patches as they are no longer needed with Rust 1.61 in repo. |
TinfoilSubmarine
force-pushed
the
maint/vaultwarden
branch
2 times, most recently
from
June 28, 2022 13:49
ca7d8b7
to
0bdc475
Compare
TinfoilSubmarine
changed the title
New packages: vaultwarden-web-2022.05.0, vaultwarden-1.25.0
New packages: vaultwarden-web-2022.5.2, vaultwarden-1.25.0
Jun 28, 2022
TinfoilSubmarine
force-pushed
the
maint/vaultwarden
branch
from
July 11, 2022 13:00
0bdc475
to
27745bd
Compare
TinfoilSubmarine
changed the title
New packages: vaultwarden-web-2022.5.2, vaultwarden-1.25.0
New packages: vaultwarden-web-2022.6.0, vaultwarden-1.25.0
Jul 11, 2022
TinfoilSubmarine
force-pushed
the
maint/vaultwarden
branch
from
July 19, 2022 15:53
27745bd
to
51ef5e5
Compare
TinfoilSubmarine
changed the title
New packages: vaultwarden-web-2022.6.0, vaultwarden-1.25.0
New packages: vaultwarden-web-2022.6.2, vaultwarden-1.25.1
Jul 19, 2022
TinfoilSubmarine
force-pushed
the
maint/vaultwarden
branch
from
July 28, 2022 19:40
51ef5e5
to
3d5f627
Compare
TinfoilSubmarine
force-pushed
the
maint/vaultwarden
branch
from
September 4, 2022 22:49
3d5f627
to
309ab5e
Compare
TinfoilSubmarine
changed the title
New packages: vaultwarden-web-2022.6.2, vaultwarden-1.25.1
New packages: vaultwarden-web-2022.8.1, vaultwarden-1.25.1
Sep 4, 2022
I know I said the opposite before, but thinking about it again, i think pulling the patch from upstream is best this worked for me: diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template
index 47f3f41d62..557c3e1952 100644
--- a/srcpkgs/vaultwarden-web/template
+++ b/srcpkgs/vaultwarden-web/template
@@ -2,17 +2,26 @@
pkgname=vaultwarden-web
version=2022.8.1
revision=1
-wrksrc="clients-web-v${version}"
+_patch_ver=2022.8.0
+create_wrksrc=yes
+build_wrksrc="clients-web-v${version}"
hostmakedepends="git nodejs"
short_desc="Web vault builds for vaultwarden"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="GPL-3.0-or-later"
-# patches need to be pulled from
-# https://github.com/dani-garcia/bw_web_builds/tree/master/patches into the
-# patches directory
homepage="https://github.com/dani-garcia/bw_web_builds"
-distfiles="https://github.com/bitwarden/clients/archive/web-v${version}.tar.gz"
-checksum=9dff38f13d8be047fe0fd6426bda3c409bb222b787bd6b21a3559f5d29255a92
+distfiles="https://github.com/bitwarden/clients/archive/web-v${version}.tar.gz
+ https://raw.githubusercontent.com/dani-garcia/bw_web_builds/master/patches/v${_patch_ver}.patch"
+checksum="9dff38f13d8be047fe0fd6426bda3c409bb222b787bd6b21a3559f5d29255a92
+ 1199bcf5edb0cad2e0fc1e839b5bdc690565d6af5b32cc1c38348f0b13c69ee9"
+
+post_extract() {
+ mv v$_patch_ver.patch ${build_wrksrc}
+}
+
+post_patch() {
+ patch -Np1 -i v$_patch_ver.patch
+}
do_configure() {
npm ci --ignore-scripts I'm going to do some testing with it and we can get this merged :) |
classabbyamp
reviewed
Sep 6, 2022
TinfoilSubmarine
force-pushed
the
maint/vaultwarden
branch
from
September 6, 2022 13:37
309ab5e
to
ad81b8e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Testing the changes
New package