add security fix for CAN-2005-1914, remove outdated versions

(Portage version: 2.0.51-r14)

15 files changed, 18 insertions, 340 deletions

diff --git a/net-im/centericq/ChangeLog b/net-im/centericq/ChangeLog
index 8efb4d230207..742170e44a89 100644
--- a/net-im/centericq/ChangeLog
+++ b/net-im/centericq/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/centericq
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/ChangeLog,v 1.61 2005/05/01 18:13:41 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/ChangeLog,v 1.62 2005/07/18 16:34:37 wschlich Exp $
+
+*centericq-4.20.0-r2 (18 Jul 2005)
+
+  18 Jul 2005; Wolfram Schlich <wschlich@gentoo.org>
+  -centericq-4.11.0.ebuild, -centericq-4.12.0.ebuild,
+  -centericq-4.13.0.ebuild, -centericq-4.14.0.ebuild,
+  -centericq-4.20.0-r1.ebuild, +centericq-4.20.0-r2.ebuild,
+  -centericq-4.20.0.ebuild:
+  add security fix for CAN-2005-1914, remove outdated versions
 
   01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
   centericq-4.20.0-r1.ebuild:
diff --git a/net-im/centericq/Manifest b/net-im/centericq/Manifest
index 07086d5973c2..d8bcfd40a42e 100644
--- a/net-im/centericq/Manifest
+++ b/net-im/centericq/Manifest
@@ -1,15 +1,6 @@
-MD5 de632b15be484a98657ff3058c8b4f03 centericq-4.20.0.ebuild 2375
-MD5 ee3e7140dac6f26bd97ba256a69482e1 centericq-4.14.0.ebuild 2234
-MD5 3506561b42d85d2abbe977abd15571d2 centericq-4.13.0.ebuild 2231
+MD5 19050d00a4316230306ad0c1ce0bf207 ChangeLog 9268
 MD5 7f795e49e944fe6f3aa15fe53e8da366 metadata.xml 693
-MD5 48321be682472ab0816a4a50f6d4e803 ChangeLog 8919
-MD5 fac0d63593de1e9580621a95eca5294e centericq-4.20.0-r1.ebuild 2373
-MD5 5c7057b76f3a45d892ad786893ec58df centericq-4.12.0.ebuild 2181
-MD5 df387c6930123b6fce1ff21b81ce2402 centericq-4.11.0.ebuild 1675
-MD5 cb21aa5d990cbba3ea7fde0c48731fe2 files/digest-centericq-4.20.0 70
-MD5 3ff4d1ed212b9191d78f5d62dbbd4e71 files/digest-centericq-4.11.0 70
-MD5 f2b19b888bf1799ee2643a7a832f996b files/digest-centericq-4.12.0 70
-MD5 9e00bb9cbcf5f672594b4307ada536d0 files/digest-centericq-4.14.0 70
-MD5 cb21aa5d990cbba3ea7fde0c48731fe2 files/digest-centericq-4.20.0-r1 70
-MD5 46e9d0c5b7ea4e05001e593b447715e1 files/digest-centericq-4.13.0 70
+MD5 bc0b844ab60cb7d21d4e39c739e87d5f centericq-4.20.0-r2.ebuild 2490
 MD5 0f60514eff0a237cf8fbdd13fd88293e files/centericq-amd64.patch 6291
