Debian updates, minor fixes.

15 files changed, 270 insertions, 117 deletions

diff --git a/THANKS b/THANKS
index 5542876b6..6132cdc89 100644
--- a/THANKS
+++ b/THANKS
@@ -65,6 +65,7 @@ Janusz A. Urbanowicz	   [email protected]
 James Troup		   [email protected]
 Jean-loup Gailly	   [email protected]
 Jeff Long		   [email protected]
+Jeffery Von Ronne          [email protected]
 Jens Bachem		   [email protected]
 Jeroen C. van Gelderen     [email protected]
 J Horacio MG		   [email protected]
diff --git a/debian/README.Debian b/debian/README.Debian
index f59643715..aaf745e96 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,3 +1,14 @@
+GDBM keyring support
+--------------------
+
+GDBM-based keyring support is (and always) was an experimental feature
+which is likely to be removed in future versions.  For that reason it
+is not compiled into the Debian package and won't be until and unless
+GDBM support stabalizes.
+
+Upgrading from old (<= 0.3.3) versions GnuPG
+--------------------------------------------
+
 Due to a bug in the way secret keys were encrypted in versions prior
 to 0.3.3, later version of gnupg are not backwards compatible and you
 will have to convert your secret keys before using old secret keys
@@ -12,5 +23,6 @@ binaries for i386, m68k, alpha, powerpc and hurd-i386 at:
   <URL:http://james.nocrew.org/gnupg/>
 
 -- 
