CVS commit: pkgsrc/mail/p5-Qmail-Deliverable

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Jan 28 21:10:35 UTC 2024

Modified Files:
        pkgsrc/mail/p5-Qmail-Deliverable: Makefile distinfo
        pkgsrc/mail/p5-Qmail-Deliverable/patches:
            patch-lib_Qmail_Deliverable.pm

Log Message:
p5-Qmail-Deliverable: update to 1.09. Changes:

new:
- detect ezmlm lists, reject null senders to lists
- correctly ignore comments in qmail/users/assign #3
- add module syntax tests #3
- add regression test that exercises bug reported in #2

fix:
- fix interpretation of wildcard assignments #2


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/p5-Qmail-Deliverable/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/p5-Qmail-Deliverable/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/mail/p5-Qmail-Deliverable/patches/patch-lib_Qmail_Deliverable.pm

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/p5-Qmail-Deliverable/Makefile
diff -u pkgsrc/mail/p5-Qmail-Deliverable/Makefile:1.3 pkgsrc/mail/p5-Qmail-Deliverable/Makefile:1.4
--- pkgsrc/mail/p5-Qmail-Deliverable/Makefile:1.3       Fri Jan 26 19:54:52 2024
+++ pkgsrc/mail/p5-Qmail-Deliverable/Makefile   Sun Jan 28 21:10:34 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2024/01/26 19:54:52 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2024/01/28 21:10:34 schmonz Exp $
 
-DISTNAME=              Qmail-Deliverable-1.08
+DISTNAME=              Qmail-Deliverable-1.09
 PKGNAME=               p5-${DISTNAME}
 CATEGORIES=            mail perl5
-MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=../../authors/id/J/JU/JUERD/}
+MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/MS/MSIMERSON/}
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              https://metacpan.org/pod/Qmail::Deliverable

Index: pkgsrc/mail/p5-Qmail-Deliverable/distinfo
diff -u pkgsrc/mail/p5-Qmail-Deliverable/distinfo:1.2 pkgsrc/mail/p5-Qmail-Deliverable/distinfo:1.3
--- pkgsrc/mail/p5-Qmail-Deliverable/distinfo:1.2       Fri Jan 26 19:54:52 2024
+++ pkgsrc/mail/p5-Qmail-Deliverable/distinfo   Sun Jan 28 21:10:34 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2024/01/26 19:54:52 schmonz Exp $
+$NetBSD: distinfo,v 1.3 2024/01/28 21:10:34 schmonz Exp $
 
-BLAKE2s (Qmail-Deliverable-1.08.tar.gz) = 05501dfa86010dc74f1e18a4e3b6503b43214df5952bc1938ace410b8dc6d806
-SHA512 (Qmail-Deliverable-1.08.tar.gz) = f1f9100869ec9b994e5f9d5344842093a63ca33510e2e99dde33522087b41a3a97bd119d51aee21a8e5d4d09cd59130904af4fbe7fcb2ad75a20a97d0fecd3b5
-Size (Qmail-Deliverable-1.08.tar.gz) = 18916 bytes
-SHA1 (patch-lib_Qmail_Deliverable.pm) = e2172dc43a2a4e769ceb28628395469026eff8b8
+BLAKE2s (Qmail-Deliverable-1.09.tar.gz) = 309fdba502d1b9c3ee50454e61fc1d41ab881005fb0b8ec046846b09c1b01985
+SHA512 (Qmail-Deliverable-1.09.tar.gz) = 90b34d57f315b614efa581973f8a5d3675216cc74d9c29c5089ee103c3060c0fd8453ad75a079bcb265d2073af6795d38e37f07ff544601331e0a3864d1d8b3f
+Size (Qmail-Deliverable-1.09.tar.gz) = 19794 bytes
+SHA1 (patch-lib_Qmail_Deliverable.pm) = fa5f4a4c8107e713d62134425084d62fcf807279
 SHA1 (patch-lib_Qmail_Deliverable_Comparison.pod) = 0fdd7a6dd3275d7f03068a178ed6ad7c35f804b5
 SHA1 (patch-qpsmtpd-plugin_qmail__deliverable) = 2339f73db04380b2c8bc23fe34790fcea4e60ff9

