[git] GnuPG - branch, master, updated. gnupg-2.1.11-6-g1b90b52
by Werner Koch
cvs at cvs.gnupg.org
Wed Jan 27 14:28:30 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 1b90b52a56b4f808ad29a7ef79aeafc03c7424b4 (commit)
via ab7d41b69ce569270b25bc69f88b8b420465366c (commit)
via 4d67144142f04184b835e50314eb21b882b9e00a (commit)
via f099042d82ed49be0ed546a751e26a10c4e01a47 (commit)
from d0d97089706286fafd3c8ff56f3b5bf7ac07c6e0 (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 1b90b52a56b4f808ad29a7ef79aeafc03c7424b4
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jan 27 14:23:19 2016 +0100
scd: Fix detection of libusb.
* configure.ac (HAVE_LIBUSB): Clear if no header file was found.
(LIBUSB_LIBS): Ditto.
--
This allows to use commit d0d9708 when libusb is installed without the
header files.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/configure.ac b/configure.ac
index c200069..81fde82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -797,10 +797,7 @@ if test "$use_ccid_driver" = yes ; then
esac
AC_CHECK_LIB(usb-1.0, libusb_init,
[ LIBUSB_LIBS="$LIBUSB_LIBS"
- AC_DEFINE(HAVE_LIBUSB,1, [defined if libusb is available])
- have_libusb=yes
- ])
- AC_DEFINE([HAVE_LIBUSB])
+ have_libusb=yes ])
AC_MSG_CHECKING([libusb include dir])
usb_incdir_found="no"
for _incdir in "" "/usr/include/libusb-1.0" "/usr/local/include/libusb-1.0"; do
@@ -819,9 +816,16 @@ if test "$use_ccid_driver" = yes ; then
AC_MSG_RESULT([${usb_incdir}])
else
AC_MSG_RESULT([not found])
+ usb_incdir=""
+ have_libusb=no
use_ccid_driver=no
+ LIBUSB_LIBS=""
fi
- if test "$usb_incdir" = ""; then
+
+ if test "$have_libusb" = yes; then
+ AC_DEFINE(HAVE_LIBUSB,1, [defined if libusb is available])
+ fi
+ if test x"$usb_incdir" = x; then
LIBUSB_CPPFLAGS=""
else
LIBUSB_CPPFLAGS="-I${usb_incdir}"
commit ab7d41b69ce569270b25bc69f88b8b420465366c
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jan 27 13:58:20 2016 +0100
gpg: Shorten the --tofu-policy help text
--
Using "help" as value lists the options. Not having the current
options in the help text also makes it easier to keep translations
clean.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/g10/gpg.c b/g10/gpg.c
index 56bbd0d..330d5a3 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -486,7 +486,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aGenRandom,"gen-random", "@" ),
ARGPARSE_c (aServer, "server", N_("run in server mode")),
ARGPARSE_c (aTOFUPolicy, "tofu-policy",
- N_("|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)")),
+ N_("|VALUE|set the TOFU policy for a key")),
ARGPARSE_group (301, N_("@\nOptions:\n ")),
commit 4d67144142f04184b835e50314eb21b882b9e00a
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jan 27 13:55:31 2016 +0100
dirmngr: Build fix for FreeBSD (EAI macros)
* dirmngr/dns-stuff.c (map_eai_to_gpg_error): Map EAI_NODATA and
EAI_ADDRFAMILY only if defined.
--
Reported-by: Christoph Moench-Tegeder <cmt at burggraben.net>
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index 63dfc8d..40c71f3 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -177,13 +177,17 @@ map_eai_to_gpg_error (int ec)
case EAI_BADFLAGS: err = gpg_error (GPG_ERR_INV_FLAG); break;
case EAI_FAIL: err = gpg_error (GPG_ERR_SERVER_FAILED); break;
case EAI_MEMORY: err = gpg_error (GPG_ERR_ENOMEM); break;
+#ifdef EAI_NODATA
case EAI_NODATA: err = gpg_error (GPG_ERR_NO_DATA); break;
+#endif
case EAI_NONAME: err = gpg_error (GPG_ERR_NO_NAME); break;
case EAI_SERVICE: err = gpg_error (GPG_ERR_NOT_SUPPORTED); break;
case EAI_FAMILY: err = gpg_error (GPG_ERR_EAFNOSUPPORT); break;
case EAI_SOCKTYPE: err = gpg_error (GPG_ERR_ESOCKTNOSUPPORT); break;
#ifndef HAVE_W32_SYSTEM
+# ifdef EAI_ADDRFAMILY
case EAI_ADDRFAMILY:err = gpg_error (GPG_ERR_EADDRNOTAVAIL); break;
+# endif
case EAI_SYSTEM: err = gpg_error_from_syserror (); break;
#endif
default: err = gpg_error (GPG_ERR_UNKNOWN_ERRNO); break;
commit f099042d82ed49be0ed546a751e26a10c4e01a47
Author: Ineiev <ineiev at gnu.org>
Date: Wed Jan 27 10:42:16 2016 +0100
doc: Typo fixes
--
diff --git a/doc/TRANSLATE b/doc/TRANSLATE
index 38a6fd9..2a20aad 100644
--- a/doc/TRANSLATE
+++ b/doc/TRANSLATE
@@ -26,7 +26,7 @@ help used to be translated the usual way with gettext but it turned
out that this is too inflexible and does for example not allow to
correct little mistakes in the English text. For some newer features
we require editable help files anyway and thus the existing help
-strings have neen moved to plain text files names "help.LL.txt". We
+strings have been moved to plain text files names "help.LL.txt". We
distribute these files and allow overriding them by files of that name
in /etc/gnupg. The syntax of these files is documented in
doc/help.txt. This is also the original we use to describe new
diff --git a/doc/help.txt b/doc/help.txt
index f545c2b..e92cfbe 100644
--- a/doc/help.txt
+++ b/doc/help.txt
@@ -207,7 +207,7 @@ N to change the name.
C to change the comment.
E to change the email address.
O to continue with key generation.
-Q to to quit the key generation.
+Q to quit the key generation.
.
.gpg.keygen.sub.okay
@@ -337,7 +337,7 @@ file (which is shown in brackets) will be used.
.gpg.ask_revocation_reason.code
# revoke.c (ask_revocation_reason)
-You should specify a reason for the certification. Depending on the
+You should specify a reason for the revocation. Depending on the
context you have the ability to choose from this list:
"Key has been compromised"
Use this if you have a reason to believe that unauthorized persons
@@ -373,7 +373,7 @@ your system administrator whether you should trust this certificate.
.gpgsm.crl-problem
-# This tex is displayed by the audit log for problems with
+# This text is displayed by the audit log for problems with
# the CRL or OCSP checking.
Depending on your configuration a problem retrieving the CRL or
performing an OCSP check occurred. There are a great variety of
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 14 +++++++++-----
dirmngr/dns-stuff.c | 4 ++++
doc/TRANSLATE | 2 +-
doc/help.txt | 6 +++---
g10/gpg.c | 2 +-
5 files changed, 18 insertions(+), 10 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list