Merge ~mirespace/ubuntu/+source/libmail-dmarc-perl:fix-dmarc-receive into ubuntu/+source/libmail-dmarc-perl:ubuntu/noble-devel

[Miriam España Acebal]

Hi,

ppa for this is

https://launchpad.net/~mirespace/+archive/ubuntu/libmail-dmarc-perl-suggested
ppa:mirespace/libmail-dmarc-perl-suggested

package for Noble, suffix ~mirespace10. This is the package that passed the MIR review and security reviews.

[Bryce Harrington (bryce)]

A few whitespace nits. Not necessary to fix if you're in a hurry to upload.

For the changelog it would be nice to see a statement in the first line or two what the goal of this set of changes is. I.e. "Readjust dependencies to allow inclusion in main, so that spamassassin can start depending on DMARC for stronger spam filtering." This is also not necessary to fix if you're in a hurry to upload, since the various bug references will lead one to LP: #2061865 which has a good explanation.

You might want to squash some of the commits together, but you mentioned already about cleanup so perhaps you plan this already?

[Miriam España Acebal (mirespace)]

Polishing the make the changes happen .. on it! Thank you both

[Miriam España Acebal (mirespace)]

Changes done.

I uploaded the package with this changes to

ppa ppa:mirespace/spamassassin-dmarc-mir
https://launchpad.net/~mirespace/+archive/ubuntu/spamassassin-dmarc-mir/+packages

@Paride: I removed the "-series" line ... it was for the series file on d/p, but removing it for avoiding confusion and because it's known to be changed indirectly.

[Bryce Harrington (bryce)]

I notice autopkgtest passed on an earlier iteration:

  - libmail-dmarc-perl/1.20230215-1ubuntu1~mirespace7
    + ✅ libmail-dmarc-perl on noble for amd64 @ 21.02.24 11:08:26 Log️ 🗒️
    + ✅ libmail-dmarc-perl on noble for arm64 @ 21.02.24 11:08:55 Log️ 🗒️
    + ✅ libmail-dmarc-perl on noble for armhf @ 21.02.24 11:13:34 Log️ 🗒️
    + ✅ libmail-dmarc-perl on noble for i386 @ 21.02.24 11:08:16 Log️ 🗒️
    + ✅ libmail-dmarc-perl on noble for ppc64el @ 21.02.24 11:09:25 Log️ 🗒️
    + ✅ libmail-dmarc-perl on noble for s390x @ 21.02.24 11:39:48 Log️ 🗒️

I've re-triggered on the ~mirespace10 version. Since this MP includes tests it seems well worth doublechecking.

I read through the new test cases. It would be helpful to include a comment or something as to what distinguishes each test email - i.e. that this one tests for missing DMARC, this one handles invalid situation A, this one situation B, etc. That info could be included in the splitting-check test, or even better if it could be included in the test emails themselves (maybe as the body text?)

Do any of the test cases cover the IDN or MIME module changes? If so those would be worth calling out. I'm guessing though that those were drop-in replacements so no new tests were needed... Does the package already have test cases with coverage on the functionality used from those modules?
Is 'ko' in the filenames indicating "! ok"? Or K.O. as in "knocked out!" Clever :-)

review: Needs Information

[Miriam España Acebal (mirespace)]

Bryce, I will try to summarize or add the info that I write to the MIR bug about the tests:

we use the data from spamassassin's test :
- d/t/data/nice contains messages that qualifies as PASS due to the DMARC rules (DMARC_PASS) and
- d/t/data/spam contains messages that are market as REJECT, QUARENTINE, MISSING or NONE.

     root@Mspamassasin-suggested:~# l spam_mails/
     nodmarc.eml noneko.eml quarko.eml rejectko.eml strictrejectko.eml
     root@Mspamassasin-suggested:~# spamc -R < spam_mails/rejectko.eml | grep DMARC
      1.8 DMARC_REJECT DMARC reject policy
     root@Mspamassasin-suggested:~# spamc -R < spam_mails/strictrejectko.eml | grep DMARC
      1.8 DMARC_REJECT DMARC reject policy
     root@Mspamassasin-suggested:~# spamc -R < spam_mails/quarko.eml | grep DMARC
      1.2 DMARC_QUAR DMARC quarantine policy
     root@Mspamassasin-suggested:~# spamc -R < spam_mails/nodmarc.eml | grep DMARC
      0.0 DMARC_MISSING Missing DMARC policy
     root@Mspamassasin-suggested:~# spamc -R < spam_mails/noneko.eml | grep DMARC
      0.9 DMARC_NONE DMARC none policy

in a comment at the beginning of the test file.

The names for the filenames used as data in the tests come also from spamassassin's developers... they are the clever ones, and I like both of your interpretations :).

I used, for checking the changes for IDN and MIME dependency changes, the libmail-dmarc-perl building tests themself plus the t/dmarc.t test in spamassassin test suite package (without the implicit net tests on this file) [1]:

  $ make test TEST_FILES="t/dmarc.t"

I'm running this also.

I'll put the comment on the test file and I'll post here the results of the test (only the t/dmarc.t I assume that because it has been built, the build tests passed).

[1] https://bugs.launchpad.net/ubuntu/+source/libmail-dmarc-perl/+bug/2023971/comments/12

[Miriam España Acebal (mirespace)]

Checking t/dmarc.t in a lxc vm with this MP package libamil-dmarc-package: PASSED

# We installed the proper packages we want to test:

root@Ndmarc-final:~# apt-cache policy libmail-dmarc-perl
libmail-dmarc-perl:
  Installed: 1.20230215-1ubuntu1
  Candidate: 1.20230215-1ubuntu1
  Version table:
 *** 1.20230215-1ubuntu1 500
        500 https://ppa.launchpadcontent.net/mirespace/spamassassin-dmarc-mir/ubuntu noble/main amd64 Packages
        100 /var/lib/dpkg/status
     1.20230215-1ubuntu1~mirespace10 500
        500 https://ppa.launchpadcontent.net/mirespace/libmail-dmarc-perl-suggested/ubuntu noble/main amd64 Packages
     1.20230215-1 500
        500 http://archive.ubuntu.com/ubuntu noble/universe amd64 Packages
