Release 0.2.1

AUTHORS

@@ -1,9 +1,23 @@
 Program: gpgme
-Maintainer: Werner Koch <wk@gnupg.org>
+Maintainer: Werner Koch <wk@g10code.com>
 
 
 FSF <gnu@gnu.org>
-    * Code taken from GnuPG: gpgme/w32-util.c 
+ - Code taken from GnuPG 1.0: gpgme/w32-util.c, GnuPG 1.1: jnlib/.
+
+g10 Code GmbH <code@g10code.com>
+ - All stuff since mid march 2001.
 
 Werner Koch <wk@gnupg.org>
-    * Design and most stuff.
+ - Design and most stuff.
+
+
+ Copyright 2001 g10 Code GmbH
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

ChangeLog

@@ -1,3 +1,9 @@
+2001-04-02  Werner Koch  <wk@gnupg.org>
+
+	Released 0.2.1.
+
+	Changed the copyright notices all over the place.
+	
 2001-02-28  Werner Koch  <wk@gnupg.org>
 
 	Released 0.2.0.
@@ -6,3 +12,14 @@
 
 	* autogen.sh: Added option --build-w32.
 
+
+ Copyright 2001 g10 Code GmbH
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	

INSTALL

@@ -1,3 +1,17 @@
+Installation Instructions for GPGME
+===================================
+
+ Copyright 2001 g10 Code GmbH
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+
 Basic Installation
 ==================
 

Makefile.am

@@ -1,3 +1,23 @@
+# Copyright (C) 2000 Werner Koch (dd9jn)
+# Copyright (C) 2001 g10 Code GmbH
+# 
+# This file is part of GPGME.
+# 
+# GPGME is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPGME is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = README-alpha autogen.sh
 

NEWS

@@ -0,0 +1,20 @@
+Noteworthy changes in version 0.2.1 (2001-04-02)
+------------------------------------------------
+
+ * Changed debug output and GPGME_DEBUG variable (gpgme/debug.c)
+
+ * Handle GnuPG's new key capabilities output and support revocation
+   et al. attributes
+
+ * Made the W32 support more robust.
+
+
+ Copyright 2001 g10 Code GmbH
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

bonobo/Makefile.am

@@ -1,3 +1,22 @@
+# Copyright (C) 2000 Werner Koch (dd9jn)
+# Copyright (C) 2001 g10 Code GmbH
+# 
+# This file is part of GPGME.
+# 
+# GPGME is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPGME is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = gpgme

complus/Makefile.am

@@ -1,3 +1,22 @@
+# Copyright (C) 2000 Werner Koch (dd9jn)
+# Copyright (C) 2001 g10 Code GmbH
+# 
+# This file is part of GPGME.
+# 
+# GPGME is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPGME is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = WINE-LICENSE WINE-AUTHORS

configure.in

@@ -1,6 +1,24 @@
 # configure.in  for GPGME
+# Copyright (C) 2000 Werner Koch (dd9jn)
+# Copyright (C) 2001 g10 Code GmbH
 # 
-dnl (Process this file with autoconf to produce a configure script.)
+# This file is part of GPGME.
+# 
+# GPGME is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPGME is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ 
+# (Process this file with autoconf to produce a configure script.)
 AC_REVISION($Revision$)dnl
 
 AC_INIT(gpgme/gpgme.h)
@@ -13,11 +31,11 @@ AM_MAINTAINER_MODE
 #    AGE, set REVISION to 0.
 # 3. Interfaces removed (BAD, breaks upward compatibility): Increment
 #    CURRENT, set AGE and REVISION to 0.
-AM_INIT_AUTOMAKE(gpgme,0.2.0a)
+AM_INIT_AUTOMAKE(gpgme,0.2.1)
 LIBGPGME_LT_CURRENT=3
 LIBGPGME_LT_AGE=3
 LIBGPGME_LT_REVISION=0
-NEED_GPG_VERSION=1.0.4e
+NEED_GPG_VERSION=1.0.4f
 ##############################################
 
 AC_SUBST(LIBGPGME_LT_CURRENT)
@@ -32,7 +50,7 @@ dnl
 AC_ARG_PROGRAM
 
 dnl Don't default to build static libs
-AM_DISABLE_STATIC
+dnl AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
 
 if test "$GCC" = yes; then

gpgme/ChangeLog

