[Pgp-tools-commit] r312 - in branches/backports.org: caff debian
gpg-key2ps gpglist
Christoph Berg
myon at alioth.debian.org
Wed Nov 22 00:57:39 CET 2006
Author: myon
Date: 2006-11-22 00:57:39 +0100 (Wed, 22 Nov 2006)
New Revision: 312
Modified:
branches/backports.org/caff/caff
branches/backports.org/debian/changelog
branches/backports.org/debian/control
branches/backports.org/debian/copyright
branches/backports.org/gpg-key2ps/gpg-key2ps
branches/backports.org/gpglist/gpglist
Log:
merge changes into bpo branch
Modified: branches/backports.org/caff/caff
===================================================================
--- branches/backports.org/caff/caff 2006-10-29 21:40:36 UTC (rev 311)
+++ branches/backports.org/caff/caff 2006-11-21 23:57:39 UTC (rev 312)
@@ -3,7 +3,7 @@
# caff -- CA - Fire and Forget
# $Id$
#
-# Copyright (c) 2004, 2005 Peter Palfrader <peter at palfrader.org>
+# Copyright (c) 2004, 2005, 2006 Peter Palfrader <peter at palfrader.org>
# Copyright (c) 2005, 2006 Christoph Berg <cb at df7cb.de>
#
# All rights reserved.
@@ -105,7 +105,7 @@
=item $HOME/.caff/gnupghome/gpg.conf - gpg configuration
-useful options include use-agent, default-cert-level, etc.
+useful options include use-agent, keyserver-options, default-cert-level, etc.
=back
@@ -297,6 +297,7 @@
use File::Temp qw{tempdir};
use Text::Template;
use MIME::Entity;
+use Encode;
use Fcntl;
use IO::Select;
use Getopt::Long;
@@ -465,7 +466,8 @@
check_executable("gpg", $CONFIG{'gpg'});
check_executable("gpg-sign", $CONFIG{'gpg-sign'});
check_executable("gpg-delsig", $CONFIG{'gpg-delsig'});
- $CONFIG{'secret-keyring'} = $ENV{'HOME'}.'/.gnupg/secring.gpg' unless defined $CONFIG{'secret-keyring'};
+ $CONFIG{'secret-keyring'} = ($ENV{'GNUPGHOME'} || "$ENV{'HOME'}/.gnupg") . '/secring.gpg'
+ unless defined $CONFIG{'secret-keyring'};
$CONFIG{'no-download'} = 0 unless defined $CONFIG{'no-download'};
$CONFIG{'no-sign'} = 0 unless defined $CONFIG{'no-sign'};
$CONFIG{'key-files'} = () unless defined $CONFIG{'key-files'};
@@ -799,7 +801,7 @@
$message_entity->head->add("Subject", "Your signed PGP key 0x$key_id");
$message_entity->head->add("To", $address);
- $message_entity->head->add("From", '"'.$CONFIG{'owner'}.'" <'.$CONFIG{'email'}.'>');
+ $message_entity->head->add("From", '"'.Encode::encode('MIME-Q', $CONFIG{'owner'}).'" <'.$CONFIG{'email'}.'>');
$message_entity->head->add("Reply-To", $CONFIG{'reply-to'}) if defined $CONFIG{'reply-to'};
$message_entity->head->add("Bcc", $CONFIG{'bcc'}) if defined $CONFIG{'bcc'};
$message_entity->head->add("User-Agent", $USER_AGENT);
@@ -908,11 +910,11 @@
for my $keyid (@ARGV) {
$keyid =~ s/^0x//i;
- unless ($keyid =~ /^([A-F0-9]{8}|[A-F0-9]{16}||[A-F0-9]{40})$/i) {
- if ($keyid =~ /^[A-F0-9]{32}$/) {
- info("Ignoring v3 fingerprint $keyid. v3 keys are obsolete.");
- next;
- };
+ if ($keyid =~ /^[A-F0-9]{32}$/i) {
+ info("Ignoring v3 fingerprint $keyid. v3 keys are obsolete.");
+ next;
+ };
+ if ($keyid !~ /^([A-F0-9]{8}|[A-F0-9]{16}|[A-F0-9]{40})$/i) {
print STDERR "$keyid is not a keyid.\n";
usage(\*STDERR, 1);
};
@@ -1025,7 +1027,7 @@
if (scalar %local_keyids) {
notice ("Import failed for: ". (join ' ', keys %local_keyids)."." . ($had_v3_keys ? " (Or maybe it's one of those ugly v3 keys?)" : ""));
exit 1 unless ask ("Some keys could not be imported - continue anyway?", 0);
- if (scalar %local_keyids == 1) {
+ if (scalar keys %local_keyids == 1) {
mywarn("Assuming ". (join ' ', keys %local_keyids)." is a fine keyid.");
} else {
mywarn("Assuming ". (join ' ', keys %local_keyids)." are fine keyids.");
Modified: branches/backports.org/debian/changelog
===================================================================
--- branches/backports.org/debian/changelog 2006-10-29 21:40:36 UTC (rev 311)
+++ branches/backports.org/debian/changelog 2006-11-21 23:57:39 UTC (rev 312)
@@ -1,3 +1,29 @@
+signing-party (0.4.9-1~bpo.1) sarge-backports; urgency=low
+
+ * Backport.
+
+ -- Christoph Berg <myon at debian.org> Wed, 22 Nov 2006 00:57:45 +0100
+
+signing-party (0.4.9-1) unstable; urgency=low
+
+ * caff:
+ + Fix a bug with checking if we have exactly one or more keys that failed
+ downloading.
+ + Mention in manpage that keyserver-options is a useful setting in
+ .caff/gnupghome/gpg.conf (Closes: #392811).
+ + q-p-encode From: header (Closes: #366745).
+
+ -- Christoph Berg <myon at debian.org> Sun, 29 Oct 2006 21:02:56 +0100
+
+signing-party (0.4.8-1) unstable; urgency=low
+
+ * gpglist: do not die with with-fingerprint (Closes: #382019).
+ * gpg-key2ps: add --list-key to gpg call (works around #382794).
+ * caff: when set, use $ENV{'GNUPGHOME'} to find secring.gpg. Suggested by
+ Gerfried Fuchs.
+
+ -- Christoph Berg <myon at debian.org> Sun, 8 Oct 2006 01:29:59 +0200
+
signing-party (0.4.7-0bpo1) sarge-backports; urgency=low
* Backport.
Modified: branches/backports.org/debian/control
===================================================================
--- branches/backports.org/debian/control 2006-10-29 21:40:36 UTC (rev 311)
+++ branches/backports.org/debian/control 2006-11-21 23:57:39 UTC (rev 312)
@@ -5,6 +5,7 @@
Uploaders: Simon Richter <sjr at debian.org>, Peter Palfrader <weasel at debian.org>, Christoph Berg <myon at debian.org>
Build-Depends: debhelper (>= 4)
Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/svn/pgp-tools
Package: signing-party
Architecture: all
Modified: branches/backports.org/debian/copyright
===================================================================
--- branches/backports.org/debian/copyright 2006-10-29 21:40:36 UTC (rev 311)
+++ branches/backports.org/debian/copyright 2006-11-21 23:57:39 UTC (rev 312)
@@ -8,7 +8,7 @@
svn://svn.debian.org/pgp-tools/trunk/
Authors and Copyright:
- (c) 2000, 2002, 2004, 2005 Peter Palfrader <peter at palfrader.org>
+ (c) 2000, 2002, 2004, 2005, 2006 Peter Palfrader <peter at palfrader.org>
(c) 2004 Uli Martens <uli at youam.net>
(c) 2004, 2005, 2006 Christoph Berg <cb at df7cb.de>
(c) 2001-2005 Simon Richter <sjr at debian.org>
Modified: branches/backports.org/gpg-key2ps/gpg-key2ps
===================================================================
--- branches/backports.org/gpg-key2ps/gpg-key2ps 2006-10-29 21:40:36 UTC (rev 311)
+++ branches/backports.org/gpg-key2ps/gpg-key2ps 2006-11-21 23:57:39 UTC (rev 312)
@@ -3,7 +3,7 @@
# gpg-key2ps: convert a PGP/GnuPG key into paper slips.
# Copyright (C) 2001-2005 Simon Richter
# Copyright (C) 2005-2006 Thijs Kinkhorst
-# Copyright (C) 2005 Christoph Berg <cb at df7cb.de>
+# Copyright (C) 2005-2006 Christoph Berg <cb at df7cb.de>
# Licenced under the GNU General Public License,
# version 2 or later.
#
@@ -19,7 +19,7 @@
sub version($) {
my $fd = shift;
- print $fd "gpg-key2ps $version - (c) 2001-2005 Simon Richter, Thijs Kinkhorst, Christoph Berg\n";
+ print $fd "gpg-key2ps $version - (c) 2001-2006 Simon Richter, Thijs Kinkhorst, Christoph Berg\n";
}
sub usage($$) {
@@ -92,7 +92,8 @@
# open a gpg process we'll be reading from below
map { s/'/'\\''/g; } @ARGV; # quote single quotes
-open(GPG, "gpg --fingerprint --with-colons '". (join "' '", @ARGV) ."' |");
+# --list-key due to #382794
+open(GPG, "gpg --list-key --with-fingerprint --with-colons '". (join "' '", @ARGV) ."' |");
sub start_postscript {
# start the PostScript output
Modified: branches/backports.org/gpglist/gpglist
===================================================================
--- branches/backports.org/gpglist/gpglist 2006-10-29 21:40:36 UTC (rev 311)
+++ branches/backports.org/gpglist/gpglist 2006-11-21 23:57:39 UTC (rev 312)
@@ -120,7 +120,7 @@
next;
}
last if ( m/^(sub):/ );
- next if ( m/^(tru):/ );
+ next if ( m/^(fpr|tru):/ );
print STDERR "hi, i'm a bug. please report me to my owner\n";
die "input: $_, key: $key";
}
More information about the Pgp-tools-commit
mailing list