[pkgsrc/trunk]: pkgsrc/security/password-store password-store: Update securit...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/security/password-store password-store: Update securit...
From: leot <leot%pkgsrc.org@localhost>
Date: Thu, 14 Jun 2018 17:17:17 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/fb11b9dca31f
branches:  trunk
changeset: 309284:fb11b9dca31f
user:      leot <leot%pkgsrc.org@localhost>
date:      Thu Jun 14 16:08:39 2018 +0000

description:
password-store: Update security/password-store to 1.7.2

pkgsrc changes:
 - Deprecate PKG_OPTIONS.pass in favour of PKG_OPTIONS.password-store
 - Remove patches/patch-tests_t0300-reencryption.sh, fixed similarly upstream

Changes:
1.7.2
-----
Pass 1.7.2 has a number of important changes and bug fixes, including
a fix for CVE-2018-12356. Everybody must update immediately.

diffstat:

 security/password-store/Makefile                                  |   4 +-
 security/password-store/PLIST                                     |   6 +-
 security/password-store/distinfo                                  |  15 ++--
 security/password-store/options.mk                                |  12 ++-
 security/password-store/patches/patch-contrib_dmenu_passmenu      |   4 +-
 security/password-store/patches/patch-src_password-store.sh       |  34 +++++-----
 security/password-store/patches/patch-tests_t0300-reencryption.sh |  15 ----
 7 files changed, 42 insertions(+), 48 deletions(-)

diffs (183 lines):

diff -r 5e9c8c595749 -r fb11b9dca31f security/password-store/Makefile
--- a/security/password-store/Makefile  Thu Jun 14 15:16:09 2018 +0000
+++ b/security/password-store/Makefile  Thu Jun 14 16:08:39 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2018/05/06 11:56:58 leot Exp $
+# $NetBSD: Makefile,v 1.7 2018/06/14 16:08:39 leot Exp $
 
-DISTNAME=      password-store-1.7.1
+DISTNAME=      password-store-1.7.2
 CATEGORIES=    security
 MASTER_SITES=  http://git.zx2c4.com/password-store/snapshot/
 EXTRACT_SUFX=  .tar.xz
diff -r 5e9c8c595749 -r fb11b9dca31f security/password-store/PLIST
--- a/security/password-store/PLIST     Thu Jun 14 15:16:09 2018 +0000
+++ b/security/password-store/PLIST     Thu Jun 14 16:08:39 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2018/05/06 11:56:58 leot Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/06/14 16:08:39 leot Exp $
 bin/pass
 man/man1/pass.1
 share/examples/password-store/completion/pass.bash-completion
@@ -6,6 +6,7 @@
 share/examples/password-store/completion/pass.zsh-completion
 share/examples/password-store/contrib/dmenu/README.md
 share/examples/password-store/contrib/dmenu/passmenu
+share/examples/password-store/contrib/emacs/CHANGELOG.md
 share/examples/password-store/contrib/emacs/Cask
 share/examples/password-store/contrib/emacs/README.md
 share/examples/password-store/contrib/emacs/password-store.el
@@ -24,5 +25,6 @@
 share/examples/password-store/contrib/importers/revelation2pass.py
 share/examples/password-store/contrib/importers/roboform2pass.rb
 share/examples/password-store/contrib/pass.applescript
-share/examples/password-store/contrib/vim/noplaintext.vim
+share/examples/password-store/contrib/vim/redact_pass.txt
+share/examples/password-store/contrib/vim/redact_pass.vim
 share/examples/password-store/example-filter.sh
diff -r 5e9c8c595749 -r fb11b9dca31f security/password-store/distinfo
--- a/security/password-store/distinfo  Thu Jun 14 15:16:09 2018 +0000
+++ b/security/password-store/distinfo  Thu Jun 14 16:08:39 2018 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.4 2018/05/06 11:56:58 leot Exp $
+$NetBSD: distinfo,v 1.5 2018/06/14 16:08:39 leot Exp $
 
