From unknown Fri Jun 20 07:19:04 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#67557 <67557@debbugs.gnu.org> To: bug#67557 <67557@debbugs.gnu.org> Subject: Status: [PATCH 0/5] Update libtorrent-rasterbar and dependent programs Reply-To: bug#67557 <67557@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:19:04 +0000 retitle 67557 [PATCH 0/5] Update libtorrent-rasterbar and dependent programs reassign 67557 guix-patches submitter 67557 Tomas Volf <~@wolfsden.cz> severity 67557 normal tag 67557 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 30 20:34:48 2023 Received: (at submit) by debbugs.gnu.org; 1 Dec 2023 01:34:49 +0000 Received: from localhost ([127.0.0.1]:54787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8sQa-0001H4-CV for submit@debbugs.gnu.org; Thu, 30 Nov 2023 20:34:48 -0500 Received: from lists.gnu.org ([2001:470:142::17]:46810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8qLJ-0006Gx-SX for submit@debbugs.gnu.org; Thu, 30 Nov 2023 18:21:14 -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 1r8qL3-0003Xe-Jb for guix-patches@gnu.org; Thu, 30 Nov 2023 18:20:58 -0500 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8qKy-0004dw-TD for guix-patches@gnu.org; Thu, 30 Nov 2023 18:20:55 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 68EB4260DF3; Thu, 30 Nov 2023 23:20:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701386449; bh=2IB8SjvlzMuwX4fTezzQKhd4ZQ20t0/19RjRYoCuE6A=; h=From:To:Cc:Subject:Date; b=Lf/GEVy7PlG8UVtUn89Rn1W7NufZyG4Tm5HBC6T7eceGFpp+nun4igqEyojxeVqB7 HRwGnRU2wQm5fHTO9bV0EJSrsA3qBevbXLgZdTze+jGWLUStnb+7tfzlJJ1D39KKfC jk5hig8LJC3Q3Ll5O6YWpUVArpiLTfYPFeFGs8C0b+DqgoxM/bwaiGMBQPHTkJFLnB cewGeHGuw7IZHRXz4TIDoN+J3dMNT1y2xx091xRJ+OQlT+Ji7Gp1/wGAzjt8QqPWjd WKj7ZrdXRbXW+oLJZIbR9m6rkXc15e3FeYHpGY6gTYIvsXJ2wH8FUbBVlKVC3aV9gP H8spYKeSCm6zGmBYMaQN1c8CdTutpITSjhKQ4w/2/ktWDxFMzaMMriCWcKLWYhrgAE Kh0PXGl+wESDkDq3uz+pVD7ZvhCPHjTTU3dGRMvASU25X4ht8Z+dSVIPmw7c1u6wyD aN7K7yZ8qNLc/5neAOI8uFmHhpa2Zbh6viHULvOoyFQwuHJlVhj34W8m5Nbzo3w7aS khee4U+lSeTIpjtJJRYXEk2l3ogEnjYHNZumlR9B0ybx1yORnfC4rIoXDFjbFuifLe nV8BNFzVym+y8sL+Beyw3adZsDU0zZnWHkorMtHTA3048MpdpW4yit1o9vGPYLC5uU MDhtdn8TuPsyms4N/nehVMdg= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [81.17.16.69]) by wolfsden.cz (Postfix) with ESMTPSA id AB3FB26122D; Thu, 30 Nov 2023 23:20:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701386448; bh=2IB8SjvlzMuwX4fTezzQKhd4ZQ20t0/19RjRYoCuE6A=; h=From:To:Cc:Subject:Date; b=mAf54scjiOyP2S5SL914fyUKG4q9WyqUJURUCmjwiEWf3TOlzK/t0bZl43qfmGIHB p+sAKjRTiqAoILkkNRtLrErfgZUdBNa6SzLO5NnNd3vTZp07o2pZVQmZPPGZuDvKLt 1AVzoY04d4bZDvPw5jGZCXsh8JyaaGB6TrOuhBWotOq8hNEc2//J/xF4c5zmovJDUT Eh5AAtAg5Cd2Yb80x7wZIupF3HDqrkbQYk81wykr7/A995Rj8fCyy7yLn6Yd6p0Z3X ScIjS0K5enKH4FvzEh8dWVTJapVk4dV9gnnRqbQDuxM3ZkpDEErpPu/GC/2+Mr+5wL Sh6rYiCrPo9ROEMsGHg2QVXSCrU3PwmcFB2W9gZzLFdQhxAqovlx7EBHY8kbu6Bju+ iVuU9k2WzPRSu404KjUcuGKii2awd2LSVar7CG3KURsuRae1f7wevPixwMLAsxwvTU Ft101u6/2jT7bzxBi8d7VE12EWU5WsIzPKSiXUoAAQWTLpc1bP6ax2Yw/guN8pDbKe k86Til3bahkH5U5Dwd0JvRIsJWeHk90R4iSDUf6r7EZYq/cPXZeXaJUPn/G/GhQeRH L990/eytDydZHx1thFj3e4L7i0a6udGzQCrli9HU7l1lXN0fC7EbJek5mK2bWOHPRf TA0WDWliwwfuuCBQUly5PfPQ= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 5212a398; Thu, 30 Nov 2023 23:20:47 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: guix-patches@gnu.org Subject: [PATCH 0/5] Update libtorrent-rasterbar and dependent programs Date: Fri, 1 Dec 2023 00:19:54 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=37.205.8.62; envelope-from=ws@wolfsnet.cz; helo=wolfsden.cz X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Thu, 30 Nov 2023 20:34:44 -0500 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) This series updates libtorrent-rasterbar and programs that do depend on it. Some of these patches (for example version update of qbittorrent) could have been sent separately, however due to split to libtorrent-rasterbar and libtorrent-rasterbar-1.2 it seems better to send it as one series, so that the big picture is visible. And I was editing the package definitions anyway. Tomas Volf (5): gnu: libtorrent-rasterbar: Update to 1.2.19. gnu: deluge: Update to 2.1.1. gnu: qbittorrent-enhanced: Update to 4.6.1.10. gnu: qbittorrent: Update to 4.6.2. gnu: libtorrent-rasterbar: Update to 2.0.9. gnu/local.mk | 1 + gnu/packages/bittorrent.scm | 96 ++++-- gnu/packages/enlightenment.scm | 2 +- .../libtorrent-rasterbar-fix-tests.patch | 304 ++++++++++++++++++ 4 files changed, 379 insertions(+), 24 deletions(-) create mode 100644 gnu/packages/patches/libtorrent-rasterbar-fix-tests.patch base-commit: bdbb9dc27a590b08651d058f06a42caa26e04abb -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 01 09:01:11 2023 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 14:01:11 +0000 Received: from localhost ([127.0.0.1]:55308 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r944q-0001cj-D7 for submit@debbugs.gnu.org; Fri, 01 Dec 2023 09:01:11 -0500 Received: from wolfsden.cz ([37.205.8.62]:40220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r92Q3-0004Ok-TX for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 07:14:57 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 7E876261B43; Fri, 1 Dec 2023 12:14:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701432885; bh=UkW7UBlhqgylLW8gjB3na6p4uQb7zOjqIjhtBckh6IU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xv3jCB2roFpz1s0U02oExIx6ktsWJucbcNtJbbsS4AVzJx8vfaXGjdvd1BWyfdEV/ mR3n8nC45XoU/m2Caj5GYgF4tQPaNL0pTeC90rPPSzJNbZNVcad1pyGgFmfb1DiUnY npz1UaxvPl3S3rKPYUC1pn3dEnyPIspqhqx1QLPK5oLz5zDm2A37pNoM4emBxhEbnW KTSLSZIzJ/Kmdsf82vM7ppbzJHHejpS5o2Pc3oCOCVWyyS/40Z2GXCtdrmmjdqbjxp yegky9U9njpJf0rBWoGsz2dpQwGeJN4dU7otGka8V6Fm1vYkHJXxH1n3MPNwl4E8DG 4GXi64f+nokJJj9RpmcF/CZUCdc7sBf40kiuPR6oqm4uQO8lZ1WSSkVGj/AsUiP/8z E5ztkIbY1ysWxDIL0+cvBI7vR5qzgnshKvjYtd8N4zZShE9dT9ZE+vwvQdFJklw0Yj pHFb2Yd4KSQ2cebMq2G9MTMQHbSAgQb4byboEpNvCPoYF/jKhnuQf5HXgxbzFc6b3w FViScpEOvOj4laXV31nJr5Yw0swTMIYkpcKrxG+wtSFGT66gnjAMF6FxONcmOOFm8s hu/i8tm4d//JYIvOk/2I7TuhosDLdXfphNSESf56V2yFGoBxMwNc43caIZDaRkkNdd xy9AEiiGDBkqGcLZUP5kkqsg= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 8ADAB2622A4; Fri, 1 Dec 2023 12:14:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701432882; bh=UkW7UBlhqgylLW8gjB3na6p4uQb7zOjqIjhtBckh6IU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tPQ00IojFIPLK+rSigSu5BrFWJthSJmFSL39hY6gN+TPqvFhrPY67+TFSBMYEr+vV Q5cxWHqgQT4Jp4TNrhGBpLm2a8KFeYO4ITjIT7a5gvdtjoLWEb8Gc6JpmtmaTEADuA NdNoXqX8Gu2cRRIbpVylPF7Zz/6hUcI5CtStO55UsXXOIO6B7pcp+sYR/15kEbmja2 lUNskUk12NasCZn45RtzrUbvHBsYKS55y10TvErV6XqcrOTIC4YT8ItgHtxY6HylFN 8PfEFnN7Ua3iAFYa+GAFKFhPrh7Iti2M+IeWU3EfUnGk0gH9inzb1sV4rJphb6kuf8 uG3Uc6j8WNFdh36RZ2MG2YRifyKmc3hTDiQmu4rIXTBrgBZQQm1EYfs1TbyoqI2pMq i7m2pUD/sleLUfakSBi+Cn/fXaUXqkUk36aaj6HhUQw5UbXImhGzUSijycD5ARNucc TtAwaDt/UMPqCQekZ+L/Fj6Rauhj9y+75S1eIxJjAC9i45UFdk57lh7SMNlmJG311M PGaSusug1z77UKubZADklKLWmgWPm8ngUWYT+GPR4tDSmb7R+MAJjfU3gBf9gGYbxX S/VxGCJu8F4wC93KabmH1YwSdKZwpUt0oxbciobuD7pPD9S0ASh0UXrYvk7Q90mYjg Pvwwc0rGU0vN5KV3J0Do4B+s= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 80ab2e89; Fri, 1 Dec 2023 12:14:41 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: 67557@debbugs.gnu.org Subject: [PATCH 4/5] gnu: qbittorrent: Update to 4.6.2. Date: Fri, 1 Dec 2023 13:14:36 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557 X-Mailman-Approved-At: Fri, 01 Dec 2023 09:01:06 -0500 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) * gnu/packages/bittorrent.scm (qbittorrent): Update to 4.6.2. Change-Id: I75d05f14396e1b017cc939264e30ade625cb7017 --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index fb20b3c92c..f9098b1a56 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -488,7 +488,7 @@ (define-public libtorrent-rasterbar (define-public qbittorrent (package (name "qbittorrent") - (version "4.5.5") + (version "4.6.2") (source (origin (method git-fetch) @@ -497,7 +497,7 @@ (define-public qbittorrent (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ngvvwhafi9mi05r2l9dk9x05za8x35y12p230wpzprydhlgwsxd")))) + (base32 "1wps17iv4gj7y751fibvcxk51v09wyniv6xm2yx429dj7z8rfmzs")))) (build-system qt-build-system) (arguments (list #:configure-flags #~(list "-DTESTING=ON") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 01 09:01:11 2023 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 14:01:12 +0000 Received: from localhost ([127.0.0.1]:55310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r944t-0001cp-I9 for submit@debbugs.gnu.org; Fri, 01 Dec 2023 09:01:11 -0500 Received: from wolfsden.cz ([37.205.8.62]:40188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r92Q3-0004Og-LG for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 07:14:58 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 5FE822622A5; Fri, 1 Dec 2023 12:14:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701432884; bh=O+cE/lgiQ1/zHJu6YdxBL/E592gitPqNxnHAxgKyrVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=k4adCJZp3Lf5GYN2LwsEStftkhb+6Py2egiv64fFZE0goRGrRP0wztXyM/3e9nNPG SDN6AY3vs1bomsWd9E5jp0DLjjM49b/B8OWNewF/5w3VDOzXhGN22MoRLf2/8YRjU8 i4Q+JCHeb2ZP9QrIAVIFhdYq5OVgql1qxz0UOrC/QwfBGGRzsib98Sq0JgBhAr00SM QUVkmX0SFS3gW8igQl5zmFe0rYYiEVhDRKGxmWZCvCZRAQ4rQD6uf3+F1PLAwZ83Rt 6QiF1Fg/+zBPQeUMUD2EdmOQCVH0tdNfcOTNpvUU2/q9vg3pZkfFqUdwVvXFxoJHJA Ry1bWXDgVpgPOBsOkXdMuMvagMa1GYO30HFawAWEo7T9I9kQcLuTkT2DKGl8kS7JdK FLkWyVPSDQ3zXEwcLDEaQh0OfTe41j2p9GEnY+6zUfzQeCeNII2DKYpLLm7Ol6NOg6 49AyEpVYwCAqezborQcjCNaCviTSyDV+9X+yb4VueVV6/ovD1FJQfbVszyfm/FLbd+ Eel5vL7OjAS+VzGWMeVyicD209+FtdprEXBHWD18sriy3I/eh7QcdV3h0hNrRhL97+ eq5qLRkutkWbbZq5gre9fig3oXhJ5eK0yFVrG1z4vWzANYSiBWCgjX7btLcqUw1CtA g9dV1RDLx6cO8xHbkN0LTJak= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 0B6EC260A6B; Fri, 1 Dec 2023 12:14:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701432882; bh=O+cE/lgiQ1/zHJu6YdxBL/E592gitPqNxnHAxgKyrVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gdjCFMktz52pbVmcbSjkk/ir5JssTEFiyY9w/SEUHAwobj+9VHwiutZfQaZwaEYA4 yWyp7zt87zrlncUWA0LHRC9r8KlyMy6oHvZ1ZlpwF3BGnB4hVQCgizJX36Cv7pkkZm FKGKUrf55z8hIqSIRj6WFxTAJWKF23nm5q1TTz1vJgfmYyD3Vw3H8QJR9n0KGC1K1s BFA5ZTGo6yzHOZuUXFu+OqbRGy4U+UXfTElkociGa6JQKq1C2aUkhTI9qn+B6kqZep YE8pBcpBPfSGl5UUVWWgMtunzhjCQUMoPIRXBfKSxakFu+NjbzZzXbXMYpnNhAdw25 kh5QFQAPxTv53ay85iKhC2SydU9PE+FJQRLOvqmfLc2WabaiNxjLNzYlMSc66IVHTG vTfhtiXQrk5rYmHMrLfN59m36DoNG4ZlHutem7xwkOymFqqSzJeIpsBmfNKX2GBiOS teZGu0QVMq2aM4IQjKkL05g8SLdiV7gsCIMroU2t1Y1KN8hrD072Msx+qxthE+zaah otN94TYeWgOQcZ29trb3jJ8+ddxiyTZp/oQl+JZ8FXAc66l4GztJ01HnYA8+rVsXCZ CH/SVusjV3XRVjQ+KSXRuivSjqqrmxKGJWejex45uSZXMxFphd/kbncvTtcFybV7np mSi2xaEzX1dmm41IvqNSWje4= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id bc6af5c4; Fri, 1 Dec 2023 12:14:41 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: 67557@debbugs.gnu.org Subject: [PATCH 2/5] gnu: deluge: Update to 2.1.1. Date: Fri, 1 Dec 2023 13:14:34 +0100 Message-ID: <00b037edcd941fdf3a288c9212ceded8f182821c.1701386073.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557 X-Mailman-Approved-At: Fri, 01 Dec 2023 09:01:06 -0500 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) Dependency on nss-certs was added. Most torrents do require SSL in some shape or form, so it seems appropriate to add it by default. * gnu/packages/bittorrent.scm (deluge)[version]: Update to 2.1.1. [propagated-inputs]: Add nss-certs. [native-search-paths]: Set to allow locating the certificates. Change-Id: Ic6c79f24851d6917dc4e5b22b3bcb2f6b99e187a --- gnu/packages/bittorrent.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index e115c13017..3d79a3a159 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -46,11 +46,13 @@ (define-module (gnu packages bittorrent) #:use-module ((guix licenses) #:prefix l:) #:use-module (guix gexp) #:use-module (guix utils) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages) #:use-module (gnu packages adns) #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages boost) + #:use-module (gnu packages certs) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -574,7 +576,7 @@ (define-public qbittorrent-enhanced-nox (define-public deluge (package (name "deluge") - (version "2.0.5") + (version "2.1.1") (source (origin (method url-fetch) @@ -583,12 +585,13 @@ (define-public deluge (version-major+minor version) "/deluge-" version ".tar.xz")) (sha256 (base32 - "1n15dzfnz1gvb4cf046yhi404i3gs933qgz0ichna6r1znmh9gf4")))) + "1xyz8bscwqmd7d8b43svxl42w54pnisvwkkrndx46hifh0cx73bn")))) (build-system python-build-system) (inputs (list bash-minimal)) (propagated-inputs (list gtk+ libtorrent-rasterbar + nss-certs python-pycairo python-chardet python-dbus @@ -606,6 +609,9 @@ (define-public deluge (native-inputs (list intltool python-wheel (librsvg-for-system))) + (native-search-paths + (list $SSL_CERT_DIR + $SSL_CERT_FILE)) ;; TODO: Enable tests. ;; After "pytest-twisted" is packaged, HOME is set, and an X server is ;; started, some of the tests still fail. There are likely some tests -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 01 09:01:12 2023 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 14:01:12 +0000 Received: from localhost ([127.0.0.1]:55312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r944t-0001cx-US for submit@debbugs.gnu.org; Fri, 01 Dec 2023 09:01:12 -0500 Received: from wolfsden.cz ([37.205.8.62]:40206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r92Q3-0004Oi-LI for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 07:14:59 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 431DE260A6F; Fri, 1 Dec 2023 12:14:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701432885; bh=f0cASahPtFh/zEEdI3BA02Kf8/79o3TYCXUO3MaRdxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kWUBCleMi16lOhZwjwhQtEIj7d67t1L8uH56XRjsIFKhkec/U3bfjqaBO/H52mRQt vqPl+iZXgBA0JedULxU/XEtosrocRaKwdu1HLFOuNiLhL5wdAHB6POmRqoDiVzInLi ez9CL1KmTiQPO6WNnMCMEp7jW7qYj2BSzpKtGO3ZN3/0+eesDjZ3TF16kH8TrRAOcE qENIX8ARHFNHGQlmWp3b+B6xbT5/ZEkiF+5uqkGV4j/K/uZvoMsPGtYxm4tP8Jepfd +80RpeDsCgXZpUtwOTAm2ky2eDBxqPY/W3blHZVo0bsiJv6VDv/b2CfUivspi6xOq8 PYWny8S5xdJhyap4Q+ahHCvCOae+z9aUKPdQUiWHk5pY0qeyI6BneMzct8VA4JUXJ+ WPFWgFVBJ9GC2RzHNtYllzHYlnnlMQf0v5JuY588n4o+v/QtrH5QSRO+jU8ZciE1Rl b6Q/VvYtGdXXQsC7dEo9FC1TzBJs2JsKybuFfc54xoqayJcFndcfX0Bhf6hmE9pljr s7LaDOjjT+MUo0qHO7YCM57vIyuuNq5L1wzpdS5IiskxM3rzs7RcUiss9ohuVNh3H8 fL5p+Xz4prPc+oePE+ttEO5/KyQ+ZJ8+q0c4i2k8W61Iwp4MLXcE43YD3n7LU1CViT 05ULyP0587/Ghh941QD4mgCc= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id C5CF52615F0; Fri, 1 Dec 2023 12:14:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701432881; bh=f0cASahPtFh/zEEdI3BA02Kf8/79o3TYCXUO3MaRdxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JYmts3eq/RAYqfvtMlN34PNF695pznllA7/xeRz7NVelMG7NSX50df7wSHC0R6eGh fJ9Z9gD6GIkdRKTKXmg8oIS+4LWEasAI3yU8xLrfsC1YNIR/kJ/7Xo8XB8wP1f5B1t F2F5KtAG694gSRT6dE9/mCAx7uogdzmSa3xDIVfpggPMPjLqczUs514bjWpey7qO0k 6W4AfKeuc5H0ejcKLifc1eTuOAFZMXdIlWsc8RVacu0AnGk6dyh9HDQSNHw0EoKgn1 MHRnbh+kvPdZIqX5lP0xNyOYxB/vFTCWfj4eY708WT4NpG0nzlOIk4xE7I1nyHWHhW 4I2Pu2GZsYSxNObuqqMVra8sYV7me3XmOGkS6KCOeZ6aj56/3vKcs/UUNhMtkt9l44 AXp9ouwISzBfVjHpzzfUQW4Y2E0Luf6kbpAZoux3vLB0ztNxPin2fAvRfAs4E3HFEh /UXMbJ1F/Durmk/ambD1i8Qg2B2CaBs1DhfiLywZDl/Ne7B7ZRpjs9qckpCrGzyJb0 78uQXdJFW3VHMCjZic61EIYf/G2UvtMJ4+U3nU2IQmQNKeJgFHybInvsqpjJhZYAAo 08gxe9ZqqkTgUF17mcXh9w6GEwEp6t5ndBJyId5nVEsiA8KJbAtkvh59WDleA/6YQG ez34Z53+E7ErPGhZhj+IR24M= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 90b2f2d0; Fri, 1 Dec 2023 12:14:40 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: 67557@debbugs.gnu.org Subject: [PATCH 1/5] gnu: libtorrent-rasterbar: Update to 1.2.19. Date: Fri, 1 Dec 2023 13:14:33 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557 X-Mailman-Approved-At: Fri, 01 Dec 2023 09:01:06 -0500 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) With the update, the execution of the test suite was overhauled a lot. Parallel tests were disabled, since the do not work well. Since faketime does cause some tests to hang, test_ssl was moved into a separate run. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[version]: Update to 1.2.19. [arguments]<#:parallel-tests?>: Disable. [arguments]<#:phases>: Move test_ssl into separate run under faketime. Do not run under tests under faketime. Anchor the regex for test exclusion. Set timeout of 600 seconds for each test. Change-Id: I7392cb3ce1a8815b26b3257498082761255535ee --- gnu/packages/bittorrent.scm | 46 ++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 6f75a92cff..e115c13017 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -417,7 +417,7 @@ (define-public mktorrent (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.2.18") + (version "1.2.19") (source (origin (method url-fetch) @@ -426,35 +426,49 @@ (define-public libtorrent-rasterbar "releases/download/v" version "/" "libtorrent-rasterbar-" version ".tar.gz")) (sha256 - (base32 "0wpsaqadcicxl4lf1nc1i93c4yzjv8hpzhhrw1hdkrp4gn0vdwpy")))) + (base32 "03p4nvsll568zlyqifid0cn135sg5whbk7g48gkbapnw92ayks7f")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dpython-bindings=ON" "-Dbuild_tests=ON") + ;; Tests do not reliably work when executed in parallel. + #:parallel-tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'extend-test-timeout - (lambda _ - (substitute* "test/test_remove_torrent.cpp" - ;; Extend the test timeout from 3 seconds to 10. - (("i > 30") "i > 100")))) (replace 'check (lambda* (#:key tests? parallel-tests? #:allow-other-keys) - (let ((disabled-tests - ;; test_upnp requires a non-localhost IPv4 interface. - '("test_upnp"))) + (let* ((disabled-tests + '( + ;; Requires a non-localhost IPv4 interface. + "test_upnp" + ;; test_ssl needs to be run separately. + "test_ssl")) + (exclude-regex (string-append "^(" + (string-join disabled-tests "|") + ")$")) + (timeout "600") + (jobs (if parallel-tests? + (number->string (parallel-job-count)) + "1"))) (when tests? + (invoke "ctest" + "-E" exclude-regex + "-j" jobs + "--timeout" timeout + "--output-on-failure") ;; test_ssl relies on bundled TLS certificates with a fixed ;; expiry date. To ensure succesful builds in the future, ;; fake the time to be roughly that of the release. - (setenv "FAKETIME_ONLY_CMDS" "test_ssl") + ;; + ;; At the same time, faketime happens to cause + ;; test_fast_extension, test_privacy and test_resolve_links + ;; to hang, even with FAKETIME_ONLY_CMDS. Not sure why. So + ;; execute only test_ssl under faketime. (invoke "faketime" "2022-10-24" "ctest" - "--exclude-regex" (string-join disabled-tests "|") - "-j" (if parallel-tests? - (number->string (parallel-job-count)) - "1") - "--rerun-failed" + "-R" "^test_ssl$" + "-j" jobs + "--timeout" timeout "--output-on-failure")))))))) (inputs (list boost openssl)) (native-inputs -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 01 09:01:12 2023 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 14:01:12 +0000 Received: from localhost ([127.0.0.1]:55314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r944u-0001d4-B8 for submit@debbugs.gnu.org; Fri, 01 Dec 2023 09:01:12 -0500 Received: from wolfsden.cz ([37.205.8.62]:40190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r92Q3-0004Oh-LJ for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 07:15:00 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 31802260A6D; Fri, 1 Dec 2023 12:14:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701432885; bh=9l6NilxYioviN+4WEXvrpnWxFpfhfGAH6hkUPYjOZPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MRoyoEEzHPJJgaR+meHb7dsrol+CFx49d3ujKmXAP9nAEX7lwDcL66dH5RrXZccPq /qTFCtlsqS6HMPd3aPW875fFxZOKgwkw7EWx+Ms3qiU3XP+MzMUoWVHw5UaDlMSf8T z8C4brp9OvaAnaov7O9my8HbiiTXA/+4nDH3/HfQTjtVIKwKcZXZxXzz7HN/RVXPyn 6Let1KHUxLkeUSZMPICyfb42g+3i2PECKLUZsQfoKU+DoJWWc7V+KPsQywG3KmueAj vPICxHDkKP9S8mYrPvpyIFPMynBWAmIc9N9RhDnvi9Z8ghtTTixiGGUmzalQyqmS1n J/KUdPdiYJCTJjc65RvhWnREybF/HYeADj0OrBzTHIMA1venwPjMfBSBNteAluxio5 o6NZ2ZFW65a19wRJvjER0lBvCnGuhUgXAj7oBxsTj/GfEC2+0oWZgRlarMKW3p6yxx iFods4cqgpAmQh+JLeAHjEaUJOVDP/NXIP61KM96+iapq2CyI+FZRSuqCW6g4mNnsz w0TwqR9WRh1qBNd7IatHgVIQB6TVRz7NWI9v+8/bYvOi7vjgQo2FQk6sW2JsU4F25u d4tDTgHsD3D+glD0LrcDPX69eFdm6GCF7GRazduGQx4sjQAjbcYMiQAkoq1/DgH35j mhtabawkCkuZlHjQCz2dlJyc= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 4F041262780; Fri, 1 Dec 2023 12:14:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701432882; bh=9l6NilxYioviN+4WEXvrpnWxFpfhfGAH6hkUPYjOZPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nZjv8wi8+nB0OqzVG1q/bxpdm4QoBf4wV5gYMw4/VLh1ttb1bVxvnHFoyLTQBbtEO e1pcuggdG3km4U3YpLhgVkt7gd2KSSRy29fy9UhzQCQhwerWCDT2dyKFAzRcR5g9cb 84rzeTVq9Gxj53teGEvi+wDGmbyPrlEF4FGRhul3Wpx144f8T9YlXdfALANh1m/eTS aib8R3j6dfv2bwNN4HN1Z/PJ6ZwX1J2J3tEEVyjZiLcTu/GmscMorIVRHgAnPsBwjV 5uVV0FUdzaHbUEWqU5EPSMkfWDVgfm5hVvak7P3Ec2WVetuLMKQM+r5ID6ICEQQjEG 8Hf5zpXE6eR/FUnFwOM+Lg0hlpEfUsL/w8RFXg83OvMni1wShqEXceA+018Kr97UHY WCAGBFHC+10jS8W9s4Mf4ncelzQ7SCm1n35HalEFFXAcViuWyEhy7cQs09J4PMiX3B /a4HhBLZAYyWda6eHJ13Q4PrIplBogPpToUCo/LoSvXv52/aoC7C5n0S6wsA/xzu1R gR1oMtFdZ9sXKGzGI7YlZiOYu4XvXv7HSERaCLEVe1Lo4ndL/GFgq7bfCIW9AQ6kkq lR3cL2w2zs70G2fMO3nmf+9XNYRB9hfJdH4CQPigQ5GBPbgfINO/BKQGv9bxTk8s6g CRgXjm9BpvQlBXpBdUggsgQ0= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 3173d31b; Fri, 1 Dec 2023 12:14:41 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: 67557@debbugs.gnu.org Subject: [PATCH 3/5] gnu: qbittorrent-enhanced: Update to 4.6.1.10. Date: Fri, 1 Dec 2023 13:14:35 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557 X-Mailman-Approved-At: Fri, 01 Dec 2023 09:01:06 -0500 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) * gnu/packages/bittorrent.scm (qbittorrent-enhanced): Update to 4.6.1.10. Change-Id: Ic164ee27ea54018acfcba0e9db8db11f119800a4 --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 3d79a3a159..fb20b3c92c 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -542,7 +542,7 @@ (define-public qbittorrent-enhanced (package (inherit qbittorrent) (name "qbittorrent-enhanced") - (version "4.5.5.10") + (version "4.6.1.10") (source (origin (method git-fetch) @@ -552,7 +552,7 @@ (define-public qbittorrent-enhanced (file-name (git-file-name name version)) (sha256 (base32 - "029crx8yd8apssg2k4alnc0py5i2sp3bhjkwki5fvvnpgkrhfqf0")))) + "101a9n2vk9d6b4vc3schkmpc56l0i0i60fcjh8hwadc6amc2ymvy")))) (home-page "https://github.com/c0re100/qBittorrent-Enhanced-Edition") (description "qBittorrent Enhanced is a bittorrent client based on qBittorrent with -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 01 09:01:15 2023 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 14:01:15 +0000 Received: from localhost ([127.0.0.1]:55316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r944v-0001dC-Le for submit@debbugs.gnu.org; Fri, 01 Dec 2023 09:01:15 -0500 Received: from wolfsden.cz ([37.205.8.62]:40218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r92Q3-0004Oj-LL for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 07:15:01 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 64A792615F8; Fri, 1 Dec 2023 12:14:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701432885; bh=H5EF8pyrKcUAtHuJ1riX18JgKwz37DECUL+OEPV0obU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DGTrhjU4nuI0raGNSUphGXtcEMTRrm6s7HdlTyBoK95tN+OZQ1xa+Vo/ajjrdWBFr 91aBwAsgmalrTHsQh2allegCwfq9EdKZCQsQsRIsnpCYU8/vuJv7LmnaR5d/YuIeQ2 Mxu0kJVtyQW/UvdDj0IUyyXgx71xYMIGkI1quGshAeiPXvSx96vj7VaTKKq3aALZg6 LmSTqjt6jDwES6hFqexZPkOULZje9h9EFObiO/6KVehi/8Guf+QR4nQcJGyh49ayzu fSu0Q1Ab8GlcGk3pdmQtY2AYlPbcP+C2beJGG6rA1hUXRUdo/Q8Qb6LWBnms7oGoeo EiS8OQjvfsVHvKS3gPq3KDORe/zy13SQX5Et8jiF6orpDK2DTi2motGgFTSE29EQE0 COZQJLi+wmVey9YSMW9s8MkKvVxHGvhPQvi2OHuGWlZPcD5yo4qqdb8ZB1BY8b+488 W/65rOVgVq5OHZ7Fegls/mgAraJK+33cB1dCcLxAwQ0I6fyiJ3W1n9/adPv1M25lzx +WS40SXAVk/Nq5pjuV8jx+vbcg77wxYMxiz8tJNNCN3y/b+S3JiSIP+4qOtMNtfS1x LdtIsRZk2XjJRGka2NMbkOyvc4ncRkSMxryDvyBzfYxKHH1X1RIQBtS3HomaoeKEsM SkJlY20ik5ix3rNLshloOv+4= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,LOTS_OF_MONEY, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id C2095262701; Fri, 1 Dec 2023 12:14:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701432882; bh=H5EF8pyrKcUAtHuJ1riX18JgKwz37DECUL+OEPV0obU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zC44+FuZkO2QBBXgAOsWSPbdht0t9DCTdGf0rFkxWUZe72mqDCRo5+H6qbyC6mtSc 9SRSJST0lIKD8QRmmtS99EGXX6D/A2j6c6fda3VAWjvYuagU7+4y6R3IHL3mVfLBGp i87NnBq3BtVJwV4m8vVfZ3T2VaSRl/jwnxfF88cNN3y5InoYtoUXLWt5Cxjzg1WlbT 4EtasAeW5vRkpkkh77GxAPfnP6F0hj3z9Smngn+zmsUbcjsluciAdmCqDainG/ldE0 Psv/4SyZ9Eur0X69C2xU/OlKOGzBEPPhFVAkJ7k8yuPu2HOqtSmNLBVgdIgUF5CWn4 4Rcf515f61/h9j105wUAOLyuNPXtTGQpv8hF0Yi25uwFCONosMhJBDlf2E2p/aVuI7 PDh+o7vzROZXQiu9ooQwOYBy7VZrE4ivQhrcCAbInG2UGM1xGRN+QeStQ38wd6pwQQ wKJkEZ7sTS8I3PZtGlH3/3TG6UneISfzJCWHAXiqkD953aMBcEiRzphDUaqfvLUNwD OanJsNdFCMWsQ0YKL1dGWQCiD2NSCC7Li9wg9zYM8qv5vfJ0nToY33TC06QiuvCvvB sRat1fT9TBu7+UF9ETo7zIP3BK9PyfIrWVt1FxFwjQjnK092iOxw9kWHxWBIKetiHE hAhnAULBbcYX+EQIoVZFhbxI= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 28cbb0d7; Fri, 1 Dec 2023 12:14:41 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: 67557@debbugs.gnu.org Subject: [PATCH 5/5] gnu: libtorrent-rasterbar: Update to 2.0.9. Date: Fri, 1 Dec 2023 13:14:37 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557 X-Mailman-Approved-At: Fri, 01 Dec 2023 09:01:07 -0500 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) Update the package. Since other packages do depend on the previous version (and according to their documentation do recommend it), the previous version is exposed as libtorrent-rasterbar-1.2. The v2.0.9 requires patching to get tests working. Sadly one of the changes is to introduce new binary file, which is not supported by the (patches) block. So snippet is used instead to do the patching using git. * gnu/local.mk (dist_patch_DATA): Register new patch. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[version]: Update to 2.0.9. (libtorrent-rasterbar)[source]: Apply the patch. * gnu/packages/bittorrent.scm (libtorrent-rasterbar-1.2): New variable. (qbittorrent)[inputs]: Use libtorrent-rasterbar-1.2. * gnu/packages/enlightenment.scm (epour)[inputs]: Use libtorrent-rasterbar-1.2. * gnu/packages/patches/libtorrent-rasterbar-fix-tests.patch: New file. Change-Id: Ifbbbf02a671f6a3db653499a7a5f2504fd23c255 --- gnu/local.mk | 1 + gnu/packages/bittorrent.scm | 36 ++- gnu/packages/enlightenment.scm | 2 +- .../libtorrent-rasterbar-fix-tests.patch | 304 ++++++++++++++++++ 4 files changed, 339 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/libtorrent-rasterbar-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index a8142bb0f2..78b51a1c65 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1573,6 +1573,7 @@ dist_patch_DATA = \ %D%/packages/patches/libtirpc-hurd.patch \ %D%/packages/patches/libtommath-fix-linkage.patch \ %D%/packages/patches/libtommath-integer-overflow.patch \ + %D%/packages/patches/libtorrent-rasterbar-fix-tests.patch \ %D%/packages/patches/libtool-grep-compat.patch \ %D%/packages/patches/libtool-skip-tests2.patch \ %D%/packages/patches/libtree-fix-check-non-x86.patch \ diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index f9098b1a56..813636d526 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -80,6 +80,7 @@ (define-module (gnu packages bittorrent) #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages xml)) @@ -416,10 +417,19 @@ (define-public mktorrent (license (list l:public-domain ; sha1.*, used to build without OpenSSL l:gpl2+)))) ; with permission to link with OpenSSL +;;; The patch fixing tests contains a binary section, and regular (patches) +;;; section cannot handle it. So collect the patches here and patch using +;;; `git apply' in the (snippet) block. +(define %libtorrent-rasterbar-patches + (list + (local-file + (assume-valid-file-name + (search-patch "libtorrent-rasterbar-fix-tests.patch"))))) + (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.2.19") + (version "2.0.9") (source (origin (method url-fetch) @@ -428,7 +438,13 @@ (define-public libtorrent-rasterbar "releases/download/v" version "/" "libtorrent-rasterbar-" version ".tar.gz")) (sha256 - (base32 "03p4nvsll568zlyqifid0cn135sg5whbk7g48gkbapnw92ayks7f")))) + (base32 "13kry578ifzz4m2f291bbd7v5v9zsi8y3mf38146cnqw0sv95kch")) + (modules '((guix build utils))) + (snippet + #~(begin + (use-modules (guix build utils)) + (invoke (string-append #$git "/bin/git") "apply" + #$@%libtorrent-rasterbar-patches))))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dpython-bindings=ON" @@ -485,6 +501,20 @@ (define-public libtorrent-rasterbar desktops.") (license l:bsd-2))) +(define-public libtorrent-rasterbar-1.2 + (package + (inherit libtorrent-rasterbar) + (version "1.2.19") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/arvidn/libtorrent/" + "releases/download/v" version "/" + "libtorrent-rasterbar-" version ".tar.gz")) + (sha256 + (base32 "03p4nvsll568zlyqifid0cn135sg5whbk7g48gkbapnw92ayks7f")))))) + (define-public qbittorrent (package (name "qbittorrent") @@ -506,7 +536,7 @@ (define-public qbittorrent (list qttools-5)) (inputs (list boost - libtorrent-rasterbar + libtorrent-rasterbar-1.2 openssl python-wrapper qtsvg-5 diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 64d8945f8e..7860c43fef 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -585,7 +585,7 @@ (define-public epour (native-inputs (list intltool python-distutils-extra)) (inputs - (list libtorrent-rasterbar python-dbus python-efl python-pyxdg)) + (list libtorrent-rasterbar-1.2 python-dbus python-efl python-pyxdg)) (home-page "https://www.enlightenment.org") (synopsis "EFL Bittorrent client") (description "Epour is a BitTorrent client based on the @dfn{Enlightenment diff --git a/gnu/packages/patches/libtorrent-rasterbar-fix-tests.patch b/gnu/packages/patches/libtorrent-rasterbar-fix-tests.patch new file mode 100644 index 0000000000..40e016a5fc --- /dev/null +++ b/gnu/packages/patches/libtorrent-rasterbar-fix-tests.patch @@ -0,0 +1,304 @@ +From 757a13aa68254eae5b2f4fd3bd51122d5eab0a3b Mon Sep 17 00:00:00 2001 +From: Tomas Volf <~@wolfsden.cz> +Date: Thu, 30 Nov 2023 21:49:29 +0100 +Subject: [PATCH] libtorrent-rasterbar: Fix tests. + +In Guix build environment, TMPFS might be used for the build directory. If that +happens, the test_copy_file fails, since it thinks TMPFS does not support sparse +files (it does though). + +For some reason, the v2_empty_file.torrent is missing from the release +archive (it is present in the v2.0.9 git tag). So copy it over to allow +test_create_torrent to pass. + +* test/test_copy_file.cpp (fs_supports_sparse_files): Consider TMPFS a sparse +file-system. +* test/test_torrents/v2_empty_file.torrent: New file. +--- + test/test_copy_file.cpp | 1 + + test/test_torrents/v2_empty_file.torrent | Bin 0 -> 13529 bytes + 2 files changed, 1 insertion(+) + create mode 100644 test/test_torrents/v2_empty_file.torrent + +diff --git a/test/test_copy_file.cpp b/test/test_copy_file.cpp +index b4a9761..316ec57 100644 +--- a/test/test_copy_file.cpp ++++ b/test/test_copy_file.cpp +@@ -119,6 +119,7 @@ bool fs_supports_sparse_files() + using fsword_t = decltype(statfs::f_type); + static fsword_t const ufs = 0x00011954; + static const std::set sparse_filesystems{ ++ TMPFS_MAGIC, + EXT4_SUPER_MAGIC, EXT3_SUPER_MAGIC, XFS_SUPER_MAGIC, fsword_t(BTRFS_SUPER_MAGIC) + , ufs, REISERFS_SUPER_MAGIC + }; +diff --git a/test/test_torrents/v2_empty_file.torrent b/test/test_torrents/v2_empty_file.torrent +new file mode 100644 +index 0000000000000000000000000000000000000000..6c77b9a69812435d8a272f8627782363c01fbca1 +GIT binary patch +literal 13529 +zcma)iQ;;ysl4aYrZQI>n+qP}nwr#t=wr$(CZM%E_xqD|~CN?&9Un;6HGfrlnsE4W( +zY0SvLW#njL;A~<{VCccf%;jw7=xAc=OzUiCXYKUQ`Cm>8J6i(de_|{c*;rUP8CaQ_ +zI80c$ENo5fj5)bXEv!uloE=R}j9LG+XEbKuGG^nlHnBBxHn-qlTpwe@&y&R9>vmrMO^*_raCFx&s`>nCv9gFzq?g7}KdG`?d35cuv;;XVENN +z_6E-8*8lG7pAP@4Erx&k|8G8~|L*(GTK-1_^FN6gnYe6BoDB$EO&p#6q11xu9}rsu +zn}1ek6DQ|?y#Hc|;NQ%#v9dC=nXvtvHr9Vg +z^zg*$)EsD46!|f~@uXeEKE`j7&86JzkuTED8xRC6TjCCS(#b$9WuxZ2cvxm&a +zsdzdJkL&>Er);gyCnXt=lbU*ZLtMSDc2(}uWX~nGahSb1ge+cKlxo8297nn%vLTV) +z8D2Qyw>Q<78ia?tDfOMpdhafRm|RlfaTHP-YG3I*F9)}UE2!nK`g4JkyGvSDvir$4 +z+oSy)ZpguWa9!Y@BOq#dwbi`UmGGDb42@Xs_`68fE^RCSo(ZvR(!(Y7s}t*~fL&@5Iaik4Vr&grxEm)A+pl)%Aj!4U+x+ +zdS6BEN#Ie)amSeT^Nr03S@DNBO#B+AjB&r&hc;c+)sK->>n7>VKJtmA%S+C( +zIw(cYHhH9_=9fL61+yJIj&6+znp}Z6`f<)_&d*d>86M=3E}gJW%dx1i5V-=~A2EId +zo5Y_A39em0dbkgmey294%p?=ca +z^7amTqw9FO){Pz&NGNJt(0k}>myW?4LL}En54QpH?q3mN!f2eLO>BRi%0zJJS?;%9 +zll^XUMe`(M&b95jt7N!e7VK +zvPd&O5m|yGk1z8PjilWmo3V!mD}B&t*$?lsu>xu+`N?E1pFxy?f!Aa}A?uF6@_2Gu +zWXX_87lqHS67{F~i`obuwP%T=PcKQHj-E$Os~*6zS%t%5)Y_?+SQ`g81$&jsbnH!$ +zzDJIcn@1Mrw}(7>L^#-_an~hLyftP{mH4+bxW{yjWA~&`k2R4XXX5D`_4py$&E~e> +zF=F#!zzjl{g#jb9qG)15K~j$nyKtF@P(h4ffZ!~<(CstX?49_dk~nLS)bZCneU;7m +zSd{~_fn<#^`Ioi@77HM|;ySWYLmgb{q2Yf8HWm~{lq^YJ#W`}l;m4WCVUPP^B^{O5 +zP6FVBs_IC)NMpMVlCc$X2))su56Uj>7qpAH(uF4$2q#&zNRv +zukLh(&fb2OtoR!m_?L0am(=d|CF%39W%idar3Y+cB`JGj!UghlRHCGyhGip!r&lG! +z2H_JSvx4F51_$1-EQ)Kngq;Z(?U5u5GwwrG)h1B%bK?Acv%nm{u9(^vlkw)kB9MU2 +zSnq7QnUN(oO60wf!k9tsm!1s!$trwY?*WSjeNLl#_Pj;&p15dL4-!R2C=VgoaZU0@ +zTwlV6eDxDxJ;iCqGgtJfkJlt;ml(pF_g(vEmo;OKV*8%7=dMpnk+X+lJ0 +z#C1vXsnrGdH64ScB1M_&METvsOLDLj=YkQ&q7|LsMC_$*W$Nxw{t^{yBNbq6zQu@9 +z$oEt)d$s0f&Fy64>4o~`g=2HO>_r3EC=JTa2s0=P&J}UhQc* +zJ^X?sYkYg<1&pu^=vmgSHpNvqeI;%)d0~t0OX~sCo5{=qoGqD=xS~RT;fYeV$Wu*p +zw^f1Z&U4(rkx_kDqrl0@tE>EkYc7)~D08x`tLQ;-n?KZ|&C}x#W~Z$tLpxvWi9%DX +z(8%l>E2*`T_#Q_kte|hB)!kZI`2UJ*+Qp?+p@C$ +zJYK_o@l390d~?MwVwrf39gZ}^4oHa}zF>kqjdS5)i`t5fR)@+tG}K+fe5~B9u7yf{ +zk3oq!(WUjsu9&Y%+KK@{)Zee`#=5Y$w|kSm@b`tYHGIPJ5<5?bN^id#e6fA^nGeMP +z_Ot_VkP)&3>NHOnp~QU+cxi?S^7PHH2zs86~tTG{kL3(@$G`Zu +zv;u#o_$}6ZiiJ?3&41?PIv4uj(stK-an?Ju#1@5d{T?>QMzixii!qHZ3e*tJ%NDXI +z3CTj)FCDg|rjZXw$;@ao!UD!reAHhnWzvqg+2&pZPb_7&V)6)@m&|e?1Y7_-fieoV +zGHr+z2_~t +zzGniKYr0iU`tVm7*EK0l_q5ygV%cFdv@KYlF%)wX2mxA>)jBR}<&@VV^rjWI)3>x*Ht-mR+5v=41gXh=h_{ +zLk~Hx!CJbN9Kul^w=IJ7f}0u1L(bpmexS}wsx0nU3VuG4;)BxtU+}n$X1#ISw4zef +zIE`xz3MKgN^HG8~PRi3w-oVRTEHpIHRkeAJKY7jVkpd`a_{g(}A}IkBrePAv)-=@< +z(Y+%$kz~{g1<`*pOLY5kG&FsVZm_0#hp5zIWocDUY%vcbb~4l|d0@I#2O*ye4HzLq +z-OCjuK_DHFyxGAuFKW<1VG&1QJB_-U1F9X6UbRU2wi5C0r`Ekd!Mgrln2VFE0WGZQ +zx** +z`Dd@SeL=I~c||2ri?Vl!4uJ5;N#kWIU91(A1V*o`$KBvX>&<~6*g4{%r7=m}#=jL4 +zl-2Q6-+wZy`*N%zCh=uRm|#`7RGgybWCP39Vcf~P=V14k=K{KY@lyGxlJnx&uf^a< +z=jY6Ml~7oP{opGom~yp%q(cS%LQ#xFJ*J{Gxw2*+sulx2s)+7*_4ZD6S>V+8=%rWU +zmo^$=<8oT6;7LeA@mVqozUatcK%VpO0|cNMmYm@oUK8Rl78{VdRy#mDURI +zgZwn7rlbjxBDZCJK3;lp3Y(AvLkzn{nIjg;Aof=}pi268Kf9?>=y9i(64+QrowTEU(o+d@x{T#4cgipT$U1--?Lye47OC$u%T1E;{pv;(fXf$D2Yxg!yI +z37a}vQ7uxF9I5w8^6D3$aG<&Omy(nJIY;63znFV|k#_HdH18Ne>JF?kfk)qe`vrNq +zL^sCkxA%{*z&IwPFN`=TTbQ#BG<5evQ7fypgrgQ%y3yl|e;{wFG8^zm60~2;&jEw+ +z+ka6>Qjy3X{FMDnrEw`ZP?`H724HMkfyNlU-|9OX@QppGysa`+rnTC;qdxe4Aq7$I +ztDXfW#1y314lw!B+_E1A!%uu2g~6!4mG!&QG9JjER^`lR2s~3t#dfmFnQ0&wP_#d# +z0a0n3CFX5))zbW1qO>rMRDyS`M8iTVhOQub^+$Wh`d~yx)OJD@B7$D4nAaF6tBzdx +zvJ$*Xw}R?~g;|UL^;4O;7gH}JnjhCA5j?Nqq@$nC=z=!Qr}moNP{z&`jB@#m%S0Pe +z@jX(zc`_BE=*B$!gA4}S)69uJVo$YYpKb?3akJk<*a}*jxbg<}OpNv-4`dL!{U=0Z +z%9lQ3*JChG3(3;J>5&0knnr{^4n#9|MIn|COg4QJ4av-yVOnoeL?WRf*=E0W$?pMY +z2;pcLKVd;eK{q2m@K%6t6cQ3ibv$w@93$epX@u?jS!E1{_`8i#n1LQS0)BkNv|z|o +zhAMZh=f2dy`a5c~K4BxwOUN$mo+^mIiNv&MeT%AE7R4_3v1t$mhO`f*DMg +zUOsQ`WlBLc2?%q_N2rlI{dGp3%&4&%MBW_thnzbXj_X50A*3=h-l#tQa`T`$tCDV~ +zr(6t(IvCq4qH(-LK<<@#F@dB?NjMSey?g7u_?jIjLRWiK_;nH@e47aesJJa_m{Dd@ +zx&XsWVZ{>oolBG*4Q^^7h>0Ai-Ik9UW%Cd?<_;eKX#DwI#81p83;Qn)8S{mQplNgq +zsM0k^SZUw(xX4I5L$K~S311fL-@sqmAir=RiIK%<8pBZ6YBWJtF2*)c)*(@cj~UPt +zkLZ2s70l*xvM&erI54Kec~U!Ju!N42&k3|oxYS!l%7j1zU~t@vY#_%AW}^8nF;X>y +zMg^U|Tksgj^Qg;Dy%sr1GVNPBLm5<#{*B(T7UFNA*! +znJtV7vAyMd{|>6(Fm5{LGgZE3>$6>lg0%8cZIGJPYFLG8w%oDK2J1@83`&W2&6u>ej}va(;El-@PFJl1Arr9Kn!ZLQLRYK`=UA3-$ZKA=lPJS(XOE1E6MEu`ZoTgP7Rp4K}5v7ZG6!}g`Xb6%+8Js-(d5FMq?f?DKqet +zO;7abkmS1@J5uu(5OBFASqdE34s$WY7L@PJ(yp<>Y`e^D8PpM4wmt-uTm<+70p8`A +zDNUnEloWNfX~NNM6y?w5UdaiwcAId<%pO?SCV|QYL9*)e5-eJd!2E}j_iwGvz~dh= +z&-fob^Zz9@viygDhoThG;fpbqf=0rfR<;p0b}J=0c!0|~pQ>c!MhyOd!w?!8Hy0!k +z#+4*73k`*eu7N#xbbF{|QqVUbU^=cbP*%BxhWJ}_vfuyu@#=$c3`gysd%Z@}C7AVK +z_r3Hq#W@S#X(0{|Z`(#=L@-nv8WH8iOef!y1FGAZnM(n2iqHh0+tQa)^)e4a`vk=X +zz=gRY&=G)?VW%@*p)|nad>6}Nmo#j{pJ$7TDW+m-v~U4^^Z}WkTK0StHNJ(-KL-ln +zzgn%r))DWa(HIR4_e&{v0qEaA?&zu;w`oyZbxek0!#^?D8>DtIw4A1mpbu-`DIcIk +zN#Vfaijx54>$^N&z$QR2t&PIPuW0*=RH;}i9~jiK;n_)K>C(cg!E#!`mDz~SQNUqy +z;TK+US0ailrYi4k7z#Il*`|WkwLaw@&O_);BUJnS0Rw%9=7R5kLw-S6NU#S`nUe&9 +zy?2r~Zlbf~Ija$fkDu?U9NM2=!w5Lq~WDjnnO3mIBOl_r}-FDk~twDwg^S5E50dpG?NK+nye53?281NxMj=x|dL +z3U)mm{XO=x@vYC!V%A197StLjle6Bffwj(g1sPU~p>R=AAQ|V+W&1RHbG|Mp2|5L` +z?)9*dek9tDZ16GGO9K>k8^XnLPR!Tps0WBXDgA)zu*L)?qZm_$Ko#k>^kT$KSuWlp +z9^RTm7qMe#cY?u!msvwZYW#TGO)$j|>wJ{TnI=+n-_ix|-qNd>z3hiU6}j~@`>GG5 +z4qz_uI!&*y7#3!wm8tjzoo>PeEa>G-vq~8ImIvvS%5wN=C>wYgX$#|q59J#aMLUF* +z9px2$I@3xUsp8x6ra|sBOEh&>J7CIPq+RNvQ`sp(;`TeKhJaDTVV9u +zJFdRzT=?1Tzn|lJlVCWZ_*S-td8o(bR`+UGhOOAzgSDR@!=zwN+-lzUXpJVgH`T6l +zXkAm7g-4|AlB5@2sM?N3X9@CDfoZ$IhyiQZC +zcq#UC7(DcD^QqE)XHa)e5p#5szgPoR{-+~t4s8B_9#D0GjszZfejMDt5IuK)SFh0$ +z>Krla!&j{;UF-Qlfq2d}&kxtY7G&pMx+BIot?2La;eybS(8(Rn4`)TlK1i8+dLKD# +zB(3^2;PCnSg5~m0aDGQ1s>!2H>$|#}?-S~cH2OUO +ztip;K$!Z=Vh335AM(YB~PR07nJKUk0hSKWpFW&}K!rJysk~JEy)#O^j@QE3y!!SGR +zJ8+b#R9LDJPSmr +zUY+A7X&Ek=14%QOc6SC2oVUvL*RuQ|5wD?iuOsa7{O5>9t+v-o678$6D0qCggHu*qDBoZb!HXH1N1uPfH; +zZ-I;o#`sztF|Vpp>b~v!o4Moe%n+L__X}MzD6_vwST+Xxa(V$ZB{jgegRyn&iqoOE-z;=E5&7s?*}W=IoozL8q6s=MZqj}KX(WFE?O1% +z2>@ZIofCAGQ8qJXi6s;N?N#Fql%mvcgX)Z`h{q($-~LN9yJ0?$y`MoAsmES;sD4n* +zAv(+$<+nzz%(%S{02F(QM-37W->M_5KT(FWtkK`Z2&MV?E$PE9T#Z4{mWcAmleHj< +zYkFZ3DS|xkes{1L3ncc}GCo49sH-T7;^wcY;0G{unPa7ZEi*Z93dR9GauB5>`%_#XdGOSQQ7P3L4c#Y%o; +zkF<1Fr;y(Y=H+wFDBv#jqeq$ptB^|WvYu)0@JfA-h_UOA{2r^ti!*tT^v?ow`jjjT +zpCH8t@fv+pi?KDK|J3vQ6?%yu5vms5hKcn?2&rhdfmp$iw1NKe;nuQ=%+~0h@v`sv +zo_;x^HqR%xGU_h;7tjwnE%Txr(weTrZ!^`~m~*(=zSx*_j@oZL#652bmwaRrLtFNn +z=#<#EGLNp&f^c=sU0&XA*j}!>y$9TR_nzj5tNNk2_@NI>*46Q8_ZKJ- +zYH4mQ@TV_{haw|d@K5>kMfYCiDg;seHub`P|eQXDIM +zmo`dnfv|NRd$$fv(83}Co5!I7rZ~IFPSR{uv`(K1;>giujw>pmwtJ~X(FXfxn$jU_$esW^3=-4iw*n%uHT8?S9+=F8%V9D&aA!{GKmk`nuZKC0MiBXlQaC@?XR@1! +z&n!+(7!L8h+DPdUlA1sp=mPK}P$)OKVf7C^fu568o*G$;JLh;!5BNj+*4s)LfdLAX +z&1KVsNQWo12s5JMP#eu1J;a!s`D!B^@!6M5C|W7F5{1nnI>t%MOGx;ab@CZbc@Qk+ +z3IlL(NEzQZoO)okD{PX548>D*v9-N8XPDL7!O$6e!XF;#NGOjuV}Fm~%r-|keIUw? +zok_2C=E8>I754aNzag7J_Pp2w1$2cDI +zzJA;lebw_E(DtjRPBVxCo&WUkzNv6wTzK( +zt`;Lldp6m7#HMgW4W*T14@gc)8Btlr$=fyD~;~w+#=bHGm^1AH_RdURh`4y+zu2tm>P_0Z9Jep@a +zUuKz52n;8FA|mY+&h-vl^tF&0i_$zC8jXQ2aLcq&vt9MnP8G?AXR4=w3%psuXQVQO +zp!es_u8IhC-3kHOY~yTQuT77<&i>5d+&&MdD$^kB^GC7Fgrzg^wg7qUE`?ib%T5 +z2r!M9Qh)zNuY$k2=ls;t_r+P>$>|ZPkwl+R%2?Hq${eZ9!v9IK6pJy0R?RKc^7) +zeAG_-2RY=jK6tnhaDzpoj5J5;m*f}xgApYND=4)^S=l2@2V~iqzB2v=0_8o#;(4U+ +zQkvPU8|g%mpzp&ZetZIc*M4r?RB{>GgPhES4YZ;Q;x{I#IUmPiei&sQU5um~SkW)r +zA;WDUC-oK&vaYtBz4k+-XrMwmD*1*%NkZ?+NwI2@f{Pg5T8w!6sHiC@*wSiKgvy2N +z8*+EjR5>l)MPWr(rO)lpBwc7?ntYSrL$sn};Vo+#G#mi)2I|dXKGWe5+EAq|`UsQX +zYG1Mtf&cNQgV8Ns6*^;(z4^xzAFdoEL-qAGiWqNX?40hA^3iOxV^cEs2gMtWh`q5AZ}5Y9h!2;yGtka=4)q7 +z!QEEDUWft|=FgQEmg=S;5|#^iPLk%X(5 +zr=+y9lql%}(3hXH%aJ-YA;<|e6lYUjyyu~G_N-RmHYNwn>V2Hx5aP>UCvrJ0s$lY{ +zvv!~O`V&oGoAwI3D@{)=hkj>43^!Q7y$i<~`2vIw?HFS&e{PIX88CS4;2zDkFE1~d +zZlY%3E+HXlMu`JJc|X||pY-wNxf^~y*(QAZ{()`K6QWYTIF*kXduh>{+t%k}IdEq0@V^-h8onJvkm0V5Fk8_;x&3ibJ*!0F +z&K}13oC7q|*8$PYQNUh>!_NB4MFqaQP8=fV(m|>Qu#D~%TSG9toXs>cL#VA$!m_@& +zHM0B-uB_2#HhfJ4m1!gVPIlyFwpJ9vE@mm4zmKlu!-rCuS(9c%DCb8}C2*DsxdiNo +zS%@t5mofrodYlpqC(XG2G4L#hD8!}|axM+R9Sdr!$Q!jKi6!v+0m7C1?LL_67bg*OV@OV@qs1oqSZ^($!g7!&~`YLIWJIGwhn~!C*?J +z?%VNUnF4Ik2`JpRDw8q>CIjTg$|uG_4E#jN +zJMwBs7goHmuAa!VQqLc`%=_;7uFN29M7Jz7onV|DkxCth) +zb+^9T4VYP~?8tMQ@0%8{NP`(8KY{j%w}pRlNV7fIkn|Aaf&I$RVG({F +zz?V)(+g1R%?|Ss|P%oZ+%q$c2(c^}H0w3DUH#??me{cO`x=HHY9@7R_;K8n25N5LZ +z=2bg<90f&at+>`nEUQwd;^WV&;dq=lXCvfjj#V+oq$#(fTL(vzM(oMCiY_&V=9SQe +z<78xee6=DOo$FH^!*pSxT!m>|=X8o!+eQf1h5h|ruM~ZAFVs4*nw)zt1ugiicY9X3p`2I +z1lu&xGCQpcGOk|GbT3S$5CD_eL@P_1zLN7f%@FKdMhc=RW%KknD+k)1N#C;l7r`Ve +z&ZWL$6Z^ANrPI*tgOdj~$FTPqo==X3?+=uF(!{Lyq5RFIkBzo)HQ?e<3@;}(jpXov +zv~wT34RbP+4dYqmbKv~!xc`jyNXX)h#k_!) +z*JABZBm&pvR0P>$4e=L?Ak^4xWYRIbJ8`&tC@yrr^qK{jMA`wI6#L4I@tO9pO&L}g +zxR{sN$O3VbFnsUVu2aa@eC&TNNe>>1R<@iQ+|*T*#07M^HY^B7tufLDu5sz#=IZ6U +zzr&u*0=`uZ9fb+xh>YmwOiAqN<-!;t^u@`8Tmm62nGdK_15VbBi69G-@O1+{Y`6)+Glc$ +z=wR?+Vm%a$6)IG9n$6>xu<4;!az?<}-xE=*$iwCX9+FjQa;~9FSx>?E2!vyaskUrZ +z%21y~sWl`X*~$UjH#m23rGt?yz1GGmHaGF8A7|1MrtF6+dHKcWXAoWPN;eBuGf +z@P7uVr#o%GKAI-O>?TcCHyC58V6`vEvFG&UgAO1jX@?u$>BxC9OicVt<4SRRt83#n +zhoD2nP^6sVtP=z1FxL{c-J5e^cfqxkh}ttS2S6YE6*JQb9Sh3|WakMcOS4N>=C>=| +zW0C<%AYqrosXeL?U5DvnI+1RQI?@Ib^w#5<^H){|8%F_-9rw~-r%MMb9uneT_fA@7+5 +z3Xu`E@Csd0LzPeaYFLL0#ws8a*^|WlJYPs6?8)^8$>5r1aO}``&Yy| +zqXpDW>slNTlTCF0wPTj6X4!R_1j>5cT?}Yj?-6P;Z)XXqbgemnb#rJUj5#U;fDS1g +z$O*krlOr4(gx=ZKd$d0St{L<*WRLRasn$FQ6#xr}?k@F^55$bYvC8|6Kl<;8L%C+S +zSgmpL$`9;*?i&>kxWx0v91g>B4}B|#b_;dE*PiSEafFUIKpm9yH!GntJ%1NiaJeG^ +zJ1Qi|KD-L`;Nn~S#$$0xi`SgarK}sl$&+3MExeEd!%lU(!M9RfQXqoDvT#2GgI{I{ +z$a$l{_J`$y5|)%Lq2%JSS?SB?P5;kt!MXVdMnSjP4E&*d?|3(r%kiqI&z>CaS^GL! +zMQ9jNGwfOfWQJpE;CSjw7?DS%!xW0QtKsl +zXf(FVAwAp$t7u%W}$xEfHgEbBq_fi8!7Mo9w2#y*euwkvsbACXd^RkzDNr~3GF1AURIy+xk +zi@pAA+6)YI?`O`;vNk>}uReh1(7fEEmcAFdm}50Xxq+FQ5W<&K1@#`e+FEL`Ff%d~ +z(Ke?!V!YrIc6MCPJg*@_$2W9Astx?^|Z@VgD;7>V?u{|KY36gC8;0#ODC~{5nkrV +zFhogEB$k!@Qa>ACiK)2gpgdR^l&i!iLxV(tr2D4Z2*lH$-e~}|-;(2ykxeh8opN7q +zE96fP=I&v5G?vD6QN{eQEeR#I@_l?L$}E*C!Zw#-9WN=$F{fqmPB<8$KuB8PsQYrN +z0f%|;A`)iQNz6{p$ZHIpL8cg@0?96}Ro^3BFLM+`63)NL;oV+Z0CK+eF5&k`YbrI_ +z0j|3*O0TlzAkVMQSc^MKaFnYs +zHpKyQ(UN6-Znvi&EZOM<%^tZg(%r#DW1pU7O%)>ZFiNY-pl0ql6M#<>!=I*+79~1sJj&P#zRjVrW5Zm5{2?u~1iRX{PobO_rQI +z1hpp~1(f*<`nF0Q=c^x8=;{UMDj7#8j>#fH#n0RgIE3d?=}pWc287(?fU{em2}(_@ +z*i8F}t&Z7E5ftkY7-7mk$%A$3o-oeX3-gEcJd|4}+c~JEkS+G)PiI@mSvklr2wqOc +zlMbOWLS7!WP92e2x9@Z&n&WP%R)DM*bH$4Ty=#<)j!rE4)U=5$jg)aUU)!nqk_0Qs +zdom~?gP-VOaos`qhK_{RM_3UDnp)R6?`N!7HaEeFss3u*{(*@#+k|I2P4H)Nq&aize +zPCnBt%+ZhF6!!(Mu6VybwDnv9Dde{rwu-Kdb2MP`)P>Gqg>aGbp)>r8yBqCXoI2?m +zM%Dfk>pFsU#oG_(i!ak5N}2ug%-=%$8z3$IE-1_v8YqLXj=TeIDK;6Ja%(`Z2=95;NAQweQ>&y_nx38@ +zKktR31La6GH6IlrPw9xZZ@$=fy?FSG>6C@NJh^uu7O)eGf5m`U^@_HfceB&H6UL}g +z(b$CGbpq;nK5*);Z#3|_e7w@*_{WRbXn*oU#GE?(gPDfgAq02$V6jB*1ImIl@yE9a +z3L1Yy!AvYseu)N`1)=c(y}{w`Dz82BFc0|^>d7mU^C^RAo55ttCBAW5X6;+pKM6WC +zU}&?S>#Uadp!Zg<&TMXcin*P|aSJBpI3O8Uma^6f0~{r*4WX2&PmBDn2hz(I7E0)&MvMR7Wxoq)klz7uzrlIRF3v + +literal 0 +HcmV?d00001 + +-- +2.41.0 + -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 01 18:17:01 2023 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 23:17:01 +0000 Received: from localhost ([127.0.0.1]:56331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckn-0005Ix-0C for submit@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:01 -0500 Received: from wolfsden.cz ([37.205.8.62]:42462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckh-0005IP-PP for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 18:16:59 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 0DD50261274; Fri, 1 Dec 2023 23:16:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472606; bh=F/zTB/jHQaqCIp6L1dIbS9/0kzQIF7/s8iRVDrnu8P8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sEq4Rf8SLDAsjhozfEsMEwRDBjhiGznuO6pJPmQi+7ZAKeNaHEom1OTzMjiNq4uh+ 0JFi3wqR0q0ZP5dsrdXD4lnqyBuDDe5vzqc5djsvd86KKrBJsNN4NAH+vwFjNQgoxB dhxBgD23NBY6p7JeFwDiTN4e2q13+0lizYFcpqWPS2DgyHEnzfFD7Tv2xybLBPhIOw +NxEVyL7eD/IU0hM5p6J7Yy+O3GRKJNIM+LFe89fayG191Ou2BWvKoeCS1FpSOtoHg k1w39sJ333Sai7SxsbLxm/2gI/LrwqeddV/scIRTlPSsfSdwxc7xaXyoLxHSGQS0Sv aXF/G0dzGRBV/P1xUIXNayG8IJwVKuwAqnlLkPIY1ptLsblfeHx/NV7mGCYe0HEbf8 mdpD8R3dUB9KcU6dAZ3sMVKarV5KgQmFOYn0P80iZBJN1zSK/JNp1D8DiGiJ+gMZAw 8TXNLRGnHZhZ6hiP9mjlYyBOD6pMR9GAwkMweImtuHTdix+sgXONP+lynUX2yfUIL1 PYrNrgTZFWgkbFZmO+LwLu14EaH43iJX7bIIJU/0Pr1srQ9Jqi8mprBurSqZANYBMI AxkjoXXYLtn5KnBXNy5sTqf6LkDckWqqazzqqkJ/15F1UCcJPHuyvMXdKBJ1jInhgI HtPkIxfT1jOAptMBASYQyXqI= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 6799F262C96; Fri, 1 Dec 2023 23:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472605; bh=F/zTB/jHQaqCIp6L1dIbS9/0kzQIF7/s8iRVDrnu8P8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XBW9vpk3ZedSkZOz3WevKDlc9UKO9vorN/4ZrXdk72EG4ROQF6UxxJXG7tZwSfhKH GcyPR8PsTukLHsgVNqgpGLNqA/TdWk2Um4rO0OzNhSMhscJFVfz5SXA9aKf0W9kI7O 2ZfIMdbN1nCscslPqIaqotj0vfQ/YxXg2zwCfcrglY+8pihrUWaf5zjxS6DmbEo75P eRn29Jfa5fSMDzRq3TKplp725/DrBv2M5K6fpuEopoKU6/Bo+/n+n9FaJeS7ac58Lq MbAq7uLuKWHkPfy/b6XmmaOuFvTG04bSIg7vzE1tYvr2BhkfQW42IBJyuBJetP0M71 +gQaetf22JWJdDNt4yxYcW9VGeRdnJGRkaKYRPKLe8SJJ9+BsT3z+xbclP/g2nwjyZ CVZsPxf7LPmqLCUJ3S6X5zuAN4kTvfWBqZ1fqVfohzgYgXf0Hb0JPpp7EVVlQdumwo UFUV490Vrz0cMF4pMk22QgZ5o1qZQTZHBlqYUVNxDNhMnhI25x39phxoaBBq5tIUwV u00vl+0ph6YZFa+F9S4N1FcrLDK4l4C8Z032+6Q1K/AcCrJV2twzb5/PZ3jHGAuctY qsnSOEKp3OJhsmAcfzP9odrzxB6k6FPhGVNEF9MPpHmRtuAaXOma8Yzn2KBCeQ4I4l DtWr3gNoYE5+yz4lZinnrCug= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id fe204cea; Fri, 1 Dec 2023 23:16:44 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: 67557@debbugs.gnu.org Subject: [PATCH v2 5/5] gnu: libtorrent-rasterbar: Update to 2.0.9. Date: Sat, 2 Dec 2023 00:15:17 +0100 Message-ID: <921fd74462b70786e61ebffea4c4f23d771dc3ef.1701472517.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) Update the package. Since other packages do depend on the previous version (and according to their documentation do recommend it), the previous version is exposed as libtorrent-rasterbar-1.2. The v2.0.9 requires patching to get tests working. Sadly one of the changes is to introduce new binary file, so it is fetched as an input and applied in a phase. Snippet is used instead to do the rest of the patching. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[version]: Update to 2.0.9. [source]: Patch test/test_copy_file.cpp. [native-inputs]: Add the missing file (v2_empty_file.torrent). [arguments]<#:phases>: And add a phase copying it into the correct place. * gnu/packages/bittorrent.scm (libtorrent-rasterbar-1.2): New variable. (qbittorrent)[inputs]: Use libtorrent-rasterbar-1.2. * gnu/packages/enlightenment.scm (epour)[inputs]: Use libtorrent-rasterbar-1.2. Change-Id: Ifbbbf02a671f6a3db653499a7a5f2504fd23c255 --- v2: Drop the patch file and instead do the necessary changes using a substitute* and a phase copying the test file into the correct place from native-inputs. gnu/packages/bittorrent.scm | 49 +++++++++++++++++++++++++++++----- gnu/packages/enlightenment.scm | 2 +- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index f9098b1a56..7a96ac08eb 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -80,6 +80,7 @@ (define-module (gnu packages bittorrent) #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages xml)) @@ -416,10 +417,16 @@ (define-public mktorrent (license (list l:public-domain ; sha1.*, used to build without OpenSSL l:gpl2+)))) ; with permission to link with OpenSSL +(define %v2_empty_file.torrent + (origin (method url-fetch) + (uri "https://github.com/arvidn/libtorrent/raw/v2.0.9/test/test_torrents/v2_empty_file.torrent") + (sha256 + (base32 "1hydgf0m9193hy9010wl0wrbz4k4cgrqg70jakx68pgi79jcqnrn")))) + (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.2.19") + (version "2.0.9") (source (origin (method url-fetch) @@ -428,7 +435,14 @@ (define-public libtorrent-rasterbar "releases/download/v" version "/" "libtorrent-rasterbar-" version ".tar.gz")) (sha256 - (base32 "03p4nvsll568zlyqifid0cn135sg5whbk7g48gkbapnw92ayks7f")))) + (base32 "13kry578ifzz4m2f291bbd7v5v9zsi8y3mf38146cnqw0sv95kch")) + ;; https://github.com/arvidn/libtorrent/issues/7566 + ;; Remove when resolved. I would hope this to be fixed in 2.0.10. + (modules '((guix build utils))) + (snippet + #~(substitute* "test/test_copy_file.cpp" + (("EXT4_SUPER_MAGIC, EXT3_SUPER_MAGIC, XFS_SUPER_MAGIC" all) + (string-append all ", TMPFS_MAGIC\n")))))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dpython-bindings=ON" @@ -437,6 +451,13 @@ (define-public libtorrent-rasterbar #:parallel-tests? #f #:phases (modify-phases %standard-phases + ;; https://github.com/arvidn/libtorrent/issues/7567 + ;; Remove when resolved. I would hope this to be fixed in 2.0.10. + ;; Do not forget to remove the %v2_empty_file.torrent variable. + (add-before 'configure 'copy-v2_empty_file.torrent + (lambda* (#:key inputs #:allow-other-keys) + (copy-file (assoc-ref inputs "%v2_empty_file.torrent") + "test/test_torrents/v2_empty_file.torrent"))) (replace 'check (lambda* (#:key tests? parallel-tests? #:allow-other-keys) (let* ((disabled-tests @@ -473,10 +494,10 @@ (define-public libtorrent-rasterbar "--timeout" timeout "--output-on-failure")))))))) (inputs (list boost openssl)) - (native-inputs - (list libfaketime - python-wrapper - pkg-config)) + (native-inputs `(("libfaketime" ,libfaketime) + ("python-wrapper" ,python-wrapper) + ("pkg-config" ,pkg-config) + ("%v2_empty_file.torrent" ,%v2_empty_file.torrent))) (home-page "https://www.libtorrent.org/") (synopsis "Feature-complete BitTorrent implementation") (description @@ -485,6 +506,20 @@ (define-public libtorrent-rasterbar desktops.") (license l:bsd-2))) +(define-public libtorrent-rasterbar-1.2 + (package + (inherit libtorrent-rasterbar) + (version "1.2.19") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/arvidn/libtorrent/" + "releases/download/v" version "/" + "libtorrent-rasterbar-" version ".tar.gz")) + (sha256 + (base32 "03p4nvsll568zlyqifid0cn135sg5whbk7g48gkbapnw92ayks7f")))))) + (define-public qbittorrent (package (name "qbittorrent") @@ -506,7 +541,7 @@ (define-public qbittorrent (list qttools-5)) (inputs (list boost - libtorrent-rasterbar + libtorrent-rasterbar-1.2 openssl python-wrapper qtsvg-5 diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 64d8945f8e..7860c43fef 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -585,7 +585,7 @@ (define-public epour (native-inputs (list intltool python-distutils-extra)) (inputs - (list libtorrent-rasterbar python-dbus python-efl python-pyxdg)) + (list libtorrent-rasterbar-1.2 python-dbus python-efl python-pyxdg)) (home-page "https://www.enlightenment.org") (synopsis "EFL Bittorrent client") (description "Epour is a BitTorrent client based on the @dfn{Enlightenment -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 01 18:17:01 2023 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 23:17:02 +0000 Received: from localhost ([127.0.0.1]:56333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckn-0005J8-Ha for submit@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:01 -0500 Received: from wolfsden.cz ([37.205.8.62]:42438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckh-0005IK-PU for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:00 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 2CB92262F06; Fri, 1 Dec 2023 23:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472605; bh=O+cE/lgiQ1/zHJu6YdxBL/E592gitPqNxnHAxgKyrVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SA0NUfcAKtuGoMJpbvvTMsDpkOcFS0UC6K27wI8bl2T1JNr2svDZyWPHG6e+bGeog fobY4lFLqlZfvdEYQEHH9us5kNq42Ux8bxl2DzzhszRJK7TLkAeMoJkSAJHoXoZ0s4 fljbNm3jnUqETN04WOf8v8bWhBpyMYCU6ASzHoEF11Qv+lPqiBC1IzW4eQ6o1D6ugF 2z7HdjpSQnClDQeQG0T0EHVeT43FIgIVP9RreVR5lmk0QgXWOq3PRf4t3Xtyesx0ox ERd2P3pj6q1xm0MeYTvtR5rFhOjxpvb+nJkv5rxjDLVnOeTNsWBJLpxC+6HCNnC7yv dSoYkYg1gyql3fTdOmWQk1Ya+3JrCVBBMJS2/5md5ATexI8el4P2TeMbQa4jH9rH6k RSZaEOG969X1PaTUm2PhW+fq44YJsgTXpCHLhBN6YxMRLUM2z41329mmXzNA4GH8Lu wVwvtuZgLTpS1ZY4NoPo79dlBfPT/e+M658UKFpwsuCumlQhqi7E4Gsh6XYEWa4F+B 1uh9IkWm9ADpFxFM5q+0Fyq9fSEMNxh/LvX0uvDFV4A271bVlQE7Ar1W78SHrb99eo fXCFb2wGkzyrpG+qyCEAHCkVKG5QO6GFQCtUT9QlaYRDhpkJkjvk/2nK7DaZlBVawY Jnb3lT2yVX49PXoaEtwrUse0= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id AF093260768; Fri, 1 Dec 2023 23:16:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472604; bh=O+cE/lgiQ1/zHJu6YdxBL/E592gitPqNxnHAxgKyrVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MYQ9eyXbiyWD4ASB4KcYQHPLysyHdplXLh6AnxXld5XidZXeoFNCCxZUtg7qBPkPv MtZoHvusawjv7LTvzcNyE3yPDlS79OPaTU3+CM73Ar80Li0oczCRVYm9cgf03k/5zF AuHjam+dIAyL9xlsA3WtsnVmAxLDrmcFzJDbgqz4InnTzNB9djGlRcgMRX1keS9bql MKTnA1O7pVq44dAy4JJ6qEcCIQ2mZp91o3ndxoI1aN58G91pyveQYEbI7JHjKQx4Df vmnqPTiuuiemrJhgW/kJLHFse4HgC2GfbinNRQ9vQGfkOwu0Ch0ES2ixEhknUhbtz0 NdjNy7otKE0WJInThYeUXrZesSnzEhOkoFUvMmKjvZUAS1FdGRgAJzFXhWcULYS/bO g+R+qPPwQjSuE1eeJ37gEwQhu9vedlIwaNNVADFbkXgZ/g49o0EqRzgmpfiiifzrt0 C0gJMd2qGDezeqez2GqMH/N5j5636PyatesL8mydQMs/rSFardzmJ5H1ybktYQK/KK n84tqMKU2Pl5LlX/DwComWbH0y6vn+CcB3A3/zgNdHh1GHUTuzAzYL9WU+Fyb6eEn4 Q1Yv4Q+QCaVucVXTu0pvkvMFOJcwnn4dqtsLSntfVaCvqwcOnkXv6w9RPidZxxk850 D8g8pB3tOQl3vusufYC/L4+I= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id c29da741; Fri, 1 Dec 2023 23:16:43 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: 67557@debbugs.gnu.org Subject: [PATCH v2 2/5] gnu: deluge: Update to 2.1.1. Date: Sat, 2 Dec 2023 00:15:14 +0100 Message-ID: <00b037edcd941fdf3a288c9212ceded8f182821c.1701472517.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) Dependency on nss-certs was added. Most torrents do require SSL in some shape or form, so it seems appropriate to add it by default. * gnu/packages/bittorrent.scm (deluge)[version]: Update to 2.1.1. [propagated-inputs]: Add nss-certs. [native-search-paths]: Set to allow locating the certificates. Change-Id: Ic6c79f24851d6917dc4e5b22b3bcb2f6b99e187a --- gnu/packages/bittorrent.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index e115c13017..3d79a3a159 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -46,11 +46,13 @@ (define-module (gnu packages bittorrent) #:use-module ((guix licenses) #:prefix l:) #:use-module (guix gexp) #:use-module (guix utils) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages) #:use-module (gnu packages adns) #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages boost) + #:use-module (gnu packages certs) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -574,7 +576,7 @@ (define-public qbittorrent-enhanced-nox (define-public deluge (package (name "deluge") - (version "2.0.5") + (version "2.1.1") (source (origin (method url-fetch) @@ -583,12 +585,13 @@ (define-public deluge (version-major+minor version) "/deluge-" version ".tar.xz")) (sha256 (base32 - "1n15dzfnz1gvb4cf046yhi404i3gs933qgz0ichna6r1znmh9gf4")))) + "1xyz8bscwqmd7d8b43svxl42w54pnisvwkkrndx46hifh0cx73bn")))) (build-system python-build-system) (inputs (list bash-minimal)) (propagated-inputs (list gtk+ libtorrent-rasterbar + nss-certs python-pycairo python-chardet python-dbus @@ -606,6 +609,9 @@ (define-public deluge (native-inputs (list intltool python-wheel (librsvg-for-system))) + (native-search-paths + (list $SSL_CERT_DIR + $SSL_CERT_FILE)) ;; TODO: Enable tests. ;; After "pytest-twisted" is packaged, HOME is set, and an X server is ;; started, some of the tests still fail. There are likely some tests -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 01 18:17:02 2023 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 23:17:02 +0000 Received: from localhost ([127.0.0.1]:56335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckn-0005JR-VH for submit@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:02 -0500 Received: from wolfsden.cz ([37.205.8.62]:42440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckh-0005IL-PT for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:00 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 5545C2617EA; Fri, 1 Dec 2023 23:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472605; bh=9l6NilxYioviN+4WEXvrpnWxFpfhfGAH6hkUPYjOZPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bIdFtjwS4gDltGOJ5qRvOswFiurnB6NpiUEEUn1mCvAHfp/jq3FPe+PZLuij5n9Ma GIz7KQMnrcJqU9Uzjidk4GOR9b0vnyM+Uw9EH9d7SReFUtEScFMe/wkpxBISQs3RlF 3lLZLPSIMKXhzb5R3stmZh2x5Q8lovmTPpGN4sEru1mdpOhsYQrWFY4Kbq55p1U/HW yZfSGwqoobuEOaGk/17qVDfyd37behb6ePXCqjTw92q7e/Nydbvaho/PNL5yDGwxqF qlu4hRK6n3qWMfVouZwS2HP18gSRSwn7BKZgMpMe25owV2HzEYeR9bH2R6AluLDpsj vYfePAmvDKx2ZcYRnncjFlFA4ERyi9Kc0L1JVtijYQ5cG//bPLpqNEO1NDhITyn3LR pe3o58aIlQkG+MU9qqV8d+QlfJCkBTgo72xfCe3Ir61K6ydqTtuPYgDw05HpBtG/qw 7UDkcEmXT9/TXC/3CdF2fNVnbAEb+rD3pfBP3dwapX6SPh7sBLiqnIRgrVI24fAAnx 0sdnus+HUm2GZppeupRipC/E4abSqXSYGRoJjsHET4WT7mZUra3l7vPlMRZuo3UuS3 qpvO62vVzOJm5TE0pb9KsPDexyK01HuPJaP9yrj4hiYMTs2jtZ9OoaINf2Q+oQJph2 oePxFcPTsWEEeMXdpRDIe+Kc= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id E9A86262A9F; Fri, 1 Dec 2023 23:16:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472605; bh=9l6NilxYioviN+4WEXvrpnWxFpfhfGAH6hkUPYjOZPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bIdFtjwS4gDltGOJ5qRvOswFiurnB6NpiUEEUn1mCvAHfp/jq3FPe+PZLuij5n9Ma GIz7KQMnrcJqU9Uzjidk4GOR9b0vnyM+Uw9EH9d7SReFUtEScFMe/wkpxBISQs3RlF 3lLZLPSIMKXhzb5R3stmZh2x5Q8lovmTPpGN4sEru1mdpOhsYQrWFY4Kbq55p1U/HW yZfSGwqoobuEOaGk/17qVDfyd37behb6ePXCqjTw92q7e/Nydbvaho/PNL5yDGwxqF qlu4hRK6n3qWMfVouZwS2HP18gSRSwn7BKZgMpMe25owV2HzEYeR9bH2R6AluLDpsj vYfePAmvDKx2ZcYRnncjFlFA4ERyi9Kc0L1JVtijYQ5cG//bPLpqNEO1NDhITyn3LR pe3o58aIlQkG+MU9qqV8d+QlfJCkBTgo72xfCe3Ir61K6ydqTtuPYgDw05HpBtG/qw 7UDkcEmXT9/TXC/3CdF2fNVnbAEb+rD3pfBP3dwapX6SPh7sBLiqnIRgrVI24fAAnx 0sdnus+HUm2GZppeupRipC/E4abSqXSYGRoJjsHET4WT7mZUra3l7vPlMRZuo3UuS3 qpvO62vVzOJm5TE0pb9KsPDexyK01HuPJaP9yrj4hiYMTs2jtZ9OoaINf2Q+oQJph2 oePxFcPTsWEEeMXdpRDIe+Kc= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 4f871593; Fri, 1 Dec 2023 23:16:43 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: 67557@debbugs.gnu.org Subject: [PATCH v2 3/5] gnu: qbittorrent-enhanced: Update to 4.6.1.10. Date: Sat, 2 Dec 2023 00:15:15 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) * gnu/packages/bittorrent.scm (qbittorrent-enhanced): Update to 4.6.1.10. Change-Id: Ic164ee27ea54018acfcba0e9db8db11f119800a4 --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 3d79a3a159..fb20b3c92c 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -542,7 +542,7 @@ (define-public qbittorrent-enhanced (package (inherit qbittorrent) (name "qbittorrent-enhanced") - (version "4.5.5.10") + (version "4.6.1.10") (source (origin (method git-fetch) @@ -552,7 +552,7 @@ (define-public qbittorrent-enhanced (file-name (git-file-name name version)) (sha256 (base32 - "029crx8yd8apssg2k4alnc0py5i2sp3bhjkwki5fvvnpgkrhfqf0")))) + "101a9n2vk9d6b4vc3schkmpc56l0i0i60fcjh8hwadc6amc2ymvy")))) (home-page "https://github.com/c0re100/qBittorrent-Enhanced-Edition") (description "qBittorrent Enhanced is a bittorrent client based on qBittorrent with -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 01 18:17:02 2023 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 23:17:02 +0000 Received: from localhost ([127.0.0.1]:56337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Cko-0005JY-8R for submit@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:02 -0500 Received: from wolfsden.cz ([37.205.8.62]:42450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckh-0005IM-PS for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:00 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 7CD682603E2; Fri, 1 Dec 2023 23:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472605; bh=UkW7UBlhqgylLW8gjB3na6p4uQb7zOjqIjhtBckh6IU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NRdIEL/VgHdzyI+bhzAc4jEfOjUeE/MeLHGXY3/ZGmPeFv3qRYpee5imQjocRIy3i wb+bBX9c7gl23ujBMa1CER7VecQZaNvcBaq10GyTN70pnmqqCDbdLZIs5VGwufRiT+ hWGdhBMBE/5RT1uT2xNxBLLHpvddGKAf9d7Q5fSfPYPuCv7KPbCQQQ8+YDHFfAIwW4 7vHFZTuPzA8PgkLRzv4iJaCO6DfFt3Qkbfm+4k5GTm8BefmZblNNCwAycP4WDHHZhD tEItQlcZtr1t/JedGlwCKmQqE3u9oMSZ0M5/aM8xGUpMq7JwpS5HHtF6Qm3bZipts9 RH8+xuTxJYMo0W+GL7LZj2+Epc/giMG8N/VO1uuIXrh+sFM3LbKoaQ3UZ6Qova6MTr AYm/pH8hKKmQIjowyLvJj0ipDuSiArO6WbmzpkQeD0rCPyFIldUwmW135X1CbJu2Vi 35VmUcbgFrI3lWh12WJ0vKSUbI6zxs/N9vzkng67/vpSf3xFWAz5ajBAMsXAGWCUbw LgD+Yh4ThiMvnycpolzo399E1wsG5qQhDGPTJP9pjyyYEc+g4uguWscfEy87eYvx8K AoVKWqsyRV0TuKLQHNPYPN9D2g1Ieex1NZp2ozS8x1pYqWQ22/+FI7rwtK3qqD3Oy0 x9nUMsOigpqnWWdFBLrNEe0A= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 2BE8A262AA2; Fri, 1 Dec 2023 23:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472605; bh=UkW7UBlhqgylLW8gjB3na6p4uQb7zOjqIjhtBckh6IU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NRdIEL/VgHdzyI+bhzAc4jEfOjUeE/MeLHGXY3/ZGmPeFv3qRYpee5imQjocRIy3i wb+bBX9c7gl23ujBMa1CER7VecQZaNvcBaq10GyTN70pnmqqCDbdLZIs5VGwufRiT+ hWGdhBMBE/5RT1uT2xNxBLLHpvddGKAf9d7Q5fSfPYPuCv7KPbCQQQ8+YDHFfAIwW4 7vHFZTuPzA8PgkLRzv4iJaCO6DfFt3Qkbfm+4k5GTm8BefmZblNNCwAycP4WDHHZhD tEItQlcZtr1t/JedGlwCKmQqE3u9oMSZ0M5/aM8xGUpMq7JwpS5HHtF6Qm3bZipts9 RH8+xuTxJYMo0W+GL7LZj2+Epc/giMG8N/VO1uuIXrh+sFM3LbKoaQ3UZ6Qova6MTr AYm/pH8hKKmQIjowyLvJj0ipDuSiArO6WbmzpkQeD0rCPyFIldUwmW135X1CbJu2Vi 35VmUcbgFrI3lWh12WJ0vKSUbI6zxs/N9vzkng67/vpSf3xFWAz5ajBAMsXAGWCUbw LgD+Yh4ThiMvnycpolzo399E1wsG5qQhDGPTJP9pjyyYEc+g4uguWscfEy87eYvx8K AoVKWqsyRV0TuKLQHNPYPN9D2g1Ieex1NZp2ozS8x1pYqWQ22/+FI7rwtK3qqD3Oy0 x9nUMsOigpqnWWdFBLrNEe0A= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id fbe4c2b7; Fri, 1 Dec 2023 23:16:44 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: 67557@debbugs.gnu.org Subject: [PATCH v2 4/5] gnu: qbittorrent: Update to 4.6.2. Date: Sat, 2 Dec 2023 00:15:16 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) * gnu/packages/bittorrent.scm (qbittorrent): Update to 4.6.2. Change-Id: I75d05f14396e1b017cc939264e30ade625cb7017 --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index fb20b3c92c..f9098b1a56 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -488,7 +488,7 @@ (define-public libtorrent-rasterbar (define-public qbittorrent (package (name "qbittorrent") - (version "4.5.5") + (version "4.6.2") (source (origin (method git-fetch) @@ -497,7 +497,7 @@ (define-public qbittorrent (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ngvvwhafi9mi05r2l9dk9x05za8x35y12p230wpzprydhlgwsxd")))) + (base32 "1wps17iv4gj7y751fibvcxk51v09wyniv6xm2yx429dj7z8rfmzs")))) (build-system qt-build-system) (arguments (list #:configure-flags #~(list "-DTESTING=ON") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 01 18:17:02 2023 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 23:17:03 +0000 Received: from localhost ([127.0.0.1]:56339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Cko-0005Jg-Hz for submit@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:02 -0500 Received: from wolfsden.cz ([37.205.8.62]:42434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckh-0005IJ-PQ for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:00 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 0A7672603E1; Fri, 1 Dec 2023 23:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472605; bh=sQ8I9EYzgafVf7osiSuLyfvj4HQQDISqR+x2kwJ8TNM=; h=From:To:Cc:Subject:Date; b=LX1JyRINyr9i/01H6kp9rMpLSL/ekcoo90gFQFgTAfLOzw26dU2r79wHMn+x/xEce /avL1WMLs3gIYFUz/hUzoEhC4H9HOrjC1VraEYhWwpouTSyH8ECBEovCgowAUvuhjl 1gFVWEs3KMFdXjARZj0BVZYbv2KHHWLpMtVYGu2YgPdG/rYQkUuJ740YlhKhuAeQur i4mBWn0MC8VtB1JTF48U2/4XLTbY3TpU84LKUbox5PQEaSy+yqbEW0CYON/g+DC1/f 4QMCXzqdet5hWV2dCODJwNXyJ3KFOGisvGCOiV9RXdjjFy3gTP1UUbPLb+jthGfvcM NgOgI6jUtyJSP5LjdY92nMxG3FoeH2SIvxn/HLSIpBIACM397ouBT+NAtjZTHS7P56 iUpG/qY/lJs3+t+Kl4zAtBITv3TaQRMhv8thes0GyXXZQj3ma9pt+u76qjEPfvAOU1 fS5t3dOYQ4NI3hjt96BqrKKzS1OGgyCuiughr4IgBBRADgmkrfNoCkRIgp/KtjbPiJ T1V/1pI7hVWljx/OojbtXRz9CvYpDd4pbkZEV6ZBswfrOxlcRRNls47ahL6BwOTHhw BN3NLxPbzRWjImYAFtlwdoZZ8t0/jcNmM1j3eCcRQKKBIhbxYwSgSUEeWjW8IjaMgx L6Ta84gHiAwYnBHQ9vrYquok= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 72B2026271E; Fri, 1 Dec 2023 23:16:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472604; bh=sQ8I9EYzgafVf7osiSuLyfvj4HQQDISqR+x2kwJ8TNM=; h=From:To:Cc:Subject:Date; b=vHjLNobnJhSXBme6k596PynGAmM8tb7xViT4eysI8duQWGdei3LvlFQAUdJ9++1Jz G8fT425FzEGUbxrfHYNzErc+S/BnnKBgTmjR753FIZvQYovJ648Umg1//RLKwYg1SY KduTGo4R4PaVRQWnVFNYdTwCSaPLiRKWM7af9X+75kv1Y969+aai42oWtK1SeIjHVQ zWLlXrKyZCxmdGA9DiB8grh3mwCjjL7t4LL8twtH4TcLF6dxQ6rM8shuh3DhR/iByw e6TImll7tIKipf9hL7AUiDvJGtHjka9nWO/3fMEPIBh5ZWmMMSdX0D7XeWWmKoBozO 9biNBhumvsVRiP8vgxDWu1XmaNuTVeIUfA9pEpIrAu4MyipkJeO4+7IquNBh/HHMl/ Dz0wVkVHiu8lepWu2YJ15ob35FlLIa1bQ+AqfSO3CnmpmRBQfkLYt5ws7gCOTDGwsm IWJdZhXbJxP98ScJCfD4FoaLeLjeWIiX7HSd0hXlmuKSEiyqRxJ2uf7mKlok5NqH/Z imP0y4EEJR/dMLhDSupcqEB0IR/7HY6445mND5pnCzeIF/J+Sys56EIGfbZX6vOmZM cJeLtkpEl2oTA+uxmMRKN16vIp7IZLQVDRM0xTsYCLmlbCqL4F6O2WqzOzHCeQpSL0 hZCqRY3xhfVjFny4mbEYtF+g= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 6a53c904; Fri, 1 Dec 2023 23:16:43 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: 67557@debbugs.gnu.org Subject: [PATCH v2 1/5] gnu: libtorrent-rasterbar: Update to 1.2.19. Date: Sat, 2 Dec 2023 00:15:13 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) With the update, the execution of the test suite was overhauled a lot. Parallel tests were disabled, since the do not work well. Since faketime does cause some tests to hang, test_ssl was moved into a separate run. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[version]: Update to 1.2.19. [arguments]<#:parallel-tests?>: Disable. [arguments]<#:phases>: Move test_ssl into separate run under faketime. Do not run under tests under faketime. Anchor the regex for test exclusion. Set timeout of 600 seconds for each test. Change-Id: I7392cb3ce1a8815b26b3257498082761255535ee --- gnu/packages/bittorrent.scm | 46 ++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 6f75a92cff..e115c13017 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -417,7 +417,7 @@ (define-public mktorrent (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.2.18") + (version "1.2.19") (source (origin (method url-fetch) @@ -426,35 +426,49 @@ (define-public libtorrent-rasterbar "releases/download/v" version "/" "libtorrent-rasterbar-" version ".tar.gz")) (sha256 - (base32 "0wpsaqadcicxl4lf1nc1i93c4yzjv8hpzhhrw1hdkrp4gn0vdwpy")))) + (base32 "03p4nvsll568zlyqifid0cn135sg5whbk7g48gkbapnw92ayks7f")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dpython-bindings=ON" "-Dbuild_tests=ON") + ;; Tests do not reliably work when executed in parallel. + #:parallel-tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'extend-test-timeout - (lambda _ - (substitute* "test/test_remove_torrent.cpp" - ;; Extend the test timeout from 3 seconds to 10. - (("i > 30") "i > 100")))) (replace 'check (lambda* (#:key tests? parallel-tests? #:allow-other-keys) - (let ((disabled-tests - ;; test_upnp requires a non-localhost IPv4 interface. - '("test_upnp"))) + (let* ((disabled-tests + '( + ;; Requires a non-localhost IPv4 interface. + "test_upnp" + ;; test_ssl needs to be run separately. + "test_ssl")) + (exclude-regex (string-append "^(" + (string-join disabled-tests "|") + ")$")) + (timeout "600") + (jobs (if parallel-tests? + (number->string (parallel-job-count)) + "1"))) (when tests? + (invoke "ctest" + "-E" exclude-regex + "-j" jobs + "--timeout" timeout + "--output-on-failure") ;; test_ssl relies on bundled TLS certificates with a fixed ;; expiry date. To ensure succesful builds in the future, ;; fake the time to be roughly that of the release. - (setenv "FAKETIME_ONLY_CMDS" "test_ssl") + ;; + ;; At the same time, faketime happens to cause + ;; test_fast_extension, test_privacy and test_resolve_links + ;; to hang, even with FAKETIME_ONLY_CMDS. Not sure why. So + ;; execute only test_ssl under faketime. (invoke "faketime" "2022-10-24" "ctest" - "--exclude-regex" (string-join disabled-tests "|") - "-j" (if parallel-tests? - (number->string (parallel-job-count)) - "1") - "--rerun-failed" + "-R" "^test_ssl$" + "-j" jobs + "--timeout" timeout "--output-on-failure")))))))) (inputs (list boost openssl)) (native-inputs base-commit: bdbb9dc27a590b08651d058f06a42caa26e04abb -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 01 19:30:20 2023 Received: (at 67557) by debbugs.gnu.org; 2 Dec 2023 00:30:20 +0000 Received: from localhost ([127.0.0.1]:56389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtj-0007O9-JA for submit@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:20 -0500 Received: from wolfsden.cz ([37.205.8.62]:49428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtf-0007Nb-LP for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:17 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id CC9B52619D4; Sat, 2 Dec 2023 00:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477005; bh=PUQWMm1zQN7fYit4zs/N6KwqSQ8ddX0ptslTWzDFcOU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fQgjAH9GECyqOeP3qglHl6kicai7OZUuT6xV9hz0ZZlIY7KKGTiDKTe4f+mcvPqD5 d3Dg5XggonOCxWdIW6N41CplwdvaEkM3GIbPRc7Zm1XB7TBzslM3Ce5ixswFFheItt PKUi91uU+Ml+sPr7MlyhSwrPCzsPiRbwxOjFt9TQ+yvlLGjZk17Pm0qOfgO5GRxQEU acdZPa+vF9GB5pp0MkSw64IN61ny6DKR8G18aj0OgGcV/Paji4ErefSHM9h1+G6/Zf dRDbPvSBaWoa4sNYqe0lAYPFvITpdkKR82P1d9U97wjnroWGAqs3tOK8Fs9Z4dt05W dorr4zOr3SrGNy43OKzSxMiTqAqSoJSQE98oe/0b6WeDgJnvwjm8fzyycNsEMryhp6 AvUL2puBNmrmP51UqFS1j66AnvQY5qltEkZ3wrHDTbZeLMbIPNmeWiFCIn40HFwM1V MB1WNjYE6vtEaqwfI18PK9QiV57oMhV0m/dumcBxLXLD2varkIeFBpOHhDG32/qWWF T/tG+ij0dRFX2tMmHJmcGzTMa3gh8fpm9pl6nGkqkNspu7QfMEMTQkZGwPBsrLHES7 SJuPiAGkMEx0EVQTZzfyfQakPDtor4MiKAOSyEfhCt2L+POX6m36VXSjABqTVLMpna G1DQzI4qa261JrlaXmzZIVlU= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 3BB812603EE; Sat, 2 Dec 2023 00:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477004; bh=PUQWMm1zQN7fYit4zs/N6KwqSQ8ddX0ptslTWzDFcOU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZsxHwihSZ+25bBwVA3biLCb0z2XXOI6QeLzGm1symSHYtep9LieJO4+zyRO2vz4Ql rAOGEh972cnShRvL9ZC4+teiye9rBPpRksB5LFAj6IzVpJZbWn15oeinWNaMUYAcqc 5YGCc4J7Jwj6ECcBTr0JyVtUEydmZY+VviQAhp3eo4bV4rLoVgNBegWC8UO9E7vkHs Vi2t3E5EDBJGjKNC5EVcEIw35ZqqP0yt4FlEkbNq2kGiHhkIreqP1DZHcWvqpucGqi MSCk+kZ4b6f3vNDdfgRwWE7l5pBgSx10BsmA/mGVBYefvaJxDuRsiovH3aBntA0Gz7 LNMl7/n1HmkrfQPtG1J9jBKSHIzXIg2uGAyoyhZo0fAIEdJAsSdkZjZiyjKSOoh9hh 1ePGuYeAVQj9LpvjUI8pavjHVxVgUPOXcn9Bi4W0lhtAWSb7YWHlgMoxx978+KokZx s64P3U7pR5jci+bLiITduxLkUazrIA1lwBLsQ8cz/uDOlf6izd8P00MQCq3a0o7A/A zzZVus9+rTVD/+H9KNGmzrA5EHFn6osYWqyMoeMR96biE/+eUmmMJTjU1JGFdDFg+g 49qfKbK/yDsBfjn20C5uvmLf/ok8ulg+NTkG/i6+yku9UGrUypoqbsmVNxNhYNeKrn /shJzBloNhrmZBlpq0fenOSk= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id ebc9dead; Sat, 2 Dec 2023 00:30:02 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: 67557@debbugs.gnu.org Subject: [PATCH v3 5/5] gnu: libtorrent-rasterbar: Update to 2.0.9. Date: Sat, 2 Dec 2023 01:28:58 +0100 Message-ID: <671a383b562328b48e7674c5291a6150183b3faa.1701476938.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) Update the package. Since other packages do depend on the previous version (and according to their documentation do recommend it), the previous version is exposed as libtorrent-rasterbar-1.2. The v2.0.9 requires patching to get tests working. Sadly one of the changes is to introduce new binary file, so it is fetched as an input and applied in a phase. Snippet is used instead to do the rest of the patching. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[version]: Update to 2.0.9. [source]: Patch test/test_copy_file.cpp. [native-inputs]: Add the missing file (v2_empty_file.torrent). [arguments]<#:phases>: And add a phase copying it into the correct place. * gnu/packages/bittorrent.scm (libtorrent-rasterbar-1.2): New variable. (qbittorrent)[inputs]: Use libtorrent-rasterbar-1.2. * gnu/packages/enlightenment.scm (epour)[inputs]: Use libtorrent-rasterbar-1.2. Change-Id: Ifbbbf02a671f6a3db653499a7a5f2504fd23c255 --- v2: Drop the patch file and instead do the necessary changes using a substitute* and a phase copying the test file into the correct place from native-inputs. v3: Use (or native-inputs inputs). gnu/packages/bittorrent.scm | 50 +++++++++++++++++++++++++++++----- gnu/packages/enlightenment.scm | 2 +- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index f9098b1a56..731c8e1c20 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -80,6 +80,7 @@ (define-module (gnu packages bittorrent) #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages xml)) @@ -416,10 +417,16 @@ (define-public mktorrent (license (list l:public-domain ; sha1.*, used to build without OpenSSL l:gpl2+)))) ; with permission to link with OpenSSL +(define %v2_empty_file.torrent + (origin (method url-fetch) + (uri "https://github.com/arvidn/libtorrent/raw/v2.0.9/test/test_torrents/v2_empty_file.torrent") + (sha256 + (base32 "1hydgf0m9193hy9010wl0wrbz4k4cgrqg70jakx68pgi79jcqnrn")))) + (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.2.19") + (version "2.0.9") (source (origin (method url-fetch) @@ -428,7 +435,14 @@ (define-public libtorrent-rasterbar "releases/download/v" version "/" "libtorrent-rasterbar-" version ".tar.gz")) (sha256 - (base32 "03p4nvsll568zlyqifid0cn135sg5whbk7g48gkbapnw92ayks7f")))) + (base32 "13kry578ifzz4m2f291bbd7v5v9zsi8y3mf38146cnqw0sv95kch")) + ;; https://github.com/arvidn/libtorrent/issues/7566 + ;; Remove when resolved. I would hope this to be fixed in 2.0.10. + (modules '((guix build utils))) + (snippet + #~(substitute* "test/test_copy_file.cpp" + (("EXT4_SUPER_MAGIC, EXT3_SUPER_MAGIC, XFS_SUPER_MAGIC" all) + (string-append all ", TMPFS_MAGIC\n")))))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dpython-bindings=ON" @@ -437,6 +451,14 @@ (define-public libtorrent-rasterbar #:parallel-tests? #f #:phases (modify-phases %standard-phases + ;; https://github.com/arvidn/libtorrent/issues/7567 + ;; Remove when resolved. I would hope this to be fixed in 2.0.10. + ;; Do not forget to remove the %v2_empty_file.torrent variable. + (add-before 'configure 'copy-v2_empty_file.torrent + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (copy-file (assoc-ref (or native-inputs inputs) + "%v2_empty_file.torrent") + "test/test_torrents/v2_empty_file.torrent"))) (replace 'check (lambda* (#:key tests? parallel-tests? #:allow-other-keys) (let* ((disabled-tests @@ -473,10 +495,10 @@ (define-public libtorrent-rasterbar "--timeout" timeout "--output-on-failure")))))))) (inputs (list boost openssl)) - (native-inputs - (list libfaketime - python-wrapper - pkg-config)) + (native-inputs `(("libfaketime" ,libfaketime) + ("python-wrapper" ,python-wrapper) + ("pkg-config" ,pkg-config) + ("%v2_empty_file.torrent" ,%v2_empty_file.torrent))) (home-page "https://www.libtorrent.org/") (synopsis "Feature-complete BitTorrent implementation") (description @@ -485,6 +507,20 @@ (define-public libtorrent-rasterbar desktops.") (license l:bsd-2))) +(define-public libtorrent-rasterbar-1.2 + (package + (inherit libtorrent-rasterbar) + (version "1.2.19") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/arvidn/libtorrent/" + "releases/download/v" version "/" + "libtorrent-rasterbar-" version ".tar.gz")) + (sha256 + (base32 "03p4nvsll568zlyqifid0cn135sg5whbk7g48gkbapnw92ayks7f")))))) + (define-public qbittorrent (package (name "qbittorrent") @@ -506,7 +542,7 @@ (define-public qbittorrent (list qttools-5)) (inputs (list boost - libtorrent-rasterbar + libtorrent-rasterbar-1.2 openssl python-wrapper qtsvg-5 diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 64d8945f8e..7860c43fef 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -585,7 +585,7 @@ (define-public epour (native-inputs (list intltool python-distutils-extra)) (inputs - (list libtorrent-rasterbar python-dbus python-efl python-pyxdg)) + (list libtorrent-rasterbar-1.2 python-dbus python-efl python-pyxdg)) (home-page "https://www.enlightenment.org") (synopsis "EFL Bittorrent client") (description "Epour is a BitTorrent client based on the @dfn{Enlightenment -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 01 19:30:20 2023 Received: (at 67557) by debbugs.gnu.org; 2 Dec 2023 00:30:20 +0000 Received: from localhost ([127.0.0.1]:56391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtk-0007OD-67 for submit@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:20 -0500 Received: from wolfsden.cz ([37.205.8.62]:49410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtf-0007NY-Kr for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:18 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 575E12619C8; Sat, 2 Dec 2023 00:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477005; bh=O+cE/lgiQ1/zHJu6YdxBL/E592gitPqNxnHAxgKyrVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JKQGtmqbqF3mECTwDwJ6ZxD/FIwBR7i/lvzIX7SpycUecwgjHUGZxQaRyzB44BM+t iagDtPry3GcxqXm4DI4BPrhDJ5FjKdWvAIr5rwBaupJDuBE2S4LroQ/as/BjqB5Gkq YQvCkLmFNgwQJB21dJQhPod9lia05xaQ1AmxJMEh2S46DO+pWl0F/CRB2r4VqzE2qE tdqRibSbqEYQdxP4B6OAxn8+9PT7aFoaiazf+4H+7WhNC7/dWjbFADOvB5/BPVxswZ 2O//AHIBns3/GsRt/CdqXKg9Z56q0gRQcSHPVrB03PutBCAVeAOLh8hnY5vVhqHZAS GZJEuhl1uxTrbxVNqmGOI8+L/yUMYG39btTqhxR2pktcKvFn0quwtugVuxvwLZesAl CAkWOG8E5/uqDMPyuUJAsQVU7lyFcTiHZUf8Q/AbAe7liedUluZ+Wzu82ZJQalW3Wz zqDzTUeMPfRJ9cC817xf6IOlO6GjRFYAZaDf9JtAW12nnETEH3A3UKU4P5k5D2y7NX EU7GNXYq1s9cSdD+fmCIAv4u4qwJ9q3hhNZvJNegn9J1dLGzYRsn8gVnji2st6RK0Y 5kcIkqL7VBc4MZjmj42pjcIFpjkA0rZ0HZtVEDHoh/D7MBA2lKOUsuS0HTlnRIkOH4 ms5H1U8ZBexJiIPL2+0IkMWE= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 53E14261556; Sat, 2 Dec 2023 00:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477003; bh=O+cE/lgiQ1/zHJu6YdxBL/E592gitPqNxnHAxgKyrVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sXc3JdtpmdBX+gbshtmV1hkvK/zlGiEVTffguRsENZb8FZxap3mWIMhf7RBJJDM4D AKSwq4GsWGHUafdMQ1vBT2nmV1xNP6VXgX9Kp/s0t9TeeXe6xe9rAPNc8JAkCe9AYR jKQKo9j8J7bug7i3F7dtfMqtjRDmfNNcLO1fe7S3fJYdOrM+X/Tbeha2dTuq1U0ptA q2g/mOK+Y5OTnGRkaEij1x773GIFkv6qyBYJbTtwfskJxegiAHX4FAX3xeVd/P5bPw WtSE/tk0+lNa4L1WHb6VMUkXbKQ8eGuuiPWnrOxvT5CpdW65G/gV8sH8okeswrJ2FB 9sBaoKRHDGcRMXGIz5/qXQscMOosVphG7B1rlDgswiqJpNU2PCWZndVT+KCcU1c0hZ E+BBLyzf1rO+PTY5LpN9/1pQUH7ze+5uhS9nSvzEa7iR2NGBfFrPO0BW0rD1b4DpFt ArLkT9icpq4rs23XcbFCXuZtu7z4KBNxFRg3EWqwVlrwd5748omKXtxF/zbIpbz0GO Wp7xiio2nWeB4uTSDV7CEvVqob1LaqvTxTQtkU4pQrU9OMzb2TL2vC9UmhzgAc1Ckd PjEMRs77oz1bVKR/+4rnGpDaRNVHMwsOp1xgklQbi/z0JJtx6kquv0XWsn98KRSyIb PxSaXiAOYl/M7fW29Ef8avbY= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id c42d65cc; Sat, 2 Dec 2023 00:30:01 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: 67557@debbugs.gnu.org Subject: [PATCH v3 2/5] gnu: deluge: Update to 2.1.1. Date: Sat, 2 Dec 2023 01:28:55 +0100 Message-ID: <367e95748003ea62a27dc1b3a27ce13d1e0c7e6f.1701476938.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) Dependency on nss-certs was added. Most torrents do require SSL in some shape or form, so it seems appropriate to add it by default. * gnu/packages/bittorrent.scm (deluge)[version]: Update to 2.1.1. [propagated-inputs]: Add nss-certs. [native-search-paths]: Set to allow locating the certificates. Change-Id: Ic6c79f24851d6917dc4e5b22b3bcb2f6b99e187a --- gnu/packages/bittorrent.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index e115c13017..3d79a3a159 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -46,11 +46,13 @@ (define-module (gnu packages bittorrent) #:use-module ((guix licenses) #:prefix l:) #:use-module (guix gexp) #:use-module (guix utils) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages) #:use-module (gnu packages adns) #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages boost) + #:use-module (gnu packages certs) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -574,7 +576,7 @@ (define-public qbittorrent-enhanced-nox (define-public deluge (package (name "deluge") - (version "2.0.5") + (version "2.1.1") (source (origin (method url-fetch) @@ -583,12 +585,13 @@ (define-public deluge (version-major+minor version) "/deluge-" version ".tar.xz")) (sha256 (base32 - "1n15dzfnz1gvb4cf046yhi404i3gs933qgz0ichna6r1znmh9gf4")))) + "1xyz8bscwqmd7d8b43svxl42w54pnisvwkkrndx46hifh0cx73bn")))) (build-system python-build-system) (inputs (list bash-minimal)) (propagated-inputs (list gtk+ libtorrent-rasterbar + nss-certs python-pycairo python-chardet python-dbus @@ -606,6 +609,9 @@ (define-public deluge (native-inputs (list intltool python-wheel (librsvg-for-system))) + (native-search-paths + (list $SSL_CERT_DIR + $SSL_CERT_FILE)) ;; TODO: Enable tests. ;; After "pytest-twisted" is packaged, HOME is set, and an X server is ;; started, some of the tests still fail. There are likely some tests -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 01 19:30:20 2023 Received: (at 67557) by debbugs.gnu.org; 2 Dec 2023 00:30:20 +0000 Received: from localhost ([127.0.0.1]:56393 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtk-0007OK-Ii for submit@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:20 -0500 Received: from wolfsden.cz ([37.205.8.62]:49396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtf-0007NX-Kq for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:18 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 18700261677; Sat, 2 Dec 2023 00:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477005; bh=9l6NilxYioviN+4WEXvrpnWxFpfhfGAH6hkUPYjOZPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=goxeo0fcK+bQyuC+b4MSF/WjJ3X99s0bZ1T0PuGpzP+Fr6TUdHsKN4cqTD/IB5Rpr wgbq6kJuhf2fofK1qsKZf5jAi9YwX87wBLfRGzQB49t8Eu7NbSlwKg2DxMQpJ5WJ/g d9ac8yyJJN9ft3bbbn+ZdSMLudVcwi33gTXwJwOHHFwgAwBo3HcDgyy+Yb1hZZHqz0 1SUaIefrFtCPZjkXVP/WP1SOGVaoYbb2xh4hXz4QerQ4BBCpLY+qQ08rA+7M8HC8Xc yD1tYRwmKgU4OOb8tTZ0k+5jnW1LTJ+rxLjqdygOBlhxHcMU29Va58pGrNscEp5+lA dnO16mqufMJfVrX2aFTbfWv4TE4E7OwhVL2GsNy3UM9p+NsVYuQ9XmlfCXlt7OLzPT AJ7Cnm3PGXT38qJCKS9YcPjM9uJWYz3np+2BMBczdWU8OOw0OQ480Rk1UpaAXOxLUe 1CAZkyT4MOWRnbB41ikLDrzCXeuJD0nVVLoxUdzUcC96aC2mGc/5/7BDHYH4oGljWo 7/y2bPjn1dGGx6IJCMDbmrc8467Yg/1nxvQM6HGIOpE29nkkORO/RFY24JEBywIp2D th7T7OYw42GXqQUKMjs5HO5W/ZaPc+LRgj/8LpsM77/WkJXO+D4dqCjOH4UC/uqqYk PAqeQRP0/R0oAqp/tjzGo0fg= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 9A5CB2603E8; Sat, 2 Dec 2023 00:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477003; bh=9l6NilxYioviN+4WEXvrpnWxFpfhfGAH6hkUPYjOZPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MIphHjCDPWz6dgXbUFx7aG8MCeZPutBxVa+OQ7luNWxLaklCQCfPRR9IeK8qiqlku 0Nmw/Lp28mqumes++iOrKx0+TekKoedkLGbcQ7JSfx800SPxuTOpNE27d3bnAS1xOT 4b9HtKgEioK7qH7Lo89+p1er1eqiiKRJmgG25ARd/7BK3pGOu/iire5FeesQA+IZIe uzr/+StR9AhViDaffWQV/nCYnWmdFnc/rmGQE7aDCPrQW4lJWz+KRKpVIgWv3f6tbJ 75QxSgd1DQ4yP59VoBhYBNatrpiLF6Rol80uY7U4oXob+ogMdsMmHjqiqVUsOuZ4eu w/mfP+kyIARQdCFs8TQM5mE05fwBJK9CuajZGKSgVJtzRPX2l42ZNUSff5bFpRgrm2 0sRom2XKHV+kSD2YzOV1lGKpdHiVjoCBbXUzT7gIt9Z1lseC6iuIRZeDfrQCKoVWCG gkW8keyy05JSwAZEnumJP4qBaVLDm30nKeVQuaTk031hcJxwLZ1T5DxXd+UmnaXzU7 DALAN5y2PrjjM46+QH1UFbFkVDqZBllGM84vbBAjhGqV+6cR2uYk407n0FE1jdNAn4 YtlAg7m8B3droEgak+W04ZeF5ba8Hf+RQD5Rjd4Vyvq37KNBw+2Xmq7InCTHNO6EZQ q+0SwzKT/e1RMjRmInfpfnbs= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 491a3234; Sat, 2 Dec 2023 00:30:01 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: 67557@debbugs.gnu.org Subject: [PATCH v3 3/5] gnu: qbittorrent-enhanced: Update to 4.6.1.10. Date: Sat, 2 Dec 2023 01:28:56 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) * gnu/packages/bittorrent.scm (qbittorrent-enhanced): Update to 4.6.1.10. Change-Id: Ic164ee27ea54018acfcba0e9db8db11f119800a4 --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 3d79a3a159..fb20b3c92c 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -542,7 +542,7 @@ (define-public qbittorrent-enhanced (package (inherit qbittorrent) (name "qbittorrent-enhanced") - (version "4.5.5.10") + (version "4.6.1.10") (source (origin (method git-fetch) @@ -552,7 +552,7 @@ (define-public qbittorrent-enhanced (file-name (git-file-name name version)) (sha256 (base32 - "029crx8yd8apssg2k4alnc0py5i2sp3bhjkwki5fvvnpgkrhfqf0")))) + "101a9n2vk9d6b4vc3schkmpc56l0i0i60fcjh8hwadc6amc2ymvy")))) (home-page "https://github.com/c0re100/qBittorrent-Enhanced-Edition") (description "qBittorrent Enhanced is a bittorrent client based on qBittorrent with -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 01 19:30:21 2023 Received: (at 67557) by debbugs.gnu.org; 2 Dec 2023 00:30:21 +0000 Received: from localhost ([127.0.0.1]:56395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtk-0007OW-Ta for submit@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:21 -0500 Received: from wolfsden.cz ([37.205.8.62]:49412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtf-0007NZ-Ks for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:18 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 9BD1D261557; Sat, 2 Dec 2023 00:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477005; bh=UkW7UBlhqgylLW8gjB3na6p4uQb7zOjqIjhtBckh6IU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JQlcn53+RQhghlqaviqqY4qbZPjDKz2TvBr6KJItSkODoKbuMdyWC+8Aig2eYPQJz 42UtrOOW752753n9jl5lmNRq3gKa/pSSp47mgtQxEbSx2FzKQSyZezgMTmk42v/l+C AWZj+zA4t1SJN4yJeud8akEB/5w1VKEiHspwNSP4mykJ0Eaxj89nBfiPSapFbohTRc Ps1sJivHorlxbC/wIYNjMxWCVgkiCImeN+KVVjdypqNywCEsPvkO47mbnNVTrvXRMX XFGRvcgxIf1eYZux8SJZiCi0kX2HBOyoWF5Ure6sPPkD97XC1jKitixTo1guzfQH/a UWPBv4fgSlNCz0U8hSqOTW5teINZciNleES9aGWhr8t4kWFSnWrXfRYMRHHqivHtLm IS7HBK+iS9uJORFgp3FPYFIOevVErPrdDU/+DO19arV/D9KGsUF2f4rXlSd/SRwiWz xfRS/i0z0sfCKrPT2W7I21rTOYeX+67csyD9gZ3SpAY6KNrh4/TXvNI0mnZMrjlBfV WK06Cz1Gwkyggz/jfg2JeYoTRe2li1d0yQkTg3p3t8RWibU2rpPPuu3eFNfoWPp3Lo QZxCXLQ0FWRTtJBZEMk6fIhV+Dlnof5AVKvJhw8nErofSpqnmJezTelkZdrvZuwNI9 zN4IbxO4ngp7yWpjhH2chU1w= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id DDE142603EB; Sat, 2 Dec 2023 00:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477004; bh=UkW7UBlhqgylLW8gjB3na6p4uQb7zOjqIjhtBckh6IU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DopTm0lSWXe5XJqviqCJ7SiJn01M2+ySAEp5V9Iw9L2ZCV4Zi7ACUnO3VJj+ZbzGY Mbkybk/SRmgNpjpvRKNwMi65pJb3W4UxhyWwfcXjeNX00dosRkmZfwrnvHKSKOLJOY ghvfPYNPDyMnc4dbnEVU7+Uk6ipmG0NIK/gD3OVvFSHzGnIdsvyAGPg3o54S/3CtJe ycKgL4fZbA64JrGcKsw3WGtl2Erb0MOdOKz22higLQzzlR0kwPLmG4j3Us3JEyyaPA G6hDJ8ERHCxN1oAt962FCojGYvbsiTAaLYlqNwpH4cU896vwUWvkREyv9WZcaqVwgA 7ZGj0kDbdj7KrixBrjxiyB+uSuw9Nne4VdJKg56bLiOtAm+YWDnH0X3UO0KDTu19Zc Uu41B+gc2+l82xyCsgMc46DMIoJBo7ZsrmM6FGOYDjCjDgob/Xnzi+Z1qwxRbukdDL tr50sf3xFznwAdq2SqVVN/Lrzt7GBolwNCOVfpDM6ctUpXWsBd9orA0B8Zry/mB894 l5OSFgrnmv3VJAwFBQrSTFaYQow8lMwQkAr/YKicg78v3b8RdI1j32Y+23oGejOx1t rC6hKqwowxvrN1u2l1ObmKCc9TfVzPOO4SBXZe+A3y3z8CWDdyMQZY6Xc/+U/msRNX OVNpK4ARgTfuhkU3WQIj83YU= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 14605114; Sat, 2 Dec 2023 00:30:02 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: 67557@debbugs.gnu.org Subject: [PATCH v3 4/5] gnu: qbittorrent: Update to 4.6.2. Date: Sat, 2 Dec 2023 01:28:57 +0100 Message-ID: <9a33bc543d1ef38d2fa8333b14c74a86815efe52.1701476938.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) * gnu/packages/bittorrent.scm (qbittorrent): Update to 4.6.2. Change-Id: I75d05f14396e1b017cc939264e30ade625cb7017 --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index fb20b3c92c..f9098b1a56 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -488,7 +488,7 @@ (define-public libtorrent-rasterbar (define-public qbittorrent (package (name "qbittorrent") - (version "4.5.5") + (version "4.6.2") (source (origin (method git-fetch) @@ -497,7 +497,7 @@ (define-public qbittorrent (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ngvvwhafi9mi05r2l9dk9x05za8x35y12p230wpzprydhlgwsxd")))) + (base32 "1wps17iv4gj7y751fibvcxk51v09wyniv6xm2yx429dj7z8rfmzs")))) (build-system qt-build-system) (arguments (list #:configure-flags #~(list "-DTESTING=ON") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 01 19:30:21 2023 Received: (at 67557) by debbugs.gnu.org; 2 Dec 2023 00:30:21 +0000 Received: from localhost ([127.0.0.1]:56397 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtl-0007OZ-60 for submit@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:21 -0500 Received: from wolfsden.cz ([37.205.8.62]:49394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtf-0007NW-Kr for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:18 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id C7C582628A4; Sat, 2 Dec 2023 00:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477004; bh=H1DkL1YIfVU6GbWe/hpGyXdbWIiW3eNmlVpVBhDwABo=; h=From:To:Cc:Subject:Date; b=vkWXrZxVLMOwvoA/uL3VdNuFYHr8hCAxHmxczn7CKTu8UBLFGqbF3Gh0MgKsd0B6C 6RB0kyzDlXuYXFyADCpYhEFGedQP/rUs2fCf7m96i735GNLJWOHXIAfSwbkMKxwx0Q 2RSf5+PXTRBuEptuQqDFSaf05v42XUuGxBXudGhxvmyqZdkTRUK/RIJmGLTk8kDh9E Q81EvfW0WaD2O8jIhrYZTbAPRkggYoh7q0gYZTd2FRdOiPVYt6Wmtw5pUOumJBo19K erFvk53G2EDAu6k/W6PMmfCKyVr6J7iYFKm94iGYREBZS1oXR3Nyyvjqh4RNDIBcT9 3mFNwBzrCm8e1ch1wJLPW1jwEtutgLQBNcUrTvY1aFu8hh9fFelg9MTtvEezUoDAwc mTyrPXz8wQWu2KR9Hd9sVnsEtHAUlUMLQdfsF44Et1nADqHT9IXA4n1msTs3U5n2Ti 9iOEay3oCDmKG3sOYVUVMCb1q0G7xFl8KuSA+lAhViM5/OFE5kNEvp+sC26zK5uIIS 8uzJIVND5HuFyxc4fvEiBNzjVD8g73ZFfw0NZmgoUoHu0gaaEiHCJevRzP/6GjhYDz D+1Rqc13r7qJ9cnifwU7DO9ZY6YmlZbJmLpOxl/GVmE5EZKYQ82b05/LPXl+fBGw5l JdFZ2+BuktiOMGoq9CjKsKt4= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 148082603E3; Sat, 2 Dec 2023 00:30:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477003; bh=H1DkL1YIfVU6GbWe/hpGyXdbWIiW3eNmlVpVBhDwABo=; h=From:To:Cc:Subject:Date; b=s0leB/tqVEm/FW6oxhdzsM2Wh7p6C5+wo0AsGEZOf7UU3JkZh+RXiMiNdlYZczi1E HR4BBPq4vJjfU1pkVQUN4HLhWrJALUiSWchQqm8DMtUOlUk3P4ERx2ZUGS3hmiAGqa tKU69s5cL/tSmk6xSViYwZYBM9ZevblK0g1pzJnQQXaqIOUVzlniRTnFfsuZOAyDgT zJ0XrjzTXWF1R9vOzCAvDAi9/e9U8PKCCx3y7p6KzSnh0QxpHJUWz7WtP1TSyNuPZh 92cWsRWWA+mpG9m5DyVpNC0NbZIkS9kN5LKziH087oBeS37gO3byX6Ae+tDFZ1F9SN zW6LZ42oRN/gv+W1njK0ACCCTJUfvrCywVR0gWqMTZcUzr+eh2IZs9t93+pZtE8f0/ TJbhy+fXvKVMu0uKtMeo8xb9Npjg0HL/2y2hM2LJy3kdERNG4ddRtsTV/MDdJrNeMO ycv5NfiC39VGskMb+o6oRg9DsCfA74LgzWWZ8zJUrpBv9gBM6M5sxTeM/Zgre2BjT5 pKFXyRQoGX1tiLeAqDhSXdA10F4BAOx/S/rtjWa95O2L0XQd2OPCbf7MmVJzA7MpC9 /+RC13uyn35mV3lbDeeE4f8ibN9A1xtru3TGk2NY4fIPEAFgZoAvaAMEcdR/qMM3vV yMoPAe9iWTuihLP7iuoP3gQg= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id bbd2262f; Sat, 2 Dec 2023 00:30:01 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> To: 67557@debbugs.gnu.org Subject: [PATCH v3 1/5] gnu: libtorrent-rasterbar: Update to 1.2.19. Date: Sat, 2 Dec 2023 01:28:54 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557 Cc: Tomas Volf <~@wolfsden.cz> 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: -0.8 (/) With the update, the execution of the test suite was overhauled a lot. Parallel tests were disabled, since the do not work well. Since faketime does cause some tests to hang, test_ssl was moved into a separate run. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[version]: Update to 1.2.19. [arguments]<#:parallel-tests?>: Disable. [arguments]<#:phases>: Move test_ssl into separate run under faketime. Do not run under tests under faketime. Anchor the regex for test exclusion. Set timeout of 600 seconds for each test. Change-Id: I7392cb3ce1a8815b26b3257498082761255535ee --- gnu/packages/bittorrent.scm | 46 ++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 6f75a92cff..e115c13017 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -417,7 +417,7 @@ (define-public mktorrent (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.2.18") + (version "1.2.19") (source (origin (method url-fetch) @@ -426,35 +426,49 @@ (define-public libtorrent-rasterbar "releases/download/v" version "/" "libtorrent-rasterbar-" version ".tar.gz")) (sha256 - (base32 "0wpsaqadcicxl4lf1nc1i93c4yzjv8hpzhhrw1hdkrp4gn0vdwpy")))) + (base32 "03p4nvsll568zlyqifid0cn135sg5whbk7g48gkbapnw92ayks7f")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dpython-bindings=ON" "-Dbuild_tests=ON") + ;; Tests do not reliably work when executed in parallel. + #:parallel-tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'extend-test-timeout - (lambda _ - (substitute* "test/test_remove_torrent.cpp" - ;; Extend the test timeout from 3 seconds to 10. - (("i > 30") "i > 100")))) (replace 'check (lambda* (#:key tests? parallel-tests? #:allow-other-keys) - (let ((disabled-tests - ;; test_upnp requires a non-localhost IPv4 interface. - '("test_upnp"))) + (let* ((disabled-tests + '( + ;; Requires a non-localhost IPv4 interface. + "test_upnp" + ;; test_ssl needs to be run separately. + "test_ssl")) + (exclude-regex (string-append "^(" + (string-join disabled-tests "|") + ")$")) + (timeout "600") + (jobs (if parallel-tests? + (number->string (parallel-job-count)) + "1"))) (when tests? + (invoke "ctest" + "-E" exclude-regex + "-j" jobs + "--timeout" timeout + "--output-on-failure") ;; test_ssl relies on bundled TLS certificates with a fixed ;; expiry date. To ensure succesful builds in the future, ;; fake the time to be roughly that of the release. - (setenv "FAKETIME_ONLY_CMDS" "test_ssl") + ;; + ;; At the same time, faketime happens to cause + ;; test_fast_extension, test_privacy and test_resolve_links + ;; to hang, even with FAKETIME_ONLY_CMDS. Not sure why. So + ;; execute only test_ssl under faketime. (invoke "faketime" "2022-10-24" "ctest" - "--exclude-regex" (string-join disabled-tests "|") - "-j" (if parallel-tests? - (number->string (parallel-job-count)) - "1") - "--rerun-failed" + "-R" "^test_ssl$" + "-j" jobs + "--timeout" timeout "--output-on-failure")))))))) (inputs (list boost openssl)) (native-inputs base-commit: 842a11f1caa1bb929c427722ad9d7b7c1ff65727 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 06 17:50:11 2023 Received: (at 67557-done) by debbugs.gnu.org; 6 Dec 2023 22:50:11 +0000 Received: from localhost ([127.0.0.1]:40631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rB0iZ-0004mc-1d for submit@debbugs.gnu.org; Wed, 06 Dec 2023 17:50:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rB0iT-0004m2-9h for 67557-done@debbugs.gnu.org; Wed, 06 Dec 2023 17:50:09 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rB0iB-0004o5-6Z; Wed, 06 Dec 2023 17:49:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=KtdQ1uTEAu/TqofIFE9wIqgvjHvRDtEnO9QQKFCXNB8=; b=VCJ9JFGpZuqVUQYg0eC6 st6Gl15FhGQC8VZBIKvwnqBi5KXES5yCE7XTGSGeWQc/+hE6Eezlyzv3O0gzadoAVjo7jZ+BKnJem r2mQSoXkAGMm8TIftJKFrGwK9XMCUvZ2+1C7YiLsm6zW8x5oamGVRq+PQtp0xQa8UHLcoHy7SeFTb s6GYC+Hy1AnMLyu4JTtwMZv0HLP/V1igofbFvSLazTg9ImWjpCgqUkDO3I+lh1XqpMbuh0d1lQ1t3 B2ceBcH3OTmpNDia4VapCkncV0wJaE/Ag5ZI5VFf1UZ8N+VmRXkQDaH+30SFa7udZqDBf/SUGXWB4 vdsbBza/1yfiqg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Tomas Volf <~@wolfsden.cz> Subject: Re: [bug#67557] [PATCH 0/5] Update libtorrent-rasterbar and dependent programs In-Reply-To: (Tomas Volf's message of "Fri, 1 Dec 2023 00:19:54 +0100") References: Date: Wed, 06 Dec 2023 23:49:44 +0100 Message-ID: <87o7f3eyk7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67557-done Cc: 67557-done@debbugs.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: -3.3 (---) Hello Tomas, Tomas Volf <~@wolfsden.cz> skribis: > gnu: libtorrent-rasterbar: Update to 1.2.19. > gnu: deluge: Update to 2.1.1. > gnu: qbittorrent-enhanced: Update to 4.6.1.10. > gnu: qbittorrent: Update to 4.6.2. > gnu: libtorrent-rasterbar: Update to 2.0.9. Applied v3 of the patch series after building all dependents of =E2=80=98libtorrent-rasterbar=E2=80=99 locally on x86_64-linux. Thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 10:31:51 2023 Received: (at 67557-done) by debbugs.gnu.org; 7 Dec 2023 15:31:52 +0000 Received: from localhost ([127.0.0.1]:42788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBGLv-00010j-N0 for submit@debbugs.gnu.org; Thu, 07 Dec 2023 10:31:51 -0500 Received: from wolfsden.cz ([37.205.8.62]:37914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBGLt-00010Z-He for 67557-done@debbugs.gnu.org; Thu, 07 Dec 2023 10:31:51 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 7818825B6E4; Thu, 7 Dec 2023 15:31:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701963095; bh=zPkIKm0Dg9xvNiXv8sWsBTI9ZrL/YgSEHd1Ae1a2WPo=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=BslH9s+VZBi4VmnuMtE/H0eCXFvy8A7e9EXZhy2RNb2KuKL573QnwvNvcONiCv69G XQzY8yqLmYN+5AlZD3I2uaIaxvG5TIz3WH/ilYUuiU5cHflV7EScdMv6rLCScCy3E0 vRK+/XLr+tqsOfp+Q3W1nyn0wFIYruo/84GDoHkH5egeY4FjiJmbIPyGLEqEbDbYcg 55HF0/tBWBrtZ5P2C6YW7fEHb0uoy2afcOBdzJUvoTrb6zJJeXwjddQytZ7NqQ3A3b BVMS9h9EEJ9cN2GSc6jRAcn3uhQObXPDbFIOGKXMTgWGQIre36QIq6hyzFDWrUm4iw DSntDAhP8F4Wf1rXEvH1bGEjgSgpYvd5UjH+3S8T+MrwFjBKggBTOGnklHzupN9hBj vRkWN1aGHV5fFuR/7Vc6jyxoGrDqNd8725g9XA4i4rX+6/x8Yw0P2Ns0U0e5b0auOO /RbM+6RAjCHqLlH9Bsg95Symz8nLAo8bLw70ItwpHNQGSdNQVcpj955hSo1j0FVmMp 2DHOBUFQl5/7HMmmys+V5ew/YkDGsRedu0NdLHLr3/2eD9ZFthT1If2nDbZ8IL+OfW mNeW8M25UanjLGvUc0/XnQUSz41E2oiYiZg1CsIi9z/yFB7SvjwbeLcQnj3h8hRv8R aJioLbJ2uIi/rplR4aVamHxM= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id A7496258E51; Thu, 7 Dec 2023 15:31:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701963094; bh=zPkIKm0Dg9xvNiXv8sWsBTI9ZrL/YgSEHd1Ae1a2WPo=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=WmGyajqGKIDQ/o7/6y/MbeHdCiwEvriCzAmOdEKE7Scw0c8DEQEXjVCGtVS/QZezP xtulR9es/uIQYJXVkUgvtjABoQ2Z0Kky2gavup5IHBNTmTYPR80MvbhDTAWn7GNU9G rMKYrui4OlHoADijaBNknf8F/8q84CjQMlSPn1fGZBVwcuciM0Ir1h51g/Y5+LFs3U tzr3PFqh4xDWGCAbswvK3qNGpT6KYSEOmrc74pR0LJQ+W4PesnCci7lo4hQ4qz3Cfu tBGYszycqZ2efrPMsFWixgJBVtqa5pm04m9T5iwhZq696yut7gz+BIbr04Gerhk1+q Jgw0WhG81BuFv8ff+AZp/5SwvqHUAw/jfsq0VYsz32IBYfUVSmTiw4TXpkmTbsgIkz 2KZMItb8KZ9AY1a1lRXYm5hm3m9Y1/EpcEIFDQo4DZHWISa3L4raQuxVGb+agD9X1q 0hzCvPwtGjIOyniOwPv/NfFH82reOPf6VPPLcMwOqoy8aT/SzXsiXj2Vy+WUZSeQZK PCzzMikxYsqTjjOUNF4xmUO5XAFCf2R/Rf/fmQSr6uBFCWvO9j0VbzZvpNMBg6tZXQ gNhAz4H32yg/rN1ym7/utjKM7iFKFbcVLT407GIyWPgNWLHsUCZt3MlxUVrCaH+5cv BZUtL8Om1oyPQWb3hXxl/RSA= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 2884b509; Thu, 7 Dec 2023 15:31:34 +0000 (UTC) Date: Thu, 7 Dec 2023 16:31:34 +0100 From: Tomas Volf <~@wolfsden.cz> To: Ludovic =?iso-8859-1?Q?Court=E8s?= Subject: Re: [bug#67557] [PATCH 0/5] Update libtorrent-rasterbar and dependent programs Message-ID: References: <87o7f3eyk7.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="zq7WVld4IhcCYMub" Content-Disposition: inline In-Reply-To: <87o7f3eyk7.fsf@gnu.org> X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 67557-done Cc: 67557-done@debbugs.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: -0.8 (/) --zq7WVld4IhcCYMub Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On 2023-12-06 23:49:44 +0100, Ludovic Court=C3=A8s wrote: > Hello Tomas, > > Tomas Volf <~@wolfsden.cz> skribis: > > > gnu: libtorrent-rasterbar: Update to 1.2.19. > > gnu: deluge: Update to 2.1.1. > > gnu: qbittorrent-enhanced: Update to 4.6.1.10. > > gnu: qbittorrent: Update to 4.6.2. > > gnu: libtorrent-rasterbar: Update to 2.0.9. > > Applied v3 of the patch series after building all dependents of > =E2=80=98libtorrent-rasterbar=E2=80=99 locally on x86_64-linux. > > Thanks! No, thank you :) Tomas -- There are only two hard things in Computer Science: cache invalidation, naming things and off-by-one errors. --zq7WVld4IhcCYMub Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEt4NJs4wUfTYpiGikL7/ufbZ/wakFAmVx5VYACgkQL7/ufbZ/ wanLnQ/+NpkRJhnTQ+Z/dys/2wxGF1yipilQHi+QdPuIhMDtszUI410QYI8Oqca6 82dpR9ZfuD9glaPwsUl08gx0UG/7VL70xzhLxAzNy9rlqppRwbDjz3meUCZk5MZA CQTsUhcRKZiriZaGC6yAYiWcjsy63cYveHi5xUa+9cYNtit2qTBnAz+/XhPVWlcH karyvEpwqWbbdCI160fFQ5vp06jNaqEFJJwMSXaqjS8ZjeQJB2FkMPJ/hdOga9cg uxZi7t0TOAKyi0A6WvbzrQR/3wCfzRFaGJAsm95VNIH1Jm8fjrOzhzg1Y7il3Nkq iFmV8SqkRsU1kMbTK3GJCU12fr19CMBkjDFWJuZfCY5Wa96tvMDw52I8ahkj+pl+ yKWK0ZOlcI2uqUs03PrN5BE9tmp6xsFhNlcA6GAOoTXOBXXGjYAPdV5lX6Rc5lhj lK51zX8bqROewsoGz2UJJ5bQDDhLhf3GqurrZ9jqzMuWTkL3spblt8pNHUz9IEQ0 /9HS8/q9FNOkXsatlxXHH9sJXAg7TZK/WKyLQGIQXzDtP4eq/6ouYOWR1qLjJex5 Hw5OY0wiH96q9JgNnSXH2MQCqK9oqFXhLUISMLGXw8ldXX6nfl0F9L3pMHsvOvfL KMeTN6UHEYhZJVDawZll43wzAl0j8p+YO3pM7j7lu6G7IsW0tzM= =rn1v -----END PGP SIGNATURE----- --zq7WVld4IhcCYMub-- From unknown Fri Jun 20 07:19:04 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, 05 Jan 2024 12:24:06 +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