mirror of
https://kernel.googlesource.com/pub/scm/linux/kernel/git/tglx/remail.git
synced 2024-11-09 14:02:38 +01:00
remail/gpg: Allow specifying path to the gpgbinary to use
We want to be able to support ECC subkeys, which limits us to gnupg versions 2.2 and above. CentOS-7 ships with gnupg-2.0, which cannot be easily upgraded to 2.2 due to a slew of potential problems, so we install the newer version into /opt/gnupg22 and must call it as /opt/gnupg22/bin/gpg. Allow specifying gpg binary path to use instead of the default "gpg" in $PATH. Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
323b8cda64
commit
1ed9841f76
3 changed files with 7 additions and 0 deletions
|
@ -211,6 +211,7 @@ GPG options:
|
||||||
gpg:
|
gpg:
|
||||||
always_trust: True
|
always_trust: True
|
||||||
sign: True
|
sign: True
|
||||||
|
gpgbinary: gpg
|
||||||
|
|
||||||
always_trust:
|
always_trust:
|
||||||
|
|
||||||
|
@ -228,6 +229,10 @@ GPG options:
|
||||||
the public key of the list is not part of the welcome message which is
|
the public key of the list is not part of the welcome message which is
|
||||||
sent to new recipients.
|
sent to new recipients.
|
||||||
|
|
||||||
|
gpgbinary:
|
||||||
|
|
||||||
|
Path to the GnuPG binary to use, defaults to "gpg".
|
||||||
|
|
||||||
The mailing lists collection:
|
The mailing lists collection:
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
|
|
@ -211,6 +211,7 @@ class smime_config(object):
|
||||||
gpg_defaults = {
|
gpg_defaults = {
|
||||||
'always_trust' : True,
|
'always_trust' : True,
|
||||||
'sign' : True,
|
'sign' : True,
|
||||||
|
'gpgbinary' : 'gpg',
|
||||||
}
|
}
|
||||||
|
|
||||||
class gpg_config(object):
|
class gpg_config(object):
|
||||||
|
|
|
@ -25,6 +25,7 @@ class gpg_crypt(object):
|
||||||
self.config = gpgcfg
|
self.config = gpgcfg
|
||||||
self.account = account
|
self.account = account
|
||||||
self.gpg = gnupg.GPG(gnupghome=self.config.home,
|
self.gpg = gnupg.GPG(gnupghome=self.config.home,
|
||||||
|
gpgbinary=self.config.gpgbinary,
|
||||||
keyring=self.config.keyring)
|
keyring=self.config.keyring)
|
||||||
self.keys = self.gpg.list_keys()
|
self.keys = self.gpg.list_keys()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue