From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1394187-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 6B3FC158090
for <garchives@archives.gentoo.org>; Sun, 8 May 2022 20:51:36 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9E817E0874;
Sun, 8 May 2022 20:51:35 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id D6829E0874
for <gentoo-commits@lists.gentoo.org>; Sun, 8 May 2022 20:51:34 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BF1F93410A7
for <gentoo-commits@lists.gentoo.org>; Sun, 8 May 2022 20:51:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B349D3
for <gentoo-commits@lists.gentoo.org>; Sun, 8 May 2022 20:51:32 +0000 (UTC)
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" <marecki@gentoo.org>
Message-ID: <1652043086.758a5f0dcbd5ff618e8733066603a05548583299.marecki@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-p2p/syncthing/Manifest net-p2p/syncthing/syncthing-1.20.1.ebuild
X-VCS-Directories: net-p2p/syncthing/
X-VCS-Committer: marecki
X-VCS-Committer-Name: Marek Szuba
X-VCS-Revision: 758a5f0dcbd5ff618e8733066603a05548583299
X-VCS-Branch: master
Date: Sun, 8 May 2022 20:51:32 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 93f49cc7-2b28-419e-a6c5-67da57a41d0e
X-Archives-Hash: bf196f5b2cd4b99b7b0805a4b3b2b85c
commit: 758a5f0dcbd5ff618e8733066603a05548583299
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 12:25:38 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun May 8 20:51:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=758a5f0d
net-p2p/syncthing: add 1.20.1
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
net-p2p/syncthing/Manifest | 2 +
net-p2p/syncthing/syncthing-1.20.1.ebuild | 103 ++++++++++++++++++++++++++++++
2 files changed, 105 insertions(+)
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 397e723fb63b..b7b47ed97907 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -777,3 +777,5 @@ DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.m
DIST syncthing-1.18.5.tar.gz 6168905 BLAKE2B 4555351e6bad90cf3fde76971bc500f47f628ed1690f843d7404f47a20bcd4570c8aa7791ebe26c1abfe21550b18e1dc3a6354b98223589e27f8424ab5784bd4 SHA512 10968cdbc7357909bc34e2d82691c2a905c66ef5874eeb93e3b9c9a454df0122551feaf454b916e1ca3363a87f0699628a08f44ab1edecd8fb7d1fa78ef87af5
DIST syncthing-1.19.2-deps.tar.xz 206531144 BLAKE2B 88e5246217f792c8258f0074ecb3e917e03fb3f4b7d32d0f17cb9501c5a6fdbe31f77ce8a5af02e5dcefb3711464e16159e5b7fee564470d6eb5c7718a29032d SHA512 92e080544c6a24ad501d0bfacca2743d5285cc5348817b915f5c944fa57d8876c69fa328553ccb5135d514fcb7d970eac17b546467b4563a8e93e976e446bdd1
DIST syncthing-1.19.2.tar.gz 6197504 BLAKE2B 0db0f286a79ef8b9c4b74f9aa2da275f216d0a1cb5e10ec7fbd9a479c55f81ec8b8c06b2dbea6aed135eccf6bf539499c8852a8586bd37c4d0ba9969503a2114 SHA512 51641574e01daf591083e00aa956aeb0b6820eeb660c34dc0c161d2edfc183786dfa3bf50f75b6502b73440e3666672e651f0afc75c26cabbb457f0591d75f89
+DIST syncthing-1.20.1-deps.tar.xz 206808680 BLAKE2B 2808af40205cf7af25c9ba4d7bc1c181e598ddc3675955c6766eb278b86b30d63ef6aa84b9dfcf5687fa51f4ef596a4ea8067102aeb0fbca83800120570597eb SHA512 4d34abf541db8abd5cfd346b2276465038a5b17de3cd92c77125c0accef842890d18fdb737908bd08fcc9f20cc3ea983365e2c812b7b5b9f1980e7dbd5cd1ac1
+DIST syncthing-1.20.1.tar.gz 6202692 BLAKE2B 7525f7cfc1757ef86b503ccc2be85b29341f9a038eb517b48552aa62cba75a635121b21baf5279964056541af4b3aa8f4c4cbc26de3825953751217333a0434a SHA512 04c5e2daeb7c3076824b4a955b8cc0008e952bce094a62fb656b6c31d6a4c149e1c97eec5e1029d7483a197783599f742272930bde8359361ab18ac6b8b6a292
diff --git a/net-p2p/syncthing/syncthing-1.20.1.ebuild b/net-p2p/syncthing/syncthing-1.20.1.ebuild
new file mode 100644
index 000000000000..602b88210caa
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.20.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 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"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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 )"
+
+DOCS=( README.md AUTHORS CONTRIBUTING.md )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch
+ "${FILESDIR}"/${PN}-1.18.4-tool_users.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
+
+ # We do not need this and it sometimes causes build failures
+ rm -rf cmd/stupgrades
+}
+
+src_compile() {
+ GOARCH= 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() {
+ doman man/*.[157]
+ einstalldocs
+
+ dobin bin/syncthing
+ domenu etc/linux-desktop/*.desktop
+ if use tools; then
+ exeinto /usr/libexec/syncthing
+ local exe
+ for exe in bin/* ; do
+ [[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
+ done
+ fi
+
+ systemd_dounit etc/linux-systemd/system/${PN}{@,-resume}.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}
+
+ if use tools; then
+ 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
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}