-SHA1 (password-store-1.7.1.tar.xz) = e7982416eaea8773ead0836f0b4c7a475ef33cb3
-RMD160 (password-store-1.7.1.tar.xz) = ebd86a7ae52559eeac5001e9634306dc0b8bdd5f
-SHA512 (password-store-1.7.1.tar.xz) = 2ba2ebc80c90454bbab1da3c43c2cfc87135f838f381e2616eef7c36b0c1de01e491cf587a666bb052d6dfd475fa429bc8fd82b0269325bd2b70afbb897b923e
-Size (password-store-1.7.1.tar.xz) = 62340 bytes
-SHA1 (patch-contrib_dmenu_passmenu) = 025e88b68b68936d80e6eca914e7e6e44d1d887e
-SHA1 (patch-src_password-store.sh) = 21741ae5c3c7f4f1cae713ce8ba2f029c6318625
-SHA1 (patch-tests_t0300-reencryption.sh) = 281b25c8fa46d0412b87725aaa375dc902bf971f
+SHA1 (password-store-1.7.2.tar.xz) = d8027e01634cec0694a5513ab6950e639cf2c69c
+RMD160 (password-store-1.7.2.tar.xz) = 69f8482fa565f3b5990de74cbf4429b20addd577
+SHA512 (password-store-1.7.2.tar.xz) = e6719a7125af6ecd80fdbeb38b4e2e89e7358ff16e18739d68a04b72dfdf860294b54f7ec0ec9676a62d2e270db8f54784a357c82217a478694472f8136e3657
+Size (password-store-1.7.2.tar.xz) = 63620 bytes
+SHA1 (patch-contrib_dmenu_passmenu) = 24458d7100df28232f87ffc414e133d38565ba6f
+SHA1 (patch-src_password-store.sh) = 765a0c6eee25b924d370122426fd7491dd22b2ea
diff -r 5e9c8c595749 -r fb11b9dca31f security/password-store/options.mk
--- a/security/password-store/options.mk        Thu Jun 14 15:16:09 2018 +0000
+++ b/security/password-store/options.mk        Thu Jun 14 16:08:39 2018 +0000
@@ -1,11 +1,19 @@
-# $NetBSD: options.mk,v 1.2 2018/05/06 11:56:58 leot Exp $
+# $NetBSD: options.mk,v 1.3 2018/06/14 16:08:39 leot Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.pass
+PKG_OPTIONS_VAR=       PKG_OPTIONS.password-store
 
 PKG_SUPPORTED_OPTIONS=         git x11
 PKG_SUGGESTED_OPTIONS=         git
 PKG_OPTIONS_LEGACY_OPTS+=      xclip:x11
 
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(PKG_OPTIONS.pass)
+PKG_LEGACY_OPTIONS+=           ${PKG_OPTIONS.pass}
+PKG_OPTIONS_DEPRECATED_WARNINGS+= \
+       "Deprecated variable PKG_OPTIONS.pass used, use ${PKG_OPTIONS_VAR} instead."
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mx11)
diff -r 5e9c8c595749 -r fb11b9dca31f security/password-store/patches/patch-contrib_dmenu_passmenu
--- a/security/password-store/patches/patch-contrib_dmenu_passmenu      Thu Jun 14 15:16:09 2018 +0000
+++ b/security/password-store/patches/patch-contrib_dmenu_passmenu      Thu Jun 14 16:08:39 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-contrib_dmenu_passmenu,v 1.1 2018/05/06 11:56:58 leot Exp $
+$NetBSD: patch-contrib_dmenu_passmenu,v 1.2 2018/06/14 16:08:39 leot Exp $
 
 Avoid unsupported x11/xdotool (at least version 2.20110530.1) `--file' option.
 Refactor the logic for `passmenu --type' in order to avoid `--file' and directly
@@ -10,7 +10,7 @@
  if [[ $typeit -eq 0 ]]; then
        pass show -c "$password" 2>/dev/null
  else
--      pass show "$password" | { read -r pass; printf %s "$pass"; } |
+-      pass show "$password" | { IFS= read -r pass; printf %s "$pass"; } |
 -              xdotool type --clearmodifiers --file -
 +      { printf "type --clearmodifiers -- ";
 +          pass show "$password" | head -n 1 ; } |
