Skip to content

Commit 0037d97

Browse files
timleggetimlegge
authored
Merge pull request #2 from perl-net-saml2/distzilla
Add Dist::Zilla for making releases
2 parents 83d8959 + 52d9525 commit 0037d97

File tree

10 files changed

+690
-91
lines changed

10 files changed

+690
-91
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Crypt-OpenSSL-PKCS10*
2+
Release*
3+

‎LICENSE‎

Lines changed: 412 additions & 0 deletions
Large diffs are not rendered by default.

‎MANIFEST‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎META.json‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"author" : [
44
"JoNO <jonozzz@yahoo.com>"
55
],
6-
"dynamic_config" : 1,
7-
"generated_by" : "ExtUtils::MakeMaker version 7.62, CPAN::Meta::Converter version 2.150010",
6+
"dynamic_config" : 0,
7+
"generated_by" : "Dist::Zilla version 6.030, CPAN::Meta::Converter version 2.150010",
88
"license" : [
99
"perl_5"
1010
],
@@ -13,17 +13,10 @@
1313
"version" : 2
1414
},
1515
"name" : "Crypt-OpenSSL-PKCS10",
16-
"no_index" : {
17-
"directory" : [
18-
"t",
19-
"inc"
20-
]
21-
},
2216
"prereqs" : {
2317
"build" : {
2418
"requires" : {
25-
"ExtUtils::MakeMaker" : "0",
26-
"Test" : "0"
19+
"Crypt::OpenSSL::Guess" : "0.11"
2720
}
2821
},
2922
"configure" : {
@@ -32,30 +25,48 @@
3225
"ExtUtils::MakeMaker" : "0"
3326
}
3427
},
28+
"develop" : {
29+
"requires" : {
30+
"Test::CPAN::Meta::JSON" : "0.16",
31+
"Test::Pod" : "1.41",
32+
"Test::Spelling" : "0.12"
33+
}
34+
},
3535
"runtime" : {
3636
"recommends" : {
3737
"Crypt::OpenSSL::Bignum" : "0"
3838
},
3939
"requires" : {
40-
"Crypt::OpenSSL::RSA" : "0"
40+
"Crypt::OpenSSL::RSA" : "0",
41+
"perl" : "5.008"
42+
}
43+
},
44+
"test" : {
45+
"requires" : {
46+
"Crypt::OpenSSL::RSA" : "0",
47+
"Test::More" : "0"
4148
}
4249
}
4350
},
51+
"provides" : {},
4452
"release_status" : "stable",
4553
"resources" : {
4654
"bugtracker" : {
4755
"web" : "https://rt.cpan.org/Public/Dist/Display.html?Name=Crypt-OpenSSL-PKCS10"
4856
},
57+
"homepage" : "http://search.cpan.org/dist/Crypt-OpenSSL-PKCS10/",
4958
"repository" : {
5059
"type" : "git",
51-
"url" : "git@github.com:perl-net-saml2/perl-Crypt-OpenSSL-PKCS10.git",
60+
"url" : "git://github.com/perl-net-saml2/perl-Crypt-OpenSSL-PKCS10.git",
5261
"web" : "https://github.com/perl-net-saml2/perl-Crypt-OpenSSL-PKCS10"
53-
},
54-
"homepage" : "https://metacpan.org/pod/Crypt::OpenSSL::PKCS10",
55-
"license" : [
56-
"http://dev.perl.org/licenses/"
57-
]
62+
}
5863
},
59-
"version" : "0.20",
60-
"x_serialization_backend" : "JSON::PP version 4.06"
64+
"version" : "0.22",
65+
"x_generated_by_perl" : "v5.36.1",
66+
"x_maintainers" : [
67+
"Timothy Legge <timlegge@cpan.org>"
68+
],
69+
"x_serialization_backend" : "JSON::PP version 4.07",
70+
"x_spdx_expression" : "Artistic-1.0-Perl OR GPL-1.0-or-later"
6171
}
72+

