summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorrfmae <rfmae.git@mailbox.org>2018-04-18 10:56:21 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-04-21 07:43:00 +0700
commit1abf27187acdf9d6b7e97e18823f472f4d3b380f (patch)
tree5227c73cdd5b826ddd728c0f480d240addf1d891 /system
parent25ea671171009609e0cf76d7f26df9b292fc85c2 (diff)
downloadslackbuilds-1abf27187acdf9d6b7e97e18823f472f4d3b380f.tar.gz
system/passwordsafe: Updated for version 1.05BETA.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/passwordsafe/01_help-xml.patch19
-rw-r--r--system/passwordsafe/README17
-rw-r--r--system/passwordsafe/passwordsafe.SlackBuild97
-rw-r--r--system/passwordsafe/passwordsafe.info6
-rw-r--r--system/passwordsafe/slack-desc4
5 files changed, 43 insertions, 100 deletions
diff --git a/system/passwordsafe/01_help-xml.patch b/system/passwordsafe/01_help-xml.patch
deleted file mode 100644
index 5907667d75..0000000000
--- a/system/passwordsafe/01_help-xml.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- pwsafe-1.02BETA.orig/src/os/unix/dir.cpp 2017-04-02 19:48:25.000000000 +0200
-+++ pwsafe-1.02BETA/src/os/unix/dir.cpp 2017-04-10 23:11:49.191186791 +0200
-@@ -176,7 +176,7 @@
- #ifdef __FreeBSD__
- return _S("/usr/local/share/pwsafe/xml/");
- #else
-- return _S("/usr/share/pwsafe/xml/");
-+ return _S("/usr/share/passwordsafe/xml/");
- #endif
- }
-
-@@ -185,6 +185,6 @@
- #ifdef __FreeBSD__
- return _S("/usr/local/share/doc/passwordsafe/help/");
- #else
-- return _S("/usr/share/doc/passwordsafe/help/");
-+ return _S("/usr/share/passwordsafe/help/");
- #endif
- }
diff --git a/system/passwordsafe/README b/system/passwordsafe/README
index 8690bb4e13..7b4a839487 100644
--- a/system/passwordsafe/README
+++ b/system/passwordsafe/README
@@ -1,17 +1,14 @@
-Password Safe - password database utility (BETA)
+Passwordsafe - password database utility (BETA)
Portable version of the password manager program originally designed by Bruce
-Schneier. pwsafe is the Linux version of the popular Windows PasswordSafe
+Schneier. passwordsafe is the Linux version of the popular Windows PasswordSafe
password manager.
-pwsafe supports Yubicos Yubikey, a unique USB and NFC device offering one-touch
-authentication and supporting multiple authentication protocols for all devices
-and platforms - 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.
-To compile the package without Yubikey support pass NO_YUBI=1 to the script:
-
- NO_YUBI=1 ./passwordsafe.SlackBuild
-
-In this case you don't need libyubikey and ykpers packages.
+If you do not want support for Yubicos Yubikey do not install ykpers and its
+dependency (libyubikey).
Read passwordsafe.info for additional dependencies.
diff --git a/system/passwordsafe/passwordsafe.SlackBuild b/system/passwordsafe/passwordsafe.SlackBuild
index b0a5b87693..4261b04ad4 100644
--- a/system/passwordsafe/passwordsafe.SlackBuild
+++ b/system/passwordsafe/passwordsafe.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for passwordsafe
-# Copyright 2015 rfmae <rf.mae.git@gmail.com>
+# Copyright 2018 rfmae <rfmae.git@mailbox.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -11,21 +11,22 @@
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=passwordsafe
-VERSION=${VERSION:-1.04BETA}
+VERSION=${VERSION:-1.05BETA}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+
SRCNAM=pwsafe
if [ -z "$ARCH" ]; then
@@ -57,18 +58,6 @@ fi
set -e
-# Check for YubiKey support.
-YUBI_DISABLED=${NO_YUBI}
-if [ -n "${NO_YUBI-}" ] || [ "${NO_YUBI+x}" = x ]; then
- YUBI_DISABLED=1
-else
- YUBI_DISABLED=0
-fi
-
-if [ $YUBI_DISABLED -ne 1 ]; then
- SLKCFLAGS="$SLKCFLAGS -I/usr/include/ykpers-1"
-fi
-
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
@@ -78,56 +67,32 @@ 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 {} \;
-
-# Change path to help and xml files to the proper directory.
-patch -p1 < $CWD/01_help-xml.patch
-
-CFLAGS="$SLKCFLAGS"
-CXXFLAGS="$SLKCFLAGS"
-
-make -j1 clean
-make -j1 release
-cd help
-make -j1
-cd ../src/ui/wxWidgets/I18N
-make -j1 mos
-
-cd $TMP/$SRCNAM-$VERSION
-mkdir -p $PKG/usr/bin
-cp -a src/ui/wxWidgets/GCCUnicodeRelease/pwsafe $PKG/usr/bin
-
-mkdir -p $PKG/usr/man/man1
-cp -a docs/pwsafe.1 $PKG/usr/man/man1
-mkdir -p $PKG/usr/share/{pixmaps,applications,locale}
-cp -a install/graphics/pwsafe.png $PKG/usr/share/pixmaps/$PRGNAM.png
-cp -a install/desktop/pwsafe.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-cp -aR src/ui/wxWidgets/I18N/mos/* $PKG/usr/share/locale
-
-find $PKG -type f -print0 | xargs -0 --no-run-if-empty chmod 644
-chmod 755 $PKG/usr/bin/*
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+ cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DNO_GTEST=ON \
+ -DCMAKE_BUILD_TYPE=Release ..
+ make
+ make install 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
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# Move man pages
+mv $PKG/usr/share/man $PKG/usr/man
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/docs
-cp -a docs/*.{txt,rtf,html} $PKG/usr/doc/$PRGNAM-$VERSION/docs
-cp -a README* LICENSE install/copyright $PKG/usr/doc/$PRGNAM-$VERSION
-mkdir -p $PKG/usr/share/$PRGNAM/{help,xml}
-cp -a help/help*.zip $PKG/usr/share/$PRGNAM/help
-cp -a xml/* $PKG/usr/share/$PRGNAM/xml
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE install/copyright $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-# Compress program documentation files > 4k.
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -size 4k ! -iname *.htm ! -iname *.html \
- ! -iname *.sh ! -iname *.zip -print0 | xargs -0 --no-run-if-empty /bin/gzip \
- --verbose --best
-
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/system/passwordsafe/passwordsafe.info b/system/passwordsafe/passwordsafe.info
index 6b1156546d..a85122f7df 100644
--- a/system/passwordsafe/passwordsafe.info
+++ b/system/passwordsafe/passwordsafe.info
@@ -1,8 +1,8 @@
PRGNAM="passwordsafe"
-VERSION="1.04BETA"
+VERSION="1.05BETA"
HOMEPAGE="https://pwsafe.org"
-DOWNLOAD="https://github.com/pwsafe/pwsafe/archive/1.04BETA/pwsafe-1.04BETA.tar.gz"
-MD5SUM="5b64189e0ba0ea34f6e7a0c2edbdd6f9"
+DOWNLOAD="https://github.com/pwsafe/pwsafe/archive/1.05BETA.tar.gz"
+MD5SUM="84a2e758146e94bd6bd7529ab779681a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ykpers xerces-c wxGTK3 xvkbd qrencode"
diff --git a/system/passwordsafe/slack-desc b/system/passwordsafe/slack-desc
index fb94ec1de9..aad7bbede1 100644
--- a/system/passwordsafe/slack-desc
+++ b/system/passwordsafe/slack-desc
@@ -8,8 +8,8 @@
|-----handy-ruler------------------------------------------------------|
passwordsafe: passwordsafe (password database utility)
passwordsafe:
-passwordsafe: Portable version of popular password manager program
-passwordsafe: pwsafe is the Linux version of the popular Windows PasswordSafe
+passwordsafe: Portable version of popular password manager program.
+passwordsafe: passwordsafe is the Linux version of the popular Windows PasswordSafe
passwordsafe: password manager.
passwordsafe:
passwordsafe: https://pwsafe.org