CVS commit: pkgsrc/mail/opensmtpd

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Apr 19 18:16:47 UTC 2026

Modified Files:
        pkgsrc/mail/opensmtpd: Makefile distinfo
        pkgsrc/mail/opensmtpd/patches: patch-usr.sbin_smtpd_smtp__session.c

Log Message:
mail/opensmtpd: 7.8.0p1

# changes
* Backport OpenBSD 7.8 errata 26


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/mail/opensmtpd/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/opensmtpd/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/mail/opensmtpd/patches/patch-usr.sbin_smtpd_smtp__session.c

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

Modified files:

Index: pkgsrc/mail/opensmtpd/Makefile
diff -u pkgsrc/mail/opensmtpd/Makefile:1.36 pkgsrc/mail/opensmtpd/Makefile:1.37
--- pkgsrc/mail/opensmtpd/Makefile:1.36 Sun Nov  2 20:13:39 2025
+++ pkgsrc/mail/opensmtpd/Makefile      Sun Apr 19 18:16:47 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2025/11/02 20:13:39 vins Exp $
+# $NetBSD: Makefile,v 1.37 2026/04/19 18:16:47 vins Exp $
 
-VERSION=       7.8.0p0
+VERSION=       7.8.0p1
 DISTNAME=      opensmtpd-${VERSION}
 CATEGORIES=    mail net
 MASTER_SITES=  https://www.opensmtpd.org/archives/

Index: pkgsrc/mail/opensmtpd/distinfo
diff -u pkgsrc/mail/opensmtpd/distinfo:1.15 pkgsrc/mail/opensmtpd/distinfo:1.16
--- pkgsrc/mail/opensmtpd/distinfo:1.15 Sun Nov  2 20:13:39 2025
+++ pkgsrc/mail/opensmtpd/distinfo      Sun Apr 19 18:16:47 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2025/11/02 20:13:39 vins Exp $
+$NetBSD: distinfo,v 1.16 2026/04/19 18:16:47 vins Exp $
 
-BLAKE2s (opensmtpd-7.8.0p0.tar.gz) = 81e58867f8b5685ae8b4d8abb0e4b152fca68b6dfd82387390cd10cde9b134c9
-SHA512 (opensmtpd-7.8.0p0.tar.gz) = ef4233909497c604c5c3de18c5ff50ee1e04f417d6ef0e6def3ebef214acee3a63306b27f5c7eab00992e24f3a7f2b2f2748fee2e535b3b291e194f1b8bd8652
-Size (opensmtpd-7.8.0p0.tar.gz) = 744995 bytes
+BLAKE2s (opensmtpd-7.8.0p1.tar.gz) = 717dce12d8bcd72053b2a79234a8331c7dacf744f61a7e0effe00d04147246f4
+SHA512 (opensmtpd-7.8.0p1.tar.gz) = 5364036cc0503436ed0836ccd8b5a756e1aec3625b142f15fc3a029dba47e05e6c9fe94e40d6d475a1bfb1b0ca1ee39ba21a4c9d8a98eb5d97b335f5e1389a3a
+Size (opensmtpd-7.8.0p1.tar.gz) = 745487 bytes
 SHA1 (patch-configure.ac) = ff6534e28ecba1de479660a00340600feefd5d7e
 SHA1 (patch-contrib_libexec_mail.local_mail.local.c) = bec19540fa52c7c6596ab5923f3a67b334ddf168
 SHA1 (patch-mk_smtpd_Makefile.am) = cc3f82922e3e56bc0205085f7e311f2beeda7fc4
@@ -12,4 +12,4 @@ SHA1 (patch-openbsd-compat_imsg.c) = 762
 SHA1 (patch-openbsd-compat_libtls_tls.c) = 09b9ab78709e8989b86843a5ddc24a0a7231c604
 SHA1 (patch-usr.sbin_smtpd_proxy.c) = 895d3e9532bf53dcdb7a52825043acacac51b378
 SHA1 (patch-usr.sbin_smtpd_queue__fs.c) = f40d5be4c05d8d54f7368af8d20f4ee007860dc7
-SHA1 (patch-usr.sbin_smtpd_smtp__session.c) = d153c13e56b1bae8a6e07ca62ed2f5428a3be2fc
+SHA1 (patch-usr.sbin_smtpd_smtp__session.c) = 88f95cf9d228c1873d9780bf4977a9ca6ab4e410

Index: pkgsrc/mail/opensmtpd/patches/patch-usr.sbin_smtpd_smtp__session.c
diff -u pkgsrc/mail/opensmtpd/patches/patch-usr.sbin_smtpd_smtp__session.c:1.2 pkgsrc/mail/opensmtpd/patches/patch-usr.sbin_smtpd_smtp__session.c:1.3
--- pkgsrc/mail/opensmtpd/patches/patch-usr.sbin_smtpd_smtp__session.c:1.2      Sun Nov  2 20:13:39 2025
+++ pkgsrc/mail/opensmtpd/patches/patch-usr.sbin_smtpd_smtp__session.c  Sun Apr 19 18:16:47 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-usr.sbin_smtpd_smtp__session.c,v 1.2 2025/11/02 20:13:39 vins Exp $
+$NetBSD: patch-usr.sbin_smtpd_smtp__session.c,v 1.3 2026/04/19 18:16:47 vins Exp $
 
 Add a patch to handle long usernames during SMTP authentication.
 
---- usr.sbin/smtpd/smtp_session.c.orig 2025-07-30 20:26:49.764391744 +0000
+--- usr.sbin/smtpd/smtp_session.c.orig 2026-03-26 17:09:54.833595248 +0000
 +++ usr.sbin/smtpd/smtp_session.c
 @@ -80,6 +80,7 @@ enum {
        TX_ERROR_ENVELOPE,
@@ -37,18 +37,18 @@ Add a patch to handle long usernames dur
                /* buf is a byte string, NUL terminate. */
                buf[len] = '\0';
  
-@@ -2021,9 +2031,12 @@ smtp_rfc4954_auth_login(struct smtp_sess
+@@ -2025,9 +2035,12 @@ smtp_rfc4954_auth_login(struct smtp_sess
  
        case STATE_AUTH_USERNAME:
                memset(s->username, 0, sizeof(s->username));
 -              if (base64_decode(arg, (unsigned char *)s->username,
 -                                sizeof(s->username) - 1) == -1)
-+              if (base64_decode(arg, (unsigned char *)buf,
-+                                sizeof(buf) - 1) == -1)
++              if (base64_decode(arg, (unsigned char *)buf,
++                                sizeof(buf) - 1) == -1)
                        goto abort;
 +              if (strlcpy(s->username, buf, sizeof(s->username))
-+                  >= sizeof(s->username))
-+                      s->flags |= SF_USERTOOLONG;
++                >= sizeof(s->username))
++                      s->flags |= SF_USERTOOLONG;
  
-               smtp_enter_state(s, STATE_AUTH_PASSWORD);
-               smtp_reply(s, "334 UGFzc3dvcmQ6");
+               if (s->username[strcspn(s->username, "\r\n")] != '\0')
+                       goto abort;