‎META.yml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,32 @@ abstract: "Perl extension to OpenSSL's PKCS10 API."
33
author:
44
- 'JoNO <jonozzz@yahoo.com>'
55
build_requires:
6-
ExtUtils::MakeMaker: '0'
7-
Test: '0'
6+
Crypt::OpenSSL::Guess: '0.11'
7+
Crypt::OpenSSL::RSA: '0'
8+
Test::More: '0'
89
configure_requires:
910
Crypt::OpenSSL::Guess: '0.11'
1011
ExtUtils::MakeMaker: '0'
11-
dynamic_config: 1
12-
generated_by: 'ExtUtils::MakeMaker version 7.62, CPAN::Meta::Converter version 2.150010'
12+
dynamic_config: 0
13+
generated_by: 'Dist::Zilla version 6.030, CPAN::Meta::Converter version 2.150010'
1314
license: perl
1415
meta-spec:
1516
url: http://module-build.sourceforge.net/META-spec-v1.4.html
1617
version: '1.4'
1718
name: Crypt-OpenSSL-PKCS10
18-
no_index:
19-
directory:
20-
- t
21-
- inc
19+
provides: {}
2220
recommends:
2321
Crypt::OpenSSL::Bignum: '0'
2422
requires:
2523
Crypt::OpenSSL::RSA: '0'
24+
perl: '5.008'
2625
resources:
2726
bugtracker: https://rt.cpan.org/Public/Dist/Display.html?Name=Crypt-OpenSSL-PKCS10
28-
repository: git@github.com:perl-net-saml2/perl-Crypt-OpenSSL-PKCS10.git
29-
homepage: https://metacpan.org/pod/Crypt::OpenSSL::PKCS10
30-
license: http://dev.perl.org/licenses/
31-
version: '0.20'
32-
x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
27+
homepage: http://search.cpan.org/dist/Crypt-OpenSSL-PKCS10/
28+
repository: git://github.com/perl-net-saml2/perl-Crypt-OpenSSL-PKCS10.git
29+
version: '0.22'
30+
x_generated_by_perl: v5.36.1
31+
x_maintainers:
32+
- 'Timothy Legge <timlegge@cpan.org>'
33+
x_serialization_backend: 'YAML::Tiny version 1.74'
34+
x_spdx_expression: 'Artistic-1.0-Perl OR GPL-1.0-or-later'

‎Makefile.PL‎

Lines changed: 57 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1-
use 5.008000;
1+
# This Makefile.PL for Crypt-OpenSSL-PKCS10 was generated by
2+
# Dist::Zilla::Plugin::MakeMaker::Awesome 0.49.
3+
# Don't edit it but the dist.ini and plugins used to construct it.
4+
5+
use strict;
6+
use warnings;
7+
8+
use 5.008;
29
use ExtUtils::MakeMaker;
3-
use Crypt::OpenSSL::Guess qw(openssl_inc_paths openssl_lib_paths);
410

511
use Config;
612
use File::Spec;
7-
use Crypt::OpenSSL::Guess;
13+
use Crypt::OpenSSL::Guess qw(openssl_version openssl_inc_paths openssl_lib_paths);
14+
815
my %args;
916

1017
my ($major, $minor, $patch) = openssl_version();
@@ -14,8 +21,6 @@ $args{INC} = openssl_inc_paths();
1421
$args{LIBS} = [openssl_lib_paths() . ' -lssl -lcrypto'];
1522

1623
my $cc_option_flags;
17-
#my $cc_option_flags = $major ge 3 ? ' -DOPENSSL_API_COMPAT=30000' : ' -DOPENSSL_API_COMPAT=10100';
18-
#my $cc_option_flags = $major ge 3 ? ' -DOPENSSL_API_COMPAT=10100' : ' -DOPENSSL_API_COMPAT=10100';
1924

