author | Jan Friedel <jan.friedel@oracle.com> |
Fri, 15 May 2015 11:39:39 -0700 | |
branch | s11-update |
changeset 4665 | ac89769a1a3b |
permissions | -rw-r--r-- |
4665
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
1 |
# Internal patch. |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
2 |
# GpgME can't find /usr/bin/gpg2 and /usr/bin/gpgsm, |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
3 |
# which are needed by gpgme-config. So, we have to find |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
4 |
# them instead. |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
5 |
# Not for upstream because they should fix this. |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
6 |
--- src/gpgme-config.in 2013-03-15 12:27:33.000000000 -0700 |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
7 |
+++ src/gpgme-config.in 2015-05-14 12:28:27.296390126 -0700 |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
8 |
@@ -179,10 +179,10 @@ |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
9 |
fi |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
10 |
;; |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
11 |
--get-gpg) |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
12 |
- output="$output @GPG@" |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
13 |
+ output="$output /usr/bin/gpg2" |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
14 |
;; |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
15 |
--get-gpgsm) |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
16 |
- output="$output @GPGSM@" |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
17 |
+ output="$output /usr/bin/gpgsm" |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
18 |
;; |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
19 |
*) |
ac89769a1a3b
21091953 upgrade GPGME to 1.5.3
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
20 |
usage 1 1>&2 |