pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/mail/qmail



Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jul 21 04:07:01 UTC 2017

Modified Files:
        pkgsrc/mail/qmail: INSTALL Makefile PLIST distinfo options.mk
        pkgsrc/mail/qmail/files: README.pkgsrc
        pkgsrc/mail/qmail/patches: patch-Makefile
Removed Files:
        pkgsrc/mail/qmail/patches: patch-auto__uids.c patch-auto__uids.h
            patch-hier.c patch-pkgsrc__user__destdir__fake__chown.c
            patch-pkgsrc__user__destdir__fake__uids.h patch-spawn.c

Log Message:
Update to 1.03nb29. pkgsrc changes:

Remove unneeded options:

- Unconditionally apply netqmail (which includes a local patch; remove it)

- Unconditionally apply bigdns, maildiruniq, outgoingip, rcptcheck, remote

- Unconditionally apply the TLS + SMTP AUTH _patch_ (not the options)

- Record all applied patches (mandatory and optional) in QMAILPATCHES

- Remove badrcptto, qregex, realrcptto, viruscan (moved to rejectutils)

Simplify packaging:

- Extract a standalone patch <https://schmonz.com/qmail/rejectutils> to
  repackage the mutually conflicting recipient- and content-checking
  patches as separate programs, along with wrappers for running checks
  in sequence

- Extract a standalone patch <https://schmonz.com/qmail/destdir> to
  build to a staging area, as non-root, without hardcoded IDs

- Run the destdir patch's `install-destdir` to make or repair the queue
  and set special file permissions, obviating the need for a dependency
  on mail/queue-fix and handcrafted SPECIAL_PERMS

