update tahoe-lafs

2 files changed, 14 insertions, 22 deletions

diff --git a/pcr/tahoe-lafs/PKGBUILD b/pcr/tahoe-lafs/PKGBUILD
index bd1da4931..26b34e0fc 100644
--- a/pcr/tahoe-lafs/PKGBUILD
+++ b/pcr/tahoe-lafs/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor (Arch): Nicolas Pouillard <nicolas.pouillard@gmail.com>
 
 pkgname=tahoe-lafs
-pkgver=1.10.2
+pkgver=1.11.0
 pkgrel=1
 pkgdesc="Secure, decentralized, and fault-tolerant filesystem."
 url='https://tahoe-lafs.org/trac/tahoe-lafs'
@@ -15,7 +15,7 @@ conflicts=('tahoe-lafs-i2p')
 BUILDENV+=(!check)
 
 depends=('openssl>=1.0.2'
-         'python2-twisted>=13.0.0'
+         'python2-twisted>=15.1.0'
          'python2-pyopenssl>=0.14'
          'python2-pyasn1>=0.1.8'
          'python2-pyasn1-modules>=0.0.5'
@@ -34,41 +34,33 @@ depends=('openssl>=1.0.2'
          'python2-pycparser'
          'python2-six'
          'libffi'
-         'python2-foolscap>=0.8.0'
+         'python2-foolscap>=0.10.1'
          'net-tools' # provides /sbin/ifconfig
          'python2-setuptools')
 
 optdepends=('python2-numpy: reliability test')
 
-source=("https://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-$pkgver.tar.bz2"
-"https://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-$pkgver.tar.bz2.asc"
-'PKGBUILD'
-'PKGBUILD.sig')
-validpgpkeys=('CB6E213A349B8DF9E96B622AC3F4FFCF3EAE8697' # PKGBUILD Maintainer's key
-'E34E62D06D0E69CFCA4179FFBDE0D31D68666A7A') # Tahoe-LAFS Release-Signing Key
-sha512sums=('79d4e3395aa7ef8e1e7c97eebdfcb75b3b36edb75aa5d5f805c568b842b9b2f4ea5f8529dbf32fbdd9cc467cf82f153aca09310bc3b69fa00efae7be8a7bc198'
-'40e5c1cbf24e44a652aaff27f7c55016900cfca0659f6a9071e22b87d0ee281b8ab76005393c92e3eabb9b364eedbd0d108ba3ea29c7f46339c68865f3bb77fe'
-'SKIP'
-'SKIP')
+source=("https://tahoe-lafs.org/downloads/tahoe-lafs-$pkgver.tar.bz2"
+        "https://tahoe-lafs.org/downloads/tahoe-lafs-$pkgver.tar.bz2.asc")
+
+sha512sums=('f8adce8596d4f9d6fe2370daf11ed7667ef32fa2fbcccf50e7810004426ca6c9eaa7e324b420cb3863f914dd5950374d13d7f794227da2a71a284113e6625b62'
+            'deba80ed6ef57fe1e003f91596cbdb72eb55881ae0639c4196c73bab464f0f2f93c455912f9d54f83e3cb0e593336ac86b5d8ed7aa26515aabe7b0d657947fc3')
+
+validpgpkeys=('E34E62D06D0E69CFCA4179FFBDE0D31D68666A7A') # Tahoe-LAFS Release-Signing Key
 
 build(){
-  gpg --verify PKGBUILD.sig PKGBUILD
-  echo "Note: If the GPG verification fails, import the PKGBUILD maintainer's GPG key. See: https://wiki.parabola.nu/GnuPG#Import_key"
-  whirlpoolsum=('d38a362105118113aaaf34c429c4b611e37ebf10d983dff1a4a117f6802671df78805ac1950b1c01279d36d1c87bc3976fec498580117d6f9bc46912a00b792f')
-  [[ "$(openssl dgst -r -whirlpool allmydata-tahoe-$pkgver.tar.bz2 | awk '{print $1}')" = ${whirlpoolsum} ]] && echo "Whirlpool checksum passed." || { echo "Whirlpool checksum failed!!" ;  exit 1; } # This is an added security layer. If SHA512 for some unlikely reason fails, whirlpool will check and abort if it too fails to match.
-    gpg --verify allmydata-tahoe-$pkgver.tar.bz2.asc allmydata-tahoe-$pkgver.tar.bz2
-    cd "${srcdir}/allmydata-tahoe-${pkgver}"
+    cd "${srcdir}/tahoe-lafs-${pkgver}"
     python2 setup.py build
 }
 
 check() {
-    cd "${srcdir}/allmydata-tahoe-${pkgver}"
+    cd "${srcdir}/tahoe-lafs-${pkgver}"
     msg "This may take a while"
     python2 bin/tahoe debug trial $MAKEFLAGS
 }
 
 package(){
-    cd "${srcdir}/allmydata-tahoe-${pkgver}"
+    cd "${srcdir}/tahoe-lafs-${pkgver}"
     python2 setup.py install --root="$pkgdir" --optimize=1
     install -Dm644 COPYING.GPL "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
\ No newline at end of file
+}
diff --git a/pcr/tahoe-lafs/PKGBUILD.sig b/pcr/tahoe-lafs/PKGBUILD.sig
index c84c3df9a..06ccb98d5 100644
--- a/pcr/tahoe-lafs/PKGBUILD.sig
+++ b/pcr/tahoe-lafs/PKGBUILD.sig