root@Ndmarc-final:~# apt-cache policy spamassassin
spamassassin:
  Installed: 4.0.0-8ubuntu5
  Candidate: 4.0.0-8ubuntu5+ppa1
  Version table:
     4.0.0-8ubuntu5+ppa1 500
        500 https://ppa.launchpadcontent.net/mirespace/spamassassin-dmarc-mir/ubuntu noble/main amd64 Packages
 *** 4.0.0-8ubuntu5 100
        100 http://archive.ubuntu.com/ubuntu noble-proposed/main amd64 Packages
        100 /var/lib/dpkg/status
     4.0.0-8ubuntu4 500
        500 http://archive.ubuntu.com/ubuntu noble/main amd64 Packages

#preparing tests as stated in t/README:

# step 0

root@Ndmarc-final:~/spamassassin# perl Makefile.PL
What email address or URL should be used in the suspected-spam report
text for users who want more information on your filter installation?
(In particular, ISPs should change this to a local Postmaster contact)
default text: [the administrator of that system]

NOTE: settings for "make test" are now controlled using "t/config.dist".
See that file if you wish to customize what tests are run, and how.

checking module dependencies and their versions...

***************************************************************************
NOTE: the optional Digest::SHA1 module is not installed.

  The Digest::SHA1 module is still required by the Razor2 plugin.
  Other modules prefer Digest::SHA, which is a Perl base module.

***************************************************************************
NOTE: the optional Net::LibIDN2 module is not installed.

  Newer version of the optional Net::LibIDN module.
  Provides mapping between Internationalized Domain Names (IDN) in
  Unicode and ASCII-compatible encoding (ACE) for use in DNS and comparisions.
  The module is optional, but without it Unicode IDN names found in mail will
  not be suitable for DNS queries and welcome/blocklisting.

***************************************************************************
NOTE: the optional MaxMind::DB::Reader module is not installed.

  Used by the RelayCountry plugin (not enabled by default) to
  determine the domain country codes of each relay in the path of an email.
  Also used by the URILocalBL plugin (not enabled by default) to provide ISP
  and Country code based filtering.

***************************************************************************
NOTE: the optional MaxMind::DB::Reader::XS module is not installed.

  Recommended much faster version of the optional MaxMind::DB::Reader module,
  used by RelayCountry / URILocalBL plugins...

[Miriam España Acebal (mirespace)]

Also, the dependency splitting works as expected:

root@Ndmarc-final:~# for p in $(apt install -s -t noble-proposed spamassassin | grep Inst | cut -d' ' -f2); do echo -n ${p} && echo -n " " && apt-cache policy ${p} | grep archive.ubuntu | cut -d'/' -f5 | cut -d' ' -f1 ; done | grep universe

WARNING: apt does not have a stable CLI interface. Use with caution in scripts.

libclass-inspector-perl universe
libemail-simple-perl universe
libfile-sharedir-perl universe
libnet-ip-perl universe
libregexp-common-perl universe
libmail-dmarc-perl universe

[Bryce Harrington (bryce)]

Ok, thanks, this looks good!

review: Approve

[Miriam España Acebal (mirespace)]

Thanks Bryce for your support and patience! Uploading:

❯ dput ubuntu ../libmail-dmarc-perl_1.20230215-1ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../libmail-dmarc-perl_1.20230215-1ubuntu1_source.changes: Valid signature from 703D47ACCD48A2E6
Checking signature on .dsc
gpg: ../libmail-dmarc-perl_1.20230215-1ubuntu1.dsc: Valid signature from 703D47ACCD48A2E6
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libmail-dmarc-perl_1.20230215-1ubuntu1.dsc: done.
  Uploading libmail-dmarc-perl_1.20230215-1ubuntu1.debian.tar.xz: done.
  Uploading libmail-dmarc-perl_1.20230215-1ubuntu1_source.buildinfo: done.
  Uploading libmail-dmarc-perl_1.20230215-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: bryce, mirespace
