Index: head/net/syncthing/Makefile =================================================================== --- head/net/syncthing/Makefile (revision 542475) +++ head/net/syncthing/Makefile (revision 542476) @@ -1,55 +1,54 @@ # $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}/ DISTNAME= ${PORTNAME}-source-${DISTVERSIONPREFIX}${PORTVERSION} MAINTAINER= swills@FreeBSD.org COMMENT= Encrypted file sync tool LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/${PORTNAME}/LICENSE USES= go USE_RC_SUBR= syncthing syncthing-discosrv syncthing-relaysrv syncthing-relaypoolsrv BINS= syncthing stdiscosrv strelaysrv strelaypoolsrv .for x in ${BINS} PLIST_FILES+= bin/${x} .endfor PORTDOCS= * USERS= syncthing GROUPS= syncthing OPTIONS_DEFINE= DOCS NO_WRKSUBDIR= yes do-build: @( cd ${WRKSRC}/${PORTNAME} ; \ ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build ; \ ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build stdiscosrv ; \ ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build strelaysrv ; \ ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build strelaypoolsrv ; \ ) do-install: .for x in ${BINS} ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}/${x} \ ${STAGEDIR}${PREFIX}/bin/ .endfor ${MKDIR} ${STAGEDIR}${DOCSDIR} .for x in AUTHORS LICENSE README.md ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${x} \ ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/net/syncthing/distinfo =================================================================== --- head/net/syncthing/distinfo (revision 542475) +++ head/net/syncthing/distinfo (revision 542476) @@ -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 Index: head/net/syncthing/files/patch-171.diff =================================================================== --- head/net/syncthing/files/patch-171.diff (revision 542475) +++ head/net/syncthing/files/patch-171.diff (nonexistent) @@ -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 { Property changes on: head/net/syncthing/files/patch-171.diff ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property