Init script handles baselayout 1 & 2, fix #373913. Version bump wrt #381637, drop old. Add optional zeromq support to rsyslog.

(Portage version: 2.1.10.11/cvs/Linux x86_64)

4 files changed, 39 insertions, 9 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index b41f51462f7f..620e3ae9501d 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.52 2011/08/03 07:45:11 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.53 2011/09/05 09:25:41 ultrabug Exp $
+
+*rsyslog-5.8.5 (05 Sep 2011)
+
+  05 Sep 2011; Ultrabug <ultrabug@gentoo.org> files/5-stable/rsyslog.initd,
+  -rsyslog-5.8.1.ebuild, +rsyslog-5.8.5.ebuild, metadata.xml:
+  Init script handles baselayout 1 & 2, fix #373913 thanks to Martin Dummer for
+  reporting. Version bump wrt #381637 and drop old vulnerable version. Add
+  optional zeromq support to rsyslog.
 
 *rsyslog-5.8.3 (03 Aug 2011)
 
diff --git a/app-admin/rsyslog/files/5-stable/rsyslog.initd b/app-admin/rsyslog/files/5-stable/rsyslog.initd
index 68ff86c06ec8..98dee94b5fb8 100644
--- a/app-admin/rsyslog/files/5-stable/rsyslog.initd
+++ b/app-admin/rsyslog/files/5-stable/rsyslog.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.1 2010/10/21 07:38:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.2 2011/09/05 09:25:41 ultrabug Exp $
 
 opts="reload"
 
@@ -31,8 +31,13 @@ reload() {
 		return 1
 	fi
 
+	# Baselayout-1 users still use --stop and --oknodo
+	local USEROPT="--name rsyslogd"
+	if [ ! -f /etc/init.d/sysfs ]; then
+		USEROPT="--stop --oknodo"
+	fi
+
 	ebegin "Re-opening rsyslogd log files"
-	start-stop-daemon --stop --oknodo --signal HUP \
-		--pidfile "${PIDFILE}"
+	start-stop-daemon --signal HUP --pidfile "${PIDFILE}" ${USEROPT}
 	eend $?
 }
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index b3cbe0f83bf2..2979a3de236d 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -13,7 +13,8 @@
   <description>co-maintainer</description>
 </maintainer>
 <use>
-	<flag name='relp'>Add support for the Reliable Event Logging Protocol using <pkg>dev-libs/librelp</pkg></flag>
 	<flag name='extras'>Add support for the UDP spoofing module (omudpspoof) using <pkg>net-libs/libnet</pkg></flag>
+	<flag name='relp'>Add support for the Reliable Event Logging Protocol using <pkg>dev-libs/librelp</pkg></flag>
+	<flag name='zeromq'>Add support for the ZeroMQ input and output plugins using <pkg>net-libs/zeromq</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/app-admin/rsyslog/rsyslog-5.8.1.ebuild b/app-admin/rsyslog/rsyslog-5.8.5.ebuild
index ded989d658df..ba042a9f5a1a 100644
--- a/app-admin/rsyslog/rsyslog-5.8.1.ebuild
+++ b/app-admin/rsyslog/rsyslog-5.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.1.ebuild,v 1.1 2011/05/23 08:01:54 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.5.ebuild,v 1.1 2011/09/05 09:25:41 ultrabug Exp $
 
 EAPI=4
 
@@ -8,12 +8,13 @@ inherit autotools-utils systemd
 
 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more."
 HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz"
+SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+	zeromq?	( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> ${PN}-zeromq.tar.gz )"
 
 LICENSE="GPL-3 LGPL-3"
 KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
 SLOT="0"
-IUSE="dbi debug doc extras gnutls kerberos mysql oracle postgres relp snmp static-libs zlib"
+IUSE="dbi debug doc extras gnutls kerberos mysql oracle postgres relp snmp static-libs zeromq zlib"
 
 DEPEND="dbi? ( dev-db/libdbi )
 	extras? ( net-libs/libnet )
@@ -24,6 +25,7 @@ DEPEND="dbi? ( dev-db/libdbi )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	relp? ( >=dev-libs/librelp-0.1.3 )
 	snmp? ( net-analyzer/net-snmp )
+	zeromq? ( net-libs/zeromq )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
@@ -38,6 +40,18 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 
 DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
 
+src_prepare() {
+	# Maintainer notes:
+	# ZeroMQ support, for now it is done by hand until upstream process bug.
+	# Bugzilla : http://bugzilla.adiscon.com/show_bug.cgi?id=277
+	if use zeromq; then
+		local ZEROPATH=${WORKDIR}/aggregateknowledge-rsyslog-zeromq-44b551a
+		epatch ${ZEROPATH}/rsyslog-zeromq.patch
+		cp -r "${ZEROPATH}/{i,o}mzeromq" "${S}/plugins"
+		eautoreconf
+	fi
+}
+
 src_configure() {
 	# Maintainer notes:
 	# * rfc3195 needs a library and development of that library
@@ -82,6 +96,8 @@ src_configure() {
 		$(use_enable debug diagtools)
 		$(use_enable debug memcheck)
 		$(use_enable debug valgrind)
+		$(use_enable zeromq imzeromq)
+		$(use_enable zeromq omzeromq)
 	)
 
 	systemd_to_myeconfargs