Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: 1password-8.4.1
@ 2021-12-08  9:46 b-l-a-i-n-e
  2021-12-08  9:48 ` b-l-a-i-n-e
                   ` (13 more replies)
  0 siblings, 14 replies; 15+ messages in thread
From: b-l-a-i-n-e @ 2021-12-08  9:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 656 bytes --]

There is a new pull request by b-l-a-i-n-e against master on the void-packages repository

https://github.com/b-l-a-i-n-e/void-packages 1password
https://github.com/void-linux/void-packages/pull/34427

New package: 1password-8.4.1
#### Testing the changes
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)


A patch file from https://github.com/void-linux/void-packages/pull/34427.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-1password-34427.patch --]
[-- Type: text/x-diff, Size: 3176 bytes --]

From 56344db022a0ea486fdc0cf5496e18ce5711a160 Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 8 Dec 2021 01:35:46 -0800
Subject: [PATCH] New package: 1password-8.4.1

---
 srcpkgs/1password/INSTALL  | 20 ++++++++++++++++++
 srcpkgs/1password/REMOVE   | 10 +++++++++
 srcpkgs/1password/template | 42 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 srcpkgs/1password/INSTALL
 create mode 100644 srcpkgs/1password/REMOVE
 create mode 100644 srcpkgs/1password/template

diff --git a/srcpkgs/1password/INSTALL b/srcpkgs/1password/INSTALL
new file mode 100644
index 000000000000..269d27d84964
--- /dev/null
+++ b/srcpkgs/1password/INSTALL
@@ -0,0 +1,20 @@
+# INSTALL
+case "${ACTION}" in
+post)
+	install -Dm0644 opt/1Password/com.1password.1Password.policy -t /usr/share/polkit-1/actions/
+	install -Dm0644 opt/1Password/resources/custom_allowed_browsers -t /usr/share/doc/1password/examples/
+
+	chmod 4755 opt/1Password/chrome-sandbox
+
+	groupadd -f onepassword
+
+	chown :onepassword opt/1Password/1Password-KeyringHelper
+	chmod u+s opt/1Password/1Password-KeyringHelper
+	chmod g+s opt/1Password/1Password-KeyringHelper
+
+	chown :onepassword opt/1Password/1Password-BrowserSupport
+	chmod g+s opt/1Password/1Password-BrowserSupport
+
+	ln -sf /opt/1Password/1password /usr/bin/1password
+	;;
+esac
diff --git a/srcpkgs/1password/REMOVE b/srcpkgs/1password/REMOVE
new file mode 100644
index 000000000000..f30e3442e35e
--- /dev/null
+++ b/srcpkgs/1password/REMOVE
@@ -0,0 +1,10 @@
+# REMOVE
+case "${ACTION}" in
+post)
+	rm /usr/share/polkit-1/actions/com.1password.1Password.policy
+	# Remove docs
+	rm -rf /usr/share/doc/1password
+	# Cleanup symlink
+	rm /usr/bin/1password
+	;;
+esac
diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
new file mode 100644
index 000000000000..ad0ca10bfdfb
--- /dev/null
+++ b/srcpkgs/1password/template
@@ -0,0 +1,42 @@
+# Template file for '1password'
+pkgname=1password
+version=8.4.1
+revision=1
+_filename="1password-latest.tar.gz"
+_1passworddir="1password-${version}.x64"
+archs="x86_64"
+create_wrksrc=yes
+build_style=fetch
+hostmakedepends="curl w3m libcurl"
+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/${_filename}"
+checksum=f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
+_license_checksum=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+repository=nonfree
+restricted=yes
+nostrip=yes
+noshlibprovides=yes
+
+post_extract() {
+	curl -Llhttps://1password.com/legal/terms-of-service/ |
+		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 EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
+do_build() {
+	bsdtar -xf "${_filename}"
+}
+
+do_install() {
+	vmkdir opt/1Password
+	vcopy "${_1passworddir}/*" opt/1Password
+	vlicense EULA
+}

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

* Re: New package: 1password-8.4.1
  2021-12-08  9:46 [PR PATCH] New package: 1password-8.4.1 b-l-a-i-n-e
@ 2021-12-08  9:48 ` b-l-a-i-n-e
  2021-12-08  9:49 ` b-l-a-i-n-e
                   ` (12 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: b-l-a-i-n-e @ 2021-12-08  9:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 152 bytes --]

New comment by b-l-a-i-n-e on void-packages repository

https://github.com/void-linux/void-packages/pull/34427#issuecomment-988657217

Comment:
#34427 

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

* Re: New package: 1password-8.4.1
  2021-12-08  9:46 [PR PATCH] New package: 1password-8.4.1 b-l-a-i-n-e
  2021-12-08  9:48 ` b-l-a-i-n-e
@ 2021-12-08  9:49 ` b-l-a-i-n-e
  2021-12-08  9:50 ` b-l-a-i-n-e
                   ` (11 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: b-l-a-i-n-e @ 2021-12-08  9:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 152 bytes --]

New comment by b-l-a-i-n-e on void-packages repository

https://github.com/void-linux/void-packages/pull/34427#issuecomment-988657217

Comment:
#34427 

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

* Re: New package: 1password-8.4.1
  2021-12-08  9:46 [PR PATCH] New package: 1password-8.4.1 b-l-a-i-n-e
  2021-12-08  9:48 ` b-l-a-i-n-e
  2021-12-08  9:49 ` b-l-a-i-n-e
@ 2021-12-08  9:50 ` b-l-a-i-n-e
  2021-12-08 17:31 ` Chocimier
                   ` (10 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: b-l-a-i-n-e @ 2021-12-08  9:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 152 bytes --]

New comment by b-l-a-i-n-e on void-packages repository

https://github.com/void-linux/void-packages/pull/34427#issuecomment-988658381

Comment:
#34425 

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

* Re: New package: 1password-8.4.1
  2021-12-08  9:46 [PR PATCH] New package: 1password-8.4.1 b-l-a-i-n-e
                   ` (2 preceding siblings ...)
  2021-12-08  9:50 ` b-l-a-i-n-e
@ 2021-12-08 17:31 ` Chocimier
  2021-12-08 22:11 ` [PR PATCH] [Updated] " b-l-a-i-n-e
                   ` (9 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: Chocimier @ 2021-12-08 17:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 469 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/34427#issuecomment-989022335

Comment:
- usr should be populated build time (do install), not install time (INSTALL)
- group should be added with dedicated mechanism, not from INSTALL, and should be prefixed with underscore
- use url of specific version (see aur), otherwise template will break continuously
- drop build_style and custom extraction in `do_build`

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

* Re: [PR PATCH] [Updated] New package: 1password-8.4.1
  2021-12-08  9:46 [PR PATCH] New package: 1password-8.4.1 b-l-a-i-n-e
                   ` (3 preceding siblings ...)
  2021-12-08 17:31 ` Chocimier
@ 2021-12-08 22:11 ` b-l-a-i-n-e
  2021-12-08 22:18 ` b-l-a-i-n-e
                   ` (8 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: b-l-a-i-n-e @ 2021-12-08 22:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 661 bytes --]

There is an updated pull request by b-l-a-i-n-e against master on the void-packages repository

https://github.com/b-l-a-i-n-e/void-packages 1password
https://github.com/void-linux/void-packages/pull/34427

New package: 1password-8.4.1
#### Testing the changes
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)


