security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* configure.ac: Require libgcrypt 1.1.94.

Browse source 
Introduce PACKAGE_GT and set it to gnupg2.

* gpg-agent.c (main): Use new libgcrypt thread library register
scheme.

* Makevars (DOMAIN): Init from PACKAGE_GT
This commit is contained in:
Werner Koch 2004-04-06 10:01:04 +00:00
parent c58c97e61f
commit d84d632583
20 changed files with 630 additions and 428 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sm/certdump.c
View file

@ -633,7 +633,7 @@ gpgsm_format_keydesc (ksba_cert_t cert)
#ifdef ENABLE_NLS
/* The Assuan agent protol requires us to transmit utf-8 strings */
orig_codeset = bind_textdomain_codeset (PACKAGE, NULL);
orig_codeset = bind_textdomain_codeset (PACKAGE_GT, NULL);
#ifdef HAVE_LANGINFO_CODESET
if (!orig_codeset)
orig_codeset = nl_langinfo (CODESET);
@ -641,7 +641,7 @@ gpgsm_format_keydesc (ksba_cert_t cert)
if (orig_codeset)
{ /* We only switch when we are able to restore the codeset later. */
orig_codeset = xstrdup (orig_codeset);
if (!bind_textdomain_codeset (PACKAGE, "utf-8"))
if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8"))
orig_codeset = NULL;
}
#endif
@ -659,7 +659,7 @@ gpgsm_format_keydesc (ksba_cert_t cert)
#ifdef ENABLE_NLS
if (orig_codeset)
bind_textdomain_codeset (PACKAGE, orig_codeset);
bind_textdomain_codeset (PACKAGE_GT, orig_codeset);
#endif
xfree (orig_codeset);

20
sm/gpgsm.c
View file

@ -540,7 +540,7 @@ static void
i18n_init(void)
{
#ifdef USE_SIMPLE_GETTEXT
set_gettext_file (PACKAGE);
set_gettext_file (PACKAGE_GT);
#else
# ifdef ENABLE_NLS
# ifdef HAVE_LC_MESSAGES
@ -549,8 +549,8 @@ i18n_init(void)
# else
setlocale (LC_ALL, "" );
# endif
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
bindtextdomain (PACKAGE_GT, LOCALEDIR);
textdomain (PACKAGE_GT);
# endif
#endif
}
@ -1318,7 +1318,7 @@ main ( int argc, char **argv)
case aCallDirmngr:
if (!argc)
wrong_args (_("--call-dirmngr <command> {args}"));
wrong_args ("--call-dirmngr <command> {args}");
else
if (gpgsm_dirmngr_run_command (&ctrl, *argv, argc-1, argv+1))
gpgsm_exit (1);
@ -1334,7 +1334,7 @@ main ( int argc, char **argv)
else if (argc == 1)
gpgsm_encrypt (&ctrl, recplist, open_read (*argv), stdout); /* from file */
else
wrong_args (_("--encrypt [datafile]"));
wrong_args ("--encrypt [datafile]");
break;
case aSign: /* sign the given file */
@ -1348,7 +1348,7 @@ main ( int argc, char **argv)
gpgsm_sign (&ctrl, signerlist,
open_read (*argv), detached_sig, stdout); /* from file */
else
wrong_args (_("--sign [datafile]"));
wrong_args ("--sign [datafile]");
break;
case aSignEncr: /* sign and encrypt the given file */
@ -1375,7 +1375,7 @@ main ( int argc, char **argv)
else if (argc == 2) /* detached signature (sig, detached) */
gpgsm_verify (&ctrl, open_read (*argv), open_read (argv[1]), NULL);
else
wrong_args (_("--verify [signature [detached_data]]"));
wrong_args ("--verify [signature [detached_data]]");
if (fp && fp != stdout)
fclose (fp);
@ -1383,7 +1383,7 @@ main ( int argc, char **argv)
break;
case aVerifyFiles:
log_error ("this command has not yet been implemented\n");
log_error (_("this command has not yet been implemented\n"));
break;
case aDecrypt:
@ -1392,7 +1392,7 @@ main ( int argc, char **argv)
else if (argc == 1)
gpgsm_decrypt (&ctrl, open_read (*argv), stdout); /* from file */
else
wrong_args (_("--decrypt [filename]"));
wrong_args ("--decrypt [filename]");
break;
case aDeleteKey:
@ -1445,7 +1445,7 @@ main ( int argc, char **argv)
if (argc == 1)
gpgsm_p12_export (&ctrl, *argv, stdout);
else
wrong_args (_("--export-secret-key-p12 KEY-ID"));
wrong_args ("--export-secret-key-p12 KEY-ID");
break;
case aSendKeys:

2
sm/import.c
View file

@ -644,7 +644,7 @@ parse_p12 (ksba_reader_t reader, FILE **retfp)
while ( (i=waitpid (pid, &status, 0)) == -1 && errno == EINTR)
;
if (i == -1)
log_error (_("waiting for protect-tools to terminate failed: %s\n"),
log_error (_("waiting for protect-tool to terminate failed: %s\n"),
strerror (errno));
else if (WIFEXITED (status) && WEXITSTATUS (status) == 31)
log_error (_("error running `%s': probably not installed\n"), pgmname);