Received: (at 68541) by debbugs.gnu.org; 17 Jan 2024 23:47:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Jan 17 18:47:38 2024
Received: from localhost ([127.0.0.1]:53963 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rQFdB-0000mU-PI
for submit <at> debbugs.gnu.org; Wed, 17 Jan 2024 18:47:38 -0500
Received: from out2-smtp.messagingengine.com ([66.111.4.26]:39047)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <clement@HIDDEN>) id 1rQFd9-0000lq-C5
for 68541 <at> debbugs.gnu.org; Wed, 17 Jan 2024 18:47:36 -0500
Received: from compute7.internal (compute7.nyi.internal [10.202.2.48])
by mailout.nyi.internal (Postfix) with ESMTP id EC1D65C01D8;
Wed, 17 Jan 2024 18:47:28 -0500 (EST)
Received: from mailfrontend1 ([10.202.2.162])
by compute7.internal (MEProxy); Wed, 17 Jan 2024 18:47:28 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lassieur.org; h=
cc:cc:content-transfer-encoding:content-type:content-type:date
:date:from:from:in-reply-to:in-reply-to:message-id:mime-version
:references:reply-to:subject:subject:to:to; s=fm2; t=1705535248;
x=1705621648; bh=x5/BD0C67hWDfPG7KJ4yd1gjUDnmSu77G3yPkzfcMw4=; b=
PAN1gAUYDISVP9exDes5Csb/H8WN2kK2HarEcVOajr2Gu75VRC4ErmVEH3M+80/A
qZP6FpH3AkeowiUW5rSw94F3kWiCCxOo/XzqL5ugOPBNk58k1GRiHd7q3iqMjwuC
t7rXRL0hfH0j2/3q+bThFYoyfCLZwNB1yfvapRa4v7/0exo0kpNsKON4LuBLE7WH
ROBLSgAYZ2tSyVcd+RiXD1nR/IVbdU9sJSg7/o5KHXkjDlWdonuv3OLxGHrxhevt
By/iXaHnUFvEJmT9iy4pXKH8Dx8Gz0fz0oStBL8EFe51Yx7L+kdE6akox4c+tTED
nF5qD/WSR1uzj9DbEt1Jgg==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:cc:content-transfer-encoding
:content-type:content-type:date:date:feedback-id:feedback-id
:from:from:in-reply-to:in-reply-to:message-id:mime-version
:references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy
:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1705535248; x=
1705621648; bh=x5/BD0C67hWDfPG7KJ4yd1gjUDnmSu77G3yPkzfcMw4=; b=i
m+GRxVPdSFIiiDIsjr5LHqbMiWYunpXfaK3QVpkR7lzBKjgnlD3R/YtokTCs/1l/
sFWhclZieDTxgkz8KTV0VEFiQo9gGMelL0AB7QgAj3zdQ+VfuJVql9Spw0fGA+Lr
S55t9HsjA2usdZBfFtQeUykINbt9JvSAF4snXT99Te8TFuRlUSjZ07RnV+ucScri
ffuXSH7XlOLowb1oiBlJoVuYRxmCsvPVDJnn+m3m+jyNCeMeBQVBu5D7fUcb/urM
T3U+b01+A8GVYTjI+N5EIG9Ps14z3qsv7IFRKMYWataNz0q9LDae3xLbNJ5M7rof
5DXLOQYsXKtTKrFHIyz+g==
X-ME-Sender: <xms:EGeoZRFrvx6FXbRPAAQOMsQ9oW4ivCpVOFqBZ_T6WBzBivKdrSPBEw>
<xme:EGeoZWX4U8vT4Gp1bAWFViVFmIHMAh4uiuxaEcDuMM-QyV2icnjAyEQ-bIvRLl9Xq
ReoW96P5jZsmL6LXHw>
X-ME-Received: <xmr:EGeoZTLZZ44dntzxNyKXEiu3G_BWXlQyywh6vaokk5F8R2WKAhKZsw>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejiedgudduucetufdoteggodetrfdotf
fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
cujfgurhephffvvefujghffffkfgggtgfgsehtqhertddtreejnecuhfhrohhmpeevlhor
mhgvnhhtucfnrghsshhivghurhcuoegtlhgvmhgvnhhtsehlrghsshhivghurhdrohhrgh
eqnecuggftrfgrthhtvghrnhepgfetgeffvedvkeekueeiuddvhfethfejtefhtdefkeei
leffgfdtjeehteetieegnecuffhomhgrihhnpeguohhvvggtohhtrdhorhhgpdguvggsih
grnhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr
ohhmpegtlhgvmhgvnhhtsehlrghsshhivghurhdrohhrgh
X-ME-Proxy: <xmx:EGeoZXHSVcrFUXNv1fYEAjvc55JFFvcFMXWFv18hKWrpsUpijab_SQ>
<xmx:EGeoZXXkC3yrW3qtYW0MSxUHlDpf_6vdgtnOcpynjEhuaCqbeGZGbg>
<xmx:EGeoZSMAFBMITENEL1BWVypclNEa6ryCaxYxNwUoaMUxcPOuxKVXVg>
<xmx:EGeoZedacBdG5ZTcOFWuFPlgl7dxKB-CvxFitHIDXs9daLkVE9WBGw>
Feedback-ID: i4c21472a:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed,
17 Jan 2024 18:47:27 -0500 (EST)
From: =?utf-8?Q?Cl=C3=A9ment_Lassieur?= <clement@HIDDEN>
To: Herman Rimm via Guix-patches via <guix-patches@HIDDEN>
Subject: Re: [bug#68541] [PATCH 2/2] gnu: dovecot: Apply guix style.
In-Reply-To: <8961185a443ea28a4a26c545a334a2ebd5dcbf40.1705512974.git.herman@HIDDEN>
(Herman Rimm via Guix-patches via's message of "Wed, 17 Jan 2024
18:50:11 +0100")
References: <a88bf4bb9a0e756fe8b2f08d4c48ee8bcbb6235d.1705512974.git.herman@HIDDEN>
<8961185a443ea28a4a26c545a334a2ebd5dcbf40.1705512974.git.herman@HIDDEN>
Date: Thu, 18 Jan 2024 00:47:23 +0100
Message-ID: <87h6jbiktw.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 68541
Cc: 68541 <at> debbugs.gnu.org, Herman Rimm <herman@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
On Wed, Jan 17 2024, Herman Rimm via Guix-patches via wrote:
> * gnu/packages/mail.scm (dovecot): Apply guix style.
>
> Change-Id: I2f50fa15ccbd2391be1f6f12e13e62aff707c54a
> ---
> gnu/packages/mail.scm | 88 +++++++++++++++++++++++--------------------
> 1 file changed, 47 insertions(+), 41 deletions(-)
Hi, "guix style" is not perfect, and in this case the previous style
was, I believe, way better. I think it's meant to help people automate
some stuff, but not to reformat the whole source tree.
Thanks! And sorry :)
Cl=C3=A9ment
> diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
> index b522943294..5bbe4ca7ea 100644
> --- a/gnu/packages/mail.scm
> +++ b/gnu/packages/mail.scm
> @@ -2011,57 +2011,63 @@ (define-public dovecot
> (origin
> (method url-fetch)
> (uri (string-append "https://www.dovecot.org/releases/"
> - (version-major+minor version) "/"
> - "dovecot-" version ".tar.gz"))
> + (version-major+minor version)
> + "/"
> + "dovecot-"
> + version
> + ".tar.gz"))
This is not readable :/
> (sha256
> (base32 "0bah6rn5ihczai8q50p6pqxwj73j21smib89ycp7q8qwly9i1c85"))
> - (patches
> - (search-patches "dovecot-bootstrap-cross-compile.patch"
> - "dovecot-opensslv3.patch"))
> + (patches (search-patches "dovecot-bootstrap-cross-compile.patch"
> + "dovecot-opensslv3.patch"))
> (modules '((guix build utils)))
> (snippet '(delete-file "configure"))))
> (build-system gnu-build-system)
> - (native-inputs
> - (list autoconf automake gettext-minimal libtool pkg-config))
> - (inputs
> - (list bzip2
> - icu4c
> - libsodium ; extra password algorithms
> - libstemmer
> - libunwind
> - linux-pam
> - lz4
> - openssl
> - sqlite
> - zlib
> - `(,zstd "lib")))
> + (native-inputs (list autoconf automake gettext-minimal libtool pkg-c=
onfig))
> + (inputs (list bzip2
> + icu4c
> + libsodium ;extra password algorithms
> + libstemmer
> + libunwind
> + linux-pam
> + lz4
> + openssl
> + sqlite
> + zlib
> + `(,zstd "lib")))
> (arguments
> - `(#:configure-flags '("--sysconfdir=3D/etc"
> - "--localstatedir=3D/var"
> - "--with-sqlite") ; not auto-detected
> + `(#:configure-flags '("--sysconfdir=3D/etc" "--localstatedir=3D/var"
> + "--with-sqlite") ;not auto-detected
> ;; The -rdynamic linker flag is needed for the backtrace() functi=
on to
> ;; have symbol names rather than just addresses. Dovecot's tests=
rely
> ;; on this, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=
=3D962630.
> #:make-flags (list "LDFLAGS=3D-rdynamic")
> - #:phases
> - (modify-phases %standard-phases
> - (add-after 'unpack 'patch-file-names
> - (lambda _
> - (substitute* "src/lib-program-client/test-program-client-lo=
cal.c"
> - (("(/bin/| )cat") (which "cat"))
> - (("/bin/echo") (which "echo"))
> - (("/bin/false") (which "false"))
> - (("/bin/sh") (which "bash"))
> - (("head") (which "head"))
> - (("sleep") (which "sleep")))
> - (substitute* (list "src/lib-smtp/test-bin/sendmail-exit-1.s=
h"
> - "src/lib-smtp/test-bin/sendmail-success.=
sh")
> - (("cat") (which "cat")))))
> - (replace 'install
> - (lambda* (#:key make-flags #:allow-other-keys)
> - ;; Simple hack to avoid installing a trivial README in /etc.
> - (apply invoke "make" "install" "sysconfdir=3D/tmp/bogus"
> - make-flags))))))
> + #:phases (modify-phases %standard-phases
> + (add-after 'unpack 'patch-file-names
> + (lambda _
> + (substitute* "src/lib-program-client/test-program-=
client-local.c"
> + (("(/bin/| )cat")
> + (which "cat"))
> + (("/bin/echo")
> + (which "echo"))
> + (("/bin/false")
> + (which "false"))
> + (("/bin/sh")
> + (which "bash"))
> + (("head")
> + (which "head"))
> + (("sleep")
> + (which "sleep")))
Same here, the previous version was more readable.
> + (substitute* (list
> + "src/lib-smtp/test-bin/sendmail-exit=
-1.sh"
> + "src/lib-smtp/test-bin/sendmail-succ=
ess.sh")
> + (("cat")
> + (which "cat")))))
> + (replace 'install
> + (lambda* (#:key make-flags #:allow-other-keys)
> + ;; Simple hack to avoid installing a trivial READM=
E in /etc.
> + (apply invoke "make" "install" "sysconfdir=3D/tmp/=
bogus"
> + make-flags))))))
> (home-page "https://www.dovecot.org")
> (synopsis "Secure POP3/IMAP server")
> (description
guix-patches@HIDDEN:bug#68541; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 17 Jan 2024 23:47:42 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Jan 17 18:47:42 2024
Received: from localhost ([127.0.0.1]:53968 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rQFdF-0000n2-Hn
for submit <at> debbugs.gnu.org; Wed, 17 Jan 2024 18:47:42 -0500
Received: from lists.gnu.org ([2001:470:142::17]:44538)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <clement@HIDDEN>) id 1rQFdE-0000m6-7F
for submit <at> debbugs.gnu.org; Wed, 17 Jan 2024 18:47:40 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <clement@HIDDEN>)
id 1rQFd7-0000pV-4z
for guix-patches@HIDDEN; Wed, 17 Jan 2024 18:47:33 -0500
Received: from out2-smtp.messagingengine.com ([66.111.4.26])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <clement@HIDDEN>)
id 1rQFd5-0000NB-0K
for guix-patches@HIDDEN; Wed, 17 Jan 2024 18:47:32 -0500
Received: from compute7.internal (compute7.nyi.internal [10.202.2.48])
by mailout.nyi.internal (Postfix) with ESMTP id EC1D65C01D8;
Wed, 17 Jan 2024 18:47:28 -0500 (EST)
Received: from mailfrontend1 ([10.202.2.162])
by compute7.internal (MEProxy); Wed, 17 Jan 2024 18:47:28 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lassieur.org; h=
cc:cc:content-transfer-encoding:content-type:content-type:date
:date:from:from:in-reply-to:in-reply-to:message-id:mime-version
:references:reply-to:subject:subject:to:to; s=fm2; t=1705535248;
x=1705621648; bh=x5/BD0C67hWDfPG7KJ4yd1gjUDnmSu77G3yPkzfcMw4=; b=
PAN1gAUYDISVP9exDes5Csb/H8WN2kK2HarEcVOajr2Gu75VRC4ErmVEH3M+80/A
qZP6FpH3AkeowiUW5rSw94F3kWiCCxOo/XzqL5ugOPBNk58k1GRiHd7q3iqMjwuC
t7rXRL0hfH0j2/3q+bThFYoyfCLZwNB1yfvapRa4v7/0exo0kpNsKON4LuBLE7WH
ROBLSgAYZ2tSyVcd+RiXD1nR/IVbdU9sJSg7/o5KHXkjDlWdonuv3OLxGHrxhevt
By/iXaHnUFvEJmT9iy4pXKH8Dx8Gz0fz0oStBL8EFe51Yx7L+kdE6akox4c+tTED
nF5qD/WSR1uzj9DbEt1Jgg==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:cc:content-transfer-encoding
:content-type:content-type:date:date:feedback-id:feedback-id
:from:from:in-reply-to:in-reply-to:message-id:mime-version
:references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy
:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1705535248; x=
1705621648; bh=x5/BD0C67hWDfPG7KJ4yd1gjUDnmSu77G3yPkzfcMw4=; b=i
m+GRxVPdSFIiiDIsjr5LHqbMiWYunpXfaK3QVpkR7lzBKjgnlD3R/YtokTCs/1l/
sFWhclZieDTxgkz8KTV0VEFiQo9gGMelL0AB7QgAj3zdQ+VfuJVql9Spw0fGA+Lr
S55t9HsjA2usdZBfFtQeUykINbt9JvSAF4snXT99Te8TFuRlUSjZ07RnV+ucScri
ffuXSH7XlOLowb1oiBlJoVuYRxmCsvPVDJnn+m3m+jyNCeMeBQVBu5D7fUcb/urM
T3U+b01+A8GVYTjI+N5EIG9Ps14z3qsv7IFRKMYWataNz0q9LDae3xLbNJ5M7rof
5DXLOQYsXKtTKrFHIyz+g==
X-ME-Sender: <xms:EGeoZRFrvx6FXbRPAAQOMsQ9oW4ivCpVOFqBZ_T6WBzBivKdrSPBEw>
<xme:EGeoZWX4U8vT4Gp1bAWFViVFmIHMAh4uiuxaEcDuMM-QyV2icnjAyEQ-bIvRLl9Xq
ReoW96P5jZsmL6LXHw>
X-ME-Received: <xmr:EGeoZTLZZ44dntzxNyKXEiu3G_BWXlQyywh6vaokk5F8R2WKAhKZsw>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejiedgudduucetufdoteggodetrfdotf
fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
cujfgurhephffvvefujghffffkfgggtgfgsehtqhertddtreejnecuhfhrohhmpeevlhor
mhgvnhhtucfnrghsshhivghurhcuoegtlhgvmhgvnhhtsehlrghsshhivghurhdrohhrgh
eqnecuggftrfgrthhtvghrnhepgfetgeffvedvkeekueeiuddvhfethfejtefhtdefkeei
leffgfdtjeehteetieegnecuffhomhgrihhnpeguohhvvggtohhtrdhorhhgpdguvggsih
grnhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr
ohhmpegtlhgvmhgvnhhtsehlrghsshhivghurhdrohhrgh
X-ME-Proxy: <xmx:EGeoZXHSVcrFUXNv1fYEAjvc55JFFvcFMXWFv18hKWrpsUpijab_SQ>
<xmx:EGeoZXXkC3yrW3qtYW0MSxUHlDpf_6vdgtnOcpynjEhuaCqbeGZGbg>
<xmx:EGeoZSMAFBMITENEL1BWVypclNEa6ryCaxYxNwUoaMUxcPOuxKVXVg>
<xmx:EGeoZedacBdG5ZTcOFWuFPlgl7dxKB-CvxFitHIDXs9daLkVE9WBGw>
Feedback-ID: i4c21472a:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed,
17 Jan 2024 18:47:27 -0500 (EST)
From: =?utf-8?Q?Cl=C3=A9ment_Lassieur?= <clement@HIDDEN>
To: Herman Rimm via Guix-patches via <guix-patches@HIDDEN>
Subject: Re: [bug#68541] [PATCH 2/2] gnu: dovecot: Apply guix style.
In-Reply-To: <8961185a443ea28a4a26c545a334a2ebd5dcbf40.1705512974.git.herman@HIDDEN>
(Herman Rimm via Guix-patches via's message of "Wed, 17 Jan 2024
18:50:11 +0100")
References: <a88bf4bb9a0e756fe8b2f08d4c48ee8bcbb6235d.1705512974.git.herman@HIDDEN>
<8961185a443ea28a4a26c545a334a2ebd5dcbf40.1705512974.git.herman@HIDDEN>
Date: Thu, 18 Jan 2024 00:47:23 +0100
Message-ID: <87h6jbiktw.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass client-ip=66.111.4.26; envelope-from=clement@HIDDEN;
helo=out2-smtp.messagingengine.com
X-Spam_score_int: -27
X-Spam_score: -2.8
X-Spam_bar: --
X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001,
SPF_HELO_PASS=-0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.6 (/)
X-Debbugs-Envelope-To: submit
Cc: 68541 <at> debbugs.gnu.org, Herman Rimm <herman@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.4 (/)
On Wed, Jan 17 2024, Herman Rimm via Guix-patches via wrote:
> * gnu/packages/mail.scm (dovecot): Apply guix style.
>
> Change-Id: I2f50fa15ccbd2391be1f6f12e13e62aff707c54a
> ---
> gnu/packages/mail.scm | 88 +++++++++++++++++++++++--------------------
> 1 file changed, 47 insertions(+), 41 deletions(-)
Hi, "guix style" is not perfect, and in this case the previous style
was, I believe, way better. I think it's meant to help people automate
some stuff, but not to reformat the whole source tree.
Thanks! And sorry :)
Cl=C3=A9ment
> diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
> index b522943294..5bbe4ca7ea 100644
> --- a/gnu/packages/mail.scm
> +++ b/gnu/packages/mail.scm
> @@ -2011,57 +2011,63 @@ (define-public dovecot
> (origin
> (method url-fetch)
> (uri (string-append "https://www.dovecot.org/releases/"
> - (version-major+minor version) "/"
> - "dovecot-" version ".tar.gz"))
> + (version-major+minor version)
> + "/"
> + "dovecot-"
> + version
> + ".tar.gz"))
This is not readable :/
> (sha256
> (base32 "0bah6rn5ihczai8q50p6pqxwj73j21smib89ycp7q8qwly9i1c85"))
> - (patches
> - (search-patches "dovecot-bootstrap-cross-compile.patch"
> - "dovecot-opensslv3.patch"))
> + (patches (search-patches "dovecot-bootstrap-cross-compile.patch"
> + "dovecot-opensslv3.patch"))
> (modules '((guix build utils)))
> (snippet '(delete-file "configure"))))
> (build-system gnu-build-system)
> - (native-inputs
> - (list autoconf automake gettext-minimal libtool pkg-config))
> - (inputs
> - (list bzip2
> - icu4c
> - libsodium ; extra password algorithms
> - libstemmer
> - libunwind
> - linux-pam
> - lz4
> - openssl
> - sqlite
> - zlib
> - `(,zstd "lib")))
> + (native-inputs (list autoconf automake gettext-minimal libtool pkg-c=
onfig))
> + (inputs (list bzip2
> + icu4c
> + libsodium ;extra password algorithms
> + libstemmer
> + libunwind
> + linux-pam
> + lz4
> + openssl
> + sqlite
> + zlib
> + `(,zstd "lib")))
> (arguments
> - `(#:configure-flags '("--sysconfdir=3D/etc"
> - "--localstatedir=3D/var"
> - "--with-sqlite") ; not auto-detected
> + `(#:configure-flags '("--sysconfdir=3D/etc" "--localstatedir=3D/var"
> + "--with-sqlite") ;not auto-detected
> ;; The -rdynamic linker flag is needed for the backtrace() functi=
on to
> ;; have symbol names rather than just addresses. Dovecot's tests=
rely
> ;; on this, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=
=3D962630.
> #:make-flags (list "LDFLAGS=3D-rdynamic")
> - #:phases
> - (modify-phases %standard-phases
> - (add-after 'unpack 'patch-file-names
> - (lambda _
> - (substitute* "src/lib-program-client/test-program-client-lo=
cal.c"
> - (("(/bin/| )cat") (which "cat"))
> - (("/bin/echo") (which "echo"))
> - (("/bin/false") (which "false"))
> - (("/bin/sh") (which "bash"))
> - (("head") (which "head"))
> - (("sleep") (which "sleep")))
> - (substitute* (list "src/lib-smtp/test-bin/sendmail-exit-1.s=
h"
> - "src/lib-smtp/test-bin/sendmail-success.=
sh")
> - (("cat") (which "cat")))))
> - (replace 'install
> - (lambda* (#:key make-flags #:allow-other-keys)
> - ;; Simple hack to avoid installing a trivial README in /etc.
> - (apply invoke "make" "install" "sysconfdir=3D/tmp/bogus"
> - make-flags))))))
> + #:phases (modify-phases %standard-phases
> + (add-after 'unpack 'patch-file-names
> + (lambda _
> + (substitute* "src/lib-program-client/test-program-=
client-local.c"
> + (("(/bin/| )cat")
> + (which "cat"))
> + (("/bin/echo")
> + (which "echo"))
> + (("/bin/false")
> + (which "false"))
> + (("/bin/sh")
> + (which "bash"))
> + (("head")
> + (which "head"))
> + (("sleep")
> + (which "sleep")))
Same here, the previous version was more readable.
> + (substitute* (list
> + "src/lib-smtp/test-bin/sendmail-exit=
-1.sh"
> + "src/lib-smtp/test-bin/sendmail-succ=
ess.sh")
> + (("cat")
> + (which "cat")))))
> + (replace 'install
> + (lambda* (#:key make-flags #:allow-other-keys)
> + ;; Simple hack to avoid installing a trivial READM=
E in /etc.
> + (apply invoke "make" "install" "sysconfdir=3D/tmp/=
bogus"
> + make-flags))))))
> (home-page "https://www.dovecot.org")
> (synopsis "Secure POP3/IMAP server")
> (description
guix-patches@HIDDEN:bug#68541; Package guix-patches.
Full text available.
Received: (at 68541) by debbugs.gnu.org; 17 Jan 2024 17:50:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Jan 17 12:50:33 2024
Received: from localhost ([127.0.0.1]:53290 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rQA3c-0002Du-Ra
for submit <at> debbugs.gnu.org; Wed, 17 Jan 2024 12:50:33 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39739
helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <herman@HIDDEN>) id 1rQA3Z-0002Dd-1X
for 68541 <at> debbugs.gnu.org; Wed, 17 Jan 2024 12:50:30 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1705513820;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=x2hWKgCO4pkqIm3t3NEZIO51G915bZM9kmPb5QxXWsM=;
b=MrSFN/VBqBJGyzHMZTZkjT3IMMV0mks36EWQdwi8ErFBmi6XJzwINjDK1iyvkhTFsbCn7/
KHp4vmAL7dkO/XJFZRqIy0P5/iEz+84BUIdTeeVxpBJrHoiG28FTtAsX9JQhuqcADhZa6S
3M8waZSkCILuWo4AiU+Qlxh7hvYeZS4kOxzKPuvDS4bez33ZIHyJPzXdjLJzG759odqbRr
Rlo9cvGU4FF5D7vuXljfakFOApl25wYgeo979gOmuQ9uUN2XJCsc5kR9++5an3ubSgu1Ox
cKcz7GYwyKL7raqbAy/Y/3v20/gHvMZVy0YjqOvjYETAneBauNUM3KQF8cnVBw==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 78e96a16
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO);
Wed, 17 Jan 2024 17:50:20 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
To: 68541 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: dovecot: Apply guix style.
Date: Wed, 17 Jan 2024 18:50:11 +0100
Message-ID: <8961185a443ea28a4a26c545a334a2ebd5dcbf40.1705512974.git.herman@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <a88bf4bb9a0e756fe8b2f08d4c48ee8bcbb6235d.1705512974.git.herman@HIDDEN>
References: <a88bf4bb9a0e756fe8b2f08d4c48ee8bcbb6235d.1705512974.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.5 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: * gnu/packages/mail.scm (dovecot): Apply guix style.
Change-Id:
I2f50fa15ccbd2391be1f6f12e13e62aff707c54a --- gnu/packages/mail.scm | 88
+++++++++++++++++++++++ 1 file changed, 47 insertions(+), 41 deletions(-)
Content analysis details: (3.5 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 TVD_RCVD_IP Message was received from an IP address
3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL
[81.205.150.117 listed in zen.spamhaus.org]
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 T_SCC_BODY_TEXT_LINE No description available.
X-Debbugs-Envelope-To: 68541
Cc: Herman Rimm <herman@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.5 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: * gnu/packages/mail.scm (dovecot): Apply guix style. Change-Id:
I2f50fa15ccbd2391be1f6f12e13e62aff707c54a --- gnu/packages/mail.scm | 88
+++++++++++++++++++++++ 1 file changed, 47 insertions(+), 41 deletions(-)
Content analysis details: (2.5 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL
[81.205.150.117 listed in zen.spamhaus.org]
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 T_SCC_BODY_TEXT_LINE No description available.
-1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list
manager
* gnu/packages/mail.scm (dovecot): Apply guix style.
Change-Id: I2f50fa15ccbd2391be1f6f12e13e62aff707c54a
---
gnu/packages/mail.scm | 88 +++++++++++++++++++++++--------------------
1 file changed, 47 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index b522943294..5bbe4ca7ea 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -2011,57 +2011,63 @@ (define-public dovecot
(origin
(method url-fetch)
(uri (string-append "https://www.dovecot.org/releases/"
- (version-major+minor version) "/"
- "dovecot-" version ".tar.gz"))
+ (version-major+minor version)
+ "/"
+ "dovecot-"
+ version
+ ".tar.gz"))
(sha256
(base32 "0bah6rn5ihczai8q50p6pqxwj73j21smib89ycp7q8qwly9i1c85"))
- (patches
- (search-patches "dovecot-bootstrap-cross-compile.patch"
- "dovecot-opensslv3.patch"))
+ (patches (search-patches "dovecot-bootstrap-cross-compile.patch"
+ "dovecot-opensslv3.patch"))
(modules '((guix build utils)))
(snippet '(delete-file "configure"))))
(build-system gnu-build-system)
- (native-inputs
- (list autoconf automake gettext-minimal libtool pkg-config))
- (inputs
- (list bzip2
- icu4c
- libsodium ; extra password algorithms
- libstemmer
- libunwind
- linux-pam
- lz4
- openssl
- sqlite
- zlib
- `(,zstd "lib")))
+ (native-inputs (list autoconf automake gettext-minimal libtool pkg-config))
+ (inputs (list bzip2
+ icu4c
+ libsodium ;extra password algorithms
+ libstemmer
+ libunwind
+ linux-pam
+ lz4
+ openssl
+ sqlite
+ zlib
+ `(,zstd "lib")))
(arguments
- `(#:configure-flags '("--sysconfdir=/etc"
- "--localstatedir=/var"
- "--with-sqlite") ; not auto-detected
+ `(#:configure-flags '("--sysconfdir=/etc" "--localstatedir=/var"
+ "--with-sqlite") ;not auto-detected
;; The -rdynamic linker flag is needed for the backtrace() function to
;; have symbol names rather than just addresses. Dovecot's tests rely
;; on this, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=962630.
#:make-flags (list "LDFLAGS=-rdynamic")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-file-names
- (lambda _
- (substitute* "src/lib-program-client/test-program-client-local.c"
- (("(/bin/| )cat") (which "cat"))
- (("/bin/echo") (which "echo"))
- (("/bin/false") (which "false"))
- (("/bin/sh") (which "bash"))
- (("head") (which "head"))
- (("sleep") (which "sleep")))
- (substitute* (list "src/lib-smtp/test-bin/sendmail-exit-1.sh"
- "src/lib-smtp/test-bin/sendmail-success.sh")
- (("cat") (which "cat")))))
- (replace 'install
- (lambda* (#:key make-flags #:allow-other-keys)
- ;; Simple hack to avoid installing a trivial README in /etc.
- (apply invoke "make" "install" "sysconfdir=/tmp/bogus"
- make-flags))))))
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'patch-file-names
+ (lambda _
+ (substitute* "src/lib-program-client/test-program-client-local.c"
+ (("(/bin/| )cat")
+ (which "cat"))
+ (("/bin/echo")
+ (which "echo"))
+ (("/bin/false")
+ (which "false"))
+ (("/bin/sh")
+ (which "bash"))
+ (("head")
+ (which "head"))
+ (("sleep")
+ (which "sleep")))
+ (substitute* (list
+ "src/lib-smtp/test-bin/sendmail-exit-1.sh"
+ "src/lib-smtp/test-bin/sendmail-success.sh")
+ (("cat")
+ (which "cat")))))
+ (replace 'install
+ (lambda* (#:key make-flags #:allow-other-keys)
+ ;; Simple hack to avoid installing a trivial README in /etc.
+ (apply invoke "make" "install" "sysconfdir=/tmp/bogus"
+ make-flags))))))
(home-page "https://www.dovecot.org")
(synopsis "Secure POP3/IMAP server")
(description
--
2.41.0
guix-patches@HIDDEN:bug#68541; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 17 Jan 2024 17:42:22 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Jan 17 12:42:22 2024
Received: from localhost ([127.0.0.1]:53274 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rQ9vh-0007h1-Rl
for submit <at> debbugs.gnu.org; Wed, 17 Jan 2024 12:42:22 -0500
Received: from lists.gnu.org ([2001:470:142::17]:35414)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <herman@HIDDEN>) id 1rQ9vf-0007gl-2l
for submit <at> debbugs.gnu.org; Wed, 17 Jan 2024 12:42:20 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <herman@HIDDEN>) id 1rQ9vY-0006pn-JG
for guix-patches@HIDDEN; Wed, 17 Jan 2024 12:42:12 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]
helo=email.rimm.ee)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256)
(Exim 4.90_1) (envelope-from <herman@HIDDEN>) id 1rQ9vW-0006Im-8F
for guix-patches@HIDDEN; Wed, 17 Jan 2024 12:42:12 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1705513323;
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:
content-transfer-encoding:content-transfer-encoding;
bh=7cELVcv5Fmt5ARiXU0SawXkpP6pfmuyDgcngfqxahUw=;
b=gaxxmvqr/3hSh9ZASZMq64RntCzuaCLUKaMu9+E7zQ7jhVowzpz+r3Iem2GV65S77x2Zcu
UfcBr8LvGOYCpcHIyeEM/K4DkiFICsYI+RaFSNyviz9kLGwQ9P4NtR8QHRmMAJj/KcnBUr
fuEcC0EpmjE8yJgKxRRyanEH28P2Xp3eGG+1v30bXHwiL06mX9MB/Hk6/7O/HJ+2Mc+BHv
doYm9zFTaIFPH6xJ4UgEZrJaskOsnlNmoLYEjh8pf02YFKkpGipbgPXFipc6n79IlCocot
JluKISwBw9dHhBKXU3/n7HwxS/sJq5C4uzOpRZK+/YYEBpBmWcnsNcbUoYgCdg==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id b2e8640d
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO);
Wed, 17 Jan 2024 17:42:03 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH 1/2] gnu: dovecot: Prevent cross-compile errors.
Date: Wed, 17 Jan 2024 18:37:49 +0100
Message-ID: <a88bf4bb9a0e756fe8b2f08d4c48ee8bcbb6235d.1705512974.git.herman@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@HIDDEN;
helo=email.rimm.ee
X-Spam_score_int: 12
X-Spam_score: 1.2
X-Spam_bar: +
X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,
DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_PBL=3.335, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001, TVD_RCVD_IP=0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
Cc: Herman Rimm <herman@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)
* gnu/local.mk: Register patch.
* gnu/packages/mail.scm (dovecot): Fix cross-compile.
[arguments]: Remove '--with-clucene' configure flag.
[inputs]: Remove clucene.
[native-inputs]: Add autoconf, automake, gettext-minimal, libtool.
[patches]: Add patch to configure for cross-compiling.
* gnu/packages/patches/dovecot-bootstrap-cross-compile.patch: New file.
Change-Id: Iec697ccd92cc55652b83a683aa46f9955df9e15c
---
The first patch enables cross-compilation, at least on x86_64 targeting
Aarch64. The second patch runs guix style. Guix lint outputs:
dovecot@HIDDEN: label 'zstd' does not match package name 'zstd:lib'.
Do I need to specify the 'lib' output of zstd in a different way?
gnu/local.mk | 1 +
gnu/packages/mail.scm | 12 +-
.../dovecot-bootstrap-cross-compile.patch | 165 ++++++++++++++++++
3 files changed, 173 insertions(+), 5 deletions(-)
create mode 100644 gnu/packages/patches/dovecot-bootstrap-cross-compile.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 34bed91fc3..35e4d6b7ed 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1088,6 +1088,7 @@ dist_patch_DATA = \
%D%/packages/patches/docbook-xsl-support-old-url.patch \
%D%/packages/patches/doc++-include-directives.patch \
%D%/packages/patches/doc++-segfault-fix.patch \
+ %D%/packages/patches/dovecot-bootstrap-cross-compile.patch \
%D%/packages/patches/dovecot-opensslv3.patch \
%D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
%D%/packages/patches/doxygen-hurd.patch \
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 4466e5e6d9..b522943294 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -54,6 +54,7 @@
;;; Copyright © 2023 Timo Wilken <guix@HIDDEN>
;;; Copyright © 2023 Arjan Adriaanse <arjan@HIDDEN>
;;; Copyright © 2023 Wilko Meyer <w@HIDDEN>
+;;; Copyright © 2023 Herman Rimm <herman@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2015,13 +2016,15 @@ (define-public dovecot
(sha256
(base32 "0bah6rn5ihczai8q50p6pqxwj73j21smib89ycp7q8qwly9i1c85"))
(patches
- (search-patches "dovecot-opensslv3.patch"))))
+ (search-patches "dovecot-bootstrap-cross-compile.patch"
+ "dovecot-opensslv3.patch"))
+ (modules '((guix build utils)))
+ (snippet '(delete-file "configure"))))
(build-system gnu-build-system)
(native-inputs
- (list pkg-config))
+ (list autoconf automake gettext-minimal libtool pkg-config))
(inputs
(list bzip2
- clucene
icu4c
libsodium ; extra password algorithms
libstemmer
@@ -2035,8 +2038,7 @@ (define-public dovecot
(arguments
`(#:configure-flags '("--sysconfdir=/etc"
"--localstatedir=/var"
- "--with-sqlite" ; not auto-detected
- "--with-lucene") ; not auto-detected
+ "--with-sqlite") ; not auto-detected
;; The -rdynamic linker flag is needed for the backtrace() function to
;; have symbol names rather than just addresses. Dovecot's tests rely
;; on this, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=962630.
diff --git a/gnu/packages/patches/dovecot-bootstrap-cross-compile.patch b/gnu/packages/patches/dovecot-bootstrap-cross-compile.patch
new file mode 100644
index 0000000000..5b268082a0
--- /dev/null
+++ b/gnu/packages/patches/dovecot-bootstrap-cross-compile.patch
@@ -0,0 +1,165 @@
+Upstream status: sent to dovecot@HIDDEN
+
+From f53b92560ed86144b880919b66c096ce74a0a9e6 Mon Sep 17 00:00:00 2001
+From: Herman Rimm <herman@HIDDEN>
+Date: Wed, 17 Jan 2024 17:59:08 +0100
+Subject: [PATCH] m4: Fill in 'action-if-cross-compiling' for every
+ AC_RUN_IFELSE.
+
+---
+ m4/c99_vsnprintf.m4 | 1 +
+ m4/fd_passing.m4 | 4 ++++
+ m4/glibc.m4 | 2 ++
+ m4/gmtime_max.m4 | 5 ++++-
+ m4/ioloop.m4 | 2 ++
+ m4/mmap_write.m4 | 2 ++
+ m4/mntctl.m4 | 2 ++
+ m4/vararg.m4 | 9 ++++++---
+ m4/want_gssapi.m4 | 2 ++
+ 9 files changed, 25 insertions(+), 4 deletions(-)
+
+diff --git a/m4/c99_vsnprintf.m4 b/m4/c99_vsnprintf.m4
+index e642083..3a5d21f 100644
+--- a/m4/c99_vsnprintf.m4
++++ b/m4/c99_vsnprintf.m4
+@@ -21,6 +21,7 @@ AC_DEFUN([DOVECOT_C99_VSNPRINTF], [
+ return f("hello %s%d", "world", 1);
+ }]])],
+ [i_cv_c99_vsnprintf=yes],
++ [i_cv_c99_vsnprintf=no],
+ [i_cv_c99_vsnprintf=no])
+ ])
+ if test $i_cv_c99_vsnprintf = no; then
+diff --git a/m4/fd_passing.m4 b/m4/fd_passing.m4
+index 6b96c0f..dc7e180 100644
+--- a/m4/fd_passing.m4
++++ b/m4/fd_passing.m4
+@@ -72,6 +72,10 @@ AC_DEFUN([DOVECOT_FD_PASSING], [
+ dnl no, try with BUGGY_CMSG_MACROS
+ CFLAGS=$old_cflags
+ i_cv_fd_passing=no
++ ], [
++ dnl no, try with BUGGY_CMSG_MACROS
++ CFLAGS=$old_cflags
++ i_cv_fd_passing=buggy_cmsg_macros
+ ])
+ done
+ ]);
+diff --git a/m4/glibc.m4 b/m4/glibc.m4
+index 5d722aa..1dee501 100644
+--- a/m4/glibc.m4
++++ b/m4/glibc.m4
+@@ -41,6 +41,8 @@ AC_DEFUN([DOVECOT_GLIBC], [
+ i_cv_posix_fallocate_works=yes
+ ], [
+ i_cv_posix_fallocate_works=no
++ ], [
++ i_cv_posix_fallocate_works=no
+ ])
+ ])
+ if test $i_cv_posix_fallocate_works = yes; then
+diff --git a/m4/gmtime_max.m4 b/m4/gmtime_max.m4
+index 1613cb2..1c193e5 100644
+--- a/m4/gmtime_max.m4
++++ b/m4/gmtime_max.m4
+@@ -36,7 +36,10 @@ AC_DEFUN([DOVECOT_GMTIME_MAX], [
+ ], [
+ printf "check failed, assuming "
+ i_cv_gmtime_max_time_t=31
+- ],[])
++ ], [
++ printf "check failed, assuming "
++ i_cv_gmtime_max_time_t=31
++ ])
+ ])
+ AC_DEFINE_UNQUOTED(TIME_T_MAX_BITS, $i_cv_gmtime_max_time_t, [max. time_t bits gmtime() can handle])
+ ])
+diff --git a/m4/ioloop.m4 b/m4/ioloop.m4
+index 0f7dde0..3ec0902 100644
+--- a/m4/ioloop.m4
++++ b/m4/ioloop.m4
+@@ -15,6 +15,8 @@ AC_DEFUN([DOVECOT_IOLOOP], [
+ i_cv_epoll_works=yes
+ ], [
+ i_cv_epoll_works=no
++ ], [
++ i_cv_epoll_works=no
+ ])
+ ])
+ if test $i_cv_epoll_works = yes; then
+diff --git a/m4/mmap_write.m4 b/m4/mmap_write.m4
+index 3352c3a..f922957 100644
+--- a/m4/mmap_write.m4
++++ b/m4/mmap_write.m4
+@@ -36,6 +36,8 @@ AC_DEFUN([DOVECOT_MMAP_WRITE], [
+ i_cv_mmap_plays_with_write=yes
+ ], [
+ i_cv_mmap_plays_with_write=no
++ ], [
++ i_cv_mmap_plays_with_write=no
+ ])
+ ])
+ if test $i_cv_mmap_plays_with_write = no; then
+diff --git a/m4/mntctl.m4 b/m4/mntctl.m4
+index 9d0dde1..4ad18f2 100644
+--- a/m4/mntctl.m4
++++ b/m4/mntctl.m4
+@@ -25,6 +25,8 @@ AC_DEFUN([DOVECOT_MNTCTL], [
+ AC_MSG_RESULT($size)
+ ],[
+ AC_MSG_RESULT(default)
++ ],[
++ AC_MSG_RESULT(default)
+ ])
+ fi
+ ])
+diff --git a/m4/vararg.m4 b/m4/vararg.m4
+index 6bc8dcc..79ce983 100644
+--- a/m4/vararg.m4
++++ b/m4/vararg.m4
+@@ -16,7 +16,8 @@ AC_DEFUN([DOVECOT_VA_COPY], [
+ return 0;
+ }]])],
+ [lib_cv_va_copy=yes],
+- [lib_cv_va_copy=no],[])
++ [lib_cv_va_copy=no],
++ [lib_cv_va_copy=yes])
+ ])
+ AC_CACHE_CHECK([for an implementation of __va_copy()],lib_cv___va_copy,[
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+@@ -35,7 +36,8 @@ AC_DEFUN([DOVECOT_VA_COPY], [
+ return 0;
+ }]])],
+ [lib_cv___va_copy=yes],
+- [lib_cv___va_copy=no],[])
++ [lib_cv___va_copy=no],
++ [lib_cv___va_copy=no])
+ ])
+
+ if test "x$lib_cv_va_copy" = "xyes"; then
+@@ -68,7 +70,8 @@ AC_DEFUN([DOVECOT_VA_COPY_BYVAL], [
+ return 0;
+ }]])],
+ [lib_cv_va_val_copy=yes],
+- [lib_cv_va_val_copy=no],[])
++ [lib_cv_va_val_copy=no],
++ [lib_cv_va_val_copy=no])
+ ])
+
+ if test "x$lib_cv_va_val_copy" = "xno"; then
+diff --git a/m4/want_gssapi.m4 b/m4/want_gssapi.m4
+index 7866aba..c318b0a 100644
+--- a/m4/want_gssapi.m4
++++ b/m4/want_gssapi.m4
+@@ -82,6 +82,8 @@ AC_DEFUN([DOVECOT_WANT_GSSAPI], [
+ i_cv_gssapi_spnego=yes
+ ], [
+ i_cv_gssapi_spnego=no
++ ], [
++ i_cv_gssapi_spnego=no
+ ])
+ ])
+ if test "$i_cv_gssapi_spnego" = "yes"; then
+--
+2.41.0
+
base-commit: 8ca490e6600c55b2dab5db12cf1aefa2b1b27f9a
prerequisite-patch-id: 80cc6bb367fd6671f325eb5f88b030db5979b74b
prerequisite-patch-id: 60a91900bd16347223fd517454ca7c20c655ae2e
--
2.41.0
Herman Rimm <herman@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#68541; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.