CVS commit: pkgsrc/mail/opensmtpd

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Jun  9 12:46:28 UTC 2024

Modified Files:
        pkgsrc/mail/opensmtpd: Makefile distinfo
        pkgsrc/mail/opensmtpd/files: README.pkgsrc

Log Message:
mail/opensmtpd: update to 7.5.0p0

# Changes

* Added support for RFC 7505 "Null MX" handling and treat an MX of
  "localhost" as it were a "Null MX".
* Allow inline tables and filter listings in smtpd.conf(5) to span over
  multiple lines.
* Enabled DSN for the implicit socket too.
* Added the no-dsn option for listen on socket too.
* Reject headers that start with a space or a tab.
* Fixed parsing of the ORCPT parameter.
* Fixed table lookups of IPv6 addresses.
* Fixed handling of escape characters in To, From and Cc headers.
* Run LMTP deliveries as the recipient user again.
* Disallow custom commands and file reading in root's .forward file.
* Do not process other users .forward files when an alternate delivery
  user is provided in a dispatcher.
* Unify the table(5) parser used in smtpd(8) and makemap(8).
* Allow to use table(5) mappings on various match constraints.

 Portability fixes:

 * re-add ASR_IPV4_BEFORE_IPV6 compile-time knob to prefer connecting to
   IPv6 instead of IPv4.
 * update asr(3) and imsg with OpenBSD.
 * fixed rpath handling on NetBSD in the configure.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/mail/opensmtpd/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mail/opensmtpd/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/opensmtpd/files/README.pkgsrc

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.25 pkgsrc/mail/opensmtpd/Makefile:1.26
--- pkgsrc/mail/opensmtpd/Makefile:1.25 Sat Mar  2 17:01:12 2024
+++ pkgsrc/mail/opensmtpd/Makefile      Sun Jun  9 12:46:28 2024
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2024/03/02 17:01:12 vins Exp $
+# $NetBSD: Makefile,v 1.26 2024/06/09 12:46:28 vins Exp $
 
-VERSION=       7.4.0p1
+VERSION=       7.5.0p0
 DISTNAME=      opensmtpd-${VERSION}
-PKGREVISION=   1
 CATEGORIES=    mail net
 MASTER_SITES=  https://www.opensmtpd.org/archives/
 
@@ -12,7 +11,7 @@ COMMENT=      The OpenSMTPD mail transfer age
 LICENSE=       isc AND modified-bsd AND 2-clause-bsd
 
 BUILD_DEFS+=   VARBASE
-SMTPD_HOME=    ${VARBASE}/chroot/smtpd
+SMTPD_HOME=    ${VARBASE}/smtpd/empty
 
 GNU_CONFIGURE= yes
 USE_DB185=     yes
@@ -20,7 +19,12 @@ USE_LIBTOOL= yes
 USE_TOOLS+=    awk pkg-config yacc
 USE_TOOLS+=    automake aclocal autoheader autoconf
 
+CHECK_BUILTIN.openssl:= yes
+.include "../../security/openssl/buildlink3.mk"
+CHECK_BUILTIN.openssl:= no
+.if ${USE_BUILTIN.openssl:U:tl} != yes
 DEPENDS+=      mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts
+.endif
 
 PLIST_SRC=     PLIST.common
 
@@ -28,10 +32,12 @@ CFLAGS.SunOS+=      -D__EXTENSIONS__
 
 PKG_GROUPS=            _smtpd _smtpq
 PKG_USERS=             _smtpd:_smtpd _smtpq:_smtpq
-PKG_GECOS._smtpd=      OpenSMTPD pseudo-user
-PKG_HOME._smtpd=       ${SMTPD_HOME}
-PKG_GECOS._smtpq=      OpenSMTPD pseudo-user
-PKG_HOME._smtpq=       ${SMTPD_HOME}
+PKG_GECOS._smtpd=      OpenSMTPD Daemon
+PKG_GECOS._smtpq=      OpenSMTPD Queue
+.for id in _smptd _smtpq
+PKG_HOME.${id}=                ${SMTPD_HOME}
+PKG_SHELL.${id}=       /sbin/nologin
+.endfor
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -41,7 +47,7 @@ CONFIGURE_ENV+=               MANTYPE=man
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-libssl=${SSLBASE:Q}
 CONFIGURE_ARGS+=       --with-path-CAfile=${SSLCERTS}/ca-certificates.crt
