[gentoo-commits] repo/gentoo:master commit in: profiles/, app-admin/bastille/files/, app-admin/bastille/

[gentoo-commits] repo/gentoo:master commit in: profiles/, app-admin/bastille/files/, app-admin/bastille/

[David Seifert]

commit:     7af2cd5ba65642e43f8dbac890db6fef9566aac5
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 16:42:56 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 16:42:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af2cd5b

app-admin/bastille: treeclean

Closes: https://bugs.gentoo.org/455542
Closes: https://bugs.gentoo.org/892325
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-admin/bastille/Manifest                        |  2 -
 app-admin/bastille/bastille-3.0.9-r3.ebuild        | 82 ----------------------
 .../bastille/files/bastille-3.0.9-openrc.patch     | 12 ----
 app-admin/bastille/files/bastille-3.0.9-perl.patch | 25 -------
 .../files/bastille-3.0.9-renamewidgets.patch       | 48 -------------
 app-admin/bastille/metadata.xml                    | 11 ---
 profiles/package.mask                              |  8 ---
 7 files changed, 188 deletions(-)

diff --git a/app-admin/bastille/Manifest b/app-admin/bastille/Manifest
deleted file mode 100644
index 8883a28d189c..000000000000
--- a/app-admin/bastille/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Bastille-3.0.9.tar.bz2 319045 BLAKE2B 480288c6e9fc5462e8e6ca84665d5769aab4252813ff478ab0519d382e1f03994da008ac2818b1d4214a09607c7316711665bce154121b3029bace6f2822df09 SHA512 a97ab2c2bb64c655d43ddcfd4000cee8666787e5b5923390e3155b258c3a2cf7d131abd474f9b0dd415eb455b664ab26a875da6636268b2a715ea87dd4dae2f0
-DIST bastille-3.0.9-gentoo-0.2.patch.bz2 14117 BLAKE2B 9c4383eae9e27cc4e110553a21424cd2811172c32609b0d3bcc72ccc3f61ba7cd76bfdbee969de5a89c22d0c1dd91b9ba92ce27ea5ac2b7260e5c0e1ce424be5 SHA512 a4ecfc064d6cf8c12b6f53c81dea841931df270293b03c39266861121f3def28fcbc4127b3bc9374028983e584736fb85361443badaadec7441cfb1570bdea8f

diff --git a/app-admin/bastille/bastille-3.0.9-r3.ebuild b/app-admin/bastille/bastille-3.0.9-r3.ebuild
deleted file mode 100644
index 4a1ca299446d..000000000000
--- a/app-admin/bastille/bastille-3.0.9-r3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit perl-functions
-
-PATCHVER=0.2
-MY_PN=${PN/b/B}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Bastille-Linux is a security hardening tool"
-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}
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="X"
-
-RDEPEND="
-	app-admin/logrotate
-	dev-lang/perl
-	dev-perl/Curses
-	net-firewall/iptables
-	net-firewall/psad
-	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"
-)
-
-src_prepare() {
-	perl_set_version
-
-	default
-
-	cd "${S}" || die
-	chmod a+x Install.sh bastille-ipchains bastille-netfilter || die
-}
-
-src_install() {
-	perl_set_version
-	export VENDOR_LIB
-
-	cd "${S}" || die
-	DESTDIR="${D}" ./Install.sh || die
-
-	# Example configs
-	cd "${S}" || die
-	insinto /usr/share/Bastille
-	doins *.config
-
-	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*
-	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."
-}

diff --git a/app-admin/bastille/files/bastille-3.0.9-openrc.patch b/app-admin/bastille/files/bastille-3.0.9-openrc.patch
deleted file mode 100644
index 08d0a04fa480..000000000000
--- a/app-admin/bastille/files/bastille-3.0.9-openrc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN Bastille.orig/bastille-firewall.gentoo-init Bastille/bastille-firewall.gentoo-init
---- Bastille.orig/bastille-firewall.gentoo-init	2017-01-02 09:47:33.144433650 +0100
-+++ Bastille/bastille-firewall.gentoo-init	2017-01-02 09:49:05.396431757 +0100
-@@ -1,6 +1,6 @@
--#!/sbin/runscript
-+#!/sbin/openrc-run
- # Copyright 1999-2004 Gentoo Foundation
--# Distributed under the terms of the GNU General Public License v2         
-+# Distributed under the terms of the GNU General Public License v2
- # $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/files/bastille-3.0.2-firewall.init,v 1.1 2005/07/31 05:21:10 battousai Exp $
- 
- opts="start stop"

