Update to 0.13.4.

Tested with syncthing-android 0.7.18 (syncthing 0.13.0).
Packaging changes: increase GOPATH hackery.

Upstream changes: bug and security fixes, plus a major version upgrade
with an incompatible protocol.

Syncthing v0.13.0 "Copper Cockroach"
Upgrade Notes

  v0.13 is not protocol compatible with v0.12.

  The database format has changed. It will be migrated without rescan
  on first startup, but the first startup may take longer than usual.

Major Changes Since v0.12

  Devices now announce files that are in progress of being downloaded,
  in addition to those that are already complete. This means a device
  can serve parts of a file to other devices before it has completed
  the download itself.

  Folder labels are now distinct from the folder ID. The intention is
  for the label to be human readable and for the ID to be machine
  readable and unique. When upgrading, folder IDs are not
  changed. However when creating new folders Syncthing will suggest a
  random, unique folder ID.

  When receiving a connection attempt from an unknown device Syncthing
  will now show the name of that device, not only it's ID.

  Syncthing will now manage port mappings on NAT-PMP compliant routers,
  in addition to the existing UPnP support.  Minor Changes and
  Improvements

  Ignored files can now be tagged with the prefix (?d) to indicate that
  Syncthing may delete these files if they remain when deleting a
  directory. Ignore patterns use less memory by default.

  The address for sync connections, both the listening side and for
  remote devices, can now be made IPv4- or IPv6-only. Use the tcp4:// or
  tcp6:// schemes to specify one or the other. The default tcp:// is
  still dual stack. Additionally, relays are now treated as listen
  addresses and set in the same configuration setting.

  The folder settings dialog has been cleaned up.

  The environment variable ALL_PROXY_NO_FALLBACK can be set to disable
  falling back to direct connections in the absence of a working proxy.

  Many, many bug fixes.

Known Issues

  The "Syncing" complete percentage for remote devices may erroneously
  display more than 100% (i.e. 156% or 297%) while a remote device is
  still synchronizing.

3 files changed, 18 insertions, 12 deletions

diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index e70fc877fad..a50fd38c49e 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/05/23 12:57:14 gdt Exp $
+# $NetBSD: Makefile,v 1.19 2016/06/01 18:46:00 gdt Exp $
 
 # Upstream regularly breaks protocol compatibility.  While users of
 # pkgsrc syncthing on multiple systems can update synchronously, an
@@ -13,7 +13,7 @@
 # Note that the android versioning is disconnected from syncthing versioning;
 # see https://github.com/syncthing/syncthing-android/issues/652 for
 # a fuller explanation.
-DISTNAME=	syncthing-0.12.24
+DISTNAME=	syncthing-0.13.4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=syncthing/}
 
@@ -43,9 +43,15 @@ SUBST_FILES.version=	build.go
 SUBST_SED.version=	-e 's|runError("git", "describe", "--always", "--dirty")|runError("echo","v${PKGVERSION_NOREV}")|'
 SUBST_SED.version+=	-e 's|runError("git", "show", "-s", "--format=%ct")|runError("false")|'
 
+# The following is more complicated than the build documenation says,
+# but appears necessary to link in both syncthing sources and the
+# included sources.
 post-extract:
 	${MKDIR} ${WRKDIR}/gopath/src/github.com/syncthing
+	${MKDIR} ${WRKDIR}/gopath/src/golang.org
 	${LN} -s ${WRKSRC} ${WRKDIR}/gopath/src/github.com/syncthing/syncthing
