From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id kFRRLjOYYGfWKAEA62LTzQ:P1 (envelope-from ) for ; Mon, 16 Dec 2024 21:14:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id kFRRLjOYYGfWKAEA62LTzQ (envelope-from ) for ; Mon, 16 Dec 2024 22:14:27 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=VDTkNnFE; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=sgzyv+Tm; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=bg2UI7QY; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734383666; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=ema+D/YGPD0b22wfE0u6TZoEbtq3kI8pwvGQfuND+yw=; b=c/C6MbG/RdttIUF6gFJQaFngRLqvtDw1cbn/KRLR4gLhqApIGjyKWXIiea6AJ99yFU+dMQ tv7/7vEHTENvrpHGvJzWvC0wRKp2rvNzydeDdb4DHcaRiDIGz3H302+XSiH+8N/Dvh/wnE BJBW/YxF6DuEZlha9nmNdZtiPfgUXL/HBKdnjf1ukLQNkKjmjY80aN7+p09zJ+msKJ5pD8 Ou8b0Ghc4k2pw9qsQuiuaf3pmyLa22SG76AvA0jdImCzPA+e1WUO6rrU4fODSArypkHx10 3sXnGhFC7cDcEvenSlmPJpRcZWRITSL7aFggQ2rnvk5cdJ9XH75VDnQ+JY2MrQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734383666; a=rsa-sha256; cv=none; b=dWqXqWyKFoJQwYoAS35ut2DFv4lhxOm6rECgEf77ZgN0DNbo6EpW3k/6VhNq3iYDnvdYL2 FHDcr/7dzIgAzvhzbNINzHf1IGX98H5CVxZPVPbDBKLKFmnTi1Z2iwVEkKXFDyQYo1C3kb Fc2JNGOJ7gI4AgPZEpbTxdr5Xrzl7Km8xIUJsXj+AuZVJIFikHpN6pN0kzOAQU8plK2XZy uOKd6HCXd0TxoKCckaXtvwHRHpyws0fl2hgqX4Gqw7kgMub7TE/VanK8Z3ypc7QLCyISvZ VcrYEYz6RPBdVApPFe6o9PkTZLGql3ziogFZRfC7snjfCw8Bn8p6/zkvQvRJSg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=VDTkNnFE; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=sgzyv+Tm; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=bg2UI7QY; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 90A007C79F for ; Mon, 16 Dec 2024 22:14:26 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNIPn-0001k3-FN; Mon, 16 Dec 2024 16:14:07 -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 1tNIPj-0001iT-Vr for guix-patches@gnu.org; Mon, 16 Dec 2024 16:14:04 -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 1tNIPj-0001lz-N1 for guix-patches@gnu.org; Mon, 16 Dec 2024 16:14:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=ema+D/YGPD0b22wfE0u6TZoEbtq3kI8pwvGQfuND+yw=; b=VDTkNnFEzTsx/IlAQziicAfLshW8WlRIg89WpdeDdU+X8Ln0MtMCXPEDKZNy3onpJQw//l9s0AfGB+IEi3HOUDdNQL+RoDY5AwudyZAfvK/hpbB0AfAxbBOrSwchlIIXVSDPK2Tow6X5tEfW0NdoV0o4r2P8q0qE4ByiTZg182eNEeEat3JdUuhOWv49vmGVwK8oOAzEEmyqqBtJUYOM/HW4ggDbMCY9Q727/ZXfYMyQfngOcK6TRzauHmEk4g7niH0bb0dl8NvIDpEuK7RDdALnWfXGOqgTviSi09ydh/uaouHnsMKDSEUmWcBPB8ioJVXKx0jsUiH6GacM08ZYxg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tNIPi-0001ru-LB; Mon, 16 Dec 2024 16:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74917] [PATCH] gnu: Syncthing: Update to 1.28.1. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 16 Dec 2024 21:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74917 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74917@debbugs.gnu.org Cc: Katherine Cox-Buday , Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Katherine Cox-Buday , Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.17343835897085 (code B ref -1); Mon, 16 Dec 2024 21:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Dec 2024 21:13:09 +0000 Received: from localhost ([127.0.0.1]:56492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNIOq-0001qD-SL for submit@debbugs.gnu.org; Mon, 16 Dec 2024 16:13:09 -0500 Received: from lists.gnu.org ([209.51.188.17]:53788) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNIOo-0001q0-7h for submit@debbugs.gnu.org; Mon, 16 Dec 2024 16:13:07 -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 1tNIOh-0001Om-Ga for guix-patches@gnu.org; Mon, 16 Dec 2024 16:13:01 -0500 Received: from fout-b1-smtp.messagingengine.com ([202.12.124.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tNIOc-0001gq-0R for guix-patches@gnu.org; Mon, 16 Dec 2024 16:12:56 -0500 Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfout.stl.internal (Postfix) with ESMTP id 1D1A3114015E; Mon, 16 Dec 2024 16:12:51 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Mon, 16 Dec 2024 16:12:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=mesmtp; t=1734383570; x=1734469970; bh=ema+D/YGPD0b22wfE0u6TZoEbtq3kI8pwvGQfuND+yw=; b=sgzyv+TmQcaS XCWpT4M4IE1V2jjE4DmdFq/Blk52t2xkfY6/awW2J6Ic/l8StWqrpMYMr8EeE3QA BvA0rveJoTjlyzDo19VKUYorY9cX3EqTN8lrmcw6Z0h01iD7p2DAV/jGkuuII5N1 0l2Ig85u9u1NqYD6FE+GO05589kLbig= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1734383570; x=1734469970; bh=ema+D/YGPD0b22wfE0u6TZoEbtq3kI8pwvG QfuND+yw=; b=bg2UI7QYcHJ6WDa2S6asE+6ru0LQqVXNfcsQTEs+QqsNYg5HVW/ rCWsEHBn56bIcwjBYJ+1MmnaC3odGtHSfe0rPykooeEJ8cSP32+CsgEzUVV9MHG4 uiXCioJfvlemyHb37k0B5Q1A+C+6J7rc9b75/uM7PwEq3NUJ4xWLaJvq76VhqGdi Cfs2CTWzeKlYStBrNc8jshlwa1pzoyuTZI8+VUnoRv2oYjqPds3ZrDPiQzMoYCTL ET/5+h3jnyGgNWMguR9z6p1MDJR90A68nPOL9Ezr6WWOM5UIGnVRMknVsNl3/a/0 SE5o0RdZCUSQ6KEnw96h3H5SjTcGYBoWxtw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrleefgddugeekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofggtgfgsehtkeertdertdejnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehl vghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeefleefhfdute ehteetueeuteehfffghfeiiefhvdfgieduueejgeevudekgfffheenucffohhmrghinhep ghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvgdpnhgspghrtghpthhtohep uddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhuihigqdhprghttghhvghsse hgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 16 Dec 2024 16:12:50 -0500 (EST) From: Leo Famulari Date: Mon, 16 Dec 2024 16:12:45 -0500 Message-ID: <31d98f908834e7ffea2beac2ae92c34f4ab830e4.1734383565.git.leo@famulari.name> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=202.12.124.144; envelope-from=leo@famulari.name; helo=fout-b1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.14 X-Spam-Score: -5.14 X-Migadu-Queue-Id: 90A007C79F X-Migadu-Scanner: mx11.migadu.com X-TUID: qk9T8mtHTHfj * gnu/packages/syncthing.scm (syncthing): Update to 1.28.1. [arguments]: Adjust the 'build' and 'install' phases to upstream changes. Change-Id: Icc7342ce13ffa03df51e4e71faf2e19a0636635f --- gnu/packages/syncthing.scm | 113 ++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 71a1eb3326..345017d80d 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Petter -;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2024 Leo Famulari ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2020 Giacomo Leidi @@ -49,7 +49,7 @@ (define-module (gnu packages syncthing) (define-public syncthing (package (name "syncthing") - (version "1.27.2") + (version "1.28.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -57,71 +57,70 @@ (define-public syncthing "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "0g418jyqqik8ds8qcrlnmm2bhwwpbrfgd82fg2jyip4zw1aicqia")))) + "16j5w6hdr1x2231hw0zsxm53sw34wxcs4ijjjcnzcg1vz9drjrg9")))) (build-system go-build-system) ;; The primary Syncthing executable goes to "out", while the auxiliary ;; server programs and utility tools go to "utils". This reduces the size ;; of "out" by ~144 MiB. (outputs '("out" "utils")) (arguments - (list #:modules '((srfi srfi-26) ; for cut - (guix build utils) - (guix build go-build-system)) - #:import-path "github.com/syncthing/syncthing" - ;; We don't need to install the source code for end-user applications. - #:install-source? #f - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'increase-test-timeout - (lambda _ - (substitute* "src/github.com/syncthing/syncthing/build.go" - (("120s") "999s")))) + (list + #:modules '((srfi srfi-26) ; for cut + (guix build utils) + (guix build go-build-system)) + #:import-path "github.com/syncthing/syncthing" + ;; We don't need to install the source code for end-user applications. + #:install-source? #f + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'increase-test-timeout + (lambda _ + (substitute* "src/github.com/syncthing/syncthing/build.go" + (("120s") "999s")))) - (replace 'build - (lambda _ - (with-directory-excursion "src/github.com/syncthing/syncthing" - ;; XXX The only way to build Syncthing without its automatic - ;; updater and to build the utilities is to "build all" and then - ;; "build syncthing" again with -no-upgrade. - ;; https://github.com/syncthing/syncthing/issues/6118 - (invoke "go" "run" "build.go") - (delete-file "bin/syncthing") - (invoke "go" "run" "build.go" "-no-upgrade" "build" "syncthing")))) + (replace 'build + (lambda _ + (with-directory-excursion "src/github.com/syncthing/syncthing" + ; Build the primary Syncthing executable + (invoke "go" "run" "build.go" "-no-upgrade") + ; Build utilities used to run an independent Syncthing network + (for-each (cut invoke "go" "run" "build.go" "build" <>) + '("stcrashreceiver" "strelaypoolsrv" "stupgrades" + "ursrv"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (with-directory-excursion "src/github.com/syncthing/syncthing" - (invoke "go" "run" "build.go" "test"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "src/github.com/syncthing/syncthing" + (invoke "go" "run" "build.go" "test"))))) - (replace 'install - (lambda _ - (with-directory-excursion "src/github.com/syncthing/syncthing/bin" - (install-file "../syncthing" (string-append #$output "/bin")) - (for-each (cut install-file <> (string-append #$output:utils "/bin/")) - '("stcompdirs" "stcrashreceiver" - "stdisco" "stdiscosrv" "stevents" "stfileinfo" - "stfinddevice" "stfindignored" "stgenfiles" - "strelaypoolsrv" "strelaysrv" "stsigtool" - "stvanity" "stwatchfile" "ursrv"))))) + (replace 'install + (lambda _ + (with-directory-excursion "src/github.com/syncthing/syncthing/bin" + (install-file "syncthing" (string-append #$output "/bin")) + (for-each (cut install-file <> (string-append #$output:utils "/bin/")) + '("stdiscosrv" "strelaysrv"))) + (with-directory-excursion "src/github.com/syncthing/syncthing" + (for-each (cut install-file <> (string-append #$output:utils "/bin/")) + '("ursrv" "stupgrades" "strelaypoolsrv" "stcrashreceiver"))))) - (add-after 'install 'install-docs - (lambda _ - (let ((man (string-append #$output "/share/man")) - (man:utils (string-append #$output:utils "/share/man"))) - ;; Install all the man pages to "out". - (for-each - (lambda (file) - (install-file file - (string-append man "/man" (string-take-right file 1)))) - (find-files "src/github.com/syncthing/syncthing/man" "\\.[1-9]")) - ;; Copy all the man pages to "utils" - (copy-recursively man man:utils) - ;; Delete extraneous man pages from "out" and "utils", - ;; respectively. - (delete-file (string-append man "/man1/stdiscosrv.1")) - (delete-file (string-append man "/man1/strelaysrv.1")) - (delete-file (string-append man:utils "/man1/syncthing.1")))))))) + (add-after 'install 'install-docs + (lambda _ + (let ((man (string-append #$output "/share/man")) + (man:utils (string-append #$output:utils "/share/man"))) + ;; Install all the man pages to "out". + (for-each + (lambda (file) + (install-file file + (string-append man "/man" (string-take-right file 1)))) + (find-files "src/github.com/syncthing/syncthing/man" "\\.[1-9]")) + ;; Copy all the man pages to "utils" + (copy-recursively man man:utils) + ;; Delete extraneous man pages from "out" and "utils", + ;; respectively. + (delete-file (string-append man "/man1/stdiscosrv.1")) + (delete-file (string-append man "/man1/strelaysrv.1")) + (delete-file (string-append man:utils "/man1/syncthing.1")))))))) (synopsis "Decentralized continuous file system synchronization") (description "Syncthing is a peer-to-peer file synchronization tool that supports a wide variety of computing platforms. It uses the Block Exchange base-commit: 93eca69d69355dc37ebcc9193d5af19cbac8071c -- 2.46.0