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

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64

4 files changed, 36 insertions, 20 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/Manifest b/app-admin/rsyslog/Manifest
index 40e90d96aa06..fade893f96a1 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -6,9 +6,9 @@ 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 817 RMD160 c2c6e3a697ce8763008a630140954fca7ed3e3e9 SHA1 acec0956768f19157b57f9930bc90dbb9bb61af0 SHA256 8999f132424ee7de89ee00f108c0d20bc22479e8d5c6fffddca03a0199b8b07a
 AUX 3-stable/rsyslog.logrotate 390 RMD160 8639ed6de74a17b5ea895d4b1a92c34242c5ec0e SHA1 c611b0df1808c621a2ab4d200cb42bd51033e282 SHA256 ab84fcdd6bd17a4b2e1b53eb42e96914197a66e04be1bcdf4b43051f1bde4dc2
-DIST rsyslog-3.18.4.tar.gz 1102655 RMD160 3ca8e13a8c21075c0917c4ee67f4020d4cc1efe1 SHA1 721ef14140f9862bc526df72145c890c93014ac3 SHA256 79a9629752952481088aed25cd607de731ef9b67699dccfcf42d46eaaa484f1c
-DIST rsyslog-3.21.6.tar.gz 1315645 RMD160 ab56c38959fa58dd474b1f8b0ce88343668eeeca SHA1 7195ee17157f09c0e17dc64785c5142b2310a82e SHA256 532049c857e27ab7bdbb4fb526dbfa13f8023fdc11df955b58c4e2ffa1de1557
-EBUILD rsyslog-3.18.4.ebuild 2285 RMD160 7a61ed1dda15116eb9cecbe77454873a2fb72203 SHA1 f4b7c710eecc2f2a8d69c985611fa7c00daf4334 SHA256 c9368678b7f9ffa78a7189a26b869194bf667c45ea74c06a32839f2179d96685
-EBUILD rsyslog-3.21.6.ebuild 2476 RMD160 6ac115c197781fac4970baa8c9edd9af15ad348c SHA1 3f1956ffb7ced5201f6b3d6094b7b92ddc4abd92 SHA256 3ae77133a2e44b3f310c8ec3b6aeebfcdf6d6e32acf08b5388326399156ee323
-MISC ChangeLog 4845 RMD160 e0e8459d314da3fd60b18ff31519bd7640c8cf15 SHA1 9601ac1938b4b9e46cf38b4790130cb5b97b7201 SHA256 7a4c954f40cd071a2d8b5b22ce85d09a9c2af0c8130a2c2c4a4c44de27712aaf
+DIST rsyslog-3.20.2.tar.gz 1298126 RMD160 d583ba1389da07856cef849d06187fda61989fb3 SHA1 612fa5bc52aa52f84d68b0ea8bdbc6e4150a6543 SHA256 e5406a8d7571d0b7f035ad647035bb5b52685316acc55a4fb37c4caabdf63676
+DIST rsyslog-3.21.9.tar.gz 1324907 RMD160 5dbb2f1c0fc5c708926b1a84b208dd73958c4142 SHA1 49c4f01526084a8414d4dc9d61dd8ba763758b06 SHA256 00cce98f1088245cd9bb8f514f7464a7ef80a4231688b60e940ce3404fa3e548
+EBUILD rsyslog-3.20.2.ebuild 2370 RMD160 d52b4a59fc29f3ee7050eadbb0570026db4d6b5a SHA1 91f8fb28c356138c716b29b33fa75d6e4e59e4fb SHA256 3edfad5b1b19fa7b8a923787d7cc11496abeaec4b1806b4de37e91030e8074ba
+EBUILD rsyslog-3.21.9.ebuild 2657 RMD160 03942c952fadd90d0518621512112f763ec0f86c SHA1 39dd4c1f446fcfc6fe420287ba21bd9a948822ab SHA256 e1e4a1b773f621d6ed0338001c767a4e4b7353e5ef21663e486030f144901cf8
+MISC ChangeLog 5163 RMD160 fa890f64d046bfcc800f4bc8cbcb18129df10bb2 SHA1 e562062ec4e9abf76e4840318a131f98aef59ace SHA256 e31fad90af52de0f287bedf3874f49879d12f0e93cec162edc48bfa92bfecfa6
 MISC metadata.xml 466 RMD160 154248463e6426a6947e1ef8d11fc18d16ea786d SHA1 80667e3a1bf68f3dab15d35e38a53fed56fc1916 SHA256 83bd8fbd18c96dc972ef351b262f52034a0472adaa0ac42217e6f857d65684fd
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"
+}