aboutsummaryrefslogtreecommitdiff
path: root/app/backup
diff options
context:
space:
mode:
Diffstat (limited to 'app/backup')
-rw-r--r--app/backup/duplicity/Manifest27
-rwxr-xr-xapp/backup/duplicity/duplicity.SlackBuild26
2 files changed, 43 insertions, 10 deletions
diff --git a/app/backup/duplicity/Manifest b/app/backup/duplicity/Manifest
index 1d1160d8..29fe6f5f 100644
--- a/app/backup/duplicity/Manifest
+++ b/app/backup/duplicity/Manifest
@@ -1,4 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST duplicity-0.5.03.tar.gz 146490 MD5 80273525ae47e8075078a855cf4a134e SHA1 7c78ec834fb742c1499680db4024e625f13fd21a SHA256 d6e3929dc515b72916bfe7cadb25cbe7b383b9f699353bed65c16029ea1cda81 SHA512 41258134b0b5fb4bf19f849a3f0dc0e66da38d21769934564b0019e0aa68fe253c2f173232eede6e79b9d90d8abfe8329d67cfccaaec5860669caee6ec001424 RMD160 4841488694a1d9c1229fbf298e9a46c5a2e96007
-MKBUILD duplicity.mkbuild 3257 MD5 4e0deb66fd464a3a296bf976c89252a9 SHA1 dca986a21c156d724d37d097e17334ea88427b08 SHA256 4d1f8e4c06dfd738f3f0be22e90e044496dc0c436f88ea685bbcfcb8cae3da00 SHA512 84208f007672182ffa0eb9e70b7f43fd4e99ca348c5e45b25a5ff1e47cb0223226ed325bab7818c6e3084ec7808917e7553484eccf3c80136de74243549fa798 RMD160 d75bf0877b5b40338ab770e5298f7164e462b989
-SLACK-REQUIRED slack-required 107 MD5 f35f4cde74f4c8647d2c8aac01927ade SHA1 ff30133a4e23609f8b3faddf26c6fa90487e769b SHA256 127536baf911bc2e6d86dc801231a14cc9dc769bd9f08ef9909c44f2a95a1513 SHA512 0327c883e77e93aa9360c2aa2b06a568947f8e3c495a0c8e526a5718ea3718f7b4f61c37b1ee2906bf98f05df965114e9f71b746b33ec696ec93c74aef421334 RMD160 6679ef54a25ef75d592edb3da6953b10def79a06
-SLACKBUILD duplicity.SlackBuild 6690 MD5 256ca8c11294a61da528acaede99f298 SHA1 f4cf9fcaac4be2d1c88ada555105903b4369b9dc SHA256 1131d000275f591bb4e482ba14b1363235d80447a4e405e7c9dfd6f3c981942a SHA512 00ad4446a2888d0e7a992b93cc6bc8e52fadb1416ae6f3bd19fa534bb2e38bca8ece8a46334b5f00c98fd05f80b6476bf2da46ed24c159951191832298f7ec46 RMD160 be78a1341eb32367b1bf56cf2adb8007ea007d58
+DIST duplicity-0.5.16.tar.gz 209858 MD5 83e92b106a42c09e86447b1019f0a105 RMD160 674b2bae7a0afe0574cfea731c1c7860d59802b2 SHA1 89fd75899e477523e8037f652a5c3a50d5e64db8 SHA256 abccd962681d1a932f84131eae9fbab73c063ebef5eebf745b490cba0d4df931 SHA512 f4510cb4b9e2dc7f67ea8b7ced6a8b90296815b60acd021749e8d9d4eaa525254536d9920bd26f52960fea8513603c09448a6d8a35a3deefa563dacb2c94edc4
+MKBUILD duplicity.mkbuild 3257 MD5 9afbe4280d914f789afe7fa866bf32c1 RMD160 086960c512ef586e806ccab5f941d191098d5c1d SHA1 f68824e62dedc937563aa6d92c28490bf41c5b55 SHA256 d3aaa5fe115496ce462482a089f3e67e702d2fe761f813789ea1fe14ab827dbc SHA512 5e62b74972247977be9bc547abf52ad933ee1846348b43e533ac3d7c9ea1fa5187167890c9a7a5961b30d0a251e2fade25dc7cd25979c5d0ca210b7c89f65a0d
+SLACK-REQUIRED slack-required 107 MD5 f35f4cde74f4c8647d2c8aac01927ade RMD160 6679ef54a25ef75d592edb3da6953b10def79a06 SHA1 ff30133a4e23609f8b3faddf26c6fa90487e769b SHA256 127536baf911bc2e6d86dc801231a14cc9dc769bd9f08ef9909c44f2a95a1513 SHA512 0327c883e77e93aa9360c2aa2b06a568947f8e3c495a0c8e526a5718ea3718f7b4f61c37b1ee2906bf98f05df965114e9f71b746b33ec696ec93c74aef421334
+SLACKBUILD duplicity.SlackBuild 7065 MD5 7f9a789488d40a56d1826ae5400d3820 RMD160 31c8d89d42700c465b18af77bc42ae6b6085a029 SHA1 3b04a50ee31d1834e1aa66e31653b047b3351dad SHA256 1046e92281ef8fe5513aae6b533f5daed15083ef0d856ed0129e89e868a95e14 SHA512 dec498fd16c042dce9b5647dad67481feadb46204d97091bc49f76e02457ac64619198bd4af3de4917e2b1e966ba4af3a3a46830e8e5d1c624834add74610201
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ+zWkAAoJEEHL93ESzgeiW/AQAKdUi9DCPZayAsLcU5J+OsJV
+pS2CskRWhvPddhmmCnUJe7XrouipcYf8NUi1B99wRYty4zaiGBkQ97Of2R3O2sJ6
+tcMKrutwVmCQ6mH0S3AdHBKyp8bAGkLM6dcVLGJ5UUK75A0L8RjZLNbXGKe6wUR4
+xZtA2+sB/tF8ZizIlX0uazHuyD40Qhl9fTag97Nino5l7y4x/40qVUeymAgs81Wo
+ceQpZsk5os3u7XJElf2m3uIBQMobwF657nzP8yTvTXYCcTu7+LYEsC5nxDsZV+hx
+4AsX2BAflK3GY7mirKYtGwpdAL8+ohqeZLxO2RVC9wb7fQ587pH/gmzHqVoibaD+
+kXyg9kQyg/lRc2lXgs/uaV+TQSHYjPTxIK5p0N7MhPWmaONE5IRUrBE0UEVHS6Nl
+DOmA1h3RSpl7AzkAglwoQDSu3OUZqLNxVn5jV1/McvKch3UetrUdnt+d98+SC7vn
+fNWCqlN8OleTYqVugq5G3hEvgI4WUUmWu/7yxc0nJZrRmH2ETfWoEUj6Tbz9cCq3
+4zdt51lNEZJAbxq41ejKZgWxJJi/Dc9IvGYoBTL/pSGF/0m8aXPPABWs7kC/xZ0K
+E4nnTTrQ/36hfU+dnYkiZ4ljdGuy8boK47P5dbnrMysluEjkr1dpTyl/XYEThaE9
++fmvAj9KxDA/ldyRBTdU
+=tZ6c
+-----END PGP SIGNATURE-----
diff --git a/app/backup/duplicity/duplicity.SlackBuild b/app/backup/duplicity/duplicity.SlackBuild
index c50d8ba8..23d88b53 100755
--- a/app/backup/duplicity/duplicity.SlackBuild
+++ b/app/backup/duplicity/duplicity.SlackBuild
@@ -15,8 +15,9 @@
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
#
# slackbuild for duplicity, by Silvio Rhatto
-# requires: librsync py-gnupg pexpect
-# tested: duplicity-0.5.03
+# requires:
+# tested: duplicity-0.5.16
+# model: generic.mkSlackBuild $Rev: 805 $
#
# Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
SRC_NAME="duplicity"
PKG_NAME="duplicity"
ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.5.03}
+SRC_VERSION=${VERSION:=0.5.16}
PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
BUILD=${BUILD:=1rha}
SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="app/backup/duplicity"}
PREFIX=${PREFIX:=/usr}
PKG_WORK="$TMP/$SRC_NAME"
CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:=""}
LIBDIR="$PREFIX/lib"
if [ "$ARCH" = "i386" ]; then
- SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+ SLKCFLAGS="-O2 -march=i386 -mtune=i686"
elif [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686"
elif [ "$ARCH" = "s390" ]; then
@@ -88,6 +90,15 @@ fi
# Check Manifest file
if [ -e "$CWD/Manifest" ]; then
+ # Manifest signature checking
+ if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+ echo "Checking Manifest signature..."
+ gpg --verify $CWD/Manifest
+ if [ "$?" != "0" ]; then
+ exit $ERROR_MANIFEST
+ fi
+ fi
+
MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
@@ -120,7 +131,7 @@ if [ -e "$CWD/Manifest" ]; then
fi
# Check source code integrity
- for ALGO in md5 sha1 sha256 sha512 rmd160; do
+ for ALGO in md5 rmd160 sha1 sha256 sha512; do
if [ $ALGO = "rmd160" ]; then
ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
else
@@ -191,7 +202,8 @@ fi
# Build the package
cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
# Delete source and build directories if requested
if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then