From 75a2679b15a2387209787b1ce4dc8def359d162d Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Sat, 27 May 2017 23:45:38 +0700
Subject: [PATCH] system/password-store: Updated for version 1.7.1, new
 maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 system/password-store/README                  | 22 ++++++++++++++-----
 .../password-store/password-store.SlackBuild  | 17 +++++++++-----
 system/password-store/password-store.info     | 12 +++++-----
 system/password-store/slack-desc              |  8 +++----
 4 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/system/password-store/README b/system/password-store/README
index a9c771db7b..5e346aad15 100644
--- a/system/password-store/README
+++ b/system/password-store/README
@@ -1,9 +1,21 @@
-password-store is a simple password manager which uses GnuPG to 
+password-store is a simple password manager which uses GnuPG2 to
 securely encrypt and retrieve passwords.
 
-By default, bash completion is installed as 
-/usr/share/bash-completion/completions/pass. Add 'source
-/usr/share/bash-completion/completions/pass' to your .bashrc to enable it.
+The pass utility provides a series of commands for manipulating the password
+store, allowing the user to add, remove, edit, synchronize, generate, and
+manipulate passwords.
 
-zsh and fish completion is also optionally included.
+By default, bash and zsh completion are installed in
+/usr/share/bash-completion/completions/pass and
+usr/share/zsh/site-functions/_pass.
+Add 'source /path/to/{bash,zsh}/completions' to your .bashrc to enable it.
+
+fish completion is optionally included.
 uncomment the lines in the SlackBuild to include it in the package.
+
+This script also include user-contributed scripts to help on migrating from
+third-party applications.
+
+Optional dependencies:
+- dmenu (passmenu support)
+- pwgen (generate human-easily memorized password)
diff --git a/system/password-store/password-store.SlackBuild b/system/password-store/password-store.SlackBuild
index eb9e4f6e4d..76323d1a01 100644
--- a/system/password-store/password-store.SlackBuild
+++ b/system/password-store/password-store.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for password-store
 
 # Copyright 2013 Michael Ren <micron33@gmail.com>
+# Copyright 2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=password-store
-VERSION=${VERSION:-1.6.5}
+VERSION=${VERSION:-1.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -51,12 +52,16 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-make install FORCE_BASHCOMP=1 MANDIR=/usr/man DESTDIR=$PKG
+# Extensions is hard-coded to /usr/lib/password-store/extensions
+PREFIX=/usr LIBDIR=/usr/lib MANDIR=/usr/man DESTDIR=$PKG make
+PREFIX=/usr LIBDIR=/usr/lib MANDIR=/usr/man DESTDIR=$PKG make install
 
-# Adapted from the Makefile:
-# Uncomment the two lines below to install the zsh completion file.
-#mkdir -p "${PKG}/usr/share/zsh/site-functions"
-#install -m 0644 -v contrib/pass.zsh-completion "${PKG}/usr/share/zsh/site-functions/_pass"
+cp contrib/importers/* $PKG/usr/bin/
+
+# Check for dmenu
+if [ -e /usr/bin/dmenu ]; then
+  cp contrib/dmenu/passmenu $PKG/usr/bin/
+fi
 
 # Uncomment the two lines below to install the fish completion file.
 #mkdir -p "${PKG}/usr/share/fish/completions"
diff --git a/system/password-store/password-store.info b/system/password-store/password-store.info
index a8c469bb1e..3a30855b7d 100644
--- a/system/password-store/password-store.info
+++ b/system/password-store/password-store.info
@@ -1,10 +1,10 @@
 PRGNAM="password-store"
-VERSION="1.6.5"
+VERSION="1.7.1"
 HOMEPAGE="https://www.passwordstore.org/"
-DOWNLOAD="https://git.zx2c4.com/password-store/snapshot/password-store-1.6.5.tar.xz"
-MD5SUM="2c4468360c678184051e76f03c2f6b04"
+DOWNLOAD="https://git.zx2c4.com/password-store/snapshot/password-store-1.7.1.tar.xz"
+MD5SUM="44f735d7d6c1664d87ee0ec7338af43a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="xclip pwgen"
-MAINTAINER="Michael Ren"
-EMAIL="micron33@gmail.com"
+REQUIRES="xclip"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/system/password-store/slack-desc b/system/password-store/slack-desc
index 4126f03e2d..50e4d517f7 100644
--- a/system/password-store/slack-desc
+++ b/system/password-store/slack-desc
@@ -8,12 +8,12 @@
               |-----handy-ruler------------------------------------------------------|
 password-store: password-store (Password manager using GnuPG)
 password-store:
-password-store: password-store is a simple password manager which uses GnuPG to
+password-store: password-store is a simple password manager which uses GnuPG2 to
 password-store: securely encrypt and retrieve passwords.
 password-store:
-password-store: password-store installs bash completion by default.
-password-store: zsh and fish completion can also be enabled.
+password-store: The pass utility provides a series of commands for manipulating the
+password-store: password store, allowing the user to add, remove, edit, synchronize,
+password-store: generate, and manipulate passwords.
 password-store:
 password-store: Homepage: https://www.passwordstore.org/
 password-store:
-password-store: