From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 15 Jan 2020 15:51:32 +0000
Subject: gentoo resync : 15.01.2020

---
 app-admin/sysklogd/files/sysklogd.confd3 |  3 +
 app-admin/sysklogd/files/sysklogd.rc10   | 20 +++++++
 app-admin/sysklogd/files/sysklogd.rc8    | 94 --------------------------------
 3 files changed, 23 insertions(+), 94 deletions(-)
 create mode 100644 app-admin/sysklogd/files/sysklogd.confd3
 create mode 100644 app-admin/sysklogd/files/sysklogd.rc10
 delete mode 100644 app-admin/sysklogd/files/sysklogd.rc8

(limited to 'app-admin/sysklogd/files')

diff --git a/app-admin/sysklogd/files/sysklogd.confd3 b/app-admin/sysklogd/files/sysklogd.confd3
new file mode 100644
index 000000000000..d897c9e25282
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.confd3
@@ -0,0 +1,3 @@
+# Config file for /etc/init.d/sysklogd
+
+SYSLOGD="-m 0 -s -s -r 10M:10"
diff --git a/app-admin/sysklogd/files/sysklogd.rc10 b/app-admin/sysklogd/files/sysklogd.rc10
new file mode 100644
index 000000000000..749f87f08be6
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.rc10
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_started_commands="reload"
+pidfile="/run/${RC_SVCNAME}.pid"
+command="/usr/sbin/syslogd"
+command_background="true"
+command_args="-F ${SYSLOGD}"
+
+depend() {
+	need clock hostname
+	provide logger
+}
+
+reload() {
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --pidfile ${pidfile}
+	eend $?
+}
diff --git a/app-admin/sysklogd/files/sysklogd.rc8 b/app-admin/sysklogd/files/sysklogd.rc8
deleted file mode 100644
index 920ab9633264..000000000000
--- a/app-admin/sysklogd/files/sysklogd.rc8
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-depend() {
-	need clock hostname
-	provide logger
-}
-
-has_klogd() {
-	[ -x "/usr/sbin/klogd" ]
-}
-
-start_daemon() {
-	local retval=0
-	local daemon="$1"
-	local options="$2"
-	local fg_opt=""
-
-	case "${daemon}" in
-		syslogd)
-			fg_opt="-F"
-		;;
-		klogd)
-			fgopt="-n"
-		;;
-		*)
-			return 1
-		;;
-	esac
-
-	ebegin "sysklogd -> start: ${daemon}"
-	start-stop-daemon --start --exec /usr/sbin/"${daemon}" \
-		-b -m --pidfile /var/run/"${daemon}".pid \
-		-- ${options} ${fg_opt}
-	retval=$?
-	eend ${retval} "Failed to start ${daemon}"
-
-	return ${retval}
-}
-
-stop_daemon() {
-	local retval=0
-	local daemon="$1"
-
-	[ -z "${daemon}" ] && return 1
-	
-	ebegin "sysklogd -> stop: ${daemon}"
-	# syslogd can be stubborn some times (--retry 15)...
-	start-stop-daemon --stop --retry 15 --quiet --pidfile /var/run/"${daemon}".pid
-	retval=$?
-	eend ${retval} "Failed to stop ${daemon}"
-
-	return ${retval}
-}
-
-start() {
-	start_daemon "syslogd" "${SYSLOGD}" || return 1
-
-	# klogd do not always start proper if started too early
-	sleep 1
-
-	if has_klogd && ! start_daemon "klogd" "${KLOGD}" ; then
-		stop_daemon "syslogd"
-		return 1
-	fi
-
-	return 0
-}
-
-stop() {
-	if has_klogd ; then
-		stop_daemon "klogd" || return 1
-	fi
-	stop_daemon "syslogd" || return 1 
-	return 0
-}
-
-reload() {
-	local ret=0
-
-	ebegin "Reloading configuration"
-
-	start-stop-daemon --signal HUP --pidfile /var/run/syslogd.pid
-	ret=$((${ret} + $?))
-	if has_klogd ; then
-		start-stop-daemon --signal USR1 --pidfile /var/run/klogd.pid
-		ret=$((${ret} + $?))
-	fi
-
-	eend ${ret}
-}
-- 
cgit v1.2.3