A patch file from https://github.com/void-linux/void-packages/pull/34427.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-1password-34427.patch --]
[-- Type: text/x-diff, Size: 7710 bytes --]

From 56344db022a0ea486fdc0cf5496e18ce5711a160 Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 8 Dec 2021 01:35:46 -0800
Subject: [PATCH 1/2] New package: 1password-8.4.1

---
 srcpkgs/1password/INSTALL  | 20 ++++++++++++++++++
 srcpkgs/1password/REMOVE   | 10 +++++++++
 srcpkgs/1password/template | 42 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 srcpkgs/1password/INSTALL
 create mode 100644 srcpkgs/1password/REMOVE
 create mode 100644 srcpkgs/1password/template

diff --git a/srcpkgs/1password/INSTALL b/srcpkgs/1password/INSTALL
new file mode 100644
index 000000000000..269d27d84964
--- /dev/null
+++ b/srcpkgs/1password/INSTALL
@@ -0,0 +1,20 @@
+# INSTALL
+case "${ACTION}" in
+post)
+	install -Dm0644 opt/1Password/com.1password.1Password.policy -t /usr/share/polkit-1/actions/
+	install -Dm0644 opt/1Password/resources/custom_allowed_browsers -t /usr/share/doc/1password/examples/
+
+	chmod 4755 opt/1Password/chrome-sandbox
+
+	groupadd -f onepassword
+
+	chown :onepassword opt/1Password/1Password-KeyringHelper
+	chmod u+s opt/1Password/1Password-KeyringHelper
+	chmod g+s opt/1Password/1Password-KeyringHelper
+
+	chown :onepassword opt/1Password/1Password-BrowserSupport
+	chmod g+s opt/1Password/1Password-BrowserSupport
+
+	ln -sf /opt/1Password/1password /usr/bin/1password
+	;;
+esac
diff --git a/srcpkgs/1password/REMOVE b/srcpkgs/1password/REMOVE
new file mode 100644
index 000000000000..f30e3442e35e
--- /dev/null
+++ b/srcpkgs/1password/REMOVE
@@ -0,0 +1,10 @@
+# REMOVE
+case "${ACTION}" in
+post)
+	rm /usr/share/polkit-1/actions/com.1password.1Password.policy
+	# Remove docs
+	rm -rf /usr/share/doc/1password
+	# Cleanup symlink
+	rm /usr/bin/1password
+	;;
+esac
diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
new file mode 100644
index 000000000000..ad0ca10bfdfb
--- /dev/null
+++ b/srcpkgs/1password/template
@@ -0,0 +1,42 @@
+# Template file for '1password'
+pkgname=1password
+version=8.4.1
+revision=1
+_filename="1password-latest.tar.gz"
+_1passworddir="1password-${version}.x64"
+archs="x86_64"
+create_wrksrc=yes
+build_style=fetch
+hostmakedepends="curl w3m libcurl"
+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/${_filename}"
+checksum=f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
+_license_checksum=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+repository=nonfree
+restricted=yes
+nostrip=yes
+noshlibprovides=yes
+
+post_extract() {
+	curl -Llhttps://1password.com/legal/terms-of-service/ |
+		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 EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
+do_build() {
+	bsdtar -xf "${_filename}"
+}
+
+do_install() {
+	vmkdir opt/1Password
+	vcopy "${_1passworddir}/*" opt/1Password
+	vlicense EULA
+}

From 1322e69d971956e0a2ea8398dfe3826dfbbc56df Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 8 Dec 2021 14:10:09 -0800
Subject: [PATCH 2/2] Address PR comments

- usr populated at build time instead of INSTALL
- add group using system_groups
- specify version instead of latest
- drop build_style
- also adds gpg verify
---
 srcpkgs/1password/INSTALL         |  9 ---------
 srcpkgs/1password/REMOVE          | 10 ----------
 srcpkgs/1password/files/1password |  2 ++
 srcpkgs/1password/template        | 32 ++++++++++++++++++++++---------
 4 files changed, 25 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/1password/REMOVE
 create mode 100644 srcpkgs/1password/files/1password

diff --git a/srcpkgs/1password/INSTALL b/srcpkgs/1password/INSTALL
index 269d27d84964..c4ec5e9b3720 100644
--- a/srcpkgs/1password/INSTALL
+++ b/srcpkgs/1password/INSTALL
@@ -1,20 +1,11 @@
 # INSTALL
 case "${ACTION}" in
 post)
-	install -Dm0644 opt/1Password/com.1password.1Password.policy -t /usr/share/polkit-1/actions/
-	install -Dm0644 opt/1Password/resources/custom_allowed_browsers -t /usr/share/doc/1password/examples/
-
 	chmod 4755 opt/1Password/chrome-sandbox
-
-	groupadd -f onepassword
-
 	chown :onepassword opt/1Password/1Password-KeyringHelper
 	chmod u+s opt/1Password/1Password-KeyringHelper
 	chmod g+s opt/1Password/1Password-KeyringHelper
-
 	chown :onepassword opt/1Password/1Password-BrowserSupport
 	chmod g+s opt/1Password/1Password-BrowserSupport
-
-	ln -sf /opt/1Password/1password /usr/bin/1password
 	;;
 esac