@@ -1,3 +1,11 @@
+2001-03-30  Werner Koch  <wk@gnupg.org>
+
+	* debug.c (debug_init): Allow to specify a debug file.
+	(_gpgme_debug_level): New.
+
+	* posix-io.c (_gpgme_io_read, _gpgme_io_write): Print output.
+	(_gpgme_io_select): Debug only with level > 2.
+
 2001-03-15  Werner Koch  <wk@gnupg.org>
 
 	* rungpg.c: Included time.h.
@@ -33,7 +41,7 @@
 
 2001-02-28  Werner Koch  <wk@gnupg.org>
 
-	* w32-io.c (destroy_reader): Set sop_me flag.
+	* w32-io.c (destroy_reader): Set stop_me flag.
 	(writer,create_writer,destroy_writer,find_writer,kill_writer): New.
 	(_gpgme_io_write): Use a writer thread to avaoid blocking.
 	(_gpgme_io_close): Cleanup a writer thread
@@ -163,3 +171,15 @@
 2001-01-05  Werner Koch  <wk@gnupg.org>
 
 	* data.c (gpgme_data_rewind): Allow to rewind data_type_none.
+
+
+ Copyright 2001 g10 Code GmbH
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	

gpgme/Makefile.am

@@ -1,4 +1,23 @@
-# Process this file with automake to produce Makefile.in
+# Copyright (C) 2000 Werner Koch (dd9jn)
+# Copyright (C) 2001 g10 Code GmbH
+# 
+# This file is part of GPGME.
+# 
+# GPGME is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPGME is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = gpgme-config.in gpgme.m4 mkerrors mkstatus
 BUILT_SOURCES = errors.c status-table.h

gpgme/context.h

@@ -1,5 +1,6 @@
 /* context.h 
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/data.c

@@ -1,5 +1,6 @@
 /* data.c
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/debug.c

@@ -1,5 +1,5 @@
 /* debug.c
- *	Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <unistd.h>
+#include <ctype.h>
 #include <assert.h>
 
 #include "util.h"
@@ -37,6 +38,34 @@ struct debug_control_s {
 };
 
 static int debug_level = 0;
+static FILE *errfp = NULL;
+
+/****************
+ * remove leading and trailing white spaces
+ */
+static char *
+trim_spaces( char *str )
+{
+    char *string, *p, *mark;
+
+    string = str;
+    /* find first non space character */
+    for( p=string; *p && isspace( *(byte*)p ) ; p++ )
+	;
+    /* move characters */
+    for( (mark = NULL); (*string = *p); string++, p++ )
+	if( isspace( *(byte*)p ) ) {
+	    if( !mark )
+		mark = string ;
+	}
+	else
+	    mark = NULL ;
+    if( mark )
+	*mark = '\0' ;  /* remove trailing spaces */
+
+    return str ;
+}
+
 
 static void
 debug_init (void)
@@ -48,15 +77,51 @@ debug_init (void)
     LOCK (debug_lock);
     if (!initialized) {
         const char *e = getenv ("GPGME_DEBUG");
+        const char *s1, *s2;;
 
-        debug_level =  e? atoi (e): 0;
         initialized = 1;
+        debug_level = 0;
+        errfp = stderr;
+        if (e) {
+            debug_level = atoi (e);
+            s1 = strchr (e, ':');
+            if (s1 
+#ifndef HAVE_DOSISH_SYSTEM
+                && getuid () == geteuid ()
+#endif
+                ) {
+                char *p;
+                FILE *fp;
+
+                s1++;
+                if ( !(s2 = strchr (s1, ':')) )
+                    s2 = s1 + strlen(s1);
+                p = xtrymalloc (s2-s1+1);
+                if (p) {
+                    memcpy (p, s1, s2-s1);
+                    p[s2-s1] = 0;
+                    trim_spaces (p);
+                    fp = fopen (p,"a");
+                    if (fp) {
+                        setvbuf (fp, NULL, _IOLBF, 0);
+                        errfp = fp;
+                    }
+                    xfree (p);
+                }
+            }
+        }
+
         if (debug_level > 0)
-            fprintf (stderr,"gpgme_debug: level=%d\n", debug_level);
+            fprintf (errfp,"gpgme_debug: level=%d\n", debug_level);
     }
     UNLOCK (debug_lock);
 }
 
