Wed Sep 27 17:25:18 2023 UTC ()
mail/opensmtpd: update to OpenSMTPD 7.3.0p2

Portable-only changes:

* avoid potential use of uninitialized the bundled copy of
  ASN1_time_parse
  This could lead to a failure during STARTTLS and a subsequent
  downgrade to plaintext.

 * backport the ENGINE removal to build with the latest LiBRESSL


(vins)
diff -r1.20 -r1.21 pkgsrc/mail/opensmtpd/Makefile
diff -r1.8 -r1.9 pkgsrc/mail/opensmtpd/distinfo
cvs diff -r1.20 -r1.21 pkgsrc/mail/opensmtpd/Makefile (switch to unified diff)

--- pkgsrc/mail/opensmtpd/Makefile 2023/09/21 12:51:06 1.20
+++ pkgsrc/mail/opensmtpd/Makefile 2023/09/27 17:25:18 1.21
@@ -1,117 +1,116 @@ @@ -1,117 +1,116 @@
1# $NetBSD: Makefile,v 1.20 2023/09/21 12:51:06 vins Exp $ 1# $NetBSD: Makefile,v 1.21 2023/09/27 17:25:18 vins Exp $
2 2
3VERSION= 7.3.0p1 3VERSION= 7.3.0p2
4DISTNAME= opensmtpd-${VERSION} 4DISTNAME= opensmtpd-${VERSION}
5PKGREVISION= 2 
6CATEGORIES= mail net 5CATEGORIES= mail net
7MASTER_SITES= https://www.opensmtpd.org/archives/ 6MASTER_SITES= https://www.opensmtpd.org/archives/
8 7
9MAINTAINER= vins@NetBSD.org 8MAINTAINER= vins@NetBSD.org
10HOMEPAGE= https://www.opensmtpd.org/ 9HOMEPAGE= https://www.opensmtpd.org/
11COMMENT= The OpenSMTPD mail transfer agent, a replacement for sendmail 10COMMENT= The OpenSMTPD mail transfer agent, a replacement for sendmail
12LICENSE= isc AND modified-bsd AND 2-clause-bsd 11LICENSE= isc AND modified-bsd AND 2-clause-bsd
13 12
14BUILD_DEFS+= VARBASE 13BUILD_DEFS+= VARBASE
15SMTPD_HOME= ${VARBASE}/chroot/smtpd 14SMTPD_HOME= ${VARBASE}/chroot/smtpd
16 15
17USE_LIBTOOL= yes 16USE_LIBTOOL= yes
18USE_TOOLS+= awk pkg-config yacc 17USE_TOOLS+= awk pkg-config yacc
19USE_TOOLS+= automake aclocal autoheader autoconf 18USE_TOOLS+= automake aclocal autoheader autoconf
20 19
21DEPENDS+= mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts 20DEPENDS+= mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts
22 21
23PLIST_SRC= PLIST.common 22PLIST_SRC= PLIST.common
24 23
25CFLAGS.SunOS+= -D__EXTENSIONS__ 24CFLAGS.SunOS+= -D__EXTENSIONS__
26 25
27PKG_GROUPS= _smtpd _smtpq 26PKG_GROUPS= _smtpd _smtpq
28PKG_USERS= _smtpd:_smtpd _smtpq:_smtpq 27PKG_USERS= _smtpd:_smtpd _smtpq:_smtpq
29PKG_GECOS._smtpd= OpenSMTPD pseudo-user 28PKG_GECOS._smtpd= OpenSMTPD pseudo-user
30PKG_HOME._smtpd= ${SMTPD_HOME} 29PKG_HOME._smtpd= ${SMTPD_HOME}
31PKG_GECOS._smtpq= OpenSMTPD pseudo-user 30PKG_GECOS._smtpq= OpenSMTPD pseudo-user
32PKG_HOME._smtpq= ${SMTPD_HOME} 31PKG_HOME._smtpq= ${SMTPD_HOME}
33 32
34.include "../../mk/bsd.prefs.mk" 33.include "../../mk/bsd.prefs.mk"
35 34
36GNU_CONFIGURE= yes 35GNU_CONFIGURE= yes
37USE_DB185= yes 36USE_DB185= yes
38CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}/smtpd 37CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}/smtpd
39CONFIGURE_ARGS+= --with-mantype=man 38CONFIGURE_ARGS+= --with-mantype=man
40CONFIGURE_ARGS+= --with-libssl=${SSLBASE:Q} 39CONFIGURE_ARGS+= --with-libssl=${SSLBASE:Q}
41CONFIGURE_ARGS+= --with-path-CAfile=${SSLCERTS}/ca-certificates.crt 40CONFIGURE_ARGS+= --with-path-CAfile=${SSLCERTS}/ca-certificates.crt
42CONFIGURE_ARGS+= --with-path-empty=${VARBASE}/empty 41CONFIGURE_ARGS+= --with-path-empty=${VARBASE}/empty
43.if ${OPSYS} == "Linux" 42.if ${OPSYS} == "Linux"
44CONFIGURE_ARGS+= --with-path-mbox=${VARBASE}/spool/mail 43CONFIGURE_ARGS+= --with-path-mbox=${VARBASE}/spool/mail
45.else 44.else
46CONFIGURE_ARGS+= --with-path-mbox=${VARBASE}/mail 45CONFIGURE_ARGS+= --with-path-mbox=${VARBASE}/mail
47.endif 46.endif
48CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent} 47CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent}
49CONFIGURE_ARGS+= --with-table-db 48CONFIGURE_ARGS+= --with-table-db
50CONFIGURE_ARGS+= --with-pie 49CONFIGURE_ARGS+= --with-pie
51 50
52.include "options.mk" 51.include "options.mk"
53 52
54EGDIR= ${PREFIX}/share/examples/opensmtpd 53EGDIR= ${PREFIX}/share/examples/opensmtpd
55DOCDIR= ${PREFIX}/share/doc/opensmtpd 54DOCDIR= ${PREFIX}/share/doc/opensmtpd
56CONF_FILES+= ${EGDIR}/smtpd.conf ${PKG_SYSCONFDIR}/smtpd/smtpd.conf 55CONF_FILES+= ${EGDIR}/smtpd.conf ${PKG_SYSCONFDIR}/smtpd/smtpd.conf
57CONF_FILES+= ${EGDIR}/aliases ${PKG_SYSCONFDIR}/smtpd/aliases 56CONF_FILES+= ${EGDIR}/aliases ${PKG_SYSCONFDIR}/smtpd/aliases
58 57
59OWN_DIRS+= ${SMTPD_HOME} 58OWN_DIRS+= ${SMTPD_HOME}
60OWN_DIRS+= ${PKG_SYSCONFDIR}/smtpd 59OWN_DIRS+= ${PKG_SYSCONFDIR}/smtpd
61MAKE_DIRS+= ${VARBASE}/empty ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 60MAKE_DIRS+= ${VARBASE}/empty ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
62 61
63INSTALLATION_DIRS+= share/examples/${PKGBASE} 62INSTALLATION_DIRS+= share/examples/${PKGBASE}
64INSTALLATION_DIRS+= share/doc/${PKGBASE} 63INSTALLATION_DIRS+= share/doc/${PKGBASE}
65 64
66RCD_SCRIPTS= opensmtpd 65RCD_SCRIPTS= opensmtpd
67 66
68SETUID_ROOT_PERMS?= ${REAL_ROOT_USER} _smtpq 2555 67SETUID_ROOT_PERMS?= ${REAL_ROOT_USER} _smtpq 2555
69SPECIAL_PERMS+= sbin/smtpctl ${SETUID_ROOT_PERMS} 68SPECIAL_PERMS+= sbin/smtpctl ${SETUID_ROOT_PERMS}
70 69
71SUBST_CLASSES+= pkgsrc 70SUBST_CLASSES+= pkgsrc
72SUBST_STAGE.pkgsrc= pre-configure 71SUBST_STAGE.pkgsrc= pre-configure
73SUBST_FILES.pkgsrc= mailer.conf README.pkgsrc 72SUBST_FILES.pkgsrc= mailer.conf README.pkgsrc
74SUBST_VARS.pkgsrc= PKG_SYSCONFDIR PREFIX RCD_SCRIPTS_DIR 73SUBST_VARS.pkgsrc= PKG_SYSCONFDIR PREFIX RCD_SCRIPTS_DIR
75SUBST_MESSAGE.pkgsrc= Replacing pkgsrc placeholders. 74SUBST_MESSAGE.pkgsrc= Replacing pkgsrc placeholders.
76 75
77SUBST_CLASSES+= paths 76SUBST_CLASSES+= paths
78SUBST_STAGE.paths= pre-configure 77SUBST_STAGE.paths= pre-configure
79SUBST_MESSAGE.paths= Fixing hard-coded paths. 78SUBST_MESSAGE.paths= Fixing hard-coded paths.
80SUBST_FILES.paths+= mk/smtpd/Makefile.am usr.sbin/smtpd/smtpd.conf \ 79SUBST_FILES.paths+= mk/smtpd/Makefile.am usr.sbin/smtpd/smtpd.conf \
81 usr.sbin/smtpd/smtpd.8 usr.sbin/smtpd/smtpd.conf.5 \ 80 usr.sbin/smtpd/smtpd.8 usr.sbin/smtpd/smtpd.conf.5 \
82 usr.sbin/smtpd/aliases.5 usr.sbin/smtpd/makemap.8 \ 81 usr.sbin/smtpd/aliases.5 usr.sbin/smtpd/makemap.8 \
83 usr.sbin/smtpd/newaliases.8 82 usr.sbin/smtpd/newaliases.8
84SUBST_SED.paths+= -e "s:/etc/mail:${PKG_SYSCONFDIR}/smtpd:g" 83SUBST_SED.paths+= -e "s:/etc/mail:${PKG_SYSCONFDIR}/smtpd:g"
85SUBST_SED.paths+= -e "s:/usr/local/etc:${PKG_SYSCONFDIR}/smtpd:g" 84SUBST_SED.paths+= -e "s:/usr/local/etc:${PKG_SYSCONFDIR}/smtpd:g"
86SUBST_SED.paths+= -e "s:@EXAMPLE_DIR@:${EGDIR}:g" 85SUBST_SED.paths+= -e "s:@EXAMPLE_DIR@:${EGDIR}:g"
87SUBST_SED.paths+= -e "s:/etc/ssl:${SSLDIR}:g" 86SUBST_SED.paths+= -e "s:/etc/ssl:${SSLDIR}:g"
88 87
89MESSAGE_SUBST+= DOCDIR=${DOCDIR:Q} 88MESSAGE_SUBST+= DOCDIR=${DOCDIR:Q}
90 89
91post-extract: 90post-extract:
92.for f in mailer.conf README.pkgsrc 91.for f in mailer.conf README.pkgsrc
93 cp ${FILESDIR}/${f} ${WRKSRC} 92 cp ${FILESDIR}/${f} ${WRKSRC}
94.endfor 93.endfor
95 94
96pre-configure: 95pre-configure:
97 cd ${WRKSRC} && ${PREFIX}/bin/libtoolize --copy --force 96 cd ${WRKSRC} && ${PREFIX}/bin/libtoolize --copy --force
98 cd ${WRKSRC} && ${TOOLS_CMD.aclocal} 97 cd ${WRKSRC} && ${TOOLS_CMD.aclocal}
99 cd ${WRKSRC} && ${TOOLS_CMD.autoconf} 98 cd ${WRKSRC} && ${TOOLS_CMD.autoconf}
100 cd ${WRKSRC} && ${TOOLS_CMD.autoheader} 99 cd ${WRKSRC} && ${TOOLS_CMD.autoheader}
101 cd ${WRKSRC} && ${TOOLS_CMD.automake} --foreign --add-missing --copy 100 cd ${WRKSRC} && ${TOOLS_CMD.automake} --foreign --add-missing --copy
102 101
103.PHONY: doc-install 102.PHONY: doc-install
104doc-install: 103doc-install:
105 ${INSTALL_DATA} ${WRKSRC}/etc/aliases ${DESTDIR}${EGDIR} 104 ${INSTALL_DATA} ${WRKSRC}/etc/aliases ${DESTDIR}${EGDIR}
106 ${INSTALL_DATA} ${WRKSRC}/README.pkgsrc ${DESTDIR}${DOCDIR} 105 ${INSTALL_DATA} ${WRKSRC}/README.pkgsrc ${DESTDIR}${DOCDIR}
107 106
108.if ${OPSYS} == "Linux" 107.if ${OPSYS} == "Linux"
109. include "../../devel/libbsd/buildlink3.mk" 108. include "../../devel/libbsd/buildlink3.mk"
110.endif 109.endif
111.include "../../databases/db5/buildlink3.mk" 110.include "../../databases/db5/buildlink3.mk"
112.include "../../devel/libevent/buildlink3.mk" 111.include "../../devel/libevent/buildlink3.mk"
113.include "../../devel/zlib/buildlink3.mk" 112.include "../../devel/zlib/buildlink3.mk"
114.include "../../net/libasr/buildlink3.mk" 113.include "../../net/libasr/buildlink3.mk"
115.include "../../security/libretls/buildlink3.mk" 114.include "../../security/libretls/buildlink3.mk"
116.include "../../mk/dlopen.buildlink3.mk" 115.include "../../mk/dlopen.buildlink3.mk"
117.include "../../mk/bsd.pkg.mk" 116.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/mail/opensmtpd/distinfo (switch to unified diff)

