Package: gnupg
Version: 1.4.10-4
Severity: important
File: /usr/bin/gpg
Tags: patch
if I have gnupg2 options in my .gnupg/gpg.conf file, like
debug-level basic
log-file socket:///home/user/.gnupg/log-socket
gpg fails to work.
Attached is a patch that makes gpg1 ignore those two options, and thus
keeps succeeding.
Note that kmail offers options in the gui to, thru gpgconf, to add those
options to .gnupg/gpg.conf and then breaks any use of gpg of the user.
use of gpg2 still works.
/Sune
(I know I can just commit and upload, but I would like a sanity check
first)
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=en_DK.ISO-8859-15, LC_CTYPE=en_DK.ISO-8859-15 (charmap=ISO-8859-15)
Shell: /bin/sh linked to /bin/dash
Versions of packages gnupg depends on:
ii dpkg 1.15.7.2 Debian package management system
ii gpgv 1.4.10-3 GNU privacy guard - signature veri
ii install-info 4.13a.dfsg.1-5 Manage installed documentation in
ii libbz2-1.0 1.0.5-4 high-quality block-sorting file co
ii libc6 2.10.2-9 Embedded GNU C Library: Shared lib
ii libreadline6 6.1-2 GNU readline and history libraries
ii libusb-0.1-4 2:0.1.12-15 userspace USB programming library
ii zlib1g 1:1.2.3.4.dfsg-3 compression library - runtime
Versions of packages gnupg recommends:
pn gnupg-curl <none> (no description available)
ii libldap-2.4-2 2.4.21-1 OpenLDAP libraries
Versions of packages gnupg suggests:
ii gnupg-doc 2003.04.06+dak1-1 GNU Privacy Guard documentation
ii imagemagick 7:6.6.0.4-2 image manipulation programs
ii libpcsclite1 1.5.5-3 Middleware to access a smart card
-- no debconf information
#! /bin/sh /usr/share/dpatch/dpatch-run
## Don't choke on gnupg2 options. Author: Sune Vuorela <s...@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Some of the logging options available to gnupg2 is something that
## DP: that gnupg1 doesn't recognize, and thus fails.
## DP: gnupg1 and gnupg2 is coinstallable and uses the same configuration
## DP: file in .gnupg, and thus shouldn't fail on options that is only
## DP: relevant to 'the other'.
## DP:
## DP:
@DPATCH@
--- gnupg-1.4.10.orig/g10/gpg.c
+++ gnupg-1.4.10/g10/gpg.c
@@ -519,6 +519,8 @@
{ oAttributeFile, "attribute-file" ,2, "@" },
{ oNoop, "sk-comments", 0, "@"},
{ oNoop, "no-sk-comments", 0, "@"},
+ { oNoop, "debug-level", 1, "@"},
+ { oNoop, "log-file", 1, "@"},
{ oCompletesNeeded, "completes-needed", 1, "@"},
{ oMarginalsNeeded, "marginals-needed", 1, "@"},
{ oMaxCertDepth, "max-cert-depth", 1, "@" },
