GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

/

Browse Source 
* configure.ac (NEED_GPG_VERSION,
	(NEED_GPGSM_VERSION): Must define after it may have been changed
	by an option.

	* configure.ac: Require gpg-error 1.4 due to the use of
	gpg_error_from_syserror.
	(HAVE_ASSUAN_H): New.

gpgme/

	* ttyname_r.c (ttyname_r) [W32]: Return a dummy name.

	* version.c (do_subsystem_inits): Do assuan init only if building
	with Assuan.
	* setenv.c: Include assuan-def.h only if building with Assuan
	support.

	* op-support.c (_gpgme_op_reset): Set LC_MESSAGES only if
	if defined.
	* engine-gpgsm.c (gpgsm_set_locale): Ditto.
	* rungpg.c (gpg_set_locale): Ditto.
This commit is contained in:
Werner Koch 2007-01-10 10:18:05 +00:00
parent fca9d331d2
commit cc5190ffc1
5 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-01-09 Werner Koch <wk@g10code.com>
* configure.ac (NEED_GPG_VERSION,
(NEED_GPGSM_VERSION): Must define after it may have been changed
by an option.
2007-01-08 Werner Koch <wk@g10code.com> 2007-01-08 Werner Koch <wk@g10code.com>
* configure.ac: Require gpg-error 1.4 due to the use of * configure.ac: Require gpg-error 1.4 due to the use of

5
TODO
View File

@ -99,6 +99,11 @@ Hey Emacs, this is -*- outline -*- mode!
gpg: test: sign+encrypt failed: general error gpg: test: sign+encrypt failed: general error
** Without agent and with wrong passphrase, gpg 1.4.2 enters into an ** Without agent and with wrong passphrase, gpg 1.4.2 enters into an
infinite loop. 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 * Operations
** Include cert values -2, -1, 0 and 1 should be defined as macros. ** Include cert values -2, -1, 0 and 1 should be defined as macros.

9
configure.ac
View File

@ -87,10 +87,6 @@ AC_PROG_CC
AC_SUBST(LIBGPGME_LT_CURRENT) AC_SUBST(LIBGPGME_LT_CURRENT)
AC_SUBST(LIBGPGME_LT_AGE) AC_SUBST(LIBGPGME_LT_AGE)
AC_SUBST(LIBGPGME_LT_REVISION) 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(PACKAGE)
AC_SUBST(VERSION) AC_SUBST(VERSION)
@ -273,6 +269,11 @@ if test "$NEED_GPGSM_VERSION" = "no"; then
NEED_GPGSM_VERSION=0.0.0 NEED_GPGSM_VERSION=0.0.0
fi 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 NO_OVERRIDE=no
AC_ARG_WITH(gpg, AC_ARG_WITH(gpg,

4
gpgme/ChangeLog
View File

@ -1,3 +1,7 @@
2007-01-10 Werner Koch <wk@g10code.com>
* ttyname_r.c (ttyname_r) [W32]: Return a dummy name.
2007-01-08 Werner Koch <wk@g10code.com> 2007-01-08 Werner Koch <wk@g10code.com>
* version.c (do_subsystem_inits): Do assuan init only if building * version.c (do_subsystem_inits): Do assuan init only if building

13
gpgme/ttyname_r.c
View File

@ -32,17 +32,22 @@
int int
ttyname_r (int fd, char *buf, size_t buflen) 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; 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); tty = ttyname (fd);
if (!tty) if (!tty)
return errno; return errno;
#endif
strncpy (buf, tty, buflen); strncpy (buf, tty, buflen);
buf[buflen - 1] = '\0'; buf[buflen - 1] = '\0';
return (strlen (tty) >= buflen) ? ERANGE : 0; return (strlen (tty) >= buflen) ? ERANGE : 0;
#endif
} }