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 94823138334 for ; Sun, 1 Dec 2019 18:45:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D857AE0802; Sun, 1 Dec 2019 18:45:03 +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 AC488E0802 for ; Sun, 1 Dec 2019 18:45:03 +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 7BBC434D63C for ; Sun, 1 Dec 2019 18:45:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08D9A744 for ; Sun, 1 Dec 2019 18:45:01 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1575225882.41a960aeff089c770dc4ad08060cab82517336dc.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/bastille/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/bastille/bastille-3.0.9-r1.ebuild app-admin/bastille/bastille-3.0.9-r2.ebuild X-VCS-Directories: app-admin/bastille/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 41a960aeff089c770dc4ad08060cab82517336dc X-VCS-Branch: master Date: Sun, 1 Dec 2019 18:45:01 +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: 1f4b3858-a630-4294-9d82-524489787151 X-Archives-Hash: 7b32c4397fdb954f8964b2c1fb00b288 commit: 41a960aeff089c770dc4ad08060cab82517336dc Author: Michael Mair-Keimberger gmail com> AuthorDate: Sun May 19 13:08:43 2019 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Sun Dec 1 18:44:42 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41a960ae app-admin/bastille: fix HOMEPAGE and LICENSE, improve ebuilds Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12052 Signed-off-by: Aaron Bauman gentoo.org> app-admin/bastille/bastille-3.0.9-r1.ebuild | 18 +++++++++--------- app-admin/bastille/bastille-3.0.9-r2.ebuild | 13 +++++-------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/app-admin/bastille/bastille-3.0.9-r1.ebuild b/app-admin/bastille/bastille-3.0.9-r1.ebuild index 1088834fccd..19860743e3f 100644 --- a/app-admin/bastille/bastille-3.0.9-r1.ebuild +++ b/app-admin/bastille/bastille-3.0.9-r1.ebuild @@ -11,22 +11,22 @@ MY_PN=${PN/b/B} MY_P=${MY_PN}-${PV} S=${WORKDIR}/${MY_PN} DESCRIPTION="Bastille-Linux is a security hardening tool" -HOMEPAGE="http://bastille-linux.org/" +HOMEPAGE="http://bastille-linux.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2 mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" IUSE="X" RDEPEND=" - net-firewall/iptables app-admin/logrotate dev-perl/Curses + net-firewall/iptables net-firewall/psad - X? ( dev-perl/Tk ) virtual/logger + X? ( dev-perl/Tk ) " src_prepare() { @@ -36,7 +36,7 @@ src_prepare() { epatch "${FILESDIR}/${P}-perl.patch" perl_set_version - cd "${S}" + cd "${S}" || die chmod a+x Install.sh bastille-ipchains bastille-netfilter } @@ -44,20 +44,20 @@ src_install() { perl_set_version export VENDOR_LIB - cd "${S}" + cd "${S}" || die DESTDIR="${D}" ./Install.sh # Example configs - cd "${S}" + cd "${S}" || die insinto /usr/share/Bastille doins *.config newinitd ${PN}-firewall.gentoo-init ${PN}-firewall # Documentation - cd "${S}" + cd "${S}" || die dodoc *.txt BUGS Change* README* - cd "${S}"/docs + cd "${S}"/docs || die doman *.1m } diff --git a/app-admin/bastille/bastille-3.0.9-r2.ebuild b/app-admin/bastille/bastille-3.0.9-r2.ebuild index 01d5a028636..ae641528292 100644 --- a/app-admin/bastille/bastille-3.0.9-r2.ebuild +++ b/app-admin/bastille/bastille-3.0.9-r2.ebuild @@ -3,41 +3,38 @@ EAPI=6 -inherit eutils perl-functions +inherit perl-functions PATCHVER=0.2 MY_PN=${PN/b/B} MY_P=${MY_PN}-${PV} S=${WORKDIR}/${MY_PN} DESCRIPTION="Bastille-Linux is a security hardening tool" -HOMEPAGE="http://bastille-linux.org/" +HOMEPAGE="http://bastille-linux.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2 mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" IUSE="X" RDEPEND=" - net-firewall/iptables app-admin/logrotate dev-lang/perl:= dev-perl/Curses + net-firewall/iptables net-firewall/psad - X? ( dev-perl/Tk ) virtual/logger + X? ( dev-perl/Tk ) " PATCHES=( "${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch - # make sure the Perl modules go into vendor dir "${FILESDIR}/${P}-perl.patch" - # prevent file collision, bug 536292 "${FILESDIR}/${P}-renamewidgets.patch" - # openrc runscript rename "${FILESDIR}/${P}-openrc.patch" )