From fd115bee31d04f1277560b82bb982e6aa19fc977 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 12 Jul 2018 11:23:24 -0400 Subject: gnu: Syncthing: Fix a crash bug. * gnu/packages/patches/syncthing-fix-crash.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/syncthing.scm (syncthing)[source]: Use it. --- gnu/packages/syncthing.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/syncthing.scm') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 14e83b5861..4c0bceedf6 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -24,6 +24,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix licenses) + #:use-module (gnu packages) #:use-module (gnu packages golang)) (define-public syncthing @@ -35,6 +36,7 @@ (uri (string-append "https://github.com/syncthing/syncthing" "/releases/download/v" version "/syncthing-source-v" version ".tar.gz")) + (patches (search-patches "syncthing-fix-crash.patch")) (sha256 (base32 "0bxkm5jlj6l4gai23bg0y31brr80r9qllh1rdg29pahjn0c2b4ml")) -- cgit 1.4.1 From 2ed97a22d31196d06c9769925a7fd70b057ef900 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 24 Jul 2018 18:19:57 -0400 Subject: gnu: go-github-com-thejerf-suture: Update to 2.0.3-0.3f1fb62. * gnu/packages/syncthing.scm (go-github-com-thejerf-suture): Update to 2.0.3-0.3f1fb62. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/syncthing.scm') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 4c0bceedf6..9dcaa658c9 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -703,11 +703,11 @@ database in Go.") (license bsd-2)))) (define-public go-github-com-thejerf-suture - (let ((commit "87e298c9891673c9ae76e10c2c9be589127e5f49") + (let ((commit "3f1fb62fe0a3cc6429122d7dc45588a8b59c5bb6") (revision "0")) (package (name "go-github-com-thejerf-suture") - (version (git-version "2.0.1" revision commit)) + (version (git-version "2.0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -716,7 +716,7 @@ database in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "0srw0g94z6jplvlsjqsr6wf7885alnbb6h4fhvbg2i7q1ia5ldy2")))) + "0mp7gz6bp6xhggkgmbl33vpmrq3a6n2dkgcxbkb7csnpv4r4d59k")))) (build-system go-build-system) (arguments `(#:import-path "github.com/thejerf/suture")) -- cgit 1.4.1 From 869d9c69f32b140ffc7b11314f411ddc92ee2a9e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 24 Jul 2018 18:20:47 -0400 Subject: gnu: go-github-com-syncthing-notify: Update to 0.0.0-1.cdf89c4. * gnu/packages/syncthing.scm (go-github-com-syncthing-notify): Update to 0.0.0-1.cdf89c4. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/syncthing.scm') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 9dcaa658c9..c9313e7d94 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1088,8 +1088,8 @@ using sh's word-splitting rules.") (license expat)))) (define-public go-github-com-syncthing-notify - (let ((commit "b9ceffc925039c77cd9e0d38f248279ccc4399e2") - (revision "0")) + (let ((commit "cdf89c4039d13726e227d0a472053ea19de021b4") + (revision "1")) (package (name "go-github-com-syncthing-notify") (version (git-version "0.0.0" revision commit)) @@ -1101,7 +1101,7 @@ using sh's word-splitting rules.") (file-name (git-file-name name version)) (sha256 (base32 - "1scha9b2r35bvqzqx86sarzjxf72ywvj3g6n9pm3xq4i4xzpylxf")))) + "1ra1id9r06i4q8vhrrv1zpybhjxs3361rg35758dxglkyk4pzk6j")))) (build-system go-build-system) (arguments '(#:import-path "github.com/syncthing/notify")) -- cgit 1.4.1 From 39a57afc42d473517f6e62c2d6a5d3c75eee3e89 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jun 2018 15:14:43 -0400 Subject: gnu: syncthing: Update to 0.14.49. * gnu/packages/syncthing.scm (syncthing): Update to 0.14.49. [source]: Remove obsolete patch. [inputs]: Remove go-github-com-kardianos-osext. * gnu/packages/patches/syncthing-fix-crash.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/syncthing-fix-crash.patch | 72 -------------------------- gnu/packages/syncthing.scm | 6 +-- 3 files changed, 2 insertions(+), 77 deletions(-) delete mode 100644 gnu/packages/patches/syncthing-fix-crash.patch (limited to 'gnu/packages/syncthing.scm') diff --git a/gnu/local.mk b/gnu/local.mk index ea906b83e7..fa859d5bb0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1139,7 +1139,6 @@ dist_patch_DATA = \ %D%/packages/patches/superlu-dist-scotchmetis.patch \ %D%/packages/patches/swish-e-search.patch \ %D%/packages/patches/swish-e-format-security.patch \ - %D%/packages/patches/syncthing-fix-crash.patch \ %D%/packages/patches/synfigstudio-fix-ui-with-gtk3.patch \ %D%/packages/patches/t1lib-CVE-2010-2642.patch \ %D%/packages/patches/t1lib-CVE-2011-0764.patch \ diff --git a/gnu/packages/patches/syncthing-fix-crash.patch b/gnu/packages/patches/syncthing-fix-crash.patch deleted file mode 100644 index d27e543982..0000000000 --- a/gnu/packages/patches/syncthing-fix-crash.patch +++ /dev/null @@ -1,72 +0,0 @@ -Avoid a crash: - -https://github.com/syncthing/syncthing/issues/5002 - -Patch copied from upstream source repository: - -https://github.com/syncthing/syncthing/commit/35a75a95dc6383b2d73ab645f1407f7907ec1a2c - -From 35a75a95dc6383b2d73ab645f1407f7907ec1a2c Mon Sep 17 00:00:00 2001 -From: Jakob Borg -Date: Wed, 13 Jun 2018 19:07:52 +0200 -Subject: [PATCH] lib/model: Don't panic when rechecking file (fixes #5002) - (#5003) - ---- - lib/model/model.go | 2 +- - lib/model/model_test.go | 26 ++++++++++++++++++++++++++ - 2 files changed, 27 insertions(+), 1 deletion(-) - -diff --git a/lib/model/model.go b/lib/model/model.go -index 5a9146e0..302f06c5 100644 ---- a/lib/model/model.go -+++ b/lib/model/model.go -@@ -1373,7 +1373,7 @@ func (m *Model) recheckFile(deviceID protocol.DeviceID, folderFs fs.Filesystem, - return - } - -- if blockIndex > len(cf.Blocks) { -+ if blockIndex >= len(cf.Blocks) { - l.Debugf("%v recheckFile: %s: %q / %q i=%d: block index too far", m, deviceID, folder, name, blockIndex) - return - } -diff --git a/lib/model/model_test.go b/lib/model/model_test.go -index 295eafc1..456bbc4a 100644 ---- a/lib/model/model_test.go -+++ b/lib/model/model_test.go -@@ -3608,6 +3608,32 @@ func TestIssue4903(t *testing.T) { - } - } - -+func TestIssue5002(t *testing.T) { -+ // recheckFile should not panic when given an index equal to the number of blocks -+ -+ db := db.OpenMemory() -+ m := NewModel(defaultCfgWrapper, protocol.LocalDeviceID, "syncthing", "dev", db, nil) -+ m.AddFolder(defaultFolderConfig) -+ m.StartFolder("default") -+ -+ m.ServeBackground() -+ defer m.Stop() -+ -+ if err := m.ScanFolder("default"); err != nil { -+ t.Error(err) -+ } -+ -+ file, ok := m.CurrentFolderFile("default", "foo") -+ if !ok { -+ t.Fatal("test file should exist") -+ } -+ nBlocks := len(file.Blocks) -+ -+ m.recheckFile(protocol.LocalDeviceID, defaultFolderConfig.Filesystem(), "default", "foo", nBlocks-1, []byte{1, 2, 3, 4}) -+ m.recheckFile(protocol.LocalDeviceID, defaultFolderConfig.Filesystem(), "default", "foo", nBlocks, []byte{1, 2, 3, 4}) // panic -+ m.recheckFile(protocol.LocalDeviceID, defaultFolderConfig.Filesystem(), "default", "foo", nBlocks+1, []byte{1, 2, 3, 4}) -+} -+ - func addFakeConn(m *Model, dev protocol.DeviceID) *fakeConnection { - fc := &fakeConnection{id: dev, model: m} - m.AddConnection(fc, protocol.HelloResult{}) --- -2.18.0 - diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index c9313e7d94..58e3f02db8 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -30,16 +30,15 @@ (define-public syncthing (package (name "syncthing") - (version "0.14.48") + (version "0.14.49") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" "/releases/download/v" version "/syncthing-source-v" version ".tar.gz")) - (patches (search-patches "syncthing-fix-crash.patch")) (sha256 (base32 - "0bxkm5jlj6l4gai23bg0y31brr80r9qllh1rdg29pahjn0c2b4ml")) + "06mzzj5iwgqw3yva7azrsqs9zpl84srbamza4gm03grp7v9gf3sj")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. (snippet '(begin @@ -130,7 +129,6 @@ ("go-github-com-golang-groupcache-lru" ,go-github-com-golang-groupcache-lru) ("go-github-com-jackpal-gateway" ,go-github-com-jackpal-gateway) - ("go-github-com-kardianos-osext" ,go-github-com-kardianos-osext) ("go-github-com-kballard-go-shellquote" ,go-github-com-kballard-go-shellquote) ("go-github-com-lib-pq" ,go-github-com-lib-pq) -- cgit 1.4.1