[PR PATCH] pass: update to 1.7.4.

[PR PATCH] pass: update to 1.7.4.

[teldra]

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

There is a new pull request by teldra against master on the void-packages repository

https://github.com/teldra/void-packages update-pass
https://github.com/void-linux/void-packages/pull/31469

pass: update to 1.7.4.
Since https://git.zx2c4.com/password-store/commit/?id=3d36829ce7a203f97e84723e1dc02fef1e0d06cc
the patch for wayland is not needed anymore.

<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl



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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-pass-31469.patch --]
[-- Type: text/x-diff, Size: 5865 bytes --]

From 7e335b2d1c4283f294f45c1eed99d18c85256647 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 14 Jun 2021 08:49:00 +0200
Subject: [PATCH] pass: update to 1.7.4.

Since https://git.zx2c4.com/password-store/commit/?id=3d36829ce7a203f97e84723e1dc02fef1e0d06cc
the patch for wayland is not needed anymore.
---
 .../patches/0001-clip-wayland-support.patch   | 109 ------------------
 srcpkgs/pass/template                         |   6 +-
 2 files changed, 3 insertions(+), 112 deletions(-)
 delete mode 100644 srcpkgs/pass/patches/0001-clip-wayland-support.patch

diff --git a/srcpkgs/pass/patches/0001-clip-wayland-support.patch b/srcpkgs/pass/patches/0001-clip-wayland-support.patch
deleted file mode 100644
index 5e0f25b9de99..000000000000
--- a/srcpkgs/pass/patches/0001-clip-wayland-support.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From b0b784b1a57c0b06936e6f5d6560712b4b810cd3 Mon Sep 17 00:00:00 2001
-From: Brett Cornwall <brett@i--b.com>
-Date: Wed, 27 Feb 2019 00:08:33 -0700
-Subject: clip: Add support for wl-clipboard
-
----
- README                |  4 +++-
- man/pass.1            |  5 +++++
- src/password-store.sh | 26 +++++++++++++++++++++-----
- 3 files changed, 29 insertions(+), 6 deletions(-)
-
-diff --git a/README b/README
-index 6b59965..1a46242 100644
---- README
-+++ README
-@@ -19,8 +19,10 @@ Depends on:
-   http://www.gnupg.org/
- - git
-   http://www.git-scm.com/
--- xclip
-+- xclip (for X11 environments)
-   http://sourceforge.net/projects/xclip/
-+- wl-clipboard (for wlroots Wayland-based environments)
-+  https://github.com/bugaevc/wl-clipboard
- - tree >= 1.7.0
-   http://mama.indstate.edu/users/ice/tree/
- - GNU getopt
-diff --git a/man/pass.1 b/man/pass.1
-index 01a3fbe..a555dcb 100644
---- man/pass.1
-+++ man/pass.1
-@@ -99,6 +99,8 @@ Decrypt and print a password named \fIpass-name\fP. If \fI--clip\fP or \fI-c\fP
- is specified, do not print the password but instead copy the first (or otherwise specified)
- line to the clipboard using
- .BR xclip (1)
-+or
-+.BR wl-clipboard(1)
- and then restore the clipboard after 45 (or \fIPASSWORD_STORE_CLIP_TIME\fP) seconds. If \fI--qrcode\fP
- or \fI-q\fP is specified, do not print the password but instead display a QR code using
- .BR qrencode (1)
-@@ -132,6 +134,8 @@ in generating passwords can be changed with the \fIPASSWORD_STORE_CHARACTER_SET\
- If \fI--clip\fP or \fI-c\fP is specified, do not print the password but instead copy
- it to the clipboard using
- .BR xclip (1)
-+or
-+.BR wl-clipboard(1)
- and then restore the clipboard after 45 (or \fIPASSWORD_STORE_CLIP_TIME\fP) seconds. If \fI--qrcode\fP
- or \fI-q\fP is specified, do not print the password but instead display a QR code using
- .BR qrencode (1)
-@@ -466,6 +470,7 @@ The location of the text editor used by \fBedit\fP.
- .BR tr (1),
- .BR git (1),
- .BR xclip (1),
-+.BR wl-clipboard (1),
- .BR qrencode (1).
- 
- .SH AUTHOR
-diff --git a/src/password-store.sh b/src/password-store.sh
-index d89d455..284eabf 100755
---- src/password-store.sh
-+++ src/password-store.sh
-@@ -152,16 +152,32 @@ check_sneaky_paths() {
- #
- 
- clip() {
-+	if [[ -n $WAYLAND_DISPLAY ]]; then
-+		local copy_cmd=( wl-copy )
-+		local paste_cmd=( wl-paste -n )
-+		if [[ $X_SELECTION == primary ]]; then
-+			copy_cmd+=( --primary )
-+			paste_cmd+=( --primary )
-+		fi
-+		local display_name="$WAYLAND_DISPLAY"
-+	elif [[ -n $DISPLAY ]]; then
-+		local copy_cmd=( xclip -selection "$X_SELECTION" )
-+		local paste_cmd=( xclip -o -selection "$X_SELECTION" )
-+		local display_name="$DISPLAY"
-+	else
-+		die "Error: No X11 or Wayland display detected"
-+	fi
-+	local sleep_argv0="password store sleep on display $display_name"
-+
- 	# This base64 business is because bash cannot store binary data in a shell
- 	# variable. Specifically, it cannot store nulls nor (non-trivally) store
- 	# trailing new lines.
--	local sleep_argv0="password store sleep on display $DISPLAY"
- 	pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
--	local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | $BASE64)"
--	echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard"
-+	local before="$("${paste_cmd[@]}" 2>/dev/null | $BASE64)"
-+	echo -n "$1" | "${copy_cmd[@]}" || die "Error: Could not copy data to the clipboard"
- 	(
- 		( exec -a "$sleep_argv0" bash <<<"trap 'kill %1' TERM; sleep '$CLIP_TIME' & wait" )
--		local now="$(xclip -o -selection "$X_SELECTION" | $BASE64)"
-+		local now="$("${paste_cmd[@]}" | $BASE64)"
- 		[[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now"
- 
- 		# It might be nice to programatically check to see if klipper exists,
-@@ -173,7 +189,7 @@ clip() {
- 		# so we axe it here:
- 		qdbus org.kde.klipper /klipper org.kde.klipper.klipper.clearClipboardHistory &>/dev/null
- 
--		echo "$before" | $BASE64 -d | xclip -selection "$X_SELECTION"
-+		echo "$before" | $BASE64 -d | "${copy_cmd[@]}"
- 	) >/dev/null 2>&1 & disown
- 	echo "Copied $2 to clipboard. Will clear in $CLIP_TIME seconds."
- }
--- 
-cgit v1.2.3-10-g9804
diff --git a/srcpkgs/pass/template b/srcpkgs/pass/template
index 33f0811c76dc..001e14a3b2e2 100644
--- a/srcpkgs/pass/template
+++ b/srcpkgs/pass/template
@@ -1,7 +1,7 @@
 # Template file for 'pass'
 pkgname=pass
-version=1.7.3
-revision=5
+version=1.7.4
+revision=1
 wrksrc="password-store-${version}"
 build_style=gnu-makefile
 make_install_args="WITH_BASHCOMP=yes WITH_ZSHCOMP=yes WITH_FISHCOMP=yes"
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://www.passwordstore.org"
 distfiles="https://git.zx2c4.com/password-store/snapshot/password-store-${version}.tar.xz"
-checksum=2b6c65846ebace9a15a118503dcd31b6440949a30d3b5291dfb5b1615b99a3f4
+checksum=cfa9faf659f2ed6b38e7a7c3fb43e177d00edbacc6265e6e32215ff40e3793c0
 
 do_check() {
 	mkdir -p fake-home

Re: pass: update to 1.7.4.

[teldra]

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

New comment by teldra on void-packages repository

https://github.com/void-linux/void-packages/pull/31469#issuecomment-861258765

Comment:
useless, already merged: https://github.com/void-linux/void-packages/commit/e5af7d2b231778445188f7dfe500db4c57adc832

Re: [PR PATCH] [Closed]: pass: update to 1.7.4.

[teldra]

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

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

pass: update to 1.7.4.
https://github.com/void-linux/void-packages/pull/31469

Description:
Since https://git.zx2c4.com/password-store/commit/?id=3d36829ce7a203f97e84723e1dc02fef1e0d06cc
the patch for wayland is not needed anymore.

<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl

Re: pass: update to 1.7.4.

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/31469#issuecomment-861483299

Comment:
Sorry, I didn't see the PR.

Re: pass: update to 1.7.4.

[teldra]

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

New comment by teldra on void-packages repository

https://github.com/void-linux/void-packages/pull/31469#issuecomment-861784551

Comment:
Oh no problem. Perhaps it was harshly. The most important thing is the update, imho.