* configure.ac: Require libksba 0.9.3 due to another bug fix there.

* sign.c (add_certificate_list): Decrement N for the first cert.

* Makefile.am (sbin_SCRIPTS): New, to install addgnupghome.
(EXTRA_DIST): Added rfc822parse.c rfc822parse.h gpgparsemail.c
which might be useful for debugging.

ChangeLog

@@ -1,3 +1,9 @@
+2004-01-30  Werner Koch  <wk@gnupg.org>
+
+	Released 1.9.4.
+
+	* configure.ac: Require libksba 0.9.3 due to another bug fix there.
+
 2004-01-29  Werner Koch  <wk@gnupg.org>
 
 	* README: Updated.

NEWS

@@ -1,11 +1,15 @@
-Noteworthy changes in version 1.9.4 (unreleased)
+Noteworthy changes in version 1.9.4 (2004-01-30)
 ------------------------------------------------
 
  * Added support for the Telesec NKS 2.0 card application.
 
+ * Added simple tool addgnupghome to create .gnupg directories from
+   /etc/skel/.gnupg.
+
  * Various minor bug fixes and cleanups; mainly gpgsm and gpg-agent
    related.
 
+
 Noteworthy changes in version 1.9.3 (2003-12-23)
 ------------------------------------------------
 

configure.ac

@@ -24,7 +24,7 @@ min_automake_version="1.7.6"
 
 # Version number: Remember to change it immediately *after* a release.
 #                 Add a "-cvs" prefix for non-released code.
-AC_INIT(gnupg, 1.9.4-cvs, gnupg-devel@gnupg.org)
+AC_INIT(gnupg, 1.9.4, gnupg-devel@gnupg.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.
@@ -32,7 +32,7 @@ development_version=yes
 NEED_GPG_ERROR_VERSION=0.6
 NEED_LIBGCRYPT_VERSION=1.1.91
 NEED_LIBASSUAN_VERSION=0.6.3
-NEED_KSBA_VERSION=0.9.2
+NEED_KSBA_VERSION=0.9.3
 NEED_OPENSC_VERSION=0.8.0
 
 

sm/ChangeLog

@@ -1,3 +1,7 @@
+2004-01-30  Werner Koch  <wk@gnupg.org>
+
+	* sign.c (add_certificate_list): Decrement N for the first cert.
+
 2004-01-29  Werner Koch  <wk@gnupg.org>
 
 	* certdump.c (parse_dn_part): Map common OIDs to human readable

sm/sign.c

@@ -244,6 +244,7 @@ add_certificate_list (CTRL ctrl, ksba_cms_t cms, ksba_cert_t cert)
   ksba_cert_ref (cert);
 
   n = ctrl->include_certs;
+  log_debug ("adding certificates at level %d\n", n);
   if (n == -2)
     {
       not_root = 1;
@@ -252,6 +253,8 @@ add_certificate_list (CTRL ctrl, ksba_cms_t cms, ksba_cert_t cert)
   if (n < 0 || n > 50)
     n = 50; /* We better apply an upper bound */
 
+  /* First add my own certificate unless we don't want any certificate
+     included at all. */
   if (n)
     {
       if (not_root && gpgsm_is_root_cert (cert))
@@ -260,7 +263,12 @@ add_certificate_list (CTRL ctrl, ksba_cms_t cms, ksba_cert_t cert)
         err = ksba_cms_add_cert (cms, cert);
       if (err)
         goto ksba_failure;
+      if (n>0)
+        n--;
     }
+  /* Walk the chain to include all other certificates.  Note that a -1
+     used for N makes sure that there is no limit and all certs get
+     included. */
   while ( n-- && !(rc = gpgsm_walk_cert_chain (cert, &next)) )
     {
       if (not_root && gpgsm_is_root_cert (next))

tools/ChangeLog

@@ -1,3 +1,9 @@
+2004-01-30  Werner Koch  <wk@gnupg.org>
+
+	* Makefile.am (sbin_SCRIPTS): New, to install addgnupghome.
+	(EXTRA_DIST): Added rfc822parse.c rfc822parse.h gpgparsemail.c
+	which might be useful for debugging.
+
 2004-01-29  Werner Koch  <wk@gnupg.org>
 
 	* addgnupghome: New.
@@ -32,7 +38,7 @@
 	* watchgnupg.c: New.
 
 
- Copyright 2003 Free Software Foundation, Inc.
+ Copyright 2003, 2004 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without

tools/Makefile.am

@@ -17,7 +17,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-EXTRA_DIST = Manifest watchgnupg.c addgnupghome
+EXTRA_DIST = Manifest watchgnupg.c \
+             rfc822parse.c rfc822parse.h gpgparsemail.c \
+	     addgnupghome
 
 localedir = $(datadir)/locale
 INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
@@ -26,6 +28,8 @@ INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
 # require that file.  It is not actually used in gpgconf.
 AM_CFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/intl @GPG_ERROR_CFLAGS@
 
+sbin_SCRIPTS = addgnupghome
+
 bin_PROGRAMS = gpgconf
 
 gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c

tools/gpgparsemail.c

@@ -1,5 +1,5 @@
 /* gpgparsemail.c - Standalone crypto mail parser
- *	Copyright (C) 2003 Free Software Foundation, Inc.
+ *	Copyright (C) 2004 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *