[git] GnuPG - branch, master, updated. gnupg-2.1.9-200-gb2b079c
by Werner Koch
cvs at cvs.gnupg.org
Mon Nov 30 11:51:39 CET 2015
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 b2b079cb2f06067012e311434000d1cb5d6de8a2 (commit)
via 4ecb5db804003c10c57bdc0dc7f1d9649c5ba6f8 (commit)
via b4756a54a55fcd51717c149e19191a2eeaa6a919 (commit)
via 081c902f16a2f251df4593f090b3978dfa473a26 (commit)
via 75eb071354d1f862bac09c56c8ab81dae8883270 (commit)
from 686f31c3d5aee0d2825265869ae92ca95cdcabae (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 b2b079cb2f06067012e311434000d1cb5d6de8a2
Author: Werner Koch <wk at gnupg.org>
Date: Mon Nov 30 11:47:23 2015 +0100
doc: Typo fix.
--
diff --git a/doc/gnupg.texi b/doc/gnupg.texi
index 42d9dc0..d0e5199 100644
--- a/doc/gnupg.texi
+++ b/doc/gnupg.texi
@@ -36,7 +36,7 @@ Published by The GnuPG Project@*
@copyright{} 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.@*
@copyright{} 2013, 2014, 2015 Werner Koch.@*
- at copyright{} 2015 g10code Gmbh.
+ at copyright{} 2015 g10 Code GmbH.
@quotation
Permission is granted to copy, distribute and/or modify this document
commit 4ecb5db804003c10c57bdc0dc7f1d9649c5ba6f8
Author: Werner Koch <wk at gnupg.org>
Date: Mon Nov 30 11:45:28 2015 +0100
doc: Make make distcheck work again.
* doc/Makefile.am (DISTCLEANFILES): Add gpgkey2ssh.1
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 50d4725..44e9957 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -82,7 +82,7 @@ watchgnupg_SOURCE = gnupg.texi
CLEANFILES = yat2m mkdefsinc defs.inc
DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
- $(myman_pages) gpg-zip.1 gnupg.7
+ $(myman_pages) gpg-zip.1 gpgkey2ssh.1 gnupg.7
yat2m: yat2m.c
$(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
commit b4756a54a55fcd51717c149e19191a2eeaa6a919
Author: Werner Koch <wk at gnupg.org>
Date: Mon Nov 30 11:32:00 2015 +0100
yat2m: Add keyword @url.
* doc/yat2m.c (proc_texi_cmd): Add keyword @url.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/doc/yat2m.c b/doc/yat2m.c
index 6a7291f..1634985 100644
--- a/doc/yat2m.c
+++ b/doc/yat2m.c
@@ -684,6 +684,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
} cmdtbl[] = {
{ "command", 0, "\\fB", "\\fR" },
{ "code", 0, "\\fB", "\\fR" },
+ { "url", 0, "\\fB", "\\fR" },
{ "sc", 0, "\\fB", "\\fR" },
{ "var", 0, "\\fI", "\\fR" },
{ "samp", 0, "\\(aq", "\\(aq" },
commit 081c902f16a2f251df4593f090b3978dfa473a26
Author: Werner Koch <wk at gnupg.org>
Date: Mon Nov 30 11:27:30 2015 +0100
doc: Build man pages with the same date as the info files.
* doc/Makefile.am (yat2m-stamp): Use option --date.
--
This changes allows reproducible builds.
Debian-bug-id: 806494
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c6a5e25..50d4725 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -108,8 +108,10 @@ mkdefsinc: mkdefsinc.c Makefile ../config.h
yat2m-stamp: $(myman_sources) defs.inc
@rm -f yat2m-stamp.tmp
@touch yat2m-stamp.tmp
+ incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
for file in $(myman_sources) ; do \
./yat2m $(YAT2M_OPTIONS) --store \
+ --date "`cat $$incd 2>/dev/null`" \
`test -f '$$file' || echo '$(srcdir)/'`$$file ; done
@mv -f yat2m-stamp.tmp $@
commit 75eb071354d1f862bac09c56c8ab81dae8883270
Author: Werner Koch <wk at gnupg.org>
Date: Mon Nov 30 11:25:37 2015 +0100
yat2m: New option --date.
* doc/yat2m.c (opt_date): new.
(isodatestring): Use it if set.
(main): New option --date.
diff --git a/doc/yat2m.c b/doc/yat2m.c
index e2ab86e..6a7291f 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 g10 Code GmbH
+ * Copyright (C) 2005, 2013, 2015 g10 Code GmbH
* Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
@@ -120,6 +120,7 @@ static int quiet;
static int debug;
static const char *opt_source;
static const char *opt_release;
+static const char *opt_date;
static const char *opt_select;
static const char *opt_include;
static int opt_store;
@@ -323,8 +324,12 @@ isodatestring (void)
{
static char buffer[11+5];
struct tm *tp;
- time_t atime = time (NULL);
+ time_t atime;
+ if (opt_date && *opt_date)
+ atime = strtoul (opt_date, NULL, 10);
+ else
+ atime = time (NULL);
if (atime < 0)
strcpy (buffer, "????" "-??" "-??");
else
@@ -1466,13 +1471,14 @@ main (int argc, char **argv)
"Extract man pages from a Texinfo source.\n\n"
" --source NAME use NAME as source field\n"
" --release STRING use STRING as the release field\n"
+ " --date EPOCH use EPOCH as publication date\n"
" --store write output using @manpage name\n"
" --select NAME only output pages with @manpage NAME\n"
" --verbose enable extra informational output\n"
" --debug enable additional debug output\n"
" --help display this help and exit\n"
" -I DIR also search in include DIR\n"
- " -D gpgone the only useable define\n\n"
+ " -D gpgone the only usable define\n\n"
"With no FILE, or when FILE is -, read standard input.\n\n"
"Report bugs to <bugs at g10code.com>.");
exit (0);
@@ -1519,6 +1525,15 @@ main (int argc, char **argv)
argc--; argv++;
}
}
+ else if (!strcmp (*argv, "--date"))
+ {
+ argc--; argv++;
+ if (argc)
+ {
+ opt_date = *argv;
+ argc--; argv++;
+ }
+ }
else if (!strcmp (*argv, "--store"))
{
opt_store = 1;
-----------------------------------------------------------------------
Summary of changes:
doc/Makefile.am | 4 +++-
doc/gnupg.texi | 2 +-
doc/yat2m.c | 22 +++++++++++++++++++---
3 files changed, 23 insertions(+), 5 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list