From patchwork Thu Nov 21 12:25:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 70621 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 1F8EB27BBED; Thu, 21 Nov 2024 12:27: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 53DD127BBE2 for ; Thu, 21 Nov 2024 12:27:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tE6H4-0008Av-1c; Thu, 21 Nov 2024 07:27:07 -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 1tE6H1-0008AJ-6h for guix-patches@gnu.org; Thu, 21 Nov 2024 07:27:03 -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 1tE6H0-00025S-U8 for guix-patches@gnu.org; Thu, 21 Nov 2024 07:27:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=zdB6oszxWcHGs3/0Xy+10pSZQOcqxowhAntw76GvOGk=; b=G29AIDCwmeyLiFtcjA7me1no3WAFx1YL0NylUWbp+leJAJrK6Q/38nU0vZ3Hz0dNTLFho8Ixy+JDRPSL3RER50AzSKk4+FNyNpeXBdcQ74i88VixUJVveOO/2qNtyta5xZ0KEXWqiDec8/biaoftl/PGyaEu7owt8fThROIR5FMtwK/7aWMU9t9fqPcf1Oo12wdYbLroBiwjW9Zk3eanJn5sXZg5XkIKp52n/mFr2rk5fGZphSSNQBhoP995Zyu4b1UIL+xG4vC7QDfs9CspvB0Brt8qmEOkkS8xEVvoemeKUu59v6yTroXGH/fUnEhbHuaojxtEAjuQ/MyFhl2YhQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tE6H0-00088k-Jz for guix-patches@gnu.org; Thu, 21 Nov 2024 07:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42899] [PATCH v6 1/3] gnu: dovecot: Set moduledir to global directory. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Nov 2024 12:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42899@debbugs.gnu.org Received: via spool by 42899-submit@debbugs.gnu.org id=B42899.173219197531200 (code B ref 42899); Thu, 21 Nov 2024 12:27:02 +0000 Received: (at 42899) by debbugs.gnu.org; 21 Nov 2024 12:26:15 +0000 Received: from localhost ([127.0.0.1]:49391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tE6GE-000878-Jr for submit@debbugs.gnu.org; Thu, 21 Nov 2024 07:26:14 -0500 Received: from mail.mmer.org ([178.22.65.174]:58744) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tE6GA-00086V-1I for 42899@debbugs.gnu.org; Thu, 21 Nov 2024 07:26:10 -0500 Received: from mail.mmer.org (localhost [127.0.0.1]) by mail.mmer.org (OpenSMTPD) with ESMTP id c4ef6cd8 for <42899@debbugs.gnu.org>; Thu, 21 Nov 2024 12:26:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=mmer.org; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=VoS8CVkA2K/TrOTAn9ZaUJBQO J313G0MWiTFwYc26lw=; b=yCIr6FBI+HQfhaEPtki2XU6RIzLhp+TEnPcwJ4+C1 0E7RI8PIbrEWPePcawnXwkqz5+Q6RrIbO66nwy7tcLf+maUfXefmDluIGDyclAfG nLzTC026MTwBesgmDkGJxSCRQGsZQuUmUvOaL9HPMuDWCalXld46la1p5tILi6w4 OI= Received: from delta (142-212-98-95.ftth.glasoperator.nl [95.98.212.142]) by mail.mmer.org (OpenSMTPD) with ESMTPSA id b509f615 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <42899@debbugs.gnu.org>; Thu, 21 Nov 2024 12:25:59 +0000 (UTC) Date: Thu, 21 Nov 2024 12:25:56 +0000 Message-ID: <20241121122558.8617-2-levenson@mmer.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241121122558.8617-1-levenson@mmer.org> References: <20241121122558.8617-1-levenson@mmer.org> 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: Alexey Abramov X-ACL-Warn: , Alexey Abramov via Guix-patches X-Patchwork-Original-From: Alexey Abramov via Guix-patches via From: Alexey Abramov 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)[arguments]: Add configure-flag to set moduledir. Adjust custom 'install phase to override moduledir so it successfully installs. --- gnu/packages/mail.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 636961aae79..1c537b70a27 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2141,7 +2141,8 @@ (define-public dovecot `(#:configure-flags '("--sysconfdir=/etc" "--localstatedir=/var" "--with-sqlite" ; not auto-detected - "--with-lucene") ; not auto-detected + "--with-lucene" + "--with-moduledir=/usr/lib/dovecot") ; 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. @@ -2161,9 +2162,12 @@ (define-public dovecot "src/lib-smtp/test-bin/sendmail-success.sh") (("cat") (which "cat"))))) (replace 'install - (lambda* (#:key make-flags #:allow-other-keys) + (lambda* (#:key outputs make-flags #:allow-other-keys) + ;; The .la files don't like having the moduledir moved. + (for-each delete-file (find-files "." "\\.la")) ;; Simple hack to avoid installing a trivial README in /etc. (apply invoke "make" "install" "sysconfdir=/tmp/bogus" + (string-append "moduledir=" (assoc-ref outputs "out") "/lib/dovecot") make-flags)))))) (home-page "https://www.dovecot.org") (synopsis "Secure POP3/IMAP server")