From patchwork Fri Feb 10 18:08:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 46790 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 BF272165F7; Fri, 10 Feb 2023 18:17:32 +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,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 75C79165EF for ; Fri, 10 Feb 2023 18:17:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQXxJ-0003vY-2T; Fri, 10 Feb 2023 13:17:05 -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 1pQXxG-0003sN-P8 for guix-patches@gnu.org; Fri, 10 Feb 2023 13:17:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQXxG-0003A9-Gm for guix-patches@gnu.org; Fri, 10 Feb 2023 13:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQXxF-0003hM-QO for guix-patches@gnu.org; Fri, 10 Feb 2023 13:17:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61408] [PATCH] gnu: bees: Update to 0.9.1. Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 10 Feb 2023 18:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61408 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61408@debbugs.gnu.org Cc: Morgan Smith X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167605300114173 (code B ref -1); Fri, 10 Feb 2023 18:17:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Feb 2023 18:16:41 +0000 Received: from localhost ([127.0.0.1]:38106 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQXwv-0003gW-5D for submit@debbugs.gnu.org; Fri, 10 Feb 2023 13:16:41 -0500 Received: from lists.gnu.org ([209.51.188.17]:54694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQXwt-0003gO-Sp for submit@debbugs.gnu.org; Fri, 10 Feb 2023 13:16: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 ) id 1pQXwt-000387-KN for guix-patches@gnu.org; Fri, 10 Feb 2023 13:16:39 -0500 Received: from mail-mw2nam12olkn20812.outbound.protection.outlook.com ([2a01:111:f400:fe5a::812] helo=NAM12-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pQXwr-00032R-Cy for guix-patches@gnu.org; Fri, 10 Feb 2023 13:16:39 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j6rjzxYDKrlNFyFqGCUDw5RpfAAl4t/kb7AGwibjxhpwAGnzPKk+LeCXXooA/LMvaGkG2aPOYYPA6/QSQF27ogMW/1QEuKdvKeCirNQnhHjyMrOYoc5bBkyg1XwMP48trYRiAM9ZCEJEQIJy47jYnaYMQvctlWc7R56ekXXuzilPGKfMWu1W7UA69Gu9MjYBx90ewyv0m7Fd3cw7gRNb8fbbXQo7L24MQ/CkdQKGBX9H9nEsa3jgC85VjW7n+jTLhW4clZ7V4Z6z/ClnRWVUcrunKcwumDuzgDvvRrYbZ4WA6bneo10/EZKkgw38c2HfFQJJK+L6zDYnWpJEQegHwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=XC62h1bgJzz6B4DzoG3yUULK/OvwPUCvNHUKVGM2sGU=; b=kpdL3WJNzAyj0pZBGBViIDn8pX8WnmXFlFAZaioq91283tjRAec/ZCfJ3CDfbWMEhCQz65sHuCAjGv8AX3wzlmG07CuhAfZ7nhhx8UliL9UevDpc/mis02X6KIcjK6ABg/N1Hn7A7kKN3xp58tBIBEbb+4QMCv+FmpxdQO4puQtgBPRPdGUb/dR2A9wNOlURZ8bVwbXKztwm4sPa7cwMnw6QgmSoxHfbb2G9QrnFzS9CCNrRb6R7OqAvf+zJU84ETazRZuusur6W+/lJRRjF2UXg9VHx89+Sz1JMVBJ3GJczNYK3U6pNVBiQu6U1ZVT3zC4joZ9XAbj3oMsMdzToHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XC62h1bgJzz6B4DzoG3yUULK/OvwPUCvNHUKVGM2sGU=; b=h6oPae/+0OKt8TVP97NBZgsZqAF0SvwmZ96Fk/Xj0lxi+o3zlJkEFuoBZP/BgZ6aZYVjrxw4uh9cyEs4xt20ybRX5RpxucDviYKRmxyRyssSmGUMQPSQ/kgjzKXK5OekRHGkoKtfp/2QPGuZMtMQ9SGLRvEmFn8X9XDA/3+qb9NpdEMkf7rv+/iA2w3NXI8z3ODaqqKrV6z1V1NPQXFV6KxAhJLz8dg1b+o8W/HxG4dMxd5MIOhbOSqTel5E4Q5FqfrqKse2pMos79LsZvE9a3nYbubf7MH2qKRm7QRfpTkImHZMSlQgzP2BZeBzrdPSVQACeL78kBFaxpa8kA0Vwg== Received: from DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) by PH0PR03MB6527.namprd03.prod.outlook.com (2603:10b6:510:ba::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.17; Fri, 10 Feb 2023 18:11:30 +0000 Received: from DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::9d7c:7c0a:3e89:57dc]) by DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::9d7c:7c0a:3e89:57dc%7]) with mapi id 15.20.6043.033; Fri, 10 Feb 2023 18:11:30 +0000 From: Morgan.J.Smith@outlook.com Date: Fri, 10 Feb 2023 13:08:48 -0500 Message-ID: X-Mailer: git-send-email 2.39.1 X-TMN: [W3DW3aErQNPNumx5c5Y5cYL37rxKpjfD] X-ClientProxiedBy: YT4PR01CA0250.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10f::22) To DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) X-Microsoft-Original-Message-ID: <20230210180846.3656-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR03MB3163:EE_|PH0PR03MB6527:EE_ X-MS-Office365-Filtering-Correlation-Id: b260fbed-6e95-4fd4-bc1c-08db0b923c16 X-MS-Exchange-SLBlob-MailProps: feAVlmA1hHWyPNPlBlMWXuIAQ7GR0vBxnd3MAuCRDJoDgB+l6iGZoa5Dr05uielbbCbe26sEqJlWm9nQhJnGeBpHYOxzoOGYibM1jMoNlSuxf6EZk9tGaEhtJp7bR9MTyNVL/5pJOqn6/JwsJlcqmdrYnhYMlsbd4sFTDSWmqQVquB5Ag03VML3mwMRUV9uYVOl81uGPAJwDI26tJX2hAZn9srR0Dt+STENmhgbclYPb7bQs43Hb3s63ZyN9X6D0B+M1907HQd4z8jutQA3MIgAEuBWOoFHxGXa6PZRKL/ngD9gdD7FCGMNJJIto1wH20WbaEuFLb1KhEE/pevrM/00+Y+b/SJvOu82oNJ1JmKyT4Mel6MkBcibz3zD6If7cGsgUQ6sgkwjlvWm2YEFT186/gTCPLCKoy21/xibYcnv257QPkdvj/BBv3qKznf+KtdzMmFn4cmQWUlYGMQznmR4PjHkTVq+w8JKsUdBjib1HhOsO9HmO/W7ShH2UVLqTJHGlRxK/5gslZ0+vR4a0uLmJKofVn6T9dul1fNAHslTW6COdJSqMfHa5iqEKrXBVx+l50lcky7S16EKOiHzmd27qczQHtBrPftg4kqJcPl+AFKqzh9TTOkSbLLT0lQnsR2QL7C+PRpCSpYzh16cxUqgXnMf65ZsU5rvnNb++n531hleFMV9rpHAOBBvK77kTNLVq7avoKNofCDCdxdTSKw== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q/Id+JkwFwJ09oCkFKU4SYoGkRKJBOw8nlXlKv2q9PIGLM+SmqNb1DWvCgoW8AOodwb3XtAdGhI3Am1Kb1/0s3M+e3OfW65u0gagIGfYZMPitBoT46a/xMTmUFPaKXYIAZlj6QyATtJ1dZDPrQEURgLvy3yk77PhWY/4ab8MowZQ8/Fi3QY5OSwey9GezsIrXzuaTw1W3q6k1KySc8nn3n/St9RhBX8LTp8g3yMQ3CXX/Rt1D6APjMEwUKD8oS3deSEAQ3ojorcs61ZQvlOfJSF7rRXNwgEv+5vQME0vddIamIzK1aQsEEWK+haEhiSLhfVhJdfCbzMkYRAPUbIzJW8EgDBxBgMh9vLnGpQ9KSeG4dVi7G+mhpS6yMJVbxm092gkyDJrKN2EnqVAbz0LwCLzS02JXaN8v/kHJ7yeUlkycvsMF1DxxjgYAYB7BBTleAozp4T1Nn4TBBbptq/u1CUCaNSz0KllwsHjkRMbCZgzaNGJ27iVZboLkrHNNBA2CPbVkIhrsGtGbJoaTabAypaDgi7CdrxnBdS7UTwwyxHIVGVrBjgyJXbVyrJYhqYiRpCPjgzxoToBHH7Pmjafp681nhUk1Cv9Q0kfmTVkfvYaXtuaP175WFxU9t1p1CSY+o16FknJ01XdK6wgo6wAGA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Nng08ca/pKbk05mOBhozPFTM9m7Z6OrJPTB0RNyupKyZTMAzrENgj/yqyeqKp+3HAAsnf4/esmuJSHwVllhsa8N7AhMEGqOJp/uXsBPApAjwsosCQ6yUqVEGiQmQoAJEEEI1HeDTAlWtJQWFoawm5esg2t1J/BjmNfF/oLncD1UJCoXQMFi8akG7Y0tifT/UMB7k42yJHcb5IVbXI6+ofbF/4VpvcOwgBmYSpHeZrMDlX6BIrBgg4dz1+P01XS3JK8xvgDll16e/braEHGuzo2EJlnjhDkwct6vl5EqMPnIRFtuicKDHXIfk6YxwC9yUE6n2pxNWk/l0TuNN+VTQOCqD9UYlmssF3w9PIS55nmPJbcveT2pryys9aHBo9yWu8OtPOPxrVjySdq4h0a2qckNBob3i3SGR8vVD6Q03tHqrT/1r0uX/AibCB4p4+ksH/BLeAIDm9m+wgigYDyOmSxHufAlJTFVqQIVTsVlsbP2//mU6HAbZo8S2/WqGB9TtIx0V40ybH4cmdCOq7RjvXkaiar/LGPrqMkaruRPc1V+6o8oGA0HWSr+SPHklJsUbc3bdM/j5q755WtrwTcvK5YnNJPVlXend1mOB59fBZDpxNhMEVbWyqxTdBNfHOQW5A6CwTx7rBRuCuMbvAbpwDZAAHghxJBiQYNUmfZctIjYlfN3Xp+T9hb2sNZTdHBYSQ2TdFhNIpCrMdeOGbhQUhFdf1SeJRgUjqj1WXOQ1Sv/4HfgY4eptj5O9rBBR+3sn7ASh2ymw/scbDzDeT1ni0EIN7yo/5CyhUcoNXIUxPYy9wnqDZLqmJSOsOAR40WyttTbXKvYNlMiK7pDVA2OCc2SGcxwAOLg1Qe7Kz4xuxPDXBBHqnzyCr68FESbPk3wyziTLUznvVMYXxHW//zUocFY4sm/Py+8yIVYT1KdSkD4wVU1UaQq8D7NNSZ/juEI6mrZAx6Me8D9uE8V8mZdHz7Qx/dedEm3H4oWJKKj+WodtaxvJ9mA8XxkMxB/slbQaMPu2rYbXzyHJcesERbk/HWgaOCLorYb7+6oGOJeEQBUcMyFu8/Nm6doMDbJm1SYkjaolKCldd5HD1n989OadrCvmywOAcAleewzata6oy75dPyXXGTwOxG3uHtA3joFd3+mKo3a0lYJeIhoy23vPZc9ofHgRt0odlHY0AvDkA/nTtH8kssRLisOA4ZQq+0wnhwBA4l0zhED4HmHypOW4VDTyXTDy9ZOpMQ46nrUeJ23XE9mcEkGpUq8VS0jsNWnyzuwCl9+rkLIZiVL1NmdWPpjZm6up2aJSsLl4VCqLvKU= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b260fbed-6e95-4fd4-bc1c-08db0b923c16 X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2023 18:11:30.8216 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB6527 Received-SPF: pass client-ip=2a01:111:f400:fe5a::812; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM12-MW2-obe.outbound.protection.outlook.com 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, FREEMAIL_FROM=0.001, SPF_HELO_PASS=-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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Morgan Smith * gnu/packages/file-systems.scm (bees): Update to 0.9.1. * gnu/local.mk: Remove bees-beesd-honor-destdir-on-installation.patch * gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch: Delete file --- I looked at all the source files, looked at the changes since v0.8, and even ran the new version successfully on my system. I think I've been pretty thorough on this patch gnu/local.mk | 1 - gnu/packages/file-systems.scm | 13 +++--- ...-beesd-honor-destdir-on-installation.patch | 40 ------------------- 3 files changed, 5 insertions(+), 49 deletions(-) delete mode 100644 gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch diff --git a/gnu/local.mk b/gnu/local.mk index f1fed73987..83d6399efd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -940,7 +940,6 @@ dist_patch_DATA = \ %D%/packages/patches/bsd-games-prevent-name-collisions.patch \ %D%/packages/patches/bsd-games-stdio.h.patch \ %D%/packages/patches/beancount-disable-googleapis-fonts.patch \ - %D%/packages/patches/bees-beesd-honor-destdir-on-installation.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/bidiv-update-fribidi.patch \ %D%/packages/patches/binutils-2.37-file-descriptor-leak.patch \ diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 049ef04ea8..f0e022ba0d 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1809,7 +1809,7 @@ (define-public fuse-overlayfs (define-public bees (package (name "bees") - (version "0.8") + (version "0.9.1") (source (origin (method git-fetch) (uri (git-reference @@ -1826,14 +1826,9 @@ (define-public bees (("city.o.*") "")) (substitute* "src/bees-hash.cc" (("#include .crucible/city.h.") "#include ")))) - (patches - (search-patches - ;; XXX: Cherry-picked from upstream, remove the patch when - ;; bumping version. - "bees-beesd-honor-destdir-on-installation.patch")) (sha256 (base32 - "1kxpz1p9k5ir385kpvmfjawki5vg22hlx768k7835w6n5z5a65y4")))) + "1h2a7p1ik27cykbnql5b36wfv4n2arw4289p2vvs0v471b0x3b1c")))) (build-system gnu-build-system) (arguments (list #:test-target "test" @@ -1876,7 +1871,9 @@ (define-public bees for large btrfs filesystems. It is an offline dedupe combined with an incremental data scan capability to minimize time data spends on disk from write to dedupe.") - (license license:gpl3+))) + (license (list license:gpl3+ + license:zlib ; lib/crc64.cc + license:gpl2)))) ; include/crucible/btrfs.h (define-public dwarfs (package diff --git a/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch b/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch deleted file mode 100644 index 93817f42cf..0000000000 --- a/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 66b00f8a972ebb4da68f7aa0d0656f43ce2a2c3a Mon Sep 17 00:00:00 2001 -From: Hilton Chain -Date: Fri, 23 Dec 2022 11:04:46 +0800 -Subject: [PATCH] beesd: Honor DESTDIR on installation. - -Co-authored-by: Adam Faiz -Signed-off-by: Hilton Chain ---- - Defines.mk | 1 + - scripts/beesd.in | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Defines.mk b/Defines.mk -index 9e8df40..e5394ba 100644 ---- a/Defines.mk -+++ b/Defines.mk -@@ -2,6 +2,7 @@ MAKE += PREFIX=$(PREFIX) LIBEXEC_PREFIX=$(LIBEXEC_PREFIX) ETC_PREFIX=$(ETC_PREFI - - define TEMPLATE_COMPILER = - sed $< >$@ \ -+ -e's#@DESTDIR@#$(DESTDIR)#' \ - -e's#@PREFIX@#$(PREFIX)#' \ - -e's#@ETC_PREFIX@#$(ETC_PREFIX)#' \ - -e's#@LIBEXEC_PREFIX@#$(LIBEXEC_PREFIX)#' -diff --git a/scripts/beesd.in b/scripts/beesd.in -index 174bb6c..35d04aa 100755 ---- a/scripts/beesd.in -+++ b/scripts/beesd.in -@@ -15,7 +15,7 @@ readonly AL128K="$((128*1024))" - readonly AL16M="$((16*1024*1024))" - readonly CONFIG_DIR=@ETC_PREFIX@/bees/ - --readonly bees_bin=$(realpath @LIBEXEC_PREFIX@/bees) -+readonly bees_bin=$(realpath @DESTDIR@/@LIBEXEC_PREFIX@/bees) - - command -v "$bees_bin" &> /dev/null || ERRO "Missing 'bees' agent" - --- -2.38.1 -