gentoo resync : 23.03.2018

5 files changed, 120 insertions, 3 deletions

diff --git a/sys-cluster/teleport/Manifest b/sys-cluster/teleport/Manifest
index 92be594190b9..561a80ec6769 100644
--- a/sys-cluster/teleport/Manifest
+++ b/sys-cluster/teleport/Manifest
@@ -1,11 +1,15 @@
+AUX teleport-2.5.init.d 940 BLAKE2B a3b5fd197e6d8e173903aac6e9db4a684a986ab7d52227d40128ec16457990e78bc8345153b3c87558d3073b6acc7337050f4d21aa9f41acde8334aae8fc1c3e SHA512 9dd26daa519e9fef30b25ef5af505b8b35d8566eaa02f0ec47a6f7805227e94eb25ffb8fd007b73e7c3a91f9e783d47391c55dd8d659d683770aa9d5a02df923
+AUX teleport-2.5.service 310 BLAKE2B 410a8ca2e1273a0b9ef1ad93f4ff21f71ecedc979e52eb4f7e1b807b5434fba2b88bd1e0a5544ac68489d6e0db641cda4d76e606bed9cc96527156088b9b088b SHA512 72a43cce5f16bbed63e3b25917d3a4d63641b735acf63975c13c3cd2624c7971f40dc697d1da0d9b94b54e675e051d0a4e863696f7ebcea14f1c4b86e9e1218b
 AUX teleport.conf.d 442 BLAKE2B 089128fa5d277f5b7cda5d054a079c4cfd7990b503df2ac6818c83f79ea73b7ded2abf7eed2a66cd32394483e5494502355837e03883085db8afd92e537bfb47 SHA512 e50e3d0030e467afcfaf42c8f56ba1c0397e3dc6a445981b3f1533d7a0a9e550aabdc8bff394a5b01e44d3445b1981e2e955ea38b079386f675df8a37d7d20de
 AUX teleport.init.d 763 BLAKE2B b57826ab86550da58590546d484c78c05744699363de770e55dbb494d41f545f26f373a32959d8a67b9f04bd03e43192b4fe8b325f17fae3f4cb9149c7dbef8d SHA512 ea8803c27ed1b89615183ed17b6772726c4cc2f976bc008d6752a5d10a814e381baccd7c6cc354120b3707f351f1cc6592a9f55f6aff2010946eca9f17566f46
 AUX teleport.service 209 BLAKE2B ee1f8561ec543a9571cccd5449a276bfdb581db2bccf5f47151159670a9588fc655dcecde69fa951c9a8fb5243033a56b656663bbec94753d5f4925fecd3a3a8 SHA512 c71665c287575b1e127fdf5c580552aeb17bff55627d537999964be3a86ba2b11dce9d46bf10ab8e909c65a9d94263ced590191b7ea9e5ee2f0c3f65a044816e
 AUX teleport.service.conf 90 BLAKE2B 7f12f281d73ac6573c882a7910e400f901ff6392e0c576e4b7076972f4ced046f709c8898766aaf38cc38fbfcf450b526d3045ff859eed2a48e19dbd92ec3131 SHA512 d17faa0deaf3c864e5159d3567e542e36d09c6ea0ac91c663d3ae9729d1bccf7d2139f1f48fec132eccc473e023ffdaed0b8f2ee75db5dedc6ff36f637f68e1c
 AUX teleport.yaml 5177 BLAKE2B 8280b9924497af772574faad5d01351d9c49dd1916dca8e3e0384579e7628b2c0b1833b72882231bfef4ae11b2fa9820a4785393ea8c9d00aef105263bbf5c15 SHA512 f9f854472d469d0822d5766517cc68364feca4f3345a69d616d073aaaf9af7be6f72aa55c7d0c801426c3fef42714c09b884e0e086a58a07208ebef0ffe3ca80
-DIST teleport-2.4.0.tar.gz 9967298 BLAKE2B 26cb5610701c4c7deba0ba36b02f43928f4582cd81449045f58281b06a570eb5df762d21e5fef8f7f461855af3ac766fbafd1d2238b6916f9aaaaf07e20b7353 SHA512 4ed3a38fea4ba5acd52aa44cbc36d2bb1cda1fcb304d7787754b1165eefa3d1c8da65e76bf5c33a3f524ecf43b50145f2e850c927b35f2ec754ed90ed507c54d
 DIST teleport-2.4.2.tar.gz 9975909 BLAKE2B 68916e1d15f49448e918b39b2a760f90eca292b07f61e51cfe125eb99c6b36d95a528cfec40b62cd61893ce81edbf5f26066eb59063214369402e2a62d07bd5e SHA512 f9c2f923e05c8fa0b82708955c944e1bd35da2e6bf8b673832e76c91b918a4bc6d6666797faf0f7572cfaa7341991ef8937cd9b374cdc273271aff45f96b2960
