CVS commit: pkgsrc/mail/sendmail

["John Nemeth" <jnemeth%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jnemeth
Date:           Mon Jul 15 02:06:42 UTC 2019

Modified Files:
        pkgsrc/mail/sendmail: Makefile options.mk
Added Files:
        pkgsrc/mail/sendmail/files: site.config.m4-ffr_badrcptshutdown

Log Message:
Add sendmail-ffr-badrcptshutdown option.  This option enables the
sendmail options BadRcptShutdown and BadRcptShutdownGood to be
used.  "ffr" stands for For Future Release, which means it is a
beta test feature that may show up in a future release of sendmail.

The sendmail-ffr-badrcptshutdown option is disabled by default so
no change to binary packages, thus not bumping PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 pkgsrc/mail/sendmail/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mail/sendmail/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/sendmail/files/site.config.m4-ffr_badrcptshutdown

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/sendmail/Makefile
diff -u pkgsrc/mail/sendmail/Makefile:1.130 pkgsrc/mail/sendmail/Makefile:1.131
--- pkgsrc/mail/sendmail/Makefile:1.130 Wed Dec  5 12:10:21 2018
+++ pkgsrc/mail/sendmail/Makefile       Mon Jul 15 02:06:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.130 2018/12/05 12:10:21 bsiegert Exp $
+# $NetBSD: Makefile,v 1.131 2019/07/15 02:06:42 jnemeth Exp $
 
 PKGNAME=       sendmail-${DIST_VERS}
 PKGREVISION=   3
@@ -103,6 +103,9 @@ post-patch: make-sendmail-siteconfig
 .if !empty(PKG_OPTIONS:Msasl)
        cat ${FILESDIR}/site.config.m4-sasl2 >>${SITECONFIG}
 .endif
+.if !empty(PKG_OPTIONS:Msendmail-ffr-badrcptshutdown)
+       cat ${FILESDIR}/site.config.m4-ffr_badrcptshutdown >>${SITECONFIG}
+.endif
 
 post-extract:
        cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf

Index: pkgsrc/mail/sendmail/options.mk
diff -u pkgsrc/mail/sendmail/options.mk:1.23 pkgsrc/mail/sendmail/options.mk:1.24
--- pkgsrc/mail/sendmail/options.mk:1.23        Sat Jul 11 10:08:32 2015
+++ pkgsrc/mail/sendmail/options.mk     Mon Jul 15 02:06:42 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.23 2015/07/11 10:08:32 jnemeth Exp $
+# $NetBSD: options.mk,v 1.24 2019/07/15 02:06:42 jnemeth Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.sendmail
 PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl tls tcpwrappers
-PKG_SUPPORTED_OPTIONS+=        sendmail-ffr-tls
+PKG_SUPPORTED_OPTIONS+=        sendmail-ffr-tls sendmail-ffr-badrcptshutdown
 PKG_SUGGESTED_OPTIONS= inet6 tcpwrappers tls
 
 PKG_OPTIONS_LEGACY_OPTS+=      starttls:tls ffr_tls_1:sendmail-ffr-tls
@@ -40,7 +40,13 @@ PKG_OPTIONS_LEGACY_OPTS+=    starttls:tls f
 .endif
 
 ###
-### 'For Future Release' FFR_TLS_* options: CipherList, multiple certs
+### 'For Future Release' _FFR_TLS_* options: CipherList, multiple certs
+###
+# Nothing to do here, activation is done in Makefile
+
+###
+### 'For Future Release' _FFR_BADRCPT_SHUTDOWN options:
+###      BadRcptShutdown, BadRcptShutdownGood
 ###
 # Nothing to do here, activation is done in Makefile
 

Added files:

Index: pkgsrc/mail/sendmail/files/site.config.m4-ffr_badrcptshutdown
diff -u /dev/null pkgsrc/mail/sendmail/files/site.config.m4-ffr_badrcptshutdown:1.1
--- /dev/null   Mon Jul 15 02:06:42 2019
+++ pkgsrc/mail/sendmail/files/site.config.m4-ffr_badrcptshutdown       Mon Jul 15 02:06:42 2019
@@ -0,0 +1,4 @@
+# $NetBSD: site.config.m4-ffr_badrcptshutdown,v 1.1 2019/07/15 02:06:42 jnemeth Exp $
+
+# enable _FFR_BARRCPT_SHUTDOWN
+APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_BADRCPT_SHUTDOWN')