diff --git a/ChangeLog b/ChangeLog index 5e69de21f..cc081ba36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-03-09 Werner Koch + + Released 1.4.3rc2. + 2006-03-07 David Shaw * NEWS: Note CERT retrieval. Tweak PKA and backsig language to diff --git a/checks/ChangeLog b/checks/ChangeLog index 854794814..29d1d3125 100644 --- a/checks/ChangeLog +++ b/checks/ChangeLog @@ -1,3 +1,7 @@ +2006-03-09 Werner Koch + + * defs.inc: Removed Basishm by proper redirection. + 2006-03-06 Werner Koch * defs.inc: Print error messages also to stderr. Allow for diff --git a/checks/defs.inc b/checks/defs.inc index 9917de913..98a6c3f76 100755 --- a/checks/defs.inc +++ b/checks/defs.inc @@ -41,14 +41,14 @@ defs_error_seen=no fatal () { echo "$pgmname: fatal:" $* >&2 - [ -n "${BASH_VERSION+set}" ] && echo "$pgmname: fatal:" $* >&5 + echo "$pgmname: fatal:" $* >&5 exit 1; } error () { echo "$pgmname:" $* >&2 defs_error_seen=yes - [ -n "${BASH_VERSION+set}" ] && echo "$pgmname:" $* >&5 + echo "$pgmname:" $* >&5 if [ x$defs_stop_on_error != xyes ]; then exit 1 fi @@ -71,7 +71,7 @@ resume_error () { info () { echo "$pgmname:" $* >&2 if [ -n "${verbose+set}" ]; then - [ -n "${BASH_VERSION+set}" ] && echo "$pgmname:" $* >&5 + echo "$pgmname:" $* >&5 fi } @@ -156,9 +156,7 @@ fi GPG="../g10/gpg --no-permission-warning --homedir . " -[ -n "${BASH_VERSION+set}" ] && exec 5>/dev/stderr - -exec 2> ${pgmname}.log +exec 5>&2 2>${pgmname}.log : # end diff --git a/configure.ac b/configure.ac index 6a8d6dae7..7d865cd89 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ min_automake_version="1.9.3" # Remember to change the version number immediately *after* a release # and remove the "-cvs" or "rc" suffix immediately *before* a release. -AC_INIT(gnupg, 1.4.3-cvs, bug-gnupg@gnu.org) +AC_INIT(gnupg, 1.4.3rc2, bug-gnupg@gnu.org) # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not # sufficient. diff --git a/g10/ChangeLog b/g10/ChangeLog index c08c19547..cb3245b06 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -6,26 +6,31 @@ (tty_print_notations): Helper. (show_prefs): Show notations in "showpref". - * mainproc.c (get_pka_address), keylist.c (show_notation): Remove + * mainproc.c (get_pka_address) + * keylist.c (show_notation): Remove duplicate code by using notation functions. - * packet.h, build-packet.c (sig_to_notation), keygen.c - (keygen_add_notations): Provide printable text for + * packet.h, build-packet.c (sig_to_notation) + * keygen.c (keygen_add_notations): Provide printable text for non-human-readable notation values. - * packet.h, build-packet.c (sig_to_notation), keygen.c - (keygen_add_notations): Tweak to handle non-human-readable + * packet.h, build-packet.c (sig_to_notation) + * keygen.c (keygen_add_notations): Tweak to handle non-human-readable notation values. - * options.h, sign.c (mk_notation_policy_etc), gpg.c - (add_notation_data): Use it here for the various notation + * options.h, sign.c (mk_notation_policy_etc) + * gpg.c (add_notation_data): Use it here for the various notation commands. - * packet.h, main.h, keygen.c (keygen_add_notations), - build-packet.c (string_to_notation, sig_to_notation) + * packet.h, main.h, keygen.c (keygen_add_notations) + * build-packet.c (string_to_notation, sig_to_notation) (free_notation): New "one stop shopping" functions to handle notations and start removing some code duplication. +2006-03-08 Werner Koch + + * mainproc.c (do_check_sig): Use log_error for standalone revocations. + 2006-03-07 David Shaw * options.h, mainproc.c (check_sig_and_print), gpg.c (main): diff --git a/g10/mainproc.c b/g10/mainproc.c index 336ad948d..dbe64c96e 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -814,8 +814,8 @@ do_check_sig( CTX c, KBNODE node, int *is_selfsig, return check_key_signature( c->list, node, is_selfsig ); } else if( sig->sig_class == 0x20 ) { - log_info(_("standalone revocation - " - "use \"gpg --import\" to apply\n")); + log_error (_("standalone revocation - " + "use \"gpg --import\" to apply\n")); return G10ERR_NOT_PROCESSED; } else {