Version bump for stable and beta branches, fixes security bug #249878 (thanks to Bruno Boss & Crag).

(Portage version: 2.2_rc17/cvs/Linux 2.6.27.8 x86_64)

3 files changed, 31 insertions, 15 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index f55ea1acc8be..7627dc179942 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,14 @@
 # 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.18 2008/11/10 15:48:00 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.19 2008/12/08 12:53:06 dev-zero Exp $
+
+*rsyslog-3.21.9 (08 Dec 2008)
+*rsyslog-3.20.2 (08 Dec 2008)
+
+  08 Dec 2008; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.18.4.ebuild,
+  +rsyslog-3.20.2.ebuild, -rsyslog-3.21.6.ebuild, +rsyslog-3.21.9.ebuild:
+  Version bump for stable and beta branches, fixes security bug #249878
+  (thanks to Bruno Boss & Crag).
 
   10 Nov 2008; Tiziano Müller <dev-zero@gentoo.org> rsyslog-3.21.6.ebuild:
   Disable building imdiag with USE=debug (bug #240550) since upstream
diff --git a/app-admin/rsyslog/rsyslog-3.21.6.ebuild b/app-admin/rsyslog/rsyslog-3.20.2.ebuild
index d1f63b0d31a7..ed17340b384d 100644
--- a/app-admin/rsyslog/rsyslog-3.21.6.ebuild
+++ b/app-admin/rsyslog/rsyslog-3.20.2.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.21.6.ebuild,v 1.2 2008/11/10 15:48:00 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-3.20.2.ebuild,v 1.1 2008/12/08 12:53:06 dev-zero Exp $
 
 inherit versionator
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.rsyslog.com/"
 SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug kerberos dbi gnutls mysql postgres relp snmp zlib"
 
 DEPEND="kerberos? ( virtual/krb5 )
@@ -23,14 +23,13 @@ DEPEND="kerberos? ( virtual/krb5 )
 RDEPEND="${DEPEND}"
 PROVIDE="virtual/logger"
 
-BRANCH="3-devel"
+BRANCH="3-stable"
 
 src_compile() {
 	# Maintainer notes:
 	# * rsyslog-3 doesn't support single threading anymore
-	# * rfc3195 needs a library
-	# * OpenSSL detection is present in ./configure but nothing
-	#   in the code actually needs it
+	# * rfc3195 needs a library and development of that library
+	#   is suspended
 	econf \
 		--enable-largefile \
 		--enable-regexp \
@@ -44,7 +43,6 @@ src_compile() {
 		$(use_enable debug) \
 		$(use_enable debug rtinst) \
 		$(use_enable debug valgrind) \
-		$(use_enable debug diagtools) \
 		$(use_enable mysql) \
 		$(use_enable postgres pgsql) \
 		$(use_enable dbi libdbi) \
@@ -53,7 +51,6 @@ src_compile() {
 		--enable-rsyslogrt \
 		--enable-rsyslogd \
 		--enable-mail \
-		--disable-imdiag \
 		$(use_enable relp) \
 		--disable-rfc3195 \
 		--enable-imfile \
diff --git a/app-admin/rsyslog/rsyslog-3.18.4.ebuild b/app-admin/rsyslog/rsyslog-3.21.9.ebuild
index 8e67735d3e06..4272bc89c43a 100644
--- a/app-admin/rsyslog/rsyslog-3.18.4.ebuild
+++ b/app-admin/rsyslog/rsyslog-3.21.9.ebuild
@@ -1,28 +1,29 @@
 # 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.18.4.ebuild,v 1.1 2008/09/29 12:03:18 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-3.21.9.ebuild,v 1.1 2008/12/08 12:53:06 dev-zero Exp $
 
-inherit eutils versionator
+inherit 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 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug kerberos dbi mysql postgres relp snmp zlib"
+KEYWORDS="~amd64 ~hppa ~x86"
+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? ( virtual/postgresql-base )
-	relp? ( dev-libs/librelp )
+	relp? ( >=dev-libs/librelp-0.1.1 )
 	snmp? ( net-analyzer/net-snmp )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 PROVIDE="virtual/logger"
 
-BRANCH="3-stable"
+BRANCH="3-devel"
 
 src_compile() {
 	# Maintainer notes:
@@ -42,12 +43,16 @@ src_compile() {
 		$(use_enable debug) \
 		$(use_enable debug rtinst) \
 		$(use_enable debug valgrind) \
+		$(use_enable debug diagtools) \
 		$(use_enable mysql) \
 		$(use_enable postgres pgsql) \
 		$(use_enable dbi libdbi) \
 		$(use_enable snmp) \
+		$(use_enable gnutls) \
+		--enable-rsyslogrt \
 		--enable-rsyslogd \
 		--enable-mail \
+		--disable-imdiag \
 		$(use_enable relp) \
 		--disable-rfc3195 \
 		--enable-imfile \
@@ -79,3 +84,9 @@ src_install() {
 	newconfd "${FILESDIR}/${BRANCH}/rsyslog.conf" rsyslog
 	newinitd "${FILESDIR}/${BRANCH}/rsyslog.init" rsyslog
 }
+
+pkg_postinst() {
+	ewarn "You installed a beta version of rsyslog, please do report bugs"
+	ewarn "with the software directly to upstream. Please read more about"
+	ewarn "stable or unstable branches at http://www.rsyslog.com"
+}