+int
+_gpgme_debug_level ()
+{
+    return debug_level;
+}
 
 void
 _gpgme_debug (int level, const char *format, ...)
@@ -69,12 +134,12 @@ _gpgme_debug (int level, const char *format, ...)
     
     va_start ( arg_ptr, format ) ;
     LOCK (debug_lock);
-    vfprintf (stderr, format, arg_ptr) ;
+    vfprintf (errfp, format, arg_ptr) ;
     va_end ( arg_ptr ) ;
     if( format && *format && format[strlen(format)-1] != '\n' )
-        putc ('\n', stderr);
+        putc ('\n', errfp);
     UNLOCK (debug_lock);
-    fflush (stderr);
+    fflush (errfp);
 }
 
 
@@ -144,11 +209,11 @@ _gpgme_debug_end (void **helper, const char *text)
     rewind (ctl->fp);
     LOCK (debug_lock);
     while ( (c=getc (ctl->fp)) != EOF ) {
-        putc (c, stderr);
+        putc (c, errfp);
         last_c = c;
     }
     if (last_c != '\n')
-        putc ('\n', stderr);
+        putc ('\n', errfp);
     UNLOCK (debug_lock);
     
     fclose (ctl->fp);

gpgme/decrypt.c

@@ -1,5 +1,6 @@
 /* decrypt.c -  decrypt functions
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/delete.c

@@ -1,5 +1,5 @@
 /* delete.c -  delete a key 
- *	Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/encrypt.c

@@ -1,5 +1,6 @@
 /* encrypt.c -  encrypt functions
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/export.c

@@ -1,5 +1,6 @@
 /* export.c -  encrypt functions
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/genkey.c

@@ -1,5 +1,6 @@
 /* genkey.c -  key generation
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/gpgme.c

@@ -1,5 +1,6 @@
 /* gpgme.c -  GnuPG Made Easy
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/gpgme.h

@@ -1,5 +1,6 @@
 /* gpgme.h -  GnuPG Made Easy
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *
@@ -43,7 +44,7 @@ extern "C" {
  * let autoconf (using the AM_PATH_GPGME macro) check that this
  * header matches the installed library.
  * Warning: Do not edit the next line.  configure will do that for you! */
-#define GPGME_VERSION "0.2.0a"
+#define GPGME_VERSION "0.2.1"
 
 
 

gpgme/import.c

@@ -1,5 +1,6 @@
-/* impoirt.c -  encrypt functions
+/* import.c -  encrypt functions
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/io.h

@@ -1,5 +1,6 @@
 /* io.h - I/O functions 
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/key.c

@@ -1,5 +1,6 @@
 /* key.c - Key and keyList objects
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/key.h

@@ -1,5 +1,6 @@
 /* key.h 
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/keylist.c

@@ -1,5 +1,6 @@
 /* keylist.c -  key listing
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/mkerrors

@@ -2,6 +2,7 @@
 # mkerrors - Extract error strings from gpgme.h
 #            and create C source for gpgme_strerror
 #	Copyright (C) 2000 Werner Koch (dd9jn)
+#       Copyright (C) 2001 g10 Code GmbH
 #
 # This file is part of GPGME.
 #

gpgme/mkstatus

@@ -2,6 +2,7 @@
 # mkstatus - Extract error strings from rungpg.h
 #            and create a lookup table
 #	Copyright (C) 2000 Werner Koch (dd9jn)
+#       Copyright (C) 2001 g10 Code GmbH
 #
 # This file is part of GPGME.
 #

gpgme/ops.h

@@ -1,5 +1,6 @@
 /* ops.h - internal operations stuff 
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/posix-io.c

@@ -1,5 +1,6 @@
 /* posix-io.c - Posix I/O functions
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *
@@ -52,6 +53,9 @@ _gpgme_io_read ( int fd, void *buffer, size_t count )
         nread = read (fd, buffer, count);
     } while (nread == -1 && errno == EINTR );
     DEBUG2 ("fd %d: got %d bytes\n", fd, nread );
+    if ( nread > 0 ) {
+        _gpgme_debug (2, "fd %d: got `%.*s'\n", fd, nread, buffer );
+    }
     return nread;
 }
 
@@ -62,6 +66,7 @@ _gpgme_io_write ( int fd, const void *buffer, size_t count )
     int nwritten;
 
     DEBUG2 ("fd %d: about to write %d bytes\n", fd, (int)count );
+    _gpgme_debug (2, "fd %d: write `%.*s'\n", fd, (int)count, buffer );
     do {
         nwritten = write (fd, buffer, count);
     } while (nwritten == -1 && errno == EINTR );
@@ -256,12 +261,13 @@ _gpgme_io_select ( struct io_select_fd_s *fds, size_t nfds )
     static fd_set writefds;
     int any, i, max_fd, n, count;
     struct timeval timeout = { 1, 0 }; /* Use a 1s timeout */
