Add Toby Betts' "tai-leapsecs" patch to handle leap seconds correctly

when the system clock is set to TAI (and a libtai dependency to get
leapsecs.dat). While here, catch up to his latest maildiruniq patch.

Let an installed ucspi-tcp6 satisfy the ucspi-tcp dependency for
non-'inet6' builds.

Bump PKGREVISION.

3 files changed, 42 insertions, 5 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index be5bfbb3c3d..90e7efd50d7 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.107 2018/12/17 19:15:33 schmonz Exp $
+# $NetBSD: Makefile,v 1.108 2019/01/09 19:32:07 schmonz Exp $
 #
 
 DISTNAME=		netqmail-1.06
 PKGNAME=		qmail-1.03
-PKGREVISION=		42
+PKGREVISION=		43
 CATEGORIES=		mail
 MASTER_SITES=		http://qmail.org/
 
@@ -13,6 +13,8 @@ COMMENT=		Secure, reliable, efficient, simple, and fast MTA
 LICENSE=		public-domain
 
 DEPENDS+=		daemontools-[0-9]*:../../sysutils/daemontools
+DEPENDS_LIBTAI=		libtai>=0.60nb5:../../devel/libtai
+DEPENDS+=		${DEPENDS_LIBTAI}
 
 CONFLICTS+=		courier-maildirmake-[0-9]*
 CONFLICTS+=		courier-mta-[0-9]*
@@ -76,6 +78,19 @@ INSTALLATION_DIRS+=	${EGDIR}/users
 
 .include "../../mk/bsd.prefs.mk"
 
+# Detect the PKG_SYSCONFDIR of the installed libtai, so we can find
+# its leapsecs.dat.
+
+.if !defined(PKG_SYSCONFDIR.libtai)
+PKG_SYSCONFDIR.libtai!=							\
+	${PKG_INFO} -Q PKG_SYSCONFDIR					\
+		${DEPENDS_LIBTAI:C/:.*$//:Q} 2>/dev/null ||		\
+	${ECHO} "PKG_SYSCONFDIR.libtai_not_set"
+.  if empty(PKG_SYSCONFDIR.libtai:M*not_set)
+MAKEVARS+=	PKG_SYSCONFDIR.libtai
+.  endif
+.endif
+
 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
@@ -122,6 +137,11 @@ SUBST_STAGE.paths=	do-configure
 SUBST_FILES.paths=	README.*
 SUBST_VARS.paths=	PKGNAME PKG_INFO PREFIX GREP
 
+SUBST_CLASSES+=		libtai
+SUBST_STAGE.libtai=	do-configure
+SUBST_FILES.libtai=	leapsecs_read.c
+SUBST_SED.libtai=	-e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR.libtai}|g'
+
 SUBST_FILES.djbware+=	cdb_seek.c dns.c
 
 PKG_USERS_VARS+=	QMAIL_ALIAS_USER QMAIL_DAEMON_USER QMAIL_LOG_USER
@@ -168,6 +188,10 @@ 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
+PATCH_DIST_CAT.${MAILDIRUNIQ_PATCH}= \
+				${SED} -e 's|"057"|"\\\\057"|' \
+				-e 's|"072"|"\\\\072"|' \
+				< ${MAILDIRUNIQ_PATCH}
 
 QMAILPATCHES+=			outgoingip:${OUTGOINGIP_PATCH}
 OUTGOINGIP_PATCH=		outgoingip.patch
@@ -196,6 +220,15 @@ PATCH_DIST_CAT.${SPP_PATCH}=	${TAR} -C ${WRKDIR} -zxf ${SPP_PATCH} ${SPP_PATCHFI
 PATCH_DIST_STRIP.${SPP_PATCH}=	-p1
 LICENSE+=			AND gnu-gpl-v2
 
+QMAILPATCHES+=			taileapsecs:${TAILEAPSECS_PATCH}
+TAILEAPSECS_PATCH=		netqmail-1.05-TAI-leapsecs.patch
+PATCHFILES+=			${TAILEAPSECS_PATCH}
+SITES.${TAILEAPSECS_PATCH}=	https://su.bze.ro/software/
+PATCH_DIST_STRIP.${TAILEAPSECS_PATCH}=-p1
+PATCH_DIST_CAT.${TAILEAPSECS_PATCH}= \
+				${SED} -e 's|"/etc/leapsecs.dat"|"@PKG_SYSCONFDIR@/leapsecs.dat"|' \
+				< ${TAILEAPSECS_PATCH}
+
 post-extract:
 	for i in ${READMES}; do						\
 		${CP} ${FILESDIR}/$$i ${WRKSRC} || ${TRUE};		\
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 13252ffd97f..aa535a68543 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.42 2018/12/17 19:15:33 schmonz Exp $
+$NetBSD: distinfo,v 1.43 2019/01/09 19:32:07 schmonz Exp $
 
+SHA1 (netqmail-1.05-TAI-leapsecs.patch) = 2c21cd7e20b241c1a82b79379f2c7ee3da5519f7
+RMD160 (netqmail-1.05-TAI-leapsecs.patch) = 9fd59001be5a07d914c66127236ebe8c33f64675
+SHA512 (netqmail-1.05-TAI-leapsecs.patch) = 2278139b825330a418171ad6dd4667410819591d3828f8b40dda789e1aafe1cefcc638fdc6d9de21a8c0ca6caffb41fbbb44bab2dd80f570e81c6e900c8596f7
+Size (netqmail-1.05-TAI-leapsecs.patch) = 16382 bytes
 SHA1 (netqmail-1.06-destdir-20181217.patch) = b309f99d29af95358301ae6dde6b32c8db6c371a
 RMD160 (netqmail-1.06-destdir-20181217.patch) = e42312b05c6f5dbb6614bfffb17991e25a4518d0
 SHA512 (netqmail-1.06-destdir-20181217.patch) = 1cb02193f69930569c4c340c427d8e0002d1fb67b622ee8fd0fcbb273b5deca356fa2e0b11d44a2473cf2c083fc09d43bb3dfb70f22d284f262f2c2d6cf4221e
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index 262420e1b19..e01493072a8 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.60 2018/12/13 05:01:55 schmonz Exp $
+# $NetBSD: options.mk,v 1.61 2019/01/09 19:32:07 schmonz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS+=		eai inet6 pam syncdir tls
@@ -102,6 +102,6 @@ BUILDLINK_TRANSFORM+=		rm:-lcrypto
 .if !empty(PKG_OPTIONS:Minet6)
 DEPENDS+=			ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6
 .else
-DEPENDS+=			ucspi-tcp-[0-9]*:../../net/ucspi-tcp
+DEPENDS+=			{ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp
 .endif
 .endif