- While here, run `instcheck` to ensure we've installed just like `make
  setup check` as root would have

- Install INSTALL and SENDMAIL docs under their original names,
  even on Darwin

- Avoid building catpages, since we don't install them, and remove nroff
  from USE_TOOLS

Default-enable more useful options:

- "eai" (new) permits UTF-8 almost everywhere in email

- "qmail-rejectutils" (new) adds several tools for selectively
  rejecting messages

- "syncdir" forces synchronous link() and related syscalls

- "tls" and "sasl", instead of causing patch conflicts, cause the TLS
  and SMTP AUTH code to be included (!)


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/qmail/INSTALL
cvs rdiff -u -r1.86 -r1.87 pkgsrc/mail/qmail/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/qmail/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/mail/qmail/distinfo
cvs rdiff -u -r1.41 -r1.42 pkgsrc/mail/qmail/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/qmail/files/README.pkgsrc
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/qmail/patches/patch-Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/mail/qmail/patches/patch-auto__uids.c \
    pkgsrc/mail/qmail/patches/patch-auto__uids.h \
    pkgsrc/mail/qmail/patches/patch-spawn.c
cvs rdiff -u -r1.5 -r0 pkgsrc/mail/qmail/patches/patch-hier.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/mail/qmail/patches/patch-pkgsrc__user__destdir__fake__chown.c \
    pkgsrc/mail/qmail/patches/patch-pkgsrc__user__destdir__fake__uids.h

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/INSTALL
diff -u pkgsrc/mail/qmail/INSTALL:1.8 pkgsrc/mail/qmail/INSTALL:1.9
--- pkgsrc/mail/qmail/INSTALL:1.8       Thu Apr 27 20:35:10 2017
+++ pkgsrc/mail/qmail/INSTALL   Fri Jul 21 04:07:01 2017
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.8 2017/04/27 20:35:10 schmonz Exp $
+# $NetBSD: INSTALL,v 1.9 2017/07/21 04:07:01 schmonz Exp $
 
 DOCDIR=@DOCDIR@
 EGDIR=@EGDIR@
@@ -56,9 +56,37 @@ EOF
        ;;
 
 POST-INSTALL)
-       if ! [ -d ${QMAIL_QUEUE_DIR} ] || ! [ -d ${QMAIL_QUEUE_DIR}/info ]; then
-               ${PREFIX}/bin/queue-fix ${QMAIL_QUEUE_DIR}
+       ${PREFIX}/share/qmail/setup/install-destdir
+       QMAIL_SETUP_EXITCODE=$?
+       if [ ${QMAIL_SETUP_EXITCODE} -ne 0 ]; then
+               ${CAT} <<EOF
+===========================================================================
+
+ERROR: install-destdir exited nonzero (${QMAIL_SETUP_EXITCODE}).
+
+Permissions are likely wrong, and/or the queue may be uninitialized.
+
+===========================================================================
+EOF
+               exit 1
+       fi
+
+       QMAIL_CHECK_OUTPUT=$(${PREFIX}/share/qmail/setup/instcheck 2>&1)
+       if [ -n "${QMAIL_CHECK_OUTPUT}" ]; then
+               ${CAT} <<EOF
+===========================================================================
+
+ERROR: instcheck issued warnings:
+
+${QMAIL_CHECK_OUTPUT}
+
+Permissions are likely wrong, and/or the queue may be uninitialized.
+
+===========================================================================
+EOF
+               exit 1
        fi
+
        if ! [ -z ${QMAIL_QUEUE_EXTRA} ]; then
                ${CAT} <<EOF
 ===========================================================================
@@ -84,6 +112,10 @@ NOTE: If you don't already have an SSL c
 # ln -s ${SERVERCERT} ${PKG_SYSCONFDIR}/control/clientcert.pem
 # update_tmprsadh
 
+Once you have a certificate, regularly regenerate DH params from cron(8):
+
+    01 01 * * * ${PREFIX}/bin/update_tmprsadh > /dev/null 2>&1
+
 ===========================================================================
 EOF
        fi

Index: pkgsrc/mail/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.86 pkgsrc/mail/qmail/Makefile:1.87
--- pkgsrc/mail/qmail/Makefile:1.86     Mon May 22 17:18:32 2017
+++ pkgsrc/mail/qmail/Makefile  Fri Jul 21 04:07:01 2017
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.86 2017/05/22 17:18:32 schmonz Exp $
+# $NetBSD: Makefile,v 1.87 2017/07/21 04:07:01 schmonz Exp $
 #
 
-DISTNAME=              ${PKGNAME_NOREV}
+DISTNAME=              netqmail-1.06
 PKGNAME=               qmail-1.03
-PKGREVISION=           28
+PKGREVISION=           29
 CATEGORIES=            mail
 MASTER_SITES=          http://qmail.org/
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
-HOMEPAGE=              http://cr.yp.to/qmail.html
+HOMEPAGE=              http://qmail.org/netqmail/
 COMMENT=               Secure, reliable, efficient, simple, and fast MTA
 LICENSE=               public-domain
 
 DEPENDS+=              daemontools-[0-9]*:../../sysutils/daemontools
-DEPENDS+=              queue-fix>=1.4nb1:../../mail/queue-fix
 DEPENDS+=              ucspi-tcp-[0-9]*:../../net/ucspi-tcp
 
 CONFLICTS+=            courier-maildirmake-[0-9]*
@@ -22,11 +21,10 @@ CONFLICTS+=         mirrordir-[0-9]*
 CONFLICTS+=            mutt<=1.4.2.1nb1
 CONFLICTS+=            netqmail-[0-9]*
 CONFLICTS+=            pulsar<=0.1.1
+CONFLICTS+=            qmail-run<=20170706
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}
 
-USE_TOOLS+=            nroff
-
 DJB_CONFIG_CMDS=       ${ECHO} ${DESTDIR:Q}${QMAILDIR:Q} > conf-destdir;
 DJB_CONFIG_CMDS+=      ${ECHO} ${QMAIL_ALIAS_USER:Q}     > conf-users;
 DJB_CONFIG_CMDS+=      ${ECHO} ${QMAIL_DAEMON_USER:Q}   >> conf-users;
@@ -50,7 +48,6 @@ OWN_DIRS+=            ${QMAILDIR} ${QMAIL_QUEUE_DI
 DOCDIR=                        ${PREFIX}/share/doc/qmail
 EGDIR=                 ${PREFIX}/share/examples/qmail
 SHAREDIR=              ${PREFIX}/share/qmail
-PLIST_SUBST+=          DARWINSUFX=${DARWINSUFX:Q}
 MESSAGE_SRC+=          ${PKGDIR}/MESSAGE
 MESSAGE_SUBST+=                DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q}
 FILES_SUBST+=          DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q}
@@ -63,7 +60,8 @@ FILES_SUBST+=         QMAIL_QUEUE_DIR=${QMAIL_Q
 FILES_SUBST+=          QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
 FILES_SUBST+=          PKGNAME=${PKGNAME:Q}
 
-SETUP_PROGRAMS=                dnsfq dnsip dnsptr hostname install ipmeprint
+SETUP_PROGRAMS=                dnsfq dnsip dnsptr hostname ipmeprint
+SETUP_PROGRAMS+=       install-destdir instcheck
 SETUP_SCRIPTS=         config config-fast
 
 MANDIRS=               man
@@ -76,7 +74,7 @@ INSTALLATION_DIRS+=   ${EGDIR}/users
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=           QMAILDIR QMAIL_QUEUE_DIR QMAIL_QUEUE_EXTRA
+BUILD_DEFS+=           QMAILDIR QMAILPATCHES QMAIL_QUEUE_DIR QMAIL_QUEUE_EXTRA
 BUILD_DEFS+=           QMAIL_ALIAS_USER QMAIL_DAEMON_USER QMAIL_LOG_USER
 BUILD_DEFS+=           QMAIL_ROOT_USER QMAIL_PASSWD_USER QMAIL_QUEUE_USER
 BUILD_DEFS+=           QMAIL_REMOTE_USER QMAIL_SEND_USER
@@ -98,11 +96,17 @@ SUBST_SED.logging+= -e 's|""|${QUEUE_EXT
 SUBST_MESSAGE.logging= Setting QUEUE_EXTRA.
 .endif
 
+CASECLASH=             .doc.caseclash
 SUBST_CLASSES+=                caseclash
 SUBST_STAGE.caseclash= do-configure
 SUBST_FILES.caseclash= hier.c
-SUBST_SED.caseclash=   -e 's|"INSTALL"|"INSTALL${DARWINSUFX}"|g'
-SUBST_SED.caseclash+=  -e 's|"SENDMAIL"|"SENDMAIL${DARWINSUFX}"|g'
+SUBST_SED.caseclash=   -e 's|"INSTALL"|"INSTALL${CASECLASH}"|g'
+SUBST_SED.caseclash+=  -e 's|"SENDMAIL"|"SENDMAIL${CASECLASH}"|g'
+SUBST_CLASSES+=                caseclash2
+SUBST_STAGE.caseclash2=        post-install
+SUBST_FILES.caseclash2=        hier.c
+SUBST_SED.caseclash2=  -e 's|"INSTALL${CASECLASH}"|"INSTALL"|g'
+SUBST_SED.caseclash2+= -e 's|"SENDMAIL${CASECLASH}"|"SENDMAIL"|g'
 
 SUBST_CLASSES+=                catpages
 SUBST_STAGE.catpages=  do-configure
@@ -110,37 +114,13 @@ SUBST_FILES.catpages=     hier.c
 SUBST_SED.catpages=    -e 's|.*"man/cat[0-9]".*||g'
 SUBST_SED.catpages+=   -e 's|.*"tcp-environ\.5".*||g'  # also in ucspi-tcp
 
-SUBST_CLASSES+=                destdir
-SUBST_STAGE.destdir=   do-configure
-SUBST_FILES.destdir=   Makefile
-SUBST_SED.destdir=     -e 's|\(^load inst.*\.o\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g'
-SUBST_SED.destdir+=    -e 's|\(^       \./load inst.*\) auto_qmail\.o\(.*\)|\1 auto_destdir.o\2|g'
-
-SUBST_CLASSES+=                groups
-SUBST_STAGE.groups=    do-configure
-SUBST_FILES.groups=    auto_uids.c
-SUBST_SED.groups=      -e 's,@QMAIL_QMAIL_GROUP@,${QMAIL_QMAIL_GROUP:Q},g'
-SUBST_SED.groups+=     -e 's,@QMAIL_NOFILES_GROUP@,${QMAIL_NOFILES_GROUP:Q},g'
-
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     do-configure
 SUBST_FILES.paths=     README.*
-SUBST_SED.paths=       -e 's,@PKGNAME@,${PKGNAME:Q},g'
-SUBST_SED.paths+=      -e 's,@PKG_INFO@,${PKG_INFO:Q},g'
-SUBST_SED.paths+=      -e 's,@PREFIX@,${PREFIX:Q},g'
-SUBST_SED.paths+=      -e 's,@GREP@,${GREP:Q},g'
-
-SUBST_CLASSES+=                users
-SUBST_STAGE.users=     do-configure
-SUBST_FILES.users=     auto_uids.c
-SUBST_SED.users=       -e 's,@QMAIL_ROOT_USER@,${QMAIL_ROOT_USER:Q},g'
-SUBST_SED.users+=      -e 's,@QMAIL_ALIAS_USER@,${QMAIL_ALIAS_USER:Q},g'
-SUBST_SED.users+=      -e 's,@QMAIL_DAEMON_USER@,${QMAIL_DAEMON_USER:Q},g'
-SUBST_SED.users+=      -e 's,@QMAIL_LOG_USER@,${QMAIL_LOG_USER:Q},g'
-SUBST_SED.users+=      -e 's,@QMAIL_PASSWD_USER@,${QMAIL_PASSWD_USER:Q},g'
-SUBST_SED.users+=      -e 's,@QMAIL_QUEUE_USER@,${QMAIL_QUEUE_USER:Q},g'
-SUBST_SED.users+=      -e 's,@QMAIL_REMOTE_USER@,${QMAIL_REMOTE_USER:Q},g'
-SUBST_SED.users+=      -e 's,@QMAIL_SEND_USER@,${QMAIL_SEND_USER:Q},g'
+SUBST_SED.paths=       -e 's|@PKGNAME@|${PKGNAME:Q}|g'
+SUBST_SED.paths+=      -e 's|@PKG_INFO@|${PKG_INFO:Q}|g'
+SUBST_SED.paths+=      -e 's|@PREFIX@|${PREFIX:Q}|g'
+SUBST_SED.paths+=      -e 's|@GREP@|${GREP:Q}|g'
 
 SUBST_FILES.djbware+=  cdb_seek.c dns.c
 
@@ -157,28 +137,22 @@ PKG_HOME.${user}= ${QMAILDIR}
 .endfor
 PKG_HOME.alias=                ${QMAILDIR}/alias
 
-SPECIAL_PERMS+=                ${PREFIX}/bin/qmail-queue ${QMAIL_QUEUE_USER} ${QMAIL_QMAIL_GROUP} 04711
-.for f in qmail-inject qmail-pop3d qmail-qmqpc qmail-qmqpd qmail-qmtpd qmail-qread qmail-qstat qmail-showctl qmail-smtpd qmail-tcpok qmail-tcpto
-SPECIAL_PERMS+=                ${PREFIX}/bin/${f} ${QMAIL_ROOT_USER} ${QMAIL_QMAIL_GROUP} 0755
-.endfor
-.for f in qmail-clean qmail-getpw qmail-local qmail-popup qmail-pw2u qmail-remote qmail-rspawn qmail-send splogger
-SPECIAL_PERMS+=                ${PREFIX}/bin/${f} ${QMAIL_ROOT_USER} ${QMAIL_QMAIL_GROUP} 0711
-.endfor
-.for f in qmail-lspawn qmail-newmrh qmail-newu qmail-start
-SPECIAL_PERMS+=                ${PREFIX}/bin/${f} ${QMAIL_ROOT_USER} ${QMAIL_QMAIL_GROUP} 0700
-.endfor
+READMES=               README.pkgsrc
 
-OPSYSVARS+=            DARWINSUFX
-DARWINSUFX.Darwin=     .doc
-DARWINSUFX.*=          # empty
-
-post-extract: post-extract-srs post-extract-viruscan
-       ${CP} ${FILESDIR}/README.pkgsrc ${WRKSRC}
-.if ${OPSYS} == "Darwin"
-.      for i in INSTALL SENDMAIL
-         mv ${WRKSRC}/${i} ${WRKSRC}/${i}${DARWINSUFX}
-.      endfor
-.endif
+post-extract:
+       for i in ${READMES}; do                                         \
+               ${CP} ${FILESDIR}/$$i ${WRKSRC} || ${TRUE};             \
+       done
+       for i in INSTALL SENDMAIL; do                                   \
+               ${MV} ${WRKSRC}/$$i ${WRKSRC}/$$i${CASECLASH};          \
+       done
+
+post-patch:
+       cd ${WRKSRC}; \
+       for i in ssl_timeoutio.c tls.c; do \
+               ( ${ECHO} '#ifdef TLS'; ${CAT} $$i; ${ECHO} '#endif' ) > $$i.new; \
+               mv $$i.new $$i; \
+       done
 
 pre-install:
        ${MKDIR} ${DESTDIR}${QMAILDIR}
@@ -193,8 +167,20 @@ pre-install:
        ${LN} -s ${DESTDIR}${QMAIL_QUEUE_DIR}   ${DESTDIR}${QMAILDIR}/queue
        ${LN} -s ${DESTDIR}${EGDIR}/users       ${DESTDIR}${QMAILDIR}/users
 
-post-install: post-install-srs post-install-viruscan
-       ${INSTALL_DATA} ${WRKSRC}/README.pkgsrc ${DESTDIR}${DOCDIR}
+post-install:
+       for i in ${READMES}; do                                         \
+               ${INSTALL_DATA} ${WRKSRC}/$$i ${DESTDIR}${DOCDIR};      \
+       done
+
+       cd ${WRKSRC} && ${MAKE} instcheck install-destdir
+
+       for i in INSTALL SENDMAIL; do                                   \
+               ${MV} ${DESTDIR}${DOCDIR}/$$i${CASECLASH} ${DESTDIR}${DOCDIR}/$$i || ${TRUE}; \
+       done
+
+       for i in ${REJECTUTILS}; do                                     \
+               ${INSTALL_PROGRAM} ${WRKSRC}/$$i ${DESTDIR}${PREFIX}/bin/$$i; \
+       done
 
        ${INSTALL_PROGRAM_DIR} ${DESTDIR}${SHAREDIR}/setup
        for i in ${SETUP_PROGRAMS}; do                                  \

Index: pkgsrc/mail/qmail/PLIST
diff -u pkgsrc/mail/qmail/PLIST:1.17 pkgsrc/mail/qmail/PLIST:1.18
--- pkgsrc/mail/qmail/PLIST:1.17        Fri Mar 31 13:52:00 2017
+++ pkgsrc/mail/qmail/PLIST     Fri Jul 21 04:07:01 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2017/03/31 13:52:00 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.18 2017/07/21 04:07:01 schmonz Exp $
 bin/bouncesaying
 bin/condredirect
 bin/datemail
@@ -24,12 +24,19 @@ bin/qmail-newu
 bin/qmail-pop3d
 bin/qmail-popup
 bin/qmail-pw2u
+${PLIST.rejectutils}bin/qmail-qfilter-viruscan
 bin/qmail-qmqpc
 bin/qmail-qmqpd
 bin/qmail-qmtpd
 bin/qmail-qread
 bin/qmail-qstat
 bin/qmail-queue
+${PLIST.rejectutils}bin/qmail-qfilter-ofmipd-queue
+${PLIST.rejectutils}bin/qmail-qfilter-smtpd-queue
+${PLIST.rejectutils}bin/qmail-rcptcheck
+${PLIST.rejectutils}bin/qmail-rcptcheck-badrcptto
+${PLIST.rejectutils}bin/qmail-rcptcheck-qregex
+${PLIST.rejectutils}bin/qmail-rcptcheck-realrcptto
 bin/qmail-remote
 bin/qmail-rspawn
 bin/qmail-send
@@ -96,7 +103,7 @@ man/man8/qmail-tcpok.8
 man/man8/qmail-tcpto.8
 man/man8/splogger.8
 share/doc/qmail/FAQ
-share/doc/qmail/INSTALL${DARWINSUFX}
+share/doc/qmail/INSTALL
 share/doc/qmail/INSTALL.alias
 share/doc/qmail/INSTALL.ctl
 share/doc/qmail/INSTALL.ids
@@ -114,10 +121,9 @@ share/doc/qmail/PIC.relaygood
 share/doc/qmail/PIC.rem2local
 share/doc/qmail/README.pkgsrc
 ${PLIST.srs}share/doc/qmail/README.srs
-${PLIST.qregex}share/doc/qmail/README.qregex
 share/doc/qmail/REMOVE.binmail
 share/doc/qmail/REMOVE.sendmail
-share/doc/qmail/SENDMAIL${DARWINSUFX}
+share/doc/qmail/SENDMAIL
 share/doc/qmail/TEST.deliver
 share/doc/qmail/TEST.receive
 share/doc/qmail/UPGRADE
@@ -131,12 +137,12 @@ share/examples/qmail/boot/home
 share/examples/qmail/boot/home+df
 share/examples/qmail/boot/proc
 share/examples/qmail/boot/proc+df
-${PLIST.viruscan}share/examples/qmail/control/signatures
 share/qmail/setup/config
 share/qmail/setup/config-fast
 share/qmail/setup/dnsfq
 share/qmail/setup/dnsip
 share/qmail/setup/dnsptr
 share/qmail/setup/hostname
-share/qmail/setup/install
+share/qmail/setup/install-destdir
+share/qmail/setup/instcheck
 share/qmail/setup/ipmeprint

Index: pkgsrc/mail/qmail/distinfo
diff -u pkgsrc/mail/qmail/distinfo:1.34 pkgsrc/mail/qmail/distinfo:1.35
--- pkgsrc/mail/qmail/distinfo:1.34     Mon May 22 17:18:32 2017
+++ pkgsrc/mail/qmail/distinfo  Fri Jul 21 04:07:01 2017
@@ -1,66 +1,48 @@
-$NetBSD: distinfo,v 1.34 2017/05/22 17:18:32 schmonz Exp $
+$NetBSD: distinfo,v 1.35 2017/07/21 04:07:01 schmonz Exp $
 
-SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a
-RMD160 (qmail-1.03.tar.gz) = b851f273f1d365d38efd949b1efcf35768ffa30f
-SHA512 (qmail-1.03.tar.gz) = f2cc47c3ef4a3595d5953f216811a9b60f505cf8cbfd31ae31a888ee04916936210ef1c23d59e8d280a5f0e1c3794b90ee212b2b0f36361c5eff842598c8aee2
-Size (qmail-1.03.tar.gz) = 220668 bytes
-SHA1 (netqmail-1.06-qmailremote-20170522.patch) = cb120ddb3138b45828c7f7840e0f3414b35b840e
-RMD160 (netqmail-1.06-qmailremote-20170522.patch) = 3529bfb091034682507658d8d9507ab3fbf14882
-SHA512 (netqmail-1.06-qmailremote-20170522.patch) = b61ec03a965f32e7bc66877859fd35929c946e3e565a4b46855bf04c8cd7f34518aae65c757877c5a663d1969c2ddd42666762b32fd73044dc44e534228df942
-Size (netqmail-1.06-qmailremote-20170522.patch) = 2337 bytes
+SHA1 (netqmail-1.05-tls-smtpauth-20070417.patch) = d24cb13cf1371044fc2dfe20471478f59b5524e5
+RMD160 (netqmail-1.05-tls-smtpauth-20070417.patch) = 81a00e06fa67a4073b1a5bf5195fbbac675cd46b
+SHA512 (netqmail-1.05-tls-smtpauth-20070417.patch) = ce5fb50ae9a7683b708eeb65c68a0db47c5817eb3fc14457c4f7c5746916ca2734c647a2369bf6f1240477ee818e3e7d7870aec3edbad2eaace179cba6267e41
+Size (netqmail-1.05-tls-smtpauth-20070417.patch) = 67942 bytes
+SHA1 (netqmail-1.06-destdir-20170716.patch) = 92b3fe539d7863792e951723e26f6cfb6062771a
+RMD160 (netqmail-1.06-destdir-20170716.patch) = bad1976ba87e0af934a50d02bd38eebb3b22cf03
+SHA512 (netqmail-1.06-destdir-20170716.patch) = 00dc4d90f52332784900d5c8b1142d5517d639115e1da4e1cf4880635d10107816981892f22847f682a71b7a15c348789bce20701d9bec20a2315c0fd1f2bf73
+Size (netqmail-1.06-destdir-20170716.patch) = 12871 bytes
+SHA1 (netqmail-1.06-qmailremote-20170716.patch) = cf7fa5aaf74a5b7d48b2cf0e5f46f7c124de83c7
+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-rejectutils-20170720.patch) = a2902231ebbd27b214206f0e26150fe7aef48ca3
+RMD160 (netqmail-1.06-rejectutils-20170720.patch) = 6f0aba229513ad635145016a689c50cad37321d2
+SHA512 (netqmail-1.06-rejectutils-20170720.patch) = da7d0fb60c21f2ff63fe99bf540f83345369cbf6ade4b9a6cae36b5b3d91b3edfd58d91b8b7a300a617fd963de860a76f30d429f677318078b1430fce4676d12
+Size (netqmail-1.06-rejectutils-20170720.patch) = 37193 bytes
+SHA1 (netqmail-1.06-tls-smtpauth-20070417-rcptcheck-20170716.patch) = 682661f44fdcb49e130226cbc90b32dbad1f2f6c
+RMD160 (netqmail-1.06-tls-smtpauth-20070417-rcptcheck-20170716.patch) = 51cbb3a18275f5958fd3fd0299fb53e47fb066c1
+SHA512 (netqmail-1.06-tls-smtpauth-20070417-rcptcheck-20170716.patch) = 
04f2d22a035a92af808a6351e2c7b98626b1fe699b95751c42b7c981f2fc4ff3538e159b80081cbad67ab89d3b23afcadffdaf0c0cc790c31c0b235480906507
+Size (netqmail-1.06-tls-smtpauth-20070417-rcptcheck-20170716.patch) = 3132 bytes
 SHA1 (netqmail-1.06.tar.gz) = 9ee9a603e2ad3d8e1d34b900e19b7a5d275f538b
 RMD160 (netqmail-1.06.tar.gz) = d31598afa862abb35bc1feb8d038ab619b5a17a2
 SHA512 (netqmail-1.06.tar.gz) = de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b
 Size (netqmail-1.06.tar.gz) = 260941 bytes
-SHA1 (badrcptto.patch) = 713875ab08239416b6d22ba0d846b14a6aa6912f
-RMD160 (badrcptto.patch) = 88e29eeb203f30ec9c9d01cc42f1b849ea08d509
-SHA512 (badrcptto.patch) = 317e7bbcc48af47c363280a172f0b37d756ed2b6e88ae377b16ee675de863da4f95b4ae6c8bf471509e7f558252cb6ad24cf35eaed478e947288ffcfd1d21713
-Size (badrcptto.patch) = 3033 bytes
-SHA1 (qmail-103.patch) = dfb9cdabe91449dad2117115177b0a6a356baa9f
-RMD160 (qmail-103.patch) = 437f8b3063438bbd82c59557333b3566214afa9c
-SHA512 (qmail-103.patch) = b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
-Size (qmail-103.patch) = 2104 bytes
 SHA1 (outgoingip.patch) = c37b50facc72f82cad6505d2db88d5eccc5418b2
 RMD160 (outgoingip.patch) = 032c653d395e5f599c0998e92debb09d84f90f0f
 SHA512 (outgoingip.patch) = 876eba3e65eba02f62838e5324cf64985254805ac5ec9417b168caa8c8d150a5185885d49a92d968690438289963bd6569e3de3330daf71a248206cd94227cd2
 Size (outgoingip.patch) = 6839 bytes
-SHA1 (qregex-20060423.patch) = fe52992254e5d464ce0fa0b68cf15ee744266b83
-RMD160 (qregex-20060423.patch) = f28245fee8bcc38e84816fe379be886376740a0c
-SHA512 (qregex-20060423.patch) = 5b93deee7cce7762a8d25a6b3428c67512b81c64443e05c96cdc20fb3a9fc288a45bcb1e133ad70bd520fc807f011b9c5565f72dfb7925e9e010417eb8260631
-Size (qregex-20060423.patch) = 26745 bytes
 SHA1 (qmail-1.03-maildir-uniq.patch) = 6adeba8b04c1e11ca6a2db5a5d64944c9e184521
 RMD160 (qmail-1.03-maildir-uniq.patch) = 515d8dfc1e455a39f3695d18b5715623bc2e40ff
 SHA512 (qmail-1.03-maildir-uniq.patch) = 66a09cf13e851b1c3045cbe094cf83dbc37712bbd593c0dd2ee5f36cf6eaa055f29f23af16eed3811674ab6fbdec0a383911d2628dfcde5535873ca28b7c961c
 Size (qmail-1.03-maildir-uniq.patch) = 3903 bytes
-SHA1 (qmail-1.03-realrcptto-2006.12.10.patch) = 89e06519df0f52f748afec583e3e2ce33fe5dfb2
-RMD160 (qmail-1.03-realrcptto-2006.12.10.patch) = 0f6ad12dd24accab324097350a90f7717747eb56
-SHA512 (qmail-1.03-realrcptto-2006.12.10.patch) = 96fedb97e5c0871f6de3fe91819353503ec0878a31303496072d2cad97384b0c845c7e5f1e76cb9a90c469916dd1353400b4314cdb5b48747b6ed72c09917721
-Size (qmail-1.03-realrcptto-2006.12.10.patch) = 17718 bytes
-SHA1 (netqmail-1.05-tls-smtpauth-20070417.patch) = d24cb13cf1371044fc2dfe20471478f59b5524e5
-RMD160 (netqmail-1.05-tls-smtpauth-20070417.patch) = 81a00e06fa67a4073b1a5bf5195fbbac675cd46b
-SHA512 (netqmail-1.05-tls-smtpauth-20070417.patch) = ce5fb50ae9a7683b708eeb65c68a0db47c5817eb3fc14457c4f7c5746916ca2734c647a2369bf6f1240477ee818e3e7d7870aec3edbad2eaace179cba6267e41
-Size (netqmail-1.05-tls-smtpauth-20070417.patch) = 67942 bytes
-SHA1 (qmail-smtpd-viruscan-1.3.patch) = 3a8f4e38df1c3f483f72b1a24ebc36664d075dd9
-RMD160 (qmail-smtpd-viruscan-1.3.patch) = ad6c5ef7894177fd5a7f131765eff22d092ecf54
-SHA512 (qmail-smtpd-viruscan-1.3.patch) = acc84c793aba4f3987cf1479c9cf246b319f617cb4f3a483ee57632f4507038d396435b5b154583f0a61c6363f1af4551a9a657089c6922014d2584c12fd6d6f
-Size (qmail-smtpd-viruscan-1.3.patch) = 8891 bytes
-SHA1 (qmail-smtpd-viruscan-logging.patch) = ca7105b5561cf280e9e3a465d2d68a16673ff56c
-RMD160 (qmail-smtpd-viruscan-logging.patch) = 79631cb7b5b120f98397011c4fb94726c48b83e4
-SHA512 (qmail-smtpd-viruscan-logging.patch) = 6441dfb5dd8951a765d7172f44420d691976f4aa13c77ef16c459c6457cf32086a730278350bcb801ed4c986cbafa3c7a483c399ed073c02d53ad2ea18781efe
-Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes
-SHA1 (qmail-smtpd.patch) = 2f14d7a98686ad5f32bdaaa6e201734302352e71
-RMD160 (qmail-smtpd.patch) = a4496ee44f9a4298404c3f75d23dd985f3ff12bb
-SHA512 (qmail-smtpd.patch) = ada4f2ce3972965b02a7acc9a072deeedafd026e19c2c96b8b4059f1f1fab653409f88cd6ee5f1d4a99dd943e018a1cd6296b05d7fd86e83296aa0150227edbe
-Size (qmail-smtpd.patch) = 3716 bytes
+SHA1 (qmail-103.patch) = dfb9cdabe91449dad2117115177b0a6a356baa9f
+RMD160 (qmail-103.patch) = 437f8b3063438bbd82c59557333b3566214afa9c
+SHA512 (qmail-103.patch) = b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
+Size (qmail-103.patch) = 2104 bytes
+SHA1 (qmail-smtputf8.patch) = 909cb9d5f77e9b85973ad5d9daf821287950bf56
+RMD160 (qmail-smtputf8.patch) = bbed2ca7167937f6a38caf375a7e1e9bc490bd96
+SHA512 (qmail-smtputf8.patch) = 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4
+Size (qmail-smtputf8.patch) = 6693 bytes
 SHA1 (qmail-srs-0.8.patch) = 44d6075fe22d698b21a9045b0cce7f607bc86eee
 RMD160 (qmail-srs-0.8.patch) = cf86dc7874dc116b31bf933f18615c75cfc4c0c4
 SHA512 (qmail-srs-0.8.patch) = a2a6c26a02d1c607f4ed4f73d6c8b57ed6a6c31126f20b073e9cd2258ca43c0da98a67de254df30e07e3887c90239cba0ccf3f45d535f4c66017217da1732f9b
 Size (qmail-srs-0.8.patch) = 25412 bytes
-SHA1 (patch-Makefile) = 7ab7c2893393f42d8587a14a2d0c86c09e60061a
-SHA1 (patch-auto__uids.c) = df4e83de90bfe7845d5e12abd4309258e4eb36b1
-SHA1 (patch-auto__uids.h) = f38c649b05e5540e6e1035edca8b9ac980d9af0b
-SHA1 (patch-hier.c) = 7578a0977f168e337748773d63e57504bf7bf075
-SHA1 (patch-pkgsrc__user__destdir__fake__chown.c) = 3897b81327ca5c59503199d08dd6ed5cdc6a531a
-SHA1 (patch-pkgsrc__user__destdir__fake__uids.h) = 139f6cf38c1b928265a16bd3335b8ce6d7563f96
-SHA1 (patch-spawn.c) = aad06c4ed3ad4bd0e500ab561d7f7307c19e3283
+SHA1 (patch-Makefile) = ee82c0d6e64aaf617e3b2e69c577b6c4c23f62ca
 SHA1 (patch-strerr_sys.c) = 15e6466c655058664cb660e5e12232bf45010814

Index: pkgsrc/mail/qmail/options.mk
diff -u pkgsrc/mail/qmail/options.mk:1.41 pkgsrc/mail/qmail/options.mk:1.42
--- pkgsrc/mail/qmail/options.mk:1.41   Mon May 22 17:18:32 2017
+++ pkgsrc/mail/qmail/options.mk        Fri Jul 21 04:07:01 2017
@@ -1,181 +1,163 @@
-# $NetBSD: options.mk,v 1.41 2017/05/22 17:18:32 schmonz Exp $
+# $NetBSD: options.mk,v 1.42 2017/07/21 04:07:01 schmonz Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.qmail
-PKG_OPTIONS_OPTIONAL_GROUPS=   rcpt
-PKG_OPTIONS_GROUP.rcpt=        qmail-badrcptto qmail-qregex
-PKG_OPTIONS_GROUP.rcpt+=qmail-rcptcheck qmail-realrcptto
-PKG_SUPPORTED_OPTIONS+=        sasl syncdir tls qmail-bigdns qmail-maildiruniq
-PKG_SUPPORTED_OPTIONS+=        qmail-netqmail qmail-outgoingip qmail-remote
-PKG_SUPPORTED_OPTIONS+=        qmail-srs qmail-viruscan
-PKG_SUGGESTED_OPTIONS+=        qmail-bigdns qmail-netqmail qmail-realrcptto
-
-.include "../../mk/bsd.options.mk"
+PKG_OPTIONS_VAR=               PKG_OPTIONS.qmail
+PKG_SUPPORTED_OPTIONS+=                eai qmail-rejectutils qmail-srs sasl syncdir tls
+PKG_SUGGESTED_OPTIONS+=                eai qmail-rejectutils sasl syncdir tls
+
+# For users migrating from 2017Q2; remove compatibility after 2017Q3 is branched
+QMAIL_PATCHES_ALWAYS_ON=       netqmail bigdns maildiruniq outgoingip rcptcheck remote
+QMAIL_PATCHES_REMOVED=         badrcptto qregex realrcptto viruscan
+PKG_OPTIONS_ALWAYS_ON=         ${QMAIL_PATCHES_ALWAYS_ON:S/^/qmail-/}
+PKG_OPTIONS_REMOVED=           ${QMAIL_PATCHES_REMOVED:S/^/qmail-/}
+PKG_SUPPORTED_OPTIONS+=                ${PKG_OPTIONS_ALWAYS_ON} ${PKG_OPTIONS_REMOVED}
+
+# Formerly optional patches, now unconditionally applied:
+QMAILPATCHES=                  netqmail:${DEFAULT_DISTFILES}
+
+QMAILPATCHES+=                 tls-smtpauth:${TLSSASL_PATCH}
+TLSSASL_PATCH=                 netqmail-1.05-tls-smtpauth-20070417.patch
+PATCHFILES+=                   ${TLSSASL_PATCH}
+SITES.${TLSSASL_PATCH}=                https://raw.githubusercontent.com/shupp/legacy-qmail-related/master/patches/
+
+QMAILPATCHES+=                 bigdns:${BIGDNS_PATCH}
+BIGDNS_PATCH=                  qmail-103.patch
+PATCHFILES+=                   ${BIGDNS_PATCH}
+SITES.${BIGDNS_PATCH}=         http://www.ckdhr.com/ckd/
+SITES.${BIGDNS_PATCH}+=                ${MASTER_SITE_LOCAL}
+PATCH_DIST_STRIP.${BIGDNS_PATCH}=-p1
+
+QMAILPATCHES+=                 destdir:${DESTDIR_PATCH}
+DESTDIR_PATCH=                 netqmail-1.06-destdir-20170716.patch
+PATCHFILES+=                   ${DESTDIR_PATCH}
+SITES.${DESTDIR_PATCH}=                https://schmonz.com/qmail/destdir/
+
+QMAILPATCHES+=                 maildiruniq:${MAILDIRUNIQ_PATCH}
+MAILDIRUNIQ_PATCH=             qmail-1.03-maildir-uniq.patch
+PATCHFILES+=                   ${MAILDIRUNIQ_PATCH}
+SITES.${MAILDIRUNIQ_PATCH}=    http://www.memoryhole.net/qmail/
+PATCH_DIST_STRIP.${MAILDIRUNIQ_PATCH}=-p1
 
-.if !empty(PKG_OPTIONS:Mqmail-badrcptto)
-BADRCPTTO_PATCH=       badrcptto.patch
-PATCHFILES+=           ${BADRCPTTO_PATCH}
-SITES.${BADRCPTTO_PATCH}=      http://patch.be/qmail/
-PATCH_DIST_STRIP.${BADRCPTTO_PATCH}=   -p1
-.endif
+QMAILPATCHES+=                 outgoingip:${OUTGOINGIP_PATCH}
+OUTGOINGIP_PATCH=              outgoingip.patch
+PATCHFILES+=                   ${OUTGOINGIP_PATCH}
+SITES.${OUTGOINGIP_PATCH}=     http://www.qmail.org/
 
-.if !empty(PKG_OPTIONS:Mqmail-bigdns)
-BIGDNS_PATCH=          qmail-103.patch
-PATCHFILES+=           ${BIGDNS_PATCH}
-SITES.${BIGDNS_PATCH}= http://www.ckdhr.com/ckd/
-SITES.${BIGDNS_PATCH}+=        ${MASTER_SITE_LOCAL}
-PATCH_DIST_STRIP.${BIGDNS_PATCH}=      -p1
-.endif
+QMAILPATCHES+=                 rcptcheck:${RCPTCHECK_PATCH}
+RCPTCHECK_PATCH=               netqmail-1.06-tls-smtpauth-20070417-rcptcheck-20170716.patch
+PATCHFILES+=                   ${RCPTCHECK_PATCH}
+SITES.${RCPTCHECK_PATCH}=      https://schmonz.com/qmail/rcptcheck/
+
+QMAILPATCHES+=                 remote:${REMOTE_PATCH}
+REMOTE_PATCH=                  netqmail-1.06-qmailremote-20170716.patch
+PATCHFILES+=                   ${REMOTE_PATCH}
+SITES.${REMOTE_PATCH}=         https://schmonz.com/qmail/remote/
 
-.if !empty(PKG_OPTIONS:Mqmail-maildiruniq)
-MAILDIRUNIQ_PATCH=     qmail-1.03-maildir-uniq.patch
-PATCHFILES+=           ${MAILDIRUNIQ_PATCH}
-SITES.${MAILDIRUNIQ_PATCH}=    http://www.memoryhole.net/qmail/
-PATCH_DIST_STRIP.${MAILDIRUNIQ_PATCH}= -p1
-.endif
+.include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mqmail-netqmail)
-DISTNAME=              netqmail-1.06
-.endif
+# For users migrating from 2017Q2; remove compatibility after 2017Q3 is branched
+.for i in ${PKG_OPTIONS_ALWAYS_ON}
+.  if !empty(PKG_OPTIONS:M${i})
+PKG_LEGACY_OPTIONS+=           ${i}
+PKG_OPTIONS_DEPRECATED_WARNINGS+="WARN: Please unset \"${i}\" option (it's now always enabled)."
+.  endif
+.endfor
 
-.if !empty(PKG_OPTIONS:Mqmail-outgoingip)
-OUTGOINGIP_PATCH=      outgoingip.patch
-PATCHFILES+=           ${OUTGOINGIP_PATCH}
-SITES.${OUTGOINGIP_PATCH}=     http://www.qmail.org/
-.endif
+# For users migrating from 2017Q2; remove compatibility after 2017Q3 is branched
+.for i in ${PKG_OPTIONS_REMOVED}
+.  if !empty(PKG_OPTIONS:M${i})
+PKG_LEGACY_OPTIONS+=           ${i}
+PKG_OPTIONS_DEPRECATED_WARNINGS+="WARN: Please unset \"${i}\" option (it's now always included, as a program)."
+.  endif
+.endfor
 
-.if !empty(PKG_OPTIONS:Mqmail-remote)
-REMOTE_PATCH=          netqmail-1.06-qmailremote-20170522.patch
-PATCHFILES+=           ${REMOTE_PATCH}
-SITES.${REMOTE_PATCH}= https://schmonz.com/2017/05/22/
+.if !empty(PKG_OPTIONS:Meai)
+.  include "../../devel/libidn2/buildlink3.mk"
+QMAILPATCHES+=                 eai:${EAI_PATCH}
+EAI_PATCH=                     qmail-smtputf8.patch
+PATCHFILES+=                   ${EAI_PATCH}
+SITES.${EAI_PATCH}=            http://arnt.gulbrandsen.priv.no/qmail/
+PATCH_DIST_STRIP.${EAI_PATCH}= -p1
+.endif
+
+PLIST_VARS+=                   rejectutils
+.if !empty(PKG_OPTIONS:Mqmail-rejectutils)
+QMAILPATCHES+=                 rejectutils:${REJECTUTILS_PATCH}
+REJECTUTILS_PATCH=             netqmail-1.06-rejectutils-20170720.patch
+PATCHFILES+=                   ${REJECTUTILS_PATCH}
+SITES.${REJECTUTILS_PATCH}=    https://schmonz.com/qmail/rejectutils/
+DJB_BUILD_TARGETS+=            rejectutils
+PLIST.rejectutils=             yes
+REJECTUTILS=                   qmail-qfilter-ofmipd-queue      \
+                               qmail-qfilter-smtpd-queue       \
+                               qmail-qfilter-viruscan          \
+                               qmail-rcptcheck                 \
+                               qmail-rcptcheck-badrcptto       \
+                               qmail-rcptcheck-qregex          \
+                               qmail-rcptcheck-realrcptto
 .endif
 
-PLIST_VARS+=           srs
-.PHONY: post-extract-srs post-install-srs
+PLIST_VARS+=                   srs
 .if !empty(PKG_OPTIONS:Mqmail-srs)
 .  include "../../mail/libsrs2/buildlink3.mk"
-SRS_PATCH=             qmail-srs-0.8.patch
-PATCHFILES+=           ${SRS_PATCH}
-SITES.${SRS_PATCH}=    http://www.mco2.com.br/opensource/download/qmail/
-PATCH_DIST_STRIP.${SRS_PATCH}= -p1
-.  if !empty(PKG_OPTIONS:Mqmail-netqmail)
-PATCH_DIST_STRIP.${SRS_PATCH}+=        -l
-SUBST_CLASSES+=                srsnetq1 srsnetq2
-SUBST_STAGE.srsnetq1=  pre-patch
-SUBST_STAGE.srsnetq2=  post-patch
-SUBST_FILES.srsnetq1=  Makefile
-SUBST_FILES.srsnetq2=  Makefile
-SUBST_SED.srsnetq1=    -e 's|^auto_split.o env.a$$|auto_split.o|'
-SUBST_SED.srsnetq2=    -e 's|^auto_split.o$$|auto_split.o env.a|'
-SUBST_SED.srsnetq1+=   -e 's|^ substdio.a error.a str.a fs.a auto_qmail.o auto_split.o env.a$$|        substdio.a error.a str.a fs.a auto_qmail.o auto_split.o|'
-SUBST_SED.srsnetq2+=   -e 's|^ substdio.a error.a str.a fs.a auto_qmail.o auto_split.o \\$$|   substdio.a error.a str.a fs.a auto_qmail.o auto_split.o env.a \\|'
-.  endif
-SUBST_CLASSES+=                srsinclude
-SUBST_STAGE.srsinclude=        do-configure
-SUBST_FILES.srsinclude=        srs.c
-SUBST_SED.srsinclude=  -e 's|/usr/local/include/srs2.h|srs2.h|'
-SUBST_CLASSES+=                srsreadme
-SUBST_STAGE.srsreadme= do-configure
-SUBST_FILES.srsreadme= README.srs
-SUBST_SED.srsreadme=   -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR:Q},g'
-SPECIAL_PERMS+=                ${PREFIX}/bin/srsfilter ${QMAIL_ROOT_USER} ${QMAIL_QMAIL_GROUP} 0755
-PLIST.srs=             yes
-MESSAGE_SRC+=          ${PKGDIR}/MESSAGE.srs
-post-extract-srs:
-       ${CP} ${FILESDIR}/README.srs ${WRKSRC}
-post-install-srs:
-       ${INSTALL_DATA} ${WRKSRC}/README.srs ${DESTDIR}${DOCDIR}
-.else
-post-extract-srs:
-       ${DO_NADA}
-post-install-srs:
-       ${DO_NADA}
+QMAILPATCHES+=                 srs:${SRS_PATCH}
+SRS_PATCH=                     qmail-srs-0.8.patch
+PATCHFILES+=                   ${SRS_PATCH}
+SITES.${SRS_PATCH}=            http://www.mco2.com.br/opensource/download/qmail/
+PATCH_DIST_STRIP.${SRS_PATCH}= -l
+PATCH_DIST_CAT.${SRS_PATCH}=   ${SED} -e 's|binm3 binm3+df|binm3 binm3+df update_tmprsadh|g' < ${SRS_PATCH}
+SUBST_CLASSES+=                        srsnetq1 srsnetq2
+SUBST_STAGE.srsnetq1=          pre-patch
+SUBST_STAGE.srsnetq2=          post-patch
+SUBST_FILES.srsnetq1=          Makefile
+SUBST_FILES.srsnetq2=          Makefile
+SUBST_SED.srsnetq1=            -e 's|^auto_split.o env.a$$|auto_split.o|'
+SUBST_SED.srsnetq2=            -e 's|^auto_split.o$$|auto_split.o env.a|'
+SUBST_SED.srsnetq1+=           -e 's|^ substdio.a error.a str.a fs.a auto_qmail.o auto_split.o env.a$$|        substdio.a error.a str.a fs.a auto_qmail.o auto_split.o|'
+SUBST_SED.srsnetq2+=           -e 's|^ substdio.a error.a str.a fs.a auto_qmail.o auto_split.o \\$$|   substdio.a error.a str.a fs.a auto_qmail.o auto_split.o env.a \\|'
+SUBST_CLASSES+=                        srsinclude
+SUBST_STAGE.srsinclude=                do-configure
+SUBST_FILES.srsinclude=                srs.c
+SUBST_SED.srsinclude=          -e 's|/usr/local/include/srs2.h|srs2.h|'
+SUBST_CLASSES+=                        srsreadme
+SUBST_STAGE.srsreadme=         do-configure
+SUBST_FILES.srsreadme=         README.srs
+SUBST_SED.srsreadme=           -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR:Q}|g'
+PLIST.srs=                     yes
+MESSAGE_SRC+=                  ${PKGDIR}/MESSAGE.srs
+READMES+=                      README.srs
 .endif
 
-PLIST_VARS+=           qregex
-.if !empty(PKG_OPTIONS:Mqmail-qregex)
-QREGEX_PATCH=          qregex-20060423.patch
-PATCHFILES+=           ${QREGEX_PATCH}
-SITES.${QREGEX_PATCH}= http://www.arda.homeunix.net/store/qmail/
-# actually http://www.arda.homeunix.net/?ddownload=409
-PATCH_DIST_STRIP.${QREGEX_PATCH}=      -p3
-PLIST.qregex=          yes
-.endif
-
-.if !empty(PKG_OPTIONS:Mqmail-rcptcheck)
-RCPTCHECK_PATCH=       qmail-smtpd.patch
-PATCHFILES+=           ${RCPTCHECK_PATCH}
-SITES.${RCPTCHECK_PATCH}=      http://www.soffian.org/downloads/qmail/
-PATCH_DIST_STRIP.${RCPTCHECK_PATCH}=   -p1
-.endif
-
-.if !empty(PKG_OPTIONS:Mqmail-realrcptto)
-REALRCPTTO_PATCH=      qmail-1.03-realrcptto-2006.12.10.patch
-PATCHFILES+=           ${REALRCPTTO_PATCH}
-SITES.${REALRCPTTO_PATCH}=     http://code.dogmap.org/qmail/
-PATCH_DIST_STRIP.${REALRCPTTO_PATCH}=  -p1
+.if !empty(PKG_OPTIONS:Msyncdir)
+.  include "../../devel/syncdir/buildlink3.mk"
+SYNCDIR_DISTFILES_cmd=         ( cd ../../devel/syncdir && ${MAKE} show-var VARNAME=DISTFILES )
+QMAILPATCHES+=                 syncdir:${SYNCDIR_DISTFILES_cmd:sh}
+SUBST_CLASSES+=                        load
+SUBST_STAGE.load=              do-configure
+SUBST_FILES.load=              make-load.sh
+SUBST_SED.load=                        -e '$$s|$$| ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.syncdir}/lib -L${BUILDLINK_PREFIX.syncdir}/lib \-lsyncdir|'
+.  if ${OPSYS} == "Darwin"
+SUBST_SED.load+=               -e '$$s|$$| -bind_at_load|'
+.  endif
+SUBST_MESSAGE.load=            Setting linker flags for syncdir.
 .endif
 
-PLIST_VARS+=           tls
+PLIST_VARS+=                   tls
 .if !empty(PKG_OPTIONS:Msasl) || !empty(PKG_OPTIONS:Mtls)
 .  if empty(PKG_OPTIONS:Msasl)
-PKG_OPTIONS+=          sasl
+PKG_OPTIONS+=                  sasl
 .  endif
 .  include "../../security/openssl/buildlink3.mk"
-TLSSASL_PATCH=         netqmail-1.05-tls-smtpauth-20070417.patch
-PATCHFILES+=           ${TLSSASL_PATCH}
-SITES.${TLSSASL_PATCH}=        https://raw.githubusercontent.com/shupp/legacy-qmail-related/master/patches/
 .  if !empty(PKG_OPTIONS:Mtls)
-CFLAGS+=               -DTLS=20070408  # NOTE: match what's _in_ the patch
-USE_TOOLS+=            openssl
-SUBST_CLASSES+=                tmprsadh
-SUBST_STAGE.tmprsadh=  do-configure
-SUBST_FILES.tmprsadh=  update_tmprsadh.sh
-SUBST_SED.tmprsadh=    -e 's|^export PATH=.*||'
-SUBST_SED.tmprsadh+=   -e 's|^openssl |${OPENSSL} |'
-PLIST.tls=             yes
+CFLAGS+=                       -DTLS=20070408  # NOTE: match what's _in_ the patch
+USE_TOOLS+=                    openssl
+SUBST_CLASSES+=                        tmprsadh
+SUBST_STAGE.tmprsadh=          do-configure
+SUBST_FILES.tmprsadh=          update_tmprsadh.sh
+SUBST_SED.tmprsadh=            -e 's|^export PATH=.*||'
+SUBST_SED.tmprsadh+=           -e 's|^openssl |${OPENSSL} |'
+PLIST.tls=                     yes
 .  endif
-.endif
-
-.if !empty(PKG_OPTIONS:Msyncdir)
-.  include "../../devel/syncdir/buildlink3.mk"
-SUBST_CLASSES+=                load
-SUBST_STAGE.load=      do-configure
-SUBST_FILES.load=      make-load.sh
-SUBST_SED.load=                -e '$$s|$$| ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.syncdir}/lib -L${BUILDLINK_PREFIX.syncdir}/lib \-lsyncdir|'
-.  if ${OPSYS} == "Darwin"
-SUBST_SED.load+=       -e '$$s|$$| -bind_at_load|'
-.  endif
-SUBST_MESSAGE.load=    Setting linker flags for syncdir.
-.endif
-
-PLIST_VARS+=           viruscan
-.PHONY: post-extract-viruscan post-install-viruscan
-.if !empty(PKG_OPTIONS:Mqmail-viruscan)
-VIRUSCAN_PATCH=                qmail-smtpd-viruscan-1.3.patch
-VIRUSCAN_LOG_PATCH=    qmail-smtpd-viruscan-logging.patch
-PATCHFILES+=           ${VIRUSCAN_PATCH} ${VIRUSCAN_LOG_PATCH}
-SITES.${VIRUSCAN_PATCH}=       http://www.qmail.org/
-SITES.${VIRUSCAN_LOG_PATCH}=   ${MASTER_SITE_LOCAL}
-PATCH_DIST_STRIP.${VIRUSCAN_PATCH}=    -p1
-PATCH_DIST_STRIP.${VIRUSCAN_LOG_PATCH}=        -p1
-SUBST_CLASSES+=                viruscan
-SUBST_STAGE.viruscan=  do-configure
-SUBST_FILES.viruscan=  qmail-smtpd.c
-SUBST_SED.viruscan=    -e 's|qmail-smtpd: ||g'
-PLIST.viruscan=                yes
-post-extract-viruscan:
-       ${SED} -e '1,15d' -e '34,$$d'           \
-               < ${DISTDIR}/${VIRUSCAN_PATCH}  \
-               > ${WRKSRC}/signatures
-       ${CHMOD} 644 ${WRKSRC}/signatures
-post-install-viruscan:
-       ${INSTALL_DATA} ${WRKSRC}/signatures ${DESTDIR}/${EGDIR}/control
-.  for i in control/signatures
-CONF_FILES+=           ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i}
-.  endfor
 .else
-post-extract-viruscan:
-       ${DO_NADA}
-post-install-viruscan:
-       ${DO_NADA}
+BUILDLINK_TRANSFORM+=          rm:-lssl
+BUILDLINK_TRANSFORM+=          rm:-lcrypto
 .endif

Index: pkgsrc/mail/qmail/files/README.pkgsrc
diff -u pkgsrc/mail/qmail/files/README.pkgsrc:1.4 pkgsrc/mail/qmail/files/README.pkgsrc:1.5
--- pkgsrc/mail/qmail/files/README.pkgsrc:1.4   Fri Mar  9 12:34:22 2007
+++ pkgsrc/mail/qmail/files/README.pkgsrc       Fri Jul 21 04:07:01 2017
@@ -17,8 +17,7 @@ Therefore, if you need to ask for help o
 mention:
 
 * that you installed @PKGNAME@ from pkgsrc,
-* the output of "@PKG_INFO@ -B @PKGNAME@ | @GREP@ ^QMAIL",
-* the output of "@PKG_INFO@ -Q PKG_OPTIONS @PKGNAME@", and
+* the output of "@PKG_INFO@ -B @PKGNAME@ | @GREP@ ^QMAIL", and
 * how you're running (or trying to run) the qmail daemons.
 
 If you can first reproduce your problem on a manual LWQ-style

Index: pkgsrc/mail/qmail/patches/patch-Makefile
diff -u pkgsrc/mail/qmail/patches/patch-Makefile:1.4 pkgsrc/mail/qmail/patches/patch-Makefile:1.5
--- pkgsrc/mail/qmail/patches/patch-Makefile:1.4        Mon Mar 20 16:23:20 2017
+++ pkgsrc/mail/qmail/patches/patch-Makefile    Fri Jul 21 04:07:01 2017
@@ -1,39 +1,26 @@
-$NetBSD: patch-Makefile,v 1.4 2017/03/20 16:23:20 schmonz Exp $
+$NetBSD: patch-Makefile,v 1.5 2017/07/21 04:07:01 schmonz Exp $
 
-DESTDIR support, and don't hardcode numeric IDs into binaries.
+Don't build catpages we won't install.
 
---- Makefile.orig      1998-06-15 10:53:16.000000000 +0000
+--- Makefile.orig      2017-07-19 02:44:58.000000000 +0000
 +++ Makefile
-@@ -4,6 +4,14 @@ SHELL=/bin/sh
+@@ -987,17 +987,8 @@ make-makelib warn-auto.sh systype
+       chmod 755 makelib
  
- default: it
+ man: \
+-qmail-local.0 qmail-lspawn.0 qmail-getpw.0 qmail-remote.0 \
+-qmail-rspawn.0 qmail-clean.0 qmail-send.0 qmail-start.0 splogger.0 \
+-qmail-queue.0 qmail-inject.0 mailsubj.0 qmail-showctl.0 qmail-newu.0 \
+-qmail-pw2u.0 qmail-qread.0 qmail-qstat.0 qmail-tcpto.0 qmail-tcpok.0 \
+-qmail-pop3d.0 qmail-popup.0 qmail-qmqpc.0 qmail-qmqpd.0 qmail-qmtpd.0 \
+-qmail-smtpd.0 tcp-env.0 qmail-newmrh.0 qreceipt.0 qbiff.0 forward.0 \
+-preline.0 condredirect.0 bouncesaying.0 except.0 maildirmake.0 \
+-maildir2mbox.0 maildirwatch.0 qmail.0 qmail-limits.0 qmail-log.0 \
+-qmail-control.0 qmail-header.0 qmail-users.0 dot-qmail.0 \
+-qmail-command.0 tcp-environ.0 maildir.0 mbox.0 addresses.0 \
+-envelopes.0 forgeries.0
++dot-qmail.5 qmail-control.5 qmail-getpw.8 qmail-limits.7 qmail-newmrh.8 \
++qmail-newu.8 qmail-pw2u.8 qmail-send.8 qmail-start.8 qmail-users.5
  
-+auto_destdir.c: \
-+auto-str conf-destdir
-+      ./auto-str auto_qmail `head -1 conf-destdir` > auto_destdir.c
-+
-+auto_destdir.o: \
-+compile auto_destdir.c
-+      ./compile auto_destdir.c
-+
- addresses.0: \
- addresses.5
-       nroff -man addresses.5 > addresses.0
-@@ -110,7 +118,7 @@ auto_split.o: \
- compile auto_split.c
-       ./compile auto_split.c
- 
--auto_uids.c: \
-+auto_uids_orig.c: \
- auto-uid auto-gid conf-users conf-groups
-       ( ./auto-uid auto_uida `head -1 conf-users` \
-       &&./auto-uid auto_uidd `head -2 conf-users | tail -1` \
-@@ -122,7 +130,7 @@ auto-uid auto-gid conf-users conf-groups
-       &&./auto-uid auto_uids `head -8 conf-users | tail -1` \
-       &&./auto-gid auto_gidq `head -1 conf-groups` \
-       &&./auto-gid auto_gidn `head -2 conf-groups | tail -1` \
--      ) > auto_uids.c.tmp && mv auto_uids.c.tmp auto_uids.c
-+      ) > auto_uids_orig.c.tmp && mv auto_uids_orig.c.tmp auto_uids_orig.c
- 
- auto_uids.o: \
- compile auto_uids.c
+ mbox.0: \
+ mbox.5



Home | Main Index | Thread Index | Old Index