Merge branch 'release/8.0.27' into 'master'

upgpkg: 1password 8.0.27

See merge request dev/core/1password-archlinux-aur!19

3 files changed, 65 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f633d7e135bd..c9b666585c65 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
 pkgbase = 1password
 	pkgdesc = Password manager and secure wallet
-	pkgver = 0.9.26
+	pkgver = 8.0.27
 	pkgrel = 1
 	url = https://1password.com
+	install = 1password.install
 	arch = x86_64
 	license = LicenseRef-1Password-Proprietary
 	depends = fuse2
 	depends = zlib
 	depends = hicolor-icon-theme
-	noextract = 1password-0.9.26.AppImage
+	noextract = 1password-8.0.27.AppImage
 	options = !strip
-	source = https://downloads.1password.com/linux/appimage/1password-0.9.26.AppImage
-	source = https://downloads.1password.com/linux/appimage/1password-0.9.26.AppImage.sig
+	source = https://downloads.1password.com/linux/appimage/1password-8.0.27.AppImage
+	source = https://downloads.1password.com/linux/appimage/1password-8.0.27.AppImage.sig
 	validpgpkeys = 3FEF9748469ADBE15DA7CA80AC2D62742012EA22
-	sha256sums = 2ef1ef5944b68849bd9bebfe924ef07fe3fdc5990ecaea0b938c4ce3e3f6bc5f
-	sha256sums = 7ddaa03634d5f93b0087171c6c3a7b4b5f3090f1e488a6c314f1973bd342f1b1
+	sha256sums = ab3657b3b6a4e34e76220abe616bb3803a89ef5e37ab9ab0e4fddbdde3773645
+	sha256sums = fbc9cf798b380620095b1ea40f3f16d5d7b1d39370689c9bd1001a79e413bc80
 
 pkgname = 1password
 
diff --git a/1password.install b/1password.install
new file mode 100755
index 000000000000..446df885dd76
--- /dev/null
+++ b/1password.install
@@ -0,0 +1,52 @@
+# Do not add your user, or any others, to this group.
+GROUP_NAME="onepassword"
+
+app_group_exists() {
+    if [ $(getent group "${GROUP_NAME}") ]; then
+        true
+    else
+        false
+    fi
+}
+
+pre_install() {
+    if app_group_exists; then
+        : # Do nothing
+    else
+        groupadd "${GROUP_NAME}"
+    fi
+}
+
+pre_upgrade() {
+    if app_group_exists; then
+        : # Do nothing
+    else
+        groupadd "${GROUP_NAME}"
+    fi
+}
+
+post_install() {
+    # Setup the Core App Integration helper binary with the correct permissions and group
+    HELPER_PATH="/opt/1password/1Password-KeyringHelper"
+
+    chgrp "${GROUP_NAME}" $HELPER_PATH
+    # The binary requires setuid so it may interact with the Kernel keyring facilities
+    chmod u+s $HELPER_PATH
+    chmod g+s $HELPER_PATH
+}
+
+post_upgrade() {
+    # Setup the Core App Integration helper binary with the correct permissions and group
+    HELPER_PATH="/opt/1password/1Password-KeyringHelper"
+
+    chgrp "${GROUP_NAME}" $HELPER_PATH
+    # The binary requires setuid so it may interact with the Kernel keyring facilities
+    chmod u+s $HELPER_PATH
+    chmod g+s $HELPER_PATH
+}
+
+post_remove() {
+    if app_group_exists; then
+        groupdel "${GROUP_NAME}"
+    fi
+}
diff --git a/PKGBUILD b/PKGBUILD
index 16aaac03fb85..a1a18f008be6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=1password
-_appimagver=0.9.26
+_appimagver=8.0.27
 _appimage="${pkgname}-${_appimagver}.AppImage"
 pkgver=${_appimagver//-/_}
 pkgrel=1
@@ -9,10 +9,11 @@ url='https://1password.com'
 license=('LicenseRef-1Password-Proprietary')
 depends=('fuse2' 'zlib' 'hicolor-icon-theme')
 options=(!strip)
+install="${pkgname}.install"
 source=(https://downloads.1password.com/linux/appimage/${_appimage}{,.sig})
 noextract=("${_appimage}")
-sha256sums=('2ef1ef5944b68849bd9bebfe924ef07fe3fdc5990ecaea0b938c4ce3e3f6bc5f'
-            '7ddaa03634d5f93b0087171c6c3a7b4b5f3090f1e488a6c314f1973bd342f1b1'
+sha256sums=('ab3657b3b6a4e34e76220abe616bb3803a89ef5e37ab9ab0e4fddbdde3773645'
+            'fbc9cf798b380620095b1ea40f3f16d5d7b1d39370689c9bd1001a79e413bc80'
 )
 validpgpkeys=('3FEF9748469ADBE15DA7CA80AC2D62742012EA22')
 
@@ -41,6 +42,8 @@ package() {
     install -Dm644 squashfs-root/${pkgname}.desktop -t "${pkgdir}"/usr/share/applications/
     # Move package contents to opt
     mv squashfs-root "${pkgdir}"/opt/${pkgname}
+    # Install system unlock PolKit policy file
+    install -Dm0644 "${pkgdir}"/opt/${pkgname}/com.1password.1Password.policy -t "${pkgdir}"/usr/share/polkit-1/actions/
     # Symlink /usr/bin executable to opt
     ln -s /opt/${pkgname}/${pkgname} "${pkgdir}"/usr/bin/${pkgname}
 }