security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-13 22:21:09 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,6 +1,7 @@
2004-04-06 Werner Koch <wk@gnupg.org> 2004-04-06 Werner Koch <wk@gnupg.org>
* configure.ac: Require libgcrypt 1.1.94. * configure.ac: Require libgcrypt 1.1.94.
Introduce PACKAGE_GT and set it to gnupg2.
2004-03-23 Werner Koch <wk@gnupg.org> 2004-03-23 Werner Koch <wk@gnupg.org>
@ -414,7 +415,7 @@
* configure.ac (HAVE_JNLIB_LOGGING): always define it. * configure.ac (HAVE_JNLIB_LOGGING): always define it.
Copyright 2001, 2002 Free Software Foundation, Inc. Copyright 2001, 2002, 2004 Free Software Foundation, Inc.
This file is free software; as a special exception the author gives This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without unlimited permission to copy and/or distribute it, with or without

3
NEWS
View File

@ -7,6 +7,9 @@ Noteworthy changes in version 1.9.7
* Include the smimeCapabilities attribute with signed messages. * Include the smimeCapabilities attribute with signed messages.
* Now uses the gettext domain "gnupg2" to avoid conflicts with gnupg
versions < 1.9.
Noteworthy changes in version 1.9.6 (2004-03-06) Noteworthy changes in version 1.9.6 (2004-03-06)
------------------------------------------------ ------------------------------------------------

8
agent/gpg-agent.c
View File

@ -197,12 +197,12 @@ static void
i18n_init (void) i18n_init (void)
{ {
#ifdef USE_SIMPLE_GETTEXT #ifdef USE_SIMPLE_GETTEXT
set_gettext_file( PACKAGE ); set_gettext_file( PACKAGE_GT );
#else #else
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR); bindtextdomain (PACKAGE_GT, LOCALEDIR);
textdomain (PACKAGE); textdomain (PACKAGE_GT);
#endif #endif
#endif #endif
} }
@ -649,7 +649,7 @@ main (int argc, char **argv )
easier to switch only once instead of for every message and it easier to switch only once instead of for every message and it
actually helps when more then one thread is active (avoids an actually helps when more then one thread is active (avoids an
extra copy step). */ extra copy step). */
bind_textdomain_codeset (PACKAGE, "UTF-8"); bind_textdomain_codeset (PACKAGE_GT, "UTF-8");
#endif #endif
/* now start with logging to a file if this is desired */ /* now start with logging to a file if this is desired */

6
agent/protect-tool.c
View File

@ -141,12 +141,12 @@ static void
i18n_init (void) i18n_init (void)
{ {
#ifdef USE_SIMPLE_GETTEXT #ifdef USE_SIMPLE_GETTEXT
set_gettext_file( PACKAGE ); set_gettext_file( PACKAGE_GT );
#else #else
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR); bindtextdomain (PACKAGE_GT, LOCALEDIR);
textdomain (PACKAGE); textdomain (PACKAGE_GT);
#endif #endif
#endif #endif
} }

6
configure.ac
View File

@ -1,6 +1,6 @@
# configure.ac - for GnuPG 1.9 # configure.ac - for GnuPG 1.9
# Copyright (C) 1998, 1999, 2000, 2001, 2002, # Copyright (C) 1998, 1999, 2000, 2001, 2002,
# 2003 Free Software Foundation, Inc. # 2003, 2004 Free Software Foundation, Inc.
# #
# This file is part of GnuPG. # This file is part of GnuPG.
# #
@ -43,6 +43,7 @@ NEED_OPENSC_VERSION=0.8.0
PACKAGE=$PACKAGE_NAME PACKAGE=$PACKAGE_NAME
PACKAGE_GT=${PACKAGE_NAME}2
VERSION=$PACKAGE_VERSION VERSION=$PACKAGE_VERSION
AC_CONFIG_AUX_DIR(scripts) AC_CONFIG_AUX_DIR(scripts)
@ -68,8 +69,11 @@ GNUPG_BUILD_PROGRAM(scdaemon, yes)
AC_SUBST(PACKAGE) AC_SUBST(PACKAGE)
AC_SUBST(PACKAGE_GT)
AC_SUBST(VERSION) AC_SUBST(VERSION)
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package]) AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
AC_DEFINE_UNQUOTED(PACKAGE_GT, "$PACKAGE_GT",
[Name of this package for gettext])
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package]) AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$PACKAGE_BUGREPORT", AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$PACKAGE_BUGREPORT",
[Bug report address]) [Bug report address])