-James Troup <[email protected]>, Bradford, UK
-Sun,  8 Nov 1998 19:11:40 +0000
+James Troup <[email protected]>, Horsforth, UK
+Sun,  1 Oct 2000 13:53:12 +0100
+
diff --git a/debian/changelog b/debian/changelog
index 5cf71aec8..823429d99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,91 @@
+gnupg (1.0.3b-1) unstable; urgency=low
+
+  * New upstream snapshot version.
+
+ -- James Troup <[email protected]>  Fri, 13 Oct 2000 18:08:14 +0100
+
+gnupg (1.0.3-2) unstable; urgency=low
+
+  * debian/control: Conflict, Replace and Provide gpg-rsa & gpg-rsaref.
+    Fix long description to reflect the fact that RSA is no longer
+    patented and now included. [#72177]
+  * debian/rules: move faq.html to /usr/share/doc/gnupg/ and remove FAQ
+    from /usr/share/gnupg/.  Thanks to Robert Luberda
+    <[email protected]> for noticing. [#72151]
+  * debian/control: Suggest new package gnupg-doc. [#64323, #65560]
+  * utils/secmem.c (lock_pool): don't bomb out if mlock() returns ENOMEM,
+    as Linux will do this if resource limits (or other reasons) prevent
+    memory from being locked, instead treat it like permission was denied
+    and warn but continue.  Thanks to Topi Miettinen
+    <[email protected]>. [#70446]
+  * g10/hkp.c (not_implemented): s/ist/is/ in error message.
+  * debian/README.Debian: add a note about GDBM support and why it is
+    disabled.  Upstream already fixed the manpage.  [#65913]
+  * debian/rules (binary-arch): fix the Spanish translation to be 'es' not
+    'es_ES' at Nicol�s Lichtmaier <[email protected]>'s request. [#57314]
+
+ -- James Troup <[email protected]>  Sun,  1 Oct 2000 14:55:03 +0100
+
+gnupg (1.0.3-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- James Troup <[email protected]>  Mon, 18 Sep 2000 15:56:54 +0100
+
+gnupg (1.0.2-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- James Troup <[email protected]>  Thu, 13 Jul 2000 20:26:50 +0100
+
+gnupg (1.0.1-2) unstable; urgency=low
+
+  * debian/control (Build-Depends): added.
+  * debian/copyright: corrected location of copyright file.  Removed
+    references to Linux.  Removed warnings about beta nature of GnuPG.
+  * debian/rules (binary-arch): install documentation into
+    /usr/share/doc/gnupg/ and pass mandir to make install to ensure the
+    manpages go to /usr/share/man/.
+  * debian/postinst: create /usr/doc/gnupg symlink.
+  * debian/prerm: new file; remove /usr/doc/gnupg symlink.
+  * debian/rules (binary-arch): install prerm.
+  * debian/control (Standards-Version): updated to 3.1.1.1.
+
+ -- James Troup <[email protected]>  Thu, 30 Dec 1999 16:16:49 +0000
+
+gnupg (1.0.1-1) unstable; urgency=low
+
+  * New upstream version.
+  * doc/gpg.1: updated to something usable from
+    ftp://ftp.gnupg.org/pub/gcrypt/gnupg/gpg.1.gz.
+
+ -- James Troup <[email protected]>  Sun, 19 Dec 1999 23:47:10 +0000
+
+gnupg (1.0.0-3) unstable; urgency=low
+
+  * debian/rules (build): remove the stunningly ill-advised --host option
+    to configure.  [#44698, #48212, #48281]
+
+ -- James Troup <[email protected]>  Tue, 26 Oct 1999 01:12:59 +0100
+
+gnupg (1.0.0-2) unstable; urgency=low
+
+  * debian/rules (binary-arch): fix the permissions on the
+    modules. [#47280]
+  * debian/postinst, debian/postrm: fix the package name passed to
+    suidregister. [#45013]
+  * debian/control: update long description. [#44636]
+  * debian/rules (build): pass the host explicitly to configure to avoid
+    problems on sparc64. [(Should fix) #44698].
+
+ -- James Troup <[email protected]>  Wed, 20 Oct 1999 23:39:05 +0100
+
+gnupg (1.0.0-1) unstable; urgency=low
+
+  * New upstream release. [#44545]
+
+ -- James Troup <[email protected]>  Wed,  8 Sep 1999 00:53:02 +0100
+
 gnupg (0.9.10-2) unstable; urgency=low
 
   * debian/rules (binary-arch): install lspgpot.  Requested by Kai
diff --git a/debian/control b/debian/control
index 0b6120ea6..28eb808c0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,22 +2,23 @@ Source: gnupg
 Section: utils
 Priority: optional
 Maintainer: James Troup <[email protected]>
-Standards-Version: 2.5.0.0
+Standards-Version: 3.1.1.1
+Build-Depends: gettext, libgdbmg1-dev, libz-dev
 
 Package: gnupg
 Architecture: any
 Depends: ${shlibs:Depends}, makedev (>= 2.3.1-13)
+Suggests: gnupg-doc
+Conflicts: gpg-rsa, gpg-rsaref
+Replaces: gpg-rsa, gpg-rsaref
+Provides: gpg-rsa, gpg-rsaref
 Description: GNU privacy guard - a free PGP replacement.
- GnuPG is the GNU encryption and signing tool.  As you can see from the
- version number, the program may have some bugs and some features may not
- work at all.
+ GnuPG is GNU's tool for secure communication and data storage.
+ It can be used to encrypt data and to create digital signatures.
+ It includes an advanced key management facility and is compliant
+ with the proposed OpenPGP Internet standard as described in RFC2440.
  .
- Due to the fact that GnuPG does not use use any patented algorithm,
- it cannot be compatible to old PGP versions, because those use
- IDEA (which is worldwide patented) and RSA (which is patented in
- the United States until Sep 20, 2000).
- .
- GnuPG is in almost all aspects compatible with other OpenPGP
- implementations. The default algorithms are DSA and ELGamal.
- Symmetric algorithms are: Blowfish and CAST5, Digest algorithms are
- MD5, RIPEMD160, SHA1 and TIGER/192.
+ GnuPG does not use use any patented algorithms so it cannot be
+ compatible with PGP2 because it uses IDEA (which is patented
+ worldwide) and RSA.  RSA's patent expired on the 20th September 2000,
+ and it is now included in GnuPG.
diff --git a/debian/copyright b/debian/copyright
index 6c08adfc7..8de304ccb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,30 +1,29 @@
-This is Debian/GNU Linux's prepackaged version of GNUPG, a free PGP
-replacement. As you can see from the version number, the program may
-have some bugs and some features may not work at all.
+This is Debian GNU's prepackaged version of GnuPG, a free PGP
+replacement.
 
-This package was put together by me, James Troup
-<[email protected]>, from the sources, which I obtained from
-ftp://ftp.gnupg.org/pub/gcrypt/gnupg-0.9.10.tar.gz.  The changes were
-minimal, namely:
+This package was put together by me, James Troup <[email protected]>,
+from the sources, which I obtained from
+ftp://ftp.gnupg.org/pub/gcrypt/gnupg/gnupg-1.0.3.tar.gz.  The changes
+were minimal, namely:
 
 - adding support for the Debian package maintenance scheme, by adding
   various debian/* files.
 
 Program Copyright (C) 1998, 1999 Free Software Foundation, Inc.
-Modifications for Debian Copyright (C) 1998,1999 James Troup.
+Modifications for Debian Copyright (C) 1998, 1999, 2000 James Troup.
 
-GNUPG is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+GnuPG is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
 
-GNUPG is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
+GnuPG is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
 You should have received a copy of the GNU General Public License with
-your Debian GNU/Linux system, in /usr/doc/copyright/GPL, or with the
-Debian GNU/Linux gnupg source package as the file COPYING.  If not,
-write to the Free Software Foundation, Inc., 59 Temple Place, Suite
-330, Boston, MA 02111-1307, USA.
+your Debian GNU system, in /usr/share/common-licenses/GPL, or with the
+Debian GNU gnupg source package as the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+Boston, MA 02111-1307, USA.
diff --git a/debian/rules b/debian/rules
index 3583ed4f7..d194653ef 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules file - for GNUPG (0.9.10)
+# debian/rules file - for GNUPG (1.0.3)
 # Based on sample debian/rules file - for GNU Hello (1.3).
 # Copyright 1994,1995 by Ian Jackson.
 # Copyright 1998 James Troup
@@ -32,26 +32,31 @@ binary-arch:	checkroot build # test
 	$(checkdir)
 	-rm -rf debian/tmp
 	install -d debian/tmp/DEBIAN/
-	install -m 755 debian/preinst debian/postinst debian/postrm debian/tmp/DEBIAN/
-	$(MAKE) prefix=`pwd`/debian/tmp/usr install
+	install -m 755 debian/preinst debian/prerm debian/postinst debian/postrm debian/tmp/DEBIAN/
+	$(MAKE) prefix=`pwd`/debian/tmp/usr mandir=`pwd`/debian/tmp/usr/share/man install
 	strip debian/tmp/usr/bin/*
+	chmod 644 debian/tmp/usr/lib/gnupg/*
 	sed -e "s#../g10/gpg#gpg#" < tools/lspgpot > debian/tmp/usr/bin/lspgpot
 	chmod 755 debian/tmp/usr/bin/lspgpot
 	strip --strip-unneeded debian/tmp/usr/lib/gnupg/*
-	sed -e "s#/usr/local/#/usr/#" < debian/tmp/usr/man/man1/gpg.1 \
-	    > debian/tmp/usr/man/man1/gpg.1.new
-	mv debian/tmp/usr/man/man1/gpg.1.new debian/tmp/usr/man/man1/gpg.1
-	gzip -9v debian/tmp/usr/man/man1/*
-	install -d debian/tmp/usr/doc/gnupg/
-	install -m 644 debian/changelog debian/tmp/usr/doc/gnupg/changelog.Debian
+	# In response to #53714... no idea if it's correct, will check with upstream
+	mv debian/tmp/usr/share/locale/es_ES debian/tmp/usr/share/locale/es
+	sed -e "s#/usr/local/#/usr/#" < debian/tmp/usr/share/man/man1/gpg.1 \
+	    > debian/tmp/usr/share/man/man1/gpg.1.new
+	mv debian/tmp/usr/share/man/man1/gpg.1.new debian/tmp/usr/share/man/man1/gpg.1
+	gzip -9v debian/tmp/usr/share/man/man1/*
+	# Remove from /usr/share/gnupg that we install into /usr/share/doc/gnupg/
+	rm debian/tmp/usr/share/gnupg/FAQ debian/tmp/usr/share/gnupg/faq.html
+	install -d debian/tmp/usr/share/doc/gnupg/
+	install -m 644 debian/changelog debian/tmp/usr/share/doc/gnupg/changelog.Debian
 	install -m 644 debian/README.Debian README NEWS THANKS TODO doc/DETAILS \
-		doc/FAQ doc/OpenPGP debian/tmp/usr/doc/gnupg/
+		doc/FAQ doc/faq.html doc/OpenPGP debian/tmp/usr/share/doc/gnupg/
 	for i in po util mpi cipher tools g10 checks include; do \
-		install -m 644 $$i/ChangeLog debian/tmp/usr/doc/gnupg/changelog.$$i; done
-	install -m 644 ChangeLog debian/tmp/usr/doc/gnupg/changelog.toplevel
-	gzip -9v debian/tmp/usr/doc/gnupg/*
-	ln -s changelog.g10.gz debian/tmp/usr/doc/gnupg/changelog.gz
-	install -m 644 debian/copyright debian/tmp/usr/doc/gnupg/
+		install -m 644 $$i/ChangeLog debian/tmp/usr/share/doc/gnupg/changelog.$$i; done
+	install -m 644 ChangeLog debian/tmp/usr/share/doc/gnupg/changelog.toplevel
+	gzip -9v debian/tmp/usr/share/doc/gnupg/*
+	ln -s changelog.g10.gz debian/tmp/usr/share/doc/gnupg/changelog.gz
+	install -m 644 debian/copyright debian/tmp/usr/share/doc/gnupg/
 	dpkg-shlibdeps g10/gpg
 	dpkg-gencontrol -isp
 	chown -R root.root debian/tmp
diff --git a/doc/FAQ b/doc/FAQ
index 51635fb67..a2a2d4800 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -2,7 +2,7 @@
 GNUPG FREQUENTLY ASKED QUESTIONS
 
 Version: 0.2
-Last-Modified: Oct 01, 2000
+Last-Modified: Oct 14, 2000
 Maintained-by: Nils Ellmenreich <nils 'at' infosun.fmi.uni-passau.de>
 
 This is the GnuPG FAQ. The latest HTML version is available  
@@ -69,6 +69,8 @@ to be included here.
    6.4) Old versions of GnuPG can't verify ElGamal signatures
    6.5) When I use --clearsign, the plain text has sometimes extra dashes 
 	in it - why?
+   6.6) I have multiple signatures in a file and GnuPG says, the signatures are
+	bad.
 
  7. ADVANCED TOPICS
    7.1) How does this whole thing work?
@@ -490,6 +492,16 @@ in it - why?
     Good mail clients remove those extra dashes when displaying such a 
     message.      
 
+6.6) I have multiple signatures in a file and GnuPG says, the signatures are
+    bad.
+
+    Due to different message formats GnuPG is not always able to split such a
+    file unambiguously into the it's parts.  The result is that GnuPG claims 
+    the signature(s) is bad.  
+
+    The only way to have multiple signatures in a file is by using the 
+    OpenPGP format with one-pass-signature packets (which is GnuPG's
+    default) or the cleartext signed format.
 
 
 7. ADVANCED TOPICS
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 191501b4c..055c2de60 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,9 @@
 2000-10-16  Werner Koch  <[email protected]>
 
+	* mainproc.c (do_proc_packets): Hack to fix the problem that
+	signatures are not detected when there is a MDC packet but no
+	compression packet.
+	
 	* g10.c (print_hashline): New.
 	(print_mds): Use above func with --with-colons.
 
diff --git a/g10/hkp.c b/g10/hkp.c
index 9df6da83b..57aed93d0 100644
--- a/g10/hkp.c
+++ b/g10/hkp.c
@@ -42,7 +42,7 @@ static int urlencode_filter( void *opaque, int control,
 static void
 not_implemented(void)
 {
-    log_error("keyserver access ist not yet available for MS-Windows\n");
+    log_error("keyserver access is not yet available for MS-Windows\n");
 }
 #endif
 
diff --git a/g10/mainproc.c b/g10/mainproc.c
index d0afd7ac1..dc2d66d5e 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1072,7 +1072,15 @@ do_proc_packets( CTX c, IOBUF a )
 	      default: newpkt = 0; break;
 	    }
 	}
-	if( pkt->pkttype != PKT_SIGNATURE )
+        /* This is a very ugly construct and frankly, I don't remember why
+         * I used it.  Adding the MDC check here is a hack.
+         * The right solution is to initiate another context for encrypted
+         * packet and not to reuse the current one ...  It works right
+         * when there is a compression packet inbetween which adds just
+         * an extra layer.
+         * Hmmm: Rewrite this whole module here?? 
+         */
+	if( pkt->pkttype != PKT_SIGNATURE && pkt->pkttype != PKT_MDC )
 	    c->have_data = pkt->pkttype == PKT_PLAINTEXT;
 
 	if( newpkt == -1 )
diff --git a/po/ChangeLog b/po/ChangeLog
index 73ff61453..f2f77085b 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-16  Werner Koch  <[email protected]>
+
+	* de.po, de.glo: Updated.
+
 Thu Sep 14 17:45:11 CEST 2000  Werner Koch  <[email protected]>
 
         * eo.po: Updated.
diff --git a/po/de.glo b/po/de.glo
index a7ef4f35c..92780ebd3 100644
--- a/po/de.glo
+++ b/po/de.glo
@@ -38,10 +38,12 @@ casual  		>zuf�llig, >gelegentlich >unregelm��ig
 certificate		Zertifikat
 , (Urkunde)
 character set		Zeichensatz
-check (verb)		pr|fen, gepr|ft
+check (verb)		pr�fen, gepr�ft
+checking [sth.]		[sth-]-�berpr�fung
 checksum		Pr�fsumme
 cipher algorithm	Verschl�sselungsverfahren
 clearsig header		Klartextsignatur-Einleitung
+created			erzeugt
 command			Befehl
 comment			Bemerkung
 compress algorithm      Komprimierverfahren,*Komprimierungsverfahren ?   
@@ -52,6 +54,7 @@ core function    	<wesentliche Funktion
 correct			beseitigen (please correct the error first)
 corrupted		besch�digter
 cover   		>behandeln, <erl�utern
+created			erstellt
 creation    		<Erzeugung
 critical bit   		???
 dash escaped            mit Bindestrich \"escapte\", *m.Bindestrichen maskiert?
@@ -68,10 +71,13 @@ encrypted		verschl�sselte
 eventually  		>schlie�lich, endlich  Nicht: eventuell
 expiration date 	<Verfalldatum
 expire  		<verfallen
+expires			verf�llt
 expire date		Verfallsdatum
 failed			fehlgeschlagen
 faked [RNG]             - *manipulierter Zufallszahlengenerator
+faked [certificate]     gef�lscht
 fingerprint  		Fingerabdruck
+found [xyz found]       entdeckt [xyz entdeckt]
 for-your-eyes-only	Vertraulichkeit (\"for-your-eyes-only\")
 generated		erzeugter
 good certificate	Korrektes Zertifikat
@@ -87,8 +93,9 @@ key-ID                  Schl�ssel-ID, *Schl�sselkennung ?
 
 key binding		Schl�sselanbindung
 keyblock		Schl�sselblock
-keyring 		Schl�sselbund
 keyserver   		Schl�sselserver, -*Schl�ssel-Server 
+keysize			
+keyring 		Schl�sselbund
 lifetime    		>G�ltigkeitsdauer, >Geltungsdauer
 lookup			- Suche
 machine 		h�ufig: Computer, Rechner
@@ -119,6 +126,7 @@ preference items	????
 preferences 		Einstellungen    *(die gesamten) Einstellungen
 preferred		bevorzugt
 primary keys		Hauptschl�ssel
+problem [to do sth.]    -Schwierigkeit
 prompt (to) 		auch: >abfragen, >anfordern, >verlangen
 protected
 protection algorithm	Schutzverfahren
@@ -148,6 +156,7 @@ signature (files)	Unterschrift          *
 signature (keys)	Beglaubigung          *
 simple S2K mode		????
 skipped			�bergangen, �bersprungen, ignoriert
+so far 			bislang
 specify 		>spezifizieren, <angeben, ?festlegen
 stdin   		- stdin, *die Standardeingabe 
 subkey			Unterschl�ssel
@@ -155,6 +164,7 @@ superseeded		�berholt, veraltet
 terminal charset        - Terminalzeichensatz *Terminal-Zeichensatz(s.o.)
 throw			verwerfe
 Timestamp conflict	Zeitangaben differieren
+trust			Vertrauen
 Trust-DB    		'Trust'-Datenbank, *Vertrauensdatenbank ?
 trusted			- vertrauensw�rdig
 trustvalues		- trustvalues >Vertrauensniveaus?? *Vertrauensma�? >Vertrauenswerte?
@@ -177,3 +187,4 @@ verify  		< �berpr�fen
 warning			Warnung
 weak key		unsicherer Schl�ssel
 wisely                  >klug, vern�nftig(erweise), >gescheit; m�glichst sinnvoll
+
diff --git a/po/de.po b/po/de.po
index 295fa38ee..7c20ee993 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-10-13 17:20+0200\n"
-"PO-Revision-Date: 2000-06-12  12:50+0200\n"
+"POT-Creation-Date: 2000-10-15 01:31+0000\n"
+"PO-Revision-Date: 2000-10-15 14:30+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -591,7 +591,7 @@ msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
 #: g10/g10.c:299
 msgid "|KEYID|ulimately trust this key"
-msgstr ""
+msgstr "|KEYID|diesem Schl�ssel uneingeschr�nkt vertrauen"
 
 #: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
@@ -1316,9 +1316,9 @@ msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signieren/beglaubigen und verschl�sseln)\n"
 
 #: g10/keygen.c:548
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (signieren/beglaubigen und verschl�sseln)\n"
+msgstr "   (%d) RSA (signieren/beglaubigen und verschl�sseln)\n"
 
 #: g10/keygen.c:552
 msgid "Your selection? "
@@ -1360,9 +1360,8 @@ msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
 
 #: g10/keygen.c:613
-#, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
+msgstr "zu kurz; 1024 ist die kleinste f�r RSA m�gliche Schl�ssell�nge.\n"
 
 #. It is ridiculous and an annoyance to use larger key sizes!
 #. * GnuPG can handle much larger sizes; but it takes an eternity
@@ -1672,7 +1671,7 @@ msgstr "Zertifikat Leseproblem: %s\n"
 #: g10/export.c:171
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "Schl�ssel %08lX: dies ist kein rfc2440-Sch�ssel - �bersprungen\n"
+msgstr "Schl�ssel %08lX: dies ist kein RFC2440-Sch�ssel - �bersprungen\n"
 
 #: g10/export.c:182
 #, c-format
@@ -1734,59 +1733,59 @@ msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schl�ssel: %lu\n"
 
 #: g10/import.c:206
-#, fuzzy, c-format
+#, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr "  neue Unterschl�ssel: %lu\n"
+msgstr "              ignorierte neue Schl�ssel: %lu\n"
 
 #: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
-msgstr "         ohne User-ID: %lu\n"
+msgstr "                           ohne User-ID: %lu\n"
 
 #: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
-msgstr "           importiert: %lu"
+msgstr "                             importiert: %lu"
 
 #: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
-msgstr "          unver�ndert: %lu\n"
+msgstr "                            unver�ndert: %lu\n"
 
 #: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
-msgstr "        neue User-IDs: %lu\n"
+msgstr "                          neue User-IDs: %lu\n"
 
 #: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
-msgstr "  neue Unterschl�ssel: %lu\n"
+msgstr "                    neue Unterschl�ssel: %lu\n"
 
 #: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
-msgstr "        neue Signaturen: %lu\n"
+msgstr "                        neue Signaturen: %lu\n"
 
 #: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "neue Schl�sselwiderrufe: %lu\n"
+msgstr "                neue Schl�sselwiderrufe: %lu\n"
 
 #: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
-msgstr " gelesene geheime Schl.: %lu\n"
+msgstr "             gelesene geheime Schl�ssel: %lu\n"
 
 #: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
-msgstr "geheime Schl�ssel importiert: %lu\n"
+msgstr "           geheime Schl�ssel importiert: %lu\n"
 
 #: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
-msgstr " unver�nderte geh.Schl.: %lu\n"
+msgstr "                 unver�nderte geh.Schl.: %lu\n"
 
 #: g10/import.c:391 g10/import.c:590
 #, c-format
@@ -1808,9 +1807,9 @@ msgid "key %08lX: public key not found: %s\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
 
 #: g10/import.c:423
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: new key - skipped\n"
-msgstr "Schl�ssel %08lX: dies ist kein rfc2440-Sch�ssel - �bersprungen\n"
+msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 
 #: g10/import.c:431
 msgid "no default public keyring\n"
@@ -2436,31 +2435,30 @@ msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 #: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr ""
+msgstr "%s%c %4u%c/%08lX  erstellt: %s verf�llt: %s"
 
 #: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
-msgstr ""
+msgstr " Vertrauen: %c/%c"
 
 #: g10/keyedit.c:1094
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
 #: g10/keyedit.c:1123
-#, fuzzy, c-format
+#, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "Schl�ssel %08lX: Unterschl�ssel wurde widerrufen\n"
+msgstr "rev! Unterschl�ssel wurde widerrufen: %s\n"
 
 #: g10/keyedit.c:1126
-#, fuzzy
 msgid "rev- faked revocation found\n"
-msgstr "neue Schl�sselwiderrufe: %lu\n"
+msgstr "rev- gef�lschter Schl�sselwiderruf entdeckt\n"
 
 #: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr ""
+msgstr "rev? Schwierigkeiten bei der Widerruf-�berpr�fung: %s\n"
 
 #: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
@@ -2571,129 +2569,127 @@ msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
 #: g10/keylist.c:158
-#, fuzzy
 msgid "invalid"
-msgstr "Ung�ltige ASCII-H�lle"
+msgstr "ung�ltig"
 
 #: g10/keylist.c:178
-#, fuzzy
 msgid "revoked"
-msgstr "revkey"
+msgstr "widerrufen"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:781
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verf�llt: %s]"
 
-#: g10/mainproc.c:231
+#: g10/mainproc.c:240
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "�ffentlicher Schl�ssel ist %08lX\n"
 
-#: g10/mainproc.c:275
+#: g10/mainproc.c:284
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:317
+#: g10/mainproc.c:326
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "verschl�sselt mit %u-Bit %s Schl�ssel, ID %08lX, erzeugt %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:327
+#: g10/mainproc.c:336
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "verschl�sselt mit %s Schl�ssel, ID %08lX\n"
 
-#: g10/mainproc.c:333
+#: g10/mainproc.c:342
 msgid "no secret key for decryption available\n"
 msgstr "kein geheimer Schl�ssel zur Entschl�sselung vorhanden\n"
 
-#: g10/mainproc.c:342
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:379
+#: g10/mainproc.c:388
 msgid "decryption okay\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:384
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:408
+#: g10/mainproc.c:417
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:410
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:652 g10/mainproc.c:661
+#: g10/mainproc.c:661 g10/mainproc.c:670
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
 
-#: g10/mainproc.c:664
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:671
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1104
+#: g10/mainproc.c:1113
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1110
+#: g10/mainproc.c:1119
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1136 g10/mainproc.c:1147
+#: g10/mainproc.c:1145 g10/mainproc.c:1156
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1137 g10/mainproc.c:1148
+#: g10/mainproc.c:1146 g10/mainproc.c:1157
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1139
+#: g10/mainproc.c:1148
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1195
+#: g10/mainproc.c:1204
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1270
+#: g10/mainproc.c:1279
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1321
+#: g10/mainproc.c:1330
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1326
+#: g10/mainproc.c:1335
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -3098,9 +3094,9 @@ msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record fehlgeschlagen: %s\n"
 
 #: g10/trustdb.c:474
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
-msgstr "%s: Dies ist keine g�ltige Schl�ssel-ID\n"
+msgstr "'%s' ist keine g�ltige Schl�ssel-ID-L�nge\n"
 
 #: g10/trustdb.c:501
 #, c-format
@@ -3123,9 +3119,10 @@ msgid "key %08lX: accepted as trusted key.\n"
 msgstr "Schl�ssel %08lX: Akzeptiert als vertrauensw�rdiger Schl�ssel.\n"
 
 #: g10/trustdb.c:546
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "Schl�ssel %08lX: ungesch�tzt - �bersprungen\n"
+msgstr "Schl�ssel %08lX: kein �ffentlicher Schl�ssel f�r den vertrauensw�rdig
+en Schl�ssel - �bersprungen\n"
 
 #: g10/trustdb.c:565
 #, c-format
diff --git a/util/ChangeLog b/util/ChangeLog
index 8be8f3fb8..8aee8a72b 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-16  Werner Koch  <[email protected]>
+
+	* secmem.c (lock_pool): Fixed error checking for Linux.
+	By James Troup.
+
 Thu Sep 14 14:20:38 CEST 2000  Werner Koch  <[email protected]>
 
         * miscutil.c (answer_is_yes_no_quit): Swapped order of yes/no test
diff --git a/util/secmem.c b/util/secmem.c
index 308b6bb46..1420597e8 100644
--- a/util/secmem.c
+++ b/util/secmem.c
@@ -100,6 +100,9 @@ lock_pool( void *p, size_t n )
 	  #ifdef ENOSYS  /* Some SCOs return this (function not implemented) */
 	    && errno != ENOSYS
 	  #endif
+          #ifdef ENOMEM  /* Linux can return this */
+            && errno != ENOMEM
+          #endif
 	  )
 	    log_error("can't lock memory: %s\n", strerror(err));
 	show_warning = 1;
@@ -142,6 +145,9 @@ lock_pool( void *p, size_t n )
 	  #ifdef ENOSYS  /* Some SCOs return this (function not implemented) */
 	    && errno != ENOSYS
 	  #endif
+          #ifdef ENOMEM  /* Linux can return this */
+            && errno != ENOMEM
+          #endif
 	  )
 	    log_error("can't lock memory: %s\n", strerror(err));
 	show_warning = 1;