gnupg/g10 (ChangeLog Makefile.am import.c)

[cvs user dshaw]

    Date: Monday, January 3, 2005 @ 16:15:35
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog Makefile.am import.c

* Makefile.am: Use @LIBUSB@ instead of @LIBUSB_LIBS@

* import.c (delete_inv_parts): Comments on import-unusable-sigs.


-------------+
 ChangeLog   |    6 ++++++
 Makefile.am |    6 +++---
 import.c    |    6 ++++++
 3 files changed, 15 insertions(+), 3 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.675 gnupg/g10/ChangeLog:1.676
--- gnupg/g10/ChangeLog:1.675	Sat Jan  1 22:21:11 2005
+++ gnupg/g10/ChangeLog	Mon Jan  3 16:15:34 2005
@@ -1,3 +1,9 @@
+2005-01-03  David Shaw  <dshaw at jabberwocky.com>
+
+	* Makefile.am: Use @LIBUSB@ instead of @LIBUSB_LIBS@
+
+	* import.c (delete_inv_parts): Comments on import-unusable-sigs.
+
 2005-01-01  David Shaw  <dshaw at jabberwocky.com>
 
 	* options.h, import.c (parse_import_options, delete_inv_parts):
Index: gnupg/g10/Makefile.am
diff -u gnupg/g10/Makefile.am:1.88 gnupg/g10/Makefile.am:1.89
--- gnupg/g10/Makefile.am:1.88	Sat Dec 18 23:23:48 2004
+++ gnupg/g10/Makefile.am	Mon Jan  3 16:15:34 2005
@@ -1,5 +1,5 @@
-# Copyright (C) 1998, 1999, 2000, 2001, 2002,
-#               2003 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
+#               2004 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
@@ -133,7 +133,7 @@
 #	       $(common_source)
 
 LDADD =  $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ @LIBREADLINE@
-gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB_LIBS@
+gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB@
 
 $(PROGRAMS): $(needed_libs)
 
Index: gnupg/g10/import.c
diff -u gnupg/g10/import.c:1.118 gnupg/g10/import.c:1.119
--- gnupg/g10/import.c:1.118	Sat Jan  1 22:21:11 2005
+++ gnupg/g10/import.c	Mon Jan  3 16:15:34 2005
@@ -1565,6 +1565,12 @@
 		    || node->pkt->pkt.signature->keyid[1]!=keyid[1])
 		&& !(options&IMPORT_UNUSABLE_SIGS))
 	  {
+	    /* Note that we haven't necessarily checked this sig for
+	       validity.  We strip it anyway since if it was valid, it
+	       would be expired.  If it wasn't valid, it either would
+	       be expired if it was valid, or was altered to the point
+	       that it looked expired (and so doesn't matter terribly
+	       much if it is expired or not). */
 	    if(opt.verbose)
 	      {
 		char *kid=m_strdup(keystr(keyid));