6
g10/g10.c
View File

@ -783,12 +783,12 @@ static void
i18n_init(void) i18n_init(void)
{ {
#ifdef USE_SIMPLE_GETTEXT #ifdef USE_SIMPLE_GETTEXT
set_gettext_file( PACKAGE ); set_gettext_file( PACKAGE_GT );
#else #else
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
setlocale( LC_ALL, "" ); setlocale( LC_ALL, "" );
bindtextdomain( PACKAGE, LOCALEDIR ); bindtextdomain( PACKAGE_GT, LOCALEDIR );
textdomain( PACKAGE ); textdomain( PACKAGE_GT );
#endif #endif
#endif #endif
} }

6
g10/gpgv.c
View File

@ -116,7 +116,7 @@ static void
i18n_init(void) i18n_init(void)
{ {
#ifdef USE_SIMPLE_GETTEXT #ifdef USE_SIMPLE_GETTEXT
set_gettext_file( PACKAGE ); set_gettext_file( PACKAGE_GT );
#else #else
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
#ifdef HAVE_LC_MESSAGES #ifdef HAVE_LC_MESSAGES
@ -125,8 +125,8 @@ i18n_init(void)
#else #else
setlocale( LC_ALL, "" ); setlocale( LC_ALL, "" );
#endif #endif
bindtextdomain( PACKAGE, LOCALEDIR ); bindtextdomain( PACKAGE_GT, LOCALEDIR );
textdomain( PACKAGE ); textdomain( PACKAGE_GT );
#endif #endif
#endif #endif
} }

12
g10/passphrase.c
View File

@ -649,8 +649,8 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
} }
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
/* The Assuan agent protol requires us to trasnmit utf-8 strings */ /* The Assuan agent protocol 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 #ifdef HAVE_LANGINFO_CODESET
if (!orig_codeset) if (!orig_codeset)
orig_codeset = nl_langinfo (CODESET); orig_codeset = nl_langinfo (CODESET);
@ -658,7 +658,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
if (orig_codeset) if (orig_codeset)
{ /* We only switch when we are able to restore the codeset later. */ { /* We only switch when we are able to restore the codeset later. */
orig_codeset = xstrdup (orig_codeset); orig_codeset = xstrdup (orig_codeset);
if (!bind_textdomain_codeset (PACKAGE, "utf-8")) if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8"))
orig_codeset = NULL; orig_codeset = NULL;
} }
#endif #endif
@ -765,7 +765,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
free_public_key( pk ); free_public_key( pk );
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
if (orig_codeset) if (orig_codeset)
bind_textdomain_codeset (PACKAGE, orig_codeset); bind_textdomain_codeset (PACKAGE_GT, orig_codeset);
#endif #endif
xfree (orig_codeset); xfree (orig_codeset);
return pw; return pw;
@ -857,7 +857,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
free_public_key( pk ); free_public_key( pk );
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
if (orig_codeset) if (orig_codeset)
bind_textdomain_codeset (PACKAGE, orig_codeset); bind_textdomain_codeset (PACKAGE_GT, orig_codeset);
#endif #endif
xfree (orig_codeset); xfree (orig_codeset);
return pw; return pw;
@ -880,7 +880,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
failure: failure:
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
if (orig_codeset) if (orig_codeset)
bind_textdomain_codeset (PACKAGE, orig_codeset); bind_textdomain_codeset (PACKAGE_GT, orig_codeset);
#endif #endif
xfree (atext); xfree (atext);
if ( fd != -1 ) if ( fd != -1 )

16
kbx/kbxutil.c
View File

