From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 01A791382C5 for ; Fri, 16 Feb 2018 09:47:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5370EE092A; Fri, 16 Feb 2018 09:47:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 20591E092A for ; Fri, 16 Feb 2018 09:47:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8AA9C335C2A for ; Fri, 16 Feb 2018 09:47:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 497921C9 for ; Fri, 16 Feb 2018 09:47:22 +0000 (UTC) From: "Marek Szuba" 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" Message-ID: <1518774433.885a369b69b31c1ea5f23142394772c86758b5ef.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-0.14.44.ebuild X-VCS-Directories: net-p2p/syncthing/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 885a369b69b31c1ea5f23142394772c86758b5ef X-VCS-Branch: master Date: Fri, 16 Feb 2018 09:47:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3cbb3f8f-79ff-4516-9d71-46c32d161c76 X-Archives-Hash: 346cfa1ba36bc36158fcb9cb5ad3ca71 commit: 885a369b69b31c1ea5f23142394772c86758b5ef Author: Marek Szuba gentoo org> AuthorDate: Fri Feb 16 09:46:32 2018 +0000 Commit: Marek Szuba gentoo org> CommitDate: Fri Feb 16 09:47:13 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=885a369b net-p2p/syncthing: bump to 0.14.44 Among other things, this version seems to fix Bug #647558. Closes: https://bugs.gentoo.org/644704 Closes: https://bugs.gentoo.org/647558 Package-Manager: Portage-2.3.19, Repoman-2.3.6 net-p2p/syncthing/Manifest | 1 + net-p2p/syncthing/syncthing-0.14.44.ebuild | 123 +++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest index 95f2670bb36..71c66bb7c5a 100644 --- a/net-p2p/syncthing/Manifest +++ b/net-p2p/syncthing/Manifest @@ -1,2 +1,3 @@ DIST syncthing-0.14.38.tar.gz 8246629 BLAKE2B 93c01750fedd57cc07bffa14fe65d98fc1cf48b43eaf965fc3ff9546a24acada411a89a19b47e2f5b5e7508e57646d0560559c35bb3c378b7c04e3db14b7ffaa SHA512 be5f7527d63e8db427705c34b26d783d9abd7cb5727d3dcf08ee62b1ace5454b7dfed4f030ec53e847a34f560cf349460f68c859a1008c5105aef65ef42c5cc5 DIST syncthing-0.14.40.tar.gz 8300965 BLAKE2B 6cafde21707c3334b55d29f741059dae79c9566373e365e2e5f275df60170b2d0a7e13db8b0a061410f327387c4eb446f5104cebf2457918dc0f5419baec7acc SHA512 3e79b034d71d1c862d21433f897dc774d3e421628804ed9c8304d4ed0dccb90fa8ec738aef476bf074ba70d4c9947114c5b6a8326faa5d6b6e5dcc03dacabecb +DIST syncthing-0.14.44.tar.gz 10225689 BLAKE2B 67531246b9ffef72289f8c3d1372b4596f307a9608a2c2f09f96c2ca4eacd7413029cda9fadb0351c7980f7dc1ce17fa498fafa64860aa8437b158fa5e217fa2 SHA512 3a68c8ad3f586af22243d502322ed8269b10ea4d85b0a1bc39578d3da1bcc61e8753a6b94d5a7c8d7b56b86777932327450c2c08f447bb8a190a0171e2c015d4 diff --git a/net-p2p/syncthing/syncthing-0.14.44.ebuild b/net-p2p/syncthing/syncthing-0.14.44.ebuild new file mode 100644 index 00000000000..00190a582b6 --- /dev/null +++ b/net-p2p/syncthing/syncthing-0.14.44.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN="github.com/${PN}/${PN}" + +inherit golang-vcs-snapshot systemd user versionator + +DESCRIPTION="Open Source Continuous File Synchronization" +HOMEPAGE="https://syncthing.net" +SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="selinux tools" + +RDEPEND="selinux? ( sec-policy/selinux-syncthing )" + +DOCS=( README.md AUTHORS CONTRIBUTING.md ) + +pkg_setup() { + enewgroup ${PN} + enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} + + if use tools ; then + # separate user for the relay server + enewgroup strelaysrv + enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv + # and his home folder + keepdir /var/lib/strelaysrv + fowners strelaysrv:strelaysrv /var/lib/strelaysrv + fi +} + +src_prepare() { + default + sed -i \ + 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \ + src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ + || die +} + +src_compile() { + export GOPATH="${S}:$(get_golibdir_gopath)" + cd src/${EGO_PN} || die + go run build.go -version "v${PV}" -no-upgrade install \ + $(usex tools "all" "") || die "build failed" +} + +src_test() { + cd src/${EGO_PN} || die + go run build.go test || die "test failed" +} + +src_install() { + pushd src/${EGO_PN} >& /dev/null || die + doman man/*.[157] + einstalldocs + + dobin bin/syncthing + if use tools ; then + exeinto /usr/libexec/syncthing + local exe + for exe in bin/* ; do + [[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}" + done + fi + popd >& /dev/null || die + + # openrc and systemd service files + systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service + systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service + newconfd "${FILESDIR}/${PN}.confd" ${PN} + newinitd "${FILESDIR}/${PN}.initd" ${PN} + + keepdir /var/{lib,log}/${PN} + fowners ${PN}:${PN} /var/{lib,log}/${PN} + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotate" ${PN} + + if use tools ; then + # openrc and systemd service files + systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service + newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv + newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv + + insinto /etc/logrotate.d + newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv + fi +} + +pkg_postinst() { + local v + for v in ${REPLACING_VERSIONS}; do + if [[ $(get_version_component_range 2) -gt \ + $(get_version_component_range 2 ${v}) ]]; then + ewarn "Version ${PV} is not protocol-compatible with version" \ + "0.$(($(get_version_component_range 2) - 1)).x or lower." + ewarn "Make sure all your devices are running at least version" \ + "0.$(get_version_component_range 2).0." + fi + ewarn "Syncthing OpenRC init script now uses the upstream default of" + ewarn "" + ewarn " /var/lib/${PN}/.config/${PN}" + ewarn "" + ewarn "as its configuration directory. Please set SYNCTHING_HOMEDIR" + ewarn "to /var/lib/${PN} in /etc/conf.d/${PN} if you wish to continue" + ewarn "using the old Gentoo default. Systemd users are not affected." + done + + # check if user syncthing-relaysrv exists + # if yes, warn that it has been moved to strelaysrv + if [[ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]]; then + ewarn + ewarn "The user and group for the relay server have been changed" + ewarn "from syncthing-relaysrv to strelaysrv" + ewarn "The old user and group are not deleted automatically. Delete them by running:" + ewarn " userdel -r syncthing-relaysrv" + ewarn " groupdel syncthing-relaysrv" + fi +}