1 |
commit: a1ae7269862547d1620f703142bf47c2e33ba474 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 27 04:39:00 2017 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 27 04:39:36 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ae7269 |
7 |
|
8 |
net-firewall/shorewall: Cleanup old unused file. |
9 |
|
10 |
Closes: https://bugs.gentoo.org/638128 |
11 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
12 |
|
13 |
.../shorewall/files/shorewall6-lite.confd-r1 | 19 ---- |
14 |
.../shorewall/files/shorewall6-lite.initd-r1 | 92 ---------------- |
15 |
net-firewall/shorewall/files/shorewall6.confd-r1 | 19 ---- |
16 |
net-firewall/shorewall/files/shorewall6.initd-r1 | 117 --------------------- |
17 |
4 files changed, 247 deletions(-) |
18 |
|
19 |
diff --git a/net-firewall/shorewall/files/shorewall6-lite.confd-r1 b/net-firewall/shorewall/files/shorewall6-lite.confd-r1 |
20 |
deleted file mode 100644 |
21 |
index daef3054274..00000000000 |
22 |
--- a/net-firewall/shorewall/files/shorewall6-lite.confd-r1 |
23 |
+++ /dev/null |
24 |
@@ -1,19 +0,0 @@ |
25 |
-# Global start/restart/stop options |
26 |
-# |
27 |
-OPTIONS="-tvv" |
28 |
- |
29 |
-# Start options |
30 |
-# |
31 |
-STARTOPTIONS="" |
32 |
- |
33 |
-# Stop options |
34 |
-# |
35 |
-STOPOPTIONS="" |
36 |
- |
37 |
-# Reload options |
38 |
-# |
39 |
-RELOADOPTIONS="" |
40 |
- |
41 |
-# Restart options |
42 |
-# |
43 |
-RESTARTOPTIONS="" |
44 |
|
45 |
diff --git a/net-firewall/shorewall/files/shorewall6-lite.initd-r1 b/net-firewall/shorewall/files/shorewall6-lite.initd-r1 |
46 |
deleted file mode 100644 |
47 |
index 9db79c33451..00000000000 |
48 |
--- a/net-firewall/shorewall/files/shorewall6-lite.initd-r1 |
49 |
+++ /dev/null |
50 |
@@ -1,92 +0,0 @@ |
51 |
-#!/sbin/openrc-run |
52 |
-# Copyright 1999-2016 Gentoo Foundation |
53 |
-# Distributed under the terms of the GNU General Public License v2 |
54 |
- |
55 |
-description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is' |
56 |
-description="${description} a high-level tool for configuring Netfilter." |
57 |
- |
58 |
-extra_commands="clear" |
59 |
-extra_started_commands="reload reset" |
60 |
- |
61 |
-description_clear="Clear will remove all rules and chains installed by" |
62 |
-description_clear="${description_clear} Shorewall6 Lite. The firewall is" |
63 |
-description_clear="${description_clear} then wide open and unprotected." |
64 |
- |
65 |
-description_reload="Reload is similar to \"${RC_SERVICE} start\" except that it assumes" |
66 |
-description_reload="${description_reload} that the firewall is already started." |
67 |
-description_reload="${description_reload} Existing connections are maintained." |
68 |
- |
69 |
-description_reset="All the packet and byte counters in the firewall are reset." |
70 |
- |
71 |
-command="/usr/sbin/shorewall6-lite" |
72 |
- |
73 |
-depend() { |
74 |
- provide firewall |
75 |
- after ulogd |
76 |
-} |
77 |
- |
78 |
-status() { |
79 |
- local _retval |
80 |
- ${command} status 1>/dev/null |
81 |
- _retval=$? |
82 |
- if [ ${_retval} = '0' ]; then |
83 |
- einfo 'status: started' |
84 |
- mark_service_started "${SVCNAME}" |
85 |
- return 0 |
86 |
- else |
87 |
- einfo 'status: stopped' |
88 |
- mark_service_stopped "${SVCNAME}" |
89 |
- return 3 |
90 |
- fi |
91 |
-} |
92 |
- |
93 |
-start() { |
94 |
- ebegin "Starting shorewall6-lite" |
95 |
- ${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null |
96 |
- eend $? |
97 |
-} |
98 |
- |
99 |
-stop() { |
100 |
- ebegin "Stopping shorewall6-lite" |
101 |
- ${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null |
102 |
- eend $? |
103 |
-} |
104 |
- |
105 |
-restart() { |
106 |
- # shorewall comes with its own control script that includes a |
107 |
- # restart function, so refrain from calling svc_stop/svc_start |
108 |
- # here. Note that this comment is required to fix bug 55576; |
109 |
- # runscript.sh greps this script... (09 Jul 2004 agriffis) |
110 |
- |
111 |
- ebegin "Restarting shorewall6-lite" |
112 |
- ${command} status 1>/dev/null |
113 |
- if [ $? != 0 ] ; then |
114 |
- svc_start |
115 |
- else |
116 |
- ${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null |
117 |
- fi |
118 |
- eend $? |
119 |
-} |
120 |
- |
121 |
-clear() { |
122 |
- # clear will remove all the rules and bring the system to an unfirewalled |
123 |
- # state. (21 Nov 2004 eldad) |
124 |
- |
125 |
- ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT" |
126 |
- ${command} ${OPTIONS} clear 1>/dev/null |
127 |
- eend $? |
128 |
-} |
129 |
- |
130 |
-reload() { |
131 |
- ebegin "Reloading shorewall6-lite" |
132 |
- ${command} ${OPTIONS} reload ${RELOADOPTIONS} 1>/dev/null |
133 |
- eend $? |
134 |
-} |
135 |
- |
136 |
-reset() { |
137 |
- # reset the packet and byte counters in the firewall |
138 |
- |
139 |
- ebegin "Resetting the packet and byte counters in shorewall6-lite" |
140 |
- ${command} ${OPTIONS} reset 1>/dev/null |
141 |
- eend $? |
142 |
-} |
143 |
|
144 |
diff --git a/net-firewall/shorewall/files/shorewall6.confd-r1 b/net-firewall/shorewall/files/shorewall6.confd-r1 |
145 |
deleted file mode 100644 |
146 |
index daef3054274..00000000000 |
147 |
--- a/net-firewall/shorewall/files/shorewall6.confd-r1 |
148 |
+++ /dev/null |
149 |
@@ -1,19 +0,0 @@ |
150 |
-# Global start/restart/stop options |
151 |
-# |
152 |
-OPTIONS="-tvv" |
153 |
- |
154 |
-# Start options |
155 |
-# |
156 |
-STARTOPTIONS="" |
157 |
- |
158 |
-# Stop options |
159 |
-# |
160 |
-STOPOPTIONS="" |
161 |
- |
162 |
-# Reload options |
163 |
-# |
164 |
-RELOADOPTIONS="" |
165 |
- |
166 |
-# Restart options |
167 |
-# |
168 |
-RESTARTOPTIONS="" |
169 |
|
170 |
diff --git a/net-firewall/shorewall/files/shorewall6.initd-r1 b/net-firewall/shorewall/files/shorewall6.initd-r1 |
171 |
deleted file mode 100644 |
172 |
index 43a7d1b1f41..00000000000 |
173 |
--- a/net-firewall/shorewall/files/shorewall6.initd-r1 |
174 |
+++ /dev/null |
175 |
@@ -1,117 +0,0 @@ |
176 |
-#!/sbin/openrc-run |
177 |
-# Copyright 1999-2016 Gentoo Foundation |
178 |
-# Distributed under the terms of the GNU General Public License v2 |
179 |
- |
180 |
-description='The Shoreline Firewall 6, more commonly known as "Shorewall6", is' |
181 |
-description="${description} a high-level tool for configuring Netfilter." |
182 |
- |
183 |
-extra_commands="check clear" |
184 |
-extra_started_commands="refresh reload reset" |
185 |
- |
186 |
-description_check="Checks if the configuration will compile or not." |
187 |
- |
188 |
-description_clear="Clear will remove all rules and chains installed by" |
189 |
-description_clear="${description_clear} Shorewall6. The firewall is then" |
190 |
-description_clear="${description_clear} wide open and unprotected." |
191 |
- |
192 |
-description_refresh="The mangle table will be refreshed along with the" |
193 |
-description_refresh="${description_refresh} blacklist chain (if any)." |
194 |
- |
195 |
-description_reload="Reload is similar to \"${RC_SERVICE} start\" except that it assumes" |
196 |
-description_reload="${description_reload} that the firewall is already started." |
197 |
-description_reload="${description_reload} Existing connections are maintained." |
198 |
- |
199 |
-description_reset="All the packet and byte counters in the firewall are reset." |
200 |
- |
201 |
-command="/usr/sbin/shorewall6" |
202 |
- |
203 |
-depend() { |
204 |
- provide firewall |
205 |
- after ulogd |
206 |
-} |
207 |
- |
208 |
-status() { |
209 |
- local _retval |
210 |
- ${command} status 1>/dev/null |
211 |
- _retval=$? |
212 |
- if [ ${_retval} = '0' ]; then |
213 |
- einfo 'status: started' |
214 |
- mark_service_started "${SVCNAME}" |
215 |
- return 0 |
216 |
- else |
217 |
- einfo 'status: stopped' |
218 |
- mark_service_stopped "${SVCNAME}" |
219 |
- return 3 |
220 |
- fi |
221 |
-} |
222 |
- |
223 |
-start() { |
224 |
- ebegin "Starting shorewall6" |
225 |
- ${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null |
226 |
- eend $? |
227 |
-} |
228 |
- |
229 |
-stop() { |
230 |
- ebegin "Stopping shorewall6" |
231 |
- ${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null |
232 |
- eend $? |
233 |
-} |
234 |
- |
235 |
-restart() { |
236 |
- # shorewall comes with its own control script that includes a |
237 |
- # restart function, so refrain from calling svc_stop/svc_start |
238 |
- # here. Note that this comment is required to fix bug 55576; |
239 |
- # runscript.sh greps this script... (09 Jul 2004 agriffis) |
240 |
- |
241 |
- ebegin "Restarting shorewall6" |
242 |
- ${command} status 1>/dev/null |
243 |
- if [ $? != 0 ] ; then |
244 |
- svc_start |
245 |
- else |
246 |
- ${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null |
247 |
- fi |
248 |
- eend $? |
249 |
-} |
250 |
- |
251 |
-clear() { |
252 |
- # clear will remove all the rules and bring the system to an unfirewalled |
253 |
- # state. (21 Nov 2004 eldad) |
254 |
- |
255 |
- ebegin "Clearing all shorewall rules and setting policy to ACCEPT" |
256 |
- ${command} ${OPTIONS} clear 1>/dev/null |
257 |
- eend $? |
258 |
-} |
259 |
- |
260 |
-reload() { |
261 |
- ebegin "Reloading shorewall6" |
262 |
- ${command} ${OPTIONS} reload ${RELOADOPTIONS} 1>/dev/null |
263 |
- eend $? |
264 |
-} |
265 |
- |
266 |
-reset() { |
267 |
- # reset the packet and byte counters in the firewall |
268 |
- |
269 |
- ebegin "Resetting the packet and byte counters in shorewall6" |
270 |
- ${command} ${OPTIONS} reset 1>/dev/null |
271 |
- eend $? |
272 |
-} |
273 |
- |
274 |
-refresh() { |
275 |
- # refresh the rules involving the broadcast addresses of firewall |
276 |
- # interfaces, the black list, traffic control rules and |
277 |
- # ECN control rules |
278 |
- |
279 |
- ebegin "Refreshing shorewall6 rules" |
280 |
- ${command} ${OPTIONS} refresh 1>/dev/null |
281 |
- eend $? |
282 |
-} |
283 |
- |
284 |
-check() { |
285 |
- # perform cursory validation of the zones, interfaces, hosts, rules |
286 |
- # and policy files. CAUTION: does not parse and validate the generated |
287 |
- # iptables commands. |
288 |
- |
289 |
- ebegin "Checking shorewall6 configuration" |
290 |
- ${command} ${OPTIONS} check 1>/dev/null |
291 |
- eend $? |
292 |
-} |