From 6828e76979a5be18a9b46bd3bba0f830eb686e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 10 Nov 2022 08:03:18 +0700 Subject: [PATCH] pass: really switch to gpg --- srcpkgs/pass/patches/gpg.patch | 14 ++++++++++++++ srcpkgs/pass/template | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/pass/patches/gpg.patch diff --git a/srcpkgs/pass/patches/gpg.patch b/srcpkgs/pass/patches/gpg.patch new file mode 100644 index 00000000000..bea9a45dfb1 --- /dev/null +++ b/srcpkgs/pass/patches/gpg.patch @@ -0,0 +1,14 @@ +Index: pass-1.7.4/src/password-store.sh +=================================================================== +--- pass-1.7.4.orig/src/password-store.sh ++++ pass-1.7.4/src/password-store.sh +@@ -9,8 +9,7 @@ set -o pipefail + GPG_OPTS=( $PASSWORD_STORE_GPG_OPTS "--quiet" "--yes" "--compress-algo=none" "--no-encrypt-to" ) + GPG="gpg" + export GPG_TTY="${GPG_TTY:-$(tty 2>/dev/null)}" +-which gpg2 &>/dev/null && GPG="gpg2" +-[[ -n $GPG_AGENT_INFO || $GPG == "gpg2" ]] && GPG_OPTS+=( "--batch" "--use-agent" ) ++GPG_OPTS+=( "--batch" "--use-agent" ) + + PREFIX="${PASSWORD_STORE_DIR:-$HOME/.password-store}" + EXTENSIONS="${PASSWORD_STORE_EXTENSIONS_DIR:-$PREFIX/.extensions}" diff --git a/srcpkgs/pass/template b/srcpkgs/pass/template index c048b2f19ab..20bcc68db5f 100644 --- a/srcpkgs/pass/template +++ b/srcpkgs/pass/template @@ -1,11 +1,11 @@ # Template file for 'pass' pkgname=pass version=1.7.4 -revision=2 +revision=3 build_style=gnu-makefile make_install_args="WITH_BASHCOMP=yes WITH_ZSHCOMP=yes WITH_FISHCOMP=yes" -depends="bash gnupg>=2 tree which" -checkdepends="gnupg tree which git" +depends="bash gnupg>=2 tree" +checkdepends="gnupg tree git" short_desc="Stores, retrieves, generates, and synchronizes passwords securely" maintainer="teldra " license="GPL-2.0-or-later"