[git] GnuPG - branch, master, updated. gnupg-2.1.10-31-g7baca03
by Werner Koch
cvs at cvs.gnupg.org
Mon Dec 14 16:27:01 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 7baca033070e7811f75e2021100adf8e6a48907f (commit)
via 7d129a7391115ff1d6a3541078a37a630ab7819f (commit)
via 467e18b74b4790dcbdf3c816206d2fbaf170a12a (commit)
via d80e1bc430bf64debdb6b08f0b7e5c42836781fa (commit)
from f5aa51aaacfe13ab9528aa9b88d8ce8eb61362fc (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 7baca033070e7811f75e2021100adf8e6a48907f
Author: Werner Koch <wk at gnupg.org>
Date: Mon Dec 14 10:00:57 2015 +0100
common: Change license of isascii.c to all-premissive,
* common/isascii.c: Change.
--
Actually this code is too trivial to claim any copyright at all.
diff --git a/common/isascii.c b/common/isascii.c
index be14a38..6ebe79b 100644
--- a/common/isascii.c
+++ b/common/isascii.c
@@ -1,20 +1,13 @@
/* isascii.c - Replacement for isascii.
* Copyright (C) 2002 Free Software Foundation, Inc.
*
- * This file is part of GnuPG.
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
*
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * This file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
#ifdef HAVE_CONFIG_H
commit 7d129a7391115ff1d6a3541078a37a630ab7819f
Author: Werner Koch <wk at gnupg.org>
Date: Mon Dec 14 09:59:43 2015 +0100
common: Change license of some modules to LGPLv3+/GPLv2+.
* common/status.c: Change from GPLv3 to LGPLv3+/GPLv2+.
* common/status.h: Ditto.
* common/yesno.c: Ditto.
* common/common-defs.h: Ditto.
* common/gettime.h: Ditto.
* common/keyserver.h: Ditto.
--
This is shared code and trivial enough to allow use under GPLv2+ so to
allow use by GPLv2only software. Some of the headers are simply
adjusted to the license of their implementation.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/common/common-defs.h b/common/common-defs.h
index 861967f..ab5ed34 100644
--- a/common/common-defs.h
+++ b/common/common-defs.h
@@ -3,12 +3,22 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of either
*
- * GnuPG is distributed in the hope that it will be useful,
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
+ *
+ * This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/common/gettime.h b/common/gettime.h
index ec68faa..cbc257a 100644
--- a/common/gettime.h
+++ b/common/gettime.h
@@ -3,12 +3,22 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of either
*
- * GnuPG is distributed in the hope that it will be useful,
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
+ *
+ * This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/common/keyserver.h b/common/keyserver.h
index d56b4f4..63dbde6 100644
--- a/common/keyserver.h
+++ b/common/keyserver.h
@@ -3,12 +3,22 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of either
*
- * GnuPG is distributed in the hope that it will be useful,
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
+ *
+ * This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/common/status.c b/common/status.c
index 435279c..a16e7b4 100644
--- a/common/status.c
+++ b/common/status.c
@@ -3,12 +3,22 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of either
*
- * GnuPG is distributed in the hope that it will be useful,
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
+ *
+ * This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/common/status.h b/common/status.h
index 71bcc95..509e044 100644
--- a/common/status.h
+++ b/common/status.h
@@ -3,12 +3,22 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of either
*
- * GnuPG is distributed in the hope that it will be useful,
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
+ *
+ * This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/common/yesno.c b/common/yesno.c
index 821df4b..7803349 100644
--- a/common/yesno.c
+++ b/common/yesno.c
@@ -3,12 +3,22 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of either
*
- * GnuPG is distributed in the hope that it will be useful,
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
+ *
+ * This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
commit 467e18b74b4790dcbdf3c816206d2fbaf170a12a
Author: Werner Koch <wk at gnupg.org>
Date: Mon Dec 14 09:44:38 2015 +0100
common: Change license for exectool to LGPLv3+/GPLv2+.
* common/exectool.c, common/exectool.h: Change license.
--
We always try to use this license for shared code.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/common/exectool.c b/common/exectool.c
index 5659f2d..a2828a6 100644
--- a/common/exectool.c
+++ b/common/exectool.c
@@ -3,12 +3,22 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of either
*
- * GnuPG is distributed in the hope that it will be useful,
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
+ *
+ * This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/common/exectool.h b/common/exectool.h
index e79b786..d9439aa 100644
--- a/common/exectool.h
+++ b/common/exectool.h
@@ -3,12 +3,22 @@
*
* This file is part of GnuPG.
*
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of either
*
- * GnuPG is distributed in the hope that it will be useful,
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
+ *
+ * This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
commit d80e1bc430bf64debdb6b08f0b7e5c42836781fa
Author: Werner Koch <wk at gnupg.org>
Date: Mon Dec 14 09:38:46 2015 +0100
common: Rename sh-exectool to exectool.
* common/sh-exectool.c: Rename to exectool.c.
* common/sh-exectool.h: Rename to exectool.h.
* common/Makefile.am (common_sources): Adjust for rename.
* common/exectool.c (sh_exec_tool_stream): Rename to
gnupg_exec-tool-stream.
(sh_exec_tool): Rename to gnupg_exec_tool.
* tools/gpgtar-create.c (gpgtar_create): Adjust for changes.
* tools/gpgtar-extract.c: Adjust for changes.
* tools/gpgtar-list.c: Adjust for changes.
--
The "sh-" presifx is used by g13 for system helpers which are used by
processes created via userv. A generic function in common/ should
also have a generic name.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/common/Makefile.am b/common/Makefile.am
index 1db4ec9..54dee54 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -88,7 +88,7 @@ common_sources = \
mkdir_p.c mkdir_p.h \
strlist.c strlist.h \
call-gpg.c call-gpg.h \
- sh-exectool.c sh-exectool.h
+ exectool.c exectool.h
if HAVE_W32_SYSTEM
common_sources += w32-reg.c w32-afunix.c w32-afunix.h
diff --git a/common/sh-exectool.c b/common/exectool.c
similarity index 95%
rename from common/sh-exectool.c
rename to common/exectool.c
index 4382536..5659f2d 100644
--- a/common/sh-exectool.c
+++ b/common/exectool.c
@@ -1,4 +1,4 @@
-/* sh-exectool.c - Utility functions to execute a helper tool
+/* exectool.c - Utility functions to execute a helper tool
* Copyright (C) 2015 Werner Koch
*
* This file is part of GnuPG.
@@ -216,9 +216,9 @@ copy_buffer_flush (struct copy_buffer *c, estream_t sink)
the process' stdout is written to OUTPUT. On error a diagnostic is
printed, and an error code returned. */
gpg_error_t
-sh_exec_tool_stream (const char *pgmname, const char *argv[],
- estream_t input,
- estream_t output)
+gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
+ estream_t input,
+ estream_t output)
{
gpg_error_t err;
pid_t pid;
@@ -256,7 +256,7 @@ sh_exec_tool_stream (const char *pgmname, const char *argv[],
fds[2].want_read = 1;
/* Now read as long as we have something to poll. We continue
reading even after EOF or error on stdout so that we get the
- other error messages or remaining outout. */
+ other error messages or remaining outut. */
while (!fds[1].ignore && !fds[2].ignore)
{
count = es_poll (fds, DIM(fds), -1);
@@ -361,9 +361,9 @@ nop_free (void *ptr)
stored at RESULT, a diagnostic is printed, and an error code
returned. */
gpg_error_t
-sh_exec_tool (const char *pgmname, const char *argv[],
- const char *input_string,
- char **result, size_t *resultlen)
+gnupg_exec_tool (const char *pgmname, const char *argv[],
+ const char *input_string,
+ char **result, size_t *resultlen)
{
gpg_error_t err;
estream_t input = NULL;
@@ -391,7 +391,7 @@ sh_exec_tool (const char *pgmname, const char *argv[],
goto leave;
}
- err = sh_exec_tool_stream (pgmname, argv, input, output);
+ err = gnupg_exec_tool_stream (pgmname, argv, input, output);
if (err)
goto leave;
diff --git a/common/sh-exectool.h b/common/exectool.h
similarity index 81%
rename from common/sh-exectool.h
rename to common/exectool.h
index 6f511c2..e79b786 100644
--- a/common/sh-exectool.h
+++ b/common/exectool.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GNUPG_COMMON_SH_EXECTOOL_H
-#define GNUPG_COMMON_SH_EXECTOOL_H
+#ifndef GNUPG_COMMON_EXECTOOL_H
+#define GNUPG_COMMON_EXECTOOL_H
#include <gpg-error.h>
@@ -30,17 +30,17 @@
NULL. A hidden Nul is appended to the output. On error NULL is
stored at RESULT, a diagnostic is printed, and an error code
returned. */
-gpg_error_t sh_exec_tool (const char *pgmname, const char *argv[],
- const char *input_string,
- char **result, size_t *resultlen);
+gpg_error_t gnupg_exec_tool (const char *pgmname, const char *argv[],
+ const char *input_string,
+ char **result, size_t *resultlen);
/* Run the program PGMNAME with the command line arguments given in
the NULL terminates array ARGV. If INPUT is not NULL it will be
fed to stdin of the process. stderr is logged using log_info and
the process' stdout is written to OUTPUT. On error a diagnostic is
printed, and an error code returned. */
-gpg_error_t sh_exec_tool_stream (const char *pgmname, const char *argv[],
+gpg_error_t gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
estream_t input,
estream_t output);
-#endif /* GNUPG_COMMON_SH_EXECTOOL_H */
+#endif /* GNUPG_COMMON_EXECTOOL_H */
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index d8d1d54..2fd7019 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -36,7 +36,7 @@
#include <assert.h>
#include "i18n.h"
-#include "../common/sh-exectool.h"
+#include "../common/exectool.h"
#include "../common/sysutils.h"
#include "gpgtar.h"
@@ -937,8 +937,8 @@ gpgtar_create (char **inpattern, int encrypt, int sign)
+ 1 + !!encrypt + !!sign + 2 * !!opt.user
+ !!opt.symmetric);
- err = sh_exec_tool_stream (opt.gpg_program, argv,
- outstream, cipher_stream);
+ err = gnupg_exec_tool_stream (opt.gpg_program, argv,
+ outstream, cipher_stream);
xfree (argv);
if (err)
goto leave;
diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
index cb8074c..95f2b56 100644
--- a/tools/gpgtar-extract.c
+++ b/tools/gpgtar-extract.c
@@ -28,7 +28,7 @@
#include <assert.h>
#include "i18n.h"
-#include "../common/sh-exectool.h"
+#include "../common/exectool.h"
#include "../common/sysutils.h"
#include "gpgtar.h"
@@ -325,8 +325,8 @@ gpgtar_extract (const char *filename, int decrypt)
argv[i++] = NULL;
assert (i == strlist_length (opt.gpg_arguments) + 2);
- err = sh_exec_tool_stream (opt.gpg_program, argv,
- cipher_stream, stream);
+ err = gnupg_exec_tool_stream (opt.gpg_program, argv,
+ cipher_stream, stream);
xfree (argv);
if (err)
goto leave;
diff --git a/tools/gpgtar-list.c b/tools/gpgtar-list.c
index 7bf4d49..25c70d2 100644
--- a/tools/gpgtar-list.c
+++ b/tools/gpgtar-list.c
@@ -26,7 +26,7 @@
#include "i18n.h"
#include "gpgtar.h"
-#include "../common/sh-exectool.h"
+#include "../common/exectool.h"
@@ -64,7 +64,7 @@ parse_xoctal (const void *data, size_t length, const char *filename)
}
else
{
- log_error ("%s: invalid octal number encountered - assuming 0\n",
+ log_error ("%s: invalid octal number encountered - assuming 0\n",
filename);
value = 0;
break;
@@ -83,7 +83,7 @@ parse_header (const void *record, const char *filename)
tar_header_t header;
int use_prefix;
- use_prefix = (!memcmp (raw->magic, "ustar", 5)
+ use_prefix = (!memcmp (raw->magic, "ustar", 5)
&& (raw->magic[5] == ' ' || !raw->magic[5]));
@@ -135,7 +135,7 @@ parse_header (const void *record, const char *filename)
n = 0;
memcpy (header->name+n, raw->name, namelen);
header->name[n+namelen] = 0;
-
+
header->mode = parse_xoctal (raw->mode, sizeof raw->mode, filename);
header->uid = parse_xoctal (raw->uid, sizeof raw->uid, filename);
header->gid = parse_xoctal (raw->gid, sizeof raw->gid, filename);
@@ -161,7 +161,7 @@ parse_header (const void *record, const char *filename)
header->nrecords = (header->size + RECORDSIZE-1)/RECORDSIZE;
else
header->nrecords = 0;
-
+
return header;
}
@@ -325,8 +325,8 @@ gpgtar_list (const char *filename, int decrypt)
argv[i++] = NULL;
assert (i == strlist_length (opt.gpg_arguments) + 2);
- err = sh_exec_tool_stream (opt.gpg_program, argv,
- cipher_stream, stream);
+ err = gnupg_exec_tool_stream (opt.gpg_program, argv,
+ cipher_stream, stream);
xfree (argv);
if (err)
goto leave;
-----------------------------------------------------------------------
Summary of changes:
common/Makefile.am | 2 +-
common/common-defs.h | 20 ++++++++++++++-----
common/{sh-exectool.c => exectool.c} | 38 +++++++++++++++++++++++-------------
common/{sh-exectool.h => exectool.h} | 34 ++++++++++++++++++++------------
common/gettime.h | 20 ++++++++++++++-----
common/isascii.c | 19 ++++++------------
common/keyserver.h | 20 ++++++++++++++-----
common/status.c | 20 ++++++++++++++-----
common/status.h | 20 ++++++++++++++-----
common/yesno.c | 20 ++++++++++++++-----
tools/gpgtar-create.c | 6 +++---
tools/gpgtar-extract.c | 6 +++---
tools/gpgtar-list.c | 14 ++++++-------
13 files changed, 156 insertions(+), 83 deletions(-)
rename common/{sh-exectool.c => exectool.c} (90%)
rename common/{sh-exectool.h => exectool.h} (59%)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list