Removed deprecated --oknodo option (bug #379515). Replaced deprecated opts variable and removed --stop option from reload function

(Portage version: 2.2.0_alpha56/cvs/Linux x86_64)

3 files changed, 141 insertions, 1 deletions

diff --git a/app-admin/sysklogd/ChangeLog b/app-admin/sysklogd/ChangeLog
index 71927600cad3..39606840a6a0 100644
--- a/app-admin/sysklogd/ChangeLog
+++ b/app-admin/sysklogd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/sysklogd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.73 2011/04/07 07:51:22 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.74 2011/09/14 22:22:57 polynomial-c Exp $
+
+*sysklogd-1.5-r2 (14 Sep 2011)
+
+  14 Sep 2011; Lars Wendler <polynomial-c@gentoo.org> +sysklogd-1.5-r2.ebuild,
+  +files/sysklogd.rc7:
+  non-maintainer commit: Removed deprecated --oknodo option (bug #379515).
+  Replaced deprecated opts variable and removed --stop option from reload
+  function. All done with kind permission from vapier.
 
   07 Apr 2011; Ultrabug <ultrabug@gentoo.org>
   sysklogd-1.4.2_pre20061230-r2.ebuild, sysklogd-1.5.ebuild,
diff --git a/app-admin/sysklogd/files/sysklogd.rc7 b/app-admin/sysklogd/files/sysklogd.rc7
new file mode 100644
index 000000000000..35721a961b15
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.rc7
@@ -0,0 +1,75 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/files/sysklogd.rc7,v 1.1 2011/09/14 22:22:57 polynomial-c Exp $
+
+extra_started_commands="reload"
+
+depend() {
+	need clock hostname
+	provide logger
+}
+
+start_daemon() {
+	local retval=0
+	local daemon="$1"
+	local options="$2"
+
+	[ -z "${daemon}" ] && return 1
+
+	ebegin "sysklogd -> start: ${daemon}"
+	start-stop-daemon --start --exec /usr/sbin/"${daemon}" \
+		--pidfile /var/run/"${daemon}".pid -- ${options}
+	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 ! start_daemon "klogd" "${KLOGD}" ; then
+		stop_daemon "syslogd"
+		return 1
+	fi
+
+	return 0
+}
+
+stop() {
+	stop_daemon "klogd" || return 1
+	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} + $?))
+	start-stop-daemon --signal USR1 --pidfile /var/run/klogd.pid
+	ret=$((${ret} + $?))
+
+	eend ${ret}
+}
diff --git a/app-admin/sysklogd/sysklogd-1.5-r2.ebuild b/app-admin/sysklogd/sysklogd-1.5-r2.ebuild
new file mode 100644
index 000000000000..12b65bde5e3e
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-1.5-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.5-r2.ebuild,v 1.1 2011/09/14 22:22:57 polynomial-c Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DEB_VER="6"
+DESCRIPTION="Standard log daemons"
+HOMEPAGE="http://www.infodrom.org/projects/sysklogd/"
+SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
+	mirror://debian/pool/main/s/sysklogd/${PN}_${PV}-${DEB_VER}.diff.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	sys-apps/debianutils"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${WORKDIR}"/${PN}_${PV}-${DEB_VER}.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-debian-cron.patch
+	epatch "${FILESDIR}"/${P}-build.patch
+
+	# CAEN/OWL security patches
+	epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-bind.diff
+	epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-drop-root.diff
+	epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-klogd-drop-root.diff
+
+	epatch "${FILESDIR}"/${P}-syslog-func-collision.patch #342601
+
+	append-lfs-flags
+}
+
+src_compile() {
+	tc-export CC
+	emake || die
+}
+
+src_install() {
+	dosbin syslogd klogd debian/syslog-facility debian/syslogd-listfiles || die "dosbin"
+	doman *.[1-9] debian/syslogd-listfiles.8
+	insinto /etc
+	doins debian/syslog.conf || die
+	exeinto /etc/cron.daily
+	newexe debian/cron.daily syslog || die
+	exeinto /etc/cron.weekly
+	newexe debian/cron.weekly syslog || die
+	dodoc ANNOUNCE CHANGES NEWS README.1st README.linux
+	newinitd "${FILESDIR}"/sysklogd.rc7 sysklogd
+	newconfd "${FILESDIR}"/sysklogd.confd sysklogd
+}