* [PR PATCH] 1password: update to 8.9.12.
@ 2023-01-11 18:35 karlgrose
2023-01-18 10:08 ` [PR PATCH] [Updated] " karlgrose
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: karlgrose @ 2023-01-11 18:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 639 bytes --]
There is a new 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.9.12.
#### 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)
#### Comments
- Added 1Password icons and 1password.desktop file to template
- Extended INSTALL post action to create and install custom policy file
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: 3185 bytes --]
From 63d0d80eb10094c6108c9df02a066e372d67055c 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.9.12.
---
srcpkgs/1password/INSTALL | 6 ++++++
srcpkgs/1password/template | 26 +++++++++++++++++++++-----
2 files changed, 27 insertions(+), 5 deletions(-)
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/template b/srcpkgs/1password/template
index 293ac7dc4461..64723fd7b385 100644
--- a/srcpkgs/1password/template
+++ b/srcpkgs/1password/template
@@ -1,6 +1,6 @@
# Template file for '1password'
pkgname=1password
-version=8.4.1
+version=8.9.12
revision=1
archs="x86_64"
hostmakedepends="w3m gnupg"
@@ -10,12 +10,13 @@ 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"
+checksum="31fab5e119a974efc8c1ea1ebaeea2ba91c86b6be30a3289118871374380db42
+ a1f04c4c57091d04a19717079eb2d65ae0c7677dacaf1ecd1b8b9af8fb7e166a"
_filename="1password-${version}.x64.tar.gz"
_1passworddir="${_filename%.tar.*}"
-_license_checksum=b8f6ff9297488416f3d8063a151109ed5e8a2df6fa546856a4beaa715cbc0fda
+_license_checksum=1799c4d0c678dce26d6ae0113f496dd0f1e103abd2dbd8eb224614c2b3990068
_gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
+_resources="opt/1Password/resources"
system_groups="_onepassword"
repository=nonfree
restricted=yes
@@ -50,7 +51,22 @@ do_install() {
vlicense EULA
rm -f EULA 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"
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] 1password: update to 8.9.12.
2023-01-11 18:35 [PR PATCH] 1password: update to 8.9.12 karlgrose
@ 2023-01-18 10:08 ` karlgrose
2023-01-28 2:39 ` [PR PATCH] [Updated] 1password: update to 8.9.13 karlgrose
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: karlgrose @ 2023-01-18 10:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 644 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.9.12.
#### 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)
#### Comments
- Added 1Password icons and 1password.desktop file to template
- Extended INSTALL post action to create and install custom policy file
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: 3834 bytes --]
From 2a01f67a2c08aa313138c8bfb42b84644020160b 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.9.13.
---
srcpkgs/1password/INSTALL | 6 +++++
srcpkgs/1password/template | 47 ++++++++++++++++++++++++++++++--------
2 files changed, 44 insertions(+), 9 deletions(-)
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/template b/srcpkgs/1password/template
index 293ac7dc4461..94c2df9aecdf 100644
--- a/srcpkgs/1password/template
+++ b/srcpkgs/1password/template
@@ -1,21 +1,35 @@
# Template file for '1password'
pkgname=1password
-version=8.4.1
+version=8.9.13
revision=1
-archs="x86_64"
+archs="x86_64 aarch64"
hostmakedepends="w3m 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="cc6d61be5e5a4f84d4a138b39985e496a5f9336f2b433cd5d111fff7798476ab
+ ed569ad65833bb1f7d0df2cb734e333e87833c4061d892d82d7fc10616a0ded0"
+ ;;
+
+ x86_64)
+ _arch="x64"
+ checksum="d7c295e8a545fb15267286aeb4da9bb74e1649c1825e0410fd588dc0d9bfa00d
+ c6e849333fd12ba8f128e5f185c79b7fe9f23fe2df44e8fabf5db9f3e1be88c9"
+ ;;
+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
+_license_checksum=75de41c3067bbca89f9550461f95cf28b34be5099bc4694fc240ae8be3e6c6bf
_gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
+_resources="opt/1Password/resources"
system_groups="_onepassword"
repository=nonfree
restricted=yes
@@ -50,7 +64,22 @@ do_install() {
vlicense EULA
rm -f EULA 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"
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] 1password: update to 8.9.13.
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 ` karlgrose
2023-02-15 8:07 ` [PR PATCH] [Updated] 1password: update to 8.9.14 karlgrose
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: karlgrose @ 2023-01-28 2:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 753 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.9.13.
#### 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
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: 3834 bytes --]
From 78fe720e522c78015f80a6790316df449013dde8 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.9.14.
---
srcpkgs/1password/INSTALL | 6 +++++
srcpkgs/1password/template | 47 ++++++++++++++++++++++++++++++--------
2 files changed, 44 insertions(+), 9 deletions(-)
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/template b/srcpkgs/1password/template
index 293ac7dc4461..ed6ce72513f0 100644
--- a/srcpkgs/1password/template
+++ b/srcpkgs/1password/template
@@ -1,21 +1,35 @@
# Template file for '1password'
pkgname=1password
-version=8.4.1
+version=8.9.14
revision=1
-archs="x86_64"
+archs="x86_64 aarch64"
hostmakedepends="w3m 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="8494ea16bebf28e9780bed68ca8ff3ae709baaf4508a7e878f22ca3a9a5497f3
+ 0a0da26f74dcd5459477bfb353643aaeeef9c3a9caa694ef046f7c535ab61a2c"
+ ;;
+
+ x86_64)
+ _arch="x64"
+ checksum="ae52f33c33ce9b36a60e7471baf82ba405b442b308370fcfb1d2f13a20693270
+ 58f2f9b89d02011edb1db88f9263a77295ceeaa99900025a92b9a8e9378671b2"
+ ;;
+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
+_license_checksum=75de41c3067bbca89f9550461f95cf28b34be5099bc4694fc240ae8be3e6c6bf
_gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
+_resources="opt/1Password/resources"
system_groups="_onepassword"
repository=nonfree
restricted=yes
@@ -50,7 +64,22 @@ do_install() {
vlicense EULA
rm -f EULA 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"
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] 1password: update to 8.9.14.
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 ` karlgrose
2023-02-16 17:12 ` 1password: update to 8.10.0 larsgrah
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: karlgrose @ 2023-02-15 8:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 753 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.9.14.
#### 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
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: 3834 bytes --]
From 513b3876d362b379e78f4c85c2943a5e150aaa61 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.0.
---
srcpkgs/1password/INSTALL | 6 +++++
srcpkgs/1password/template | 47 ++++++++++++++++++++++++++++++--------
2 files changed, 44 insertions(+), 9 deletions(-)
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/template b/srcpkgs/1password/template
index 293ac7dc4461..070383336272 100644
--- a/srcpkgs/1password/template
+++ b/srcpkgs/1password/template
@@ -1,21 +1,35 @@
# Template file for '1password'
pkgname=1password
-version=8.4.1
+version=8.10.0
revision=1
-archs="x86_64"
+archs="x86_64 aarch64"
hostmakedepends="w3m 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="c636ea67ffacc378c1cdbaa1cddfe63fb0993822d8622e8aa57f18a72ffcfc4b
+ c38058faa9c78bdafc7a8a0cfef9308c46dc79249bafd2f4dfd4c9b495bb7658"
+ ;;
+
+ x86_64)
+ _arch="x64"
+ checksum="988a65216d5719bec45653c81e0ccbd7acef55aff7ca97f04ccb554a24af6181
+ 07009b75472c0348325e3b94c6e814b65242397bd7b3ca9eb5ae16af06a64b7a"
+ ;;
+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
+_license_checksum=75de41c3067bbca89f9550461f95cf28b34be5099bc4694fc240ae8be3e6c6bf
_gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
+_resources="opt/1Password/resources"
system_groups="_onepassword"
repository=nonfree
restricted=yes
@@ -50,7 +64,22 @@ do_install() {
vlicense EULA
rm -f EULA 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"
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: 1password: update to 8.10.0.
2023-01-11 18:35 [PR PATCH] 1password: update to 8.9.12 karlgrose
` (2 preceding siblings ...)
2023-02-15 8:07 ` [PR PATCH] [Updated] 1password: update to 8.9.14 karlgrose
@ 2023-02-16 17:12 ` larsgrah
2023-02-16 21:06 ` [PR PATCH] [Updated] " karlgrose
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: larsgrah @ 2023-02-16 17:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New comment by larsgrah on void-packages repository
https://github.com/void-linux/void-packages/pull/41589#issuecomment-1433428024
Comment:
works as expected, lgtm
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] 1password: update to 8.10.0.
2023-01-11 18:35 [PR PATCH] 1password: update to 8.9.12 karlgrose
` (3 preceding siblings ...)
2023-02-16 17:12 ` 1password: update to 8.10.0 larsgrah
@ 2023-02-16 21:06 ` karlgrose
2023-02-16 21:12 ` karlgrose
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: karlgrose @ 2023-02-16 21:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 753 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.0.
#### 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
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: 4655 bytes --]
From b504b6f7908160436a3ddba583cd35a781492631 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.0.
---
srcpkgs/1password/INSTALL | 6 ++++
srcpkgs/1password/files/EULA | 1 +
srcpkgs/1password/template | 63 +++++++++++++++++++++++-------------
3 files changed, 47 insertions(+), 23 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..87d6cca6a6a6 100644
--- a/srcpkgs/1password/template
+++ b/srcpkgs/1password/template
@@ -1,21 +1,34 @@
# Template file for '1password'
pkgname=1password
-version=8.4.1
-revision=1
-archs="x86_64"
-hostmakedepends="w3m gnupg"
+version=8.10.0
+revision=2
+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="c636ea67ffacc378c1cdbaa1cddfe63fb0993822d8622e8aa57f18a72ffcfc4b
+ c38058faa9c78bdafc7a8a0cfef9308c46dc79249bafd2f4dfd4c9b495bb7658"
+ ;;
+
+ x86_64)
+ _arch="x64"
+ checksum="988a65216d5719bec45653c81e0ccbd7acef55aff7ca97f04ccb554a24af6181
+ 07009b75472c0348325e3b94c6e814b65242397bd7b3ca9eb5ae16af06a64b7a"
+ ;;
+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"
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] 1password: update to 8.10.0.
2023-01-11 18:35 [PR PATCH] 1password: update to 8.9.12 karlgrose
` (4 preceding siblings ...)
2023-02-16 21:06 ` [PR PATCH] [Updated] " karlgrose
@ 2023-02-16 21:12 ` karlgrose
2023-03-10 6:36 ` karlgrose
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: karlgrose @ 2023-02-16 21:12 UTC (permalink / raw)
To: ml
[-- 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.0.
#### 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 f1dbe6ad99c3fd5bbe9bf825f6c7fd9337dd08cb 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.0.
---
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..d2509c9553f0 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.0
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="c636ea67ffacc378c1cdbaa1cddfe63fb0993822d8622e8aa57f18a72ffcfc4b
+ c38058faa9c78bdafc7a8a0cfef9308c46dc79249bafd2f4dfd4c9b495bb7658"
+ ;;
+
+ x86_64)
+ _arch="x64"
+ checksum="988a65216d5719bec45653c81e0ccbd7acef55aff7ca97f04ccb554a24af6181
+ 07009b75472c0348325e3b94c6e814b65242397bd7b3ca9eb5ae16af06a64b7a"
+ ;;
+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"
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] 1password: update to 8.10.0.
2023-01-11 18:35 [PR PATCH] 1password: update to 8.9.12 karlgrose
` (5 preceding siblings ...)
2023-02-16 21:12 ` karlgrose
@ 2023-03-10 6:36 ` karlgrose
2023-03-14 22:41 ` [PR PATCH] [Updated] 1password: update to 8.10.1 karlgrose
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: karlgrose @ 2023-03-10 6:36 UTC (permalink / raw)
To: ml
[-- 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.0.
#### 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 43f23880262db635b5e28b28fb01ae153fdab100 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.1.
---
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..b0adef819fa1 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.1
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="514176f3f2238b43f81e6da3f26faebe7ba7d82a2b7a7cffccbc51bfbc9400ba
+ 2d250d4dd75c37bf2758e0615d2ef4f24bb7930aba8eb96789b6f4bc15fd78f9"
+ ;;
+
+ x86_64)
+ _arch="x64"
+ checksum="bae85012c54b136339bbda611caac5fca049896ff8340f629f201641ec34da44
+ 7ac2ca3d38f1f2af8cbaeef25834ffabca32a7f3c449ae7ac2a43d2412d37104"
+ ;;
+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"
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] 1password: update to 8.10.1.
2023-01-11 18:35 [PR PATCH] 1password: update to 8.9.12 karlgrose
` (6 preceding siblings ...)
2023-03-10 6:36 ` karlgrose
@ 2023-03-14 22:41 ` karlgrose
2023-04-12 19:05 ` [PR PATCH] [Updated] 1password: update to 8.10.3 karlgrose
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: karlgrose @ 2023-03-14 22:41 UTC (permalink / raw)
To: ml
[-- 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"
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] 1password: update to 8.10.3.
2023-01-11 18:35 [PR PATCH] 1password: update to 8.9.12 karlgrose
` (7 preceding siblings ...)
2023-03-14 22:41 ` [PR PATCH] [Updated] 1password: update to 8.10.1 karlgrose
@ 2023-04-12 19:05 ` karlgrose
2023-05-10 1:46 ` [PR PATCH] [Updated] 1password: update to 8.10.4 karlgrose
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: karlgrose @ 2023-04-12 19:05 UTC (permalink / raw)
To: ml
[-- 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.3.
#### 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 63032f089af2ef2fbc742e1334f744bec24b9508 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.4.
---
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..d600003a761e 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.4
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="8002d0e37980272dde5ffd2a99d069d327cc2e001da80a83f7709b0f276f251f
+ e4c0a9ffa7543586e66f526d2c60427e697991e5565e929c26a629796af7ebb5"
+ ;;
+
+ x86_64)
+ _arch="x64"
+ checksum="cc507c6d497414d98cbcd3790280de61d5236ac25b955c51022e74576045e4e5
+ bafbc376ab33eca19a35d2a94bc2c7e43dc6027199f9577b40828503c3b88462"
+ ;;
+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"
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] 1password: update to 8.10.4.
2023-01-11 18:35 [PR PATCH] 1password: update to 8.9.12 karlgrose
` (8 preceding siblings ...)
2023-04-12 19:05 ` [PR PATCH] [Updated] 1password: update to 8.10.3 karlgrose
@ 2023-05-10 1:46 ` 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
11 siblings, 0 replies; 13+ messages in thread
From: karlgrose @ 2023-05-10 1:46 UTC (permalink / raw)
To: ml
[-- 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.4.
#### 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 2ad71d50901e4e77a6c74bfc48a302fb5772ca07 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.6.
---
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..ece7ff4eff2c 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.6
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="88b8eeb9d5a690b32ea19499668f69469c7431996e754ac64e94c7093364e15a
+ df3d1239038de10db070789a1459b459e6800016eb38500ade311bf5896d9769"
+ ;;
+
+ x86_64)
+ _arch="x64"
+ checksum="c0263de31ebbcfe5fc977c2befdf815eebbafd45c995d6d5200ebb0000fd9a3d
+ 357787ecdf7a67f842b79ef81370711e3706d5b6af9d12219f10e8b1fcc1e20d"
+ ;;
+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"
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] 1password: update to 8.10.6.
2023-01-11 18:35 [PR PATCH] 1password: update to 8.9.12 karlgrose
` (9 preceding siblings ...)
2023-05-10 1:46 ` [PR PATCH] [Updated] 1password: update to 8.10.4 karlgrose
@ 2023-06-01 0:01 ` karlgrose
2023-06-27 11:17 ` [PR PATCH] [Merged]: 1password: update to 8.10.7 Duncaen
11 siblings, 0 replies; 13+ messages in thread
From: karlgrose @ 2023-06-01 0:01 UTC (permalink / raw)
To: ml
[-- 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.6.
#### 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 679fea211bd11667065b64bcb6a3df03a00b8184 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.7.
---
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..e4a929e497ae 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.7
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="4e6a1ffa66b54893104525754f97e52de5df7ba5b56b6536998ce2f8caf1bc93
+ 31dd56227da961b346c5e00aebfe44b065cecb06314c144c3572033777d5c6d0"
+ ;;
+
+ x86_64)
+ _arch="x64"
+ checksum="e4a300cecb683e636015e8e9db547c3dc76b994b645f7ab11d85f7ad5e49ab21
+ 572508224d18cceb7efe66ed2db3c52f2cfd7f572c7e107e9d7b8439340d17ac"
+ ;;
+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"
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Merged]: 1password: update to 8.10.7.
2023-01-11 18:35 [PR PATCH] 1password: update to 8.9.12 karlgrose
` (10 preceding siblings ...)
2023-06-01 0:01 ` [PR PATCH] [Updated] 1password: update to 8.10.6 karlgrose
@ 2023-06-27 11:17 ` Duncaen
11 siblings, 0 replies; 13+ messages in thread
From: Duncaen @ 2023-06-27 11:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 645 bytes --]
There's a merged pull request on the void-packages repository
1password: update to 8.10.7.
https://github.com/void-linux/void-packages/pull/41589
Description:
#### 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
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2023-06-27 11:17 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PR PATCH] [Updated] 1password: update to 8.10.1 karlgrose
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
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).