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.

Package-Manager: portage-2.1.5_rc7

7 files changed, 45 insertions, 153 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/Manifest b/app-admin/rsyslog/Manifest
index 6faea1d4c1cd..daadbae6822e 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3-devel/rsyslog-gentoo.conf 2535 RMD160 2e0447f015851e098fdbb62d8eee591633ac9fb1 SHA1 4577c6889112d5597f75b178c3f385da8f90b993 SHA256 d3291188dc03e2709d1b64ed23518c591538e1408be8a96efd4981a9256d91fc
 AUX 3-devel/rsyslog.conf 448 RMD160 7e793828710e6edc189149322b1bdeb5e2e94079 SHA1 d7d2ff8a30a1552108f284492c41e177973a7ca3 SHA256 3f72fdae2c58074a99ac71a9de3e36683dc8b2bf7647dcda0c46ef721e6fd7b1
 AUX 3-devel/rsyslog.init 786 RMD160 765cf08ea09f81137c10cd9a7cf0ce53c2a1ded3 SHA1 8f1fefc2a15d6252dd85826ce080b96cf6a76a06 SHA256 9bbfcf94fb6b3efe897117711d5711c2753025e97338245c66988ea163cd28cc
@@ -9,19 +6,10 @@ AUX 3-stable/rsyslog-gentoo.conf 2535 RMD160 2e0447f015851e098fdbb62d8eee591633a
 AUX 3-stable/rsyslog.conf 448 RMD160 7e793828710e6edc189149322b1bdeb5e2e94079 SHA1 d7d2ff8a30a1552108f284492c41e177973a7ca3 SHA256 3f72fdae2c58074a99ac71a9de3e36683dc8b2bf7647dcda0c46ef721e6fd7b1
 AUX 3-stable/rsyslog.init 787 RMD160 bb3a4c466686ba5b3e6f8c648ca48dabe4c45150 SHA1 d165941f1ed8ea5d3a4024c0b9085c424b3fa8e8 SHA256 bc8c1fc5c34c1e821636c735d72f4f0eb6a20a9d4603364628f7e7307e5f5ff4
 AUX 3-stable/rsyslog.logrotate 390 RMD160 8639ed6de74a17b5ea895d4b1a92c34242c5ec0e SHA1 c611b0df1808c621a2ab4d200cb42bd51033e282 SHA256 ab84fcdd6bd17a4b2e1b53eb42e96914197a66e04be1bcdf4b43051f1bde4dc2
