CVS commit: [pkgsrc-2022Q1] pkgsrc/mail/sendmail

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri May 20 12:58:37 UTC 2022

Modified Files:
        pkgsrc/mail/sendmail [pkgsrc-2022Q1]: Makefile distinfo
        pkgsrc/mail/sendmail/patches [pkgsrc-2022Q1]: patch-bo

Log Message:
Pullup ticket #6634 - requested by sborrill
mail/sendmail: bugfix for SMTP AUTH

Revisions pulled up:
- mail/sendmail/Makefile                                        1.141
- mail/sendmail/distinfo                                        1.68
- mail/sendmail/patches/patch-bo                                1.5

---
   Module Name: pkgsrc
   Committed By:        sborrill
   Date:                Tue May 10 13:46:49 UTC 2022

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

   Log Message:
   sendmail: fix SMTP AUTH

   Pull in SMTP AUTH fix from 8.17.1.9.
   Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.140.4.1 pkgsrc/mail/sendmail/Makefile
cvs rdiff -u -r1.67 -r1.67.4.1 pkgsrc/mail/sendmail/distinfo
cvs rdiff -u -r1.4 -r1.4.6.1 pkgsrc/mail/sendmail/patches/patch-bo

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.140 pkgsrc/mail/sendmail/Makefile:1.140.4.1
--- pkgsrc/mail/sendmail/Makefile:1.140 Tue Nov  9 22:02:36 2021
+++ pkgsrc/mail/sendmail/Makefile       Fri May 20 12:58:37 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.140 2021/11/09 22:02:36 jnemeth Exp $
+# $NetBSD: Makefile,v 1.140.4.1 2022/05/20 12:58:37 bsiegert Exp $
 
 PKGNAME=       sendmail-${DIST_VERS}
-PKGREVISION=   1
+PKGREVISION=   2
 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.67 pkgsrc/mail/sendmail/distinfo:1.67.4.1
--- pkgsrc/mail/sendmail/distinfo:1.67  Sun Dec 19 04:01:11 2021
+++ pkgsrc/mail/sendmail/distinfo       Fri May 20 12:58:37 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.67 2021/12/19 04:01:11 jnemeth Exp $
+$NetBSD: distinfo,v 1.67.4.1 2022/05/20 12:58:37 bsiegert Exp $
 
 BLAKE2s (sendmail.8.16.1.tar.gz) = 6f92d35a8dfe1ba071da197ae53559a1d67290f7042e5650ebbdac3d3045fe2f
 SHA512 (sendmail.8.16.1.tar.gz) = d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
@@ -31,7 +31,7 @@ SHA1 (patch-bg) = 716c90ff76edbdcb223111
 SHA1 (patch-bl) = 4fff262691deb2fcacf5013bfeb5aede45783dcd
 SHA1 (patch-bm) = b1ec82ab5a97c2dc7f7230d31e47c89b7b5ac1d9
 SHA1 (patch-bn) = 3af37c9d3523d6093181ae3b7d4c25bc8173b7f9
-SHA1 (patch-bo) = ca819c8f8de9bd67b7e6d5738020c90b03c6fad8
+SHA1 (patch-bo) = e55b2cb4ee31fdfa593a307b4ec8ca0799f55060
 SHA1 (patch-bp) = 9a1daac264aba6c4fc39a63a464b942dd25b06eb
 SHA1 (patch-bq) = 548bf6d373cb49958437548a65803b6f3c6b35d2
 SHA1 (patch-br) = 1f0b9716906b91ce2b867bf65e5c06ad16749e36

Index: pkgsrc/mail/sendmail/patches/patch-bo
diff -u pkgsrc/mail/sendmail/patches/patch-bo:1.4 pkgsrc/mail/sendmail/patches/patch-bo:1.4.6.1
--- pkgsrc/mail/sendmail/patches/patch-bo:1.4   Sun Jul  4 07:57:13 2021
+++ pkgsrc/mail/sendmail/patches/patch-bo       Fri May 20 12:58:37 2022
@@ -1,8 +1,12 @@
-$NetBSD: patch-bo,v 1.4 2021/07/04 07:57:13 jnemeth Exp $
+$NetBSD: patch-bo,v 1.4.6.1 2022/05/20 12:58:37 bsiegert Exp $
+
+Add blacklist support.
+Pull up SMTP AUTH fix from 8.17.1.9 as per:
+       https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262935
 
 --- sendmail/sendmail.h.orig   2020-07-02 05:00:37.000000000 +0000
-+++ sendmail/sendmail.h
-@@ -63,6 +63,10 @@ SM_UNUSED(static char SmailId[]) = "@(#)
++++ sendmail/sendmail.h        2022-05-10 09:51:29.162720330 +0000
+@@ -63,6 +63,10 @@
  #endif
  
  #include "bf.h"
@@ -13,7 +17,16 @@ $NetBSD: patch-bo,v 1.4 2021/07/04 07:57
  #include "timers.h"
  #include <sm/exc.h>
  #include <sm/heap.h>
-@@ -2576,6 +2580,8 @@ EXTERN int Hacks;        /* bit field of run-ti
+@@ -706,7 +710,7 @@
+ # define SASL_IS_AUTH 2               /* authenticated */
+ 
+ /* SASL options */
+-# define SASL_AUTH_AUTH       0x1000          /* use auth= only if authenticated */
++# define SASL_AUTH_AUTH       0x10000         /* use auth= only if authenticated */
+ # if SASL >= 20101
+ #  define SASL_SEC_MASK       SASL_SEC_MAXIMUM /* mask for SASL_SEC_* values: sasl.h */
+ # else /* SASL >= 20101 */
+@@ -2576,6 +2580,8 @@
  
  EXTERN int ConnectionRateWindowSize;