GNUPG-1-9-BRANCH gnupg (9 files)

[cvs user wk]

    Date: Thursday, March 3, 2005 @ 11:15:07
  Author: wk
    Path: /cvs/gnupg/gnupg
     Tag: GNUPG-1-9-BRANCH

Modified: ChangeLog THANKS TODO acinclude.m4 agent/command-ssh.c
          common/ChangeLog common/Makefile.am sm/ChangeLog sm/Makefile.am

* acinclude.m4 (GNUPG_PTH_VERSION_CHECK): Accidently used
--ldflags instead of --cflags. Reported by Kazu Yamamoto.

* Makefile.am (AM_CFLAGS): Added PTH_CFLAGS.  Noted by Kazu Yamamoto.

* Makefile.am (gpgsm_LDADD): Added PTH_LIBS.  Noted by Kazu Yamamoto.


---------------------+
 ChangeLog           |    5 +++++
 THANKS              |    3 ++-
 TODO                |    2 ++
 acinclude.m4        |    2 +-
 agent/command-ssh.c |    2 +-
 common/ChangeLog    |    4 ++++
 common/Makefile.am  |    2 +-
 sm/ChangeLog        |    4 ++++
 sm/Makefile.am      |    2 +-
 9 files changed, 21 insertions(+), 5 deletions(-)


Index: gnupg/ChangeLog
diff -u gnupg/ChangeLog:1.131.2.67 gnupg/ChangeLog:1.131.2.68
--- gnupg/ChangeLog:1.131.2.67	Thu Feb  3 18:40:02 2005
+++ gnupg/ChangeLog	Thu Mar  3 11:15:07 2005
@@ -1,3 +1,8 @@
+2005-03-03  Werner Koch  <wk at g10code.com>
+
+	* acinclude.m4 (GNUPG_PTH_VERSION_CHECK): Accidently used
+	--ldflags instead of --cflags. Reported by Kazu Yamamoto.
+
 2005-02-03  Werner Koch  <wk at g10code.com>
 
 	* AUTHORS: Copied from 1.4 and edited to refelct the changes in
Index: gnupg/THANKS
diff -u gnupg/THANKS:1.69.2.4 gnupg/THANKS:1.69.2.5
--- gnupg/THANKS:1.69.2.4	Thu Sep  9 09:27:57 2004
+++ gnupg/THANKS	Thu Mar  3 11:15:07 2005
@@ -1,5 +1,6 @@
 
 Alexander Belopolsky      belopolsky at mac.com
-Richard Lefebvre          rick at cerca.umontreal.ca
 Andrew J. Schorr          aschorr at telemetry-investments.com
+Kazu Yamamoto             kazu at iij.ad.jp
 Michael Nottebrock        michaelnottebrock at gmx.net
+Richard Lefebvre          rick at cerca.umontreal.ca
Index: gnupg/TODO
diff -u gnupg/TODO:1.165.2.37 gnupg/TODO:1.165.2.38
--- gnupg/TODO:1.165.2.37	Tue Feb 22 19:08:28 2005
+++ gnupg/TODO	Thu Mar  3 11:15:07 2005
@@ -104,3 +104,5 @@
 ** No card status notifications.
 
 
+* [scdaemon] release the card after use so that gpg 1.4 is abale to access it
+
Index: gnupg/acinclude.m4
diff -u gnupg/acinclude.m4:1.34.4.8 gnupg/acinclude.m4:1.34.4.9
--- gnupg/acinclude.m4:1.34.4.8	Thu Jan 13 19:00:46 2005
+++ gnupg/acinclude.m4	Thu Mar  3 11:15:07 2005
@@ -246,7 +246,7 @@
          _gnupg_pth_save_cflags=$CFLAGS
          _gnupg_pth_save_ldflags=$LDFLAGS
          _gnupg_pth_save_libs=$LIBS
-         CFLAGS="$CFLAGS `$PTH_CONFIG --ldflags`"
+         CFLAGS="$CFLAGS `$PTH_CONFIG --cflags`"
          LDFLAGS="$LDFLAGS `$PTH_CONFIG --ldflags`"
          LIBS="$LIBS `$PTH_CONFIG --libs`"
          AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pth.h>
Index: gnupg/agent/command-ssh.c
diff -u gnupg/agent/command-ssh.c:1.1.4.14 gnupg/agent/command-ssh.c:1.1.4.15
--- gnupg/agent/command-ssh.c:1.1.4.14	Wed Mar  2 21:36:50 2005
+++ gnupg/agent/command-ssh.c	Thu Mar  3 11:15:07 2005
@@ -1550,7 +1550,7 @@
    key.  Store a copy of that key at R_PK and return 0.  If no key is
    available store NULL at R_PK and return an error code.  If CARDSN
    is no NULL, a string with the serial number of the card will be
-   amalloced and stored there. */
+   a malloced and stored there. */
 static gpg_error_t
 card_key_available (ctrl_t ctrl, gcry_sexp_t *r_pk, char **cardsn)
 {
Index: gnupg/common/ChangeLog
diff -u gnupg/common/ChangeLog:1.30.2.44 gnupg/common/ChangeLog:1.30.2.45
--- gnupg/common/ChangeLog:1.30.2.44	Fri Feb 25 17:14:55 2005
+++ gnupg/common/ChangeLog	Thu Mar  3 11:15:07 2005
@@ -1,3 +1,7 @@
+2005-03-03  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (AM_CFLAGS): Added PTH_CFLAGS.  Noted by Kazu Yamamoto.
+
 2005-02-25  Werner Koch  <wk at g10code.com>
 
 	* xasprintf.c (xtryasprintf): New.
Index: gnupg/common/Makefile.am
diff -u gnupg/common/Makefile.am:1.15.2.12 gnupg/common/Makefile.am:1.15.2.13
--- gnupg/common/Makefile.am:1.15.2.12	Wed Jan 26 23:24:59 2005
+++ gnupg/common/Makefile.am	Thu Mar  3 11:15:07 2005
@@ -21,7 +21,7 @@
 
 noinst_LIBRARIES = libcommon.a libsimple-pwquery.a
 
-AM_CFLAGS =  $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
+AM_CFLAGS =  $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(PTH_CFLAGS)
 
 libcommon_a_SOURCES = \
 	util.h i18n.h \
Index: gnupg/sm/ChangeLog
diff -u gnupg/sm/ChangeLog:1.101.2.88 gnupg/sm/ChangeLog:1.101.2.89
--- gnupg/sm/ChangeLog:1.101.2.88	Thu Jan 13 19:00:44 2005
+++ gnupg/sm/ChangeLog	Thu Mar  3 11:15:07 2005
@@ -1,3 +1,7 @@
+2005-03-03  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (gpgsm_LDADD): Added PTH_LIBS.  Noted by Kazu Yamamoto.
+
 2005-01-13  Werner Koch  <wk at g10code.com>
 
 	* certreqgen.c (proc_parameters): Cast printf arg.
Index: gnupg/sm/Makefile.am
diff -u gnupg/sm/Makefile.am:1.27.2.4 gnupg/sm/Makefile.am:1.27.2.5
--- gnupg/sm/Makefile.am:1.27.2.4	Wed Dec 15 15:15:08 2004
+++ gnupg/sm/Makefile.am	Thu Mar  3 11:15:07 2005
@@ -54,6 +54,6 @@
 gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a	\
               ../common/libcommon.a \
               $(LIBGCRYPT_LIBS)  $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error \
-	      $(LIBINTL)
+	      $(LIBINTL) $(PTH_LIBS)