2025
if ($Config::Config{cc} =~ /gcc/i) {
2126
$cc_option_flags .= $ENV{AUTHOR_TESTING} ? ' -Wall -Werror' : ' -Wall';
@@ -37,7 +42,7 @@ if ($Config{gccversion} =~ /llvm/i) {
3742
$cc_option_flags .= ' -Wno-compound-token-split-by-macro';
3843
}
3944

40-
if ($Config{perl_version} <= 20) {
45+
if ($Config{PERL_VERSION} <= 20) {
4146
$cc_option_flags .= ' -Wno-error=pointer-bool-conversion';
4247
}
4348
}
@@ -48,41 +53,51 @@ if ($Config{myuname} =~ /sunos|solaris/i) {
4853
$args{OPTIMIZE} = $cc_option_flags;
4954
}
5055

51-
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
52-
# the contents of the Makefile that is written.
53-
WriteMakefile(
54-
NAME => 'Crypt::OpenSSL::PKCS10',
55-
VERSION_FROM => 'PKCS10.pm',
56-
PREREQ_PM => { Crypt::OpenSSL::RSA => 0}, # e.g., Module::Name => 1.1
57-
($] >= 5.005 ? ## Add these new keywords supported since 5.005
58-
(ABSTRACT_FROM => 'PKCS10.pm',
59-
AUTHOR => 'JoNO <jonozzz@yahoo.com>') : ()),
60-
INC => openssl_inc_paths(),
61-
62-
'dist' => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
63-
'clean' => { FILES => 'Crypt-OpenSSL-PKCS10-*' },
64-
( $ExtUtils::MakeMaker::VERSION >= 6.3002 ? ( 'LICENSE' => 'perl', ) : () ),
65-
(
66-
$ExtUtils::MakeMaker::VERSION >= 6.46
67-
? (
68-
'META_MERGE' => {
69-
recommends => {
70-
'Crypt::OpenSSL::Bignum' => 0,
71-
},
72-
configure_requires => {
73-
'Crypt::OpenSSL::Guess' => '0.11',
74-
},
75-
build_requires => {
76-
'Test' => 0, # For testing
77-
},
78-
resources => {
79-
'license' => 'http://dev.perl.org/licenses/',
80-
'homepage' => 'https://metacpan.org/pod/Crypt::OpenSSL::PKCS10',
81-
'bugtracker' => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Crypt-OpenSSL-PKCS10',
82-
}
83-
}
84-
)
85-
: ()
86-
),
56+
my %WriteMakefileArgs = (
57+
"ABSTRACT" => "Perl extension to OpenSSL's PKCS10 API.",
58+
"AUTHOR" => "JoNO <jonozzz\@yahoo.com>",
59+
"BUILD_REQUIRES" => {
60+
"Crypt::OpenSSL::Guess" => "0.11"
61+
},
62+
"CONFIGURE_REQUIRES" => {
63+
"Crypt::OpenSSL::Guess" => "0.11",
64+
"ExtUtils::MakeMaker" => 0
65+
},
66+
"DISTNAME" => "Crypt-OpenSSL-PKCS10",
67+
"LICENSE" => "perl",
68+
"MIN_PERL_VERSION" => "5.008",
69+
"NAME" => "Crypt::OpenSSL::PKCS10",
70+
"PREREQ_PM" => {
71+
"Crypt::OpenSSL::RSA" => 0
72+
},
73+
"TEST_REQUIRES" => {
74+
"Crypt::OpenSSL::RSA" => 0,
75+
"Test::More" => 0
76+
},
77+
"VERSION" => "0.22",
78+
"test" => {
79+
"TESTS" => "t/*.t"
80+
}
81+
);
82+
83+
%WriteMakefileArgs = (
84+
%WriteMakefileArgs,
8785
%args,
8886
);
87+
88+
my %FallbackPrereqs = (
89+
"Crypt::OpenSSL::Guess" => "0.11",
90+
"Crypt::OpenSSL::RSA" => 0,
91+
"Test::More" => 0
92+
);
93+
94+
unless ( eval { ExtUtils::MakeMaker->VERSION('6.63_03') } ) {
95+
delete $WriteMakefileArgs{TEST_REQUIRES};
96+
delete $WriteMakefileArgs{BUILD_REQUIRES};
97+
$WriteMakefileArgs{PREREQ_PM} = \%FallbackPrereqs;
98+
}
99+
100+
delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
101+
unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
102+
103+
WriteMakefile(%WriteMakefileArgs);

‎PKCS10.pm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
3030

3131
#);
3232

33-
our $VERSION = '0.21';
33+
our $VERSION = '0.22';
3434

3535
require XSLoader;
3636
XSLoader::load('Crypt::OpenSSL::PKCS10', $VERSION);
@@ -49,6 +49,8 @@ sub new_from_rsa {
4949
1;
5050
__END__
5151
52+
# ABSTRACT: Perl extension to OpenSSL's PKCS10 API.
53+
5254
=head1 NAME
5355
5456
Crypt::OpenSSL::PKCS10 - Perl extension to OpenSSL's PKCS10 API.

‎cpanfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# This file is generated by Dist::Zilla::Plugin::CPANFile v6.030
22
# Do not edit this file directly. To change prereqs, edit the `dist.ini` file.
33

4+
requires "Crypt::OpenSSL::RSA" => "0";
45
requires "perl" => "5.008";
6+
recommends "Crypt::OpenSSL::Bignum" => "0";
57

68
on 'build' => sub {
7-
requires "Crypt::OpenSSL::Guess" => "0";
9+
requires "Crypt::OpenSSL::Guess" => "0.11";
810
};
911

1012
on 'test' => sub {
@@ -13,12 +15,12 @@ on 'test' => sub {
1315
};
1416

1517
on 'configure' => sub {
16-
requires "Crypt::OpenSSL::Guess" => "0";
18+
requires "Crypt::OpenSSL::Guess" => "0.11";
19+
requires "ExtUtils::MakeMaker" => "0";
1720
};
1821

1922
on 'develop' => sub {
2023
requires "Test::CPAN::Meta::JSON" => "0.16";
21-
requires "Test::Kwalitee" => "1.21";
2224
requires "Test::Pod" => "1.41";
2325
requires "Test::Spelling" => "0.12";
2426
};

0 commit comments

Comments
 (0)