--- pkgsrc/mail/opensmtpd/distinfo 2023/08/24 15:26:40 1.8
+++ pkgsrc/mail/opensmtpd/distinfo 2023/09/27 17:25:18 1.9
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.8 2023/08/24 15:26:40 vins Exp $ 1$NetBSD: distinfo,v 1.9 2023/09/27 17:25:18 vins Exp $
2 2
3BLAKE2s (opensmtpd-7.3.0p1.tar.gz) = 0b2b46d52ae98647cb952d175b718b5bbb13c407cbde997a5d3350099227ccc2 3BLAKE2s (opensmtpd-7.3.0p2.tar.gz) = 8c3df580b02d90bce9471e8a80a528168f84b6c7a060286debbfdff7fd44203a
4SHA512 (opensmtpd-7.3.0p1.tar.gz) = 2106de43e4b7435e49df759570ec758672ca8271dc451e30a261c250b41908b6ffe28e571a5f52e2ac14f59af132d1df45b272f8fcafeab04fcfb6bd5db970bb 4SHA512 (opensmtpd-7.3.0p2.tar.gz) = b7491df894410672cd100bd2acaa6c4a92f4935fe220990329122f2323bedb44d2a23753ef7996835eaca56720e8b4c13269ee80f4c4742e554bef4ecb434557
5Size (opensmtpd-7.3.0p1.tar.gz) = 849026 bytes 5Size (opensmtpd-7.3.0p2.tar.gz) = 846999 bytes
6SHA1 (patch-contrib_libexec_mail.local_mail.local.c) = bec19540fa52c7c6596ab5923f3a67b334ddf168 6SHA1 (patch-contrib_libexec_mail.local_mail.local.c) = bec19540fa52c7c6596ab5923f3a67b334ddf168
7SHA1 (patch-mk_smtpd_Makefile.am) = cc3f82922e3e56bc0205085f7e311f2beeda7fc4 7SHA1 (patch-mk_smtpd_Makefile.am) = cc3f82922e3e56bc0205085f7e311f2beeda7fc4
8SHA1 (patch-openbsd-compat_getpeereid.c) = 8d60140bffcabb6accf9b7bbe0f419c2c25d352d 8SHA1 (patch-openbsd-compat_getpeereid.c) = 8d60140bffcabb6accf9b7bbe0f419c2c25d352d
9SHA1 (patch-openbsd-compat_imsg-buffer.c) = 4b6861eec3461a192e20aa2daba4d74bd2659339 9SHA1 (patch-openbsd-compat_imsg-buffer.c) = 4b6861eec3461a192e20aa2daba4d74bd2659339
10SHA1 (patch-openbsd-compat_imsg.c) = 762b2ae2362716947ea007fa229e9e31fa6d08f3 10SHA1 (patch-openbsd-compat_imsg.c) = 762b2ae2362716947ea007fa229e9e31fa6d08f3
11SHA1 (patch-usr.sbin_smtpd_proxy.c) = 895d3e9532bf53dcdb7a52825043acacac51b378 11SHA1 (patch-usr.sbin_smtpd_proxy.c) = 895d3e9532bf53dcdb7a52825043acacac51b378
12SHA1 (patch-usr.sbin_smtpd_queue__fs.c) = f40d5be4c05d8d54f7368af8d20f4ee007860dc7 12SHA1 (patch-usr.sbin_smtpd_queue__fs.c) = f40d5be4c05d8d54f7368af8d20f4ee007860dc7
13SHA1 (patch-usr.sbin_smtpd_smtp__session.c) = 565b1df1a6d4d3c5ee786f4501c1cd73992f2d3e 13SHA1 (patch-usr.sbin_smtpd_smtp__session.c) = 565b1df1a6d4d3c5ee786f4501c1cd73992f2d3e