Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9967b4d7e04b0e7f459482ac53e0e7441582b6c1
commit 9967b4d7e04b0e7f459482ac53e0e7441582b6c1 Author: Miklos Vajna <[email protected]> Date: Mon Sep 28 10:26:44 2009 +0200 libvorbis-1.2.3-1-i686 - version bump diff --git a/source/lib/libvorbis/CVE-2008-1419.patch b/source/lib/libvorbis/CVE-2008-1419.patch deleted file mode 100644 index fd73f23..0000000 --- a/source/lib/libvorbis/CVE-2008-1419.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/codebook.c -=================================================================== ---- lib/codebook.c (revision 14601) -+++ lib/codebook.c (revision 14602) -@@ -225,7 +225,7 @@ - int quantvals=0; - switch(s->maptype){ - case 1: -- quantvals=_book_maptype1_quantvals(s); -+ quantvals=(s->dim==0?0:_book_maptype1_quantvals(s)); - break; - case 2: - quantvals=s->entries*s->dim; diff --git a/source/lib/libvorbis/CVE-2008-1420.patch b/source/lib/libvorbis/CVE-2008-1420.patch deleted file mode 100644 index 819cbf0..0000000 --- a/source/lib/libvorbis/CVE-2008-1420.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: lib/res0.c -=================================================================== ---- lib/res0.c (revision 14597) -+++ lib/res0.c (revision 14598) -@@ -223,6 +223,20 @@ - for(j=0;j<acc;j++) - if(info->booklist[j]>=ci->books)goto errout; - -+ /* verify the phrasebook is not specifying an impossible or -+ inconsistent partitioning scheme. */ -+ { -+ int entries = ci->book_param[info->groupbook]->entries; -+ int dim = ci->book_param[info->groupbook]->dim; -+ int partvals = 1; -+ while(dim>0){ -+ partvals *= info->partitions; -+ if(partvals > entries) goto errout; -+ dim--; -+ } -+ if(partvals != entries) goto errout; -+ } -+ - return(info); - errout: - res0_free_info(info); -@@ -263,7 +277,7 @@ - } - } - -- look->partvals=rint(pow((float)look->parts,(float)dim)); -+ look->partvals=look->phrasebook->entries; - look->stages=maxstage; - look->decodemap=_ogg_malloc(look->partvals*sizeof(*look->decodemap)); - for(j=0;j<look->partvals;j++){ diff --git a/source/lib/libvorbis/CVE-2008-1423.patch b/source/lib/libvorbis/CVE-2008-1423.patch deleted file mode 100644 index 8c7c479..0000000 --- a/source/lib/libvorbis/CVE-2008-1423.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/codebook.c -=================================================================== ---- lib/codebook.c (revision 14603) -+++ lib/codebook.c (revision 14604) -@@ -159,6 +159,8 @@ - s->entries=oggpack_read(opb,24); - if(s->entries==-1)goto _eofout; - -+ if(_ilog(s->dim)+_ilog(s->entries)>24)goto _eofout; -+ - /* codeword ordering.... length ordered or unordered? */ - switch((int)oggpack_read(opb,1)){ - case 0: diff --git a/source/lib/libvorbis/FrugalBuild b/source/lib/libvorbis/FrugalBuild index 38acd41..c54ceae 100644 --- a/source/lib/libvorbis/FrugalBuild +++ b/source/lib/libvorbis/FrugalBuild @@ -3,27 +3,22 @@ # Maintainer: Zsolt Szalai <[email protected]> pkgname=libvorbis -pkgver=1.2.0 -pkgrel=2 +pkgver=1.2.3 +pkgrel=1 pkgdesc="Vorbis codec library" url="http://www.vorbis.com/" groups=('lib') archs=('i686' 'x86_64' 'ppc') depends=('glibc' 'libogg') up2date="lynx -dump http://www.xiph.org/downloads/|grep libvorbis-|Flasttar" -source=(http://downloads.xiph.org/releases/vorbis/$pkgname-$pkgver.tar.gz \ - CVE-2008-1419.patch CVE-2008-1420.patch CVE-2008-1423.patch) -sha1sums=('6ff5f9d9d71cc385ee180171cc21af5653b76a16' \ - '4631f34d2586864aee96bdf93eb52ddd4c7aceaa' \ - 'ee5f3d023f6d9d756c433f7ce4af5d88996d2ab3' \ - '85b32994f2d2ebff248020857d4d44ecd7afeb85') +source=(http://downloads.xiph.org/releases/vorbis/$pkgname-$pkgver.tar.gz) +sha1sums=('a93251aa5e4f142db4fa6433de80797f80960fac') build() { Fcd ## god ... - Fsed '-O20' '' configure* - Fautoreconf + Fsed '-O20' '' configure Fbuild } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
