[git] GnuPG - branch, master, updated. gnupg-2.1.0-7-g7362c8c
by Werner Koch
cvs at cvs.gnupg.org
Fri Nov 7 18:42:55 CET 2014
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 7362c8c6e60939588e817384ae2e29195cb3f518 (commit)
via f0f5cb6b3e525f696b8820c517190e1d84f3b885 (commit)
via c7c79e31937e2d2fdb4042641786c229e31fbfae (commit)
via f7e1be24c8fcf588d4e48aa53a85b22bd035e3b0 (commit)
from e0db5af7ed9c2872cfdbf2adadcf49b954d85af3 (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 7362c8c6e60939588e817384ae2e29195cb3f518
Author: Werner Koch <wk at gnupg.org>
Date: Fri Nov 7 18:42:37 2014 +0100
gpg: Remove warning message for non-implemented search modes.
* kbx/keybox-search.c (keybox_search): Silently ignore.
* doc/specify-user-id.texi: Docuement '@", '+', and '.' search
prefixes.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index cfd46a6..1154cd9 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1,4 +1,4 @@
- @c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+ at c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
@c 2008, 2009, 2010 Free Software Foundation, Inc.
@c This is part of the GnuPG manual.
@c For copying conditions, see the file gnupg.texi.
diff --git a/doc/specify-user-id.texi b/doc/specify-user-id.texi
index 2eee024..c49edad 100644
--- a/doc/specify-user-id.texi
+++ b/doc/specify-user-id.texi
@@ -85,14 +85,14 @@ with left and right angles.
@end cartouche
- at item By word match.
-All words must match exactly (not case sensitive) but can appear in any
-order in the user ID or a subjects name. Words are any sequences of
-letters, digits, the underscore and all characters with bit 7 set.
+ at item By partial match on an email address.
+This is indicated by prefixing the search string with an @code{@@}.
+This uses a substring search but considers only the mail address
+(i.e. inside the angle brackets).
@cartouche
@example
-+Heinrich Heine duesseldorf
+@@heinrichh
@end example
@end cartouche
@@ -156,8 +156,12 @@ Heine
@end example
@end cartouche
- at end itemize
+ at item . and + prefixes
+These prefixes are reserved for looking up mails anchored at the end
+and for a word search mode. They are not yet implemented and using
+them is undefined.
+ at end itemize
Please note that we have reused the hash mark identifier which was used
in old GnuPG versions to indicate the so called local-id. It is not
diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c
index 10a71c4..6e72d0b 100644
--- a/kbx/keybox-search.c
+++ b/kbx/keybox-search.c
@@ -907,7 +907,7 @@ keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc,
break;
case KEYDB_SEARCH_MODE_MAILEND:
case KEYDB_SEARCH_MODE_WORDS:
- never_reached (); /* not yet implemented */
+ /* not yet implemented */
break;
case KEYDB_SEARCH_MODE_ISSUER:
if (has_issuer (blob, desc[n].u.name))
commit f0f5cb6b3e525f696b8820c517190e1d84f3b885
Author: Werner Koch <wk at gnupg.org>
Date: Fri Nov 7 18:21:50 2014 +0100
w32: Fix http access module.
* common/http.c (write_server) [W32]: Rework to use send() instead of
write even when build with npth.
(cookie_read) [W32]: Rework to use recv() instead of read even when
build with npth.
diff --git a/common/http.c b/common/http.c
index 413efd8..f129010 100644
--- a/common/http.c
+++ b/common/http.c
@@ -2320,14 +2320,20 @@ write_server (int sock, const char *data, size_t length)
nleft = length;
while (nleft > 0)
{
-#if defined(HAVE_W32_SYSTEM) && !defined(USE_NPTH)
+#if defined(HAVE_W32_SYSTEM)
+# if defined(USE_NPTH)
+ npth_unprotect ();
+# endif
nwritten = send (sock, data, nleft, 0);
+# if defined(USE_NPTH)
+ npth_protect ();
+# endif
if ( nwritten == SOCKET_ERROR )
{
log_info ("network write failed: ec=%d\n", (int)WSAGetLastError ());
return gpg_error (GPG_ERR_NETWORK);
}
-#else /*!HAVE_W32_SYSTEM || USE_NPTH*/
+#else /*!HAVE_W32_SYSTEM*/
# ifdef USE_NPTH
nwritten = npth_write (sock, data, nleft);
# else
@@ -2349,7 +2355,7 @@ write_server (int sock, const char *data, size_t length)
log_info ("network write failed: %s\n", strerror (errno));
return gpg_error_from_syserror ();
}
-#endif /*!HAVE_W32_SYSTEM || USE_NPTH*/
+#endif /*!HAVE_W32_SYSTEM*/
nleft -= nwritten;
data += nwritten;
}
@@ -2404,14 +2410,25 @@ cookie_read (void *cookie, void *buffer, size_t size)
{
do
{
-#ifdef USE_NPTH
- nread = npth_read (c->sock->fd, buffer, size);
-#elif defined(HAVE_W32_SYSTEM)
+#ifdef HAVE_W32_SYSTEM
/* Under Windows we need to use recv for a socket. */
+# if defined(USE_NPTH)
+ npth_unprotect ();
+# endif
nread = recv (c->sock->fd, buffer, size, 0);
-#else
+# if defined(USE_NPTH)
+ npth_protect ();
+# endif
+
+#else /*!HAVE_W32_SYSTEM*/
+
+# ifdef USE_NPTH
+ nread = npth_read (c->sock->fd, buffer, size);
+# else
nread = read (c->sock->fd, buffer, size);
-#endif
+# endif
+
+#endif /*!HAVE_W32_SYSTEM*/
}
while (nread == -1 && errno == EINTR);
}
commit c7c79e31937e2d2fdb4042641786c229e31fbfae
Author: Werner Koch <wk at gnupg.org>
Date: Fri Nov 7 18:20:06 2014 +0100
build: Add method to use a custom swdb.lst and use adns with Windows.
* build-aux/getswdb.sh: Add option --skip-verify.
* build-aux/speedo.mk: Add config var CUSTOM_SWDB. Tage adns version
from swdb and build for Windows with adns.
diff --git a/build-aux/getswdb.sh b/build-aux/getswdb.sh
index 8b1d5e5..fec9f88 100755
--- a/build-aux/getswdb.sh
+++ b/build-aux/getswdb.sh
@@ -34,6 +34,7 @@ Usage: $(basename $0) [OPTIONS]
Get the online version of the GnuPG software version database
Options:
--skip-download Assume download has already been done.
+ --skip-verify Do not check signatures
--find-sha1sum Print the name of the sha1sum utility
--help Print this help.
EOF
@@ -44,6 +45,7 @@ EOF
# Parse options
#
skip_download=no
+skip_verify=no
find_sha1sum=no
while test $# -gt 0; do
case "$1" in
@@ -63,6 +65,9 @@ while test $# -gt 0; do
--skip-download)
skip_download=yes
;;
+ --skip-verify)
+ skip_verify=yes
+ ;;
--find-sha1sum)
find_sha1sum=yes
;;
@@ -96,10 +101,12 @@ fi
version=$(cat "$srcdir/../VERSION")
version_num=$(echo "$version" | cvtver)
-if ! $GPGV --version >/dev/null 2>/dev/null ; then
- echo "command \"gpgv\" is not installed" >&2
- echo "(please install an older version of GnuPG)" >&2
- exit 1
+if [ $skip_verify = no ]; then
+ if ! $GPGV --version >/dev/null 2>/dev/null ; then
+ echo "command \"gpgv\" is not installed" >&2
+ echo "(please install an older version of GnuPG)" >&2
+ exit 1
+ fi
fi
#
@@ -110,9 +117,11 @@ if [ $skip_download = yes ]; then
echo "swdb.lst is missing." >&2
exit 1
fi
- if [ ! -f swdb.lst.sig ]; then
+ if [ $skip_verify = no ]; then
+ if [ ! -f swdb.lst.sig ]; then
echo "swdb.lst.sig is missing." >&2
exit 1
+ fi
fi
else
if ! $WGET --version >/dev/null 2>/dev/null ; then
@@ -124,14 +133,18 @@ else
echo "download of swdb.lst failed." >&2
exit 1
fi
- if ! $WGET -q -O swdb.lst.sig "$urlbase/swdb.lst.sig" ; then
+ if [ $skip_verify = no ]; then
+ if ! $WGET -q -O swdb.lst.sig "$urlbase/swdb.lst.sig" ; then
echo "download of swdb.lst.sig failed." >&2
exit 1
+ fi
fi
fi
-if ! $GPGV --keyring "$distsigkey" swdb.lst.sig swdb.lst; then
+if [ $skip_verify = no ]; then
+ if ! $GPGV --keyring "$distsigkey" swdb.lst.sig swdb.lst; then
echo "list of software versions is not valid!" >&2
exit 1
+ fi
fi
#
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 63d508d..f9490cb 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -58,10 +58,10 @@ help:
@echo ' w32-installer Build a Windows installer'
@echo ' w32-source Pack a source archive'
@echo
- @echo 'You may append INSTALL_REFIX=<dir> for native builds.'
+ @echo 'You may append INSTALL_PREFIX=<dir> for native builds.'
@echo 'Prepend TARGET with "git-" to build from GIT repos.'
@echo 'Prepend TARGET with "this-" to build from the source tarball.'
-
+ @echo 'Use CUSTOM_SWDB=1 for an already downloaded swdb.lst.'
SPEEDOMAKE := $(MAKE) -f $(SPEEDO_MK) UPD_SWDB=1
@@ -113,6 +113,9 @@ TARGETOS=
# Set to 1 to build the GUI tools
WITH_GUI=0
+# Set to 1 to use a pre-installed swdb.lst instead of the online version.
+CUSTOM_SWDB=0
+
# Set to 1 to really download the swdb.
UPD_SWDB=0
@@ -157,7 +160,7 @@ speedo_spkgs = \
ifeq ($(TARGETOS),w32)
speedo_spkgs += \
- zlib bzip2 libiconv gettext
+ zlib bzip2 adns libiconv gettext
endif
speedo_spkgs += \
@@ -206,8 +209,13 @@ speedo_make_only_style = \
zlib bzip2
# Get the content of the software DB.
+ifeq ($(CUSTOM_SWDB),1)
+getswdb_options = --skip-download --skip-verify
+else
+getswdb_options =
+endif
ifeq ($(UPD_SWDB),1)
-SWDB := $(shell $(topsrc)/build-aux/getswdb.sh && echo okay)
+SWDB := $(shell $(topsrc)/build-aux/getswdb.sh $(getswdb_options) && echo okay)
ifeq ($(strip $(SWDB)),)
$(error Error getting GnuPG software version database)
endif
@@ -248,6 +256,9 @@ zlib_sha1 := $(shell awk '$$1=="zlib_sha1_gz" {print $$2}' swdb.lst)
bzip2_ver := $(shell awk '$$1=="bzip2_ver" {print $$2}' swdb.lst)
bzip2_sha1 := $(shell awk '$$1=="bzip2_sha1_gz" {print $$2}' swdb.lst)
+adns_ver := $(shell awk '$$1=="adns_ver" {print $$2}' swdb.lst)
+adns_sha1 := $(shell awk '$$1=="adns_sha1" {print $$2}' swdb.lst)
+
$(info Information from the version database)
$(info GnuPG ..........: $(gnupg_ver))
$(info Libgpg-error ...: $(libgpg_error_ver))
@@ -256,6 +267,7 @@ $(info Libgcrypt ......: $(libgcrypt_ver))
$(info Libassuan ......: $(libassuan_ver))
$(info Zlib ...........: $(zlib_ver))
$(info Bzip2 ..........: $(bzip2_ver))
+$(info ADNS ...........: $(adns_ver))
$(info GPGME ..........: $(gpgme_ver))
$(info Pinentry .......: $(pinentry_ver))
$(info GPA ............: $(gpa_ver))
@@ -264,7 +276,6 @@ endif
# Version number for external packages
pkg_config_ver = 0.23
-zlib_ver = 1.2.8
libiconv_ver = 1.14
gettext_ver = 0.18.2.1
libffi_ver = 3.0.13
@@ -277,7 +288,6 @@ pixman_ver = 0.32.4
cairo_ver = 1.12.16
gtk__ver = 2.24.17
-
# The GIT repository. Using a local repo is much faster.
#gitrep = git://git.gnupg.org
gitrep = ${HOME}/s
@@ -355,6 +365,7 @@ endif
speedo_pkg_pkg_config_tar = $(pkg2rep)/pkg-config-$(pkg_config_ver).tar.gz
speedo_pkg_zlib_tar = $(pkgrep)/zlib/zlib-$(zlib_ver).tar.gz
speedo_pkg_bzip2_tar = $(pkgrep)/bzip2/bzip2-$(bzip2_ver).tar.gz
+speedo_pkg_adns_tar = $(pkg10rep)/adns/adns-$(adns_ver).tar.bz2
speedo_pkg_libiconv_tar = $(pkg2rep)/libiconv-$(libiconv_ver).tar.gz
speedo_pkg_gettext_tar = $(pkg2rep)/gettext-$(gettext_ver).tar.gz
speedo_pkg_libffi_tar = $(pkg2rep)/libffi-$(libffi_ver).tar.gz
commit f7e1be24c8fcf588d4e48aa53a85b22bd035e3b0
Author: Werner Koch <wk at gnupg.org>
Date: Fri Nov 7 18:17:52 2014 +0100
build: Improve test for ADNS
* configure.ac <adns>: Use adns_free as probe function for libadns.
(HAVE_ADNS_FREE): Remove bogus tests to set this and remove the macro.
(ADNSLIBS): Do not ac_subst - it is only used within configure.
--
adns_free is required on Windows anyway (for robustness reasons) and
it has been around for so long now that we do not need a separate
test. An upstream adns 1.5 has meanwhile been release but I doubt that
this has the required Windows code - and it is not libtool based
anyway.
diff --git a/common/dns-cert.c b/common/dns-cert.c
index 179bb15..4e297bf 100644
--- a/common/dns-cert.c
+++ b/common/dns-cert.c
@@ -44,9 +44,6 @@
#endif
#ifdef USE_ADNS
# include <adns.h>
-# ifndef HAVE_ADNS_FREE
-# define adns_free free
-# endif
#endif
#include "util.h"
diff --git a/common/pka.c b/common/pka.c
index 3c45e8b..d472162 100644
--- a/common/pka.c
+++ b/common/pka.c
@@ -48,9 +48,6 @@
#endif /* USE_DNS_PKA */
#ifdef USE_ADNS
# include <adns.h>
-# ifndef HAVE_ADNS_FREE
-# define adns_free free
-# endif
#endif
#include "util.h"
diff --git a/common/srv.c b/common/srv.c
index 380e356..7a0c42d 100644
--- a/common/srv.c
+++ b/common/srv.c
@@ -45,9 +45,6 @@
#include <time.h>
#ifdef USE_ADNS
# include <adns.h>
-# ifndef HAVE_ADNS_FREE
-# define adns_free free
-# endif
#endif
#include "util.h"
diff --git a/configure.ac b/configure.ac
index 9afcd3b..320ee27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -904,18 +904,14 @@ AC_ARG_WITH(adns,
fi])
if test "$with_adns" != "no"; then
AC_CHECK_HEADERS(adns.h,
- AC_CHECK_LIB(adns, adns_init,
+ AC_CHECK_LIB(adns, adns_free,
[have_adns=yes],
[CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}]),
- [CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}])
+ [CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}])
fi
if test "$have_adns" = "yes"; then
ADNSLIBS="-ladns"
fi
-AC_SUBST(ADNSLIBS)
-# Newer adns versions feature a free function to be used under W32.
-AC_CHECK_FUNCS(adns_free)
-
#
-----------------------------------------------------------------------
Summary of changes:
build-aux/getswdb.sh | 27 ++++++++++++++++++++-------
build-aux/speedo.mk | 23 +++++++++++++++++------
common/dns-cert.c | 3 ---
common/http.c | 33 +++++++++++++++++++++++++--------
common/pka.c | 3 ---
common/srv.c | 3 ---
configure.ac | 8 ++------
doc/gpg.texi | 2 +-
doc/specify-user-id.texi | 16 ++++++++++------
kbx/keybox-search.c | 2 +-
10 files changed, 76 insertions(+), 44 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list