CVS commit: pkgsrc/mail/opensmtpd

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Thu Dec  5 00:42:34 UTC 2024

Modified Files:
        pkgsrc/mail/opensmtpd: MESSAGE Makefile PLIST.common distinfo
        pkgsrc/mail/opensmtpd/files: README.pkgsrc
Added Files:
        pkgsrc/mail/opensmtpd/files: README.tls

Log Message:
mail/opensmtpd: update to 7.6.0p1

# changes (since 7.5.0p0)

* added missing forward(5) documentation fix
* Introduced a new K_AUTH service to allow offloading the credentials to a
  proc table for non-crypt(3) authentication. Helps with use cases like
  LDAP or custom auth.
* Implement report responses for proc-filters too.
* Changed the table protocol to a simpler text-based one. Existing proc
  tables needs to be updated since old ones won't work. The new protocol
  is documented in smtpd-tables(7).
* Fixed the parsing of IPv6 addresses in file-backed table(5).
* Document expected MDA behavior and the environment set by OpenSMTPD.
* Set ORIGINAL_RECIPIENT in the environment of MDA scripts for
* Updated the bundled libtls.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/opensmtpd/MESSAGE \
    pkgsrc/mail/opensmtpd/PLIST.common
cvs rdiff -u -r1.28 -r1.29 pkgsrc/mail/opensmtpd/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/mail/opensmtpd/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/opensmtpd/files/README.pkgsrc
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/opensmtpd/files/README.tls

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/MESSAGE
diff -u pkgsrc/mail/opensmtpd/MESSAGE:1.2 pkgsrc/mail/opensmtpd/MESSAGE:1.3
--- pkgsrc/mail/opensmtpd/MESSAGE:1.2   Fri Mar  1 20:50:05 2024
+++ pkgsrc/mail/opensmtpd/MESSAGE       Thu Dec  5 00:42:34 2024
@@ -1,8 +1,12 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2024/03/01 20:50:05 vins Exp $
+$NetBSD: MESSAGE,v 1.3 2024/12/05 00:42:34 vins Exp $
 
 Sample configuration files have been installed at ${PKG_SYSCONFDIR}.
 
-Check the README available at ${DOCDIR}.
+Check the README(s) available at ${DOCDIR}.
+
+If you're upgrading from 7.5 or earlier, please note that OpenSMTPD-extras
+has been deprecated and the tables need to be replaced with the new ones
+(available in the pkgsrc tree).
 
 ===========================================================================
Index: pkgsrc/mail/opensmtpd/PLIST.common
diff -u pkgsrc/mail/opensmtpd/PLIST.common:1.2 pkgsrc/mail/opensmtpd/PLIST.common:1.3
--- pkgsrc/mail/opensmtpd/PLIST.common:1.2      Fri Mar  1 20:50:05 2024
+++ pkgsrc/mail/opensmtpd/PLIST.common  Thu Dec  5 00:42:34 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2024/03/01 20:50:05 vins Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2024/12/05 00:42:34 vins Exp $
 bin/smtp
 libexec/opensmtpd/encrypt
 libexec/opensmtpd/lockspool
@@ -15,6 +15,7 @@ man/man5/forward.5
 man/man5/smtpd.conf.5
 man/man5/table.5
 man/man7/smtpd-filters.7
+man/man7/smtpd-tables.7
 man/man8/mail.lmtp.8
 man/man8/mail.local.8
 man/man8/mail.maildir.8
@@ -28,6 +29,7 @@ man/man8/smtpd.8
 sbin/smtpctl
 sbin/smtpd
 share/doc/opensmtpd/README.pkgsrc
+share/doc/opensmtpd/README.tls
 share/examples/opensmtpd/aliases
 ${PLIST.mailwrapper}share/examples/opensmtpd/mailer.conf
 share/examples/opensmtpd/smtpd.conf

