[svn] GnuPG - r4056 - in trunk: . checks g10

[svn author wk]

Author: wk
Date: 2006-03-09 13:45:02 +0100 (Thu, 09 Mar 2006)
New Revision: 4056

Modified:
   trunk/ChangeLog
   trunk/checks/ChangeLog
   trunk/checks/defs.inc
   trunk/configure.ac
   trunk/g10/ChangeLog
   trunk/g10/mainproc.c
Log:
Preparing for an RC23


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-03-09 04:00:18 UTC (rev 4055)
+++ trunk/ChangeLog	2006-03-09 12:45:02 UTC (rev 4056)
@@ -1,3 +1,7 @@
+2006-03-09  Werner Koch  <wk at g10code.com>
+
+	Released 1.4.3rc2.
+
 2006-03-07  David Shaw  <dshaw at jabberwocky.com>
 
 	* NEWS: Note CERT retrieval.  Tweak PKA and backsig language to

Modified: trunk/checks/ChangeLog
===================================================================
--- trunk/checks/ChangeLog	2006-03-09 04:00:18 UTC (rev 4055)
+++ trunk/checks/ChangeLog	2006-03-09 12:45:02 UTC (rev 4056)
@@ -1,3 +1,7 @@
+2006-03-09  Werner Koch  <wk at g10code.com>
+
+	* defs.inc: Removed Basishm by proper redirection.
+
 2006-03-06  Werner Koch  <wk at g10code.com>
 
 	* defs.inc: Print error messages also to stderr.  Allow for

Modified: trunk/checks/defs.inc
===================================================================
--- trunk/checks/defs.inc	2006-03-09 04:00:18 UTC (rev 4055)
+++ trunk/checks/defs.inc	2006-03-09 12:45:02 UTC (rev 4056)
@@ -41,14 +41,14 @@
 
 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 @@
 info () {
     echo "$pgmname:" $* >&2
     if [ -n "${verbose+set}" ]; then
-      [ -n "${BASH_VERSION+set}" ] && echo "$pgmname:" $* >&5
+      echo "$pgmname:" $* >&5
     fi
 }
 
@@ -156,9 +156,7 @@
 
 GPG="../g10/gpg --no-permission-warning --homedir . "
 
-[ -n "${BASH_VERSION+set}" ] && exec 5>/dev/stderr
+exec 5>&2 2>${pgmname}.log
 
-exec 2> ${pgmname}.log
-
 :
 # end

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-03-09 04:00:18 UTC (rev 4055)
+++ trunk/configure.ac	2006-03-09 12:45:02 UTC (rev 4056)
@@ -26,7 +26,7 @@
 
 # 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 at gnu.org)
+AC_INIT(gnupg, 1.4.3rc2, bug-gnupg at 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.

Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-03-09 04:00:18 UTC (rev 4055)
+++ trunk/g10/ChangeLog	2006-03-09 12:45:02 UTC (rev 4056)
@@ -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  <wk at g10code.com>
+
+	* mainproc.c (do_check_sig): Use log_error for standalone revocations.
+
 2006-03-07  David Shaw  <dshaw at jabberwocky.com>
 
 	* options.h, mainproc.c (check_sig_and_print), gpg.c (main):

Modified: trunk/g10/mainproc.c
===================================================================
--- trunk/g10/mainproc.c	2006-03-09 04:00:18 UTC (rev 4055)
+++ trunk/g10/mainproc.c	2006-03-09 12:45:02 UTC (rev 4056)
@@ -814,8 +814,8 @@
 	    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 {