-CONFIGURE_ARGS+=       --with-path-empty=${VARBASE}/empty
+CONFIGURE_ARGS+=       --with-path-empty=${SMTPD_HOME}
 .if ${OPSYS} == "Linux"
 CONFIGURE_ARGS+=       --with-path-mbox=${VARBASE}/spool/mail
 .else
@@ -58,8 +64,7 @@ DOCDIR=                       ${PREFIX}/share/doc/opensmtpd
 CONF_FILES+=           ${EGDIR}/smtpd.conf ${PKG_SYSCONFDIR}/smtpd.conf
 CONF_FILES+=           ${EGDIR}/aliases ${PKG_SYSCONFDIR}/aliases
 
-OWN_DIRS+=     ${SMTPD_HOME}
-MAKE_DIRS+=    ${VARBASE}/empty ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
+OWN_DIRS+=     ${SMTPD_HOME} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
 
 INSTALLATION_DIRS+=    share/examples/${PKGBASE}
 INSTALLATION_DIRS+=    share/doc/${PKGBASE}
@@ -72,7 +77,7 @@ 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
+SUBST_VARS.pkgsrc=     PKG_SYSCONFDIR PREFIX RCD_SCRIPTS_DIR VARBASE
 SUBST_MESSAGE.pkgsrc=  Replacing pkgsrc placeholders.
 
 SUBST_CLASSES+=                paths

Index: pkgsrc/mail/opensmtpd/distinfo
diff -u pkgsrc/mail/opensmtpd/distinfo:1.10 pkgsrc/mail/opensmtpd/distinfo:1.11
--- pkgsrc/mail/opensmtpd/distinfo:1.10 Tue Jan 16 13:24:00 2024
+++ pkgsrc/mail/opensmtpd/distinfo      Sun Jun  9 12:46:28 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2024/01/16 13:24:00 vins Exp $
+$NetBSD: distinfo,v 1.11 2024/06/09 12:46:28 vins Exp $
 
-BLAKE2s (opensmtpd-7.4.0p1.tar.gz) = fec5c3f3dc2067465644c6a4b7a605cff9429e0a8d8809467a82e04f6574a256
-SHA512 (opensmtpd-7.4.0p1.tar.gz) = 23aad112ed8f45547e808592823ba8818d8b0ac6ca82d9f83ee33c4a61cfa6326488e10b6beaa3c9e40030eb680478f485b552c15c4ae2835c7a71af509ce94f
-Size (opensmtpd-7.4.0p1.tar.gz) = 908307 bytes
+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
 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.3 pkgsrc/mail/opensmtpd/files/README.pkgsrc:1.4
--- pkgsrc/mail/opensmtpd/files/README.pkgsrc:1.3       Fri Mar  1 20:50:05 2024
+++ pkgsrc/mail/opensmtpd/files/README.pkgsrc   Sun Jun  9 12:46:28 2024
@@ -2,6 +2,15 @@
 | 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: 
 
@@ -16,7 +25,7 @@ to set up OpenSMTPD for local and outbou
 * Copy the sample rc.d service script provided as
   @PREFIX@/share/examples/rc.d/opensmtpd to @RCD_SCRIPTS_DIR@
 
-* Import the pam policy for the smtp protocol by copying
+* Import the pam policy file for the smtp protocol by copying
   @PREFIX@/share/examples/pam.d/smtp to /etc/pam.d 
 
 * Prepend @PREFIX@/man to the MANPATH environment to avoid conflicting
@@ -26,4 +35,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.
+  and run `$ @RCD_SCRIPTS_DIR@/opensmtpd start' to start OpenSMTPD.
\ No newline at end of file