Index: pkgsrc/mail/opensmtpd/Makefile
diff -u pkgsrc/mail/opensmtpd/Makefile:1.28 pkgsrc/mail/opensmtpd/Makefile:1.29
--- pkgsrc/mail/opensmtpd/Makefile:1.28 Tue Dec  3 08:29:16 2024
+++ pkgsrc/mail/opensmtpd/Makefile      Thu Dec  5 00:42:34 2024
@@ -1,14 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2024/12/03 08:29:16 wiz Exp $
-#
-# Starting with release 7.6.0, OpenSMTPD breaks backward compatibility with
-# mail/opensmtpd-extras.
-# As a consequence, this package shouldn't be updated to 7.6.0p0 or above
-# unless the new table add-ons are imported on pkgsrc first.
-#
-# For further reference, see:
-# https://github.com/OpenSMTPD/OpenSMTPD-extras/blob/master/README.md
+# $NetBSD: Makefile,v 1.29 2024/12/05 00:42:34 vins Exp $
 
-VERSION=       7.5.0p0
+VERSION=       7.6.0p1
 DISTNAME=      opensmtpd-${VERSION}
 CATEGORIES=    mail net
 MASTER_SITES=  https://www.opensmtpd.org/archives/
@@ -84,8 +76,8 @@ SPECIAL_PERMS+=               sbin/smtpctl ${SETUID_R
 
 SUBST_CLASSES+=                pkgsrc
 SUBST_STAGE.pkgsrc=    pre-configure
-SUBST_FILES.pkgsrc=    mailer.conf README.pkgsrc
-SUBST_VARS.pkgsrc=     PKG_SYSCONFDIR PREFIX RCD_SCRIPTS_DIR VARBASE
+SUBST_FILES.pkgsrc=    mailer.conf README.pkgsrc README.tls
+SUBST_VARS.pkgsrc=     PKG_SYSCONFDIR PREFIX RCD_SCRIPTS_DIR SSLDIR VARBASE
 SUBST_MESSAGE.pkgsrc=  Replacing pkgsrc placeholders.
 
 SUBST_CLASSES+=                paths
@@ -105,7 +97,7 @@ SUBST_SED.paths+=    -e "s:/etc/ssl:${SSLDI
 MESSAGE_SUBST+=                DOCDIR=${DOCDIR:Q}
 
 post-extract:
-.for f in mailer.conf README.pkgsrc
+.for f in mailer.conf README.pkgsrc README.tls
        cp ${FILESDIR}/${f} ${WRKSRC}
 .endfor
 
@@ -120,6 +112,7 @@ pre-configure:
 doc-install:
        ${INSTALL_DATA} ${WRKSRC}/etc/aliases ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/README.pkgsrc ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/README.tls ${DESTDIR}${DOCDIR}
 
 .if ${OPSYS} == "Linux"
 .  include "../../devel/libbsd/buildlink3.mk"

Index: pkgsrc/mail/opensmtpd/distinfo
diff -u pkgsrc/mail/opensmtpd/distinfo:1.11 pkgsrc/mail/opensmtpd/distinfo:1.12
--- pkgsrc/mail/opensmtpd/distinfo:1.11 Sun Jun  9 12:46:28 2024
+++ pkgsrc/mail/opensmtpd/distinfo      Thu Dec  5 00:42:34 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2024/06/09 12:46:28 vins Exp $
+$NetBSD: distinfo,v 1.12 2024/12/05 00:42:34 vins Exp $
 
-BLAKE2s (opensmtpd-7.5.0p0.tar.gz) = 73be3f629adc87f074e4cb161d06dbfda9263a9800b6497a404a91294a3ab664
-SHA512 (opensmtpd-7.5.0p0.tar.gz) = 1e4bf23e623d40732e4055a8db330b0dc69dbfbd4f3d89ef092ead3359aac4123f8a58feb61661be47d84c58e27d22c706dc308dfa245fa76f1d36ed2bb9a822
-Size (opensmtpd-7.5.0p0.tar.gz) = 926333 bytes
+BLAKE2s (opensmtpd-7.6.0p1.tar.gz) = aa4f28d820b0b2563f334ee5ef4979c37aee9cb9b93d0e3db595c01a4cb44796
+SHA512 (opensmtpd-7.6.0p1.tar.gz) = 1e5ff894635f4b91a6b61aecafba588e58dda73cf17dc8595cd96120523e5efa479b5d888a363158f7e9cb73f15d5084f413cef1a6eb48f533c61cc350e0d328
+Size (opensmtpd-7.6.0p1.tar.gz) = 933649 bytes
 SHA1 (patch-contrib_libexec_mail.local_mail.local.c) = bec19540fa52c7c6596ab5923f3a67b334ddf168
 SHA1 (patch-mk_smtpd_Makefile.am) = cc3f82922e3e56bc0205085f7e311f2beeda7fc4
 SHA1 (patch-openbsd-compat_getpeereid.c) = 8d60140bffcabb6accf9b7bbe0f419c2c25d352d

Index: pkgsrc/mail/opensmtpd/files/README.pkgsrc
diff -u pkgsrc/mail/opensmtpd/files/README.pkgsrc:1.4 pkgsrc/mail/opensmtpd/files/README.pkgsrc:1.5
--- pkgsrc/mail/opensmtpd/files/README.pkgsrc:1.4       Sun Jun  9 12:46:28 2024
+++ pkgsrc/mail/opensmtpd/files/README.pkgsrc   Thu Dec  5 00:42:34 2024
@@ -2,15 +2,6 @@
 | Getting started with OpenSMTPD on NetBSD 
 +-----------------------------------------------------------------------
 
-NOTE: If you're upgrading from 7.4.0p*, make sure ${VARBASE}/smtpd/empty
-      exists, and change the home directory for the _smtpd and _smtpq
-      pesudo-users accordingly: 
-
-       $ usermod -d @VARBASE@/smtpd/empty _smptd
-       $ usermod -d @VARBASE@/smtpd/empty _smtpq
-
-------------------------------------------------------------------------
-
 Assuming NetBSD-style mailwrapper(8) and rc(8), few steps are required
 to set up OpenSMTPD for local and outbound delivery on your system: 
 
@@ -35,4 +26,4 @@ to set up OpenSMTPD for local and outbou
   the relevant man pages, including smtpd.conf(5).
 
 * Set opensmtpd=YES in /etc/rc.conf to enable the service upon startup,
-  and run `$ @RCD_SCRIPTS_DIR@/opensmtpd start' to start OpenSMTPD.
\ No newline at end of file
+  and run `$ @RCD_SCRIPTS_DIR@/opensmtpd start' to start OpenSMTPD.

Added files:

Index: pkgsrc/mail/opensmtpd/files/README.tls
diff -u /dev/null pkgsrc/mail/opensmtpd/files/README.tls:1.1
--- /dev/null   Thu Dec  5 00:42:35 2024
+++ pkgsrc/mail/opensmtpd/files/README.tls      Thu Dec  5 00:42:34 2024
@@ -0,0 +1,30 @@
++-----------------------------------------------------------------------
+| OpenSMTPD and TLS
++-----------------------------------------------------------------------
+
+In order send/receive mails over TLS, look at the example below and edit
+your @PKG_SYSCONFDIR@/smtpd.conf accordingly:
+
+________________________________________________________________________
+
+# certificate
+pki "example.com" cert "@SSLDIR@/certs/example.com.pem"
+pki "example.com" key "@SSLDIR@/private/example.com.key"
+
+# tables
+table aliases "@PKG_SYSCONFDIR@/aliases"
+table passwds "@PKG_SYSCONFDIR@/passwd"
+
+# listeners 
+listen on eth0 port 25 tls pki "example.com" 
+listen on eth0 port 465 smtps pki "example.com" auth <passwd>
+listen on eth0 port 587 tls-require pki "example.com" auth <passwd> 
+
+# rules
+match from any for domain "example.com" action "RECV"
+match from any auth for any action "SEND"
+________________________________________________________________________
+
+See smtpd.conf(8) for more information.
+You may obtain a TLS certificate from a trusted authority through 
+security/py-certbot or security/acmesh.