1 |
commit: c1f9b251bc260e8c7c794fb1ac34aa29285b46d6 |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Feb 10 17:02:18 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 11 20:14:38 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f9b251 |
7 |
|
8 |
sys-freebsd/freebsd-usbin: remove unused patch/files |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/3903 |
11 |
|
12 |
.../files/freebsd-usbin-9.0-libarchive.patch | 12 ---- |
13 |
sys-freebsd/freebsd-usbin/files/moused.confd | 20 ------ |
14 |
sys-freebsd/freebsd-usbin/files/moused.initd | 66 ------------------ |
15 |
sys-freebsd/freebsd-usbin/files/nfsmount.initd | 63 ----------------- |
16 |
sys-freebsd/freebsd-usbin/files/powerd.confd | 14 ---- |
17 |
sys-freebsd/freebsd-usbin/files/powerd.initd | 27 -------- |
18 |
sys-freebsd/freebsd-usbin/files/rarpd.confd | 7 -- |
19 |
sys-freebsd/freebsd-usbin/files/rarpd.initd | 35 ---------- |
20 |
sys-freebsd/freebsd-usbin/files/rpcbind.initd | 30 --------- |
21 |
sys-freebsd/freebsd-usbin/files/syscons.confd | 14 ---- |
22 |
sys-freebsd/freebsd-usbin/files/syscons.initd | 78 ---------------------- |
23 |
sys-freebsd/freebsd-usbin/files/syslogd.initd | 25 ------- |
24 |
12 files changed, 391 deletions(-) |
25 |
|
26 |
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch |
27 |
deleted file mode 100644 |
28 |
index bfe4794470..0000000000 |
29 |
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch |
30 |
+++ /dev/null |
31 |
@@ -1,12 +0,0 @@ |
32 |
---- usr.sbin/bsdinstall/distextract/distextract.c.old 2011-11-02 20:28:08.000000000 +0000 |
33 |
-+++ usr.sbin/bsdinstall/distextract/distextract.c 2011-11-02 20:28:57.000000000 +0000 |
34 |
-@@ -32,6 +32,9 @@ |
35 |
- #include <limits.h> |
36 |
- #include <archive.h> |
37 |
- #include <dialog.h> |
38 |
-+#ifndef archive_read_free |
39 |
-+#define archive_read_free(x) archive_read_finish(x) |
40 |
-+#endif |
41 |
- |
42 |
- static int extract_files(int nfiles, const char **files); |
43 |
- |
44 |
|
45 |
diff --git a/sys-freebsd/freebsd-usbin/files/moused.confd b/sys-freebsd/freebsd-usbin/files/moused.confd |
46 |
deleted file mode 100644 |
47 |
index 4d64933683..0000000000 |
48 |
--- a/sys-freebsd/freebsd-usbin/files/moused.confd |
49 |
+++ /dev/null |
50 |
@@ -1,20 +0,0 @@ |
51 |
-# $Id$ |
52 |
- |
53 |
-# See the moused man page for available settings. |
54 |
- |
55 |
-# Set to your mouse device psm[0-9] for PS/2 ports, ums[0-9] for USB ports |
56 |
-# Leave blank to try to autodetect it |
57 |
-MOUSED_DEVICE="" |
58 |
- |
59 |
-# Any additional flags requires |
60 |
-MOUSED_FLAGS="" |
61 |
- |
62 |
-# If 0xd0-0xd3 default range is occupied in your language code table, specify |
63 |
-# alternative range start like MOUSECHAR_START="3", see vidcontrol(1) |
64 |
-MOUSECHAR_START="" |
65 |
- |
66 |
-# You can also multiplex the init script for each device like so |
67 |
-# ln -s moused /etc/init.d/moused.ums0 |
68 |
-# This enables you to have a config file per mouse (forces MOUSED_DEVICE |
69 |
-# to ums0 in this case) and control each mouse. |
70 |
-# devd can also start and stop these mice, which laptop users will find handy. |
71 |
|
72 |
diff --git a/sys-freebsd/freebsd-usbin/files/moused.initd b/sys-freebsd/freebsd-usbin/files/moused.initd |
73 |
deleted file mode 100644 |
74 |
index d7ca8e0fcf..0000000000 |
75 |
--- a/sys-freebsd/freebsd-usbin/files/moused.initd |
76 |
+++ /dev/null |
77 |
@@ -1,66 +0,0 @@ |
78 |
-#!/sbin/openrc-run |
79 |
-# Copyright 1999-2005 Gentoo Foundation |
80 |
-# Distributed under the terms of the GNU General Public License v2 |
81 |
-# $Id$ |
82 |
- |
83 |
-MOUSED_NAME=${SVCNAME##*.} |
84 |
-if [ -n "${MOUSED_NAME}" ] && [ ${MOUSED_NAME} != "moused" ] ; then |
85 |
- MOUSED_DEVICE=/dev/"${MOUSED_NAME}" |
86 |
- MOUSED_PIDFILE=/var/run/moused-"${MOUSED_NAME}".pid |
87 |
-else |
88 |
- MOUSED_NAME= |
89 |
- MOUSED_PIDFILE=/var/run/moused.pid |
90 |
-fi |
91 |
- |
92 |
-depend() { |
93 |
- need localmount |
94 |
-} |
95 |
- |
96 |
-start() { |
97 |
- ebegin "Starting the Console Mouse Daemon" "${MOUSED_NAME}" |
98 |
- |
99 |
- if [ -z ${MOUSED_DEVICE} ] ; then |
100 |
- for x in /dev/psm[0-9]* /dev/ums[0-9]* ; do |
101 |
- if [ -e "${x}" ] && \ |
102 |
- [ ! -e /var/run/moused-$(basename "${x}").pid ] ; then |
103 |
- MOUSED_DEVICE=${x} |
104 |
- eindent |
105 |
- einfo "Using mouse on ${MOUSED_DEVICE}" |
106 |
- eoutdent |
107 |
- break |
108 |
- fi |
109 |
- done |
110 |
- fi |
111 |
- |
112 |
- if [ -z "${MOUSED_DEVICE}" ] ; then |
113 |
- eend 1 "No device specified in" "/etc/conf.d/${SVCNAME}" \ |
114 |
- "and no mouse detected" |
115 |
- return 1 |
116 |
- fi |
117 |
- |
118 |
- local opts="${MOUSED_FLAGS} -p ${MOUSED_DEVICE}" |
119 |
- start-stop-daemon --start --quiet --exec /usr/sbin/moused \ |
120 |
- --pidfile "${MOUSED_PIDFILE}" \ |
121 |
- -- ${opts} -I "${MOUSED_PIDFILE}" |
122 |
- local retval=$? |
123 |
- |
124 |
- [ -n "${MOUSE_CHAR_START}" ] && MOUSE_CHAR_START="-M ${MOUSE_CHAR_START}" |
125 |
- local ttyv= |
126 |
- for ttyv in /dev/ttyv* ; do |
127 |
- vidcontrol < "${ttyv}" ${MOUSE_CHAR_START} -m on || retval=1 |
128 |
- done |
129 |
- |
130 |
- eend ${retval} "Failed to start moused" |
131 |
-} |
132 |
- |
133 |
-stop() { |
134 |
- ebegin "Stopping the Console Mouse Daemon" "${MOUSED_NAME}" |
135 |
- # Don't specify the binary as >1 instance of moused may be running |
136 |
- # which is perfectly valid as we can be multiplexed. |
137 |
- start-stop-daemon --stop --exec /usr/sbin/moused \ |
138 |
- --pidfile "${MOUSED_PIDFILE}" |
139 |
- eend $? "Failed to stop moused" |
140 |
-} |
141 |
- |
142 |
-# vim: set ts=4 : |
143 |
- |
144 |
|
145 |
diff --git a/sys-freebsd/freebsd-usbin/files/nfsmount.initd b/sys-freebsd/freebsd-usbin/files/nfsmount.initd |
146 |
deleted file mode 100644 |
147 |
index 2fb49010a8..0000000000 |
148 |
--- a/sys-freebsd/freebsd-usbin/files/nfsmount.initd |
149 |
+++ /dev/null |
150 |
@@ -1,63 +0,0 @@ |
151 |
-#!/sbin/openrc-run |
152 |
-# Copyright 1999-2004 Gentoo Foundation |
153 |
-# Distributed under the terms of the GNU General Public License v2 |
154 |
-# $Id$ |
155 |
- |
156 |
-depend() { |
157 |
- need net rpcbind |
158 |
- use ypbind |
159 |
-} |
160 |
- |
161 |
-start_statd() { |
162 |
- # Don't start rpc.statd if already started by init.d/nfs |
163 |
- killall -0 rpc.statd 2>/dev/null && return 0 |
164 |
- ebegin "Starting NFS statd" |
165 |
- rpc.statd |
166 |
- eend $? "Error starting NFS statd" |
167 |
-} |
168 |
- |
169 |
-stop_statd() { |
170 |
- # Don't stop rpc.statd if it's in use by init.d/nfs |
171 |
- killall -0 nfsd 2>/dev/null && return 0 |
172 |
- # Make sure it's actually running |
173 |
- killall -0 rpc.statd 2>/dev/null || return 0 |
174 |
- # Okay, all tests passed, stop rpc.statd |
175 |
- ebegin "Stopping NFS statd" |
176 |
- killall rpc.statd |
177 |
- eend $? "Error stopping NFS statd" |
178 |
-} |
179 |
- |
180 |
-start_lockd() { |
181 |
- # Don't start rpc.lockd if already started by init.d/nfs |
182 |
- killall -0 rpc.lockd 2>/dev/null && return 0 |
183 |
- ebegin "Starting NFS lockd" |
184 |
- rpc.lockd |
185 |
- eend $? "Error starting NFS lockd" |
186 |
-} |
187 |
- |
188 |
-stop_lockd() { |
189 |
- # Don't stop rpc.lockd if it's in use by init.d/nfs |
190 |
- killall -0 nfsd 2>/dev/null && return 0 |
191 |
- # Make sure it's actually running |
192 |
- killall -0 rpc.lockd 2>/dev/null || return 0 |
193 |
- # Okay, all tests passed, stop rpc.lockd |
194 |
- ebegin "Stopping NFS lockd" |
195 |
- killall rpc.lockd |
196 |
- eend $? "Error stopping NFS lockd" |
197 |
-} |
198 |
- |
199 |
-start() { |
200 |
- start_statd |
201 |
- start_lockd |
202 |
- ebegin "Mounting NFS filesystems" |
203 |
- mount -a -t nfs |
204 |
- eend $? "Error mounting NFS filesystems" |
205 |
-} |
206 |
- |
207 |
-stop() { |
208 |
- ebegin "Unmounting NFS filesystems" |
209 |
- umount -a -t nfs |
210 |
- eend $? "Error unmounting NFS filesystems" |
211 |
- stop_statd |
212 |
- stop_lockd |
213 |
-} |
214 |
|
215 |
diff --git a/sys-freebsd/freebsd-usbin/files/powerd.confd b/sys-freebsd/freebsd-usbin/files/powerd.confd |
216 |
deleted file mode 100644 |
217 |
index e5db5a1a34..0000000000 |
218 |
--- a/sys-freebsd/freebsd-usbin/files/powerd.confd |
219 |
+++ /dev/null |
220 |
@@ -1,14 +0,0 @@ |
221 |
-# Copyright 2006 Gentoo Foundation |
222 |
-# Distributed under the terms of the GNU General Public License v2 |
223 |
-# $Id$ |
224 |
- |
225 |
-# Mode allowed: maximum, minimum, adaptive |
226 |
-# Default unless specified is adaptive |
227 |
- |
228 |
-AC_MODE="maximum" |
229 |
- |
230 |
-#BATTERY_MODE="minimum" |
231 |
- |
232 |
-POWERD_OPTS="" |
233 |
- |
234 |
- |
235 |
|
236 |
diff --git a/sys-freebsd/freebsd-usbin/files/powerd.initd b/sys-freebsd/freebsd-usbin/files/powerd.initd |
237 |
deleted file mode 100644 |
238 |
index ff79f6391c..0000000000 |
239 |
--- a/sys-freebsd/freebsd-usbin/files/powerd.initd |
240 |
+++ /dev/null |
241 |
@@ -1,27 +0,0 @@ |
242 |
-#!/sbin/openrc-run |
243 |
-# Copyright 2006 Gentoo Foundation |
244 |
-# Distributed under the terms of the GNU General Public License v2 |
245 |
-# $Id$ |
246 |
- |
247 |
-depend() { |
248 |
- need localmount |
249 |
-} |
250 |
- |
251 |
-start() { |
252 |
- local args= |
253 |
- [ -n "${BATTERY_MODE}" ] && args="${args} -b ${BATTERY_MODE}" |
254 |
- [ -n "${AC_MODE}" ] && args="${args} -a ${AC_MODE}" |
255 |
- |
256 |
- ebegin "Starting Power Control Daemon" |
257 |
- start-stop-daemon --start --exec /usr/sbin/powerd \ |
258 |
- --pidfile /var/run/powerd.pid \ |
259 |
- -- ${args} ${POWERD_OPTS} |
260 |
- eend $? "Failed to start powerd" |
261 |
-} |
262 |
- |
263 |
-stop() { |
264 |
- ebegin "Stopping Power Control Daemon" |
265 |
- start-stop-daemon --stop --exec /usr/sbin/powerd \ |
266 |
- --pidfile /var/run/powerd.pid |
267 |
- eend $? "Failed to stop powerd" |
268 |
-} |
269 |
|
270 |
diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.confd b/sys-freebsd/freebsd-usbin/files/rarpd.confd |
271 |
deleted file mode 100644 |
272 |
index b56fdd51c8..0000000000 |
273 |
--- a/sys-freebsd/freebsd-usbin/files/rarpd.confd |
274 |
+++ /dev/null |
275 |
@@ -1,7 +0,0 @@ |
276 |
-# $Id$ |
277 |
- |
278 |
-# Configuration file for /etc/init.d/rarpd |
279 |
- |
280 |
-# To start rarpd only for a given interface, set the |
281 |
-# following variable |
282 |
-# RARPD_ONLY_INTERFACE="rl0" |
283 |
|
284 |
diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.initd b/sys-freebsd/freebsd-usbin/files/rarpd.initd |
285 |
deleted file mode 100644 |
286 |
index 3c2a3ffe41..0000000000 |
287 |
--- a/sys-freebsd/freebsd-usbin/files/rarpd.initd |
288 |
+++ /dev/null |
289 |
@@ -1,35 +0,0 @@ |
290 |
-#!/sbin/openrc-run |
291 |
-# Copyright 2006 Gentoo Foundation |
292 |
-# Distributed under the terms of the GNU General Public License v2 |
293 |
-# $Id$ |
294 |
- |
295 |
-depend() { |
296 |
- if [ -z "${RARPD_ONLY_INTERFACE}" ]; then |
297 |
- need net |
298 |
- else |
299 |
- need net."${RARPD_ONLY_INTERFACE}" |
300 |
- fi |
301 |
-} |
302 |
- |
303 |
-start() { |
304 |
- local rarpd_opts |
305 |
- |
306 |
- if [ -z "${RARPD_ONLY_INTERFACE}" ]; then |
307 |
- rarpd_opts="${rarpd_opts} -a" |
308 |
- else |
309 |
- rarpd_opts="${rarpd_opts} ${RARPD_ONLY_INTERFACE}" |
310 |
- fi |
311 |
- |
312 |
- ebegin "Starting reverse ARP daemon" |
313 |
- start-stop-daemon --start --background \ |
314 |
- --pidfile /var/run/rarpd.pid --make-pidfile \ |
315 |
- --exec /usr/sbin/rarpd -- -f ${rarpd_opts} |
316 |
- eend $? |
317 |
-} |
318 |
- |
319 |
-stop() { |
320 |
- ebegin "Stopping reverse ARP daemon" |
321 |
- start-stop-daemon --stop --pidfile /var/run/rarpd.pid \ |
322 |
- --exec /usr/sbin/rarpd -- ${rarpd_opts} |
323 |
- eend $? |
324 |
-} |
325 |
|
326 |
diff --git a/sys-freebsd/freebsd-usbin/files/rpcbind.initd b/sys-freebsd/freebsd-usbin/files/rpcbind.initd |
327 |
deleted file mode 100644 |
328 |
index 1ff98a5ef5..0000000000 |
329 |
--- a/sys-freebsd/freebsd-usbin/files/rpcbind.initd |
330 |
+++ /dev/null |
331 |
@@ -1,30 +0,0 @@ |
332 |
-#!/sbin/openrc-run |
333 |
-# Copyright 1999-2005 Gentoo Foundation |
334 |
-# Distributed under the terms of the GNU General Public License v2 |
335 |
-# $Id$ |
336 |
- |
337 |
-depend() { |
338 |
- need localmount |
339 |
- use net |
340 |
- before inetd |
341 |
- before xinetd |
342 |
-} |
343 |
- |
344 |
-start() { |
345 |
- ebegin "Starting rpcbind" |
346 |
- start-stop-daemon --start --exec /usr/sbin/rpcbind |
347 |
- local ret=$? |
348 |
- eend ${ret} |
349 |
- |
350 |
- # without, if a service depending on portmap is started too fast, |
351 |
- # connecting to portmap will fail -- azarah |
352 |
- # doing that for rpcbind, too -- flameeyes |
353 |
- sleep 1 |
354 |
- return ${ret} |
355 |
-} |
356 |
- |
357 |
-stop() { |
358 |
- ebegin "Stopping rpcbind" |
359 |
- start-stop-daemon --stop --exec /usr/sbin/rpcbind |
360 |
- eend $? |
361 |
-} |
362 |
|
363 |
diff --git a/sys-freebsd/freebsd-usbin/files/syscons.confd b/sys-freebsd/freebsd-usbin/files/syscons.confd |
364 |
deleted file mode 100644 |
365 |
index 7ba81ff47a..0000000000 |
366 |
--- a/sys-freebsd/freebsd-usbin/files/syscons.confd |
367 |
+++ /dev/null |
368 |
@@ -1,14 +0,0 @@ |
369 |
-# $Id$ |
370 |
-# Example syscons config file. This is the place to set things like keymap, etc. |
371 |
- |
372 |
-# Set the keymap to "uk.iso". |
373 |
-#KEYMAP="uk.iso" |
374 |
- |
375 |
-# Set the keyboard rate to 250ms delay, and 34 repeat rate. |
376 |
-#KEYRATE="250.34" |
377 |
- |
378 |
-# Change the behaviour of F-unction keys (see kbdcontrol(1)). |
379 |
-#KEYCHANGE="10 'ssh myhost'" |
380 |
- |
381 |
-# See vidcontrol(1) -t |
382 |
-#BLANKTIME="off" |
383 |
|
384 |
diff --git a/sys-freebsd/freebsd-usbin/files/syscons.initd b/sys-freebsd/freebsd-usbin/files/syscons.initd |
385 |
deleted file mode 100644 |
386 |
index 5ab3075c4d..0000000000 |
387 |
--- a/sys-freebsd/freebsd-usbin/files/syscons.initd |
388 |
+++ /dev/null |
389 |
@@ -1,78 +0,0 @@ |
390 |
-#!/sbin/openrc-run |
391 |
-# Copyright 1999-2006 Gentoo Foundation |
392 |
-# Distributed under the terms of the GNU General Public License v2 |
393 |
-# $Id$ |
394 |
- |
395 |
-depend() { |
396 |
- need localmount |
397 |
-} |
398 |
- |
399 |
-start() { |
400 |
- ebegin "Configuring system console" |
401 |
- |
402 |
- if [ -n "${MODE}" ] ; then |
403 |
- einfo "Setting mode to ${MODE}" |
404 |
- vidcontrol "${MODE}" |
405 |
- eend $? |
406 |
- fi |
407 |
- |
408 |
- # XXX: This should handle serial consoles. |
409 |
- |
410 |
- # Set the keymap. |
411 |
- if [ -n "${KEYMAP}" ]; then |
412 |
- einfo "Setting keymap to" "${KEYMAP}" |
413 |
- kbdcontrol -l ${KEYMAP} < /dev/console |
414 |
- fi |
415 |
- |
416 |
- if [ -n "${KEYRATE}" ]; then |
417 |
- einfo "Setting keyrate to" "${KEYRATE}" |
418 |
- kbdcontrol -r ${KEYRATE} < /dev/console |
419 |
- fi |
420 |
- |
421 |
- if [ -n "${KEYCHANGE}" ]; then |
422 |
- einfo "Changing function keys..." |
423 |
- eval set -- "${KEYCHANGE}" |
424 |
- eindent |
425 |
- while [ $# -gt 0 ] ; do |
426 |
- veinfo "F$1 -> \`$2'" |
427 |
- kbdcontrol -f "$1" "$2" < /dev/console |
428 |
- shift ; shift |
429 |
- done |
430 |
- eoutdent |
431 |
- fi |
432 |
- |
433 |
- if [ -n "${CURSOR}" ]; then |
434 |
- einfo "Setting cursor" |
435 |
- vidcontrol -c ${CURSOR} |
436 |
- fi |
437 |
- |
438 |
- einfo "Setting custom fonts..." |
439 |
- # Nothing to see here, move along... |
440 |
- for v in FONT8x16 FONT8x14 FONT8x8; do |
441 |
- f=$(eval \$"${v}") |
442 |
- if [ -n "${f}" ]; then |
443 |
- vidcontrol -f ${v##FONT} ${f} |
444 |
- fi |
445 |
- done |
446 |
- |
447 |
- if [ -n "${BLANKTIME}" ]; then |
448 |
- einfo "Setting blanktime" |
449 |
- vidcontrol -t ${BLANKTIME} |
450 |
- fi |
451 |
- |
452 |
- if [ -n "${SAVER}" ]; then |
453 |
- for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do |
454 |
- kldunload ${i} |
455 |
- done |
456 |
- kldstat -v | grep -q _saver || kldload ${SAVER}_saver |
457 |
- fi |
458 |
- |
459 |
- if [ -n "${KBDFLAGS}" ]; then |
460 |
- einfo "Setting keyboard flags for all screens" |
461 |
- for ttyv in /dev/ttyv*; do |
462 |
- kbdcontrol ${KBDFLAGS} <${ttyv} >${ttyv} 2>&1 |
463 |
- done |
464 |
- fi |
465 |
- |
466 |
- eend 0 |
467 |
-} |
468 |
|
469 |
diff --git a/sys-freebsd/freebsd-usbin/files/syslogd.initd b/sys-freebsd/freebsd-usbin/files/syslogd.initd |
470 |
deleted file mode 100644 |
471 |
index 87c40cd2a3..0000000000 |
472 |
--- a/sys-freebsd/freebsd-usbin/files/syslogd.initd |
473 |
+++ /dev/null |
474 |
@@ -1,25 +0,0 @@ |
475 |
-#!/sbin/openrc-run |
476 |
-# Copyright 1999-2005 Gentoo Foundation |
477 |
-# Distributed under the terms of the GNU General Public License v2 |
478 |
-# $Id$ |
479 |
- |
480 |
-depend() { |
481 |
- provide logger |
482 |
- need localmount |
483 |
-} |
484 |
- |
485 |
-start() { |
486 |
- ebegin "Starting System Logger" |
487 |
- start-stop-daemon --start --quiet --exec /usr/sbin/syslogd \ |
488 |
- -- ${SYSLOGD_OPTS} |
489 |
- eend $? |
490 |
-} |
491 |
- |
492 |
-stop() { |
493 |
- ebegin "Stopping System Logger" |
494 |
- start-stop-daemon --stop --quiet --pidfile /var/run/syslog.pid |
495 |
- eend $? |
496 |
-} |
497 |
- |
498 |
- |
499 |
- |