Tue Dec 3 18:51:02 2019 UTC ()
To resole hostname to IPv6 addresses gethostbyname2() is needed.
Fix spurious (may be forged) logs when receiving via IPv6 socket,
and fix sending to IPv6-enabled relay.
Bump PKGREVISION
(no revision bump for libmilter, it's not affected)


(bouyer)
diff -r1.133 -r1.134 pkgsrc/mail/sendmail/Makefile
diff -r1.65 -r1.66 pkgsrc/mail/sendmail/Makefile.common
diff -r0 -r1.1 pkgsrc/mail/sendmail/files/site.config.m4-gethostbyname2
cvs diff -r1.133 -r1.134 pkgsrc/mail/sendmail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/sendmail/Makefile 2019/07/15 07:05:02 1.133
+++ pkgsrc/mail/sendmail/Makefile 2019/12/03 18:51:02 1.134
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.133 2019/07/15 07:05:02 jnemeth Exp $ 1# $NetBSD: Makefile,v 1.134 2019/12/03 18:51:02 bouyer Exp $
2 2
3PKGNAME= sendmail-${DIST_VERS} 3PKGNAME= sendmail-${DIST_VERS}
4PKGREVISION= 5 4PKGREVISION= 6
5COMMENT= The well known Mail Transport Agent 5COMMENT= The well known Mail Transport Agent
6 6
7CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]* 7CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
8CONFLICTS+= esmtp>=1.2 8CONFLICTS+= esmtp>=1.2
9 9
10.include "options.mk" 10.include "options.mk"
11.include "../../mail/sendmail/Makefile.common" 11.include "../../mail/sendmail/Makefile.common"
12 12
13USE_TOOLS+= pax 13USE_TOOLS+= pax
14 14
15MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC 15MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC
16PLIST_SRC= ${WRKDIR}/.PLIST_SRC 16PLIST_SRC= ${WRKDIR}/.PLIST_SRC
17 17
cvs diff -r1.65 -r1.66 pkgsrc/mail/sendmail/Makefile.common (expand / switch to unified diff)

--- pkgsrc/mail/sendmail/Makefile.common 2017/01/19 18:52:17 1.65
+++ pkgsrc/mail/sendmail/Makefile.common 2019/12/03 18:51:02 1.66
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.65 2017/01/19 18:52:17 agc Exp $ 1# $NetBSD: Makefile.common,v 1.66 2019/12/03 18:51:02 bouyer Exp $
2# 2#
3# used by mail/libmilter/Makefile 3# used by mail/libmilter/Makefile
4# used by mail/sendmail/Makefile 4# used by mail/sendmail/Makefile
5# used by mail/sendmail-qtool/Makefile 5# used by mail/sendmail-qtool/Makefile
6# used by mail/sendmail-cidrexpand/Makefile 6# used by mail/sendmail-cidrexpand/Makefile
7# 7#
8 8
9DISTNAME= sendmail.${DIST_VERS} 9DISTNAME= sendmail.${DIST_VERS}
10CATEGORIES= mail 10CATEGORIES= mail
11MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ 11MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
12MASTER_SITES+= ftp://ftp.sendmail.org/pub/sendmail/past-releases/ 12MASTER_SITES+= ftp://ftp.sendmail.org/pub/sendmail/past-releases/
13MASTER_SITES+= ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/ 13MASTER_SITES+= ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/
14 14
@@ -46,23 +46,26 @@ pre-configure: @@ -46,23 +46,26 @@ pre-configure:
46 cp ${FILESDIR}/sm_os_netbsd.h ${WRKSRC}/include/sm/os/sm_os_netbsd.h 46 cp ${FILESDIR}/sm_os_netbsd.h ${WRKSRC}/include/sm/os/sm_os_netbsd.h
47 47
48.PHONY: make-sendmail-siteconfig 48.PHONY: make-sendmail-siteconfig
49make-sendmail-siteconfig: 49make-sendmail-siteconfig:
50 ${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG} 50 ${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG}
51 ${CHMOD} +w ${SITECONFIG} 51 ${CHMOD} +w ${SITECONFIG}
52 52
53.if !empty(PKG_OPTIONS:Minet6) 53.if !empty(PKG_OPTIONS:Minet6)
54 ${CAT} ${FILESDIR}/site.config.m4-v6 >>${SITECONFIG} 54 ${CAT} ${FILESDIR}/site.config.m4-v6 >>${SITECONFIG}
55. if (${OPSYS} != "SunOS") && (${OPSYS} != "BSDOS") && \ 55. if (${OPSYS} != "SunOS") && (${OPSYS} != "BSDOS") && \
56 (${OPSYS} != "DragonFly") && (${OPSYS} != "FreeBSD") 56 (${OPSYS} != "DragonFly") && (${OPSYS} != "FreeBSD")
57 ${CAT} ${FILESDIR}/site.config.m4-v6-not-solaris >>${SITECONFIG} 57 ${CAT} ${FILESDIR}/site.config.m4-v6-not-solaris >>${SITECONFIG}
58. endif 58. endif
 59. if ${OPSYS} == "NetBSD"
 60 ${CAT} ${FILESDIR}/site.config.m4-gethostbyname2 >>${SITECONFIG}
 61. endif
59.endif 62.endif
60 63
61 ${CAT} ${FILESDIR}/site.config.m4-milter >>${SITECONFIG} 64 ${CAT} ${FILESDIR}/site.config.m4-milter >>${SITECONFIG}
62.if ${OPSYS} == "SunOS" 65.if ${OPSYS} == "SunOS"
63 ${CAT} ${FILESDIR}/site.config.m4-fpic >>${SITECONFIG} 66 ${CAT} ${FILESDIR}/site.config.m4-fpic >>${SITECONFIG}
64 ${CAT} ${FILESDIR}/site.config.m4-libresolv >>${SITECONFIG} 67 ${CAT} ${FILESDIR}/site.config.m4-libresolv >>${SITECONFIG}
65. if exists(/usr/include/stdbool.h) 68. if exists(/usr/include/stdbool.h)
66 ${CAT} ${FILESDIR}/site.config.m4-stdbool >>${SITECONFIG} 69 ${CAT} ${FILESDIR}/site.config.m4-stdbool >>${SITECONFIG}
67. endif 70. endif
68.endif 71.endif
File Added: pkgsrc/mail/sendmail/files/site.config.m4-gethostbyname2
# $NetBSD: site.config.m4-gethostbyname2,v 1.1 2019/12/03 18:51:02 bouyer Exp $

# has gethostbyname2()
APPENDDEF(`confENVDEF', `-DHAS_GETHOSTBYNAME2')