| 1 |
commit: 41a960aeff089c770dc4ad08060cab82517336dc |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun May 19 13:08:43 2019 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 1 18:44:42 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41a960ae |
| 7 |
|
| 8 |
app-admin/bastille: fix HOMEPAGE and LICENSE, improve ebuilds |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/12052 |
| 12 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
| 13 |
|
| 14 |
app-admin/bastille/bastille-3.0.9-r1.ebuild | 18 +++++++++--------- |
| 15 |
app-admin/bastille/bastille-3.0.9-r2.ebuild | 13 +++++-------- |
| 16 |
2 files changed, 14 insertions(+), 17 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-admin/bastille/bastille-3.0.9-r1.ebuild b/app-admin/bastille/bastille-3.0.9-r1.ebuild |
| 19 |
index 1088834fccd..19860743e3f 100644 |
| 20 |
--- a/app-admin/bastille/bastille-3.0.9-r1.ebuild |
| 21 |
+++ b/app-admin/bastille/bastille-3.0.9-r1.ebuild |
| 22 |
@@ -11,22 +11,22 @@ MY_PN=${PN/b/B} |
| 23 |
MY_P=${MY_PN}-${PV} |
| 24 |
S=${WORKDIR}/${MY_PN} |
| 25 |
DESCRIPTION="Bastille-Linux is a security hardening tool" |
| 26 |
-HOMEPAGE="http://bastille-linux.org/" |
| 27 |
+HOMEPAGE="http://bastille-linux.sourceforge.net/" |
| 28 |
SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2 |
| 29 |
mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2" |
| 30 |
|
| 31 |
-LICENSE="GPL-2" |
| 32 |
+LICENSE="GPL-2+" |
| 33 |
SLOT="0" |
| 34 |
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" |
| 35 |
IUSE="X" |
| 36 |
|
| 37 |
RDEPEND=" |
| 38 |
- net-firewall/iptables |
| 39 |
app-admin/logrotate |
| 40 |
dev-perl/Curses |
| 41 |
+ net-firewall/iptables |
| 42 |
net-firewall/psad |
| 43 |
- X? ( dev-perl/Tk ) |
| 44 |
virtual/logger |
| 45 |
+ X? ( dev-perl/Tk ) |
| 46 |
" |
| 47 |
|
| 48 |
src_prepare() { |
| 49 |
@@ -36,7 +36,7 @@ src_prepare() { |
| 50 |
epatch "${FILESDIR}/${P}-perl.patch" |
| 51 |
perl_set_version |
| 52 |
|
| 53 |
- cd "${S}" |
| 54 |
+ cd "${S}" || die |
| 55 |
chmod a+x Install.sh bastille-ipchains bastille-netfilter |
| 56 |
} |
| 57 |
|
| 58 |
@@ -44,20 +44,20 @@ src_install() { |
| 59 |
perl_set_version |
| 60 |
export VENDOR_LIB |
| 61 |
|
| 62 |
- cd "${S}" |
| 63 |
+ cd "${S}" || die |
| 64 |
DESTDIR="${D}" ./Install.sh |
| 65 |
|
| 66 |
# Example configs |
| 67 |
- cd "${S}" |
| 68 |
+ cd "${S}" || die |
| 69 |
insinto /usr/share/Bastille |
| 70 |
doins *.config |
| 71 |
|
| 72 |
newinitd ${PN}-firewall.gentoo-init ${PN}-firewall |
| 73 |
|
| 74 |
# Documentation |
| 75 |
- cd "${S}" |
| 76 |
+ cd "${S}" || die |
| 77 |
dodoc *.txt BUGS Change* README* |
| 78 |
- cd "${S}"/docs |
| 79 |
+ cd "${S}"/docs || die |
| 80 |
doman *.1m |
| 81 |
} |
| 82 |
|
| 83 |
|
| 84 |
diff --git a/app-admin/bastille/bastille-3.0.9-r2.ebuild b/app-admin/bastille/bastille-3.0.9-r2.ebuild |
| 85 |
index 01d5a028636..ae641528292 100644 |
| 86 |
--- a/app-admin/bastille/bastille-3.0.9-r2.ebuild |
| 87 |
+++ b/app-admin/bastille/bastille-3.0.9-r2.ebuild |
| 88 |
@@ -3,41 +3,38 @@ |
| 89 |
|
| 90 |
EAPI=6 |
| 91 |
|
| 92 |
-inherit eutils perl-functions |
| 93 |
+inherit perl-functions |
| 94 |
|
| 95 |
PATCHVER=0.2 |
| 96 |
MY_PN=${PN/b/B} |
| 97 |
MY_P=${MY_PN}-${PV} |
| 98 |
S=${WORKDIR}/${MY_PN} |
| 99 |
DESCRIPTION="Bastille-Linux is a security hardening tool" |
| 100 |
-HOMEPAGE="http://bastille-linux.org/" |
| 101 |
+HOMEPAGE="http://bastille-linux.sourceforge.net/" |
| 102 |
SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2 |
| 103 |
mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2" |
| 104 |
|
| 105 |
-LICENSE="GPL-2" |
| 106 |
+LICENSE="GPL-2+" |
| 107 |
SLOT="0" |
| 108 |
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" |
| 109 |
IUSE="X" |
| 110 |
|
| 111 |
RDEPEND=" |
| 112 |
- net-firewall/iptables |
| 113 |
app-admin/logrotate |
| 114 |
dev-lang/perl:= |
| 115 |
dev-perl/Curses |
| 116 |
+ net-firewall/iptables |
| 117 |
net-firewall/psad |
| 118 |
- X? ( dev-perl/Tk ) |
| 119 |
virtual/logger |
| 120 |
+ X? ( dev-perl/Tk ) |
| 121 |
" |
| 122 |
|
| 123 |
PATCHES=( |
| 124 |
"${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch |
| 125 |
- |
| 126 |
# make sure the Perl modules go into vendor dir |
| 127 |
"${FILESDIR}/${P}-perl.patch" |
| 128 |
- |
| 129 |
# prevent file collision, bug 536292 |
| 130 |
"${FILESDIR}/${P}-renamewidgets.patch" |
| 131 |
- |
| 132 |
# openrc runscript rename |
| 133 |
"${FILESDIR}/${P}-openrc.patch" |
| 134 |
) |
Archives