-EBUILD teleport-2.4.0.ebuild 1219 BLAKE2B 08b15391673d1fb70c7bbd3897a55bab447bb9eb0f2de0550bdc8d0ee2e533c1f0c9c0b0636e4401cff6c915a0df6c116c921ad7a71652a49e14c93168a61b1c SHA512 0fef7d62e254ac354c32ce125b3ede4b747216e1e324651ad92718cf6569b7d713d79ae5652a4a17a03795d84a274e6b3948a31b69cd9cf911918500d6315fcd
+DIST teleport-2.4.5.tar.gz 9975753 BLAKE2B cdb6e577cd565cf6760d73c92cac674571e9b1257d23b280bd96428cca4e7c593738a925d3632a80fed3e0868c5f3aac79800db19bbf2a2b92d495600bf014cc SHA512 15e7e3c52c058625eb525c7c9cda00186eba037edbed89d21fb090b87c05570a1636f328260d4c7445253b0f5b81f321ce0da7d2b7fc316a0a9938ed22cc6c9c
+DIST teleport-2.5.2.tar.gz 16211219 BLAKE2B 28d0d1bb8d01fba39e79a262744b69a9df27438b9dbb0a25cd23acd57b6004a7f2309e432c0db4188c2e023a0b0299fd64723acfd57c1328d2345bba08fff4a9 SHA512 58fad4015824b9077bbd13cc3c6a994e5a54ed367264477854da7b129eea04c4cba44a580650a259b01f390a9f2028d7501df2ac4ab4821d085bbfe1cd887ec5
 EBUILD teleport-2.4.2.ebuild 1219 BLAKE2B 08b15391673d1fb70c7bbd3897a55bab447bb9eb0f2de0550bdc8d0ee2e533c1f0c9c0b0636e4401cff6c915a0df6c116c921ad7a71652a49e14c93168a61b1c SHA512 0fef7d62e254ac354c32ce125b3ede4b747216e1e324651ad92718cf6569b7d713d79ae5652a4a17a03795d84a274e6b3948a31b69cd9cf911918500d6315fcd
+EBUILD teleport-2.4.5.ebuild 1301 BLAKE2B ef05c9c03c79593dc3e8f220ed7f2286a579b6f4e34178497a3cb3df1763d07d5a735b8a42cac2dca54861ce5ba70d6274b8f10c45d419e316daa5b82d47b7a0 SHA512 68c288276ceb06e4b282625c27eb3a078212d8f04f55805ada66b03175f4bcf3cdbd6814ac11f81f57870781b1f87ca48b74bc7245e60ad05993e55cf25f9df6
+EBUILD teleport-2.5.2.ebuild 1324 BLAKE2B 3a9dc6602f98680351cf2d22883f50963112f4593eb6e06b189017c51894c121ef5ffd2a3370e253de2994a5052716985c00f10b95474d24a7a616e3a4b9fbb8 SHA512 1bca06688e5abb025e04e815ceefb0d210d07c6d0764f34e323eb92447773695fd28e70989cbf9dc09031115ce90d36b5b9cc525323e8eab27aa6f81a592e22a
 EBUILD teleport-9999.ebuild 1460 BLAKE2B 8ae106a5bdf26e8b8ffe36f83719a10d7ed3e10e875ba735eedd26d09141b3a016cd5f5dacd37657db6f9c399486038a5a5f1f02ceeb507fdf29159e331ac90e SHA512 74ff9bb734b5b47ad2ac475413af8721c818293eb8166bc99887f75f3e9fa4b8e66e5abeb6fcbf58bb8a4f63db34f010d85471b1a5a7cd1c28c70e43019fa2cd
 MISC metadata.xml 630 BLAKE2B ad22bb63ecf79ddd45b62fe0dcadd6d0d7fd475938b18ec868b56b0f4afe7ee5d3e0908eb0b13249a7c7b5031a3296bec406fea6fb487069a087c9e29dcf0ef2 SHA512 2aa911f2a91bfdea340b38715d69cbe59bcd460d34ac6d1d641f2badf2ba72f4e02cdd2f8a2ca387c9a9d19ea2c22e2be80ab4bb582d9395c1517b818f343c74
