aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TODO4
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/DETAILS6
-rw-r--r--doc/gpg.sgml8
-rw-r--r--g10/ChangeLog7
-rw-r--r--g10/armor.c2
-rw-r--r--g10/build-packet.c2
-rw-r--r--g10/cipher.c2
-rw-r--r--g10/compress.c2
-rw-r--r--g10/dearmor.c2
-rw-r--r--g10/delkey.c7
-rw-r--r--g10/encode.c2
-rw-r--r--g10/encr-data.c4
-rw-r--r--g10/export.c2
-rw-r--r--g10/filter.h2
-rw-r--r--g10/free-packet.c2
-rw-r--r--g10/getkey.c2
-rw-r--r--g10/helptext.c2
-rw-r--r--g10/hkp.h2
-rw-r--r--g10/import.c2
-rw-r--r--g10/kbnode.c2
-rw-r--r--g10/keydb.h2
-rw-r--r--g10/keyedit.c2
-rw-r--r--g10/keyid.c2
-rw-r--r--g10/keylist.c2
-rw-r--r--g10/ks-proto.h2
-rw-r--r--g10/main.h2
-rw-r--r--g10/mainproc.c2
-rw-r--r--g10/mdfilter.c2
-rw-r--r--g10/misc.c2
-rw-r--r--g10/openfile.c2
-rw-r--r--g10/options.h2
-rw-r--r--g10/packet.h2
-rw-r--r--g10/passphrase.c2
-rw-r--r--g10/pkclist.c2
-rw-r--r--g10/plaintext.c2
-rw-r--r--g10/pubkey-enc.c2
-rw-r--r--g10/revoke.c2
-rw-r--r--g10/seckey-cert.c2
-rw-r--r--g10/seskey.c2
-rw-r--r--g10/sig-check.c2
-rw-r--r--g10/sign.c2
-rw-r--r--g10/signal.c2
-rw-r--r--g10/skclist.c2
-rw-r--r--g10/status.c3
-rw-r--r--g10/status.h3
-rw-r--r--g10/tdbdump.c2
-rw-r--r--g10/tdbio.c2
-rw-r--r--g10/tdbio.h2
-rw-r--r--g10/textfilter.c2
-rw-r--r--g10/trustdb.c2
-rw-r--r--g10/trustdb.h2
-rw-r--r--g10/verify.c2
-rw-r--r--scripts/ChangeLog4
-rw-r--r--scripts/gnupg.spec.in28
55 files changed, 109 insertions, 57 deletions
diff --git a/TODO b/TODO
index 61dcef769..fa6d071f6 100644
--- a/TODO
+++ b/TODO
@@ -9,6 +9,10 @@
* INFO Kommand um z.B. default-recipients herauszufinden.
+ * export sollte exit(1) machen bei einem Fehler - testen! Es wird ein
+ leerer File erzeugt.
+
+
Scheduled for 1.1
-----------------
* Rework the whole key selection stuff: Compile a list of valid
diff --git a/doc/ChangeLog b/doc/ChangeLog
index bdd535e5c..a877cf5aa 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-12 10:57:21 Werner Koch ([email protected])
+
+ * gpg.sgml: Documented --no-tty.
+
2000-03-09 15:01:51 Werner Koch ([email protected])
* DETAILS: Ad a short blurb about unattended key generation.
diff --git a/doc/DETAILS b/doc/DETAILS
index 37475c6b5..46c7e9dfe 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -199,6 +199,12 @@ more arguments in future versions.
END_ENCRYPTION
Mark the start and end of the actual encryption process.
+ DELETE_PROBLEM reason_code
+ Deleting a key failed. Reason codes are:
+ 1 - No such key
+ 2 - Must delete secret key first
+
+
Key generation
==============
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 5db773aad..0871b77c6 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -695,6 +695,14 @@ Use batch mode. Never ask, do not allow interactive
commands.
</para></listitem></varlistentry>
+<varlistentry>
+<term>--no-tty</term>
+<listitem><para>
+Make sure that the TTY (terminal) is never used for any output.
+This option is needed in some cases because GnuPG sometimes prints
+warnings to the TTY if if --batch is used.
+</para></listitem></varlistentry>
+
<varlistentry>
<term>--no-batch</term>
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 0d783d072..5a0647f6c 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,10 @@
+Fri May 12 14:01:20 CEST 2000 Werner Koch <[email protected]>
+
+ * delkey.c (delete_key): Add 2 new status messages
+ * status.c, status.h (STATUS_DELETE_PROBLEM): New.
+
+ Fixed years of copyright in all source files.
+
Mon May 1 17:08:14 CEST 2000 Werner Koch <[email protected]>
* trustdb.c (propagate_validity): Fixed the bug that only one uid
diff --git a/g10/armor.c b/g10/armor.c
index 863b93243..4384131ff 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -1,5 +1,5 @@
/* armor.c - Armor flter
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/build-packet.c b/g10/build-packet.c
index 204611bcd..238a2021b 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -1,5 +1,5 @@
/* build-packet.c - assemble packets and write them
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/cipher.c b/g10/cipher.c
index 6b74c3d6e..b270a4aee 100644
--- a/g10/cipher.c
+++ b/g10/cipher.c
@@ -1,5 +1,5 @@
/* cipher.c - En-/De-ciphering filter
- * Copyright (C) 1998,1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/compress.c b/g10/compress.c
index 4862346ad..0cbb98ee1 100644
--- a/g10/compress.c
+++ b/g10/compress.c
@@ -1,5 +1,5 @@
/* compress.c - compress filter
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/dearmor.c b/g10/dearmor.c
index e87dffcd9..bf31ed72a 100644
--- a/g10/dearmor.c
+++ b/g10/dearmor.c
@@ -1,5 +1,5 @@
/* dearmor.c - Armor utility
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/delkey.c b/g10/delkey.c
index a324fd631..31d7caaa4 100644
--- a/g10/delkey.c
+++ b/g10/delkey.c
@@ -1,5 +1,5 @@
/* delkey.c - delete keys
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -62,6 +62,7 @@ delete_key( const char *username, int secret )
: find_keyblock_byname( &kbpos, username );
if( rc ) {
log_error(_("%s: user not found\n"), username );
+ write_status_text( STATUS_DELETE_PROBLEM, "1" );
goto leave;
}
@@ -93,10 +94,12 @@ delete_key( const char *username, int secret )
"there is a secret key for this public key!\n"));
log_info(_(
"use option \"--delete-secret-key\" to delete it first.\n"));
+ write_status_text( STATUS_DELETE_PROBLEM, "2" );
rc = -1;
}
- else if( rc != G10ERR_NO_SECKEY )
+ else if( rc != G10ERR_NO_SECKEY ) {
log_error("%s: get secret key: %s\n", username, g10_errstr(rc) );
+ }
else
rc = 0;
}
diff --git a/g10/encode.c b/g10/encode.c
index e1311f2d9..d1c02bbed 100644
--- a/g10/encode.c
+++ b/g10/encode.c
@@ -1,5 +1,5 @@
/* encode.c - encode data
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/encr-data.c b/g10/encr-data.c
index 0593efe97..d2aea0ff1 100644
--- a/g10/encr-data.c
+++ b/g10/encr-data.c
@@ -1,5 +1,5 @@
/* encr-data.c - process an encrypted data packet
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -165,7 +165,7 @@ mdc_decode_filter( void *opaque, int control, IOBUF a,
}
if( n == 40 ) {
/* we have enough stuff - flush the deferred stuff */
- /* (we have asserted that the buffer is large enough */
+ /* (we have asserted that the buffer is large enough) */
if( !dfx->defer_filled ) /* the first time */
memcpy(buf, buf+20, 20 );
else
diff --git a/g10/export.c b/g10/export.c
index be72e89d8..4c70c7ce5 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -1,5 +1,5 @@
/* export.c
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/filter.h b/g10/filter.h
index 5e16040e7..1adf0edaa 100644
--- a/g10/filter.h
+++ b/g10/filter.h
@@ -1,5 +1,5 @@
/* filter.h
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/free-packet.c b/g10/free-packet.c
index 1bc1be064..3082be686 100644
--- a/g10/free-packet.c
+++ b/g10/free-packet.c
@@ -1,5 +1,5 @@
/* free-packet.c - cleanup stuff for packets
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/getkey.c b/g10/getkey.c
index 6c15542df..26fcda686 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -1,5 +1,5 @@
/* getkey.c - Get a key from the database
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/helptext.c b/g10/helptext.c
index f189f4f8e..4a7a14fde 100644
--- a/g10/helptext.c
+++ b/g10/helptext.c
@@ -1,5 +1,5 @@
/* helptext.c - English help texts
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/hkp.h b/g10/hkp.h
index 6b124fc43..c8c002e1b 100644
--- a/g10/hkp.h
+++ b/g10/hkp.h
@@ -1,5 +1,5 @@
/* hkp.h - Horrowitz Keyserver Protocol
- * Copyright (C) 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/import.c b/g10/import.c
index b210668f7..35007deff 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1,5 +1,5 @@
/* import.c
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/kbnode.c b/g10/kbnode.c
index e28e977b9..f24dc3527 100644
--- a/g10/kbnode.c
+++ b/g10/kbnode.c
@@ -1,5 +1,5 @@
/* kbnode.c - keyblock node utility functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/keydb.h b/g10/keydb.h
index 6db15d8a8..5cb8b5a5d 100644
--- a/g10/keydb.h
+++ b/g10/keydb.h
@@ -1,5 +1,5 @@
/* keydb.h - Key database
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 424b412a6..2a1b26af8 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1,5 +1,5 @@
/* keyedit.c - keyedit stuff
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/keyid.c b/g10/keyid.c
index 665b3be86..d56c58711 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -1,5 +1,5 @@
/* keyid.c - jeyid and fingerprint handling
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/keylist.c b/g10/keylist.c
index ff44408b8..5fc89d765 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -1,5 +1,5 @@
/* keylist.c
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/ks-proto.h b/g10/ks-proto.h
index bd58db5f9..7a7858ef9 100644
--- a/g10/ks-proto.h
+++ b/g10/ks-proto.h
@@ -1,5 +1,5 @@
/* ks-proto.h
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/main.h b/g10/main.h
index 5a63fe636..9ec141ebc 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -1,5 +1,5 @@
/* main.h
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 0b52ef72d..7c5ed36aa 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1,5 +1,5 @@
/* mainproc.c - handle packets
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/mdfilter.c b/g10/mdfilter.c
index 951fd730e..91739f9be 100644
--- a/g10/mdfilter.c
+++ b/g10/mdfilter.c
@@ -1,5 +1,5 @@
/* mdfilter.c - filter data and calculate a message digest
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/misc.c b/g10/misc.c
index 3f18183b5..8706430e7 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -1,5 +1,5 @@
/* misc.c - miscellaneous functions
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/openfile.c b/g10/openfile.c
index 4591f4212..a00785e96 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -1,5 +1,5 @@
/* openfile.c
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/options.h b/g10/options.h
index 1da1120be..c0394f608 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -1,5 +1,5 @@
/* options.h
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/packet.h b/g10/packet.h
index 41782dcc3..fdc8af4a5 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -1,5 +1,5 @@
/* packet.h - packet read/write stuff
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/passphrase.c b/g10/passphrase.c
index 219238321..b400ea257 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -1,5 +1,5 @@
/* passphrase.c - Get a passphrase
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 5cb214746..bf93988ce 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -1,5 +1,5 @@
/* pkclist.c
- * Copyright (C) 1998,2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/plaintext.c b/g10/plaintext.c
index eb74da3d3..4ab20278d 100644
--- a/g10/plaintext.c
+++ b/g10/plaintext.c
@@ -1,5 +1,5 @@
/* plaintext.c - process an plaintext packet
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c
index f84075486..1806de8f8 100644
--- a/g10/pubkey-enc.c
+++ b/g10/pubkey-enc.c
@@ -1,5 +1,5 @@
/* pubkey-enc.c - public key encoded packet handling
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/revoke.c b/g10/revoke.c
index 3683c3006..3ceb5212f 100644
--- a/g10/revoke.c
+++ b/g10/revoke.c
@@ -1,5 +1,5 @@
/* revoke.c
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index 91511c68f..283e4e816 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -1,5 +1,5 @@
/* seckey-cert.c - secret key certificate packet handling
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/seskey.c b/g10/seskey.c
index bb158abc0..d0fe5f9bf 100644
--- a/g10/seskey.c
+++ b/g10/seskey.c
@@ -1,5 +1,5 @@
/* seskey.c - make sesssion keys etc.
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/sig-check.c b/g10/sig-check.c
index 5a452f367..cb00b86dc 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -1,5 +1,5 @@
/* sig-check.c - Check a signature
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/sign.c b/g10/sign.c
index 4a2bd3ec1..e4b1b8f4e 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -1,5 +1,5 @@
/* sign.c - sign data
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/signal.c b/g10/signal.c
index 5397f076d..cf8dbd5eb 100644
--- a/g10/signal.c
+++ b/g10/signal.c
@@ -1,5 +1,5 @@
/* signal.c - signal handling
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/skclist.c b/g10/skclist.c
index df8b683f3..3d4b930ce 100644
--- a/g10/skclist.c
+++ b/g10/skclist.c
@@ -1,5 +1,5 @@
/* skclist.c
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/status.c b/g10/status.c
index be7b16fa0..23bb7deca 100644
--- a/g10/status.c
+++ b/g10/status.c
@@ -1,5 +1,5 @@
/* status.c
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -124,6 +124,7 @@ write_status_text ( int no, const char *text)
case STATUS_END_DECRYPTION : s = "END_DECRYPTION\n"; break;
case STATUS_BEGIN_ENCRYPTION:s = "BEGIN_ENCRYPTION\n"; break;
case STATUS_END_ENCRYPTION : s = "END_ENCRYPTION\n"; break;
+ case STATUS_DELETE_PROBLEM : s = "DELETE_PROBLEM\n"; break;
default: s = "?\n"; break;
}
diff --git a/g10/status.h b/g10/status.h
index e1d7f524d..3581fd767 100644
--- a/g10/status.h
+++ b/g10/status.h
@@ -1,5 +1,5 @@
/* status.h
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -74,6 +74,7 @@
#define STATUS_BEGIN_ENCRYPTION 43
#define STATUS_END_ENCRYPTION 44
+#define STATUS_DELETE_PROBLEM 45
/*-- status.c --*/
void set_status_fd ( int fd );
diff --git a/g10/tdbdump.c b/g10/tdbdump.c
index 230fda980..3b84103e8 100644
--- a/g10/tdbdump.c
+++ b/g10/tdbdump.c
@@ -1,5 +1,5 @@
/* tdbdump.c
- * Copyright (C) 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/tdbio.c b/g10/tdbio.c
index 6ae39ed20..8ea24c744 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -1,5 +1,5 @@
/* tdbio.c
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/tdbio.h b/g10/tdbio.h
index 1c6630961..4cc51353a 100644
--- a/g10/tdbio.h
+++ b/g10/tdbio.h
@@ -1,5 +1,5 @@
/* tdbio.h - Trust database I/O functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/textfilter.c b/g10/textfilter.c
index bbba51424..414d3ec0e 100644
--- a/g10/textfilter.c
+++ b/g10/textfilter.c
@@ -1,5 +1,5 @@
/* textfilter.c
- * Copyright (C) 1998,1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/trustdb.c b/g10/trustdb.c
index cc769d1f8..54fe34d88 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1,5 +1,5 @@
/* trustdb.c
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/trustdb.h b/g10/trustdb.h
index dc1e3d0c4..a3e9225cf 100644
--- a/g10/trustdb.h
+++ b/g10/trustdb.h
@@ -1,5 +1,5 @@
/* trustdb.h - Trust database
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/g10/verify.c b/g10/verify.c
index d0feda7aa..fcc2f09ad 100644
--- a/g10/verify.c
+++ b/g10/verify.c
@@ -1,5 +1,5 @@
/* verify.c - verify signed data
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 807870d1b..1b00eae3b 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+Fri May 12 14:01:20 CEST 2000 Werner Koch <[email protected]>
+
+ * gnupg.spec.in: New version from Fabio with some updated descriptions.
+
Mon May 1 15:38:04 CEST 2000 Werner Koch <[email protected]>
* gnupg.spec.in: New version from Fabio.
diff --git a/scripts/gnupg.spec.in b/scripts/gnupg.spec.in
index fea9055c4..5ee69276c 100644
--- a/scripts/gnupg.spec.in
+++ b/scripts/gnupg.spec.in
@@ -4,9 +4,10 @@
#
%define version @pkg_version@
%define name gnupg
-Summary: GPL public key crypto
+Summary: GNU Utility for data encryption and digital signatures
Summary(it): Utility GNU per la sicurezza nelle comunicazioni e nell'archiviazione dei dati.
Summary(cs): GNU n�stroj pro �ifrovanou komunikaci a bezpe�n� ukl�d�n� dat
+Summary(fr): Utilitaire GNU de chiffrement et d'authentification des communications et des donn�es
Vendor: GNU Privacy Guard Project
Name: %{name}
Version: %{version}
@@ -14,12 +15,17 @@ Release: 1
Copyright: GPL
Group: Applications/Cryptography
Group(cs): Aplikace/�ifrov�n�
+Group(fr): Applications/Cryptographie
Source: ftp://ftp.gnupg.org/pub/gcrypt/%{name}-%{version}.tar.gz
URL: http://www.gnupg.org
Provides: gpg openpgp
BuildRoot: /tmp/rpmbuild_%{name}
%changelog
+* Mon May 01 2000 Fabio Coatti <[email protected]>
+- Some corrections in French description, thanks to Ga�l Qu�ri
+<[email protected]>; Some corrections to Italian descriptions.
+
* Tue Apr 25 2000 Fabio Coatti <[email protected]>
- Removed the no longer needed patch for man page by Keith Owens
@@ -66,14 +72,22 @@ only IDEA, patented worldwide, and RSA, which is patented in the US
until 9/20/00).
%description -l it
-GnuPG � un sostituto completo e gratuito per il PGP. Non utilizzando
-IDEA o RSA pu� essere utilizzato senza restrizioni. GnuPG � conforme
-alle specifiche OpenPGP (RFC2440).
+GnuPG (GNU Privacy Guard) � una utility GNU per la cifratura di dati e
+la creazione di firme digitali. Possiede una gestione avanzata delle
+chiavi ed � conforme allo standard Internet OpenPGP, descritto nella
+RFC 2440. Non utilizzando algoritmi brevettati, non � compatibile con
+PGP2 (PGP2.x usa solo IDEA, coperto da brevetto mondiale, ed RSA,
+brevettato negli USA con scadenza 20/09/2000). Questi algoritmi sono
+utilizzabili da GnuPG tramite moduli esterni.
%description -l fr
-GnuPG est un remplacement complet et � libre � de PGP. Comme il n'utilise
-ni IDEA ni RSA il peut �tre utilis� sans restriction. GnuPG est conforme
-� la sp�cification OpenPGP (RFC2440).
+GnuPG est un utilitaire GNU destin� � chiffrer des donn�es et � cr�er
+des signatures �lectroniques. Il a des capacit�s avanc�es de gestion de
+cl�s et il est conforme � la norme propos�e OpenPGP d�crite dans la
+RFC2440. Comme GnuPG n'utilise pas d'algorithme brevet�, il n'est
+compatible avec aucune version de PGP2 (PGP2.x ne sait utiliser que
+l'IDEA brevet� dans le monde entier et RSA, brevet� aux �tats-Unis
+jusqu'au 20 septembre 2000).
%description -l cs
GnuPG je GNU n�stroj pro bezpe�nou komunikaci a ukl�d�n� dat. M��e b�t