-    void *dbg_help;
+    void *dbg_help = NULL;
     
     FD_ZERO ( &readfds );
     FD_ZERO ( &writefds );
     max_fd = 0;
 
+    if ( _gpgme_debug_level () > 2 )
         DEBUG_BEGIN (dbg_help, "gpgme:select on [ ");
     any = 0;
     for ( i=0; i < nfds; i++ ) {
@@ -300,6 +306,7 @@ _gpgme_io_select ( struct io_select_fd_s *fds, size_t nfds )
         return -1; /* error */
     }
 
+    if ( _gpgme_debug_level () > 2 )
         DEBUG_BEGIN (dbg_help, "select OK [ " );
     if (DEBUG_ENABLED(dbg_help)) {
         for (i=0; i <= max_fd; i++ ) {

gpgme/posix-sema.c

@@ -1,5 +1,6 @@
 /* posix-sema.c 
  *	Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/posix-util.c

@@ -1,5 +1,6 @@
 /* posix-util.c - Utility functions for Posix
  *	Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/recipient.c

@@ -1,5 +1,6 @@
 /* recipient.c - mainatin recipient sets
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/rungpg.c

@@ -1,5 +1,6 @@
 /* rungpg.c 
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/rungpg.h

@@ -1,5 +1,6 @@
 /* rungpg.h -  gpg calling functions
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/sema.h

@@ -1,5 +1,6 @@
 /* sema.h -  definitions for semaphores
  *	Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/sign.c

@@ -1,5 +1,6 @@
 /* sign.c -  signing functions
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/signers.c

@@ -1,5 +1,6 @@
 /* signers.c - maintain signer sets
  *	Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/syshdr.h

@@ -1,5 +1,6 @@
 /* syshdr.h - System specfic header files 
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/trustlist.c

@@ -1,5 +1,6 @@
 /* trustlist.c -  key listing
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/types.h

@@ -1,5 +1,6 @@
 /* types.h -  Some type definitions
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/util.c

@@ -1,5 +1,6 @@
 /* util.c
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/util.h

@@ -1,5 +1,6 @@
 /* util.h 
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *
@@ -47,6 +48,7 @@ void  _gpgme_free ( void *a );
 
 
 void _gpgme_debug (int level, const char *format, ...);
+int  _gpgme_debug_level (void);
 void _gpgme_debug_begin ( void **helper, int level, const char *text);
 int  _gpgme_debug_enabled ( void **helper );
 void _gpgme_debug_add (void **helper, const char *format, ...);

gpgme/verify.c

@@ -1,5 +1,6 @@
 /* verify.c -  signature verification
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/version.c

@@ -1,5 +1,6 @@
 /* version.c -  version check
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/w32-io.c

@@ -1,5 +1,6 @@
 /* w32-io.c - W32 API I/O functions
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/w32-sema.c

@@ -1,5 +1,6 @@
 /* w32-sema.c 
  *	Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/w32-util.c

@@ -1,6 +1,7 @@
 /* w32-util.c - Utility functions for the W32 API
- *	Copyright (C) 2001 Werner Koch (dd9jn)
  *      Copyright (C) 1999 Free Software Foundation, Inc
+ *	Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/wait.c

@@ -1,5 +1,6 @@
 /* wait.c 
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

gpgme/wait.h

@@ -1,5 +1,6 @@
 /* wait.h -  definitions for wait.c
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

jnlib/ChangeLog

@@ -39,3 +39,14 @@ Mon Jan 24 13:04:28 CET 2000  Werner Koch  <wk@gnupg.de>
   (log_printf): New.
   (do_logv): Add kludge to insert LFs.
 
+
+ Copyright 2000 Werner Koch (dd9jn)
+ Copyright 2001 g10 Code GmbH
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

jnlib/Makefile.am

@@ -1,3 +1,21 @@
+# Copyright (C) 1999, 2000, 2001 Feee Software Soundation, Inc.
+# 
+# This file is part of GnuPG
+# 
+# GnuPG is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GnuPG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = README
@@ -16,4 +34,3 @@ libjnlib_a_SOURCES = libjnlib-config.h	       \
 		     types.h mischelp.h
 
 
-

jnlib/argparse.c

@@ -1,5 +1,5 @@
 /* [argparse.c wk 17.06.97] Argument Parser for option handling
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  *  This file is part of GnuPG.
  *

jnlib/argparse.h

@@ -1,5 +1,5 @@
 /* argparse.h
- *	Copyright (C) 1998,1999 Free Software Foundation, Inc.
+ *	Copyright (C) 1998,1999,2000,2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

jnlib/dotlock.c

@@ -1,5 +1,5 @@
 /* dotlock.c - dotfile locking
- *	Copyright (C) 1998,2000 Free Software Foundation, Inc.
+ *	Copyright (C) 1998,2000,2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

jnlib/dotlock.h

@@ -1,5 +1,5 @@
 /* dotlock.h
- *	Copyright (C) 2000 Free Software Foundation, Inc.
+ *	Copyright (C) 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

jnlib/libjnlib-config.h

@@ -1,5 +1,5 @@
 /* libjnlib-config.h - local configuration of the jnlib functions
- *	Copyright (C) 2000 Free Software Foundation, Inc.
+ *	Copyright (C) 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

jnlib/logging.c

@@ -1,5 +1,5 @@
 /* logging.c -	useful logging functions
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

jnlib/logging.h

@@ -1,5 +1,5 @@
 /* logging.h
- *	Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ *	Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

jnlib/mischelp.h

@@ -1,5 +1,5 @@
 /* mischelp.h
- *	Copyright (C) 1999 Free Software Foundation, Inc.
+ *	Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

jnlib/stringhelp.c

@@ -1,5 +1,5 @@
 /* stringhelp.c -  standard string helper functions
- *	Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

jnlib/stringhelp.h

@@ -1,5 +1,5 @@
 /* stringhelp.h
- *	Copyright (C) 1998,1999 Free Software Foundation, Inc.
+ *	Copyright (C) 1998,1999,2000,2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

jnlib/types.h

@@ -1,5 +1,5 @@
 /* types.h
- *	Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ *	Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

jnlib/xmalloc.c

@@ -1,5 +1,5 @@
 /* xmalloc.c -	standard malloc wrappers
- *	Copyright (C) 1999 Free Software Foundation, Inc.
+ *	Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

jnlib/xmalloc.h

@@ -1,5 +1,5 @@
 /* xmalloc.h
- *	Copyright (C) 1999 Free Software Foundation, Inc.
+ *	Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

tests/Makefile.am

@@ -1,4 +1,24 @@
-## Process this file with automake to create Makefile.in
+# Copyright (C) 2000 Werner Koch (dd9jn)
+# Copyright (C) 2001 g10 Code GmbH
+# 
+# This file is part of GPGME.
+# 
+# GPGME is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPGME is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+## Process this file with automake to produce Makefile.in
+
 
 TESTS_ENVIRONMENT = GNUPGHOME=. 
 

tests/t-decrypt.c

@@ -1,5 +1,6 @@
 /* t-encrypt.c  - regression test
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

tests/t-encrypt.c

@@ -1,5 +1,6 @@
 /* t-encrypt.c  - regression test
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

tests/t-export.c

@@ -1,5 +1,6 @@
 /* t-export.c  - regression test
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

tests/t-genkey.c

@@ -1,5 +1,6 @@
 /* t-genkey.c  - regression test
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

tests/t-import.c

@@ -1,5 +1,6 @@
 /* t-import.c  - regression test
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

tests/t-keylist.c

@@ -1,5 +1,6 @@
 /* t-keylist.c  - regression test
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

tests/t-sign.c

@@ -1,5 +1,6 @@
 /* t-sign.c  - regression test
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

tests/t-trustlist.c

@@ -1,5 +1,6 @@
 /* t-trustlist.c  - regression test
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

tests/t-verify.c

@@ -1,5 +1,6 @@
 /* t-verify.c  - regression test
  *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *