CVS commit: pkgsrc/mail/qmail

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Nov 10 15:29:01 UTC 2018

Modified Files:
        pkgsrc/mail/qmail: Makefile distinfo options.mk

Log Message:
Add a new non-optional patch: qmail-spp, a generic plugin interface for
qmail-smtpd (tweaked to tolerate the absence of a config file).

The RCPTCHECK patch is a logical subset of SPP with a slightly different
interface, and conflicts with SPP. Remove RCPTCHECK.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 pkgsrc/mail/qmail/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/mail/qmail/distinfo
cvs rdiff -u -r1.56 -r1.57 pkgsrc/mail/qmail/options.mk

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

Modified files:

Index: pkgsrc/mail/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.100 pkgsrc/mail/qmail/Makefile:1.101
--- pkgsrc/mail/qmail/Makefile:1.100    Thu Nov  8 20:58:08 2018
+++ pkgsrc/mail/qmail/Makefile  Sat Nov 10 15:29:01 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.100 2018/11/08 20:58:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.101 2018/11/10 15:29:01 schmonz Exp $
 #
 
 DISTNAME=              netqmail-1.06
 PKGNAME=               qmail-1.03
-PKGREVISION=           39
+PKGREVISION=           40
 CATEGORIES=            mail
 MASTER_SITES=          http://qmail.org/
 

Index: pkgsrc/mail/qmail/distinfo
diff -u pkgsrc/mail/qmail/distinfo:1.40 pkgsrc/mail/qmail/distinfo:1.41
--- pkgsrc/mail/qmail/distinfo:1.40     Thu Nov  8 20:58:08 2018
+++ pkgsrc/mail/qmail/distinfo  Sat Nov 10 15:29:01 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2018/11/08 20:58:08 schmonz Exp $
+$NetBSD: distinfo,v 1.41 2018/11/10 15:29:01 schmonz Exp $
 
 SHA1 (netqmail-1.06-destdir-20170716.patch) = 92b3fe539d7863792e951723e26f6cfb6062771a
 RMD160 (netqmail-1.06-destdir-20170716.patch) = bad1976ba87e0af934a50d02bd38eebb3b22cf03
