Convert patch from DOS to Unix format, to prevent bugs like #422725

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 27 insertions, 23 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index 3f330c33ba8c..e24fccbe161a 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.72 2012/06/12 17:49:22 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.73 2012/06/22 13:36:45 voyageur Exp $
+
+  22 Jun 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  files/clang-3.1-increase-parser-recursion-limit.patch:
+  Convert patch from DOS to Unix format, to prevent bugs like #422725
 
   12 Jun 2012; Fabian Groffen <grobian@gentoo.org> clang-3.1-r4.ebuild:
   Marked ~x64-macos
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 4c1ba6d60376..ec3d37342638 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX clang-2.7-fixdoc.patch 1977 RMD160 62f52e5580baa396d93c56735c0039c8691b43b6 SHA1 351c1d2cf86b6da75a6ed19083d7a857333f007c SHA256 36c2214e575ed3fd78938279739e82c4f750f8726f8387e1414c18532501314a
 AUX clang-2.8-alignof.patch 11984 RMD160 3ddf038274481a325ced3a736a5109302d0c50b5 SHA1 7d040a7d2d54e64b85cd2ac188d151d8b89fc62a SHA256 2c1d648c64cc6582a00b0adbc5c65e3ac89a1bb1816e0691902866730a332fa2
@@ -19,7 +19,7 @@ AUX clang-3.1-gentoo-freebsd-fix-lib-path.patch 646 RMD160 5c78398bf16c0cad3cc1d
 AUX clang-3.1-gentoo-linux-fix-cxx-include.patch 836 RMD160 1ec5d07904cb6f8bac1bd6b364a23529695385ec SHA1 1e9d097f521bc1ac5ee04971442c069b07c20607 SHA256 5fa3d5094321084fdffad75492007c5f194cab2d4bb3b6d5eceaeae28ee1a1c0
 AUX clang-3.1-gentoo-runtime-gcc-detection-v3.patch 1457 RMD160 1c12bf8351c5147c727c3a932a4335f616d59e5d SHA1 410f0d3360b5590025398f10f067132843f0baa7 SHA256 f4b22281d21e39bc4681519cec90243c0e50262ce56ae68b0a8d9e7d92ce0375
 AUX clang-3.1-gentoo-runtime-gcc-detection.patch 1272 RMD160 c204c5aac4eb7be0247c65f2fee6246d63b3cb72 SHA1 a86028612d67b16d77973735028778260cbd3832 SHA256 d50176ae5aa1264bc8dd18c8e25e316d14bc0e8237e58980779d7f76d528d187
-AUX clang-3.1-increase-parser-recursion-limit.patch 495 RMD160 ee36c645b66a71839fb8fef8827b51652ee0a0c2 SHA1 154f47395be58673b814c8140bde3dcb42edcc82 SHA256 a0800603a8162de3beff5cc508648d6c4f5c0b095635ec8317682b04c6ce8e95
+AUX clang-3.1-increase-parser-recursion-limit.patch 480 RMD160 359d69a49af3706c803a40e7b6583e8e946f9431 SHA1 4e5d1097fdce9b264410151a28e05c1ce8780561 SHA256 8c2fce5bbbeac965e0f116533e06a58d1a67df545855b7513c1ab6189596f757
 DIST clang-2.8.tgz 5666777 RMD160 f00956b6de29cc09f3992aeabd140f2189c6cf39 SHA1 94977c84ce136307dbbeade95e67bfe3c25161ff SHA256 ed83481553e6a39a8a2953e89630d881d87833506f096a90f18d93ec2bdee0c1
 DIST clang-2.9.tgz 6243772 RMD160 4ab79cbd0e2ad25a2272e6ee2fbbf546818dbd73 SHA1 5fd3b5cec050ec12858c1602b23cf096282ad4a4 SHA256 70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df
 DIST clang-3.0.tar.gz 7240578 RMD160 640b309116db4357627c0b81ebba5dab824d9eeb SHA1 1fa11f07f957bd9c9de003d1b5a7a9ba1e0055e4 SHA256 b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d
