Hello community, here is the log from the commit of package password-store for openSUSE:Factory checked in at 2015-01-29 09:57:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/password-store (Old) and /work/SRC/openSUSE:Factory/.password-store.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "password-store" Changes: -------- --- /work/SRC/openSUSE:Factory/password-store/password-store.changes 2014-11-15 12:22:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.password-store.new/password-store.changes 2015-01-29 09:58:11.000000000 +0100 @@ -1,0 +2,30 @@ +Wed Jan 28 13:24:32 UTC 2015 - [email protected] + +- Version bump 1.6.5: + * 1.6.4 Changelog: + * Features: + * "add" is an alias of "insert" + * `pass edit` will no longer make a commit if the password does not change + * Symbolic links are now followed + * Remove gpg agent check, due to the auto-starting gpg-agent in GnuPG 2.1 + * Bug Fixes: + * Avoid trailing slash in `pass grep` + * Account for $CLIP_TIME in messages + * revelation2pass, keepassx2pass, and other script improvements + * Fix .gpg extension in tree listings, and preserve colors + * Improved support for getopt on OSX + * Updates for zsh and fish completion autoloading + * Always preserve TTY for pinentry + * Only use encryption subkeys + * Better clip error messages + * No longer use hidden recipients + * 1.6.5 Changelog: + * Features: + * Support Gpg4win alongside Cygwin + * Bug Fixes: + * Work around unit tests bug with GnuPG 2.1.0 and 2.1.1 + * Manually migrate unit tests keys to GnuPG 2.1 series + * Restore support for GnuPG 2.0 series +- Add a few builddeps so that we don't own the dirs of the completion files + +------------------------------------------------------------------- Old: ---- password-store-1.6.3.tar.xz New: ---- password-store-1.6.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ password-store.spec ++++++ --- /var/tmp/diff_new_pack.nu1Gq1/_old 2015-01-29 09:58:12.000000000 +0100 +++ /var/tmp/diff_new_pack.nu1Gq1/_new 2015-01-29 09:58:12.000000000 +0100 @@ -17,7 +17,7 @@ Name: password-store -Version: 1.6.3 +Version: 1.6.5 Release: 0 Summary: Stores, retrieves, generates, and synchronizes passwords License: GPL-2.0+ @@ -29,6 +29,9 @@ BuildRequires: pwgen BuildRequires: tree >= 1.7.0 BuildRequires: xz +BuildRequires: bash-completion +BuildRequires: zsh +BuildRequires: fish Requires: gpg2 Requires: pwgen Requires: tree >= 1.7.0 @@ -60,7 +63,7 @@ %build %install -make DESTDIR=%{buildroot} FORCE_ALL=1 install %{?_smp_mflags} +make DESTDIR=%{buildroot} FISHCOMP_PATH=%{buildroot}%{_datadir}/fish/completions FORCE_ALL=1 install %{?_smp_mflags} install -D -m 0755 contrib/dmenu/passmenu %{buildroot}%{_bindir}/passmenu %check @@ -71,12 +74,6 @@ %doc README COPYING %{_mandir}/man1/pass.1.gz %{_bindir}/pass -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%dir %{_datadir}/fish -%dir %{_datadir}/fish/completions -%dir %{_datadir}/zsh -%dir %{_datadir}/zsh/site-functions %{_datadir}/bash-completion/completions/pass %{_datadir}/fish/completions/pass.fish %{_datadir}/zsh/site-functions/_pass ++++++ password-store-1.6.3.tar.xz -> password-store-1.6.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/password-store-1.6.3/Makefile new/password-store-1.6.5/Makefile --- old/password-store-1.6.3/Makefile 2014-07-01 10:42:26.000000000 +0200 +++ new/password-store-1.6.5/Makefile 2015-01-28 17:43:02.000000000 +0100 @@ -8,7 +8,7 @@ BASHCOMP_PATH ?= $(DESTDIR)$(PREFIX)/share/bash-completion/completions ZSHCOMP_PATH ?= $(DESTDIR)$(PREFIX)/share/zsh/site-functions -FISHCOMP_PATH ?= $(DESTDIR)$(PREFIX)/share/fish/completions +FISHCOMP_PATH ?= $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d ifeq ($(FORCE_ALL),1) FORCE_BASHCOMP := 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/password-store-1.6.3/contrib/emacs/password-store.el new/password-store-1.6.5/contrib/emacs/password-store.el --- old/password-store-1.6.3/contrib/emacs/password-store.el 2014-07-01 10:42:26.000000000 +0200 +++ new/password-store-1.6.5/contrib/emacs/password-store.el 2015-01-28 17:43:02.000000000 +0100 @@ -200,7 +200,10 @@ "Insert a new ENTRY containing PASSWORD." (interactive (list (read-string "Password entry: ") (read-passwd "Password: " t))) - (message (shell-command-to-string (format "echo %s | %s insert -m -f %s" password password-store-executable entry)))) + (message (shell-command-to-string (format "echo %s | %s insert -m -f %s" + (shell-quote-argument password) + password-store-executable + (shell-quote-argument entry))))) ;;;###autoload (defun password-store-generate (entry &optional password-length) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/password-store-1.6.3/contrib/importers/keepassx2pass.py new/password-store-1.6.5/contrib/importers/keepassx2pass.py --- old/password-store-1.6.3/contrib/importers/keepassx2pass.py 2014-07-01 10:42:26.000000000 +0200 +++ new/password-store-1.6.5/contrib/importers/keepassx2pass.py 2015-01-28 17:43:02.000000000 +0100 @@ -47,7 +47,7 @@ ret = passwd + "\n" if passwd else "\n" for field in ['username', 'url', 'comment']: fel = element.find(field) - children = [str(e.text or '') + str(e.tail or '') for e in list(fel)] + children = [unicode(e.text or '') + unicode(e.tail or '') for e in list(fel)] if len(children) > 0: children.insert(0, '') text = (fel.text or '') + "\n".join(children) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/password-store-1.6.3/contrib/importers/revelation2pass.py new/password-store-1.6.5/contrib/importers/revelation2pass.py --- old/password-store-1.6.3/contrib/importers/revelation2pass.py 2014-07-01 10:42:26.000000000 +0200 +++ new/password-store-1.6.5/contrib/importers/revelation2pass.py 2015-01-28 17:43:02.000000000 +0100 @@ -57,7 +57,10 @@ """ Return password data and additional info if available from password entry element. """ data = OrderedDict() - data['password'] = element.find('field[@id="generic-password"]').text + try: + data['password'] = element.find('field[@id="generic-password"]').text + except AttributeError: + data['password'] = None data['type'] = element.attrib['type'] for field in element.findall('field'): field_id = field.attrib['id'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/password-store-1.6.3/contrib/vim/noplaintext.vim new/password-store-1.6.5/contrib/vim/noplaintext.vim --- old/password-store-1.6.3/contrib/vim/noplaintext.vim 1970-01-01 01:00:00.000000000 +0100 +++ new/password-store-1.6.5/contrib/vim/noplaintext.vim 2015-01-28 17:43:02.000000000 +0100 @@ -0,0 +1,46 @@ +" +" Prevent various Vim features from keeping the contents of pass(1) password +" files (or any other purely temporary files) in plaintext on the system. +" +" Either append this to the end of your .vimrc, or install it as a plugin with +" a plugin manager like Tim Pope's Pathogen. +" +" Author: Tom Ryder <[email protected]> +" + +" Don't backup files in temp directories or shm +if exists('&backupskip') + set backupskip+=/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*,*/shm/* +endif + +" Don't keep swap files in temp directories or shm +if has('autocmd') + augroup swapskip + autocmd! + silent! autocmd BufNewFile,BufReadPre + \ /tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*,*/shm/* + \ setlocal noswapfile + augroup END +endif + +" Don't keep undo files in temp directories or shm +if has('persistent_undo') && has('autocmd') + augroup undoskip + autocmd! + silent! autocmd BufWritePre + \ /tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*,*/shm/* + \ setlocal noundofile + augroup END +endif + +" Don't keep viminfo for files in temp directories or shm +if has('viminfo') + if has('autocmd') + augroup viminfoskip + autocmd! + silent! autocmd BufNewFile,BufReadPre + \ /tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*,*/shm/* + \ setlocal viminfo= + augroup END + endif +endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/password-store-1.6.3/man/pass.1 new/password-store-1.6.5/man/pass.1 --- old/password-store-1.6.3/man/pass.1 2014-07-01 10:42:26.000000000 +0200 +++ new/password-store-1.6.5/man/pass.1 2015-01-28 17:43:02.000000000 +0100 @@ -99,7 +99,8 @@ disable keyboard echo when the password is entered and confirm the password by asking for it twice. If \fI--multiline\fP or \fI-m\fP is specified, lines will be read until EOF or Ctrl+D is reached. Otherwise, only a single line from standard in is read. Prompt -before overwriting an existing password, unless \fI--force\fP or \fI-f\fP is specified. +before overwriting an existing password, unless \fI--force\fP or \fI-f\fP is specified. This +command is alternatively named \fBadd\fP. .TP \fBedit\fP \fIpass-name\fP Insert a new password or edit an existing password using the default text editor specified diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/password-store-1.6.3/src/completion/pass.zsh-completion new/password-store-1.6.5/src/completion/pass.zsh-completion --- old/password-store-1.6.3/src/completion/pass.zsh-completion 2014-07-01 10:42:26.000000000 +0200 +++ new/password-store-1.6.5/src/completion/pass.zsh-completion 2015-01-28 17:43:02.000000000 +0100 @@ -114,7 +114,7 @@ _pass_complete_entries_helper () { local IFS=$'\n' local prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}" - _values -C 'passwords' $(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' | sort) + _values -C 'passwords' ${$(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print 2>/dev/null | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' | sort):-""} } _pass_complete_entries_with_subdirs () { @@ -130,3 +130,5 @@ # Extract names and email addresses from gpg --list-keys _values 'gpg keys' $(gpg2 --list-secret-keys --with-colons | cut -d : -f 10 | sort -u | sed '/^$/d') } + +_pass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/password-store-1.6.3/src/password-store.sh new/password-store-1.6.5/src/password-store.sh --- old/password-store-1.6.3/src/password-store.sh 2014-07-01 10:42:26.000000000 +0200 +++ new/password-store-1.6.5/src/password-store.sh 2015-01-28 17:43:02.000000000 +0100 @@ -6,8 +6,9 @@ umask "${PASSWORD_STORE_UMASK:-077}" set -o pipefail -GPG_OPTS=( "--quiet" "--yes" "--compress-algo=none" ) +GPG_OPTS=( "--quiet" "--yes" "--compress-algo=none" "--no-encrypt-to" ) GPG="gpg" +export GPG_TTY="${GPG_TTY:-$(tty 2>/dev/null)}" which gpg2 &>/dev/null && GPG="gpg2" [[ -n $GPG_AGENT_INFO || $GPG == "gpg2" ]] && GPG_OPTS+=( "--batch" "--use-agent" ) @@ -79,16 +80,7 @@ GPG_RECIPIENTS+=( "$gpg_id" ) done < "$current" } -agent_check() { - [[ ! -t 0 || -n $GPG_AGENT_INFO ]] || yesno "$(cat <<-_EOF - You are not running gpg-agent. This means that you will - need to enter your password for each and every gpg file - that pass processes. This could be quite tedious. - Are you sure you would like to continue without gpg-agent? - _EOF - )" -} reencrypt_path() { local prev_gpg_recipients="" gpg_keys="" current_keys="" index passfile local groups="$($GPG --list-config --with-colons | grep "^cfg:group:.*")" @@ -108,7 +100,7 @@ IFS=";" eval 'GPG_RECIPIENTS+=( $group )' # http://unix.stackexchange.com/a/92190 unset GPG_RECIPIENTS[$index] done - gpg_keys="$($GPG --list-keys --keyid-format long "${GPG_RECIPIENTS[@]}" | sed -n 's/sub *.*\/\([A-F0-9]\{16\}\) .*/\1/p' | LC_ALL=C sort -u)" + gpg_keys="$($GPG --list-keys --with-colons "${GPG_RECIPIENTS[@]}" | sed -n 's/sub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u)" fi current_keys="$($GPG -v --no-secmem-warning --no-permission-warning --list-only --keyid-format long "$passfile" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u)" @@ -139,11 +131,10 @@ # This base64 business is because bash cannot store binary data in a shell # variable. Specifically, it cannot store nulls nor (non-trivally) store # trailing new lines. - local sleep_argv0="password store sleep on display $DISPLAY" pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 - local before="$(xclip -o -selection "$X_SELECTION" | base64)" - echo -n "$1" | xclip -selection "$X_SELECTION" + local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | base64)" + echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard" ( ( exec -a "$sleep_argv0" sleep "$CLIP_TIME" ) local now="$(xclip -o -selection "$X_SELECTION" | base64)" @@ -210,7 +201,7 @@ ============================================ = pass: the standard unix password manager = = = - = v1.6.3 = + = v1.6.5 = = = = Jason A. Donenfeld = = [email protected] = @@ -245,7 +236,7 @@ Insert a new password or edit an existing password using ${EDITOR:-vi}. $PROGRAM generate [--no-symbols,-n] [--clip,-c] [--in-place,-i | --force,-f] pass-name pass-length Generate a new password of pass-length with optionally no symbols. - Optionally put it on the clipboard and clear board after 45 seconds. + Optionally put it on the clipboard and clear board after $CLIP_TIME seconds. Prompt before overwriting existing password unless forced. Optionally replace only the first line of an existing file with a new password. $PROGRAM rm [--recursive,-r] [--force,-f] pass-name @@ -298,7 +289,6 @@ git_add_file "$gpg_id" "Set GPG id to ${id_print%, }." fi - agent_check reencrypt_path "$PREFIX/$id_path" git_add_file "$PREFIX/$id_path" "Reencrypt password store using new GPG id ${id_print%, }." } @@ -320,7 +310,7 @@ check_sneaky_paths "$path" if [[ -f $passfile ]]; then if [[ $clip -eq 0 ]]; then - exec $GPG -d "${GPG_OPTS[@]}" "$passfile" + $GPG -d "${GPG_OPTS[@]}" "$passfile" || exit $? else local pass="$($GPG -d "${GPG_OPTS[@]}" "$passfile" | head -n 1)" [[ -n $pass ]] || exit 1 @@ -332,7 +322,7 @@ else echo "${path%\/}" fi - tree -C -l --noreport "$PREFIX/$path" | tail -n +2 | sed 's/\.gpg$//' + tree -C -l --noreport "$PREFIX/$path" | tail -n +2 | sed 's/\.gpg\(\x1B\[[0-9]\+m\)\{0,1\}\( ->\|$\)/\1\2/g' # remove .gpg at end of line, but keep colors elif [[ -z $path ]]; then die "Error: password store is empty. Try \"pass init\"." else @@ -344,23 +334,23 @@ [[ -z "$@" ]] && die "Usage: $PROGRAM $COMMAND pass-names..." IFS="," eval 'echo "Search Terms: $*"' local terms="*$(printf '%s*|*' "$@")" - tree -C -l --noreport -P "${terms%|*}" --prune --matchdirs --ignore-case "$PREFIX" | tail -n +2 | sed 's/\.gpg$//' + tree -C -l --noreport -P "${terms%|*}" --prune --matchdirs --ignore-case "$PREFIX" | tail -n +2 | sed 's/\.gpg\(\x1B\[[0-9]\+m\)\{0,1\}\( ->\|$\)/\1\2/g' } cmd_grep() { [[ $# -ne 1 ]] && die "Usage: $PROGRAM $COMMAND search-string" - agent_check local search="$1" passfile grepresults while read -r -d "" passfile; do grepresults="$($GPG -d "${GPG_OPTS[@]}" "$passfile" | grep --color=always "$search")" [ $? -ne 0 ] && continue passfile="${passfile%.gpg}" passfile="${passfile#$PREFIX/}" - local passfile_dir="${passfile%/*}" + local passfile_dir="${passfile%/*}/" + [[ $passfile_dir == "${passfile}/" ]] && passfile_dir="" passfile="${passfile##*/}" - printf "\e[94m%s/\e[1m%s\e[0m:\n" "$passfile_dir" "$passfile" + printf "\e[94m%s\e[1m%s\e[0m:\n" "$passfile_dir" "$passfile" echo "$grepresults" - done < <(find "$PREFIX" -iname '*.gpg' -print0) + done < <(find -L "$PREFIX" -iname '*.gpg' -print0) } cmd_insert() { @@ -431,6 +421,7 @@ fi ${EDITOR:-vi} "$tmp_file" [[ -f $tmp_file ]] || die "New password not saved." + $GPG -d -o - "${GPG_OPTS[@]}" "$passfile" | diff - "$tmp_file" &>/dev/null && die "Password unchanged." while ! $GPG -e "${GPG_RECIPIENT_ARGS[@]}" -o "$passfile" "${GPG_OPTS[@]}" "$tmp_file"; do yesno "GPG encryption failed. Would you like to try again?" done @@ -592,7 +583,7 @@ show|ls|list) shift; cmd_show "$@" ;; find|search) shift; cmd_find "$@" ;; grep) shift; cmd_grep "$@" ;; - insert) shift; cmd_insert "$@" ;; + insert|add) shift; cmd_insert "$@" ;; edit) shift; cmd_edit "$@" ;; generate) shift; cmd_generate "$@" ;; delete|rm|remove) shift; cmd_delete "$@" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/password-store-1.6.3/src/platform/cygwin.sh new/password-store-1.6.5/src/platform/cygwin.sh --- old/password-store-1.6.3/src/platform/cygwin.sh 2014-07-01 10:42:26.000000000 +0200 +++ new/password-store-1.6.5/src/platform/cygwin.sh 2015-01-28 17:43:02.000000000 +0100 @@ -14,3 +14,28 @@ ) 2>/dev/null & disown echo "Copied $2 to clipboard. Will clear in $CLIP_TIME seconds." } + +# replaces Cygwin-style filenames with their Windows counterparts +gpg_winpath() { + local args=("$@") + # as soon as an argument (from back to front) is no file, it can only be a filename argument if it is preceeded by '-o' + local could_be_filenames="true" + local i + for ((i=${#args[@]}-1; i>=0; i--)); do + if ( [ $i -gt 0 ] && [ "${args[$i-1]}" = "-o" ] ); then + args[$i]=$(cygpath -am ${args[$i]}) + elif [ $could_be_filenames = "true" ]; then + if [ -e ${args[$i]} ]; then + args[$i]=$(cygpath -am ${args[$i]}) + else + could_be_filenames="false" + fi + fi + done + $GPG_ORIG "${args[@]}" +} + +if $GPG --help | grep -q Gpg4win; then + GPG_ORIG="$GPG" + GPG=gpg_winpath +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/password-store-1.6.3/src/platform/darwin.sh new/password-store-1.6.5/src/platform/darwin.sh --- old/password-store-1.6.3/src/platform/darwin.sh 2014-07-01 10:42:26.000000000 +0200 +++ new/password-store-1.6.5/src/platform/darwin.sh 2015-01-28 17:43:02.000000000 +0100 @@ -12,7 +12,7 @@ [[ $now != $(echo -n "$1" | openssl base64) ]] && before="$now" echo "$before" | openssl base64 -d | pbcopy ) 2>/dev/null & disown - echo "Copied $2 to clipboard. Will clear in 45 seconds." + echo "Copied $2 to clipboard. Will clear in $CLIP_TIME seconds." } tmpdir() { @@ -31,5 +31,5 @@ mount -t hfs -o noatime -o nobrowse "$DARWIN_RAMDISK_DEV" "$SECURE_TMPDIR" || die "Error: could not mount filesystem on ramdisk." } -GETOPT="$(brew --prefix gnu-getopt 2>/dev/null || echo /usr/local)/bin/getopt" +GETOPT="$(brew --prefix gnu-getopt 2>/dev/null || { which port &>/dev/null && echo /opt/local; } || echo /usr/local)/bin/getopt" SHRED="srm -f -z" Files old/password-store-1.6.3/tests/gnupg/private-keys-v1.d/0606FE40527B8F47BFD30238709F895642EEF303.key and new/password-store-1.6.5/tests/gnupg/private-keys-v1.d/0606FE40527B8F47BFD30238709F895642EEF303.key differ Files old/password-store-1.6.3/tests/gnupg/private-keys-v1.d/06278846A35FE4416E8701DDCF6B60E93F8BCB63.key and new/password-store-1.6.5/tests/gnupg/private-keys-v1.d/06278846A35FE4416E8701DDCF6B60E93F8BCB63.key differ Files old/password-store-1.6.3/tests/gnupg/private-keys-v1.d/615FC2A5B2CBFD58B7FFA0A140D43B74AB9748B0.key and new/password-store-1.6.5/tests/gnupg/private-keys-v1.d/615FC2A5B2CBFD58B7FFA0A140D43B74AB9748B0.key differ Files old/password-store-1.6.3/tests/gnupg/private-keys-v1.d/63D607EC5C89163B473708E7B3E5115301CF06E4.key and new/password-store-1.6.5/tests/gnupg/private-keys-v1.d/63D607EC5C89163B473708E7B3E5115301CF06E4.key differ Files old/password-store-1.6.3/tests/gnupg/private-keys-v1.d/A5CEE9554AA7090ADD97D97E0DA902764E6C2111.key and new/password-store-1.6.5/tests/gnupg/private-keys-v1.d/A5CEE9554AA7090ADD97D97E0DA902764E6C2111.key differ Files old/password-store-1.6.3/tests/gnupg/private-keys-v1.d/AD20D0B45D263DD5AE866FDB98E04A0D20070F68.key and new/password-store-1.6.5/tests/gnupg/private-keys-v1.d/AD20D0B45D263DD5AE866FDB98E04A0D20070F68.key differ Files old/password-store-1.6.3/tests/gnupg/private-keys-v1.d/C93858C40FA9E117DA4E7F336580B8B12354EB83.key and new/password-store-1.6.5/tests/gnupg/private-keys-v1.d/C93858C40FA9E117DA4E7F336580B8B12354EB83.key differ Files old/password-store-1.6.3/tests/gnupg/private-keys-v1.d/C93F70CA322D4F42E7FC7D54F6367E65C23E5CA3.key and new/password-store-1.6.5/tests/gnupg/private-keys-v1.d/C93F70CA322D4F42E7FC7D54F6367E65C23E5CA3.key differ Files old/password-store-1.6.3/tests/gnupg/private-keys-v1.d/CDA6EE91E62A15AB9F6A3041FE01CC123B7E9D23.key and new/password-store-1.6.5/tests/gnupg/private-keys-v1.d/CDA6EE91E62A15AB9F6A3041FE01CC123B7E9D23.key differ Files old/password-store-1.6.3/tests/gnupg/private-keys-v1.d/FFED3C5A6A52B200BCCE3F41593EA51D6054649F.key and new/password-store-1.6.5/tests/gnupg/private-keys-v1.d/FFED3C5A6A52B200BCCE3F41593EA51D6054649F.key differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/password-store-1.6.3/tests/t0300-reencryption.sh new/password-store-1.6.5/tests/t0300-reencryption.sh --- old/password-store-1.6.3/tests/t0300-reencryption.sh 2014-07-01 10:42:26.000000000 +0200 +++ new/password-store-1.6.5/tests/t0300-reencryption.sh 2015-01-28 17:43:02.000000000 +0100 @@ -7,10 +7,10 @@ INITIAL_PASSWORD="will this password live? a big question indeed..." canonicalize_gpg_keys() { - $GPG --list-keys --keyid-format long "$@" | sed -n 's/sub *.*\/\([A-F0-9]\{16\}\) .*/\1/p' | sort -u + $GPG --list-keys --with-colons "$@" | sed -n 's/sub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u } gpg_keys_from_encrypted_file() { - $GPG -v --no-secmem-warning --no-permission-warning --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | sort -u + $GPG -v --no-secmem-warning --no-permission-warning --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u } gpg_keys_from_group() { local output="$($GPG --list-config --with-colons | sed -n "s/^cfg:group:$1:\\(.*\\)/\\1/p" | head -n 1)" @@ -21,6 +21,12 @@ canonicalize_gpg_keys "${keys[@]}" } +if $GPG --with-colons --list-config | grep -q '^cfg:version:2.1.[01]$'; then + skip_all="These tests are broken with GnuPG 2.1.0 and 2.1.1." + test_done + exit 0 +fi + test_expect_success 'Setup initial key and git' ' "$PASS" init $KEY1 && "$PASS" git init ' -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
