From ee92dead7a954adab9e571c2b9cbf5e0f161d1c0 Mon Sep 17 00:00:00 2001
From: jnemeth <jnemeth@pkgsrc.org>
Date: Fri, 20 Jun 2014 16:26:55 +0000
Subject: Update to sendmail 8.14.9nb2: this is a pkgsrc bugfix update.

This should be the last update during the freeze.

PR/48566 - Emmanuel Dreyfus -- typo in patch-aw leading to build failure
PR/48913 - Matthias Scheler -- libmilter fails on unprivileged builds
---
 mail/sendmail/Makefile                   |  4 ++--
 mail/sendmail/TODO                       |  3 ++-
 mail/sendmail/distinfo                   |  5 +++--
 mail/sendmail/files/site.config.m4-sasl2 |  5 ++++-
 mail/sendmail/patches/patch-aw           |  4 ++--
 mail/sendmail/patches/patch-bf           | 15 +++++++++++++++
 6 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 mail/sendmail/patches/patch-bf

(limited to 'mail/sendmail')

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 33acbf4941e..8b64765cdee 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.123 2014/06/20 05:24:32 jnemeth Exp $
+# $NetBSD: Makefile,v 1.124 2014/06/20 16:26:55 jnemeth Exp $
 
 PKGNAME=	sendmail-${DIST_VERS}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	The well known Mail Transport Agent
 
 CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
diff --git a/mail/sendmail/TODO b/mail/sendmail/TODO
index 4a86d42b22e..b83fcbb7f56 100644
--- a/mail/sendmail/TODO
+++ b/mail/sendmail/TODO
@@ -1,5 +1,6 @@
-$NetBSD: TODO,v 1.1 2014/06/15 20:48:49 jnemeth Exp $
+$NetBSD: TODO,v 1.2 2014/06/20 16:26:55 jnemeth Exp $
 
+- investigate why the combination of SASL, NAMED_RESN, and MILTER fails
 - get helpfile installed somewhere useful
   - alternatively, adjust default "O HelpFile"
 - install sample aliases somewhere
diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo
index 9e46e3e70eb..740da08e058 100644
--- a/mail/sendmail/distinfo
+++ b/mail/sendmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2014/06/20 05:24:32 jnemeth Exp $
+$NetBSD: distinfo,v 1.53 2014/06/20 16:26:55 jnemeth Exp $
 
 SHA1 (sendmail.8.14.9.tar.gz) = fcf92eb0c119da1593ccda96ee24b4d0b0b21fd7
 RMD160 (sendmail.8.14.9.tar.gz) = da36f900a94c9300521a60bf917ed3e5d6c88d1e
@@ -18,7 +18,7 @@ SHA1 (patch-as) = 652b107d5f68507a0b2fb7c5402186eff96c6bc0
 SHA1 (patch-at) = 7c206df88d29671faef950276a5119ef2f525f4b
 SHA1 (patch-au) = 87e907f36482f3ca03754160bc1ee106e17e3aaa
 SHA1 (patch-av) = 1b6bd4547930507ab67427bcf8a390c0afce0fb0
-SHA1 (patch-aw) = 898fc58af028f9887fceddc7bbb50d5fc88d5189
+SHA1 (patch-aw) = 76402522b3737c5bde2ee9061f76cdf73f232853
 SHA1 (patch-ax) = adba9177404e10d5f461e1e8f0c4dd5840d78dd1
 SHA1 (patch-ay) = 94f9c633c1d15037ddd0a6ed46a4f3aaec236fc2
 SHA1 (patch-az) = e067d46657593348e7df912d1d54c02c0dfd54ed
@@ -27,3 +27,4 @@ SHA1 (patch-bb) = 6c86a60af25b02fc0389f1d40f59c5031d9679f1
 SHA1 (patch-bc) = 9e7346342dfe1ca5d84053b913df4be41a979683
 SHA1 (patch-bd) = 1a6d035c585838e771a1a677892b95bb82000a7b
 SHA1 (patch-be) = d2f3397b7880f23f8cbd5d3c4eb5ccfe6a6ca75b
