Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
msimerson authored Feb 15, 2024
2 parents 9b03e3a + 4d436e2 commit d4da3af
Show file tree
Hide file tree
Showing 34 changed files with 3,137 additions and 1,908 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CI Tests

on: [ push ]
on: [ push, pull_request ]

jobs:
perl_tester:
Expand All @@ -16,16 +16,17 @@ jobs:
- "5.26"

container:
image: perldocker/perl-tester:${{ matrix.perl-version }}
image: perl:${{ matrix.perl-version }}

steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1

- name: install-with-cpanm
uses: perl-actions/install-with-cpanm@stable
uses: perl-actions/install-with-cpanm@v1
continue-on-error: true
with:
install: |
Regexp::Common
Expand All @@ -45,6 +46,7 @@ jobs:
HTTP::Tiny
Test::File::ShareDir
Test::Output
Test::Exception
Net::IDN::Encode
CGI
XML::Validator::Schema
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Coverage Test

on: [ push ]
on: [ push, pull_request ]

jobs:
perl_tester:
Expand All @@ -15,16 +15,16 @@ jobs:

container:
image: perl:${{ matrix.perl-version }}
# image: perldocker/perl-tester:${{ matrix.perl-version }}

steps:
- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Install Perl Modules
uses: perl-actions/install-with-cpanm@v1
continue-on-error: true
with:
install: |
Regexp::Common
Expand All @@ -45,10 +45,10 @@ jobs:
HTTP::Tiny
Test::File::ShareDir
Test::Output
Test::Exception
Net::IDN::Encode
CGI
XML::Validator::Schema
Test::Exception
Devel::Cover::Report::Coveralls
Net::DNS::Resolver::Mock
sudo: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/critic.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Perl Critic

on: [ push ]
on: [ push, pull_request ]

jobs:
perl_tester:
Expand All @@ -18,7 +18,7 @@ jobs:

steps:
- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
31 changes: 0 additions & 31 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.

This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Status Badges

[![Build Status](https://travis-ci.org/msimerson/mail-dmarc.svg?branch=master)](https://travis-ci.org/msimerson/mail-dmarc)
[![Build Status](https://github.com/msimerson/mail-dmarc/actions/workflows/ci.yml/badge.svg)](https://github.com/msimerson/mail-dmarc/actions/workflows/ci.yml)

[![Coverage Status](https://coveralls.io/repos/msimerson/mail-dmarc/badge.svg)](https://coveralls.io/r/msimerson/mail-dmarc)

Expand Down Expand Up @@ -287,7 +287,7 @@ The daddy of this perl module was a [DMARC module for the qpsmtpd MTA](https://g

# COPYRIGHT AND LICENSE

This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.

This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
4 changes: 2 additions & 2 deletions lib/Mail/DMARC.pm
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ __END__
=head1 Status Badges
=for markdown [![Build Status](https://travis-ci.org/msimerson/mail-dmarc.svg?branch=master)](https://travis-ci.org/msimerson/mail-dmarc)
=for markdown [![Build Status](https://github.com/msimerson/mail-dmarc/actions/workflows/ci.yml/badge.svg)](https://github.com/msimerson/mail-dmarc/actions/workflows/ci.yml)
=for markdown [![Coverage Status](https://coveralls.io/repos/msimerson/mail-dmarc/badge.svg)](https://coveralls.io/r/msimerson/mail-dmarc)
Expand Down Expand Up @@ -655,7 +655,7 @@ Ricardo Signes <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Base.pm
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/HTTP.pm
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Policy.pm
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
3 changes: 2 additions & 1 deletion lib/Mail/DMARC/PurePerl.pm
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ sub is_whitelisted {
foreach my $line ( split /\n/, $self->slurp($white_file) ) {
next if $line =~ /^#/; # ignore comments
my ($lip,$reason) = split /\s+/, $line, 2;
next if not defined $lip;
$self->{_whitelist}{$lip} = $reason;
};
};
Expand Down Expand Up @@ -753,7 +754,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report.pm
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Aggregate.pm
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Aggregate/Metadata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Aggregate/Record.pm
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Aggregate/Record/Auth_Results.pm
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Aggregate/Record/Auth_Results/SPF.pm
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Aggregate/Record/Identifiers.pm
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Aggregate/Record/Row.pm
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Receive.pm
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Send.pm
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Send/HTTP.pm
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Send/SMTP.pm
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Store.pm
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Store/SQL.pm
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Store/SQL/Grammars/MySQL.pm
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Store/SQL/Grammars/PostgreSQL.pm
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/Store/SQL/Grammars/SQLite.pm
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Report/URI.pm
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mail/DMARC/Result.pm
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ Marc Bradshaw <[email protected]>
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2023 by Matt Simerson.
This software is copyright (c) 2024 by Matt Simerson.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand Down
Loading

0 comments on commit d4da3af

Please sign in to comment.