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 B9E06138334 for ; Wed, 1 May 2019 19:18:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC336E08DB; Wed, 1 May 2019 19:18:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 9F01FE08DB for ; Wed, 1 May 2019 19:18:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 220A13431B7 for ; Wed, 1 May 2019 19:18:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C1DC57F for ; Wed, 1 May 2019 19:18:20 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1556738277.3eb912727e8848d9e3060d3502282c0ffee6abe4.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/endlessh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/endlessh/endlessh-9999.ebuild X-VCS-Directories: net-misc/endlessh/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 3eb912727e8848d9e3060d3502282c0ffee6abe4 X-VCS-Branch: master Date: Wed, 1 May 2019 19:18:20 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3d734a62-18e0-4e8f-b73d-adb4501397dc X-Archives-Hash: 875ab687ecd52e59be7ab7aab430c518 commit: 3eb912727e8848d9e3060d3502282c0ffee6abe4 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed May 1 19:17:57 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Wed May 1 19:17:57 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb91272 net-misc/endlessh: sync live ebuild Bug: https://bugs.gentoo.org/684848 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> net-misc/endlessh/endlessh-9999.ebuild | 40 +++++++++++++++------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/net-misc/endlessh/endlessh-9999.ebuild b/net-misc/endlessh/endlessh-9999.ebuild index 105c786b101..e0a840877f3 100644 --- a/net-misc/endlessh/endlessh-9999.ebuild +++ b/net-misc/endlessh/endlessh-9999.ebuild @@ -3,9 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_6 ) - -inherit python-single-r1 systemd toolchain-funcs +inherit systemd toolchain-funcs DESCRIPTION="SSH tarpit that slowly sends and endless banner" HOMEPAGE="https://github.com/skeeto/endlessh" @@ -20,25 +18,12 @@ fi LICENSE="Unlicense" SLOT="0" -IUSE="tools" -REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )" +IUSE="" DEPEND="" - -RDEPEND="${DEPEND} - tools? ( - ${PYTHON_DEPS} - dev-db/sqlite - dev-python/pyrfc3339[${PYTHON_USEDEP}] - ) -" - +RDEPEND="" BDEPEND="" -pkg_setup() { - use tools && python-single-r1_pkg_setup -} - src_prepare() { default @@ -49,6 +34,7 @@ src_prepare() { -e 's/^CFLAGS =/CFLAGS +=/' \ -e 's/ -Os//' \ -e 's/^LDFLAGS/LDFLAGS?/' \ + -e 's/^PREFIX/PREFIX?/' \ Makefile || die sed -i -e "/^ExecStart=/ s:=/opt/endlessh:=${EPREFIX}/usr/bin:" \ @@ -56,15 +42,23 @@ src_prepare() { } src_install() { - dobin endlessh + emake DESTDIR="${D}" PREFIX=/usr install - newinitd "${FILESDIR}"/endlessh.initd endlessh - newconfd "${FILESDIR}"/endlessh.confd endlessh + einstalldocs + + newinitd "${FILESDIR}"/endlessh.initd-r1 endlessh + newconfd "${FILESDIR}"/endlessh.confd-r1 endlessh systemd_dounit util/endlessh.service insinto /etc/logrotate.d - newins "${FILESDIR}/logrotated" endlessh + newins "${FILESDIR}/logrotated-r1" endlessh - einstalldocs + insinto /usr/share/"${PN}" + doins util/{pivot.py,schema.sql} +} + +pkg_postinst() { + elog "Log parsing script installed to ${EPREFIX}/usr/share/${PN}" + elog "Install dev-python/pyrfc3339 if you are going to use it" }