[git] GnuPG - branch, master, updated. gnupg-2.2.7-157-g08147f8

by Werner Koch cvs at cvs.gnupg.org
Tue Jun 19 08:07:53 CEST 2018


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  08147f8bbdca40c98c2a094fa48fab15b8339c80 (commit)
      from  a4a054bf14fa855715faee01a152755c4e2a74f7 (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 08147f8bbdca40c98c2a094fa48fab15b8339c80
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jun 19 08:06:50 2018 +0200

    wks: Take name of sendmail from configure.
    
    * configure.ac (NAME_OF_SENDMAIL): New ac_define.
    * tools/send-mail.c (run_sendmail): Use it.
    --
    
    We used to ac_subst the SENDMAIL in the old keyserver via mail script.
    We cab reuse this to avoid a fixed name for sendmail in the
    send-mail.c helper.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/configure.ac b/configure.ac
index 0d270a4..60ec941 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1219,6 +1219,8 @@ elif test x"$with_mailprog" != xno ; then
     AC_SUBST(SENDMAIL,$with_mailprog)
     AC_MSG_RESULT($with_mailprog)
 fi
+AC_DEFINE_UNQUOTED(NAME_OF_SENDMAIL,"$SENDMAIL",
+                   [Tool with sendmail -t interface])
 
 
 #
diff --git a/tools/send-mail.c b/tools/send-mail.c
index 9f07c7a..6492c43 100644
--- a/tools/send-mail.c
+++ b/tools/send-mail.c
@@ -33,7 +33,7 @@ static gpg_error_t
 run_sendmail (estream_t data)
 {
   gpg_error_t err;
-  const char pgmname[] = "/usr/lib/sendmail";
+  const char pgmname[] = NAME_OF_SENDMAIL;
   const char *argv[3];
 
   argv[0] = "-oi";

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

Summary of changes:
 configure.ac      | 2 ++
 tools/send-mail.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)


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




More information about the Gnupg-commits mailing list