diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile index c7481d74099b..afab2e4fc4eb 100644 --- a/net/syncthing/Makefile +++ b/net/syncthing/Makefile @@ -1,66 +1,65 @@ PORTNAME= syncthing DISTVERSIONPREFIX= v -DISTVERSION= 2.0.12 -PORTREVISION= 2 +DISTVERSION= 2.0.13 CATEGORIES= net MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ DISTNAME= ${PORTNAME}-source-${DISTVERSIONFULL} MAINTAINER= dvl@FreeBSD.org COMMENT= Encrypted file sync tool WWW= https://syncthing.net/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/${PORTNAME}/LICENSE USES= cpe go:modules USE_RC_SUBR= syncthing syncthing-discosrv syncthing-relaysrv \ syncthing-relaypoolsrv BINS= syncthing stdiscosrv strelaysrv strelaypoolsrv # Anonymize MAKE_ENV+= BUILD_HOST=freebsd \ BUILD_USER=ports CONFLICTS_INSTALL= syncthing1 NO_CCACHE= yes NO_WRKSUBDIR= yes USERS= syncthing GROUPS= syncthing .for x in ${BINS} PLIST_FILES+= bin/${x} .endfor PORTDOCS= * OPTIONS_DEFINE= DOCS do-build: @( cd ${WRKSRC}/${PORTNAME} ; \ ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade build ; \ ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade build stdiscosrv; \ ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade build strelaysrv; \ ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -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 do-test: @( cd ${WRKSRC}/${PORTNAME} ; \ ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade test ; \ ) .include diff --git a/net/syncthing/distinfo b/net/syncthing/distinfo index 5b62c0a7e9ed..767632fac899 100644 --- a/net/syncthing/distinfo +++ b/net/syncthing/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1764678760 -SHA256 (syncthing-source-v2.0.12.tar.gz) = 56004ae6d974aa387c3c6a734eb98aafd5d6159fc657a1f4c618e0b1814fadae -SIZE (syncthing-source-v2.0.12.tar.gz) = 62613260 +TIMESTAMP = 1767704310 +SHA256 (syncthing-source-v2.0.13.tar.gz) = fd7c93e01a6d61faa84adda8b22479dd7fd106144fbbb2eb15d773707d8a382e +SIZE (syncthing-source-v2.0.13.tar.gz) = 62623134 diff --git a/net/syncthing/files/patch-syncthing_lib_beacon_multicast.go b/net/syncthing/files/patch-syncthing_lib_beacon_multicast.go index 2b817687cf6e..d44b72e8e104 100644 --- a/net/syncthing/files/patch-syncthing_lib_beacon_multicast.go +++ b/net/syncthing/files/patch-syncthing_lib_beacon_multicast.go @@ -1,12 +1,11 @@ ---- syncthing/lib/beacon/multicast.go.orig 2021-07-06 12:51:32 UTC +--- syncthing/lib/beacon/multicast.go.orig 2026-01-06 13:20:06 UTC +++ syncthing/lib/beacon/multicast.go -@@ -126,6 +126,9 @@ func readMulticasts(ctx context.Context, outbox chan<- +@@ -129,7 +129,7 @@ func readMulticasts(ctx context.Context, outbox chan<- pconn := ipv6.NewPacketConn(conn) joined := 0 for _, intf := range intfs { +- if intf.Flags&net.FlagMulticast == 0 { + if intf.Flags&net.FlagUp == 0 || intf.Flags&net.FlagMulticast == 0 || intf.Name == "ipfw0" { -+ continue -+ } - err := pconn.JoinGroup(&intf, &net.UDPAddr{IP: gaddr.IP}) - if err != nil { - l.Debugln("IPv6 join", intf.Name, "failed:", err) + slog.DebugContext(ctx, "Not joining multicast group on non-multicast interface", "name", intf.Name, slog.String("flags", intf.Flags.String())) + continue + }