@@ -36,12 +36,12 @@ EBUILD clang-3.1-r1.ebuild 6078 RMD160 9240f45ff4f9b9fefde458968aa4002bd6409aa3
 EBUILD clang-3.1-r2.ebuild 6504 RMD160 7b5701a3420c6fc86c4c23ec7391f4ccef5769a4 SHA1 7578a7bfc609a697724998adeaf62f09ecd67cb6 SHA256 572e92bfffd67eda07839a6a4f46469187cd5067ec98884cdc656688ea304849
 EBUILD clang-3.1-r4.ebuild 6389 RMD160 ee84440e23f4f710817cf7a31f745289e8faf85f SHA1 102086fbd958f0ca6d72db4dd4cf0fbdb880d567 SHA256 09435651bac997103a9451f73c3a7620a14b428e75dae107bc15ababe9ec0f09
 EBUILD clang-9999.ebuild 5651 RMD160 9cc2348661563c03aed3a4adefaea5c4b7a9b025 SHA1 0207dcf4740f2f0eec6e307a7d521fcc0f055737 SHA256 028ff14c0aa2d05026511a35693baa92c80d3d61d5fcc60b48272ed3f128c25b
-MISC ChangeLog 13839 RMD160 ed63f5a68cb302e0ea0cbc1a57a42aa7678d3acb SHA1 7e36a969269b65e8373a8be421a644f79129296c SHA256 1a8ef8f51fbca67fc1676dc107560872f23ca36ce09afb2f795ce807728ae6c9
+MISC ChangeLog 14023 RMD160 50456fb09acab8b1c003f1b2b6b03b24e7b9b97e SHA1 5ae576fd30f29d1406e315762303c5fb35407619 SHA256 f57d79aa28575fe876295daf34b4b63d6c6df63540e1797fe4f51bd2f93b9031
 MISC metadata.xml 1526 RMD160 d9a78d39d6024f98a9f7ed4bcb8479019b07e21e SHA1 d4aac42fd7d0cbc6570d0cadd0666eda7a3f8bf5 SHA256 142d229331f82d741b95b794866ca22b753722efd86d5d0e054f69cb5286f4bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (Darwin)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/XgScACgkQX3X2B8XHTon3UwCeI8M+Fs/asoHsH/ooIz0u9USk
-/xcAnieIZ2VC5Qf9xi0r4D0B6Iy4edN0
-=ZlP9
+iF4EAREIAAYFAk/kdPwACgkQFYEBGcdFJfKvWQD/YmcHTAOj5aCulq/TyoSMRWne
+f1qtNw+AUX3509iJeQIA/A98Hw5Yr0D16KFSwK48rHTyE943pA1cBSsWlqtNzyuh
+=CYKv
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/clang/files/clang-3.1-increase-parser-recursion-limit.patch b/sys-devel/clang/files/clang-3.1-increase-parser-recursion-limit.patch
index 91606d1ca724..79f4f9f07871 100644
--- a/sys-devel/clang/files/clang-3.1-increase-parser-recursion-limit.patch
+++ b/sys-devel/clang/files/clang-3.1-increase-parser-recursion-limit.patch
@@ -1,15 +1,15 @@
-Backported from r155737.

-

-diff --git a/llvm-3.1.src/tools/clang/include/clang/Parse/Parser.h b/llvm-3.1.src/tools/clang/include/clang/Parse/Parser.h

-index 0ae5dc8..2a7464f 100644

---- a/llvm-3.1.src/tools/clang/include/clang/Parse/Parser.h

-+++ b/llvm-3.1.src/tools/clang/include/clang/Parse/Parser.h

-@@ -451,7 +451,7 @@ private:

-       }

-     }

-     

--    enum { MaxDepth = 256 };

-+    enum { MaxDepth = 512 };

-     

-     bool diagnoseOverflow();

-     bool diagnoseMissingClose();

+Backported from r155737.
+
+diff --git a/llvm-3.1.src/tools/clang/include/clang/Parse/Parser.h b/llvm-3.1.src/tools/clang/include/clang/Parse/Parser.h
+index 0ae5dc8..2a7464f 100644
+--- a/llvm-3.1.src/tools/clang/include/clang/Parse/Parser.h
++++ b/llvm-3.1.src/tools/clang/include/clang/Parse/Parser.h
+@@ -451,7 +451,7 @@ private:
+       }
+     }
+     
+-    enum { MaxDepth = 256 };
++    enum { MaxDepth = 512 };
+     
+     bool diagnoseOverflow();
+     bool diagnoseMissingClose();