From: joey <>
Date: Sun, 23 Jan 2005 09:45:50 +0000 (+0000)
Subject: Patch by Andreas Barth: added --secret-keyring /dev/null
X-Git-Tag: debian_userdir-ldap_0-3-8~11
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=5335eb0fbeb3600dfcffe9082b9c4f88ad21333b

Patch by Andreas Barth: added --secret-keyring /dev/null

This is required for ud-mailgate to work with sarge as well.  The
semantics of the option --no-default-keyring of GnuPG has been changed
between woody and sarge:

--no-default-keyring
  Do not add the default keyrings to the list of keyrings.  Note that
  GnuPG will not operate without any keyrings, so if you use this
  option and do not provide alternate keyrings via --keyring or
  --secret-keyring, then GnuPG will still use the default public or
  secret keyrings.  (and won't work if they don't exist)
---

diff --git a/userdir_gpg.py b/userdir_gpg.py
index 1f3b1cb..9f494fb 100644
--- a/userdir_gpg.py
+++ b/userdir_gpg.py
@@ -31,8 +31,12 @@ import rfc822, time, fcntl, FCNTL, anydbm
 # General GPG options
 GPGPath = "gpg"
 # "--load-extension","rsa",
-GPGBasicOptions = ["--no-options","--batch",
-          "--no-default-keyring","--always-trust"];
+GPGBasicOptions = [
+   "--no-options",
+   "--batch",
+   "--no-default-keyring",
+   "--secret-keyring", "/dev/null",
+   "--always-trust"];
 GPGKeyRings = [];
 GPGSigOptions = ["--output","-"];
 GPGSearchOptions = ["--dry-run","--with-colons","--fingerprint"];