Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1709326205192180"
MIME-Version: 1.0
Date: Fri, 1 Mar 2024 20:50:05 +0000
From: "Paolo Vincenzo Olivo" <vins@netbsd.org>
Subject: CVS commit: pkgsrc/mail/opensmtpd
To: pkgsrc-changes@NetBSD.org
Reply-To: vins@netbsd.org
Message-Id: <20240301205006.05E02FA27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1709326205192180
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	vins
Date:		Fri Mar  1 20:50:05 UTC 2024

Modified Files:
	pkgsrc/mail/opensmtpd: MESSAGE Makefile PLIST.common options.mk
	pkgsrc/mail/opensmtpd/files: README.pkgsrc

Log Message:
mail/opensmtpd: minor revision

* use PKG_SYSCONFSUBDIR.
* Fix sample pam file location to match the common pkgsrc practice.
* update README.pkgsrc and make it more verbose.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/opensmtpd/MESSAGE \
    pkgsrc/mail/opensmtpd/PLIST.common
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mail/opensmtpd/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/opensmtpd/options.mk
cvs rdiff -u -r1.2 -r1.3 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.


--_----------=_1709326205192180
Content-Disposition: inline
Content-Length: 5662
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mail/opensmtpd/MESSAGE
diff -u pkgsrc/mail/opensmtpd/MESSAGE:1.1 pkgsrc/mail/opensmtpd/MESSAGE:1.2
--- pkgsrc/mail/opensmtpd/MESSAGE:1.1	Thu Aug 24 15:26:40 2023
+++ pkgsrc/mail/opensmtpd/MESSAGE	Fri Mar  1 20:50:05 2024
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2023/08/24 15:26:40 vins Exp $
+$NetBSD: MESSAGE,v 1.2 2024/03/01 20:50:05 vins Exp $
 
-Sample configuration files have been installed at ${PKG_SYSCONFDIR}/smtpd.
+Sample configuration files have been installed at ${PKG_SYSCONFDIR}.
 
 Check the README available at ${DOCDIR}.
 
Index: pkgsrc/mail/opensmtpd/PLIST.common
diff -u pkgsrc/mail/opensmtpd/PLIST.common:1.1 pkgsrc/mail/opensmtpd/PLIST.common:1.2
--- pkgsrc/mail/opensmtpd/PLIST.common:1.1	Thu Aug 24 15:26:40 2023
+++ pkgsrc/mail/opensmtpd/PLIST.common	Fri Mar  1 20:50:05 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2023/08/24 15:26:40 vins Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2024/03/01 20:50:05 vins Exp $
 bin/smtp
 libexec/opensmtpd/encrypt
 libexec/opensmtpd/lockspool
@@ -30,5 +30,5 @@ sbin/smtpd
 share/doc/opensmtpd/README.pkgsrc
 share/examples/opensmtpd/aliases
 ${PLIST.mailwrapper}share/examples/opensmtpd/mailer.conf
-${PLIST.pam}share/examples/opensmtpd/pam.d/smtp
 share/examples/opensmtpd/smtpd.conf
+${PLIST.pam}share/examples/pam.d/smtp

Index: pkgsrc/mail/opensmtpd/Makefile
diff -u pkgsrc/mail/opensmtpd/Makefile:1.23 pkgsrc/mail/opensmtpd/Makefile:1.24
--- pkgsrc/mail/opensmtpd/Makefile:1.23	Tue Jan 16 13:24:00 2024
+++ pkgsrc/mail/opensmtpd/Makefile	Fri Mar  1 20:50:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2024/01/16 13:24:00 vins Exp $
+# $NetBSD: Makefile,v 1.24 2024/03/01 20:50:05 vins Exp $
 
 VERSION=	7.4.0p1
 DISTNAME=	opensmtpd-${VERSION}
@@ -50,13 +50,13 @@ CONFIGURE_ARGS+=	--with-pie
 
 .include "options.mk"
 
-EGDIR=		${PREFIX}/share/examples/opensmtpd
-DOCDIR=		${PREFIX}/share/doc/opensmtpd
-CONF_FILES+=	${EGDIR}/smtpd.conf ${PKG_SYSCONFDIR}/smtpd/smtpd.conf
-CONF_FILES+=	${EGDIR}/aliases ${PKG_SYSCONFDIR}/smtpd/aliases
+PKG_SYSCONFSUBDIR=	smtpd
+EGDIR=			${PREFIX}/share/examples/opensmtpd
+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}
-OWN_DIRS+=	${PKG_SYSCONFDIR}/smtpd
 MAKE_DIRS+=	${VARBASE}/empty ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
 
 INSTALLATION_DIRS+=	share/examples/${PKGBASE}

