4 files changed, 33 insertions, 23 deletions
diff --git a/system/passwordsafe/README b/system/passwordsafe/README
index e8e7b1b435..ed4afdd044 100644
--- a/system/passwordsafe/README
+++ b/system/passwordsafe/README
@@ -1,14 +1,14 @@
 Passwordsafe - password database utility
 
-Portable version of the password manager program originally designed by Bruce
-Schneier. passwordsafe is the Linux version of the popular Windows PasswordSafe
-password manager.
+Portable version of the password manager program originally designed by
+Bruce Schneier. passwordsafe is the Linux version of the popular Windows
+PasswordSafe password manager.
 
-passwordsafe supports Yubicos Yubikey, a unique USB and NFC device offering one-
-touch authentication and supporting multiple authentication protocols for all
-devices and platfroms - with no driver or client software needed.
+passwordsafe supports Yubicos Yubikey, a unique USB and NFC device
+offering one- touch authentication and supporting multiple
+authentication protocols for all devices and platfroms - with no driver
+or client software needed.
 
-If you do not want support for Yubicos Yubikey do not install ykpers and its
-dependency (libyubikey).
+Optional dependencies:
 
-Read passwordsafe.info for additional dependencies.
+ykpers (for yubikey support).
diff --git a/system/passwordsafe/doinst.sh b/system/passwordsafe/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/system/passwordsafe/doinst.sh
+++ b/system/passwordsafe/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/passwordsafe/passwordsafe.SlackBuild b/system/passwordsafe/passwordsafe.SlackBuild
index e655224b2e..c4c43f353f 100644
--- a/system/passwordsafe/passwordsafe.SlackBuild
+++ b/system/passwordsafe/passwordsafe.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for passwordsafe
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=passwordsafe
-VERSION=${VERSION:-1.09.0}
+VERSION=${VERSION:-1.16.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=pwsafe
 
@@ -37,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,9 +74,9 @@ cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
@@ -80,12 +87,9 @@ cd build
     -DNO_GTEST=ON \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 # Move man pages
 mv $PKG/usr/share/man $PKG/usr/man
 
@@ -98,4 +102,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/passwordsafe/passwordsafe.info b/system/passwordsafe/passwordsafe.info
index c1b699b5a7..8f5b60b962 100644
--- a/system/passwordsafe/passwordsafe.info
+++ b/system/passwordsafe/passwordsafe.info
@@ -1,10 +1,10 @@
 PRGNAM="passwordsafe"
-VERSION="1.09.0"
+VERSION="1.16.0"
 HOMEPAGE="https://pwsafe.org"
-DOWNLOAD="https://github.com/pwsafe/pwsafe/archive/1.09.0/pwsafe-1.09.0.tar.gz"
-MD5SUM="a17ffef0f96e9413255dbab780579dd3"
+DOWNLOAD="https://github.com/pwsafe/pwsafe/archive/1.16.0/pwsafe-1.16.0.tar.gz"
+MD5SUM="6a0d858569dfc212b31536148a4f4fea"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ykpers xerces-c wxGTK3 xvkbd qrencode"
+REQUIRES="xerces-c wxGTK3 xvkbd"
 MAINTAINER="rfmae"
 EMAIL="rfmae.git@mailbox.org"