Hello community, here is the log from the commit of package duply for openSUSE:Factory checked in at 2018-06-02 12:15:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/duply (Old) and /work/SRC/openSUSE:Factory/.duply.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "duply" Sat Jun 2 12:15:20 2018 rev:19 rq:613551 version:2.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/duply/duply.changes 2017-08-16 16:18:35.480303469 +0200 +++ /work/SRC/openSUSE:Factory/.duply.new/duply.changes 2018-06-02 12:15:42.984137392 +0200 @@ -1,0 +2,12 @@ +Fri Jun 1 21:28:20 UTC 2018 - malcolmle...@opensuse.org + +- Update to version 2.0.4: + + Bugfix 114: "duply usage is not current" wrt. purgeFull/Incr. + + Bugfix 115: typo in error message - "Not GPG_KEY entries" + should be "No". + + Bugfix 117: no duply_ prefix when ARCH_DIR is set in conf. + + Occasionally shows negative runtimes, (deb#882159). +- Changes from version 2.0.3: + +Bugfix: "line 2231: CMDS: bad array subscript". + +------------------------------------------------------------------- Old: ---- duply_2.0.2.tgz New: ---- duply_2.0.4.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ duply.spec ++++++ --- /var/tmp/diff_new_pack.JCU0Pa/_old 2018-06-02 12:15:45.836032785 +0200 +++ /var/tmp/diff_new_pack.JCU0Pa/_new 2018-06-02 12:15:45.872031465 +0200 @@ -1,8 +1,8 @@ # # spec file for package duply # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2011-2017 Malcolm J Lewis <malcolmle...@opensuse.org> +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2011-2018 Malcolm J Lewis <malcolmle...@opensuse.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,10 +18,10 @@ Name: duply -Version: 2.0.2 +Version: 2.0.4 Release: 0 Summary: A frontend for the mighty duplicity magic -License: GPL-2.0 +License: GPL-2.0-only Group: Productivity/Archiving/Compression Url: http://duply.net/ Source0: https://svwh.dl.sourceforge.net/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/%{name}_%{version}.tgz @@ -39,11 +39,13 @@ %prep %setup -q -n %{name}_%{version} +#Fix env-script-interpreter rpmlint error +sed -i 's/\/usr\/bin\/env bash/\/bin\/bash/g' duply %build %install -install -D -m0755 %{name} %{buildroot}%{_bindir}/%{name} +install -Dm0755 %{name} %{buildroot}%{_bindir}/%{name} %files %defattr(-,root,root,-) ++++++ duply_2.0.2.tgz -> duply_2.0.4.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/duply_2.0.2/CHANGELOG.txt new/duply_2.0.4/CHANGELOG.txt --- old/duply_2.0.2/CHANGELOG.txt 2017-05-23 14:51:09.000000000 +0200 +++ new/duply_2.0.4/CHANGELOG.txt 2018-02-20 17:02:08.000000000 +0100 @@ -17,6 +17,16 @@ - import/export profile from/to .tgz function !!! CHANGELOG: +2.0.4 (20.02.2018) +- bugfix 114: "duply usage is not current" wrt. purgeFull/Incr +- bugfix 115: typo in error message - "Not GPG_KEY entries" should be "No" +- bugfix 117: no duply_ prefix when ARCH_DIR is set in conf +- bugfix debian 882159: duply: occasionally shows negative runtimes + +2.0.3 (29.08.2017) +- bugfix: "line 2231: CMDS: bad array subscript" +- bugfix 112: "env: illegal option -- u" on MacOSX + 2.0.2 (23.05.2017) - bugfix: never insert creds into file:// targets - bugfix: avail profiles hint sometimes shortend the names by one char diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/duply_2.0.2/duply new/duply_2.0.4/duply --- old/duply_2.0.2/duply 2017-05-23 14:51:09.000000000 +0200 +++ new/duply_2.0.4/duply 2018-02-20 17:02:08.000000000 +0100 @@ -9,7 +9,7 @@ # changed from ftplicity to duply. # # See http://duply.net or http://ftplicity.sourceforge.net/ for more info. # # (c) 2006 Christiane Ruetten, Heise Zeitschriften Verlag, Germany # -# (c) 2008-2016 Edgar Soldin (changes since version 1.3) # +# (c) 2008-2017 Edgar Soldin (changes since version 1.3) # ################################################################################ # LICENSE: # # This program is licensed under GPLv2. # @@ -33,6 +33,16 @@ # - import/export profile from/to .tgz function !!! # # CHANGELOG: +# 2.0.4 (20.02.2018) +# - bugfix 114: "duply usage is not current" wrt. purgeFull/Incr +# - bugfix 115: typo in error message - "Not GPG_KEY entries" should be "No" +# - bugfix 117: no duply_ prefix when ARCH_DIR is set in conf +# - bugfix debian 882159: duply: occasionally shows negative runtimes +# +# 2.0.3 (29.08.2017) +# - bugfix: "line 2231: CMDS: bad array subscript" +# - bugfix 112: "env: illegal option -- u" on MacOSX +# # 2.0.2 (23.05.2017) # - bugfix: never insert creds into file:// targets # - bugfix: avail profiles hint sometimes shortend the names by one char @@ -439,7 +449,7 @@ # wrap grep to override possible env set GREP_OPTIONS=--color=always function grep { - command env -u GREP_OPTIONS grep "$@" + command env "GREP_OPTIONS=" grep "$@" } # implement basename in plain bash @@ -471,7 +481,7 @@ ME_LONG="$0" ME="$(basename $0)" ME_NAME="${ME%%.*}" -ME_VERSION="2.0.2" +ME_VERSION="2.0.4" ME_WEBSITE="http://duply.net"; # default config values @@ -679,7 +689,8 @@ version show version information of $ME_NAME and needed programs OPTIONS: - --force passed to duplicity (see commands: purge, purge-full, cleanup) + --force passed to duplicity (see commands: + purge, purgeFull, purgeIncr, cleanup) --preview do nothing but print out generated duplicity command lines --disable-encryption disable encryption, overrides profile settings @@ -863,12 +874,12 @@ # see duplicity man page, chapter TIME_FORMATS) #MAX_AGE=1M -# Number of full backups to keep. Used for the "purge-full" command. +# Number of full backups to keep. Used for the "purgeFull" command. # See duplicity man page, action "remove-all-but-n-full". #MAX_FULL_BACKUPS=1 # Number of full backups for which incrementals will be kept for. -# Used for the "purge-incr" command. +# Used for the "purgeIncr" command. # See duplicity man page, action "remove-all-inc-of-but-n-full". #MAX_FULLS_WITH_INCRS=1 @@ -1178,8 +1189,15 @@ local DUPL_ARCHDIR='' if var_isset 'ARCH_DIR'; then DUPL_ARCHDIR="--archive-dir $(qw "${ARCH_DIR}")" + # reuse erronously duply_ prefixed folders from bug #117 + if [ -d "$ARCH_DIR/duply_${PROFILE}" ]; then + DUPL_ARCHDIR="${DUPL_ARCHDIR} --name $(qw "duply_${PROFILE}")" + else + DUPL_ARCHDIR="${DUPL_ARCHDIR} --name $(qw "${PROFILE}")" + fi + else + DUPL_ARCHDIR="--name $(qw "duply_${PROFILE}")" fi -DUPL_ARCHDIR="${DUPL_ARCHDIR} --name $(qw "duply_${PROFILE}")" fi DUPL_PARAMS_GLOBAL="${DUPL_ARCHDIR} ${DUPL_PARAM_ENC} \ @@ -1256,6 +1274,8 @@ # params are $1=timeformatstring (default like date output), $2=epoch seconds since 1.1.1970 (default now) function date_fix { local DEFAULTFORMAT='%a %b %d %H:%M:%S %Z %Y' + local date + #[ "$1" == "%N" ] && return #test the no nsec test below # gnu date with -d @epoch date=$(date ${2:+-d @$2} ${1:++"$1"} 2> /dev/null) && \ echo $date && return @@ -1281,9 +1301,19 @@ } function nsecs { - # only 9 digit returns, e.g. not all date(s) deliver nsecs - local NSECS=$(date +%N 2> /dev/null | head -1 |grep -e "^[[:digit:]]\{9\}$") - echo ${NSECS:-000000000} + local NSECS + # test if date supports nanosecond output + if ! var_isset NSECS_DISABLED; then + NSECS=$(date_fix %N 2> /dev/null | head -1 |grep -e "^[[:digit:]]\{9\}$") + [ -n "$NSECS" ] && NSECS_DISABLED=0 || NSECS_DISABLED=1 + fi + + # add 9 digits, not all date(s) deliver nsecs eg. busybox date + if [ "$NSECS_DISABLED" == "1" ]; then + date_fix %s000000000 + else + date_fix %s%N + fi } function nsecs_to_sec { @@ -1937,7 +1967,7 @@ elif ! var_isset 'GPG_KEY_SIGN'; then KEY_ID="${GPG_KEYS_ENC_ARRAY[0]}" if [ -z "${KEY_ID}" ]; then - echo "Signing disabled. Not GPG_KEY entries in config." + echo "Signing disabled. No GPG_KEY entries in config." GPG_KEY_SIGN='disabled' else # use avail OR try import OR fail @@ -2145,7 +2175,7 @@ # for all protocols we put username in url and pass into env var -# for sec�rity reasons, we url_encode username to protect special chars +# for sec�rity reasons, we url_encode username to protect special chars # first sortout backends with special ways to handle password case "$TARGET_URL_PROT_lowercase" in 'imap'|'imaps') @@ -2214,7 +2244,7 @@ unset CMD_VALUE CMD_NEXT CMD_PREV CND_NEXT CND_PREV # get next cmd,cnd vars -nextno=$(($CMD_NO+1)) +nextno=$(( $CMD_NO + 1 )) while ! var_isset 'CMD_NEXT' do if [ "$nextno" -lt "${#CMDS[@]}" ]; then @@ -2228,8 +2258,7 @@ # get prev cnd, cnd are skipped pseudocmds prevno=$(( $CMD_NO - 1 )) -CMD_VALUE=${CMDS[$prevno]} -is_condition "$CMD_VALUE" && [ "$prevno" -ge 0 ] && CND_PREV=${CMDS[$prevno]} +[ "$prevno" -ge 0 ] && is_condition "${CMDS[$prevno]}" && CND_PREV=${CMDS[$prevno]} # get prev cmd command minus skipped commands, only executed prevno=$(( $CMD_NO - ${CMD_SKIPPED-0} - 1 )); unset CMD_SKIPPED @@ -2245,7 +2274,7 @@ done # save start time -RUN_START=$(date_fix %s)$(nsecs) +RUN_START=$(nsecs) # export some useful env vars for external scripts/programs to use export PROFILE CONFDIR SOURCE TARGET_URL_PROT TARGET_URL_HOSTPATH \ @@ -2357,7 +2386,7 @@ esac CMD_ERR=$? -RUN_END=$(date_fix %s)$(nsecs) +RUN_END=$(nsecs) RUNTIME=$(( $RUN_END - $RUN_START )) # print message on error; set error code