diff --git a/srcpkgs/1password/REMOVE b/srcpkgs/1password/REMOVE
deleted file mode 100644
index f30e3442e35e..000000000000
--- a/srcpkgs/1password/REMOVE
+++ /dev/null
@@ -1,10 +0,0 @@
-# REMOVE
-case "${ACTION}" in
-post)
-	rm /usr/share/polkit-1/actions/com.1password.1Password.policy
-	# Remove docs
-	rm -rf /usr/share/doc/1password
-	# Cleanup symlink
-	rm /usr/bin/1password
-	;;
-esac
diff --git a/srcpkgs/1password/files/1password b/srcpkgs/1password/files/1password
new file mode 100644
index 000000000000..c1c521260437
--- /dev/null
+++ b/srcpkgs/1password/files/1password
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /opt/1Password/1password "$@"
diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
index ad0ca10bfdfb..6bad3bd33a1e 100644
--- a/srcpkgs/1password/template
+++ b/srcpkgs/1password/template
@@ -2,41 +2,55 @@
 pkgname=1password
 version=8.4.1
 revision=1
-_filename="1password-latest.tar.gz"
 _1passworddir="1password-${version}.x64"
+_filename="${_1passworddir}.tar.gz"
 archs="x86_64"
 create_wrksrc=yes
-build_style=fetch
-hostmakedepends="curl w3m libcurl"
+hostmakedepends="curl w3m libcurl gnupg"
+system_groups="onepassword"
 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/${_filename}"
 checksum=f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
-_license_checksum=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+_license_checksum=b8f6ff9297488416f3d8063a151109ed5e8a2df6fa546856a4beaa715cbc0fda
+_gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
 repository=nonfree
 restricted=yes
 nostrip=yes
 noshlibprovides=yes
 
-post_extract() {
-	curl -Llhttps://1password.com/legal/terms-of-service/ |
+post_fetch() {
+	# verify gpg key
+	curl -L "${distfiles}.sig" > "${_filename}.sig"
+	if ! gpg --recv-keys "${_gpg_key}"; then
+		msg_error "Incorrect gpg key: ${_gpg_key}\n"
+	fi
+	if ! gpg --verify "${_filename}.sig" "${_filename}"; then
+		msg_error "gpg verify failed\n"
+	fi
+
+	# verify EULA
+	curl -L https://1password.com/legal/terms-of-service/ |
 		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 EULA)"
 	if [ "$filesum" != "$_license_checksum" ]; then
 		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
 	fi
 }
 
