diff options
author | Marius Mauch <genone@gentoo.org> | 2005-11-11 13:52:49 +0000 |
---|---|---|
committer | Marius Mauch <genone@gentoo.org> | 2005-11-11 13:52:49 +0000 |
commit | eec9af08c551ce6a4243ed12772ca6b6a35cc8ad (patch) | |
tree | 7f0ff5b379fa2b685188786eedd20ac862673e57 | |
parent | Updated dependencies (diff) | |
download | historical-eec9af08c551ce6a4243ed12772ca6b6a35cc8ad.tar.gz historical-eec9af08c551ce6a4243ed12772ca6b6a35cc8ad.tar.bz2 historical-eec9af08c551ce6a4243ed12772ca6b6a35cc8ad.zip |
Version bump and security bump (bug 111853)
Package-Manager: portage-2.0.53_rc7
7 files changed, 512 insertions, 1 deletions
diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog index ec6e630161e7..4a13ddb6bea0 100644 --- a/mail-client/sylpheed-claws/ChangeLog +++ b/mail-client/sylpheed-claws/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for mail-client/sylpheed-claws # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.67 2005/11/07 05:12:55 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.68 2005/11/11 13:52:49 genone Exp $ + +*sylpheed-claws-1.9.100 (11 Nov 2005) +*sylpheed-claws-1.0.5-r1 (11 Nov 2005) + + 11 Nov 2005; Marius Mauch <genone@gentoo.org> + +files/ldif-buffer-overflow-fix.diff, +sylpheed-claws-1.0.5-r1.ebuild, + +sylpheed-claws-1.9.100.ebuild: + Version bump and backported security fix for 1.0.5 (bug #111853). *sylpheed-claws-1.9.99 (07 Nov 2005) diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest index a4b1a5c1f391..b37285b368bf 100644 --- a/mail-client/sylpheed-claws/Manifest +++ b/mail-client/sylpheed-claws/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 732cdc3b41403a115970d497a9ec257e ChangeLog 25770 MD5 743b9535636a8b39507545bc03a1a265 files/digest-sylpheed-claws-1.0.5 74 MD5 743b9535636a8b39507545bc03a1a265 files/digest-sylpheed-claws-1.0.5-r1 74 @@ -16,3 +19,10 @@ MD5 5cd279ff9a1732297aa19e63b9af17c0 sylpheed-claws-1.9.13-r1.ebuild 4825 MD5 15b5c9348ba0b0a416892588256b4cbc sylpheed-claws-1.9.15.ebuild 4821 MD5 d183694ee9f8f98700d28c9d77106b6a sylpheed-claws-1.9.99.ebuild 4420 MD5 37cb377350bd646741915100c011b64f sylpheed-claws-1.9.99_rc2.ebuild 4826 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDdKJD6J2i8a8J4okRAmRbAKCt0U6P385YEeVHyX2N0gB5HCIsKwCdGVM+ +AWcFHuDYewO2fVheLNArvMo= +=zsfe +-----END PGP SIGNATURE----- diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.5-r1 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.5-r1 new file mode 100644 index 000000000000..17aa11653b76 --- /dev/null +++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.5-r1 @@ -0,0 +1 @@ +MD5 ef4a1a7beb407dc7c31b4799bc48f12e sylpheed-claws-1.0.5.tar.bz2 3268626 diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.100 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.100 new file mode 100644 index 000000000000..b23897e160c7 --- /dev/null +++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.100 @@ -0,0 +1 @@ +MD5 863c314557f90f17c2f6d6a0ab57e6c2 sylpheed-claws-1.9.100.tar.bz2 3480063 diff --git a/mail-client/sylpheed-claws/files/ldif-buffer-overflow-fix.diff b/mail-client/sylpheed-claws/files/ldif-buffer-overflow-fix.diff new file mode 100644 index 000000000000..93029d99f5ed --- /dev/null +++ b/mail-client/sylpheed-claws/files/ldif-buffer-overflow-fix.diff @@ -0,0 +1,200 @@ +diff -ru sylpheed-claws-1.9.99/work/sylpheed-claws-1.9.99/src/ldif.c sylpheed-claws-1.9.100/work/sylpheed-claws-1.9.100/src/ldif.c +--- sylpheed-claws-1.9.99/work/sylpheed-claws-1.9.99/src/ldif.c 2005-09-21 19:52:31.000000000 +0200 ++++ sylpheed-claws-1.9.100/work/sylpheed-claws-1.9.100/src/ldif.c 2005-11-07 19:41:26.000000000 +0100 +@@ -306,26 +306,28 @@ + static gchar *ldif_get_line( LdifFile *ldifFile ) { + gchar buf[ LDIFBUFSIZE ]; + gint ch; +- gchar *ptr; ++ int i = 0; + +- if( feof( ldifFile->file ) ) return NULL; ++ if( feof( ldifFile->file ) ) ++ return NULL; + +- ptr = buf; +- while( TRUE ) { +- *ptr = '\0'; ++ while( i < LDIFBUFSIZE-1 ) { + ch = fgetc( ldifFile->file ); + if( ch == '\0' || ch == EOF ) { +- if( *buf == '\0' ) return NULL; ++ if( i == 0 ) return NULL; + break; + } + #if HAVE_DOSISH_SYSTEM + #else +- if( ch == '\r' ) continue; ++ if( ch == '\r' ) ++ continue; + #endif +- if( ch == '\n' ) break; +- *ptr = ch; +- ptr++; ++ if( ch == '\n' ) ++ break; ++ buf[i] = ch; ++ i++; + } ++ buf[i] = '\0'; + + /* Return a copy of buffer */ + return g_strdup( buf ); +@@ -483,6 +485,14 @@ + fullName = g_strdup_printf( "%s", lastName ); + } + } ++ ++ if (!fullName || strlen(fullName) == 0) { ++ g_free(fullName); ++ fullName = NULL; ++ if (rec->listCName) ++ fullName = g_strdup(rec->listCName->data); ++ } ++ + if( fullName ) { + g_strchug( fullName ); g_strchomp( fullName ); + } +@@ -723,7 +733,17 @@ + if( lastTag ) { + /* Save record */ + fullValue = mgu_list_coalesce( listValue ); +- ++ if (fullValue && last64) { ++ gchar *out = g_malloc(strlen(fullValue)); ++ int len = 0; ++ if ((len = base64_decode(out, fullValue, ++ strlen(fullValue))) >= 0) { ++ g_free(fullValue); ++ fullValue = out; ++ fullValue[len] = '\0'; ++ } else ++ g_free(out); ++ } + /* Base-64 encoded data */ + /* + if( last64 ) { +@@ -764,6 +784,17 @@ + /* Save data */ + fullValue = + mgu_list_coalesce( listValue ); ++ if (fullValue && last64) { ++ gchar *out = g_malloc(strlen(fullValue)); ++ int len = 0; ++ if ((len = base64_decode(out, fullValue, ++ strlen(fullValue))) >= 0) { ++ g_free(fullValue); ++ fullValue = out; ++ fullValue[len] = '\0'; ++ } else ++ g_free(out); ++ } + /* Base-64 encoded data */ + /* + if( last64 ) { +@@ -908,7 +939,6 @@ + /* Process file */ + while( ! flagEOF ) { + gchar *line = ldif_get_line( ldifFile ); +- + posCur = ftell( ldifFile->file ); + if( ldifFile->cbProgress ) { + /* Call progress indicator */ +diff -ru sylpheed-claws-1.9.99/work/sylpheed-claws-1.9.99/src/mutt.c sylpheed-claws-1.9.100/work/sylpheed-claws-1.9.100/src/mutt.c +--- sylpheed-claws-1.9.99/work/sylpheed-claws-1.9.99/src/mutt.c 2005-09-21 19:52:32.000000000 +0200 ++++ sylpheed-claws-1.9.100/work/sylpheed-claws-1.9.100/src/mutt.c 2005-11-07 11:59:11.000000000 +0100 +@@ -159,34 +159,37 @@ + static gchar *mutt_get_line( MuttFile *muttFile, gboolean *flagCont ) { + gchar buf[ MUTTBUFSIZE ]; + int ch, lch; +- gchar *ptr, *lptr; ++ int i = 0, li = 0; + + *flagCont = FALSE; +- if( feof( muttFile->file ) ) return NULL; ++ if( feof( muttFile->file ) ) ++ return NULL; ++ ++ memset(buf, 0, MUTTBUFSIZE); + +- ptr = buf; + lch = '\0'; +- lptr = NULL; +- while( TRUE ) { +- *ptr = '\0'; ++ while( i < MUTTBUFSIZE-1 ) { + ch = fgetc( muttFile->file ); + if( ch == '\0' || ch == EOF ) { +- if( *buf == '\0' ) return NULL; ++ if( i == 0 ) ++ return NULL; + break; + } + if( ch == '\n' ) { + if( lch == '\\' ) { + /* Replace backslash with NULL */ +- if( lptr ) *lptr = '\0'; ++ if( li != 0 ) ++ buf[li] = '\0'; + *flagCont = TRUE; + } + break; + } +- *ptr = ch; +- lptr = ptr; ++ buf[i] = ch; ++ li = i; + lch = ch; +- ptr++; ++ i++; + } ++ buf[i]='\0'; + + /* Copy into private buffer */ + return g_strdup( buf ); +diff -ru sylpheed-claws-1.9.99/work/sylpheed-claws-1.9.99/src/pine.c sylpheed-claws-1.9.100/work/sylpheed-claws-1.9.100/src/pine.c +--- sylpheed-claws-1.9.99/work/sylpheed-claws-1.9.99/src/pine.c 2005-09-21 19:52:32.000000000 +0200 ++++ sylpheed-claws-1.9.100/work/sylpheed-claws-1.9.100/src/pine.c 2005-11-07 11:59:11.000000000 +0100 +@@ -163,31 +163,32 @@ + */ + static gchar *pine_read_line( PineFile *pineFile ) { + gchar buf[ PINEBUFSIZE ]; +- int c; ++ int c, i = 0; + gchar ch; +- gchar *ptr; + +- if( feof( pineFile->file ) ) return NULL; ++ if( feof( pineFile->file ) ) ++ return NULL; + +- ptr = buf; +- while( TRUE ) { +- *ptr = '\0'; ++ while( i < PINEBUFSIZE-1 ) { + c = fgetc( pineFile->file ); + if( c == EOF ) { +- if( *buf == '\0' ) return NULL; ++ if( i == 0 ) ++ return NULL; + break; + } + ch = (gchar) c; + if( ch == '\0' ) { +- if( *buf == '\0' ) return NULL; ++ if( i == 0 ) ++ return NULL; + break; + } + if( ch == '\n' ) { + break; + } +- *ptr = ch; +- ptr++; ++ buf[i] = ch; ++ i++; + } ++ buf[i] = '\0'; + + /* Copy into private buffer */ + return g_strdup( buf ); diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.0.5-r1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.0.5-r1.ebuild new file mode 100644 index 000000000000..e53914e561c7 --- /dev/null +++ b/mail-client/sylpheed-claws/sylpheed-claws-1.0.5-r1.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.0.5-r1.ebuild,v 1.1 2005/11/11 13:52:49 genone Exp $ + +IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir xface kde" # mbox + +inherit eutils + +# setting up plugin related variables +GS_VERSION="ghostscript-viewer-0.8" +PGP_VERSION="pgpinline-0.5" +MAILDIR_VERSION="maildir-0.7" + +DESCRIPTION="Bleeding edge version of Sylpheed" +HOMEPAGE="http://claws.sylpheed.org" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +#SRC_URI="mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~genone/distfiles/${P}.tar.bz2" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" + +COMMONDEPEND="=x11-libs/gtk+-1.2* + pda? ( >=app-pda/jpilot-0.99 ) + ssl? ( >=dev-libs/openssl-0.9.7 ) + ldap? ( >=net-nds/openldap-2.0.7 ) + crypt? ( =app-crypt/gpgme-0.3.14-r1 ) + dillo? ( www-client/dillo ) + clamav? ( app-antivirus/clamav ) + gnome? ( >=media-libs/gdk-pixbuf-0.16 ) + imlib? ( >=media-libs/imlib-1.9.10 ) + spell? ( virtual/aspell-dict ) + nls? ( >=sys-devel/gettext-0.12 ) + kde? ( kde-base/kdelibs ) + x11-libs/startup-notification" + +DEPEND="${COMMONDEPEND} + >=media-libs/compface-1.4 + >=sys-apps/sed-4" + +RDEPEND="${COMMONDEPEND} + app-misc/mime-types + net-mail/metamail + x11-misc/shared-mime-info" + +PDEPEND="pdflib? ( =mail-client/${PN}-${GS_VERSION} ) + maildir? ( =mail-client/${PN}-${MAILDIR_VERSION} ) + crypt? ( =mail-client/${PN}-${PGP_VERSION} )" +# mbox? ( =mail-client/${PN}-${MBOX_VERSION} )" + +PROVIDE="virtual/sylpheed" + +src_unpack() { + unpack ${A} + + # use shared-mime-info + cd ${S}/src + epatch ${FILESDIR}/procmime.patch + epatch ${FILESDIR}/ldif-buffer-overflow-fix.diff +} + +src_compile() { + local myconf + + myconf="${myconf} `use_enable gnome gdk-pixbuf`" + myconf="${myconf} `use_enable imlib`" + myconf="${myconf} `use_enable spell aspell`" + myconf="${myconf} `use_enable ldap`" + myconf="${myconf} `use_enable ssl openssl`" + myconf="${myconf} `use_enable crypt gpgme`" + myconf="${myconf} `use_enable ipv6`" + myconf="${myconf} `use_enable pda jpilot`" + myconf="${myconf} `use_enable nls`" + myconf="${myconf} `use_enable dillo dillo-viewer-plugin`" + myconf="${myconf} `use_enable clamav clamav-plugin`" + myconf="${myconf} `use_enable crypt pgpmime-plugin`" + myconf="${myconf} `use_enable xface compface`" + + export GPGME_CONFIG=${ROOT}/usr/bin/gpgme3-config + econf \ + --program-suffix=-claws \ + --enable-spamassassin-plugin \ + ${myconf} || die "./configure failed" + + emake || die + + # build the extra tools + cd ${S}/tools + emake || die +} + +src_install() { + make DESTDIR=${D} install || die + + local menuentry="/usr/share/applications/sylpheed-claws.desktop" + insinto /usr/share/applications + newins ${S}/sylpheed.desktop sylpheed-claws.desktop + dosed "s/Sylpheed/Sylpheed Claws/" ${menuentry} + dosed "s/sylpheed/sylpheed-claws/" ${menuentry} + rm -rf ${D}/usr/share/gnome + + insinto /usr/share/pixmaps + newins ${S}/sylpheed.png sylpheed-claws.png + rm -f ${D}/usr/share/pixmaps/sylpheed.png + + dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO* + docinto tools + dodoc tools/README* + + # install the extra tools + cd ${S}/tools + exeinto /usr/lib/${PN}/tools + doexe *.pl *.py *.rc *.conf *.sh + doexe tb2sylpheed update-po uudec gpg-sign-syl + + if use kde; then + local kdeprefix="$(kde-config --prefix)" + local servicescript="sylpheed-kdeservicemenu.pl" + cd ${S}/tools/kdeservicemenu + for f in sylpheed-attach-files.desktop sylpheed-compress-attach.desktop; do + sed -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" template_$f > $f + install -m 0644 $f ${D}/${kdeprefix}/share/apps/konqueror/servicemenus/$f + done + insinto ${kdeprefix}/bin + doexe ${servicescript} + fi +} + +pkg_postinst() { + ewarn + ewarn "You have to re-emerge or update all external plugins" + ewarn + epause 5 + ebeep 3 +} diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.9.100.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.9.100.ebuild new file mode 100644 index 000000000000..bd9ca84c3b94 --- /dev/null +++ b/mail-client/sylpheed-claws/sylpheed-claws-1.9.100.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.9.100.ebuild,v 1.1 2005/11/11 13:52:49 genone Exp $ + +IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc" + +inherit eutils + +DESCRIPTION="Bleeding edge version of Sylpheed" +HOMEPAGE="http://claws.sylpheed.org" + +if [ -n "${P/*_rc*/}" ]; then + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +else + MY_P="${P/_/-}" + S="${WORKDIR}/${MY_P}" + SRC_URI="http://claws.sylpheed.org/snapshots/${MY_P}.tar.bz2" +fi + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +COMMONDEPEND=">=x11-libs/gtk+-2.4 + pda? ( >=app-pda/jpilot-0.99 ) + ssl? ( >=dev-libs/openssl-0.9.7 ) + ldap? ( >=net-nds/openldap-2.0.7 ) + crypt? ( >=app-crypt/gpgme-0.4 ) + dillo? ( www-client/dillo ) + spell? ( virtual/aspell-dict ) + clamav? ( app-antivirus/clamav ) + kde? ( kde-base/kdelibs ) + imap? ( >=net-libs/libetpan-0.38 ) + gnome? ( >=gnome-base/libgnomeprintui-2.2 ) + x11-libs/startup-notification + !mail-client/sylpheed-claws-pgpinline" # included in the main package now + +DEPEND="${COMMONDEPEND} + xface? ( >=media-libs/compface-1.4 ) + >=sys-apps/sed-4" + +RDEPEND="${COMMONDEPEND} + app-misc/mime-types + net-mail/metamail + x11-misc/shared-mime-info" + +PROVIDE="virtual/sylpheed" + +src_unpack() { + unpack ${A} + + # Only install local manual/FAQ if USE=doc, and honor $LINGUAS: + local docdir lang languages + for docdir in faq manual ; do + cd "${S}/doc/${docdir}" + languages="" + # filter languages that are in $LINGUAS + for lang in ${LINGUAS} ; do + if [[ -d "${lang}" ]] ; then + languages="${languages} ${lang}" + fi + done + # Fix SUBDIRS (will be empty if -doc) + if use doc && [ -n "${languages}" ]; then + sed -i -e "/^SUBDIRS =/s:= .*:= ${languages}:" Makefile.in + elif ! use doc; then + sed -i -e "/^SUBDIRS =/s:= .*:= :" Makefile.in + fi + done +} + +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`" + + # 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`" + + econf \ + --enable-startup-notification \ + --enable-trayicon-plugin \ + ${myconf} || die "./configure failed" + + emake || die + + # build the extra tools + cd ${S}/tools + emake || die +} + +src_install() { + make DESTDIR=${D} install || die + + # wait for upstream: move manpage + mv ${D}/usr/share/man/man1/sylpheed{,-claws}.1 + + dodir /usr/share/applications + mv ${D}/usr/share/{gnome/apps/Internet,applications}/sylpheed-claws.desktop + rm -rf ${D}/usr/share/gnome + + # Makefile install sylpheed-claws.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 sylpheed-claws.png + local resdir + for res in 64x64 128x128 ; do + resdir="/usr/share/icons/hicolor/${res}/apps" + insinto ${resdir} + newins sylpheed-claws-${res}.png sylpheed-claws.png + done + + dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO* + docinto tools + dodoc tools/README* + + # install the extra tools + cd ${S}/tools + exeinto /usr/lib/${PN}/tools + doexe *.pl *.py *.rc *.conf *.sh + doexe tb2sylpheed update-po uudec + + if use kde; then + local kdeprefix="$(kde-config --prefix)" + local servicescript="sylpheed-kdeservicemenu.pl" + cd ${S}/tools/kdeservicemenu + for f in sylpheed-attach-files.desktop sylpheed-compress-attach.desktop; do + sed -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" template_$f > $f + install -m 0644 $f ${D}/${kdeprefix}/share/apps/konqueror/servicemenus/$f + done + insinto ${kdeprefix}/bin + doexe ${servicescript} + fi +} + +pkg_postinst() { + ewarn + ewarn "You have to re-emerge or update all external plugins" + ewarn + epause 5 + ebeep 3 +} |