1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

Debian updates, minor fixes.

This commit is contained in:
Werner Koch 2000-10-17 12:41:51 +00:00
parent c9c435d91f
commit 0ad18f3cc4
15 changed files with 270 additions and 117 deletions

1
THANKS
View File

@ -65,6 +65,7 @@ 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
Jeffery Von Ronne jronne@ics.uci.edu
Jens Bachem bachem@rrz.uni-koeln.de
Jeroen C. van Gelderen jeroen@vangelderen.org
J Horacio MG homega@ciberia.es

16
debian/README.Debian vendored
View File

@ -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 <james@nocrew.org>, Bradford, UK
Sun, 8 Nov 1998 19:11:40 +0000
James Troup <james@nocrew.org>, Horsforth, UK
Sun, 1 Oct 2000 13:53:12 +0100

88
debian/changelog vendored
View File

@ -1,3 +1,91 @@
gnupg (1.0.3b-1) unstable; urgency=low
* New upstream snapshot version.
-- James Troup <james@nocrew.org> 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
<robert@pingu.ii.uj.edu.pl> 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
<Topi.Miettinen@nic.fi>. [#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 <nick@debian.org>'s request. [#57314]
-- James Troup <james@nocrew.org> Sun, 1 Oct 2000 14:55:03 +0100
gnupg (1.0.3-1) unstable; urgency=low
* New upstream version.
-- James Troup <james@nocrew.org> Mon, 18 Sep 2000 15:56:54 +0100
gnupg (1.0.2-1) unstable; urgency=low
* New upstream version.
-- James Troup <james@nocrew.org> 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 <james@nocrew.org> 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 <james@nocrew.org> 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 <james@nocrew.org> 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 <james@nocrew.org> Wed, 20 Oct 1999 23:39:05 +0100
gnupg (1.0.0-1) unstable; urgency=low
* New upstream release. [#44545]
-- James Troup <james@nocrew.org> 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

27
debian/control vendored
View File

@ -2,22 +2,23 @@ Source: gnupg
Section: utils
Priority: optional
Maintainer: James Troup <james@nocrew.org>
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.

39
debian/copyright vendored
View File

@ -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
<james@nocrew.org>, 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 <james@nocrew.org>,
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.

35
debian/rules vendored
View File

@ -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

14
doc/FAQ
View File

@ -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

View File

@ -1,5 +1,9 @@
2000-10-16 Werner Koch <wk@gnupg.org>
* 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.

View File

@ -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

View File

@ -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 )

View File

@ -1,3 +1,7 @@
2000-10-16 Werner Koch <wk@gnupg.org>
* de.po, de.glo: Updated.
Thu Sep 14 17:45:11 CEST 2000 Werner Koch <wk@openit.de>
* eo.po: Updated.

View File

@ -38,10 +38,12 @@ casual >zuf
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
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
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
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 <
warning Warnung
weak key unsicherer Schlüssel
wisely >klug, vernünftig(erweise), >gescheit; möglichst sinnvoll

121
po/de.po
View File

@ -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 <koch@hsp.de>\n"
"Language-Team: German <de@li.org>\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
#: 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

View File

@ -1,3 +1,8 @@
2000-10-16 Werner Koch <wk@gnupg.org>
* secmem.c (lock_pool): Fixed error checking for Linux.
By James Troup.
Thu Sep 14 14:20:38 CEST 2000 Werner Koch <wk@openit.de>
* miscutil.c (answer_is_yes_no_quit): Swapped order of yes/no test

View File

@ -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;