-do_build() {
-	bsdtar -xf "${_filename}"
+post_extract() {
+	# copy the verified EULA
+	cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/EULA" "${wrksrc}"
 }
 
 do_install() {
 	vmkdir opt/1Password
 	vcopy "${_1passworddir}/*" opt/1Password
+	vinstall "${_1passworddir}/com.1password.1Password.policy" 644 usr/share/polkit-1/actions/
+	vinstall "${_1passworddir}/resources/custom_allowed_browsers" 644 usr/share/doc/1password/examples/
+	vbin "${FILESDIR}/1password"
 	vlicense EULA
 }

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

* Re: [PR PATCH] [Updated] New package: 1password-8.4.1
  2021-12-08  9:46 [PR PATCH] New package: 1password-8.4.1 b-l-a-i-n-e
                   ` (4 preceding siblings ...)
  2021-12-08 22:11 ` [PR PATCH] [Updated] " b-l-a-i-n-e
@ 2021-12-08 22:18 ` b-l-a-i-n-e
  2021-12-08 22:23 ` b-l-a-i-n-e
                   ` (7 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: b-l-a-i-n-e @ 2021-12-08 22:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 661 bytes --]

There is an updated pull request by b-l-a-i-n-e against master on the void-packages repository

https://github.com/b-l-a-i-n-e/void-packages 1password
https://github.com/void-linux/void-packages/pull/34427

New package: 1password-8.4.1
#### Testing the changes
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)


A patch file from https://github.com/void-linux/void-packages/pull/34427.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-1password-34427.patch --]
[-- Type: text/x-diff, Size: 8818 bytes --]

From 56344db022a0ea486fdc0cf5496e18ce5711a160 Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 8 Dec 2021 01:35:46 -0800
Subject: [PATCH 1/3] New package: 1password-8.4.1

---
 srcpkgs/1password/INSTALL  | 20 ++++++++++++++++++
 srcpkgs/1password/REMOVE   | 10 +++++++++
 srcpkgs/1password/template | 42 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 srcpkgs/1password/INSTALL
 create mode 100644 srcpkgs/1password/REMOVE
 create mode 100644 srcpkgs/1password/template

diff --git a/srcpkgs/1password/INSTALL b/srcpkgs/1password/INSTALL
new file mode 100644
index 000000000000..269d27d84964
--- /dev/null
+++ b/srcpkgs/1password/INSTALL
@@ -0,0 +1,20 @@
+# INSTALL
+case "${ACTION}" in
+post)
+	install -Dm0644 opt/1Password/com.1password.1Password.policy -t /usr/share/polkit-1/actions/
+	install -Dm0644 opt/1Password/resources/custom_allowed_browsers -t /usr/share/doc/1password/examples/
+
+	chmod 4755 opt/1Password/chrome-sandbox
+
+	groupadd -f onepassword
+
+	chown :onepassword opt/1Password/1Password-KeyringHelper
+	chmod u+s opt/1Password/1Password-KeyringHelper
+	chmod g+s opt/1Password/1Password-KeyringHelper
+
+	chown :onepassword opt/1Password/1Password-BrowserSupport
+	chmod g+s opt/1Password/1Password-BrowserSupport
+
+	ln -sf /opt/1Password/1password /usr/bin/1password
+	;;
+esac
diff --git a/srcpkgs/1password/REMOVE b/srcpkgs/1password/REMOVE
new file mode 100644
index 000000000000..f30e3442e35e
--- /dev/null
+++ b/srcpkgs/1password/REMOVE
@@ -0,0 +1,10 @@
+# REMOVE
+case "${ACTION}" in
+post)
+	rm /usr/share/polkit-1/actions/com.1password.1Password.policy
+	# Remove docs
+	rm -rf /usr/share/doc/1password
+	# Cleanup symlink
+	rm /usr/bin/1password
+	;;
+esac
diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
new file mode 100644
index 000000000000..ad0ca10bfdfb
--- /dev/null
+++ b/srcpkgs/1password/template
@@ -0,0 +1,42 @@
+# Template file for '1password'
+pkgname=1password
+version=8.4.1
+revision=1
+_filename="1password-latest.tar.gz"
+_1passworddir="1password-${version}.x64"
+archs="x86_64"
+create_wrksrc=yes
+build_style=fetch
+hostmakedepends="curl w3m libcurl"
+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/${_filename}"
+checksum=f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
+_license_checksum=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+repository=nonfree
+restricted=yes
+nostrip=yes
+noshlibprovides=yes
+
+post_extract() {
+	curl -Llhttps://1password.com/legal/terms-of-service/ |
+		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 EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
+do_build() {
+	bsdtar -xf "${_filename}"
+}
+
+do_install() {
+	vmkdir opt/1Password
+	vcopy "${_1passworddir}/*" opt/1Password
+	vlicense EULA
+}

From 1322e69d971956e0a2ea8398dfe3826dfbbc56df Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 8 Dec 2021 14:10:09 -0800
Subject: [PATCH 2/3] Address PR comments

- usr populated at build time instead of INSTALL
- add group using system_groups
- specify version instead of latest
- drop build_style
- also adds gpg verify
---
 srcpkgs/1password/INSTALL         |  9 ---------
 srcpkgs/1password/REMOVE          | 10 ----------
 srcpkgs/1password/files/1password |  2 ++
 srcpkgs/1password/template        | 32 ++++++++++++++++++++++---------
 4 files changed, 25 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/1password/REMOVE
 create mode 100644 srcpkgs/1password/files/1password

diff --git a/srcpkgs/1password/INSTALL b/srcpkgs/1password/INSTALL
index 269d27d84964..c4ec5e9b3720 100644
--- a/srcpkgs/1password/INSTALL
+++ b/srcpkgs/1password/INSTALL
@@ -1,20 +1,11 @@
 # INSTALL
 case "${ACTION}" in
 post)
-	install -Dm0644 opt/1Password/com.1password.1Password.policy -t /usr/share/polkit-1/actions/
-	install -Dm0644 opt/1Password/resources/custom_allowed_browsers -t /usr/share/doc/1password/examples/
-
 	chmod 4755 opt/1Password/chrome-sandbox
-
-	groupadd -f onepassword
-
 	chown :onepassword opt/1Password/1Password-KeyringHelper
 	chmod u+s opt/1Password/1Password-KeyringHelper
 	chmod g+s opt/1Password/1Password-KeyringHelper
-
 	chown :onepassword opt/1Password/1Password-BrowserSupport
 	chmod g+s opt/1Password/1Password-BrowserSupport
-
-	ln -sf /opt/1Password/1password /usr/bin/1password
 	;;
 esac
diff --git a/srcpkgs/1password/REMOVE b/srcpkgs/1password/REMOVE
deleted file mode 100644
index f30e3442e35e..000000000000
--- a/srcpkgs/1password/REMOVE
+++ /dev/null
@@ -1,10 +0,0 @@
-# REMOVE
-case "${ACTION}" in
-post)
-	rm /usr/share/polkit-1/actions/com.1password.1Password.policy
-	# Remove docs
-	rm -rf /usr/share/doc/1password
-	# Cleanup symlink
-	rm /usr/bin/1password
-	;;
-esac
diff --git a/srcpkgs/1password/files/1password b/srcpkgs/1password/files/1password
new file mode 100644
index 000000000000..c1c521260437
--- /dev/null
+++ b/srcpkgs/1password/files/1password
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /opt/1Password/1password "$@"
diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
index ad0ca10bfdfb..6bad3bd33a1e 100644
--- a/srcpkgs/1password/template
+++ b/srcpkgs/1password/template
@@ -2,41 +2,55 @@
 pkgname=1password
 version=8.4.1
 revision=1
-_filename="1password-latest.tar.gz"
 _1passworddir="1password-${version}.x64"
+_filename="${_1passworddir}.tar.gz"
 archs="x86_64"
 create_wrksrc=yes
-build_style=fetch
-hostmakedepends="curl w3m libcurl"
+hostmakedepends="curl w3m libcurl gnupg"
+system_groups="onepassword"
 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/${_filename}"
 checksum=f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
-_license_checksum=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+_license_checksum=b8f6ff9297488416f3d8063a151109ed5e8a2df6fa546856a4beaa715cbc0fda
+_gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
 repository=nonfree
 restricted=yes
 nostrip=yes
 noshlibprovides=yes
 
-post_extract() {
-	curl -Llhttps://1password.com/legal/terms-of-service/ |
+post_fetch() {
+	# verify gpg key
+	curl -L "${distfiles}.sig" > "${_filename}.sig"
+	if ! gpg --recv-keys "${_gpg_key}"; then
+		msg_error "Incorrect gpg key: ${_gpg_key}\n"
+	fi
+	if ! gpg --verify "${_filename}.sig" "${_filename}"; then
+		msg_error "gpg verify failed\n"
+	fi
+
+	# verify EULA
+	curl -L https://1password.com/legal/terms-of-service/ |
 		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 EULA)"
 	if [ "$filesum" != "$_license_checksum" ]; then
 		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
 	fi
 }
 
-do_build() {
-	bsdtar -xf "${_filename}"
+post_extract() {
+	# copy the verified EULA
+	cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/EULA" "${wrksrc}"
 }
 
 do_install() {
 	vmkdir opt/1Password
 	vcopy "${_1passworddir}/*" opt/1Password
+	vinstall "${_1passworddir}/com.1password.1Password.policy" 644 usr/share/polkit-1/actions/
+	vinstall "${_1passworddir}/resources/custom_allowed_browsers" 644 usr/share/doc/1password/examples/
+	vbin "${FILESDIR}/1password"
 	vlicense EULA
 }

From f1fb050b7d743d9fd17f01c4afe40c9e7d437eea Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 8 Dec 2021 14:18:39 -0800
Subject: [PATCH 3/3] Fix lint error

---
 srcpkgs/1password/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
index 6bad3bd33a1e..2a3ea9570958 100644
--- a/srcpkgs/1password/template
+++ b/srcpkgs/1password/template
@@ -7,13 +7,13 @@ _filename="${_1passworddir}.tar.gz"
 archs="x86_64"
 create_wrksrc=yes
 hostmakedepends="curl w3m libcurl gnupg"
-system_groups="onepassword"
 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/${_filename}"
 checksum=f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
+system_groups="onepassword"
 _license_checksum=b8f6ff9297488416f3d8063a151109ed5e8a2df6fa546856a4beaa715cbc0fda
 _gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
 repository=nonfree

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

* Re: [PR PATCH] [Updated] New package: 1password-8.4.1
  2021-12-08  9:46 [PR PATCH] New package: 1password-8.4.1 b-l-a-i-n-e
                   ` (5 preceding siblings ...)
  2021-12-08 22:18 ` b-l-a-i-n-e
@ 2021-12-08 22:23 ` b-l-a-i-n-e
  2021-12-08 23:15 ` b-l-a-i-n-e
                   ` (6 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: b-l-a-i-n-e @ 2021-12-08 22:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 661 bytes --]

There is an updated pull request by b-l-a-i-n-e against master on the void-packages repository

https://github.com/b-l-a-i-n-e/void-packages 1password
https://github.com/void-linux/void-packages/pull/34427

New package: 1password-8.4.1
#### Testing the changes
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)


