From unknown Sat Aug 16 11:40:41 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#61408 <61408@debbugs.gnu.org> To: bug#61408 <61408@debbugs.gnu.org> Subject: Status: [PATCH] gnu: bees: Update to 0.9.1. Reply-To: bug#61408 <61408@debbugs.gnu.org> Date: Sat, 16 Aug 2025 18:40:41 +0000 retitle 61408 [PATCH] gnu: bees: Update to 0.9.1. reassign 61408 guix-patches submitter 61408 Morgan.J.Smith@outlook.com severity 61408 normal tag 61408 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 10 13:16:41 2023 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: bees: Update to 0.9.1. Date: Fri, 10 Feb 2023 13:08:48 -0500 Message-ID: X-Mailer: git-send-email 2.39.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: =?us-ascii?Q?Nng08ca/pKbk05mOBhozPFTM9m7Z6OrJPTB0RNyupKyZTMAzrENgj/yqyeqK?= =?us-ascii?Q?p+3HAAsnf4/esmuJSHwVllhsa8N7AhMEGqOJp/uXsBPApAjwsosCQ6yUqVEG?= =?us-ascii?Q?iQmQoAJEEEI1HeDTAlWtJQWFoawm5esg2t1J/BjmNfF/oLncD1UJCoXQMFi8?= =?us-ascii?Q?akG7Y0tifT/UMB7k42yJHcb5IVbXI6+ofbF/4VpvcOwgBmYSpHeZrMDlX6BI?= =?us-ascii?Q?rBgg4dz1+P01XS3JK8xvgDll16e/braEHGuzo2EJlnjhDkwct6vl5EqMPnIR?= =?us-ascii?Q?FtuicKDHXIfk6YxwC9yUE6n2pxNWk/l0TuNN+VTQOCqD9UYlmssF3w9PIS55?= =?us-ascii?Q?nmPJbcveT2pryys9aHBo9yWu8OtPOPxrVjySdq4h0a2qckNBob3i3SGR8vVD?= =?us-ascii?Q?6Q03tHqrT/1r0uX/AibCB4p4+ksH/BLeAIDm9m+wgigYDyOmSxHufAlJTFVq?= =?us-ascii?Q?QIVTsVlsbP2//mU6HAbZo8S2/WqGB9TtIx0V40ybH4cmdCOq7RjvXkaiar/L?= =?us-ascii?Q?GPrqMkaruRPc1V+6o8oGA0HWSr+SPHklJsUbc3bdM/j5q755WtrwTcvK5YnN?= =?us-ascii?Q?JPVlXend1mOB59fBZDpxNhMEVbWyqxTdBNfHOQW5A6CwTx7rBRuCuMbvAbpw?= =?us-ascii?Q?DZAAHghxJBiQYNUmfZctIjYlfN3Xp+T9hb2sNZTdHBYSQ2TdFhNIpCrMdeOG?= =?us-ascii?Q?bhQUhFdf1SeJRgUjqj1WXOQ1Sv/4HfgY4eptj5O9rBBR+3sn7ASh2ymw/scb?= =?us-ascii?Q?DzDeT1ni0EIN7yo/5CyhUcoNXIUxPYy9wnqDZLqmJSOsOAR40WyttTbXKvYN?= =?us-ascii?Q?lMiK7pDVA2OCc2SGcxwAOLg1Qe7Kz4xuxPDXBBHqnzyCr68FESbPk3wyziTL?= =?us-ascii?Q?UznvVMYXxHW//zUocFY4sm/Py+8yIVYT1KdSkD4wVU1UaQq8D7NNSZ/juEI6?= =?us-ascii?Q?mrZAx6Me8D9uE8V8mZdHz7Qx/dedEm3H4oWJKKj+WodtaxvJ9mA8XxkMxB/s?= =?us-ascii?Q?lbQaMPu2rYbXzyHJcesERbk/HWgaOCLorYb7+6oGOJeEQBUcMyFu8/Nm6doM?= =?us-ascii?Q?DbJm1SYkjaolKCldd5HD1n989OadrCvmywOAcAleewzata6oy75dPyXXGTwO?= =?us-ascii?Q?xG3uHtA3joFd3+mKo3a0lYJeIhoy23vPZc9ofHgRt0odlHY0AvDkA/nTtH8k?= =?us-ascii?Q?ssRLisOA4ZQq+0wnhwBA4l0zhED4HmHypOW4VDTyXTDy9ZOpMQ46nrUeJ23X?= =?us-ascii?Q?E9mcEkGpUq8VS0jsNWnyzuwCl9+rkLIZiVL1NmdWPpjZm6up2aJSsLl4VCqL?= =?us-ascii?Q?vKU=3D?= 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 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 - -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 12 13:14:56 2023 Received: (at 61408) by debbugs.gnu.org; 12 Feb 2023 18:14:56 +0000 Received: from localhost ([127.0.0.1]:46688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRGsJ-0003rV-ET for submit@debbugs.gnu.org; Sun, 12 Feb 2023 13:14:56 -0500 Received: from mail-bn8nam12olkn2099.outbound.protection.outlook.com ([40.92.21.99]:58292 helo=NAM12-BN8-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRGsE-0003rA-NS for 61408@debbugs.gnu.org; Sun, 12 Feb 2023 13:14:53 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X0CC7J64kKckDxVfjpmv8ul/XBq+yFSTlXAvDSgvxMRKKGgeVeh50XVUMR+CdzPAHX0CKkCNqJyesXNmGnH0yDLLuq5TXZgwTy7QdUJtXvL+Sv+Sax4e/07BxbvzhrEnDHUeVUjjkpPf9UIf76n2UVAAZsgd6slFAtd3yPTuQXD79L5F6ME+Zr1rqcrlyTc5oyXhlZblr8uY0deBcxYSdvzz+1VHKsU/C9aACBICu2d+G4zqHBKbiw4tPZ8le6c2yMm8BA1aDdP/TCnefYYhetjQTU/WkCXGwPMCYPh8CxKx9o8ZbSzdcz9F+Gak4P7DyHMXCBPOm9sG4LIyR+oTew== 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=Ngy+lTQlSP+T+YAAain1c9SlJgJ3YyflMXXKz/KLmtc=; b=ADHBvIN7RvYh5dsLyo3JP4topjdZMGZGpxY6kXU9ppBG2UowxgCE2VqznOtS2Dq0+5pbACHlZxHw+9cByZjGkq5OTg7dUNmqGqGO2eIfCl9aKT8r0TLEynZXpteQmSx/VBnGARfbXLb489XwDHawIUeZvfOJPTl+8lBiRyA5sQQ7l22jr67o1T/pMyr50vXgjiINaDFY/OjPSzLi3nQnJNL9aiPQ39rA3v81HExWDaa0Mu96hMAWXHJIAX3BPfR01AlFl0jNkIHucXHG/zImfxIq1h+pgsnY/1MG5mgGGvKrvfAGIU4XESLHkEB+xKuRKVuauTjyrPNErPztyqJGkA== 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=Ngy+lTQlSP+T+YAAain1c9SlJgJ3YyflMXXKz/KLmtc=; b=C7V3wur48gg/KfkOtfOYtYsWn5n79fRBThUACm2nrtdcyDTeNXvyBwoUK5uQnwyQWL390U4Yn8pC7VXlhGtEAQIM3Q++opzazwN94erk+jMJp74c0mneHpVhQTggfVQBHFZ+Kno6WZUQCir3KmQx+yeM9/TUGrtEm7gYewmGTbksEX2KQpQAjYTPSaVF28RbzizNrDBw8L/gzSwuX1Ytq00asLYl61M6F7h4ugFuCwz5ZPXJqVX/gVTt36dII9LuEwW0733ck2GSoD8cv2X9ORF3pI4StO7Y89hYh0ebFJiUrGtjKCDbMQo1DJDOynEU8TqvHThWjKO3TKvXeveB+w== Received: from DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) by CH2PR03MB5238.namprd03.prod.outlook.com (2603:10b6:610:a1::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.23; Sun, 12 Feb 2023 18:14:40 +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.6086.023; Sun, 12 Feb 2023 18:14:40 +0000 From: Morgan.J.Smith@outlook.com To: 61408@debbugs.gnu.org Subject: [PATCH v2] gnu: bees: Update to 0.9.1. Date: Sun, 12 Feb 2023 13:12:56 -0500 Message-ID: X-Mailer: git-send-email 2.39.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [tPLdyid0cq6HBc7i3WoC7XDUFWKQIbMFCfaDk3bAM+FX7YRq/C8b6g==] X-ClientProxiedBy: YQBPR0101CA0314.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:6c::27) To DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) X-Microsoft-Original-Message-ID: <20230212181255.24198-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR03MB3163:EE_|CH2PR03MB5238:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e742539-5648-43f2-2230-08db0d25022e X-MS-Exchange-SLBlob-MailProps: 0wLWl8rLpvv0xTmL6ZAFYM6ewCh/hLtZLsLH/rTfyujKx8XOVt2Gory+aY+JUM85QiC6N7xSSNTC3NQKDex6QmAH/mxAs9iYlLhaiCj6tDt5dxH1as+hZ5VtUHVctMeipWjQRBjVRcZXyLATtA4aNmv8fhpgEPxYAFU4lagqkN1kFaa24KDwpbPd70ohMsKXJNFDiC66j3QvdevbcDmBcwk7/tJ9iTx9GW5T7Cgcua4z8Zju8blXFXUw14l4cSBfry8W7A7HZz0kNwmcsPpDA5x3+bxrxLudS0Gxg/b0DuJvPaX5GWjCGsMLds0847hei0cVrcP0Py4b4zyzygmlAoKQrX33fyMuIQ1xTAPjwKKkUUilSMHOw6MhoWBh3lhlVqcmB3D87iw1aGfJilDUIoJTnejYFt9211MEu2pTGPEUmt2V1X14S6UYwI65F+NeTb2qRpvsDEHT+Zi3TKgOEJdoH5etunvsG3lCurFJ1ugphiG8iTrKYGLmKwHPXw6Sn1V9PtdSHZmDgkw2P6Lyc23axo+EN8hYFkouKOPDJy+jg6aBp6RPrG3zjwcxRnKVkCPjb9YUdS64wZn6U0NI+0F7V1G/6GzqtrCW7UkXvSomFs93u2JaFD5FwsyNvQja/TDNIl7DL1qU4wOsnmPyHZK1HlwhAmSrwJqtdbWcLOk1NVKrxHx3btMslvy87fHdyHXuARRUhyP2kSrBaLNKAIv3C8SY0sAO1kYbqYqy0gJKFkuuYE971rNgeKqa1JbauPuJO2I77cU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uw8/+A8wXa+h/b3Zds0y6H8JSByJzj+RFiTfmHwzIRQK1jInylwXYt3C9kh4yUmIsevHTz/t02mPGak/GTwt6CyrQ0UtCdKrNAlCX5UJpbHneT19HQV95UUeZGB4IdJXeH3jEC7Ei/IcnNTrTAf6PCM3jn5ebpjVmNfOGYRTcGBYlkcn+9Q1U+/DKJO/2xMVrACEhpEAP5tntT2ICVPwGb3D0fS43jvPDC3JM5zchlgF58r0tpQYsA6z0KQAjj0nAbvuq4i1PEqsSL9tRiUTKZlnNFfqTmQ4roEj1XIFcd1xXNl0i0UGgBs68L2cwnQeMYxa9vGP7jm/sA7UjJNwHO2SBtZd6HnHyeWMC4vvl/spKJkpjGQwWT/wcBo+d8RBJTDrEys2gRLC9IKPs529FEIhr0pTpB5o7pNZQmeZFRMkfuvFQUQlOD8swF2kvIosw1AVxAd7MfOLWAYtBMdNPTyasm77AKMaN+6f6phuf6N98L0rQFsMQpeilaE3c9MFW2uLX/y3cTuQPDMihiwNmvlQCt3JfZffdcUSGWIEMH9LJmnyBJwRCoPFxsVVxL5DtOO+TbKgrSz5hbOjbcBoAwFxnE/OwoH/nZDkRR1alL9kC7aXvOX046mQKMNSiWdtn51xvkXP95y96kZtpdQcbw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0Hkbp/6Na93IhkTgWIN/RAyrJBymQfmUnN57sPgCfJNL7z1pJYaCDzZW3u7R?= =?us-ascii?Q?9olIxV0854iKBaOohXCr5FegbY5ZIy7ZzUGVtdBPskqs/zLNKu8vfdENXz2t?= =?us-ascii?Q?xqIRUeqw5RVQGpGAxGFldImaUpJaxvC9Sdp8zO8Ou6V9v3nmIYXlt0nb9LXk?= =?us-ascii?Q?jAKFKM2UltqC6VbS6wmFT1r0Xf5nuoFFpl57vgpwinUhe1ussNpb7Xxk6Xu+?= =?us-ascii?Q?Jgb28x7LthMPw3v4LhDn3cBcL2wxtnWfMoiqvqPXXzztEEv0B/g6AKjlYq3z?= =?us-ascii?Q?w9ZMrGKYYMwwsjSfgB8Tl2AkG33RreQAF0PsQTLngEyVZjAUCWzPZjScDcS7?= =?us-ascii?Q?59TWxxBqytKm6LmjijymOW4VIghwRUSBcHYVDSg+RBsEAg+RpJUpX/jtW41n?= =?us-ascii?Q?QiRfwLzGn8aJF7JzkRrGmP52g2O+752fznoc3sFkSpSM2emdel5hk0eMkh8K?= =?us-ascii?Q?L5R9586F96+i8l8AhmrIrV55K7iP7jlQKsD14LTtmxdQT4StWk3i4yD/x97y?= =?us-ascii?Q?HvinKfDOa1xTEQr91uGFU0pBf1cULRlkVyLHuNAz+QQnGRQx30dKLojvcPjp?= =?us-ascii?Q?wJlzkO55IAyFUYX7XlmKGnlb2RcmeyUUP6LZJvxFLy+gw/k75/dktQFs652u?= =?us-ascii?Q?28W9ociQjxIWN2rcmXPA/Or1HetyR2dDlOJWgieZ8tKacEKV9vzEbQruuuYM?= =?us-ascii?Q?SdPyAsVy9c7iXu3SuW6oBELCIEIeQaxtfbUnEU0/BDogTnVQffl4tWMveAzL?= =?us-ascii?Q?mb/r/2eQU22S83tsrhO6JteudZcHiGKj4NDyFw1prp6EH81LzRGHVTFxCNwR?= =?us-ascii?Q?y2eFQF12AbMbRuBYKjr2E83Ti+cvg6Hmp5THUcdwY5ARQODKibZkgspX+JyC?= =?us-ascii?Q?R+iv7iy8QIuHT9ZpW/2ityE9KBNt3VSjmwf3Vfz+rUzf4pJFOV+blY6Ye3q7?= =?us-ascii?Q?hYSBMWw2DNJsc2zsnqbBsdFES99sG6zg7bBuuPc0qrUUt/jBJOkl7OXNI5rE?= =?us-ascii?Q?+/YYjVKtNo2jUhXmgS30weBxsDX7mQdtzIf4zo/ovE5dEYCYaC2IvFzIXj6p?= =?us-ascii?Q?o7emBCQ0RguPtWGq1dr9i2177G2zNN2EKQ7tUEscKf1xykxEuwN/57Izh20C?= =?us-ascii?Q?d78fCTbwbJZzcXUZgQL2JG+2a898Inr2u62ozRNdch8q0gai91s9tX7fdrUD?= =?us-ascii?Q?xMnZAxAg8WDbGid5B/TIzNMnK5zpmdCoJfkSIpLzbgwtC79we/ts/5Zkei1Q?= =?us-ascii?Q?MCqgji8ru/oIvWMo1qBSn6fxSEdLqYzPKiJt19/k651iWJSoyVcLDhvNtkgC?= =?us-ascii?Q?aTuXsGnIioj9yt+JwpspsHw7?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e742539-5648-43f2-2230-08db0d25022e X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2023 18:14:40.6929 (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: CH2PR03MB5238 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61408 Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Morgan Smith * gnu/packages/file-systems.scm (bees): Update to 0.9.1. [arguments]: Add fixtest phase. * gnu/local.mk: Remove bees-beesd-honor-destdir-on-installation.patch * gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch: Delete file --- I have just discovered https://qa.guix.gnu.org and it is very cool. It helped me fix this patch :) gnu/local.mk | 1 - gnu/packages/file-systems.scm | 22 +++++----- ...-beesd-honor-destdir-on-installation.patch | 40 ------------------- 3 files changed, 13 insertions(+), 50 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 cdb99813d0..669d431802 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -941,7 +941,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 471f943754..492ae23dd1 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" @@ -1845,6 +1840,12 @@ (define-public bees #:phases #~(modify-phases %standard-phases (delete 'configure) + (add-after 'unpack 'fixtest + (lambda _ + ;; Reported upstream. Check if fixed when updating. + ;; Fixes build failure on i686 and armhf where size_t != uint64_t. + (substitute* "test/seeker.cc" + (("size_t target") "uint64_t target")))) (add-after 'unpack 'fixpath (lambda* (#:key inputs #:allow-other-keys) (substitute* "scripts/beesd.in" @@ -1867,7 +1868,8 @@ (define-public bees (search-input-file inputs (string-append "/bin/" command))) (("btrfs sub") - (string-append (search-input-file inputs "/bin/btrfs") " sub")))))))) + (string-append (search-input-file inputs "/bin/btrfs") + " sub")))))))) (inputs (list btrfs-progs cityhash util-linux)) (home-page "https://github.com/Zygo/bees") (synopsis "Best-Effort Extent-Same, a btrfs dedupe agent") @@ -1876,7 +1878,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 - -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 23 18:05:57 2023 Received: (at 61408-done) by debbugs.gnu.org; 23 Feb 2023 23:05:57 +0000 Received: from localhost ([127.0.0.1]:35559 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVKey-0006ZE-T7 for submit@debbugs.gnu.org; Thu, 23 Feb 2023 18:05:57 -0500 Received: from tobias.gr ([80.241.217.52]:59778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVKex-0006Z3-3s for 61408-done@debbugs.gnu.org; Thu, 23 Feb 2023 18:05:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=ytY86HhA2fKZR fQ4s2C2q3dCaWb+vxcseFwIHYr3HmQ=; h=in-reply-to:date:subject:cc:to: from:references; d=tobias.gr; b=hD3VZaERnIJRuyOO2OJXPnrh27rGXPRWwIVd97 Cyk17QKFCkIFlOwq+k9U5IoIC6cKtIrz4rb3ZVVPf7sE7yNwwg+6OjC4gtFdw2k3xNnbLq KmEvrr7kKJeeA8ndBSz45zlX/zxl5rLzVSV6dJUL/8+4HFXwpjyOk8bBSI3RNkmVsQHDpF boMKI7QRw5xliwgfyZlIr/CwE0BXZT1f7Y9slvpwO+1qwZuhecN+nfjmQhonz7Fy5GRyGi yyC3haLHyY5+SGN389hk+//DVOjxkEgwDW78CpsNBPKQH6taZ8xqWy/31BAjjri+J1Ex1a wPmpJlm0YIlAJ7v7B0tWgTsA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id e4e28fa9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 23 Feb 2023 23:05:51 +0000 (UTC) References: From: Tobias Geerinckx-Rice To: Morgan.J.Smith@outlook.com Subject: Re: [bug#61408] [PATCH v2] gnu: bees: Update to 0.9.1. Date: Thu, 23 Feb 2023 23:57:18 +0100 In-reply-to: BIMI-Selector: v=BIMI1; s=default; Message-ID: <87bklkq8vu.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61408-done Cc: 61408-done@debbugs.gnu.org, guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Morgan, I've pushed an updated & modified version of this patch as=20 4f08551a83f3a9f5e22c70e51e488f38171e6937. Thanks! Morgan.J.Smith@outlook.com =E5=86=99=E9=81=93=EF=BC=9A > * gnu/packages/file-systems.scm (bees): Update to 0.9.1. > [arguments]: Add fixtest phase. Since you reported this failure upstream, 0.9.2 was released with=20 your fix. \o/ I used that instead. > * gnu/local.mk: Remove=20 > bees-beesd-honor-destdir-on-installation.patch > *=20 > gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch:=20 > Delete > file I prefer writing this as *=20 gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. > + license:gpl2)))) ; include/crucible/btrfs.h Nice! Well spotted. Now, any copyrightable change by BEES to this file would/will be=20 GPL3+. I didn't notice any in its commit log, though, so this=20 point is academic. I erred on the side of keeping this, and added an explicit comment=20 that the combined work is GPL3+. Kind regards, T G-R --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIMEARYKACsWIQT12iAyS4c9C3o4dnINsP+IT1VteQUCY/fxhQ0cbWVAdG9iaWFz LmdyAAoJEA2w/4hPVW159EsBAJ9rGRNc6MGWIDM4suF0yuAfgBXCfmO9NWdLBMZ8 shC8AQDyBk4gmK25UL7m0xKps2pLi3VQQwGaSVFhZFAO22LNBg== =Sz4a -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Aug 16 11:40:41 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 24 Mar 2023 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator