5 files changed, 49 insertions, 43 deletions
diff --git a/system/tarsnap/README b/system/tarsnap/README
index a66412ec7633..0d998b61a7e2 100644
--- a/system/tarsnap/README
+++ b/system/tarsnap/README
@@ -1,8 +1,5 @@
-Tarsnap: Online backups for the truly paranoid
+Tarsnap is a secure cloud-based backup service featuring client-side
+encryption and deduplication created by Colin Percival.
 
-Colin Percival's program 'tarsnap' to be used as a part of Tarsnap. Tarsnap
-is an online snapshotted backup service featuring client-side encryption
-and deduplication.
-
-Please note that this is only the client. In order to use tarsnap you must
-subscribe to the service. Please visit https://tarsnap.com for further details.
+This is only the client software.  You will need to be a tarsnap
+subscriber to use the service.
diff --git a/system/tarsnap/slack-desc b/system/tarsnap/slack-desc
index 084728412987..3d20f482d7f5 100644
--- a/system/tarsnap/slack-desc
+++ b/system/tarsnap/slack-desc
@@ -6,13 +6,13 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-tarsnap: tarsnap (Client-Side Encrypted Snapshotted Remote Backup Service)
+tarsnap: tarsnap (Client software for Tarsnap backup service)
 tarsnap:
-tarsnap: Colin Percival's program 'tarsnap' to be used as a part of Tarsnap.
-tarsnap: Tarsnap is an online snapshotted backup service featuring client-side
-tarsnap: encryption and deduplication.
+tarsnap: Tarsnap is a secure cloud-based backup service featuring client-side
+tarsnap: encryption and deduplication created by Colin Percival.
+tarsnap:
+tarsnap: https://www.tarsnap.com
 tarsnap:
-tarsnap: http://www.tarsnap.com
 tarsnap:
 tarsnap:
 tarsnap:
diff --git a/system/tarsnap/tarsnap.SlackBuild b/system/tarsnap/tarsnap.SlackBuild
index 4e09c41e208c..9dfae49766fd 100644
--- a/system/tarsnap/tarsnap.SlackBuild
+++ b/system/tarsnap/tarsnap.SlackBuild
@@ -1,27 +1,27 @@
 #!/bin/sh
 
-# Slackware build script for tarsnap
-
-# Written by Justin H Haynes <justin@justinhaynes.com>
-# as a series of careful modifications to the excellent
-# http://slackbuilds.org/template.SlackBuild
-
-# Modified by Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
-
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
+# SlackBuild for Tarsnap, 9 August 2017
+# AW Green <awg@posteo.us>
+# All rights reserved.
 #
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# Permission to use, copy, modify, or distribute this software for any
+# purpose with or without fee is hereby granted, provided that this
+# notice of copyright and permission appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+# PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+## The Tarsnap client itself remains a copyrighted work.  Please see the
+## file COPYING in the Tarsnap client source distribution.
 
 PRGNAM=tarsnap
-VERSION=${VERSION:-1.0.37}
+VERSION=${VERSION:-1.0.39}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -38,9 +38,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Normally we'd have this if block here for setting ARCH and
-# feeding same to the configure script, but the tarsnap configure script
-# figures out the architecture itself.
+# we can omit the usual block here for passing ARCH-specific flags,
+# since tarsnap's configure script handles this on its own.
 
 set -e
 
@@ -53,9 +52,12 @@ cd $PRGNAM-autoconf-$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 {} \;
+
+# patch stock path in tarsnap.conf.sample.
+patch -p1 < $CWD/$PRGNAM.patch
 
 ./configure \
   --prefix=/usr \
@@ -67,7 +69,7 @@ find -L . \
 make
 make install DESTDIR=$PKG
 
-# We don't set ARCH.  we let Colin Percival's configure do it.
+# configure determines ARCH for us.
 ARCH=$(grep build_cpu Makefile | cut -d= -f 2 | sed s/^\ //)
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/system/tarsnap/tarsnap.info b/system/tarsnap/tarsnap.info
index 04624a7f4033..0f3973ae64bf 100644
--- a/system/tarsnap/tarsnap.info
+++ b/system/tarsnap/tarsnap.info
@@ -1,10 +1,10 @@
 PRGNAM="tarsnap"
-VERSION="1.0.37"
-HOMEPAGE="http://www.tarsnap.com"
-DOWNLOAD="https://www.tarsnap.com/download/tarsnap-autoconf-1.0.37.tgz"
-MD5SUM="755492b15a2ab53286182c3ba5f05c94"
+VERSION="1.0.39"
+HOMEPAGE="https://www.tarsnap.com"
+DOWNLOAD="https://www.tarsnap.com/download/tarsnap-autoconf-1.0.39.tgz"
+MD5SUM="8fe9f49c73e82bfd6a2c60727b8a8b01"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andrew Stevens"
-EMAIL="andrew@omniarch.is"
+MAINTAINER="AW Green"
+EMAIL="awg@posteo.us"
diff --git a/system/tarsnap/tarsnap.patch b/system/tarsnap/tarsnap.patch
new file mode 100644
index 000000000000..ce15abdaa7f2
--- /dev/null
+++ b/system/tarsnap/tarsnap.patch
@@ -0,0 +1,7 @@
+--- tarsnap-autoconf-1.0.39/tar/tarsnap.conf.sample	2017-08-08 20:59:45.821457794 -0600
++++ tarsnap-autoconf-1.0.39/tar/tarsnap.conf.sample	2017-07-28 19:20:37.000000000 -0600
+@@ -3,3 +3,3 @@
+ # Tarsnap cache directory
+-cachedir /usr/local/tarsnap-cache
++cachedir /var/cache/tarsnap
+