[git] GnuPG - branch, master, updated. gnupg-2.2.1-33-gbf26c08

[by NIIBE Yutaka]

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  bf26c08b95389718ba07f12789d372c6f438134f (commit)
       via  3549dce4f5a726f5350ac2f20d83ba9f84cc23b4 (commit)
      from  f8e2d87532ef2db5eda9e4df397cfdd0800399dc (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 bf26c08b95389718ba07f12789d372c6f438134f
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 26 11:24:39 2017 +0900

    agent, tests: Support --disable-scdaemon build case.
    
    * agent/command.c (cmd_scd): Support !BUILD_WITH_SCDAEMON.
    * tests/openpgp/defs.scm (create-gpghome): Likewise.
    * tests/gpgsm/gpgsm-defs.scm (create-gpgsmhome): Likewise.
    
    --
    
    We could modify gpg-agent to remove all support of scdaemon, with no
    inclusion of call-scd.c, divert-scd.c, and learncard.c, but it would
    not be worth to do that.
    
    GnuPG-bug-id: 3316
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/command.c b/agent/command.c
index 4016cc2..3b249b1 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1988,14 +1988,17 @@ static const char hlp_scd[] =
 static gpg_error_t
 cmd_scd (assuan_context_t ctx, char *line)
 {
-  ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
-
+#ifdef BUILD_WITH_SCDAEMON
+  ctrl_t ctrl = assuan_get_pointer (ctx);
   if (ctrl->restricted)
     return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
 
   rc = divert_generic_cmd (ctrl, line, ctx);
-
+#else
+  (void)ctx; (void)line;
+  rc = gpg_error (GPG_ERR_NOT_SUPPORTED);
+#endif
   return rc;
 }
 
diff --git a/tests/gpgsm/gpgsm-defs.scm b/tests/gpgsm/gpgsm-defs.scm
index d99d7da..c78a127 100644
--- a/tests/gpgsm/gpgsm-defs.scm
+++ b/tests/gpgsm/gpgsm-defs.scm
@@ -67,7 +67,9 @@
 	       "faked-system-time 1008241200")
   (create-file "gpg-agent.conf"
 	       (string-append "pinentry-program " (tool 'pinentry))
-	       (string-append "scdaemon-program " (tool 'scdaemon))
+	       (if (assoc "scdaemon" gpg-components)
+		   (string-append "scdaemon-program " (tool 'scdaemon))
+		   "# No scdaemon available")
 	       )
   (start-agent)
   (create-file
diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index f52f316..a6347fe 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -354,7 +354,9 @@
 	       (if (flag "--extended-key-format" *args*)
 		   "enable-extended-key-format" "#enable-extended-key-format")
 	       (string-append "pinentry-program " (tool 'pinentry))
-	       (string-append "scdaemon-program " (tool 'scdaemon))
+	       (if (assoc "scdaemon" gpg-components)
+		   (string-append "scdaemon-program " (tool 'scdaemon))
+		   "# No scdaemon available")
 	       ))
 
 ;; Initialize the test environment, install appropriate configuration

commit 3549dce4f5a726f5350ac2f20d83ba9f84cc23b4
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 26 11:19:45 2017 +0900

    Fix comment of configure.
    
    * configure.ac (BUILD_WITH_DIRMNGR): Comment fix.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/configure.ac b/configure.ac
index c479325..22f082e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1777,7 +1777,7 @@ if test "$build_scdaemon" = yes ; then
     AC_DEFINE(BUILD_WITH_SCDAEMON,1,[Defined if SCDAEMON is to be build])
 fi
 if test "$build_dirmngr" = yes ; then
-    AC_DEFINE(BUILD_WITH_DIRMNGR,1,[Defined if SCDAEMON is to be build])
+    AC_DEFINE(BUILD_WITH_DIRMNGR,1,[Defined if DIRMNGR is to be build])
 fi
 if test "$build_g13" = yes ; then
     AC_DEFINE(BUILD_WITH_G13,1,[Defined if G13 is to be build])

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

Summary of changes:
 agent/command.c            | 9 ++++++---
 configure.ac               | 2 +-
 tests/gpgsm/gpgsm-defs.scm | 4 +++-
 tests/openpgp/defs.scm     | 4 +++-
 4 files changed, 13 insertions(+), 6 deletions(-)


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