-AUX 3.14.1-implicit_declaration.patch 1529 RMD160 2d43706c9b31abd9d8b95fb1798f8ae4718ed22c SHA1 33cd80b95fa621a17829181229eb565f20f465f2 SHA256 cbc9e4fd5c80cd702396ff88ffb4246e7953be1d8ec6cc67c1aba608ddf7123c
-DIST rsyslog-3.14.1.tar.gz 1057895 RMD160 51577f6bc5065272d9d604e92f25b86ce302d34a SHA1 ae5d614389ec9bb7da12ae1f279c4ad3b93b6232 SHA256 aa6930d713880299f32717db198f5a35de08d983f4d33ce6ec241fa8135afffc
-DIST rsyslog-3.16.0.tar.gz 1062775 RMD160 869a48bbe71be0eb60c535fb6cbafdca2dd09b70 SHA1 9a126d5e196638c30780de921321bd588734b263 SHA256 5062d9e554f0b3c031c3249c0c63f22e14df75767da5a66641d4722ab53e5a63
-DIST rsyslog-3.17.1.tar.gz 1086271 RMD160 52c3e775935ac9e483935bf943577309a0df5253 SHA1 08855c609b974551e1cd396c2b95bffc3be273fb SHA256 015318c66b8e784c25292b522f18ac0aceaa5ec76182e538df5d8642689ae5f8
-EBUILD rsyslog-3.14.1.ebuild 2234 RMD160 4d40749417d7ec14149a60c7d17cf47488d049ac SHA1 8ca964b57e6a57b5f591946b4b280e8bc73c116a SHA256 72893722f3e4df78fa3805b247776c96329a7009449b9ab56f054ce235684fd8
-EBUILD rsyslog-3.16.0.ebuild 2146 RMD160 656babfb812b2db67512094f1333fca59be2af30 SHA1 14b351f3058b7af5c338a7cef7ff033acf3514f2 SHA256 23e03977b9cb17c7ab330aab8da13ff48af24ee98982c746654050a9198386e5
-EBUILD rsyslog-3.17.1.ebuild 2289 RMD160 46c9cd45917f7468b1ca84425fd5394d1913c133 SHA1 c81a6822c4baa90830d8e79dacba79df33142c3d SHA256 bf36be134fa74e26e75c6c8fe6d77a001cc9fc6420c49e73b77ddc8d95509037
-MISC ChangeLog 1672 RMD160 d75e1e1844b80f3e22da5917e05ab633078048d8 SHA1 bd492baa3eab609b10b3486a3147847dbf88962a SHA256 3d13ff43d060c695ac1e5f75e80bffb8088a18fc9da24e067fea54eb0c440dda
+AUX 3.19.2-as_needed.patch 498 RMD160 5a801e6bf13d1472814f32d4a839977e3d362008 SHA1 3c8aa15af579ff91e59767b4be491e9a4f8b7273 SHA256 da8b9ddc64e216b80da47970b375b3b6f4581a670e92463813659bba76e98a1c
+DIST rsyslog-3.16.1.tar.gz 1063026 RMD160 2a4b42ab9111ffc3111dd0c89105e4fb3b323644 SHA1 22ea16cebfbe5d1df9e23555ac2ae4229da51e3f SHA256 ebcc095119c0c379ff4013b135595ba9ad42812527a6606034457273e11cc916
+DIST rsyslog-3.19.2.tar.gz 1124381 RMD160 c71e582c4219d72d16ca0630719158b0cf9fa29a SHA1 b98c6e68bcb4692ce4a436c079c3d12d02de66b0 SHA256 226441b9e145be779017dbdd332000a4509d62133861bbac0b0b0e6485425386
+EBUILD rsyslog-3.16.1.ebuild 2159 RMD160 b3a9e78b41796e07d958073b1fc92d279be8e080 SHA1 bafdf02a3da9296f34919c31fa203fd4b1df1466 SHA256 8b80560b460b0b78dfa34a611245fc934610726109c257a7272aafca935c2d6a
+EBUILD rsyslog-3.19.2.ebuild 2448 RMD160 c2ce6e604342d9b7b5dc96661eca9d0a0b9b8eb5 SHA1 c522c4ca08fbbc6ffbd2a6d8a07da06ca917c2e3 SHA256 f13230c2c4953a914810c72ce2cfcad2a5c081e8caee2479bfd0133ccd426e8c
+MISC ChangeLog 2175 RMD160 460cc3fe07e9bbb966c2d89159fe0c4f0d4c905a SHA1 614b650a171ef14a8e38ef6d802d383421c8bc5f SHA256 1372dfbf5e612fa3eee6f5010bcffebc6f0b7df77ce9fabcfdb6004958cd628c
 MISC metadata.xml 234 RMD160 71429d1d4a30b5ab923cc277f1697e48cd5778cb SHA1 e4587261387a7dad22cdba0a6f2a928dc982c32a SHA256 3299defd0e5e3780bf8db22ac755b39ecc0d5ae97b62507f6795c1dd74b4949b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgrTUgACgkQkKaRLQcq0GIBswCgjvL01DwrrkDeZhfKnR2R3ufN
-fiEAmgL9nc5PSKHs/+wLa+h2Qap2DEY/
-=uhpP
------END PGP SIGNATURE-----
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"
 }