[git] GnuPG - branch, master, updated. gnupg-2.1.21-81-g139de02

[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  139de02b93773615bdd95e04a7f0c1ad73b4f6fb (commit)
       via  f6faa058749846de18cb34f1cc79867bb0029922 (commit)
      from  7fb724c61655c6f75c61572d65a46e21ae112574 (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 139de02b93773615bdd95e04a7f0c1ad73b4f6fb
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jul 5 09:14:38 2017 +0200

    doc: Update yat2m to take care of SOURCE_DATE_EPOCH.
    
    * doc/yat2m.c (main): Set a default for OPT_DATE.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/doc/yat2m.c b/doc/yat2m.c
index 23fc6ba..c7bec33 100644
--- a/doc/yat2m.c
+++ b/doc/yat2m.c
@@ -1,5 +1,5 @@
 /* yat2m.c - Yet Another Texi 2 Man converter
- *	Copyright (C) 2005, 2013, 2015, 2016 g10 Code GmbH
+ *	Copyright (C) 2005, 2013, 2015, 2016, 2017 g10 Code GmbH
  *      Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,6 +16,12 @@
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 
+/**********************************************
+ * Note: The canonical source of this tool   **
+ *       is part of libgpg-error and it      **
+ *       installs yat2m on the build system. **
+ **********************************************/
+
 /*
     This is a simple texinfo to man page converter.  It needs some
     special markup in th e texinfo and tries best to get a create man
@@ -1478,6 +1484,7 @@ int
 main (int argc, char **argv)
 {
   int last_argc = -1;
+  const char *s;
 
   opt_source = "GNU";
   opt_release = "";
@@ -1611,6 +1618,11 @@ main (int argc, char **argv)
   if (argc > 1)
     die ("usage: " PGM " [OPTION] [FILE] (try --help for more information)\n");
 
+  /* Take care of supplied timestamp for reproducible builds.  See
+   * https://reproducible-builds.org/specs/source-date-epoch/  */
+  if (!opt_date && (s = getenv ("SOURCE_DATE_EPOCH")) && *s)
+    opt_date = s;
+
   /* Start processing. */
   if (argc && strcmp (*argv, "-"))
     {

commit f6faa058749846de18cb34f1cc79867bb0029922
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jul 5 10:49:13 2017 +0200

    doc: Prefer an installed version of yat2m
    
    * configure.ac (YAT2M): Check for tool.
    * doc/Makefile.am (yat2m-stamp): Use installed tool if possible.
    --

diff --git a/configure.ac b/configure.ac
index 5ab8a53..56cb78e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -605,6 +605,8 @@ AC_PROG_RANLIB
 AC_CHECK_TOOL(AR, ar, :)
 AC_PATH_PROG(PERL,"perl")
 AC_CHECK_TOOL(WINDRES, windres, :)
+AC_PATH_PROG(YAT2M, "yat2m", "./yat2m" )
+AC_ARG_VAR(YAT2M, [tool to convert texi to man pages])
 AC_ISC_POSIX
 AC_SYS_LARGEFILE
 GNUPG_CHECK_USTAR
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0c78284..1fa04b4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -146,12 +146,12 @@ yat2m-stamp: $(myman_sources) defs.inc
 	@touch yat2m-stamp.tmp
 	incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
 	for file in $(myman_sources) ; do \
-              ./yat2m $(YAT2M_OPTIONS) --store \
+              $(YAT2M) $(YAT2M_OPTIONS) --store \
                   --date "`cat $$incd 2>/dev/null`" \
 	          `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
 	@mv -f yat2m-stamp.tmp $@
 
-yat2m-stamp: yat2m
+yat2m-stamp: $(YAT2M)
 
 $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
 	@if test -f $@; then :; else \

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

Summary of changes:
 configure.ac    |  2 ++
 doc/Makefile.am |  4 ++--
 doc/yat2m.c     | 14 +++++++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)


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