r73340 - in /trunk/libmodule-signature-perl: ./ debian/ inc/Module/Install/ lib/Module/ t/ t/test-datcrlf-sigcrlf/ t/test-datcrlf-siglf/ t/test-datlf-sigcrlf/ t/test-datlf-siglf/
jotamjr-guest at users.alioth.debian.org
jotamjr-guest at users.alioth.debian.org
Sat Apr 23 21:59:04 UTC 2011
Author: jotamjr-guest
Date: Sat Apr 23 21:58:57 2011
New Revision: 73340
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=73340
Log:
New upstream release
Added:
trunk/libmodule-signature-perl/t/3-verify.t
- copied unchanged from r73338, branches/upstream/libmodule-signature-perl/current/t/3-verify.t
trunk/libmodule-signature-perl/t/test-datcrlf-sigcrlf/
- copied from r73338, branches/upstream/libmodule-signature-perl/current/t/test-datcrlf-sigcrlf/
trunk/libmodule-signature-perl/t/test-datcrlf-siglf/
- copied from r73338, branches/upstream/libmodule-signature-perl/current/t/test-datcrlf-siglf/
trunk/libmodule-signature-perl/t/test-datlf-sigcrlf/
- copied from r73338, branches/upstream/libmodule-signature-perl/current/t/test-datlf-sigcrlf/
trunk/libmodule-signature-perl/t/test-datlf-siglf/
- copied from r73338, branches/upstream/libmodule-signature-perl/current/t/test-datlf-siglf/
Modified:
trunk/libmodule-signature-perl/Changes
trunk/libmodule-signature-perl/MANIFEST
trunk/libmodule-signature-perl/META.yml
trunk/libmodule-signature-perl/Makefile.PL
trunk/libmodule-signature-perl/SIGNATURE
trunk/libmodule-signature-perl/debian/changelog
trunk/libmodule-signature-perl/inc/Module/Install/ReadmeFromPod.pm
trunk/libmodule-signature-perl/lib/Module/Signature.pm
Modified: trunk/libmodule-signature-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-signature-perl/Changes?rev=73340&op=diff
==============================================================================
--- trunk/libmodule-signature-perl/Changes (original)
+++ trunk/libmodule-signature-perl/Changes Sat Apr 23 21:58:57 2011
@@ -1,3 +1,7 @@
+[Changes for 0.67 - Sun, 17 Apr 2011 16:29:23 +0200]
+
+* Better handling of \r (Andreas König, Zefram) (Closes RT#46339).
+
[Changes for 0.66 - Fri, 6 Sep 2010 22:51:37 +0200]
* Fix incompatibility with EU::Manifest 1.54 to 1.57
Modified: trunk/libmodule-signature-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-signature-perl/MANIFEST?rev=73340&op=diff
==============================================================================
--- trunk/libmodule-signature-perl/MANIFEST (original)
+++ trunk/libmodule-signature-perl/MANIFEST Sat Apr 23 21:58:57 2011
@@ -23,3 +23,16 @@
t/0-signature.t
t/1-basic.t
t/2-cygwin.t
+t/3-verify.t
+t/test-datcrlf-sigcrlf/MANIFEST
+t/test-datcrlf-sigcrlf/README
+t/test-datcrlf-sigcrlf/SIGNATURE
+t/test-datcrlf-siglf/MANIFEST
+t/test-datcrlf-siglf/README
+t/test-datcrlf-siglf/SIGNATURE
+t/test-datlf-sigcrlf/MANIFEST
+t/test-datlf-sigcrlf/README
+t/test-datlf-sigcrlf/SIGNATURE
+t/test-datlf-siglf/MANIFEST
+t/test-datlf-siglf/README
+t/test-datlf-siglf/SIGNATURE
Modified: trunk/libmodule-signature-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-signature-perl/META.yml?rev=73340&op=diff
==============================================================================
--- trunk/libmodule-signature-perl/META.yml (original)
+++ trunk/libmodule-signature-perl/META.yml Sat Apr 23 21:58:57 2011
@@ -4,7 +4,7 @@
- 'åé³³ <cpan at audreyt.org>'
build_requires:
ExtUtils::MakeMaker: 6.42
- Test::More: 0
+ Test::More: IPC::Run:
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
@@ -23,4 +23,4 @@
perl: 5.005
resources:
repository: http://github.com/audreyt/module-signature
-version: 0.66
+version: 0.67
Modified: trunk/libmodule-signature-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-signature-perl/Makefile.PL?rev=73340&op=diff
==============================================================================
--- trunk/libmodule-signature-perl/Makefile.PL (original)
+++ trunk/libmodule-signature-perl/Makefile.PL Sat Apr 23 21:58:57 2011
@@ -8,7 +8,7 @@
readme_from 'lib/Module/Signature.pm';
repository 'http://github.com/audreyt/module-signature';
install_script 'script/cpansign';
-build_requires 'Test::More';
+build_requires 'Test::More', 'IPC::Run:';
# On Win32 (excluding cygwin) we know that IO::Socket::INET,
# which is needed for keyserver stuff, doesn't work. In fact
@@ -175,6 +175,6 @@
} else {
# Forget about it...
print "Module::Signature is not wanted on this host.\n";
- exit(255);
+ exit(0);
}
}
Modified: trunk/libmodule-signature-perl/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-signature-perl/SIGNATURE?rev=73340&op=diff
==============================================================================
--- trunk/libmodule-signature-perl/SIGNATURE (original)
+++ trunk/libmodule-signature-perl/SIGNATURE Sat Apr 23 21:58:57 2011
@@ -1,5 +1,5 @@
This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.65.
+signed via the Module::Signature module, version 0.67.
To verify the content in this distribution, first make sure you have
Module::Signature installed, then type:
@@ -16,10 +16,10 @@
SHA1 0b722678d07c66ef6992f2cc2c9e9acf3bef0ecb AUDREY2006.pub
SHA1 1e2b550757ebdf3ef2c0e8d1d06bcbb9c6b62a6f AUTHORS
-SHA1 5c58d739b5f59bdb261ce0d30ec68549ebf2e45e Changes
-SHA1 7341f3cbf8e4e34aba8066763eb638a6e1421d42 MANIFEST
-SHA1 ce553cc4b962f4fc47f1dae64c311501db3f96e4 META.yml
-SHA1 d9dfdaad0b2205fc074a218c52319259e5438b4c Makefile.PL
+SHA1 83056689f172ae6d0cfaa48e7bcc3ed5aad51986 Changes
+SHA1 4cf34e908b8e824f4be8afa9fbe4516c8ba4d62b MANIFEST
+SHA1 c97d3cef91dd0d54895dd220b7072e777d205add META.yml
+SHA1 4ce4e001188ab1542489b7a3d91f73f37b8ede60 Makefile.PL
SHA1 37e858c51409a297ef5d3fb35dc57cd3b57f9a4d PAUSE2003.pub
SHA1 955ba924e9cd1bafccb4d6d7bd3be25c3ce8bf75 README
SHA1 7305dbe2904416e28decb05396988a5d51d578be inc/Module/Install.pm
@@ -29,19 +29,32 @@
SHA1 bf0a3e1977effc2832d7a813a76dce3f31b437b6 inc/Module/Install/Fetch.pm
SHA1 b721c93ca5bc9a6aa863b49af15f1b1de6125935 inc/Module/Install/Makefile.pm
SHA1 026cc0551a0ad399d195e395b46bdf842e115192 inc/Module/Install/Metadata.pm
-SHA1 4a3a72dc019bf2c82013c47fcaf0f20581d011ce inc/Module/Install/ReadmeFromPod.pm
+SHA1 d3a33569b41077d6a836f95bb63484c51e9d0a52 inc/Module/Install/ReadmeFromPod.pm
SHA1 d3a4c720c6ec7f8fce7df37002fbc9177fb77050 inc/Module/Install/Scripts.pm
SHA1 5457015ea5a50e93465bf2dafa29feebd547f85b inc/Module/Install/Win32.pm
SHA1 051e7fa8063908befa3440508d0584a2497b97db inc/Module/Install/WriteAll.pm
-SHA1 27008cd26948a367ca947c48154cc94ca8aba6ce lib/Module/Signature.pm
+SHA1 571752560a872f6e2e85627a960115c36abca23c lib/Module/Signature.pm
SHA1 0882c50213a28b7a30fc91fd58c19015f33348d0 script/cpansign
SHA1 3ec6171779122b0bdc69937c283be11b2a15dd89 t/0-signature.t
SHA1 307a744384e704d94031df73233f24174b843bc8 t/1-basic.t
SHA1 0177dcafa00571440541d6495fce6d3b61f81039 t/2-cygwin.t
+SHA1 da68934fa41789e939ca94b20199f5f5a0400493 t/3-verify.t
+SHA1 e943619dfc12d2bab253597ab1d6eff80f00dbde t/test-datcrlf-sigcrlf/MANIFEST
+SHA1 47e6d6416876be98bcab097507c31eb5dc217b35 t/test-datcrlf-sigcrlf/README
+SHA1 b57b20a48c48db6d3445066fe613a36a211f6473 t/test-datcrlf-sigcrlf/SIGNATURE
+SHA1 e943619dfc12d2bab253597ab1d6eff80f00dbde t/test-datcrlf-siglf/MANIFEST
+SHA1 47e6d6416876be98bcab097507c31eb5dc217b35 t/test-datcrlf-siglf/README
+SHA1 a827ab896b767b8ad91a06498a6ec948e33d0e09 t/test-datcrlf-siglf/SIGNATURE
+SHA1 e943619dfc12d2bab253597ab1d6eff80f00dbde t/test-datlf-sigcrlf/MANIFEST
+SHA1 f7a80112f7597a7312d6e0d499aa4cf5f6e8ef08 t/test-datlf-sigcrlf/README
+SHA1 b57b20a48c48db6d3445066fe613a36a211f6473 t/test-datlf-sigcrlf/SIGNATURE
+SHA1 e943619dfc12d2bab253597ab1d6eff80f00dbde t/test-datlf-siglf/MANIFEST
+SHA1 f7a80112f7597a7312d6e0d499aa4cf5f6e8ef08 t/test-datlf-siglf/README
+SHA1 a827ab896b767b8ad91a06498a6ec948e33d0e09 t/test-datlf-siglf/SIGNATURE
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
+Version: GnuPG v1.4.11 (GNU/Linux)
-iEYEARECAAYFAkyFVbUACgkQdC8qQo5jWl6F3QCeJFh5Vbwr1mr1UNbnVA85Zqfg
-b4wAn1Reop5VT3cEVVM2zW4ubezik+vo
-=XjLa
+iEYEARECAAYFAk2rAiUACgkQdC8qQo5jWl48NwCdEWufeyGw+sWnoV1OnvqWUI9p
+ebYAn3QVmBk8kwHtKwKUIe8X2jjuWv9v
+=caFd
-----END PGP SIGNATURE-----
Modified: trunk/libmodule-signature-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-signature-perl/debian/changelog?rev=73340&op=diff
==============================================================================
--- trunk/libmodule-signature-perl/debian/changelog (original)
+++ trunk/libmodule-signature-perl/debian/changelog Sat Apr 23 21:58:57 2011
@@ -1,3 +1,9 @@
+libmodule-signature-perl (0.67-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Jotam Jr. Trejo <jotamjr at debian.org.sv> Sat, 23 Apr 2011 15:48:42 -0600
+
libmodule-signature-perl (0.66-2) unstable; urgency=low
[ Peter Pentchev ]
Modified: trunk/libmodule-signature-perl/inc/Module/Install/ReadmeFromPod.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-signature-perl/inc/Module/Install/ReadmeFromPod.pm?rev=73340&op=diff
==============================================================================
--- trunk/libmodule-signature-perl/inc/Module/Install/ReadmeFromPod.pm (original)
+++ trunk/libmodule-signature-perl/inc/Module/Install/ReadmeFromPod.pm Sat Apr 23 21:58:57 2011
@@ -1,36 +1,48 @@
#line 1
package Module::Install::ReadmeFromPod;
+use 5.006;
use strict;
use warnings;
use base qw(Module::Install::Base);
use vars qw($VERSION);
-$VERSION = '0.10';
+$VERSION = '0.12';
sub readme_from {
my $self = shift;
- return unless $Module::Install::AUTHOR;
- my $file = shift || return;
+ return unless $self->is_admin;
+
+ my $file = shift || $self->_all_from
+ or die "Can't determine file to make readme_from";
my $clean = shift;
+
+ print "Writing README from $file\n";
+
require Pod::Text;
my $parser = Pod::Text->new();
open README, '> README' or die "$!\n";
$parser->output_fh( *README );
$parser->parse_file( $file );
- return 1 unless $clean;
- $self->postamble(<<"END");
-distclean :: license_clean
+ if ($clean) {
+ $self->clean_files('README');
+ }
+ return 1;
+}
-license_clean:
-\t\$(RM_F) README
-END
- return 1;
+sub _all_from {
+ my $self = shift;
+ return unless $self->admin->{extensions};
+ my ($metadata) = grep {
+ ref($_) eq 'Module::Install::Metadata';
+ } @{$self->admin->{extensions}};
+ return unless $metadata;
+ return $metadata->{values}{all_from} || '';
}
'Readme!';
__END__
-#line 94
+#line 112
Modified: trunk/libmodule-signature-perl/lib/Module/Signature.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-signature-perl/lib/Module/Signature.pm?rev=73340&op=diff
==============================================================================
--- trunk/libmodule-signature-perl/lib/Module/Signature.pm (original)
+++ trunk/libmodule-signature-perl/lib/Module/Signature.pm Sat Apr 23 21:58:57 2011
@@ -1,5 +1,5 @@
package Module::Signature;
-$Module::Signature::VERSION = '0.66';
+$Module::Signature::VERSION = '0.67';
use 5.005;
use strict;
@@ -51,6 +51,18 @@
$AutoKeyRetrieve = 1;
$CanKeyRetrieve = undef;
+sub _cipher_map {
+ my($sigtext) = @_;
+ my @lines = split /\015?\012/, $sigtext;
+ my %map;
+ for my $line (@lines) {
+ my($cipher,$digest,$file) = split " ", $line, 3;
+ return unless defined $file;
+ $map{$file} = [$cipher, $digest];
+ }
+ return \%map;
+}
+
sub verify {
my %args = ( skip => 1, @_ );
my $rv;
@@ -65,12 +77,12 @@
return SIGNATURE_MALFORMED;
};
- (my ($cipher) = ($sigtext =~ /^(\w+) /)) or do {
+ (my ($cipher_map) = _cipher_map($sigtext)) or do {
warn "==> MALFORMED Signature file! <==\n";
return SIGNATURE_MALFORMED;
};
- (defined(my $plaintext = _mkdigest($cipher))) or do {
+ (defined(my $plaintext = _mkdigest($cipher_map))) or do {
warn "==> UNKNOWN Cipher format! <==\n";
return CIPHER_UNKNOWN;
};
@@ -489,7 +501,7 @@
}
sub _mkdigest {
- my $digest = _mkdigest_files(undef, @_) or return;
+ my $digest = _mkdigest_files(@_) or return;
my $plaintext = '';
foreach my $file (sort keys %$digest) {
@@ -500,13 +512,8 @@
return $plaintext;
}
-sub _mkdigest_files {
- my $p = shift;
- my $algorithm = shift || $Cipher;
- my $dosnames = (defined(&Dos::UseLFN) && Dos::UseLFN()==0);
- my $read = ExtUtils::Manifest::maniread() || {};
- my $found = ExtUtils::Manifest::manifind($p);
- my(%digest) = ();
+sub _digest_object {
+ my($algorithm) = @_;
my $obj = eval { Digest->new($algorithm) } || eval {
my ($base, $variant) = ($algorithm =~ /^(\w+?)(\d+)$/g) or die;
require "Digest/$base.pm"; "Digest::$base"->new($variant)
@@ -523,8 +530,35 @@
} and return } or do {
warn "Unknown cipher: $algorithm, please install Digest::$algorithm\n"; return;
};
-
- foreach my $file (sort keys %$read){
+ $obj;
+}
+
+sub _mkdigest_files {
+ my $verify_map = shift;
+ my $dosnames = (defined(&Dos::UseLFN) && Dos::UseLFN()==0);
+ my $read = ExtUtils::Manifest::maniread() || {};
+ my $found = ExtUtils::Manifest::manifind();
+ my(%digest) = ();
+ my($default_obj) = _digest_object($Cipher);
+ FILE: foreach my $file (sort keys %$read){
+ next FILE if $file eq $SIGNATURE;
+ my($obj,$this_cipher,$this_hexdigest,$verify_digest);
+ if ($verify_map) {
+ if (my $vmf = $verify_map->{$file}) {
+ ($this_cipher,$verify_digest) = @$vmf;
+ if ($this_cipher eq $Cipher) {
+ $obj = $default_obj;
+ } else {
+ $obj = _digest_object($this_cipher);
+ }
+ } else {
+ $this_cipher = $Cipher;
+ $obj = $default_obj;
+ }
+ } else {
+ $this_cipher = $Cipher;
+ $obj = $default_obj;
+ }
warn "Debug: collecting digest from $file\n" if $Debug;
if ($dosnames){
$file = lc $file;
@@ -539,10 +573,6 @@
open F, $file or die "Cannot open $file for reading: $!";
if (-B $file) {
binmode(F);
- $obj->addfile(*F);
- }
- elsif ($] >= 5.006) {
- binmode(F, ':crlf');
$obj->addfile(*F);
}
elsif ($^O eq 'MSWin32') {
@@ -553,10 +583,32 @@
local $/;
binmode(F);
my $input = <F>;
- $input =~ s/\015?\012/\n/g;
- $obj->add($input);
+ VERIFYLOOP: for my $eol ("","\015\012","\012") {
+ my $lax_input = $input;
+ if (! length $eol) {
+ # first try is binary
+ } else {
+ my @lines = split /$eol/, $input, -1;
+ if (grep /[\015\012]/, @lines) {
+ # oops, apparently not a text file, treat as binary, forget @lines
+ } else {
+ my $other_eol = $eol eq "\012" ? "\015\012" : "\012";
+ $lax_input = join $other_eol, @lines;
+ }
+ }
+ $obj->add($lax_input);
+ $this_hexdigest = $obj->hexdigest;
+ if ($verify_digest) {
+ if ($this_hexdigest eq $verify_digest) {
+ last VERIFYLOOP;
+ }
+ $obj->reset;
+ } else {
+ last VERIFYLOOP;
+ }
+ }
}
- $digest{$file} = [$algorithm, $obj->hexdigest];
+ $digest{$file} = [$this_cipher, $this_hexdigest];
$obj->reset;
}
}
More information about the Pkg-perl-cvs-commits
mailing list