components/git/patches/gpg.patch
author pkidd <patrick.kidd@oracle.com>
Wed, 22 Jun 2016 17:23:03 -0700
branchs11u3-sru
changeset 6270 774c76b1f10a
parent 5720 519e1bb835ee
permissions -rw-r--r--
build metadata for S11.3SRU10.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5720
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     1
On Solaris, GnuPG's main executable is "gpg2" instead of "gpg".  Perhaps
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     2
that should be otherwise, but until we deliver a "gpg" executable, git
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     3
should look for "gpg2" instead.  This is not suitable for upstream.
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     4
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     5
--- git-2.6.1/gpg-interface.c	Fri Oct  2 15:40:47 2015
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     6
+++ git-2.6.1/gpg-interface.c	Fri Dec  4 14:12:20 2015
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     7
@@ -5,7 +5,7 @@
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     8
 #include "sigchain.h"
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     9
 
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    10
 static char *configured_signing_key;
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    11
-static const char *gpg_program = "gpg";
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    12
+static const char *gpg_program = "gpg2";
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    13
 
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    14
 #define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    15
 #define PGP_MESSAGE "-----BEGIN PGP MESSAGE-----"