diff -r 5e9c8c595749 -r fb11b9dca31f security/password-store/patches/patch-src_password-store.sh
--- a/security/password-store/patches/patch-src_password-store.sh       Thu Jun 14 15:16:09 2018 +0000
+++ b/security/password-store/patches/patch-src_password-store.sh       Thu Jun 14 16:08:39 2018 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_password-store.sh,v 1.2 2018/05/06 11:56:58 leot Exp $
+$NetBSD: patch-src_password-store.sh,v 1.3 2018/06/14 16:08:39 leot Exp $
 
 Avoid non portable mkdir(1) `-v' parameter.
 
---- src/password-store.sh.orig 2017-04-13 10:11:14.000000000 +0000
+--- src/password-store.sh.orig 2018-06-14 14:58:28.000000000 +0000
 +++ src/password-store.sh
 @@ -323,7 +323,7 @@ cmd_init() {
                fi
@@ -13,34 +13,34 @@
                printf "%s\n" "$@" > "$gpg_id"
                local id_print="$(printf "%s, " "$@")"
                echo "Password store initialized for ${id_print%, }${id_path:+ ($id_path)}"
-@@ -430,7 +430,7 @@ cmd_insert() {
+@@ -432,7 +432,7 @@ cmd_insert() {
  
        [[ $force -eq 0 && -e $passfile ]] && yesno "An entry already exists for $path. Overwrite it?"
  
--      mkdir -p -v "$PREFIX/$(dirname "$path")"
-+      mkdir -p "$PREFIX/$(dirname "$path")"
-       set_gpg_recipients "$(dirname "$path")"
+-      mkdir -p -v "$PREFIX/$(dirname -- "$path")"
++      mkdir -p "$PREFIX/$(dirname -- "$path")"
+       set_gpg_recipients "$(dirname -- "$path")"
  
        if [[ $multiline -eq 1 ]]; then
-@@ -464,7 +464,7 @@ cmd_edit() {
+@@ -466,7 +466,7 @@ cmd_edit() {
  
        local path="${1%/}"
        check_sneaky_paths "$path"
--      mkdir -p -v "$PREFIX/$(dirname "$path")"
-+      mkdir -p "$PREFIX/$(dirname "$path")"
-       set_gpg_recipients "$(dirname "$path")"
+-      mkdir -p -v "$PREFIX/$(dirname -- "$path")"
++      mkdir -p "$PREFIX/$(dirname -- "$path")"
+       set_gpg_recipients "$(dirname -- "$path")"
        local passfile="$PREFIX/$path.gpg"
        set_git "$passfile"
-@@ -506,7 +506,7 @@ cmd_generate() {
-       local length="${2:-$GENERATED_LENGTH}"
+@@ -509,7 +509,7 @@ cmd_generate() {
        check_sneaky_paths "$path"
-       [[ ! $length =~ ^[0-9]+$ ]] && die "Error: pass-length \"$length\" must be a number."
--      mkdir -p -v "$PREFIX/$(dirname "$path")"
-+      mkdir -p "$PREFIX/$(dirname "$path")"
-       set_gpg_recipients "$(dirname "$path")"
+       [[ $length =~ ^[0-9]+$ ]] || die "Error: pass-length \"$length\" must be a number."
+       [[ $length -gt 0 ]] || die "Error: pass-length must be greater than zero."
+-      mkdir -p -v "$PREFIX/$(dirname -- "$path")"
++      mkdir -p "$PREFIX/$(dirname -- "$path")"
+       set_gpg_recipients "$(dirname -- "$path")"
        local passfile="$PREFIX/$path.gpg"
        set_git "$passfile"
-@@ -595,7 +595,7 @@ cmd_copy_move() {
+@@ -598,7 +598,7 @@ cmd_copy_move() {
        echo "$old_path"
        [[ -e $old_path ]] || die "Error: $1 is not in the password store."
  
diff -r 5e9c8c595749 -r fb11b9dca31f security/password-store/patches/patch-tests_t0300-reencryption.sh
--- a/security/password-store/patches/patch-tests_t0300-reencryption.sh Thu Jun 14 15:16:09 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-tests_t0300-reencryption.sh,v 1.1 2018/05/06 11:56:58 leot Exp $
-
-Adjust output for gnupg2>=2.2.5.
-
---- tests/t0300-reencryption.sh.orig   2017-04-13 10:11:14.000000000 +0000
-+++ tests/t0300-reencryption.sh
-@@ -10,7 +10,7 @@ canonicalize_gpg_keys() {
-       $GPG --list-keys --with-colons "$@" | sed -n 's/sub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u
- }
- gpg_keys_from_encrypted_file() {
--      $GPG -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u
-+      $GPG -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$1" 2>&1 | sed -n '/public key/p' | cut -d ' ' -f 5 | LC_ALL=C sort -u
- }
- gpg_keys_from_group() {
-       local output="$($GPG --list-config --with-colons | sed -n "s/^cfg:group:$1:\\(.*\\)/\\1/p" | head -n 1)"
Prev by Date: [pkgsrc/trunk]: pkgsrc/graphics/gimp gimp: Requires GCC 5.x for adequate C++1...
Next by Date: [pkgsrc/trunk]: pkgsrc/graphics/gimp gimp: Avoid ambiguous function call.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/graphics/gimp gimp: Requires GCC 5.x for adequate C++1...
Next by Thread: [pkgsrc/trunk]: pkgsrc/graphics/gimp gimp: Avoid ambiguous function call.
Indexes:
Home | Main Index | Thread Index | Old Index