commit: fb1cb169205133265f46066807fa044d1d5cf441 Author: Filip Kobierski <fkobi <AT> fsfe <DOT> org> AuthorDate: Sun Dec 14 13:20:57 2025 +0000 Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> CommitDate: Sun Dec 14 16:22:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb1cb169
net-p2p/syncthing: drop old Signed-off-by: Filip Kobierski <fkobi <AT> fsfe.org> Part-of: https://github.com/gentoo/gentoo/pull/45005 Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org> net-p2p/syncthing/Manifest | 3 - .../files/syncthing-1.23.2-tests_race.patch | 25 ----- net-p2p/syncthing/syncthing-1.27.12.ebuild | 114 ------------------- net-p2p/syncthing/syncthing-2.0.8-r1.ebuild | 125 --------------------- 4 files changed, 267 deletions(-) diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest index 05b63357b167..59248c274781 100644 --- a/net-p2p/syncthing/Manifest +++ b/net-p2p/syncthing/Manifest @@ -1,4 +1,3 @@ -DIST syncthing-1.27.12.tar.gz 15553432 BLAKE2B df4ecaacb2986152755bcc6b20570856217b49dcffae45ff9cb3e1bc32eb648eb709fdf79c9051e73eff7b61adcf7078daed1d06d22a0d65061eb99a25b8aa02 SHA512 4e46124936ab7670d2929b0817b014c5d9ab6c94a9ce47368c796ab59b1f03c7da983ade358ae98be7c83fb4b70d2c3a3709827257be9dc61c0d0e113022dd85 DIST syncthing-source-v1.29.5.tar.gz 16044586 BLAKE2B d0e557d6158c3e568314725c06862b9b30f83e4e7f1322930dcdd30c80bee89730bfa3d4051ba45c1714901a96175dcd8e328feb87a4deeaadb7b4eb37e47fe0 SHA512 a11ee3e95ba656f2bfceddde10ef13d86dffc0cba78f428bf5cbba13a8bb6e0ef7eb9c8b75317596d56b7880465cf8972be6cf77258c7c53529c16d5310cc43d DIST syncthing-source-v2.0.10.tar.gz 62668860 BLAKE2B 28f4c9abedfbcc0d74c27d7d705a27fbf3a5aa36bf5a5bea14efb3eb6b55ae43635d27ccff0dc2fa8918d5b2a88c63a2984f6af9a242c111c08a28f32e42bbc4 SHA512 7bd66902211402ac2af017fd3a7eae589a0b3dbb20d3e9f17a4e0760503b3ebd177d917d9d7345f4bf6cc6a2c43d748195b079272e199285aac7719ffc89ab87 DIST syncthing-source-v2.0.10.tar.gz.asc 1391 BLAKE2B 746a183dc6cfe43ce414ae7128aa4ff50ca4681d6fcc692c8607bdbd70dab237b00d4c12dd7733b8255cd7d813eb25c1be09b2dae857963aec766afde6dfaf80 SHA512 8bf1ccab2670623b0bedaef7b196fad5a823068fb5c1922a7d6497ea431872311ad800413a96210df00c9907dbd85de8f563a3d635e76a1ef50641835998eb23 @@ -6,5 +5,3 @@ DIST syncthing-source-v2.0.11.tar.gz 62758646 BLAKE2B 1da106603632fd6195304d9475 DIST syncthing-source-v2.0.11.tar.gz.asc 1391 BLAKE2B 210206ad0bf5112f9637d5e7df92eaf02b40097715c89369676421bac50861eee3ffe30a8e2dbd68444389b12cc7382daf72b719b87f34610f6bc801230ea7ed SHA512 f0c298e7430aaad9ffaddf2a2d4a426925ef07720b431a2b8c538e5803ad4e81ed2398cf362e338609dd348696a1f9028f2b796fefdd90d10ca88f974d833fe7 DIST syncthing-source-v2.0.12.tar.gz 62613260 BLAKE2B b91b963331a630fb4de15143925092608e3aed22ea192e36a9f970629444967c8ab6904cf3a6b60b7bfaaa0b8db98f4cc53d022345401453ceacd8f99f4cd9a7 SHA512 c7c4c762f46eaf0351421ca18e5dbe941dbe604c1b76fb4ae983915534e6b3b2f41b0e8e36438e595f1a542b7c2ecdb6f8a3015e846b8c994b2692f9a6a64c85 DIST syncthing-source-v2.0.12.tar.gz.asc 1391 BLAKE2B bc081c8ffbfcc87ae2414bb2771d61722d91fbe1cc33edf712d52ec48539a514be6d7951b6848b7e23c2b13c87aa45a6a9dd91352cc539edcb7f6f6b8edc3752 SHA512 582ef3619c79b76df2b3ec8986a7cfaee8fe922230e1bde1980d9a6a24d9fa91d4e1e5616663c2e064ad6ad7d0454c30b979d2f5b3a1734238c8ed9dc84cdc16 -DIST syncthing-source-v2.0.8.tar.gz 62666559 BLAKE2B b980705b97f79447c7ec1eb811b8d426b1790d6f5c44bd5cfff260959ed186b197dc6f5b7627948e1dcb302417c77fb4c18748548bf9af38f5b7446f131c1375 SHA512 c8139c7ff3b1067db789c395ed8f78fdba38d731f9e2760d10eb5c0288bdfc3f9b05311b0852881f79ccb33fa1ac6ac609820bbf1ab89f83fcc09f11842bfb23 -DIST syncthing-source-v2.0.8.tar.gz.asc 1391 BLAKE2B 55c6fd642a51f83408d0bdecdcbdbeff8cc0a0e3da116c05e59101394207f6647c3973365a48603d84f57070ea89f588b9c50057ab72f1569ecaab046d49971a SHA512 0f951fb9c4354d26cf779fca8aeca89a8559e03d247b6c440aa54b6a9c878cb4a26597f120903a66798300e4e3b6e08b1a5575b296aded80239219ce5b0069d6 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 deleted file mode 100644 index 8d9e6819d101..000000000000 --- a/net-p2p/syncthing/files/syncthing-1.23.2-tests_race.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- 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.27.12.ebuild b/net-p2p/syncthing/syncthing-1.27.12.ebuild deleted file mode 100644 index 6737abdf36cf..000000000000 --- a/net-p2p/syncthing/syncthing-1.27.12.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# 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 -> ${P}.tar.gz" - -S="${WORKDIR}"/${PN} - -LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 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=( 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() { - # Bug #679280 - xdg_environment_reset - - default - sed -i \ - 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/stdiscosrv|' \ - cmd/stdiscosrv/etc/linux-systemd/stdiscosrv.service \ - || die - sed -i \ - 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \ - cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ - || die -} - -src_compile() { - GOARCH= CGO_ENABLED=1 go run build.go -version "v${PV}" -no-upgrade -build-out=bin/ \ - ${GOARCH:+-goarch="${GOARCH}"} \ - build $(usex tools "all" "") || die "build failed" -} - -src_test() { - go run build.go test || die "test failed" -} - -src_install() { - local icon_size - - doman man/*.[157] - einstalldocs - - dobin bin/syncthing - - domenu etc/linux-desktop/*.desktop - 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/syncthing - local exe - for exe in bin/* ; do - [[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}" - done - - systemd_dounit cmd/stdiscosrv/etc/linux-systemd/stdiscosrv.service - newconfd "${FILESDIR}"/stdiscosrv.confd stdiscosrv - newinitd "${FILESDIR}"/stdiscosrv.initd-r1 stdiscosrv - - systemd_dounit cmd/strelaysrv/etc/linux-systemd/strelaysrv.service - newconfd "${FILESDIR}"/strelaysrv.confd strelaysrv - newinitd "${FILESDIR}"/strelaysrv.initd-r1 strelaysrv - - insinto /etc/logrotate.d - newins "${FILESDIR}"/stdiscosrv.logrotate strelaysrv - newins "${FILESDIR}"/strelaysrv.logrotate strelaysrv - fi -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/net-p2p/syncthing/syncthing-2.0.8-r1.ebuild b/net-p2p/syncthing/syncthing-2.0.8-r1.ebuild deleted file mode 100644 index ba325f993600..000000000000 --- a/net-p2p/syncthing/syncthing-2.0.8-r1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit eapi9-ver desktop go-module systemd verify-sig xdg - -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 - verify-sig? ( - https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v${PV}.tar.gz.asc - ) -" -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" - -DEPEND=" - dev-db/sqlite:3 -" -RDEPEND=" - ${DEPEND} - acct-group/syncthing - acct-user/syncthing - tools? ( - >=acct-user/stdiscosrv-1 - >=acct-user/strelaysrv-1 - ) - selinux? ( sec-policy/selinux-syncthing ) -" -BDEPEND=" - verify-sig? ( sec-keys/openpgp-keys-syncthing ) -" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/syncthing.asc - -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() { - # https://github.com/mattn/go-sqlite3#linux - # -tags libsqlite3: use system sqlite3 instead of bundled - ego run build.go -version "v${PV}" -tags "libsqlite3" -no-upgrade -build-out=bin/ \ - build $(usev tools all) -} - -src_test() { - ego run build.go test -} - -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-r1 ${PN} - newinitd "${FILESDIR}"/${PN}.initd-r4 ${PN} - exeinto /etc/user/init.d - newexe "${FILESDIR}"/syncthing.initd-user syncthing - - 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_pkg_postinst - - if ver_replacing -lt 2.0 ; then - elog "Major changes in 2.0:" - elog "https://github.com/syncthing/syncthing/blob/v${PV}/relnotes/v2.0.md"; - fi -}
