Merge branch 'master' of ssh://projects.parabola.nu:1863/~git/abslibre

1 files changed, 23 insertions, 17 deletions

diff --git a/pcr/tomb/PKGBUILD b/pcr/tomb/PKGBUILD
index 23aba4e02..febfe6a4a 100644
--- a/pcr/tomb/PKGBUILD
+++ b/pcr/tomb/PKGBUILD
@@ -1,29 +1,32 @@
-## PKGBUILD [bash]
-# Maintainer (Arch): nignux <nignux@freaknet.org>
 # Maintainer: fauno <fauno@parabola.nu>
+# Maintainer (Arch): Rich Li <rich at dranek com>
+# Contributor (Arch): nignux <nignux@freaknet.org>
 # Contributor (Arch): BoySka
-# Contributor (Arch): Rich Li
 
 pkgname=(tomb tomb-kdf)
-pkgver=1.5.2
+pkgver=1.5.3
 pkgrel=1
-pkgdesc="Crypto Undertaker, simple tool to manage encrypted storage"
+pkgdesc="Crypto Undertaker, a simple tool to manage encrypted storage"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.dyne.org/software/tomb/"
 license=('GPL3')
 install=${pkgname}.install
-source=(https://files.dyne.org/.xsend.php?file=tomb/Tomb-${pkgver}.tar.gz
-        https://files.dyne.org/.xsend.php?file=tomb/Tomb-${pkgver}.tar.gz.sha
-        https://files.dyne.org/.xsend.php?file=tomb/Tomb-${pkgver}.tar.gz.sha.asc
+source=(
+        https://releases.dyne.org/tomb/Tomb-${pkgver}.tar.gz
+        https://releases.dyne.org/tomb/Tomb-${pkgver}.tar.gz.sha
+        https://releases.dyne.org/tomb/Tomb-${pkgver}.tar.gz.asc
         )
+
 # The first hash comes from the .sha file
-sha256sums=('6ae28aaec7b533127534070b25ccba08eb1416dc07e7e74bf433f5c5d675f7e2'
-            'SKIP'
+sha256sums=('e56180434011acda6e58f25c24db3a6d6a10f9e796cfd9c88405ae7abb27e1fb'
+            'c2bdd00edb0df013a97d50dd109b4744dfc8cee1b5dd71283fc942cdabc7b1af'
             'SKIP')
 
+# The public key is found at http://jaromil.dyne.org/contact
+# gpg --recv-keys 0x73b35da54acb7d10
+
 build() {
   cd ${srcdir}/Tomb-${pkgver}/extras/kdf-keys
-
   make
 }
 
@@ -34,21 +37,24 @@ build() {
 #}
 
 package_tomb() {
-  pkgdesc="Crypto Undertaker, simple tool to manage encrypted storage, from the hashes of the dyne:bolic nesting mechanism."
-  depends=('bc' 'cryptsetup' 'gnupg' 'sudo' 'zsh' 'wipe')
+  depends=('bc' 'cryptsetup' 'gnupg' 'sudo' 'zsh' 'e2fsprogs')
   optdepends=(
   'steghide: steganography'
   'dcfldd: show nice progress during massive I/O'
+  'wipe: secure file deletion'
+  'qrencode: for paper backups of keys'
+  'swish-e: file content indexer'
   )
   arch=('any')
-  cd ${srcdir}/Tomb-${pkgver}
-  make DESTDIR=${pkgdir} PREFIX=/usr install
+
+  cd "${srcdir}/Tomb-${pkgver}"
+  make DESTDIR="${pkgdir}" PREFIX=/usr install
 }
 
 package_tomb-kdf() {
   pkgdesc="Crypto Undertaker extensions to improve password security"
   depends=('libgcrypt')
 
-  cd ${srcdir}/Tomb-${pkgver}/extras/kdf-keys
-  make DESTDIR=${pkgdir} PREFIX=/usr install
+  cd "${srcdir}/Tomb-${pkgver}/extras/kdf-keys"
+  make DESTDIR="${pkgdir}" PREFIX=/usr install
 }