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

Package-Manager: portage-2.2.0_alpha56/cvs/Linux x86_64

4 files changed, 159 insertions, 7 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/Manifest b/app-admin/sysklogd/Manifest
index 00a5aa00cc93..8c1238ff9945 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX sysklogd-1.4.1-accept.patch 292 RMD160 27b857446e00e6f90576efebccc5c5d316978758 SHA1 3cb2a4e61a53d8f217b6eaa05822d1910fa34e26 SHA256 b0aca8d3a1c3421348f74be265aa4c9b2528c9114bd22a0b849a9efcef37e1d3
 AUX sysklogd-1.4.1-caen-owl-klogd-drop-root.diff 4320 RMD160 f3eff69313d7cd804ad0ce1b5aee7ac13e6fc47d SHA1 81c28ccbf5eb86ccfee983ed668372e9f92d110a SHA256 c09d92c25b9c99b9dc16aee67fdb59bb4f97784a8552eae92f53b3fe5aa3772e
@@ -16,6 +16,7 @@ AUX sysklogd-1.5-debian-cron.patch 954 RMD160 c9a03f6cf1b6c1cd82b1fb01b36fc2d265
 AUX sysklogd-1.5-syslog-func-collision.patch 2273 RMD160 e3a1e10411dc4a24b11be43f4abf91af3f6cfb8d SHA1 826e76a59834868658eb9f8d8f3aabd8bf748759 SHA256 e035765eb6d7f013d42d872dc0561deac52dccaf00fa26e21504891b3e0ae14a
 AUX sysklogd.confd 113 RMD160 08edc849adba1b6678832f50fb822b6338c464d5 SHA1 edb73eace5bdf91f8557cae95ca6ea1c62772f27 SHA256 11a1eeb9edd09639d5143227bada137945822b23c5abb88fec5ebaef064b991d
 AUX sysklogd.rc6 1575 RMD160 963226c78967f912735d9fc32945d71a9fcae04e SHA1 e37b494fa7580c7035784cb7e9193e5310eedc4c SHA256 d62ddc4d2750dca70c577f497bde69e30d9d258f709326aa4ecb8d75995f78a9
+AUX sysklogd.rc7 1564 RMD160 a3901998d4eb7d7f8ba53c6200f5f38fd5612df9 SHA1 4a8b7592ba6b4c49896788c39ba29098961394c2 SHA256 c0d23c3c09c7b71510a6b6571c2729b7d9b6a7e1bfbc224da8750d99f94b3907
 AUX syslog-cron 658 RMD160 e157e9ca0592bca51c626c11d86ab889cdf4f684 SHA1 89b6f7bc2d8e1870eb6ef55e1138080cae7b55d6 SHA256 cdf96a7283b8fcf51797ff3483393b25f658979015b46aa570c22da719b7bf8c
 AUX syslog.conf 2332 RMD160 1b3ee0e7bee6098849379fe7cbb31101f401c9bb SHA1 48713c205b4b6032c49bb55e607c3051d380d24d SHA256 1b5f4782d958760de5842a34471676892624df8e972c07148d598bb7128b79e8
 AUX syslogd-listfiles 2759 RMD160 c5991ba76e451ca43a1cf7d92addda8dec15055c SHA1 02c83fad8baccebec3e169a43c4c68ef974e83da SHA256 8622d5efba7bcbaa912f689cde94d6d331dfd1b53701be7bf6bfc06e57fe3a98
@@ -27,13 +28,24 @@ DIST sysklogd_1.5-3.diff.gz 24368 RMD160 347d67d23de1435c28498b737a17754f59e2b7f
 DIST sysklogd_1.5-6.diff.gz 25677 RMD160 63da0226c790325d86536a285242a931d0387c9f SHA1 08c083e17c85c5d67fed5dda89923610985b258d SHA256 1c5366865bd058530071a6071c317ab3562f33f4b0f3a934878cb97059fde20a
 EBUILD sysklogd-1.4.2_pre20061230-r2.ebuild 1845 RMD160 9ae0ddd0c670b5e65cba973837d67905143faa12 SHA1 18fa0f51066115c50c891da6df79798e561ea539 SHA256 cc7634ea2bd49a1ef042994cb60de73110dee195154778559d733dee228a3a91
 EBUILD sysklogd-1.5-r1.ebuild 1694 RMD160 ba99ee1bb5aa4f34fe8fdc5e58a28181badc2837 SHA1 5003813d5ca8367887f962049564141519ed87e2 SHA256 3c0c30f801b98b8be0ab302e23dba661ddca0bf2b491580bdf2c152a32913de8