A patch file from https://github.com/void-linux/void-packages/pull/34427.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-1password-34427.patch --]
[-- Type: text/x-diff, Size: 8818 bytes --]

From a4b0256be239ecbbe83c108565baa615337d183f Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 8 Dec 2021 01:35:46 -0800
Subject: [PATCH 1/3] New package: 1password-8.4.1

---
 srcpkgs/1password/INSTALL  | 20 ++++++++++++++++++
 srcpkgs/1password/REMOVE   | 10 +++++++++
 srcpkgs/1password/template | 42 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 srcpkgs/1password/INSTALL
 create mode 100644 srcpkgs/1password/REMOVE
 create mode 100644 srcpkgs/1password/template

diff --git a/srcpkgs/1password/INSTALL b/srcpkgs/1password/INSTALL
new file mode 100644
index 000000000000..269d27d84964
--- /dev/null
+++ b/srcpkgs/1password/INSTALL
@@ -0,0 +1,20 @@
+# INSTALL
+case "${ACTION}" in
+post)
+	install -Dm0644 opt/1Password/com.1password.1Password.policy -t /usr/share/polkit-1/actions/
+	install -Dm0644 opt/1Password/resources/custom_allowed_browsers -t /usr/share/doc/1password/examples/
+
+	chmod 4755 opt/1Password/chrome-sandbox
+
+	groupadd -f onepassword
+
+	chown :onepassword opt/1Password/1Password-KeyringHelper
+	chmod u+s opt/1Password/1Password-KeyringHelper
+	chmod g+s opt/1Password/1Password-KeyringHelper
+
+	chown :onepassword opt/1Password/1Password-BrowserSupport
+	chmod g+s opt/1Password/1Password-BrowserSupport
+
+	ln -sf /opt/1Password/1password /usr/bin/1password
+	;;
+esac
diff --git a/srcpkgs/1password/REMOVE b/srcpkgs/1password/REMOVE
new file mode 100644
index 000000000000..f30e3442e35e
--- /dev/null
+++ b/srcpkgs/1password/REMOVE
@@ -0,0 +1,10 @@
+# REMOVE
+case "${ACTION}" in
+post)
+	rm /usr/share/polkit-1/actions/com.1password.1Password.policy
+	# Remove docs
+	rm -rf /usr/share/doc/1password
+	# Cleanup symlink
+	rm /usr/bin/1password
+	;;
+esac
diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
new file mode 100644
index 000000000000..ad0ca10bfdfb
--- /dev/null
+++ b/srcpkgs/1password/template
@@ -0,0 +1,42 @@
+# Template file for '1password'
+pkgname=1password
+version=8.4.1
+revision=1
+_filename="1password-latest.tar.gz"
+_1passworddir="1password-${version}.x64"
+archs="x86_64"
+create_wrksrc=yes
+build_style=fetch
+hostmakedepends="curl w3m libcurl"
+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/${_filename}"
+checksum=f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
+_license_checksum=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+repository=nonfree
+restricted=yes
+nostrip=yes
+noshlibprovides=yes
+
+post_extract() {
+	curl -Llhttps://1password.com/legal/terms-of-service/ |
+		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 EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
+do_build() {
+	bsdtar -xf "${_filename}"
+}
+
+do_install() {
+	vmkdir opt/1Password
+	vcopy "${_1passworddir}/*" opt/1Password
+	vlicense EULA
+}

From 9c3af7fd957abca873ff6ad0ca0d31ce66dac266 Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 8 Dec 2021 14:10:09 -0800
Subject: [PATCH 2/3] Address PR comments

- usr populated at build time instead of INSTALL
- add group using system_groups
- specify version instead of latest
- drop build_style
- also adds gpg verify
---
 srcpkgs/1password/INSTALL         |  9 ---------
 srcpkgs/1password/REMOVE          | 10 ----------
 srcpkgs/1password/files/1password |  2 ++
 srcpkgs/1password/template        | 32 ++++++++++++++++++++++---------
 4 files changed, 25 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/1password/REMOVE
 create mode 100644 srcpkgs/1password/files/1password

diff --git a/srcpkgs/1password/INSTALL b/srcpkgs/1password/INSTALL
index 269d27d84964..c4ec5e9b3720 100644
--- a/srcpkgs/1password/INSTALL
+++ b/srcpkgs/1password/INSTALL
@@ -1,20 +1,11 @@
 # INSTALL
 case "${ACTION}" in
 post)
-	install -Dm0644 opt/1Password/com.1password.1Password.policy -t /usr/share/polkit-1/actions/
-	install -Dm0644 opt/1Password/resources/custom_allowed_browsers -t /usr/share/doc/1password/examples/
-
 	chmod 4755 opt/1Password/chrome-sandbox
-
-	groupadd -f onepassword
-
 	chown :onepassword opt/1Password/1Password-KeyringHelper
 	chmod u+s opt/1Password/1Password-KeyringHelper
 	chmod g+s opt/1Password/1Password-KeyringHelper
-
 	chown :onepassword opt/1Password/1Password-BrowserSupport
 	chmod g+s opt/1Password/1Password-BrowserSupport
-
-	ln -sf /opt/1Password/1password /usr/bin/1password
 	;;
 esac
diff --git a/srcpkgs/1password/REMOVE b/srcpkgs/1password/REMOVE
deleted file mode 100644
index f30e3442e35e..000000000000
--- a/srcpkgs/1password/REMOVE
+++ /dev/null
@@ -1,10 +0,0 @@
-# REMOVE
-case "${ACTION}" in
-post)
-	rm /usr/share/polkit-1/actions/com.1password.1Password.policy
-	# Remove docs
-	rm -rf /usr/share/doc/1password
-	# Cleanup symlink
-	rm /usr/bin/1password
-	;;
-esac
diff --git a/srcpkgs/1password/files/1password b/srcpkgs/1password/files/1password
new file mode 100644
index 000000000000..c1c521260437
--- /dev/null
+++ b/srcpkgs/1password/files/1password
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /opt/1Password/1password "$@"
diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
index ad0ca10bfdfb..6bad3bd33a1e 100644
--- a/srcpkgs/1password/template
+++ b/srcpkgs/1password/template
@@ -2,41 +2,55 @@
 pkgname=1password
 version=8.4.1
 revision=1
