From patchwork Fri Dec 29 07:47:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 58148 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 0AF2B27BBE2; Fri, 29 Dec 2023 07:48:36 +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.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D172427BBE9 for ; Fri, 29 Dec 2023 07:48:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJ7bA-00012v-P6; Fri, 29 Dec 2023 02:48:04 -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 1rJ7b8-00012J-LA for guix-patches@gnu.org; Fri, 29 Dec 2023 02:48:02 -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 1rJ7b8-0005Rk-Br for guix-patches@gnu.org; Fri, 29 Dec 2023 02:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJ7b7-0003sE-Qs for guix-patches@gnu.org; Fri, 29 Dec 2023 02:48:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68095] [PATCH] gnu: guile-ssh: Update to 0.16.4. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Dec 2023 07:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68095 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68095@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170383604914728 (code B ref -1); Fri, 29 Dec 2023 07:48:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Dec 2023 07:47:29 +0000 Received: from localhost ([127.0.0.1]:40721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJ7aa-0003pU-Bl for submit@debbugs.gnu.org; Fri, 29 Dec 2023 02:47:28 -0500 Received: from lists.gnu.org ([2001:470:142::17]:52060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJ7aW-0003pD-TY for submit@debbugs.gnu.org; Fri, 29 Dec 2023 02:47:26 -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 1rJ7aR-0000zJ-He for guix-patches@gnu.org; Fri, 29 Dec 2023 02:47:19 -0500 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJ7aP-00044h-56 for guix-patches@gnu.org; Fri, 29 Dec 2023 02:47:19 -0500 Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-50e49a0b5caso7436832e87.0 for ; Thu, 28 Dec 2023 23:47:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703836034; x=1704440834; darn=gnu.org; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=Uyx+eFxvYTkZIwm/UUeL+QOxRmR6iSGPdeaCQXwYPck=; b=QPptYZiEYbW0XjQY5Hg2Rif9SAms1RD3HaA1qj1HKXDHZTEA1GeUXU9B8ihS76quuL JafXSAHSrRpcIpfFlRvyQGQOInTYTi4vZ72WtRwKmJu0w3+BLd+Lc+88aDap4JQ0yAHv df2MDA/+8brdRKKuNJzRZGTsHHVPbaHTtLA6C16DibfxxIhdCpe8lo3FoT83SG7Ec11V 7B8KBhR4vFnpwjT43zDUucCTW/cVuX/gT74s8XfhfL/JWaiHekgMO2INqX8mSi6fhiAV VAnhT4tYVAdsvLUQWQETn4e3HtR/ezDmDgjjEZCe5GKO1F3IVBxsqE5WvgQGISsxyr7E xhpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703836034; x=1704440834; h=mime-version:user-agent:message-id:date:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Uyx+eFxvYTkZIwm/UUeL+QOxRmR6iSGPdeaCQXwYPck=; b=aAJUoygwQ1qQwO1FxPiSTT6wgV3tnAnxsgs5cE/8nCnZhW9zZS0rOf8b55MV+UCm6y VmzTIYjk6ZbpZt9n2S4MYz9Q3cu0LrMFcHcYj9us2LfbvanoIFOSL0zQjvwJrjTQllHz 7rOGwXmADRP6UPsXrRKwXK6ly6pabM1bmLtVy5yngdtv66j9B3gpqDwOwHoL7MbvHL5T P0SfDZAdStfKHOreRFGhaOl+fdAfhTBygRhRHoGPXz7CfpIbei54lVKWJ41aNz+oHmJh k5elkleKW4eqOiz59BtAYwW8RdGkRqpEVaLyxDmj3566JD8E/fvWDXVrZwJxZlz3T+PW vW+g== X-Gm-Message-State: AOJu0Yxk07Ic+REIu43s1pi52E4ipBwDozPDyokS74L4+2we0FJ/6j1z 4RZkyFGkWjP459j+2ajEn5Tprex5d0w= X-Google-Smtp-Source: AGHT+IHlO2E9nL8V0o/tZafU6X7iHIHCoo+hD/BsGAUfkE2Hhqd50N53cHScrrJtZhTirPhL1/DgYg== X-Received: by 2002:a05:6512:2352:b0:50e:8122:7d38 with SMTP id p18-20020a056512235200b0050e81227d38mr2827218lfu.71.1703836034148; Thu, 28 Dec 2023 23:47:14 -0800 (PST) Received: from elephant ([95.79.157.105]) by smtp.gmail.com with ESMTPSA id dw11-20020a0565122c8b00b0050e84c6bfbasm774473lfb.48.2023.12.28.23.47.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Dec 2023 23:47:13 -0800 (PST) From: "Artyom V. Poptsov" Date: Fri, 29 Dec 2023 10:47:11 +0300 Message-ID: <87y1ddzc00.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12a; envelope-from=poptsov.artyom@gmail.com; helo=mail-lf1-x12a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hello, this patch updates Guile-SSH to 0.16.4: - avp From 9ff09d133b2978f727e77e05092e957e0ca46981 Mon Sep 17 00:00:00 2001 Message-ID: <9ff09d133b2978f727e77e05092e957e0ca46981.1703835285.git.poptsov.artyom@gmail.com> From: "Artyom V. Poptsov" Date: Sat, 23 Dec 2023 10:16:55 +0300 Subject: [PATCH] gnu: guile-ssh: Update to 0.16.4. * gnu/packages/ssh.scm (guile-ssh): Update to 0.16.4. [arguments]: Improve the style. Change-Id: Ib7d741e7f4fc7a1fc167cfa4f7953f84d9f4d390 --- gnu/packages/ssh.scm | 61 +++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 0b364bbe90..4e9ee675f1 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2023 Simon Streit +;;; Copyright © 2023 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -324,22 +325,22 @@ (define-public openssh-sans-x (define-public guile-ssh (package (name "guile-ssh") - (version "0.16.3") + (version "0.16.4") (home-page "https://github.com/artyom-poptsov/guile-ssh") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0b03aizjdj3g15xfkspgvy8k5jl8bgv4q7gwjwr3l2ibqkrm8vrz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "127yhjaywais3h2g3cxhqmhdmqgxf9j1jwb6wzx92j0z7asrjqwr")))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments - `(;; It makes no sense to build libguile-ssh.a. - #:configure-flags '("--disable-static") + `( ;It makes no sense to build libguile-ssh.a. + #:configure-flags '("--disable-static") #:phases (modify-phases %standard-phases (add-before 'bootstrap 'support-cross-compilation @@ -356,36 +357,38 @@ (define-public guile-ssh ;; the .go files. (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib"))) - (invoke "make" "install" - "-C" "libguile-ssh" - "-j" (number->string - (parallel-job-count))) + (invoke "make" + "install" + "-C" + "libguile-ssh" + "-j" + (number->string (parallel-job-count))) (substitute* (find-files "." "\\.scm$") (("\"libguile-ssh\"") - (string-append "\"" lib "/libguile-ssh\""))) - #t))) + (string-append "\"" lib "/libguile-ssh\"")))))) ,@(if (%current-target-system) '() - '((add-before 'check 'fix-guile-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((guile (assoc-ref inputs "guile"))) - (substitute* "tests/common.scm" - (("/usr/bin/guile") - (string-append guile "/bin/guile"))) - #t))))) + '((add-before 'check + 'fix-guile-path + (lambda* (#:key inputs + #:allow-other-keys) + (let ((guile (assoc-ref inputs "guile"))) + (substitute* "tests/common.scm" + (("/usr/bin/guile") + (string-append guile + "/bin/guile")))))))) (add-after 'install 'remove-bin-directory (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) - (examples (string-append - out "/share/guile-ssh/examples"))) + (examples (string-append out + "/share/guile-ssh/examples"))) (mkdir-p examples) (rename-file (string-append bin "/ssshd.scm") (string-append examples "/ssshd.scm")) (rename-file (string-append bin "/sssh.scm") (string-append examples "/sssh.scm")) - (delete-file-recursively bin) - #t)))))) + (delete-file-recursively bin))))))) (native-inputs (list autoconf automake libtool base-commit: 7722da6fa5422c4fec69d6c8b9536c7d6fc3d326 -- 2.41.0