Skip to content

Commit bff978f

Browse files
committed
Upgrade Module::Metadata from version 1.000016 to 1.000017
1 parent 054559e commit bff978f

File tree

11 files changed

+40
-6
lines changed

11 files changed

+40
-6
lines changed

MANIFEST

+1
Original file line numberDiff line numberDiff line change
@@ -1764,6 +1764,7 @@ cpan/Module-Metadata/t/lib/ENDPOD.pm
17641764
cpan/Module-Metadata/t/lib/MBTest.pm
17651765
cpan/Module-Metadata/t/lib/Tie/CPHash.pm
17661766
cpan/Module-Metadata/t/metadata.t
1767+
cpan/Module-Metadata/t/taint.t
17671768
cpan/Module-Metadata/t/version.t
17681769
cpan/NEXT/lib/NEXT.pm Pseudo-class NEXT for method redispatch
17691770
cpan/NEXT/t/actual.t NEXT

Porting/Maintainers.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,7 @@ package Maintainers;
12411241

12421242
'Module::Metadata' => {
12431243
'MAINTAINER' => 'dagolden',
1244-
'DISTRIBUTION' => 'ETHER/Module-Metadata-1.000016.tar.gz',
1244+
'DISTRIBUTION' => 'ETHER/Module-Metadata-1.000017.tar.gz',
12451245
'FILES' => q[cpan/Module-Metadata],
12461246
'EXCLUDED' => [
12471247
qr{^maint},

cpan/Module-Metadata/lib/Module/Metadata.pm

+6-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ package Module::Metadata;
1010
# parrot future to look at other types of modules).
1111

1212
use strict;
13-
use vars qw($VERSION);
14-
$VERSION = '1.000016';
13+
use warnings;
14+
15+
our $VERSION = '1.000017';
1516
$VERSION = eval $VERSION;
1617

1718
use Carp qw/croak/;
@@ -649,7 +650,7 @@ sub _evaluate_version_line {
649650
# compiletime/runtime issues with local()
650651
my $vsub;
651652
$pn++; # everybody gets their own package
652-
my $eval = qq{BEGIN { q# Hide from _packages_inside()
653+
my $eval = qq{BEGIN { my \$dummy = q# Hide from _packages_inside()
653654
#; package Module::Metadata::_version::p$pn;
654655
use version;
655656
no strict;
@@ -662,6 +663,8 @@ sub _evaluate_version_line {
662663
};
663664
}};
664665

666+
$eval = $1 if $eval =~ m{^(.+)}s;
667+
665668
local $^W;
666669
# Try to get the $VERSION
667670
eval $eval;

cpan/Module-Metadata/t/encoding.t

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!perl
22

33
use strict;
4+
use warnings;
45
use File::Spec;
56
use Test::More;
67

cpan/Module-Metadata/t/lib/DistGen.pm

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package DistGen;
22

33
use strict;
4+
use warnings;
45

56
use vars qw( $VERSION $VERBOSE @EXPORT_OK);
67

@@ -182,6 +183,7 @@ sub _gen_default_filedata {
182183
\$VERSION = '0.01';
183184
184185
use strict;
186+
use warnings;
185187
186188
1;
187189
@@ -205,6 +207,7 @@ sub _gen_default_filedata {
205207
$self->$add_unless('t/basic.t', undent(<<" ---"));
206208
use Test::More tests => 1;
207209
use strict;
210+
use warnings;
208211
209212
use $self->{name};
210213
ok 1;
@@ -470,6 +473,7 @@ sub change_build_pl {
470473

471474
$self->change_file( 'Build.PL', undent(<<" ---") );
472475
use strict;
476+
use warnings;
473477
use Module::Build;
474478
my \$b = Module::Build->new(
475479
# Some CPANPLUS::Dist::Build versions need to allow mismatches

cpan/Module-Metadata/t/lib/MBTest.pm

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package MBTest;
22

33
use strict;
4+
use warnings;
45

56
use IO::File ();
67
use File::Spec;

cpan/Module-Metadata/t/lib/Tie/CPHash.pm

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ package Tie::CPHash;
2020

2121
require 5.000;
2222
use strict;
23+
use warnings;
2324
use vars qw(@ISA $VERSION);
2425

2526
@ISA = qw();

cpan/Module-Metadata/t/metadata.t

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# vim:ts=8:sw=2:et:sta:sts=2
44

55
use strict;
6+
use warnings;
67
use lib 't/lib';
78
use IO::File;
89
use MBTest;

cpan/Module-Metadata/t/taint.t

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/usr/bin/perl -T
2+
use strict;
3+
use warnings;
4+
5+
use 5.008000; # for ${^TAINT}
6+
use Module::Metadata;
7+
use Test::More;
8+
use Test::Fatal;
9+
10+
ok(${^TAINT}, 'taint flag is set');
11+
12+
# without the fix, we get:
13+
# Insecure dependency in eval while running with -T switch at lib/Module/Metadata.pm line 668, <GEN0> line 15.
14+
is(
15+
exception { Module::Metadata->new_from_module( "Module::Metadata" )->version },
16+
undef,
17+
'no exception',
18+
);
19+
20+
done_testing;

cpan/Module-Metadata/t/version.t

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use strict;
2+
use warnings;
23
use Test::More;
34
use Module::Metadata;
45
use lib "t/lib/0_2";

pod/perldelta.pod

+3-2
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,11 @@ C<requires> has been made more robust. [cpan #83728]
325325

326326
=item *
327327

328-
L<Module::Metadata> has been upgraded from version 1.000014 to 1.000016.
328+
L<Module::Metadata> has been upgraded from version 1.000014 to 1.000017.
329329

330330
The module's DESCRIPTION has been re-worded regarding safety/security to
331-
satisfy CVE-2013-1437.
331+
satisfy CVE-2013-1437. Also, versions are now detainted if needed. [cpan
332+
#88576]
332333

333334
=item *
334335

0 commit comments

Comments
 (0)