mirror of git://git.gnupg.org/gnupg.git
Use estream for dirmngr's --gpgconf-list.
Change insalled name of gpg2 for Wince.
This commit is contained in:
Werner Koch
parent
dcd20e18a5
commit
af500f0ae4
|
|
@ -1,3 +1,9 @@
|
|||
2011-01-19 Werner Koch <wk@g10code.com>
|
||||
|
||||
* configure.ac: Add new option --enable-gpg2-is-gpg.
|
||||
(NAME_OF_INSTALLED_GPG): New ac_define.
|
||||
* autogen.sh [--build-w32ce]: Use --enable-gpg2-is-gpg.
|
||||
|
||||
2011-01-03 Werner Koch <wk@g10code.com>
|
||||
|
||||
* README.SVN: Rename to README.GIT.
|
||||
|
|
@ -16,7 +22,7 @@
|
|||
|
||||
2010-11-17 Werner Koch <wk@g10code.com>
|
||||
|
||||
* configure.ac (ENABLE_CARD_SUPPORT): Define.
|
||||
* configure.ac (ENABLE_CARD_SUPPORT): Define.
|
||||
|
||||
2010-10-27 Werner Koch <wk@g10code.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -104,7 +104,8 @@ if [ "$myhost" = "w32" ]; then
|
|||
[ -z "$w32root" ] && w32root="$HOME/w32ce_root"
|
||||
toolprefixes="$w32ce_toolprefixes arm-mingw32ce"
|
||||
extraoptions="--enable-dirmngr-auto-start --disable-scdaemon "
|
||||
extraoptions="$extraoptions --disable-zip $w32ce_extraoptions"
|
||||
extraoptions="$extraoptions --disable-zip --enable-gpg2-is-gpg"
|
||||
extraoptions="$extraoptions $w32ce_extraoptions"
|
||||
;;
|
||||
*)
|
||||
[ -z "$w32root" ] && w32root="$HOME/w32root"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,11 @@
|
|||
2011-01-19 Werner Koch <wk@g10code.com>
|
||||
|
||||
* homedir.c (gnupg_module_name): Use NAME_OF_INSTALLED_GPG instead
|
||||
of "gpg2".
|
||||
|
||||
2011-01-18 Werner Koch <wk@g10code.com>
|
||||
|
||||
* estream.c (es_func_mem_write): FIX computation of NEWSIZE.
|
||||
* estream.c (es_func_mem_write): Fix computation of NEWSIZE.
|
||||
|
||||
2011-01-10 Werner Koch <wk@g10code.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -528,7 +528,7 @@ gnupg_module_name (int which)
|
|||
X(bindir, "gpgsm");
|
||||
|
||||
case GNUPG_MODULE_NAME_GPG:
|
||||
X(bindir, "gpg2");
|
||||
X(bindir, NAME_OF_INSTALLED_GPG);
|
||||
|
||||
case GNUPG_MODULE_NAME_CONNECT_AGENT:
|
||||
X(bindir, "gpg-connect-agent");
|
||||
|
|
|
|||
18
configure.ac
18
configure.ac
|
|
@ -168,6 +168,24 @@ show_gnupg_dirmngr_ldap_pgm="(default)"
|
|||
test -n "$GNUPG_DIRMNGR_LDAP_PGM" \
|
||||
&& show_gnupg_dirmngr_ldap_pgm="$GNUPG_DIRMNGR_LDAP_PGM"
|
||||
|
||||
#
|
||||
# On some platforms gpg2 is usually installed as gpg without using a
|
||||
# symlink. For correct operation of gpgconf it needs to know the
|
||||
# installed name of gpg. This option sets "gpg2"'s installed name to
|
||||
# just "gpg". Note that it might be required to rename gpg2 to gpg
|
||||
# manually after the build process.
|
||||
#
|
||||
AC_ARG_ENABLE(gpg2-is-gpg,
|
||||
AC_HELP_STRING([--enable-gpg2-is-gpg],[Set installed name of gpg2 to gpg]),
|
||||
gpg2_is_gpg=$enableval)
|
||||
if test "$gpg2_is_gpg" = "yes"; then
|
||||
name_of_installed_gpg=gpg
|
||||
else
|
||||
name_of_installed_gpg=gpg2
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED(NAME_OF_INSTALLED_GPG, "$name_of_installed_gpg",
|
||||
[The name of the installed GPG tool])
|
||||
|
||||
|
||||
# Some folks want to use only the agent from this packet. Make it
|
||||
# easier for them by providing the configure option
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2011-01-19 Werner Koch <wk@g10code.com>
|
||||
|
||||
* dirmngr.c (main): Use es_printf for --gpgconf-list.
|
||||
|
||||
2010-12-14 Werner Koch <wk@g10code.com>
|
||||
|
||||
* cdb.h (struct cdb) [W32]: Add field CDB_MAPPING.
|
||||
|
|
|
|||
|
|
@ -1019,7 +1019,7 @@ main (int argc, char **argv)
|
|||
start of the dirmngr. */
|
||||
#ifdef HAVE_W32_SYSTEM
|
||||
pid = getpid ();
|
||||
printf ("set DIRMNGR_INFO=%s;%lu;1\n", socket_name, (ulong) pid);
|
||||
es_printf ("set DIRMNGR_INFO=%s;%lu;1\n", socket_name, (ulong) pid);
|
||||
#else
|
||||
pid = pth_fork ();
|
||||
if (pid == (pid_t)-1)
|
||||
|
|
@ -1051,11 +1051,11 @@ main (int argc, char **argv)
|
|||
if (csh_style)
|
||||
{
|
||||
*strchr (infostr, '=') = ' ';
|
||||
printf ( "setenv %s\n", infostr);
|
||||
es_printf ( "setenv %s\n", infostr);
|
||||
}
|
||||
else
|
||||
{
|
||||
printf ( "%s; export DIRMNGR_INFO;\n", infostr);
|
||||
es_printf ( "%s; export DIRMNGR_INFO;\n", infostr);
|
||||
}
|
||||
free (infostr);
|
||||
exit (0);
|
||||
|
|
@ -1220,15 +1220,15 @@ main (int argc, char **argv)
|
|||
"dirmngr.conf", NULL );
|
||||
|
||||
filename = percent_escape (opt.config_filename, NULL);
|
||||
printf ("gpgconf-dirmngr.conf:%lu:\"%s\n",
|
||||
es_printf ("gpgconf-dirmngr.conf:%lu:\"%s\n",
|
||||
GC_OPT_FLAG_DEFAULT, filename);
|
||||
xfree (filename);
|
||||
|
||||
printf ("verbose:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
printf ("quiet:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
printf ("debug-level:%lu:\"none\n", flags | GC_OPT_FLAG_DEFAULT);
|
||||
printf ("log-file:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
printf ("force:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("verbose:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("quiet:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("debug-level:%lu:\"none\n", flags | GC_OPT_FLAG_DEFAULT);
|
||||
es_printf ("log-file:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("force:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
|
||||
/* --csh and --sh are mutually exclusive, something we can not
|
||||
express in GPG Conf. --options is only usable from the
|
||||
|
|
@ -1241,34 +1241,34 @@ main (int argc, char **argv)
|
|||
"ldapservers.conf":"dirmngr_ldapservers.conf",
|
||||
NULL);
|
||||
filename_esc = percent_escape (filename, NULL);
|
||||
printf ("ldapserverlist-file:%lu:\"%s\n", flags | GC_OPT_FLAG_DEFAULT,
|
||||
es_printf ("ldapserverlist-file:%lu:\"%s\n", flags | GC_OPT_FLAG_DEFAULT,
|
||||
filename_esc);
|
||||
xfree (filename_esc);
|
||||
xfree (filename);
|
||||
|
||||
printf ("ldaptimeout:%lu:%u\n",
|
||||
es_printf ("ldaptimeout:%lu:%u\n",
|
||||
flags | GC_OPT_FLAG_DEFAULT, DEFAULT_LDAP_TIMEOUT);
|
||||
printf ("max-replies:%lu:%u\n",
|
||||
es_printf ("max-replies:%lu:%u\n",
|
||||
flags | GC_OPT_FLAG_DEFAULT, DEFAULT_MAX_REPLIES);
|
||||
printf ("allow-ocsp:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
printf ("ocsp-responder:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
printf ("ocsp-signer:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("allow-ocsp:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("ocsp-responder:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("ocsp-signer:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
|
||||
printf ("faked-system-time:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
printf ("no-greeting:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("faked-system-time:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("no-greeting:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
|
||||
printf ("disable-http:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
printf ("disable-ldap:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
printf ("honor-http-proxy:%lu\n", flags | GC_OPT_FLAG_NONE);
|
||||
printf ("http-proxy:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
printf ("ldap-proxy:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
printf ("only-ldap-proxy:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
printf ("ignore-ldap-dp:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
printf ("ignore-http-dp:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
printf ("ignore-ocsp-service-url:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("disable-http:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("disable-ldap:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("honor-http-proxy:%lu\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("http-proxy:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("ldap-proxy:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("only-ldap-proxy:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("ignore-ldap-dp:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("ignore-http-dp:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("ignore-ocsp-service-url:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
/* Note: The next one is to fix a typo in gpgconf - should be
|
||||
removed eventually. */
|
||||
printf ("ignore-ocsp-servic-url:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
es_printf ("ignore-ocsp-servic-url:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
||||
}
|
||||
cleanup ();
|
||||
return !!rc;
|
||||
|
|
|
|||
Loading…
Reference in New Issue