+	${LN} -s ${WRKSRC}/vendor/github.com/* ${WRKDIR}/gopath/src/github.com
+	${LN} -s ${WRKSRC}/vendor/golang.org/* ${WRKDIR}/gopath/src/golang.org
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/go run build.go
diff --git a/net/syncthing/distinfo b/net/syncthing/distinfo
index 4e719d2f318..b17b40b7016 100644
--- a/net/syncthing/distinfo
+++ b/net/syncthing/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2016/05/15 22:30:10 abs Exp $
+$NetBSD: distinfo,v 1.16 2016/06/01 18:46:00 gdt Exp $
 
-SHA1 (syncthing-0.12.24.tar.gz) = 0b6355627c67f719ba8a702b6bf809dd4c7b1dcf
-RMD160 (syncthing-0.12.24.tar.gz) = e7118e9630c5d59f6b90d7537e9f4bd92616bd6c
-SHA512 (syncthing-0.12.24.tar.gz) = 684c9f863c0427813c32b63aec8cc4d9a1c575dc4b2fb4b989e35b9e1e2b05222edd9935fdf8331b074f9962d4b03d82e67c008e01bf9ce42c01bf68229d46f3
-Size (syncthing-0.12.24.tar.gz) = 4469779 bytes
-SHA1 (patch-lib_config_optionsconfiguration.go) = 8ea9446dab9f9345c63cb01a7d50447e6cd550ac
+SHA1 (syncthing-0.13.4.tar.gz) = dd918c9abc4dc706e16d7718e1890800b222a251
+RMD160 (syncthing-0.13.4.tar.gz) = 117106707d62607ee989e6ed57b058d2f183e9aa
+SHA512 (syncthing-0.13.4.tar.gz) = e7ffaa2f72e81e19ebe190db5384a72e19aae531c0ea7f9603f0683b9adae48ea2c637d0aaa86550b1b6e8f1543576caf9bec69be6264b460a91422cdd9df7df
+Size (syncthing-0.13.4.tar.gz) = 3937983 bytes
+SHA1 (patch-lib_config_optionsconfiguration.go) = 341c1c032c9551e17c86a6fb5d3552b1d79041c8
diff --git a/net/syncthing/patches/patch-lib_config_optionsconfiguration.go b/net/syncthing/patches/patch-lib_config_optionsconfiguration.go
index ed144128a89..58e72e93aea 100644
--- a/net/syncthing/patches/patch-lib_config_optionsconfiguration.go
+++ b/net/syncthing/patches/patch-lib_config_optionsconfiguration.go
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_config_optionsconfiguration.go,v 1.2 2015/11/26 00:18:56 gdt Exp $
+$NetBSD: patch-lib_config_optionsconfiguration.go,v 1.3 2016/06/01 18:46:01 gdt Exp $
 
 By default, disable automatic upgrade checking, because it is a
 privacy leak, of the sort that would earn a warning on f-droid a la:
@@ -7,14 +7,14 @@ privacy leak, of the sort that would earn a warning on f-droid a la:
 Not reported upstream because they appear to think upgrade
 checks/web-bugs are a feature.
 
---- lib/config/optionsconfiguration.go.orig	2015-11-22 15:05:20.000000000 +0000
+--- lib/config/optionsconfiguration.go.orig	2016-05-26 09:16:08.000000000 +0000
 +++ lib/config/optionsconfiguration.go
-@@ -31,7 +31,7 @@ type OptionsConfiguration struct {
+@@ -29,7 +29,7 @@ type OptionsConfiguration struct {
  	URPostInsecurely        bool     `xml:"urPostInsecurely" json:"urPostInsecurely" default:"false"` // For testing
  	URInitialDelayS         int      `xml:"urInitialDelayS" json:"urInitialDelayS" default:"1800"`
  	RestartOnWakeup         bool     `xml:"restartOnWakeup" json:"restartOnWakeup" default:"true"`
 -	AutoUpgradeIntervalH    int      `xml:"autoUpgradeIntervalH" json:"autoUpgradeIntervalH" default:"12"` // 0 for off
 +	AutoUpgradeIntervalH    int      `xml:"autoUpgradeIntervalH" json:"autoUpgradeIntervalH" default:"0"` // 0 for off
  	KeepTemporariesH        int      `xml:"keepTemporariesH" json:"keepTemporariesH" default:"24"`         // 0 for off
- 	CacheIgnoredFiles       bool     `xml:"cacheIgnoredFiles" json:"cacheIgnoredFiles" default:"true"`
+ 	CacheIgnoredFiles       bool     `xml:"cacheIgnoredFiles" json:"cacheIgnoredFiles" default:"false"`
  	ProgressUpdateIntervalS int      `xml:"progressUpdateIntervalS" json:"progressUpdateIntervalS" default:"5"`