+MD5 73abf7a5deb27baf431c12003caeb02d files/centericq-4.20.0.CAN-2005-1914.patch.bz2 576
+MD5 cb21aa5d990cbba3ea7fde0c48731fe2 files/digest-centericq-4.20.0-r2 70
diff --git a/net-im/centericq/centericq-4.11.0.ebuild b/net-im/centericq/centericq-4.11.0.ebuild
deleted file mode 100644
index b70ba747ead5..000000000000
--- a/net-im/centericq/centericq-4.11.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.11.0.ebuild,v 1.3 2005/01/22 23:59:35 wschlich Exp $
-
-inherit eutils
-
-IUSE="bidi nls ssl icq jabber aim msn yahoo" # gg irc rss lj
-
-DESCRIPTION="A ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
-SRC_URI="http://thekonst.net/download/${P}.tar.bz2"
-HOMEPAGE="http://thekonst.net/en/centericq"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~amd64 ~ppc ~hppa ~ppc64"
-
-DEPEND="virtual/libc
-	>=sys-libs/ncurses-5.2
-	icq? ( !net-libs/libicq2000 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	msn? ( net-misc/curl )
-	bidi? ( dev-libs/fribidi )"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	local myopts="--with-gnu-ld --disable-konst"
-	use nls && myopts="${myopts} --enable-locales-fix" || myopts="${myopts} --disable-nls"
-	use bidi && myopts="${myopts} --with-fribidi"
-	use ssl && myopts="${myopts} --with-ssl"
-
-	use icq || myopts="${myopts} --disable-icq"
-	use jabber || myopts="${myopts} --disable-jabber"
-	use aim || myopts="${myopts} --disable-aim"
-	use msn || myopts="${myopts} --disable-msn"
-	use yahoo || myopts="${myopts} --disable-yahoo"
-#	use gg || myopts="${myopts} --disable-gg"
-#	use irc || myopts="${myopts} --disable-irc"
-#	use rss || myopts="${myopts} --disable-rss"
-#	use lj || myopts="${myopts} --disable-lj"
-
-	econf ${myopts} || die "Configure failed"
-	emake || die "Compilation failed"
-}
-
-src_install () {
-	einstall || die "Installation failed"
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ README THANKS TODO
-}
diff --git a/net-im/centericq/centericq-4.12.0.ebuild b/net-im/centericq/centericq-4.12.0.ebuild
deleted file mode 100644
index 4b7e2c927a5f..000000000000
--- a/net-im/centericq/centericq-4.12.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.12.0.ebuild,v 1.3 2005/01/22 23:59:35 wschlich Exp $
-
-inherit eutils
-
-IUSE="bidi nls ssl icq jabber aim msn yahoo" # gg irc rss lj
-
-DESCRIPTION="A ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
-SRC_URI="http://thekonst.net/download/${P}.tar.bz2"
-HOMEPAGE="http://thekonst.net/en/centericq"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~amd64 ~ppc ~hppa ~ppc64"
-
-DEPEND="virtual/libc
-	>=sys-libs/ncurses-5.2
-	icq? ( !net-libs/libicq2000 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	msn? ( net-misc/curl )
-	bidi? ( dev-libs/fribidi )"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	local myopts="--with-gnu-ld --disable-konst"
-	use nls >&/dev/null && myopts="${myopts} --enable-locales-fix" || myopts="${myopts} --disable-nls"
-	use bidi >&/dev/null && myopts="${myopts} --with-fribidi"
-	use ssl >&/dev/null && myopts="${myopts} --with-ssl"
-
-	use icq >&/dev/null || myopts="${myopts} --disable-icq"
-	use jabber >&/dev/null || myopts="${myopts} --disable-jabber"
-	use aim >&/dev/null || myopts="${myopts} --disable-aim"
-	use msn >&/dev/null || myopts="${myopts} --disable-msn"
-	if use msn >&/dev/null && ! use ssl >&/dev/null; then
-		eerror ""
-		eerror "USE flag problem"
-		eerror "================"
-		eerror "'msn' USE flag detected, but 'ssl' USE flag missing:"
-		eerror "MSN support needs libcurl with SSL support."
-		eerror ""
-		die "Please either activate the 'ssl' USE flag or deactivate the 'msn' USE flag for net-im/centericq"
-	fi
-	use yahoo >&/dev/null || myopts="${myopts} --disable-yahoo"
-#	use gg >&/dev/null || myopts="${myopts} --disable-gg"
-#	use irc >&/dev/null || myopts="${myopts} --disable-irc"
-#	use rss >&/dev/null || myopts="${myopts} --disable-rss"
-#	use lj >&/dev/null || myopts="${myopts} --disable-lj"
-
-	econf ${myopts} || die "Configure failed"
-	emake || die "Compilation failed"
-}
-
-src_install () {
-	einstall || die "Installation failed"
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ README THANKS TODO
-}
diff --git a/net-im/centericq/centericq-4.13.0.ebuild b/net-im/centericq/centericq-4.13.0.ebuild
deleted file mode 100644
index 42d8c2149a45..000000000000
--- a/net-im/centericq/centericq-4.13.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.13.0.ebuild,v 1.6 2005/01/30 10:03:33 lanius Exp $
-
-inherit eutils
-
-IUSE="bidi nls ssl icq jabber aim msn yahoo" # gg irc rss lj
-
-DESCRIPTION="A ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
-SRC_URI="http://thekonst.net/download/${P}.tar.bz2"
-HOMEPAGE="http://thekonst.net/en/centericq"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc amd64 ~ppc ~hppa ~ppc64"
-
-DEPEND="virtual/libc
-	>=sys-libs/ncurses-5.2
-	icq? ( !net-libs/libicq2000 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	msn? ( net-misc/curl )
-	bidi? ( dev-libs/fribidi )"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	use amd64 && epatch ${FILESDIR}/${PN}-amd64.patch
-}
-
-src_compile() {
-	local myopts="--with-gnu-ld --disable-konst"
-	use nls >&/dev/null && myopts="${myopts} --enable-locales-fix" || myopts="${myopts} --disable-nls"
-	use bidi >&/dev/null && myopts="${myopts} --with-fribidi"
-	use ssl >&/dev/null && myopts="${myopts} --with-ssl"
-
-	use icq >&/dev/null || myopts="${myopts} --disable-icq"
-	use jabber >&/dev/null || myopts="${myopts} --disable-jabber"
-	use aim >&/dev/null || myopts="${myopts} --disable-aim"
-	use msn >&/dev/null || myopts="${myopts} --disable-msn"
-	if use msn >&/dev/null && ! use ssl >&/dev/null; then
-		eerror ""
-		eerror "USE flag problem"
-		eerror "================"
-		eerror "'msn' USE flag detected, but 'ssl' USE flag missing:"
-		eerror "MSN support needs libcurl with SSL support."
-		eerror ""
-		die "Please either activate the 'ssl' USE flag or deactivate the 'msn' USE flag for net-im/centericq"
-	fi
-	use yahoo >&/dev/null || myopts="${myopts} --disable-yahoo"
-#	use gg >&/dev/null || myopts="${myopts} --disable-gg"
-#	use irc >&/dev/null || myopts="${myopts} --disable-irc"
-#	use rss >&/dev/null || myopts="${myopts} --disable-rss"
-#	use lj >&/dev/null || myopts="${myopts} --disable-lj"
-
-	econf ${myopts} || die "Configure failed"
-	emake || die "Compilation failed"
-}
-
-src_install () {
-	einstall || die "Installation failed"
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ README THANKS TODO
-}
diff --git a/net-im/centericq/centericq-4.14.0.ebuild b/net-im/centericq/centericq-4.14.0.ebuild
deleted file mode 100644
index 65ac2f833794..000000000000
--- a/net-im/centericq/centericq-4.14.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.14.0.ebuild,v 1.3 2005/01/22 23:59:35 wschlich Exp $
-
-inherit eutils
-
-IUSE="bidi nls ssl icq jabber aim msn yahoo" # gg irc rss lj
-
-DESCRIPTION="A ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
-SRC_URI="http://thekonst.net/download/${P}.tar.bz2"
-HOMEPAGE="http://thekonst.net/en/centericq"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~hppa ~ppc64"
-
-DEPEND="virtual/libc
-	>=sys-libs/ncurses-5.2
-	icq? ( !net-libs/libicq2000 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	msn? ( net-misc/curl )
-	bidi? ( dev-libs/fribidi )"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	use amd64 && epatch ${FILESDIR}/${PN}-amd64.patch
-}
-
-src_compile() {
-	local myopts="--with-gnu-ld --disable-konst"
-	use nls >&/dev/null && myopts="${myopts} --enable-locales-fix" || myopts="${myopts} --disable-nls"
-	use bidi >&/dev/null && myopts="${myopts} --with-fribidi"
-	use ssl >&/dev/null && myopts="${myopts} --with-ssl"
-
-	use icq >&/dev/null || myopts="${myopts} --disable-icq"
-	use jabber >&/dev/null || myopts="${myopts} --disable-jabber"
-	use aim >&/dev/null || myopts="${myopts} --disable-aim"
-	use msn >&/dev/null || myopts="${myopts} --disable-msn"
-	if use msn >&/dev/null && ! use ssl >&/dev/null; then
-		eerror ""
-		eerror "USE flag problem"
-		eerror "================"
-		eerror "'msn' USE flag detected, but 'ssl' USE flag missing:"
-		eerror "MSN support needs libcurl with SSL support."
-		eerror ""
-		die "Please either activate the 'ssl' USE flag or deactivate the 'msn' USE flag for net-im/centericq"
-	fi
-	use yahoo >&/dev/null || myopts="${myopts} --disable-yahoo"
-#	use gg >&/dev/null || myopts="${myopts} --disable-gg"
-#	use irc >&/dev/null || myopts="${myopts} --disable-irc"
-#	use rss >&/dev/null || myopts="${myopts} --disable-rss"
-#	use lj >&/dev/null || myopts="${myopts} --disable-lj"
-
-	econf ${myopts} || die "Configure failed"
-	emake || die "Compilation failed"
-}
-
-src_install () {
-	einstall || die "Installation failed"
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ README THANKS TODO
-}
diff --git a/net-im/centericq/centericq-4.20.0-r1.ebuild b/net-im/centericq/centericq-4.20.0-r2.ebuild
index ce1fe29e041a..246f13da6f83 100644
--- a/net-im/centericq/centericq-4.20.0-r1.ebuild
+++ b/net-im/centericq/centericq-4.20.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.20.0-r1.ebuild,v 1.4 2005/05/01 18:13:41 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.20.0-r2.ebuild,v 1.1 2005/07/18 16:34:37 wschlich Exp $
 
 inherit eutils
 
