Sat Mar 2 17:01:12 2024 UTC (95d)
mail/opensmtpd: fix SUBST routines after SYSCONFSUBDIR introduction.

Also, since we're here, remove pam policy file from CONF files and
better sort Makefile.
Bump revision.


(vins)
diff -r1.24 -r1.25 pkgsrc/mail/opensmtpd/Makefile
diff -r1.3 -r1.4 pkgsrc/mail/opensmtpd/options.mk
diff -r1.3 -r1.4 pkgsrc/mail/opensmtpd/files/opensmtpd.sh
cvs diff -r1.24 -r1.25 pkgsrc/mail/opensmtpd/Makefile (expand / switch to unified diff)

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

--- pkgsrc/mail/opensmtpd/options.mk 2024/03/01 20:50:05 1.3
+++ pkgsrc/mail/opensmtpd/options.mk 2024/03/02 17:01:12 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.3 2024/03/01 20:50:05 vins Exp $ 1# $NetBSD: options.mk,v 1.4 2024/03/02 17:01:12 vins Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.opensmtpd 3PKG_OPTIONS_VAR= PKG_OPTIONS.opensmtpd
4 4
5PKG_SUPPORTED_OPTIONS= mailwrapper pam 5PKG_SUPPORTED_OPTIONS= mailwrapper pam
6 6
7.if ${OPSYS} != "OpenBSD" 7.if ${OPSYS} != "OpenBSD"
8PKG_SUGGESTED_OPTIONS+= pam 8PKG_SUGGESTED_OPTIONS+= pam
9.else 9.else
10CONFIGURE_ARGS+= --with-auth-bsdauth 10CONFIGURE_ARGS+= --with-auth-bsdauth
11.endif 11.endif
12 12
13.if exists(/etc/mailer.conf) || exists(/etc/mail/mailer.conf) || exists(${PKG_SYSCONFDIR}/mailer.conf) 13.if exists(/etc/mailer.conf) || exists(/etc/mail/mailer.conf) || exists(${PKG_SYSCONFDIR}/mailer.conf)
14PKG_SUGGESTED_OPTIONS+= mailwrapper 14PKG_SUGGESTED_OPTIONS+= mailwrapper
@@ -18,30 +18,26 @@ PLIST_VARS+= mailwrapper pam @@ -18,30 +18,26 @@ PLIST_VARS+= mailwrapper pam
18 18
19.include "../../mk/bsd.options.mk" 19.include "../../mk/bsd.options.mk"
20 20
21# 21#
22# PAM support 22# PAM support
23# 23#
24.if !empty(PKG_OPTIONS:Mpam) 24.if !empty(PKG_OPTIONS:Mpam)
25. include "../../mk/pam.buildlink3.mk" 25. include "../../mk/pam.buildlink3.mk"
26 26
27CONFIGURE_ARGS+= --with-auth-pam=smtp 27CONFIGURE_ARGS+= --with-auth-pam=smtp
28 28
29PAMDIR= share/examples/pam.d 29PAMDIR= share/examples/pam.d
30MAKE_DIRS+= ${PAMDIR} 30MAKE_DIRS+= ${PAMDIR}
31MAKE_DIRS+= ${PKG_SYSCONFDIR}/pam.d 
32 
33CONF_FILES+= ${PREFIX}/${PAMDIR}/smtp \ 
34 ${PKG_SYSCONFDIR}/pam.d/smtp 
35 31
36INSTALLATION_DIRS+= ${PAMDIR} 32INSTALLATION_DIRS+= ${PAMDIR}
37 33
38PLIST.pam= yes 34PLIST.pam= yes
39 35
40.PHONY: pam-install 36.PHONY: pam-install
41 37
42pam-install: 38pam-install:
43 ${INSTALL_DATA} ${FILESDIR}/smtp.conf \ 39 ${INSTALL_DATA} ${FILESDIR}/smtp.conf \
44 ${DESTDIR}${PREFIX}/${PAMDIR}/smtp 40 ${DESTDIR}${PREFIX}/${PAMDIR}/smtp
45.endif 41.endif
46 42
47# 43#
cvs diff -r1.3 -r1.4 pkgsrc/mail/opensmtpd/files/opensmtpd.sh (expand / switch to unified diff)

--- pkgsrc/mail/opensmtpd/files/opensmtpd.sh 2023/08/24 15:26:40 1.3
+++ pkgsrc/mail/opensmtpd/files/opensmtpd.sh 2024/03/02 17:01:12 1.4
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!/bin/sh 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: opensmtpd.sh,v 1.3 2023/08/24 15:26:40 vins Exp $ 3# $NetBSD: opensmtpd.sh,v 1.4 2024/03/02 17:01:12 vins Exp $
4# 4#
5 5
6# PROVIDE: smtpd mail 6# PROVIDE: smtpd mail
7# REQUIRE: LOGIN 7# REQUIRE: LOGIN
8# KEYWORD: shutdown 8# KEYWORD: shutdown
9# we make mail start late, so that things like .forward's are not 9# we make mail start late, so that things like .forward's are not
10# processed until the system is fully operational 10# processed until the system is fully operational
11 11
12$_rc_subr_loaded . @SYSCONFBASE@/rc.subr 12$_rc_subr_loaded . @SYSCONFBASE@/rc.subr
13 13
14name="smtpd" 14name="smtpd"
15rcvar=opensmtpd 15rcvar=opensmtpd
16 16