[git] GnuPG - branch, master, updated. gnupg-2.1.11-119-g4b5341d
by Werner Koch
cvs at cvs.gnupg.org
Tue Apr 5 11:19:24 CEST 2016
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 4b5341dc333983a15f649601fdddc42ba9161433 (commit)
via 7b58a1118d98543ed6854447d7b403877638ba54 (commit)
from 96bcd4220f1f1313afe12097d8dc62342ac8de0d (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 4b5341dc333983a15f649601fdddc42ba9161433
Author: Werner Koch <wk at gnupg.org>
Date: Tue Apr 5 11:18:45 2016 +0200
build: Build gpgcompose only in maintainer mode
* g10/Makefile.am (noinst_PROGRAMS): Add gpgcompose only in maintainer
mode.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 1b52e64..d6fbe92 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -49,7 +49,9 @@ noinst_PROGRAMS = gpg
if !HAVE_W32CE_SYSTEM
noinst_PROGRAMS += gpgv
endif
+if MAINTAINER_MODE
noinst_PROGRAMS += gpgcompose $(module_tests)
+endif
TESTS = $(module_tests)
if ENABLE_BZIP2_SUPPORT
diff --git a/g10/gpgcompose.c b/g10/gpgcompose.c
index 7bb0e04..d6f0307 100644
--- a/g10/gpgcompose.c
+++ b/g10/gpgcompose.c
@@ -1,4 +1,4 @@
-/* gpgcompose.c - Create OpenPGP messages by hand.
+/* gpgcompose.c - Maintainer tool to create OpenPGP messages by hand.
* Copyright (C) 2016 g10 Code GmbH
*
* This file is part of GnuPG.
commit 7b58a1118d98543ed6854447d7b403877638ba54
Author: Werner Koch <wk at gnupg.org>
Date: Tue Apr 5 11:10:09 2016 +0200
gpg: Replace use of "gpg2" by GPG_NAME
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/g10/gpgcompose.c b/g10/gpgcompose.c
index 55d3ae2..7bb0e04 100644
--- a/g10/gpgcompose.c
+++ b/g10/gpgcompose.c
@@ -553,7 +553,7 @@ static struct option user_id_options[] = {
"\"Name (comment) <email at example.org>\"" },
{ NULL, NULL,
"Example:\n\n"
- " $ gpgcompose --user-id \"USERID\" | gpg2 --list-packets" }
+ " $ gpgcompose --user-id \"USERID\" | " GPG_NAME " --list-packets" }
};
static int
@@ -662,7 +662,7 @@ static struct option pk_options[] = {
{ NULL, NULL,
"Example:\n\n"
" $ gpgcompose --public-key $KEYID --user-id \"USERID\" \\\n"
- " | gpg2 --list-packets" }
+ " | " GPG_NAME " --list-packets" }
};
static int
@@ -1554,7 +1554,7 @@ static struct option sig_options[] = {
"Example:\n\n"
" $ gpgcompose --public-key $KEYID --user-id USERID \\\n"
" --signature --class 0x10 --issuer $KEYID --issuer-keyid self \\\n"
- " | gpg2 --list-packets"}
+ " | " GPG_NAME " --list-packets"}
};
static int
@@ -2146,12 +2146,12 @@ static struct option sk_esk_options[] = {
"password. The session key may be prefaced with an integer and a colon "
"to indicate the cipher to use for the SED packet (making --sed-cipher "
"unnecessary and allowing the direct use of the result of "
- "\"gpg2 --show-session-key\")." },
+ "\"" GPG_NAME " --show-session-key\")." },
{ "", sk_esk_password, "The password." },
{ NULL, NULL,
"Example:\n\n"
" $ gpgcompose --sk-esk foobar --encrypted \\\n"
- " --literal --value foo | gpg2 --list-packets" }
+ " --literal --value foo | " GPG_NAME " --list-packets" }
};
static int
@@ -2388,14 +2388,14 @@ static struct option pk_esk_options[] = {
"then a new session key is generated. The session key may be "
"prefaced with an integer and a colon to indicate the cipher to use "
"for the SED packet (making --sed-cipher unnecessary and allowing the "
- "direct use of the result of \"gpg2 --show-session-key\")." },
+ "direct use of the result of \"" GPG_NAME " --show-session-key\")." },
{ "--throw-keyid", pk_esk_throw_keyid,
"Throw the keyid." },
{ "", pk_esk_keyid, "The key id." },
{ NULL, NULL,
"Example:\n\n"
" $ gpgcompose --pk-esk $KEYID --encrypted --literal --value foo \\\n"
- " | gpg2 --list-packets"}
+ " | " GPG_NAME " --list-packets"}
};
static int
@@ -2494,14 +2494,14 @@ static struct option encrypted_options[] = {
"string. If this is not given or is \"auto\", then the last session key "
"is used. If there was none, then an error is raised. The session key "
"must be prefaced with an integer and a colon to indicate the cipher "
- "to use (this is format used by \"gpg2 --show-session-key\")." },
+ "to use (this is format used by \"" GPG_NAME " --show-session-key\")." },
{ NULL, NULL,
"After creating the packet, this command clears the current "
"session key.\n\n"
"Example: nested encryption packets:\n\n"
" $ gpgcompose --sk-esk foo --encrypted-mdc \\\n"
" --sk-esk bar --encrypted-mdc \\\n"
- " --literal --value 123 --encrypted-pop --encrypted-pop | gpg2 -d" }
+ " --literal --value 123 --encrypted-pop --encrypted-pop | " GPG_NAME" -d" }
};
static int
@@ -2743,7 +2743,7 @@ static struct option literal_options[] = {
"The literal's name." },
{ NULL, NULL,
"Example:\n\n"
- " $ gpgcompose --literal --value foobar | gpg2 -d"}
+ " $ gpgcompose --literal --value foobar | " GPG_NAME " -d"}
};
static int
diff --git a/g10/t-stutter.c b/g10/t-stutter.c
index 8bdfb07..9576027 100644
--- a/g10/t-stutter.c
+++ b/g10/t-stutter.c
@@ -37,12 +37,13 @@
*
* How to generate a test message:
*
- * $ echo 0123456789abcdefghijklmnopqrstuvwxyz | gpg2 --disable-mdc -z 0 -c > msg.asc
- * $ gpg2 --list-packets msg.asc
+ * $ echo 0123456789abcdefghijklmnopqrstuvwxyz | \
+ * gpg --disable-mdc -z 0 -c > msg.asc
+ * $ gpg --list-packets msg.asc
* # Make sure the encryption packet contains a literal packet (without
* # any nesting).
* $ gpgsplit msg.asc
- * $ gpg2 --show-session-key -d msg.asc
+ * $ gpg --show-session-key -d msg.asc
* $ ./t-stutter --debug SESSION_KEY 000002-009.encrypted
*/
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 1837596..c7d09da 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -421,13 +421,13 @@ how_to_fix_the_trustdb ()
log_info (_("You may try to re-create the trustdb using the commands:\n"));
log_info (" cd %s\n", default_homedir ());
- log_info (" gpg2 --export-ownertrust > otrust.tmp\n");
+ log_info (" %s --export-ownertrust > otrust.tmp\n", GPG_NAME);
#ifdef HAVE_W32_SYSTEM
log_info (" del %s\n", name);
#else
log_info (" rm %s\n", name);
#endif
- log_info (" gpg2 --import-ownertrust < otrust.tmp\n");
+ log_info (" %s --import-ownertrust < otrust.tmp\n", GPG_NAME);
log_info (_("If that does not work, please consult the manual\n"));
}
-----------------------------------------------------------------------
Summary of changes:
g10/Makefile.am | 2 ++
g10/gpgcompose.c | 22 +++++++++++-----------
g10/t-stutter.c | 7 ++++---
g10/trustdb.c | 4 ++--
4 files changed, 19 insertions(+), 16 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list