Hello community, here is the log from the commit of package duply for openSUSE:Factory checked in at 2011-11-22 17:47:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/duply (Old) and /work/SRC/openSUSE:Factory/.duply.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "duply", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/duply/duply.changes 2011-10-08 11:41:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.duply.new/duply.changes 2011-11-22 17:47:24.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Nov 21 21:54:30 UTC 2011 - [email protected] + +- Update to version 1.5.5.4: + + Bugfix 3421268: SFTP passwords from conf ignored and always + prompted for. + + Add support for separate sign passphrase (needs duplicity + 0.6.14+). + +------------------------------------------------------------------- Old: ---- duply_1.5.5.3.tgz New: ---- duply_1.5.5.4.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ duply.spec ++++++ --- /var/tmp/diff_new_pack.hm0gZl/_old 2011-11-22 17:47:27.000000000 +0100 +++ /var/tmp/diff_new_pack.hm0gZl/_new 2011-11-22 17:47:27.000000000 +0100 @@ -19,13 +19,13 @@ Name: duply -Version: 1.5.5.3 +Version: 1.5.5.4 Release: 1 License: GPL-2.0 Summary: A frontend for the mighty duplicity magic Url: http://duply.net/ Group: Productivity/Archiving/Compression -Source0: http://cdnetworks-us-2.dl.sourceforge.net/project/ftplicity/duply%20%28simple%20duplicity%29/1.5.x/duply_1.5.5.3.tgz +Source0: http://surfnet.dl.sourceforge.net/project/ftplicity/duply%20%28simple%20duplicity%29/1.5.x/duply_1.5.5.4.tgz Requires: duplicity BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ duply_1.5.5.3.tgz -> duply_1.5.5.4.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/duply_1.5.5.3/duply new/duply_1.5.5.4/duply --- old/duply_1.5.5.3/duply 2011-10-01 12:45:02.000000000 +0200 +++ new/duply_1.5.5.4/duply 2011-10-16 15:15:07.000000000 +0200 @@ -38,8 +38,15 @@ # - import/export profile from/to .tgz function !!! # # CHANGELOG: +# versioning scheme will be simplified to [major].[minor].[patch] version +# with the next minor version raise +# +# 1.5.5.4 (16.10.2010) +# - bugfix 3421268: SFTP passwords from conf ignored and always prompted for +# - add support for separate sign passphrase (needs duplicity 0.6.14+) +# # 1.5.5.3 (1.10.2011) -# - bugfix 3416690: repaired preview threw echo1 error +# - bugfix 3416690: preview threw echo1 error # - fix unknown cmds error usage & friends if more than 2 params were given # # 1.5.5.2 (23.9.2011) @@ -272,7 +279,7 @@ ME_LONG="$0" ME="$(basename $0)" ME_NAME="${ME%%.*}" -ME_VERSION="1.5.5.3" +ME_VERSION="1.5.5.4" ME_WEBSITE="http://duply.net"; # default config values @@ -519,8 +526,9 @@ # GPG_KEY_SIGN='<keyid1>|disabled' - a secret key for signing # GPG_PW='<passphrase>' - needed for signing, decryption and symmetric # encryption. If you want to deliver different passphrases for e.g. -# several keys or symmetric encryption plus key signing you should use +# several keys or symmetric encryption plus key signing you can use # gpg-agent. Add '--use-agent' to the duplicity parameters below. +# also see "A NOTE ON SYMMETRIC ENCRYPTION AND SIGNING" in duplicity manpage # notes on en/decryption # private key and passphrase will only be needed for decryption or signing. # decryption happens on restore and incrementals (compare archdir contents). @@ -528,10 +536,14 @@ # encryption keys. https://answers.launchpad.net/duplicity/+question/107216 #GPG_KEYS_ENC='<pubkey1>,<pubkey2>,...' #GPG_KEY_SIGN='<prvkey>' +# set if signing key passphrase differs from encryption (key) passphrase +# NOTE: available since duplicity 0.6.14, translates to SIGN_PASSPHRASE +#GPG_PW_SIGN='<signpass>' # gpg options passed from duplicity to gpg process (default='') # e.g. "--trust-model pgp|classic|direct|always" # or "--compress-algo=bzip2 --bzip2-compress-level=9" +# or "--personal-cipher-preferences AES256,AES192,AES..." #GPG_OPTS='' # disable preliminary tests with the following setting @@ -851,6 +863,7 @@ function duplicity_params_global { # already done? return var_isset 'DUPL_PARAMS_GLOBAL' && return + local DUPL_ARG_ENC # use key only if set in config, else leave it to symmetric encryption if gpg_disabled; then @@ -858,10 +871,9 @@ else local DUPL_PARAM_ENC=$(gpg_prefix_keyset ' --encrypt-key ' 'GPG_KEYS_ENC') gpg_signing && local DUPL_PARAM_SIGN=$(gpg_prefix_keyset ' --sign-key ' 'GPG_KEY_SIGN') - # interpret password setting - if var_isset 'GPG_PW'; then - local DUPL_ARG_ENC="PASSPHRASE=$(qw "${GPG_PW}")" - fi + # interpret password settings + var_isset 'GPG_PW' && DUPL_ARG_ENC="PASSPHRASE=$(qw "${GPG_PW}")" + var_isset 'GPG_PW_SIGN' && DUPL_ARG_ENC="${DUPL_ARG_ENC} SIGN_PASSPHRASE=$(qw "${GPG_PW_SIGN}")" fi local GPG_OPTS=${GPG_OPTS:+"--gpg-options $(qw "${GPG_OPTS}")"} @@ -1158,6 +1170,7 @@ echo $OUT } +# grep a variable from conf text file (currently not used) function gpg_passwd { [ -r "$CONF" ] && \ awk '/^[ \t]*GPG_PW[ \t=]/{\ @@ -1505,9 +1518,9 @@ fi fi + # interpret sign key setting if var_isset 'GPG_KEY_SIGN'; then - # warning - echo "Autoset found secret key of first GPG_KEY entry '${KEY_ID}' as signing key." + echo "Autoset found secret key of first GPG_KEY entry '${KEY_ID}' for signing." else echo "Signing disabled. First GPG_KEY entry's '${KEY_ID}' private key is missing." GPG_KEY_SIGN='disabled' @@ -1594,7 +1607,7 @@ done # check encrypting CMD_MSG="Test - Encrypt to $(gpg_join_keyset ${GPG_KEYS_ENC[@]})${CMD_MSG_SIGN:+ & $CMD_MSG_SIGN}" - run_cmd gpg_passwd \| $GPG $CMD_PARAM_SIGN $CMD_PARAMS --batch --status-fd 1 $GPG_OPTS -o "${GPG_TEST}_ENC" -e "$ME_LONG" + run_cmd echo $(qw "${GPG_PW_SIGN:-$GPG_PW}") \| $GPG $CMD_PARAM_SIGN $CMD_PARAMS --batch --status-fd 1 $GPG_OPTS -o "${GPG_TEST}_ENC" -e "$ME_LONG" if [ "$CMD_ERR" != "0" ]; then KEY_NOTRUST=$(echo "$CMD_OUT"|awk '/^\[GNUPG:\] INV_RECP 10/ { print $4 }') @@ -1607,7 +1620,7 @@ # check decrypting CMD_MSG="Test - Decrypt" gpg_key_decryptable || CMD_DISABLED="No matching secret key or GPG_PW not set." - run_cmd gpg_passwd \| $GPG --passphrase-fd 0 -o "${GPG_TEST}_DEC" --batch $GPG_OPTS -d "${GPG_TEST}_ENC" + run_cmd echo $(qw "${GPG_PW}") \| $GPG --passphrase-fd 0 -o "${GPG_TEST}_DEC" --batch $GPG_OPTS -d "${GPG_TEST}_ENC" if [ "$CMD_ERR" != "0" ]; then error_gpg_test "Decryption failed.${CMD_OUT:+\n$CMD_OUT}" @@ -1616,8 +1629,8 @@ # symmetric only else # check encrypting - CMD_MSG="Test - Encryption with passphrase" - run_cmd gpg_passwd \| $GPG $CMD_PARAM_SIGN --passphrase-fd 0 -o "${GPG_TEST}_ENC" --batch $GPG_OPTS -c "$ME_LONG" + CMD_MSG="Test - Encryption with passphrase${CMD_MSG_SIGN:+ & $CMD_MSG_SIGN}" + run_cmd echo $(qw "${GPG_PW}") \| $GPG $CMD_PARAM_SIGN --passphrase-fd 0 -o "${GPG_TEST}_ENC" --batch $GPG_OPTS -c "$ME_LONG" if [ "$CMD_ERR" != "0" ]; then error_gpg_test "Encryption failed.${CMD_OUT:+\n$CMD_OUT}" @@ -1625,7 +1638,7 @@ # check decrypting CMD_MSG="Test - Decryption with passphrase" - run_cmd gpg_passwd \| $GPG --passphrase-fd 0 -o "${GPG_TEST}_DEC" --batch $GPG_OPTS -d "${GPG_TEST}_ENC" + run_cmd echo $(qw "${GPG_PW}") \| $GPG --passphrase-fd 0 -o "${GPG_TEST}_DEC" --batch $GPG_OPTS -d "${GPG_TEST}_ENC" if [ "$CMD_ERR" != "0" ]; then error_gpg_test "Decryption failed.${CMD_OUT:+\n$CMD_OUT}" fi @@ -1700,7 +1713,8 @@ 'ssh'|'sftp'|'scp') # ssh backend wants to be told that theres a pass to use var_isset 'TARGET_URL_PASS' && \ - DUPL_PARAMS="$DUPL_PARAMS --ssh-askpass" + DUPL_PARAMS="$DUPL_PARAMS --ssh-askpass" && \ + BACKEND_PARAMS="FTP_PASSWORD=$(qw "${TARGET_URL_PASS}")" ;; *) # rest uses FTP_PASS var -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
