commit: 258b078422e2aad516119787da45a8c2d8c0aa78
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 8 11:32:23 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Mar 8 13:22:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=258b0784
net-p2p/syncthing: add 1.23.2, drop 1.23.0
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
net-p2p/syncthing/Manifest | 4 ++--
.../files/syncthing-1.23.2-tests_race.patch | 25 ++++++++++++++++++++++
...thing-1.23.0.ebuild => syncthing-1.23.2.ebuild} | 2 +-
3 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 7da9131d05eb..e57788d6ba60 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -2,5 +2,5 @@ DIST syncthing-1.21.0-deps.tar.xz 96707392 BLAKE2B
3cbf6d98758a453f16717ec974cb1
DIST syncthing-1.21.0.tar.gz 6319691 BLAKE2B
390a06ff41ed1b023941d958d8112f9c503c296cc47a5bb6d6baa55d81f6cbd431c725cc6493b041a96734e56c9a267c6a3b4c564b67ab320cd7f9d46e173320
SHA512
ad613da2c3aaa4792703e69dde0ab3ace3a92f20b968a2d7c02d6ec3b6ce2d53a6c3d6b64c41c58ca8296bf722e689cd8ca34c05fd0dd32d8005d31b5f860d58
DIST syncthing-1.22.2-deps.tar.xz 101162440 BLAKE2B
74e846b191ca7aefdaca4784d2c4c3ed3d412695820dff2280c13c8c2c498a746b54210ca3bbc310fbd8693c8dedbab5bf51078ff01e345bd0ced54559b76106
SHA512
b9e23e1d50bc27ffab1e66f08a67b910fa3c869e514f68c17cae73d717f4a0452b93ad7d0a6ec475f4e1055a6d4d85bcd8e7f85692a6088baa96e2af710739c0
DIST syncthing-1.22.2.tar.gz 6339424 BLAKE2B
69a6350a5166af8cd670090b440fb9b932a6d1169fc649588277d90aff305604302bc368b61f542252b06b5212c1c094f720e39c1be6f8375fc7e8f8d2f7bdef
SHA512
5b724beb139ec2701222cf77c540cb3f4525db3b1102ccc9ac55829dda668e7fe4b962c7263fbe6bc4efa813d0e783486a7b329f903ded1cef47be585c1e8787
-DIST syncthing-1.23.0-deps.tar.xz 101340488 BLAKE2B
00dc20c5b2aee91bb84a9014ac7ff38828aa8faa396a3567dbb3469409f22566a36bf50a6dc20ddd38803e3f0a1d7229a1e685328cc4a6e4285a808f29f14eb8
SHA512
2fcdc7dd29c75d2f1ee0e385f2d1728021acd32e06f7e48013ba54615b4793ae033e1f05e607925618b095388bb48b78f14561e5866a285a9e7e7659c26caff1
-DIST syncthing-1.23.0.tar.gz 6342650 BLAKE2B
165b7bceb88a5ba8443b1393c50b28c6c4dbc7cdd74383ff7718d5594050703e2f6bd66c41c00cd7bf35fe54ff85c9837fb9f59c578eb71acb588b078faa074d
SHA512
b0122923ad3ed4cc50aafe89bb94e13b44998483db0b1df795e05ff17bcbc029a17ed3af187b615154cf88d4c964cb5bdb84e25b6f5548ccf29545b6d2a1cd4f
+DIST syncthing-1.23.2-deps.tar.xz 101786324 BLAKE2B
5ab47ce288ece8ef53a14f3769650ba945c4b0cb8c314964694690c4d6b34c4161ccd256deae1a29bd97f0441610810dbb9af6dd9b90786c709a03adb1a6f511
SHA512
94fb5031ce471af2ed462d83bdfff8c290df8e83917e09c5571ef1e585fe3a9c4d4b4119b529b5af974be58b7e92c1e07c17fe9810d0d9c011323f344f37f83e
+DIST syncthing-1.23.2.tar.gz 6529048 BLAKE2B
cda30a17000c5cf59b90d68148c0b375c36145e3d497409c49060cddcee794951bd72e8d0f97be7b66cb5c595c2d7232b64b06df2d9a37a48e02d614367cf8c0
SHA512
3f182aad9714d299205a0379d32121adb018d5d7fb31f199a108f1a6b7822452e1b10a27c05516d232004469a1f20f086465fbbc163f10ed9375273a8b90ff9d
diff --git a/net-p2p/syncthing/files/syncthing-1.23.2-tests_race.patch
b/net-p2p/syncthing/files/syncthing-1.23.2-tests_race.patch
new file mode 100644
index 000000000000..8d9e6819d101
--- /dev/null
+++ b/net-p2p/syncthing/files/syncthing-1.23.2-tests_race.patch
@@ -0,0 +1,25 @@
+--- a/build.go
++++ b/build.go
+@@ -32,8 +32,6 @@
+ "strings"
+ "text/template"
+ "time"
+-
+- buildpkg "github.com/syncthing/syncthing/lib/build"
+ )
+
+ var (
+@@ -409,13 +409,6 @@
+ }
+ args = append(args, "-timeout", timeout)
+
+- if runtime.GOARCH == "amd64" {
+- switch runtime.GOOS {
+- case buildpkg.Darwin, buildpkg.Linux, buildpkg.FreeBSD: // ,
"windows": # See https://github.com/golang/go/issues/27089
+- args = append(args, "-race")
+- }
+- }
+-
+ if coverage {
+ args = append(args, "-covermode", "atomic", "-coverprofile",
"coverage.txt", "-coverpkg", strings.Join(pkgs, ","))
+ }
diff --git a/net-p2p/syncthing/syncthing-1.23.0.ebuild
b/net-p2p/syncthing/syncthing-1.23.2.ebuild
similarity index 98%
rename from net-p2p/syncthing/syncthing-1.23.0.ebuild
rename to net-p2p/syncthing/syncthing-1.23.2.ebuild
index 9284130b9c50..b0131fe7f83f 100644
--- a/net-p2p/syncthing/syncthing-1.23.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.2.ebuild
@@ -20,13 +20,13 @@ RDEPEND="acct-group/syncthing
tools? ( >=acct-user/stdiscosrv-1
>=acct-user/strelaysrv-1 )
selinux? ( sec-policy/selinux-syncthing )"
-BDEPEND="<dev-lang/go-1.20"
DOCS=( README.md AUTHORS CONTRIBUTING.md )
PATCHES=(
"${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch
"${FILESDIR}"/${PN}-1.18.4-tool_users.patch
+ "${FILESDIR}"/${PN}-1.23.2-tests_race.patch
)
src_prepare() {
