3 files changed, 128 insertions, 0 deletions
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 3067f356965b..b6bb92f1f922 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -6,6 +6,7 @@ AUX strelaysrv.initd-r1 695 BLAKE2B e888d5c43f1638c2fa281e0b81f520c323dfc9a719f9
 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.29.5-remove_race_in_tests.patch 489 BLAKE2B d46813511194089769771c313995876e723d7b0cbbddd42e16017780ac52f54bc0a822948b09dc5fda6bd4a7af7620c71ff901815b43ba3b9fcf5b2082f5ee28 SHA512 355754334cd60f2301686fe7b3d3da9f8bab4e66eea51bd0c7c254058395c06e5363a1523739a176aaa29204b34fb7013d5a1ce14fd6e91113d6077211627fa7
 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,7 +14,9 @@ AUX syncthing.logrotate 101 BLAKE2B af499a6979e5c61cc4791932e247fe7f25baffbbf690
 DIST syncthing-1.27.10.tar.gz 15431543 BLAKE2B e6c745e10beed7fa705aa5839440dc3e7fe730348bf7119c853bbd93cfb5e6d5fd920f37b9aec1774c175f24d1a5b70fc921d4222a69a432b6dcb777a6641e97 SHA512 caf24474790b7c40edbca27191a977dfc1009445129abc89cc4f3d0abecd20219d1e82e10947dde03763323d46ce951d1bdfa210189f13cdd9759541e6fdb6c8
 DIST syncthing-1.27.12.tar.gz 15553432 BLAKE2B df4ecaacb2986152755bcc6b20570856217b49dcffae45ff9cb3e1bc32eb648eb709fdf79c9051e73eff7b61adcf7078daed1d06d22a0d65061eb99a25b8aa02 SHA512 4e46124936ab7670d2929b0817b014c5d9ab6c94a9ce47368c796ab59b1f03c7da983ade358ae98be7c83fb4b70d2c3a3709827257be9dc61c0d0e113022dd85
 DIST syncthing-1.27.9.tar.gz 15394317 BLAKE2B a7b02c57d897c3fc56734d039e5cf0eceaf802258e3a9fd34d667a9e22ff75db0bd1cf6b8d5be8b8e9d4eb772145222bee7d3154b004c437bbab23f33fb98e66 SHA512 11c56dcf3b44f87581560b4f8f8f76d6ee851fc0421d85f458a32c3900bd0ee6bb2964b7d5253a343d61ba57e3aa40f2f8a94d6f5d5d5b0cf27dc1cc28a14fa1
+DIST syncthing-source-v1.29.5.tar.gz 16044586 BLAKE2B d0e557d6158c3e568314725c06862b9b30f83e4e7f1322930dcdd30c80bee89730bfa3d4051ba45c1714901a96175dcd8e328feb87a4deeaadb7b4eb37e47fe0 SHA512 a11ee3e95ba656f2bfceddde10ef13d86dffc0cba78f428bf5cbba13a8bb6e0ef7eb9c8b75317596d56b7880465cf8972be6cf77258c7c53529c16d5310cc43d
 EBUILD syncthing-1.27.10.ebuild 2996 BLAKE2B fb2b566234a96d2e52830021e00510f8a1157874d193043707b4edcbe8a6b834bb12074ba55ab437240563a3a772688822195b1a36c4e410b1ab997013a873ab SHA512 33d6492b1852d84cc86b2f1bd464d80b590b722cd6238a5fa28ef83b0561fe1ae7a089e9158f00bfd5b2dfe4169c50da46f876555a43426b6925e5eb4a900cc0
 EBUILD syncthing-1.27.12.ebuild 3013 BLAKE2B 5c31e1d648624f3701f1f4d0ba165a63caf28a149c20e47bc29241ca87571d890bf8ea1d98dba6f861e89207c55e7ee35fdca6a23d0bee77b6a5c4112c7a6e38 SHA512 f57af88f87aea3727dc7d32be397c29cb3fe0e060b260489ca9e479246e330f267cf79fa884c4046c6900599c0549716bdedf1ef11347d41f214c5e40bd10e48
 EBUILD syncthing-1.27.9.ebuild 3004 BLAKE2B b5c1513358b5469e2f8e6aecd0abe3dc5d8d70c9627cdf5762ecb79d09ee27fb3367d476e856288cc426005740038b3a74906110f7c633977e35640a733d4016 SHA512 99f296c71df6c689273e425442167b3fd83d588a52b20f7dced18dc73592037aae6b7baeab53eff86467b361a16794e926087f556e969a16c16a8ddd6cde0bfd
