diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | README | 10 | ||||
| -rw-r--r-- | TODO | 18 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 450 | ||||
| -rw-r--r-- | configure.in | 70 | ||||
| -rw-r--r-- | g10/ChangeLog | 2 | ||||
| -rw-r--r-- | g10/getkey.c | 6 | ||||
| -rw-r--r-- | mpi/config.links | 5 | ||||
| -rw-r--r-- | po/de.po | 50 | ||||
| -rw-r--r-- | po/en.po | 50 | ||||
| -rw-r--r-- | po/es_ES.po | 50 | ||||
| -rw-r--r-- | po/it.po | 50 | ||||
| -rw-r--r-- | po/ru.po | 50 |
16 files changed, 436 insertions, 391 deletions
@@ -1,3 +1,9 @@ +Fri Nov 20 19:34:57 1998 Werner Koch (wk@isil.d.shuttle.de) + + * VERSION: Released 0.4.4 + + * configure.in (try_asm_modules): For option --disable-asm + Tue Nov 10 19:32:40 1998 Werner Koch (wk@isil.d.shuttle.de) * configure.in (MPI_SFLAGS): New. @@ -28,6 +28,8 @@ Configure options for GNUPG --disable-dynload If you have problems with dynamic loading, this option disables all dynamic loading stuff. +--disable-asm Do not use assembler modules. + Problems @@ -42,7 +44,7 @@ If you have other compile problems, try the configure options or --disable-dynload. I can't check all assembler files, so if you have problems assembling them -(or the program crashes), simply delete the files in the mpi/<cpu> directory. +(or the program crashes) use --disable-asm with ./configure. The configure scripts may consider several subdirectories to get all available assembler files; be sure to delete the correct ones. The assembler replacements are in C and in mpi/generic; never delete udiv-qrnnd.S @@ -1,5 +1,5 @@ -This is NOT a released version! -------------------------------- +Noteworthy changes in version 0.4.4 +----------------------------------- * Fixed the way the key expiration time is stored. If you have an expiration time on your key you should fix it with --edit-key @@ -334,11 +334,11 @@ -----BEGIN PGP SIGNATURE----- -Version: GNUPG v0.4.2 (GNU/Linux) +Version: GnuPG v0.4.4 (GNU/Linux) Comment: For info finger gcrypt@ftp.guug.de -iQB1AwUBNkXLyx0Z9MEMmFelAQExuwMArLtkLI3vpxZ7tCoit6hELkpyEHe10Bo6 -Ms72TXasJ8L0tKNKRE2kagV7Ie7wxl0dyENlumOxsZIKLq8DGSyjSoE7GmMQEEff -ZU+4xpO3KMw6XpJMvUWwlxpm2/WDpYTa -=Y10x +iQB1AwUBNlXAUh0Z9MEMmFelAQFmhwL/RfW9WxAMTh/edDy0yGTJjDgo7d/Kfmtq +8C0LJ4b2M0py1ctW6jZyiQsYtvkrttKiTYXGtRoIzVFWX2hqABKPCTHzOeXQEOSu +ro5fnRwsuj9cRxhH8lpN+diY+m1E5Fu3 +=sciv -----END PGP SIGNATURE----- @@ -1,5 +1,11 @@ - * hash calculation for cleartext sigs without a "Hash: xxx" line + * Check revocation and expire stuff. + + * Check calculation of key validity. + + * preferences of hash algorithms are not yet used. + + * Hash calculation for cleartext sigs without a "Hash: xxx" line does it work as specified in the RFC? - Hmmm, I think so * Check Berkeley BD - it is in glibc -any licensing problems? @@ -10,9 +16,7 @@ * Update the keyring at ftp.guug.de - * expire date is not shown in --edit-key for subkeys. - - * check support for mpi/powerpc + * check support for mpi/powerpc (see Brian's mail) * use zlib 1.1.13 to avoid a bug with 13 bit windows but there are more problems with large files @@ -26,8 +30,6 @@ * clearsig: keep lineendings as they are. Remember that trailings blanks are not hashed. - * Check revocation and expire stuff. - * Always use the latest key signature (import). This is needed, so that we are able to chnage the expiration time or other info in the selfsignature @@ -49,8 +51,6 @@ * new menu to delete signatures and list signature in menu - * commandline controlled --edit-key with assumed save. - * -rdynamic auf Solaris Problem * Replace the SIGUSR1 stuff by semaphores to avoid loss of a signal. @@ -60,8 +60,6 @@ * add some sanity checks to read_keyblock, so that we are sure that the minimal requirements are met (?) - * preferences of hash algorithms are not yet used. - * rewrite --list-packets or put it into another tool. * Burn the buffers used by fopen(), or use read(2). Does this @@ -1 +1 @@ -0.4.3c +0.4.4 diff --git a/acinclude.m4 b/acinclude.m4 index fbbe2d00d..bb8700f51 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -22,7 +22,7 @@ AC_DEFUN(WK_CHECK_TYPEDEF, ], wk_cv_typedef_$1=yes, wk_cv_typedef_$1=no )]) AC_MSG_RESULT($wk_cv_typedef_$1) if test "$wk_cv_typedef_$1" = yes; then - AC_DEFINE($2) + AC_DEFINE($2) fi ]) @@ -37,11 +37,11 @@ dnl correct when using a caching scheme dnl define(WK_LINK_FILES, [ if test "x$wk_link_files_src" = "x"; then - wk_link_files_src="$1" - wk_link_files_dst="$2" + wk_link_files_src="$1" + wk_link_files_dst="$2" else - wk_link_files_src="$wk_link_files_src $1" - wk_link_files_dst="$wk_link_files_dst $2" + wk_link_files_src="$wk_link_files_src $1" + wk_link_files_dst="$wk_link_files_dst $2" fi ]) define(WK_DO_LINK_FILES, @@ -54,38 +54,38 @@ dnl define either LITTLE_ENDIAN_HOST or BIG_ENDIAN_HOST dnl define(WK_CHECK_ENDIAN, [ if test "$cross_compiling" = yes; then - AC_MSG_WARN(cross compiling; assuming little endianess) + AC_MSG_WARN(cross compiling; assuming little endianess) fi AC_MSG_CHECKING(endianess) AC_CACHE_VAL(wk_cv_c_endian, [ wk_cv_c_endian=unknown - # See if sys/param.h defines the BYTE_ORDER macro. - AC_TRY_COMPILE([#include <sys/types.h> - #include <sys/param.h>], [ - #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN - bogus endian macros - #endif], [# It does; now see whether it defined to BIG_ENDIAN or not. - AC_TRY_COMPILE([#include <sys/types.h> - #include <sys/param.h>], [ - #if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif], wk_cv_c_endian=big, wk_cv_c_endian=little)]) - if test "$wk_cv_c_endian" = unknown; then - AC_TRY_RUN([main () { - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long l; - char c[sizeof (long)]; - } u; - u.l = 1; - exit (u.c[sizeof (long) - 1] == 1); - }], - wk_cv_c_endian=little, - wk_cv_c_endian=big, - wk_cv_c_endian=little - ) - fi + # See if sys/param.h defines the BYTE_ORDER macro. + AC_TRY_COMPILE([#include <sys/types.h> + #include <sys/param.h>], [ + #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN + bogus endian macros + #endif], [# It does; now see whether it defined to BIG_ENDIAN or not. + AC_TRY_COMPILE([#include <sys/types.h> + #include <sys/param.h>], [ + #if BYTE_ORDER != BIG_ENDIAN + not big endian + #endif], wk_cv_c_endian=big, wk_cv_c_endian=little)]) + if test "$wk_cv_c_endian" = unknown; then + AC_TRY_RUN([main () { + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long l; + char c[sizeof (long)]; + } u; + u.l = 1; + exit (u.c[sizeof (long) - 1] == 1); + }], + wk_cv_c_endian=little, + wk_cv_c_endian=big, + wk_cv_c_endian=little + ) + fi ]) AC_MSG_RESULT([$wk_cv_c_endian]) if test "$wk_cv_c_endian" = little; then @@ -102,12 +102,12 @@ define(WK_CHECK_CACHE, wk_hostcheck="$target" AC_CACHE_VAL(wk_cv_hostcheck, [ wk_cv_hostcheck="$wk_hostcheck" ]) if test "$wk_cv_hostcheck" != "$wk_hostcheck"; then - AC_MSG_RESULT(changed) - AC_MSG_WARN(config.cache exists!) - AC_MSG_ERROR(you must do 'make distclean' first to compile for - different target or different parameters.) + AC_MSG_RESULT(changed) + AC_MSG_WARN(config.cache exists!) + AC_MSG_ERROR(you must do 'make distclean' first to compile for + different target or different parameters.) else - AC_MSG_RESULT(ok) + AC_MSG_RESULT(ok) fi ]) @@ -125,41 +125,41 @@ define(WK_CHECK_IPC, if test "$ac_cv_header_sys_shm_h" = "yes"; then AC_MSG_CHECKING(whether shmctl IPC_RMID allowes subsequent attaches) AC_TRY_RUN([ - #include <sys/types.h> - #include <sys/ipc.h> - #include <sys/shm.h> - int main() - { - int id; - char *shmaddr; - id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0777); - if (id == -1) - exit (2); - shmaddr = shmat (id, 0, 0); - shmctl (id, IPC_RMID, 0); - if ((char*) shmat (id, 0, 0) == (char*) -1) - { - shmdt (shmaddr); - exit (1); - } - shmdt (shmaddr); - shmdt (shmaddr); - exit (0); - } - ], - AC_DEFINE(IPC_RMID_DEFERRED_RELEASE) - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no), - AC_MSG_RESULT(assuming no)) + #include <sys/types.h> + #include <sys/ipc.h> + #include <sys/shm.h> + int main() + { + int id; + char *shmaddr; + id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0777); + if (id == -1) + exit (2); + shmaddr = shmat (id, 0, 0); + shmctl (id, IPC_RMID, 0); + if ((char*) shmat (id, 0, 0) == (char*) -1) + { + shmdt (shmaddr); + exit (1); + } + shmdt (shmaddr); + shmdt (shmaddr); + exit (0); + } + ], + AC_DEFINE(IPC_RMID_DEFERRED_RELEASE) + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no), + AC_MSG_RESULT(assuming no)) AC_MSG_CHECKING(whether SHM_LOCK is available) AC_TRY_COMPILE([#include <sys/types.h> - #include <sys/ipc.h> - #include <sys/shm.h>],[ - int foo( int shm_id ) { shmctl(shm_id, SHM_LOCK, 0); } - ], - AC_DEFINE(IPC_HAVE_SHM_LOCK) - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) + #include <sys/ipc.h> + #include <sys/shm.h>],[ + int foo( int shm_id ) { shmctl(shm_id, SHM_LOCK, 0); } + ], + AC_DEFINE(IPC_HAVE_SHM_LOCK) + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) fi ]) @@ -173,38 +173,38 @@ dnl define(WK_CHECK_MLOCK, [ AC_CHECK_FUNCS(mlock) if test "$ac_cv_func_mlock" = "yes"; then - AC_MSG_CHECKING(whether mlock is broken) - AC_TRY_RUN([ - #include <stdlib.h> - #include <unistd.h> - #include <errno.h> - #include <sys/mman.h> - #include <sys/types.h> - #include <fcntl.h> - - int main() - { - char *pool; - int err; - long int pgsize = getpagesize(); - - pool = malloc( 4096 + pgsize ); - if( !pool ) - return 2; - pool += (pgsize - ((long int)pool % pgsize)); - - err = mlock( pool, 4096 ); - if( !err || errno == EPERM ) - return 0; /* okay */ - - return 1; /* hmmm */ - } - - ], - AC_MSG_RESULT(no), - AC_DEFINE(HAVE_BROKEN_MLOCK) - AC_MSG_RESULT(yes), - AC_MSG_RESULT(assuming no)) + AC_MSG_CHECKING(whether mlock is broken) + AC_TRY_RUN([ + #include <stdlib.h> + #include <unistd.h> + #include <errno.h> + #include <sys/mman.h> + #include <sys/types.h> + #include <fcntl.h> + + int main() + { + char *pool; + int err; + long int pgsize = getpagesize(); + + pool = malloc( 4096 + pgsize ); + if( !pool ) + return 2; + pool += (pgsize - ((long int)pool % pgsize)); + + err = mlock( pool, 4096 ); + if( !err || errno == EPERM ) + return 0; /* okay */ + + return 1; /* hmmm */ + } + + ], + AC_MSG_RESULT(no), + AC_DEFINE(HAVE_BROKEN_MLOCK) + AC_MSG_RESULT(yes), + AC_MSG_RESULT(assuming no)) fi ]) @@ -229,7 +229,7 @@ AC_DEFUN(AM_WITH_NLS, [AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], + [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) AC_MSG_RESULT($USE_NLS) AC_SUBST(USE_NLS) @@ -241,131 +241,131 @@ AC_DEFUN(AM_WITH_NLS, AC_DEFINE(ENABLE_NLS) AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH(included-gettext, - [ --with-included-gettext use the GNU gettext library included here], - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If gettext or catgets are available (in this order) we - dnl use this. Else we have to fall back to GNU NLS library. - dnl catgets is only used if permitted by option --with-catgets. - nls_cv_header_intl= - nls_cv_header_libgt= - CATOBJEXT=NONE - - AC_CHECK_HEADER(libintl.h, - [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, - [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")], - gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) - - if test "$gt_cv_func_gettext_libc" != "yes"; then - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, gettext, - gt_cv_func_gettext_libintl=yes, - gt_cv_func_gettext_libintl=no)]) - fi - - if test "$gt_cv_func_gettext_libintl" = "yes" ; then - LIBS="-lintl $LIBS" - fi - - if test "$gt_cv_func_gettext_libc" = "yes" \ - || test "$gt_cv_func_gettext_libintl" = "yes"; then - AC_DEFINE(HAVE_GETTEXT) - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - AC_CHECK_FUNCS(dcgettext) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - INSTOBJEXT=.mo - fi - fi - ]) - - if test "$CATOBJEXT" = "NONE"; then - AC_MSG_CHECKING([whether catgets can be used]) - AC_ARG_WITH(catgets, - [ --with-catgets use catgets functions if available], - nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) - AC_MSG_RESULT($nls_cv_use_catgets) - - if test "$nls_cv_use_catgets" = "yes"; then - dnl No gettext in C library. Try catgets next. - AC_CHECK_LIB(i, main) - AC_CHECK_FUNC(catgets, - [AC_DEFINE(HAVE_CATGETS) - INTLOBJS="\$(CATOBJS)" - AC_PATH_PROG(GENCAT, gencat, no)dnl - if test "$GENCAT" != "no"; then - AC_PATH_PROG(GMSGFMT, gmsgfmt, no) - if test "$GMSGFMT" = "no"; then - AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) - fi - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.cat - INSTOBJEXT=.cat - DATADIRNAME=lib - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi]) - fi - fi - - if test "$CATOBJEXT" = "NONE"; then - dnl Neither gettext nor catgets in included in the C library. - dnl Fall back on GNU gettext library. - nls_cv_use_gnu_gettext=yes - fi + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If gettext or catgets are available (in this order) we + dnl use this. Else we have to fall back to GNU NLS library. + dnl catgets is only used if permitted by option --with-catgets. + nls_cv_header_intl= + nls_cv_header_libgt= + CATOBJEXT=NONE + + AC_CHECK_HEADER(libintl.h, + [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, + [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")], + gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) + + if test "$gt_cv_func_gettext_libc" != "yes"; then + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, gettext, + gt_cv_func_gettext_libintl=yes, + gt_cv_func_gettext_libintl=no)]) + fi + + if test "$gt_cv_func_gettext_libintl" = "yes" ; then + LIBS="-lintl $LIBS" + fi + + if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$gt_cv_func_gettext_libintl" = "yes"; then + AC_DEFINE(HAVE_GETTEXT) + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_CHECK_FUNCS(dcgettext) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + INSTOBJEXT=.mo + fi + fi + ]) + + if test "$CATOBJEXT" = "NONE"; then + AC_MSG_CHECKING([whether catgets can be used]) + AC_ARG_WITH(catgets, + [ --with-catgets use catgets functions if available], + nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) + AC_MSG_RESULT($nls_cv_use_catgets) + + if test "$nls_cv_use_catgets" = "yes"; then + dnl No gettext in C library. Try catgets next. + AC_CHECK_LIB(i, main) + AC_CHECK_FUNC(catgets, + [AC_DEFINE(HAVE_CATGETS) + INTLOBJS="\$(CATOBJS)" + AC_PATH_PROG(GENCAT, gencat, no)dnl + if test "$GENCAT" != "no"; then + AC_PATH_PROG(GMSGFMT, gmsgfmt, no) + if test "$GMSGFMT" = "no"; then + AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) + fi + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.cat + INSTOBJEXT=.cat + DATADIRNAME=lib + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi]) + fi + fi + + if test "$CATOBJEXT" = "NONE"; then + dnl Neither gettext nor catgets in included in the C library. + dnl Fall back on GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi fi if test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions used to generate GNU NLS library. - INTLOBJS="\$(GETTOBJS)" - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_SUBST(MSGFMT) - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.gmo - INSTOBJEXT=.mo - DATADIRNAME=share - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h + dnl Mark actions used to generate GNU NLS library. + INTLOBJS="\$(GETTOBJS)" + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_SUBST(MSGFMT) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h fi dnl Test whether we really found GNU xgettext. if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi fi # We need to process the po/ directory. @@ -378,7 +378,7 @@ AC_DEFUN(AM_WITH_NLS, AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) AC_OUTPUT_COMMANDS( [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac]) @@ -447,9 +447,9 @@ strdup __argz_count __argz_stringify __argz_next]) AC_MSG_CHECKING(for catalogs to be installed) NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do - case "$ALL_LINGUAS" in - *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; - esac + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac done LINGUAS=$NEW_LINGUAS AC_MSG_RESULT($LINGUAS) @@ -474,7 +474,7 @@ strdup __argz_count __argz_stringify __argz_next]) dnl Determine which catalog format we have (if any is needed) dnl For now we know about two different formats: - dnl Linux libc-5 and the normal X/Open format + dnl Linux libc-5 and the normal X/Open format test -d intl || mkdir intl if test "$CATOBJEXT" = ".cat"; then AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) @@ -488,7 +488,7 @@ strdup __argz_count __argz_stringify __argz_next]) $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed dnl In the intl/Makefile.in we have a special dependency which makes - dnl only sense for gettext. We comment this out for non-gettext + dnl only sense for gettext. We comment this out for non-gettext dnl packages. if test "$PACKAGE" = "gettext"; then GT_NO="#NO#" @@ -530,6 +530,6 @@ strdup __argz_count __argz_stringify __argz_next]) fi rm -f po/POTFILES sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES + < $srcdir/po/POTFILES.in > po/POTFILES ]) diff --git a/configure.in b/configure.in index 2b2fdcabc..7265e6ef9 100644 --- a/configure.in +++ b/configure.in @@ -20,17 +20,27 @@ AC_SUBST(PACKAGE) AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") +AC_MSG_CHECKING([whether use of /dev/random is requested]) AC_ARG_ENABLE(dev-random, [ --disable-dev-random disable the use of dev random], try_dev_random=$enableval, try_dev_random=yes) +AC_MSG_RESULT($try_dev_random) +AC_MSG_CHECKING([whether use of extensions is requested]) AC_ARG_ENABLE(dynload, -[ --disable-dynload disable dynamic loading], +[ --disable-dynload disable use of extensions], try_dynload=$enableval, try_dynload=yes) +AC_MSG_RESULT($try_dynload) + +AC_MSG_CHECKING([whether assembler modules are requested]) +AC_ARG_ENABLE(asm, +[ --disable-asm do not use assembler modules], + try_asm_modules=$enableval, try_asm_modules=yes) +AC_MSG_RESULT($try_asm_modules) AC_MSG_CHECKING([whether memory debugging is requested]) AC_ARG_ENABLE(m-debug, -[ --enable-m-debug enable debugging of memory allocation], +[ --enable-m-debug enable debugging of memory allocation], use_m_debug=$enableval, use_m_debug=no) AC_MSG_RESULT($use_m_debug) if test "$use_m_debug" = yes; then @@ -80,50 +90,50 @@ AM_CYGWIN32 case "${target}" in i386--mingw32) - # special stuff for Windoze NT - cross_compiling=yes - CC="i386--mingw32-gcc" - CPP="i386--mingw32-gcc -E" - RANLIB="i386--mingw32-ranlib" - ac_cv_have_dev_random=no - AC_DEFINE(USE_RAND_W32) - ;; + # special stuff for Windoze NT + cross_compiling=yes + CC="i386--mingw32-gcc" + CPP="i386--mingw32-gcc -E" + RANLIB="i386--mingw32-ranlib" + ac_cv_have_dev_random=no + AC_DEFINE(USE_RAND_W32) + ;; *-*-hpux*) - if test -z "$GCC" ; then - CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE" - fi - AC_DEFINE(USE_RAND_UNIX) - ;; + if test -z "$GCC" ; then + CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE" + fi + AC_DEFINE(USE_RAND_UNIX) + ;; *) - AC_DEFINE(USE_RAND_UNIX) + AC_DEFINE(USE_RAND_UNIX) ;; esac case "${target}" in i386--mingw32) - PRINTABLE_OS_NAME="MingW32" - ;; + PRINTABLE_OS_NAME="MingW32" + ;; *-linux*) - PRINTABLE_OS_NAME="GNU/Linux" - ;; + PRINTABLE_OS_NAME="GNU/Linux" + ;; *) - PRINTABLE_OS_NAME=`uname -s || echo "Unknown"` - ;; + PRINTABLE_OS_NAME=`uname -s || echo "Unknown"` + ;; esac AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME") dnl Fixme: Are these the best flags for OpenBSD???? case "${target}" in *-openbsd*) - NAME_OF_DEV_RANDOM="/dev/srandom" - NAME_OF_DEV_URANDOM="/dev/urandom" - DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x" - ;; + NAME_OF_DEV_RANDOM="/dev/srandom" + NAME_OF_DEV_URANDOM="/dev/urandom" + DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x" + ;; *) - NAME_OF_DEV_RANDOM="/dev/random" - NAME_OF_DEV_URANDOM="/dev/urandom" - DYNLINK_MOD_CFLAGS="-shared -fPIC -lc" - ;; + NAME_OF_DEV_RANDOM="/dev/random" + NAME_OF_DEV_URANDOM="/dev/urandom" + DYNLINK_MOD_CFLAGS="-shared -fPIC -lc" + ;; esac AC_DEFINE_UNQUOTED(NAME_OF_DEV_RANDOM, "$NAME_OF_DEV_RANDOM") AC_DEFINE_UNQUOTED(NAME_OF_DEV_URANDOM, "$NAME_OF_DEV_URANDOM") diff --git a/g10/ChangeLog b/g10/ChangeLog index be2a984f9..8e0cc8574 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -4,6 +4,8 @@ Fri Nov 20 16:54:52 1998 Werner Koch (wk@isil.d.shuttle.de) * sign.c (write_dashed_escaped): Ditto. * armor.c (find_header): Support for NotDashEscaped header. + * getkey.c: print "disabled cache.." only if verbose is used. + Thu Nov 19 07:17:31 1998 Werner Koch <werner.koch@guug.de> * parse-packet.c (dump_sig_subpkt): Fixed expire listing diff --git a/g10/getkey.c b/g10/getkey.c index a6d0ed1a9..ba98d17ac 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -160,7 +160,8 @@ cache_public_key( PKT_public_key *pk ) if( pk_cache_entries >= MAX_PK_CACHE_ENTRIES ) { /* fixme: use another algorithm to free some cache slots */ pk_cache_disabled=1; - log_info(_("too many entries in pk cache - disabled\n")); + if( opt.verbose ) + log_info(_("too many entries in pk cache - disabled\n")); return; } pk_cache_entries++; @@ -258,7 +259,8 @@ get_pubkey( PKT_public_key *pk, u32 *keyid ) ; else if( ++unk_cache_entries > MAX_UNK_CACHE_ENTRIES ) { unk_cache_disabled = 1; - log_info(_("too many entries in unk cache - disabled\n")); + if( opt.verbose ) + log_info(_("too many entries in unk cache - disabled\n")); } else { keyid_list_t kl; diff --git a/mpi/config.links b/mpi/config.links index df8d1bb3c..11871a83f 100644 --- a/mpi/config.links +++ b/mpi/config.links @@ -10,6 +10,7 @@ test -d ./mpi || mkdir ./mpi echo '/* created by config.links - do not edit */' >./mpi/asm-syntax.h +if test "$try_asm_modules" = "yes" ; then case "${target}" in i[34]86*-*-freebsd*-elf | i[34]86*-*-freebsd3*) echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h @@ -151,6 +152,10 @@ case "${target}" in path="" ;; esac +else + echo '/* Assembler modules disabled on request */' >>./mpi/asm-syntax.h + path="" +fi case "${target}" in @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 1998-11-20 15:17+0100\n" +"POT-Creation-Date: 1998-11-20 19:52+0100\n" "PO-Revision-Date: 1998-11-18 20:10+0200\n" "Last-Translator: Walter Koch <walterk@mail.dip.de>\n" "Language-Team: German <de@li.org>\n" @@ -757,45 +757,45 @@ msgstr "Ungültige ASCII-Hülle" msgid "armor: %s\n" msgstr "ASCII-Hülle: %s\n" -#: g10/armor.c:530 +#: g10/armor.c:532 msgid "invalid dash escaped line: " msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: " -#: g10/armor.c:599 +#: g10/armor.c:601 msgid "invalid clear text header: " msgstr "ungültige Klartexteinleitung" -#: g10/armor.c:841 +#: g10/armor.c:843 #, fuzzy, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "Ungültiges \"radix64\" Zeichen %02x ignoriert\n" -#: g10/armor.c:874 +#: g10/armor.c:876 msgid "premature eof (no CRC)\n" msgstr "vorzeitiges Dateiende (keine Prüfsumme)\n" -#: g10/armor.c:893 +#: g10/armor.c:895 msgid "premature eof (in CRC)\n" msgstr "vorzeitiges Dateiende (innerhalb der Prüfsumme)\n" -#: g10/armor.c:897 +#: g10/armor.c:899 msgid "malformed CRC\n" msgstr "Falsch aufgebaute Prüfsumme\n" -#: g10/armor.c:901 +#: g10/armor.c:903 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "Prüfsummenfehler; %06lx - %06lx\n" -#: g10/armor.c:920 +#: g10/armor.c:922 msgid "premature eof (in Trailer)\n" msgstr "vorzeitiges Dateiende (im Nachsatz)\n" -#: g10/armor.c:924 +#: g10/armor.c:926 msgid "error in trailer line\n" msgstr "Fehler in der Nachsatzzeile\n" -#: g10/armor.c:1178 +#: g10/armor.c:1180 msgid "no valid RFC1991 or OpenPGP data found.\n" msgstr "Keine gültigen RFC1991- oder OpenPGP-Daten gefunden.\n" @@ -1396,15 +1396,15 @@ msgstr "%s verschlüsselt für: %s\n" msgid "WARNING: nothing exported\n" msgstr "WARNUNG: Ein Schlüssel ohne gesichertes Vertrauen wird benutzt!\n" -#: g10/getkey.c:163 +#: g10/getkey.c:164 msgid "too many entries in pk cache - disabled\n" msgstr "" -#: g10/getkey.c:261 +#: g10/getkey.c:263 msgid "too many entries in unk cache - disabled\n" msgstr "" -#: g10/getkey.c:967 +#: g10/getkey.c:969 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" @@ -2108,15 +2108,19 @@ msgid "Changing exiration time for the primary key.\n" msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n" #: g10/keyedit.c:1250 +msgid "You can't change the expiration date of a v3 key\n" +msgstr "" + +#: g10/keyedit.c:1266 msgid "No corresponding signature in secret ring\n" msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n" -#: g10/keyedit.c:1310 +#: g10/keyedit.c:1326 #, c-format msgid "No user id with index %d\n" msgstr "Keine User-ID mit Index %d\n" -#: g10/keyedit.c:1355 +#: g10/keyedit.c:1371 #, c-format msgid "No secondary key with index %d\n" msgstr "Kein Zweitschlüssel mit Index %d\n" @@ -2152,33 +2156,33 @@ msgstr "" msgid "original file name='%.*s'\n" msgstr "" -#: g10/mainproc.c:837 +#: g10/mainproc.c:833 msgid "signature verification suppressed\n" msgstr "" -#: g10/mainproc.c:843 +#: g10/mainproc.c:839 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signatur am %.*s mit %s Schlüssel %08lX erzeugt\n" -#: g10/mainproc.c:851 +#: g10/mainproc.c:847 msgid "BAD signature from \"" msgstr "FALSCHE Signatur von \"" -#: g10/mainproc.c:852 +#: g10/mainproc.c:848 msgid "Good signature from \"" msgstr "Gültige Signatur von \"" -#: g10/mainproc.c:865 +#: g10/mainproc.c:861 #, c-format msgid "Can't check signature: %s\n" msgstr "Signatur kann nicht geprüft werden: %s\n" -#: g10/mainproc.c:938 +#: g10/mainproc.c:934 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:943 +#: g10/mainproc.c:939 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 1998-11-20 15:17+0100\n" +"POT-Creation-Date: 1998-11-20 19:52+0100\n" "Content-Type: text/plain; charset=\n" "Date: 1998-08-08 18:07:50+0200\n" "From: Werner Koch <wk@frodo>\n" @@ -710,45 +710,45 @@ msgstr "" msgid "armor: %s\n" msgstr "" -#: g10/armor.c:530 +#: g10/armor.c:532 msgid "invalid dash escaped line: " msgstr "" -#: g10/armor.c:599 +#: g10/armor.c:601 msgid "invalid clear text header: " msgstr "" -#: g10/armor.c:841 +#: g10/armor.c:843 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "" -#: g10/armor.c:874 +#: g10/armor.c:876 msgid "premature eof (no CRC)\n" msgstr "" -#: g10/armor.c:893 +#: g10/armor.c:895 msgid "premature eof (in CRC)\n" msgstr "" -#: g10/armor.c:897 +#: g10/armor.c:899 msgid "malformed CRC\n" msgstr "" -#: g10/armor.c:901 +#: g10/armor.c:903 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "" -#: g10/armor.c:920 +#: g10/armor.c:922 msgid "premature eof (in Trailer)\n" msgstr "" -#: g10/armor.c:924 +#: g10/armor.c:926 msgid "error in trailer line\n" msgstr "" -#: g10/armor.c:1178 +#: g10/armor.c:1180 msgid "no valid RFC1991 or OpenPGP data found.\n" msgstr "" @@ -1297,15 +1297,15 @@ msgstr "" msgid "WARNING: nothing exported\n" msgstr "" -#: g10/getkey.c:163 +#: g10/getkey.c:164 msgid "too many entries in pk cache - disabled\n" msgstr "" -#: g10/getkey.c:261 +#: g10/getkey.c:263 msgid "too many entries in unk cache - disabled\n" msgstr "" -#: g10/getkey.c:967 +#: g10/getkey.c:969 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" @@ -1974,15 +1974,19 @@ msgid "Changing exiration time for the primary key.\n" msgstr "" #: g10/keyedit.c:1250 +msgid "You can't change the expiration date of a v3 key\n" +msgstr "" + +#: g10/keyedit.c:1266 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:1310 +#: g10/keyedit.c:1326 #, c-format msgid "No user id with index %d\n" msgstr "" -#: g10/keyedit.c:1355 +#: g10/keyedit.c:1371 #, c-format msgid "No secondary key with index %d\n" msgstr "" @@ -2014,33 +2018,33 @@ msgstr "" msgid "original file name='%.*s'\n" msgstr "" -#: g10/mainproc.c:837 +#: g10/mainproc.c:833 msgid "signature verification suppressed\n" msgstr "" -#: g10/mainproc.c:843 +#: g10/mainproc.c:839 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "" -#: g10/mainproc.c:851 +#: g10/mainproc.c:847 msgid "BAD signature from \"" msgstr "" -#: g10/mainproc.c:852 +#: g10/mainproc.c:848 msgid "Good signature from \"" msgstr "" -#: g10/mainproc.c:865 +#: g10/mainproc.c:861 #, c-format msgid "Can't check signature: %s\n" msgstr "" -#: g10/mainproc.c:938 +#: g10/mainproc.c:934 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:943 +#: g10/mainproc.c:939 msgid "invalid root packet detected in proc_tree()\n" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 3d6c0a44a..ab60f6260 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,7 +5,7 @@ # I also got inspiration from it.po by Marco d'Itri <md@linux.it> msgid "" msgstr "" -"POT-Creation-Date: 1998-11-20 15:17+0100\n" +"POT-Creation-Date: 1998-11-20 19:52+0100\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-13 10:49:25+0100\n" "From: Urko Lusa <ulusa@lacueva.ddns.org>\n" @@ -742,45 +742,45 @@ msgstr "cabecera de armadura no válida: " msgid "armor: %s\n" msgstr "armadura: %s\n" -#: g10/armor.c:530 +#: g10/armor.c:532 msgid "invalid dash escaped line: " msgstr "Línea con guiones no válida: " -#: g10/armor.c:599 +#: g10/armor.c:601 msgid "invalid clear text header: " msgstr "cabecera de texto claro no válida: " -#: g10/armor.c:841 +#: g10/armor.c:843 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "caracteres no válidos radix64 %02x ignorados\n" -#: g10/armor.c:874 +#: g10/armor.c:876 msgid "premature eof (no CRC)\n" msgstr "Fin de fichero prematuro\n" -#: g10/armor.c:893 +#: g10/armor.c:895 msgid "premature eof (in CRC)\n" msgstr "Fin de suma de comprobación prematuro\n" -#: g10/armor.c:897 +#: g10/armor.c:899 msgid "malformed CRC\n" msgstr "Suma de comprobación mal creada\n" -#: g10/armor.c:901 +#: g10/armor.c:903 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "Error en suma de comprobación: %06lx - %06lx\n" -#: g10/armor.c:920 +#: g10/armor.c:922 msgid "premature eof (in Trailer)\n" msgstr "" -#: g10/armor.c:924 +#: g10/armor.c:926 msgid "error in trailer line\n" msgstr "" -#: g10/armor.c:1178 +#: g10/armor.c:1180 msgid "no valid RFC1991 or OpenPGP data found.\n" msgstr "RFC1991 no válida o datos OpenPGP no encontrados\n" @@ -1372,15 +1372,15 @@ msgstr "%s cifrado para: %s\n" msgid "WARNING: nothing exported\n" msgstr "ATENCIÓN: ¡Usando una clave no fiable!\n" -#: g10/getkey.c:163 +#: g10/getkey.c:164 msgid "too many entries in pk cache - disabled\n" msgstr "" -#: g10/getkey.c:261 +#: g10/getkey.c:263 msgid "too many entries in unk cache - disabled\n" msgstr "" -#: g10/getkey.c:967 +#: g10/getkey.c:969 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n" @@ -2058,15 +2058,19 @@ msgid "Changing exiration time for the primary key.\n" msgstr "Cambiando caducidad de clave primaria.\n" #: g10/keyedit.c:1250 +msgid "You can't change the expiration date of a v3 key\n" +msgstr "" + +#: g10/keyedit.c:1266 msgid "No corresponding signature in secret ring\n" msgstr "No hay firma correspondiente en anillo secreto\n" -#: g10/keyedit.c:1310 +#: g10/keyedit.c:1326 #, c-format msgid "No user id with index %d\n" msgstr "No hay ningún identificativo de usuario con el índice %d\n" -#: g10/keyedit.c:1355 +#: g10/keyedit.c:1371 #, c-format msgid "No secondary key with index %d\n" msgstr "No hay ninguna clave secundaria con el índice %d\n" @@ -2101,33 +2105,33 @@ msgstr "nota: el remitente solicitó \"sólo-para-tus-ojos\"\n" msgid "original file name='%.*s'\n" msgstr "" -#: g10/mainproc.c:837 +#: g10/mainproc.c:833 msgid "signature verification suppressed\n" msgstr "" -#: g10/mainproc.c:843 +#: g10/mainproc.c:839 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Firma creada %.*s usando identificativo de clave %08lX\n" -#: g10/mainproc.c:851 +#: g10/mainproc.c:847 msgid "BAD signature from \"" msgstr "Firma INCORRECTA de \"" -#: g10/mainproc.c:852 +#: g10/mainproc.c:848 msgid "Good signature from \"" msgstr "Firma correcta de \"" -#: g10/mainproc.c:865 +#: g10/mainproc.c:861 #, c-format msgid "Can't check signature: %s\n" msgstr "Imposible comprobar la firma: %s\n" -#: g10/mainproc.c:938 +#: g10/mainproc.c:934 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:943 +#: g10/mainproc.c:939 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.4.3\n" -"POT-Creation-Date: 1998-11-20 15:17+0100\n" +"POT-Creation-Date: 1998-11-20 19:52+0100\n" "PO-Revision-Date: 1998-11-09 16:19+01:00\n" "Last-Translator: Marco d'Itri <md@linux.it>\n" "Language-Team: Italian <it@li.org>\n" @@ -732,45 +732,45 @@ msgstr "header dell'armatura non valido: " msgid "armor: %s\n" msgstr "armatura: %s\n" -#: g10/armor.c:530 +#: g10/armor.c:532 msgid "invalid dash escaped line: " msgstr "riga protetta con il trattino non valida: " -#: g10/armor.c:599 +#: g10/armor.c:601 msgid "invalid clear text header: " msgstr "header del testo in chiaro non valido: " -#: g10/armor.c:841 +#: g10/armor.c:843 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "Carattere radix64 non valido %02x saltato\n" -#: g10/armor.c:874 +#: g10/armor.c:876 msgid "premature eof (no CRC)\n" msgstr "eof prematura (nessun CRC)\n" -#: g10/armor.c:893 +#: g10/armor.c:895 msgid "premature eof (in CRC)\n" msgstr "eof prematura (nel CRC)\n" -#: g10/armor.c:897 +#: g10/armor.c:899 msgid "malformed CRC\n" msgstr "CRC malformato\n" -#: g10/armor.c:901 +#: g10/armor.c:903 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "errore nel CRC; %06lx - %06lx\n" -#: g10/armor.c:920 +#: g10/armor.c:922 msgid "premature eof (in Trailer)\n" msgstr "eof prematura (nella coda)\n" -#: g10/armor.c:924 +#: g10/armor.c:926 msgid "error in trailer line\n" msgstr "errore nella riga della coda\n" -#: g10/armor.c:1178 +#: g10/armor.c:1180 msgid "no valid RFC1991 or OpenPGP data found.\n" msgstr "Non sono stati trovati dati RFC1991 o OpenPGP validi.\n" @@ -1361,15 +1361,15 @@ msgstr "%s crittografato per: %s\n" msgid "WARNING: nothing exported\n" msgstr "ATTENZIONE: uso di una chiave non fidata!\n" -#: g10/getkey.c:163 +#: g10/getkey.c:164 msgid "too many entries in pk cache - disabled\n" msgstr "" -#: g10/getkey.c:261 +#: g10/getkey.c:263 msgid "too many entries in unk cache - disabled\n" msgstr "" -#: g10/getkey.c:967 +#: g10/getkey.c:969 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n" @@ -2046,15 +2046,19 @@ msgid "Changing exiration time for the primary key.\n" msgstr "Modifico il tempo di scadenza per la chiave primaria.\n" #: g10/keyedit.c:1250 +msgid "You can't change the expiration date of a v3 key\n" +msgstr "" + +#: g10/keyedit.c:1266 msgid "No corresponding signature in secret ring\n" msgstr "Manca la firma corrispondente nel portachiavi segreto\n" -#: g10/keyedit.c:1310 +#: g10/keyedit.c:1326 #, c-format msgid "No user id with index %d\n" msgstr "Nessun user id con l'indice %d\n" -#: g10/keyedit.c:1355 +#: g10/keyedit.c:1371 #, c-format msgid "No secondary key with index %d\n" msgstr "Nessuna chiave secondaria con l'indice %d\n" @@ -2089,33 +2093,33 @@ msgstr "nota: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n" msgid "original file name='%.*s'\n" msgstr "" -#: g10/mainproc.c:837 +#: g10/mainproc.c:833 msgid "signature verification suppressed\n" msgstr "" -#: g10/mainproc.c:843 +#: g10/mainproc.c:839 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Firma fatta %.*s usando %s key ID %08lX\n" -#: g10/mainproc.c:851 +#: g10/mainproc.c:847 msgid "BAD signature from \"" msgstr "Firma NON corretta da \"" -#: g10/mainproc.c:852 +#: g10/mainproc.c:848 msgid "Good signature from \"" msgstr "Buona firma da \"" -#: g10/mainproc.c:865 +#: g10/mainproc.c:861 #, c-format msgid "Can't check signature: %s\n" msgstr "Impossibile controllare la firma: %s\n" -#: g10/mainproc.c:938 +#: g10/mainproc.c:934 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:943 +#: g10/mainproc.c:939 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -9,7 +9,7 @@ # QingLong <qinglong@Bolizm> (couldn't send an email to let you know) msgid "" msgstr "" -"POT-Creation-Date: 1998-11-20 15:17+0100\n" +"POT-Creation-Date: 1998-11-20 19:52+0100\n" "Content-Type: text/plain; charset=\n" "Date: 1998-01-26 22:08:36+0100\n" "From: Gregory Steuck <steuck@iname.com>\n" @@ -760,45 +760,45 @@ msgstr "" msgid "armor: %s\n" msgstr "ëÏÄÉÒÏ×ËÁ: %s\n" -#: g10/armor.c:530 +#: g10/armor.c:532 msgid "invalid dash escaped line: " msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÔÒÏËÁ ÎÁÞÉÎÁÀÝÁÑÓÑ Ó ÍÉÎÕÓÏ×: " -#: g10/armor.c:599 +#: g10/armor.c:601 msgid "invalid clear text header: " msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÔÅËÓÔÏ×ÙÊ ÚÁÇÏÌÏ×ÏË: " -#: g10/armor.c:841 +#: g10/armor.c:843 #, fuzzy, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÌÑ ËÏÄÉÒÏ×ËÉ radix64 ÓÉÍ×ÏÌ %02x ÐÒÏÐÕÝÅÎ\n" -#: g10/armor.c:874 +#: g10/armor.c:876 msgid "premature eof (no CRC)\n" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (ÎÅÔ CRC)\n" -#: g10/armor.c:893 +#: g10/armor.c:895 msgid "premature eof (in CRC)\n" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (× CRC)\n" -#: g10/armor.c:897 +#: g10/armor.c:899 msgid "malformed CRC\n" msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÆÏÒÍÁ CRC\n" -#: g10/armor.c:901 +#: g10/armor.c:903 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "ÏÛÉÂËÁ CRC; %06lx - %06lx\n" -#: g10/armor.c:920 +#: g10/armor.c:922 msgid "premature eof (in Trailer)\n" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (× È×ÏÓÔÅ)\n" -#: g10/armor.c:924 +#: g10/armor.c:926 msgid "error in trailer line\n" msgstr "ÏÛÉÂËÁ × ÚÁ×ÅÒÛÁÀÝÅÊ ÓÔÒÏËÅ\n" -#: g10/armor.c:1178 +#: g10/armor.c:1180 msgid "no valid RFC1991 or OpenPGP data found.\n" msgstr "ÎÅ ÎÁÊÄÅÎÏ ÄÏÐÕÓÔÉÍÙÈ RFC1991 ÉÌÉ OpenPGP ÄÁÎÎÙÈ.\n" @@ -1393,15 +1393,15 @@ msgstr "%s ÚÁÛÉÆÒÏ×ÁÎÏ ÄÌÑ: %s\n" msgid "WARNING: nothing exported\n" msgstr "÷îéíáîéå: éÓÐÏÌØÚÕÅÔÓÑ ËÌÀÞ Ë ËÏÔÏÒÏÍÕ ÎÅÔ ÄÏ×ÅÒÉÑ!\n" -#: g10/getkey.c:163 +#: g10/getkey.c:164 msgid "too many entries in pk cache - disabled\n" msgstr "" -#: g10/getkey.c:261 +#: g10/getkey.c:263 msgid "too many entries in unk cache - disabled\n" msgstr "" -#: g10/getkey.c:967 +#: g10/getkey.c:969 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "ÉÓÐÏÌØÚÕÅÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ËÌÀÞ %09lX ×ÍÅÓÔÏ ÏÓÎÏ×ÎÏÇÏ %08lX%\n" @@ -2101,15 +2101,19 @@ msgid "Changing exiration time for the primary key.\n" msgstr "" #: g10/keyedit.c:1250 +msgid "You can't change the expiration date of a v3 key\n" +msgstr "" + +#: g10/keyedit.c:1266 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:1310 +#: g10/keyedit.c:1326 #, c-format msgid "No user id with index %d\n" msgstr "îÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ Ó ÉÎÄÅËÓÏÍ %d\n" -#: g10/keyedit.c:1355 +#: g10/keyedit.c:1371 #, c-format msgid "No secondary key with index %d\n" msgstr "îÅÔ ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ ËÌÀÞÁ Ó ÉÎÄÅËÓÏÍ %d\n" @@ -2144,33 +2148,33 @@ msgstr "ÚÁÍÅÞÁÎÉÅ: ÏÔÐÒÁ×ÉÔÅÌØ ÚÁÐÒÏÓÉÌ \"ÔÏÌØËÏ-ÄÌÑ-÷ÁÛÉÈ-ÇÌÁÚ\"\n" msgid "original file name='%.*s'\n" msgstr "" -#: g10/mainproc.c:837 +#: g10/mainproc.c:833 msgid "signature verification suppressed\n" msgstr "" -#: g10/mainproc.c:843 +#: g10/mainproc.c:839 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "ðÏÄÐÉÓØ ÓÄÅÌÁÎÁ %.*s, ÉÓÐÏÌØÚÕÑ %s ËÌÀÞ %08lX\n" -#: g10/mainproc.c:851 +#: g10/mainproc.c:847 msgid "BAD signature from \"" msgstr "ðìïèáñ ÐÏÄÐÉÓØ ÏÔ \"" -#: g10/mainproc.c:852 +#: g10/mainproc.c:848 msgid "Good signature from \"" msgstr "èÏÒÏÛÁÑ ÐÏÄÐÉÓØ ÏÔ \"" -#: g10/mainproc.c:865 +#: g10/mainproc.c:861 #, c-format msgid "Can't check signature: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ: %s\n" -#: g10/mainproc.c:938 +#: g10/mainproc.c:934 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:943 +#: g10/mainproc.c:939 msgid "invalid root packet detected in proc_tree()\n" msgstr "" |