-_filename="1password-latest.tar.gz"
 _1passworddir="1password-${version}.x64"
+_filename="${_1passworddir}.tar.gz"
 archs="x86_64"
 create_wrksrc=yes
-build_style=fetch
-hostmakedepends="curl w3m libcurl"
+hostmakedepends="curl w3m libcurl gnupg"
+system_groups="onepassword"
 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/${_filename}"
 checksum=f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
-_license_checksum=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+_license_checksum=b8f6ff9297488416f3d8063a151109ed5e8a2df6fa546856a4beaa715cbc0fda
+_gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
 repository=nonfree
 restricted=yes
 nostrip=yes
 noshlibprovides=yes
 
-post_extract() {
-	curl -Llhttps://1password.com/legal/terms-of-service/ |
+post_fetch() {
+	# verify gpg key
+	curl -L "${distfiles}.sig" > "${_filename}.sig"
+	if ! gpg --recv-keys "${_gpg_key}"; then
+		msg_error "Incorrect gpg key: ${_gpg_key}\n"
+	fi
+	if ! gpg --verify "${_filename}.sig" "${_filename}"; then
+		msg_error "gpg verify failed\n"
+	fi
+
+	# verify EULA
+	curl -L https://1password.com/legal/terms-of-service/ |
 		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 EULA)"
 	if [ "$filesum" != "$_license_checksum" ]; then
 		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
 	fi
 }
 
