CVS commit: pkgsrc/mail/sendmail

["John Nemeth" <jnemeth%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jnemeth
Date:           Mon Feb 19 04:12:36 UTC 2024

Modified Files:
        pkgsrc/mail/sendmail: Makefile distinfo
        pkgsrc/mail/sendmail/patches: patch-az

Log Message:
PR/57936 -- fix build problem on netbsd-9


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 pkgsrc/mail/sendmail/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/mail/sendmail/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/sendmail/patches/patch-az

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

Modified files:

Index: pkgsrc/mail/sendmail/Makefile
diff -u pkgsrc/mail/sendmail/Makefile:1.143 pkgsrc/mail/sendmail/Makefile:1.144
--- pkgsrc/mail/sendmail/Makefile:1.143 Mon Jan 15 04:43:22 2024
+++ pkgsrc/mail/sendmail/Makefile       Mon Feb 19 04:12:36 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.143 2024/01/15 04:43:22 jnemeth Exp $
+# $NetBSD: Makefile,v 1.144 2024/02/19 04:12:36 jnemeth Exp $
 
 PKGNAME=       sendmail-${DIST_VERS}
-#PKGREVISION=  3
+PKGREVISION=   1
 COMMENT=       The well known Mail Transport Agent
 
 CONFLICTS+=    courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*

Index: pkgsrc/mail/sendmail/distinfo
diff -u pkgsrc/mail/sendmail/distinfo:1.71 pkgsrc/mail/sendmail/distinfo:1.72
--- pkgsrc/mail/sendmail/distinfo:1.71  Mon Feb 12 03:23:05 2024
+++ pkgsrc/mail/sendmail/distinfo       Mon Feb 19 04:12:36 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.71 2024/02/12 03:23:05 jnemeth Exp $
+$NetBSD: distinfo,v 1.72 2024/02/19 04:12:36 jnemeth Exp $
 
 BLAKE2s (sendmail.8.18.1.tar.gz) = 959e83d47978867cf89f817e51ce16a834998ef94a417ead59ddfdfdf0debff0
 SHA512 (sendmail.8.18.1.tar.gz) = 9ce713b44439d4de6faa9e3cdfa2226b44b4fbeb352a5f81584c062570e9472da244158287e489aabe258d28fe54ca4964565c7b0adc7e1763d212be42f98061
@@ -20,7 +20,7 @@ SHA1 (patch-av) = bb6ecd69f6b0db22056b49
 SHA1 (patch-aw) = e340bd366ce04c4d5ddd15f964bc4040e715a6c9
 SHA1 (patch-ax) = 771c9c8a951a09c80eb85233986af1fc7fedbe77
 SHA1 (patch-ay) = 0a043f2ff0028d475ee852b302844626f4ff4609
-SHA1 (patch-az) = c951d7f00b92b1783fc5e633897d33238f1970d9
+SHA1 (patch-az) = f2683b7bf5f52cd9baedbe8a84ea691734f74b41
 SHA1 (patch-ba) = c190b11b9874f00a18b9c75b6e734f4a9dd3f68f
 SHA1 (patch-bb) = 6c86a60af25b02fc0389f1d40f59c5031d9679f1
 SHA1 (patch-bc) = 9e7346342dfe1ca5d84053b913df4be41a979683

Index: pkgsrc/mail/sendmail/patches/patch-az
diff -u pkgsrc/mail/sendmail/patches/patch-az:1.5 pkgsrc/mail/sendmail/patches/patch-az:1.6
--- pkgsrc/mail/sendmail/patches/patch-az:1.5   Mon Feb 12 03:23:06 2024
+++ pkgsrc/mail/sendmail/patches/patch-az       Mon Feb 19 04:12:36 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-az,v 1.5 2024/02/12 03:23:06 jnemeth Exp $
+$NetBSD: patch-az,v 1.6 2024/02/19 04:12:36 jnemeth Exp $
 
 --- sendmail/srvrsmtp.c.orig   2024-01-31 06:38:32.000000000 +0000
 +++ sendmail/srvrsmtp.c
@@ -17,7 +17,7 @@ $NetBSD: patch-az,v 1.5 2024/02/12 03:23
                                          (int) tp->tv_sec +
                                                (tp->tv_usec >= 500000 ? 1 : 0)
                                         );
-+                              BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, fd, "pre-greeting traffic");
++                              BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL), "pre-greeting traffic");
                        }
                }
        }
@@ -29,7 +29,7 @@ $NetBSD: patch-az,v 1.5 2024/02/12 03:23
 +
    authenticated:
 +                              fd = sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL);
-+                              BLACKLIST_NOTIFY(BLACKLIST_AUTH_OK, fd, "AUTH OK");
++                              BLACKLIST_NOTIFY(BLACKLIST_AUTH_OK, sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL), "AUTH OK");
 +
                                message("235 2.0.0 OK Authenticated");
                                authenticating = SASL_IS_AUTH;
@@ -49,7 +49,7 @@ $NetBSD: patch-az,v 1.5 2024/02/12 03:23
 +                                      int fd;
 +
 +                                      fd = sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL);
-+                                      BLACKLIST_NOTIFY(BLACKLIST_ABUSIVE_BEHAVIOR, fd, "too many bad commands");
++                                      BLACKLIST_NOTIFY(BLACKLIST_ABUSIVE_BEHAVIOR, sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL), "too many bad commands");
                                        message("421 4.7.0 %s Too many bad commands; closing connection",
                                                MyHostName);
  
@@ -61,7 +61,7 @@ $NetBSD: patch-az,v 1.5 2024/02/12 03:23
 +
    stopattack:
 +                              fd = sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL);
-+                              BLACKLIST_NOTIFY(BLACKLIST_ABUSIVE_BEHAVIOR, fd, "too many bad commands");
++                              BLACKLIST_NOTIFY(BLACKLIST_ABUSIVE_BEHAVIOR, sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL), "too many bad commands");
                                message("421 4.7.0 %s Too many bad commands; closing connection",
                                        MyHostName);