commit: c1f9b251bc260e8c7c794fb1ac34aa29285b46d6 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Feb 10 17:02:18 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Feb 11 20:14:38 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f9b251
sys-freebsd/freebsd-usbin: remove unused patch/files Closes: https://github.com/gentoo/gentoo/pull/3903 .../files/freebsd-usbin-9.0-libarchive.patch | 12 ---- sys-freebsd/freebsd-usbin/files/moused.confd | 20 ------ sys-freebsd/freebsd-usbin/files/moused.initd | 66 ------------------ sys-freebsd/freebsd-usbin/files/nfsmount.initd | 63 ----------------- sys-freebsd/freebsd-usbin/files/powerd.confd | 14 ---- sys-freebsd/freebsd-usbin/files/powerd.initd | 27 -------- sys-freebsd/freebsd-usbin/files/rarpd.confd | 7 -- sys-freebsd/freebsd-usbin/files/rarpd.initd | 35 ---------- sys-freebsd/freebsd-usbin/files/rpcbind.initd | 30 --------- sys-freebsd/freebsd-usbin/files/syscons.confd | 14 ---- sys-freebsd/freebsd-usbin/files/syscons.initd | 78 ---------------------- sys-freebsd/freebsd-usbin/files/syslogd.initd | 25 ------- 12 files changed, 391 deletions(-) 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 deleted file mode 100644 index bfe4794470..0000000000 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- usr.sbin/bsdinstall/distextract/distextract.c.old 2011-11-02 20:28:08.000000000 +0000 -+++ usr.sbin/bsdinstall/distextract/distextract.c 2011-11-02 20:28:57.000000000 +0000 -@@ -32,6 +32,9 @@ - #include <limits.h> - #include <archive.h> - #include <dialog.h> -+#ifndef archive_read_free -+#define archive_read_free(x) archive_read_finish(x) -+#endif - - static int extract_files(int nfiles, const char **files); - diff --git a/sys-freebsd/freebsd-usbin/files/moused.confd b/sys-freebsd/freebsd-usbin/files/moused.confd deleted file mode 100644 index 4d64933683..0000000000 --- a/sys-freebsd/freebsd-usbin/files/moused.confd +++ /dev/null @@ -1,20 +0,0 @@ -# $Id$ - -# See the moused man page for available settings. - -# Set to your mouse device psm[0-9] for PS/2 ports, ums[0-9] for USB ports -# Leave blank to try to autodetect it -MOUSED_DEVICE="" - -# Any additional flags requires -MOUSED_FLAGS="" - -# If 0xd0-0xd3 default range is occupied in your language code table, specify -# alternative range start like MOUSECHAR_START="3", see vidcontrol(1) -MOUSECHAR_START="" - -# You can also multiplex the init script for each device like so -# ln -s moused /etc/init.d/moused.ums0 -# This enables you to have a config file per mouse (forces MOUSED_DEVICE -# to ums0 in this case) and control each mouse. -# devd can also start and stop these mice, which laptop users will find handy. diff --git a/sys-freebsd/freebsd-usbin/files/moused.initd b/sys-freebsd/freebsd-usbin/files/moused.initd deleted file mode 100644 index d7ca8e0fcf..0000000000 --- a/sys-freebsd/freebsd-usbin/files/moused.initd +++ /dev/null @@ -1,66 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -MOUSED_NAME=${SVCNAME##*.} -if [ -n "${MOUSED_NAME}" ] && [ ${MOUSED_NAME} != "moused" ] ; then - MOUSED_DEVICE=/dev/"${MOUSED_NAME}" - MOUSED_PIDFILE=/var/run/moused-"${MOUSED_NAME}".pid -else - MOUSED_NAME= - MOUSED_PIDFILE=/var/run/moused.pid -fi - -depend() { - need localmount -} - -start() { - ebegin "Starting the Console Mouse Daemon" "${MOUSED_NAME}" - - if [ -z ${MOUSED_DEVICE} ] ; then - for x in /dev/psm[0-9]* /dev/ums[0-9]* ; do - if [ -e "${x}" ] && \ - [ ! -e /var/run/moused-$(basename "${x}").pid ] ; then - MOUSED_DEVICE=${x} - eindent - einfo "Using mouse on ${MOUSED_DEVICE}" - eoutdent - break - fi - done - fi - - if [ -z "${MOUSED_DEVICE}" ] ; then - eend 1 "No device specified in" "/etc/conf.d/${SVCNAME}" \ - "and no mouse detected" - return 1 - fi - - local opts="${MOUSED_FLAGS} -p ${MOUSED_DEVICE}" - start-stop-daemon --start --quiet --exec /usr/sbin/moused \ - --pidfile "${MOUSED_PIDFILE}" \ - -- ${opts} -I "${MOUSED_PIDFILE}" - local retval=$? - - [ -n "${MOUSE_CHAR_START}" ] && MOUSE_CHAR_START="-M ${MOUSE_CHAR_START}" - local ttyv= - for ttyv in /dev/ttyv* ; do - vidcontrol < "${ttyv}" ${MOUSE_CHAR_START} -m on || retval=1 - done - - eend ${retval} "Failed to start moused" -} - -stop() { - ebegin "Stopping the Console Mouse Daemon" "${MOUSED_NAME}" - # Don't specify the binary as >1 instance of moused may be running - # which is perfectly valid as we can be multiplexed. - start-stop-daemon --stop --exec /usr/sbin/moused \ - --pidfile "${MOUSED_PIDFILE}" - eend $? "Failed to stop moused" -} - -# vim: set ts=4 : - diff --git a/sys-freebsd/freebsd-usbin/files/nfsmount.initd b/sys-freebsd/freebsd-usbin/files/nfsmount.initd deleted file mode 100644 index 2fb49010a8..0000000000 --- a/sys-freebsd/freebsd-usbin/files/nfsmount.initd +++ /dev/null @@ -1,63 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need net rpcbind - use ypbind -} - -start_statd() { - # Don't start rpc.statd if already started by init.d/nfs - killall -0 rpc.statd 2>/dev/null && return 0 - ebegin "Starting NFS statd" - rpc.statd - eend $? "Error starting NFS statd" -} - -stop_statd() { - # Don't stop rpc.statd if it's in use by init.d/nfs - killall -0 nfsd 2>/dev/null && return 0 - # Make sure it's actually running - killall -0 rpc.statd 2>/dev/null || return 0 - # Okay, all tests passed, stop rpc.statd - ebegin "Stopping NFS statd" - killall rpc.statd - eend $? "Error stopping NFS statd" -} - -start_lockd() { - # Don't start rpc.lockd if already started by init.d/nfs - killall -0 rpc.lockd 2>/dev/null && return 0 - ebegin "Starting NFS lockd" - rpc.lockd - eend $? "Error starting NFS lockd" -} - -stop_lockd() { - # Don't stop rpc.lockd if it's in use by init.d/nfs - killall -0 nfsd 2>/dev/null && return 0 - # Make sure it's actually running - killall -0 rpc.lockd 2>/dev/null || return 0 - # Okay, all tests passed, stop rpc.lockd - ebegin "Stopping NFS lockd" - killall rpc.lockd - eend $? "Error stopping NFS lockd" -} - -start() { - start_statd - start_lockd - ebegin "Mounting NFS filesystems" - mount -a -t nfs - eend $? "Error mounting NFS filesystems" -} - -stop() { - ebegin "Unmounting NFS filesystems" - umount -a -t nfs - eend $? "Error unmounting NFS filesystems" - stop_statd - stop_lockd -} diff --git a/sys-freebsd/freebsd-usbin/files/powerd.confd b/sys-freebsd/freebsd-usbin/files/powerd.confd deleted file mode 100644 index e5db5a1a34..0000000000 --- a/sys-freebsd/freebsd-usbin/files/powerd.confd +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# Mode allowed: maximum, minimum, adaptive -# Default unless specified is adaptive - -AC_MODE="maximum" - -#BATTERY_MODE="minimum" - -POWERD_OPTS="" - - diff --git a/sys-freebsd/freebsd-usbin/files/powerd.initd b/sys-freebsd/freebsd-usbin/files/powerd.initd deleted file mode 100644 index ff79f6391c..0000000000 --- a/sys-freebsd/freebsd-usbin/files/powerd.initd +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need localmount -} - -start() { - local args= - [ -n "${BATTERY_MODE}" ] && args="${args} -b ${BATTERY_MODE}" - [ -n "${AC_MODE}" ] && args="${args} -a ${AC_MODE}" - - ebegin "Starting Power Control Daemon" - start-stop-daemon --start --exec /usr/sbin/powerd \ - --pidfile /var/run/powerd.pid \ - -- ${args} ${POWERD_OPTS} - eend $? "Failed to start powerd" -} - -stop() { - ebegin "Stopping Power Control Daemon" - start-stop-daemon --stop --exec /usr/sbin/powerd \ - --pidfile /var/run/powerd.pid - eend $? "Failed to stop powerd" -} diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.confd b/sys-freebsd/freebsd-usbin/files/rarpd.confd deleted file mode 100644 index b56fdd51c8..0000000000 --- a/sys-freebsd/freebsd-usbin/files/rarpd.confd +++ /dev/null @@ -1,7 +0,0 @@ -# $Id$ - -# Configuration file for /etc/init.d/rarpd - -# To start rarpd only for a given interface, set the -# following variable -# RARPD_ONLY_INTERFACE="rl0" diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.initd b/sys-freebsd/freebsd-usbin/files/rarpd.initd deleted file mode 100644 index 3c2a3ffe41..0000000000 --- a/sys-freebsd/freebsd-usbin/files/rarpd.initd +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - if [ -z "${RARPD_ONLY_INTERFACE}" ]; then - need net - else - need net."${RARPD_ONLY_INTERFACE}" - fi -} - -start() { - local rarpd_opts - - if [ -z "${RARPD_ONLY_INTERFACE}" ]; then - rarpd_opts="${rarpd_opts} -a" - else - rarpd_opts="${rarpd_opts} ${RARPD_ONLY_INTERFACE}" - fi - - ebegin "Starting reverse ARP daemon" - start-stop-daemon --start --background \ - --pidfile /var/run/rarpd.pid --make-pidfile \ - --exec /usr/sbin/rarpd -- -f ${rarpd_opts} - eend $? -} - -stop() { - ebegin "Stopping reverse ARP daemon" - start-stop-daemon --stop --pidfile /var/run/rarpd.pid \ - --exec /usr/sbin/rarpd -- ${rarpd_opts} - eend $? -} diff --git a/sys-freebsd/freebsd-usbin/files/rpcbind.initd b/sys-freebsd/freebsd-usbin/files/rpcbind.initd deleted file mode 100644 index 1ff98a5ef5..0000000000 --- a/sys-freebsd/freebsd-usbin/files/rpcbind.initd +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need localmount - use net - before inetd - before xinetd -} - -start() { - ebegin "Starting rpcbind" - start-stop-daemon --start --exec /usr/sbin/rpcbind - local ret=$? - eend ${ret} - - # without, if a service depending on portmap is started too fast, - # connecting to portmap will fail -- azarah - # doing that for rpcbind, too -- flameeyes - sleep 1 - return ${ret} -} - -stop() { - ebegin "Stopping rpcbind" - start-stop-daemon --stop --exec /usr/sbin/rpcbind - eend $? -} diff --git a/sys-freebsd/freebsd-usbin/files/syscons.confd b/sys-freebsd/freebsd-usbin/files/syscons.confd deleted file mode 100644 index 7ba81ff47a..0000000000 --- a/sys-freebsd/freebsd-usbin/files/syscons.confd +++ /dev/null @@ -1,14 +0,0 @@ -# $Id$ -# Example syscons config file. This is the place to set things like keymap, etc. - -# Set the keymap to "uk.iso". -#KEYMAP="uk.iso" - -# Set the keyboard rate to 250ms delay, and 34 repeat rate. -#KEYRATE="250.34" - -# Change the behaviour of F-unction keys (see kbdcontrol(1)). -#KEYCHANGE="10 'ssh myhost'" - -# See vidcontrol(1) -t -#BLANKTIME="off" diff --git a/sys-freebsd/freebsd-usbin/files/syscons.initd b/sys-freebsd/freebsd-usbin/files/syscons.initd deleted file mode 100644 index 5ab3075c4d..0000000000 --- a/sys-freebsd/freebsd-usbin/files/syscons.initd +++ /dev/null @@ -1,78 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need localmount -} - -start() { - ebegin "Configuring system console" - - if [ -n "${MODE}" ] ; then - einfo "Setting mode to ${MODE}" - vidcontrol "${MODE}" - eend $? - fi - - # XXX: This should handle serial consoles. - - # Set the keymap. - if [ -n "${KEYMAP}" ]; then - einfo "Setting keymap to" "${KEYMAP}" - kbdcontrol -l ${KEYMAP} < /dev/console - fi - - if [ -n "${KEYRATE}" ]; then - einfo "Setting keyrate to" "${KEYRATE}" - kbdcontrol -r ${KEYRATE} < /dev/console - fi - - if [ -n "${KEYCHANGE}" ]; then - einfo "Changing function keys..." - eval set -- "${KEYCHANGE}" - eindent - while [ $# -gt 0 ] ; do - veinfo "F$1 -> \`$2'" - kbdcontrol -f "$1" "$2" < /dev/console - shift ; shift - done - eoutdent - fi - - if [ -n "${CURSOR}" ]; then - einfo "Setting cursor" - vidcontrol -c ${CURSOR} - fi - - einfo "Setting custom fonts..." - # Nothing to see here, move along... - for v in FONT8x16 FONT8x14 FONT8x8; do - f=$(eval \$"${v}") - if [ -n "${f}" ]; then - vidcontrol -f ${v##FONT} ${f} - fi - done - - if [ -n "${BLANKTIME}" ]; then - einfo "Setting blanktime" - vidcontrol -t ${BLANKTIME} - fi - - if [ -n "${SAVER}" ]; then - for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do - kldunload ${i} - done - kldstat -v | grep -q _saver || kldload ${SAVER}_saver - fi - - if [ -n "${KBDFLAGS}" ]; then - einfo "Setting keyboard flags for all screens" - for ttyv in /dev/ttyv*; do - kbdcontrol ${KBDFLAGS} <${ttyv} >${ttyv} 2>&1 - done - fi - - eend 0 -} diff --git a/sys-freebsd/freebsd-usbin/files/syslogd.initd b/sys-freebsd/freebsd-usbin/files/syslogd.initd deleted file mode 100644 index 87c40cd2a3..0000000000 --- a/sys-freebsd/freebsd-usbin/files/syslogd.initd +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - provide logger - need localmount -} - -start() { - ebegin "Starting System Logger" - start-stop-daemon --start --quiet --exec /usr/sbin/syslogd \ - -- ${SYSLOGD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping System Logger" - start-stop-daemon --stop --quiet --pidfile /var/run/syslog.pid - eend $? -} - - -
