Date: Wed, 15 Feb 2023 06:50:49 GMT From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1e8f2fb060fd - main - mail/exim: actually fix the bug in code (+) Message-ID: <202302150650.31F6onlE055376@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e8f2fb060fd95cb87b392d29919da2e7cf283ee commit 1e8f2fb060fd95cb87b392d29919da2e7cf283ee Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2023-02-15 06:48:40 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2023-02-15 06:48:40 +0000 mail/exim: actually fix the bug in code (+) The comment prior to smtp_printf() implementation says that the extra BOOL argument tells whether "further is data expected". Looking at other invocations of it, including those for error 451, it should be FALSE here. --- mail/exim/Makefile | 3 --- mail/exim/files/extra-patch-Local-sa-exim.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 9b628a088d3d..2242ff7608fa 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -21,9 +21,6 @@ USES= compiler cpe tar:bzip2 perl5 USE_CSTD= c99 USE_PERL5= run -# LLVM15 workaround -CFLAGS= -Wno-int-conversion - # Exim build system is job unsafe atm MAKE_JOBS_UNSAFE= yes # One can tune the following "hidden" knobs: diff --git a/mail/exim/files/extra-patch-Local-sa-exim.c b/mail/exim/files/extra-patch-Local-sa-exim.c index 103027b1f44d..b3343e3c5e26 100644 --- a/mail/exim/files/extra-patch-Local-sa-exim.c +++ b/mail/exim/files/extra-patch-Local-sa-exim.c @@ -193,7 +193,7 @@ - str=string_sprintf(string_sprintf("451- %s\r\n",SAmsgteergrubewait), spamstatus); - fprintf(smtp_out, str); - ret=fflush(smtp_out); -+ smtp_printf("451-%s\r\n", teergrubewaitstr); ++ smtp_printf("451-%s\r\n", FALSE, teergrubewaitstr); + ret=smtp_fflush(); if (ret != 0) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302150650.31F6onlE055376>