commit: 23ed52dd798dcd77519881753d59f9a956a55fdb Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> AuthorDate: Sun May 3 17:28:49 2015 +0000 Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> CommitDate: Sun May 3 17:28:49 2015 +0000 URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=23ed52dd
cancd-0.1.0-r3 with fixes is in tree now. app-admin/cancd/ChangeLog | 46 --------------- app-admin/cancd/Manifest | 10 ---- app-admin/cancd/cancd-0.1.0-r2.ebuild | 38 ------------- app-admin/cancd/files/cancd-0.1.0-build.patch | 14 ----- app-admin/cancd/files/cancd-0.1.0-c-cleanup.patch | 65 ---------------------- app-admin/cancd/files/cancd-conf.d | 20 ------- app-admin/cancd/files/cancd-init.d | 23 -------- app-admin/cancd/files/netconsole-conf.d | 28 ---------- app-admin/cancd/files/netconsole-init.d | 68 ----------------------- app-admin/cancd/metadata.xml | 8 --- 10 files changed, 320 deletions(-) diff --git a/app-admin/cancd/ChangeLog b/app-admin/cancd/ChangeLog deleted file mode 100644 index e4ee5b1..0000000 --- a/app-admin/cancd/ChangeLog +++ /dev/null @@ -1,46 +0,0 @@ -# ChangeLog for app-admin/cancd -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/ChangeLog,v 1.9 2011/12/31 15:42:32 idl0r Exp $ - -*cancd-0.1.0-r2 (31 Dec 2011) - - 31 Dec 2011; Christian Ruppert <id...@gentoo.org> -cancd-0.1.0-r1.ebuild, - +cancd-0.1.0-r2.ebuild, files/cancd-init.d: - Revbump. Don't use deprecated start-stop-daemon options, bug 377843. - - 11 Oct 2009; Mark Loeser <halc...@gentoo.org> cancd-0.1.0.ebuild: - QA fixes, unquoted variables - - 14 Jan 2009; Mike Frysinger <vap...@gentoo.org> - +files/cancd-0.1.0-build.patch, cancd-0.1.0-r1.ebuild: - Fix building with newer glibc #246734 by Diego E. Pettenò. - - 14 Nov 2008; Diego E. Pettenò <flamee...@gentoo.org> - cancd-0.1.0-r1.ebuild: - Die on emake or dosbin failure. - - 04 Jan 2007; Steve Dibb <bean...@gentoo.org> cancd-0.1.0.ebuild, - cancd-0.1.0-r1.ebuild: - ebuild cleanup, bug 157656 - - 18 Mar 2006; Robin H. Johnson <robb...@gentoo.org> - +files/cancd-0.1.0-c-cleanup.patch, cancd-0.1.0-r1.ebuild: - Clean up upstream code slightly, so it works better. - - 19 Nov 2005; Robin H. Johnson <robb...@gentoo.org> - files/netconsole-conf.d, files/netconsole-init.d: - Slight comment cleanup. - -*cancd-0.1.0-r1 (15 Nov 2005) - - 15 Nov 2005; Robin H. Johnson <robb...@gentoo.org> - +files/netconsole-conf.d, +files/netconsole-init.d, - +cancd-0.1.0-r1.ebuild: - Add netconsole source init.d scripts. - -*cancd-0.1.0 (14 Nov 2005) - - 14 Nov 2005; Robin H. Johnson <robb...@gentoo.org> +files/cancd-conf.d, - +files/cancd-init.d, +cancd-0.1.0.ebuild: - Initial commit, ebuild by Robin H. Johnson <robb...@gentoo.org>. - diff --git a/app-admin/cancd/Manifest b/app-admin/cancd/Manifest deleted file mode 100644 index daa352c..0000000 --- a/app-admin/cancd/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX cancd-0.1.0-build.patch 262 SHA256 10be31f427940224cecd5b90de94dfd9b0a76368c57a8354b44f4c3905c8d192 SHA512 cbc3d0bfcdb2abae08268a408d2d7f7bc5898bd07c744878a6d8996dea5ea4f9f308078f9fe05566ee8cd06b3a5e083163f50d69f6795b31952934a88d69c481 WHIRLPOOL a8cdce4f61d03d7a683065bd43422d25723685b75008abfd2c745b5d5bb56257007af26992276c829fa47336a959f75e0f628d3f0e91f8e556dc3c3ade135a6a -AUX cancd-0.1.0-c-cleanup.patch 1648 SHA256 55628aa8e2fabd3aa26bc0023d46562a238047b2f7ad5c8485b88794655f93d7 SHA512 16350363f8f8f7e3843000e3128216d302ea7112608d61ae8d74ca79688588f3b028e1eedf187df06c78f8aaa2c987cdfdf33761adb9e597d4ca617f34b1072e WHIRLPOOL fb55e5d1ab1a9971a8423d6dadadcaacfc24dc6a2f300e7c1b28173d5beccf04309f511299af5f64ea06f9f497ee35548cfd6744459afd7ef54ccfe1e5c1b7ca -AUX cancd-conf.d 605 SHA256 bbf84fdba07bde4a61864715e42a76c2b3ad2ecade4ad11b8ca4d557bfa9deb8 SHA512 baf0af880434bb875b4c3e1b146a5250652730d8ee0be0938662927aac90af00618519c0ee4cef81af430ab850b9cf2a98dae45990edc23df4f19d6b1f5676ce WHIRLPOOL 8eda969041bcae2dcdbb8aa43c3bc8aae4341afff7b5b2f1493adf99a21dc8cfda98686b0a607657e92db5fa1711f3ad28f5f97b521365bb73bd4bf1d653e4ef -AUX cancd-init.d 621 SHA256 2107d774087d88cc263b7777ec64fa0f916f9672eaac8eb598dbc2f97016a685 SHA512 7636575deabaa880bd77be70a752993cdbe3e55ea2b153d9cfef301a7d18ec20cd20736fd5e88e5bb3d68732db133aca92b8ff6f21baddad7c092168175a5888 WHIRLPOOL 23ed53a0614f0ae0c841f26e08a890a055b24a215f6bcfb4f8f8ad10e7b703af294118b7312c0df852bd3edc1c19f714a2114ddd624fc52d0d6b782c57f0fcac -AUX netconsole-conf.d 866 SHA256 480230a83fade7e2c284936fc8814c07e075d8296e37aa83772f8d8cb3c6ff96 SHA512 b20be2c12dddc2b6bf7778940190949a70607b4c9d67d0bf81a1495ea2b5c51c3ab476f902cf8ee8a1e5944b164f266f49f67da34d21990d10ff0f84e4cddd80 WHIRLPOOL 4c4ac57f3db932af9273060a15f5180a91eec8cd08db248596defc4d9f97a90f4215701b03b16176a23a793dc51771894b0d6972060c01b5a95a8f4b152683c4 -AUX netconsole-init.d 1618 SHA256 d4c700878a3c6994d5269e70a71793576253b87e1fc9baca33e378ec4de0ab59 SHA512 69e6925d87aa3af76b2149c92133c2c94d5e815b7e8ec5c69a834a789e7696ff775abfd28f5bbe73eaf6b918f69d79d3e71645b7d1b74071c00d9d4d9ddae242 WHIRLPOOL 6a8cbf341710a706fdc5af77de717d88486f730047db7c2b54f975400722e86dee8a79916777aafa49391ed8ae1d38824c5c5664b017770136f194f0a1b8633c -DIST cancd-0.1.0.tar.gz 7634 SHA256 aea21e3eadee64d2b76591d272dcd03c566215b2320d7fef5cfe0937c3ef0315 SHA512 9b01ed3ea1e27276799d657572645a7b40da9cf80910a73e2de9d733e8f3cfa374e29764b1e5853d7fb5a6835edda3103a1a6d31fd699010f98318631e62c5fb WHIRLPOOL 84e1b6461bc5ae40b01c71112fed9999e590a7cbed54da6850131bd475eafb6ab7830a418a6fc46bf217645ed73aec080af6d4117a9ea97f1b48dad92cc93caf -EBUILD cancd-0.1.0-r2.ebuild 1320 SHA256 cf0b29d6faa2d2ba2298325dedf9fcd4014be61e52bc93b9480ffb1467b2748d SHA512 f3ba383dd481a418c20581790c37c9c2e0a2389fc1973c20560838aa38818dc80cecb2798ecffb22efc692498cf70ea13f85b486cdf7b0ccad6f320c4c4c3e48 WHIRLPOOL 194fb7b3de71e7ed2292ab2fa387dbfd63cd584b50ac37a44a51870a6dc0fa803293b91f9762cbd6f39179f442ae70c617246670a0e2c32e2c117550f55f3143 -MISC ChangeLog 1656 SHA256 e56064b24e5e87a527d76414e1aad578d4ae7ba2e2df4926ce1ebec8ea91ae67 SHA512 1ffb0670e755d0060e34a532fd71cf25426705281b8746573b2e02dfa51d19be9854065e1a7d0003efb091410d29e4704f506d2a6adc35e36ae29769c77712c8 WHIRLPOOL 558bf9d5bc307cb3f240641171505589d2746d52852434e014629e54bdde0ea3fae81d256e644612a25a498116ad02f1a2384037318d710832c49a18df2e3f27 -MISC metadata.xml 254 SHA256 01e5e65407b8647d4a3ba7fc968e271368b319b1b34a2df8fa891c70099a3e63 SHA512 1e5e169b9f7bbc60a3b0e19a0f21d108b6d5cdea4ab299817c8d157370f8a6a876c901aa94e4c8ef817f91fe53fe4cf029d72931d5fdb15b91b8119dc3d78e55 WHIRLPOOL acd26f78ca257d987fda8fbec98f3a9df754b8470d36fcf137b219760e9cfb5b95656fa104847c8e3cdb5b1f284ad97f3d6924ef8343c763e83f942abbeb9f23 diff --git a/app-admin/cancd/cancd-0.1.0-r2.ebuild b/app-admin/cancd/cancd-0.1.0-r2.ebuild deleted file mode 100644 index 4b20b93..0000000 --- a/app-admin/cancd/cancd-0.1.0-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/cancd-0.1.0-r2.ebuild,v 1.1 2011/12/31 15:42:32 idl0r Exp $ - -EAPI=5 - -inherit eutils - -DESCRIPTION="the CA NetConsole Daemon, a daemon to receive output from the Linux netconsole driver" -HOMEPAGE="http://oss.oracle.com/projects/cancd/"; -SRC_URI="http://oss.oracle.com/projects/cancd/dist/files/source/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch #246734 - epatch "${FILESDIR}"/${P}-c-cleanup.patch - # slight makefile cleanup - sed -i \ - -e '/^CFLAGS/s,-g,,' \ - -e '/^CFLAGS/s,-O2,-Wall -W -Wextra -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wredundant-decls -Wunreachable-code -Wlong-long,' \ - -e '/rm cancd cancd.o/s,rm,rm -f,' \ - Makefile || die -} - -src_install() { - dosbin cancd - newinitd "${FILESDIR}"/cancd-init.d cancd - newconfd "${FILESDIR}"/cancd-conf.d cancd - newinitd "${FILESDIR}"/netconsole-init.d netconsole - newconfd "${FILESDIR}"/netconsole-conf.d netconsole - keepdir /var/crash - fowners adm:nobody /var/crash - fperms 700 /var/crash -} diff --git a/app-admin/cancd/files/cancd-0.1.0-build.patch b/app-admin/cancd/files/cancd-0.1.0-build.patch deleted file mode 100644 index b1c99b1..0000000 --- a/app-admin/cancd/files/cancd-0.1.0-build.patch +++ /dev/null @@ -1,14 +0,0 @@ -fix building with newer glibc - -http://bugs.gentoo.org/246734 - ---- cancd.c -+++ 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 47defb3..0000000 --- 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 b/app-admin/cancd/files/cancd-conf.d deleted file mode 100644 index 5f9a2cf..0000000 --- a/app-admin/cancd/files/cancd-conf.d +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/files/cancd-conf.d,v 1.1 2005/11/14 21:15:54 robbat2 Exp $ - -# 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-init.d b/app-admin/cancd/files/cancd-init.d deleted file mode 100644 index 9550789..0000000 --- a/app-admin/cancd/files/cancd-init.d +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/files/cancd-init.d,v 1.2 2011/12/31 15:42:32 idl0r Exp $ - -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/netconsole-conf.d b/app-admin/cancd/files/netconsole-conf.d deleted file mode 100644 index 537725e..0000000 --- a/app-admin/cancd/files/netconsole-conf.d +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/files/netconsole-conf.d,v 1.2 2005/11/19 01:32:21 robbat2 Exp $ - -# 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 e0513ea..0000000 --- a/app-admin/cancd/files/netconsole-init.d +++ /dev/null @@ -1,68 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/files/netconsole-init.d,v 1.3 2005/11/19 01:33:14 robbat2 Exp $ - -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: diff --git a/app-admin/cancd/metadata.xml b/app-admin/cancd/metadata.xml deleted file mode 100644 index a732fd8..0000000 --- a/app-admin/cancd/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer> - <email>robb...@gentoo.org</email> - <name>Robin H. Johnson</name> - </maintainer> -</pkgmetadata>
