diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-admin/cancd/files | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-admin/cancd/files')
-rw-r--r-- | app-admin/cancd/files/cancd-0.1.0-build-r1.patch | 14 | ||||
-rw-r--r-- | app-admin/cancd/files/cancd-0.1.0-c-cleanup.patch | 65 | ||||
-rw-r--r-- | app-admin/cancd/files/cancd-conf.d-r1 | 14 | ||||
-rw-r--r-- | app-admin/cancd/files/cancd-init.d-r1 | 22 | ||||
-rw-r--r-- | app-admin/cancd/files/netconsole-conf.d | 27 | ||||
-rw-r--r-- | app-admin/cancd/files/netconsole-init.d | 67 |
6 files changed, 0 insertions, 209 deletions
diff --git a/app-admin/cancd/files/cancd-0.1.0-build-r1.patch b/app-admin/cancd/files/cancd-0.1.0-build-r1.patch deleted file mode 100644 index 19bc929b2bc0..000000000000 --- a/app-admin/cancd/files/cancd-0.1.0-build-r1.patch +++ /dev/null @@ -1,14 +0,0 @@ -fix building with newer glibc - -http://bugs.gentoo.org/246734 - ---- a/cancd.c -+++ b/cancd.c -@@ -36,6 +36,7 @@ - #include <libgen.h> - #include <getopt.h> - #include <stdarg.h> -+#include <limits.h> - #include <sys/socket.h> - #include <arpa/inet.h> - #include <netinet/in.h> diff --git a/app-admin/cancd/files/cancd-0.1.0-c-cleanup.patch b/app-admin/cancd/files/cancd-0.1.0-c-cleanup.patch deleted file mode 100644 index 47defb3e43b2..000000000000 --- a/app-admin/cancd/files/cancd-0.1.0-c-cleanup.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -Nuar --exclude '*~' --exclude '*.orig' --exclude Makefile cancd-0.1.0/cancd.c cancd-0.1.0.new/cancd.c ---- cancd-0.1.0/cancd.c 2005-08-18 11:47:48.000000000 -0700 -+++ cancd-0.1.0.new/cancd.c 2006-03-17 17:09:46.402025517 -0800 -@@ -199,7 +199,7 @@ - char *path; - }; - --static int make_tree(const char *path, int mode) -+static int make_tree(const char *path, mode_t mode) - { - struct stat stat_buf; - char *ptr, *tmp; -@@ -319,7 +319,7 @@ - static int open_socket() - { - int rc; -- struct sockaddr_in servaddr = {0, }; -+ struct sockaddr_in servaddr; - - sock_fd = socket(PF_INET, SOCK_DGRAM, 0); - if (sock_fd < 0) -@@ -438,7 +438,7 @@ - int rc; - static int block = 1; - -- rc = recvfrom(sock_fd, buf, bufsize, 0, -+ rc = recvfrom(fd, buf, bufsize, 0, - (struct sockaddr *)from, fromlen); - if (rc < 0) - { -@@ -569,7 +569,7 @@ - - static int valid_format() - { -- struct in_addr addr = {0, }; -+ struct in_addr addr; - char *name; - int rc; - -@@ -599,9 +599,11 @@ - exit(rc); - } - -+/* - extern char *optarg; - extern int optopt; - extern int opterr; -+*/ - static int parse_options(int argc, char *argv[]) - { - int c; -@@ -641,11 +643,11 @@ - optarg); - print_usage(-EINVAL); - } -- log_prefix = optarg; -+ log_prefix = strdup(optarg); - break; - - case 'o': -- log_format = optarg; -+ log_format = strdup(optarg); - if (!log_format || !*log_format || !valid_format()) - { - fprintf(stderr, diff --git a/app-admin/cancd/files/cancd-conf.d-r1 b/app-admin/cancd/files/cancd-conf.d-r1 deleted file mode 100644 index 13322298f28b..000000000000 --- a/app-admin/cancd/files/cancd-conf.d-r1 +++ /dev/null @@ -1,14 +0,0 @@ -#!/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-r1 b/app-admin/cancd/files/cancd-init.d-r1 deleted file mode 100644 index a2a96f1ce81c..000000000000 --- a/app-admin/cancd/files/cancd-init.d-r1 +++ /dev/null @@ -1,22 +0,0 @@ -#!/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}" -} diff --git a/app-admin/cancd/files/netconsole-conf.d b/app-admin/cancd/files/netconsole-conf.d deleted file mode 100644 index aad2fc797172..000000000000 --- a/app-admin/cancd/files/netconsole-conf.d +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# required! -TGT_IP='' - -DEVICE=eth0 - -SRC_IP='' -# will default to first address on $DEVICE -# must be specified if the device does not have an IP at init time -SRC_PORT=6665 # default - -# note that cancd daemon uses 6667 as default -# but netconsole.txt says 6666 is the default -TGT_PORT=6667 - -# if you want to broadcast, specify 'broadcast' here. -# it's a security hole on an untrusted network. -TGT_MAC='' - -LOGLEVEL='1' -# LOGLEVEL are the kernel console logging levels -# [0..7] = EMERG,ALERT,CRIT,ERR,WARNING,NOTICE,INFO,DEBUG -# 1 means only kernel panics are reported (default) -# this affects all console logging -# see syslog(2) for more info diff --git a/app-admin/cancd/files/netconsole-init.d b/app-admin/cancd/files/netconsole-init.d deleted file mode 100644 index dfb28eb9eac0..000000000000 --- a/app-admin/cancd/files/netconsole-init.d +++ /dev/null @@ -1,67 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - checkconfig || return 1 - if [ -z "${TGT_MAC}" ]; then - LC_ALL=C /bin/ping -nq -c 3 "${TGT_IP}" -I "${DEVICE}" 1>/dev/null 2>/dev/null - ret=$? - # ping worked, try arp - if [ $ret -eq 0 ]; then - TGT_MAC="$(LC_ALL=C arp -an -i ${DEVICE} ${TGT_IP} |egrep -v 'incomplete|no match' | awk '{print $4}')" - fi - elif [ "${TGT_MAC}" = "broadcast" ]; then - TGT_MAC='' - fi - ebegin "Starting netconsole ${SRC_IP}:${SRC_PORT}(${DEVICE}) -> ${TGT_IP}:${TGT_PORT} ${TGT_MAC}" - # else we use the MAC that we are given - modprobe netconsole netconsole=${SRC_PORT}@${SRC_IP}/${DEVICE},${TGT_PORT}@${TGT_IP}/${TGT_MAC} - ret=$? - [ $ret -eq 0 ] && dmesg -n ${LOGLEVEL} - eend $ret -} - -stop() { - ebegin "Stopping netconsole" - modprobe -r netconsole - eend $? -} - -checkconfig() { - # kernel uses 15 internally - if [ "$LOGLEVEL" -lt 0 -o "${LOGLEVEL}" -gt 15 ]; then - eerror "Invalid kernel console loglevel." - return 1 - fi - - if [ "$SRC_PORT" -le 0 ]; then - eerror "Invalid source port." - return 1 - fi - - LC_ALL=C ifconfig "${DEVICE}" 1>/dev/null 2>/dev/null - ret=$? - - if [ -z "${DEVICE}" -o "${ret}" -gt 0 ]; then - eerror "Source device invalid." - return 1 - fi - - if [ "$TGT_PORT" -le 0 ]; then - eerror "Invalid target port." - return 1 - fi - - if [ -z "$TGT_IP" ]; then - eerror "Unspecified target address." - return 1 - fi - - return 0 -} -# vim: ts=4 sw=4 sts=4: |