From: karlgrose <karlgrose@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] 1password: update to 8.10.1.
Date: Tue, 14 Mar 2023 23:41:21 +0100 [thread overview]
Message-ID: <20230314224121.wVZvMs_z11DtdrmCXE2soJbVgcVe1wMmURzQiq_Ejic@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41589@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 807 bytes --]
There is an updated pull request by karlgrose against master on the void-packages repository
https://github.com/karlgrose/void-packages 1password
https://github.com/void-linux/void-packages/pull/41589
1password: update to 8.10.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally also for aarch64-glibc (cross-build)
#### Comments
- Added 1Password icons and 1password.desktop file to template
- Extended INSTALL post action to create and install custom policy file
- Added aarch64 as a supported architecture
- Revised the license handling as per commit 1527238
A patch file from https://github.com/void-linux/void-packages/pull/41589.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-1password-41589.patch --]
[-- Type: text/x-diff, Size: 4643 bytes --]
From b34c40a40af313bb8d772b27020b1811cf9e6866 Mon Sep 17 00:00:00 2001
From: Karl R Grose <karlgrose@gromar.org>
Date: Tue, 10 Jan 2023 23:22:00 -0800
Subject: [PATCH] 1password: update to 8.10.3.
---
srcpkgs/1password/INSTALL | 6 ++++
srcpkgs/1password/files/EULA | 1 +
srcpkgs/1password/template | 61 +++++++++++++++++++++++-------------
3 files changed, 46 insertions(+), 22 deletions(-)
create mode 100644 srcpkgs/1password/files/EULA
diff --git a/srcpkgs/1password/INSTALL b/srcpkgs/1password/INSTALL
index 131b1fae2096..3a8529a27e3c 100644
--- a/srcpkgs/1password/INSTALL
+++ b/srcpkgs/1password/INSTALL
@@ -7,5 +7,11 @@ post)
chmod g+s opt/1Password/1Password-KeyringHelper
chown :_onepassword opt/1Password/1Password-BrowserSupport
chmod g+s opt/1Password/1Password-BrowserSupport
+ export POLICY_OWNERS
+ POLICY_OWNERS="$(cut -d: -f1,3 etc/passwd | grep -E ':[0-9]{4}$' | cut -d: -f1 | head -n 10 | sed 's/^/unix-user:/' | tr '\n' ' ')"
+ eval "cat <<EOF
+$(cat opt/1Password/com.1password.1Password.policy.tpl)
+EOF" > opt/1Password/com.1password.1Password.policy
+ install -Dm0644 opt/1Password/com.1password.1Password.policy -t usr/share/polkit-1/actions/
;;
esac
diff --git a/srcpkgs/1password/files/EULA b/srcpkgs/1password/files/EULA
new file mode 100644
index 000000000000..1d939047fedc
--- /dev/null
+++ b/srcpkgs/1password/files/EULA
@@ -0,0 +1 @@
+The current version can be found at: https://1password.com/legal/terms-of-service/
diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
index 293ac7dc4461..57e2526bda8b 100644
--- a/srcpkgs/1password/template
+++ b/srcpkgs/1password/template
@@ -1,21 +1,34 @@
# Template file for '1password'
pkgname=1password
-version=8.4.1
+version=8.10.3
revision=1
-archs="x86_64"
-hostmakedepends="w3m gnupg"
+archs="x86_64 aarch64"
+hostmakedepends="gnupg"
short_desc="Password manager"
maintainer="b-l-a-i-n-e <blaine.gilbreth@gmail.com>"
license="custom:Proprietary"
homepage="https://www.1password.com"
-distfiles="https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz
- https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz.sig"
-checksum="f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
- 0739424395377f56c9528c1169ef72d6a941e21f1bc9d728481bf5de8563bf01"
-_filename="1password-${version}.x64.tar.gz"
+
+case "${XBPS_TARGET_MACHINE}" in
+ aarch64)
+ _arch="arm64"
+ checksum="fe8b1aaa3ace15f5d5ef7e151e1b715ec25e6792550a4dcfa51a0d62fe6ffd70
+ d92d993faafb73d998bebaf013602bf287a5e59bd55662042b7b2c624ec639eb"
+ ;;
+
+ x86_64)
+ _arch="x64"
+ checksum="ba61b00478c59b9a219b1e794da9ee79a3a88caedcd3c5eab16db3b1e714dcec
+ 7657ac64c4ac092593f58e061a5bc7462c03ae00551250ae211beada1bb478e5"
+ ;;
+esac
+
+distfiles="https://downloads.1password.com/linux/tar/stable/${XBPS_TARGET_MACHINE}/1password-${version}.${_arch}.tar.gz
+ https://downloads.1password.com/linux/tar/stable/${XBPS_TARGET_MACHINE}/1password-${version}.${_arch}.tar.gz.sig"
+_filename="1password-${version}.${_arch}.tar.gz"
_1passworddir="${_filename%.tar.*}"
-_license_checksum=b8f6ff9297488416f3d8063a151109ed5e8a2df6fa546856a4beaa715cbc0fda
_gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
+_resources="opt/1Password/resources"
system_groups="_onepassword"
repository=nonfree
restricted=yes
@@ -33,24 +46,28 @@ post_extract() {
then
msg_error "gpg verify failed\n"
fi
-
- # verify EULA
- $XBPS_FETCH_CMD -o eula https://1password.com/legal/terms-of-service/
- cat eula |
- w3m -dump -I utf-8 -T text/html |
- sed -n '/Service Agreement for 1Password/,/We clarified what happens if we part ways./p' > EULA
- filesum="$($XBPS_DIGEST_CMD EULA)"
- if [ "$filesum" != "$_license_checksum" ]; then
- msg_error "SHA256 mismatch for EULA:\n$filesum\n"
- fi
}
do_install() {
vmkdir opt/1Password
- vlicense EULA
- rm -f EULA eula
+ vlicense ${FILESDIR}/EULA
vcopy "*" opt/1Password
- vinstall com.1password.1Password.policy 644 usr/share/polkit-1/actions/
+
+ # Install the icons
+ for _s in 32 64 256 512; do
+ # Create xdg directory
+ vmkdir usr/share/icons/hicolor/${_s}x${_s}/apps
+
+ # Copy the 1Password icon
+ mv ${DESTDIR}/${_resources}/icons/hicolor/${_s}x${_s}/apps/1password.png \
+ ${DESTDIR}/usr/share/icons/hicolor/${_s}x${_s}/apps/1password.png
+ done
+
+ # Install the .desktop file
+ vmkdir usr/share/applications
+ mv ${DESTDIR}/${_resources}/1password.desktop \
+ ${DESTDIR}/usr/share/applications/1password.desktop
+
vinstall resources/custom_allowed_browsers 644 usr/share/doc/1password/examples/
vbin "${FILESDIR}/1password"
}
next prev parent reply other threads:[~2023-03-14 22:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-11 18:35 [PR PATCH] 1password: update to 8.9.12 karlgrose
2023-01-18 10:08 ` [PR PATCH] [Updated] " karlgrose
2023-01-28 2:39 ` [PR PATCH] [Updated] 1password: update to 8.9.13 karlgrose
2023-02-15 8:07 ` [PR PATCH] [Updated] 1password: update to 8.9.14 karlgrose
2023-02-16 17:12 ` 1password: update to 8.10.0 larsgrah
2023-02-16 21:06 ` [PR PATCH] [Updated] " karlgrose
2023-02-16 21:12 ` karlgrose
2023-03-10 6:36 ` karlgrose
2023-03-14 22:41 ` karlgrose [this message]
2023-04-12 19:05 ` [PR PATCH] [Updated] 1password: update to 8.10.3 karlgrose
2023-05-10 1:46 ` [PR PATCH] [Updated] 1password: update to 8.10.4 karlgrose
2023-06-01 0:01 ` [PR PATCH] [Updated] 1password: update to 8.10.6 karlgrose
2023-06-27 11:17 ` [PR PATCH] [Merged]: 1password: update to 8.10.7 Duncaen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230314224121.wVZvMs_z11DtdrmCXE2soJbVgcVe1wMmURzQiq_Ejic@z \
--to=karlgrose@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).