diff options
author | 2007-06-04 16:05:29 +0000 | |
---|---|---|
committer | 2007-06-04 16:05:29 +0000 | |
commit | bad6672577d50ccc5bc1236b1cd3de784e5ba865 (patch) | |
tree | 3e8c5d7a3cf8ecb752639609af90ab3c02140883 /media-libs | |
parent | Stable for HPPA (bug #180436). (diff) | |
download | historical-bad6672577d50ccc5bc1236b1cd3de784e5ba865.tar.gz historical-bad6672577d50ccc5bc1236b1cd3de784e5ba865.tar.bz2 historical-bad6672577d50ccc5bc1236b1cd3de784e5ba865.zip |
Fix memory corruption, patch and report from flameeyes
Package-Manager: portage-2.1.2.9
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/libtheora/ChangeLog | 9 | ||||
-rw-r--r-- | media-libs/libtheora/Manifest | 29 | ||||
-rw-r--r-- | media-libs/libtheora/files/digest-libtheora-1.0_alpha7-r1 | 3 | ||||
-rw-r--r-- | media-libs/libtheora/files/libtheora-1.0alpha7-nocomments.patch | 40 | ||||
-rw-r--r-- | media-libs/libtheora/libtheora-1.0_alpha7-r1.ebuild | 65 |
5 files changed, 131 insertions, 15 deletions
diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog index 383eed783914..4d3ab875d57b 100644 --- a/media-libs/libtheora/ChangeLog +++ b/media-libs/libtheora/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/libtheora # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.58 2007/06/01 20:14:30 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.59 2007/06/04 16:05:29 lu_zero Exp $ + +*libtheora-1.0_alpha7-r1 (04 Jun 2007) + + 04 Jun 2007; Luca Barbato <lu_zero@gentoo.org> + +files/libtheora-1.0alpha7-nocomments.patch, + +libtheora-1.0_alpha7-r1.ebuild: + Fix memory corruption, patch and report from flameeyes 01 Jun 2007; Alexis Ballier <aballier@gentoo.org> libtheora-1.0_alpha6-r1.ebuild: diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest index 4f0b84891bc0..de872f08fd69 100644 --- a/media-libs/libtheora/Manifest +++ b/media-libs/libtheora/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX libtheora-1.0_alpha6-pic-fix.patch 10712 RMD160 bb24bd1268ea4bbce8bdfc4ae21c7d5a463067ff SHA1 8654476589b44ecf0eea17204189c7b76c7c812b SHA256 1c5e77d55fe186f61cdde878d4f06333a7c4382ddea14a02b82c7e2395b1c4cd MD5 5ee6df083131befd1d185acff813aa77 files/libtheora-1.0_alpha6-pic-fix.patch 10712 RMD160 bb24bd1268ea4bbce8bdfc4ae21c7d5a463067ff files/libtheora-1.0_alpha6-pic-fix.patch 10712 @@ -9,20 +6,28 @@ AUX libtheora-1.0alpha6-buildfixes.patch 3977 RMD160 58061a155a4fbdb35ec87288d33 MD5 1eb2cfa449ce65cb36b04b1d8c93933f files/libtheora-1.0alpha6-buildfixes.patch 3977 RMD160 58061a155a4fbdb35ec87288d332001906ba457e files/libtheora-1.0alpha6-buildfixes.patch 3977 SHA256 d2770fadcef32f8c4ea585865974ad82b8e55b4c6b874168d258b5c65e5d2701 files/libtheora-1.0alpha6-buildfixes.patch 3977 +AUX libtheora-1.0alpha7-nocomments.patch 1520 RMD160 4f5ea455eebc349fbd2f9d1ea048f629ea6380aa SHA1 9b8b55da07243a092de4f7039bc0981b4b75f03c SHA256 0c4fe22dc41bf125166cdf4ba4df533f9132b7520de170480eea2aa1abd6913c +MD5 03743dd3b135007839f2b21c7ee026b7 files/libtheora-1.0alpha7-nocomments.patch 1520 +RMD160 4f5ea455eebc349fbd2f9d1ea048f629ea6380aa files/libtheora-1.0alpha7-nocomments.patch 1520 +SHA256 0c4fe22dc41bf125166cdf4ba4df533f9132b7520de170480eea2aa1abd6913c files/libtheora-1.0alpha7-nocomments.patch 1520 DIST libtheora-1.0alpha6.tar.bz2 1559318 RMD160 b0d81dab81ec96d51e2d6a4c047beff807de6077 SHA1 0fa7314a432e60c6178a7d98b6408c7a950155ed SHA256 4e6044cb24d2cdb42e5d9402c709644886e8761f7b166781469ffda44240da92 DIST libtheora-1.0alpha7.tar.bz2 1673255 RMD160 45a46c35cb1bd6f44a82a286940937e031edb14f SHA1 ee97d30e0818c27666477113c019d53f15449d3d SHA256 f0380bedd14382cf80304e3f209704b460a87981cd11e32194d940151d8880ea EBUILD libtheora-1.0_alpha6-r1.ebuild 1717 RMD160 7a15e9113c96bac6caa61868cdd16a7ff48711f2 SHA1 dd1575600ec35b01440059e9656cf9379d2ebcf9 SHA256 21f55309efab710b4d39187d75fc718fb103969d3c2e8b80aa429b6f6f3e458b MD5 cd8665bd1e644416bc297a4d0177ee49 libtheora-1.0_alpha6-r1.ebuild 1717 RMD160 7a15e9113c96bac6caa61868cdd16a7ff48711f2 libtheora-1.0_alpha6-r1.ebuild 1717 SHA256 21f55309efab710b4d39187d75fc718fb103969d3c2e8b80aa429b6f6f3e458b libtheora-1.0_alpha6-r1.ebuild 1717 +EBUILD libtheora-1.0_alpha7-r1.ebuild 1539 RMD160 f9be4b83a0f74e6c3210ac6477b36c86618112c7 SHA1 6b46ab0d511c5740fb5a8e70471a37bcd74267e2 SHA256 ba45351a1e4a49381bf7edaa95bac9baf0e729dc56a265056efda726ba38569f +MD5 b76148af5026280b645ebaf01964f082 libtheora-1.0_alpha7-r1.ebuild 1539 +RMD160 f9be4b83a0f74e6c3210ac6477b36c86618112c7 libtheora-1.0_alpha7-r1.ebuild 1539 +SHA256 ba45351a1e4a49381bf7edaa95bac9baf0e729dc56a265056efda726ba38569f libtheora-1.0_alpha7-r1.ebuild 1539 EBUILD libtheora-1.0_alpha7.ebuild 1489 RMD160 6faf15754fbb4b701c240bc53dd31d7ba53cd2f2 SHA1 be7e8a502f7eb797c1c30222f80f1fd6fdce625d SHA256 c75e56af947d4bc9480f762be7d9ee83eb597ce59895807939a5d275b9a42b4b MD5 56bf308c04fb69b9df5adc0d7840af2d libtheora-1.0_alpha7.ebuild 1489 RMD160 6faf15754fbb4b701c240bc53dd31d7ba53cd2f2 libtheora-1.0_alpha7.ebuild 1489 SHA256 c75e56af947d4bc9480f762be7d9ee83eb597ce59895807939a5d275b9a42b4b libtheora-1.0_alpha7.ebuild 1489 -MISC ChangeLog 7932 RMD160 75c9a882db62a943949f633811bb42fcb81c9e34 SHA1 59a51feb5149a6ab52c34a94c70e6f0359e420d0 SHA256 1e9892e6d365143459af59e92473d8f0a1abe9fbfee00ad4b03b0896b6db5842 -MD5 4b3b677edecd8c367b47c5d187943a6a ChangeLog 7932 -RMD160 75c9a882db62a943949f633811bb42fcb81c9e34 ChangeLog 7932 -SHA256 1e9892e6d365143459af59e92473d8f0a1abe9fbfee00ad4b03b0896b6db5842 ChangeLog 7932 +MISC ChangeLog 8160 RMD160 6321209acb30d958b46075371dec889af3b08794 SHA1 f5c9d3e3584d1a9345e0371089975f77f9429ad1 SHA256 1d6fd0d239f7e7ce30c1fc85c0999631d8f34eebcfe88033f558ba548e04eca0 +MD5 9c7b4d4b3ce12c2afc7738772fef51c1 ChangeLog 8160 +RMD160 6321209acb30d958b46075371dec889af3b08794 ChangeLog 8160 +SHA256 1d6fd0d239f7e7ce30c1fc85c0999631d8f34eebcfe88033f558ba548e04eca0 ChangeLog 8160 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225 @@ -33,10 +38,6 @@ SHA256 749c39f8feedca85f21af8969bc98c8c33c3d786faf52a5ed656dd7c063f1c00 files/di MD5 a3a7254609c6b17881a0f49b5500d87d files/digest-libtheora-1.0_alpha7 265 RMD160 1cb6650a003ed75137ab49106bd7f35d3b27af8a files/digest-libtheora-1.0_alpha7 265 SHA256 ed04c06d51479bd86dd0263900668d7908ef14d78987c7f75a57cfbd029abfab files/digest-libtheora-1.0_alpha7 265 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.4 (GNU/Linux) - -iD8DBQFGYH4wvFcC4BYPU0oRAvMFAKCaB98QQquTHsFXDScKc6HU6Dmq1wCgsASJ -q+4jR/gzovIVq3Xr2rdc/bs= -=PsJt ------END PGP SIGNATURE----- +MD5 a3a7254609c6b17881a0f49b5500d87d files/digest-libtheora-1.0_alpha7-r1 265 +RMD160 1cb6650a003ed75137ab49106bd7f35d3b27af8a files/digest-libtheora-1.0_alpha7-r1 265 +SHA256 ed04c06d51479bd86dd0263900668d7908ef14d78987c7f75a57cfbd029abfab files/digest-libtheora-1.0_alpha7-r1 265 diff --git a/media-libs/libtheora/files/digest-libtheora-1.0_alpha7-r1 b/media-libs/libtheora/files/digest-libtheora-1.0_alpha7-r1 new file mode 100644 index 000000000000..50381fb22b98 --- /dev/null +++ b/media-libs/libtheora/files/digest-libtheora-1.0_alpha7-r1 @@ -0,0 +1,3 @@ +MD5 1bc851e39e4b16977131d5e5f769f48b libtheora-1.0alpha7.tar.bz2 1673255 +RMD160 45a46c35cb1bd6f44a82a286940937e031edb14f libtheora-1.0alpha7.tar.bz2 1673255 +SHA256 f0380bedd14382cf80304e3f209704b460a87981cd11e32194d940151d8880ea libtheora-1.0alpha7.tar.bz2 1673255 diff --git a/media-libs/libtheora/files/libtheora-1.0alpha7-nocomments.patch b/media-libs/libtheora/files/libtheora-1.0alpha7-nocomments.patch new file mode 100644 index 000000000000..ef2f54f050c7 --- /dev/null +++ b/media-libs/libtheora/files/libtheora-1.0alpha7-nocomments.patch @@ -0,0 +1,40 @@ +Index: libtheora-1.0alpha7/lib/toplevel.c +=================================================================== +--- libtheora-1.0alpha7.orig/lib/toplevel.c ++++ libtheora-1.0alpha7/lib/toplevel.c +@@ -182,6 +182,7 @@ static int _theora_unpack_comment(theora + + _tp_readlsbint(opb,(long *) &tc->comments); + if(tc->comments<0)goto parse_err; ++ if(tc->comments==0)goto nocomments; + tc->user_comments=_ogg_calloc(tc->comments,sizeof(*tc->user_comments)); + tc->comment_lengths=_ogg_calloc(tc->comments,sizeof(*tc->comment_lengths)); + for(i=0;i<tc->comments;i++){ +@@ -192,6 +193,8 @@ static int _theora_unpack_comment(theora + tc->user_comments[i][len]='\0'; + tc->comment_lengths[i]=len; + } ++ ++nocomments: + return(0); + + parse_err: +Index: libtheora-1.0alpha7/lib/comment.c +=================================================================== +--- libtheora-1.0alpha7.orig/lib/comment.c ++++ libtheora-1.0alpha7/lib/comment.c +@@ -99,9 +99,11 @@ int theora_comment_query_count(theora_co + void theora_comment_clear(theora_comment *tc){ + if(tc){ + long i; +- for(i=0;i<tc->comments;i++) +- if(tc->user_comments[i])_ogg_free(tc->user_comments[i]); +- if(tc->user_comments)_ogg_free(tc->user_comments); ++ if (tc->user_comments) { ++ for(i=0;i<tc->comments;i++) ++ if(tc->user_comments[i])_ogg_free(tc->user_comments[i]); ++ _ogg_free(tc->user_comments); ++ } + if(tc->comment_lengths)_ogg_free(tc->comment_lengths); + if(tc->vendor)_ogg_free(tc->vendor); + memset(tc,0,sizeof(*tc)); diff --git a/media-libs/libtheora/libtheora-1.0_alpha7-r1.ebuild b/media-libs/libtheora/libtheora-1.0_alpha7-r1.ebuild new file mode 100644 index 000000000000..4e92387890d9 --- /dev/null +++ b/media-libs/libtheora/libtheora-1.0_alpha7-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_alpha7-r1.ebuild,v 1.1 2007/06/04 16:05:29 lu_zero Exp $ + +inherit flag-o-matic libtool + +DESCRIPTION="The Theora Video Compression Codec" +HOMEPAGE="http://www.theora.org/" +SRC_URI="http://downloads.xiph.org/releases/theora/${P/_}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="encode doc examples" + +RDEPEND=">=media-libs/libogg-1.1.0 + encode? ( >=media-libs/libvorbis-1.0.1 )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +S=${WORKDIR}/${P/_} + +src_unpack() { + unpack ${A} + cd "${S}" + sed -i -e 's:SUBDIRS = .*:SUBDIRS = lib include doc:' Makefile.in + + elibtoolize + + epatch "${FILESDIR}/${P/_}-nocomments.patch" + + if use examples; then + # This creates a clean copy of examples sources + cp -R "${S}/examples" "${WORKDIR}" + rm -f "${WORKDIR}/examples/Makefile"* + fi +} + +src_compile() { + # bug #75403, -O3 needs to be filtered to -O2 + replace-flags -O3 -O2 + + use doc || export ac_cv_prog_HAVE_DOXYGEN="false" + + econf \ + $(use_enable encode) \ + --enable-shared \ + --disable-dependency-tracking \ + || die "configure failed" + emake || die "make failed" +} + +src_install() { + emake -j1 \ + DESTDIR="${D}" \ + docdir="usr/share/doc/${PF}" \ + install || die "make install failed" + + if use examples; then + insinto "/usr/share/doc/${PF}/examples" + doins "${WORKDIR}/examples/"* + fi + + dodoc README +} |