From patchwork Tue Jan 9 16:05:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Danial Behzadi X-Patchwork-Id: 58703 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 98BDB27BBEA; Tue, 9 Jan 2024 16:07:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B50FD27BBE2 for ; Tue, 9 Jan 2024 16:07:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNEdL-0005Kv-IE; Tue, 09 Jan 2024 11:07:20 -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 1rNEd4-0005Bs-E0 for guix-patches@gnu.org; Tue, 09 Jan 2024 11:07:08 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNEcy-0005cR-2a for guix-patches@gnu.org; Tue, 09 Jan 2024 11:07:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNEd4-00061D-TC for guix-patches@gnu.org; Tue, 09 Jan 2024 11:07:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68303] [PATCH v2 1/2] gnu: tractor: Update to 4.3.0. References: <20240107132014.82266-1-dani.behzi@ubuntu.com> In-Reply-To: <20240107132014.82266-1-dani.behzi@ubuntu.com> Resent-From: Danial Behzadi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Jan 2024 16:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68303 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68303@debbugs.gnu.org Cc: Danial Behzadi Received: via spool by 68303-submit@debbugs.gnu.org id=B68303.170481637923038 (code B ref 68303); Tue, 09 Jan 2024 16:07:02 +0000 Received: (at 68303) by debbugs.gnu.org; 9 Jan 2024 16:06:19 +0000 Received: from localhost ([127.0.0.1]:40716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNEcM-0005zV-Uq for submit@debbugs.gnu.org; Tue, 09 Jan 2024 11:06:19 -0500 Received: from mx0.riseup.net ([198.252.153.6]:58422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNEcH-0005yv-HW for 68303@debbugs.gnu.org; Tue, 09 Jan 2024 11:06:17 -0500 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4T8bPz5KScz9vRB; Tue, 9 Jan 2024 16:05:59 +0000 (UTC) X-Riseup-User-ID: C84C150D458AF49919FA18EF870485518317CFA65BF78E788BABD785898D002E Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4T8bPm3w28zFq4x; Tue, 9 Jan 2024 16:05:48 +0000 (UTC) Received: from danialbehzadi by banshee with local (Exim 4.96) (envelope-from ) id 1rNEbo-0013Pq-2z; Tue, 09 Jan 2024 19:35:44 +0330 From: Danial Behzadi Date: Tue, 9 Jan 2024 19:35:37 +0330 Message-Id: <20240109160538.251432-1-dani.behzi@ubuntu.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tor.scm (tractor): Update to 4.3.0. [source]: The new primary download link is from Framagit. [inputs]: Remove python-psutil as no longer needed. [phases]: Upstream is now in src-layout. data is excluded. [home-page]: The new home is hosted on tractor.frama.io. --- gnu/packages/tor.scm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index b81944ee6b..6045b29bf4 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 André Batista -;;; Copyright © 2021-2023 Danial Behzadi +;;; Copyright © 2021-2024 Danial Behzadi ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Jim Newsome ;;; Copyright © 2023 Clément Lassieur @@ -443,20 +443,20 @@ (define-public nyx (define-public tractor (package (name "tractor") - (version "4.1.1") + (version "4.3.0") (source (origin (method url-fetch) - (uri (pypi-uri "traxtor" version)) + (uri (string-append "https://framagit.org/tractor/tractor/-/archive/" + version "/tractor-" version ".tar.bz2")) (sha256 (base32 - "1542g6alycwlmvndxcijzn4d5lgycmxxb78gqd8qwgm9kw0fnr3q")))) + "1kal71hh8wbar19785b86q62rcilxrma8ldjjk258vf7lr1w12dv")))) (build-system pyproject-build-system) (native-inputs (list (list glib "bin"))) ; for glib-compile-schemas. (inputs (list python-fire - python-psutil python-pygobject python-requests python-stem @@ -464,25 +464,21 @@ (define-public tractor (arguments (list #:tests? #f ; no test suite. - #:phases - #~(modify-phases %standard-phases + #:phases #~(modify-phases %standard-phases (add-after 'install 'install-man-page (lambda _ (let ((man1 (string-append #$output "/share/man/man1"))) - (install-file "tractor/man/tractor.1" man1)))) + (install-file "data/tractor.1" man1)))) (add-after 'install 'install-bash-completion (lambda _ - (mkdir "bash-completion") - (rename-file "tractor/tractor-completion" - "bash-completion/tractor") (let ((bash-completion (string-append #$output "/share/bash-completion/completions"))) - (install-file "bash-completion/tractor" bash-completion)))) + (install-file "data/completion/bash/tractor" bash-completion)))) (add-after 'install 'install-gschema (lambda _ (let ((schemas (string-append #$output "/share/glib-2.0/schemas"))) - (install-file "tractor/tractor.gschema.xml" schemas))))))) - (home-page "https://framagit.org/tractor") + (install-file "src/tractor/tractor.gschema.xml" schemas))))))) + (home-page "https://tractor.frama.io/tractor") (synopsis "Setup an onion routing proxy") (description "This package uses Python stem library to provide a connection through From patchwork Tue Jan 9 16:05:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danial Behzadi X-Patchwork-Id: 58704 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3690727BBEA; Tue, 9 Jan 2024 16:08:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D62B027BBE2 for ; Tue, 9 Jan 2024 16:08:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNEdP-0005OH-Oj; Tue, 09 Jan 2024 11:07:23 -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 1rNEd4-0005Bt-Dv for guix-patches@gnu.org; Tue, 09 Jan 2024 11:07:07 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNEcx-0005aw-Qf for guix-patches@gnu.org; Tue, 09 Jan 2024 11:07:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNEd4-000616-Cl for guix-patches@gnu.org; Tue, 09 Jan 2024 11:07:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68303] [PATCH v2 2/2] gnu: tractor: Update to 4.3.1. Resent-From: Danial Behzadi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Jan 2024 16:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68303 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68303@debbugs.gnu.org Cc: Danial Behzadi Received: via spool by 68303-submit@debbugs.gnu.org id=B68303.170481637723022 (code B ref 68303); Tue, 09 Jan 2024 16:07:02 +0000 Received: (at 68303) by debbugs.gnu.org; 9 Jan 2024 16:06:17 +0000 Received: from localhost ([127.0.0.1]:40714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNEcK-0005zG-LC for submit@debbugs.gnu.org; Tue, 09 Jan 2024 11:06:16 -0500 Received: from mx0.riseup.net ([198.252.153.6]:58426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNEcH-0005yz-Ln for 68303@debbugs.gnu.org; Tue, 09 Jan 2024 11:06:15 -0500 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4T8bQ12Smlz9wN0; Tue, 9 Jan 2024 16:06:01 +0000 (UTC) X-Riseup-User-ID: 5C2F21E23B99ED780765D199823B0D963DCC99F01A585F46B563727B6F2F9BCB Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4T8bPp1Y2WzFqhK; Tue, 9 Jan 2024 16:05:50 +0000 (UTC) Received: from danialbehzadi by banshee with local (Exim 4.96) (envelope-from ) id 1rNEbr-0013Px-0n; Tue, 09 Jan 2024 19:35:47 +0330 From: Danial Behzadi Date: Tue, 9 Jan 2024 19:35:38 +0330 Message-Id: <20240109160538.251432-2-dani.behzi@ubuntu.com> In-Reply-To: <20240109160538.251432-1-dani.behzi@ubuntu.com> References: <20240109160538.251432-1-dani.behzi@ubuntu.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tor.scm (tractor): Update to 4.3.1. [inputs]: Remove python-requests as no longer needed. [inputs]: Add python-pysock connection check needs it. --- gnu/packages/tor.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 6045b29bf4..f697cd8c06 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -443,7 +443,7 @@ (define-public nyx (define-public tractor (package (name "tractor") - (version "4.3.0") + (version "4.3.1") (source (origin (method url-fetch) @@ -451,14 +451,14 @@ (define-public tractor version "/tractor-" version ".tar.bz2")) (sha256 (base32 - "1kal71hh8wbar19785b86q62rcilxrma8ldjjk258vf7lr1w12dv")))) + "1qqivzv65ckhk7nz6vcgchqwkxdmh2sdmkgvv8phqb1c4mzp48ip")))) (build-system pyproject-build-system) (native-inputs (list (list glib "bin"))) ; for glib-compile-schemas. (inputs (list python-fire python-pygobject - python-requests + python-pysocks python-stem python-termcolor)) (arguments