diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-18 15:11:02 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-18 15:11:02 +0000 |
commit | 0fb71e0215ed52863e462cccef73c01aff44d43d (patch) | |
tree | 428fc3fa92f9c69ed02878e9b6151a9fb810e651 /app-admin/cancd/files | |
parent | 9bd54251864651f49e673a08aec9ef79cfe08f04 (diff) |
gentoo resync : 18.12.2017
Diffstat (limited to 'app-admin/cancd/files')
-rw-r--r-- | app-admin/cancd/files/cancd-0.1.0-build-r1.patch (renamed from app-admin/cancd/files/cancd-0.1.0-build.patch) | 4 | ||||
-rw-r--r-- | app-admin/cancd/files/cancd-conf.d | 19 | ||||
-rw-r--r-- | app-admin/cancd/files/cancd-conf.d-r1 | 14 | ||||
-rw-r--r-- | app-admin/cancd/files/cancd-init.d | 22 | ||||
-rw-r--r-- | app-admin/cancd/files/cancd-init.d-r1 | 22 |
5 files changed, 38 insertions, 43 deletions
diff --git a/app-admin/cancd/files/cancd-0.1.0-build.patch b/app-admin/cancd/files/cancd-0.1.0-build-r1.patch index b1c99b1cd565..19bc929b2bc0 100644 --- a/app-admin/cancd/files/cancd-0.1.0-build.patch +++ b/app-admin/cancd/files/cancd-0.1.0-build-r1.patch @@ -2,8 +2,8 @@ fix building with newer glibc http://bugs.gentoo.org/246734 ---- cancd.c -+++ cancd.c +--- a/cancd.c ++++ b/cancd.c @@ -36,6 +36,7 @@ #include <libgen.h> #include <getopt.h> diff --git a/app-admin/cancd/files/cancd-conf.d b/app-admin/cancd/files/cancd-conf.d deleted file mode 100644 index 7b4dd27383c0..000000000000 --- a/app-admin/cancd/files/cancd-conf.d +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# user to run as, root strongly discouraged -# user should have /bin/false for a shell -# but file access into /var -CHUID='adm:nobody' - -# port to listen on -CANCD_PORT=6667 - -# directory to output to -CRASH_DIR=/var/crash - -# one file per minute, one dir per host/date -#CRASH_FORMAT="%Q/%Y-%m-%d/%H:%M.log" -# one file per day, one dir per host -CRASH_FORMAT="%Q/%Y-%m-%d.log" diff --git a/app-admin/cancd/files/cancd-conf.d-r1 b/app-admin/cancd/files/cancd-conf.d-r1 new file mode 100644 index 000000000000..13322298f28b --- /dev/null +++ b/app-admin/cancd/files/cancd-conf.d-r1 @@ -0,0 +1,14 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# port to listen on +CANCD_PORT=6667 + +# directory to output to +CANCD_LOG_DIR=/var/log/cancd + +# one file per minute, one dir per host/date +#CANCD_LOG_FORMAT="%Q/%Y-%m-%d/%H:%M.log" +# one file per day, one dir per host +CANCD_LOG_FORMAT="%Q/%Y-%m-%d.log" diff --git a/app-admin/cancd/files/cancd-init.d b/app-admin/cancd/files/cancd-init.d deleted file mode 100644 index eb0d34e1a2ee..000000000000 --- a/app-admin/cancd/files/cancd-init.d +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - mkdir -p ${CRASH_DIR} - chown ${CHUID} ${CRASH_DIR} - chmod 700 ${CRASH_DIR} - ebegin "Starting cancd" - start-stop-daemon --start --quiet --user ${CHUID} --exec /usr/sbin/cancd -- -p ${CANCD_PORT} -l "${CRASH_DIR}" -o "${CRASH_FORMAT}" - eend ${?} -} - -stop() { - ebegin "Stopping cancd" - start-stop-daemon --stop --quiet --exec /usr/sbin/cancd - eend ${?} -} diff --git a/app-admin/cancd/files/cancd-init.d-r1 b/app-admin/cancd/files/cancd-init.d-r1 new file mode 100644 index 000000000000..a2a96f1ce81c --- /dev/null +++ b/app-admin/cancd/files/cancd-init.d-r1 @@ -0,0 +1,22 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/cancd" +command_args="-p ${CANCD_PORT} + -l ${CANCD_LOG_DIR} + -o ${CANCD_LOG_FORMAT}" +command_user="cancd" + +# cancd daemonizes itself, but doesn't write a PID file and doesn't +# have an option to run in the foreground. So the best we can do +# is try to match the process name when stopping it. +procname="cancd" + +depend() { + need net +} + +start_pre() { + checkpath --directory --owner cancd --mode 0700 "${CANCD_LOG_DIR}" +} |