Date: Sat, 3 Jun 2023 14:12:19 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: 18fe59a2596c - main - mail/sendmail: Update to 8.17.2 Message-ID: <202306031412.353ECJQ4034625@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=18fe59a2596cab093f6285e7dca4897aa03717bf commit 18fe59a2596cab093f6285e7dca4897aa03717bf Author: Dirk Meyer <dinoex@FreeBSD.org> AuthorDate: 2023-06-03 14:12:06 +0000 Commit: Dirk Meyer <dinoex@FreeBSD.org> CommitDate: 2023-06-03 14:12:06 +0000 mail/sendmail: Update to 8.17.2 --- mail/sendmail/Makefile | 4 ++-- mail/sendmail/distinfo | 6 +++--- mail/sendmail/files/patch-Makefile.m4 | 4 ++-- mail/sendmail/files/patch-alias.c | 17 ----------------- mail/sendmail/files/patch-doc-op-Makefile | 4 ++-- mail/sendmail/files/patch-tls.c | 11 ----------- mail/sendmail/files/patch-zsasl2 | 21 --------------------- 7 files changed, 9 insertions(+), 58 deletions(-) diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 0cbd01b918eb..0d373ee63e59 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,6 +1,6 @@ PORTNAME= sendmail -PORTVERSION= 8.17.1 -PORTREVISION= 7 +PORTVERSION= 8.17.2 +PORTREVISION= 0 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ DISTNAME= ${PORTNAME}.${PORTVERSION} diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo index cc56819d26a9..712e3b995c2e 100644 --- a/mail/sendmail/distinfo +++ b/mail/sendmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629273011 -SHA256 (sendmail.8.17.1.tar.gz) = 04bc76b6c886e6d111be7fd8daa32b8ce00128a288b6b52e067bc29f3854a6e6 -SIZE (sendmail.8.17.1.tar.gz) = 2284027 +TIMESTAMP = 1685791197 +SHA256 (sendmail.8.17.2.tar.gz) = 90f5ae74c35a84808861933ba094201b901b70c6b2903684dcf39bdae8a5a1a2 +SIZE (sendmail.8.17.2.tar.gz) = 2313458 diff --git a/mail/sendmail/files/patch-Makefile.m4 b/mail/sendmail/files/patch-Makefile.m4 index 7f14fa5534f9..e0fe7f6b64da 100644 --- a/mail/sendmail/files/patch-Makefile.m4 +++ b/mail/sendmail/files/patch-Makefile.m4 @@ -1,9 +1,9 @@ ---- sendmail/Makefile.m4.orig 2020-06-08 08:35:03 UTC +--- sendmail/Makefile.m4.orig 2023-02-09 18:24:38 UTC +++ sendmail/Makefile.m4 @@ -7,14 +7,14 @@ 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 tlsh.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 sched.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') diff --git a/mail/sendmail/files/patch-alias.c b/mail/sendmail/files/patch-alias.c deleted file mode 100644 index 7f4a9a1f3dfd..000000000000 --- a/mail/sendmail/files/patch-alias.c +++ /dev/null @@ -1,17 +0,0 @@ ---- sendmail/alias.c.orig 2021-06-09 08:27:53 UTC -+++ sendmail/alias.c -@@ -817,10 +817,13 @@ readaliases(map, af, announcestats, logstats) - (void) sm_io_ungetc(af, SM_TIME_DEFAULT, c); - if (c != ' ' && c != '\t') - break; -+#if _FFR_8BITENVADDR -+ syserr("554 5.3.5 Continuation line currently not supported for USE_EAI nor _FFR_EIGHT_BIT_ADDR_OK"); -+#endif - - /* read continuation line */ - if (sm_io_fgets(af, SM_TIME_DEFAULT, p, -- sizeof(line) - (p-line)) < 0) -+ sizeof(lbuf) - (p-line)) < 0) - break; - LineNumber++; - diff --git a/mail/sendmail/files/patch-doc-op-Makefile b/mail/sendmail/files/patch-doc-op-Makefile index 1e75f91c0c09..0bbc747360eb 100644 --- a/mail/sendmail/files/patch-doc-op-Makefile +++ b/mail/sendmail/files/patch-doc-op-Makefile @@ -1,4 +1,4 @@ ---- doc/op/Makefile.orig 2014-03-05 00:59:45 UTC +--- doc/op/Makefile.orig 2023-02-09 18:24:38 UTC +++ doc/op/Makefile @@ -12,7 +12,7 @@ PS2PDF_CMD= ps2pdf PIC= ${PIC_CMD} -C @@ -6,6 +6,6 @@ EQNPS= ${EQN_CMD} -C -Tps -ROFFASCII= ${ROFF_CMD} -Tascii ${MACROS} +ROFFASCII= ${ROFF_CMD} -P-c -Tascii ${MACROS} + ROFFNOSGR= GROFF_NO_SGR=1 ${ROFFASCII} ROFFPS= ${ROFF_CMD} -Tps -mps ${MACROS} ULASCII= ${UL_CMD} -t dumb - PS2PDF= ${PS2PDF_CMD} diff --git a/mail/sendmail/files/patch-tls.c b/mail/sendmail/files/patch-tls.c deleted file mode 100644 index a69a34e004f8..000000000000 --- a/mail/sendmail/files/patch-tls.c +++ /dev/null @@ -1,11 +0,0 @@ ---- sendmail/tls.c.orig 2021-07-14 05:34:51 UTC -+++ sendmail/tls.c -@@ -35,7 +35,7 @@ SM_RCSID("@(#)$Id: tls.c,v 8.127 2013-11-27 02:51:11 g - ** LibreSSL 2.0 (0x20000000L - part of "These will never change") - */ - --# if (OPENSSL_VERSION_NUMBER >= 0x10100000L && OPENSSL_VERSION_NUMBER < 0x20000000L) || OPENSSL_VERSION_NUMBER >= 0x30000000L -+# if (OPENSSL_VERSION_NUMBER >= 0x10100000L && OPENSSL_VERSION_NUMBER < 0x20000000L) || OPENSSL_VERSION_NUMBER >= 0x30000000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL) - # define MTA_HAVE_DH_set0_pqg 1 - # define MTA_HAVE_DSA_GENERATE_EX 1 - diff --git a/mail/sendmail/files/patch-zsasl2 b/mail/sendmail/files/patch-zsasl2 deleted file mode 100644 index 2701fc3499cd..000000000000 --- a/mail/sendmail/files/patch-zsasl2 +++ /dev/null @@ -1,21 +0,0 @@ ---- sendmail/sendmail.h.orig 2022-04-19 21:07:42 UTC -+++ sendmail/sendmail.h -@@ -760,7 +760,7 @@ extern bool filesys_free __P((long)); - # define SASL_IS_AUTH 2 /* authenticated */ - - /* SASL options */ --# define SASL_AUTH_AUTH 0x1000 /* use auth= only if authenticated */ -+# define SASL_AUTH_AUTH 0x10000 /* use auth= only if authenticated */ - # if SASL >= 20101 - # define SASL_SEC_MASK SASL_SEC_MAXIMUM /* mask for SASL_SEC_* values: sasl.h */ - # else /* SASL >= 20101 */ -@@ -775,6 +775,9 @@ extern bool filesys_free __P((long)); - # endif /* SASL_SEC_NOPLAINTEXT & SASL_SEC_MASK) == 0 ... */ - # endif /* SASL >= 20101 */ - # define MAXOUTLEN 8192 /* length of output buffer, should be 2^n */ -+# if (SASL_AUTH_AUTH & SASL_SEC_MASK) != 0 -+# ERROR "change SASL_AUTH_AUTH notify sendmail.org!" -+# endif - - /* functions */ - extern char *intersect __P((char *, char *, SM_RPOOL_T *));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306031412.353ECJQ4034625>