[git] GnuPG - branch, master, updated. gnupg-2.1.16-158-g63c7bf1
by Werner Koch
cvs at cvs.gnupg.org
Mon Dec 19 16:43:19 CET 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 63c7bf1a62d1d801c79a75fdb2ef7d7cac68e1d1 (commit)
via 10dae1518633760db28e6f46cd0c6f4b6123013a (commit)
via d51499fdc522a696f23c6776c3ab248742f4e06a (commit)
from aec89a7297bae30f79a63fdc830530e82bab6170 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 63c7bf1a62d1d801c79a75fdb2ef7d7cac68e1d1
Author: Werner Koch <wk at gnupg.org>
Date: Mon Dec 19 16:29:44 2016 +0100
po: Some updates to the German translation.
--
diff --git a/po/de.po b/po/de.po
index 3af9918..a93bf7a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2016-11-18 15:40+0100\n"
+"PO-Revision-Date: 2016-12-18 20:17+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@ -1825,6 +1825,9 @@ msgstr "Schnell eine neue User-ID anfügen"
msgid "quickly revoke a user-id"
msgstr "Schnell eine User-ID widerrufen"
+msgid "quickly set a new expiration date"
+msgstr "Schnell ein neues Ablaufdatum setzen"
+
msgid "full featured key pair generation"
msgstr "Ein neues Schlüsselpaar erzeugen (alle Optionen)"
@@ -1934,7 +1937,7 @@ msgid ""
"Examples:\n"
"\n"
" -se -r Bob [file] sign and encrypt for user Bob\n"
-" --clear-sign [file] make a clear text signature\n"
+" --clear-sign [file] make a clear text signature\n"
" --detach-sign [file] make a detached signature\n"
" --list-keys [names] show keys\n"
" --fingerprint [names] show fingerprints\n"
@@ -1943,7 +1946,7 @@ msgstr ""
"Beispiele:\n"
"\n"
" -se -r Bob [Datei] Signieren und verschlüsseln für Benutzer Bob\n"
-" --clear-sign [Datei] Eine Klartextsignatur erzeugen\n"
+" --clear-sign [Datei] Eine Klartextsignatur erzeugen\n"
" --detach-sign [Datei] Eine abgetrennte Signatur erzeugen\n"
" --list-keys [Namen] Schlüssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n"
@@ -3414,6 +3417,10 @@ msgstr "Keine passende User-ID"
msgid "Nothing to sign.\n"
msgstr "Nichts zu beglaubigen\n"
+#, c-format
+msgid "'%s' is not a valid expiration time\n"
+msgstr "'%s' ist kein gültiges Ablaufdatum\n"
+
msgid "Digest: "
msgstr "Digest: "
@@ -5536,6 +5543,14 @@ msgstr ""
msgid "unsupported TOFU database version: %s\n"
msgstr "Nicht unterstützte TOFU Datenbank Version: %s\n"
+#, fuzzy, c-format
+#| msgid "error creating temporary file: %s\n"
+msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
+
+msgid "TOFU DB error"
+msgstr "TOFU (Trust on First Use) database error"
+
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "Fehler beim Lesen der TOFU Datenbank: %s\n"
commit 10dae1518633760db28e6f46cd0c6f4b6123013a
Author: Werner Koch <wk at gnupg.org>
Date: Mon Dec 19 16:27:21 2016 +0100
typo: Fix a string in do_we_trust_pre.
--
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 0426da8..288affc 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -481,7 +481,7 @@ do_we_trust_pre( PKT_public_key *pk, unsigned int trustlevel )
if ((trustlevel & TRUST_MASK) == TRUST_NEVER)
tty_printf(
- _("This key has is bad! It has been marked as untrusted! If you\n"
+ _("This key is bad! It has been marked as untrusted! If you\n"
"*really* know what you are doing, you may answer the next\n"
"question with yes.\n"));
else
commit d51499fdc522a696f23c6776c3ab248742f4e06a
Author: Werner Koch <wk at gnupg.org>
Date: Mon Dec 19 16:37:50 2016 +0100
dirmngr,w32: Hack around a select problem.
* dirmngr/dns.c (FD_SETSIZE): Bump up to 1024.
(dns_poll): Return an error instead of hitting an assertion failure.
--
For unknown reasons socket() return fd with values 244, 252, 268. The
latter is above the FD_SETSIZE of 256. It seems that select has been
build with a highler FD_SETSIZE limit. Bump up to a reasonable large
value.
A better solution would be to grab some code from npth_eselect to
replace select. We could also use npth_eselect direclty in
dns-stuff.c instead of using dns_res_poll.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/dirmngr/dns.c b/dirmngr/dns.c
index de7fa72..4b61b72 100644
--- a/dirmngr/dns.c
+++ b/dirmngr/dns.c
@@ -50,7 +50,7 @@
#if _WIN32
#ifndef FD_SETSIZE
-#define FD_SETSIZE 256
+#define FD_SETSIZE 1024
#endif
#include <winsock2.h>
#include <ws2tcpip.h>
@@ -1107,7 +1107,8 @@ static int dns_poll(int fd, short events, int timeout) {
if (!events)
return 0;
- assert(fd >= 0 && (unsigned)fd < FD_SETSIZE);
+ if (fd < 0 || (unsigned)fd >= FD_SETSIZE)
+ return EINVAL;
FD_ZERO(&rset);
FD_ZERO(&wset);
-----------------------------------------------------------------------
Summary of changes:
dirmngr/dns.c | 5 +++--
g10/pkclist.c | 2 +-
po/de.po | 21 ++++++++++++++++++---
3 files changed, 22 insertions(+), 6 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list