[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta751-5-g834b4a2

[by Werner Koch]

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  834b4a28f73e44a017e5846de163cd62a524e7b6 (commit)
       via  bc6b452129178658da7241903ca2174c79281752 (commit)
      from  5b34e347b612765f31061d077b7c343e08662ba9 (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 834b4a28f73e44a017e5846de163cd62a524e7b6
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jul 23 08:52:10 2014 +0200

    Register DCO for Andreas Schwier
    
    --

diff --git a/AUTHORS b/AUTHORS
index 8358faf..539d24b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -159,6 +159,9 @@ Yutaka Niibe   Assigns Past and Future Changes
 Authors with a DCO
 ==================
 
+Andreas Schwier <andreas.schwier at cardcontact.de>
+2014-07-22:53CED1D8.1010306 at cardcontact.de:
+
 Christian Aistleitner <christian at quelltextlich.at>
 2013-05-26:20130626112332.GA2228 at quelltextlich.at:
 
@@ -178,7 +181,6 @@ Werner Koch <wk at gnupg.org>
 2013-03-29:87620ahchj.fsf at vigenere.g10code.de:
 
 
-
 Other authors
 =============
 

commit bc6b452129178658da7241903ca2174c79281752
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jul 22 16:16:33 2014 +0200

    scd: Do not use the pcsc-wrapper.
    
    * scd/apdu.c (NEED_PCSC_WRAPPER): Do not define.
    * scd/Makefile.am (libexec_PROGRAMS): Remove gnupg-pcsc-wrapper
    (gnupg_pcsc_wrapper_SOURCES): Remove.
    (gnupg_pcsc_wrapper_LDADD): Remove.
    (gnupg_pcsc_wrapper_CFLAGS): Remove.

diff --git a/scd/Makefile.am b/scd/Makefile.am
index 577b4a0..215933a 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -19,11 +19,7 @@
 
 EXTRA_DIST = ChangeLog-2011 scdaemon-w32info.rc
 
-if HAVE_W32_SYSTEM
 libexec_PROGRAMS = scdaemon
-else
-libexec_PROGRAMS = scdaemon gnupg-pcsc-wrapper
-endif
 
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
 
@@ -72,6 +68,3 @@ scdaemon_LDADD = $(libcommonpth) ../gl/libgnu.a \
 #	 $(LIBUSB_LIBS) \
 #        -lgpg-error @LIBINTL@ @DL_LIBS@
 #
-gnupg_pcsc_wrapper_SOURCES = pcsc-wrapper.c
-gnupg_pcsc_wrapper_LDADD = $(DL_LIBS)
-gnupg_pcsc_wrapper_CFLAGS =
diff --git a/scd/apdu.c b/scd/apdu.c
index c7d4735..609103f 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -66,8 +66,9 @@
 #include "ccid-driver.h"
 
 /* Due to conflicting use of threading libraries we usually can't link
-   against libpcsclite.   Instead we use a wrapper program.  */
-#ifdef USE_NPTH
+   against libpcsclite if we are using Pth.  Instead we use a wrapper
+   program.  Note that with nPth there is no need for a wrapper. */
+#ifdef USE_PTH  /* Right, plain old Pth.  */
 #if !defined(HAVE_W32_SYSTEM) && !defined(__CYGWIN__)
 #define NEED_PCSC_WRAPPER 1
 #endif
diff --git a/scd/pcsc-wrapper.c b/scd/pcsc-wrapper.c
index e20e111..b3060e1 100644
--- a/scd/pcsc-wrapper.c
+++ b/scd/pcsc-wrapper.c
@@ -20,7 +20,8 @@
 /*
   This wrapper is required to handle problems with the libpscslite
   library.  That library assumes that pthreads are used and fails
-  badly if one tries to use it with a procerss using Pth.
+  badly if one tries to use it with a process using Pth.  Note that
+  the wrapper is not required if nPth is used.
 
   The operation model is pretty simple: It reads requests from stdin
   and returns the answer on stdout.  There is no direct mapping to the

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

Summary of changes:
 AUTHORS            |    4 +++-
 scd/Makefile.am    |    7 -------
 scd/apdu.c         |    5 +++--
 scd/pcsc-wrapper.c |    3 ++-
 4 files changed, 8 insertions(+), 11 deletions(-)


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