summaryrefslogtreecommitdiff
path: root/net-p2p/syncthing
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-03-08 18:00:27 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-03-08 18:00:27 +0000
commit78ebdce6a16942c7081565472862ab6730321ee3 (patch)
tree91e2d66a20ff982c4ccfdb6e95573a0d4ad2b3df /net-p2p/syncthing
parent0d96a0e47c83a107ad92e2bc90e5389f577cc9a4 (diff)
gentoo auto-resync : 08:03:2023 - 18:00:26
Diffstat (limited to 'net-p2p/syncthing')
-rw-r--r--net-p2p/syncthing/Manifest7
-rw-r--r--net-p2p/syncthing/files/syncthing-1.23.2-tests_race.patch25
-rw-r--r--net-p2p/syncthing/syncthing-1.23.2.ebuild (renamed from net-p2p/syncthing/syncthing-1.23.0.ebuild)2
3 files changed, 30 insertions, 4 deletions
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index a02d461f78e0..1b9535f708ef 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -5,6 +5,7 @@ AUX strelaysrv.confd 107 BLAKE2B d7a8bf341826c8e3f343d8e39a1e527e8284695fb513245
AUX strelaysrv.initd-r1 695 BLAKE2B e888d5c43f1638c2fa281e0b81f520c323dfc9a719f91a6439bb1b1f90925d9ba958ec33c4568beaf168caf4053d2ab4a79bfb25cffdccce6da5618577eed9fa SHA512 be51cb7f6930a9b161728a0c25d368314752e2481369755b0cabac9a2eebdfc7f8b502f0dfd030747132f9c3b921e94b305a0c9005ec65609896b33a8435fe34
AUX strelaysrv.logrotate 102 BLAKE2B 3d19a7dcade5878e7b7f275572ab2d5232ea3d043b720fa17c208dca456c3e82b5d5158df6633c6fd15d16aa0680bb2a642ba0daf440754fab281e94e69f327d SHA512 2f94be8af78b1beb567a7e6b7177aaa6451cd1ae63ef2842369879cc2e8e0cc2c615f68ce26d7031fbb7268788f7c210c03c33de52ff064b48ca42231613be85
AUX syncthing-1.18.4-tool_users.patch 757 BLAKE2B 62492e8ab952af6b1726517d21c8bf153d2bb8e0819428afd11f367b75f0918cc10a37da537bcdcc789fea4f614428fd416adfdd6b1989c9bfc0e946af0b8424 SHA512 368e9e749a6d7a1963d9d2b5b76bc4ce32cf96ec81700b0c620ac3ce4fe7f4fa4234bf953bf33f4ae1176ce7cd2e9d3d2b09878503de2685bb5e387058afb8ea
+AUX syncthing-1.23.2-tests_race.patch 588 BLAKE2B 19a143c323f7550f30d83284a4f939529e68115beeb8af4669250e712e89ad4a24ebdd791a798a8e27b4126d63335ce5947587cb30ccd9414fcb76e009f050f2 SHA512 6519516f18a6d60480ed3d9d73bb9aa64a3756eafc9923ad91a530df015042143d47a40f7d0d287eadd51b98450c98d150e0a818b3b28a6792ef09da32134901
AUX syncthing-1.3.4-TestIssue5063_timeout.patch 641 BLAKE2B 193a86b692bd65059f01bdb07361e3912fc332488195d80258105efc2aeca5c504c44897c646f707112a71e6f8dbf2dee97e11c24b8f37dee6edbd2f43db7579 SHA512 462c16526a0e1a22df67fc893134fc777b7d7ba9219479e8c88115b951f17c210adbb34a80f242fdbe0f8a88516b003573b7bb3cf9b053dd57dc140f40afdce2
AUX syncthing.confd 733 BLAKE2B dec494bd35422f57dd8b6d848325933da909000d79b3d3193cff26528f13f639f221ba9b801356694da6720f35b84bf6aa024120024e547dc8b2fc84c5b18b91 SHA512 84f2731866b279d16dd2e17c27987fd99e7440c334771ed44e2204405b97082d7d68bc56257fa13befcc3e2cdfdbd40c7c4be3a614b259c4e7ca2c327a24bb9f
AUX syncthing.initd-r2 1288 BLAKE2B a1c74a4de5bfe61fe4e57f7be358a4ba2df28a92fd48e933fa1c67b7beb72281617c3a11d2e379e97a6e57c2378ae8d88fbdb7c80ba3d6e9513833eebd06eff5 SHA512 4f86a81112df1ba15f92bd88999ba632e4a3ba4a6e5a150b2d60a82011bd35f177f86e81a51e95e10b99f4be7698ebd2786ca423635d576872fccec7607c1564
@@ -13,9 +14,9 @@ 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
EBUILD syncthing-1.21.0.ebuild 2925 BLAKE2B e14a53336245e7dc90c893a4907141fc783917d880010d53a3962766fef76de132a4f7a182a09d62cb2531619a0abdee1b812551cf4cce463bc7ac9bb9b4624d SHA512 45e6dcf9d065f91b74296c576214bf6f6baa1961164c0bf42bd1ea7c09d1d1ab6116be4b76d7bfe7bbb7ff105b2353e8ea000c468d45ca9b87ae783da2a8a51b
EBUILD syncthing-1.22.2.ebuild 2937 BLAKE2B d7520e4e101b45bf6460d67500511aa4c2262d9ca3e847ad823c7b17996ead4a039e481bdbfda6f7996c677eed5a6f67c9bfc5d9b1df7bce625e09bafaabcc5b SHA512 73a0395b99ab5a1226cf92fd657c1736201d26ad0d93f5abe7f0eb904a1792c3c866e608576b6519c4458b703c774d165844dcae217e5591ff5565c0e60a2033
-EBUILD syncthing-1.23.0.ebuild 2937 BLAKE2B d7520e4e101b45bf6460d67500511aa4c2262d9ca3e847ad823c7b17996ead4a039e481bdbfda6f7996c677eed5a6f67c9bfc5d9b1df7bce625e09bafaabcc5b SHA512 73a0395b99ab5a1226cf92fd657c1736201d26ad0d93f5abe7f0eb904a1792c3c866e608576b6519c4458b703c774d165844dcae217e5591ff5565c0e60a2033
+EBUILD syncthing-1.23.2.ebuild 2954 BLAKE2B bb800f21c8fe2bc2b1e2258a0a6379f7e162dcedaa3dda84279559b7cf91918c18b51b6d4042f43e8eaec6631c804dd9d32bfb9839479d1dcc4987376364af79 SHA512 c99c572b45c24a5206b482153cbe7cb4ec804c11b9df5e82b42a4f47ef0ac9f8de69f82bc2528a811b239cdb3c18e5cc5279ca199b34bf372c2c3b9969d2664f
MISC metadata.xml 870 BLAKE2B 9d6abd4129ab6ab9ece49e3cb74b6537cf185c5e7e0d7cf893543ea6e75be83e534a8d3f4d042aeb778f9284c9ed7a6f2d60461593ae46f65901a42a3582acc2 SHA512 ef4f1fb81733a7c53f4deb239de1d01d4d2710cf92cb4abfb49659f64bfe5a080c3ab50ec9ec9bda531d0ca87f2f5b9ac80fe1beba1eaaccd1971b1759b3e93a
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
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() {