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 32FFA1382C5 for ; Mon, 15 Feb 2021 10:05:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D009E07A5; Mon, 15 Feb 2021 10:05:30 +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 3087AE07A5 for ; Mon, 15 Feb 2021 10:05:30 +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 B48B0340DBB for ; Mon, 15 Feb 2021 10:05:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F403B478 for ; Mon, 15 Feb 2021 10:05:25 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1613383364.94db90ffa11c41f1c73288402a6bcc51e6021757.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sshguard/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/sshguard/sshguard-2.4.1-r1.ebuild app-admin/sshguard/sshguard-99999.ebuild X-VCS-Directories: app-admin/sshguard/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 94db90ffa11c41f1c73288402a6bcc51e6021757 X-VCS-Branch: master Date: Mon, 15 Feb 2021 10:05:25 +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: 788bae4a-c696-4f1d-9edf-3290af7534d5 X-Archives-Hash: 7e8d05cd5fce629e6fe8b10263bde55e commit: 94db90ffa11c41f1c73288402a6bcc51e6021757 Author: Yixun Lan gentoo org> AuthorDate: Mon Feb 15 10:01:57 2021 +0000 Commit: Yixun Lan gentoo org> CommitDate: Mon Feb 15 10:02:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94db90ff app-admin/sshguard: fix live ebuild merge live version into sole one Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Yixun Lan gentoo.org> app-admin/sshguard/sshguard-2.4.1-r1.ebuild | 14 +++++++++++--- app-admin/sshguard/sshguard-99999.ebuild | 23 +++++++++++++++++------ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/app-admin/sshguard/sshguard-2.4.1-r1.ebuild b/app-admin/sshguard/sshguard-2.4.1-r1.ebuild index 7def7a05797..ee4653a215e 100644 --- a/app-admin/sshguard/sshguard-2.4.1-r1.ebuild +++ b/app-admin/sshguard/sshguard-2.4.1-r1.ebuild @@ -3,14 +3,20 @@ EAPI=7 -inherit systemd +inherit autotools systemd DESCRIPTION="protects hosts from brute force attacks against ssh" HOMEPAGE="https://www.sshguard.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +if [[ "${PV}" == 99999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}" +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" DEPEND=" sys-devel/flex @@ -25,6 +31,7 @@ DOCS=( examples/net.sshguard.plist examples/whitelistfile.example ) + PATCHES=( "${FILESDIR}"/${PN}-2.4.1-conf.patch ) @@ -34,6 +41,7 @@ src_prepare() { sed -i -e "/ExecStartPre/s:/usr/sbin:/sbin:g" \ -e "/ExecStart/s:/usr/local/sbin:/usr/sbin:g" \ "${S}"/examples/${PN}.service || die + eautoreconf } src_install() { diff --git a/app-admin/sshguard/sshguard-99999.ebuild b/app-admin/sshguard/sshguard-99999.ebuild index 0f9a63205b6..ee4653a215e 100644 --- a/app-admin/sshguard/sshguard-99999.ebuild +++ b/app-admin/sshguard/sshguard-99999.ebuild @@ -1,16 +1,22 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools git-r3 +inherit autotools systemd DESCRIPTION="protects hosts from brute force attacks against ssh" HOMEPAGE="https://www.sshguard.net/" -EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}" + +if [[ "${PV}" == 99999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}" +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi LICENSE="BSD" SLOT="0" -KEYWORDS="" DEPEND=" sys-devel/flex @@ -23,15 +29,18 @@ DOCS=( CONTRIBUTING.rst README.rst examples/net.sshguard.plist - examples/sshguard.service examples/whitelistfile.example ) + PATCHES=( - "${FILESDIR}"/${PN}-2.1.0-conf.patch + "${FILESDIR}"/${PN}-2.4.1-conf.patch ) src_prepare() { default + sed -i -e "/ExecStartPre/s:/usr/sbin:/sbin:g" \ + -e "/ExecStart/s:/usr/local/sbin:/usr/sbin:g" \ + "${S}"/examples/${PN}.service || die eautoreconf } @@ -43,4 +52,6 @@ src_install() { insinto /etc newins examples/sshguard.conf.sample sshguard.conf + + systemd_dounit "${S}"/examples/sshguard.service }