diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | TODO | 5 | ||||
| -rw-r--r-- | cipher/ChangeLog | 10 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | doc/gpg.sgml | 7 | ||||
| -rw-r--r-- | g10/ChangeLog | 14 | ||||
| -rw-r--r-- | g10/armor.c | 5 | ||||
| -rw-r--r-- | g10/g10.c | 2 | ||||
| -rw-r--r-- | g10/openfile.c | 2 | ||||
| -rw-r--r-- | g10/options.h | 1 | ||||
| -rw-r--r-- | g10/sign.c | 2 | ||||
| -rw-r--r-- | scripts/ChangeLog | 4 | ||||
| -rwxr-xr-x | scripts/autogen.sh | 12 |
15 files changed, 56 insertions, 20 deletions
@@ -44,6 +44,8 @@ R�mi Guyomarch <[email protected]> Assignment (g10/compress.c, g10/encr-data.c, g10/free-packet.c, g10/mdfilter.c, g10/plaintext.c, util/iobuf.c) +Stefan Bellon <[email protected]> Assignment + Tedi Heriyanto <[email protected]> Translations [id] Thiago Jung Bauermann <[email protected]> Translations [pt_BR] @@ -1,3 +1,7 @@ +2001-08-03 Werner Koch <[email protected]> + + * configure.ac (VERSION,PACKAGE): Fixed quoting. + 2001-07-26 Werner Koch <[email protected]> * configure.ac: Finally got it running with the new autoconf. Had @@ -9,6 +9,8 @@ * Revoked user-IDs are not listed unless signatures are listed too or we are in verbose mode. + * There is no default comment string with ascii armors anymore + except for revocation certificates and --enarmor mode. Noteworthy changes in version 1.0.6 (2001-05-29) ------------------------------------------------ @@ -1,4 +1,9 @@ + * autogen.sh --build-w32, get that code from mingw32 so we can + better maintain it. + + * Check that a key signature can be revoked and later be signed again. + * Put a note into readme.w32 that there is a man page and a options file; write the registry stuff in regedit format. diff --git a/cipher/ChangeLog b/cipher/ChangeLog index db101efa6..14f76185f 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -6,11 +6,11 @@ 2001-06-12 Werner Koch <[email protected]> - * rndw32.c (slow_gatherer_windowsNT): Ditto. Not really needed here but anyway. - * cipher.c (string_to_cipher_algo): Use ascii_strcasecmp(). * md.c (string_to_digest_algo): Ditto. * pubkey.c (string_to_pubkey_algo): Ditto. + * rndw32.c (slow_gatherer_windowsNT): Ditto. Not really needed + here but anyway. 2001-04-29 Werner Koch <[email protected]> @@ -19,7 +19,7 @@ 2001-04-17 Werner Koch <[email protected]> - * rndunix.c: Add a signal.h header to avoid warnings on SOlaris 7 + * rndunix.c: Add a signal.h header to avoid warnings on Solaris 7 and 8. 2001-04-16 Werner Koch <[email protected]> @@ -37,11 +37,11 @@ on stack frame based machines but it is highly portable and has no side effects. Just setting the automatic variables at the end of a function to zero does not work well because the compiler will - optimize them away - marking them as volatile woule be bad for + optimize them away - marking them as volatile would be bad for performance. * md5.c, sha1.c, rmd160.c, tiger.c (burn_stack): Likewise. * random.c (burn_stack): New. - (mix_pool): Use it here to burn the stack of te mixblock function. + (mix_pool): Use it here to burn the stack of the mixblock function. 2001-04-02 Werner Koch <[email protected]> diff --git a/configure.ac b/configure.ac index 4a018e5b3..a8f90a0df 100644 --- a/configure.ac +++ b/configure.ac @@ -35,8 +35,8 @@ PACKAGE="$PACKAGE_NAME" VERSION="$PACKAGE_VERSION" AC_SUBST(PACKAGE) AC_SUBST(VERSION) -AC_DEFINE_UNQUOTED(PACKAGE, $PACKAGE, [Name of this package]) -AC_DEFINE_UNQUOTED(VERSION, $VERSION, [Version of this package]) +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package]) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package]) AC_PROG_AWK diff --git a/doc/gpg.sgml b/doc/gpg.sgml index efbc9fbaa..bf0836588 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -886,6 +886,8 @@ in an options file. <listitem><para> Shortcut for "--options /dev/null". This option is detected before an attempt to open an option file. +Using this option will also prevent the creation of a +"~./gnupg" homedir. </para></listitem></varlistentry> @@ -941,7 +943,7 @@ to do with the comments in clear text signatures. <term>--comment &ParmString;</term> <listitem><para> Use &ParmString; as comment string in clear text signatures. -To suppress those comment strings entirely, use an empty string here. +The default is not do write a comment string. </para></listitem></varlistentry> @@ -950,7 +952,8 @@ To suppress those comment strings entirely, use an empty string here. <listitem><para> Force to write the standard comment string in clear text signatures. Use this to overwrite a --comment -from a config file. +from a config file. This option is now obsolete because there is no +default comment string anymore. </para></listitem></varlistentry> diff --git a/g10/ChangeLog b/g10/ChangeLog index ed3bceb1c..14f284d88 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,17 @@ +2001-08-07 Werner Koch <[email protected]> + + * sign.c (sleep): Redefine for W32. + + * g10.c, options.h: Set new flag opt.no_homedir_creation when + --no-options is given. + * openfile.c (try_make_homedir): Don't create the homedir in that case. + +2001-08-03 Werner Koch <[email protected]> + + * armor.c (armor_filter): Removed the default comment string + because it could get us in trouble due to translations using non + ascii characters. + 2001-08-01 Werner Koch <[email protected]> * keylist.c (list_keyblock_print): Do not list revoked UIDs unless diff --git a/g10/armor.c b/g10/armor.c index a9c520ab5..1729217a5 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -918,9 +918,8 @@ armor_filter( void *opaque, int control, PRINTABLE_OS_NAME ")" LF ); /* write the comment string or a default one */ - s = opt.comment_string ? opt.comment_string - : _("For info see http://www.gnupg.org"); - if( *s ) { + s = opt.comment_string; + if( s && *s ) { iobuf_writestr(a, "Comment: " ); for( ; *s; s++ ) { if( *s == '\n' ) @@ -861,7 +861,7 @@ main( int argc, char **argv ) m_free(opt.def_recipient); opt.def_recipient = NULL; opt.def_recipient_self = 0; break; - case oNoOptions: break; /* no-options */ + case oNoOptions: opt.no_homedir_creation = 1; break; /* no-options */ case oHomedir: break; case oNoBatch: opt.batch = 0; break; case oWithKeyData: opt.with_key_data=1; /* fall thru */ diff --git a/g10/openfile.c b/g10/openfile.c index 99b81fe7b..2baf5a191 100644 --- a/g10/openfile.c +++ b/g10/openfile.c @@ -336,7 +336,7 @@ try_make_homedir( const char *fname ) * To cope with HOME, we do compare only the suffix if we see that * the default homedir does start with a tilde. */ - if( opt.dry_run ) + if( opt.dry_run || opt.no_homedir_creation ) return; if ( ( *defhome == '~' diff --git a/g10/options.h b/g10/options.h index e76104fab..ffd4e574c 100644 --- a/g10/options.h +++ b/g10/options.h @@ -105,6 +105,7 @@ struct { int no_sig_cache; int no_sig_create_check; int preserve_permissions; + int no_homedir_creation; } opt; diff --git a/g10/sign.c b/g10/sign.c index d622abb27..e54fdf4b8 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -43,6 +43,8 @@ #ifdef HAVE_DOSISH_SYSTEM #define LF "\r\n" + void __stdcall Sleep(ulong); + #define sleep(a) Sleep((a)*1000) #else #define LF "\n" #endif diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 2e1687b48..4e97acaf7 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2001-08-07 Werner Koch <[email protected]> + + * autogen.sh: Adjusted --build-w32 for autoconf 2.52 + 2001-07-09 Werner Koch <[email protected]> * autogen.sh (autoconf_vers): Require autoconf 2.50 diff --git a/scripts/autogen.sh b/scripts/autogen.sh index 7ae41b8ab..5ac403718 100755 --- a/scripts/autogen.sh +++ b/scripts/autogen.sh @@ -13,7 +13,7 @@ PGM=GnuPG lib_config_files="" -autoconf_vers=2.50 +autoconf_vers=2.52 automake_vers=1.4 aclocal_vers=1.4 @@ -22,20 +22,20 @@ DIE=no if test "$1" = "--build-w32"; then tsdir=$(cd `dirname $0`; cd ..; pwd) shift - target=i386--mingw32 + host=i386--mingw32 if [ ! -f $tsdir/scripts/config.guess ]; then echo "$tsdir/scripts/config.guess not found" >&2 exit 1 fi - host=`$tsdir/scripts/config.guess` + build=`$tsdir/scripts/config.guess` if ! mingw32 --version >/dev/null; then echo "We need at least version 0.3 of MingW32/CPD" >&2 exit 1 fi - if [ -f "$tsdir/config.h" ]; then - if grep HAVE_DOSISH_SYSTEM config.h | grep undef >/dev/null; then + if [ -f "$tsdir/config.log" ]; then + if ! head $tsdir/config.log | grep i386--mingw32 >/dev/null; then echo "Pease run a 'make distclean' first" >&2 exit 1 fi @@ -64,7 +64,7 @@ if test "$1" = "--build-w32"; then fi [ $DIE = yes ] && exit 1 - $tsdir/configure --host=${host} --target=${target} \ + $tsdir/configure --build=${build} --host=${host} \ ${disable_foo_tests} $* exit $? fi |