@ -117,20 +117,20 @@ my_strusage( int level )
static void static void
i18n_init(void) i18n_init(void)
{ {
#ifdef USE_SIMPLE_GETTEXT #ifdef USE_SIMPLE_GETTEXT
set_gettext_file( PACKAGE ); set_gettext_file( PACKAGE_GT );
#else #else
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
#ifdef HAVE_LC_MESSAGES #ifdef HAVE_LC_MESSAGES
setlocale( LC_TIME, "" ); setlocale( LC_TIME, "" );
setlocale( LC_MESSAGES, "" ); setlocale( LC_MESSAGES, "" );
#else #else
setlocale( LC_ALL, "" ); setlocale( LC_ALL, "" );
#endif #endif
bindtextdomain( PACKAGE, LOCALEDIR ); bindtextdomain( PACKAGE_GT, LOCALEDIR );
textdomain( PACKAGE ); textdomain( PACKAGE_GT );
#endif #endif
#endif #endif
} }

4
po/ChangeLog
View File

@ -1,3 +1,7 @@
2004-04-06 Werner Koch <wk@gnupg.org>
* Makevars (DOMAIN): Init from PACKAGE_GT
2003-12-09 Werner Koch <wk@gnupg.org> 2003-12-09 Werner Koch <wk@gnupg.org>
* Makevars (MSGID_BUGS_ADDRESS): New. * Makevars (MSGID_BUGS_ADDRESS): New.

19
po/LINGUAS
View File

@ -1,18 +1,5 @@
# Set of available languages. # Set of available languages.
# we have disabled most of them for now.
en@quot en@boldquot
#ca cs
#da
de de
#eo el es et
#fi fr
#gl
#hu
#id it
#ja
#nl
#pl
#pt_BR pt
#sk sv
#tr
#zh_TW"

4
po/LINUGAS
View File

@ -1,4 +0,0 @@
# Set of available languages.
de

2
po/Makevars
View File

@ -1,7 +1,7 @@
# Makefile variables for PO directory in any package using GNU gettext. # Makefile variables for PO directory in any package using GNU gettext.
# Usually the message domain is the same as the package name. # Usually the message domain is the same as the package name.
DOMAIN = $(PACKAGE) DOMAIN = gnupg2
# These two variables depend on the location of this directory. # These two variables depend on the location of this directory.
subdir = po subdir = po

3
po/POTFILES.in
View File

@ -31,3 +31,6 @@ sm/keydb.c
sm/keylist.c sm/keylist.c
sm/sign.c sm/sign.c
sm/verify.c sm/verify.c
tools/gpgconf.c
tools/gpgconf-comp.c

920
po/de.po
View File

File diff suppressed because it is too large Load Diff

6
scd/scdaemon.c
View File

@ -167,12 +167,12 @@ static void
i18n_init (void) i18n_init (void)
{ {
#ifdef USE_SIMPLE_GETTEXT #ifdef USE_SIMPLE_GETTEXT
set_gettext_file( PACKAGE ); set_gettext_file( PACKAGE_GT );
#else #else
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR); bindtextdomain (PACKAGE_GT, LOCALEDIR);
textdomain (PACKAGE); textdomain (PACKAGE_GT);
#endif #endif
#endif #endif
} }

6
sm/certdump.c
View File

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

20
sm/gpgsm.c
View File

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

6
tools/gpgconf.c
View File

@ -103,7 +103,7 @@ static void
i18n_init(void) i18n_init(void)
{ {
#ifdef USE_SIMPLE_GETTEXT #ifdef USE_SIMPLE_GETTEXT
set_gettext_file (PACKAGE); set_gettext_file (PACKAGE_GT);
#else #else
# ifdef ENABLE_NLS # ifdef ENABLE_NLS
# ifdef HAVE_LC_MESSAGES # ifdef HAVE_LC_MESSAGES
@ -112,8 +112,8 @@ i18n_init(void)
# else # else
setlocale (LC_ALL, "" ); setlocale (LC_ALL, "" );
# endif # endif
bindtextdomain (PACKAGE, LOCALEDIR); bindtextdomain (PACKAGE_GT, LOCALEDIR);
textdomain (PACKAGE); textdomain (PACKAGE_GT);
# endif # endif
#endif #endif
} }