+EBUILD sysklogd-1.5-r2.ebuild 1698 RMD160 c49657064dc883335572c760c914e600fad2287b SHA1 4c6fa0064515716ebce36d5c3ea3e82177e80f89 SHA256 96590feb081625724ce948397f898e5020bb3eabf50ac092d237d896ba6d92ba
 EBUILD sysklogd-1.5.ebuild 1627 RMD160 21f69eede1b70c40a9b1bda20a04c3522451021b SHA1 4114e642d4f5a580a413294e372006b09afb4d00 SHA256 ab3a47fa9e126c8d31f8859f482d494f8a7862994208e5e476f95c3d53669b2f
-MISC ChangeLog 11200 RMD160 a31fcb043e671ce40dcfe9ea93df52f6293e0e73 SHA1 625b2a304d79abcdcad95886922f5698b7f8ad8c SHA256 aa195ea057f8ef4d2e5af20f048ab5bee7db624f313b95a6084f15ee476283be
+MISC ChangeLog 11543 RMD160 1e2688056a9756491aa01d1e83db5463dcf34aca SHA1 1f64211e2bd22e72f3ff748c361ec61c226bcee8 SHA256 d31e93ec005cb78a860429e10f3ec6c0e790f7e5b4d04b84ee4368b76735231b
 MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk2dbQQACgkQKiQSS7ZY+hMXOQEAo32xEIJUlDnUuIQeyyWcUEqA
-U4amG3OL0aGP4SGWXXkBANNUNgEKJ2ONhWNepohpryq29iZEBkk2I7qA5aSbYpRO
-=yqHn
+iQIcBAEBCgAGBQJOcSlGAAoJEPiazRVxLXTFBKIQAKaQbbBeOpaRQ5jSsAEQGepM
+0I6+USzA0nXQYXh2/Owkd+tTMNEvK7s/8Qih901bJlacgpd1i5+YoAMOOKiqKzeK
+WObiMs6UPUwmPGUA29PBEpowKrKrddtwVItHWYoPq6+IHgdMQm3NJ8mCxfIri3xB
+l6uSEnDTPHSW1OEyh/EumK4BCcaLaeDzP1QcVoCscQVOkdyy+Hpf9U3mdIuwRkoh
+mCRj70/dggZh3f/nF93hq2nTmkCJLgB0zNmIvvojS/9rVfQ6cxHBpoEbV3pKoljw
+HUnX26NZNcdy0eEvJWc4eY1ASDMjHqCtqMRRg+WnRz4zxMCDmeRRepzYgIegfods
+/9HjqqH+b1Mq+x4AcuKzCNZYOJXSyStqgBOv2FBf/YPBTuQg19L5FWHece1cDaQk
+roWEiDV6hPgBsi4H37Lzn6ME6wJOT/qSAcDdeg5tBmxIeR5/y1P6WasbuKlyPCs8
+HHLksjLO7UH00S3QBIe1+rXxikKJ1Y3xj/xTu4MWftrQzWfttJo+myNh2YAYW/Px
+nY74yYWQu6Mk/klAZQkB+2KeZfznFWmgPqPp5G/F/8DFdE5bXoL+d2czPGAywj8r
+udcdVBlkhBoCnXW8yXlSH9tWJ2/k8KoYL4j1FQuHd2tClHAk3bZVAzojxwIYSjMJ
+7osT8+PqlKqKzDGJ0TQ1
+=02Y4
 -----END PGP SIGNATURE-----
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
+}