Index: pkgsrc/mail/p5-Qmail-Deliverable/patches/patch-lib_Qmail_Deliverable.pm
diff -u pkgsrc/mail/p5-Qmail-Deliverable/patches/patch-lib_Qmail_Deliverable.pm:1.1 pkgsrc/mail/p5-Qmail-Deliverable/patches/patch-lib_Qmail_Deliverable.pm:1.2
--- pkgsrc/mail/p5-Qmail-Deliverable/patches/patch-lib_Qmail_Deliverable.pm:1.1 Wed Jan 10 11:51:46 2024
+++ pkgsrc/mail/p5-Qmail-Deliverable/patches/patch-lib_Qmail_Deliverable.pm     Sun Jan 28 21:10:35 2024
@@ -1,37 +1,19 @@
-$NetBSD: patch-lib_Qmail_Deliverable.pm,v 1.1 2024/01/10 11:51:46 schmonz Exp $
+$NetBSD: patch-lib_Qmail_Deliverable.pm,v 1.2 2024/01/28 21:10:35 schmonz Exp $
 
 Honor pkgsrc-specified QMAILDIR.
 
---- lib/Qmail/Deliverable.pm.orig      2024-01-10 11:42:48.671762270 +0000
+--- lib/Qmail/Deliverable.pm.orig      2024-01-27 19:55:05.000000000 +0000
 +++ lib/Qmail/Deliverable.pm
-@@ -66,21 +66,21 @@ sub reread_config {
-     %virtualdomains = ();
-     %users_exact    = ();
-     %users_wild     = ();
--    my $locals_fn = -e "/var/qmail/control/locals"
--        ? "/var/qmail/control/locals"
--        : "/var/qmail/control/me";
-+    my $locals_fn = -e "@QMAILDIR@/control/locals"
-+        ? "@QMAILDIR@/control/locals"
-+        : "@QMAILDIR@/control/me";
-     for (_slurp $locals_fn) {
-         chomp;
-         ($_) = lc =~ /$ascii/ or do { warn "Invalid character"; next; };
-         $locals{$_} = 1;
-     }
--    for (_slurp "/var/qmail/control/virtualdomains") {
-+    for (_slurp "@QMAILDIR@/control/virtualdomains") {
-         chomp;
-         ($_) = lc =~ /$ascii/ or do { warn "Invalid character"; next; };
-         my ($domain, $prepend) = split /:/, $_, 2;
-         $virtualdomains{$domain} = $prepend;
-     }
--    for (_slurp "/var/qmail/users/assign") {
-+    for (_slurp "@QMAILDIR@/users/assign") {
-         chomp;
-         ($_) = /$ascii/ or do { warn "Invalid character"; next; };
-         if (s/^=([^:]+)://) {
-@@ -98,7 +98,7 @@ sub reread_config {
+@@ -9,7 +9,7 @@ our $VERSION = '1.09';
+ our @EXPORT_OK = qw/reread_config qmail_local dot_qmail deliverable qmail_user/;
+ our %EXPORT_TAGS = (all => \@EXPORT_OK);
+ our $VPOPMAIL_EXT = 0;
+-our $qmail_dir = '/var/qmail';
++our $qmail_dir = '@QMAILDIR@';
+ 
+ # rfc2822's "atext"
+ my $atext = "[A-Za-z0-9!#\$%&\'*+\/=?^_\`{|}~-]";
+@@ -101,7 +101,7 @@ sub reread_config {
  sub _qmail_getpw {
      my ($local) = @_;
      local $/ = "\0";
@@ -40,7 +22,7 @@ Honor pkgsrc-specified QMAILDIR.
      chomp @a;
      for (@a) {
          ($_) = /$ascii/ or do { warn "Invalid character"; return ""; }
-@@ -361,16 +361,16 @@ returned. A single dot at the end is all
+@@ -368,16 +368,16 @@ returned. A single dot at the end is all
  Returns the local qmail user for $address, or undef if the address is not local.
  
  Returns $address if it does not contain an @. Returns the left side of the @ if
@@ -60,7 +42,7 @@ Honor pkgsrc-specified QMAILDIR.
  
  =item dot_qmail $address
  
-@@ -434,8 +434,8 @@ returned.
+@@ -442,8 +442,8 @@ returned.
  
  =item reread_config
  
@@ -71,7 +53,7 @@ Honor pkgsrc-specified QMAILDIR.
  
  =back
  
-@@ -473,7 +473,7 @@ checks per second for assigned/virtual u
+@@ -481,7 +481,7 @@ checks per second for assigned/virtual u
  slower. For my needs, this is still plenty fast enough.
  
  To support local users automatically, C<qmail-getpw> is executed for local