[Pkg-gnupg-commit] [gnupg2] 09/16: try to use proper names

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit ceddc4ba797f84b56205eb8f492a412c4cf0f311
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Mar 30 11:04:29 2016 -0400

    try to use proper names
---
 ...06-use-GPG_NAME-in-how_to_fix_the_trustdb.patch | 30 ++++++++++
 ...lled-gpg-and-gpgv-when-enable-gpg2-is-gpg.patch | 68 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 3 files changed, 100 insertions(+)

diff --git a/debian/patches/0006-use-GPG_NAME-in-how_to_fix_the_trustdb.patch b/debian/patches/0006-use-GPG_NAME-in-how_to_fix_the_trustdb.patch
new file mode 100644
index 0000000..ad8681f
--- /dev/null
+++ b/debian/patches/0006-use-GPG_NAME-in-how_to_fix_the_trustdb.patch
@@ -0,0 +1,30 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Wed, 30 Mar 2016 10:22:39 -0400
+Subject: use GPG_NAME in how_to_fix_the_trustdb()
+
+* g10/trustdb.c: (how_to_fix_the_trustdb) use GPG_NAME explicitly
+  instead of hardcoding gpg2
+---
+ g10/trustdb.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/g10/trustdb.c b/g10/trustdb.c
+index 8f2b2cb..81d0a1a 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 ("  " GPG_NAME " --export-ownertrust > otrust.tmp\n");
+ #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 ("  " GPG_NAME " --import-ownertrust < otrust.tmp\n");
+   log_info (_("If that does not work, please consult the manual\n"));
+ }
+ 
diff --git a/debian/patches/0007-move-installed-gpg-and-gpgv-when-enable-gpg2-is-gpg.patch b/debian/patches/0007-move-installed-gpg-and-gpgv-when-enable-gpg2-is-gpg.patch
new file mode 100644
index 0000000..e6ae016
--- /dev/null
+++ b/debian/patches/0007-move-installed-gpg-and-gpgv-when-enable-gpg2-is-gpg.patch
@@ -0,0 +1,68 @@
+From 48331ced4969d9b20b1e2cad0297dd77f4bd339f Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Wed, 30 Mar 2016 10:56:49 -0400
+Subject: [PATCH] move installed gpg and gpgv when --enable-gpg2-is-gpg
+
+* configure.ac: introduce an automake conditional GPG2_IS_GPG, test
+  for WinCE there.
+* g10/Makefile.am: re-use the WinCE install-exec-hook to move the
+  files into the right location when GPG2_IS_GPG is set
+---
+ configure.ac    | 14 +++++++++++---
+ g10/Makefile.am |  5 +++--
+ 2 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 003e509..30a89cc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -211,10 +211,18 @@ test -n "$GNUPG_DIRMNGR_LDAP_PGM" \
+ # installed name of gpg.  This option sets "gpg2"'s installed name to
+ # just "gpg".  Note that it might be required to rename gpg2 to gpg
+ # manually after the build process.
+-#
++
+ AC_ARG_ENABLE(gpg2-is-gpg,
+     AC_HELP_STRING([--enable-gpg2-is-gpg],[Set installed name of gpg2 to gpg]),
+-    gpg2_is_gpg=$enableval)
++    gpg2_is_gpg=$enableval,
++    # There has never been a gpg for WindowsCE, so this should default
++    # to true on that platform.
++    [case "${host}" in
++          *-mingw32ce*)
++                  gpg2_is_gpg=yes
++                  ;;
++     esac]
++ )
+ if test "$gpg2_is_gpg" = "yes"; then
+    name_of_installed_gpg=gpg
+ else
+@@ -222,7 +230,7 @@ else
+ fi
+ AC_DEFINE_UNQUOTED(NAME_OF_INSTALLED_GPG, "$name_of_installed_gpg",
+                    [The name of the installed GPG tool])
+-
++AM_CONDITIONAL([GPG2_IS_GPG], [test x$name_of_installed_gpg = xgpg])
+ 
+ # SELinux support includes tracking of sensitive files to avoid
+ # leaking their contents through processing these files by gpg itself
+diff --git a/g10/Makefile.am b/g10/Makefile.am
+index 473a3ac..e16a2c2 100644
+--- a/g10/Makefile.am
++++ b/g10/Makefile.am
+@@ -199,9 +199,10 @@ uninstall-local:
+ 	- at rm $(DESTDIR)$(pkgdatadir)/distsigkey.gpg
+ 
+ 
+-# There has never been a gpg for WindowsCE, thus we don't need a gpg2 here
+-if HAVE_W32CE_SYSTEM
++if GPG2_IS_GPG
+ install-exec-hook:
+ 	mv -f $(DESTDIR)$(bindir)/gpg2$(EXEEXT) \
+               $(DESTDIR)$(bindir)/gpg$(EXEEXT)
++	mv -f $(DESTDIR)$(bindir)/gpgv2$(EXEEXT) \
++              $(DESTDIR)$(bindir)/gpgv$(EXEEXT)
+ endif
+-- 
+2.8.0.rc3
+
diff --git a/debian/patches/series b/debian/patches/series
index 78524b4..5c62d34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@
 0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch
 0005-common-Change-simple_query-to-ignore-status-messages.patch
 0006-w32-Do-not-error-out-if-gpgconf-is-not-installed.patch
+0006-use-GPG_NAME-in-how_to_fix_the_trustdb.patch
+0007-move-installed-gpg-and-gpgv-when-enable-gpg2-is-gpg.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git