Version bump, cleaned up the old versions due to a couple of serious bugs. Added GnuTLS USE flag for the devel-branch. Changed dependency for postgresql to virtual/postgresql-base.

(Portage version: 2.1.5_rc7)

6 files changed, 39 insertions, 135 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index a4ef1468abd2..9ecfc0ecc8e4 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,17 @@
 # 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.4 2008/05/14 20:35:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.5 2008/05/19 16:13:44 dev-zero Exp $
+
+*rsyslog-3.19.2 (19 May 2008)
+*rsyslog-3.16.1 (19 May 2008)
+
+  19 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  -files/3.14.1-implicit_declaration.patch, +files/3.19.2-as_needed.patch,
+  -rsyslog-3.14.1.ebuild, -rsyslog-3.16.0.ebuild, +rsyslog-3.16.1.ebuild,
+  -rsyslog-3.17.1.ebuild, +rsyslog-3.19.2.ebuild:
+  Version bump, cleaned up the old versions due to a couple of serious bugs.
+  Added GnuTLS USE flag for the devel-branch. Changed dependency for
+  postgresql to virtual/postgresql-base.
 
   14 May 2008; Markus Meier <maekke@gentoo.org> rsyslog-3.16.0.ebuild,
   rsyslog-3.17.1.ebuild:
diff --git a/app-admin/rsyslog/files/3.14.1-implicit_declaration.patch b/app-admin/rsyslog/files/3.14.1-implicit_declaration.patch
deleted file mode 100644
index e5a54cae5179..000000000000
--- a/app-admin/rsyslog/files/3.14.1-implicit_declaration.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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/files/3.19.2-as_needed.patch b/app-admin/rsyslog/files/3.19.2-as_needed.patch
new file mode 100644
index 000000000000..9f0737e160d4
--- /dev/null
+++ b/app-admin/rsyslog/files/3.19.2-as_needed.patch
@@ -0,0 +1,12 @@
+diff -Naur rsyslog-3.19.2.orig/runtime/Makefile.am rsyslog-3.19.2/runtime/Makefile.am
+--- rsyslog-3.19.2.orig/runtime/Makefile.am	2008-05-19 17:51:23.000000000 +0200
++++ rsyslog-3.19.2/runtime/Makefile.am	2008-05-19 17:54:26.000000000 +0200
+@@ -67,7 +67,7 @@
+ 
+ librsyslog_la_CPPFLAGS = -D_PATH_MODDIR=\"$(pkglibdir)/\" -I$(top_srcdir) $(pthreads_cflags)
+ #librsyslog_la_LDFLAGS = -module -avoid-version
+-librsyslog_la_LIBADD = 
++librsyslog_la_LIBADD = -ldl -lrt
+ 
+ #
+ # regular expression support
diff --git a/app-admin/rsyslog/rsyslog-3.14.1.ebuild b/app-admin/rsyslog/rsyslog-3.14.1.ebuild
deleted file mode 100644
index 8be90c882ec6..000000000000
--- a/app-admin/rsyslog/rsyslog-3.14.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.14.1.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 )
-	snmp? ( net-analyzer/net-snmp )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-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
-	# * 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 \
-		$(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
-}
diff --git a/app-admin/rsyslog/rsyslog-3.16.0.ebuild b/app-admin/rsyslog/rsyslog-3.16.1.ebuild
index 98b1e1a3f7cc..cc2494913581 100644
--- a/app-admin/rsyslog/rsyslog-3.16.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-3.16.1.ebuild
@@ -1,6 +1,6 @@
 # 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.16.0.ebuild,v 1.2 2008/05/14 20:35:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-3.16.1.ebuild,v 1.1 2008/05/19 16:13:44 dev-zero Exp $
 
 inherit eutils versionator
 
@@ -15,7 +15,7 @@ IUSE="debug kerberos dbi mysql postgres relp snmp zlib"
 DEPEND="kerberos? ( virtual/krb5 )
 	dbi? ( dev-db/libdbi )
 	mysql? ( virtual/mysql )
-	postgres? ( dev-db/libpq )
+	postgres? ( virtual/postgresql-base )
 	relp? ( dev-libs/librelp )
 	snmp? ( net-analyzer/net-snmp )
 	zlib? ( sys-libs/zlib )"
diff --git a/app-admin/rsyslog/rsyslog-3.17.1.ebuild b/app-admin/rsyslog/rsyslog-3.19.2.ebuild
index caac6185a5b5..3a0028c3188a 100644
--- a/app-admin/rsyslog/rsyslog-3.17.1.ebuild
+++ b/app-admin/rsyslog/rsyslog-3.19.2.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.17.1.ebuild,v 1.2 2008/05/14 20:35:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-3.19.2.ebuild,v 1.1 2008/05/19 16:13:44 dev-zero Exp $
 
-inherit eutils versionator
+inherit autotools eutils versionator
 
 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more."
 HOMEPAGE="http://www.rsyslog.com/"
@@ -10,12 +10,13 @@ SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug kerberos dbi mysql postgres relp snmp zlib"
+IUSE="debug kerberos dbi gnutls mysql postgres relp snmp zlib"
 
 DEPEND="kerberos? ( virtual/krb5 )
 	dbi? ( dev-db/libdbi )
+	gnutls? ( net-libs/gnutls )
 	mysql? ( virtual/mysql )
-	postgres? ( dev-db/libpq )
+	postgres? ( virtual/postgresql-base )
 	relp? ( >=dev-libs/librelp-0.1.1 )
 	snmp? ( net-analyzer/net-snmp )
 	zlib? ( sys-libs/zlib )"
@@ -23,6 +24,13 @@ RDEPEND="${DEPEND}"
 
 BRANCH="3-devel"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-as_needed.patch"
+	eautomake
+}
+
 src_compile() {
 	# Maintainer notes:
 	# * rsyslog-3 doesn't support single threading anymore
@@ -51,7 +59,7 @@ src_compile() {
 		--disable-rfc3195 \
 		--enable-imfile \
 		--disable-imtemplate \
-		--disable-openssl
+		$(use_enable gnutls)
 	emake || die "emake failed"
 }