+EBUILD syncthing-1.29.5.ebuild 2627 BLAKE2B 6629a526f100e6a00b753f9f7989f181398b0ed6ea30391dc1b9972d21f3cbb32cfd20b36477a87ff679ce1a59121c977437aefadf0240ef9e521a65bc19192a SHA512 82ae346667c2f194abce6adeaec089ec8ffeb7b008e4c707ad8dfa347c04419f3c005b01d21db64809f3891543801abccfdf502e13cff9bbb998727f411018eb
 MISC metadata.xml 875 BLAKE2B 55f23b2af63de22383e3ea26f2b5db552b888ec73e086c6d852794b3ac334b91f3e3e83cc38f4448b6d794df8cec442a3627b396c2e2926b32e348f6703356f1 SHA512 4a3d03f16e3376e86f85a2ebe15ade456ee5a577a36f789cec206cf2002cf2dc04e9673c2b316eb50998610fd2e52d8669b11d015ebb7372ba94596e94954dc3
diff --git a/net-p2p/syncthing/files/syncthing-1.29.5-remove_race_in_tests.patch b/net-p2p/syncthing/files/syncthing-1.29.5-remove_race_in_tests.patch
new file mode 100644
index 000000000000..eb7b1faceb55
--- /dev/null
+++ b/net-p2p/syncthing/files/syncthing-1.29.5-remove_race_in_tests.patch
@@ -0,0 +1,15 @@
+This patch removes conditional appending of "-race" flag.
+It is needed as we build in PIE mode and race is incompatible with that.
+
+https://bugs.gentoo.org/955442
+--- a/build.go
++++ b/build.go
+@@ -396,7 +396,7 @@
+ 	}
+ 	args = append(args, "-timeout", timeout)
+ 
+-	if runtime.GOARCH == "amd64" {
++	if false {
+ 		switch runtime.GOOS {
+ 		case buildpkg.Darwin, buildpkg.Linux, buildpkg.FreeBSD: // , "windows": # See https://github.com/golang/go/issues/27089
+ 			args = append(args, "-race")
diff --git a/net-p2p/syncthing/syncthing-1.29.5.ebuild b/net-p2p/syncthing/syncthing-1.29.5.ebuild
new file mode 100644
index 000000000000..4648a8dafd6c
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.29.5.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop go-module systemd xdg-utils
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net https://github.com/syncthing/syncthing"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v${PV}.tar.gz"
+S="${WORKDIR}"/${PN}
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="selinux tools"
+
+RDEPEND="
+	acct-group/syncthing
+	acct-user/syncthing
+	tools? (
+		>=acct-user/stdiscosrv-1
+		>=acct-user/strelaysrv-1
+	)
+	selinux? ( sec-policy/selinux-syncthing )
+"
+BDEPEND=">=dev-lang/go-1.21.0"
+
+DOCS=( AUTHORS {GOALS,README}.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch
+	"${FILESDIR}"/${PN}-1.18.4-tool_users.patch
+	"${FILESDIR}"/${PN}-1.29.5-remove_race_in_tests.patch #955442
+)
+
+src_prepare() {
+	# Bug #679280
+	xdg_environment_reset
+
+	default
+
+	local srv
+	for srv in st{disco,relay}srv; do
+		sed -i \
+			's|^ExecStart=.*|ExecStart=/usr/libexec/${PN}/${srv}|' \
+			cmd/${srv}/etc/linux-systemd/${srv}.service || die
+	done;
+}
+
+src_compile() {
+	GOARCH= CGO_ENABLED=1 go run build.go -version "v${PV}" -no-upgrade -build-out=bin/ \
+		${GOARCH:+-goarch="${GOARCH}"} \
+		build $(usev tools all) || die "build failed"
+}
+
+src_test() {
+	go run build.go test || die "test failed"
+}
+
+src_install() {
+	dobin bin/${PN}
+
+	doman man/*.[157]
+	einstalldocs
+
+	domenu etc/linux-desktop/${PN}-{start,ui}.desktop
+	local -i icon_size
+	for icon_size in 32 64 128 256 512; do
+		newicon -s ${icon_size} assets/logo-${icon_size}.png ${PN}.png
+	done
+	newicon -s scalable assets/logo-only.svg ${PN}.svg
+
+	systemd_dounit etc/linux-systemd/system/${PN}@.service
+	systemd_douserunit etc/linux-systemd/user/${PN}.service
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+
+	keepdir /var/log/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	insinto /etc/ufw/applications.d
+	doins etc/firewall-ufw/${PN}
+
+	if use tools; then
+		exeinto /usr/libexec/${PN}
+		insinto /etc/logrotate.d
+
+		local srv
+		for srv in st{disco,relay}srv; do
+			doexe bin/${srv}
+			systemd_dounit cmd/${srv}/etc/linux-systemd/${srv}.service
+			newconfd "${FILESDIR}"/${srv}.confd ${srv}
+			newinitd "${FILESDIR}"/${srv}.initd-r1 ${srv}
+
+			newins "${FILESDIR}"/${srv}.logrotate ${srv}
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}