Revision bump for the security fix.

(Portage version: 2.1.3.18)

7 files changed, 404 insertions, 19 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index b2bd2329b6c7..7406e4c5d259 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/claws-mail
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.52 2007/12/04 18:48:04 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.53 2007/12/04 20:42:45 ticho Exp $
+
+*claws-mail-3.1.0-r1 (04 Dec 2007)
+*claws-mail-3.0.2-r1 (04 Dec 2007)
+
+  04 Dec 2007; Andrej Kacian <ticho@gentoo.org> claws-mail-3.0.2.ebuild,
+  +claws-mail-3.0.2-r1.ebuild, claws-mail-3.1.0.ebuild,
+  +claws-mail-3.1.0-r1.ebuild:
+  Revision bump for the security fix.
 
   04 Dec 2007; Andrej Kacian <ticho@gentoo.org> claws-mail-3.0.0.ebuild,
   claws-mail-3.0.2.ebuild, claws-mail-3.1.0.ebuild:
diff --git a/mail-client/claws-mail/claws-mail-3.0.2-r1.ebuild b/mail-client/claws-mail/claws-mail-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..aec63bfff1e1
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.0.2-r1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.0.2-r1.ebuild,v 1.1 2007/12/04 20:42:45 ticho Exp $
+
+IUSE="bogofilter clamav crypt dillo doc gnome imap ipv6 kde ldap pda session spamassassin spell ssl startup-notification xface"
+
+inherit eutils multilib
+
+DESCRIPTION="Claws-Mail is an email client (and news reader) based on GTK+"
+HOMEPAGE="http://www.claws-mail.org"
+
+if [ -n "${P/*_rc*/}" ]; then
+	SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
+else
+	MY_P="${P/_/-}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="http://www.claws-mail.org/snapshots/${MY_P}.tar.bz2"
+fi
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+COMMONDEPEND=">=x11-libs/gtk+-2.6
+	pda? ( >=app-pda/jpilot-0.99 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	crypt? ( >=app-crypt/gpgme-1.1.1 )
+	dillo? ( www-client/dillo )
+	spell? ( virtual/aspell-dict )
+	clamav? ( app-antivirus/clamav )
+	kde? ( kde-base/kdelibs )
+	imap? ( >=net-libs/libetpan-0.49 )
+	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
+	startup-notification? ( x11-libs/startup-notification )
+	bogofilter? ( mail-filter/bogofilter )
+	session? ( x11-libs/libSM
+			x11-libs/libICE )
+	!<mail-client/sylpheed-claws-2.6.1"	# old name, block as user hint and due to some file collision
+
+DEPEND="${COMMONDEPEND}
+	xface? ( >=media-libs/compface-1.4 )
+	>=sys-apps/sed-4
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMONDEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info"
+
+PLUGIN_NAMES="acpi-notifier att-remover attachwarner cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification pdf-viewer perl rssyl smime synce vcalendar"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Remove unmaintained insecure script, following upstream action
+	rm tools/*sylprint* || die
+}
+
+src_compile() {
+	local myconf
+
+	# Optional features
+	myconf="${myconf} `use_enable gnome gnomeprint`"
+	myconf="${myconf} `use_enable imap libetpan`"
+	myconf="${myconf} `use_enable ipv6`"
+	myconf="${myconf} `use_enable ldap`"
+	myconf="${myconf} `use_enable pda jpilot`"
+	myconf="${myconf} `use_enable spell aspell`"
+	myconf="${myconf} `use_enable ssl openssl`"
+	myconf="${myconf} `use_enable xface compface`"
+	myconf="${myconf} `use_enable doc manual`"
+	myconf="${myconf} `use_enable startup-notification`"
+	myconf="${myconf} `use_enable session libsm`"
+
+	# Optional plugins
+	myconf="${myconf} `use_enable clamav clamav-plugin`"
+	myconf="${myconf} `use_enable crypt pgpmime-plugin`"
+	myconf="${myconf} `use_enable crypt pgpinline-plugin`"
+	myconf="${myconf} `use_enable crypt pgpcore-plugin`"
+	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
+	myconf="${myconf} `use_enable spamassassin spamassassin-plugin`"
+	myconf="${myconf} `use_enable bogofilter bogofilter-plugin`"
+
+	econf \
+		--enable-trayicon-plugin \
+		--disable-maemo \
+		${myconf} || die "./configure failed"
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+	# => also install it in /usr/share/pixmaps for other desktop envs
+	# => also install higher resolution icons in /usr/share/icons/hicolor/...
+	insinto /usr/share/pixmaps
+	doins ${PN}.png || die
+	local res resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		insinto ${resdir}
+		newins ${PN}-${res}.png ${PN}.png || die
+	done
+
+	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
+	docinto tools
+	dodoc tools/README*
+
+	insinto /usr/share/applications
+	doins ${PN}.desktop
+
+	einfo "Installing extra tools"
+	cd "${S}"/tools
+	exeinto /usr/$(get_libdir)/${PN}/tools
+	doexe *.pl *.py *.rc *.conf *.sh || die
+	doexe tb2claws-mail update-po uudec uuooffice || die
+
+	if use kde; then
+		einfo "Installing kde service scripts"
+		local kdeprefix="$(kde-config --prefix)"
+		local servicescript="${PN}-kdeservicemenu.pl"
+		local desktopfile="${PN}-attach-files.desktop"
+		cd "${S}"/tools/kdeservicemenu
+		sed -i -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" \
+			template_${desktopfile}
+		dodir /usr/share/apps/konqueror/servicemenus
+		insopts -m 0644
+		insinto /usr/share/apps/konqueror/servicemenus
+		newins template_${desktopfile} ${desktopfile} || die
+		dodir ${kdeprefix}/bin
+		insopts -m 755
+		exeinto ${kdeprefix}/bin
+		doexe ${servicescript} || die
+	fi
+
+	# kill useless plugin files
+	rm -f "${D}"/usr/lib*/${PN}/plugins/*.{la,a}
+}
+
+pkg_postinst() {
+	gtk-update-icon-cache -f -t "${ROOT}"/usr/share/icons/hicolor
+
+	UPDATE_PLUGINS=""
+	RENAME_PLUGINS=""
+	for x in ${PLUGIN_NAMES}; do
+		has_version mail-client/${PN}-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
+		has_version mail-client/sylpheed-claws-$x && RENAME_PLUGINS="${RENAME_PLUGINS} $x"
+	done
+	if [ -n "${RENAME_PLUGINS}" ]; then
+		elog
+		elog "The following sylpheed-claws plugins were found on your system:"
+		elog
+		for x in ${RENAME_PLUGINS}; do
+			elog "    mail-client/sylpheed-claws-$x"
+		done
+		elog
+		elog "If you want to continue using those you need to merge their "
+		elog "renamed counterparts:"
+		elog
+		for x in ${RENAME_PLUGINS}; do
+			elog "    mail-client/${PN}-$x"
+		done
+		elog
+	fi
+	if [ -n "${UPDATE_PLUGINS}" ]; then
+		elog
+		elog "You have to re-emerge or update the following plugins:"
+		elog
+		for x in ${UPDATE_PLUGINS}; do
+			elog "    mail-client/${PN}-$x"
+		done
+		elog
+	fi
+	if [ -n "${RENAME_PLUGINS}${UPDATE_PLUGINS}" ]; then
+		elog
+		elog "You can use"
+		elog "    /bin/bash ${FILESDIR}/plugins-rebuild.sh"
+		elog "to automatically handle this."
+		elog
+		epause 5
+		ebeep 3
+	fi
+}
+
+pkg_postrm() {
+	gtk-update-icon-cache -f -t "${ROOT}"/usr/share/icons/hicolor
+}
diff --git a/mail-client/claws-mail/claws-mail-3.0.2.ebuild b/mail-client/claws-mail/claws-mail-3.0.2.ebuild
index 0b6273c50399..539d404afca8 100644
--- a/mail-client/claws-mail/claws-mail-3.0.2.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.0.2.ebuild,v 1.5 2007/12/04 18:48:04 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.0.2.ebuild,v 1.6 2007/12/04 20:42:45 ticho Exp $
 
 IUSE="bogofilter clamav crypt dillo doc gnome imap ipv6 kde ldap pda session spamassassin spell ssl startup-notification xface"
 
@@ -49,14 +49,6 @@ RDEPEND="${COMMONDEPEND}
 
 PLUGIN_NAMES="acpi-notifier att-remover attachwarner cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification pdf-viewer perl rssyl smime synce vcalendar"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Remove unmaintained insecure script, following upstream action
-	rm tools/*sylprint* || die
-}
-
 src_compile() {
 	local myconf
 
diff --git a/mail-client/claws-mail/claws-mail-3.1.0-r1.ebuild b/mail-client/claws-mail/claws-mail-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..8e370668ca5f
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.1.0-r1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.1.0-r1.ebuild,v 1.1 2007/12/04 20:42:45 ticho Exp $
+
+IUSE="bogofilter clamav crypt dillo doc gnome gnutls imap ipv6 kde ldap nntp pda session spamassassin spell ssl startup-notification xface"
+
+inherit eutils multilib
+
+DESCRIPTION="Claws-Mail is an email client (and news reader) based on GTK+"
+HOMEPAGE="http://www.claws-mail.org"
+
+if [ -n "${P/*_rc*/}" ]; then
+	SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
+else
+	MY_P="${P/_/-}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="http://www.claws-mail.org/snapshots/${MY_P}.tar.bz2"
+fi
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+COMMONDEPEND=">=x11-libs/gtk+-2.6
+	pda? ( >=app-pda/jpilot-0.99 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	crypt? ( >=app-crypt/gpgme-1.1.1 )
+	dillo? ( www-client/dillo )
+	spell? ( virtual/aspell-dict )
+	clamav? ( app-antivirus/clamav )
+	kde? ( kde-base/kdelibs )
+	imap? ( >=net-libs/libetpan-0.49 )
+	nntp? ( >=net-libs/libetpan-0.49 )
+	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
+	gnutls? ( net-libs/gnutls )
+	startup-notification? ( x11-libs/startup-notification )
+	bogofilter? ( mail-filter/bogofilter )
+	session? ( x11-libs/libSM
+			x11-libs/libICE )
+	!<mail-client/sylpheed-claws-2.6.1"	# old name, block as user hint and due to some file collision
+
+DEPEND="${COMMONDEPEND}
+	xface? ( >=media-libs/compface-1.4 )
+	>=sys-apps/sed-4
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMONDEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info"
+
+PLUGIN_NAMES="acpi-notifier att-remover attachwarner cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification pdf-viewer perl rssyl smime synce vcalendar"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Remove unmaintained insecure script, following upstream action
+	rm tools/*sylprint* || die
+}
+
+src_compile() {
+	local myconf="--disable-libetpan"
+
+	# libetpan is needed if user wants nntp or imap functionality
+	# TODO: Perhaps change it into a single "libetpan" USE flag?
+	use imap && myconf="--enable-libetpan"
+	use nntp && myconf="--enable-libetpan"
+
+	# Optional features
+	myconf="${myconf} `use_enable gnome gnomeprint`"
+	myconf="${myconf} `use_enable ipv6`"
+	myconf="${myconf} `use_enable ldap`"
+	myconf="${myconf} `use_enable pda jpilot`"
+	myconf="${myconf} `use_enable spell aspell`"
+	myconf="${myconf} `use_enable gnutls`"
+	myconf="${myconf} `use_enable ssl openssl`"
+	myconf="${myconf} `use_enable xface compface`"
+	myconf="${myconf} `use_enable doc manual`"
+	myconf="${myconf} `use_enable startup-notification`"
+	myconf="${myconf} `use_enable session libsm`"
+
+	# Optional plugins
+	myconf="${myconf} `use_enable clamav clamav-plugin`"
+	myconf="${myconf} `use_enable crypt pgpmime-plugin`"
+	myconf="${myconf} `use_enable crypt pgpinline-plugin`"
+	myconf="${myconf} `use_enable crypt pgpcore-plugin`"
+	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
+	myconf="${myconf} `use_enable spamassassin spamassassin-plugin`"
+	myconf="${myconf} `use_enable bogofilter bogofilter-plugin`"
+
+	econf \
+		--enable-trayicon-plugin \
+		--disable-maemo \
+		${myconf} || die "./configure failed"
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+	# => also install it in /usr/share/pixmaps for other desktop envs
+	# => also install higher resolution icons in /usr/share/icons/hicolor/...
+	insinto /usr/share/pixmaps
+	doins ${PN}.png || die
+	local res resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		insinto ${resdir}
+		newins ${PN}-${res}.png ${PN}.png || die
+	done
+
+	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
+	docinto tools
+	dodoc tools/README*
+
+	insinto /usr/share/applications
+	doins ${PN}.desktop
+
+	einfo "Installing extra tools"
+	cd "${S}"/tools
+	exeinto /usr/$(get_libdir)/${PN}/tools
+	doexe *.pl *.py *.rc *.conf *.sh || die
+	doexe tb2claws-mail update-po uudec uuooffice || die
+
+	if use kde; then
+		einfo "Installing kde service scripts"
+		local kdeprefix="$(kde-config --prefix)"
+		local servicescript="${PN}-kdeservicemenu.pl"
+		local desktopfile="${PN}-attach-files.desktop"
+		cd "${S}"/tools/kdeservicemenu
+		sed -i -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" \
+			${desktopfile}.template
+		dodir /usr/share/apps/konqueror/servicemenus
+		insopts -m 0644
+		insinto /usr/share/apps/konqueror/servicemenus
+		newins ${desktopfile}.template ${desktopfile} || die
+		dodir ${kdeprefix}/bin
+		insopts -m 755
+		exeinto ${kdeprefix}/bin
+		doexe ${servicescript} || die
+	fi
+
+	# kill useless plugin files
+	rm -f "${D}"/usr/lib*/${PN}/plugins/*.{la,a}
+}
+
+pkg_postinst() {
+	gtk-update-icon-cache -f -t "${ROOT}"/usr/share/icons/hicolor
+
+	UPDATE_PLUGINS=""
+	RENAME_PLUGINS=""
+	for x in ${PLUGIN_NAMES}; do
+		has_version mail-client/${PN}-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
+		has_version mail-client/sylpheed-claws-$x && RENAME_PLUGINS="${RENAME_PLUGINS} $x"
+	done
+	if [ -n "${RENAME_PLUGINS}" ]; then
+		elog
+		elog "The following sylpheed-claws plugins were found on your system:"
+		elog
+		for x in ${RENAME_PLUGINS}; do
+			elog "    mail-client/sylpheed-claws-$x"
+		done
+		elog
+		elog "If you want to continue using those you need to merge their "
+		elog "renamed counterparts:"
+		elog
+		for x in ${RENAME_PLUGINS}; do
+			elog "    mail-client/${PN}-$x"
+		done
+		elog
+	fi
+	if [ -n "${UPDATE_PLUGINS}" ]; then
+		elog
+		elog "You have to re-emerge or update the following plugins:"
+		elog
+		for x in ${UPDATE_PLUGINS}; do
+			elog "    mail-client/${PN}-$x"
+		done
+		elog
+	fi
+	if [ -n "${RENAME_PLUGINS}${UPDATE_PLUGINS}" ]; then
+		elog
+		elog "You can use"
+		elog "    /bin/bash ${FILESDIR}/plugins-rebuild.sh"
+		elog "to automatically handle this."
+		elog
+		epause 5
+		ebeep 3
+	fi
+}
+
+pkg_postrm() {
+	gtk-update-icon-cache -f -t "${ROOT}"/usr/share/icons/hicolor
+}
diff --git a/mail-client/claws-mail/claws-mail-3.1.0.ebuild b/mail-client/claws-mail/claws-mail-3.1.0.ebuild
index 5083a9dd9ac1..095687c038d3 100644
--- a/mail-client/claws-mail/claws-mail-3.1.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.1.0.ebuild,v 1.4 2007/12/04 18:48:04 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.1.0.ebuild,v 1.5 2007/12/04 20:42:45 ticho Exp $
 
 IUSE="bogofilter clamav crypt dillo doc gnome gnutls imap ipv6 kde ldap nntp pda session spamassassin spell ssl startup-notification xface"
 
@@ -51,14 +51,6 @@ RDEPEND="${COMMONDEPEND}
 
 PLUGIN_NAMES="acpi-notifier att-remover attachwarner cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification pdf-viewer perl rssyl smime synce vcalendar"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Remove unmaintained insecure script, following upstream action
-	rm tools/*sylprint* || die
-}
-
 src_compile() {
 	local myconf="--disable-libetpan"
 
diff --git a/mail-client/claws-mail/files/digest-claws-mail-3.0.2-r1 b/mail-client/claws-mail/files/digest-claws-mail-3.0.2-r1
new file mode 100644
index 000000000000..f78efc4fe9b4
--- /dev/null
+++ b/mail-client/claws-mail/files/digest-claws-mail-3.0.2-r1
@@ -0,0 +1,3 @@
+MD5 97a0c627f91b51b6851b9a1ed9ee7afe claws-mail-3.0.2.tar.bz2 5664767
+RMD160 e7041fa284b73faa40ba7fc6dce3914625cd89d9 claws-mail-3.0.2.tar.bz2 5664767
+SHA256 d04db59df8b013651721312ed167df95d47c88d55eac0eb5b7950d6958f3636e claws-mail-3.0.2.tar.bz2 5664767
diff --git a/mail-client/claws-mail/files/digest-claws-mail-3.1.0-r1 b/mail-client/claws-mail/files/digest-claws-mail-3.1.0-r1
new file mode 100644
index 000000000000..1f54da103e2f
--- /dev/null
+++ b/mail-client/claws-mail/files/digest-claws-mail-3.1.0-r1
@@ -0,0 +1,3 @@
+MD5 ef1184a0f1b41e44545dac9d880b9638 claws-mail-3.1.0.tar.bz2 5786535
+RMD160 8f22d98836aba29afdca378308b9181f725edb74 claws-mail-3.1.0.tar.bz2 5786535
+SHA256 07badeb5dd16c24fbdb719224122a1d27fbc34c122fd3e9ff39eadf4cc6207de claws-mail-3.1.0.tar.bz2 5786535