From 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Apr 2018 14:14:48 +0100 Subject: gentoo resync : 19.04.2018 --- net-p2p/syncthing/Manifest | 4 +- net-p2p/syncthing/syncthing-0.14.38.ebuild | 4 +- net-p2p/syncthing/syncthing-0.14.46.ebuild | 123 +++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+), 3 deletions(-) create mode 100644 net-p2p/syncthing/syncthing-0.14.46.ebuild (limited to 'net-p2p/syncthing') diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest index c5544b570c6c..6d85e109e5e3 100644 --- a/net-p2p/syncthing/Manifest +++ b/net-p2p/syncthing/Manifest @@ -7,7 +7,9 @@ AUX syncthing.logrotate 101 BLAKE2B af499a6979e5c61cc4791932e247fe7f25baffbbf690 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 -EBUILD syncthing-0.14.38.ebuild 3605 BLAKE2B d6aea1f123925c75361640308366646e548e0f7cc255b0ada8a398f98b6d77f7a1a3d4bf036aba3a45893450fab8c09353f4e33fc134d5c56ced38fdd720aa30 SHA512 fa626658a0368e3fae989b26dba92740701465a146e8a4d3686ee71e3b0bc9eb60b8d1b154b4d8db047f7e64bc8839e45b15bedcb0b246d8356f8e2c1ca59184 +DIST syncthing-0.14.46.tar.gz 10200015 BLAKE2B 679b82af8ee5dad769ef01b77d0d3545d953ec2f2889faa129c433863094f431bf3e44a633109d944cbcaba6486a8b51257557eddfc20a2fb3f0cd8a77861b96 SHA512 ebf8491d1ac1dda90df35b8a9dafb808a9171d4a8083f0f24ac1c9b3aa8d2baac6cef61c5cd897a88c3fb93b114d79a31a341168859f091ed2cdef529321178c +EBUILD syncthing-0.14.38.ebuild 3604 BLAKE2B 60ab7ee9417858f5732a894a19786e66aa875d68d2ae699dba844f0efd8c0db9addd91f88b21c3e54930fc55a14d3545ea65af1c2ed43b26fa1158bfe918f6a8 SHA512 7188b18639c97775e1aad68f8a8aa1e41e95e10855f491bee61aa5898599b34d7cc0c23ea7c585d2a30dcbf1e4f16a7b08b9a5f1fa55064b6e36bb7f35cb73be EBUILD syncthing-0.14.40.ebuild 3607 BLAKE2B 0527e7cdb4c79bc6149c030248189d15ed2f2e5349204278f6a83cd35c261ecef866b8c2613d5f7381a118aab939fcb4c5682f82cf4c0b90eda07300fd9e362b SHA512 054d1d9ba8f0a9a74cf0f2211012ba206068a00b8d750df6a9d12d591ce5e9b558cf4fa03a9376e016a2c08fe37b3678f6c54f2e086a8556a0168a83e31bb90a EBUILD syncthing-0.14.44.ebuild 3607 BLAKE2B 505dd788fd96503f0952acf33ae38d1343e781573bb987110bc5ec16112b4c6735ff132e72b67123d970b843448f4498853e3e8362d7530049efa51b6888ba35 SHA512 bf28b811f3e126914f60ea9632449fee4db627db7a7054d80d949d47732a1981015bd40c46a198d3904cf5003e463acac6ebc697b6af3d9691aec67f9e6842b7 +EBUILD syncthing-0.14.46.ebuild 3607 BLAKE2B 505dd788fd96503f0952acf33ae38d1343e781573bb987110bc5ec16112b4c6735ff132e72b67123d970b843448f4498853e3e8362d7530049efa51b6888ba35 SHA512 bf28b811f3e126914f60ea9632449fee4db627db7a7054d80d949d47732a1981015bd40c46a198d3904cf5003e463acac6ebc697b6af3d9691aec67f9e6842b7 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238 diff --git a/net-p2p/syncthing/syncthing-0.14.38.ebuild b/net-p2p/syncthing/syncthing-0.14.38.ebuild index 81547999f097..ca236b559e8e 100644 --- a/net-p2p/syncthing/syncthing-0.14.38.ebuild +++ b/net-p2p/syncthing/syncthing-0.14.38.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="amd64 ~arm x86" +KEYWORDS="amd64 arm x86" IUSE="selinux tools" RDEPEND="selinux? ( sec-policy/selinux-syncthing )" diff --git a/net-p2p/syncthing/syncthing-0.14.46.ebuild b/net-p2p/syncthing/syncthing-0.14.46.ebuild new file mode 100644 index 000000000000..00190a582b6b --- /dev/null +++ b/net-p2p/syncthing/syncthing-0.14.46.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 +} -- cgit v1.2.3