Skip to content

Commit bb5c969

Browse files
audreytaudreyt
committed
* Merge from @rafl 0.68 from CPAN.
1 parent 8d848e5 commit bb5c969

File tree

19 files changed

+240
-338
lines changed

19 files changed

+240
-338
lines changed

‎Changes

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,45 @@
1-
[Changes for 0.62 - Fri Nov 2 20:59:28 CST 2012]
1+
[Changes for 0.69 - Fri Nov 2 23:04:19 CST 2012]
22

33
* Support for gpg under these alternate names:
44

55
gpg gpg2 gnupg gnupg2
66

77
Contributed by: Michael Schwern
88

9+
[Changes for 0.68 - Fri, 13 May 2011 11:51:50 +0200]
10+
11+
* Fix breakage introduced by 0.67 (Andreas König).
12+
13+
[Changes for 0.67 - Sun, 17 Apr 2011 16:29:23 +0200]
14+
15+
* Better handling of \r (Andreas König, Zefram) (Closes RT#46339).
16+
17+
[Changes for 0.66 - Fri, 6 Sep 2010 22:51:37 +0200]
18+
19+
* Fix incompatibility with EU::Manifest 1.54 to 1.57
20+
(Paul Howarth) (Closes RT#61124).
21+
22+
[Changes for 0.65 - Fri, 3 Sep 2010 21:38:02 +0200]
23+
24+
* Skip MYMETA (Alexandr Ciornii)
25+
26+
[Changes for 0.64 - Sun, 9 May 2010 00:50:11 +0200]
27+
28+
* Avoid creating gnupg configuration files for the user invoking Makefile.PL
29+
(Closes RT#41978).
30+
* Correctly detect the version of gnupg on cygwin and add tests for it
31+
(Paul Fenwick) (Closes RT#39258).
32+
33+
[Changes for 0.63 - Sun, 28 Mar 2010 04:46:27 +0100]
34+
35+
* Fix diagnostic message from Makefile.PL when the user dosn't have gnupg or
36+
Crypt::OpenPGP (miyagawa).
37+
38+
[Changes for 0.62 - Tue, 23 Mar 2010 22:17:39 +0100]
39+
40+
* Change the default keyserver from the outdated pgp.mit.edu to
41+
pool.sks-keyservers.net.
42+
943
[Changes for 0.61 - 2009年11月19日 周四 00時56分41秒 CST]
1044

1145
* Added "=encoding utf8" to POD to fix author name display.

‎MANIFEST

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
AUDREY2006.pub
22
AUTHORS
33
Changes
4-
inc/Module/AutoInstall.pm
54
inc/Module/Install.pm
6-
inc/Module/Install/AutoInstall.pm
75
inc/Module/Install/Base.pm
86
inc/Module/Install/Can.pm
97
inc/Module/Install/External.pm
108
inc/Module/Install/Fetch.pm
11-
inc/Module/Install/Include.pm
129
inc/Module/Install/Makefile.pm
1310
inc/Module/Install/Metadata.pm
1411
inc/Module/Install/ReadmeFromPod.pm
@@ -18,10 +15,15 @@ inc/Module/Install/WriteAll.pm
1815
lib/Module/Signature.pm
1916
Makefile.PL
2017
MANIFEST This list of files
18+
MANIFEST.SKIP
2119
META.yml
2220
PAUSE2003.pub
2321
README
2422
script/cpansign
25-
SIGNATURE Public-key signature (added by MakeMaker)
23+
SIGNATURE
2624
t/0-signature.t
2725
t/1-basic.t
26+
t/2-cygwin.t
27+
t/3-verify.t
28+
t/wrap.pl
29+
t/wrapped-tests.bin

‎META.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ abstract: 'Module signature file manipulation'
33
author:
44
- '唐鳳 <[email protected]>'
55
build_requires:
6-
ExtUtils::MakeMaker: 6.36
6+
ExtUtils::MakeMaker: 6.42
7+
IPC::Run: 0
78
Test::More: 0
89
configure_requires:
9-
ExtUtils::MakeMaker: 6.36
10+
ExtUtils::MakeMaker: 6.42
1011
distribution_type: module
11-
dynamic_config: 1
12-
generated_by: 'Module::Install version 1.06'
12+
generated_by: 'Module::Install version 1.00'
1313
license: cc0
1414
meta-spec:
1515
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -24,4 +24,4 @@ requires:
2424
perl: 5.005
2525
resources:
2626
repository: http://github.com/audreyt/module-signature
27-
version: 0.62
27+
version: 0.68

‎Makefile.PL

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use strict;
2-
3-
use inc::Module::Install;
2+
use inc::Module::Install 0.92;
43

54
$|++;
65

@@ -10,7 +9,7 @@ all_from 'lib/Module/Signature.pm';
109
readme_from 'lib/Module/Signature.pm';
1110
repository 'http://github.com/audreyt/module-signature';
1211
install_script 'script/cpansign';
13-
build_requires 'Test::More';
12+
build_requires 'Test::More', 0, 'IPC::Run', 0;
1413

1514
# On Win32 (excluding cygwin) we know that IO::Socket::INET,
1615
# which is needed for keyserver stuff, doesn't work. In fact
@@ -87,7 +86,6 @@ unless ( can_run('diff') ) {
8786
}
8887
}
8988

90-
auto_install;
9189
sign; WriteAll;
9290

9391

@@ -100,18 +98,17 @@ sign; WriteAll;
10098
sub locate_gpg {
10199
print "Looking for GNU Privacy Guard (gpg), a cryptographic signature tool...\n";
102100

103-
my($gpg, $gpg_path);
104-
for my $gpg_bin ('gpg', 'gpg2', 'gnupg', 'gnupg2') {
105-
$gpg_path = can_run($gpg_bin);
106-
next unless $gpg_path;
107-
next unless `$gpg_bin --version` =~ /GnuPG/;
108-
next unless defined `$gpg_bin --list-public-keys`;
109-
110-
$gpg = $gpg_bin;
111-
last;
112-
}
113-
114-
unless ( $gpg ) {
101+
my ($gpg, $gpg_path);
102+
for my $gpg_bin ('gpg', 'gpg2', 'gnupg', 'gnupg2') {
103+
$gpg_path = can_run($gpg_bin);
104+
next unless $gpg_path;
105+
next unless `$gpg_bin --version` =~ /GnuPG/;
106+
next unless defined `$gpg_bin --list-public-keys`;
107+
108+
$gpg = $gpg_bin;
109+
last;
110+
}
111+
unless ( $gpg ) {
115112
print "gpg not found.\n";
116113
return;
117114
}
@@ -126,11 +123,13 @@ sub locate_gpg {
126123
print "done.\n";
127124
}
128125

129-
return $gpg;
126+
return $gpg;
130127
}
131128

132-
# Defined the prompt messages
133-
my $message1 = <<'END_MESSAGE';
129+
sub ask_user {
130+
131+
# Defined the prompt messages
132+
my $message1 = <<'END_MESSAGE';
134133
135134
Could not auto-detect a signature utility on your system.
136135
@@ -142,14 +141,13 @@ What do you want me to do?
142141
143142
END_MESSAGE
144143

145-
my $message2 = <<'END_MESSAGE';
144+
my $message2 = <<'END_MESSAGE';
146145
147146
2) Automatically install Crypt::OpenPGP and the 20 modules it requires
148147
from CPAN, which will give the same functionality as GnuPG.
149148
150149
END_MESSAGE
151150

152-
sub ask_user {
153151
# Present the options
154152
print $message1;
155153

@@ -181,6 +179,6 @@ END_MESSAGE
181179
} else {
182180
# Forget about it...
183181
print "Module::Signature is not wanted on this host.\n";
184-
exit(255);
182+
exit(0);
185183
}
186184
}

‎README

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
NAME
22
Module::Signature - Module signature file manipulation
33

4-
VERSION
5-
This document describes version 0.62 of Module::Signature, released
6-
November 2, 2012.
7-
84
SYNOPSIS
95
As a shell command:
106

117
% cpansign # verify an existing SIGNATURE, or
12-
# make a new one if none exists
8+
# make a new one if none exists
139

1410
% cpansign sign # make signature; overwrites existing one
1511
% cpansign -s # same thing
@@ -222,7 +218,7 @@ NOTES
222218
"Next time around, consider install Module::Signature, ",
223219
"so you can verify the integrity of this distribution.\n";
224220
}
225-
elsif (!eval { require Socket; Socket::inet_aton('pgp.mit.edu') }) {
221+
elsif (!eval { require Socket; Socket::inet_aton('pool.sks-keyservers.net') }) {
226222
print "ok 1 # skip ",
227223
"Cannot connect to the keyserver\n";
228224
}

‎SIGNATURE

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
This file contains message digests of all files listed in MANIFEST,
2-
signed via the Module::Signature module, version 0.60.
2+
signed via the Module::Signature module, version 0.68.
33

44
To verify the content in this distribution, first make sure you have
55
Module::Signature installed, then type:
@@ -16,34 +16,36 @@ Hash: SHA1
1616

1717
SHA1 0b722678d07c66ef6992f2cc2c9e9acf3bef0ecb AUDREY2006.pub
1818
SHA1 1e2b550757ebdf3ef2c0e8d1d06bcbb9c6b62a6f AUTHORS
19-
SHA1 938da9cd3294843ea703ad4f83b8dc9c9dc4cd13 Changes
20-
SHA1 2758c5d6b419c1fb0e06b2752bb871635c426392 MANIFEST
21-
SHA1 380629e3109b106f8d013376d5d56b9ec6815900 META.yml
22-
SHA1 a147c655a30fe3fd8c7b9fc2b37b74730b9c90c8 Makefile.PL
19+
SHA1 9dcc6558459cdbe474dcf325eb9e8eeb68815897 Changes
20+
SHA1 366ad23151d9113e37f4a9edd4d3304ecc30b9d6 MANIFEST
21+
SHA1 af1667da11736451592aeba46d34e38c47a7201c MANIFEST.SKIP
22+
SHA1 f38db924b0216aaff4ccf18247a62997acb447ce META.yml
23+
SHA1 0024aa3f23ac84a928c4063e9435ca1607984e7e Makefile.PL
2324
SHA1 37e858c51409a297ef5d3fb35dc57cd3b57f9a4d PAUSE2003.pub
24-
SHA1 b5ecf1062331657b7ce40cdbef7cd23581e4f1b4 README
25-
SHA1 e5fb92ac217988bfc7a6af739b0459627020a27e inc/Module/AutoInstall.pm
26-
SHA1 fd5f3c4f0418efee3b9b16cf8c3902e8374909df inc/Module/Install.pm
27-
SHA1 5c529e96420d964b192f011b121283a4916f7331 inc/Module/Install/AutoInstall.pm
28-
SHA1 7cd7c349afdf3f012e475507b1017bdfa796bfbd inc/Module/Install/Base.pm
29-
SHA1 ba186541bbf6439111f01fc70769cf24d22869bf inc/Module/Install/Can.pm
30-
SHA1 a9d6306080cee9c32b18f6cbd3c7636ece67e81a inc/Module/Install/External.pm
31-
SHA1 aaa50eca0d7751db7a4d953fac9bc72c6294e238 inc/Module/Install/Fetch.pm
32-
SHA1 219da5a95c290312a81477b226f005997d97dcfd inc/Module/Install/Include.pm
33-
SHA1 3e83972921d54198d1246f7278f08664006cd65d inc/Module/Install/Makefile.pm
34-
SHA1 12bf1867955480d47d5171a9e9c6a96fabe0b58f inc/Module/Install/Metadata.pm
35-
SHA1 a615bb050ca0b2d79bfa0224addcb83019a53b09 inc/Module/Install/ReadmeFromPod.pm
36-
SHA1 3406c9015148c75406903e7382f8182613b5022a inc/Module/Install/Scripts.pm
37-
SHA1 f7ee667e878bd2faf22ee9358a7b5a2cc8e91ba4 inc/Module/Install/Win32.pm
38-
SHA1 8ed29d6cf217e0977469575d788599cbfb53a5ca inc/Module/Install/WriteAll.pm
39-
SHA1 df3decb228e7f65dfaf296ed40ffd84ee3a56988 lib/Module/Signature.pm
25+
SHA1 955ba924e9cd1bafccb4d6d7bd3be25c3ce8bf75 README
26+
SHA1 7305dbe2904416e28decb05396988a5d51d578be inc/Module/Install.pm
27+
SHA1 129960509127732258570c122042bc48615222e1 inc/Module/Install/Base.pm
28+
SHA1 cf3356ed9a5bd2f732527ef9e7bc5ef4458c8a93 inc/Module/Install/Can.pm
29+
SHA1 e083a5ec82c708f0a933785388b3ac2c94d802ec inc/Module/Install/External.pm
30+
SHA1 bf0a3e1977effc2832d7a813a76dce3f31b437b6 inc/Module/Install/Fetch.pm
31+
SHA1 b721c93ca5bc9a6aa863b49af15f1b1de6125935 inc/Module/Install/Makefile.pm
32+
SHA1 026cc0551a0ad399d195e395b46bdf842e115192 inc/Module/Install/Metadata.pm
33+
SHA1 d3a33569b41077d6a836f95bb63484c51e9d0a52 inc/Module/Install/ReadmeFromPod.pm
34+
SHA1 d3a4c720c6ec7f8fce7df37002fbc9177fb77050 inc/Module/Install/Scripts.pm
35+
SHA1 5457015ea5a50e93465bf2dafa29feebd547f85b inc/Module/Install/Win32.pm
36+
SHA1 051e7fa8063908befa3440508d0584a2497b97db inc/Module/Install/WriteAll.pm
37+
SHA1 e37281f2715f3a73c830d0408461fc0e3e43d419 lib/Module/Signature.pm
4038
SHA1 0882c50213a28b7a30fc91fd58c19015f33348d0 script/cpansign
41-
SHA1 4aeb184c9bed26ab6c3be1ebdb8470c0cb353b1f t/0-signature.t
39+
SHA1 3ec6171779122b0bdc69937c283be11b2a15dd89 t/0-signature.t
4240
SHA1 307a744384e704d94031df73233f24174b843bc8 t/1-basic.t
41+
SHA1 0177dcafa00571440541d6495fce6d3b61f81039 t/2-cygwin.t
42+
SHA1 a3bea1f17370e89ccb1c3becf5c1d072d6857fd4 t/3-verify.t
43+
SHA1 69614dfba33a1ef498a2161f9e4718092652857c t/wrap.pl
44+
SHA1 61377898e9d7cb06d370f45167a925e16736de70 t/wrapped-tests.bin
4345
-----BEGIN PGP SIGNATURE-----
44-
Version: GnuPG v1.4.10 (Darwin)
46+
Version: GnuPG v1.4.11 (GNU/Linux)
4547

46-
iEYEARECAAYFAksBZ5EACgkQtLPdNzw1AaDX+wCeI89qsRlgjNS030AF/x815eqJ
47-
s60An3MuNp2wx0hcA4jUvZwRhwT/e+9j
48-
=rJ+M
48+
iEYEARECAAYFAk3M/5gACgkQdC8qQo5jWl6ejwCfYy2EE94jsoe1oY2w7Na3jSnX
49+
1fwAnRgS45SDoKjbLSH1+6z37NL/MpGI
50+
=NYb6
4951
-----END PGP SIGNATURE-----

‎inc/Module/Install.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ BEGIN {
3131
# This is not enforced yet, but will be some time in the next few
3232
# releases once we can make sure it won't clash with custom
3333
# Module::Install extensions.
34-
$VERSION = '1.06';
34+
$VERSION = '1.00';
3535

3636
# Storage for the pseudo-singleton
3737
$MAIN = undef;
@@ -451,7 +451,7 @@ sub _version ($) {
451451
}
452452

453453
sub _cmp ($$) {
454-
_version($_[1]) <=> _version($_[2]);
454+
_version($_[0]) <=> _version($_[1]);
455455
}
456456

457457
# Cloned from Params::Util::_CLASS
@@ -467,4 +467,4 @@ sub _CLASS ($) {
467467

468468
1;
469469

470-
# Copyright 2008 - 2012 Adam Kennedy.
470+
# Copyright 2008 - 2010 Adam Kennedy.

‎inc/Module/Install/Base.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package Module::Install::Base;
44
use strict 'vars';
55
use vars qw{$VERSION};
66
BEGIN {
7-
$VERSION = '1.06';
7+
$VERSION = '1.00';
88
}
99

1010
# Suspend handler for "redefined" warnings

0 commit comments

Comments
 (0)