CVS commit: pkgsrc/mail/opensmtpd

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Tue Feb 25 05:05:15 UTC 2025

Modified Files:
        pkgsrc/mail/opensmtpd: Makefile
        pkgsrc/mail/opensmtpd/files: opensmtpd.sh

Log Message:
mail/opensmtpd: fix configuration path in sample rc.d script

Also use a more conventional chroot dir.
Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mail/opensmtpd/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/opensmtpd/files/opensmtpd.sh

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.30 pkgsrc/mail/opensmtpd/Makefile:1.31
--- pkgsrc/mail/opensmtpd/Makefile:1.30 Tue Jan  7 05:24:43 2025
+++ pkgsrc/mail/opensmtpd/Makefile      Tue Feb 25 05:05:15 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2025/01/07 05:24:43 vins Exp $
+# $NetBSD: Makefile,v 1.31 2025/02/25 05:05:15 vins Exp $
 
 VERSION=       7.6.0p1
-PKGREVISION=   1
+PKGREVISION=   2
 DISTNAME=      opensmtpd-${VERSION}
 CATEGORIES=    mail net
 MASTER_SITES=  https://www.opensmtpd.org/archives/
@@ -12,7 +12,7 @@ COMMENT=      The OpenSMTPD mail transfer age
 LICENSE=       isc AND modified-bsd AND 2-clause-bsd
 
 BUILD_DEFS+=   VARBASE
-SMTPD_HOME=    ${VARBASE}/smtpd/empty
+SMTPD_HOME=    ${VARBASE}/chroot/smtpd
 SMTPD_QUEUE=   _smtpq
 
 GNU_CONFIGURE= yes

Index: pkgsrc/mail/opensmtpd/files/opensmtpd.sh
diff -u pkgsrc/mail/opensmtpd/files/opensmtpd.sh:1.4 pkgsrc/mail/opensmtpd/files/opensmtpd.sh:1.5
--- pkgsrc/mail/opensmtpd/files/opensmtpd.sh:1.4        Sat Mar  2 17:01:12 2024
+++ pkgsrc/mail/opensmtpd/files/opensmtpd.sh    Tue Feb 25 05:05:15 2025
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: opensmtpd.sh,v 1.4 2024/03/02 17:01:12 vins Exp $
+# $NetBSD: opensmtpd.sh,v 1.5 2025/02/25 05:05:15 vins Exp $
 #
 
 # PROVIDE: smtpd mail
@@ -14,7 +14,7 @@ $_rc_subr_loaded . @SYSCONFBASE@/rc.subr
 name="smtpd"
 rcvar=opensmtpd
 
-: ${smtpd_config:="@PKG_SYSCONFDIR@/smtpd/${name}.conf"}
+: ${smtpd_config:="@PKG_SYSCONFDIR@/${name}.conf"}
 : ${smtpd_server:="@PREFIX@/sbin/${name}"}
 : ${smtpd_flags:=""}