dos2unixify the patches

(Portage version: 2.1.5)

4 files changed, 71 insertions, 65 deletions

diff --git a/media-libs/libvorbis/ChangeLog b/media-libs/libvorbis/ChangeLog
index 451e46393ab4..f4dcbf7a75f2 100644
--- a/media-libs/libvorbis/ChangeLog
+++ b/media-libs/libvorbis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libvorbis
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.93 2008/05/17 10:51:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.94 2008/05/18 09:18:35 aballier Exp $
+
+  18 May 2008; Alexis Ballier <aballier@gentoo.org>
+  files/libvorbis-1.2.0-CVE-2008-1419.patch,
+  files/libvorbis-1.2.0-CVE-2008-1420.patch,
+  files/libvorbis-1.2.0-CVE-2008-1423.patch:
+  dos2unixify the patches
 
 *libvorbis-1.2.0-r1 (17 May 2008)
 
diff --git a/media-libs/libvorbis/files/libvorbis-1.2.0-CVE-2008-1419.patch b/media-libs/libvorbis/files/libvorbis-1.2.0-CVE-2008-1419.patch
index 34d8c520c561..464b0a5ba43c 100644
--- a/media-libs/libvorbis/files/libvorbis-1.2.0-CVE-2008-1419.patch
+++ b/media-libs/libvorbis/files/libvorbis-1.2.0-CVE-2008-1419.patch
@@ -1,15 +1,15 @@
-https://trac.xiph.org/changeset/14602

-https://bugzilla.redhat.com/show_bug.cgi?id=440700

-http://nvd.nist.gov/nvd.cfm?cvename=CVE-2008-1419

-

-Index: /trunk/vorbis/lib/codebook.c

-===================================================================

---- /trunk/vorbis/lib/codebook.c (revision 13293)

-+++ /trunk/vorbis/lib/codebook.c (revision 14602)

-@@ -226,5 +226,5 @@

-       switch(s->maptype){

-       case 1:

--	quantvals=_book_maptype1_quantvals(s);

-+	quantvals=(s->dim==0?0:_book_maptype1_quantvals(s));

- 	break;

-       case 2:

+https://trac.xiph.org/changeset/14602
+https://bugzilla.redhat.com/show_bug.cgi?id=440700
+http://nvd.nist.gov/nvd.cfm?cvename=CVE-2008-1419
+
+Index: /trunk/vorbis/lib/codebook.c
+===================================================================
+--- /trunk/vorbis/lib/codebook.c (revision 13293)
++++ /trunk/vorbis/lib/codebook.c (revision 14602)
+@@ -226,5 +226,5 @@
+       switch(s->maptype){
+       case 1:
+-	quantvals=_book_maptype1_quantvals(s);
++	quantvals=(s->dim==0?0:_book_maptype1_quantvals(s));
+ 	break;
+       case 2:
diff --git a/media-libs/libvorbis/files/libvorbis-1.2.0-CVE-2008-1420.patch b/media-libs/libvorbis/files/libvorbis-1.2.0-CVE-2008-1420.patch
index a0405e5246e2..5351a13d5c09 100644
--- a/media-libs/libvorbis/files/libvorbis-1.2.0-CVE-2008-1420.patch
+++ b/media-libs/libvorbis/files/libvorbis-1.2.0-CVE-2008-1420.patch
@@ -1,34 +1,34 @@
-http://nvd.nist.gov/nvd.cfm?cvename=CVE-2008-1420

-https://bugzilla.redhat.com/show_bug.cgi?id=440706

-https://trac.xiph.org/changeset/14598

-

-Index: /trunk/vorbis/lib/res0.c

-===================================================================

---- /trunk/vorbis/lib/res0.c (revision 13578)

-+++ /trunk/vorbis/lib/res0.c (revision 14598)

-@@ -224,4 +224,18 @@

-     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:

-@@ -264,5 +278,5 @@

-   }

- 

--  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));

+http://nvd.nist.gov/nvd.cfm?cvename=CVE-2008-1420
+https://bugzilla.redhat.com/show_bug.cgi?id=440706
+https://trac.xiph.org/changeset/14598
+
+Index: /trunk/vorbis/lib/res0.c
+===================================================================
+--- /trunk/vorbis/lib/res0.c (revision 13578)
++++ /trunk/vorbis/lib/res0.c (revision 14598)
+@@ -224,4 +224,18 @@
+     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:
+@@ -264,5 +278,5 @@
+   }
+ 
+-  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));
diff --git a/media-libs/libvorbis/files/libvorbis-1.2.0-CVE-2008-1423.patch b/media-libs/libvorbis/files/libvorbis-1.2.0-CVE-2008-1423.patch
index d0e79b4dce10..bace686cff4d 100644
--- a/media-libs/libvorbis/files/libvorbis-1.2.0-CVE-2008-1423.patch
+++ b/media-libs/libvorbis/files/libvorbis-1.2.0-CVE-2008-1423.patch
@@ -1,15 +1,15 @@
-http://nvd.nist.gov/nvd.cfm?cvename=CVE-2008-1423

-https://bugzilla.redhat.com/show_bug.cgi?id=440709

-https://trac.xiph.org/changeset/14604

-

-Index: /trunk/vorbis/lib/codebook.c

-===================================================================

---- /trunk/vorbis/lib/codebook.c (revision 14602)

-+++ /trunk/vorbis/lib/codebook.c (revision 14604)

-@@ -159,4 +159,6 @@

-   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? */

+http://nvd.nist.gov/nvd.cfm?cvename=CVE-2008-1423
+https://bugzilla.redhat.com/show_bug.cgi?id=440709
+https://trac.xiph.org/changeset/14604
+
+Index: /trunk/vorbis/lib/codebook.c
+===================================================================
+--- /trunk/vorbis/lib/codebook.c (revision 14602)
++++ /trunk/vorbis/lib/codebook.c (revision 14604)
+@@ -159,4 +159,6 @@
+   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? */