svn commit: r497812 - in head/mail: . sendmail-devel sendmail-devel/files
Dirk Meyer
dinoex at FreeBSD.org
Thu Apr 4 08:33:30 UTC 2019
Author: dinoex
Date: Thu Apr 4 08:33:27 2019
New Revision: 497812
URL: https://svnweb.freebsd.org/changeset/ports/497812
Log:
- import sendmail-8.16.0.41
Added:
head/mail/sendmail-devel/
- copied from r497774, head/mail/sendmail/
Deleted:
head/mail/sendmail-devel/bsd.milter.mk
head/mail/sendmail-devel/files/patch-sm_os_freebsd.h
head/mail/sendmail-devel/files/patch-tls.c
Modified:
head/mail/Makefile
head/mail/sendmail-devel/Makefile
head/mail/sendmail-devel/distinfo
head/mail/sendmail-devel/files/patch-Makefile.m4
head/mail/sendmail-devel/files/patch-cfhead.m4
head/mail/sendmail-devel/files/patch-readcf.c
head/mail/sendmail-devel/files/patch-sendmail.h
head/mail/sendmail-devel/files/patch-srvrsmtp.c
head/mail/sendmail-devel/files/site.config.m4.tls
head/mail/sendmail-devel/files/smtputf8.patch
Modified: head/mail/Makefile
==============================================================================
--- head/mail/Makefile Thu Apr 4 08:19:45 2019 (r497811)
+++ head/mail/Makefile Thu Apr 4 08:33:27 2019 (r497812)
@@ -634,6 +634,7 @@
SUBDIR += sa-utils
SUBDIR += scam-backscatter
SUBDIR += sendmail
+ SUBDIR += sendmail-devel
SUBDIR += sendok
SUBDIR += sentinel
SUBDIR += serialmail
Modified: head/mail/sendmail-devel/Makefile
==============================================================================
--- head/mail/sendmail/Makefile Wed Apr 3 22:15:18 2019 (r497774)
+++ head/mail/sendmail-devel/Makefile Thu Apr 4 08:33:27 2019 (r497812)
@@ -1,10 +1,11 @@
# $FreeBSD$
PORTNAME= sendmail
-PORTVERSION= 8.15.2
-PORTREVISION= 18
+PORTVERSION= 8.16.0.41
+PORTREVISION= 0
CATEGORIES= mail ipv6
-MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
+MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/snapshots/
+PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2}
DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= dinoex at FreeBSD.org
@@ -75,11 +76,6 @@ GDBM_CONFIGURE_WITH= compat
SMTPUTF8_LIB_DEPENDS= libidn2.so:dns/libidn2 libicui18n.so:devel/icu
.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200000
-PKGNAMESUFFIX?= ${TLS_SUFFIX}${SASL_SUFFIX}${LDAP_SUFFIX}${BDB_SUFFIX}${PKGNAMESUFFIX2}
-.endif
-
.if ${PORT_OPTIONS:MSHMEM} && !defined(BUILDING_INDEX)
IPCCHECK!= ipcrm -q 0 2>&1 || true
.if ${IPCCHECK:Mimplemented}
@@ -265,6 +261,9 @@ post-install:
${RM} ${STAGEDIR}${PREFIX}/man/cat*/*
# final perm of sendmail is 2555 (see plist), needed for strip cmd
${CHMOD} 755 ${STAGEDIR}${PREFIX}/sbin/sendmail
+ ${RM} ${STAGEDIR}/etc/mail/submit.cf
+ ${RMDIR} ${STAGEDIR}/var/spool/clientmqueue
+
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vacation
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rmail
${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
Modified: head/mail/sendmail-devel/distinfo
==============================================================================
--- head/mail/sendmail/distinfo Wed Apr 3 22:15:18 2019 (r497774)
+++ head/mail/sendmail-devel/distinfo Thu Apr 4 08:33:27 2019 (r497812)
@@ -1,2 +1,3 @@
-SHA256 (sendmail.8.15.2.tar.gz) = 24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439
-SIZE (sendmail.8.15.2.tar.gz) = 2207417
+TIMESTAMP = 1553765712
+SHA256 (sendmail.8.16.0.41.tar.gz) = e01b73de900e419248a5ff0ab38b9dc4873847fba70e98e4ce994452936ffdc2
+SIZE (sendmail.8.16.0.41.tar.gz) = 2262860
Modified: head/mail/sendmail-devel/files/patch-Makefile.m4
==============================================================================
--- head/mail/sendmail/files/patch-Makefile.m4 Wed Apr 3 22:15:18 2019 (r497774)
+++ head/mail/sendmail-devel/files/patch-Makefile.m4 Thu Apr 4 08:33:27 2019 (r497812)
@@ -1,19 +1,10 @@
---- sendmail/Makefile.m4.orig 2015-06-19 12:59:29 UTC
+--- sendmail/Makefile.m4.orig 2019-02-15 10:30:19 UTC
+++ sendmail/Makefile.m4
-@@ -7,14 +7,14 @@ bldPRODUCT_START(`executable', `sendmail
+@@ -7,6 +7,7 @@ bldPRODUCT_START(`executable', `sendmail
define(`bldBIN_TYPE', `G')
define(`bldINSTALL_DIR', `')
- define(`bldSOURCES', `main.c alias.c arpadate.c bf.c collect.c conf.c control.c convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c macro.c map.c mci.c milter.c mime.c parseaddr.c queue.c ratectrl.c readcf.c recipient.c sasl.c savemail.c sfsasl.c shmticklib.c sm_resolve.c srvrsmtp.c stab.c stats.c sysexits.c timers.c tls.c trace.c udb.c usersmtp.c util.c version.c ')
+ define(`bldSOURCES', `main.c alias.c arpadate.c bf.c collect.c conf.c control.c convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c macro.c map.c mci.c milter.c mime.c parseaddr.c queue.c ratectrl.c readcf.c recipient.c sasl.c savemail.c sfsasl.c shmticklib.c sm_resolve.c srvrsmtp.c stab.c stats.c sysexits.c timers.c tlsh.c tls.c trace.c udb.c usersmtp.c util.c version.c ')
+APPENDDEF(`bldSOURCES',`blacklist.c ')
PREPENDDEF(`confENVDEF', `confMAPDEF')
bldPUSH_SMLIB(`sm')
bldPUSH_SMLIB(`smutil')
-
-
- dnl hack: /etc/mail is not defined as "location of .cf" in the build system
--define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP',
--`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl
-+define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP'))
- define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS',
- `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
- )dnl
Modified: head/mail/sendmail-devel/files/patch-cfhead.m4
==============================================================================
--- head/mail/sendmail/files/patch-cfhead.m4 Wed Apr 3 22:15:18 2019 (r497774)
+++ head/mail/sendmail-devel/files/patch-cfhead.m4 Thu Apr 4 08:33:27 2019 (r497812)
@@ -1,6 +1,6 @@
---- cf/m4/cfhead.m4.orig 2015-02-28 00:20:38 UTC
+--- cf/m4/cfhead.m4.orig 2019-02-15 10:30:19 UTC
+++ cf/m4/cfhead.m4
-@@ -269,7 +269,8 @@ define(`_REC_AUTH_', `$.$?{auth_type}(au
+@@ -278,7 +278,8 @@ define(`_REC_AUTH_', `$.$?{auth_type}(au
define(`_REC_FULL_AUTH_', `$.$?{auth_type}(user=${auth_authen} $?{auth_author}author=${auth_author} $.mech=${auth_type}')
define(`_REC_HDR_', `$?sfrom $s $.$?_($?s$|from $.$_)')
define(`_REC_END_', `for $u; $|;
Modified: head/mail/sendmail-devel/files/patch-readcf.c
==============================================================================
--- head/mail/sendmail/files/patch-readcf.c Wed Apr 3 22:15:18 2019 (r497774)
+++ head/mail/sendmail-devel/files/patch-readcf.c Thu Apr 4 08:33:27 2019 (r497812)
@@ -1,19 +1,19 @@
---- sendmail/readcf.c.orig 2015-06-17 16:51:58 UTC
+--- sendmail/readcf.c.orig 2019-02-15 10:30:19 UTC
+++ sendmail/readcf.c
-@@ -2910,6 +2910,10 @@ static struct optioninfo
+@@ -2988,6 +2988,10 @@ static struct optioninfo
+ { "ClientCACertPath", O_CLTCACERTPATH, OI_NONE },
#endif
- #define O_USECOMPRESSEDIPV6ADDRESSES 0xec
- { "UseCompressedIPv6Addresses", O_USECOMPRESSEDIPV6ADDRESSES, OI_NONE },
+
+#if USE_BLACKLIST
+# define O_BLACKLIST 0xf2
+ { "UseBlacklist", O_BLACKLIST, OI_NONE },
+#endif
-
{ NULL, '\0', OI_NONE }
};
-@@ -4540,6 +4544,12 @@ setoption(opt, val, safe, sticky, e)
- UseCompressedIPv6Addresses = atobool(val);
+
+@@ -4661,6 +4665,12 @@ setoption(opt, val, safe, sticky, e)
break;
+ #endif
+#if USE_BLACKLIST
+ case O_BLACKLIST:
Modified: head/mail/sendmail-devel/files/patch-sendmail.h
==============================================================================
--- head/mail/sendmail/files/patch-sendmail.h Wed Apr 3 22:15:18 2019 (r497774)
+++ head/mail/sendmail-devel/files/patch-sendmail.h Thu Apr 4 08:33:27 2019 (r497812)
@@ -1,6 +1,6 @@
---- sendmail/sendmail.h.orig 2015-06-19 12:59:29 UTC
+--- sendmail/sendmail.h.orig 2019-02-15 10:30:19 UTC
+++ sendmail/sendmail.h
-@@ -57,6 +57,10 @@ SM_UNUSED(static char SmailId[]) = "@(#)
+@@ -61,6 +61,10 @@ SM_UNUSED(static char SmailId[]) = "@(#)
#endif /* _DEFINE */
#include "bf.h"
@@ -11,9 +11,9 @@
#include "timers.h"
#include <sm/exc.h>
#include <sm/heap.h>
-@@ -2544,6 +2548,10 @@ EXTERN int ConnectionRateWindowSize;
- EXTERN bool SSLEngineInitialized;
- #endif /* STARTTLS && USE_OPENSSL_ENGINE */
+@@ -2513,6 +2517,10 @@ EXTERN int Hacks; /* bit field of run-ti
+
+ EXTERN int ConnectionRateWindowSize;
+#if USE_BLACKLIST
+EXTERN bool UseBlacklist;
Modified: head/mail/sendmail-devel/files/patch-srvrsmtp.c
==============================================================================
--- head/mail/sendmail/files/patch-srvrsmtp.c Wed Apr 3 22:15:18 2019 (r497774)
+++ head/mail/sendmail-devel/files/patch-srvrsmtp.c Thu Apr 4 08:33:27 2019 (r497812)
@@ -1,16 +1,16 @@
---- sendmail/srvrsmtp.c.orig 2015-03-18 11:47:12 UTC
+--- sendmail/srvrsmtp.c.orig 2019-02-15 10:30:19 UTC
+++ sendmail/srvrsmtp.c
-@@ -831,6 +831,9 @@ smtp(nullserver, d_flags, e)
+@@ -878,6 +878,9 @@ smtp(nullserver, d_flags, e)
#if _FFR_BADRCPT_SHUTDOWN
int n_badrcpts_adj;
- #endif /* _FFR_BADRCPT_SHUTDOWN */
+ #endif
+#ifdef USE_BLACKLIST
+ int saved_bl_fd;
+#endif
+ RESET_AUTH_FAIL_LOG_USER;
SevenBitInput_Saved = SevenBitInput;
- smtp.sm_nrcpts = 0;
-@@ -1328,6 +1331,7 @@ smtp(nullserver, d_flags, e)
+@@ -1377,6 +1380,7 @@ smtp(nullserver, d_flags, e)
(int) tp.tv_sec +
(tp.tv_usec >= 500000 ? 1 : 0)
);
@@ -18,7 +18,7 @@
}
}
}
-@@ -1421,6 +1425,10 @@ smtp(nullserver, d_flags, e)
+@@ -1479,6 +1483,10 @@ smtp(nullserver, d_flags, e)
SmtpPhase = "server cmd read";
sm_setproctitle(true, e, "server %s cmd read", CurSmtpClient);
@@ -29,19 +29,19 @@
/* handle errors */
if (sm_io_error(OutChannel) ||
(p = sfgets(inp, sizeof(inp), InChannel,
-@@ -1721,8 +1729,11 @@ smtp(nullserver, d_flags, e)
- }
- else
- {
-+ int fd;
- /* not SASL_OK or SASL_CONT */
- message("535 5.7.0 authentication failed");
-+ fd = sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL);
-+ BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, fd, "AUTH FAIL");
- if (LogLevel > 9)
- sm_syslog(LOG_WARNING, e->e_id,
- "AUTH failure (%s): %s (%d) %s, relay=%.100s",
-@@ -1867,6 +1878,9 @@ smtp(nullserver, d_flags, e)
+@@ -1792,8 +1800,11 @@ smtp(nullserver, d_flags, e)
+ #define LOGAUTHFAIL \
+ do \
+ { \
++ int fd; \
+ SET_AUTH_USER_CONDITIONALLY \
+ message("535 5.7.0 authentication failed"); \
++ fd = sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL); \
++ BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, fd, "AUTH FAIL"); \
+ if (LogLevel >= 9) \
+ sm_syslog(LOG_WARNING, e->e_id, \
+ "AUTH failure (%s): %s (%d) %s%s%.*s, relay=%.100s", \
+@@ -1943,6 +1954,9 @@ smtp(nullserver, d_flags, e)
DELAY_CONN("AUTH");
if (!sasl_ok || n_mechs <= 0)
{
@@ -51,7 +51,7 @@
message("503 5.3.3 AUTH not available");
break;
}
-@@ -3462,10 +3476,17 @@ doquit:
+@@ -3546,10 +3560,17 @@ doquit:
** timeouts for the same connection.
*/
@@ -69,7 +69,7 @@
if (tTd(93, 100))
{
/* return to handle next connection */
-@@ -3523,7 +3544,10 @@ doquit:
+@@ -3607,7 +3628,10 @@ doquit:
#if MAXBADCOMMANDS > 0
if (++n_badcmds > MAXBADCOMMANDS)
{
@@ -80,10 +80,10 @@
message("421 4.7.0 %s Too many bad commands; closing connection",
MyHostName);
-@@ -3575,6 +3599,9 @@ doquit:
+@@ -3659,6 +3683,9 @@ doquit:
#if SASL
}
- #endif /* SASL */
+ #endif
+#ifdef USE_BLACKLIST
+ close(saved_bl_fd);
+#endif
Modified: head/mail/sendmail-devel/files/site.config.m4.tls
==============================================================================
--- head/mail/sendmail/files/site.config.m4.tls Wed Apr 3 22:15:18 2019 (r497774)
+++ head/mail/sendmail-devel/files/site.config.m4.tls Thu Apr 4 08:33:27 2019 (r497812)
@@ -1,2 +1,2 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -D_FFR_TLS_EC')
+APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -DTLS_EC')
APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')
Modified: head/mail/sendmail-devel/files/smtputf8.patch
==============================================================================
--- head/mail/sendmail/files/smtputf8.patch Wed Apr 3 22:15:18 2019 (r497774)
+++ head/mail/sendmail-devel/files/smtputf8.patch Thu Apr 4 08:33:27 2019 (r497812)
@@ -355,8 +355,8 @@ index b2d0211..63a2378 100644
+#define MCIF_EAI 0x00000000 /* for MCIF_EXTENS */
+#endif /* _FFR_EAI */
--#define MCIF_EXTENS (MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT | MCIF_TLS | MCIF_AUTH2)
-+#define MCIF_EXTENS (MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT | MCIF_TLS | MCIF_AUTH2 | MCIF_EAI)
+-#define MCIF_EXTENS (MCIF_EXPN|MCIF_SIZE|MCIF_8BITMIME|MCIF_DSN|MCIF_8BITOK|MCIF_AUTH|MCIF_ENHSTAT|MCIF_PIPELINED|MCIF_VERB|MCIF_TLS|MCIF_DLVR_BY|MCIF_AUTH2)
++#define MCIF_EXTENS (MCIF_EXPN|MCIF_SIZE|MCIF_8BITMIME|MCIF_DSN|MCIF_8BITOK|MCIF_AUTH|MCIF_ENHSTAT|MCIF_PIPELINED|MCIF_VERB|MCIF_TLS|MCIF_DLVR_BY|MCIF_AUTH2|MCIF_EAI)
/* states */
#define MCIS_CLOSED 0 /* no traffic on this connection */
@@ -479,7 +479,7 @@ index b05348d..91e6956 100644
@@ -2523,6 +2563,10 @@ smtp(nullserver, d_flags, e)
if (SendMIMEErrors && bitset(SRV_OFFER_DSN, features))
message("250-DSN");
- #endif /* DSN */
+ #endif
+#if _FFR_EAI
+ if (bitset(SRV_OFFER_EAI, features))
+ message("250-SMTPUTF8");
More information about the svn-ports-head
mailing list