From 32fe5215a23455d9a80f55419201d73f029390bd Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 22 Mar 2000 12:45:04 +0000 Subject: [PATCH] See ChangeLog: Wed Mar 22 13:50:24 CET 2000 Werner Koch --- ChangeLog | 7 +++++- NOTES | 1 + THANKS | 1 + acinclude.m4 | 41 ++++++++++++++++++++++++++------ g10/ChangeLog | 7 ++++++ g10/OPTIONS | 2 +- g10/import.c | 12 +++++----- g10/mainproc.c | 8 +++++-- g10/trustdb.c | 2 +- mpi/ChangeLog | 5 ++++ mpi/config.links | 61 ++++++++++++++++++++++++++++++++++-------------- 11 files changed, 111 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 32da65f7d..6fd1f4613 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,12 @@ +Wed Mar 22 13:50:24 CET 2000 Werner Koch + + * acinclude.m4 (GNUPG_CHECK_MLOCK): Changed the way to test for + librt. Test suggested by Jeff Long. + Fri Mar 17 17:50:25 CET 2000 Werner Koch * acinclude.m4 (GNUPG_CHECK_MLOCK): Do librt check only when - we can't link a test progra,. This way GNU systems don't need + we can't link a test program. This way GNU systems don't need to link against linrt. (GNUPG_CHECK_IPC): Fixed use of TRY_COMPILE macro. From Tim Mooney. diff --git a/NOTES b/NOTES index 595f74b04..22d23355f 100644 --- a/NOTES +++ b/NOTES @@ -10,6 +10,7 @@ Some other reported cpu-vendor-os strings: sparc-sun-solaris5.4 sparc-sun-sunos4.1.2 i386-pc-sysv4.2 (USL Unixware v1.1.2) + powerpc-ibm-aix4.3.2.0 John Payne gpg 1.0.1 okay with MP-RAS 3.02.01 Edition 5 using gcc 2.95.2 and EGD By diff --git a/THANKS b/THANKS index 0fd8b2d6f..b74f1592f 100644 --- a/THANKS +++ b/THANKS @@ -55,6 +55,7 @@ Jan Krueger max@physics.otago.ac.nz Janusz A. Urbanowicz alex@bofh.torun.pl James Troup james@nocrew.org Jean-loup Gailly gzip@prep.ai.mit.edu +Jeff Long long@kestrel.cc.ukans.edu Jens Bachem bachem@rrz.uni-koeln.de J Horacio MG homega@ciberia.es Joachim Backes backes@rhrk.uni-kl.de diff --git a/acinclude.m4 b/acinclude.m4 index 35e3e4488..cddf70f4e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -314,19 +314,46 @@ define(GNUPG_CHECK_IPC, # Check whether mlock is broken (hpux 10.20 raises a SIGBUS if mlock # is not called from uid 0 (not tested whether uid 0 works) # For DECs Tru64 we have also to check whether mlock is in librt +# mlock is there a macro using memlk() ###################################################################### dnl GNUPG_CHECK_MLOCK dnl define(GNUPG_CHECK_MLOCK, [ AC_CHECK_FUNCS(mlock) - if test "$ac_cv_func_mlock" = "yes"; then - AC_TRY_LINK_FUNC(mlock,tmp=yes,tmp=no) - if test $tmp = no; then - # We could not link a test program, so check whether - # we can do it by linking against librt - # this adds librt to the path. This adds librt to LIBS. - AC_CHECK_LIB(rt, mlock) + if test "$ac_cv_func_mlock" = "no"; then + AC_CHECK_HEADERS(sys/mman.h) + if test "$ac_cv_header_sys_mman_h" = "yes"; then + # Add librt to LIBS: + AC_CHECK_LIB(rt, memlk) + AC_CACHE_CHECK([whether mlock is in sys/mman.h], + gnupg_cv_mlock_is_in_sys_mman, + [AC_TRY_LINK([ + #include + #ifdef HAVE_SYS_MMAN_H + #include + #endif + ], [ + mkdir ("foo", 0); + int i; + /* glibc defines this for functions which it implements + * to always fail with ENOSYS. Some functions are actually + * named something starting with __ and the normal name + * is an alias. */ + #if defined (__stub_mlock) || defined (__stub___mlock) + choke me + #else + mlock(&i, 4); + #endif + ; return 0; + ], + gnupg_cv_mlock_is_in_sys_mman=yes, + gnupg_cv_mlock_is_in_sys_mman=no)]) + if test "$gnupg_cv_mlock_is_in_sys_mman" = "yes"; then + AC_DEFINE(HAVE_MLOCK) + fi fi + fi + if test "$ac_cv_func_mlock" = "yes"; then AC_MSG_CHECKING(whether mlock is broken) AC_CACHE_VAL(gnupg_cv_have_broken_mlock, AC_TRY_RUN([ diff --git a/g10/ChangeLog b/g10/ChangeLog index 1c7d94043..f5753ac8c 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +Wed Mar 22 13:50:24 CET 2000 Werner Koch + + * mainproc.c (print_userid): Do UTF8 conversion before printing. + * import.c (import_one): Ditto. + (import_secret_one): Ditto. + (delete_inv_parts): Ditto. + Thu Mar 16 16:20:23 CET 2000 Werner Koch * keylist.c (print_key_data): Handle a NULL pk gracefully. diff --git a/g10/OPTIONS b/g10/OPTIONS index 96290f6cf..b1a49e254 100644 --- a/g10/OPTIONS +++ b/g10/OPTIONS @@ -19,6 +19,6 @@ compress-sigs run-as-shm-coprocess [request-locked-shm-size] # very special :-) # You will have to use "--status-fd" too -# Note: This option dioes only work if given on the command line. +# Note: This option does only work if given on the command line. diff --git a/g10/import.c b/g10/import.c index 78a1cfc8a..b210668f7 100644 --- a/g10/import.c +++ b/g10/import.c @@ -378,8 +378,8 @@ import_one( const char *fname, KBNODE keyblock, int fast ) pubkey_letter( pk->pubkey_algo ), (ulong)keyid[1], datestr_from_pk(pk) ); if( uidnode ) - print_string( stderr, uidnode->pkt->pkt.user_id->name, - uidnode->pkt->pkt.user_id->len, 0 ); + print_utf8_string( stderr, uidnode->pkt->pkt.user_id->name, + uidnode->pkt->pkt.user_id->len ); putc('\n', stderr); } if( !uidnode ) { @@ -569,8 +569,8 @@ import_secret_one( const char *fname, KBNODE keyblock ) pubkey_letter( sk->pubkey_algo ), (ulong)keyid[1], datestr_from_sk(sk) ); if( uidnode ) - print_string( stderr, uidnode->pkt->pkt.user_id->name, - uidnode->pkt->pkt.user_id->len, 0 ); + print_utf8_string( stderr, uidnode->pkt->pkt.user_id->name, + uidnode->pkt->pkt.user_id->len ); putc('\n', stderr); } stats.secret_read++; @@ -831,8 +831,8 @@ delete_inv_parts( const char *fname, KBNODE keyblock, u32 *keyid ) if( opt.verbose ) { log_info( _("key %08lX: skipped user ID '"), (ulong)keyid[1]); - print_string( stderr, node->pkt->pkt.user_id->name, - node->pkt->pkt.user_id->len, 0 ); + print_utf8_string( stderr, node->pkt->pkt.user_id->name, + node->pkt->pkt.user_id->len ); fputs("'\n", stderr ); } delete_kbnode( node ); /* the user-id */ diff --git a/g10/mainproc.c b/g10/mainproc.c index 99bf05ab3..0b52ef72d 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -552,8 +552,12 @@ print_userid( PACKET *pkt ) printf("ERROR: unexpected packet type %d", pkt->pkttype ); return; } - print_string( stdout, pkt->pkt.user_id->name, pkt->pkt.user_id->len, - opt.with_colons ); + if( opt.with_colons ) + print_string( stdout, pkt->pkt.user_id->name, + pkt->pkt.user_id->len, ':'); + else + print_utf8_string( stdout, pkt->pkt.user_id->name, + pkt->pkt.user_id->len ); } diff --git a/g10/trustdb.c b/g10/trustdb.c index 192f3d897..1520d9d6c 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -483,7 +483,7 @@ verify_own_keys(void) if( DBG_TRUST ) log_debug("key %08lX: checking secret key\n", (ulong)keyid[1] ); - if( is_secret_key_protected( sk ) < 1 ) + if( !opt.quiet && is_secret_key_protected( sk ) < 1 ) log_info(_("NOTE: secret key %08lX is NOT protected.\n"), (ulong)keyid[1] ); diff --git a/mpi/ChangeLog b/mpi/ChangeLog index 26ca24e8f..56dd3bb91 100644 --- a/mpi/ChangeLog +++ b/mpi/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 22 13:50:24 CET 2000 Werner Koch + + * config.links: Add support for FreeBSD 5 and made the case stmt + looking nicer. From Jun Kuriyama. + Fri Mar 17 17:50:25 CET 2000 Werner Koch * config.links (sparc64-unknown-linux-gnu): use udic module. diff --git a/mpi/config.links b/mpi/config.links index 31a58c8d4..6a2cbfb53 100644 --- a/mpi/config.links +++ b/mpi/config.links @@ -12,14 +12,20 @@ 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*-*-freebsd[34]* | i[34]86*-*-freebsdelf* \ - | i[34]86*-*-netbsd* ) + i[34]86*-*-freebsd*-elf | \ + i[34]86*-*-freebsd[3-9]* | \ + i[34]86*-*-freebsdelf* | \ + i[34]86*-*-netbsd* ) echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h path="i386" ;; - i[56]86*-*-freebsd*-elf | i[56]86*-*-freebsd[34]* | i[56]86*-*-freebsdelf* \ - | i[56]86*-*-netbsd* | pentium-*-netbsd* | pentiumpro-*-netbsd*) + i[56]86*-*-freebsd*-elf | \ + i[56]86*-*-freebsd[3-9]* | \ + i[56]86*-*-freebsdelf* | \ + i[56]86*-*-netbsd* | \ + pentium-*-netbsd* | \ + pentiumpro-*-netbsd*) echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h path="i586 i386" @@ -29,13 +35,17 @@ case "${target}" in cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h path="i386" ;; - i[34]86*-*-linuxaout* | i[34]86*-*-linuxoldld* | i[34]86*-*-*bsd*) + i[34]86*-*-linuxaout* | \ + i[34]86*-*-linuxoldld* | \ + i[34]86*-*-*bsd*) echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h echo '#define X86_BROKEN_ALIGN' >>./mpi/asm-syntax.h cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h path="i386" ;; - i[56]86*-*-linuxaout* | i[56]86*-*-linuxoldld* | i[56]86*-*-*bsd*) + i[56]86*-*-linuxaout* | \ + i[56]86*-*-linuxoldld* | \ + i[56]86*-*-*bsd*) echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h echo '#define X86_BROKEN_ALIGN' >>./mpi/asm-syntax.h cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h @@ -56,7 +66,9 @@ case "${target}" in cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h path="i386" ;; - i[56]86*-*-* | pentium-*-* | pentiumpro-*-*) + i[56]86*-*-* | \ + pentium-*-* | \ + pentiumpro-*-*) echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h path="i586 i386" @@ -88,11 +100,14 @@ case "${target}" in path="sparc32v8 sparc32" mpi_extra_modules="udiv" ;; - sparc9*-*-* | sparc64*-*-* | ultrasparc*-*-*) + sparc9*-*-* | \ + sparc64*-*-* | \ + ultrasparc*-*-* ) echo '/* configured for sparc9 or higher */' >>./mpi/asm-syntax.h path="sparc32v8 sparc32" ;; - sparc8*-*-* | microsparc*-*-*) + sparc8*-*-* | \ + microsparc*-*-*) echo '/* configured for sparc8 */' >>./mpi/asm-syntax.h path="sparc32v8 sparc32" ;; @@ -106,7 +121,8 @@ case "${target}" in path="sparc32" mpi_extra_modules="udiv" ;; - mips[34]*-*-* | mips*-*-irix6*) + mips[34]*-*-* | \ + mips*-*-irix6*) echo '/* configured for MIPS3 */' >>./mpi/asm-syntax.h path="mips3" ;; @@ -117,7 +133,8 @@ case "${target}" in # Motorola 68k configurations. Let m68k mean 68020-68040. # mc68000 or mc68060 configurations need to be specified explicitly - m680[234]0*-*-linuxaout* | m68k*-*-linuxaout*) + m680[234]0*-*-linuxaout* | \ + m68k*-*-linuxaout*) echo '#define MIT_SYNTAX' >>./mpi/asm-syntax.h cat $srcdir/mpi/m68k/syntax.h >>./mpi/asm-syntax.h path="m68k/mc68020 m68k" @@ -127,7 +144,8 @@ case "${target}" in cat $srcdir/mpi/m68k/syntax.h >>./mpi/asm-syntax.h path="m68k" ;; - m680[234]0*-*-linux* | m68k*-*-linux*) + m680[234]0*-*-linux* | \ + m68k*-*-linux*) echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h cat $srcdir/mpi/m68k/syntax.h >>./mpi/asm-syntax.h ;; @@ -141,12 +159,14 @@ case "${target}" in cat $srcdir/mpi/m68k/syntax.h >>./mpi/asm-syntax.h path="m68k/mc68020 m68k" ;; - m68000*-*-* | m68060*-*-*) + m68000*-*-* | \ + m68060*-*-*) echo '#define MIT_SYNTAX' >>./mpi/asm-syntax.h cat $srcdir/mpi/m68k/syntax.h >>./mpi/asm-syntax.h path="m68k/mc68000" ;; - m680[234]0*-*-* | m68k*-*-*) + m680[234]0*-*-* | \ + m68k*-*-*) echo '#define MIT_SYNTAX' >>./mpi/asm-syntax.h cat $srcdir/mpi/m68k/syntax.h >>./mpi/asm-syntax.h path="m68k/mc68020 m68k" @@ -158,12 +178,15 @@ case "${target}" in cat $srcdir/mpi/powerpc32/syntax.h >>./mpi/asm-syntax.h path="powerpc32" ;; - rs6000-*-aix[456789]* | rs6000-*-aix3.2.[456789]) + rs6000-*-aix[456789]* | \ + rs6000-*-aix3.2.[456789]) mpi_sflags="-Wa,-mpwr" path="power" mpi_extra_modules="udiv-w-sdiv" ;; - rs6000-*-* | power-*-* | power2-*-*) + rs6000-*-* | \ + power-*-* | \ + power2-*-*) mpi_sflags="-Wa,-mppc" path="power" mpi_extra_modules="udiv-w-sdiv" @@ -179,11 +202,13 @@ case "${target}" in mpi_sflags="-Wa,-mppc" path="power powerpc32" ;; - ppc60[234]*-*-* | powerpc*-*-*) + ppc60[234]*-*-* | \ + powerpc*-*-*) mpi_sflags="-Wa,-mppc" path="powerpc32" ;; - ppc620-*-* | powerpc64*-*-*) + ppc620-*-* | \ + powerpc64*-*-*) mpi_sflags="-Wa,-mppc" path="powerpc64" ;;