Version bump. Added ebuild for stable branch (3.14.x). Reorganized init.d/conf.d/logrotate files to have one set for the stable and one for the devel branch. Is supposed to fix bug #216968.

(Portage version: 2.1.5_rc2)

12 files changed, 281 insertions, 11 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index 644823d0d5bd..f2c287bae7d2 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.1 2008/04/07 21:30:00 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.2 2008/04/09 17:32:54 dev-zero Exp $
+
+*rsyslog-3.17.0 (09 Apr 2008)
+*rsyslog-3.14.1 (09 Apr 2008)
+
+  09 Apr 2008; Tiziano Müller <dev-zero@gentoo.org>
+  -files/3.15/rsyslog.conf, -files/3.15/rsyslog.init,
+  -files/3.15/rsyslog.logrotate, -files/3.15/rsyslog-gentoo.conf,
+  +files/3-devel/rsyslog.conf, +files/3-devel/rsyslog.init,
+  +files/3-stable/rsyslog.conf, +files/3.14.1-implicit_declaration.patch,
+  +files/3-devel/rsyslog.logrotate, +files/3-devel/rsyslog-gentoo.conf,
+  +files/3-stable/rsyslog.init, +files/3-stable/rsyslog.logrotate,
+  +files/3-stable/rsyslog-gentoo.conf, +rsyslog-3.14.1.ebuild,
+  -rsyslog-3.15.0.ebuild, +rsyslog-3.17.0.ebuild:
+  Version bump. Added ebuild for stable branch (3.14.x). Reorganized
+  init.d/conf.d/logrotate files to have one set for the stable and one for
+  the devel branch. Is supposed to fix bug #216968.
 
 *rsyslog-3.15.0 (07 Apr 2008)
 
diff --git a/app-admin/rsyslog/files/3.15/rsyslog-gentoo.conf b/app-admin/rsyslog/files/3-devel/rsyslog-gentoo.conf
index 2ff7d2713e0c..2ff7d2713e0c 100644
--- a/app-admin/rsyslog/files/3.15/rsyslog-gentoo.conf
+++ b/app-admin/rsyslog/files/3-devel/rsyslog-gentoo.conf
diff --git a/app-admin/rsyslog/files/3.15/rsyslog.conf b/app-admin/rsyslog/files/3-devel/rsyslog.conf
index 5abd19260b7a..5abd19260b7a 100644
--- a/app-admin/rsyslog/files/3.15/rsyslog.conf
+++ b/app-admin/rsyslog/files/3-devel/rsyslog.conf
diff --git a/app-admin/rsyslog/files/3.15/rsyslog.init b/app-admin/rsyslog/files/3-devel/rsyslog.init
index d0e74b55edce..888328c4042c 100644
--- a/app-admin/rsyslog/files/3.15/rsyslog.init
+++ b/app-admin/rsyslog/files/3-devel/rsyslog.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/3.15/rsyslog.init,v 1.1 2008/04/07 21:30:01 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/3-devel/rsyslog.init,v 1.1 2008/04/09 17:32:55 dev-zero Exp $
 
 opts="reload"
 
diff --git a/app-admin/rsyslog/files/3.15/rsyslog.logrotate b/app-admin/rsyslog/files/3-devel/rsyslog.logrotate
index 162989140715..674af8bef691 100644
--- a/app-admin/rsyslog/files/3.15/rsyslog.logrotate
+++ b/app-admin/rsyslog/files/3-devel/rsyslog.logrotate
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/3.15/rsyslog.logrotate,v 1.1 2008/04/07 21:30:01 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/3-devel/rsyslog.logrotate,v 1.1 2008/04/09 17:32:55 dev-zero Exp $
 #
 # Syslog-ng logrotate snippet for Gentoo Linux
 #
