diff options
author | Sven Wegener <swegener@gentoo.org> | 2011-03-12 13:29:59 +0000 |
---|---|---|
committer | Sven Wegener <swegener@gentoo.org> | 2011-03-12 13:29:59 +0000 |
commit | 1f6a4db52a02c6d6fb64536b103bd0d6fd4d10fe (patch) | |
tree | e960354849e25e291a7c487d5a84b069e44476ec /net-im | |
parent | Stable on alpha, bug #355265 (diff) | |
download | gentoo-2-1f6a4db52a02c6d6fb64536b103bd0d6fd4d10fe.tar.gz gentoo-2-1f6a4db52a02c6d6fb64536b103bd0d6fd4d10fe.tar.bz2 gentoo-2-1f6a4db52a02c6d6fb64536b103bd0d6fd4d10fe.zip |
Cleanup.
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/centerim/ChangeLog | 8 | ||||
-rw-r--r-- | net-im/centerim/centerim-4.22.7-r1.ebuild | 117 | ||||
-rw-r--r-- | net-im/centerim/centerim-4.22.8.ebuild | 120 | ||||
-rw-r--r-- | net-im/centerim/centerim-4.22.9.49.ebuild | 123 | ||||
-rw-r--r-- | net-im/centerim/files/centerim-4.22.7-libgadu-CVE-2008-4776.patch | 14 |
5 files changed, 7 insertions, 375 deletions
diff --git a/net-im/centerim/ChangeLog b/net-im/centerim/ChangeLog index 4934ded47ee8..3eee8a76a6f9 100644 --- a/net-im/centerim/ChangeLog +++ b/net-im/centerim/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/centerim # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.46 2011/02/26 19:41:09 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.47 2011/03/12 13:29:58 swegener Exp $ + + 12 Mar 2011; Sven Wegener <swegener@gentoo.org> + -centerim-4.22.7-r1.ebuild, + -files/centerim-4.22.7-libgadu-CVE-2008-4776.patch, + -centerim-4.22.8.ebuild, -centerim-4.22.9.49.ebuild: + Cleanup. 26 Feb 2011; Kevin McCarthy <signals@gentoo.org> centerim-4.22.7-r1.ebuild, centerim-4.22.8.ebuild, centerim-4.22.9.ebuild, centerim-4.22.9.49.ebuild, diff --git a/net-im/centerim/centerim-4.22.7-r1.ebuild b/net-im/centerim/centerim-4.22.7-r1.ebuild deleted file mode 100644 index c4e9eacf013a..000000000000 --- a/net-im/centerim/centerim-4.22.7-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.7-r1.ebuild,v 1.9 2011/02/26 19:41:09 signals Exp $ - -EAPI="2" - -inherit eutils - -PROTOCOL_IUSE="+aim gadu +icq +irc +jabber lj +msn rss +yahoo" -IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr" - -DESCRIPTION="CenterIM is a fork of CenterICQ - a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client" -if [[ ${PV} = *_p* ]] # is this a snaphot? -then - SRC_URI="http://www.centerim.org/download/snapshots/${PN}-${PV/*_p/}.tar.gz" -else - SRC_URI="http://www.centerim.org/download/releases/${P}.tar.bz2" -fi -HOMEPAGE="http://www.centerim.org/" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 x86 ~x86-fbsd" - -DEPEND=">=sys-libs/ncurses-5.2 - bidi? ( dev-libs/fribidi ) - ssl? ( >=dev-libs/openssl-0.9.6g ) - jpeg? ( virtual/jpeg ) - jabber? ( - otr? ( net-libs/libotr ) - crypt? ( >=app-crypt/gpgme-1.0.2 ) - ) - msn? ( - || ( - >=net-misc/curl-7.19.6[ssl] - >=net-misc/curl-7.19.6[gnutls] - >=net-misc/curl-7.19.6[nss] - ) - )" - -RDEPEND="${DEPEND} - nls? ( sys-devel/gettext )" - -S="${WORKDIR}"/${P/_p*} - -check_protocol_iuse() { - local flag - - for flag in ${PROTOCOL_IUSE} - do - use ${flag#+} && return 0 - done - - return 1 -} - -pkg_setup() { - if ! check_protocol_iuse - then - eerror - eerror "Please activate at least one of the following protocol USE flags:" - eerror "${PROTOCOL_IUSE//+}" - eerror - die "Please activate at least one protocol USE flag!" - fi - - if use otr && ! use jabber - then - ewarn - ewarn "Support for OTR is only supported with Jabber!" - ewarn - fi - - if use gadu && ! use jpeg - then - ewarn - ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!" - ewarn - fi -} - -src_prepare() { - default - - epatch "${FILESDIR}"/${P}-libgadu-CVE-2008-4776.patch - - # Don't execute git commands, bug #228151 - cat >"${S}"/misc/git-version-gen <<-EOF - #!/bin/sh - echo -n "${PVR}" - EOF -} - -src_configure() { - econf \ - $(use_with ssl) \ - $(use_enable aim) \ - $(use_with bidi fribidi) \ - $(use_with jpeg libjpeg) \ - $(use_with otr libotr) \ - $(use_enable gadu gg) \ - $(use_enable icq) \ - $(use_enable irc) \ - $(use_enable jabber) \ - $(use_enable lj) \ - $(use_enable msn) \ - $(use_enable nls locales-fix) \ - $(use_enable nls) \ - $(use_enable rss) \ - $(use_enable yahoo) \ - || die "econf failed" -} - -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog FAQ README THANKS TODO -} diff --git a/net-im/centerim/centerim-4.22.8.ebuild b/net-im/centerim/centerim-4.22.8.ebuild deleted file mode 100644 index 27765c83ed12..000000000000 --- a/net-im/centerim/centerim-4.22.8.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.8.ebuild,v 1.7 2011/02/26 19:41:09 signals Exp $ - -EAPI="2" - -PROTOCOL_IUSE="+aim gadu +icq +irc +jabber lj +msn rss +yahoo" -IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr" - -DESCRIPTION="CenterIM is a fork of CenterICQ - a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client" -if [[ ${PV} = *_p* ]] # is this a snaphot? -then - SRC_URI="http://www.centerim.org/download/snapshots/${PN}-${PV/*_p/}.tar.gz" -else - SRC_URI="http://www.centerim.org/download/releases/${P}.tar.gz" -fi -HOMEPAGE="http://www.centerim.org/" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" - -DEPEND=">=sys-libs/ncurses-5.2 - bidi? ( dev-libs/fribidi ) - ssl? ( >=dev-libs/openssl-0.9.6g ) - jpeg? ( virtual/jpeg ) - jabber? ( - otr? ( net-libs/libotr ) - crypt? ( >=app-crypt/gpgme-1.0.2 ) - ) - msn? ( - || ( - >=net-misc/curl-7.19.6[ssl] - >=net-misc/curl-7.19.6[gnutls] - >=net-misc/curl-7.19.6[nss] - ) - ) - yahoo? ( - || ( - >=net-misc/curl-7.19.6[ssl] - >=net-misc/curl-7.19.6[gnutls] - >=net-misc/curl-7.19.6[nss] - ) - )" - -RDEPEND="${DEPEND} - nls? ( sys-devel/gettext )" - -S="${WORKDIR}"/${P/_p*} - -check_protocol_iuse() { - local flag - - for flag in ${PROTOCOL_IUSE} - do - use ${flag#+} && return 0 - done - - return 1 -} - -pkg_setup() { - if ! check_protocol_iuse - then - eerror - eerror "Please activate at least one of the following protocol USE flags:" - eerror "${PROTOCOL_IUSE//+}" - eerror - die "Please activate at least one protocol USE flag!" - fi - - if use otr && ! use jabber - then - ewarn - ewarn "Support for OTR is only supported with Jabber!" - ewarn - fi - - if use gadu && ! use jpeg - then - ewarn - ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!" - ewarn - fi -} - -src_prepare() { - default - - # Don't execute git commands, bug #228151 - cat >"${S}"/misc/git-version-gen <<-EOF - #!/bin/sh - echo -n "${PVR}" - EOF -} - -src_configure() { - econf \ - $(use_with ssl) \ - $(use_enable aim) \ - $(use_with bidi fribidi) \ - $(use_with jpeg libjpeg) \ - $(use_with otr libotr) \ - $(use_enable gadu gg) \ - $(use_enable icq) \ - $(use_enable irc) \ - $(use_enable jabber) \ - $(use_enable lj) \ - $(use_enable msn) \ - $(use_enable nls locales-fix) \ - $(use_enable nls) \ - $(use_enable rss) \ - $(use_enable yahoo) \ - || die "econf failed" -} - -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog FAQ README THANKS TODO -} diff --git a/net-im/centerim/centerim-4.22.9.49.ebuild b/net-im/centerim/centerim-4.22.9.49.ebuild deleted file mode 100644 index 4d11d33ee7da..000000000000 --- a/net-im/centerim/centerim-4.22.9.49.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.9.49.ebuild,v 1.2 2011/02/26 19:41:09 signals Exp $ - -EAPI="2" - -PROTOCOL_IUSE="+aim gadu +icq +irc +jabber lj +msn rss +yahoo" -IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr" - -DESCRIPTION="CenterIM is a fork of CenterICQ - a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client" -if [[ ${PV} = *_p* ]] # is this a snaphot? -then - SRC_URI="http://www.centerim.org/download/snapshots/${PN}-${PV/*_p/}.tar.gz" -elif [[ ${PV} = *.*.*.* ]] # is this a mobshot? -then - SRC_URI="http://www.centerim.org/download/mobshots/${P}.tar.gz" -else - SRC_URI="http://www.centerim.org/download/releases/${P}.tar.gz" -fi -HOMEPAGE="http://www.centerim.org/" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" - -DEPEND=">=sys-libs/ncurses-5.2 - bidi? ( dev-libs/fribidi ) - ssl? ( >=dev-libs/openssl-0.9.6g ) - jpeg? ( virtual/jpeg ) - jabber? ( - otr? ( net-libs/libotr ) - crypt? ( >=app-crypt/gpgme-1.0.2 ) - ) - msn? ( - || ( - >=net-misc/curl-7.19.6[ssl] - >=net-misc/curl-7.19.6[gnutls] - >=net-misc/curl-7.19.6[nss] - ) - ) - yahoo? ( - || ( - >=net-misc/curl-7.19.6[ssl] - >=net-misc/curl-7.19.6[gnutls] - >=net-misc/curl-7.19.6[nss] - ) - )" - -RDEPEND="${DEPEND} - nls? ( sys-devel/gettext )" - -S="${WORKDIR}"/${P/_p*} - -check_protocol_iuse() { - local flag - - for flag in ${PROTOCOL_IUSE} - do - use ${flag#+} && return 0 - done - - return 1 -} - -pkg_setup() { - if ! check_protocol_iuse - then - eerror - eerror "Please activate at least one of the following protocol USE flags:" - eerror "${PROTOCOL_IUSE//+}" - eerror - die "Please activate at least one protocol USE flag!" - fi - - if use otr && ! use jabber - then - ewarn - ewarn "Support for OTR is only supported with Jabber!" - ewarn - fi - - if use gadu && ! use jpeg - then - ewarn - ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!" - ewarn - fi -} - -src_prepare() { - default - - # Don't execute git commands, bug #228151 - cat >"${S}"/misc/git-version-gen <<-EOF - #!/bin/sh - echo -n "${PVR}" - EOF -} - -src_configure() { - econf \ - $(use_with ssl) \ - $(use_enable aim) \ - $(use_with bidi fribidi) \ - $(use_with jpeg libjpeg) \ - $(use_with otr libotr) \ - $(use_enable gadu gg) \ - $(use_enable icq) \ - $(use_enable irc) \ - $(use_enable jabber) \ - $(use_enable lj) \ - $(use_enable msn) \ - $(use_enable nls locales-fix) \ - $(use_enable nls) \ - $(use_enable rss) \ - $(use_enable yahoo) \ - || die "econf failed" -} - -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog FAQ README THANKS TODO -} diff --git a/net-im/centerim/files/centerim-4.22.7-libgadu-CVE-2008-4776.patch b/net-im/centerim/files/centerim-4.22.7-libgadu-CVE-2008-4776.patch deleted file mode 100644 index ee6eb3bde391..000000000000 --- a/net-im/centerim/files/centerim-4.22.7-libgadu-CVE-2008-4776.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/264607 -https://bugs.gentoo.org/244888 - ---- centerim-4.22.7/libgadu/events.c -+++ centerim-4.22.7/libgadu/events.c -@@ -578,7 +578,7 @@ - if (GG_S_D(n->status)) { - unsigned char descr_len = *((char*) n + sizeof(struct gg_notify_reply60)); - -- if (descr_len < length) { -+ if (sizeof(struct gg_notify_reply60) + descr_len < length) { - if (!(e->event.notify60[i].descr = malloc(descr_len + 1))) { - gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n"); - goto fail; |