Index: pkgsrc/mail/opensmtpd/options.mk
diff -u pkgsrc/mail/opensmtpd/options.mk:1.2 pkgsrc/mail/opensmtpd/options.mk:1.3
--- pkgsrc/mail/opensmtpd/options.mk:1.2	Tue Jan 16 13:24:00 2024
+++ pkgsrc/mail/opensmtpd/options.mk	Fri Mar  1 20:50:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2024/01/16 13:24:00 vins Exp $
+# $NetBSD: options.mk,v 1.3 2024/03/01 20:50:05 vins Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.opensmtpd
 
@@ -26,12 +26,14 @@ PLIST_VARS+=		mailwrapper pam
 
 CONFIGURE_ARGS+=	--with-auth-pam=smtp
 
-EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES+=		${EGDIR}/pam.d/smtp \
+PAMDIR=		share/examples/pam.d
+MAKE_DIRS+=	${PAMDIR}
+MAKE_DIRS+=	${PKG_SYSCONFDIR}/pam.d
+
+CONF_FILES+=		${PREFIX}/${PAMDIR}/smtp \
 			${PKG_SYSCONFDIR}/pam.d/smtp
 
-MAKE_DIRS+=		${PKG_SYSCONFDIR}/pam.d
-INSTALLATION_DIRS+=	share/examples/${PKGBASE}/pam.d
+INSTALLATION_DIRS+=	${PAMDIR}
 
 PLIST.pam=		yes
 
@@ -39,7 +41,7 @@ PLIST.pam=		yes
 
 pam-install:
 	${INSTALL_DATA} ${FILESDIR}/smtp.conf	\
-		${DESTDIR}${EGDIR}/pam.d/smtp
+		${DESTDIR}${PREFIX}/${PAMDIR}/smtp
 .endif
 
 #

Index: pkgsrc/mail/opensmtpd/files/README.pkgsrc
diff -u pkgsrc/mail/opensmtpd/files/README.pkgsrc:1.2 pkgsrc/mail/opensmtpd/files/README.pkgsrc:1.3
--- pkgsrc/mail/opensmtpd/files/README.pkgsrc:1.2	Thu Aug 24 15:49:09 2023
+++ pkgsrc/mail/opensmtpd/files/README.pkgsrc	Fri Mar  1 20:50:05 2024
@@ -1,14 +1,29 @@
-Getting started
-===============
++-----------------------------------------------------------------------
+| Getting started with OpenSMTPD on NetBSD 
++-----------------------------------------------------------------------
 
 Assuming NetBSD-style mailwrapper(8) and rc(8), few steps are required
 to set up OpenSMTPD for local and outbound delivery on your system: 
 
-* Run `$ @RCD_SCRIPTS_DIR@/postfix stop' and set postfix=NO in /etc/rc.conf.
+* Explictely disable Postfix to prevent it from listening on smtp/smtps
+  ports. To do this, run`$ @RCD_SCRIPTS_DIR@/postfix stop' and set
+  postfix=NO in /etc/rc.conf.
+
 * Replace /etc/mailer.conf with @PREFIX@/share/examples/opensmtpd/mailer.conf.
+  This will instruct mailwrapper(8) to invoke OpenSMTPD in place of
+  Postfix when executing sendmail-compatible commands.
+
+* 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
+  @PREFIX@/share/examples/pam.d/smtp to /etc/pam.d 
+
 * Prepend @PREFIX@/man to the MANPATH environment to avoid conflicting
-  names for man pages with sendmail-compatible mail servers.
-* Check the smtpd.conf and aliases files in @PKG_SYSCONFDIR@/smtpd. See 
-  the relevant man pages.
-* Set opensmtpd=YES in /etc/rc.conf.  
-* Run `@RCD_SCRIPTS_DIR@/opensmtpd start' to start OpenSMTPD.
+  names in man pages with Postfix.
+
+* Check the smtpd.conf and aliases files in @PKG_SYSCONFDIR@. See 
+  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.


--_----------=_1709326205192180--