diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | TODO | 5 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | gpgme/ChangeLog | 4 | ||||
| -rw-r--r-- | gpgme/ttyname_r.c | 13 |
5 files changed, 29 insertions, 8 deletions
@@ -1,3 +1,9 @@ +2007-01-09 Werner Koch <[email protected]> + + * configure.ac (NEED_GPG_VERSION, + (NEED_GPGSM_VERSION): Must define after it may have been changed + by an option. + 2007-01-08 Werner Koch <[email protected]> * configure.ac: Require gpg-error 1.4 due to the use of @@ -99,6 +99,11 @@ Hey Emacs, this is -*- outline -*- mode! gpg: test: sign+encrypt failed: general error ** Without agent and with wrong passphrase, gpg 1.4.2 enters into an infinite loop. +** Use correct argv[0] + In rungpg.c:build_argv we use + argv[argc] = strdup ("gpg"); /* argv[0] */ + This should be changed to take the real file name used in account. + * Operations ** Include cert values -2, -1, 0 and 1 should be defined as macros. diff --git a/configure.ac b/configure.ac index 2e3c4e7b..09384b8a 100644 --- a/configure.ac +++ b/configure.ac @@ -87,10 +87,6 @@ AC_PROG_CC AC_SUBST(LIBGPGME_LT_CURRENT) AC_SUBST(LIBGPGME_LT_AGE) AC_SUBST(LIBGPGME_LT_REVISION) -AC_DEFINE_UNQUOTED(NEED_GPG_VERSION, "$NEED_GPG_VERSION", - [Min. needed GnuPG version.]) -AC_DEFINE_UNQUOTED(NEED_GPGSM_VERSION, "$NEED_GPGSM_VERSION", - [Min. needed GPGSM version.]) AC_SUBST(PACKAGE) AC_SUBST(VERSION) @@ -273,6 +269,11 @@ if test "$NEED_GPGSM_VERSION" = "no"; then NEED_GPGSM_VERSION=0.0.0 fi +AC_DEFINE_UNQUOTED(NEED_GPG_VERSION, "$NEED_GPG_VERSION", + [Min. needed GnuPG version.]) +AC_DEFINE_UNQUOTED(NEED_GPGSM_VERSION, "$NEED_GPGSM_VERSION", + [Min. needed GPGSM version.]) + NO_OVERRIDE=no AC_ARG_WITH(gpg, diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index a60a169b..7c1835ee 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,7 @@ +2007-01-10 Werner Koch <[email protected]> + + * ttyname_r.c (ttyname_r) [W32]: Return a dummy name. + 2007-01-08 Werner Koch <[email protected]> * version.c (do_subsystem_inits): Do assuan init only if building diff --git a/gpgme/ttyname_r.c b/gpgme/ttyname_r.c index 5cd29495..44876587 100644 --- a/gpgme/ttyname_r.c +++ b/gpgme/ttyname_r.c @@ -32,17 +32,22 @@ int ttyname_r (int fd, char *buf, size_t buflen) { -#if HAVE_W32_SYSTEM - errno = ENOTTY; /* The best error code I have under mingw. */ -#else char *tty; +#if HAVE_W32_SYSTEM + /* We use this default one for now. AFAICS we only need it to be + passed to gpg and in turn to pinentry. Providing a replacement + is needed because elsewhere we bail out on error. If we + eventually implement a pinentry for Windows it is uinlikely that + we need a real tty at all. */ + tty = "/dev/tty"; +#else tty = ttyname (fd); if (!tty) return errno; +#endif strncpy (buf, tty, buflen); buf[buflen - 1] = '\0'; return (strlen (tty) >= buflen) ? ERANGE : 0; -#endif } |