components/git/patches/gpg.patch
author Danek Duvall <danek.duvall@oracle.com>
Thu, 24 Mar 2016 11:12:03 -0700
branchs11u3-sru
changeset 5720 519e1bb835ee
permissions -rw-r--r--
22854539 git 2.7.4 16298577 git system wide configuration stored in sub-optimal directory 16576745 git can't find gpg to sign tags 16913667 gitweb.cgi have no execution flags after installation 21952988 problem in UTILITY/GIT 21955798 new git patch to prevent inet_ntop() compile failures 22315592 git send-email fails because it can't find Error.pm 22959674 problem in UTILITY/GIT

On Solaris, GnuPG's main executable is "gpg2" instead of "gpg".  Perhaps
that should be otherwise, but until we deliver a "gpg" executable, git
should look for "gpg2" instead.  This is not suitable for upstream.

--- git-2.6.1/gpg-interface.c	Fri Oct  2 15:40:47 2015
+++ git-2.6.1/gpg-interface.c	Fri Dec  4 14:12:20 2015
@@ -5,7 +5,7 @@
 #include "sigchain.h"
 
 static char *configured_signing_key;
-static const char *gpg_program = "gpg";
+static const char *gpg_program = "gpg2";
 
 #define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
 #define PGP_MESSAGE "-----BEGIN PGP MESSAGE-----"