From 80c7628f16785ee7177e83349849b6b40db02498 Mon Sep 17 00:00:00 2001 From: thijs Date: Fri, 20 Jul 2007 15:00:39 +0000 Subject: [PATCH 01/16] use maximum compression for orig.tar.gz git-svn-id: svn://svn.debian.org/pgp-tools/trunk@341 b513b33f-fedd-0310-b452-c3deb5f4c849 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 28248c9..8b1794c 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ dist: mkdir $(TGZ_DIR) for dir in $(DIRS) ; do cp -a $$dir $(TGZ_DIR); done cp -a README TODO Makefile $(TGZ_DIR) - tar cvz -f $(TGZ) --exclude .svn $(TGZ_DIR) + GZIP=--best tar cvz -f $(TGZ) --exclude .svn $(TGZ_DIR) rm -rf $(TGZ_DIR) tag-release: -- 2.30.2 From 27bcd8d5676ec687152204b59b18e506c2a4fb4d Mon Sep 17 00:00:00 2001 From: thijs Date: Thu, 2 Aug 2007 10:14:16 +0000 Subject: [PATCH 02/16] it's not useful to specify minimal versions for dependencies when these versions predate even sarge/oldstable. git-svn-id: svn://svn.debian.org/pgp-tools/trunk@342 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 3 ++- debian/control | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e503b0c..cfe10cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,9 @@ signing-party (0.4.11-2) UNRELEASED; urgency=low * caff: + Add filename to one of the MIME parts as its absence breaks certain virus scanners. + * Cleanup package dependencies. - -- Thijs Kinkhorst Mon, 9 Jul 2007 14:53:13 +0200 + -- Thijs Kinkhorst Thu, 2 Aug 2007 12:12:02 +0200 signing-party (0.4.11-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 6d65a1c..5aedf6d 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,8 @@ XS-Vcs-Browser: http://svn.debian.org/wsvn/pgp-tools Package: signing-party Architecture: all -Depends: gnupg (>= 1.3.92), libgnupg-interface-perl, libtext-template-perl, libmime-perl, libmailtools-perl (>= 1.62) -Recommends: exim4 | mail-transport-agent, libtext-iconv-perl | libintl-perl | recode, dialog | whiptail, libpaper-utils (>= 1.1.13) +Depends: gnupg, libgnupg-interface-perl, libtext-template-perl, libmime-perl, libmailtools-perl +Recommends: exim4 | mail-transport-agent, libtext-iconv-perl | libintl-perl | recode, dialog | whiptail, libpaper-utils Replaces: keylookup (<< 3.0) Conflicts: keylookup (<< 3.0) Description: Various OpenPGP related tools -- 2.30.2 From a59645dc9de7a89a9e3bce92be61f75d2498eb9d Mon Sep 17 00:00:00 2001 From: thijs Date: Thu, 2 Aug 2007 12:01:03 +0000 Subject: [PATCH 03/16] * gpg-mailkeys: + Resolve bashisms in gpg-mailkeys. git-svn-id: svn://svn.debian.org/pgp-tools/trunk@343 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 4 +++- gpg-mailkeys/gpg-mailkeys | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index cfe10cf..854e4ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,9 +14,11 @@ signing-party (0.4.11-2) UNRELEASED; urgency=low * caff: + Add filename to one of the MIME parts as its absence breaks certain virus scanners. + * gpg-mailkeys: + + Resolve bashisms in gpg-mailkeys. * Cleanup package dependencies. - -- Thijs Kinkhorst Thu, 2 Aug 2007 12:12:02 +0200 + -- Thijs Kinkhorst Thu, 02 Aug 2007 14:01:21 +0200 signing-party (0.4.11-1) unstable; urgency=low diff --git a/gpg-mailkeys/gpg-mailkeys b/gpg-mailkeys/gpg-mailkeys index d9ca259..f274aa5 100755 --- a/gpg-mailkeys/gpg-mailkeys +++ b/gpg-mailkeys/gpg-mailkeys @@ -9,8 +9,8 @@ set -e VERSION='$Rev$' if [ -z "$*" ]; then - echo "Send people their newly signed GPG key by mail." - echo "Usage: $0 keyid ..." + printf "Send people their newly signed GPG key by mail.\n" + printf "Usage: $0 keyid ...\n" exit 1 fi @@ -38,20 +38,21 @@ fi FAILKEYS= while [ -n "$1" ]; do - echo -n "[$1] " + printf "[$1] " TEMPFILE=`mktemp -t gpg2mail.XXXXXX` ADDR=`gpg --with-colons --fixed-list-mode --list-key $1 | sed -e 's/^uid:[^re][^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:<]*<[^:>]*>\):.*/@@uid@@ \1/' -e '/^@@uid@@ /!d' -e 's/([^)]*)//g' -e 's/ */ /g' -e 's/^@@uid@@ //' | head -1` if [ -z "$ADDR" ]; then - echo "(no usable user ids)" + printf "(no usable user ids)\n" FAILKEYS="$FAILKEYS:$1" shift 1 continue fi - BOUNDARY="ksp-$$-boundary-$RANDOM" + NANOTIME=`date +%s-%N` + BOUNDARY="ksp-$$-boundary-$NANOTIME" - echo -n "$ADDR:" + printf "$ADDR:" if [ $FROM ]; then - echo >$TEMPFILE "From: $NAME <$FROM>" + printf >$TEMPFILE "From: $NAME <$FROM>\n" fi cat << EOM >> $TEMPFILE To: $ADDR @@ -75,7 +76,7 @@ $TEXT EOM if [ -f ~/.signature ]; - then echo "--=20" >> $TEMPFILE + then printf "--=20\n" >> $TEMPFILE cat ~/.signature >> $TEMPFILE fi @@ -89,15 +90,14 @@ Content-Disposition: attachment; filename="$1.asc" --$BOUNDARY-- EOM - echo -n " sending" + printf " sending" /usr/sbin/sendmail -ti <$TEMPFILE rm $TEMPFILE - echo " done." + printf " done.\n" shift 1 done if [ -n "$FAILKEYS" ]; then - echo - echo "Note: The following keys could not be sent:" - echo "$FAILKEYS" | tr ':' '\n' | sed -e '/^ *$/d' -e 's/^/ /' + printf "\nNote: The following keys could not be sent:\n" + printf "$FAILKEYS\n" | tr ':' '\n' | sed -e '/^ *$/d' -e 's/^/ /' fi -- 2.30.2 From e9402a9526110b481df41ea0f279d9759fb34640 Mon Sep 17 00:00:00 2001 From: thijs Date: Wed, 15 Aug 2007 22:13:08 +0000 Subject: [PATCH 04/16] Make '-m' (mail keys) a quad-option as suggested by Gerfried Fuchs in #383423. I used his patch as inspiration but made some different choices which I think results in better compatibility. Let me know if any of you have an issue with this being changed. git-svn-id: svn://svn.debian.org/pgp-tools/trunk@344 b513b33f-fedd-0310-b452-c3deb5f4c849 --- caff/caff | 44 ++++++++++++++++++++++++++------------------ debian/changelog | 4 +++- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/caff/caff b/caff/caff index 8b9b701..493a349 100755 --- a/caff/caff +++ b/caff/caff @@ -40,7 +40,7 @@ caff -- CA - Fire and Forget =over -=item B [-eEmMRS] [-u I] I [I ..] +=item B [-eERS] [-m I] [-u I] I [I ..] =back @@ -66,13 +66,10 @@ Export old signatures. Default is to ask the user for each old signature. Do not export old signatures. Default is to ask the user for each old signature. -=item B<-m>, B<--mail> +=item B<-m>, B<--mail> I -Send mail after signing. Default is to ask the user for each uid. - -=item B<-M>, B<--no-mail> - -Do not send mail after signing. Default is to ask the user for each uid. +Whether to send mail after signing. Default is to ask, for each uid, +with a default value of yes. =item B<-R>, B<--no-download> @@ -214,12 +211,11 @@ With multiple keyids, sign with each key in turn. =item B [boolean] -Do not prompt for sending mail, just do it. Default: B<0>. - -=item B [boolean] +Whether to send mails. This is a quad-option, with which you can set the +behaviour: yes always sends, no never sends; ask-yes and ask-no asks, for +each uid, with according defaults for the question. Default: B. -Do not prompt for sending mail. The messages are still written to -$CONFIG{'caffhome'}/keys/. Default: B<0>. +In any case, the messages are also written to $CONFIG{'caffhome'}/keys/ =item B [string] @@ -662,7 +658,7 @@ sub version($) { sub usage($$) { my ($fd, $exitcode) = @_; version($fd); - print $fd "Usage: $PROGRAM_NAME [-eEmMRS] [-u ] [ ...]\n"; + print $fd "Usage: $PROGRAM_NAME [-eERS] [-m ] [-u ] [ ...]\n"; print $fd "Consult the manual page for more information.\n"; exit $exitcode; }; @@ -892,8 +888,8 @@ if (!GetOptions ( '--export-old' => \$params->{'export-old'}, '-E' => \$params->{'no-export-old'}, '--no-export-old' => \$params->{'no-export-old'}, - '-m' => \$params->{'mail'}, - '--mail' => \$params->{'mail'}, + '-m:s' => \$params->{'mail'}, + '--mail:s' => \$params->{'mail'}, '-M' => \$params->{'no-mail'}, '--no-mail' => \$params->{'no-mail'}, '-R' => \$params->{'no-download'}, @@ -915,9 +911,21 @@ usage(\*STDERR, 1) unless scalar @ARGV >= 1; $CONFIG{'local-user'} = $params->{'local-user'} if defined $params->{'local-user'}; $CONFIG{'no-download'} = $params->{'no-download'} if defined $params->{'no-download'}; +$CONFIG{'no-sign'} = $params->{'no-sign'} if defined $params->{'no-sign'}; + +# If old 'no-mail' parameter, or if the 'mail' parameter is set to 'no' +if ( $CONFIG{'no-mail'} || defined $params->{'no-mail'} || + ( defined $params->{'mail'} && $params->{'mail'} eq 'no' ) ) { + $CONFIG{'mail'} = 'no'; +} elsif ( defined $params->{'mail'} ) { + $CONFIG{'mail'} = $params->{'mail'}; +} else { + $CONFIG{'mail'} = 'ask-yes'; +} + $CONFIG{'no-mail'} = $params->{'no-mail'} if defined $params->{'no-mail'}; $CONFIG{'mail'} = $params->{'mail'} if defined $params->{'mail'}; -$CONFIG{'no-sign'} = $params->{'no-sign'} if defined $params->{'no-sign'}; + push @{$CONFIG{'key-files'}}, @{$params->{'key-files'}} if defined $params->{'key-files'}; for my $keyid (map { split /\n/ } @ARGV) { # caff "`cat txt`" is a single argument @@ -1298,7 +1306,7 @@ for my $keyid (@keyids_ok) { if (scalar @UIDS == 0) { info("found no signed uids for $keyid"); } else { - next if $CONFIG{'no-mail'}; # do not send mail + next if ($CONFIG{'mail'} eq 'no'); # do not send mail my @attached; for my $uid (@UIDS) { @@ -1317,7 +1325,7 @@ for my $keyid (@keyids_ok) { if (!$uid->{'is_uat'} && ($uid->{'text'} =~ /@/)) { my $address = $uid->{'text'}; $address =~ s/.*<(.*)>.*/$1/; - if (ask("Mail signature for $uid->{'text'} to '$address'?", 1, $CONFIG{'mail'})) { + if (ask("Mail signature for $uid->{'text'} to '$address'?", $CONFIG{'mail'} ne 'ask-no', $CONFIG{'mail'} eq 'yes')) { my $mail = send_mail($address, $can_encrypt, $longkeyid, $uid, @attached); if (defined $mail) { my $keydir = "$KEYSBASE/$DATE_STRING"; diff --git a/debian/changelog b/debian/changelog index 854e4ce..2fe199c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,11 +14,13 @@ signing-party (0.4.11-2) UNRELEASED; urgency=low * caff: + Add filename to one of the MIME parts as its absence breaks certain virus scanners. + + Make -m (mail options) a yes/no/ask-yes/ask-no option, based on a + suggestion by Gerfried Fuchs (Closes: #383423). * gpg-mailkeys: + Resolve bashisms in gpg-mailkeys. * Cleanup package dependencies. - -- Thijs Kinkhorst Thu, 02 Aug 2007 14:01:21 +0200 + -- Thijs Kinkhorst Wed, 15 Aug 2007 23:58:15 +0200 signing-party (0.4.11-1) unstable; urgency=low -- 2.30.2 From 22bdc8fb0235f077bb853ae2d2d7b8a5bcf03efe Mon Sep 17 00:00:00 2001 From: thijs Date: Thu, 23 Aug 2007 10:12:41 +0000 Subject: [PATCH 05/16] file now obsolete since keylookup is no longer a separate package git-svn-id: svn://svn.debian.org/pgp-tools/trunk@345 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/keylookup.copyright | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 debian/keylookup.copyright diff --git a/debian/keylookup.copyright b/debian/keylookup.copyright deleted file mode 100644 index 7b96ab0..0000000 --- a/debian/keylookup.copyright +++ /dev/null @@ -1,6 +0,0 @@ -This keylookup package was created on Tue, 16 Aug 2005 16:56:42 +0200 -by Peter Palfrader . - -It does not have any files, it just exists to facilitate upgrades. As -such there are no files that are copyrighted. Do with the metadata -whatever you want. -- 2.30.2 From 1b028ae1d15e9cb90cc8db9ed0f151a5ae349a72 Mon Sep 17 00:00:00 2001 From: thijs Date: Thu, 23 Aug 2007 10:12:56 +0000 Subject: [PATCH 06/16] release 1.4.12 git-svn-id: svn://svn.debian.org/pgp-tools/trunk@346 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2fe199c..b3d4338 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -signing-party (0.4.11-2) UNRELEASED; urgency=low +signing-party (0.4.12-1) unstable; urgency=low [ Christoph Berg ] * caff: @@ -20,7 +20,7 @@ signing-party (0.4.11-2) UNRELEASED; urgency=low + Resolve bashisms in gpg-mailkeys. * Cleanup package dependencies. - -- Thijs Kinkhorst Wed, 15 Aug 2007 23:58:15 +0200 + -- Thijs Kinkhorst Thu, 23 Aug 2007 12:09:43 +0200 signing-party (0.4.11-1) unstable; urgency=low -- 2.30.2 From f09cfb5ddbcfaf4ba0247f86fadac60dc3a5e1b1 Mon Sep 17 00:00:00 2001 From: myon Date: Sun, 9 Sep 2007 22:45:57 +0000 Subject: [PATCH 07/16] gpgsigs: Implement support for latex output and photo ids. (Closes: #430607) Needs some more polishing and layout, but works. git-svn-id: svn://svn.debian.org/pgp-tools/trunk@349 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 8 +++++ gpgsigs/gpgsigs | 76 +++++++++++++++++++++++++++++++++++++----------- 2 files changed, 67 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index b3d4338..779bf0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +signing-party (0.4.12-2) unreleased; urgency=low + + [ Christoph Berg ] + * gpgsigs: Implement support for latex output and photo ids. + (Closes: #430607) + + -- Christoph Berg Mon, 10 Sep 2007 00:43:13 +0200 + signing-party (0.4.12-1) unstable; urgency=low [ Christoph Berg ] diff --git a/gpgsigs/gpgsigs b/gpgsigs/gpgsigs index 8909894..af1a379 100755 --- a/gpgsigs/gpgsigs +++ b/gpgsigs/gpgsigs @@ -59,12 +59,14 @@ EOF } -my ($fromcharset, $charset, $recv_keys); +my ($fromcharset, $charset, $recv_keys, $refresh, $latex); Getopt::Long::config('bundling'); GetOptions( '-f=s' => \$fromcharset, '-t=s' => \$charset, r => \$recv_keys, + refresh => \$refresh, + latex => \$latex, help => sub { usage(*STDOUT, 0); }, version => sub { version(*STDOUT); exit 0;}, ) or usage(*STDERR, 1); @@ -109,13 +111,12 @@ sub myrecode($$$) { # parse options -my $mykey = uc(shift @ARGV); +my @mykeys = split /,/, uc(shift @ARGV); my $keytxt = (shift @ARGV) || usage(*STDERR, 1); my $outfile = (shift @ARGV) || '-'; -my @mykeys = split /,/, $mykey; map { s/^0x//i; } @mykeys; -my %myuids = map { $_ => [] } @mykeys; +my %uids = map { $_ => [] } @mykeys; if (!@mykeys || scalar @ARGV) { usage(*STDERR, 1); @@ -163,13 +164,22 @@ while () { $uid = myrecode($uid, "UTF-8", $charset); my ($shortkey) = substr $key, -8; - # Remember own, non-revoked uids - if (exists $myuids{$shortkey} and $uidstatus ne "r") { - push @{$myuids{$shortkey}}, $uid + # Remember non-revoked uids + if ($uidstatus ne "r") { + push @{$uids{$shortkey}}, $uid; } next; } + if ( m/^uat:(.):/ ) { # uat:-::::2006-08-03::27BAEAF742BD253C2F3F03B043DC1536880193C4::1 7993: + $uidstatus = $1; + next if $uidstatus ne "-"; + system "gpg --photo-viewer 'convert - %k.eps' --list-options show-photos --list-key $key"; + $uid = "Photo ID"; + my ($shortkey) = substr $key, -8; + push @{$uids{$shortkey}}, $uid; + next; + } if ( m/^sig:(?:.*?:){3,3}([0-9A-F]{8})([0-9A-F]{8}):(?:.*?:){5,5}(.*?):/ ) { my $class = $3; if ($class eq '10x') { @@ -190,7 +200,7 @@ while () { if ($before eq 'S' || $before eq 's') { $sigs->{$key}->{$uid}->{$1.$2} = $class; } elsif ($class eq 'S' || $class eq 's') { - # intentionall left blank + # intentionally left blank } elsif ($before < $class) { $sigs->{$key}->{$uid}->{$1.$2} = $class; }; @@ -200,10 +210,6 @@ while () { $sigs->{$key}->{$uid}->{$2} = $sigs->{$key}->{$uid}->{$1.$2}; next; } - if ( m/^uat:/ ) { - $uid = "Photo ID"; - next; - } next if ( m/^(rev|rvk|sub|tru):/ ); # revoke/revoker/subkey/trust warn "unknown value: '$_', key: ".(defined $key ? $key :'none')."\n"; } @@ -276,6 +282,18 @@ my $line = 0; print STDERR "Annotating $keytxt, writing into $outfile\n"; open (TXT, $keytxt) or die ("Cannot open $keytxt\n"); open (WRITE, '>'.$outfile) or die ("Cannot open $outfile for writing\n"); + +if ($latex) { + print WRITE <<'EOF'; +\documentclass{article} +\usepackage[margin=2cm]{geometry} +\usepackage{alltt} +\usepackage{graphicx} +\begin{document} +\begin{alltt} +EOF +} + while () { $line++; $_ = myrecode($_, $fromcharset, $charset); @@ -295,24 +313,39 @@ while () { # print WRITE print_tag($key, $uid) . " $_"; # next; #} + print WRITE; + next; + } + + if ( m/^ *Key fingerprint/ ) { print WRITE; my $inc = ""; foreach my $mykey (@mykeys) { - foreach my $myuid (@{$myuids{$mykey}}) { + foreach my $myuid (@{$uids{$mykey}}) { $inc .= defined $sigs->{$mykey}->{$myuid}->{$key} ? $sigs->{$mykey}->{$myuid}->{$key} : ' '; } } print WRITE "[$inc] incoming signatures\n" if $inc =~ /\S/; + if ($refresh or $latex) { + foreach $uid (@{$uids{$key}}) { + print WRITE print_tag($key, $uid) . " $uid\n"; + if ($latex and ($uid eq "Photo ID")) { + print WRITE "\\begin{flushright}\n"; + print WRITE "\\includegraphics[height=3cm]{$key.eps}\n"; + print WRITE "\\end{flushright}\n"; + } + } + } next; } if ( m/^uid +(.*)$/ ) { $uid = $1; + next if $refresh or $latex; unless (defined $key) { warn "key is undefined - input text is possibly malformed near line $line\n"; next; }; - die "uid is undefined, key $key" unless defined $uid; die "bad tag from $key | $uid" unless defined (print_tag($key, $uid)); print WRITE print_tag($key, $uid) . " $_"; next; @@ -323,12 +356,12 @@ while () { print WRITE "Legend:\n"; my $num_myuids = 0; foreach my $i (0 .. @mykeys - 1) { - print WRITE '(' . ' 'x$i . 'S' . ' 'x(@mykeys-$i-1) . ") signed with $mykeys[$i] $myuids{$mykeys[$i]}->[0]\n"; - $num_myuids += @{$myuids{$mykeys[$i]}}; + print WRITE '(' . ' 'x$i . 'S' . ' 'x(@mykeys-$i-1) . ") signed with $mykeys[$i] $uids{$mykeys[$i]}->[0]\n"; + $num_myuids += @{$uids{$mykeys[$i]}}; } my $i = 0; foreach my $mykey (@mykeys) { - foreach my $myuid (@{$myuids{$mykey}}) { + foreach my $myuid (@{$uids{$mykey}}) { my $inc = defined $sigs->{$mykey}->{$myuid}->{$key} ? $sigs->{$mykey}->{$myuid}->{$key} : ' '; print WRITE "[" . ' 'x$i . 'S' . ' 'x($num_myuids-$i-1) . "] has signed $mykey $myuid\n"; $i++; @@ -336,6 +369,15 @@ foreach my $mykey (@mykeys) { } close TXT; +if ($latex) { + print WRITE <<'EOF'; +\end{alltt} +\end{document} +EOF +} + +close WRITE; + __END__ =head1 NAME -- 2.30.2 From 6c0d2d77f14ccb89d688a1d9b33e397aa30357f0 Mon Sep 17 00:00:00 2001 From: myon Date: Sun, 16 Sep 2007 21:31:41 +0000 Subject: [PATCH 08/16] * gpg-key2ps: Mention http://www.debian.org/events/materials/business-cards/ as an alternative. (Closes: #439510) git-svn-id: svn://svn.debian.org/pgp-tools/trunk@350 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 4 +++- gpg-key2ps/gpg-key2ps | 30 +++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 779bf0b..2fb62d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ signing-party (0.4.12-2) unreleased; urgency=low [ Christoph Berg ] * gpgsigs: Implement support for latex output and photo ids. (Closes: #430607) + * gpg-key2ps: Mention http://www.debian.org/events/materials/business-cards/ + as an alternative. (Closes: #439510) - -- Christoph Berg Mon, 10 Sep 2007 00:43:13 +0200 + -- Christoph Berg Sun, 16 Sep 2007 23:30:21 +0200 signing-party (0.4.12-1) unstable; urgency=low diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps index 2dfdc17..c47a53c 100755 --- a/gpg-key2ps/gpg-key2ps +++ b/gpg-key2ps/gpg-key2ps @@ -3,7 +3,7 @@ # gpg-key2ps: convert a PGP/GnuPG key into paper slips. # Copyright (C) 2001-2005 Simon Richter # Copyright (C) 2005-2007 Thijs Kinkhorst -# Copyright (C) 2005-2006 Christoph Berg +# Copyright (C) 2005-2007 Christoph Berg # Licenced under the GNU General Public License, # version 2 or later. # @@ -336,18 +336,34 @@ Print version and exit. =back - =head1 SEE ALSO -gpg(1) +=over + +=item gpg(1) + +GNU Privacy Guard. + +=item http://pgp-tools.alioth.debian.org/ + +The homepage of B and the other tools bundled in B. -http://pgp-tools.alioth.debian.org/ +=item http://www.debian.org/events/materials/business-cards/ + +B prints plain fingerprint slips. If you are looking for something +more stylish, look at these latex templates for business cards that also +include fingerprints. + +=back =head1 AUTHORS AND COPYRIGHT -(c) 2001 - 2005 Simon Richter +=over + +=item (c) 2001-2005 Simon Richter -(c) 2005 Thijs Kinkhorst +=item (c) 2005-2007 Thijs Kinkhorst -(c) 2005 Christoph Berg +=item (c) 2005-2007 Christoph Berg +=back -- 2.30.2 From f75fbf46942d6c4a00792f5a15fb2ed79023d86a Mon Sep 17 00:00:00 2001 From: myon Date: Sun, 16 Sep 2007 22:12:15 +0000 Subject: [PATCH 09/16] (Closes: #412433, #430607) git-svn-id: svn://svn.debian.org/pgp-tools/trunk@351 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 4 ++-- gpgsigs/gpgsigs | 26 ++++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2fb62d1..4fa9e2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,11 +2,11 @@ signing-party (0.4.12-2) unreleased; urgency=low [ Christoph Berg ] * gpgsigs: Implement support for latex output and photo ids. - (Closes: #430607) + (Closes: #412433, #430607) * gpg-key2ps: Mention http://www.debian.org/events/materials/business-cards/ as an alternative. (Closes: #439510) - -- Christoph Berg Sun, 16 Sep 2007 23:30:21 +0200 + -- Christoph Berg Mon, 17 Sep 2007 00:10:45 +0200 signing-party (0.4.12-1) unstable; urgency=low diff --git a/gpgsigs/gpgsigs b/gpgsigs/gpgsigs index af1a379..49c6e3a 100755 --- a/gpgsigs/gpgsigs +++ b/gpgsigs/gpgsigs @@ -150,7 +150,7 @@ print STDERR "Running --list-sigs, this will take a while "; open SIGS, "gpg --fixed-list-mode --with-colons --list-sigs @mykeys @keys 2>/dev/null |" or die "can't get gpg listing"; -my ($key, $uid, $sigs, $uidstatus); +my ($key, $uid, $sigs); while () { if ( m/^pub:(?:.*?:){3,3}([0-9A-F]{16,16}):/ ) { $key = $1; @@ -158,24 +158,26 @@ while () { next; } if ( m/^uid:(.):(?:.*?:){7,7}(.*):/s ) { - $uidstatus = $1; + my $uidstatus = $1; $uid = $2; $uid =~ s/\\x([0-9a-f][0-9a-f])/ chr(hex($1)) /gie; $uid = myrecode($uid, "UTF-8", $charset); my ($shortkey) = substr $key, -8; # Remember non-revoked uids - if ($uidstatus ne "r") { - push @{$uids{$shortkey}}, $uid; - } - + next if $uidstatus eq "r"; + push @{$uids{$shortkey}}, $uid; next; } - if ( m/^uat:(.):/ ) { # uat:-::::2006-08-03::27BAEAF742BD253C2F3F03B043DC1536880193C4::1 7993: - $uidstatus = $1; - next if $uidstatus ne "-"; - system "gpg --photo-viewer 'convert - %k.eps' --list-options show-photos --list-key $key"; - $uid = "Photo ID"; + if ( m/^uat:(.)::::[^:]+::([0-9A-F]+)::\d+ (\d+)/ ) { # uat:-::::2006-08-03::27BAEAF742BD253C2F3F03B043DC1536880193C4::1 7993: + my $uidstatus = $1; + # $2 is hash of attribute data + my $size = $3 - 19; # FIXME: find a nicer way to find out picture size + $uid = "[jpeg image of size $size]"; + next if $uidstatus eq "r"; + if ($latex) { + system "gpg --photo-viewer 'convert - %k.eps' --list-options show-photos --list-key $key > /dev/null"; + } my ($shortkey) = substr $key, -8; push @{$uids{$shortkey}}, $uid; next; @@ -329,7 +331,7 @@ while () { if ($refresh or $latex) { foreach $uid (@{$uids{$key}}) { print WRITE print_tag($key, $uid) . " $uid\n"; - if ($latex and ($uid eq "Photo ID")) { + if ($latex and ($uid =~ /^\[jpeg image/)) { print WRITE "\\begin{flushright}\n"; print WRITE "\\includegraphics[height=3cm]{$key.eps}\n"; print WRITE "\\end{flushright}\n"; -- 2.30.2 From c8a116b9d4187dd8a2ac248d8f738bc49d62aabc Mon Sep 17 00:00:00 2001 From: thijs Date: Fri, 21 Sep 2007 14:56:26 +0000 Subject: [PATCH 10/16] move homepage to control field git-svn-id: svn://svn.debian.org/pgp-tools/trunk@352 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 7 +++++-- debian/control | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4fa9e2a..d0b8b6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,15 @@ signing-party (0.4.12-2) unreleased; urgency=low [ Christoph Berg ] - * gpgsigs: Implement support for latex output and photo ids. + * gpgsigs: Implement support for LaTeX output and photo ids. (Closes: #412433, #430607) * gpg-key2ps: Mention http://www.debian.org/events/materials/business-cards/ as an alternative. (Closes: #439510) - -- Christoph Berg Mon, 17 Sep 2007 00:10:45 +0200 + [ Thijs Kinkhorst ] + * Move Homepage to control field. + + -- Thijs Kinkhorst Fri, 21 Sep 2007 16:55:24 +0200 signing-party (0.4.12-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 5aedf6d..3ab1bc0 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Thijs Kinkhorst Uploaders: Simon Richter , Peter Palfrader , Christoph Berg Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 +Homepage: http://pgp-tools.alioth.debian.org/ XS-Vcs-Svn: svn://svn.debian.org/svn/pgp-tools XS-Vcs-Browser: http://svn.debian.org/wsvn/pgp-tools @@ -26,6 +27,4 @@ Description: Various OpenPGP related tools * gpglist: show who signed which of your UIDs * gpgsigs: annotates list of GnuPG keys with already done signatures * keylookup: ncurses wrapper around gpg --search - . - Homepage: http://pgp-tools.alioth.debian.org/ -- 2.30.2 From b6f3799ed2d896195b4d67868c0f2ba6b2b1a827 Mon Sep 17 00:00:00 2001 From: myon Date: Sun, 23 Sep 2007 10:21:52 +0000 Subject: [PATCH 11/16] Document --latex and --refresh git-svn-id: svn://svn.debian.org/pgp-tools/trunk@353 b513b33f-fedd-0310-b452-c3deb5f4c849 --- gpgsigs/gpgsigs | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gpgsigs/gpgsigs b/gpgsigs/gpgsigs index 49c6e3a..2c4da42 100755 --- a/gpgsigs/gpgsigs +++ b/gpgsigs/gpgsigs @@ -54,6 +54,8 @@ separate multiple keyids with ',' -r call gpg --recv-keys before proceeding -f convert from charset -t convert UIDs to charset in output +--refresh regenerate UID lists on keys +--latex generate LaTeX output including photo IDs EOF exit $error; } @@ -388,7 +390,7 @@ B - annotate list of GnuPG keys with already done signatures =head1 SYNOPSIS -B [-r] [-f I] [-t I] II<[>B<,>IB<,>I<...>I<]>>I<]> F [F] +B [I] II<[>B<,>IB<,>I<...>I<]>>I<]> F [F] =head1 DESCRIPTION @@ -402,19 +404,28 @@ and placeholders (C<__ __>), the checksum is inserted. =over -=item -r +=item B<-r> Call I before creating the output. -=item -f I +=item B<-f> I Convert F from I. The default is ISO-8859-1. -=item -t I +=item B<-t> I Convert UIDs to I. The default is derived from LC_ALL, LC_CTYPE, and LANG, and if all these are unset, the default is ISO-8859-1. +=item B<--refresh> + +Refresh the UID lists per key from gpg. Useful when UIDs were added or revoked +since the input text was generated. + +=item B<--latex> + +Generate LaTeX output, including photo IDs. Implies B<--refresh>. + =item I Use this keyid (8 or 16 byte) for annotation. Multiple keyids can be separated -- 2.30.2 From ba8cd91da815eb6da308b8bd70abb47d587dbea7 Mon Sep 17 00:00:00 2001 From: myon Date: Sun, 18 Nov 2007 20:18:52 +0000 Subject: [PATCH 12/16] releasing version 0.4.13-1 git-svn-id: svn://svn.debian.org/pgp-tools/trunk@354 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d0b8b6b..54d8bf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -signing-party (0.4.12-2) unreleased; urgency=low +signing-party (0.4.13-1) unstable; urgency=low [ Christoph Berg ] * gpgsigs: Implement support for LaTeX output and photo ids. @@ -9,7 +9,7 @@ signing-party (0.4.12-2) unreleased; urgency=low [ Thijs Kinkhorst ] * Move Homepage to control field. - -- Thijs Kinkhorst Fri, 21 Sep 2007 16:55:24 +0200 + -- Christoph Berg Sun, 18 Nov 2007 21:02:49 +0100 signing-party (0.4.12-1) unstable; urgency=low -- 2.30.2 From 47e7ded9faa7731b33ac167e2d27ac683754ad25 Mon Sep 17 00:00:00 2001 From: thijs Date: Sat, 1 Dec 2007 16:31:10 +0000 Subject: [PATCH 13/16] - suggest imagemagick, which can be used by gpgsigs; - use the most modern vcs-* fields form git-svn-id: svn://svn.debian.org/pgp-tools/trunk@359 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/control | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 3ab1bc0..5b6382a 100644 --- a/debian/control +++ b/debian/control @@ -6,13 +6,14 @@ Uploaders: Simon Richter , Peter Palfrader , Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 Homepage: http://pgp-tools.alioth.debian.org/ -XS-Vcs-Svn: svn://svn.debian.org/svn/pgp-tools -XS-Vcs-Browser: http://svn.debian.org/wsvn/pgp-tools +Vcs-Svn: svn://svn.debian.org/svn/pgp-tools +Vcs-Browser: http://svn.debian.org/wsvn/pgp-tools Package: signing-party Architecture: all Depends: gnupg, libgnupg-interface-perl, libtext-template-perl, libmime-perl, libmailtools-perl Recommends: exim4 | mail-transport-agent, libtext-iconv-perl | libintl-perl | recode, dialog | whiptail, libpaper-utils +Suggests: imagemagick | graphicsmagick-imagemagick-compat Replaces: keylookup (<< 3.0) Conflicts: keylookup (<< 3.0) Description: Various OpenPGP related tools -- 2.30.2 From ea10691e5eeac47a6ab0eb307128569287e202ba Mon Sep 17 00:00:00 2001 From: thijs Date: Mon, 31 Dec 2007 00:41:42 +0000 Subject: [PATCH 14/16] checked for policy 3.7.3, no changes git-svn-id: svn://svn.debian.org/pgp-tools/trunk@360 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 5b6382a..d643008 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Thijs Kinkhorst Uploaders: Simon Richter , Peter Palfrader , Christoph Berg Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Homepage: http://pgp-tools.alioth.debian.org/ Vcs-Svn: svn://svn.debian.org/svn/pgp-tools Vcs-Browser: http://svn.debian.org/wsvn/pgp-tools -- 2.30.2 From 3b453c959839c5a728a4a503524b232da4c86b33 Mon Sep 17 00:00:00 2001 From: myon Date: Mon, 18 Feb 2008 20:10:40 +0000 Subject: [PATCH 15/16] * gpglist: Do not barf on revokers (rvk). Thanks to Faidon Liambotis for spotting. git-svn-id: svn://svn.debian.org/pgp-tools/trunk@361 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 7 +++++++ gpglist/gpglist | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 54d8bf5..fbfd512 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +signing-party (0.4.13-2) unreleased/unstable; urgency=low + + * gpglist: Do not barf on revokers (rvk). Thanks to Faidon Liambotis for + spotting. + + -- Christoph Berg Mon, 18 Feb 2008 21:07:42 +0100 + signing-party (0.4.13-1) unstable; urgency=low [ Christoph Berg ] diff --git a/gpglist/gpglist b/gpglist/gpglist index f6cefe8..6393a82 100755 --- a/gpglist/gpglist +++ b/gpglist/gpglist @@ -120,7 +120,7 @@ while () { next; } last if ( m/^(sub):/ ); - next if ( m/^(fpr|tru):/ ); + next if ( m/^(fpr|tru|rvk):/ ); print STDERR "hi, i'm a bug. please report me to my owner\n"; die "input: $_, key: $key"; } -- 2.30.2 From 6ecb7df37a68f2c98b4f03adc6393ce0f6b22727 Mon Sep 17 00:00:00 2001 From: thijs Date: Wed, 27 Feb 2008 10:24:38 +0000 Subject: [PATCH 16/16] * keylookup: cope with 16 or 40 nibble keyids, thanks Philippe Teuwen (Closes: #466716). git-svn-id: svn://svn.debian.org/pgp-tools/trunk@362 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 9 +++++++-- keylookup/keylookup | 5 +++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index fbfd512..1f30d02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ -signing-party (0.4.13-2) unreleased/unstable; urgency=low +signing-party (0.4.13-2) unreleased; urgency=low + [ Christoph Berg ] * gpglist: Do not barf on revokers (rvk). Thanks to Faidon Liambotis for spotting. - -- Christoph Berg Mon, 18 Feb 2008 21:07:42 +0100 + [ Thijs Kinkhorst ] + * keylookup: cope with 16 or 40 nibble keyids, thanks Philippe Teuwen + (Closes: #466716). + + -- Thijs Kinkhorst Wed, 27 Feb 2008 11:23:33 +0100 signing-party (0.4.13-1) unstable; urgency=low diff --git a/keylookup/keylookup b/keylookup/keylookup index a8754d3..a69f888 100755 --- a/keylookup/keylookup +++ b/keylookup/keylookup @@ -210,7 +210,8 @@ sub callDialog { my %unique; my @keys = grep { !$unique{$_}++ } - grep { /^[0-9A-Fa-f]{8}$/ } + # get the keyID; can be 8, 16 or 40 nibbles + grep { /^((([a-zA-Z0-9]{24})?[a-zA-Z0-9]{8})?[a-zA-Z0-9]{8})$/ } map { s/\s//g; $_ } ; wait; @@ -296,7 +297,7 @@ sub importKeys { push @args, '--recv-keys'; for my $keyid (@$keyids) { # untaint keyids - my ($cleanid) = $keyid =~ /^([a-zA-Z0-9]{8})$/; + my ($cleanid) = $keyid =~ /^((([a-zA-Z0-9]{24})?[a-zA-Z0-9]{8})?[a-zA-Z0-9]{8})$/; warn ("keyid '$keyid' has unexpected format - skipping\n"), next unless defined $cleanid; push @args, $cleanid; -- 2.30.2