From patchwork Wed Jan 17 17:37:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 59014 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 EB60B27BBE9; Wed, 17 Jan 2024 17:43:20 +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 3E45127BBE2 for ; Wed, 17 Jan 2024 17:43:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQ9wM-0006z6-QF; Wed, 17 Jan 2024 12:43:02 -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 1rQ9wL-0006yk-92 for guix-patches@gnu.org; Wed, 17 Jan 2024 12:43:01 -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 1rQ9wL-0006Sj-0Y for guix-patches@gnu.org; Wed, 17 Jan 2024 12:43:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQ9wM-0007i5-2s for guix-patches@gnu.org; Wed, 17 Jan 2024 12:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68541] [PATCH 1/2] gnu: dovecot: Prevent cross-compile errors. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jan 2024 17:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68541 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68541@debbugs.gnu.org Cc: Herman Rimm X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170551334229579 (code B ref -1); Wed, 17 Jan 2024 17:43:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Jan 2024 17:42:22 +0000 Received: from localhost ([127.0.0.1]:53274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQ9vh-0007h1-Rl for submit@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 ) id 1rQ9vf-0007gl-2l for submit@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 ) id 1rQ9vY-0006pn-JG for guix-patches@gnu.org; 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 ) id 1rQ9vW-0006Im-8F for guix-patches@gnu.org; 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) Date: Wed, 17 Jan 2024 18:37:49 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; 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-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/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@2.3.21: 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 base-commit: 8ca490e6600c55b2dab5db12cf1aefa2b1b27f9a prerequisite-patch-id: 80cc6bb367fd6671f325eb5f88b030db5979b74b prerequisite-patch-id: 60a91900bd16347223fd517454ca7c20c655ae2e 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 ;;; Copyright © 2023 Arjan Adriaanse ;;; Copyright © 2023 Wilko Meyer +;;; Copyright © 2023 Herman Rimm ;;; ;;; 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@dovecot.org. + +From f53b92560ed86144b880919b66c096ce74a0a9e6 Mon Sep 17 00:00:00 2001 +From: Herman Rimm +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 + 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