From ecf7ad43f601395283646743086e8025d9a650f4 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 4 Oct 2006 10:22:56 +0000 Subject: [PATCH] Preparing a new release --- ChangeLog | 7 ++++++ NEWS | 7 +++++- README | 12 ++++----- configure.ac | 4 +-- doc/gpg.texi | 11 +++++---- g10/ChangeLog | 6 +++++ g10/gpg.c | 68 +++++++++------------------------------------------ 7 files changed, 45 insertions(+), 70 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5b32cc0d..4617ec59a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-10-04 Werner Koch + + Released 1.9.91. + + * configure.ac: Require libassuan 0.9.1 which fixes a problem with + gpgsm. + 2006-09-27 Werner Koch * gl/strsep.h, gl/strsep.c, gl/m4/strsep.m4: Removed. diff --git a/NEWS b/NEWS index 7d0e8f170..fc0db2b25 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,14 @@ -Noteworthy changes in version 1.9.91 +Noteworthy changes in version 1.9.91 (2006-10-04) ------------------------------------------------- * New "relax" flag for trustlist.txt to allow root CA certificates without BasicContraints. + * [gpg2] Removed the -k PGP 2 compatibility hack. -k is now an + alias for --list-keys. + + * [gpg2] Print a warning if "-sat" is used instead of "--clearsign". + Noteworthy changes in version 1.9.90 (2006-09-25) ------------------------------------------------- diff --git a/README b/README index c3359e9a8..c2ee47acf 100644 --- a/README +++ b/README @@ -3,15 +3,15 @@ Version 1.9.x -GnuPG 1.9 is the future version of GnuPG; it is based on some gnupg-1.3 -code and the previous newpg package. It will eventually lead to a -GnuPG 2.0 release. +GnuPG 1.9 is the future version of GnuPG; it is based on the gnupg-1.4 +code and the previous newpg package. It will very soon lead to a +GnuPG 2.0 release. You should use this GnuPG version if you want to use the gpg-agent or gpgsm (the S/MIME variant of gpg). Note that the gpg-agent is also -helpful when using the standard gpg versions (1.4.x) the old 1.2.x). -There are no problems installing 1.4 and 1.9 alongside; in fact we -suggest to do this. +helpful when using the standard gpg version (1.4.x). There are no +problems installing 1.4 and 1.9 alongside; in fact we suggest to do +this. BUILD INSTRUCTIONS diff --git a/configure.ac b/configure.ac index 829200b2a..12c9ce939 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ min_automake_version="1.9.3" # Set my_issvn to "yes" for non-released code. Remember to run an # "svn up" and "autogen.sh" right before creating a distribution. m4_define([my_version], [1.9.91]) -m4_define([my_issvn], [yes]) +m4_define([my_issvn], [no]) m4_define([svn_revision], m4_esyscmd([echo -n $((svn info 2>/dev/null \ @@ -44,7 +44,7 @@ NEED_GPG_ERROR_VERSION=1.4 NEED_LIBGCRYPT_API=1 NEED_LIBGCRYPT_VERSION=1.1.94 -NEED_LIBASSUAN_VERSION=0.9.0 +NEED_LIBASSUAN_VERSION=0.9.1 NEED_KSBA_API=1 NEED_KSBA_VERSION=1.0.0 diff --git a/doc/gpg.texi b/doc/gpg.texi index 07358711c..76261fec5 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -270,7 +270,7 @@ List all keys from the public keyrings, or just the keys given on the command line. @ifset gpgone @option{-k} is slightly different from @option{--list-keys} in that it -allwos only for one argument and takes the second argument as the +allows only for one argument and takes the second argument as the keyring to search. This is for command line compatibility with PGP 2 and has been removed in @command{gpg2}. @end ifset @@ -2271,10 +2271,11 @@ print the public key data. @item --fast-list-mode Changes the output of the list commands to work faster; this is achieved -by leaving some parts empty. Some applications don't need the user ID and -the trust information given in the listings. By using this options they -can get a faster listing. The exact behaviour of this option may change -in future versions. +by leaving some parts empty. Some applications don't need the user ID +and the trust information given in the listings. By using this options +they can get a faster listing. The exact behaviour of this option may +change in future versions. If you are missing some information, don't +use this option. @item --no-literal This is not for normal use. Use the source to see for what it might be useful. diff --git a/g10/ChangeLog b/g10/ChangeLog index ec0a388df..21dedf1d9 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2006-10-04 Werner Koch + + * gpg.c (main): Print a warning if -sat has been used. + (main): Removed the special treatment of the -k option. -k is now + an alias for --list-keys. + 2006-10-02 Werner Koch * encr-data.c (decrypt_data, mdc_decode_filter): Check the MDC diff --git a/g10/gpg.c b/g10/gpg.c index 8ad9c9965..aa70fc808 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -78,7 +78,7 @@ enum cmd_and_opt_values aDecrypt = 'd', aEncr = 'e', oInteractive = 'i', - oKOption = 'k', + oListKeys = 'k', oDryRun = 'n', oOutput = 'o', oQuiet = 'q', @@ -115,13 +115,10 @@ enum cmd_and_opt_values aDeleteKeys, aDeleteSecretKeys, aDeleteSecretAndPublicKeys, - aKMode, - aKModeC, aImport, aFastImport, aVerify, aVerifyFiles, - aListKeys, aListSigs, aSendKeys, aRecvKeys, @@ -562,7 +559,6 @@ static ARGPARSE_OPTS opts[] = { { aListTrustDB, "list-trustdb",0 , "@"}, /* Not yet used */ /* { aListTrustPath, "list-trust-path",0, "@"}, */ - { oKOption, NULL, 0, "@"}, { oPasswd, "passphrase",2, "@" }, { oPasswdFD, "passphrase-fd",1, "@" }, { oPasswdFile, "passphrase-file",2, "@" }, @@ -1041,8 +1037,6 @@ set_cmd( enum cmd_and_opt_values *ret_cmd, enum cmd_and_opt_values new_cmd ) cmd = aEncrSym; else if( cmd == aEncr && new_cmd == aSym ) cmd = aEncrSym; - else if( cmd == aKMode && new_cmd == aSym ) - cmd = aKModeC; else if (cmd == aSignEncr && new_cmd == aSym) cmd = aSignEncrSym; else if (cmd == aSignSym && new_cmd == aEncr) @@ -2089,7 +2083,6 @@ main (int argc, char **argv ) opt.list_options|=LIST_SHOW_UNUSABLE_UIDS; opt.list_options|=LIST_SHOW_UNUSABLE_SUBKEYS; break; - case oKOption: set_cmd( &cmd, aKMode ); break; case oBatch: opt.batch = 1; nogreeting = 1; break; case oUseAgent: @@ -3155,38 +3148,29 @@ main (int argc, char **argv ) set_cmd( &cmd, aListKeys); } - if( cmd == aKMode || cmd == aKModeC ) { /* kludge to be compatible to pgp */ - if( cmd == aKModeC ) { - opt.fingerprint = 1; - cmd = aKMode; - } - opt.list_sigs = 0; - if( opt.verbose > 2 ) - opt.check_sigs++; - if( opt.verbose > 1 ) - opt.list_sigs++; - - opt.verbose = opt.verbose > 1; - } - /* kludge to let -sat generate a clear text signature */ if( opt.textmode == 2 && !detached_sig && opt.armor && cmd == aSign ) + { + log_info ("compatibility note:\n"); + log_info ("\"-sat\" won't generate clear signed messages in " + "future versions\n"); + log_info ("Use \"--clearsign\" instead of \"-sat\"\n"); cmd = aClearsign; + } if( opt.verbose > 1 ) set_packet_list_mode(1); - /* Add the keyrings, but not for some special commands and not in - case of "-kvv userid keyring". Also avoid adding the secret - keyring for a couple of commands to avoid unneeded access in - case the secrings are stored on a floppy. + /* Add the keyrings, but not for some special commands. Also + avoid adding the secret keyring for a couple of commands to + avoid unneeded access in case the secrings are stored on a + floppy. We always need to add the keyrings if we are running under SELinux, this is so that the rings are added to the list of secured files. */ if( ALWAYS_ADD_KEYRINGS - || (cmd != aDeArmor && cmd != aEnArmor - && !(cmd == aKMode && argc == 2 )) ) + || (cmd != aDeArmor && cmd != aEnArmor) ) { if (ALWAYS_ADD_KEYRINGS || (cmd != aCheckKeys && cmd != aListSigs && cmd != aListKeys @@ -3471,34 +3455,6 @@ main (int argc, char **argv ) free_strlist(sl); break; - case aKMode: /* list keyring -- NOTE: This will be removed soon */ - if( argc < 2 ) { /* -kv [userid] */ - sl = NULL; - if (argc && **argv) - add_to_strlist2( &sl, *argv, utf8_strings ); - public_key_list( sl ); - free_strlist(sl); - } - else if( argc == 2 ) { /* -kv userid keyring */ - if( access( argv[1], R_OK ) ) { - log_error(_("can't open `%s': %s\n"), - print_fname_stdin(argv[1]), strerror(errno)); - } - else { - /* add keyring (default keyrings are not registered in this - * special case */ - keydb_add_resource( argv[1], 0, 0 ); - sl = NULL; - if (**argv) - add_to_strlist2( &sl, *argv, utf8_strings ); - public_key_list( sl ); - free_strlist(sl); - } - } - else - wrong_args(_("-k[v][v][v][c] [user-id] [keyring]") ); - break; - case aKeygen: /* generate a key */ if( opt.batch ) { if( argc > 1 )