From owner-dev-commits-ports-all@freebsd.org Sat Aug 28 01:47:01 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0162F66B6D3; Sat, 28 Aug 2021 01:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GxKFc6531z3vnt; Sat, 28 Aug 2021 01:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B9A135D5A; Sat, 28 Aug 2021 01:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17S1l08x002282; Sat, 28 Aug 2021 01:47:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17S1l0er002281; Sat, 28 Aug 2021 01:47:00 GMT (envelope-from git) Date: Sat, 28 Aug 2021 01:47:00 GMT Message-Id: <202108280147.17S1l0er002281@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Steve Wills Subject: git: 57a3995a942c - main - net/syncthing: update to 1.18.1 [0] MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: swills X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57a3995a942c59fa51caa39552b290243e957613 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Aug 2021 01:47:01 -0000 The branch main has been updated by swills: URL: https://cgit.FreeBSD.org/ports/commit/?id=57a3995a942c59fa51caa39552b290243e957613 commit 57a3995a942c59fa51caa39552b290243e957613 Author: Steve Wills AuthorDate: 2021-07-23 00:41:47 +0000 Commit: Steve Wills CommitDate: 2021-08-28 01:45:42 +0000 net/syncthing: update to 1.18.1 [0] While here, work around multicast issue until all supported versions have the fix [1] PR: 257322 [1] Obtained from: Alex Vasylenko [1] --- net/syncthing/Makefile | 2 +- net/syncthing/distinfo | 6 +++--- net/syncthing/files/patch-syncthing_lib_beacon_multicast.go | 12 ++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile index e173aebafdcf..926f248e434c 100644 --- a/net/syncthing/Makefile +++ b/net/syncthing/Makefile @@ -1,5 +1,5 @@ PORTNAME= syncthing -PORTVERSION= 1.18.0 +PORTVERSION= 1.18.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 796287005e7c..019a94a64441 100644 --- a/net/syncthing/distinfo +++ b/net/syncthing/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626354379 -SHA256 (syncthing-source-v1.18.0.tar.gz) = 169d3579b74083d4115b4d324620a7f0888e4b1a3ad3dac71d46d76d51322900 -SIZE (syncthing-source-v1.18.0.tar.gz) = 12856546 +TIMESTAMP = 1630113856 +SHA256 (syncthing-source-v1.18.1.tar.gz) = 3f6b8e87a59e72ab3389d89364524e6abec454d4c36aaf3e334ac6fe37915584 +SIZE (syncthing-source-v1.18.1.tar.gz) = 12860998 diff --git a/net/syncthing/files/patch-syncthing_lib_beacon_multicast.go b/net/syncthing/files/patch-syncthing_lib_beacon_multicast.go new file mode 100644 index 000000000000..2b817687cf6e --- /dev/null +++ b/net/syncthing/files/patch-syncthing_lib_beacon_multicast.go @@ -0,0 +1,12 @@ +--- syncthing/lib/beacon/multicast.go.orig 2021-07-06 12:51:32 UTC ++++ syncthing/lib/beacon/multicast.go +@@ -126,6 +126,9 @@ func readMulticasts(ctx context.Context, outbox chan<- + pconn := ipv6.NewPacketConn(conn) + joined := 0 + for _, intf := range intfs { ++ 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)