diff --git a/sys-cluster/teleport/files/teleport-2.5.init.d b/sys-cluster/teleport/files/teleport-2.5.init.d
new file mode 100644
index 000000000000..a951ec5318a0
--- /dev/null
+++ b/sys-cluster/teleport/files/teleport-2.5.init.d
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${TELEPORT_CONFDIR:=/etc/teleport}
+: ${TELEPORT_PIDFILE:=/var/run/${SVCNAME}.pid}
+: ${TELEPORT_BINARY:=/usr/bin/teleport}
+: ${TELEPORT_LOGFILE:=/var/log/teleport.log}
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting Teleport SSH Service"
+		start-stop-daemon --start --exec /usr/bin/teleport \
+		--background --make-pidfile --pidfile "${TELEPORT_PIDFILE}" \
+		--stderr "${TELEPORT_LOGFILE}" \
+		-- start --config="${TELEPORT_CONFDIR}/teleport.yaml" \
+		${TELEPORT_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Teleport SSH Service"
+		start-stop-daemon --stop --exec /usr/bin/teleport \
+		--pidfile "${TELEPORT_PIDFILE}"
+	eend $?
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP \
+	    --exec "${TELEPORT_BINARY}" --pidfile "${TELEPORT_PIDFILE}"
+	eend $?
+}
diff --git a/sys-cluster/teleport/files/teleport-2.5.service b/sys-cluster/teleport/files/teleport-2.5.service
new file mode 100644
index 000000000000..37b38210aff4
--- /dev/null
+++ b/sys-cluster/teleport/files/teleport-2.5.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Teleport SSH Service
+After=network.target
+
+[Service]
+Type=simple
+Restart=on-failure
+ExecStart=/usr/bin/teleport start --config=/etc/teleport/teleport.yaml --pid-file=/var/run/teleport.pid
+ExecReload=/bin/kill -HUP $MAINPID
+PIDFile=/var/run/teleport.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-cluster/teleport/teleport-2.4.0.ebuild b/sys-cluster/teleport/teleport-2.4.5.ebuild
index dc7173e18dc7..7592c615c45a 100644
--- a/sys-cluster/teleport/teleport-2.4.0.ebuild
+++ b/sys-cluster/teleport/teleport-2.4.5.ebuild
@@ -25,9 +25,15 @@ SLOT="0"
 
 DEPEND="
 	app-arch/zip
-	>=dev-lang/go-1.8.3"
+	>=dev-lang/go-1.9.2"
 RDEPEND=""
 
+src_prepare() {
+	default
+
+	sed -i -e 's/-j 4/-j 1/g' src/${EGO_PN%/*}/Makefile
+}
+
 src_compile() {
 	GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full
 }
diff --git a/sys-cluster/teleport/teleport-2.5.2.ebuild b/sys-cluster/teleport/teleport-2.5.2.ebuild
new file mode 100644
index 000000000000..4b4aeb53e588
--- /dev/null
+++ b/sys-cluster/teleport/teleport-2.5.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils golang-build systemd user
+
+DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
+HOMEPAGE="https://gravitational.com/teleport"
+
+EGO_PN="github.com/gravitational/${PN}/..."
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 golang-vcs
+	EGIT_REPO_URI="https://github.com/gravitational/${PN}.git"
+else
+	inherit golang-vcs-snapshot
+	SRC_URI="https://github.com/gravitational/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+IUSE=""
+LICENSE="Apache-2.0"
+RESTRICT="test strip"
+SLOT="0"
+
+DEPEND="
+	app-arch/zip
+	>=dev-lang/go-1.9.2"
+RDEPEND=""
+
+src_prepare() {
+	default
+
+	sed -i -e 's/-j 3/-j 1/g' src/${EGO_PN%/*}/Makefile
+}
+
+src_compile() {
+	GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full
+}
+
+src_install() {
+	keepdir /var/lib/${PN} /etc/${PN}
+	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
+
+	insinto /etc/${PN}
+	doins "${FILESDIR}"/${PN}.yaml
+
+	newinitd "${FILESDIR}"/${PN}-2.5.init.d ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+
+	systemd_newunit "${FILESDIR}"/${PN}-2.5.service ${PN}.service
+	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
+}
+
+src_test() {
+	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} test
+}