@@ -12,10 +12,10 @@ SHA1 (netqmail-1.06-qmailremote-20170716
 RMD160 (netqmail-1.06-qmailremote-20170716.patch) = c26d7f8510cab92bcf5d5fbb861ec62ff593196a
 SHA512 (netqmail-1.06-qmailremote-20170716.patch) = de77c1b01ab88199b3f096e64a733dd86867001dfbcea1cf0d6b20e99d448638e0294440ef48fabc309355440834a8747b4c476cf47b89e6ddb3b7250008dd8e
 Size (netqmail-1.06-qmailremote-20170716.patch) = 1668 bytes
-SHA1 (netqmail-1.06-tls-20160918-onlyremote-20181107-smtputf8-20181107.patch) = b0daffc407ef8284b05044f2e829bfead66d8f1e
-RMD160 (netqmail-1.06-tls-20160918-onlyremote-20181107-smtputf8-20181107.patch) = 56d6556d64a95c6ffcb968c259b9499997a2dafb
-SHA512 (netqmail-1.06-tls-20160918-onlyremote-20181107-smtputf8-20181107.patch) = 
79dcc3dabf776d6cf500481047134b8add600883f32e1fbed47a37eba921d852c3befa74295b230ff363d5a4199f2168569e83ca80344b32324f285c8f63f69e
-Size (netqmail-1.06-tls-20160918-onlyremote-20181107-smtputf8-20181107.patch) = 6937 bytes
+SHA1 (netqmail-1.06-tls-20160918-onlyremote-20181107-spp-20181109-smtputf8-20181109.patch) = c2c89aed0bc2059a8a6686bd0ec094fe08b63600
+RMD160 (netqmail-1.06-tls-20160918-onlyremote-20181107-spp-20181109-smtputf8-20181109.patch) = 1ad6791996f8741917e2b2980c7e5f6a9449e00f
+SHA512 (netqmail-1.06-tls-20160918-onlyremote-20181107-spp-20181109-smtputf8-20181109.patch) = 
a02cad7ef0f57a9eee8a12444a30df4d112ba256fa581124d7f0fb78acee4da53d0211d98de5822f058518d6a872e01e737f28e437b8ed5f8fa392ae8808468b
+Size (netqmail-1.06-tls-20160918-onlyremote-20181107-spp-20181109-smtputf8-20181109.patch) = 6962 bytes
 SHA1 (netqmail-1.06-tls-20160918-onlyremote-20181107.patch) = 054c4c66648ecc4f0c079e4f805668fae601b84d
 RMD160 (netqmail-1.06-tls-20160918-onlyremote-20181107.patch) = 686d1694a29a3c4ebd40b0f9509470c76f0a6ecd
 SHA512 (netqmail-1.06-tls-20160918-onlyremote-20181107.patch) = 7db6024f0554d1c5be6357aea23d920bee064180c9dde67ce0a01777523b88c10468300d31aa8108ebcb0bfa232a8930c3d50395b6bd77488c47418192dbc35f
@@ -40,10 +40,10 @@ SHA1 (qmail-queue-custom-error-v2.netqma
 RMD160 (qmail-queue-custom-error-v2.netqmail-1.05.patch) = e40fe48e048a41d92c052a12aafa1fccf8becba2
 SHA512 (qmail-queue-custom-error-v2.netqmail-1.05.patch) = c3710a87cee5458fee7708166afd0d591b58b071eeea8d551c38c2d59c739865478cb1a0fbb8b592933f9bb85b865da6cdb8973fa0d93259605d01347600176c
 Size (qmail-queue-custom-error-v2.netqmail-1.05.patch) = 3873 bytes
-SHA1 (qmail-smtpd.patch) = 2f14d7a98686ad5f32bdaaa6e201734302352e71
-RMD160 (qmail-smtpd.patch) = a4496ee44f9a4298404c3f75d23dd985f3ff12bb
-SHA512 (qmail-smtpd.patch) = ada4f2ce3972965b02a7acc9a072deeedafd026e19c2c96b8b4059f1f1fab653409f88cd6ee5f1d4a99dd943e018a1cd6296b05d7fd86e83296aa0150227edbe
-Size (qmail-smtpd.patch) = 3716 bytes
+SHA1 (qmail-spp-0.42.tar.gz) = 76a94051b017dd331d8c791e466bb2a936ceba41
+RMD160 (qmail-spp-0.42.tar.gz) = 5511722c52346692488a63bca53106d580a004c7
+SHA512 (qmail-spp-0.42.tar.gz) = 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
+Size (qmail-spp-0.42.tar.gz) = 18689 bytes
 SHA1 (qmail-srs-0.8.patch) = 44d6075fe22d698b21a9045b0cce7f607bc86eee
 RMD160 (qmail-srs-0.8.patch) = cf86dc7874dc116b31bf933f18615c75cfc4c0c4
 SHA512 (qmail-srs-0.8.patch) = a2a6c26a02d1c607f4ed4f73d6c8b57ed6a6c31126f20b073e9cd2258ca43c0da98a67de254df30e07e3887c90239cba0ccf3f45d535f4c66017217da1732f9b

Index: pkgsrc/mail/qmail/options.mk
diff -u pkgsrc/mail/qmail/options.mk:1.56 pkgsrc/mail/qmail/options.mk:1.57
--- pkgsrc/mail/qmail/options.mk:1.56   Thu Nov  8 20:58:08 2018
+++ pkgsrc/mail/qmail/options.mk        Sat Nov 10 15:29:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.56 2018/11/08 20:58:08 schmonz Exp $
+# $NetBSD: options.mk,v 1.57 2018/11/10 15:29:01 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS+=                eai inet6 pam syncdir tls
@@ -42,23 +42,26 @@ QBIFFUTMPX_PATCH=           netqmail-1.06-qbiffut
 PATCHFILES+=                   ${QBIFFUTMPX_PATCH}
 SITES.${QBIFFUTMPX_PATCH}=     https://schmonz.com/qmail/qbiffutmpx/
 
-QMAILPATCHES+=                 rcptcheck:${RCPTCHECK_PATCH}
-RCPTCHECK_PATCH=               qmail-smtpd.patch
-PATCHFILES+=                   ${RCPTCHECK_PATCH}
-SITES.${RCPTCHECK_PATCH}=      http://www.soffian.org/downloads/qmail/
-PATCH_DIST_STRIP.${RCPTCHECK_PATCH}=-p1
-
 QMAILPATCHES+=                 remote:${REMOTE_PATCH}
 REMOTE_PATCH=                  netqmail-1.06-qmailremote-20170716.patch
 PATCHFILES+=                   ${REMOTE_PATCH}
 SITES.${REMOTE_PATCH}=         https://schmonz.com/qmail/remote/
 
+QMAILPATCHES+=                 spp:${SPP_PATCH}
+SPP_PATCH=                     qmail-spp-0.42.tar.gz
+PATCHFILES+=                   ${SPP_PATCH}
+SITES.${SPP_PATCH}=            ${MASTER_SITE_SOURCEFORGE:=qmail-spp/}
+PATCH_DIST_CAT.${SPP_PATCH}=   ${TAR} -xOf ${SPP_PATCH} qmail-spp-0.42/netqmail-spp.diff \
+                               | ${SED} -e 's|sppfok \!= 1|sppfok == -1|'
+PATCH_DIST_STRIP.${SPP_PATCH}= -p1
+LICENSE+=                      AND gnu-gpl-v2
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Meai)
 .  include "../../devel/libidn2/buildlink3.mk"
 QMAILPATCHES+=                 eai:${EAI_PATCH}
-EAI_PATCH=                     netqmail-1.06-tls-20160918-onlyremote-20181107-smtputf8-20181107.patch
+EAI_PATCH=                     netqmail-1.06-tls-20160918-onlyremote-20181107-spp-20181109-smtputf8-20181109.patch
 PATCHFILES+=                   ${EAI_PATCH}
 SITES.${EAI_PATCH}=            https://schmonz.com/qmail/eai/
 CFLAGS+=                       -DEHLO=1