From nobody Wed Feb 15 06:50:49 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PGpcn3xdCz3rNm7; Wed, 15 Feb 2023 06:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PGpcn3Vgcz3jmY; Wed, 15 Feb 2023 06:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676443849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=20fkJ1GvycWvAjY0y6f/InR22tnJ32qbZ8CHbkLOGk4=; b=V/BXYwWh2295x0Y8peEmeSKwacXpcLKLzRAe0Uu5w5I0YC4DiM4GHtJwjyTlTDJ3mIsv2Z s5JwPYfF6XhykcQWCwQ4AKGsMMQKX5EEcEykJX40SGm7FF14C+1NC3twOhTJ7bOyUGhnuU LDhDvbt+yWyJCmN3NDA0RSDCV0ounCKUPaxLBi/UUwSD1jqs3fbb4Z+83rpCSxlFGxAw4n Ss4ptEEZRTNY5BHO7J1TcvNLFMRIMEXBqZbdaWgsYnkGAWwRsh8wP7a0KQfEWpP/24C1rr /eDuXzJ+IjTTCOBylDwjVWA7bOeWVJUIeA1Q3e8MVFtwol75VQPd06oCD1JnHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676443849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=20fkJ1GvycWvAjY0y6f/InR22tnJ32qbZ8CHbkLOGk4=; b=E9aMw3Ur9SFnxMuJDeYm1eWydPXy0nXQn2M4Xn5GjAhexXgfI6CAiofG3+MjsP4GJvw/vi 8zD0ADgyxv8SjRGNEYVZ/nycw9ZwG7Vy33yJGy1kMoPAbzec7mh4VafT1KsGj1YvAltOZx iZeogYYyZSfsxokv0ZYAy863WeiyCCIxDMqEpTn4AkIhtQm6t/juhkndjOb/ER2Gjj21KC 6f4IwZBQXdXBBdK7VCNAFQJhd6zZCGTnfZsHkKUDFiRMs9V/f0VKhqNgpqUkYA9fJRz3KA y/gfeeIyTXrvoCYeengo6FcaLaYwG4fd3C7HA28OqhudSrIMS4UO9/u5q/AHZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676443849; a=rsa-sha256; cv=none; b=PrcnnsxGi1e/IasMEjQTUGOiT06+y7DqWq9Q8Lp6brk4rOYUw68DPVTV/+YUkXXhr1foh2 3d9WaqBKq19Kf902440ie2QkWAJkYjPOFbP0uIBPncuR3qKWp55sRQ0G3e1q0niwKgEiIx qY4vLTWXmnbLC66AkEL+5tUOCk4Msg+YhpbFZlDv+t04lOeAWqwof5shRrS8PONyaMZ6bG G2fhrFk4Twem68RNf42IcgE7NAI89KSjIqvFhxcSi974P69SfXq2oiOvERTgox63MkqSWh OqqdgEBxddd2sPPu0gZPS6FwCRmD8cNIhUc52LsPB6Wx2WqZFDfwKnCjspPaqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PGpcn2YgMzF3y; Wed, 15 Feb 2023 06:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31F6onPL055377; Wed, 15 Feb 2023 06:50:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31F6onlE055376; Wed, 15 Feb 2023 06:50:49 GMT (envelope-from git) Date: Wed, 15 Feb 2023 06:50:49 GMT Message-Id: <202302150650.31F6onlE055376@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 1e8f2fb060fd - main - mail/exim: actually fix the bug in code (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e8f2fb060fd95cb87b392d29919da2e7cf283ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e8f2fb060fd95cb87b392d29919da2e7cf283ee commit 1e8f2fb060fd95cb87b392d29919da2e7cf283ee Author: Alexey Dokuchaev AuthorDate: 2023-02-15 06:48:40 +0000 Commit: Dima Panov 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) {