diff --git a/app-admin/bastille/files/bastille-3.0.9-perl.patch b/app-admin/bastille/files/bastille-3.0.9-perl.patch
deleted file mode 100644
index ab109093bc14..000000000000
--- a/app-admin/bastille/files/bastille-3.0.9-perl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ruN Bastille-gentoo-2/Install.sh Bastille/Install.sh
---- Bastille-gentoo-2/Install.sh	2014-12-09 23:05:55.674808824 +0100
-+++ Bastille/Install.sh	2014-12-09 23:17:25.907847419 +0100
-@@ -3,7 +3,7 @@
- umask 077
- 
- mkdir -p ${DESTDIR}/usr/sbin
--mkdir -p ${DESTDIR}/usr/lib/perl5/site_perl/Curses
-+mkdir -p ${DESTDIR}/${VENDOR_LIB}/Curses
- mkdir -p ${DESTDIR}/usr/lib/Bastille
- mkdir -p ${DESTDIR}/usr/share/Bastille
- mkdir -p ${DESTDIR}/usr/share/Bastille/OSMap
-@@ -13,9 +13,9 @@
-  
- cp AutomatedBastille ${DESTDIR}/usr/sbin/
- cp BastilleBackEnd ${DESTDIR}/usr/sbin
--cp Bastille_Curses.pm ${DESTDIR}/usr/lib/perl5/site_perl
--cp Bastille_Tk.pm ${DESTDIR}/usr/lib/perl5/site_perl
--cp Curses/Widgets.pm ${DESTDIR}/usr/lib/perl5/site_perl/Curses
-+cp Bastille_Curses.pm ${DESTDIR}/${VENDOR_LIB}
-+cp Bastille_Tk.pm ${DESTDIR}/${VENDOR_LIB}
-+cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses
- cp InteractiveBastille ${DESTDIR}/usr/sbin
- # Questions.txt has been replaced by Modules.txt and Questions/
- #cp Questions.txt ${DESTDIR}/usr/share/Bastille

diff --git a/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch b/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch
deleted file mode 100644
index 2cf303a548dc..000000000000
--- a/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ruN Bastille.orig/AutomatedBastille Bastille/AutomatedBastille
---- Bastille.orig/AutomatedBastille	2017-01-02 09:39:20.720443755 +0100
-+++ Bastille/AutomatedBastille	2017-01-02 09:40:54.293441835 +0100
-@@ -77,7 +77,7 @@
- 
- # Use the Curses interface
- use Curses;
--use Curses::Widgets;
-+use Curses::Widgets_Bastille;
- 
- # Hardcoded List of configurations -- to be replaced by list read from file
- @list = ("WorkstationLax","WorkstationModerate","WorkstationParanoia","ServerLax","ServerModerate","ServerParanoia","Quit");
-diff -ruN Bastille.orig/Bastille_Curses.pm Bastille/Bastille_Curses.pm
---- Bastille.orig/Bastille_Curses.pm	2005-04-18 14:32:10.000000000 +0200
-+++ Bastille/Bastille_Curses.pm	2017-01-02 09:41:24.470441216 +0100
-@@ -34,7 +34,7 @@
- sub do_Bastille {
- 
-     use Curses;
--    use Curses::Widgets;
-+    use Curses::Widgets_Bastille;
- 
-     # Number_Modules is the number of modules loaded in by Load_Questions
-     $Number_Modules=0;
-diff -ruN Bastille.orig/Curses/Widgets.pm Bastille/Curses/Widgets.pm
---- Bastille.orig/Curses/Widgets.pm	2005-04-06 01:18:11.000000000 +0200
-+++ Bastille/Curses/Widgets.pm	2017-01-02 09:42:31.145439848 +0100
-@@ -11,7 +11,7 @@
- #
- ########################################################################
- 
--package Curses::Widgets;
-+package Curses::Widgets_Bastille;
- 
- use strict;
- use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
-diff -ruN Bastille.orig/Install.sh Bastille/Install.sh
---- Bastille.orig/Install.sh	2017-01-02 09:39:20.767443754 +0100
-+++ Bastille/Install.sh	2017-01-02 09:41:05.537441604 +0100
-@@ -15,7 +15,7 @@
- cp BastilleBackEnd ${DESTDIR}/usr/sbin
- cp Bastille_Curses.pm ${DESTDIR}/${VENDOR_LIB}
- cp Bastille_Tk.pm ${DESTDIR}/${VENDOR_LIB}
--cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses
-+cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses/Widgets_Bastille.pm
- cp InteractiveBastille ${DESTDIR}/usr/sbin
- # Questions.txt has been replaced by Modules.txt and Questions/
- #cp Questions.txt ${DESTDIR}/usr/share/Bastille

diff --git a/app-admin/bastille/metadata.xml b/app-admin/bastille/metadata.xml
deleted file mode 100644
index 9a5255cbfb46..000000000000
--- a/app-admin/bastille/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>hardened@gentoo.org</email>
-		<name>Gentoo Hardened</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">bastille-linux</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 6bb92fcbd22d..cd19eb45cb84 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -288,14 +288,6 @@ acct-group/jabber
 # Commands trigger an assertion and crashes, bug #892487
 =sys-fs/lvm2-2.03.18
 
-# Mike Gilbert <floppym@gentoo.org> (2023-01-28)
-# No upstream releases since 2008.
-# No Gentoo maintainer since 2009.
-# Installs files in the wrong places (bug #455542)
-# and with the wrong mode (bug #892325).
-# Removal on 2023-02-27.
-app-admin/bastille
-
 # Florian Schmaus <flow@gentoo.org> (2023-01-27)
 # Previous dependencies of dev-lang/clojure, now part of the clojure
 # ebuild and no longer needed.