Uploaders: bryce
MP auto-approved

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 8f886bc..604bfa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+libmail-dmarc-perl (1.20230215-1ubuntu1) noble; urgency=medium
+
+  * Promoting libmail-dmarc-perl to main (LP: #2061865). Readjust
+    dependencies to allow inclusion in main, so that spamassassin
+    can start depending on DMARC for stronger spam filtering (LP: #2023971).
+    - d/control: dependencies readjustment:
+      + separate dependencies in the binary package depending on
+        their use. Modules used in validation remain as binary
+        dependencies and the rest, used in reporting, are moved
+        to suggested dependencies.
+      + drop libemail-mime-perl in favor of libmime-tools-perl and
+        libemail-simple-perl (LP: #2030880).
+      + libnet-libidn-perl replaces libnet-idn-encode-perl (LP: #2038929).
+    - d/patches: Some refactors were needed to use libraries already
+      in main that do the same function:
+      + use-MIME-Entity-and-MIME-Parser-from-libmime-tools-p.patch
+        to use libmime-tools-perl instead of Email::MIME (LP: #2030880).
+      + change-Net-IDN-Encode-by-Net-LibIDN.patch (LP: #2038929).
+    - d/tests:
+      + splitting-check: validate our dependencies split through
+        this check. Thanks to Sergio Durigan Jr. for all the fixing here.
+      + data/*.eml: mails used in the test (the same used by spamassassin
+        t/dmarc.t test).
+
+ -- Miriam España Acebal <[e-mail]>  Mon, 11 Dec 2023 16:43:31 +0200
+
 libmail-dmarc-perl (1.20230215-1) unstable; urgency=medium
 
   * New upstream version 1.20230215
diff --git a/debian/control b/debian/control
index a3b621c..3ddfcb8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: libmail-dmarc-perl
-Maintainer: Noah Meyerhans <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Noah Meyerhans <[e-mail]>
 Section: perl
 Priority: optional
 Build-Depends: debhelper-compat (= 13)
@@ -7,11 +8,12 @@ Build-Depends-Indep: perl,
 		     libconfig-tiny-perl <!nocheck>,
 		     libfile-sharedir-perl,
 		     libio-socket-ssl-perl <!nocheck>,
-		     libnet-idn-encode-perl,
-		     libemail-mime-perl,
+		     libnet-libidn-perl,
 		     libmodule-build-perl,
 		     libtest-file-sharedir-perl,
 		     libemail-sender-perl,
+		     libemail-simple-perl,
+		     libmime-tools-perl,
 		     libdbix-simple-perl,
 		     libdbd-sqlite3-perl,
 		     libtest-exception-perl <!nocheck>,
@@ -37,28 +39,29 @@ Depends: ${misc:Depends},
 	 libconfig-tiny-perl,
 	 libio-socket-ssl-perl,
 	 libfile-sharedir-perl,
+	 libemail-simple-perl,
+	 libmime-tools-perl,
 	 libnet-dns-perl,
-	 libnet-idn-encode-perl,
+	 libnet-libidn-perl,
 	 libnet-ip-perl,
 	 libnet-ssleay-perl,
-	 libemail-mime-perl,
-	 libtest-file-sharedir-perl,
-	 libemail-sender-perl,
-	 libdbix-simple-perl,
-	 libdbd-sqlite3-perl,
-	 libtest-output-perl,
 	 libregexp-common-perl,
 	 libsocket6-perl,
 	 liburi-perl,
 	 libxml-libxml-perl,
 	 publicsuffix,
-Recommends:
+Suggests:
 	    libjson-perl,
 	    libmail-dkim-perl,
 	    libnet-http-perl,
 	    libnet-imap-simple-perl,
 	    libnet-server-perl,
 	    libnet-smtps-perl,
+	    libdbd-sqlite3-perl,
+	    libdbix-simple-perl,
+	    libemail-sender-perl,
+	    libtest-file-sharedir-perl,
+	    libtest-output-perl,
 Description: Perl implementation of DMARC
  Mail::DMARC is a suite of tools for implementing DMARC. It adheres to the
  2013 DMARC draft, intending to implement every MUST and every SHOULD.
diff --git a/debian/patches/change-Net-IDN-Encode-by-Net-LibIDN.patch b/debian/patches/change-Net-IDN-Encode-by-Net-LibIDN.patch
new file mode 100644
index 0000000..a1b74c2
--- /dev/null
+++ b/debian/patches/change-Net-IDN-Encode-by-Net-LibIDN.patch
@@ -0,0 +1,72 @@
+Description: use Net::LibIDN libnet-libidn-perl instead
+ of libnet-idn-encode-perl for idn to unicode conversion.
+Author: Miriam Espana Acebal <[e-mail]>
+Date: Tue, 9 Jan 2024 13:36:20 +0100
+Bug-ubuntu: https://bugs.launchpad.net/bugs/2038929
+Forwarded: no
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/lib/Mail/DMARC/Base.pm
++++ b/lib/Mail/DMARC/Base.pm
+@@ -10,7 +10,7 @@
+ use HTTP::Tiny;
+ use IO::File;
+ use Net::DNS::Resolver;
+-use Net::IDN::Encode qw/domain_to_unicode/;
++use Net::LibIDN  qw/idn_to_unicode/;
+ use Net::IP;
+ use Regexp::Common 2013031301 qw /net/;
+ use Socket;
+@@ -143,7 +143,7 @@
+ 
+     my $public_suffixes = $self->get_public_suffix_list();
+ 
+-    $zone = domain_to_unicode( $zone ) if $zone =~ /xn--/;
++    $zone = idn_to_unicode( $zone ) if $zone =~ /xn--/;
+ 
+     return 1 if $public_suffixes->{$zone};
+ 
+--- a/Build.PL
++++ b/Build.PL
+@@ -54,7 +54,7 @@
+     "MIME::Entity" => 0,
+     "MIME::Parser" => 0,
+     "Net::DNS::Resolver" => 0,
+-    "Net::IDN::Encode" => 0,
++    "Net::LibIDN" => 0,
+     "Net::IP" => 0,
+     "Net::SSLeay" => 0,
+     "POSIX" => 0,
+--- a/META.json
++++ b/META.json
+@@ -55,7 +55,7 @@
+             "IO::Uncompress::Unzip" : "0",
+             "Mail::Field" : "0",
+             "Mail::Internet" : "0",
+-            "MIME::Entity" : "0",
++            "Net::LibIDN" : "0",
+             "MIME::Parser" : "0",
+             "Net::DNS::Resolver" : "0",
+             "Net::IDN::Encode" : "0",
+--- a/META.yml
++++ b/META.yml
+@@ -132,7 +132,7 @@
+   IO::Uncompress::Unzip: '0'
+   Mail::Field : '0'
+   Mail::Internet : '0'
+-  MIME::Entity: '0'
++  Net::LibIDN': '0'
+   MIME::Parser: '0'
+   Net::DNS::Resolver: '0'
+   Net::IDN::Encode: '0'
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -70,7 +70,7 @@
+         "IO::Uncompress::Unzip" => 0,
+         "Mail::Field" => 0,
+         "Mail::Internet" => 0,
+-        "MIME::Entity" => 0,
++        "Net::LibIDN" => 0,
+         "MIME::Parser" => 0,
+         "Net::DNS::Resolver" => 0,
+         "Net::IDN::Encode" => 0,
diff --git a/debian/patches/series b/debian/patches/series
index ff0a249..6cda580 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 0001-pod-Fix-missing-and-malformed-NAME-headings.patch
 0005-recommend-system-psl.patch
 skip_network_tests.patch
+use-MIME-Entity-and-MIME-Parser-from-libmime-tools-p.patch
+change-Net-IDN-Encode-by-Net-LibIDN.patch
diff --git a/debian/patches/use-MIME-Entity-and-MIME-Parser-from-libmime-tools-p.patch b/debian/patches/use-MIME-Entity-and-MIME-Parser-from-libmime-tools-p.patch
new file mode 100644
index 0000000..1c50291
--- /dev/null
+++ b/debian/patches/use-MIME-Entity-and-MIME-Parser-from-libmime-tools-p.patch
@@ -0,0 +1,251 @@
+Description: use MIME::Entity and MIME::Parser from libmime-tools-perl
+ instead of libemail-mime-perl
+Author: Miriam Espana Acebal <[e-mail]>
+Date: Fri, 1 Dec 2023 23:36:20 +0100
+Bug-ubuntu: https://bugs.launchpad.net/bugs/2030880
+Forwarded: no
+---
+ Build.PL                           |  3 +-
+ META.json                          |  3 +-
+ META.yml                           |  3 +-
+ Makefile.PL                        |  3 +-
+ lib/Mail/DMARC/Report/Receive.pm   | 10 ++--
+ lib/Mail/DMARC/Report/Send/SMTP.pm | 83 +++++++++++++-----------------
+ 6 files changed, 49 insertions(+), 56 deletions(-)
+
+Index: libmail-dmarc-perl/Build.PL
+===================================================================
+--- libmail-dmarc-perl.orig/Build.PL	2023-12-12 13:25:40.554260151 +0100
++++ libmail-dmarc-perl/Build.PL	2023-12-12 13:34:31.661666249 +0100
+@@ -35,7 +35,6 @@
+     "DBD::SQLite" => "1.31",
+     "DBIx::Simple" => "1.35",
+     "Data::Dumper" => 0,
+-    "Email::MIME" => 0,
+     "Email::Sender" => 0,
+     "Email::Sender::Simple" => "1.300032",
+     "Email::Simple" => 0,
+@@ -50,6 +49,10 @@
+     "IO::Socket::SSL" => 0,
+     "IO::Uncompress::Gunzip" => 0,
+     "IO::Uncompress::Unzip" => 0,
++    "Mail::Field" => 0,
++    "Mail::Internet" => 0,
++    "MIME::Entity" => 0,
++    "MIME::Parser" => 0,
+     "Net::DNS::Resolver" => 0,
+     "Net::IDN::Encode" => 0,
+     "Net::IP" => 0,
+Index: libmail-dmarc-perl/META.json
+===================================================================
+--- libmail-dmarc-perl.orig/META.json	2023-12-12 13:25:40.554260151 +0100
++++ libmail-dmarc-perl/META.json	2023-12-12 13:36:22.713205589 +0100
+@@ -39,7 +39,6 @@
+             "DBD::SQLite" : "1.31",
+             "DBIx::Simple" : "1.35",
+             "Data::Dumper" : "0",
+-            "Email::MIME" : "0",
+             "Email::Sender" : "0",
+             "Email::Sender::Simple" : "1.300032",
+             "Email::Simple" : "0",
+@@ -54,6 +53,10 @@
+             "IO::Socket::SSL" : "0",
+             "IO::Uncompress::Gunzip" : "0",
+             "IO::Uncompress::Unzip" : "0",
++            "Mail::Field" : "0",
++            "Mail::Internet" : "0",
++            "MIME::Entity" : "0",
++            "MIME::Parser" : "0",
+             "Net::DNS::Resolver" : "0",
+             "Net::IDN::Encode" : "0",
+             "Net::IP" : "0",
+Index: libmail-dmarc-perl/META.yml
+===================================================================
+--- libmail-dmarc-perl.orig/META.yml	2023-12-12 13:25:40.554260151 +0100
++++ libmail-dmarc-perl/META.yml	2023-12-12 13:37:35.244866669 +0100
+@@ -116,7 +116,6 @@
+   DBD::SQLite: '1.31'
+   DBIx::Simple: '1.35'
+   Data::Dumper: '0'
+-  Email::MIME: '0'
+   Email::Sender: '0'
+   Email::Sender::Simple: '1.300032'
+   Email::Simple: '0'
+@@ -131,6 +130,10 @@
+   IO::Socket::SSL: '0'
+   IO::Uncompress::Gunzip: '0'
+   IO::Uncompress::Unzip: '0'
++  Mail::Field : '0'
++  Mail::Internet : '0'
++  MIME::Entity: '0'
++  MIME::Parser: '0'
+   Net::DNS::Resolver: '0'
+   Net::IDN::Encode: '0'
+   Net::IP: '0'
+Index: libmail-dmarc-perl/Makefile.PL
+===================================================================
+--- libmail-dmarc-perl.orig/Makefile.PL	2023-12-12 13:25:40.554260151 +0100
++++ libmail-dmarc-perl/Makefile.PL	2023-12-12 13:34:47.101606901 +0100
+@@ -54,7 +54,6 @@
+         "DBD::SQLite" => "1.31",
+         "DBIx::Simple" => "1.35",
+         "Data::Dumper" => 0,
+-        "Email::MIME" => 0,
+         "Email::Sender" => 0,
+         "Email::Sender::Simple" => "1.300032",
+         "Email::Simple" => 0,
+@@ -69,6 +68,10 @@
+         "IO::Socket::SSL" => 0,
+         "IO::Uncompress::Gunzip" => 0,
+         "IO::Uncompress::Unzip" => 0,
++        "Mail::Field" => 0,
++        "Mail::Internet" => 0,
++        "MIME::Entity" => 0,
++        "MIME::Parser" => 0,
+         "Net::DNS::Resolver" => 0,
+         "Net::IDN::Encode" => 0,
+         "Net::IP" => 0,
+Index: libmail-dmarc-perl/lib/Mail/DMARC/Report/Receive.pm
+===================================================================
+--- libmail-dmarc-perl.orig/lib/Mail/DMARC/Report/Receive.pm	2023-12-12 13:25:40.554260151 +0100
++++ libmail-dmarc-perl/lib/Mail/DMARC/Report/Receive.pm	2023-12-12 13:25:40.538260108 +0100
+@@ -6,7 +6,7 @@
+ 
+ use Carp;
+ use Data::Dumper;
+-use Email::MIME;
++use MIME::Parser;
+ use Email::Simple;
+ use Encode;
+ use IO::Uncompress::Unzip;
+@@ -137,8 +137,10 @@
+     };
+ 
+     my $rep_type;
+-    foreach my $part ( Email::MIME->new( $email->as_string )->parts ) {
+-        my ($c_type) = split /;/, $part->content_type || '';
++    my $parser = MIME::Parser->new;
++    foreach my $part ( $parser->parse_data( $email->as_string )->parts_DFS ) {
++        next if defined(!$part->bodyhandle); # something to process
++        my ($c_type) = split /;/, $part->effective_type || '';
+         next if $c_type eq 'text/plain';
+         if ( $c_type eq 'text/rfc822-headers' ) {
+             warn "TODO: handle forensic reports\n";  ## no critic (Carp)
+@@ -151,7 +153,7 @@
+             next;
+         }
+         my $bigger;
+-        my $filename = $part->{ct}{attributes}{name} || '';
++        my $filename = $part->head->recommended_filename || $part->bodyhandle->path || '';
+ 
+         if ( $c_type eq 'application/zip' || $c_type eq 'application/x-zip-compressed' ) {
+             $self->get_submitter_from_filename( $filename );
+Index: libmail-dmarc-perl/lib/Mail/DMARC/Report/Send/SMTP.pm
+===================================================================
+--- libmail-dmarc-perl.orig/lib/Mail/DMARC/Report/Send/SMTP.pm	2023-12-12 13:25:40.554260151 +0100
++++ libmail-dmarc-perl/lib/Mail/DMARC/Report/Send/SMTP.pm	2023-12-12 13:25:40.550260140 +0100
+@@ -6,7 +6,7 @@
+ 
+ use Carp;
+ use English '-no_match_vars';
+-use Email::MIME;
++use MIME::Entity;
+ #use Mail::Sender;  # something to consider
+ use Sys::Hostname;
+ use POSIX;
+@@ -115,24 +115,20 @@
+ sub assemble_too_big_message_object {
+     my ( $self, $to, $body ) = @_;
+ 
+-    my @parts    = Email::MIME->create(
+-        attributes => {
+-            content_type => "text/plain",
+-            disposition  => "inline",
+-            charset      => "US-ASCII",
+-        },
+-        body => $body,
+-    ) or croak "unable to add body!";
+-
+-    my $email = Email::MIME->create(
+-        header_str => [
+-            From => $self->config->{organization}{email},
+-            To   => $to,
+-            Date => $self->get_timestamp_rfc2822,
+-            Subject => 'DMARC too big report',
+-        ],
+-        parts => [@parts],
+-    ) or croak "unable to assemble message\n";
++    my $email = MIME::Entity->build(
++        Type => "multipart/mixed",
++	From => $self->config->{organization}{email},
++        To   => $to,
++        Date => $self->get_timestamp_rfc2822,
++        Subject => 'DMARC too big report'
++    ) or croak "unable to create header!";;
++
++    $email->attach(
++        Type => "text/plain",
++        Disposition  => "inline",
++        Charset      => "US-ASCII",
++        Data => $body,
++    ) or croak "unable to add body and assemble message!";
+ 
+     return $email;
+ }
+@@ -146,35 +142,27 @@
+     my $cf       = 'gzip';
+       $filename .= $cf eq 'gzip' ? '.gz' : '.zip';
+ 
+-    my @parts    = Email::MIME->create(
+-        attributes => {
+-            content_type => "text/plain",
+-            disposition  => "inline",
+-            charset      => "US-ASCII",
+-        },
+-        body => $self->human_summary( $agg_ref ),
+-    ) or croak "unable to add body!";
+-
+-    push @parts,
+-        Email::MIME->create(
+-        attributes => {
+-            filename     => $filename,
+-            content_type => "application/$cf",
+-            encoding     => "base64",
+-            name         => $filename,
+-        },
+-        body => $shrunk,
+-        ) or croak "unable to add report!";
+-
+-    my $email = Email::MIME->create(
+-        header_str => [
+-            From => $self->config->{organization}{email},
+-            To   => $to,
+-            Date => $self->get_timestamp_rfc2822,
+-            Subject => $self->get_subject( $agg_ref ),
+-        ],
+-        parts => [@parts],
+-    ) or croak "unable to assemble message\n";
++    my $email = MIME::Entity->build(
++        Type    => "multipart/mixed",
++        From    => $self->config->{organization}{email},
++        To      => $to,
++        Date    => $self->get_timestamp_rfc2822,
++        Subject => $self->get_subject( $agg_ref )
++    ) or croak "unable to create header!";;
++
++    $email->attach(
++        Type         => "text/plain",
++        Disposition  => "inline",
++        Charset      => "US-ASCII",
++        Data         => \$self->human_summary( $agg_ref ),
++    ) or croak "unable to add body to message!";
++
++    $email->attach(
++        Type      => "application/$cf",
++        Encoding  => "base64",
++        Filename  => $filename,
++        Data      => \$shrunk,
++    ) or croak "unable to add report to message!";
+ 
+     return $email;
+ }
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..04e9ccd
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,4 @@
+Tests: splitting-check
+Depends: @, spamassassin, spamc, spamd
+Restrictions: needs-root
+
diff --git a/debian/tests/data/nice/noneok.eml b/debian/tests/data/nice/noneok.eml
new file mode 100644
index 0000000..965a921
--- /dev/null
+++ b/debian/tests/data/nice/noneok.eml
@@ -0,0 +1,23 @@
+Return-Path: <[e-mail]>
+Received: from dmarc1.spamassassin.org (dmarc1.spamassassin.org [64.142.3.173])
+	by dmarc1.spamassassin.org (8.14.9/8.14.9) with ESMTP id 13DFe22R006047
+	(version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256 verify=NO);
+	Tue, 13 Apr 2021 11:40:02 -0400
+DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; d=
+        dmarc1.spamassassin.org; h=from:to:subject:message-id:date
+        :mime-version:content-type; s=selector1; bh=AaYQYg3XpWgPk5P7okfW
+        fbeh0V4=; b=jxH2H2N0++4M6VJ/tebY0f+GOMteGMsjcHkP1S+oTE8657JmosdR
+        S1VXtcJ5CwrXNTxe+9oW1bdU6QVL8fe7I1i2fXIEShaw6js+l5ymbvWts8o9kHZH
+        Jv8+ZfwaSkmr6onD679oTxBFGOT0PkI33kQOoZnVQY9xF73vZXEA7NoWg0rmaGcT
+        up8zinkgQV6BhdqJGzzi3je4QOdDgVmp1Pj42aaliurC0HlFZT/xAF0OZKVzwm3I
+        J2dlpC84zKIlqa9vGnx16N1wIyA+/GnpJ13s4hg9N7PrAi7iotanBh0W+v/ujLnr
+        MTjXJ11pMzp8xvoXtt3c+Ptxbf7TW4BxKA==
+From: SpamAssassin Test <[e-mail]>
+To: undisclosed-recipients:;
+Subject: test message 1
+Message-ID: <[e-mail]>
+Date: Sun, 11 Apr 2021 02:00:04 +0000
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+
+test message
diff --git a/debian/tests/data/nice/quarok.eml b/debian/tests/data/nice/quarok.eml
new file mode 100644
index 0000000..7075137
--- /dev/null
+++ b/debian/tests/data/nice/quarok.eml
@@ -0,0 +1,23 @@
+Return-Path: <[e-mail]>
+Received: from dmarc2.spamassassin.org (dmarc2.spamassassin.org [64.142.3.173])
+	by dmarc2.spamassassin.org (8.14.9/8.14.9) with ESMTP id 13DFe22R006047
+	(version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256 verify=NO);
+	Tue, 13 Apr 2021 11:40:02 -0400
+DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; d=
+        dmarc2.spamassassin.org; h=from:to:subject:message-id:date
+        :mime-version:content-type; s=selector1; bh=AaYQYg3XpWgPk5P7okfW
+        fbeh0V4=; b=2T58S24T2pMH5xPY2FB3YYH9qvdyXg6KZUIhNnj0bHFkmLbZWsYN
+        lMdfQojRifSwD28tN8tljiKE9tdwNJeWj8sy6hGzvw5ksGjvAHjb46ZifWi9oD+7
+        2ddAvVgKSV/wtVhg5dZCimNdDq3irKOQ881mPHuzdcXxEsNxYJUMR/989HTvdYLA
+        eJAcT00hum1LdL+wdxZiG/JyC0G5mThARi/b3KdC7MV8DukO3pSRJjWsIgnEJNna
+        +F7YCCJbp6Rm32HyUayYbov3ZMZ6MFzN9sYUkej/gUTl8LMacW3ibCcleeVD4oKN
+        ksOe+bE0CAevco5lyqSEjSAXigBAGoV2ow==
+From: SpamAssassin Test <[e-mail]>
+To: undisclosed-recipients:;
+Subject: test message 1
+Message-ID: <[e-mail]>
+Date: Sun, 11 Apr 2021 02:00:04 +0000
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+
+test message
diff --git a/debian/tests/data/nice/rejectok.eml b/debian/tests/data/nice/rejectok.eml
new file mode 100644
index 0000000..abf3603
--- /dev/null
+++ b/debian/tests/data/nice/rejectok.eml
@@ -0,0 +1,23 @@
+Return-Path: <[e-mail]>
+Received: from dmarc3.spamassassin.org (dmarc3.spamassassin.org [64.142.3.173])
+	by dmarc3.spamassassin.org (8.14.9/8.14.9) with ESMTP id 13DFe22R006047
+	(version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256 verify=NO);
+	Tue, 13 Apr 2021 11:40:02 -0400
+DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; d=
+        dmarc3.spamassassin.org; h=from:to:subject:message-id:date
+        :mime-version:content-type; s=selector1; bh=AaYQYg3XpWgPk5P7okfW
+        fbeh0V4=; b=SfeRUmdB+35RaFj+etCrogC358LU4jiyF7Oa7Qsp+kp3rV++gfSG
+        6NKWuGAAbY+sA3M1m8KBXZXavPzmLRcZaorgVuHdmnsF+/5Fzmz6DBOSKhcM54p2
+        1CfeiJAz0Rcudbxq9c3OJYlu1iSXDw1YwflRDgWv+Sed9T0jWmti1//N66NTZEKc
+        2O6EyI6KuBPUvRHRD04GBCAUweiM9HR4rVIDA9H7HFFPlVfB6Gm6iNhHy1tsuDSJ
+        +1wMJcojXrdRje8QC6bIyQLsY7/H4X0tUbjXNHhC4d2oA0WQQ7mvVGWhtFQFDfIx
+        G30/NRr8NICgPhjp91rAIXU9dKgdohdnWg==
+From: SpamAssassin Test <[e-mail]>
+To: undisclosed-recipients:;
+Subject: test message 1
+Message-ID: <[e-mail]>
+Date: Sun, 11 Apr 2021 02:00:04 +0000
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+
+test message
diff --git a/debian/tests/data/nice/strictrejectok.eml b/debian/tests/data/nice/strictrejectok.eml
new file mode 100644
index 0000000..f1edb89
--- /dev/null
+++ b/debian/tests/data/nice/strictrejectok.eml
@@ -0,0 +1,23 @@
+Return-Path: <[e-mail]>
+Received: from dmarc4.spamassassin.org (dmarc4.spamassassin.org [64.142.3.173])
+	by dmarc4.spamassassin.org (8.14.9/8.14.9) with ESMTP id 13DFe22R006047
+	(version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256 verify=NO);
+	Tue, 13 Apr 2021 11:40:02 -0400
+DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; d=
+        dmarc4.spamassassin.org; h=from:to:subject:message-id:date
+        :mime-version:content-type; s=selector1; bh=AaYQYg3XpWgPk5P7okfW
+        fbeh0V4=; b=0KPynqQB29CX6l5kp6+/x/HT7iTSC1G/u6yZJP0n/JpoqPVOvmbJ
+        l3/U36gxCHPxz1D7dFWBgU2chDkAlTcz/+TkKF4jcta8pPsLTsbaJH6egS0krT+4
+        ydMeck2W98pj2zgh2yz25VqAP418y0EP/1QqlSDckjUayVRz3xakPVGX8fp4iIB4
+        lQ08239wyqHua0mJxjQuqi/Xr6qDxaPPJOs/U9+ToKrLlKuLw0LC2VGlzsttTt5z
+        8OBBIGfda0srAASmuwpyeilyFieaMAnpBuI1RAW0H5Ol8mqUjy8rjNKvoIPfZSUN
+        hSDpuUAc9u58kcZZ0TSmodXazPYne4JlLw=
+From: SpamAssassin Test <[e-mail]>
+To: undisclosed-recipients:;
+Subject: test message 1
+Message-ID: <[e-mail]>
+Date: Sun, 11 Apr 2021 02:00:04 +0000
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+
+test message
diff --git a/debian/tests/data/spam/nodmarc.eml b/debian/tests/data/spam/nodmarc.eml
new file mode 100644
index 0000000..0ad2e96
--- /dev/null
+++ b/debian/tests/data/spam/nodmarc.eml
@@ -0,0 +1,22 @@
+Return-Path: <[e-mail]>
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.157]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for <[e-mail]>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: by proxy.google.com with SMTP id so1951389 for <[e-mail]>; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Message-ID: <[e-mail]>
+Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+From: [e-mail]
+To: [e-mail]
+Subject: Google News Alert - spamassassin
+MIME-Version: 1.0
+Content-Type: text/plain; charset="ISO-8859-1";
+
+SWSOFT Unveils Plesk 7, Deployed by 1&1
+Web Host Industry Review - USA
+... The software also features a newly designed Windows XP-like user interface,
+is equipped SpamAssassin, an open source anti-spam tool, and includes
+"Application ...
+<http://thewhir.com/marketwatch/sws021004.cfm>
+See all stories on this topic:
+<http://news.google.com/news?hl=en&lr=&ie=UTF-8&oe=utf8&client=google&num=30&newsc
+lusterurl=http://thewhir.com/marketwatch/sws021004.cfm>
+
diff --git a/debian/tests/data/spam/noneko.eml b/debian/tests/data/spam/noneko.eml
new file mode 100644
index 0000000..09edf41
--- /dev/null
+++ b/debian/tests/data/spam/noneko.eml
@@ -0,0 +1,21 @@
+Return-Path: <[e-mail]>
+Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432])
+	(using TLSv1.3 with cipher AEAD-AES128-GCM-SHA256 (128/128 bits))
+	(No client certificate requested)
+	by dmarc1.spamassassin.org (Postfix) with ESMTPS id EDD4E2073D
+	for <[e-mail]>; Tue, 15 Jun 2021 11:55:45 +0200 (CEST)
+Received: from PC ([2409:4063:231e:c527:1997:664a:34e5:7d88])
+        by smtp.gmail.com with ESMTPSA id n23sm15339981pgv.76.2021.06.15.02.55.37
+        for <[e-mail]>
+        (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128);
+        Tue, 15 Jun 2021 02:55:43 -0700 (PDT)
+Message-ID: <[e-mail]>
+From: SpamAssassin Test <[e-mail]>
+To: undisclosed-recipients:;
+Subject: test message 1
+Message-ID: <[e-mail]>
+Date: Mon, 08 Jun 2009 12:00:00 +0000
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+
+testing
diff --git a/debian/tests/data/spam/quarko.eml b/debian/tests/data/spam/quarko.eml
new file mode 100644
index 0000000..5fc5351
--- /dev/null
+++ b/debian/tests/data/spam/quarko.eml
@@ -0,0 +1,21 @@
+Return-Path: <[e-mail]>
+Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432])
+  (using TLSv1.3 with cipher AEAD-AES128-GCM-SHA256 (128/128 bits))
+  (No client certificate requested)
+  by dmarc2.spamassassin.org (Postfix) with ESMTPS id EDD4E2073D
+  for <[e-mail]>; Tue, 15 Jun 2021 11:55:45 +0200 (CEST)
+Received: from PC ([2409:4063:231e:c527:1997:664a:34e5:7d88])
+        by smtp.gmail.com with ESMTPSA id n23sm15339981pgv.76.2021.06.15.02.55.37
+        for <[e-mail]>
+        (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128);
+        Tue, 15 Jun 2021 02:55:43 -0700 (PDT)
+Message-ID: <[e-mail]>
+From: SpamAssassin Test <[e-mail]>
+To: undisclosed-recipients:;
+Subject: test message 1
+Message-ID: <[e-mail]>
+Date: Mon, 08 Jun 2009 12:00:00 +0000
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+
+testing
diff --git a/debian/tests/data/spam/rejectko.eml b/debian/tests/data/spam/rejectko.eml
new file mode 100644
index 0000000..b3c0009
--- /dev/null
+++ b/debian/tests/data/spam/rejectko.eml
@@ -0,0 +1,21 @@
+Return-Path: <[e-mail]>
+Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432])
+  (using TLSv1.3 with cipher AEAD-AES128-GCM-SHA256 (128/128 bits))
+  (No client certificate requested)
+  by dmarc3.spamassassin.org (Postfix) with ESMTPS id EDD4E2073D
+  for <[e-mail]>; Tue, 15 Jun 2021 11:55:45 +0200 (CEST)
+Received: from PC ([2409:4063:231e:c527:1997:664a:34e5:7d88])
+        by smtp.gmail.com with ESMTPSA id n23sm15339981pgv.76.2021.06.15.02.55.37
+        for <[e-mail]>
+        (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128);
+        Tue, 15 Jun 2021 02:55:43 -0700 (PDT)
+Message-ID: <[e-mail]>
+From: SpamAssassin Test <[e-mail]>
+To: undisclosed-recipients:;
+Subject: test message 1
+Message-ID: <[e-mail]>
+Date: Mon, 08 Jun 2009 12:00:00 +0000
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+
+testing
diff --git a/debian/tests/data/spam/strictrejectko.eml b/debian/tests/data/spam/strictrejectko.eml
new file mode 100644
index 0000000..edbec9a
--- /dev/null
+++ b/debian/tests/data/spam/strictrejectko.eml
@@ -0,0 +1,23 @@
+Return-Path: <[e-mail]>
+Received: from dmarc4.spamassassin.org (dmarc4.spamassassin.org [1.2.3.4])
+	by dmarc4.spamassassin.org (8.14.9/8.14.9) with ESMTP id 13DFe22R006047
+	(version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256 verify=NO);
+	Tue, 13 Apr 2021 11:40:02 -0400
+DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; d=
+        dmarc4.spamassassin.org; h=from:to:subject:message-id:date
+        :mime-version:content-type; s=dkim; bh=vxHXq7bMZ9+UHGuKBsbQKsDHm
+        mk=; b=Gm/CB7JaShGbluYAiHOBX0CcOvye9210Tghzmuvya0j0EF7dfJH8I9+wc
+        zFxo4JdBQ6xoq6zXwOLU8pVcpDtxrOzIPkidkVsI1iDi7tApONTuG9JW/vVNId/J
+        RBsp8Z2gi5vO07L2dtcZEIVOXM1MKN/69gXiGY3TbyhO63iFno04nAQFHooQYdqk
+        a6C8s0n3AVfPEE4cbTit67kREHVm+ZMQpd281BUh9zOftfL+R7VEWWSnSz5EmeBU
+        MihnFhg5DpEAIFyJ9ZqspI4CG0gAiRzd+Ol2ciJOAhm/hcqn3/J0YPqtN/1Cl7I2
+        jrtCRUnSpndamKLJp1aLWibYYkbwQ==
+From: SpamAssassin Test <[e-mail]>
+To: undisclosed-recipients:;
+Subject: test message 1
+Message-ID: <[e-mail]>
+Date: Sun, 11 Apr 2021 02:00:04 +0000
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+
+test message
diff --git a/debian/tests/splitting-check b/debian/tests/splitting-check
new file mode 100644
index 0000000..8b7ecf0
--- /dev/null
+++ b/debian/tests/splitting-check
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# The data we use for this test come from spamassassin's test suite (build tests):
+#
+#   - d/t/data/nice contains messages that qualifies as PASS due to the DMARC rules (DMARC_PASS).
+#   - d/t/data/spam contains messages that are market as REJECT, QUARENTINE, MISSING or NONE:
+#
+#             root@Mspamassasin-suggested:~# l spam_mails/
+#             nodmarc.eml noneko.eml quarko.eml rejectko.eml strictrejectko.eml
+#             root@Mspamassasin-suggested:~# spamc -R < spam_mails/rejectko.eml | grep DMARC
+#             1.8 DMARC_REJECT DMARC reject policy
+#             root@Mspamassasin-suggested:~# spamc -R < spam_mails/strictrejectko.eml | grep DMARC
+#             1.8 DMARC_REJECT DMARC reject policy
+#             root@Mspamassasin-suggested:~# spamc -R < spam_mails/quarko.eml | grep DMARC
+#             1.2 DMARC_QUAR DMARC quarantine policy
+#             root@Mspamassasin-suggested:~# spamc -R < spam_mails/nodmarc.eml | grep DMARC
+#             0.0 DMARC_MISSING Missing DMARC policy
+#             root@Mspamassasin-suggested:~# spamc -R < spam_mails/noneko.eml | grep DMARC
+#             0.9 DMARC_NONE DMARC none policy
+
+set -eo pipefail
+
+check_dmarc_policy_reporting(){
+    local eml="${1}"
+    local policy="${2}"
+
+    spamc -R < "${eml}" |  grep -qF DMARC_"${policy}"
+
+}
+
+for m in $(find debian/tests/data/nice/ -type f); do
+	check_dmarc_policy_reporting "${m}" "PASS"
+done
+
+declare -A EXPECTED_RESULT
+EXPECTED_RESULT["nodmarc.eml"]="MISSING"
+EXPECTED_RESULT["noneko.eml"]="NONE"
+EXPECTED_RESULT["quarko.eml"]="QUAR"
+EXPECTED_RESULT["rejectko.eml"]="REJECT"
+EXPECTED_RESULT["strictrejectko.eml"]="REJECT"
+
+for m in ${!EXPECTED_RESULT[@]}; do
+	check_dmarc_policy_reporting "debian/tests/data/spam/${m}" "${EXPECTED_RESULT[${m}]}"
+done
\ No newline at end of file