From patchwork Wed Jan 17 17:50:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 59015 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6E3F427BBE9; Wed, 17 Jan 2024 17:51:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9DB7C27BBE2 for ; Wed, 17 Jan 2024 17:51:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQA48-0002kN-Sp; Wed, 17 Jan 2024 12:51:04 -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 ) id 1rQA46-0002jy-Ai for guix-patches@gnu.org; Wed, 17 Jan 2024 12:51:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQA45-0008Cb-NO for guix-patches@gnu.org; Wed, 17 Jan 2024 12:51:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQA46-0002Ef-GL for guix-patches@gnu.org; Wed, 17 Jan 2024 12:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68541] [PATCH 2/2] gnu: dovecot: Apply guix style. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jan 2024 17:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68541 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68541@debbugs.gnu.org Cc: Herman Rimm Received: via spool by 68541-submit@debbugs.gnu.org id=B68541.17055138338556 (code B ref 68541); Wed, 17 Jan 2024 17:51:02 +0000 Received: (at 68541) by debbugs.gnu.org; 17 Jan 2024 17:50:33 +0000 Received: from localhost ([127.0.0.1]:53290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQA3c-0002Du-Ra for submit@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 ) id 1rQA3Z-0002Dd-1X for 68541@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) Date: Wed, 17 Jan 2024 18:50:11 +0100 Message-ID: <8961185a443ea28a4a26c545a334a2ebd5dcbf40.1705512974.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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