From nobody Wed Feb 15 02:25:40 2023
X-Original-To: dev-commits-ports-all@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 4PGhks1CnQz3qbcb;
Wed, 15 Feb 2023 02:25:41 +0000 (UTC)
(envelope-from danfe@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84])
(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 "freefall.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4PGhks0lv8z4kt8;
Wed, 15 Feb 2023 02:25:41 +0000 (UTC)
(envelope-from danfe@freebsd.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1676427941;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=Nt46yPYHUbVr/nzKQK4Y7FwpDIftvig+6gBmzZXAfk8=;
b=GmJlBt+jJrU+63wFssG+r2P+eUSR1JH7gRbzcEU2VM2BHJUJ5WDc/G6YY36EgN2DmARB54
Y45AgXk4dZ7jQBls3xXwnfZ/Rx/5KuGhXVVOBUif7fAhthNpW0QAGUZZSTmiPMnKHtykVy
wQdS9jGeY93tezZ4Nfnm3D4seVMXhOeOK+2Ziq/bjZJ5GSN9YzvEQKaugL+FoyyHGtvCxD
/IZ3iwi1iRw8nYaF6Pj2WRc9BzFJ03BOdy/WGhA+0HQyEbD2AfTkXqJYMhsC1o+CeurKPc
71goRMJJXV6ruluITdJACWg6K0Y+146wPURt8ZbDjnQJBJsM8S8FO/KAXBu2aQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1676427941;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=Nt46yPYHUbVr/nzKQK4Y7FwpDIftvig+6gBmzZXAfk8=;
b=xEsMLzYQu0Evd4v3eDsk2TQEywpJklfgzmbHouGRg9E1SzRdpqIHx9nx6xJATcZgFISwf7
eDA4+NN2oEaKxoJP7h+Ayi/ZtesqU1DCYF12APxZi3FuFWFRA2m3OgkLG4thcEvhiBe4HD
jLl1ZxJ4Q+N0jSgZg2f6K/GdI0m0kgu81IcEPTEdR1ngYj7wlrPMRBgX+A210hKSU59kqc
gWf+kZokMexu7BOgV6x89wUQuJs2WZGNAcmH7L8AHrY2ivSE2TU2IKOPghIogcppyNQ56D
pduSkdwT85qjASFfALAloHGYcK+sW0DXjl0ihXc8un2mHF+IiwPy/AXW4lDb1g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676427941; a=rsa-sha256; cv=none;
b=b51szHzzbRNBE6wHOffZEgCkgavuizXn3Q/tU9Y16VFilOkgSX9IGM6VMONZV0QNhzOXW0
mdShvOmXr+vy2QAt3gdDiPoHdNdrEYwKa8DppeXAaQOLQ+F3urqeN4Wu4iq8B+eYs3/l70
shT3c25nnL+4R6+PaNqeCN4sJGevBj1R9ntOhhkOAxMvMtsh1mh3Q66bHizV52YJpkU/Rr
fKwNN/tAL3C06hZWhnLN8+aOxkQBXjjqdedrVeaSHnDqienIRw1nv3ilq/dVnFCHhZzD79
TWQplp4DAJNjsjg/9z7ktmp6IVe50GBs9AMiKpyTUVnaM1aNfW4w5+gFlU7fSg==
Received: by freefall.freebsd.org (Postfix, from userid 1033)
id EE05C1E630; Wed, 15 Feb 2023 02:25:40 +0000 (UTC)
Date: Wed, 15 Feb 2023 02:25:40 +0000
From: Alexey Dokuchaev <danfe@freebsd.org>
To: Dima Panov <fluffy@freebsd.org>
Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org,
dev-commits-ports-main@freebsd.org
Subject: Re: git: 80ef111f0369 - main - mail/exim: unbreak build with LLVM15
(+)
Message-ID: <Y+xCpOPXNTC2AMOe@FreeBSD.org>
References: <202302141143.31EBhsW8014115@gitrepo.freebsd.org>
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-all@freebsd.org
X-BeenThere: dev-commits-ports-all@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <202302141143.31EBhsW8014115@gitrepo.freebsd.org>
X-ThisMailContainsUnwantedMimeParts: N
On Tue, Feb 14, 2023 at 11:43:54AM +0000, Dima Panov wrote:
> commit 80ef111f0369fb10e3a890613460fe45cb1a97ba
>
> mail/exim: unbreak build with LLVM15 (+)
>
> Pass -Wno-int-conversion to CFLAGS fixes error with strict
> conversion rules introduced in LLVM15
>
> error: incompatible pointer to integer conversion passing
> 'char *' to parameter of type 'BOOL' (aka 'unsigned int')
> [-Wint-conversion]
There's actually bug in the 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.
Consider the following change:
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)
{
./danfe