-do_build() {
-	bsdtar -xf "${_filename}"
+post_extract() {
+	# copy the verified EULA
+	cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/EULA" "${wrksrc}"
 }
 
 do_install() {
 	vmkdir opt/1Password
 	vcopy "${_1passworddir}/*" opt/1Password
+	vinstall "${_1passworddir}/com.1password.1Password.policy" 644 usr/share/polkit-1/actions/
+	vinstall "${_1passworddir}/resources/custom_allowed_browsers" 644 usr/share/doc/1password/examples/
+	vbin "${FILESDIR}/1password"
 	vlicense EULA
 }

From da635eef9ade31122ebc50dedf7be48e163c57eb Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 8 Dec 2021 14:18:39 -0800
Subject: [PATCH 3/3] Fix lint error

---
 srcpkgs/1password/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
index 6bad3bd33a1e..2a3ea9570958 100644
--- a/srcpkgs/1password/template
+++ b/srcpkgs/1password/template
@@ -7,13 +7,13 @@ _filename="${_1passworddir}.tar.gz"
 archs="x86_64"
 create_wrksrc=yes
 hostmakedepends="curl w3m libcurl gnupg"
-system_groups="onepassword"
 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/${_filename}"
 checksum=f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
+system_groups="onepassword"
 _license_checksum=b8f6ff9297488416f3d8063a151109ed5e8a2df6fa546856a4beaa715cbc0fda
 _gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
 repository=nonfree

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

* Re: [PR PATCH] [Updated] New package: 1password-8.4.1
  2021-12-08  9:46 [PR PATCH] New package: 1password-8.4.1 b-l-a-i-n-e
                   ` (6 preceding siblings ...)
  2021-12-08 22:23 ` b-l-a-i-n-e
@ 2021-12-08 23:15 ` b-l-a-i-n-e
  2021-12-09 17:28 ` b-l-a-i-n-e
                   ` (5 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: b-l-a-i-n-e @ 2021-12-08 23:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 661 bytes --]

There is an updated pull request by b-l-a-i-n-e against master on the void-packages repository

https://github.com/b-l-a-i-n-e/void-packages 1password
https://github.com/void-linux/void-packages/pull/34427

New package: 1password-8.4.1
#### Testing the changes
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)


A patch file from https://github.com/void-linux/void-packages/pull/34427.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-1password-34427.patch --]
[-- Type: text/x-diff, Size: 3398 bytes --]

From fc6adf182cce5d199f53a9e4a25e1e18ebea3649 Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 8 Dec 2021 01:35:46 -0800
Subject: [PATCH] New package: 1password-8.4.1

---
 srcpkgs/1password/INSTALL         | 11 ++++++
 srcpkgs/1password/files/1password |  2 ++
 srcpkgs/1password/template        | 56 +++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+)
 create mode 100644 srcpkgs/1password/INSTALL
 create mode 100644 srcpkgs/1password/files/1password
 create mode 100644 srcpkgs/1password/template

diff --git a/srcpkgs/1password/INSTALL b/srcpkgs/1password/INSTALL
new file mode 100644
index 000000000000..c4ec5e9b3720
--- /dev/null
+++ b/srcpkgs/1password/INSTALL
@@ -0,0 +1,11 @@
+# INSTALL
+case "${ACTION}" in
+post)
+	chmod 4755 opt/1Password/chrome-sandbox
+	chown :onepassword opt/1Password/1Password-KeyringHelper
+	chmod u+s opt/1Password/1Password-KeyringHelper
+	chmod g+s opt/1Password/1Password-KeyringHelper
+	chown :onepassword opt/1Password/1Password-BrowserSupport
+	chmod g+s opt/1Password/1Password-BrowserSupport
+	;;
+esac
diff --git a/srcpkgs/1password/files/1password b/srcpkgs/1password/files/1password
new file mode 100644
index 000000000000..c1c521260437
--- /dev/null
+++ b/srcpkgs/1password/files/1password
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /opt/1Password/1password "$@"
diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
new file mode 100644
index 000000000000..2a3ea9570958
--- /dev/null
+++ b/srcpkgs/1password/template
@@ -0,0 +1,56 @@
+# Template file for '1password'
+pkgname=1password
+version=8.4.1
+revision=1
+_1passworddir="1password-${version}.x64"
+_filename="${_1passworddir}.tar.gz"
+archs="x86_64"
+create_wrksrc=yes
+hostmakedepends="curl w3m libcurl 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/${_filename}"
+checksum=f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
+system_groups="onepassword"
+_license_checksum=b8f6ff9297488416f3d8063a151109ed5e8a2df6fa546856a4beaa715cbc0fda
+_gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
+repository=nonfree
+restricted=yes
+nostrip=yes
+noshlibprovides=yes
+
+post_fetch() {
+	# verify gpg key
+	curl -L "${distfiles}.sig" > "${_filename}.sig"
+	if ! gpg --recv-keys "${_gpg_key}"; then
+		msg_error "Incorrect gpg key: ${_gpg_key}\n"
+	fi
+	if ! gpg --verify "${_filename}.sig" "${_filename}"; then
+		msg_error "gpg verify failed\n"
+	fi
+
+	# verify EULA
+	curl -L https://1password.com/legal/terms-of-service/ |
+		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 EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
+post_extract() {
+	# copy the verified EULA
+	cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/EULA" "${wrksrc}"
+}
+
+do_install() {
+	vmkdir opt/1Password
+	vcopy "${_1passworddir}/*" opt/1Password
+	vinstall "${_1passworddir}/com.1password.1Password.policy" 644 usr/share/polkit-1/actions/
+	vinstall "${_1passworddir}/resources/custom_allowed_browsers" 644 usr/share/doc/1password/examples/
+	vbin "${FILESDIR}/1password"
+	vlicense EULA
+}

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

* Re: New package: 1password-8.4.1
  2021-12-08  9:46 [PR PATCH] New package: 1password-8.4.1 b-l-a-i-n-e
                   ` (7 preceding siblings ...)
  2021-12-08 23:15 ` b-l-a-i-n-e
@ 2021-12-09 17:28 ` b-l-a-i-n-e
  2021-12-13 18:54 ` [PR PATCH] [Updated] " b-l-a-i-n-e
                   ` (4 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: b-l-a-i-n-e @ 2021-12-09 17:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 216 bytes --]

New comment by b-l-a-i-n-e on void-packages repository

https://github.com/void-linux/void-packages/pull/34427#issuecomment-990063818

Comment:
thanks for taking a look @Chocimier -- updated addressing your comments

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

* Re: [PR PATCH] [Updated] New package: 1password-8.4.1
  2021-12-08  9:46 [PR PATCH] New package: 1password-8.4.1 b-l-a-i-n-e
                   ` (8 preceding siblings ...)
  2021-12-09 17:28 ` b-l-a-i-n-e
@ 2021-12-13 18:54 ` b-l-a-i-n-e
  2021-12-13 19:36 ` Chocimier
                   ` (3 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: b-l-a-i-n-e @ 2021-12-13 18:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 664 bytes --]

There is an updated pull request by b-l-a-i-n-e against master on the void-packages repository

https://github.com/b-l-a-i-n-e/void-packages 1password
https://github.com/void-linux/void-packages/pull/34427

New package: 1password-8.4.1
#### Testing the changes
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)


A patch file from https://github.com/void-linux/void-packages/pull/34427.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-1password-34427.patch --]
[-- Type: text/x-diff, Size: 3398 bytes --]

From c2e607147190ecbdb9b950357127afa021d389f1 Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 8 Dec 2021 01:35:46 -0800
Subject: [PATCH] New package: 1password-8.4.1

---
 srcpkgs/1password/INSTALL         | 11 ++++++
 srcpkgs/1password/files/1password |  2 ++
 srcpkgs/1password/template        | 56 +++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+)
 create mode 100644 srcpkgs/1password/INSTALL
 create mode 100644 srcpkgs/1password/files/1password
 create mode 100644 srcpkgs/1password/template

diff --git a/srcpkgs/1password/INSTALL b/srcpkgs/1password/INSTALL
new file mode 100644
index 000000000000..c4ec5e9b3720
--- /dev/null
+++ b/srcpkgs/1password/INSTALL
@@ -0,0 +1,11 @@
+# INSTALL
+case "${ACTION}" in
+post)
+	chmod 4755 opt/1Password/chrome-sandbox
+	chown :onepassword opt/1Password/1Password-KeyringHelper
+	chmod u+s opt/1Password/1Password-KeyringHelper
+	chmod g+s opt/1Password/1Password-KeyringHelper
+	chown :onepassword opt/1Password/1Password-BrowserSupport
+	chmod g+s opt/1Password/1Password-BrowserSupport
+	;;
+esac
diff --git a/srcpkgs/1password/files/1password b/srcpkgs/1password/files/1password
new file mode 100644
index 000000000000..c1c521260437
--- /dev/null
+++ b/srcpkgs/1password/files/1password
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /opt/1Password/1password "$@"
diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
new file mode 100644
index 000000000000..2a3ea9570958
--- /dev/null
+++ b/srcpkgs/1password/template
@@ -0,0 +1,56 @@
+# Template file for '1password'
+pkgname=1password
+version=8.4.1
+revision=1
+_1passworddir="1password-${version}.x64"
+_filename="${_1passworddir}.tar.gz"
+archs="x86_64"
+create_wrksrc=yes
+hostmakedepends="curl w3m libcurl 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/${_filename}"
+checksum=f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
+system_groups="onepassword"
+_license_checksum=b8f6ff9297488416f3d8063a151109ed5e8a2df6fa546856a4beaa715cbc0fda
+_gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
+repository=nonfree
+restricted=yes
+nostrip=yes
+noshlibprovides=yes
+
+post_fetch() {
+	# verify gpg key
+	curl -L "${distfiles}.sig" > "${_filename}.sig"
+	if ! gpg --recv-keys "${_gpg_key}"; then
+		msg_error "Incorrect gpg key: ${_gpg_key}\n"
+	fi
+	if ! gpg --verify "${_filename}.sig" "${_filename}"; then
+		msg_error "gpg verify failed\n"
+	fi
+
+	# verify EULA
+	curl -L https://1password.com/legal/terms-of-service/ |
+		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 EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
+post_extract() {
+	# copy the verified EULA
+	cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/EULA" "${wrksrc}"
+}
+
+do_install() {
+	vmkdir opt/1Password
+	vcopy "${_1passworddir}/*" opt/1Password
+	vinstall "${_1passworddir}/com.1password.1Password.policy" 644 usr/share/polkit-1/actions/
+	vinstall "${_1passworddir}/resources/custom_allowed_browsers" 644 usr/share/doc/1password/examples/
+	vbin "${FILESDIR}/1password"
+	vlicense EULA
+}

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

* Re: [PR PATCH] [Updated] New package: 1password-8.4.1
  2021-12-08  9:46 [PR PATCH] New package: 1password-8.4.1 b-l-a-i-n-e
                   ` (9 preceding siblings ...)
  2021-12-13 18:54 ` [PR PATCH] [Updated] " b-l-a-i-n-e
@ 2021-12-13 19:36 ` Chocimier
  2021-12-13 19:37 ` Chocimier
                   ` (2 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: Chocimier @ 2021-12-13 19:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 662 bytes --]

There is an updated pull request by Chocimier against master on the void-packages repository

https://github.com/b-l-a-i-n-e/void-packages 1password
https://github.com/void-linux/void-packages/pull/34427

New package: 1password-8.4.1
#### Testing the changes
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)


