dos2unixify the patches

Package-Manager: portage-2.1.5

5 files changed, 78 insertions, 72 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/Manifest b/media-libs/libvorbis/Manifest
index 058dc968f3e7..bd5d1974bbcb 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -2,21 +2,21 @@
 Hash: SHA1
 
 AUX libvorbis-1.1.2-CVE-3106-4029.patch 3973 RMD160 7006d0c3fe933a35a91e89ddbe57fc2ff09d81e1 SHA1 b26624f2c174777d95854140586e4b69f5be964b SHA256 4b71e4f85f3e558668ce36eaa3becb055ebd3554721f912fe9c31953538ae0d4
-AUX libvorbis-1.2.0-CVE-2008-1419.patch 541 RMD160 21d5c2a44828d41664d75c53bb2d0640f4549960 SHA1 d45efc1b3efade71304b39b1a0861380cb44cebe SHA256 d4f4f105a3dc84d732f3c973c62cf50f8a52531cbf513d5124d621e6cdfd1212
-AUX libvorbis-1.2.0-CVE-2008-1420.patch 1114 RMD160 4cd3b0425c9c8cbbdec439cbb838fe585d7cbdea SHA1 a120af7ad71efa95c48e563f6daddef13034daec SHA256 2ca8235870280e9c8b7e49e41f75f2087acba37d7b65ba1c8e20203d2c84f38b
-AUX libvorbis-1.2.0-CVE-2008-1423.patch 569 RMD160 0ebd6ee67fd006017c3aaeaea065d459ce2db062 SHA1 b114083accf2fab801f7cd36dfaa630f3f6b0888 SHA256 c58a2ca248becd773ed3e5e4e0342dca790a391c2e7b05e4ea30627860f018a8
+AUX libvorbis-1.2.0-CVE-2008-1419.patch 526 RMD160 5849a5946378b25da9744c1d2648a4f77eac7b83 SHA1 38e9be20669e35eb74d185f24f254d2cc6dc58bd SHA256 fe59da027603ff8757b46dca00ae3bf7abb8d7d1906c10dbd8767e7e39b716eb
+AUX libvorbis-1.2.0-CVE-2008-1420.patch 1080 RMD160 bc1d40716d76a90c3a1f74d1c292b5593041fff5 SHA1 b8a4964f7b63d809b59d75d340f955d0ff645acb SHA256 87b6d445cdb43da9faef6189bdb6ad15754fb69f3bcdc9b289f336f7b77ea5cc
+AUX libvorbis-1.2.0-CVE-2008-1423.patch 554 RMD160 15043bb87839bd9c7e9822fc2ef5f5c34f96f1a5 SHA1 09e6159df64b3ac554d2eb16f7117e48fb9365b7 SHA256 f21abe97d43c8b8a49dcf60fb7ab6a569637bf5f230338a5678f134feb2d5469
 DIST aotuvb4.51-libvorbis-1.1.2.diff.bz2 23371 RMD160 df4f90ddd7e38069aff77674734d8d39c780c74a SHA1 5720046bdc603d35218beabb668a44a59cfb0ac5 SHA256 feaae2ed481635bf36e5eb18e966559f743e95e410c21560f961d42455b91560
 DIST libvorbis-1.1.2.tar.gz 1316434 RMD160 2f1c59ab8237fe3af28f9979cd96008cfa3567cb SHA1 26289fc41aa5436b1a277d726bb5cb106d675c35 SHA256 3f7135ccbda589c251017912f5f5ec9da626c976d2376bcfda19ad6b9c4a6050
 DIST libvorbis-1.2.0.tar.bz2 1214374 RMD160 4b2ceccb6bed6f367a49f3057ed4e4c0e3f0f302 SHA1 fd10558c7dc297887caf20f3ac2601e084715a6a SHA256 9ef4c57ab72081d31aa2cd256276c1c1b0081927cbf0e87b7f1066e1d112065b
 EBUILD libvorbis-1.1.2-r1.ebuild 2078 RMD160 43a1e7fc754bf86ca371278a164d6ac56eddc68d SHA1 1970f5eb8a9da59af93cdb3cd421340f1a0cec08 SHA256 da97ec54a5bb6f95a7859f5735836cabb339faa03633417f1a7ea27785566c5b
 EBUILD libvorbis-1.2.0-r1.ebuild 1495 RMD160 e729945fc8528a869dbb63fab03c079e0d950278 SHA1 e3822704236a43a4400f5465611dc86bdca2b702 SHA256 5341d1627da4e74085c4bf46ad6c81b71a2bdc0a3db9471e3008927073a47b1a
 EBUILD libvorbis-1.2.0.ebuild 1341 RMD160 37df16631310910804e5a11b34fbba4ff321e0c2 SHA1 653317d5a7cfd3b89d448aee4f6e8e0f0e29b797 SHA256 b1740945f2341c1d000052e02c7f82a36a49e4fdf5a7c812020c34b41728c384
-MISC ChangeLog 12980 RMD160 4cad2d01e1f226923bcd3fbe8ca65758a931e2fe SHA1 542f7208439b95e6325073e4f4432c01a97eaf17 SHA256 d725c1b368e269210e8c4b80791f79043913c14f954fd6a136fa389daf20358d
+MISC ChangeLog 13194 RMD160 0ff3313383445e785e58b0b1465eddb1739f5dcb SHA1 f7d4c048939106fd5dade2f604fa6f7b608f8cda SHA256 67f224eac3461ae18e4338ee0bd8ec76e924fdc86d8a48db2bb38548d3b4a06e
 MISC metadata.xml 252 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a SHA1 6e5cc1551616801a2f257d688e6fc286044c3499 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkguuLwACgkQvFcC4BYPU0o4DgCfQzqjfAWRyCLPm8Yz1o+kM7HQ
-9V4An1IrjNdtlhhgKH8RlS1nydMXldDm
-=TXiM
+iEYEARECAAYFAkgv9HIACgkQvFcC4BYPU0qzgQCfXbsTLtrz2Aq478pJxGzUk7A4
+RPwAoL6WiE+H8LmKOpaOemsIu5k1+9yB
+=6fgg
 -----END PGP SIGNATURE-----
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? */