[svn] GnuPG - r4294 - in trunk: . agent common doc g10 m4 po scd sm
tools
svn author wk
cvs at cvs.gnupg.org
Tue Oct 10 13:11:20 CEST 2006
Author: wk
Date: 2006-10-10 13:11:04 +0200 (Tue, 10 Oct 2006)
New Revision: 4294
Added:
trunk/m4/gnupg-pth.m4
Modified:
trunk/ChangeLog
trunk/TODO
trunk/acinclude.m4
trunk/agent/ChangeLog
trunk/agent/Makefile.am
trunk/common/ChangeLog
trunk/common/Makefile.am
trunk/common/gpgrlhelp.c
trunk/common/util.h
trunk/configure.ac
trunk/doc/gpg-agent.texi
trunk/doc/instguide.texi
trunk/doc/sysnotes.texi
trunk/g10/ChangeLog
trunk/g10/Makefile.am
trunk/g10/gpgv.c
trunk/g10/keyedit.c
trunk/m4/ChangeLog
trunk/m4/Makefile.am
trunk/m4/libassuan.m4
trunk/po/be.po
trunk/po/ca.po
trunk/po/cs.po
trunk/po/da.po
trunk/po/de.po
trunk/po/el.po
trunk/po/eo.po
trunk/po/es.po
trunk/po/et.po
trunk/po/fi.po
trunk/po/fr.po
trunk/po/gl.po
trunk/po/hu.po
trunk/po/id.po
trunk/po/it.po
trunk/po/ja.po
trunk/po/nb.po
trunk/po/pl.po
trunk/po/pt.po
trunk/po/pt_BR.po
trunk/po/ro.po
trunk/po/ru.po
trunk/po/sk.po
trunk/po/sv.po
trunk/po/tr.po
trunk/po/zh_CN.po
trunk/po/zh_TW.po
trunk/scd/ChangeLog
trunk/scd/Makefile.am
trunk/scd/app-p15.c
trunk/scd/scdaemon.h
trunk/sm/ChangeLog
trunk/sm/Makefile.am
trunk/tools/ChangeLog
trunk/tools/Makefile.am
Log:
Various changes
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/ChangeLog 2006-10-10 11:11:04 UTC (rev 4294)
@@ -1,3 +1,11 @@
+2006-10-09 Werner Koch <wk at g10code.com>
+
+ * acinclude.m4: Moved pth check to m4/gnupg-pth.m4.
+
+2006-10-06 Werner Koch <wk at g10code.com>
+
+ * configure.ac: Also check for libassuan's pth version.
+
2006-10-04 Werner Koch <wk at g10code.com>
Released 1.9.91.
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/TODO 2006-10-10 11:11:04 UTC (rev 4294)
@@ -68,6 +68,10 @@
Needs to be integrated with the status file update, though. It is
not a real problem because application will get a card removed status
and should the send a reset to try solving the problem.
+** app-p15.c:do_auth
+ We assume SHA1 here. However we should also allow for TLS-MD5SHA1.
+ To properly inplement this we need to extend the inetrnal API. A
+ simple workaround by looking at the digest size if possible.
** Add a test to check the extkeyusage.
@@ -99,8 +103,9 @@
** g10/ Replace DIGEST_ALGO_SHA224
We can't do that right now because it is only defined by newer
versions of libgcrypt.
+** GCRY_MD_USER
+ Remove these definitions.
-
* Extend selinux support to other modules
* Remove -sat PGP2 compatibility hack
Modified: trunk/acinclude.m4
===================================================================
--- trunk/acinclude.m4 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/acinclude.m4 2006-10-10 11:11:04 UTC (rev 4294)
@@ -186,71 +186,7 @@
-# GNUPG_PTH_VERSION_CHECK(REQUIRED)
-#
-# If the version is sufficient, HAVE_PTH will be set to yes.
-#
-# Taken form the m4 macros which come with Pth
-AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
- [
- _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'`
- _req_version="ifelse([$1],,1.2.0,$1)"
- AC_MSG_CHECKING(for PTH - version >= $_req_version)
- for _var in _pth_version _req_version; do
- eval "_val=\"\$${_var}\""
- _major=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\1/'`
- _minor=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\2/'`
- _rtype=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\3/'`
- _micro=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\4/'`
- case $_rtype in
- "a" ) _rtype=0 ;;
- "b" ) _rtype=1 ;;
- "." ) _rtype=2 ;;
- esac
- _hex=`echo dummy | awk '{ printf("%d%02d%1d%02d", major, minor, rtype, micro); }' \
- "major=$_major" "minor=$_minor" "rtype=$_rtype" "micro=$_micro"`
- eval "${_var}_hex=\"\$_hex\""
- done
- have_pth=no
- if test ".$_pth_version_hex" != .; then
- if test ".$_req_version_hex" != .; then
- if test $_pth_version_hex -ge $_req_version_hex; then
- have_pth=yes
- fi
- fi
- fi
- if test $have_pth = yes; then
- AC_MSG_RESULT(yes)
- AC_MSG_CHECKING([whether PTH installation is sane])
- AC_CACHE_VAL(gnupg_cv_pth_is_sane,[
- _gnupg_pth_save_cflags=$CFLAGS
- _gnupg_pth_save_ldflags=$LDFLAGS
- _gnupg_pth_save_libs=$LIBS
- CFLAGS="$CFLAGS `$PTH_CONFIG --cflags`"
- LDFLAGS="$LDFLAGS `$PTH_CONFIG --ldflags`"
- LIBS="$LIBS `$PTH_CONFIG --libs`"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pth.h>
- ],
- [[ pth_init ();]])],
- gnupg_cv_pth_is_sane=yes,
- gnupg_cv_pth_is_sane=no)
- CFLAGS=$_gnupg_pth_save_cflags
- LDFLAGS=$_gnupg_pth_save_ldflags
- LIBS=$_gnupg_pth_save_libs
- ])
- if test $gnupg_cv_pth_is_sane != yes; then
- have_pth=no
- fi
- AC_MSG_RESULT($gnupg_cv_pth_is_sane)
- else
- AC_MSG_RESULT(no)
- fi
- ])
-
-
-
-
# Check whether mlock is broken (hpux 10.20 raises a SIGBUS if mlock
# is not called from uid 0 (not tested whether uid 0 works)
# For DECs Tru64 we have also to check whether mlock is in librt
Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/agent/ChangeLog 2006-10-10 11:11:04 UTC (rev 4294)
@@ -1,5 +1,8 @@
2006-10-06 Werner Koch <wk at g10code.com>
+ * Makefile.am (AM_CFLAGS): Use PTH version of libassuan.
+ (gpg_agent_LDADD): Ditto.
+
* divert-scd.c (divert_pksign): Use PKAUTH for the TLS algo.
2006-10-05 Werner Koch <wk at g10code.com>
Modified: trunk/agent/Makefile.am
===================================================================
--- trunk/agent/Makefile.am 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/agent/Makefile.am 2006-10-10 11:11:04 UTC (rev 4294)
@@ -27,8 +27,8 @@
include $(top_srcdir)/am/cmacros.am
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) \
- $(PTH_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(GPG_ERROR_CFLAGS) \
+ $(PTH_CFLAGS)
gpg_agent_SOURCES = \
gpg-agent.c agent.h \
@@ -51,7 +51,7 @@
pwquery_libs = ../common/libsimple-pwquery.a
gpg_agent_LDADD = $(common_libs) \
- $(LIBGCRYPT_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) \
+ $(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
$(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
gpg_protect_tool_SOURCES = \
Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/common/ChangeLog 2006-10-10 11:11:04 UTC (rev 4294)
@@ -1,3 +1,14 @@
+2006-10-08 Werner Koch <wk at g10code.com>
+
+ * gpgrlhelp.c: Trun all functions into dummies if readline is not
+ available.
+
+2006-10-06 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (AM_CFLAGS): Use PTH version of libassuan.
+
+ * util.h (GNUPG_GCC_A_SENTINEL): Defined for gcc >= 4.
+
2006-10-04 David Shaw <dshaw at jabberwocky.com>
* gpgrlhelp.c: readline requires stdio.h.
Modified: trunk/common/Makefile.am
===================================================================
--- trunk/common/Makefile.am 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/common/Makefile.am 2006-10-10 11:11:04 UTC (rev 4294)
@@ -26,7 +26,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/gl
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS) \
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(KSBA_CFLAGS) \
$(PTH_CFLAGS)
libcommon_a_SOURCES = \
Modified: trunk/common/gpgrlhelp.c
===================================================================
--- trunk/common/gpgrlhelp.c 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/common/gpgrlhelp.c 2006-10-10 11:11:04 UTC (rev 4294)
@@ -40,6 +40,7 @@
#include "common-defs.h"
+#ifdef HAVE_LIBREADLINE
static void
set_completer (rl_completion_func_t *completer)
{
@@ -68,12 +69,15 @@
rl_inhibit_completion = 1;
}
+#endif /*HAVE_LIBREADLINE*/
+
/* Initialize our readline code. This should be called as early as
possible as it is actually a constructur. */
void
gnupg_rl_initialize (void)
{
+#ifdef HAVE_LIBREADLINE
tty_private_set_rl_hooks (init_stream,
set_completer,
inhibit_completion,
@@ -81,7 +85,7 @@
readline,
add_history);
rl_readline_name = "GnuPG";
-
+#endif
}
Modified: trunk/common/util.h
===================================================================
--- trunk/common/util.h 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/common/util.h 2006-10-10 11:11:04 UTC (rev 4294)
@@ -43,6 +43,13 @@
#include "../jnlib/dotlock.h"
#include "../jnlib/utf8conv.h"
+#if __GNUC__ >= 4
+# define GNUPG_GCC_A_SENTINEL(a) __attribute__ ((sentinel(a)))
+#else
+# define GNUPG_GCC_A_SENTINEL(a)
+#endif
+
+
/* We need this type even if we are not using libreadline and or we
did not include libreadline in the current file. */
#ifndef GNUPG_LIBREADLINE_H_INCLUDED
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/configure.ac 2006-10-10 11:11:04 UTC (rev 4294)
@@ -45,6 +45,7 @@
NEED_LIBGCRYPT_VERSION=1.1.94
NEED_LIBASSUAN_VERSION=0.9.1
+NEED_LIBASSUAN_API=1
NEED_KSBA_API=1
NEED_KSBA_VERSION=1.0.0
@@ -578,8 +579,13 @@
#
# libassuan is used for IPC
#
-AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_VERSION",
+AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
have_libassuan=yes,have_libassuan=no)
+if test "$have_libassuan" = "yes"; then
+ have_libassuan=no
+ AM_PATH_LIBASSUAN_PTH("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
+ have_libassuan=yes,have_libassuan=no)
+fi
#
@@ -632,17 +638,12 @@
# Check whether the GNU Pth library is available
# Note, that we include a Pth emulation for W32.
#
-AC_ARG_WITH(pth-prefix,
- AC_HELP_STRING([--with-pth-prefix=PFX],
- [prefix where GNU Pth is installed (optional)]),
- pth_config_prefix="$withval", pth_config_prefix="")
-if test x$pth_config_prefix != x ; then
- PTH_CONFIG="$pth_config_prefix/bin/pth-config"
-fi
-AC_PATH_PROG(PTH_CONFIG, pth-config, no)
-if test "$have_w32_system" = no; then
- if test "$PTH_CONFIG" = "no"; then
- AC_MSG_WARN([[
+GNUPG_PATH_PTH
+if test "$have_pth" = "yes"; then
+ AC_DEFINE(USE_GNU_PTH, 1,
+ [Defined if the GNU Portable Thread Library should be used])
+else
+ AC_MSG_WARN([[
***
*** To support concurrent access to the gpg-agent and the SCdaemon
*** we need the support of the GNU Portable Threads Library.
@@ -650,29 +651,10 @@
*** On a Debian GNU/Linux system you might want to try
*** apt-get install libpth-dev
***]])
- else
- GNUPG_PTH_VERSION_CHECK(1.3.7)
- if test $have_pth = yes; then
- PTH_CFLAGS=`$PTH_CONFIG --cflags`
- PTH_LIBS=`$PTH_CONFIG --ldflags`
- PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs --all`"
- AC_DEFINE(USE_GNU_PTH, 1,
- [Defined if the GNU Portable Thread Library should be used])
- AC_DEFINE(HAVE_PTH, 1,
- [Defined if the GNU Pth is available])
- fi
- fi
-else
- have_pth=yes
- PTH_CFLAGS=""
- PTH_LIBS=""
- AC_DEFINE(USE_GNU_PTH, 1)
- AC_DEFINE(HAVE_PTH, 1)
fi
-AC_SUBST(PTH_CFLAGS)
-AC_SUBST(PTH_LIBS)
+
#
# Must check for network library requirements before doing link tests
# for ldap, for example. If ldap libs are static (or dynamic and without
@@ -1262,10 +1244,10 @@
die=yes
AC_MSG_NOTICE([[
***
-*** You need libassuan to build this program.
+*** You need libassuan with Pth support to build this program.
*** This library is for example available at
*** ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/
-*** (at least version $NEED_LIBASSUAN_VERSION is required).
+*** (at least version $NEED_LIBASSUAN_VERSION (API $NEED_LIBASSUAN_API) is required).
***]])
fi
if test "$have_ksba" = "no"; then
Modified: trunk/doc/gpg-agent.texi
===================================================================
--- trunk/doc/gpg-agent.texi 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/doc/gpg-agent.texi 2006-10-10 11:11:04 UTC (rev 4294)
@@ -740,13 +740,23 @@
okay.
@example
- SETHASH <algo> <hexstring>
+ SETHASH --hash=<name>|<algo> <hexstring>
@end example
The client can use this command to tell the server about the data <hexstring>
(which usually is a hash) to be signed. <algo> is the decimal encoded hash
-algorithm number as used by Libgcrypt.
+algorithm number as used by Libgcrypt. Either <algo> or --hash=<name>
+must be given. Valid names for <name> are:
+ at table @code
+ at item sha1
+ at item sha256
+ at item rmd160
+ at item md5
+ at item tls-md5sha1
+ at end table
+
+ at noindent
The actual signing is done using
@example
@@ -754,20 +764,10 @@
@end example
Options are not yet defined, but my later be used to choosen among
-different algorithms (e.g. pkcs 1.5)
+different algorithms. The agent does then some checks, asks for the
+passphrase and as a result the server returns the signature as an SPKI
+like S-expression in "D" lines:
-The agent does then some checks, asks for the passphrase and
-if SETHASH has not been used asks the client for the data to sign:
-
- at example
- S: INQUIRE HASHVAL
- C: D ABCDEF012345678901234
- C: END
- at end example
-
-As a result the server returns the signature as an SPKI like S-Exp
-in "D" lines:
-
@example
(sig-val
(<algo>
Modified: trunk/doc/instguide.texi
===================================================================
--- trunk/doc/instguide.texi 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/doc/instguide.texi 2006-10-10 11:11:04 UTC (rev 4294)
@@ -13,7 +13,11 @@
** Explain how to setup a root CA key as trusted
** Explain how trustlist.txt might be managed.
+** How to get the ssh support running
+ How to use the ssh support.
+ at section Installation Overview
+
Modified: trunk/doc/sysnotes.texi
===================================================================
--- trunk/doc/sysnotes.texi 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/doc/sysnotes.texi 2006-10-10 11:11:04 UTC (rev 4294)
@@ -66,6 +66,9 @@
particular, @strong{using it on a box with more than one user, might
lead to a key compromise}.
+ at strong{It is quite possible that the current version does not even
+build.}
+
@noindent
Current limitations are:
Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/g10/ChangeLog 2006-10-10 11:11:04 UTC (rev 4294)
@@ -1,3 +1,17 @@
+2006-10-08 Werner Koch <wk at g10code.com>
+
+ * gpgv.c: Remove the tty stubs as we are now required to link to
+ tty anyway (it is included in libcommand and has dependencies to
+ other modules as well).
+
+ * keyedit.c (keyedit_menu): Use keyedit_completion only if
+ readline is available. It would be better to move this code into
+ gpgrlhelp.c
+
+2006-10-06 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (AM_CFLAGS): Use PTH version of libassuan.
+
2006-10-06 David Shaw <dshaw at jabberwocky.com>
* keyserver.c (keyserver_spawn): Write the 16-digit keyid rather
Modified: trunk/g10/Makefile.am
===================================================================
--- trunk/g10/Makefile.am 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/g10/Makefile.am 2006-10-10 11:11:04 UTC (rev 4294)
@@ -27,7 +27,7 @@
include $(top_srcdir)/am/cmacros.am
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(GPG_ERROR_CFLAGS)
needed_libs = ../gl/libgnu.a ../common/libcommon.a ../jnlib/libjnlib.a
Modified: trunk/g10/gpgv.c
===================================================================
--- trunk/g10/gpgv.c 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/g10/gpgv.c 2006-10-10 11:11:04 UTC (rev 4294)
@@ -388,22 +388,6 @@
void cipher_sync( gcry_cipher_hd_t c ) {}
-/* Stubs to avoid linking to ../util/ttyio.c */
-int tty_batchmode( int onoff ) { return 0; }
-void tty_printf( const char *fmt, ... ) { }
-void tty_fprintf (FILE *fp, const char *fmt, ... ) { }
-void tty_print_string( const byte *p, size_t n ) { }
-void tty_print_utf8_string( const byte *p, size_t n ) {}
-void tty_print_utf8_string2( const byte *p, size_t n, size_t max_n ) {}
-char *tty_get( const char *prompt ) { return NULL;}
-char *tty_get_hidden( const char *prompt ) {return NULL; }
-void tty_kill_prompt(void) {}
-int tty_get_answer_is_yes( const char *prompt ) {return 0;}
-int tty_no_terminal(int onoff) {return 0;}
-#ifdef HAVE_LIBREADLINE
-void tty_enable_completion(rl_completion_func_t *completer) {}
-void tty_disable_completion(void) {}
-#endif
/* We do not do any locking, so use these stubs here */
void disable_dotlock(void) {}
Modified: trunk/g10/keyedit.c
===================================================================
--- trunk/g10/keyedit.c 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/g10/keyedit.c 2006-10-10 11:11:04 UTC (rev 4294)
@@ -1620,7 +1620,9 @@
}
if( !have_commands )
{
+#ifdef HAVE_LIBREADLINE
tty_enable_completion(keyedit_completion);
+#endif
answer = cpr_get_no_help("keyedit.prompt", _("Command> "));
cpr_kill_prompt();
tty_disable_completion();
Modified: trunk/m4/ChangeLog
===================================================================
--- trunk/m4/ChangeLog 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/m4/ChangeLog 2006-10-10 11:11:04 UTC (rev 4294)
@@ -1,3 +1,12 @@
+2006-10-09 Werner Koch <wk at g10code.com>
+
+ * gnupg-pth.m4: New. Taken from ../acinclude.m4.
+ (GNUPG_PATH_PTH): New.
+
+2006-10-06 Werner Koch <wk at g10code.com>
+
+ * libassuan.m4: Updated.
+
2006-07-27 Werner Koch <wk at g10code.com>
* autobuild.m4: New.
Modified: trunk/m4/Makefile.am
===================================================================
--- trunk/m4/Makefile.am 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/m4/Makefile.am 2006-10-10 11:11:04 UTC (rev 4294)
@@ -2,6 +2,8 @@
EXTRA_DIST += ldap.m4 libcurl.m4 libusb.m4 tar-ustar.m4 readline.m4
+EXTRA_DIST += gnupg-pth.m4
+
EXTRA_DIST += gpg-error.m4 libgcrypt.m4 libassuan.m4 ksba.m4
EXTRA_DIST += autobuild.m4
Added: trunk/m4/gnupg-pth.m4
===================================================================
--- trunk/m4/gnupg-pth.m4 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/m4/gnupg-pth.m4 2006-10-10 11:11:04 UTC (rev 4294)
@@ -0,0 +1,114 @@
+dnl GnuPG's check for Pth.
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl
+dnl This file is free software; as a special exception the author gives
+dnl unlimited permission to copy and/or distribute it, with or without
+dnl modifications, as long as this notice is preserved.
+dnl
+dnl This file is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+
+# GNUPG_PTH_VERSION_CHECK(REQUIRED)
+#
+# If the version is sufficient, HAVE_PTH will be set to yes.
+#
+# Taken and modified from the m4 macros which come with Pth.
+AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
+ [
+ _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'`
+ _req_version="ifelse([$1],,1.2.0,$1)"
+
+ AC_MSG_CHECKING(for PTH - version >= $_req_version)
+ for _var in _pth_version _req_version; do
+ eval "_val=\"\$${_var}\""
+ _major=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\1/'`
+ _minor=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\2/'`
+ _rtype=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\3/'`
+ _micro=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\4/'`
+ case $_rtype in
+ "a" ) _rtype=0 ;;
+ "b" ) _rtype=1 ;;
+ "." ) _rtype=2 ;;
+ esac
+ _hex=`echo dummy | awk '{ printf("%d%02d%1d%02d", major, minor, rtype, micro); }' \
+ "major=$_major" "minor=$_minor" "rtype=$_rtype" "micro=$_micro"`
+ eval "${_var}_hex=\"\$_hex\""
+ done
+ have_pth=no
+ if test ".$_pth_version_hex" != .; then
+ if test ".$_req_version_hex" != .; then
+ if test $_pth_version_hex -ge $_req_version_hex; then
+ have_pth=yes
+ fi
+ fi
+ fi
+ if test $have_pth = yes; then
+ AC_MSG_RESULT(yes)
+ AC_MSG_CHECKING([whether PTH installation is sane])
+ AC_CACHE_VAL(gnupg_cv_pth_is_sane,[
+ _gnupg_pth_save_cflags=$CFLAGS
+ _gnupg_pth_save_ldflags=$LDFLAGS
+ _gnupg_pth_save_libs=$LIBS
+ CFLAGS="$CFLAGS `$PTH_CONFIG --cflags`"
+ LDFLAGS="$LDFLAGS `$PTH_CONFIG --ldflags`"
+ LIBS="$LIBS `$PTH_CONFIG --libs`"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pth.h>
+ ],
+ [[ pth_init ();]])],
+ gnupg_cv_pth_is_sane=yes,
+ gnupg_cv_pth_is_sane=no)
+ CFLAGS=$_gnupg_pth_save_cflags
+ LDFLAGS=$_gnupg_pth_save_ldflags
+ LIBS=$_gnupg_pth_save_libs
+ ])
+ if test $gnupg_cv_pth_is_sane != yes; then
+ have_pth=no
+ fi
+ AC_MSG_RESULT($gnupg_cv_pth_is_sane)
+ else
+ AC_MSG_RESULT(no)
+ fi
+ ])
+
+
+#
+# GNUPG_PATH_PTH([MINIMUM_VERSION])
+#
+# This is a special version of the check whioch assumes that a
+# emulation for W32 systems is available. The test assumes that
+# $have_w32_system has already been set. On return $have_pth is set
+# as well as HAVE_PTH is defined and PTH_CLFAGS and PTH_LIBS are AS_SUBST.
+#
+AC_DEFUN([GNUPG_PATH_PTH],
+[ AC_ARG_WITH(pth-prefix,
+ AC_HELP_STRING([--with-pth-prefix=PFX],
+ [prefix where GNU Pth is installed (optional)]),
+ pth_config_prefix="$withval", pth_config_prefix="")
+ if test x$pth_config_prefix != x ; then
+ PTH_CONFIG="$pth_config_prefix/bin/pth-config"
+ fi
+ AC_PATH_PROG(PTH_CONFIG, pth-config, no)
+ tmp=ifelse([$1], ,1.3.7,$1)
+ if test "$have_w32_system" = no; then
+ if test "$PTH_CONFIG" != "no"; then
+ GNUPG_PTH_VERSION_CHECK($tmp)
+ if test $have_pth = yes; then
+ PTH_CFLAGS=`$PTH_CONFIG --cflags`
+ PTH_LIBS=`$PTH_CONFIG --ldflags`
+ PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs --all`"
+ AC_DEFINE(HAVE_PTH, 1,
+ [Defined if the GNU Pth is available])
+ fi
+ fi
+ else
+ have_pth=yes
+ PTH_CFLAGS=""
+ PTH_LIBS=""
+ AC_DEFINE(HAVE_PTH, 1)
+ fi
+ AC_SUBST(PTH_CFLAGS)
+ AC_SUBST(PTH_LIBS)
+])
+
Modified: trunk/m4/libassuan.m4
===================================================================
--- trunk/m4/libassuan.m4 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/m4/libassuan.m4 2006-10-10 11:11:04 UTC (rev 4294)
@@ -9,68 +9,152 @@
dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-dnl AM_PATH_LIBASSUAN([MINIMUM-VERSION,
-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS
dnl
-AC_DEFUN([AM_PATH_LIBASSUAN],
+dnl Common code used for libassuan detection [internal]
+dnl Returns ok set to yes or no.
+dnl
+AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
[ AC_ARG_WITH(libassuan-prefix,
- AC_HELP_STRING([--with-libassuan-prefix=PFX],
- [prefix where LIBASSUAN is installed (optional)]),
+ AC_HELP_STRING([--with-libassuan-prefix=PFX],
+ [prefix where LIBASSUAN is installed (optional)]),
libassuan_config_prefix="$withval", libassuan_config_prefix="")
if test x$libassuan_config_prefix != x ; then
- libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix"
- if test x${LIBASSUAN_CONFIG+set} != xset ; then
- LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
- fi
+ libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix"
+ if test x${LIBASSUAN_CONFIG+set} != xset ; then
+ LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
+ fi
fi
+ AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
- AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
- min_libassuan_version=ifelse([$1], ,0.0.1,$1)
- AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
+ tmp=ifelse([$1], ,1:0.9.2,$1)
+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+ req_libassuan_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
+ min_libassuan_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+ else
+ req_libassuan_api=0
+ min_libassuan_version="$tmp"
+ fi
+
+ if test "$LIBASSUAN_CONFIG" != "no" ; then
+ libassuan_version=`$LIBASSUAN_CONFIG --version`
+ fi
+ libassuan_version_major=`echo $libassuan_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+ libassuan_version_minor=`echo $libassuan_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+ libassuan_version_micro=`echo $libassuan_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+
+ AC_MSG_CHECKING(for LIBASSUAN ifelse([$2], ,,[$2 ])- version >= $min_libassuan_version)
ok=no
if test "$LIBASSUAN_CONFIG" != "no" ; then
+ ifelse([$2], ,,[if `$LIBASSUAN_CONFIG --thread=$2 2> /dev/null` ; then])
req_major=`echo $min_libassuan_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
req_minor=`echo $min_libassuan_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
req_micro=`echo $min_libassuan_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
- libassuan_config_version=`$LIBASSUAN_CONFIG $libassuan_config_args --version`
- major=`echo $libassuan_config_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
- minor=`echo $libassuan_config_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
- micro=`echo $libassuan_config_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
- if test "$major" -gt "$req_major"; then
+ if test "$libassuan_version_major" -gt "$req_major"; then
ok=yes
else
- if test "$major" -eq "$req_major"; then
- if test "$minor" -gt "$req_minor"; then
+ if test "$libassuan_version_major" -eq "$req_major"; then
+ if test "$libassuan_version_minor" -gt "$req_minor"; then
ok=yes
else
- if test "$minor" -eq "$req_minor"; then
- if test "$micro" -ge "$req_micro"; then
+ if test "$libassuan_version_minor" -eq "$req_minor"; then
+ if test "$libassuan_version_micro" -ge "$req_micro"; then
ok=yes
fi
fi
fi
fi
fi
+ ifelse([$2], ,,[fi])
fi
+
if test $ok = yes; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+
+ if test $ok = yes; then
+ if test "$req_libassuan_api" -gt 0 ; then
+ tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
+ if test "$tmp" -gt 0 ; then
+ AC_MSG_CHECKING([LIBASSUAN ifelse([$2], ,,[$2 ])API version])
+ if test "$req_libassuan_api" -eq "$tmp" ; then
+ AC_MSG_RESULT(okay)
+ else
+ ok=no
+ AC_MSG_RESULT([does not match. want=$req_libassuan_api got=$tmp.])
+ fi
+ fi
+ fi
+ fi
+
+])
+
+
+
+dnl AM_PATH_LIBASSUAN([MINIMUM-VERSION,
+dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS
+dnl
+AC_DEFUN([AM_PATH_LIBASSUAN],
+[ _AM_PATH_LIBASSUAN_COMMON($1)
+ if test $ok = yes; then
LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
- AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
LIBASSUAN_CFLAGS=""
LIBASSUAN_LIBS=""
- AC_MSG_RESULT(no)
ifelse([$3], , :, [$3])
fi
AC_SUBST(LIBASSUAN_CFLAGS)
AC_SUBST(LIBASSUAN_LIBS)
])
+
+
+dnl AM_PATH_LIBASSUAN_PTH([MINIMUM-VERSION,
+dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGSand LIBASSUAN_PTH_LIBS
+dnl
+AC_DEFUN([AM_PATH_LIBASSUAN_PTH],
+[ _AM_PATH_LIBASSUAN_COMMON($1,pth)
+ if test $ok = yes; then
+ LIBASSUAN_PTH_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --cflags`
+ LIBASSUAN_PTH_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --libs`
+ ifelse([$2], , :, [$2])
+ else
+ LIBASSUAN_PTH_CFLAGS=""
+ LIBASSUAN_PTH_LIBS=""
+ ifelse([$3], , :, [$3])
+ fi
+ AC_SUBST(LIBASSUAN_PTH_CFLAGS)
+ AC_SUBST(LIBASSUAN_PTH_LIBS)
+])
+
+
+dnl AM_PATH_LIBASSUAN_PTHREAD([MINIMUM-VERSION,
+dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libassuan and define LIBASSUAN_PTHREAD_CFLAGS
+dnl and LIBASSUAN_PTHREAD_LIBS
+dnl
+AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD],
+[ _AM_PATH_LIBASSUAN_COMMON($1,pth)
+ if test $ok = yes; then
+ LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags`
+ LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs`
+ ifelse([$2], , :, [$2])
+ else
+ LIBASSUAN_PTHREAD_CFLAGS=""
+ LIBASSUAN_PTHREAD_LIBS=""
+ ifelse([$3], , :, [$3])
+ fi
+ AC_SUBST(LIBASSUAN_PTHREAD_CFLAGS)
+ AC_SUBST(LIBASSUAN_PTHREAD_LIBS)
+])
+
Modified: trunk/po/be.po
===================================================================
--- trunk/po/be.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/be.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2003-10-30 16:35+0200\n"
"Last-Translator: Ales Nyakhaychyk <nab at mail.by>\n"
"Language-Team: Belarusian <i18n at mova.org>\n"
@@ -138,20 +138,20 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: немагчыма Ñтварыць Ñ…Ñш-табліцу: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Паўтарыце пароль: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
msgid "PIN not correctly repeated; try again"
msgstr ""
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -6479,7 +6479,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA патрабуе выкарыÑÑ‚Ð°Ð½ÑŒÐ½Ñ 160-Ñ– бітавага Ñ…Ñш-альгарытму\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/ca.po
===================================================================
--- trunk/po/ca.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/ca.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -27,7 +27,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.4.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2005-02-04 02:04+0100\n"
"Last-Translator: Jordi Mallach <jordi at gnu.org>\n"
"Language-Team: Catalan <ca at dodds.net>\n"
@@ -160,22 +160,22 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "Introduïu el nom d'usuari: "
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repetiu la contrasenya: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -7053,7 +7053,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/cs.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gnupg-1.3.92\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2004-11-26 09:12+0200\n"
"Last-Translator: Roman Pavlik <rp at tns.cz>\n"
"Language-Team: Czech <translations.cs at gnupg.cz>\n"
@@ -138,21 +138,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: nepodaøilo se vytvoøit hashovací tabulku: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "|A|PIN administrátora"
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Opakujte tento PIN: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
msgid "PIN not correctly repeated; try again"
msgstr "PIN není zopakován správnì; zkuste to znovu"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||Prosím vlo¾te PIN%%0A[podpis hotov: %lu]"
@@ -6744,7 +6744,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA po¾aduje pou¾ití 160-ti bitového hashovacího algoritmu\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/da.po
===================================================================
--- trunk/po/da.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/da.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2003-12-03 16:11+0100\n"
"Last-Translator: Birger Langkjer <birger.langkjer at image.dk>\n"
"Language-Team: Danish <dansk at klid.dk>\n"
@@ -138,22 +138,22 @@
msgid "failed to create stream from socket: %s\n"
msgstr "kunne ikke initialisere TillidsDB: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "Indtast bruger-id: "
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Gentag kodesætning: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "kodesætningen blev ikke ordentlig gentaget; prøv igen.\n"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -6633,7 +6633,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr ""
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/de.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gnupg-1.9.90\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2006-09-25 09:09+0200\n"
"Last-Translator: Walter Koch <koch at u32.de>\n"
"Language-Team: German <de at li.org>\n"
@@ -141,19 +141,19 @@
msgid "failed to create stream from socket: %s\n"
msgstr "Fehler beim Speichern des Schlüssels: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
msgid "Admin PIN"
msgstr "Admin PIN"
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
msgid "Repeat this PIN"
msgstr "PIN bitte wiederholen"
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
msgid "PIN not correctly repeated; try again"
msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Bitte geben Sie die PIN%s%s%s ein um die Karte zu entsperren"
@@ -6931,7 +6931,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA benötigt einen 160-bit Hash Algorithmus\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr "(Dies ist der MD2 Algorithmus)\n"
Modified: trunk/po/el.po
===================================================================
--- trunk/po/el.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/el.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gnupg-1.1.92\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2003-06-27 12:00+0200\n"
"Last-Translator: Dokianakis Theofanis <madf at hellug.gr>\n"
"Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -137,21 +137,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: áäõíáìßá äçìéïõñãßáò hashtable: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "ÅðáíáëÜâåôå ôç öñÜóç êëåéäß: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "ç öñÜóç êëåéäß äåí åðáíáëÞöèçêå óùóôÜ. ÄïêéìÜóôå îáíÜ"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -6922,7 +6922,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "ï DSA áðáéôåß ôç ÷ñÞóç åíüò 160 bit áëãüñéèìïõ hash\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/eo.po
===================================================================
--- trunk/po/eo.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/eo.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.0.6d\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2002-04-14 14:33+0100\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo at rano.org>\n"
"Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@ -137,22 +137,22 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: malsukcesis krei haktabelon: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "Donu la uzantidentigilon: "
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Ripetu pasfrazon: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "la pasfrazo ne estis øuste ripetita; provu denove"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -6866,7 +6866,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr ""
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/es.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: GNU gnupg 1.4.1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2005-03-25 16:50+0100\n"
"Last-Translator: Jaime Suárez <jsuarez at ono.com>\n"
"Language-Team: Spanish <es at li.org>\n"
@@ -159,21 +159,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: fallo en la creación de la tabla hash: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "|A|PIN Administrador"
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repita este PIN: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
msgid "PIN not correctly repeated; try again"
msgstr "PIN repetido incorrectamente; inténtelo de nuevo"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "PIN [firmas hechas: %lu]"
@@ -6785,7 +6785,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/et.po
===================================================================
--- trunk/po/et.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/et.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2004-06-17 11:04+0300\n"
"Last-Translator: Toomas Soome <Toomas.Soome at microlink.ee>\n"
"Language-Team: Estonian <et at li.org>\n"
@@ -137,21 +137,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Korrake parooli: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "parooli ei korratud õieti; proovige uuesti"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -6826,7 +6826,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA nõuab 160 bitist räsialgoritmi kasutamist\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/fi.po
===================================================================
--- trunk/po/fi.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/fi.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -22,7 +22,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2004-06-16 22:40+0300\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen at iki.fi>\n"
"Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@ -153,21 +153,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Toista salasana: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -6905,7 +6905,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/fr.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.4.2rc2\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2005-06-28 00:24+0200\n"
"Last-Translator: Gaël Quéri <gael at lautre.net>\n"
"Language-Team: French <traduc at traduc.org>\n"
@@ -145,21 +145,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: la création de la table de hachage a échoué: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "|A|code PIN d'administration"
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Répétez ce code PIN: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
msgid "PIN not correctly repeated; try again"
msgstr "le code PIN n'a pas été correctement répété ; recommencez"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
@@ -6935,7 +6935,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA nécessite l'utilisation d'un algorithme de hachage de 160 bits\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/gl.po
===================================================================
--- trunk/po/gl.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/gl.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.2.4\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2003-12-04 11:39+0100\n"
"Last-Translator: Jacobo Tarrio <jtarrio at trasno.net>\n"
"Language-Team: Galician <gpul-traduccion at ceu.fi.udc.es>\n"
@@ -137,22 +137,22 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: fallo ao crear unha táboa hash: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "Introduza o ID de usuario: "
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repita o contrasinal: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -6913,7 +6913,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/hu.po
===================================================================
--- trunk/po/hu.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/hu.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2004-06-19 21:53+0200\n"
"Last-Translator: Nagy Ferenc László <nfl at nfllab.com>\n"
"Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@ -137,21 +137,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Ismételje meg a jelszót: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -6866,7 +6866,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "A DSA 160 bites hash (kivonatoló) algoritmust igényel.\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/id.po
===================================================================
--- trunk/po/id.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/id.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gnupg-id\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2004-06-17 16:32+0700\n"
"Last-Translator: Tedi Heriyanto <tedi_h at gmx.net>\n"
"Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@ -139,21 +139,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: gagal membuat hashtable: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Ulangi passphrase: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "passphrase tidak diulang dengan benar; coba lagi"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -6869,7 +6869,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/it.po
===================================================================
--- trunk/po/it.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/it.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.1.92\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2004-06-16 17:01+0200\n"
"Last-Translator: Marco d'Itri <md at linux.it>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -137,21 +137,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: creazione della tabella hash fallita: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Ripeti la passphrase: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "passphrase non ripetuta correttamente; prova ancora"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -6917,7 +6917,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/ja.po
===================================================================
--- trunk/po/ja.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/ja.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.3.92\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2004-11-23 11:14+0900\n"
"Last-Translator: IIDA Yosiaki <iida at gnu.org>\n"
"Language-Team: Japanese <translation-team-ja at lists.sourceforge.net>\n"
@@ -140,21 +140,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: ¥Ï¥Ã¥·¥åɽ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "|A|Admin PIN"
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "PIN¤òºÆÆþÎÏ: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
msgid "PIN not correctly repeated; try again"
msgstr "PIN¤ò¤Á¤ã¤ó¤È·«¤êÊÖ¤·¤Æ¤¤¤Þ¤»¤ó¡£ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "PIN [½ð̾ºÑ: %lu]"
@@ -6674,7 +6674,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA¤Ç¤Ï160¥Ó¥Ã¥È¤Î¥Ï¥Ã¥·¥å¡¦¥¢¥ë¥´¥ê¥º¥à¤Î»ÈÍѤ¬É¬ÍפǤ¹\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/nb.po
===================================================================
--- trunk/po/nb.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/nb.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.4.3\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2006-06-13 20:31+0200\n"
"Last-Translator: Trond Endrestøl <Trond.Endrestol at fagskolen.gjovik.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -140,21 +140,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "klarte ikke å lagre nøkkelen: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "|A|Admin PIN"
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Gjenta denne PIN: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
msgid "PIN not correctly repeated; try again"
msgstr "PIN ble ikke gjentatt korrekt; prøv igjen"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||Vennligst tast inn PIN%%0A[signaturer utført: %lu]"
@@ -6549,7 +6549,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA krever bruk av en 160-bit hashalgoritme\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/pl.po
===================================================================
--- trunk/po/pl.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/pl.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gnupg-1.2.2\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2004-06-23 15:54+0200\n"
"Last-Translator: Janusz A. Urbanowicz <alex at bofh.net.pl>\n"
"Language-Team: Polish <pl at li.org>\n"
@@ -147,22 +147,22 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: tworzenie tablicy skrótów nie powiod³o siê: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "Podaj identyfikator u¿ytkownika (user ID): "
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Powtórz has³o: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "has³o nie zosta³o poprawnie powtórzone; jeszcze jedna próba"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -6911,7 +6911,7 @@
msgstr ""
"Algorytm DSA wymaga u¿ycia algorytmu skrótu daj±cego 160-bitowy wynik.\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/pt.po
===================================================================
--- trunk/po/pt.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/pt.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2002-09-13 18:26+0100\n"
"Last-Translator: Pedro Morais <morais at kde.org>\n"
"Language-Team: pt <morais at kde.org>\n"
@@ -140,21 +140,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: falha ao criar tabela de dispersão: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repita a frase secreta: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -6877,7 +6877,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA necessita de utilização de uma algoritmo de dispersão de 160 bit\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/pt_BR.po
===================================================================
--- trunk/po/pt_BR.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/pt_BR.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: GNU gnupg 1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
"Last-Translator:\n"
"Language-Team: ?\n"
@@ -144,22 +144,22 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "Digite o identificador de usuário: "
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repita a frase secreta: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -6825,7 +6825,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr ""
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/ro.po
===================================================================
--- trunk/po/ro.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/ro.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.4.2rc1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2005-05-31 22:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <lbuz at rolix.org>\n"
"Language-Team: Romanian <translation-team-ro at lists.sourceforge.net>\n"
@@ -143,21 +143,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: am eºuat sã creez hashtable: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "|A|PIN Admin"
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repetaþi acest PIN: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
msgid "PIN not correctly repeated; try again"
msgstr "PIN-ul nu a fost repetat corect; mai încercaþi o datã"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||Vã rugãm introduceþi PIN%%0A[semnãturi fãcute: %lu]"
@@ -6777,7 +6777,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA necesitã folosirea unui algoritm cu hash de 160 biþi\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/ru.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: GnuPG 1.4.2\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2005-06-22 02:53+0200\n"
"Last-Translator: Maxim Britov <maxbritov at tut.by>\n"
"Language-Team: Russian <gnupg-ru at gnupg.org>\n"
@@ -139,21 +139,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: Ñбой ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ Ñ…Ñшей: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "|A|ÐдминиÑтративный PID"
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Повторите ввод PIN: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
msgid "PIN not correctly repeated; try again"
msgstr "повторный ввод PIN некорректен; попробуйте еще раз"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||Введите PIN%%0A[подпиÑей: %lu]"
@@ -6725,7 +6725,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA требует иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ 160 битной Ñ…Ñш-функции\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/sk.po
===================================================================
--- trunk/po/sk.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/sk.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2004-07-20 15:52+0200\n"
"Last-Translator: Michal Majer <mmajer at econ.umb.sk>\n"
"Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -136,21 +136,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: nepodarilo sa vytvori» hashovaciu tabuµku: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Opakujte heslo: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "heslo nie je zopakované správne; skúste to znovu"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -6883,7 +6883,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA po¾aduje pou¾itie 160 bitového hashovacieho algoritmu\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/sv.po
===================================================================
--- trunk/po/sv.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/sv.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -23,7 +23,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.2.6\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2004-12-01 17:49+0100\n"
"Last-Translator: Per Tunedal <info at clipanish.com>\n"
"Language-Team: Swedish <sv at li.org>\n"
@@ -157,21 +157,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repetera lösenmeningen: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "lösenmeningen upprepades inte korrekt; försök igen."
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
@@ -7038,7 +7038,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA kräver att du använder en 160-bitars kontrollsummealgoritm\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/tr.po
===================================================================
--- trunk/po/tr.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/tr.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.4.1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2005-03-16 07:30+0300\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun at superonline.com>\n"
"Language-Team: Turkish <gnu-tr-u12a at lists.sourceforge.net>\n"
@@ -138,21 +138,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: nitelemeli tablo oluşturulamadı: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "|A|Yönetici PIN'i"
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "Bu PIN'i tekrarlayın: "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
msgid "PIN not correctly repeated; try again"
msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "PIN [yapılan imza: %lu]"
@@ -6760,7 +6760,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA, 160 bitlik bir hash algoritması kullanılmasını gerektiriyor\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/zh_CN.po
===================================================================
--- trunk/po/zh_CN.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/zh_CN.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.4.4\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2006-07-02 10:58+0800\n"
"Last-Translator: Meng Jie <zuxyhere at eastday.com>\n"
"Language-Team: Chinese (simplified) <i18n-translation at lists.linux.net.cn>\n"
@@ -142,21 +142,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s：建立散列表失败：%s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "|A|管ç†å‘˜ PIN"
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "å†æ¬¡è¾“å…¥æ¤ PIN："
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
msgid "PIN not correctly repeated; try again"
msgstr "PIN å†æ¬¡è¾“入时与首次输入ä¸ç¬¦ï¼›è¯·å†è¯•ä¸€æ¬¡"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||请输入 PIN%%0A[完æˆçš„ç¾å—：%lu]"
@@ -6578,7 +6578,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA è¦æ±‚使用 160 ä½çš„散列算法\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/po/zh_TW.po
===================================================================
--- trunk/po/zh_TW.po 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/po/zh_TW.po 2006-10-10 11:11:04 UTC (rev 4294)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gnupg 1.4.2\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2006-10-04 18:34+0200\n"
+"POT-Creation-Date: 2006-10-06 19:14+0200\n"
"PO-Revision-Date: 2005-07-29 09:49+0800\n"
"Last-Translator: Jedi <Jedi at Jedi.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -140,21 +140,21 @@
msgid "failed to create stream from socket: %s\n"
msgstr "%s: 建立雜湊表失敗: %s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "|A|Admin PIN"
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:277
#, fuzzy
msgid "Repeat this PIN"
msgstr "è«‹å†æ¬¡è¼¸å…¥å€‹äººè˜åˆ¥ç¢¼ (PIN): "
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:280
msgid "PIN not correctly repeated; try again"
msgstr "個人è˜åˆ¥ç¢¼ (PIN) å†æ¬¡è¼¸å…¥æ™‚沒有æ£ç¢ºé‡è¤‡; è«‹å†è©¦ä¸€æ¬¡"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:292
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||請輸入 PIN%%0A[簽署完æˆ: %lu]"
@@ -6618,7 +6618,7 @@
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA è¦æ±‚使用 160 ä½å…ƒçš„雜湊演算法\n"
-#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
Modified: trunk/scd/ChangeLog
===================================================================
--- trunk/scd/ChangeLog 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/scd/ChangeLog 2006-10-10 11:11:04 UTC (rev 4294)
@@ -1,3 +1,10 @@
+2006-10-06 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (AM_CFLAGS): Use PTH version of libassuan.
+ (scdaemon_LDADD): Ditto.
+
+ * scdaemon.h (send_status_info): Mark with sentinel attribute.
+
2006-10-02 Marcus Brinkmann <marcus at g10code.de>
* command.c (update_reader_status_file): Increase buffer of
Modified: trunk/scd/Makefile.am
===================================================================
--- trunk/scd/Makefile.am 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/scd/Makefile.am 2006-10-10 11:11:04 UTC (rev 4294)
@@ -29,7 +29,7 @@
include $(top_srcdir)/am/cmacros.am
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) \
- $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
+ $(KSBA_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
card_apps = app-openpgp.c app-nks.c app-dinsig.c app-p15.c
@@ -45,7 +45,7 @@
scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
- $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) \
+ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
$(LIBUSB_LIBS) -lgpg-error $(LIBINTL) $(DL_LIBS) $(NETLIBS)
# Removed for now: We need to decide whether it makes sense to
@@ -63,7 +63,7 @@
#sc_copykeys_LDADD = \
# ../jnlib/libjnlib.a ../common/libcommon.a \
# ../common/libsimple-pwquery.a \
-# $(LIBGCRYPT_LIBS) $(PTH_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
+# $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
# $(LIBUSB_LIBS) \
# -lgpg-error @LIBINTL@ @DL_LIBS@
#
Modified: trunk/scd/app-p15.c
===================================================================
--- trunk/scd/app-p15.c 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/scd/app-p15.c 2006-10-10 11:11:04 UTC (rev 4294)
@@ -3187,7 +3187,7 @@
/* Handler for the PKAUTH command.
- This is basically the same as the PKSIGN command but we firstcheck
+ This is basically the same as the PKSIGN command but we first check
that the requested key is suitable for authentication; that is, it
must match the criteria used for the attribute $AUTHKEYID. See
do_sign for calling conventions; there is no HASHALGO, though. */
Modified: trunk/scd/scdaemon.h
===================================================================
--- trunk/scd/scdaemon.h 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/scd/scdaemon.h 2006-10-10 11:11:04 UTC (rev 4294)
@@ -110,7 +110,8 @@
/*-- command.c --*/
void scd_command_handler (int);
-void send_status_info (ctrl_t ctrl, const char *keyword, ...);
+void send_status_info (ctrl_t ctrl, const char *keyword, ...)
+ GNUPG_GCC_A_SENTINEL(1);
void scd_update_reader_status_file (void);
Modified: trunk/sm/ChangeLog
===================================================================
--- trunk/sm/ChangeLog 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/sm/ChangeLog 2006-10-10 11:11:04 UTC (rev 4294)
@@ -1,3 +1,8 @@
+2006-10-06 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (AM_CFLAGS): Use PTH version of libassuan.
+ (gpgsm_LDADD): Ditto.
+
2006-10-05 Werner Koch <wk at g10code.com>
* certcheck.c (do_encode_md): Check that the has algo is valid.
Modified: trunk/sm/Makefile.am
===================================================================
--- trunk/sm/Makefile.am 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/sm/Makefile.am 2006-10-10 11:11:04 UTC (rev 4294)
@@ -22,7 +22,7 @@
bin_PROGRAMS = gpgsm
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS) \
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(KSBA_CFLAGS) \
$(PTH_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
@@ -58,8 +58,8 @@
../common/libcommon.a ../gl/libgnu.a
gpgsm_LDADD = $(common_libs) \
- $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error \
- $(LIBINTL) $(PTH_LIBS) $(ZLIBS)
+ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) \
+ -lgpg-error $(LIBINTL) $(PTH_LIBS) $(ZLIBS)
# Make sure that all libs are build before we use them. This is
# important for things like make -j2.
Modified: trunk/tools/ChangeLog
===================================================================
--- trunk/tools/ChangeLog 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/tools/ChangeLog 2006-10-10 11:11:04 UTC (rev 4294)
@@ -1,3 +1,8 @@
+2006-10-08 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (gpgkey2ssh_LDADD): Add LIBINTL. Suggested by
+ Andreas Metzler.
+
2006-09-22 Werner Koch <wk at g10code.com>
* no-libgcrypt.c: Changed license to a simple all permissive one.
Modified: trunk/tools/Makefile.am
===================================================================
--- trunk/tools/Makefile.am 2006-10-06 11:06:15 UTC (rev 4293)
+++ trunk/tools/Makefile.am 2006-10-10 11:11:04 UTC (rev 4294)
@@ -79,8 +79,8 @@
gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
# common sucks in jnlib, via use of BUG() in an inline function, which
# some compilers do not eliminate.
-gpgkey2ssh_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
- $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
+gpgkey2ssh_LDADD = $(common_libs) \
+ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
# Make sure that all libs are build before we use them. This is
More information about the Gnupg-commits
mailing list