commit beb0c770f8657cb4419334a65349e9d22203f6ec
Author: Jan Palus <[email protected]>
Date: Fri Jun 11 17:23:45 2021 +0000
up to 1.7.4
bashcomp-noleak.patch | 61 ----------------------------
password-store.spec | 10 ++---
wayland.patch | 110 --------------------------------------------------
3 files changed, 3 insertions(+), 178 deletions(-)
---
diff --git a/password-store.spec b/password-store.spec
index 5a39a72..255e644 100644
--- a/password-store.spec
+++ b/password-store.spec
@@ -1,13 +1,11 @@
Summary: Simple password store
Name: password-store
-Version: 1.7.3
-Release: 2
+Version: 1.7.4
+Release: 1
License: GPL v2+
Group: Applications
Source0:
https://git.zx2c4.com/password-store/snapshot/%{name}-%{version}.tar.xz
-# Source0-md5: db2d49af9e666cc5ef6aa1c61ae5c045
-Patch0: bashcomp-noleak.patch
-Patch1: wayland.patch
+# Source0-md5: 56b918982fd80bedba6590059c332c6d
URL: https://www.passwordstore.org/
BuildRequires: rpmbuild(macros) >= 1.720
BuildRequires: tar >= 1:1.22
@@ -72,8 +70,6 @@ password-store.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
rm contrib/emacs/.gitignore
diff --git a/bashcomp-noleak.patch b/bashcomp-noleak.patch
deleted file mode 100644
index 959a10f..0000000
--- a/bashcomp-noleak.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 983efbbfd3848ed719b30407d4cc632b01dd9385 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <[email protected]>
-Date: Wed, 12 Sep 2018 23:12:56 +0300
-Subject: [PATCH] bash_completion: do not leak variables to globals scope
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Elan Ruusamäe <[email protected]>
----
- src/completion/pass.bash-completion | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/completion/pass.bash-completion
b/src/completion/pass.bash-completion
-index bbe9d0c..08f3401 100644
---- a/src/completion/pass.bash-completion
-+++ b/src/completion/pass.bash-completion
-@@ -5,10 +5,10 @@
- # This file is licensed under the GPLv2+. Please see COPYING for more
information.
-
- _pass_complete_entries () {
-- prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store/}"
-+ local prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store/}"
- prefix="${prefix%/}/"
-- suffix=".gpg"
-- autoexpand=${1:-0}
-+ local suffix=".gpg"
-+ local autoexpand=${1:-0}
-
- local IFS=$'\n'
- local items=($(compgen -f $prefix$cur))
-@@ -17,7 +17,7 @@ _pass_complete_entries () {
- # it is a directory, then don't add a space to the completion
- local firstitem=""
- # Use counter, can't use ${#items[@]} as we skip hidden directories
-- local i=0
-+ local i=0 item
-
- for item in ${items[@]}; do
- [[ $item =~ /\.[^/]*$ ]] && continue
-@@ -27,7 +27,7 @@ _pass_complete_entries () {
- if [[ ${#items[@]} -eq 1 && $autoexpand -eq 1 ]]; then
- while [[ -d $item ]]; do
- local subitems=($(compgen -f "$item/"))
-- local filtereditems=( )
-+ local filtereditems=( ) item2
- for item2 in "${subitems[@]}"; do
- [[ $item2 =~ /\.[^/]*$ ]] && continue
- filtereditems+=( "$item2" )
-@@ -59,7 +59,7 @@ _pass_complete_entries () {
- }
-
- _pass_complete_folders () {
-- prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store/}"
-+ local prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store/}"
- prefix="${prefix%/}/"
-
- local IFS=$'\n'
---
-2.18.0
-
diff --git a/wayland.patch b/wayland.patch
deleted file mode 100644
index 5d7a4b1..0000000
--- a/wayland.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From b0b784b1a57c0b06936e6f5d6560712b4b810cd3 Mon Sep 17 00:00:00 2001
-From: Brett Cornwall <[email protected]>
-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
---- a/README
-+++ b/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
---- a/man/pass.1
-+++ b/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
---- a/src/password-store.sh
-+++ b/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-11-g984f
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/password-store.git/commitdiff/beb0c770f8657cb4419334a65349e9d22203f6ec
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