@@ -27,6 +27,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	# security fix, see CAN-2005-1914 -- from CenterICQ CVS, 20050718
+	epatch ${FILESDIR}/${P}.CAN-2005-1914.patch.bz2
+
 	use amd64 && epatch ${FILESDIR}/${PN}-amd64.patch
 }
 
diff --git a/net-im/centericq/centericq-4.20.0.ebuild b/net-im/centericq/centericq-4.20.0.ebuild
deleted file mode 100644
index 5dbd6fe2789b..000000000000
--- a/net-im/centericq/centericq-4.20.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.20.0.ebuild,v 1.1 2005/02/03 14:12:23 wschlich Exp $
-
-inherit eutils
-
-IUSE="bidi nls ssl crypt icq jabber aim msn yahoo gg irc rss lj"
-
-DESCRIPTION="A ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
-SRC_URI="http://thekonst.net/download/${P}.tar.bz2"
-HOMEPAGE="http://thekonst.net/en/centericq"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~hppa ~ppc64"
-
-DEPEND="virtual/libc
-	>=sys-libs/ncurses-5.2
-	bidi? ( dev-libs/fribidi )
-	jabber? ( crypt? ( >=app-crypt/gpgme-1.0.0 ) )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	msn? ( net-misc/curl )"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	use amd64 && epatch ${FILESDIR}/${PN}-amd64.patch
-}
-
-src_compile() {
-	local myopts="--with-gnu-ld --disable-konst"
-	use nls >&/dev/null && myopts="${myopts} --enable-locales-fix" || myopts="${myopts} --disable-nls"
-	use bidi >&/dev/null && myopts="${myopts} --with-fribidi"
-	use ssl >&/dev/null && myopts="${myopts} --with-ssl"
-	use ssl >&/dev/null && myopts="${myopts} --with-ssl"
-
-	use icq >&/dev/null || myopts="${myopts} --disable-icq"
-	use jabber >&/dev/null && {
-		use crypt >&/dev/null || myopts="${myopts} --without-gpgme"
-	} || myopts="${myopts} --disable-jabber"
-	use aim >&/dev/null || myopts="${myopts} --disable-aim"
-	use msn >&/dev/null || myopts="${myopts} --disable-msn"
-	if use msn >&/dev/null && ! use ssl >&/dev/null; then
-		eerror ""
-		eerror "USE flag problem"
-		eerror "================"
-		eerror "'msn' USE flag detected, but 'ssl' USE flag missing:"
-		eerror "MSN support needs libcurl with SSL support."
-		eerror ""
-		die "Please either activate the 'ssl' USE flag or deactivate the 'msn' USE flag for net-im/centericq"
-	fi
-	use yahoo >&/dev/null || myopts="${myopts} --disable-yahoo"
-	use gg >&/dev/null || myopts="${myopts} --disable-gg"
-	use irc >&/dev/null || myopts="${myopts} --disable-irc"
-	use rss >&/dev/null || myopts="${myopts} --disable-rss"
-	use lj >&/dev/null || myopts="${myopts} --disable-lj"
-
-	econf ${myopts} || die "Configure failed"
-	emake || die "Compilation failed"
-}
-
-src_install () {
-	einstall || die "Installation failed"
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ README THANKS TODO
-}
diff --git a/net-im/centericq/files/centericq-4.20.0.CAN-2005-1914.patch.bz2 b/net-im/centericq/files/centericq-4.20.0.CAN-2005-1914.patch.bz2
new file mode 100644
index 000000000000..6764821aaa69
--- /dev/null
+++ b/net-im/centericq/files/centericq-4.20.0.CAN-2005-1914.patch.bz2
diff --git a/net-im/centericq/files/digest-centericq-4.11.0 b/net-im/centericq/files/digest-centericq-4.11.0
deleted file mode 100644
index 1341da7fabf7..000000000000
--- a/net-im/centericq/files/digest-centericq-4.11.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bed5e7eeb60b5ac0045f201f13130964 centericq-4.11.0.tar.bz2 1244984
diff --git a/net-im/centericq/files/digest-centericq-4.12.0 b/net-im/centericq/files/digest-centericq-4.12.0
deleted file mode 100644
index ad37f179a001..000000000000
--- a/net-im/centericq/files/digest-centericq-4.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 124a8fba87c1459f3b7639c7b160402a centericq-4.12.0.tar.bz2 1246533
diff --git a/net-im/centericq/files/digest-centericq-4.13.0 b/net-im/centericq/files/digest-centericq-4.13.0
deleted file mode 100644
index 80dfcef16da5..000000000000
--- a/net-im/centericq/files/digest-centericq-4.13.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d32a90906ad03d72a7f43a725646e1d2 centericq-4.13.0.tar.bz2 1251118
diff --git a/net-im/centericq/files/digest-centericq-4.14.0 b/net-im/centericq/files/digest-centericq-4.14.0
deleted file mode 100644
index 96768f2a54d7..000000000000
--- a/net-im/centericq/files/digest-centericq-4.14.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9cb9ccde5dcd05a2006ef251e3571dcc centericq-4.14.0.tar.bz2 1283829
diff --git a/net-im/centericq/files/digest-centericq-4.20.0-r1 b/net-im/centericq/files/digest-centericq-4.20.0-r1
deleted file mode 100644
index 035c446f9a1f..000000000000
--- a/net-im/centericq/files/digest-centericq-4.20.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bbb81f87b4ecb703dec31a8092303914 centericq-4.20.0.tar.bz2 1287040
diff --git a/net-im/centericq/files/digest-centericq-4.20.0 b/net-im/centericq/files/digest-centericq-4.20.0-r2
index 035c446f9a1f..035c446f9a1f 100644
--- a/net-im/centericq/files/digest-centericq-4.20.0
+++ b/net-im/centericq/files/digest-centericq-4.20.0-r2