diff options
| -rw-r--r-- | net/syncthing/Makefile | 3 | ||||
| -rw-r--r-- | net/syncthing/distinfo | 6 | ||||
| -rw-r--r-- | net/syncthing/files/patch-171.diff | 20 |
3 files changed, 4 insertions, 25 deletions
diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile index a1bfc9822045..c9a7e9f38462 100644 --- a/net/syncthing/Makefile +++ b/net/syncthing/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= syncthing -PORTVERSION= 1.7.0 -PORTREVISION= 1 +PORTVERSION= 1.7.1 DISTVERSIONPREFIX= v CATEGORIES= net MASTER_SITES= https://github.com/syncthing/syncthing/releases/download/v${PORTVERSION}/ diff --git a/net/syncthing/distinfo b/net/syncthing/distinfo index a9ea85fb8a84..8dd5d33fffb0 100644 --- a/net/syncthing/distinfo +++ b/net/syncthing/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1594234086 -SHA256 (syncthing-source-v1.7.0.tar.gz) = aee7ee49b65cb614711b9d8a7d468766adbb687fa5ba8f273eef495e4a8e9435 -SIZE (syncthing-source-v1.7.0.tar.gz) = 11594328 +TIMESTAMP = 1595038065 +SHA256 (syncthing-source-v1.7.1.tar.gz) = edf0d9adcc57e61efc270205ad89e594ee79cadb39d568c4628de4d6f8e8f4c8 +SIZE (syncthing-source-v1.7.1.tar.gz) = 11594346 diff --git a/net/syncthing/files/patch-171.diff b/net/syncthing/files/patch-171.diff deleted file mode 100644 index a47fa95b05aa..000000000000 --- a/net/syncthing/files/patch-171.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- syncthing/lib/scanner/blocks.go.orig -+++ syncthing/lib/scanner/blocks.go -@@ -108,12 +108,12 @@ func Blocks(ctx context.Context, r io.Reader, blocksize int, sizehint int64, cou - return blocks, nil - } - --// Validate quickly validates buf against the cryptohash hash (if len(hash)>0) --// and the 32-bit hash weakHash (if not zero). It is satisfied if either hash --// matches, or neither is given. -+// Validate quickly validates buf against the 32-bit weakHash, if not zero, -+// else against the cryptohash hash, if len(hash)>0. It is satisfied if -+// either hash matches or neither hash is given. - func Validate(buf, hash []byte, weakHash uint32) bool { -- if weakHash != 0 { -- return adler32.Checksum(buf) == weakHash -+ if weakHash != 0 && adler32.Checksum(buf) == weakHash { -+ return true - } - - if len(hash) > 0 { |