diff --git a/app-admin/rsyslog/files/3-stable/rsyslog-gentoo.conf b/app-admin/rsyslog/files/3-stable/rsyslog-gentoo.conf
new file mode 100644
index 000000000000..2ff7d2713e0c
--- /dev/null
+++ b/app-admin/rsyslog/files/3-stable/rsyslog-gentoo.conf
@@ -0,0 +1,60 @@
+# rsyslog v3: load input modules
+# If you do not load inputs, nothing happens!
+# You may need to set the module load path if modules are not found.
+
+$ModLoad immark.so # provides --MARK-- message capability
+$ModLoad imuxsock.so # provides support for local system logging (e.g. via logger command)
+$ModLoad imklog.so # kernel logging (formerly provided by rklogd)
+
+# Log all kernel messages to the console.
+# Logging much else clutters up the screen.
+#kern.*                                                 /dev/console
+
+# Log anything (except mail) of level info or higher.
+# Don't log private authentication messages!
+*.info;mail.none;authpriv.none;cron.none                -/var/log/messages
+
+# The authpriv file has restricted access.
+authpriv.*                                              /var/log/secure
+
+# Log all the mail messages in one place.
+mail.*                                                  -/var/log/maillog
+
+
+# Log cron stuff
+cron.*                                                  -/var/log/cron
+
+# Everybody gets emergency messages
+*.emerg                                                 *
+
+# Save news errors of level crit and higher in a special file.
+uucp,news.crit                                          -/var/log/spooler
+
+# Save boot messages also to boot.log
+local7.*                                                /var/log/boot.log
+
+# Remote Logging (we use TCP for reliable delivery)
+# An on-disk queue is created for this action. If the remote host is
+# down, messages are spooled to disk and sent when it is up again.
+#$WorkDirectory /rsyslog/spool # where to place spool files
+#$ActionQueueFileName uniqName # unique name prefix for spool files
+#$ActionQueueMaxDiskSpace 1g   # 1gb space limit (use as much as possible)
+#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
+#$ActionQueueType LinkedList   # run asynchronously
+#$ActionResumeRetryCount -1    # infinety retries if host is down
+# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
+#*.* @@remote-host
+
+
+# ######### Receiving Messages from Remote Hosts ########## 
+# TCP Syslog Server:
+# provides TCP syslog reception and GSS-API (if compiled to support it)
+#$ModLoad imtcp.so  # load module
+# Note: as of now, you need to use the -t command line option to
+# enable TCP reception (e.g. -t514 to run a server at port 514/tcp)
+# This will change in later v3 releases.
+
+# UDP Syslog Server:
+#$ModLoad imudp.so  # provides UDP syslog reception
+#$UDPServerRun 514 # start a UDP syslog server at standard port 514
+
diff --git a/app-admin/rsyslog/files/3-stable/rsyslog.conf b/app-admin/rsyslog/files/3-stable/rsyslog.conf
new file mode 100644
index 000000000000..5abd19260b7a
--- /dev/null
+++ b/app-admin/rsyslog/files/3-stable/rsyslog.conf
@@ -0,0 +1,14 @@
+# Config file for /etc/init.d/rsyslog for Gentoo Linux
+
+CONFIGFILE="/etc/rsyslog.conf"
+
+PIDFILE="/var/run/rsyslogd.pid"
+
+# Options to rsyslogd
+# See rsyslogd(8) for more details
+# Notes:
+# * Do not specify another PIDFILE but use the variable above to change the location
+# * Do not specify another CONFIGFILE but use the variable above to change the location
+# * "-c3" tells rsyslog to _not_ run in sysklogd compatibility mode
+
+RSYSLOG_OPTS="-c3"
diff --git a/app-admin/rsyslog/files/3-stable/rsyslog.init b/app-admin/rsyslog/files/3-stable/rsyslog.init
new file mode 100644
index 000000000000..e478f4ae53bf
--- /dev/null
+++ b/app-admin/rsyslog/files/3-stable/rsyslog.init
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/3-stable/rsyslog.init,v 1.1 2008/04/09 17:32:56 dev-zero Exp $
+
+opts="reload"
+
+start() {
+	ebegin "Starting rsyslogd"
+	start-stop-daemon \
+		--start --quiet --exec /usr/sbin/rsyslogd \
+		-- ${RSYSLOG_OPTS} -i "${PIDFILE}" -f "${CONFIGFILE}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping rsyslogd"
+	start-stop-daemon \
+		--stop --quiet \
+		--pidfile "${PIDFILE}"
+	eend $?
+}
+
+reload() {
+	if [ ! -f "${PIDFILE}" ]; then
+		eerror "rsyslogd not running"
+		return 1
+	fi
+	
+	ebegin "Reloading configuration and re-opening log files"
+	start-stop-daemon --stop --oknodo --signal HUP \
+		--pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/app-admin/rsyslog/files/3-stable/rsyslog.logrotate b/app-admin/rsyslog/files/3-stable/rsyslog.logrotate
new file mode 100644
index 000000000000..44772728d420
--- /dev/null
+++ b/app-admin/rsyslog/files/3-stable/rsyslog.logrotate
@@ -0,0 +1,11 @@
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/3-stable/rsyslog.logrotate,v 1.1 2008/04/09 17:32:56 dev-zero Exp $
+#
+# Syslog-ng logrotate snippet for Gentoo Linux
+#
+
+/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log {
+    sharedscripts
+    postrotate
+        /etc/init.d/rsyslog reload > /dev/null 2>&1 || true
+    endscript
+}
diff --git a/app-admin/rsyslog/files/3.14.1-implicit_declaration.patch b/app-admin/rsyslog/files/3.14.1-implicit_declaration.patch
new file mode 100644
index 000000000000..e5a54cae5179
--- /dev/null
+++ b/app-admin/rsyslog/files/3.14.1-implicit_declaration.patch
@@ -0,0 +1,43 @@
+diff -Naur rsyslog-3.14.1.orig/obj.c rsyslog-3.14.1/obj.c
+--- rsyslog-3.14.1.orig/obj.c	2008-04-09 10:13:36.000000000 +0200
++++ rsyslog-3.14.1/obj.c	2008-04-09 10:14:49.000000000 +0200
+@@ -85,6 +85,7 @@
+ #include "stream.h"
+ #include "modules.h"
+ #include "errmsg.h"
++#include "cfsysline.h"
+ 
+ /* static data */
+ DEFobjCurrIf(obj) /* we define our own interface, as this is expected by some macros! */
+@@ -1328,7 +1329,7 @@
+ 
+ 	/* init classes we use (limit to as few as possible!) */
+ 	CHKiRet(errmsgClassInit(pModInfo));
+-	CHKiRet(cfsyslineInit(pModInfo));
++	CHKiRet(cfsyslineInit());
+ 	CHKiRet(varClassInit(pModInfo));
+ 	CHKiRet(moduleClassInit(pModInfo));
+ 	CHKiRet(objUse(var, CORE_COMPONENT));
+diff -Naur rsyslog-3.14.1.orig/stringbuf.h rsyslog-3.14.1/stringbuf.h
+--- rsyslog-3.14.1.orig/stringbuf.h	2008-04-09 10:13:36.000000000 +0200
++++ rsyslog-3.14.1/stringbuf.h	2008-04-09 10:14:02.000000000 +0200
+@@ -161,4 +161,7 @@
+ 
+ #define rsCStrGetBufBeg(x) ((x)->pBuf)
+ 
++rsRetVal strInit();
++rsRetVal strExit();
++
+ #endif /* single include */
+diff -Naur rsyslog-3.14.1.orig/template.h rsyslog-3.14.1/template.h
+--- rsyslog-3.14.1.orig/template.h	2008-04-09 10:13:36.000000000 +0200
++++ rsyslog-3.14.1/template.h	2008-04-09 10:17:03.000000000 +0200
+@@ -111,6 +111,8 @@
+ rsRetVal tplToString(struct template *pTpl, msg_t *pMsg, uchar** ppSz);
+ void doSQLEscape(uchar **pp, size_t *pLen, unsigned short *pbMustBeFreed, int escapeMode);
+ 
++rsRetVal templateInit();
++
+ #endif /* #ifndef TEMPLATE_H_INCLUDED */
+ /* vim:set ai:
+  */
diff --git a/app-admin/rsyslog/rsyslog-3.15.0.ebuild b/app-admin/rsyslog/rsyslog-3.14.1.ebuild
index 1a5bbed7d431..8be90c882ec6 100644
--- a/app-admin/rsyslog/rsyslog-3.15.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-3.14.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-3.15.0.ebuild,v 1.1 2008/04/07 21:30:00 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-3.14.1.ebuild,v 1.1 2008/04/09 17:32:54 dev-zero Exp $
 
-inherit versionator
+inherit eutils versionator
 
 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more."
 HOMEPAGE="http://www.rsyslog.com/"
@@ -21,12 +21,19 @@ DEPEND="kerberos? ( virtual/krb5 )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
-MAJOR_PV="$(get_version_component_range 1-2)"
+BRANCH="3-stable"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PV}-implicit_declaration.patch"
+}
 
 src_compile() {
 	# Maintainer notes:
 	# * rsyslog-3 doesn't support single threading anymore
-	# * rc3195 needs a library
+	# * rfc3195 needs a library
 	econf \
 		--enable-largefile \
 		--enable-regexp \
@@ -67,11 +74,11 @@ src_install() {
 	dohtml doc/*
 
 	insinto /etc
-	newins "${FILESDIR}/${MAJOR_PV}/rsyslog-gentoo.conf" rsyslog.conf
+	newins "${FILESDIR}/${BRANCH}/rsyslog-gentoo.conf" rsyslog.conf
 
 	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${MAJOR_PV}/rsyslog.logrotate" rsyslog
+	newins "${FILESDIR}/${BRANCH}/rsyslog.logrotate" rsyslog
 
-	newconfd "${FILESDIR}/${MAJOR_PV}/rsyslog.conf" rsyslog
-	newinitd "${FILESDIR}/${MAJOR_PV}/rsyslog.init" rsyslog
+	newconfd "${FILESDIR}/${BRANCH}/rsyslog.conf" rsyslog
+	newinitd "${FILESDIR}/${BRANCH}/rsyslog.init" rsyslog
 }
diff --git a/app-admin/rsyslog/rsyslog-3.17.0.ebuild b/app-admin/rsyslog/rsyslog-3.17.0.ebuild
new file mode 100644
index 000000000000..0f9f891c0bec
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-3.17.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-3.17.0.ebuild,v 1.1 2008/04/09 17:32:54 dev-zero Exp $
+
+inherit eutils versionator
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more."
+HOMEPAGE="http://www.rsyslog.com/"
+SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos dbi mysql postgres relp snmp zlib"
+
+DEPEND="kerberos? ( virtual/krb5 )
+	dbi? ( dev-db/libdbi )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/libpq )
+	relp? ( >=dev-libs/librelp-0.1.1 )
+	snmp? ( net-analyzer/net-snmp )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+BRANCH="3-devel"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/3.14.1-implicit_declaration.patch"
+}
+
+src_compile() {
+	# Maintainer notes:
+	# * rsyslog-3 doesn't support single threading anymore
+	# * rfc3195 needs a library
+	econf \
+		--enable-largefile \
+		--enable-regexp \
+		$(use_enable zlib) \
+		$(use_enable kerberos gssapi-krb5) \
+		--enable-pthreads \
+		--enable-klog \
+		--enable-unix \
+		--enable-inet \
+		--enable-fsstnd \
+		$(use_enable debug) \
+		$(use_enable debug rtinst) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable dbi libdbi) \
+		$(use_enable snmp) \
+		--enable-rsyslogd \
+		--enable-mail \
+		$(use_enable relp) \
+		--disable-rfc3195 \
+		--enable-imfile \
+		--disable-imtemplate
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	insinto /usr/share/doc/${PF}/scripts/mysql
+	doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
+
+	insinto /usr/share/doc/${PF}/scripts/pgsql
+	doins plugins/ompgsql/createDB.sql
+
+	elog "SQL scripts to create the tables for MySQL or PostgreSQL have been installed to:"
+	elog "  /usr/share/doc/${PF}/scripts"
+
+	dodoc AUTHORS ChangeLog doc/rsyslog-example.conf
+	dohtml doc/*
+
+	insinto /etc
+	newins "${FILESDIR}/${BRANCH}/rsyslog-gentoo.conf" rsyslog.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/rsyslog.logrotate" rsyslog
+
+	newconfd "${FILESDIR}/${BRANCH}/rsyslog.conf" rsyslog
+	newinitd "${FILESDIR}/${BRANCH}/rsyslog.init" rsyslog
+}