From f641566a5e5215703e67ecc14b4e99b329867a1d713976d2f1a1af49f9b37db6 Mon Sep 17 00:00:00 2001
From: Alexei Sorokin <sor.alexei@meowr.ru>
Date: Wed, 7 Dec 2016 17:23:08 +0000
Subject: [PATCH] - Update to version 0.14.13.

OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=84
---
 syncthing-0.14.13-go-1.6-compat.patch | 15 +++++++++++++++
 syncthing-source-v0.14.12.tar.gz      |  3 ---
 syncthing-source-v0.14.12.tar.gz.asc  | 11 -----------
 syncthing-source-v0.14.13.tar.gz      |  3 +++
 syncthing-source-v0.14.13.tar.gz.asc  | 11 +++++++++++
 syncthing.changes                     | 12 ++++++++++++
 syncthing.spec                        |  5 ++++-
 7 files changed, 45 insertions(+), 15 deletions(-)
 create mode 100644 syncthing-0.14.13-go-1.6-compat.patch
 delete mode 100644 syncthing-source-v0.14.12.tar.gz
 delete mode 100644 syncthing-source-v0.14.12.tar.gz.asc
 create mode 100644 syncthing-source-v0.14.13.tar.gz
 create mode 100644 syncthing-source-v0.14.13.tar.gz.asc

diff --git a/syncthing-0.14.13-go-1.6-compat.patch b/syncthing-0.14.13-go-1.6-compat.patch
new file mode 100644
index 0000000..7158352
--- /dev/null
+++ b/syncthing-0.14.13-go-1.6-compat.patch
@@ -0,0 +1,15 @@
+--- a/cmd/strelaysrv/main.go
++++ b/cmd/strelaysrv/main.go
+@@ -129,10 +129,10 @@ func main() {
+ 		laddr.Port = 0
+ 		transport, ok := http.DefaultTransport.(*http.Transport)
+ 		if ok {
+-			transport.DialContext = (&net.Dialer{
++			transport.Dial = (&net.Dialer{
+ 				Timeout:   30 * time.Second,
+ 				LocalAddr: laddr,
+-			}).DialContext
++			}).Dial
+ 		}
+ 	}
+ 
diff --git a/syncthing-source-v0.14.12.tar.gz b/syncthing-source-v0.14.12.tar.gz
deleted file mode 100644
index b4d2755..0000000
--- a/syncthing-source-v0.14.12.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65cc5662923d9e211d362d764a6ae419023e83622b74678c816ab0a5083c9f91
-size 7413836
diff --git a/syncthing-source-v0.14.12.tar.gz.asc b/syncthing-source-v0.14.12.tar.gz.asc
deleted file mode 100644
index 001bfbd..0000000
--- a/syncthing-source-v0.14.12.tar.gz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQEcBAABCAAGBQJYNAn3AAoJENJubtAAZUo+V/sIAJ0n5CqdkN/QiF6bSqer9+Js
-hh3EonWqbzOm6gvhwOuZ1oYwhB8Ibh07uqMqdtiwx6EXx0GGdtYoj0MbddipHSeO
-VxjEcGFtBePJXsU80b/w5XLmDh7rHZ/Aj73wQAXpcAvcI2fEA5aiEfrnuBpSKakV
-PM68aS80I0kucF4kw60qPeUR22l067JrxPuvH4tOQ5Bfb7i4jt4RF0D9M5bz0eWE
-QxIHVlhDOIB2A+awmrdqR++qxb6qLd2xT7bwhICyh9svCSNQkm1V4Dd97afpX6lO
-YYS0UV9Rp+Jqf1+ozFFs444YffIsEKy4hwLBLRjvkRIsWs9KFQqkhPXH4aYa2eo=
-=rCQu
------END PGP SIGNATURE-----
diff --git a/syncthing-source-v0.14.13.tar.gz b/syncthing-source-v0.14.13.tar.gz
new file mode 100644
index 0000000..586e33c
--- /dev/null
+++ b/syncthing-source-v0.14.13.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f1190173f2ba2f341920faf7aa1a05af775bac6cd4cff0f003c4b0831022c67d
+size 7418996
diff --git a/syncthing-source-v0.14.13.tar.gz.asc b/syncthing-source-v0.14.13.tar.gz.asc
new file mode 100644
index 0000000..65b6514
--- /dev/null
+++ b/syncthing-source-v0.14.13.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABCAAGBQJYPWkJAAoJENJubtAAZUo+GCkH/2A19wgQagu/KS1TWsbmRbOU
+9epnP6gjvBAABUxWHtrXoAsjhBrK7QPdAFHKEaUFumYoCHzfT1ZbNjc+Rwd5rv3O
+Ind4yLYbTXj4wn2bwwLOasr9nhk27ZCFlvaic1a5ZqT2msisVh0RpNuI64doN+8X
+Wol3svGOEKupL5ffISdbNn1ovGoUiCO89RJR2Ha1drIxrCe0nUlQ4JZkgub/YNEe
+yCTKJlI326cIZiPNqTUNYn59iZ4PBz87dsFfdgJ0BD58wF5qPOL2owFH6gERR9me
+mzKx792vemH/qn0p4KleQ4t0YLEhVxKVmAapc4qrq4/2XkhSfCU6ckSp3dY4ksI=
+=8wbB
+-----END PGP SIGNATURE-----
diff --git a/syncthing.changes b/syncthing.changes
index 0d69558..580d3f6 100644
--- a/syncthing.changes
+++ b/syncthing.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Dec  7 12:13:25 UTC 2016 - sor.alexei@meowr.ru
+
+- Update to version 0.14.13:
+  * Improve CPU usage when scanning (gh#syncthing/syncthing#3394).
+  * Fix writing config and .stignore files on filesystems without
+    chmod support (gh#syncthing/syncthing#2472).
+  * Language selector now stays above the bottom bar
+    (gh#syncthing/syncthing#3758).
+- Add syncthing-0.14.13-go-1.6-compat.patch: Fix Go 1.6 and older
+  compatibility (commit 0dcf2f1).
+
 -------------------------------------------------------------------
 Mon Nov 28 13:23:16 UTC 2016 - sor.alexei@meowr.ru
 
diff --git a/syncthing.spec b/syncthing.spec
index 193dcbd..78b3b6c 100644
--- a/syncthing.spec
+++ b/syncthing.spec
@@ -17,7 +17,7 @@
 
 
 Name:           syncthing
-Version:        0.14.12
+Version:        0.14.13
 Release:        0
 Summary:        FOSS Continuous File Synchronisation
 License:        MPL-2.0
@@ -27,6 +27,8 @@ Source:         https://github.com/%{name}/%{name}/releases/download/v%{version}
 Source1:        https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz.asc
 Source2:        %{name}.keyring
 Source3:        %{name}.firewall
+# PATCH-FIX-UPSTREAM syncthing-0.14.13-go-1.6-compat.patch -- Fix Go 1.6 and older compatibility (commit 0dcf2f1).
+Patch0:         %{name}-0.14.13-go-1.6-compat.patch
 BuildRequires:  go >= 1.3
 BuildRequires:  systemd
 BuildRequires:  systemd-rpm-macros
@@ -40,6 +42,7 @@ Internet.
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
 cp -f %{SOURCE3} %{name}.firewall
 %if !(0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200)
 # Remove entries which only exist since systemd 215.