From patchwork Sat Oct 3 11:14:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 24448 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 E4EBE27BBE9; Sat, 3 Oct 2020 12:15:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2B5F827BBE8 for ; Sat, 3 Oct 2020 12:15:31 +0100 (BST) Received: from localhost ([::1]:45166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kOfVi-00065j-7B for patchwork@mira.cbaines.net; Sat, 03 Oct 2020 07:15:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kOfVH-000652-0q for guix-patches@gnu.org; Sat, 03 Oct 2020 07:15:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59750) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kOfVG-0002V1-OJ for guix-patches@gnu.org; Sat, 03 Oct 2020 07:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kOfVG-0005OH-JM for guix-patches@gnu.org; Sat, 03 Oct 2020 07:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43776] [PATCH] Update mergerfs Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Oct 2020 11:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43776 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43776@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160172367420664 (code B ref -1); Sat, 03 Oct 2020 11:15:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Oct 2020 11:14:34 +0000 Received: from localhost ([127.0.0.1]:43063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kOfUn-0005NE-PO for submit@debbugs.gnu.org; Sat, 03 Oct 2020 07:14:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:33172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kOfUl-0005N6-TZ for submit@debbugs.gnu.org; Sat, 03 Oct 2020 07:14:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kOfUl-0005mK-OI for guix-patches@gnu.org; Sat, 03 Oct 2020 07:14:31 -0400 Received: from mout-p-201.mailbox.org ([2001:67c:2050::465:201]:39386) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1kOfUi-0002Qb-JE for guix-patches@gnu.org; Sat, 03 Oct 2020 07:14:30 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4C3PQ5178yzQkm5 for ; Sat, 3 Oct 2020 13:14:21 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1601723659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9zwtqJ/AnCQc9Po/w/o6uYJXWsJ7ptH0YzFieNAhRB8=; b=PeuXu9O+bNhTGvQOC+D7EcC+a4QoU9CLg906Aw0LkPbtrIbz97o00GkumlNK9clAT/9/Yg zzVC9wrJgqdlRR8KpWDWG+d3ViZL7IeWhqskPZ84mmI1En6wsqqJC4W5GvnaVZZAA2OGi5 Taf4sSQAW+QV+IOkYBxCn1hiWobTfQAwnLdu2aVqxVdhC/rsRKekoCpbbOahjawqSy1hop dvgE7GvFiuN6z3Y0jolbiZVDlc0ZTol8j5UZ64tWCiAH1IAtYnCMomssKZirIKrD+K6W2B ILXPE1Zrka/8ZIhHAGKlxWeLXmHeJnr5QGEw/zEcLJyMqvOpeO7Uphye3zDGww== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id 8DqclhQ0IlXk for ; Sat, 3 Oct 2020 13:14:16 +0200 (CEST) Date: Sat, 3 Oct 2020 13:14:15 +0200 From: Lars-Dominik Braun Message-ID: <20201003111415.GA1335@noor.fritz.box> MIME-Version: 1.0 Content-Disposition: inline X-MBO-SPAM-Probability: X-Rspamd-Score: -4.51 / 15.00 / 15.00 X-Rspamd-Queue-Id: ED938170B X-Rspamd-UID: 5734b7 Received-SPF: pass client-ip=2001:67c:2050::465:201; envelope-from=lars@6xq.net; helo=mout-p-201.mailbox.org X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, the following patches upgrade mergerfs and mergerfs-tools to the most recent versions. I’m running both on my GuixSD storage machine. Cheers, Lars From 5a45d6423f7cf801cd6ad07f30e39513e3c31e07 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 3 Oct 2020 12:15:19 +0200 Subject: [PATCH 1/2] gnu: mergerfs: Update to 2.31.0. * gnu/packages/file-systems.scm (mergerfs) [version]: Update to 2.31.0. [arguments]: Adjust Makefile substitutions. --- gnu/packages/file-systems.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 0d897a6307..f021e81612 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -768,7 +768,7 @@ community.") (define-public mergerfs (package (name "mergerfs") - (version "2.29.0") + (version "2.31.0") (source (origin (method url-fetch) @@ -776,7 +776,7 @@ community.") version "/mergerfs-" version ".tar.gz")) (sha256 (base32 - "17gizw4vgbqqjd2ykkfpp276942jb5qclp0lkiwkmq1yjgyjqfmk")))) + "0k4asbg5n9dhy5jpjkw6simqqnr1zira2y4i71cq05091dfwm90p")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; No tests exist. @@ -797,8 +797,9 @@ community.") ;; The Makefile does not allow overriding PREFIX via make variables. (substitute* '("Makefile" "libfuse/Makefile") (("= /usr/local") (string-append "= " (assoc-ref outputs "out"))) + (("= /sbin") "= $(EXEC_PREFIX)/sbin") ;; cannot chown as build user - (("chown root:root") "true")) + (("chown root(:root)?") "true")) #t))))) ;; mergerfs bundles a heavily modified copy of libfuse. (inputs `(("util-linux" ,util-linux))) -- 2.26.2