1 |
commit: 7af2cd5ba65642e43f8dbac890db6fef9566aac5 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 18 16:42:56 2023 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 18 16:42:56 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af2cd5b |
7 |
|
8 |
app-admin/bastille: treeclean |
9 |
|
10 |
Closes: https://bugs.gentoo.org/455542 |
11 |
Closes: https://bugs.gentoo.org/892325 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
app-admin/bastille/Manifest | 2 - |
15 |
app-admin/bastille/bastille-3.0.9-r3.ebuild | 82 ---------------------- |
16 |
.../bastille/files/bastille-3.0.9-openrc.patch | 12 ---- |
17 |
app-admin/bastille/files/bastille-3.0.9-perl.patch | 25 ------- |
18 |
.../files/bastille-3.0.9-renamewidgets.patch | 48 ------------- |
19 |
app-admin/bastille/metadata.xml | 11 --- |
20 |
profiles/package.mask | 8 --- |
21 |
7 files changed, 188 deletions(-) |
22 |
|
23 |
diff --git a/app-admin/bastille/Manifest b/app-admin/bastille/Manifest |
24 |
deleted file mode 100644 |
25 |
index 8883a28d189c..000000000000 |
26 |
--- a/app-admin/bastille/Manifest |
27 |
+++ /dev/null |
28 |
@@ -1,2 +0,0 @@ |
29 |
-DIST Bastille-3.0.9.tar.bz2 319045 BLAKE2B 480288c6e9fc5462e8e6ca84665d5769aab4252813ff478ab0519d382e1f03994da008ac2818b1d4214a09607c7316711665bce154121b3029bace6f2822df09 SHA512 a97ab2c2bb64c655d43ddcfd4000cee8666787e5b5923390e3155b258c3a2cf7d131abd474f9b0dd415eb455b664ab26a875da6636268b2a715ea87dd4dae2f0 |
30 |
-DIST bastille-3.0.9-gentoo-0.2.patch.bz2 14117 BLAKE2B 9c4383eae9e27cc4e110553a21424cd2811172c32609b0d3bcc72ccc3f61ba7cd76bfdbee969de5a89c22d0c1dd91b9ba92ce27ea5ac2b7260e5c0e1ce424be5 SHA512 a4ecfc064d6cf8c12b6f53c81dea841931df270293b03c39266861121f3def28fcbc4127b3bc9374028983e584736fb85361443badaadec7441cfb1570bdea8f |
31 |
|
32 |
diff --git a/app-admin/bastille/bastille-3.0.9-r3.ebuild b/app-admin/bastille/bastille-3.0.9-r3.ebuild |
33 |
deleted file mode 100644 |
34 |
index 4a1ca299446d..000000000000 |
35 |
--- a/app-admin/bastille/bastille-3.0.9-r3.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,82 +0,0 @@ |
38 |
-# Copyright 1999-2022 Gentoo Authors |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
- |
41 |
-EAPI=8 |
42 |
- |
43 |
-inherit perl-functions |
44 |
- |
45 |
-PATCHVER=0.2 |
46 |
-MY_PN=${PN/b/B} |
47 |
-MY_P=${MY_PN}-${PV} |
48 |
-DESCRIPTION="Bastille-Linux is a security hardening tool" |
49 |
-HOMEPAGE="https://bastille-linux.sourceforge.net/" |
50 |
-SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2 |
51 |
- mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2" |
52 |
-S="${WORKDIR}"/${MY_PN} |
53 |
- |
54 |
-LICENSE="GPL-2+" |
55 |
-SLOT="0" |
56 |
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" |
57 |
-IUSE="X" |
58 |
- |
59 |
-RDEPEND=" |
60 |
- app-admin/logrotate |
61 |
- dev-lang/perl |
62 |
- dev-perl/Curses |
63 |
- net-firewall/iptables |
64 |
- net-firewall/psad |
65 |
- virtual/logger |
66 |
- X? ( dev-perl/Tk ) |
67 |
-" |
68 |
- |
69 |
-PATCHES=( |
70 |
- "${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch |
71 |
- # make sure the Perl modules go into vendor dir |
72 |
- "${FILESDIR}/${P}-perl.patch" |
73 |
- # prevent file collision, bug 536292 |
74 |
- "${FILESDIR}/${P}-renamewidgets.patch" |
75 |
- # openrc runscript rename |
76 |
- "${FILESDIR}/${P}-openrc.patch" |
77 |
-) |
78 |
- |
79 |
-src_prepare() { |
80 |
- perl_set_version |
81 |
- |
82 |
- default |
83 |
- |
84 |
- cd "${S}" || die |
85 |
- chmod a+x Install.sh bastille-ipchains bastille-netfilter || die |
86 |
-} |
87 |
- |
88 |
-src_install() { |
89 |
- perl_set_version |
90 |
- export VENDOR_LIB |
91 |
- |
92 |
- cd "${S}" || die |
93 |
- DESTDIR="${D}" ./Install.sh || die |
94 |
- |
95 |
- # Example configs |
96 |
- cd "${S}" || die |
97 |
- insinto /usr/share/Bastille |
98 |
- doins *.config |
99 |
- |
100 |
- newinitd ${PN}-firewall.gentoo-init ${PN}-firewall |
101 |
- |
102 |
- # See bug #455542 |
103 |
- keepdir /var/lock/subsys |
104 |
- keepdir /var/lock/bastille |
105 |
- keepdir /var/lock/subsys/bastille |
106 |
- |
107 |
- # Documentation |
108 |
- cd "${S}" || die |
109 |
- dodoc *.txt BUGS Change* README* |
110 |
- cd "${S}"/docs || die |
111 |
- doman *.1m |
112 |
-} |
113 |
- |
114 |
-pkg_postinst() { |
115 |
- elog "Please be aware that when using the Server Lax, Server Moderate, or" |
116 |
- elog "Server Paranoia configurations, you may need to use InteractiveBastille" |
117 |
- elog "to set any advanced network information, such as masquerading and" |
118 |
- elog "internal interfaces, if you plan to use them." |
119 |
-} |
120 |
|
121 |
diff --git a/app-admin/bastille/files/bastille-3.0.9-openrc.patch b/app-admin/bastille/files/bastille-3.0.9-openrc.patch |
122 |
deleted file mode 100644 |
123 |
index 08d0a04fa480..000000000000 |
124 |
--- a/app-admin/bastille/files/bastille-3.0.9-openrc.patch |
125 |
+++ /dev/null |
126 |
@@ -1,12 +0,0 @@ |
127 |
-diff -ruN Bastille.orig/bastille-firewall.gentoo-init Bastille/bastille-firewall.gentoo-init |
128 |
---- Bastille.orig/bastille-firewall.gentoo-init 2017-01-02 09:47:33.144433650 +0100 |
129 |
-+++ Bastille/bastille-firewall.gentoo-init 2017-01-02 09:49:05.396431757 +0100 |
130 |
-@@ -1,6 +1,6 @@ |
131 |
--#!/sbin/runscript |
132 |
-+#!/sbin/openrc-run |
133 |
- # Copyright 1999-2004 Gentoo Foundation |
134 |
--# Distributed under the terms of the GNU General Public License v2 |
135 |
-+# Distributed under the terms of the GNU General Public License v2 |
136 |
- # $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 $ |
137 |
- |
138 |
- opts="start stop" |
139 |
|
140 |
diff --git a/app-admin/bastille/files/bastille-3.0.9-perl.patch b/app-admin/bastille/files/bastille-3.0.9-perl.patch |
141 |
deleted file mode 100644 |
142 |
index ab109093bc14..000000000000 |
143 |
--- a/app-admin/bastille/files/bastille-3.0.9-perl.patch |
144 |
+++ /dev/null |
145 |
@@ -1,25 +0,0 @@ |
146 |
-diff -ruN Bastille-gentoo-2/Install.sh Bastille/Install.sh |
147 |
---- Bastille-gentoo-2/Install.sh 2014-12-09 23:05:55.674808824 +0100 |
148 |
-+++ Bastille/Install.sh 2014-12-09 23:17:25.907847419 +0100 |
149 |
-@@ -3,7 +3,7 @@ |
150 |
- umask 077 |
151 |
- |
152 |
- mkdir -p ${DESTDIR}/usr/sbin |
153 |
--mkdir -p ${DESTDIR}/usr/lib/perl5/site_perl/Curses |
154 |
-+mkdir -p ${DESTDIR}/${VENDOR_LIB}/Curses |
155 |
- mkdir -p ${DESTDIR}/usr/lib/Bastille |
156 |
- mkdir -p ${DESTDIR}/usr/share/Bastille |
157 |
- mkdir -p ${DESTDIR}/usr/share/Bastille/OSMap |
158 |
-@@ -13,9 +13,9 @@ |
159 |
- |
160 |
- cp AutomatedBastille ${DESTDIR}/usr/sbin/ |
161 |
- cp BastilleBackEnd ${DESTDIR}/usr/sbin |
162 |
--cp Bastille_Curses.pm ${DESTDIR}/usr/lib/perl5/site_perl |
163 |
--cp Bastille_Tk.pm ${DESTDIR}/usr/lib/perl5/site_perl |
164 |
--cp Curses/Widgets.pm ${DESTDIR}/usr/lib/perl5/site_perl/Curses |
165 |
-+cp Bastille_Curses.pm ${DESTDIR}/${VENDOR_LIB} |
166 |
-+cp Bastille_Tk.pm ${DESTDIR}/${VENDOR_LIB} |
167 |
-+cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses |
168 |
- cp InteractiveBastille ${DESTDIR}/usr/sbin |
169 |
- # Questions.txt has been replaced by Modules.txt and Questions/ |
170 |
- #cp Questions.txt ${DESTDIR}/usr/share/Bastille |
171 |
|
172 |
diff --git a/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch b/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch |
173 |
deleted file mode 100644 |
174 |
index 2cf303a548dc..000000000000 |
175 |
--- a/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch |
176 |
+++ /dev/null |
177 |
@@ -1,48 +0,0 @@ |
178 |
-diff -ruN Bastille.orig/AutomatedBastille Bastille/AutomatedBastille |
179 |
---- Bastille.orig/AutomatedBastille 2017-01-02 09:39:20.720443755 +0100 |
180 |
-+++ Bastille/AutomatedBastille 2017-01-02 09:40:54.293441835 +0100 |
181 |
-@@ -77,7 +77,7 @@ |
182 |
- |
183 |
- # Use the Curses interface |
184 |
- use Curses; |
185 |
--use Curses::Widgets; |
186 |
-+use Curses::Widgets_Bastille; |
187 |
- |
188 |
- # Hardcoded List of configurations -- to be replaced by list read from file |
189 |
- @list = ("WorkstationLax","WorkstationModerate","WorkstationParanoia","ServerLax","ServerModerate","ServerParanoia","Quit"); |
190 |
-diff -ruN Bastille.orig/Bastille_Curses.pm Bastille/Bastille_Curses.pm |
191 |
---- Bastille.orig/Bastille_Curses.pm 2005-04-18 14:32:10.000000000 +0200 |
192 |
-+++ Bastille/Bastille_Curses.pm 2017-01-02 09:41:24.470441216 +0100 |
193 |
-@@ -34,7 +34,7 @@ |
194 |
- sub do_Bastille { |
195 |
- |
196 |
- use Curses; |
197 |
-- use Curses::Widgets; |
198 |
-+ use Curses::Widgets_Bastille; |
199 |
- |
200 |
- # Number_Modules is the number of modules loaded in by Load_Questions |
201 |
- $Number_Modules=0; |
202 |
-diff -ruN Bastille.orig/Curses/Widgets.pm Bastille/Curses/Widgets.pm |
203 |
---- Bastille.orig/Curses/Widgets.pm 2005-04-06 01:18:11.000000000 +0200 |
204 |
-+++ Bastille/Curses/Widgets.pm 2017-01-02 09:42:31.145439848 +0100 |
205 |
-@@ -11,7 +11,7 @@ |
206 |
- # |
207 |
- ######################################################################## |
208 |
- |
209 |
--package Curses::Widgets; |
210 |
-+package Curses::Widgets_Bastille; |
211 |
- |
212 |
- use strict; |
213 |
- use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION); |
214 |
-diff -ruN Bastille.orig/Install.sh Bastille/Install.sh |
215 |
---- Bastille.orig/Install.sh 2017-01-02 09:39:20.767443754 +0100 |
216 |
-+++ Bastille/Install.sh 2017-01-02 09:41:05.537441604 +0100 |
217 |
-@@ -15,7 +15,7 @@ |
218 |
- cp BastilleBackEnd ${DESTDIR}/usr/sbin |
219 |
- cp Bastille_Curses.pm ${DESTDIR}/${VENDOR_LIB} |
220 |
- cp Bastille_Tk.pm ${DESTDIR}/${VENDOR_LIB} |
221 |
--cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses |
222 |
-+cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses/Widgets_Bastille.pm |
223 |
- cp InteractiveBastille ${DESTDIR}/usr/sbin |
224 |
- # Questions.txt has been replaced by Modules.txt and Questions/ |
225 |
- #cp Questions.txt ${DESTDIR}/usr/share/Bastille |
226 |
|
227 |
diff --git a/app-admin/bastille/metadata.xml b/app-admin/bastille/metadata.xml |
228 |
deleted file mode 100644 |
229 |
index 9a5255cbfb46..000000000000 |
230 |
--- a/app-admin/bastille/metadata.xml |
231 |
+++ /dev/null |
232 |
@@ -1,11 +0,0 @@ |
233 |
-<?xml version="1.0" encoding="UTF-8"?> |
234 |
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
235 |
-<pkgmetadata> |
236 |
- <maintainer type="project"> |
237 |
- <email>hardened@g.o</email> |
238 |
- <name>Gentoo Hardened</name> |
239 |
- </maintainer> |
240 |
- <upstream> |
241 |
- <remote-id type="sourceforge">bastille-linux</remote-id> |
242 |
- </upstream> |
243 |
-</pkgmetadata> |
244 |
|
245 |
diff --git a/profiles/package.mask b/profiles/package.mask |
246 |
index 6bb92fcbd22d..cd19eb45cb84 100644 |
247 |
--- a/profiles/package.mask |
248 |
+++ b/profiles/package.mask |
249 |
@@ -288,14 +288,6 @@ acct-group/jabber |
250 |
# Commands trigger an assertion and crashes, bug #892487 |
251 |
=sys-fs/lvm2-2.03.18 |
252 |
|
253 |
-# Mike Gilbert <floppym@g.o> (2023-01-28) |
254 |
-# No upstream releases since 2008. |
255 |
-# No Gentoo maintainer since 2009. |
256 |
-# Installs files in the wrong places (bug #455542) |
257 |
-# and with the wrong mode (bug #892325). |
258 |
-# Removal on 2023-02-27. |
259 |
-app-admin/bastille |
260 |
- |
261 |
# Florian Schmaus <flow@g.o> (2023-01-27) |
262 |
# Previous dependencies of dev-lang/clojure, now part of the clojure |
263 |
# ebuild and no longer needed. |