Hello community,
here is the log from the commit of package signing-party for openSUSE:Factory checked in at 2012-03-23 12:10:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/signing-party (Old)
and /work/SRC/openSUSE:Factory/.signing-party.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "signing-party", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/signing-party/signing-party.changes 2011-10-13 00:02:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.signing-party.new/signing-party.changes 2012-03-23 12:11:00.000000000 +0100
@@ -1,0 +2,37 @@
+Thu Mar 22 14:42:18 UTC 2012 - cfarrell@suse.com
+
+- license update: GPL-2.0+
+ Various Open Source Licenses is not acceptable as a spec file license.
+ For this package, GPL-2.0+ seems to be the most accurate license choice
+
+-------------------------------------------------------------------
+Wed Mar 14 16:56:24 UTC 2012 - joop.boonen@opensuse.org
+
+- Build version 1.1.4
+ * gpg-key2ps:
+ + Apply patch from Uwe Kleine-König to deal with latin1 characters
+ * gpg-mailkeys:
+ + Correct path of ~/.gpg-mailkeysrc and ~/.signature in manpage.
+ + Add new environment variable SENDMAIL_ARGS to allow user to pass
+ arguments to sendmail
+ * caff:
+ + Correct path of ~/.caffrc in informational messages
+ + Be more verbose on unexpected key ID
+ + Refactor import of own key and import for keys to sign from keyrings.
+ + Also automatically import keys to sign from the user's normal gpg
+ keyrings.
+ + Use --no-auto-check-trustdb when importing keys from files or
+ the user's normal gpg keyrings
+ + manpage: Refer to all of /usr/share/doc/signing-party/caff/ and not
+ just to /usr/share/doc/signing-party/caff/caffrc.sample
+ + Fix horrible &function calls used because of broken prototypes.
+ + Even if all keys to sign were found in the user's normal gpg
+ keyrings we still need to import them (again) from any keyrings
+ passed with --key-files - the keys there might be newer, containing
+ new subkeys (for encryption), uids (for signing) or revocations.
+ + Make importing of keys to be signed from the normal gpg optional
+ (--keys-from-gnupg).
+ + refactor copying of command line options into global config variable.
+ + Create the mail files in ~/.caff/keys even if mail is not sent
+
+-------------------------------------------------------------------
Old:
----
signing-party_1.1.3.orig.tar.gz
New:
----
signing-party_1.1.4.orig.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ signing-party.spec ++++++
--- /var/tmp/diff_new_pack.4mBI5p/_old 2012-03-23 12:11:01.000000000 +0100
+++ /var/tmp/diff_new_pack.4mBI5p/_new 2012-03-23 12:11:01.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package signing-party
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,14 +16,15 @@
#
-
Name: signing-party
-License: Various Open Source Licenses
-Group: Productivity/Security
+Version: 1.1.4
+Release: 0
Summary: GPG Tools
-Version: 1.1.3
-Release: 1
+License: GPL-2.0+
+Group: Productivity/Security
+Url: http://packages.debian.org/sid/signing-party
Source: http://ftp.debian.org/debian/pool/main/s/signing-party/signing-party_%{version}.orig.tar.gz
+# PATCH-FIX-OPENSUSE caff-manpage.patch [bnc#722626]
Patch1: caff-manpage.patch
Requires: /usr/sbin/sendmail
Requires: gpg
++++++ caff-manpage.patch ++++++
--- /var/tmp/diff_new_pack.4mBI5p/_old 2012-03-23 12:11:01.000000000 +0100
+++ /var/tmp/diff_new_pack.4mBI5p/_new 2012-03-23 12:11:01.000000000 +0100
@@ -1,13 +1,12 @@
-Index: signing-party-1.1.3/caff/caff
-===================================================================
---- signing-party-1.1.3.orig/caff/caff
-+++ signing-party-1.1.3/caff/caff
-@@ -305,7 +305,7 @@ http://pgp-tools.alioth.debian.org/
+diff -Naur signing-party-1.1.4.orig/caff/caff signing-party-1.1.4/caff/caff
+--- signing-party-1.1.4.orig/caff/caff 2011-11-01 20:01:39.000000000 +0100
++++ signing-party-1.1.4/caff/caff 2012-03-14 18:06:02.000000000 +0100
+@@ -309,7 +309,7 @@
=head1 SEE ALSO
--gpg(1), pgp-clean(1), /usr/share/doc/signing-party/caff/caffrc.sample.
-+gpg(1), pgp-clean(1), /usr/share/doc/signing-party/caffrc.sample.
+-gpg(1), pgp-clean(1), /usr/share/doc/signing-party/caff/
++gpg(1), pgp-clean(1), /usr/share/doc/signing-party/
=cut
++++++ signing-party_1.1.3.orig.tar.gz -> signing-party_1.1.4.orig.tar.gz ++++++
++++ 1768 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/signing-party-1.1.3/caff/caff new/signing-party-1.1.4/caff/caff
--- old/signing-party-1.1.3/caff/caff 2010-02-11 19:26:29.000000000 +0100
+++ new/signing-party-1.1.4/caff/caff 2011-11-01 20:01:39.000000000 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
# caff -- CA - Fire and Forget
-# $Id: caff 452 2010-01-24 19:13:35Z franck $
+# $Id: caff 484 2011-11-01 18:54:31Z thijs $
#
# Copyright (c) 2004, 2005, 2006 Peter Palfrader
# Copyright (c) 2005, 2006 Christoph Berg
@@ -90,6 +90,10 @@
Import keys from file. Can be supplied more than once.
+=item B<--keys-from-gnupg> I<file>
+
+Try to import keys from your standard GnuPG keyrings.
+
=back
=head1 FILES
@@ -305,7 +309,7 @@
=head1 SEE ALSO
-gpg(1), pgp-clean(1), /usr/share/doc/signing-party/caff/caffrc.sample.
+gpg(1), pgp-clean(1), /usr/share/doc/signing-party/caff/
=cut
@@ -323,10 +327,14 @@
use GnuPG::Interface;
my %CONFIG;
-my $REVISION = '$Rev: 452 $';
+my $REVISION = '$Rev: 484 $';
my ($REVISION_NUMER) = $REVISION =~ /(\d+)/;
+$REVISION_NUMER = 'unknown' unless defined $REVISION_NUMER;
my $VERSION = "0.0.0.$REVISION_NUMER";
+# Global variables
+my @KEYIDS;
+my $params;
##
# Display an error message on STDERR and then exit.
@@ -367,7 +375,7 @@
sub generate_config() {
- notice("Error: \$LOGNAME is not set.\n") unless defined $ENV{'LOGNAME'};
+ notice("Error: \$LOGNAME is not set.") unless defined $ENV{'LOGNAME'};
my $gecos = defined $ENV{'LOGNAME'} ? (getpwnam($ENV{LOGNAME}))[6] : undef;
my $email;
my @keys;
@@ -748,13 +756,13 @@
######
-# Send an email to $address. If $can_encrypt is true then the mail
+# Create an email to $address. If $can_encrypt is true then the mail
# will be PGP/MIME encrypted to $longkeyid.
#
# $longkeyid, $uid, and @attached will be used in the email and the template.
######
-#send_mail($address, $can_encrypt, $longkeyid, $uid, @attached);
-sub send_mail($$$@) {
+# create_mail($address, $can_encrypt, $longkeyid, $uid, @attached);
+sub create_mail($$$@) {
my ($address, $can_encrypt, $key_id, @keys) = @_;
my $template = Text::Template->new(TYPE => 'STRING', SOURCE => $CONFIG{'mail-template'})
@@ -847,9 +855,21 @@
$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);
- mywarn("You have set arguments to pass to Mail::Mailer. Better fix your MTA. (Also, Mail::Mailer's error reporting is non existant, so it won't tell you when it doesn't work.)") if (scalar @{$CONFIG{'mailer-send'}} > 0);
+ return $message_entity;
+};
+
+######
+# send a mail message (MIME::Entity)
+######
+my $warned_about_broken_mailer_send = 0;
+sub send_message($) {
+ my ($message_entity) = @_;
+
+ if ( (scalar @{$CONFIG{'mailer-send'}} > 0) && !$warned_about_broken_mailer_send) {
+ mywarn("You have set arguments to pass to Mail::Mailer. Better fix your MTA. (Also, Mail::Mailer's error reporting is non existant, so it won't tell you when it doesn't work.)");
+ $warned_about_broken_mailer_send = 1;
+ };
$message_entity->send(@{$CONFIG{'mailer-send'}});
- $message_entity->stringify();
};
######
@@ -907,15 +927,13 @@
# Check the local user keys.
#
# This function checks if the keyids defined through the --local-user
-# command line option or set in .caffrc are valid and known to be one of the
-# keyids listed in ./caffrc. The last check ensure we have those keyids
-# available in the caff's gnupghome directory.
+# command line option or set in ~/.caffrc are valid and known to be one of the
+# keyids listed in ~/.caffrc.
#
# @return an array containing the local user keys\n
-# (undef) if no key has been specified
+# (undef) if no valid key has been found
#
-sub get_local_user_keys()
-{
+sub get_local_user_keys() {
my @local_user = ();
my @key_list;
@@ -945,7 +963,7 @@
}
unless (grep (/$user_key$/, @{$CONFIG{'keyid'}})) {
- mywarn "Local-user $user_key is not defined as one of your keyid in ./caffrc (it will not be used).";
+ mywarn "Local-user $user_key is not defined as one of your keyid in ~/.caffrc (it will not be used).";
next;
}
@@ -954,40 +972,130 @@
# If no local-user key are valid, there is no need to go further
unless (defined $local_user[0]) {
- myerror (1, "None of the local-user keys seem to be known as a keyid listed in ./caffrc.");
+ myerror (1, "None of the local-user keys seem to be known as a keyid listed in ~/.caffrc.");
}
return @local_user;
}
+##
+# Import a key from the user gnupghome into a specified gnupghome.
+#
+# @param asciikey ascii format of the gpg key to import
+# @param dst_gnupghome gnupghome directory where to import the key
+#
+# @return 0 if successful\n
+# 1 if the key could not be exported.\n
+# 2 if the key could not be imported.
+#
+sub import_key_from_user_gnupghome($$) {
+ my $err;
+ my ($asciikey, $dst_gpghome) = @_;
+
+ trace("Exporting key $asciikey from your normal GnuPGHOME.");
+ my $key = export_key(undef, $asciikey);
+ if (defined $key && $key ne '') {
+ trace("Importing key $asciikey into $GNUPGHOME.");
+ if (import_key($GNUPGHOME, $key)) {
+ $err = 0;
+ } else {
+ warn("Could not import $asciikey into caff's gnupghome.");
+ $err = 2;
+ }
+ } else {
+ $err = 1;
+ }
+
+ return $err;
+}
+
+##
+# Import a key file into a specified gnupghome.
+#
+# @param keyfile file containing the keys to import
+# @param dst_gnupghome gnupghome directory where to import the key
+#
+# @return 0 if successful\n
+# 1 if an error occured.
+#
+sub import_key_files($$) {
+ my $err;
+ my ($keyfile, $dst_gpghome) = @_;
+
+ my $gpg = GnuPG::Interface->new();
+ $gpg->call( $CONFIG{'gpg'} );
+ $gpg->options->hash_init(
+ 'homedir' => $dst_gpghome,
+ 'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always } ] );
+ $gpg->options->meta_interactive( 0 );
+ my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
+ my $pid = $gpg->import_keys(handles => $handles, command_args => $keyfile);
+ my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd);
+ info("Importing keys from file $keyfile");
+ waitpid $pid, 0;
+
+ if ($status !~ /^\[GNUPG:\] IMPORT_OK/m) {
+ warn $stderr;
+ $err = 1;
+ } else {
+ $err = 0;
+ }
+
+ return $err;
+}
+
+##
+# Import keys to be signed into caff gnupghome directory.
+#
+# This function imports the keys the user wants to sign into the caff gnupghome
+# directory. We looks for the keys in the the user gnupghome directory first,
+# and in the key files specified by the user if not all of the keys have been
+# found.
+#
+sub import_keys_to_sign() {
+ # Check if we can find the gpg key from our normal gnupghome, and then
+ # try to import it into our working gnupghome directory
+ if ($CONFIG{'keys-from-gnupg'}) {
+ foreach my $keyid (@KEYIDS) {
+ if (!import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
+ info("Key $keyid imported from your normal GnuPGHOME.");
+ }
+ }
+ };
+
+ # Import user specified key files
+ foreach my $keyfile (@{$CONFIG{'key-files'}}) {
+ import_key_files($keyfile, $GNUPGHOME);
+ }
+
+ return 0;
+}
###################
# argument handling
###################
-my @KEYIDS;
-my $params;
-
Getopt::Long::config('bundling');
if (!GetOptions (
- '-h' => \$params->{'help'},
- '--help' => \$params->{'help'},
- '--version' => \$params->{'version'},
- '-V' => \$params->{'version'},
- '-u=s' => \$params->{'local-user'},
- '--local-user=s' => \$params->{'local-user'},
- '-e' => \$params->{'export-old'},
- '--export-old' => \$params->{'export-old'},
- '-E' => \$params->{'no-export-old'},
- '--no-export-old' => \$params->{'no-export-old'},
+ '-h' => \$params->{'help'},
+ '--help' => \$params->{'help'},
+ '--version' => \$params->{'version'},
+ '-V' => \$params->{'version'},
+ '-u=s' => \$params->{'local-user'},
+ '--local-user=s' => \$params->{'local-user'},
+ '-e' => \$params->{'export-old'},
+ '--export-old' => \$params->{'export-old'},
+ '-E' => \$params->{'no-export-old'},
+ '--no-export-old' => \$params->{'no-export-old'},
'-m:s' => \$params->{'mail'},
'--mail:s' => \$params->{'mail'},
- '-M' => \$params->{'no-mail'},
- '--no-mail' => \$params->{'no-mail'},
- '-R' => \$params->{'no-download'},
- '--no-download' => \$params->{'no-download'},
- '-S' => \$params->{'no-sign'},
- '--no-sign' => \$params->{'no-sign'},
- '--key-file=s@' => \$params->{'key-files'},
+ '-M' => \$params->{'no-mail'},
+ '--no-mail' => \$params->{'no-mail'},
+ '-R' => \$params->{'no-download'},
+ '--no-download' => \$params->{'no-download'},
+ '-S' => \$params->{'no-sign'},
+ '--no-sign' => \$params->{'no-sign'},
+ '--key-file=s@' => \$params->{'key-files'},
+ '--keys-from-gnupg' => \$params->{'keys-from-gnupg'},
)) {
usage(\*STDERR, 1);
};
@@ -1000,13 +1108,9 @@
};
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'};
-
-$CONFIG{'no-mail'} = $params->{'no-mail'} if defined $params->{'no-mail'};
-$CONFIG{'mail'} = $params->{'mail'} if defined $params->{'mail'};
-
+for my $hashkey (qw{local-user no-download no-sign no-mail mail keys-from-gnupg}) {
+ $CONFIG{$hashkey} = $params->{$hashkey} if defined $params->{$hashkey};
+};
# If old 'no-mail' parameter, or if the 'mail' parameter is set to 'no'
if ( defined $CONFIG{'no-mail'} ||
( defined $CONFIG{'mail'} && $CONFIG{'mail'} eq 'no' ) ) {
@@ -1036,36 +1140,13 @@
# import own keys
#################
for my $keyid (@{$CONFIG{'keyid'}}) {
- info("Importing key $keyid from your normal GnuPGHome.");
- my $key = export_key(undef, $keyid);
- if (!defined $key || $key eq '') {
- warn ("Did not get key $keyid from your normal GnuPGHome\n");
- next;
- };
- my $result = import_key($GNUPGHOME, $key);
- unless ($result) {
- warn ("Could not import $keyid into caff's gnupghome.\n");
- next;
- };
+ info("Importing key $keyid from your normal GnuPGHome.");
+ if (import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
+ mywarn("Key $keyid not found.");
+ }
}
-########################
-# import keys from files
-########################
-foreach my $keyfile (@{$CONFIG{'key-files'}}) {
- my $gpg = GnuPG::Interface->new();
- $gpg->call( $CONFIG{'gpg'} );
- $gpg->options->hash_init('homedir' => $GNUPGHOME);
- $gpg->options->meta_interactive( 0 );
- my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
- my $pid = $gpg->import_keys(handles => $handles, command_args => $keyfile);
- my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd);
- info ("Importing keys from $keyfile");
- waitpid $pid, 0;
- if ($status !~ /^\[GNUPG:\] IMPORT_OK/m) {
- warn $stderr;
- }
-}
+&import_keys_to_sign();
#############################
# receive keys from keyserver
@@ -1104,7 +1185,7 @@
$speced_key = $spec if $local_keyids{$spec};
};
unless ($speced_key) {
- notice ("Imported unexpected key; got: $imported_key\n");
+ notice ("Imported unexpected key; got: $imported_key\nAre you trying to work on a subkey?");
next;
};
debug ("Imported $imported_key for $speced_key");
@@ -1143,9 +1224,8 @@
$CONFIG{'no-sign'} = ! ask("Continue with signing?", 1);
}
-unless ($CONFIG{'no-sign'})
-{
- my @local_user = &get_local_user_keys();
+unless ($CONFIG{'no-sign'}) {
+ my @local_user = get_local_user_keys();
info("Sign the following keys according to your policy, then exit gpg with 'save' after signing each key");
for my $keyid (@keyids_ok) {
@@ -1383,17 +1463,18 @@
if (!$uid->{'is_uat'} && ($uid->{'text'} =~ /@/)) {
my $address = $uid->{'text'};
$address =~ s/.*<(.*)>.*/$1/;
- 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";
- my $mailfile = "$keydir/$longkeyid.mail.".$uid->{'serial'}.".".sanitize_uid($uid->{'text'});
- open (KEY, ">$mailfile") or die ("Cannot open $mailfile: $!\n");
- print KEY $mail;
- close KEY;
- } else {
- warn "Generating mail failed.\n";
- };
+ my $mail = create_mail($address, $can_encrypt, $longkeyid, $uid, @attached);
+ if (defined $mail) {
+ my $should_send_mail = ask("Mail signature for $uid->{'text'} to '$address'?", $CONFIG{'mail'} ne 'ask-no', $CONFIG{'mail'} eq 'yes');
+ send_message($mail) if $should_send_mail;
+
+ my $keydir = "$KEYSBASE/$DATE_STRING";
+ my $mailfile = "$keydir/$longkeyid.mail.".($should_send_mail ? '' : 'unsent.').$uid->{'serial'}.".".sanitize_uid($uid->{'text'});
+ open (MAILFILE, ">$mailfile") or die ("Cannot open $mailfile: $!\n");
+ print MAILFILE $mail->stringify();
+ close MAILFILE;
+ } else {
+ warn "Generating mail failed.\n";
};
};
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/signing-party-1.1.3/gpg-key2ps/gpg-key2ps new/signing-party-1.1.4/gpg-key2ps/gpg-key2ps
--- old/signing-party-1.1.3/gpg-key2ps/gpg-key2ps 2010-02-11 19:26:29.000000000 +0100
+++ new/signing-party-1.1.4/gpg-key2ps/gpg-key2ps 2011-11-03 22:02:46.000000000 +0100
@@ -7,12 +7,12 @@
# Licenced under the GNU General Public License,
# version 2 or later.
#
-# $Id: gpg-key2ps 421 2009-03-10 16:19:07Z myon $
+# $Id: gpg-key2ps 489 2011-11-02 17:18:35Z thijs $
use strict;
use Getopt::Long;
-my $version = '$Rev: 421 $';
+my $version = '$Rev: 489 $';
$version =~ s/\$Rev:\s*(\d+)\s*\$/$1/;
my $showsubkeys = 0;
my $revokestyle = "hide";
@@ -121,7 +121,21 @@
/w $w def
/h $h def
-/Times-Roman findfont 9 scalefont setfont
+/reencode {
+ exch findfont
+ dup length dict
+ begin {
+ 1 index /FID eq
+ { pop pop }
+ { def } ifelse
+ } forall
+ /Encoding ISOLatin1Encoding def
+ currentdict
+ end
+ definefont
+} bind def
+
+/Times-Roman /trlatin1 reencode 9 scalefont setfont
/newline {
/y y 10 sub def
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/signing-party-1.1.3/gpg-mailkeys/example.gpg-mailkeysrc new/signing-party-1.1.4/gpg-mailkeys/example.gpg-mailkeysrc
--- old/signing-party-1.1.3/gpg-mailkeys/example.gpg-mailkeysrc 2010-02-11 19:26:30.000000000 +0100
+++ new/signing-party-1.1.4/gpg-mailkeys/example.gpg-mailkeysrc 2011-11-01 20:01:40.000000000 +0100
@@ -15,3 +15,10 @@
See you!
"
+
+# You can add here whatever arguments you want to pass to sendmail.
+# For example, if you use ssmtp, you may want to set your credentials this way
+# SENDMAIL_ARGS="-au myusername -aps3cr3t"
+# to authenticate to the smtp server with username myusername and password
+# s3cr3t.
+SENDMAIL_ARGS=""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/signing-party-1.1.3/gpg-mailkeys/gpg-mailkeys new/signing-party-1.1.4/gpg-mailkeys/gpg-mailkeys
--- old/signing-party-1.1.3/gpg-mailkeys/gpg-mailkeys 2010-02-11 19:26:30.000000000 +0100
+++ new/signing-party-1.1.4/gpg-mailkeys/gpg-mailkeys 2011-11-01 20:01:40.000000000 +0100
@@ -2,11 +2,11 @@
#
# gpg-mailkeys: mail out just signed keys to their owners
#
-# $Id: gpg-mailkeys 444 2009-09-10 22:19:28Z thialme-guest $
+# $Id: gpg-mailkeys 481 2010-11-23 20:57:58Z franck $
set -e
-VERSION='$Rev: 444 $'
+VERSION='$Rev: 481 $'
# Define the charset used in the text message of the mail
LOCAL_CHARSET=""
@@ -61,6 +61,9 @@
Enjoy,
$NAME"
fi
+if [ -z "$SENDMAIL_ARGS" ]; then
+ SENDMAIL_ARGS=""
+fi
get_local_charset
@@ -120,7 +123,7 @@
--$BOUNDARY--
EOM
printf " sending"
- /usr/sbin/sendmail -ti <$TEMPFILE
+ /usr/sbin/sendmail $SENDMAIL_ARGS -ti <$TEMPFILE
rm $TEMPFILE
printf " done.\n"
shift 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/signing-party-1.1.3/gpg-mailkeys/gpg-mailkeys.1 new/signing-party-1.1.4/gpg-mailkeys/gpg-mailkeys.1
--- old/signing-party-1.1.3/gpg-mailkeys/gpg-mailkeys.1 2010-02-11 19:26:30.000000000 +0100
+++ new/signing-party-1.1.4/gpg-mailkeys/gpg-mailkeys.1 2011-11-01 20:01:40.000000000 +0100
@@ -1,5 +1,5 @@
.\"
-.TH GPG-MAILKEYS 1 "September 11, 2009"
+.TH GPG-MAILKEYS 1 "Nov 23, 2010"
.SH NAME
.B gpg\-mailkeys
\- sends emails containing keys to their owners
@@ -31,6 +31,11 @@
.TP 13
.I TEXT
Set the body text of the messages
+.TP 13
+.I SENDMAIL_ARGS
+Set arguments to pass to /usr/sbin/sendmail. This can be useful to set
+credentials in order to authenticate to an smtp server when using ssmtp
+for example.
.SH FILES
The behavior of
@@ -38,10 +43,10 @@
can be updated through some files available in the user home directory.
Thus,
-.B .gpg-mailkeysrc
+.B ~/.gpg-mailkeysrc
allows the user to overwrite the default value for the above environment
variables, and any text in
-.B .signature
+.B ~/.signature
will be appended to the end of the body text of the message.
.SH SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/signing-party-1.1.3/gpgsigs/gpgsigs new/signing-party-1.1.4/gpgsigs/gpgsigs
--- old/signing-party-1.1.3/gpgsigs/gpgsigs 2010-02-11 19:26:29.000000000 +0100
+++ new/signing-party-1.1.4/gpgsigs/gpgsigs 2011-11-01 20:01:39.000000000 +0100
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: gpgsigs 440 2009-08-30 16:56:26Z thialme-guest $
+# $Id: gpgsigs 482 2011-08-19 10:02:51Z tokkee $
# See the pod documentation at the end of this file for author,
# copyright, and licence information.
@@ -19,7 +19,7 @@
# * pod documentation
# see the Debian changelog for further changes.
-my $VERSION = qq$Rev: 440 $;
+my $VERSION = qq$Rev: 482 $;
$ENV{PATH} .= ":/usr/share/signing-party";
use strict;
@@ -297,6 +297,7 @@
$key = undef;
$uid = undef;
my $line = 0;
+my $keys = 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");
@@ -328,6 +329,19 @@
if (/^RIPEMD160 Checksum:/ && defined $RIPEMD160) {
s/[_[:xdigit:]][_ [:xdigit:]]+_/$RIPEMD160/;
}
+
+ if ( m/^[0-9]+\s+\[ \] Fingerprint OK/ ){
+ if ($latex) {
+ if ($keys > 0) {
+ print WRITE "\\end{samepage}\n";
+ }
+ print WRITE "\\begin{samepage}\n";
+ ++$keys;
+ }
+ print WRITE;
+ next;
+ }
+
if ( m/^pub +(?:\d+)[DR]\/([0-9A-F]{8}) [0-9]{4}-[0-9]{2}-[0-9]{2} *(.*)/ ) {
$key = $1;
$uid = $2;
@@ -377,6 +391,10 @@
print WRITE;
}
+if ($latex && ($keys > 0)) {
+ print WRITE "\\end{samepage}\n";
+}
+
print WRITE "Legend:\n";
my $num_myuids = 0;
foreach my $i (0 .. @mykeys - 1) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/signing-party-1.1.3/keyanalyze/pgpring/stamp-h new/signing-party-1.1.4/keyanalyze/pgpring/stamp-h
--- old/signing-party-1.1.3/keyanalyze/pgpring/stamp-h 1970-01-01 01:00:00.000000000 +0100
+++ new/signing-party-1.1.4/keyanalyze/pgpring/stamp-h 2011-11-01 20:38:38.000000000 +0100
@@ -0,0 +1 @@
+timestamp
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org