[git] GnuPG - branch, master, updated. gnupg-2.1.11-110-ge7171f5

[by Justus Winter]

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  e7171f559590422cc52dbcb8d78d94569b31012f (commit)
       via  8be9dab2dd2f83ca922c01542c63b404e34bdfd9 (commit)
      from  e2c5781788f765815532410a77077ddbb72513e9 (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 e7171f559590422cc52dbcb8d78d94569b31012f
Author: Justus Winter <justus at g10code.com>
Date:   Thu Mar 31 17:51:39 2016 +0200

    speedo,w32: Build libsqlite3.
    
    * build-aux/speedo.mk (speedo_spkgs): Add libsqlite3 on w32.
    (libsqlite3_ver): New variable.
    (speedo_pkg_libsqlite3_tar): Likewise.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 5dde0fe..52d6871 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -172,7 +172,7 @@ speedo_spkgs  = \
 
 ifeq ($(TARGETOS),w32)
 speedo_spkgs += \
-	zlib bzip2 adns libiconv
+	zlib bzip2 adns libiconv libsqlite3
 ifeq ($(WITH_GUI),1)
 speedo_spkgs += gettext
 endif
@@ -324,6 +324,7 @@ endif
 # Version number for external packages
 pkg_config_ver = 0.23
 libiconv_ver = 1.14
+libsqlite3_ver = 3120000
 gettext_ver = 0.18.2.1
 libffi_ver = 3.0.13
 glib_ver = 2.34.3
@@ -414,6 +415,7 @@ 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_libsqlite3_tar = $(pkg2rep)/sqlite-autoconf-$(libsqlite3_ver).tar.gz
 speedo_pkg_gettext_tar    = $(pkg2rep)/gettext-$(gettext_ver).tar.gz
 speedo_pkg_libffi_tar     = $(pkg2rep)/libffi-$(libffi_ver).tar.gz
 speedo_pkg_glib_tar       = $(pkg2rep)/glib-$(glib_ver).tar.xz

commit 8be9dab2dd2f83ca922c01542c63b404e34bdfd9
Author: Justus Winter <justus at g10code.com>
Date:   Thu Mar 31 17:23:31 2016 +0200

    g10: Use gpg-error abstraction of sched_yield.
    
    * g10/tofu.c (begin_transaction): Use 'gpgrt_yield'.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index baa2ac2..5f381b0 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -28,7 +28,6 @@
 #include <sys/stat.h>
 #include <assert.h>
 #include <stdarg.h>
-#include <sched.h>
 #include <sqlite3.h>
 
 #include "gpg.h"
@@ -240,7 +239,7 @@ begin_transaction (struct db *db, int only_batch)
       batch_update_started = gnupg_get_time ();
 
       /* Yield to allow another process a chance to run.  */
-      sched_yield ();
+      gpgrt_yield ();
     }
 
   /* XXX: In split mode, this can end in deadlock.

-----------------------------------------------------------------------

Summary of changes:
 build-aux/speedo.mk | 4 +++-
 g10/tofu.c          | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org