Date: Sun, 5 Sep 2021 16:29:53 GMT From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6525a29c1632 - main - mail/sendmail-devel: Update to 8.17.0.5 Message-ID: <202109051629.185GTrGY080274@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=6525a29c1632d8f83aa5e341fd18c3c5815ff2de commit 6525a29c1632d8f83aa5e341fd18c3c5815ff2de Author: Dirk Meyer <dinoex@FreeBSD.org> AuthorDate: 2021-09-03 14:42:02 +0000 Commit: Dirk Meyer <dinoex@FreeBSD.org> CommitDate: 2021-09-05 16:29:12 +0000 mail/sendmail-devel: Update to 8.17.0.5 --- mail/sendmail-devel/Makefile | 17 ++- mail/sendmail-devel/distinfo | 6 +- mail/sendmail-devel/files/cyruslookup.patch | 150 +++++++++++++++------- mail/sendmail-devel/files/site.config.m4.dane | 1 + mail/sendmail-devel/files/site.config.m4.smtputf8 | 3 +- mail/sendmail-devel/files/site.config.m4.ssl | 4 +- 6 files changed, 126 insertions(+), 55 deletions(-) diff --git a/mail/sendmail-devel/Makefile b/mail/sendmail-devel/Makefile index ef4ed088e7b7..952896f9c5b1 100644 --- a/mail/sendmail-devel/Makefile +++ b/mail/sendmail-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= sendmail -PORTVERSION= 8.17.0.3 +PORTVERSION= 8.17.0.5 PORTREVISION= 0 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/snapshots/ @@ -45,15 +45,16 @@ SENDMAIL= ${PREFIX}/sbin/sendmail BASEMAIL= /usr/libexec/sendmail/sendmail MILTER_SOVER?= 6 -OPTIONS_DEFINE?= SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD LDAP BDB \ - GDBM SOCKETMAP CYRUSLOOKUP BLACKLISTD SMTPUTF8 \ +OPTIONS_DEFINE?= SHMEM SEM LA NIS IPV6 TLS DANE SASL SASLAUTHD LDAP \ + BDB GDBM SOCKETMAP CYRUSLOOKUP BLACKLISTD SMTPUTF8 \ PICKY_HELO_CHECK MILTER DOCS -OPTIONS_DEFAULT?= SHMEM SEM LA NIS TLS SASL SASLAUTHD BDB1 \ +OPTIONS_DEFAULT?= SHMEM SEM LA NIS TLS DANE SASL SASLAUTHD BDB1 \ BLACKLISTD PICKY_HELO_CHECK MILTER NO_OPTIONS_SORT=yes SHMEM_DESC= System V shared memory support LA_DESC= load averages support TLS_DESC= SMTP-TLS and SMTPS support +DANE_DESC= Enable DANE support SASLAUTHD_DESC= SASLAUTHD support BDB_DESC= Berkeley DB version 4+ support GDBM_DESC= GNU dbm library support (option COMPAT needed) @@ -67,7 +68,9 @@ SMTPUTF8_DESC= Enable unicode address support TLS_USES= ssl SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASLAUTHD_RUN_DEPENDS= saslauthd:security/cyrus-sasl2-saslauthd +DANE_IMPLIES= TLS LDAP_USE= OPENLDAP=yes +LDAP_PREVENTS= DANE BDB_USES= bdb GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= compat @@ -121,6 +124,9 @@ SITE+= ${FILESDIR}/site.config.m4 .if ${PORT_OPTIONS:MIPV6} SITE+= ${FILESDIR}/site.config.m4.ipv6 .endif +.if ${PORT_OPTIONS:MDANE} +SITE+= ${FILESDIR}/site.config.m4.dane +.endif .if ${PORT_OPTIONS:MSASL} SITE+= ${FILESDIR}/site.config.m4.sasl2 .endif @@ -148,6 +154,9 @@ SED_SCRIPT= -e "s|\`-O'|\`${CFLAGS}'|" \ SED_SCRIPT+= -e "s;-DNIS ;;" .endif +post-patch: + @cd ${WRKSRC} && ${FIND} cf -type f -name "*.orig" -print0 | ${XARGS} -0 ${RM} + do-configure: .if ${PORT_OPTIONS:MGDBM} @(if [ ! -e "${LOCALBASE}/lib/libgdbm_compat.so" ] ; then \ diff --git a/mail/sendmail-devel/distinfo b/mail/sendmail-devel/distinfo index 710698af77b7..22040a553962 100644 --- a/mail/sendmail-devel/distinfo +++ b/mail/sendmail-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625165055 -SHA256 (sendmail.8.17.0.3.tar.gz) = 0b8cf894784fad367babca47a99e3a490882d4241258500bb827f0439e49749e -SIZE (sendmail.8.17.0.3.tar.gz) = 2279072 +TIMESTAMP = 1630679154 +SHA256 (sendmail.8.17.0.5.tar.gz) = 29874f76583953dd7fe39c83fb2dd501650d5a30404735f7bd9a25974e08609e +SIZE (sendmail.8.17.0.5.tar.gz) = 2282232 diff --git a/mail/sendmail-devel/files/cyruslookup.patch b/mail/sendmail-devel/files/cyruslookup.patch index a321b6a4a70e..8fe86cf886a4 100644 --- a/mail/sendmail-devel/files/cyruslookup.patch +++ b/mail/sendmail-devel/files/cyruslookup.patch @@ -1,6 +1,5 @@ -diff -ruN cf.orig/feature/ckuser_cyrus.m4 cf/feature/ckuser_cyrus.m4 ---- cf.orig/feature/ckuser_cyrus.m4 Thu Jan 1 07:00:00 1970 -+++ cf/feature/ckuser_cyrus.m4 Wed Sep 22 19:53:53 2004 +--- cf/feature/ckuser_cyrus.m4.orig 2021-03-23 05:32:02 UTC ++++ cf/feature/ckuser_cyrus.m4 @@ -0,0 +1,34 @@ +divert(-1) +# Written by Mike Boev <mike@tric.ru>, 2004. @@ -15,7 +14,7 @@ diff -ruN cf.orig/feature/ckuser_cyrus.m4 cf/feature/ckuser_cyrus.m4 +VERSIONID(`Id: ckuser_cyrus.m4,v 1.4 2004/09/21 19:02:17 m Exp ') +divert(-1) +define(`CYRUS_SMMAPD_SOCKET', -+ ifelse(len(X`'_ARG_), `1', `local:/var/imap/socket/smmapd', _ARG_)) ++ ifelse(len(X`'_ARG_), `1', `local:/var/imap/socket/smmap', _ARG_)) + +MODIFY_MAILER_FLAGS(`CYRUSV2',`+5') + @@ -36,39 +35,9 @@ diff -ruN cf.orig/feature/ckuser_cyrus.m4 cf/feature/ckuser_cyrus.m4 +R<!> $* $| $* <TMPF> $# error $@ 4.3.0 $: "451 TEMPFAIL." +#Mailbox doesn't exist or its ACL forbids posting +R<!> $* $| $* $# error $@ 5.1.1 $: "550 Mailbox is not available." -diff -ruN cf.orig/feature/mrs.m4 cf/feature/mrs.m4 ---- cf.orig/feature/mrs.m4 Thu Jan 1 07:00:00 1970 -+++ cf/feature/mrs.m4 Wed Sep 22 19:54:56 2004 -@@ -0,0 +1,25 @@ -+divert(-1) -+dnl -+dnl Updates: http://anfi.webhop.net/sendmail/mrs.html -+dnl -+dnl By using this file, you agree to the terms and conditions set -+dnl forth in the LICENSE file which can be found at the top level of -+dnl the sendmail distribution (sendmail-8.12). -+dnl -+dnl Contributed by Andrzej Filip -+dnl -+dnl THE FEATURE REQUIRES PATCHING cf/m4/proto.m4 -+dnl SEE THE LINK AFTER "Updates:" -+dnl -+dnl Log: mrs.m4,v -+dnl Revision 8.3 2004/03/18 21:39:22 anfi -+dnl Changed comments prefixes to dnl to avoid m4 expansions -+dnl -+dnl Revision 8.2 2004/03/15 09:14:28 anfi -+dnl Added "Updates:" web link. -+dnl -+divert(0) -+VERSIONID(`Id: mrs.m4,v 8.3 2004/03/18 21:39:22 anfi Exp ') -+divert(-1) -+ -+define(`_MRS_RELAY_', `') -diff -ruN cf.orig/feature/mrs_cyrus.m4 cf/feature/mrs_cyrus.m4 ---- cf.orig/feature/mrs_cyrus.m4 Thu Jan 1 07:00:00 1970 -+++ cf/feature/mrs_cyrus.m4 Wed Sep 22 19:55:05 2004 -@@ -0,0 +1,77 @@ +--- cf/feature/mrs_cyrus.m4.orig 2021-03-23 05:32:02 UTC ++++ cf/feature/mrs_cyrus.m4 +@@ -0,0 +1,80 @@ +divert(-1) +dnl +dnl Updates: http://anfi.homeunix.net/sendmail/rtcyrus2.html @@ -80,6 +49,9 @@ diff -ruN cf.orig/feature/mrs_cyrus.m4 cf/feature/mrs_cyrus.m4 +dnl Contributed by Andrzej Filip +dnl +dnl Log: mrs_cyrus.m4,v ++dnl Revision 8.9 2005/01/24 19:44:53 anfi ++dnl Fixed handling of empty relay ++dnl +dnl Revision 8.8 2004/08/11 18:20:05 anfi +dnl "stipdom" replaced by "dummy" +dnl @@ -99,10 +71,10 @@ diff -ruN cf.orig/feature/mrs_cyrus.m4 cf/feature/mrs_cyrus.m4 +define(`_MRS_CYRUS_',`') + +divert(0) -+VERSIONID(`Id: mrs_cyrus.m4,v 8.8 2004/08/11 18:20:05 anfi Exp ') ++VERSIONID(`Id: mrs_cyrus.m4,v 8.9 2005/01/24 19:44:53 anfi Exp ') +divert(-1) +define(`CYRUS_SMMAPD_SOCKET', -+ ifelse(len(X`'_ARG_), `1', `/var/imap/socket/smmapd', _ARG_)) ++ ifelse(len(X`'_ARG_), `1', `/var/imap/socket/smmap', _ARG_)) +define(`CYRUS_SMMAPD_SOCKET_TYPE', + ifelse(len(X`'_ARG2_), `1', `local', _ARG2_)) +LOCAL_CONFIG @@ -123,9 +95,9 @@ diff -ruN cf.orig/feature/mrs_cyrus.m4 cf/feature/mrs_cyrus.m4 +R<$*> $+ <@$*> $| $* <OK> $# cyrusv2 $@ dummy $: $4 +R<$*> $+ <@$*> $| $* $: <$1> $2 <@$3> +R<dummy> $+ <@dummy> $@ $1 ++R< > $* $# error $@ 5.1.1 $: "550 User unknown" +R< $~[ : $* > $* $>MailerToTriple < $1 : $2 > $3 +R< $+ > $* $>MailerToTriple < $1 > $2 -+R< > $* $# error $@ 5.1.1 $: "550 User unknown" + +Smrs_cyrus_mailertable +R<$*> $+ <@$+.> $: <$1> $2 <@ $3 > @@ -133,9 +105,9 @@ diff -ruN cf.orig/feature/mrs_cyrus.m4 cf/feature/mrs_cyrus.m4 +R<$*> $+ <@$+> $| $* <TMPF> $# error $@ 4.3.0 $: "451 Temporary system failure. Please try again later." +R<$*> $+ <@$+> $| $* <OK> $# cyrusv2d $@ dummy $: $2 <@$3> +R<$*> $+ <@$*> $| $* $: <$1> $2 <@$3> ++R< > $* $# error $@ 5.1.1 $: "550 User unknown" +R< $~[ : $* > $* $>MailerToTriple < $1 : $2 > $3 +R< $+ > $* $>MailerToTriple < $1 > $2 -+R< > $* $# error $@ 5.1.1 $: "550 User unknown" + +Smrs_cyrus_stickyhub +R<dummy> $+ <@$+.> $: <dummy> $1 <@ $2 > @@ -146,10 +118,37 @@ diff -ruN cf.orig/feature/mrs_cyrus.m4 cf/feature/mrs_cyrus.m4 +R<dummy> $+ <@$={VirtCyrus}> $| $* $# error $@ 5.1.1 $: "550 User unknown" +R<dummy> $=L <@$*> $# ifdef(`confLOCAL_MAILER',confLOCAL_MAILER,`local') $: @$1 +R<dummy> $* <@$*> $# ifdef(`confLOCAL_MAILER',confLOCAL_MAILER,`local') $: $1 -diff -ruN cf.orig/m4/proto.m4 cf/m4/proto.m4 ---- cf.orig/m4/proto.m4 Wed Sep 22 20:15:04 2004 -+++ cf/m4/proto.m4 Wed Sep 22 19:52:41 2004 -@@ -1315,6 +1315,9 @@ +--- cf/feature/mrs.m4.orig 2021-03-23 05:32:02 UTC ++++ cf/feature/mrs.m4 +@@ -0,0 +1,25 @@ ++divert(-1) ++dnl ++dnl Updates: http://anfi.webhop.net/sendmail/mrs.html ++dnl ++dnl By using this file, you agree to the terms and conditions set ++dnl forth in the LICENSE file which can be found at the top level of ++dnl the sendmail distribution (sendmail-8.12). ++dnl ++dnl Contributed by Andrzej Filip ++dnl ++dnl THE FEATURE REQUIRES PATCHING cf/m4/proto.m4 ++dnl SEE THE LINK AFTER "Updates:" ++dnl ++dnl Log: mrs.m4,v ++dnl Revision 8.3 2004/03/18 21:39:22 anfi ++dnl Changed comments prefixes to dnl to avoid m4 expansions ++dnl ++dnl Revision 8.2 2004/03/15 09:14:28 anfi ++dnl Added "Updates:" web link. ++dnl ++divert(0) ++VERSIONID(`Id: mrs.m4,v 8.3 2004/03/18 21:39:22 anfi Exp ') ++divert(-1) ++ ++define(`_MRS_RELAY_', `') +--- cf/m4/proto.m4.orig 2020-07-02 16:45:12 UTC ++++ cf/m4/proto.m4 +@@ -1373,6 +1373,9 @@ R< error : $-.$-.$- : $+ > $* $#error $@ $1.$2.$3 $: R< error : $- : $+ > $* $#error $@ $(dequote $1 $) $: $2 R< error : $+ > $* $#error $: $1 R< local : $* > $* $>CanonLocal < $1 > $2 @@ -159,3 +158,64 @@ diff -ruN cf.orig/m4/proto.m4 cf/m4/proto.m4 dnl it is $~[ instead of $- to avoid matches on IPv6 addresses R< $~[ : $+ @ $+ > $*<$*>$* $# $1 $@ $3 $: $2<@$3> use literal user R< $~[ : $+ > $* $# $1 $@ $2 $: $3 try qualified mailer +--- cf/mailer/cyrusv2.m4.orig 2020-05-19 19:54:31 UTC ++++ cf/mailer/cyrusv2.m4 +@@ -1,18 +1,30 @@ + PUSHDIVERT(-1) +-# +-# Copyright (c) 2002 Proofpoint, Inc. and its suppliers. +-# All rights reserved. +-# +-# By using this file, you agree to the terms and conditions set +-# forth in the LICENSE file which can be found at the top level of +-# the sendmail distribution. +-# +-# Contributed by Kenneth Murchison. +-# ++dnl ++dnl Updates: http://anfi.webhop.org/sendmail/cyrusv2.html ++dnl ++dnl By using this file, you agree to the terms and conditions set ++dnl forth in the LICENSE file which can be found at the top level of ++dnl the sendmail distribution (sendmail-8.12). ++dnl ++dnl Original version contributed by Kenneth Murchison. ++dnl Version with cyrusv2d mailer added contributed by Andrzej Filip ++dnl ++dnl $Log: cyrusv2.m4,v $ ++dnl Revision 8.3 2004/03/18 21:38:27 anfi ++dnl Changed comments prefixes to dnl to avoid m4 expansions ++dnl ++dnl Revision 8.2 2004/03/15 09:14:28 anfi ++dnl Added "Updates:" web link. ++dnl + +-_DEFIFNOT(`_DEF_CYRUSV2_MAILER_FLAGS', `lsDFMnqXz') +-_DEFIFNOT(`CYRUSV2_MAILER_FLAGS', `A@/:|m') +-ifdef(`CYRUSV2_MAILER_ARGS',, `define(`CYRUSV2_MAILER_ARGS', `FILE /var/imap/socket/lmtp')') ++_DEFIFNOT(`CYRUS_LMTP_SOCKET',`/var/imap/socket/lmtp') ++_DEFIFNOT(`_DEF_CYRUSV2_MAILER_FLAGS', `lsDFMnqXz1') ++_DEFIFNOT(`_DEF_CYRUSV2D_MAILER_FLAGS', _DEF_CYRUSV2_MAILER_FLAGS) ++_DEFIFNOT(`CYRUSV2_MAILER_FLAGS', `mA@/:|') ++_DEFIFNOT(`CYRUSV2D_MAILER_FLAGS', `m') ++dnl ++ifdef(`CYRUSV2_MAILER_ARGS',, `define(`CYRUSV2_MAILER_ARGS', `FILE 'CYRUS_LMTP_SOCKET)') ++ifdef(`CYRUSV2D_MAILER_ARGS',, `define(`CYRUSV2D_MAILER_ARGS', _CYRUS_V2_MAILER_ARGS)') + define(`_CYRUSV2_QGRP', `ifelse(defn(`CYRUSV2_MAILER_QGRP'),`',`', ` Q=CYRUSV2_MAILER_QGRP,')')dnl + + POPDIVERT +@@ -21,9 +33,13 @@ POPDIVERT + ### Cyrus V2 Mailer specification ### + ######################################### + +-VERSIONID(`$Id: cyrusv2.m4,v 1.2 2013-11-22 20:51:14 ca Exp $') ++VERSIONID(`$Id: cyrusv2.m4,v 8.3 2004/03/18 21:38:27 anfi Exp $') + + Mcyrusv2, P=[IPC], F=_MODMF_(CONCAT(_DEF_CYRUSV2_MAILER_FLAGS, CYRUSV2_MAILER_FLAGS), `CYRUSV2'), + S=EnvFromSMTP/HdrFromL, R=EnvToL/HdrToL, E=\r\n, ++ _OPTINS(`CYRUSV2_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`CYRUSV2_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`CYRUSV2_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,_CYRUSV2_QGRP ++ A=CYRUSV2_MAILER_ARGS ++Mcyrusv2d, P=[IPC], F=_MODMF_(CONCAT(_DEF_CYRUSV2D_MAILER_FLAGS, CYRUSV2D_MAILER_FLAGS), `CYRUSV2D'), ++ S=EnvFromSMTP/HdrFromL, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), E=\r\n, + _OPTINS(`CYRUSV2_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`CYRUSV2_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`CYRUSV2_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,_CYRUSV2_QGRP + A=CYRUSV2_MAILER_ARGS diff --git a/mail/sendmail-devel/files/site.config.m4.dane b/mail/sendmail-devel/files/site.config.m4.dane new file mode 100644 index 000000000000..1b3eda17e2b2 --- /dev/null +++ b/mail/sendmail-devel/files/site.config.m4.dane @@ -0,0 +1 @@ +APPENDDEF(`conf_sendmail_ENVDEF', `-DDANE') diff --git a/mail/sendmail-devel/files/site.config.m4.smtputf8 b/mail/sendmail-devel/files/site.config.m4.smtputf8 index e4a517848db3..c260fc3818b3 100644 --- a/mail/sendmail-devel/files/site.config.m4.smtputf8 +++ b/mail/sendmail-devel/files/site.config.m4.smtputf8 @@ -1,2 +1,3 @@ -APPENDDEF(`confLIBS', `-licuuc') APPENDDEF(`confENVDEF',`-DUSE_EAI') +APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include') +APPENDDEF(`confLIBS', `-licuuc') diff --git a/mail/sendmail-devel/files/site.config.m4.ssl b/mail/sendmail-devel/files/site.config.m4.ssl index 6ccb80597c4e..e231246946ae 100644 --- a/mail/sendmail-devel/files/site.config.m4.ssl +++ b/mail/sendmail-devel/files/site.config.m4.ssl @@ -1,4 +1,4 @@ +APPENDDEF(`conf_sendmail_ENVDEF', `-DHASSRANDOMDEV') +APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include') APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib') APPENDDEF(`confLDOPTS', ``-Wl,-rpath=%%LOCALBASE%%/lib'') -APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include') -APPENDDEF(`conf_sendmail_ENVDEF', `-DHASSRANDOMDEV')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109051629.185GTrGY080274>