summaryrefslogtreecommitdiff
path: root/extra/sysklogd
diff options
context:
space:
mode:
Diffstat (limited to 'extra/sysklogd')
-rw-r--r--extra/sysklogd/LICENSE16
-rw-r--r--extra/sysklogd/PKGBUILD55
-rwxr-xr-xextra/sysklogd/klogd37
-rw-r--r--extra/sysklogd/sysklogd-1.4.1-caen-owl-klogd-drop-root.diff161
-rw-r--r--extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-bind.diff104
-rw-r--r--extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff117
-rw-r--r--extra/sysklogd/sysklogd-1.5-syslog-func-collision.patch103
-rw-r--r--extra/sysklogd/syslog.conf15
-rw-r--r--extra/sysklogd/syslog.logrotate6
-rwxr-xr-xextra/sysklogd/syslogd37
10 files changed, 0 insertions, 651 deletions
diff --git a/extra/sysklogd/LICENSE b/extra/sysklogd/LICENSE
deleted file mode 100644
index 7e9b5d59c..000000000
--- a/extra/sysklogd/LICENSE
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 1983, 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley. The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
diff --git a/extra/sysklogd/PKGBUILD b/extra/sysklogd/PKGBUILD
deleted file mode 100644
index 21caaf687..000000000
--- a/extra/sysklogd/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 158662 2012-05-05 22:14:49Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=sysklogd
-pkgver=1.5
-pkgrel=4
-pkgdesc="System and kernel log daemons"
-arch=('i686' 'x86_64')
-url="http://www.infodrom.org/projects/sysklogd/"
-license=('GPL' 'BSD')
-depends=('glibc' 'bash')
-provides=('logger')
-backup=('etc/syslog.conf' 'etc/logrotate.d/syslog')
-source=(http://www.infodrom.org/projects/sysklogd/download/${pkgname}-${pkgver}.tar.gz{,.asc} \
- syslog.conf syslog.logrotate syslogd klogd LICENSE \
- sysklogd-1.4.1-caen-owl-syslogd-bind.diff \
- sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff \
- sysklogd-1.4.1-caen-owl-klogd-drop-root.diff \
- sysklogd-1.5-syslog-func-collision.patch)
-sha1sums=('070cce745b023f2ce7ca7d9888af434d6d61c236'
- '9599322fc176004d95b5111b05f665b5191dfe67'
- '35b4cb76109a6ffe9269021a6bfb4f8da614a4eb'
- 'e67c0f78f13c94507d3f686b4e5b8340db4624fd'
- '848beb23b9ca4de19c6022df03878dbe57e04c0a'
- 'f46088f761c033562a59bc13d4888b7343bc02fc'
- 'c416bcefd3d3d618139cc7912310caddf34c0c0b'
- '849b2dcaf11060d583ccb3c48356a6971df45cf0'
- '9701989490748b0c5a1727e0fc459179d0e350a8'
- '76da0ecd9bca969e292a6ec58d7cd96e4c97e525'
- '826e76a59834868658eb9f8d8f3aabd8bf748759')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-# CAEN/OWL security patches
- patch -p1 -i ../sysklogd-1.4.1-caen-owl-syslogd-bind.diff
- patch -p1 -i ../sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff
- patch -p1 -i ../sysklogd-1.4.1-caen-owl-klogd-drop-root.diff
-
- patch -p1 -i ../sysklogd-1.5-syslog-func-collision.patch
- sed -i -e "s/-O3/${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE/" \
- -e "s/LDFLAGS= -s/LDFLAGS= ${LDFLAGS}/" Makefile
- sed -i 's/500 -s/755/' Makefile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- install -d "${pkgdir}/usr/sbin" "${pkgdir}"/usr/share/man/{man5,man8}
- make prefix="${pkgdir}" install
- install -D -m644 ../syslog.conf "${pkgdir}/etc/syslog.conf"
- install -D -m644 ../syslog.logrotate "${pkgdir}/etc/logrotate.d/syslog"
- install -D -m755 ../syslogd "${pkgdir}/etc/rc.d/syslogd"
- install -D -m755 ../klogd "${pkgdir}/etc/rc.d/klogd"
- install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/sysklogd/klogd b/extra/sysklogd/klogd
deleted file mode 100755
index 690e13ab4..000000000
--- a/extra/sysklogd/klogd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/klogd`
-case "$1" in
- start)
- stat_busy "Starting Kernel Logger"
- [ -z "$PID" ] && /usr/sbin/klogd -c 4
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon klogd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Kernel Logger"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm -f /var/run/klogd.pid
- rm_daemon klogd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/sysklogd/sysklogd-1.4.1-caen-owl-klogd-drop-root.diff b/extra/sysklogd/sysklogd-1.4.1-caen-owl-klogd-drop-root.diff
deleted file mode 100644
index e2597fe1a..000000000
--- a/extra/sysklogd/sysklogd-1.4.1-caen-owl-klogd-drop-root.diff
+++ /dev/null
@@ -1,161 +0,0 @@
-diff -Naur sysklogd-1.4.1-orig/klogd.8 sysklogd-1.4.1/klogd.8
---- sysklogd-1.4.1-orig/klogd.8 2005-03-11 11:12:09.000000000 -0500
-+++ sysklogd-1.4.1/klogd.8 2005-10-17 23:47:41.615009160 -0400
-@@ -18,6 +19,12 @@
- .RB [ " \-f "
- .I fname
- ]
-+.RB [ " \-u "
-+.I username
-+]
-+.RB [ " \-j "
-+.I chroot_dir
-+]
- .RB [ " \-iI " ]
- .RB [ " \-n " ]
- .RB [ " \-o " ]
-@@ -53,6 +60,20 @@
- .BI "\-f " file
- Log messages to the specified filename rather than to the syslog facility.
- .TP
-+.BI "\-u " username
-+Tells klogd to become the specified user and drop root privileges before
-+starting logging.
-+.TP
-+.BI "\-j " chroot_dir
-+Tells klogd to
-+.BR chroot (2)
-+into this directory after initializing.
-+This option is only valid if the \-u option is also used to run klogd
-+without root privileges.
-+Note that the use of this option will prevent \-i and \-I from working
-+unless you set up the chroot directory in such a way that klogd can still
-+read the kernel module symbols.
-+.TP
- .BI "\-i \-I"
- Signal the currently executing klogd daemon. Both of these switches control
- the loading/reloading of symbol information. The \-i switch signals the
-diff -Naur sysklogd-1.4.1-orig/klogd.c sysklogd-1.4.1/klogd.c
---- sysklogd-1.4.1-orig/klogd.c 2004-04-29 09:29:03.000000000 -0400
-+++ sysklogd-1.4.1/klogd.c 2005-10-17 23:46:05.200556847 -0400
-@@ -261,6 +261,8 @@
- #include <stdarg.h>
- #include <paths.h>
- #include <stdlib.h>
-+#include <pwd.h>
-+#include <grp.h>
- #include "klogd.h"
- #include "ksyms.h"
- #ifndef TESTING
-@@ -311,6 +313,9 @@
- int debugging = 0;
- int symbols_twice = 0;
-
-+char *server_user = NULL;
-+char *chroot_dir = NULL;
-+int log_flags = 0;
-
- /* Function prototypes. */
- extern int ksyslog(int type, char *buf, int len);
-@@ -531,8 +536,9 @@
- * First do a stat to determine whether or not the proc based
- * file system is available to get kernel messages from.
- */
-- if ( use_syscall ||
-- ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT)) )
-+ if (!server_user &&
-+ (use_syscall ||
-+ ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT))))
- {
- /* Initialize kernel logging. */
- ksyslog(1, NULL, 0);
-@@ -980,6 +986,27 @@
- }
-
-
-+static int drop_root(void)
-+{
-+ struct passwd *pw;
-+
-+ if (!(pw = getpwnam(server_user))) return -1;
-+
-+ if (!pw->pw_uid) return -1;
-+
-+ if (chroot_dir) {
-+ if (chroot(chroot_dir)) return -1;
-+ if (chdir("/")) return -1;
-+ }
-+
-+ if (setgroups(0, NULL)) return -1;
-+ if (setgid(pw->pw_gid)) return -1;
-+ if (setuid(pw->pw_uid)) return -1;
-+
-+ return 0;
-+}
-+
-+
- int main(argc, argv)
-
- int argc;
-@@ -997,7 +1024,7 @@
- chdir ("/");
- #endif
- /* Parse the command-line. */
-- while ((ch = getopt(argc, argv, "c:df:iIk:nopsvx2")) != EOF)
-+ while ((ch = getopt(argc, argv, "c:df:u:j:iIk:nopsvx2")) != EOF)
- switch((char)ch)
- {
- case '2': /* Print lines with symbols twice. */
-@@ -1019,6 +1046,10 @@
- case 'I':
- SignalDaemon(SIGUSR2);
- return(0);
-+ case 'j': /* chroot 'j'ail */
-+ chroot_dir = optarg;
-+ log_flags |= LOG_NDELAY;
-+ break;
- case 'k': /* Kernel symbol file. */
- symfile = optarg;
- break;
-@@ -1034,6 +1065,9 @@
- case 's': /* Use syscall interface. */
- use_syscall = 1;
- break;
-+ case 'u': /* Run as this user */
-+ server_user = optarg;
-+ break;
- case 'v':
- printf("klogd %s.%s\n", VERSION, PATCHLEVEL);
- exit (1);
-@@ -1042,6 +1076,10 @@
- break;
- }
-
-+ if (chroot_dir && !server_user) {
-+ fputs("'-j' is only valid with '-u'", stderr);
-+ exit(1);
-+ }
-
- /* Set console logging level. */
- if ( log_level != (char *) 0 )
-@@ -1139,7 +1177,7 @@
- }
- }
- else
-- openlog("kernel", 0, LOG_KERN);
-+ openlog("kernel", log_flags, LOG_KERN);
-
-
- /* Handle one-shot logging. */
-@@ -1166,6 +1204,11 @@
- InitMsyms();
- }
-
-+ if (server_user && drop_root()) {
-+ syslog(LOG_ALERT, "klogd: failed to drop root");
-+ Terminate();
-+ }
-+
- /* The main loop. */
- while (1)
- {
diff --git a/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-bind.diff b/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-bind.diff
deleted file mode 100644
index e79a67d0b..000000000
--- a/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-bind.diff
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -ur sysklogd-1.4.1.orig/sysklogd.8 sysklogd-1.4.1/sysklogd.8
---- sysklogd-1.4.1.orig/sysklogd.8 Sun Mar 11 22:35:51 2001
-+++ sysklogd-1.4.1/sysklogd.8 Mon Oct 8 07:20:31 2001
-@@ -15,6 +15,9 @@
- .I config file
- ]
- .RB [ " \-h " ]
-+.RB [ " \-i "
-+.I IP address
-+]
- .RB [ " \-l "
- .I hostlist
- ]
-@@ -103,8 +106,15 @@
- Specifying this switch on the command line will cause the log daemon to
- forward any remote messages it receives to forwarding hosts which have been
- defined.
- This can cause syslog loops that fill up hard disks quite fast and
- thus needs to be used with caution.
-+.TP
-+.BI "\-i " "IP address"
-+If
-+.B syslogd
-+is configured to accept log input from a UDP port, specify an IP address
-+to bind to, rather than the default of INADDR_ANY. The address must be in
-+dotted quad notation, DNS host names are not allowed.
- .TP
- .BI "\-l " "hostlist"
- Specify a hostname that should be logged only with its simple hostname
-diff -ur sysklogd-1.4.1.orig/syslogd.c sysklogd-1.4.1/syslogd.c
---- sysklogd-1.4.1.orig/syslogd.c Sun Mar 11 22:40:10 2001
-+++ sysklogd-1.4.1/syslogd.c Mon Oct 8 07:24:41 2001
-@@ -736,6 +736,8 @@
- int NoHops = 1; /* Can we bounce syslog messages through an
- intermediate host. */
-
-+char *bind_addr = NULL; /* bind UDP port to this interface only */
-+
- extern int errno;
-
- /* Function prototypes. */
-@@ -829,7 +831,7 @@
- funix[i] = -1;
- }
-
-- while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF)
-+ while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
- switch((char)ch) {
- case 'a':
- if (nfunix < MAXFUNIX)
-@@ -846,9 +848,17 @@
- case 'h':
- NoHops = 0;
- break;
-+ case 'i':
-+ if (bind_addr) {
-+ fprintf(stderr, "Only one -i argument allowed, "
-+ "the first one is taken.\n");
-+ break;
-+ }
-+ bind_addr = optarg;
-+ break;
- case 'l':
- if (LocalHosts) {
-- fprintf (stderr, "Only one -l argument allowed," \
-+ fprintf(stderr, "Only one -l argument allowed, "
- "the first one is taken.\n");
- break;
- }
-@@ -1175,7 +1185,7 @@
- int usage()
- {
- fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
-- " [-s domainlist] [-f conffile]\n");
-+ " [-s domainlist] [-f conffile] [-i IP address]\n");
- exit(1);
- }
-
-@@ -1217,15 +1227,22 @@
- int fd, on = 1;
- struct sockaddr_in sin;
-
-+ memset(&sin, 0, sizeof(sin));
-+ sin.sin_family = AF_INET;
-+ sin.sin_port = LogPort;
-+ if (bind_addr) {
-+ if (!inet_aton(bind_addr, &sin.sin_addr)) {
-+ logerror("syslog: not a valid IP address to bind to.");
-+ return -1;
-+ }
-+ }
-+
- fd = socket(AF_INET, SOCK_DGRAM, 0);
- if (fd < 0) {
- logerror("syslog: Unknown protocol, suspending inet service.");
- return fd;
- }
-
-- memset(&sin, 0, sizeof(sin));
-- sin.sin_family = AF_INET;
-- sin.sin_port = LogPort;
- if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, \
- (char *) &on, sizeof(on)) < 0 ) {
- logerror("setsockopt(REUSEADDR), suspending inet");
diff --git a/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff b/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff
deleted file mode 100644
index b5813c1d2..000000000
--- a/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -ur sysklogd-1.4.1-caen-owl-syslogd-bind/sysklogd.8 sysklogd-1.4.1/sysklogd.8
---- sysklogd-1.4.1-caen-owl-syslogd-bind/sysklogd.8 Mon Oct 8 07:26:27 2001
-+++ sysklogd-1.4.1/sysklogd.8 Mon Oct 8 07:30:31 2001
-@@ -32,6 +32,9 @@
- .RB [ " \-s "
- .I domainlist
- ]
-+.RB [ " \-u"
-+.IB username
-+]
- .RB [ " \-v " ]
- .LP
- .SH DESCRIPTION
-@@ -159,6 +162,19 @@
- is specified and the host logging resolves to satu.infodrom.north.de
- no domain would be cut, you will have to specify two domains like:
- .BR "\-s north.de:infodrom.north.de" .
-+.TP
-+.BI "\-u " "username"
-+This causes the
-+.B syslogd
-+daemon to become the named user before starting up logging.
-+
-+Note that when this option is in use,
-+.B syslogd
-+will open all log files as root when the daemon is first started;
-+however, after a
-+.B SIGHUP
-+the files will be reopened as the non-privileged user. You should
-+take this into account when deciding the ownership of the log files.
- .TP
- .B "\-v"
- Print version and exit.
-diff -ur sysklogd-1.4.1-caen-owl-syslogd-bind/syslogd.c sysklogd-1.4.1/syslogd.c
---- sysklogd-1.4.1-caen-owl-syslogd-bind/syslogd.c Mon Oct 8 07:26:27 2001
-+++ sysklogd-1.4.1/syslogd.c Mon Oct 8 07:40:35 2001
-@@ -491,6 +491,10 @@
- #include <arpa/nameser.h>
- #include <arpa/inet.h>
- #include <resolv.h>
-+
-+#include <pwd.h>
-+#include <grp.h>
-+
- #ifndef TESTING
- #include "pidfile.h"
- #endif
-@@ -737,6 +741,7 @@
- intermediate host. */
-
- char *bind_addr = NULL; /* bind UDP port to this interface only */
-+char *server_user = NULL; /* user name to run server as */
-
- extern int errno;
-
-@@ -778,6 +783,21 @@
- static int create_inet_socket();
- #endif
-
-+static int drop_root(void)
-+{
-+ struct passwd *pw;
-+
-+ if (!(pw = getpwnam(server_user))) return -1;
-+
-+ if (!pw->pw_uid) return -1;
-+
-+ if (initgroups(server_user, pw->pw_gid)) return -1;
-+ if (setgid(pw->pw_gid)) return -1;
-+ if (setuid(pw->pw_uid)) return -1;
-+
-+ return 0;
-+}
-+
- int main(argc, argv)
- int argc;
- char **argv;
-@@ -831,7 +851,7 @@
- funix[i] = -1;
- }
-
-- while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
-+ while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:u:v")) != EOF)
- switch((char)ch) {
- case 'a':
- if (nfunix < MAXFUNIX)
-@@ -884,6 +904,9 @@
- }
- StripDomains = crunch_list(optarg);
- break;
-+ case 'u':
-+ server_user = optarg;
-+ break;
- case 'v':
- printf("syslogd %s.%s\n", VERSION, PATCHLEVEL);
- exit (0);
-@@ -1031,6 +1054,11 @@
- kill (ppid, SIGTERM);
- #endif
-
-+ if (server_user && drop_root()) {
-+ dprintf("syslogd: failed to drop root\n");
-+ exit(1);
-+ }
-+
- /* Main loop begins here. */
- for (;;) {
- int nfds;
-@@ -1185,7 +1213,7 @@
- int usage()
- {
- fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
-- " [-s domainlist] [-f conffile] [-i IP address]\n");
-+ " [-s domainlist] [-f conffile] [-i IP address] [-u username]\n");
- exit(1);
- }
-
diff --git a/extra/sysklogd/sysklogd-1.5-syslog-func-collision.patch b/extra/sysklogd/sysklogd-1.5-syslog-func-collision.patch
deleted file mode 100644
index 76912a265..000000000
--- a/extra/sysklogd/sysklogd-1.5-syslog-func-collision.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-http://bugs.gentoo.org/342601
-
-rename local "syslog" and "vsyslog" functions to avoid conflicts with glibc's
-
-patch by Dmitriy Matrosov
-
---- sysklogd-1.5/klogd.c
-+++ sysklogd-1.5/klogd.c
-@@ -258,7 +262,6 @@
- #if !defined(__GLIBC__)
- #include <linux/time.h>
- #endif /* __GLIBC__ */
--#include <stdarg.h>
- #include <paths.h>
- #include <stdlib.h>
- #include <pwd.h>
-@@ -637,7 +640,7 @@
- }
- argl += 3;
- }
-- syslog(priority, fmt, argl);
-+ syslog_own(priority, fmt, argl);
- va_end(ap);
- #ifdef TESTING
- putchar('\n');
-@@ -646,7 +649,7 @@
- }
-
- va_start(ap, fmt);
-- vsyslog(priority, fmt, ap);
-+ vsyslog_own(priority, fmt, ap);
- va_end(ap);
- #ifdef TESTING
- printf ("\n");
-@@ -1205,7 +1208,7 @@
- }
-
- if (server_user && drop_root()) {
-- syslog(LOG_ALERT, "klogd: failed to drop root");
-+ syslog_own(LOG_ALERT, "klogd: failed to drop root");
- Terminate();
- }
-
---- sysklogd-1.5/klogd.h
-+++ sysklogd-1.5/klogd.h
-@@ -24,6 +24,7 @@
- #include <stdio.h>
- #include <syslog.h>
- #include <string.h>
-+#include <stdarg.h>
-
-
- /* Function prototypes. */
-@@ -38,3 +43,5 @@
- extern char * ExpandKadds(char *, char *);
- extern void SetParanoiaLevel(int);
- extern void Syslog(int priority, char *fmt, ...);
-+extern void syslog_own(int, const char *, ...);
-+extern void vsyslog_own(int, const char *, va_list);
---- sysklogd-1.5/ksym_mod.c
-+++ sysklogd-1.5/ksym_mod.c
-@@ -95,7 +98,6 @@
- #if !defined(__GLIBC__)
- #include <linux/time.h>
- #endif /* __GLIBC__ */
--#include <stdarg.h>
- #include <paths.h>
- #include <linux/version.h>
-
---- sysklogd-1.5/syslog.c
-+++ sysklogd-1.5/syslog.c
-@@ -75,6 +79,10 @@
-
- #define _PATH_LOGNAME "/dev/log"
-
-+
-+void syslog_own(int, const char *, ...);
-+void vsyslog_own(int, const char *, va_list);
-+
- static int LogFile = -1; /* fd for log */
- static int connected; /* have done connect */
- static int LogStat = 0; /* status bits, set by openlog() */
-@@ -82,17 +90,17 @@
- static int LogFacility = LOG_USER; /* default facility code */
-
- void
--syslog(int pri, const char *fmt, ...)
-+syslog_own(int pri, const char *fmt, ...)
- {
- va_list ap;
-
- va_start(ap, fmt);
-- vsyslog(pri, fmt, ap);
-+ vsyslog_own(pri, fmt, ap);
- va_end(ap);
- }
-
- void
--vsyslog(pri, fmt, ap)
-+vsyslog_own(pri, fmt, ap)
- int pri;
- const char *fmt;
- va_list ap;
diff --git a/extra/sysklogd/syslog.conf b/extra/sysklogd/syslog.conf
deleted file mode 100644
index 7b0eae2e2..000000000
--- a/extra/sysklogd/syslog.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# /etc/syslog.conf
-#
-
-*.emerg *
-*.err /var/log/errors
-kern.* /var/log/kernel
-authpriv.*;auth.* /var/log/auth
-mail.* /var/log/mail
-*.info;*.!err;authpriv,auth,mail,kern.none /var/log/messages
-
-# Log everything to vc12
-# *.* /dev/vc/12
-
-# End of file
diff --git a/extra/sysklogd/syslog.logrotate b/extra/sysklogd/syslog.logrotate
deleted file mode 100644
index b3d8d8552..000000000
--- a/extra/sysklogd/syslog.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/messages /var/log/auth /var/log/mail /var/log/errors /var/log/kernel {
- sharedscripts
- postrotate
- /bin/kill -HUP `cat /var/run/syslogd.pid 2>/dev/null` 2> /dev/null || true
- endscript
-}
diff --git a/extra/sysklogd/syslogd b/extra/sysklogd/syslogd
deleted file mode 100755
index 24c81ec8a..000000000
--- a/extra/sysklogd/syslogd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/syslogd`
-case "$1" in
- start)
- stat_busy "Starting System Logger"
- [ -z "$PID" ] && /usr/sbin/syslogd -m 0
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon syslogd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping System Logger"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm -f /var/run/syslogd.pid
- rm_daemon syslogd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-08-07 19:23:32 +0000