A patch file from https://github.com/void-linux/void-packages/pull/34427.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-1password-34427.patch --]
[-- Type: text/x-diff, Size: 3365 bytes --]

From 6810a870539b96fa54354061b890e40dd91a3abf Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 8 Dec 2021 01:35:46 -0800
Subject: [PATCH] New package: 1password-8.4.1

---
 srcpkgs/1password/INSTALL         | 11 +++++++
 srcpkgs/1password/files/1password |  2 ++
 srcpkgs/1password/template        | 52 +++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 srcpkgs/1password/INSTALL
 create mode 100644 srcpkgs/1password/files/1password
 create mode 100644 srcpkgs/1password/template

diff --git a/srcpkgs/1password/INSTALL b/srcpkgs/1password/INSTALL
new file mode 100644
index 000000000000..131b1fae2096
--- /dev/null
+++ b/srcpkgs/1password/INSTALL
@@ -0,0 +1,11 @@
+# INSTALL
+case "${ACTION}" in
+post)
+	chmod 4755 opt/1Password/chrome-sandbox
+	chown :_onepassword opt/1Password/1Password-KeyringHelper
+	chmod u+s opt/1Password/1Password-KeyringHelper
+	chmod g+s opt/1Password/1Password-KeyringHelper
+	chown :_onepassword opt/1Password/1Password-BrowserSupport
+	chmod g+s opt/1Password/1Password-BrowserSupport
+	;;
+esac
diff --git a/srcpkgs/1password/files/1password b/srcpkgs/1password/files/1password
new file mode 100644
index 000000000000..c1c521260437
--- /dev/null
+++ b/srcpkgs/1password/files/1password
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /opt/1Password/1password "$@"
diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
new file mode 100644
index 000000000000..367703cc1b51
--- /dev/null
+++ b/srcpkgs/1password/template
@@ -0,0 +1,52 @@
+# Template file for '1password'
+pkgname=1password
+version=8.4.1
+revision=1
+archs="x86_64"
+create_wrksrc=yes
+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"
+checksum=f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
+_filename="${distfiles##*/}"
+_1passworddir="${_filename%.tar.*}"
+_license_checksum=b8f6ff9297488416f3d8063a151109ed5e8a2df6fa546856a4beaa715cbc0fda
+_gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
+system_groups="_onepassword"
+repository=nonfree
+restricted=yes
+nostrip=yes
+noshlibprovides=yes
+
+post_extract() {
+	# verify gpg key
+	$XBPS_FETCH_CMD -o "${_filename}.sig" "${distfiles}.sig"
+	if ! gpg --recv-keys "${_gpg_key}"; then
+		msg_error "Incorrect gpg key: ${_gpg_key}\n"
+	fi
+	if ! gpg --verify "${_filename}.sig" "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename}"; 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
+	vcopy "${_1passworddir}/*" opt/1Password
+	vinstall "${_1passworddir}/com.1password.1Password.policy" 644 usr/share/polkit-1/actions/
+	vinstall "${_1passworddir}/resources/custom_allowed_browsers" 644 usr/share/doc/1password/examples/
+	vbin "${FILESDIR}/1password"
+	vlicense EULA
+}

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

* Re: New package: 1password-8.4.1
  2021-12-08  9:46 [PR PATCH] New package: 1password-8.4.1 b-l-a-i-n-e
                   ` (10 preceding siblings ...)
  2021-12-13 19:36 ` Chocimier
@ 2021-12-13 19:37 ` Chocimier
  2021-12-13 19:38 ` Chocimier
  2021-12-15 20:09 ` [PR PATCH] [Merged]: " Chocimier
  13 siblings, 0 replies; 15+ messages in thread
From: Chocimier @ 2021-12-13 19:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 272 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/34427#issuecomment-992806283

Comment:
Changed group name to follow guidelines, reduced build deps, and moved fetching to post_extract so builddir is cleaned correctly.

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

* Re: New package: 1password-8.4.1
  2021-12-08  9:46 [PR PATCH] New package: 1password-8.4.1 b-l-a-i-n-e
                   ` (11 preceding siblings ...)
  2021-12-13 19:37 ` Chocimier
@ 2021-12-13 19:38 ` Chocimier
  2021-12-15 20:09 ` [PR PATCH] [Merged]: " Chocimier
  13 siblings, 0 replies; 15+ messages in thread
From: Chocimier @ 2021-12-13 19:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/34427#issuecomment-992806484

Comment:
@the-maldridge, ok for restricted package?

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

* Re: [PR PATCH] [Merged]: New package: 1password-8.4.1
  2021-12-08  9:46 [PR PATCH] New package: 1password-8.4.1 b-l-a-i-n-e
                   ` (12 preceding siblings ...)
  2021-12-13 19:38 ` Chocimier
@ 2021-12-15 20:09 ` Chocimier
  13 siblings, 0 replies; 15+ messages in thread
From: Chocimier @ 2021-12-15 20:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 498 bytes --]

There's a merged pull request on the void-packages repository

New package: 1password-8.4.1
https://github.com/void-linux/void-packages/pull/34427

Description:
#### Testing the changes
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)


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

end of thread, other threads:[~2021-12-15 20:09 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-08  9:46 [PR PATCH] New package: 1password-8.4.1 b-l-a-i-n-e
2021-12-08  9:48 ` b-l-a-i-n-e
2021-12-08  9:49 ` b-l-a-i-n-e
2021-12-08  9:50 ` b-l-a-i-n-e
2021-12-08 17:31 ` Chocimier
2021-12-08 22:11 ` [PR PATCH] [Updated] " b-l-a-i-n-e
2021-12-08 22:18 ` b-l-a-i-n-e
2021-12-08 22:23 ` b-l-a-i-n-e
2021-12-08 23:15 ` b-l-a-i-n-e
2021-12-09 17:28 ` b-l-a-i-n-e
2021-12-13 18:54 ` [PR PATCH] [Updated] " b-l-a-i-n-e
2021-12-13 19:36 ` Chocimier
2021-12-13 19:37 ` Chocimier
2021-12-13 19:38 ` Chocimier
2021-12-15 20:09 ` [PR PATCH] [Merged]: " Chocimier

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).