+SHA1 (patch-bf) = 9c5faf5b38c18623e5ce4ffafc00a4430965e41a
diff --git a/mail/sendmail/files/site.config.m4-sasl2 b/mail/sendmail/files/site.config.m4-sasl2
index 07b85db461a..1d5a47c5502 100644
--- a/mail/sendmail/files/site.config.m4-sasl2
+++ b/mail/sendmail/files/site.config.m4-sasl2
@@ -1,5 +1,8 @@
-# $NetBSD: site.config.m4-sasl2,v 1.2 2004/08/30 20:16:28 adrianp Exp $
+# $NetBSD: site.config.m4-sasl2,v 1.3 2014/06/20 16:26:55 jnemeth Exp $
 
 # enable SASL 2
 APPENDDEF(`confENVDEF', `-DSASL=2')
 APPENDDEF(`conf_sendmail_LIBS', `-lsasl2')
+
+# for some strange reason SASL, and NAMED_RESN and MILTER are incompatible
+APPENDDEF(`confENVDEF', `-DNAMED_RESN=0')
diff --git a/mail/sendmail/patches/patch-aw b/mail/sendmail/patches/patch-aw
index 2fdd51b4fdc..fa44e4717b6 100644
--- a/mail/sendmail/patches/patch-aw
+++ b/mail/sendmail/patches/patch-aw
@@ -1,4 +1,4 @@
-$NetBSD: patch-aw,v 1.2 2014/06/20 05:24:32 jnemeth Exp $
+$NetBSD: patch-aw,v 1.3 2014/06/20 16:26:55 jnemeth Exp $
 
 --- sendmail/readcf.c.orig	2014-05-16 20:40:15.000000000 +0000
 +++ sendmail/readcf.c
@@ -33,7 +33,7 @@ $NetBSD: patch-aw,v 1.2 2014/06/20 05:24:32 jnemeth Exp $
  	{ "SSL_OP_CRYPTOPRO_TLSEXT_BUG",	SSL_OP_CRYPTOPRO_TLSEXT_BUG	},
  #endif
 +#ifdef SSL_OP_TLSEXT_PADDING
-+	{ "SSL_OP_TLSEXT_PADDING",	SSL_OP_TLSEXT_PADDING
++	{ "SSL_OP_TLSEXT_PADDING",	SSL_OP_TLSEXT_PADDING	},
 +#endif
  	{ NULL,		0		}
  };
diff --git a/mail/sendmail/patches/patch-bf b/mail/sendmail/patches/patch-bf
new file mode 100644
index 00000000000..aa1d2e1334b
--- /dev/null
+++ b/mail/sendmail/patches/patch-bf
@@ -0,0 +1,15 @@
+$NetBSD: patch-bf,v 1.1 2014/06/20 16:26:55 jnemeth Exp $
+
+--- libmilter/Makefile.m4.orig	2014-05-16 20:40:15.000000000 +0000
++++ libmilter/Makefile.m4
+@@ -33,8 +33,8 @@ MFAPI=	${SRCDIR}/inc`'lude/libmilter/mfa
+ MFDEF=	${SRCDIR}/inc`'lude/libmilter/mfdef.h
+ install-mfapi: ${MFAPI}
+ 	if [ ! -d ${DESTDIR}${INCLUDEDIR}/libmilter ]; then mkdir -p ${DESTDIR}${INCLUDEDIR}/libmilter; else :; fi
+-	${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} ${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h
+-	${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} ${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h
++	${INSTALL} -c -m ${INCMODE} ${MFAPI} ${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h
++	${INSTALL} -c -m ${INCMODE} ${MFDEF} ${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h
+ divert(0)
+ 
+ bldFINISH
-- 
cgit v1.2.3