From da182aeaeb915ca9dd61659638e5a84c1ac04a4dc5964e512ca2ff5919d60efc Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sat, 17 Dec 2016 14:26:02 +0000 Subject: [PATCH 1/8] - Update to version 0.14.15. OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=86 --- syncthing-0.14.13-go-1.6-compat.patch | 15 --------------- syncthing-source-v0.14.13.tar.gz | 3 --- syncthing-source-v0.14.13.tar.gz.asc | 11 ----------- syncthing-source-v0.14.15.tar.gz | 3 +++ syncthing-source-v0.14.15.tar.gz.asc | 11 +++++++++++ syncthing.changes | 19 +++++++++++++++++++ syncthing.spec | 5 +---- 7 files changed, 34 insertions(+), 33 deletions(-) delete mode 100644 syncthing-0.14.13-go-1.6-compat.patch delete mode 100644 syncthing-source-v0.14.13.tar.gz delete mode 100644 syncthing-source-v0.14.13.tar.gz.asc create mode 100644 syncthing-source-v0.14.15.tar.gz create mode 100644 syncthing-source-v0.14.15.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 deleted file mode 100644 index 7158352..0000000 --- a/syncthing-0.14.13-go-1.6-compat.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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.13.tar.gz b/syncthing-source-v0.14.13.tar.gz deleted file mode 100644 index 586e33c..0000000 --- a/syncthing-source-v0.14.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 65b6514..0000000 --- a/syncthing-source-v0.14.13.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------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-source-v0.14.15.tar.gz b/syncthing-source-v0.14.15.tar.gz new file mode 100644 index 0000000..b43d22b --- /dev/null +++ b/syncthing-source-v0.14.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4464433666e0fa82d536111b2921f726b2b064606696ec1305eb568345b5e9a +size 6907683 diff --git a/syncthing-source-v0.14.15.tar.gz.asc b/syncthing-source-v0.14.15.tar.gz.asc new file mode 100644 index 0000000..3904c4f --- /dev/null +++ b/syncthing-source-v0.14.15.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABCAAGBQJYVSZAAAoJENJubtAAZUo+S9EH/1CFzxw1LZAX7OIgrSyng6RF +zSH4YoRf9AHN22/As2rfMq80V5/VxgWXqAJze+mqm9YqDfrpm8WlVjYwTT+iSL+9 +D4drqC/E0OGs3HDTTOse9ZNpyTs8g9HTq4mgRlE4iGv+C7/XHnDLxCmGMsAQzdQq +DSz3MgTlrWQFWecRPqc7NJ0JP7AqKX5rMVEtqzgBnQ30rAk5zOik26ShlnGy0cMh +BeFvgUgFzVge8kg6DApm17+M7XJ53wEfYhJZoNjIx7DaaHhlbfn10uh4tF8tnsrm +LGNJrtm+qTP3NGfhj1RaUV+mBUrD+W2mHKM+/YeaGrL6i+bw5KkjsAUbBND8PTE= +=6C7H +-----END PGP SIGNATURE----- diff --git a/syncthing.changes b/syncthing.changes index 580d3f6..72d40ea 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sat Dec 17 12:36:37 UTC 2016 - sor.alexei@meowr.ru + +- Update to version 0.14.15 (changes since 0.14.13): + * Fix a security issue resulted in Syncthing accepting index + entries for files like '../../foo', thus resulting in a path + above the configured directory. + * Fix a security issue resulted in symlinks be used to trick + Syncthing and escape constraints of the configured directory by + creating a symlink 'foo -> ../../' and then requesting the + contents of 'foo/something' (boo#1016161). + Syncing symlinks between v0.14.14+ and previous versions will + not work. + * The build no longer requires Go 1.7 + (gh#syncthing/syncthing#3753). + * The wording in the GUI around "last file received" is now + clearer (gh#syncthing/syncthing#3769). +- Remove syncthing-0.14.13-go-1.6-compat.patch: fixed upstream. + ------------------------------------------------------------------- Wed Dec 7 12:13:25 UTC 2016 - sor.alexei@meowr.ru diff --git a/syncthing.spec b/syncthing.spec index 78b3b6c..3b4753d 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -17,7 +17,7 @@ Name: syncthing -Version: 0.14.13 +Version: 0.14.15 Release: 0 Summary: FOSS Continuous File Synchronisation License: MPL-2.0 @@ -27,8 +27,6 @@ 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 @@ -42,7 +40,6 @@ 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. From 0d6c7d38b79b789ddfb04d67cad138f55cd2458c327566f89f90ab243824bd43 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sat, 17 Dec 2016 18:19:49 +0000 Subject: [PATCH 2/8] OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=87 --- syncthing-go-1.4-compat.patch | 612 ++++++++++++++++++++++++++++++++++ syncthing.changes | 1 + syncthing.spec | 6 +- 3 files changed, 618 insertions(+), 1 deletion(-) create mode 100644 syncthing-go-1.4-compat.patch diff --git a/syncthing-go-1.4-compat.patch b/syncthing-go-1.4-compat.patch new file mode 100644 index 0000000..019e0e4 --- /dev/null +++ b/syncthing-go-1.4-compat.patch @@ -0,0 +1,612 @@ +--- a/vendor/github.com/minio/sha256-simd/cpuid_386.go ++++ b/vendor/github.com/minio/sha256-simd/cpuid_386.go +@@ -1,3 +1,5 @@ ++// +build 386 ++ + // Minio Cloud Storage, (C) 2016 Minio, Inc. + // + // Licensed under the Apache License, Version 2.0 (the "License"); +--- a/vendor/github.com/minio/sha256-simd/cpuid_amd64.go ++++ b/vendor/github.com/minio/sha256-simd/cpuid_amd64.go +@@ -1,3 +1,5 @@ ++// +build amd64 ++ + // Minio Cloud Storage, (C) 2016 Minio, Inc. + // + // Licensed under the Apache License, Version 2.0 (the "License"); +--- a/vendor/github.com/minio/sha256-simd/cpuid_arm64.go ++++ b/vendor/github.com/minio/sha256-simd/cpuid_arm64.go +@@ -1,3 +1,5 @@ ++// +build arm64 ++ + // Minio Cloud Storage, (C) 2016 Minio, Inc. + // + // Licensed under the Apache License, Version 2.0 (the "License"); +--- a/vendor/github.com/minio/sha256-simd/cpuid_arm.go ++++ /dev/null +@@ -1,33 +0,0 @@ +-// Minio Cloud Storage, (C) 2016 Minio, Inc. +-// +-// Licensed under the Apache License, Version 2.0 (the "License"); +-// you may not use this file except in compliance with the License. +-// You may obtain a copy of the License at +-// +-// http://www.apache.org/licenses/LICENSE-2.0 +-// +-// Unless required by applicable law or agreed to in writing, software +-// distributed under the License is distributed on an "AS IS" BASIS, +-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-// See the License for the specific language governing permissions and +-// limitations under the License. +-// +- +-package sha256 +- +-func cpuid(op uint32) (eax, ebx, ecx, edx uint32) { +- return 0, 0, 0, 0 +-} +- +-func cpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32) { +- return 0, 0, 0, 0 +-} +- +-func xgetbv(index uint32) (eax, edx uint32) { +- return 0, 0 +-} +- +-func haveArmSha() bool { +- // TODO: Implement feature detection for ARM +- return true +-} +--- a/vendor/github.com/minio/sha256-simd/cpuid_noasm.go ++++ b/vendor/github.com/minio/sha256-simd/cpuid_noasm.go +@@ -0,0 +1,34 @@ ++// +build !386,!amd64,!arm64 noasm ++ ++// Minio Cloud Storage, (C) 2016 Minio, Inc. ++// ++// Licensed under the Apache License, Version 2.0 (the "License"); ++// you may not use this file except in compliance with the License. ++// You may obtain a copy of the License at ++// ++// http://www.apache.org/licenses/LICENSE-2.0 ++// ++// Unless required by applicable law or agreed to in writing, software ++// distributed under the License is distributed on an "AS IS" BASIS, ++// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++// See the License for the specific language governing permissions and ++// limitations under the License. ++// ++ ++package sha256 ++ ++func cpuid(op uint32) (eax, ebx, ecx, edx uint32) { ++ return 0, 0, 0, 0 ++} ++ ++func cpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32) { ++ return 0, 0, 0, 0 ++} ++ ++func xgetbv(index uint32) (eax, edx uint32) { ++ return 0, 0 ++} ++ ++func haveArmSha() bool { ++ return false ++} +--- a/vendor/github.com/minio/sha256-simd/cpuid_ppc64.go ++++ /dev/null +@@ -1,32 +0,0 @@ +-// Minio Cloud Storage, (C) 2016 Minio, Inc. +-// +-// Licensed under the Apache License, Version 2.0 (the "License"); +-// you may not use this file except in compliance with the License. +-// You may obtain a copy of the License at +-// +-// http://www.apache.org/licenses/LICENSE-2.0 +-// +-// Unless required by applicable law or agreed to in writing, software +-// distributed under the License is distributed on an "AS IS" BASIS, +-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-// See the License for the specific language governing permissions and +-// limitations under the License. +-// +- +-package sha256 +- +-func cpuid(op uint32) (eax, ebx, ecx, edx uint32) { +- return 0, 0, 0, 0 +-} +- +-func cpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32) { +- return 0, 0, 0, 0 +-} +- +-func xgetbv(index uint32) (eax, edx uint32) { +- return 0, 0 +-} +- +-func haveArmSha() bool { +- return false +-} +--- a/vendor/github.com/minio/sha256-simd/cpuid_ppc64le.go ++++ /dev/null +@@ -1,32 +0,0 @@ +-// Minio Cloud Storage, (C) 2016 Minio, Inc. +-// +-// Licensed under the Apache License, Version 2.0 (the "License"); +-// you may not use this file except in compliance with the License. +-// You may obtain a copy of the License at +-// +-// http://www.apache.org/licenses/LICENSE-2.0 +-// +-// Unless required by applicable law or agreed to in writing, software +-// distributed under the License is distributed on an "AS IS" BASIS, +-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-// See the License for the specific language governing permissions and +-// limitations under the License. +-// +- +-package sha256 +- +-func cpuid(op uint32) (eax, ebx, ecx, edx uint32) { +- return 0, 0, 0, 0 +-} +- +-func cpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32) { +- return 0, 0, 0, 0 +-} +- +-func xgetbv(index uint32) (eax, edx uint32) { +- return 0, 0 +-} +- +-func haveArmSha() bool { +- return false +-} +--- a/vendor/github.com/minio/sha256-simd/sha256block_386.go ++++ /dev/null +@@ -1,24 +0,0 @@ +-//+build !noasm +- +-/* +- * Minio Cloud Storage, (C) 2016 Minio, Inc. +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-package sha256 +- +-func blockArmGo(dig *digest, p []byte) {} +-func blockAvx2Go(dig *digest, p []byte) {} +-func blockAvxGo(dig *digest, p []byte) {} +-func blockSsseGo(dig *digest, p []byte) {} +--- a/vendor/github.com/minio/sha256-simd/sha256block_amd64.go ++++ b/vendor/github.com/minio/sha256-simd/sha256block_amd64.go +@@ -1,4 +1,4 @@ +-//+build !noasm ++// +build amd64,!noasm,go1.5 + + /* + * Minio Cloud Storage, (C) 2016 Minio, Inc. +--- a/vendor/github.com/minio/sha256-simd/sha256block_arm64.go ++++ b/vendor/github.com/minio/sha256-simd/sha256block_arm64.go +@@ -1,4 +1,4 @@ +-//+build !noasm ++// +build arm64,!noasm,go1.5 + + /* + * Minio Cloud Storage, (C) 2016 Minio, Inc. +--- a/vendor/github.com/minio/sha256-simd/sha256block_arm64.s ++++ b/vendor/github.com/minio/sha256-simd/sha256block_arm64.s +@@ -1,4 +1,4 @@ +-//+build !noasm !appengine ++// +build !noasm,go1.5,!appengine + + // ARM64 version of SHA256 + +--- a/vendor/github.com/minio/sha256-simd/sha256block_arm.go ++++ /dev/null +@@ -1,24 +0,0 @@ +-//+build !noasm +- +-/* +- * Minio Cloud Storage, (C) 2016 Minio, Inc. +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-package sha256 +- +-func blockAvx2Go(dig *digest, p []byte) {} +-func blockAvxGo(dig *digest, p []byte) {} +-func blockSsseGo(dig *digest, p []byte) {} +-func blockArmGo(dig *digest, p []byte) {} +--- a/vendor/github.com/minio/sha256-simd/sha256blockAvx2_amd64.go ++++ b/vendor/github.com/minio/sha256-simd/sha256blockAvx2_amd64.go +@@ -1,4 +1,4 @@ +-//+build !noasm ++// +build amd64,!noasm,go1.5 + + /* + * Minio Cloud Storage, (C) 2016 Minio, Inc. +--- a/vendor/github.com/minio/sha256-simd/sha256blockAvx2_amd64.s ++++ b/vendor/github.com/minio/sha256-simd/sha256blockAvx2_amd64.s +@@ -1,4 +1,4 @@ +-//+build !noasm !appengine ++// +build !noasm,go1.5,!appengine + + // SHA256 implementation for AVX2 + +--- a/vendor/github.com/minio/sha256-simd/sha256blockAvx_amd64.go ++++ b/vendor/github.com/minio/sha256-simd/sha256blockAvx_amd64.go +@@ -1,4 +1,4 @@ +-//+build !noasm ++// +build amd64,!noasm,go1.5 + + /* + * Minio Cloud Storage, (C) 2016 Minio, Inc. +--- a/vendor/github.com/minio/sha256-simd/sha256blockAvx_amd64.s ++++ b/vendor/github.com/minio/sha256-simd/sha256blockAvx_amd64.s +@@ -1,4 +1,4 @@ +-//+build !noasm !appengine ++// +build !noasm,go1.5,!appengine + + // SHA256 implementation for AVX + +--- a/vendor/github.com/minio/sha256-simd/sha256block_generic.go ++++ b/vendor/github.com/minio/sha256-simd/sha256block_generic.go +@@ -0,0 +1,134 @@ ++/* ++ * Minio Cloud Storage, (C) 2016 Minio, Inc. ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++package sha256 ++ ++func blockGeneric(dig *digest, p []byte) { ++ var w [64]uint32 ++ h0, h1, h2, h3, h4, h5, h6, h7 := dig.h[0], dig.h[1], dig.h[2], dig.h[3], dig.h[4], dig.h[5], dig.h[6], dig.h[7] ++ for len(p) >= chunk { ++ // Can interlace the computation of w with the ++ // rounds below if needed for speed. ++ for i := 0; i < 16; i++ { ++ j := i * 4 ++ w[i] = uint32(p[j])<<24 | uint32(p[j+1])<<16 | uint32(p[j+2])<<8 | uint32(p[j+3]) ++ } ++ for i := 16; i < 64; i++ { ++ v1 := w[i-2] ++ t1 := (v1>>17 | v1<<(32-17)) ^ (v1>>19 | v1<<(32-19)) ^ (v1 >> 10) ++ v2 := w[i-15] ++ t2 := (v2>>7 | v2<<(32-7)) ^ (v2>>18 | v2<<(32-18)) ^ (v2 >> 3) ++ w[i] = t1 + w[i-7] + t2 + w[i-16] ++ } ++ ++ a, b, c, d, e, f, g, h := h0, h1, h2, h3, h4, h5, h6, h7 ++ ++ for i := 0; i < 64; i++ { ++ t1 := h + ((e>>6 | e<<(32-6)) ^ (e>>11 | e<<(32-11)) ^ (e>>25 | e<<(32-25))) + ((e & f) ^ (^e & g)) + _K[i] + w[i] ++ ++ t2 := ((a>>2 | a<<(32-2)) ^ (a>>13 | a<<(32-13)) ^ (a>>22 | a<<(32-22))) + ((a & b) ^ (a & c) ^ (b & c)) ++ ++ h = g ++ g = f ++ f = e ++ e = d + t1 ++ d = c ++ c = b ++ b = a ++ a = t1 + t2 ++ } ++ ++ h0 += a ++ h1 += b ++ h2 += c ++ h3 += d ++ h4 += e ++ h5 += f ++ h6 += g ++ h7 += h ++ ++ p = p[chunk:] ++ } ++ ++ dig.h[0], dig.h[1], dig.h[2], dig.h[3], dig.h[4], dig.h[5], dig.h[6], dig.h[7] = h0, h1, h2, h3, h4, h5, h6, h7 ++} ++ ++var _K = []uint32{ ++ 0x428a2f98, ++ 0x71374491, ++ 0xb5c0fbcf, ++ 0xe9b5dba5, ++ 0x3956c25b, ++ 0x59f111f1, ++ 0x923f82a4, ++ 0xab1c5ed5, ++ 0xd807aa98, ++ 0x12835b01, ++ 0x243185be, ++ 0x550c7dc3, ++ 0x72be5d74, ++ 0x80deb1fe, ++ 0x9bdc06a7, ++ 0xc19bf174, ++ 0xe49b69c1, ++ 0xefbe4786, ++ 0x0fc19dc6, ++ 0x240ca1cc, ++ 0x2de92c6f, ++ 0x4a7484aa, ++ 0x5cb0a9dc, ++ 0x76f988da, ++ 0x983e5152, ++ 0xa831c66d, ++ 0xb00327c8, ++ 0xbf597fc7, ++ 0xc6e00bf3, ++ 0xd5a79147, ++ 0x06ca6351, ++ 0x14292967, ++ 0x27b70a85, ++ 0x2e1b2138, ++ 0x4d2c6dfc, ++ 0x53380d13, ++ 0x650a7354, ++ 0x766a0abb, ++ 0x81c2c92e, ++ 0x92722c85, ++ 0xa2bfe8a1, ++ 0xa81a664b, ++ 0xc24b8b70, ++ 0xc76c51a3, ++ 0xd192e819, ++ 0xd6990624, ++ 0xf40e3585, ++ 0x106aa070, ++ 0x19a4c116, ++ 0x1e376c08, ++ 0x2748774c, ++ 0x34b0bcb5, ++ 0x391c0cb3, ++ 0x4ed8aa4a, ++ 0x5b9cca4f, ++ 0x682e6ff3, ++ 0x748f82ee, ++ 0x78a5636f, ++ 0x84c87814, ++ 0x8cc70208, ++ 0x90befffa, ++ 0xa4506ceb, ++ 0xbef9a3f7, ++ 0xc67178f2, ++} +--- a/vendor/github.com/minio/sha256-simd/sha256block_noasm.go ++++ b/vendor/github.com/minio/sha256-simd/sha256block_noasm.go +@@ -1,4 +1,4 @@ +-//+build !arm64 !amd64 noasm appengine ++// +build !amd64,!arm64 noasm !go1.5 appengine + + /* + * Minio Cloud Storage, (C) 2016 Minio, Inc. +@@ -18,119 +18,7 @@ + + package sha256 + +-func blockGeneric(dig *digest, p []byte) { +- var w [64]uint32 +- h0, h1, h2, h3, h4, h5, h6, h7 := dig.h[0], dig.h[1], dig.h[2], dig.h[3], dig.h[4], dig.h[5], dig.h[6], dig.h[7] +- for len(p) >= chunk { +- // Can interlace the computation of w with the +- // rounds below if needed for speed. +- for i := 0; i < 16; i++ { +- j := i * 4 +- w[i] = uint32(p[j])<<24 | uint32(p[j+1])<<16 | uint32(p[j+2])<<8 | uint32(p[j+3]) +- } +- for i := 16; i < 64; i++ { +- v1 := w[i-2] +- t1 := (v1>>17 | v1<<(32-17)) ^ (v1>>19 | v1<<(32-19)) ^ (v1 >> 10) +- v2 := w[i-15] +- t2 := (v2>>7 | v2<<(32-7)) ^ (v2>>18 | v2<<(32-18)) ^ (v2 >> 3) +- w[i] = t1 + w[i-7] + t2 + w[i-16] +- } +- +- a, b, c, d, e, f, g, h := h0, h1, h2, h3, h4, h5, h6, h7 +- +- for i := 0; i < 64; i++ { +- t1 := h + ((e>>6 | e<<(32-6)) ^ (e>>11 | e<<(32-11)) ^ (e>>25 | e<<(32-25))) + ((e & f) ^ (^e & g)) + _K[i] + w[i] +- +- t2 := ((a>>2 | a<<(32-2)) ^ (a>>13 | a<<(32-13)) ^ (a>>22 | a<<(32-22))) + ((a & b) ^ (a & c) ^ (b & c)) +- +- h = g +- g = f +- f = e +- e = d + t1 +- d = c +- c = b +- b = a +- a = t1 + t2 +- } +- +- h0 += a +- h1 += b +- h2 += c +- h3 += d +- h4 += e +- h5 += f +- h6 += g +- h7 += h +- +- p = p[chunk:] +- } +- +- dig.h[0], dig.h[1], dig.h[2], dig.h[3], dig.h[4], dig.h[5], dig.h[6], dig.h[7] = h0, h1, h2, h3, h4, h5, h6, h7 +-} +- +-var _K = []uint32{ +- 0x428a2f98, +- 0x71374491, +- 0xb5c0fbcf, +- 0xe9b5dba5, +- 0x3956c25b, +- 0x59f111f1, +- 0x923f82a4, +- 0xab1c5ed5, +- 0xd807aa98, +- 0x12835b01, +- 0x243185be, +- 0x550c7dc3, +- 0x72be5d74, +- 0x80deb1fe, +- 0x9bdc06a7, +- 0xc19bf174, +- 0xe49b69c1, +- 0xefbe4786, +- 0x0fc19dc6, +- 0x240ca1cc, +- 0x2de92c6f, +- 0x4a7484aa, +- 0x5cb0a9dc, +- 0x76f988da, +- 0x983e5152, +- 0xa831c66d, +- 0xb00327c8, +- 0xbf597fc7, +- 0xc6e00bf3, +- 0xd5a79147, +- 0x06ca6351, +- 0x14292967, +- 0x27b70a85, +- 0x2e1b2138, +- 0x4d2c6dfc, +- 0x53380d13, +- 0x650a7354, +- 0x766a0abb, +- 0x81c2c92e, +- 0x92722c85, +- 0xa2bfe8a1, +- 0xa81a664b, +- 0xc24b8b70, +- 0xc76c51a3, +- 0xd192e819, +- 0xd6990624, +- 0xf40e3585, +- 0x106aa070, +- 0x19a4c116, +- 0x1e376c08, +- 0x2748774c, +- 0x34b0bcb5, +- 0x391c0cb3, +- 0x4ed8aa4a, +- 0x5b9cca4f, +- 0x682e6ff3, +- 0x748f82ee, +- 0x78a5636f, +- 0x84c87814, +- 0x8cc70208, +- 0x90befffa, +- 0xa4506ceb, +- 0xbef9a3f7, +- 0xc67178f2, +-} ++func blockAvx2Go(dig *digest, p []byte) {} ++func blockAvxGo(dig *digest, p []byte) {} ++func blockSsseGo(dig *digest, p []byte) {} ++func blockArmGo(dig *digest, p []byte) {} +--- a/vendor/github.com/minio/sha256-simd/sha256block_ppc64.go ++++ /dev/null +@@ -1,22 +0,0 @@ +-/* +- * Minio Cloud Storage, (C) 2016 Minio, Inc. +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-package sha256 +- +-func blockAvx2Go(dig *digest, p []byte) {} +-func blockAvxGo(dig *digest, p []byte) {} +-func blockSsseGo(dig *digest, p []byte) {} +-func blockArmGo(dig *digest, p []byte) {} +--- a/vendor/github.com/minio/sha256-simd/sha256block_ppc64le.go ++++ /dev/null +@@ -1,22 +0,0 @@ +-/* +- * Minio Cloud Storage, (C) 2016 Minio, Inc. +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-package sha256 +- +-func blockAvx2Go(dig *digest, p []byte) {} +-func blockAvxGo(dig *digest, p []byte) {} +-func blockSsseGo(dig *digest, p []byte) {} +-func blockArmGo(dig *digest, p []byte) {} +--- a/vendor/github.com/minio/sha256-simd/sha256blockSsse_amd64.go ++++ b/vendor/github.com/minio/sha256-simd/sha256blockSsse_amd64.go +@@ -1,4 +1,4 @@ +-//+build !noasm ++//+build amd64,!noasm,go1.5 + + /* + * Minio Cloud Storage, (C) 2016 Minio, Inc. +--- a/vendor/github.com/minio/sha256-simd/sha256blockSsse_amd64.s ++++ b/vendor/github.com/minio/sha256-simd/sha256blockSsse_amd64.s +@@ -1,4 +1,4 @@ +-//+build !noasm !appengine ++//+build !noasm,go1.5,!appengine + + // SHA256 implementation for SSSE3 + diff --git a/syncthing.changes b/syncthing.changes index 72d40ea..f21f212 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -16,6 +16,7 @@ Sat Dec 17 12:36:37 UTC 2016 - sor.alexei@meowr.ru * The wording in the GUI around "last file received" is now clearer (gh#syncthing/syncthing#3769). - Remove syncthing-0.14.13-go-1.6-compat.patch: fixed upstream. +- Add syncthing-go-1.4-compat.patch: Fix Go 1.4 compatibility. ------------------------------------------------------------------- Wed Dec 7 12:13:25 UTC 2016 - sor.alexei@meowr.ru diff --git a/syncthing.spec b/syncthing.spec index 3b4753d..6f9c8e7 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -27,7 +27,9 @@ 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 -BuildRequires: go >= 1.3 +# PATCH-FIX-OPENSUSE syncthing-go-1.4-compat.patch -- Fix Go 1.4 compatibility. +Patch0: %{name}-go-1.4-compat.patch +BuildRequires: go >= 1.4 BuildRequires: systemd BuildRequires: systemd-rpm-macros @@ -40,6 +42,8 @@ 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. From 3ef1f38fdb4d6663f66a6091a0a0e19f83ebb86795de4a2f3fc9bd2b755f1311 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sat, 17 Dec 2016 18:24:44 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=88 --- syncthing-go-1.4-compat.patch | 44 +++++++---------------------------- 1 file changed, 8 insertions(+), 36 deletions(-) diff --git a/syncthing-go-1.4-compat.patch b/syncthing-go-1.4-compat.patch index 019e0e4..4c9db5a 100644 --- a/syncthing-go-1.4-compat.patch +++ b/syncthing-go-1.4-compat.patch @@ -23,45 +23,17 @@ // // Licensed under the Apache License, Version 2.0 (the "License"); --- a/vendor/github.com/minio/sha256-simd/cpuid_arm.go -+++ /dev/null -@@ -1,33 +0,0 @@ --// Minio Cloud Storage, (C) 2016 Minio, Inc. --// --// Licensed under the Apache License, Version 2.0 (the "License"); --// you may not use this file except in compliance with the License. --// You may obtain a copy of the License at --// --// http://www.apache.org/licenses/LICENSE-2.0 --// --// Unless required by applicable law or agreed to in writing, software --// distributed under the License is distributed on an "AS IS" BASIS, --// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --// See the License for the specific language governing permissions and --// limitations under the License. --// -- --package sha256 -- --func cpuid(op uint32) (eax, ebx, ecx, edx uint32) { -- return 0, 0, 0, 0 --} -- --func cpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32) { -- return 0, 0, 0, 0 --} -- --func xgetbv(index uint32) (eax, edx uint32) { -- return 0, 0 --} -- --func haveArmSha() bool { -- // TODO: Implement feature detection for ARM -- return true --} ++++ b/vendor/github.com/minio/sha256-simd/cpuid_arm.go +@@ -1,3 +1,5 @@ ++// +build arm ++ + // Minio Cloud Storage, (C) 2016 Minio, Inc. + // + // Licensed under the Apache License, Version 2.0 (the "License"); --- a/vendor/github.com/minio/sha256-simd/cpuid_noasm.go +++ b/vendor/github.com/minio/sha256-simd/cpuid_noasm.go @@ -0,0 +1,34 @@ -+// +build !386,!amd64,!arm64 noasm ++// +build !386,!amd64,!arm,!arm64 noasm + +// Minio Cloud Storage, (C) 2016 Minio, Inc. +// From af28dea722449053066fc8e3b45f5ef949a8d066e189b83c80bbdbc09f4722d5 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Fri, 23 Dec 2016 10:38:44 +0000 Subject: [PATCH 4/8] - Update to version 0.14.16. OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=89 --- syncthing-source-v0.14.15.tar.gz | 3 --- syncthing-source-v0.14.15.tar.gz.asc | 11 ----------- syncthing-source-v0.14.16.tar.gz | 3 +++ syncthing-source-v0.14.16.tar.gz.asc | 11 +++++++++++ syncthing.changes | 8 ++++++++ syncthing.spec | 2 +- 6 files changed, 23 insertions(+), 15 deletions(-) delete mode 100644 syncthing-source-v0.14.15.tar.gz delete mode 100644 syncthing-source-v0.14.15.tar.gz.asc create mode 100644 syncthing-source-v0.14.16.tar.gz create mode 100644 syncthing-source-v0.14.16.tar.gz.asc diff --git a/syncthing-source-v0.14.15.tar.gz b/syncthing-source-v0.14.15.tar.gz deleted file mode 100644 index b43d22b..0000000 --- a/syncthing-source-v0.14.15.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4464433666e0fa82d536111b2921f726b2b064606696ec1305eb568345b5e9a -size 6907683 diff --git a/syncthing-source-v0.14.15.tar.gz.asc b/syncthing-source-v0.14.15.tar.gz.asc deleted file mode 100644 index 3904c4f..0000000 --- a/syncthing-source-v0.14.15.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABCAAGBQJYVSZAAAoJENJubtAAZUo+S9EH/1CFzxw1LZAX7OIgrSyng6RF -zSH4YoRf9AHN22/As2rfMq80V5/VxgWXqAJze+mqm9YqDfrpm8WlVjYwTT+iSL+9 -D4drqC/E0OGs3HDTTOse9ZNpyTs8g9HTq4mgRlE4iGv+C7/XHnDLxCmGMsAQzdQq -DSz3MgTlrWQFWecRPqc7NJ0JP7AqKX5rMVEtqzgBnQ30rAk5zOik26ShlnGy0cMh -BeFvgUgFzVge8kg6DApm17+M7XJ53wEfYhJZoNjIx7DaaHhlbfn10uh4tF8tnsrm -LGNJrtm+qTP3NGfhj1RaUV+mBUrD+W2mHKM+/YeaGrL6i+bw5KkjsAUbBND8PTE= -=6C7H ------END PGP SIGNATURE----- diff --git a/syncthing-source-v0.14.16.tar.gz b/syncthing-source-v0.14.16.tar.gz new file mode 100644 index 0000000..eca920d --- /dev/null +++ b/syncthing-source-v0.14.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9e3bca6cae8c75d80242ab71d46fa1b76d9d5a90bf9f98026f541885c56288e +size 6902293 diff --git a/syncthing-source-v0.14.16.tar.gz.asc b/syncthing-source-v0.14.16.tar.gz.asc new file mode 100644 index 0000000..04dd428 --- /dev/null +++ b/syncthing-source-v0.14.16.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABCAAGBQJYWtKUAAoJENJubtAAZUo+ZxIIAJyDYFg45r/HTOtm7kgvoy/X +4oHs/s4PQxQDMFAr4VeS8A2dwJKPPBdwPgk904GyyxAqhQXQ/4GVkrtuD3UmX67m +52vEd2bqRMYnksWtPB2TmRF9s/qfT94hdwJu7Tr9/4N1sP8VlKok83flYk0b5Rkr +jiE8jaXSwMjB7LTnIJgKSiyDfoVMIFHlDwfAJqWrYFTD8RH2ZuzQR/Zfoh9Vcdzk +WtrZODr4cS2VQcmvzfAfImvesogZpNn2F/pwNiGfdCcxuP1i3z5bp2SIj9B/3hXb +3vP4W/fJfhHYWRd11UG+p+/sDqXSrPW5RMBFkyZuSTd7U/+LVhVIg6tynVfoqjg= +=d1Lu +-----END PGP SIGNATURE----- diff --git a/syncthing.changes b/syncthing.changes index f21f212..bd473bd 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Dec 23 10:36:02 UTC 2016 - sor.alexei@meowr.ru + +- Update to version 0.14.16: + * Fix a regression introduced in v0.14.14: an 'invalid subpath' + error on syncthing-inotify full directory sync trigger + (gh#syncthing/syncthing#3829). + ------------------------------------------------------------------- Sat Dec 17 12:36:37 UTC 2016 - sor.alexei@meowr.ru diff --git a/syncthing.spec b/syncthing.spec index 6f9c8e7..f2e6726 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -17,7 +17,7 @@ Name: syncthing -Version: 0.14.15 +Version: 0.14.16 Release: 0 Summary: FOSS Continuous File Synchronisation License: MPL-2.0 From e146c07c53073bc744d8eac59092915b7792129d05e89080eb63a6992cd46ffc Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 27 Dec 2016 15:16:42 +0000 Subject: [PATCH 5/8] - Update to version 0.14.17. OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=90 --- syncthing-go-1.4-compat.patch | 48 +++++++++++++--------------- syncthing-source-v0.14.16.tar.gz | 3 -- syncthing-source-v0.14.16.tar.gz.asc | 11 ------- syncthing-source-v0.14.17.tar.gz | 3 ++ syncthing-source-v0.14.17.tar.gz.asc | 11 +++++++ syncthing.changes | 27 ++++++++++++++++ syncthing.spec | 2 +- 7 files changed, 65 insertions(+), 40 deletions(-) delete mode 100644 syncthing-source-v0.14.16.tar.gz delete mode 100644 syncthing-source-v0.14.16.tar.gz.asc create mode 100644 syncthing-source-v0.14.17.tar.gz create mode 100644 syncthing-source-v0.14.17.tar.gz.asc diff --git a/syncthing-go-1.4-compat.patch b/syncthing-go-1.4-compat.patch index 4c9db5a..6654eff 100644 --- a/syncthing-go-1.4-compat.patch +++ b/syncthing-go-1.4-compat.patch @@ -10,14 +10,6 @@ +++ b/vendor/github.com/minio/sha256-simd/cpuid_amd64.go @@ -1,3 +1,5 @@ +// +build amd64 -+ - // Minio Cloud Storage, (C) 2016 Minio, Inc. - // - // Licensed under the Apache License, Version 2.0 (the "License"); ---- a/vendor/github.com/minio/sha256-simd/cpuid_arm64.go -+++ b/vendor/github.com/minio/sha256-simd/cpuid_arm64.go -@@ -1,3 +1,5 @@ -+// +build arm64 + // Minio Cloud Storage, (C) 2016 Minio, Inc. // @@ -168,7 +160,7 @@ +++ b/vendor/github.com/minio/sha256-simd/sha256block_amd64.go @@ -1,4 +1,4 @@ -//+build !noasm -+// +build amd64,!noasm,go1.5 ++// +build amd64,!noasm,!gccgo,go1.5 /* * Minio Cloud Storage, (C) 2016 Minio, Inc. @@ -176,7 +168,7 @@ +++ b/vendor/github.com/minio/sha256-simd/sha256block_arm64.go @@ -1,4 +1,4 @@ -//+build !noasm -+// +build arm64,!noasm,go1.5 ++// +build arm64,!noasm,!gccgo,go1.5 /* * Minio Cloud Storage, (C) 2016 Minio, Inc. @@ -184,7 +176,7 @@ +++ b/vendor/github.com/minio/sha256-simd/sha256block_arm64.s @@ -1,4 +1,4 @@ -//+build !noasm !appengine -+// +build !noasm,go1.5,!appengine ++// +build !noasm,!gccgo,go1.5,!appengine // ARM64 version of SHA256 @@ -219,7 +211,7 @@ +++ b/vendor/github.com/minio/sha256-simd/sha256blockAvx2_amd64.go @@ -1,4 +1,4 @@ -//+build !noasm -+// +build amd64,!noasm,go1.5 ++// +build amd64,!noasm,!gccgo,go1.5 /* * Minio Cloud Storage, (C) 2016 Minio, Inc. @@ -227,7 +219,7 @@ +++ b/vendor/github.com/minio/sha256-simd/sha256blockAvx2_amd64.s @@ -1,4 +1,4 @@ -//+build !noasm !appengine -+// +build !noasm,go1.5,!appengine ++// +build !noasm,!gccgo,go1.5,!appengine // SHA256 implementation for AVX2 @@ -235,7 +227,7 @@ +++ b/vendor/github.com/minio/sha256-simd/sha256blockAvx_amd64.go @@ -1,4 +1,4 @@ -//+build !noasm -+// +build amd64,!noasm,go1.5 ++// +build amd64,!noasm,!gccgo,go1.5 /* * Minio Cloud Storage, (C) 2016 Minio, Inc. @@ -243,7 +235,7 @@ +++ b/vendor/github.com/minio/sha256-simd/sha256blockAvx_amd64.s @@ -1,4 +1,4 @@ -//+build !noasm !appengine -+// +build !noasm,go1.5,!appengine ++// +build !noasm,!gccgo,go1.5,!appengine // SHA256 implementation for AVX @@ -388,11 +380,11 @@ +++ b/vendor/github.com/minio/sha256-simd/sha256block_noasm.go @@ -1,4 +1,4 @@ -//+build !arm64 !amd64 noasm appengine -+// +build !amd64,!arm64 noasm !go1.5 appengine ++// +build !amd64,!arm64 noasm gccgo !go1.5 appengine /* * Minio Cloud Storage, (C) 2016 Minio, Inc. -@@ -18,119 +18,7 @@ +@@ -18,119 +18,15 @@ package sha256 @@ -444,7 +436,9 @@ - } - - dig.h[0], dig.h[1], dig.h[2], dig.h[3], dig.h[4], dig.h[5], dig.h[6], dig.h[7] = h0, h1, h2, h3, h4, h5, h6, h7 --} ++func blockAvx2Go(dig *digest, p []byte) { ++ blockGeneric(dig, p) + } - -var _K = []uint32{ - 0x428a2f98, @@ -511,11 +505,15 @@ - 0xa4506ceb, - 0xbef9a3f7, - 0xc67178f2, --} -+func blockAvx2Go(dig *digest, p []byte) {} -+func blockAvxGo(dig *digest, p []byte) {} -+func blockSsseGo(dig *digest, p []byte) {} -+func blockArmGo(dig *digest, p []byte) {} ++func blockAvxGo(dig *digest, p []byte) { ++ blockGeneric(dig, p) ++} ++func blockSsseGo(dig *digest, p []byte) { ++ blockGeneric(dig, p) ++} ++func blockArmGo(dig *digest, p []byte) { ++ blockGeneric(dig, p) + } --- a/vendor/github.com/minio/sha256-simd/sha256block_ppc64.go +++ /dev/null @@ -1,22 +0,0 @@ @@ -570,7 +568,7 @@ +++ b/vendor/github.com/minio/sha256-simd/sha256blockSsse_amd64.go @@ -1,4 +1,4 @@ -//+build !noasm -+//+build amd64,!noasm,go1.5 ++//+build amd64,!noasm,!gccgo,go1.5 /* * Minio Cloud Storage, (C) 2016 Minio, Inc. @@ -578,7 +576,7 @@ +++ b/vendor/github.com/minio/sha256-simd/sha256blockSsse_amd64.s @@ -1,4 +1,4 @@ -//+build !noasm !appengine -+//+build !noasm,go1.5,!appengine ++//+build !noasm,!gccgo,go1.5,!appengine // SHA256 implementation for SSSE3 diff --git a/syncthing-source-v0.14.16.tar.gz b/syncthing-source-v0.14.16.tar.gz deleted file mode 100644 index eca920d..0000000 --- a/syncthing-source-v0.14.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9e3bca6cae8c75d80242ab71d46fa1b76d9d5a90bf9f98026f541885c56288e -size 6902293 diff --git a/syncthing-source-v0.14.16.tar.gz.asc b/syncthing-source-v0.14.16.tar.gz.asc deleted file mode 100644 index 04dd428..0000000 --- a/syncthing-source-v0.14.16.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABCAAGBQJYWtKUAAoJENJubtAAZUo+ZxIIAJyDYFg45r/HTOtm7kgvoy/X -4oHs/s4PQxQDMFAr4VeS8A2dwJKPPBdwPgk904GyyxAqhQXQ/4GVkrtuD3UmX67m -52vEd2bqRMYnksWtPB2TmRF9s/qfT94hdwJu7Tr9/4N1sP8VlKok83flYk0b5Rkr -jiE8jaXSwMjB7LTnIJgKSiyDfoVMIFHlDwfAJqWrYFTD8RH2ZuzQR/Zfoh9Vcdzk -WtrZODr4cS2VQcmvzfAfImvesogZpNn2F/pwNiGfdCcxuP1i3z5bp2SIj9B/3hXb -3vP4W/fJfhHYWRd11UG+p+/sDqXSrPW5RMBFkyZuSTd7U/+LVhVIg6tynVfoqjg= -=d1Lu ------END PGP SIGNATURE----- diff --git a/syncthing-source-v0.14.17.tar.gz b/syncthing-source-v0.14.17.tar.gz new file mode 100644 index 0000000..dc4bc89 --- /dev/null +++ b/syncthing-source-v0.14.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:826219b21c935ed938414a8777f9c757bf28a92d0ced48c6a7daf7b3035fb8c4 +size 6959538 diff --git a/syncthing-source-v0.14.17.tar.gz.asc b/syncthing-source-v0.14.17.tar.gz.asc new file mode 100644 index 0000000..0160a7a --- /dev/null +++ b/syncthing-source-v0.14.17.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABCAAGBQJYYoLlAAoJENJubtAAZUo+OOoIALeBtpxMYJ4P53xhVFrl8I/F +XMfj71s6D3Gdv6viCxqef3EA2PEymNFtIdBfttqxvtqZfCd2Gky9EMwqRLQEZM/v +aFharMOYxMn84Zt9djf+kGhKlXeEUoeQasb6m5MLEVJ0FWymIn/VxNdBWGQalHAC +VNDa0aRo3aAP2GCGM/rjIW5BYn1pedfueCOPN4/yzb+PhJ9EOI6AnIPdJORABSwC +rCu6mOeHnsgHQQK0tG3GQZKS5uEbIjFpfNfkrk8HMZy157yrlBBVKDLhd81hdx5V +rJPEqIwG1V0c2qzE+8ZMkioSZuKDqaikMBBxwNnUs6efVdJ90EleXzIJrKrHOrA= +=IEd2 +-----END PGP SIGNATURE----- diff --git a/syncthing.changes b/syncthing.changes index bd473bd..339d7f5 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Tue Dec 27 15:05:20 UTC 2016 - sor.alexei@meowr.ru + +- Update to version 0.14.17: + * Panics caused by corrupt on disc database are now better + explained in the panic message (gh#syncthing/syncthing#3689). + * Statically configured device addresses without port number now + correctly defaulted to port 22000 again + (gh#syncthing/syncthing#3817). + * Inotify clients no longer cause 'invalid subpath' errors to be + displayed (gh#syncthing/syncthing#3829). + * Directories can now be paused (gh#syncthing/syncthing#215). + * "Master" directories are now called "send only" in order to + standardise on a terminology of sending and receiving changes + (gh#syncthing/syncthing#2679). + * Pausing devices and directories now persists across restarts + (gh#syncthing/syncthing#3407). + * A rolling checksum is used to identify and reuse blocks that + have moved within a file (gh#syncthing/syncthing#3527). + * Syncthing allows setting the type-of-service field on outgoing + packets, configured by the advanced setting "trafficClass" + (gh#syncthing/syncthing#3790). + * Which device introduced another device is now visible in the + GUI (gh#syncthing/syncthing#3809). +- Rebase and improve syncthing-go-1.4-compat.patch: wasn't working + good enough with Go 1.4. + ------------------------------------------------------------------- Fri Dec 23 10:36:02 UTC 2016 - sor.alexei@meowr.ru diff --git a/syncthing.spec b/syncthing.spec index f2e6726..31d7696 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -17,7 +17,7 @@ Name: syncthing -Version: 0.14.16 +Version: 0.14.17 Release: 0 Summary: FOSS Continuous File Synchronisation License: MPL-2.0 From 676631ab3a95bc2267aa9d5ffa8d4ea6453dd1d26ebe3d75225b66328feeccd0 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 27 Dec 2016 15:22:15 +0000 Subject: [PATCH 6/8] OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=91 --- syncthing-go-1.4-compat.patch | 582 ---------------------------------- syncthing.changes | 3 +- syncthing.spec | 5 +- 3 files changed, 2 insertions(+), 588 deletions(-) delete mode 100644 syncthing-go-1.4-compat.patch diff --git a/syncthing-go-1.4-compat.patch b/syncthing-go-1.4-compat.patch deleted file mode 100644 index 6654eff..0000000 --- a/syncthing-go-1.4-compat.patch +++ /dev/null @@ -1,582 +0,0 @@ ---- a/vendor/github.com/minio/sha256-simd/cpuid_386.go -+++ b/vendor/github.com/minio/sha256-simd/cpuid_386.go -@@ -1,3 +1,5 @@ -+// +build 386 -+ - // Minio Cloud Storage, (C) 2016 Minio, Inc. - // - // Licensed under the Apache License, Version 2.0 (the "License"); ---- a/vendor/github.com/minio/sha256-simd/cpuid_amd64.go -+++ b/vendor/github.com/minio/sha256-simd/cpuid_amd64.go -@@ -1,3 +1,5 @@ -+// +build amd64 -+ - // Minio Cloud Storage, (C) 2016 Minio, Inc. - // - // Licensed under the Apache License, Version 2.0 (the "License"); ---- a/vendor/github.com/minio/sha256-simd/cpuid_arm.go -+++ b/vendor/github.com/minio/sha256-simd/cpuid_arm.go -@@ -1,3 +1,5 @@ -+// +build arm -+ - // Minio Cloud Storage, (C) 2016 Minio, Inc. - // - // Licensed under the Apache License, Version 2.0 (the "License"); ---- a/vendor/github.com/minio/sha256-simd/cpuid_noasm.go -+++ b/vendor/github.com/minio/sha256-simd/cpuid_noasm.go -@@ -0,0 +1,34 @@ -+// +build !386,!amd64,!arm,!arm64 noasm -+ -+// Minio Cloud Storage, (C) 2016 Minio, Inc. -+// -+// Licensed under the Apache License, Version 2.0 (the "License"); -+// you may not use this file except in compliance with the License. -+// You may obtain a copy of the License at -+// -+// http://www.apache.org/licenses/LICENSE-2.0 -+// -+// Unless required by applicable law or agreed to in writing, software -+// distributed under the License is distributed on an "AS IS" BASIS, -+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+// See the License for the specific language governing permissions and -+// limitations under the License. -+// -+ -+package sha256 -+ -+func cpuid(op uint32) (eax, ebx, ecx, edx uint32) { -+ return 0, 0, 0, 0 -+} -+ -+func cpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32) { -+ return 0, 0, 0, 0 -+} -+ -+func xgetbv(index uint32) (eax, edx uint32) { -+ return 0, 0 -+} -+ -+func haveArmSha() bool { -+ return false -+} ---- a/vendor/github.com/minio/sha256-simd/cpuid_ppc64.go -+++ /dev/null -@@ -1,32 +0,0 @@ --// Minio Cloud Storage, (C) 2016 Minio, Inc. --// --// Licensed under the Apache License, Version 2.0 (the "License"); --// you may not use this file except in compliance with the License. --// You may obtain a copy of the License at --// --// http://www.apache.org/licenses/LICENSE-2.0 --// --// Unless required by applicable law or agreed to in writing, software --// distributed under the License is distributed on an "AS IS" BASIS, --// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --// See the License for the specific language governing permissions and --// limitations under the License. --// -- --package sha256 -- --func cpuid(op uint32) (eax, ebx, ecx, edx uint32) { -- return 0, 0, 0, 0 --} -- --func cpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32) { -- return 0, 0, 0, 0 --} -- --func xgetbv(index uint32) (eax, edx uint32) { -- return 0, 0 --} -- --func haveArmSha() bool { -- return false --} ---- a/vendor/github.com/minio/sha256-simd/cpuid_ppc64le.go -+++ /dev/null -@@ -1,32 +0,0 @@ --// Minio Cloud Storage, (C) 2016 Minio, Inc. --// --// Licensed under the Apache License, Version 2.0 (the "License"); --// you may not use this file except in compliance with the License. --// You may obtain a copy of the License at --// --// http://www.apache.org/licenses/LICENSE-2.0 --// --// Unless required by applicable law or agreed to in writing, software --// distributed under the License is distributed on an "AS IS" BASIS, --// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --// See the License for the specific language governing permissions and --// limitations under the License. --// -- --package sha256 -- --func cpuid(op uint32) (eax, ebx, ecx, edx uint32) { -- return 0, 0, 0, 0 --} -- --func cpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32) { -- return 0, 0, 0, 0 --} -- --func xgetbv(index uint32) (eax, edx uint32) { -- return 0, 0 --} -- --func haveArmSha() bool { -- return false --} ---- a/vendor/github.com/minio/sha256-simd/sha256block_386.go -+++ /dev/null -@@ -1,24 +0,0 @@ --//+build !noasm -- --/* -- * Minio Cloud Storage, (C) 2016 Minio, Inc. -- * -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --package sha256 -- --func blockArmGo(dig *digest, p []byte) {} --func blockAvx2Go(dig *digest, p []byte) {} --func blockAvxGo(dig *digest, p []byte) {} --func blockSsseGo(dig *digest, p []byte) {} ---- a/vendor/github.com/minio/sha256-simd/sha256block_amd64.go -+++ b/vendor/github.com/minio/sha256-simd/sha256block_amd64.go -@@ -1,4 +1,4 @@ --//+build !noasm -+// +build amd64,!noasm,!gccgo,go1.5 - - /* - * Minio Cloud Storage, (C) 2016 Minio, Inc. ---- a/vendor/github.com/minio/sha256-simd/sha256block_arm64.go -+++ b/vendor/github.com/minio/sha256-simd/sha256block_arm64.go -@@ -1,4 +1,4 @@ --//+build !noasm -+// +build arm64,!noasm,!gccgo,go1.5 - - /* - * Minio Cloud Storage, (C) 2016 Minio, Inc. ---- a/vendor/github.com/minio/sha256-simd/sha256block_arm64.s -+++ b/vendor/github.com/minio/sha256-simd/sha256block_arm64.s -@@ -1,4 +1,4 @@ --//+build !noasm !appengine -+// +build !noasm,!gccgo,go1.5,!appengine - - // ARM64 version of SHA256 - ---- a/vendor/github.com/minio/sha256-simd/sha256block_arm.go -+++ /dev/null -@@ -1,24 +0,0 @@ --//+build !noasm -- --/* -- * Minio Cloud Storage, (C) 2016 Minio, Inc. -- * -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --package sha256 -- --func blockAvx2Go(dig *digest, p []byte) {} --func blockAvxGo(dig *digest, p []byte) {} --func blockSsseGo(dig *digest, p []byte) {} --func blockArmGo(dig *digest, p []byte) {} ---- a/vendor/github.com/minio/sha256-simd/sha256blockAvx2_amd64.go -+++ b/vendor/github.com/minio/sha256-simd/sha256blockAvx2_amd64.go -@@ -1,4 +1,4 @@ --//+build !noasm -+// +build amd64,!noasm,!gccgo,go1.5 - - /* - * Minio Cloud Storage, (C) 2016 Minio, Inc. ---- a/vendor/github.com/minio/sha256-simd/sha256blockAvx2_amd64.s -+++ b/vendor/github.com/minio/sha256-simd/sha256blockAvx2_amd64.s -@@ -1,4 +1,4 @@ --//+build !noasm !appengine -+// +build !noasm,!gccgo,go1.5,!appengine - - // SHA256 implementation for AVX2 - ---- a/vendor/github.com/minio/sha256-simd/sha256blockAvx_amd64.go -+++ b/vendor/github.com/minio/sha256-simd/sha256blockAvx_amd64.go -@@ -1,4 +1,4 @@ --//+build !noasm -+// +build amd64,!noasm,!gccgo,go1.5 - - /* - * Minio Cloud Storage, (C) 2016 Minio, Inc. ---- a/vendor/github.com/minio/sha256-simd/sha256blockAvx_amd64.s -+++ b/vendor/github.com/minio/sha256-simd/sha256blockAvx_amd64.s -@@ -1,4 +1,4 @@ --//+build !noasm !appengine -+// +build !noasm,!gccgo,go1.5,!appengine - - // SHA256 implementation for AVX - ---- a/vendor/github.com/minio/sha256-simd/sha256block_generic.go -+++ b/vendor/github.com/minio/sha256-simd/sha256block_generic.go -@@ -0,0 +1,134 @@ -+/* -+ * Minio Cloud Storage, (C) 2016 Minio, Inc. -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+package sha256 -+ -+func blockGeneric(dig *digest, p []byte) { -+ var w [64]uint32 -+ h0, h1, h2, h3, h4, h5, h6, h7 := dig.h[0], dig.h[1], dig.h[2], dig.h[3], dig.h[4], dig.h[5], dig.h[6], dig.h[7] -+ for len(p) >= chunk { -+ // Can interlace the computation of w with the -+ // rounds below if needed for speed. -+ for i := 0; i < 16; i++ { -+ j := i * 4 -+ w[i] = uint32(p[j])<<24 | uint32(p[j+1])<<16 | uint32(p[j+2])<<8 | uint32(p[j+3]) -+ } -+ for i := 16; i < 64; i++ { -+ v1 := w[i-2] -+ t1 := (v1>>17 | v1<<(32-17)) ^ (v1>>19 | v1<<(32-19)) ^ (v1 >> 10) -+ v2 := w[i-15] -+ t2 := (v2>>7 | v2<<(32-7)) ^ (v2>>18 | v2<<(32-18)) ^ (v2 >> 3) -+ w[i] = t1 + w[i-7] + t2 + w[i-16] -+ } -+ -+ a, b, c, d, e, f, g, h := h0, h1, h2, h3, h4, h5, h6, h7 -+ -+ for i := 0; i < 64; i++ { -+ t1 := h + ((e>>6 | e<<(32-6)) ^ (e>>11 | e<<(32-11)) ^ (e>>25 | e<<(32-25))) + ((e & f) ^ (^e & g)) + _K[i] + w[i] -+ -+ t2 := ((a>>2 | a<<(32-2)) ^ (a>>13 | a<<(32-13)) ^ (a>>22 | a<<(32-22))) + ((a & b) ^ (a & c) ^ (b & c)) -+ -+ h = g -+ g = f -+ f = e -+ e = d + t1 -+ d = c -+ c = b -+ b = a -+ a = t1 + t2 -+ } -+ -+ h0 += a -+ h1 += b -+ h2 += c -+ h3 += d -+ h4 += e -+ h5 += f -+ h6 += g -+ h7 += h -+ -+ p = p[chunk:] -+ } -+ -+ dig.h[0], dig.h[1], dig.h[2], dig.h[3], dig.h[4], dig.h[5], dig.h[6], dig.h[7] = h0, h1, h2, h3, h4, h5, h6, h7 -+} -+ -+var _K = []uint32{ -+ 0x428a2f98, -+ 0x71374491, -+ 0xb5c0fbcf, -+ 0xe9b5dba5, -+ 0x3956c25b, -+ 0x59f111f1, -+ 0x923f82a4, -+ 0xab1c5ed5, -+ 0xd807aa98, -+ 0x12835b01, -+ 0x243185be, -+ 0x550c7dc3, -+ 0x72be5d74, -+ 0x80deb1fe, -+ 0x9bdc06a7, -+ 0xc19bf174, -+ 0xe49b69c1, -+ 0xefbe4786, -+ 0x0fc19dc6, -+ 0x240ca1cc, -+ 0x2de92c6f, -+ 0x4a7484aa, -+ 0x5cb0a9dc, -+ 0x76f988da, -+ 0x983e5152, -+ 0xa831c66d, -+ 0xb00327c8, -+ 0xbf597fc7, -+ 0xc6e00bf3, -+ 0xd5a79147, -+ 0x06ca6351, -+ 0x14292967, -+ 0x27b70a85, -+ 0x2e1b2138, -+ 0x4d2c6dfc, -+ 0x53380d13, -+ 0x650a7354, -+ 0x766a0abb, -+ 0x81c2c92e, -+ 0x92722c85, -+ 0xa2bfe8a1, -+ 0xa81a664b, -+ 0xc24b8b70, -+ 0xc76c51a3, -+ 0xd192e819, -+ 0xd6990624, -+ 0xf40e3585, -+ 0x106aa070, -+ 0x19a4c116, -+ 0x1e376c08, -+ 0x2748774c, -+ 0x34b0bcb5, -+ 0x391c0cb3, -+ 0x4ed8aa4a, -+ 0x5b9cca4f, -+ 0x682e6ff3, -+ 0x748f82ee, -+ 0x78a5636f, -+ 0x84c87814, -+ 0x8cc70208, -+ 0x90befffa, -+ 0xa4506ceb, -+ 0xbef9a3f7, -+ 0xc67178f2, -+} ---- a/vendor/github.com/minio/sha256-simd/sha256block_noasm.go -+++ b/vendor/github.com/minio/sha256-simd/sha256block_noasm.go -@@ -1,4 +1,4 @@ --//+build !arm64 !amd64 noasm appengine -+// +build !amd64,!arm64 noasm gccgo !go1.5 appengine - - /* - * Minio Cloud Storage, (C) 2016 Minio, Inc. -@@ -18,119 +18,15 @@ - - package sha256 - --func blockGeneric(dig *digest, p []byte) { -- var w [64]uint32 -- h0, h1, h2, h3, h4, h5, h6, h7 := dig.h[0], dig.h[1], dig.h[2], dig.h[3], dig.h[4], dig.h[5], dig.h[6], dig.h[7] -- for len(p) >= chunk { -- // Can interlace the computation of w with the -- // rounds below if needed for speed. -- for i := 0; i < 16; i++ { -- j := i * 4 -- w[i] = uint32(p[j])<<24 | uint32(p[j+1])<<16 | uint32(p[j+2])<<8 | uint32(p[j+3]) -- } -- for i := 16; i < 64; i++ { -- v1 := w[i-2] -- t1 := (v1>>17 | v1<<(32-17)) ^ (v1>>19 | v1<<(32-19)) ^ (v1 >> 10) -- v2 := w[i-15] -- t2 := (v2>>7 | v2<<(32-7)) ^ (v2>>18 | v2<<(32-18)) ^ (v2 >> 3) -- w[i] = t1 + w[i-7] + t2 + w[i-16] -- } -- -- a, b, c, d, e, f, g, h := h0, h1, h2, h3, h4, h5, h6, h7 -- -- for i := 0; i < 64; i++ { -- t1 := h + ((e>>6 | e<<(32-6)) ^ (e>>11 | e<<(32-11)) ^ (e>>25 | e<<(32-25))) + ((e & f) ^ (^e & g)) + _K[i] + w[i] -- -- t2 := ((a>>2 | a<<(32-2)) ^ (a>>13 | a<<(32-13)) ^ (a>>22 | a<<(32-22))) + ((a & b) ^ (a & c) ^ (b & c)) -- -- h = g -- g = f -- f = e -- e = d + t1 -- d = c -- c = b -- b = a -- a = t1 + t2 -- } -- -- h0 += a -- h1 += b -- h2 += c -- h3 += d -- h4 += e -- h5 += f -- h6 += g -- h7 += h -- -- p = p[chunk:] -- } -- -- dig.h[0], dig.h[1], dig.h[2], dig.h[3], dig.h[4], dig.h[5], dig.h[6], dig.h[7] = h0, h1, h2, h3, h4, h5, h6, h7 -+func blockAvx2Go(dig *digest, p []byte) { -+ blockGeneric(dig, p) - } -- --var _K = []uint32{ -- 0x428a2f98, -- 0x71374491, -- 0xb5c0fbcf, -- 0xe9b5dba5, -- 0x3956c25b, -- 0x59f111f1, -- 0x923f82a4, -- 0xab1c5ed5, -- 0xd807aa98, -- 0x12835b01, -- 0x243185be, -- 0x550c7dc3, -- 0x72be5d74, -- 0x80deb1fe, -- 0x9bdc06a7, -- 0xc19bf174, -- 0xe49b69c1, -- 0xefbe4786, -- 0x0fc19dc6, -- 0x240ca1cc, -- 0x2de92c6f, -- 0x4a7484aa, -- 0x5cb0a9dc, -- 0x76f988da, -- 0x983e5152, -- 0xa831c66d, -- 0xb00327c8, -- 0xbf597fc7, -- 0xc6e00bf3, -- 0xd5a79147, -- 0x06ca6351, -- 0x14292967, -- 0x27b70a85, -- 0x2e1b2138, -- 0x4d2c6dfc, -- 0x53380d13, -- 0x650a7354, -- 0x766a0abb, -- 0x81c2c92e, -- 0x92722c85, -- 0xa2bfe8a1, -- 0xa81a664b, -- 0xc24b8b70, -- 0xc76c51a3, -- 0xd192e819, -- 0xd6990624, -- 0xf40e3585, -- 0x106aa070, -- 0x19a4c116, -- 0x1e376c08, -- 0x2748774c, -- 0x34b0bcb5, -- 0x391c0cb3, -- 0x4ed8aa4a, -- 0x5b9cca4f, -- 0x682e6ff3, -- 0x748f82ee, -- 0x78a5636f, -- 0x84c87814, -- 0x8cc70208, -- 0x90befffa, -- 0xa4506ceb, -- 0xbef9a3f7, -- 0xc67178f2, -+func blockAvxGo(dig *digest, p []byte) { -+ blockGeneric(dig, p) -+} -+func blockSsseGo(dig *digest, p []byte) { -+ blockGeneric(dig, p) -+} -+func blockArmGo(dig *digest, p []byte) { -+ blockGeneric(dig, p) - } ---- a/vendor/github.com/minio/sha256-simd/sha256block_ppc64.go -+++ /dev/null -@@ -1,22 +0,0 @@ --/* -- * Minio Cloud Storage, (C) 2016 Minio, Inc. -- * -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --package sha256 -- --func blockAvx2Go(dig *digest, p []byte) {} --func blockAvxGo(dig *digest, p []byte) {} --func blockSsseGo(dig *digest, p []byte) {} --func blockArmGo(dig *digest, p []byte) {} ---- a/vendor/github.com/minio/sha256-simd/sha256block_ppc64le.go -+++ /dev/null -@@ -1,22 +0,0 @@ --/* -- * Minio Cloud Storage, (C) 2016 Minio, Inc. -- * -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --package sha256 -- --func blockAvx2Go(dig *digest, p []byte) {} --func blockAvxGo(dig *digest, p []byte) {} --func blockSsseGo(dig *digest, p []byte) {} --func blockArmGo(dig *digest, p []byte) {} ---- a/vendor/github.com/minio/sha256-simd/sha256blockSsse_amd64.go -+++ b/vendor/github.com/minio/sha256-simd/sha256blockSsse_amd64.go -@@ -1,4 +1,4 @@ --//+build !noasm -+//+build amd64,!noasm,!gccgo,go1.5 - - /* - * Minio Cloud Storage, (C) 2016 Minio, Inc. ---- a/vendor/github.com/minio/sha256-simd/sha256blockSsse_amd64.s -+++ b/vendor/github.com/minio/sha256-simd/sha256blockSsse_amd64.s -@@ -1,4 +1,4 @@ --//+build !noasm !appengine -+//+build !noasm,!gccgo,go1.5,!appengine - - // SHA256 implementation for SSSE3 - diff --git a/syncthing.changes b/syncthing.changes index 339d7f5..9abc1f3 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -22,8 +22,7 @@ Tue Dec 27 15:05:20 UTC 2016 - sor.alexei@meowr.ru (gh#syncthing/syncthing#3790). * Which device introduced another device is now visible in the GUI (gh#syncthing/syncthing#3809). -- Rebase and improve syncthing-go-1.4-compat.patch: wasn't working - good enough with Go 1.4. +- Remove syncthing-go-1.4-compat.patch: becoming impossible to fix. ------------------------------------------------------------------- Fri Dec 23 10:36:02 UTC 2016 - sor.alexei@meowr.ru diff --git a/syncthing.spec b/syncthing.spec index 31d7696..68f372b 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -27,9 +27,7 @@ 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-OPENSUSE syncthing-go-1.4-compat.patch -- Fix Go 1.4 compatibility. -Patch0: %{name}-go-1.4-compat.patch -BuildRequires: go >= 1.4 +BuildRequires: go >= 1.5 BuildRequires: systemd BuildRequires: systemd-rpm-macros @@ -42,7 +40,6 @@ Internet. %prep %setup -q -n %{name} -%patch0 -p1 cp -f %{SOURCE3} %{name}.firewall %if !(0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200) From a3a96c323a047bc232c9683b2804ea00de7f040a0c71cf54ab8c15f88069b8fa Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sat, 7 Jan 2017 12:13:15 +0000 Subject: [PATCH 7/8] - Update to version 0.14.18. OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=92 --- syncthing-source-v0.14.17.tar.gz | 3 --- syncthing-source-v0.14.17.tar.gz.asc | 11 ----------- syncthing-source-v0.14.18.tar.gz | 3 +++ syncthing-source-v0.14.18.tar.gz.asc | 11 +++++++++++ syncthing.changes | 9 +++++++++ syncthing.spec | 4 ++-- 6 files changed, 25 insertions(+), 16 deletions(-) delete mode 100644 syncthing-source-v0.14.17.tar.gz delete mode 100644 syncthing-source-v0.14.17.tar.gz.asc create mode 100644 syncthing-source-v0.14.18.tar.gz create mode 100644 syncthing-source-v0.14.18.tar.gz.asc diff --git a/syncthing-source-v0.14.17.tar.gz b/syncthing-source-v0.14.17.tar.gz deleted file mode 100644 index dc4bc89..0000000 --- a/syncthing-source-v0.14.17.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:826219b21c935ed938414a8777f9c757bf28a92d0ced48c6a7daf7b3035fb8c4 -size 6959538 diff --git a/syncthing-source-v0.14.17.tar.gz.asc b/syncthing-source-v0.14.17.tar.gz.asc deleted file mode 100644 index 0160a7a..0000000 --- a/syncthing-source-v0.14.17.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABCAAGBQJYYoLlAAoJENJubtAAZUo+OOoIALeBtpxMYJ4P53xhVFrl8I/F -XMfj71s6D3Gdv6viCxqef3EA2PEymNFtIdBfttqxvtqZfCd2Gky9EMwqRLQEZM/v -aFharMOYxMn84Zt9djf+kGhKlXeEUoeQasb6m5MLEVJ0FWymIn/VxNdBWGQalHAC -VNDa0aRo3aAP2GCGM/rjIW5BYn1pedfueCOPN4/yzb+PhJ9EOI6AnIPdJORABSwC -rCu6mOeHnsgHQQK0tG3GQZKS5uEbIjFpfNfkrk8HMZy157yrlBBVKDLhd81hdx5V -rJPEqIwG1V0c2qzE+8ZMkioSZuKDqaikMBBxwNnUs6efVdJ90EleXzIJrKrHOrA= -=IEd2 ------END PGP SIGNATURE----- diff --git a/syncthing-source-v0.14.18.tar.gz b/syncthing-source-v0.14.18.tar.gz new file mode 100644 index 0000000..96ad68c --- /dev/null +++ b/syncthing-source-v0.14.18.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95674993db7423dba9954606c8a32cbcf247d15e1f60d6e99382a85f5ee1a94b +size 6973082 diff --git a/syncthing-source-v0.14.18.tar.gz.asc b/syncthing-source-v0.14.18.tar.gz.asc new file mode 100644 index 0000000..e325783 --- /dev/null +++ b/syncthing-source-v0.14.18.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABCAAGBQJYaT2TAAoJENJubtAAZUo+m1QH/RoJHN0JwRkbgAC488aacK/t +40FSpqLNp+O9yuIuWtBuCAmqvM01rOGsiuC7njAiox8OjD4Mr1fWzjSt0h97+X8Z +VEToh496Ms8zGUAkUkVa+GmfvC1TS8NXg4e/7QCed7+PVFA/xfUa72FOotjQwby7 +ZkEyypwSHBk0+jfnCoBvYake4Dj4Sa26EdiFNvgZegBuuj8yCP5bWbb7rcq4+iWA ++VoE4NY2589R0xkLDdhJl+yFYNiqV61Ixm+DXeh9ZjGP7bUcv1gZC2wv2VpJ4h1h +BJ9UewM/1LIUQTmfQbTadXEqAp+IaCiAQMbsrInh5ostytjXHT5j33JyYMWCnMg= +=D28U +-----END PGP SIGNATURE----- diff --git a/syncthing.changes b/syncthing.changes index 9abc1f3..806135d 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 6 11:12:27 UTC 2017 - sor.alexei@meowr.ru + +- Update to version 0.14.18: + * Fix connections to older Syncthing versions being no longer + closed due to an unmarshalling message: + 'proto: wrong wireType = 2 for field BlockIndexes' + (gh#syncthing/syncthing#3855). + ------------------------------------------------------------------- Tue Dec 27 15:05:20 UTC 2016 - sor.alexei@meowr.ru diff --git a/syncthing.spec b/syncthing.spec index 68f372b..8247ccc 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,7 +1,7 @@ # # spec file for package syncthing # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: syncthing -Version: 0.14.17 +Version: 0.14.18 Release: 0 Summary: FOSS Continuous File Synchronisation License: MPL-2.0 From 090df40f332c513a35fa8eaac5098487e82aeb6edcea6d616d312610c21d1298 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Mon, 16 Jan 2017 23:35:08 +0000 Subject: [PATCH 8/8] - Update to version 0.14.19. OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=93 --- syncthing-source-v0.14.18.tar.gz | 3 --- syncthing-source-v0.14.18.tar.gz.asc | 11 ----------- syncthing-source-v0.14.19.tar.gz | 3 +++ syncthing-source-v0.14.19.tar.gz.asc | 11 +++++++++++ syncthing.changes | 22 ++++++++++++++++++++++ syncthing.spec | 2 +- 6 files changed, 37 insertions(+), 15 deletions(-) delete mode 100644 syncthing-source-v0.14.18.tar.gz delete mode 100644 syncthing-source-v0.14.18.tar.gz.asc create mode 100644 syncthing-source-v0.14.19.tar.gz create mode 100644 syncthing-source-v0.14.19.tar.gz.asc diff --git a/syncthing-source-v0.14.18.tar.gz b/syncthing-source-v0.14.18.tar.gz deleted file mode 100644 index 96ad68c..0000000 --- a/syncthing-source-v0.14.18.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95674993db7423dba9954606c8a32cbcf247d15e1f60d6e99382a85f5ee1a94b -size 6973082 diff --git a/syncthing-source-v0.14.18.tar.gz.asc b/syncthing-source-v0.14.18.tar.gz.asc deleted file mode 100644 index e325783..0000000 --- a/syncthing-source-v0.14.18.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABCAAGBQJYaT2TAAoJENJubtAAZUo+m1QH/RoJHN0JwRkbgAC488aacK/t -40FSpqLNp+O9yuIuWtBuCAmqvM01rOGsiuC7njAiox8OjD4Mr1fWzjSt0h97+X8Z -VEToh496Ms8zGUAkUkVa+GmfvC1TS8NXg4e/7QCed7+PVFA/xfUa72FOotjQwby7 -ZkEyypwSHBk0+jfnCoBvYake4Dj4Sa26EdiFNvgZegBuuj8yCP5bWbb7rcq4+iWA -+VoE4NY2589R0xkLDdhJl+yFYNiqV61Ixm+DXeh9ZjGP7bUcv1gZC2wv2VpJ4h1h -BJ9UewM/1LIUQTmfQbTadXEqAp+IaCiAQMbsrInh5ostytjXHT5j33JyYMWCnMg= -=D28U ------END PGP SIGNATURE----- diff --git a/syncthing-source-v0.14.19.tar.gz b/syncthing-source-v0.14.19.tar.gz new file mode 100644 index 0000000..cd51b59 --- /dev/null +++ b/syncthing-source-v0.14.19.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00bf4a221407f70b98033b7206854bf0e1c49575edfd1f548397efb42e8aef65 +size 7721602 diff --git a/syncthing-source-v0.14.19.tar.gz.asc b/syncthing-source-v0.14.19.tar.gz.asc new file mode 100644 index 0000000..a4e054e --- /dev/null +++ b/syncthing-source-v0.14.19.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABCAAGBQJYdJR8AAoJENJubtAAZUo+TXoH/1dWTJ+3Nc6iTiHXrDDkI9hk +X4My3JJSQ8kjC3mDy7yyDGpWfFJwtwSrKEngclIh9p4GS19u0+DHXSTBDDOb4IGR +EXNrsTGj/HprJGjMdwYFYY/7RLrJgbz7x4uGgGkOZgvcRth4eTKsWjG9gt/JNa/+ +gR5qsfVJ2BT55o8Ds+qAzYKIgNuqSyynLuPKtEfxape2NBfwPUhS1Timg9HYTtst +S0YTS8/c28WGeDJqJw2E+d04kAanIo8xDeu7Bc87HmlX5mk1H6C8HBwvS0jb3eab +J7w8XxnjZDR/dYNwUFqcjSt7ncNvXz2JPSyIBlB3zJEUFLPuRrgl55BSz9yRR2U= +=lU5c +-----END PGP SIGNATURE----- diff --git a/syncthing.changes b/syncthing.changes index 806135d..c7c257a 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Jan 16 17:25:40 UTC 2017 - sor.alexei@meowr.ru + +- Update to version 0.14.19: + * Changing bandwidth rate limits now takes effect immediately + without restart (gh#syncthing/syncthing#3846) + * The event log (-audit) can now be directed to stderr for + piping into an another application + (gh#syncthing/syncthing#3859). + * A panic on directory listing at startup has been fixed + (gh#syncthing/syncthing#3584). + * When a directory is deleted, the .stfolder marker is also + removed. The ignore file and .stversions directory are + retained, if present (gh#syncthing/syncthing#3857). + * Several scenarios where a device would get stuck with + 'not a directory' errors are now handled again + (gh#syncthing/syncthing#3819). + * Third party copyrights in the about box are now more up to + date (gh#syncthing/syncthing#3839). + * Hashing performance has been improved + (gh#syncthing/syncthing#3861) + ------------------------------------------------------------------- Fri Jan 6 11:12:27 UTC 2017 - sor.alexei@meowr.ru diff --git a/syncthing.spec b/syncthing.spec index 8247ccc..45dd2ab 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -17,7 +17,7 @@ Name: syncthing -Version: 0.14.18 +Version: 0.14.19 Release: 0 Summary: FOSS Continuous File Synchronisation License: MPL-2.0