The TLS/SASL patch no longer applies over our patch to hier.c

(reported by Thomas Lazar), so instead express our local changes
with SUBST_SED at do-configure. Update to the latest TLS/SASL patch.
Bump PKGREVISION.

4 files changed, 13 insertions, 134 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 59a5e26f9dc..d0545d53781 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.67 2014/02/12 23:18:09 tron Exp $
+# $NetBSD: Makefile,v 1.68 2014/04/16 04:57:23 schmonz Exp $
 #
 
 DISTNAME=		${PKGNAME_NOREV}
 PKGNAME=		qmail-1.03
-PKGREVISION=		17
+PKGREVISION=		18
 CATEGORIES=		mail
 MASTER_SITES=		http://qmail.org/
 
@@ -90,6 +90,12 @@ SUBST_FILES.caseclash=	hier.c
 SUBST_SED.caseclash=	-e 's|"INSTALL"|"INSTALL${DARWINSUFX}"|g'
 SUBST_SED.caseclash+=	-e 's|"SENDMAIL"|"SENDMAIL${DARWINSUFX}"|g'
 
+SUBST_CLASSES+=		catpages
+SUBST_STAGE.catpages=	do-configure
+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+=		paths
 SUBST_STAGE.paths=	do-configure
 SUBST_FILES.paths=	README.pkgsrc
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index cf80e170e2e..40a21915c5d 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2013/08/15 15:43:48 schmonz Exp $
+$NetBSD: distinfo,v 1.24 2014/04/16 04:57:23 schmonz Exp $
 
 SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a
 RMD160 (qmail-1.03.tar.gz) = b851f273f1d365d38efd949b1efcf35768ffa30f
@@ -31,6 +31,5 @@ SHA1 (qmail-smtpd-viruscan-logging.patch) = ca7105b5561cf280e9e3a465d2d68a16673f
 RMD160 (qmail-smtpd-viruscan-logging.patch) = 79631cb7b5b120f98397011c4fb94726c48b83e4
 Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes
 SHA1 (patch-Makefile) = 2c8c50889cbc7da8c51bf6d44c0b31f5f0853896
-SHA1 (patch-hier.c) = cc6c7a4369cd8503a872667c4aa388d8e013e445
 SHA1 (patch-spawn.c) = aad06c4ed3ad4bd0e500ab561d7f7307c19e3283
 SHA1 (patch-strerr_sys.c) = 15e6466c655058664cb660e5e12232bf45010814
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index c6be13f5983..e8571c872ab 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.32 2013/03/24 20:10:31 schmonz Exp $
+# $NetBSD: options.mk,v 1.33 2014/04/16 04:57:23 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qmail
 PKG_OPTIONS_OPTIONAL_GROUPS=	rcpt
@@ -54,11 +54,11 @@ PLIST_VARS+=		tls
 PKG_OPTIONS+=		sasl
 .  endif
 .  include "../../security/openssl/buildlink3.mk"
-TLSSASL_PATCH=		netqmail-1.05-tls-smtpauth-20070321.patch
+TLSSASL_PATCH=		netqmail-1.05-tls-smtpauth-20070417.patch
 PATCHFILES+=		${TLSSASL_PATCH}
-SITES.${TLSSASL_PATCH}=	http://shupp.org/patches/
+SITES.${TLSSASL_PATCH}=	https://raw.githubusercontent.com/shupp/legacy-qmail-related/master/patches/
 .  if !empty(PKG_OPTIONS:Mtls)
-CFLAGS+=		-DTLS=20060104	# NOTE: update according to the patch
+CFLAGS+=		-DTLS=20070408	# NOTE: update according to the patch
 DJB_INSTALL_TARGETS=	cert tmprsadh
 USE_TOOLS+=		gmake
 PLIST.tls=		yes
diff --git a/mail/qmail/patches/patch-hier.c b/mail/qmail/patches/patch-hier.c
deleted file mode 100644
index 29a1f236978..00000000000
--- a/mail/qmail/patches/patch-hier.c
+++ /dev/null
@@ -1,126 +0,0 @@
-$NetBSD: patch-hier.c,v 1.3 2013/08/15 15:43:48 schmonz Exp $
-
-Don't install a manpage also installed by ucspi-tcp, or any catpages.
-
---- hier.c.orig	1998-06-15 10:53:16.000000000 +0000
-+++ hier.c
-@@ -37,10 +37,6 @@ void hier()
-   d(auto_qmail,"boot",auto_uido,auto_gidq,0755);
-   d(auto_qmail,"doc",auto_uido,auto_gidq,0755);
-   d(auto_qmail,"man",auto_uido,auto_gidq,0755);
--  d(auto_qmail,"man/cat1",auto_uido,auto_gidq,0755);
--  d(auto_qmail,"man/cat5",auto_uido,auto_gidq,0755);
--  d(auto_qmail,"man/cat7",auto_uido,auto_gidq,0755);
--  d(auto_qmail,"man/cat8",auto_uido,auto_gidq,0755);
-   d(auto_qmail,"man/man1",auto_uido,auto_gidq,0755);
-   d(auto_qmail,"man/man5",auto_uido,auto_gidq,0755);
-   d(auto_qmail,"man/man7",auto_uido,auto_gidq,0755);
-@@ -145,108 +141,56 @@ void hier()
-   c(auto_qmail,"bin","pinq",auto_uido,auto_gidq,0755);
- 
-   c(auto_qmail,"man/man5","addresses.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","addresses.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man5","envelopes.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","envelopes.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man5","maildir.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","maildir.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man5","mbox.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","mbox.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man5","dot-qmail.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","dot-qmail.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man5","qmail-control.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","qmail-control.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man5","qmail-header.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","qmail-header.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man5","qmail-log.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","qmail-log.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man5","qmail-users.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","qmail-users.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man5","tcp-environ.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","tcp-environ.0",auto_uido,auto_gidq,0644);
- 
-   c(auto_qmail,"man/man7","forgeries.7",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat7","forgeries.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man7","qmail-limits.7",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat7","qmail-limits.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man7","qmail.7",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat7","qmail.0",auto_uido,auto_gidq,0644);
- 
-   c(auto_qmail,"man/man1","forward.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","forward.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man1","condredirect.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","condredirect.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man1","bouncesaying.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","bouncesaying.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man1","except.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","except.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man1","maildirmake.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","maildirmake.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man1","maildir2mbox.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","maildir2mbox.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man1","maildirwatch.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","maildirwatch.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man1","mailsubj.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","mailsubj.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man1","qreceipt.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","qreceipt.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man1","qbiff.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","qbiff.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man1","preline.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","preline.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man1","tcp-env.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","tcp-env.0",auto_uido,auto_gidq,0644);
- 
-   c(auto_qmail,"man/man8","qmail-local.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-local.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-lspawn.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-lspawn.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-getpw.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-getpw.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-remote.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-remote.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-rspawn.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-rspawn.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-clean.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-clean.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-send.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-send.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-start.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-start.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","splogger.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","splogger.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-queue.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-queue.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-inject.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-inject.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-showctl.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-showctl.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-newmrh.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-newmrh.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-newu.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-newu.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-pw2u.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-pw2u.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-qread.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-qread.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-qstat.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-qstat.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-tcpok.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-tcpok.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-tcpto.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-tcpto.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-pop3d.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-pop3d.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-popup.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-popup.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-qmqpc.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-qmqpc.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-qmqpd.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-qmqpd.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-qmtpd.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-qmtpd.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-smtpd.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-smtpd.0",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/man8","qmail-command.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-command.0",auto_uido,auto_gidq,0644);
- }