public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-admin/bastille/
@ 2017-03-11 22:12 Andreas Hüttel
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2017-03-11 22:12 UTC (permalink / raw
  To: gentoo-commits

commit:     72df9869362ca9a00711427f648e1fc1e628a2ac
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 22:11:39 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 22:11:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72df9869

app-admin/bastille: Restore keywords

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 app-admin/bastille/bastille-3.0.9-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/bastille/bastille-3.0.9-r2.ebuild b/app-admin/bastille/bastille-3.0.9-r2.ebuild
index df56a06e45f..0e2b22c76c1 100644
--- a/app-admin/bastille/bastille-3.0.9-r2.ebuild
+++ b/app-admin/bastille/bastille-3.0.9-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 IUSE="X"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/bastille/
@ 2019-12-01 18:45 Aaron Bauman
  0 siblings, 0 replies; 5+ messages in thread
From: Aaron Bauman @ 2019-12-01 18:45 UTC (permalink / raw
  To: gentoo-commits

commit:     41a960aeff089c770dc4ad08060cab82517336dc
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun May 19 13:08:43 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> 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 <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12052
Signed-off-by: Aaron Bauman <bman <AT> 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"
 )


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/bastille/
@ 2020-09-26 14:33 Aaron Bauman
  0 siblings, 0 replies; 5+ messages in thread
From: Aaron Bauman @ 2020-09-26 14:33 UTC (permalink / raw
  To: gentoo-commits

commit:     f6da7e0c09c44461d43d2526bd242b52c67298fe
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 13:21:35 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 14:33:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6da7e0c

app-admin/bastille: drop old EAPI=5

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 app-admin/bastille/bastille-3.0.9-r1.ebuild | 69 -----------------------------
 1 file changed, 69 deletions(-)

diff --git a/app-admin/bastille/bastille-3.0.9-r1.ebuild b/app-admin/bastille/bastille-3.0.9-r1.ebuild
deleted file mode 100644
index 19860743e3f..00000000000
--- a/app-admin/bastille/bastille-3.0.9-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit eutils perl-module
-
-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.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="X"
-
-RDEPEND="
-	app-admin/logrotate
-	dev-perl/Curses
-	net-firewall/iptables
-	net-firewall/psad
-	virtual/logger
-	X? ( dev-perl/Tk )
-"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch
-
-	# make sure the Perl modules go into vendor dir
-	epatch "${FILESDIR}/${P}-perl.patch"
-	perl_set_version
-
-	cd "${S}" || die
-	chmod a+x Install.sh bastille-ipchains bastille-netfilter
-}
-
-src_install() {
-	perl_set_version
-	export VENDOR_LIB
-
-	cd "${S}" || die
-	DESTDIR="${D}" ./Install.sh
-
-	# Example configs
-	cd "${S}" || die
-	insinto /usr/share/Bastille
-	doins *.config
-
-	newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
-
-	# Documentation
-	cd "${S}" || die
-	dodoc *.txt BUGS Change* README*
-	cd "${S}"/docs || die
-	doman *.1m
-}
-
-pkg_postinst() {
-	elog "Please be aware that when using the Server Lax, Server Moderate, or"
-	elog "Server Paranoia configurations, you may need to use InteractiveBastille"
-	elog "to set any advanced network information, such as masquerading and"
-	elog "internal interfaces, if you plan to use them."
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/bastille/
@ 2022-07-05  0:16 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-07-05  0:16 UTC (permalink / raw
  To: gentoo-commits

commit:     8ac4a6ded4ffb18c7d2825d1aea99806f0066b5c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 00:15:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 00:15:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ac4a6de

app-admin/bastille: update EAPI 6 -> EAPI 8

Bug: https://bugs.gentoo.org/455542
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{bastille-3.0.9-r2.ebuild => bastille-3.0.9-r3.ebuild}  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app-admin/bastille/bastille-3.0.9-r2.ebuild b/app-admin/bastille/bastille-3.0.9-r3.ebuild
similarity index 89%
rename from app-admin/bastille/bastille-3.0.9-r2.ebuild
rename to app-admin/bastille/bastille-3.0.9-r3.ebuild
index ae6415282920..365b97b97bad 100644
--- a/app-admin/bastille/bastille-3.0.9-r2.ebuild
+++ b/app-admin/bastille/bastille-3.0.9-r3.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 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.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
+S="${WORKDIR}"/${MY_PN}
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -21,7 +21,7 @@ IUSE="X"
 
 RDEPEND="
 	app-admin/logrotate
-	dev-lang/perl:=
+	dev-lang/perl
 	dev-perl/Curses
 	net-firewall/iptables
 	net-firewall/psad
@@ -62,6 +62,11 @@ src_install() {
 
 	newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
 
+	# See bug #455542
+	keepdir /var/lock/subsys
+	keepdir /var/lock/bastille
+	keepdir /var/lock/subsys/bastille
+
 	# Documentation
 	cd "${S}" || die
 	dodoc *.txt BUGS Change* README*


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/bastille/
@ 2022-12-24  2:59 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-12-24  2:59 UTC (permalink / raw
  To: gentoo-commits

commit:     b9d2b81dfb5b4287eed14054d25037b9c332b057
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 02:52:36 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 02:59:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9d2b81d

app-admin/bastille: fix HttpsUrlAvailable

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/bastille/bastille-3.0.9-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/bastille/bastille-3.0.9-r3.ebuild b/app-admin/bastille/bastille-3.0.9-r3.ebuild
index 365b97b97bad..4a1ca299446d 100644
--- a/app-admin/bastille/bastille-3.0.9-r3.ebuild
+++ b/app-admin/bastille/bastille-3.0.9-r3.ebuild
@@ -9,7 +9,7 @@ PATCHVER=0.2
 MY_PN=${PN/b/B}
 MY_P=${MY_PN}-${PV}
 DESCRIPTION="Bastille-Linux is a security hardening tool"
-HOMEPAGE="http://bastille-linux.sourceforge.net/"
+HOMEPAGE="https://bastille-linux.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
 S="${WORKDIR}"/${MY_PN}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-12-24  2:59 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-26 14:33 [gentoo-commits] repo/gentoo:master commit in: app-admin/bastille/ Aaron Bauman
  -- strict thread matches above, loose matches on Subject: below --
2022-12-24  2:59 Sam James
2022-07-05  0:16 Sam James
2019-12-01 18:45 Aaron Bauman
2017-03-11 22:12 Andreas Hüttel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox