19290 2008-05-28 07:14:12 -0700 More patches not handled by PrettyPatch.rb 2008-06-25 13:58:09 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ddkilzer aroben aroben oldest_to_newest 81723 0 ddkilzer 2008-05-28 07:14:12 -0700 More patches that aren't handled by PrettyPatch.rb: Bug 19041 https://bugs.webkit.org/attachment.cgi?id=21119&action=prettypatch Bug 18465 https://bugs.webkit.org/attachment.cgi?id=20510&action=prettypatch https://bugs.webkit.org/attachment.cgi?id=20528&action=prettypatch 81724 1 ddkilzer 2008-05-28 07:15:26 -0700 Bug 19043 https://bugs.webkit.org/attachment.cgi?id=21120&action=prettypatch https://bugs.webkit.org/attachment.cgi?id=21121&action=prettypatch 81725 2 ddkilzer 2008-05-28 07:17:20 -0700 Bug 19067 https://bugs.webkit.org/attachment.cgi?id=21151&action=prettypatch 81726 3 ddkilzer 2008-05-28 07:18:41 -0700 Bug 19068 https://bugs.webkit.org/attachment.cgi?id=21152&action=prettypatch 81727 4 ddkilzer 2008-05-28 07:19:46 -0700 Bug 19069 https://bugs.webkit.org/attachment.cgi?id=21153&action=prettypatch 81731 5 ddkilzer 2008-05-28 07:58:06 -0700 Note that all patches listed in Comment #0 through Comment #4 (except Bug 18465) are from the same contributor. 81733 6 21388 aroben 2008-05-28 08:40:22 -0700 Created attachment 21388 print exceptions from PrettyPatch to stdout 81734 7 21389 aroben 2008-05-28 08:41:56 -0700 Created attachment 21389 print exceptions from PrettyPatch to stdou Fixed a typo 81736 8 21389 aroben 2008-05-28 08:52:42 -0700 Comment on attachment 21389 print exceptions from PrettyPatch to stdou Committed in r34173 81737 9 aroben 2008-05-28 08:55:52 -0700 It looks like attachment 20510 and attachment 20528 are missing the "Index: " line that PrettyPatch uses to find the start of the diff. All the other attachments are causing PrettyPatch trouble because they have a leading / in the path of the files. This should be easy to fix. 81752 10 21392 aroben 2008-05-28 10:19:05 -0700 Created attachment 21392 Fix most of the patches listed in this bug 81753 11 21393 aroben 2008-05-28 10:20:53 -0700 Created attachment 21393 Fix most of the patches listed in this bug Fixed a typo 81756 12 21393 ddkilzer 2008-05-28 10:28:10 -0700 Comment on attachment 21393 Fix most of the patches listed in this bug r=me! 81759 13 21393 aroben 2008-05-28 10:33:04 -0700 Comment on attachment 21393 Fix most of the patches listed in this bug Committed in r34175 81760 14 aroben 2008-05-28 10:33:48 -0700 The only remaining broken patches are: Attachment 20510 Attachment 20528 82164 15 21469 ddkilzer 2008-06-02 15:10:17 -0700 Created attachment 21469 Fix remaining patches Fix the remaining issue for patches with no "Index" or "diff" headers. 82165 16 ddkilzer 2008-06-02 15:12:05 -0700 (In reply to comment #15) > Created an attachment (id=21469) [edit] > Fix remaining patches > > Fix the remaining issue for patches with no "Index" or "diff" headers. I should note that this change will NOT handle a patch with a mix of diffs that do and do not contain headers. I don't expect that case to ever happen, though. 82206 17 21469 aroben 2008-06-03 09:20:44 -0700 Comment on attachment 21469 Fix remaining patches I wonder if we should just always look for the "---" and "+++" lines instead of looking for "Index:" or "diff --git" lines? I think that's what the patch utility does anyway. It seems like it would simplify this code quite a bit. Care to take a stab at that, Dave? 82220 18 ddkilzer 2008-06-03 10:59:06 -0700 (In reply to comment #17) > (From update of attachment 21469 [edit]) > I wonder if we should just always look for the "---" and "+++" lines instead of > looking for "Index:" or "diff --git" lines? I think that's what the patch > utility does anyway. It seems like it would simplify this code quite a bit. > > Care to take a stab at that, Dave? Yes, maybe today. Bug mail is awfully slow (or Y!Mail delivery has slowed way down). 82675 19 21469 darin 2008-06-08 14:03:57 -0700 Comment on attachment 21469 Fix remaining patches r=me 82676 20 21469 ddkilzer 2008-06-08 14:05:43 -0700 Comment on attachment 21469 Fix remaining patches Sorry, Darin, I should have cleared the review? flag per Comment #17 and Comment #18. 84323 21 21918 ddkilzer 2008-06-24 17:35:32 -0700 Created attachment 21918 Fix remaining patches v2 (In reply to comment #17) > (From update of attachment 21469 [edit]) > I wonder if we should just always look for the "---" and "+++" lines instead of > looking for "Index:" or "diff --git" lines? I think that's what the patch > utility does anyway. It seems like it would simplify this code quite a bit. > > Care to take a stab at that, Dave? I don't think ignoring the "Index:" and "diff --git" lines will work. There are some patches with an "Index:" line that don't have "---" or "+++" lines (like binary patches), so this approach won't work with those cases. I did manage to simplify the patch from the previous attempt, at least for the first two changes. 84396 22 21918 aroben 2008-06-25 07:49:29 -0700 Comment on attachment 21918 Fix remaining patches v2 r=me 84427 23 ddkilzer 2008-06-25 12:47:05 -0700 Remaining patches should have been fixed by: Committed revision 34797. But it doesn't appear that they were. :( 84428 24 21918 ddkilzer 2008-06-25 12:47:26 -0700 Comment on attachment 21918 Fix remaining patches v2 Clearing review flag per Comment #23. 84433 25 ddkilzer 2008-06-25 13:58:09 -0700 (In reply to comment #23) > Remaining patches should have been fixed by: > > Committed revision 34797. > > But it doesn't appear that they were. :( This was a server update issue. The issue is now resolved! 21388 2008-05-28 08:40:22 -0700 2008-05-28 08:41:56 -0700 print exceptions from PrettyPatch to stdout 0001--Print-exceptions-from-PrettyPatch-to-stdout.patch text/plain 3274 aroben RnJvbSAyYTczMTA2YzlkODNlYjc4OTVkNzE3NTMxNDc4YmJlMTlhZTNlZTkzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBZGFtIFJvYmVuIDxhcm9iZW5AYXBwbGUuY29tPgpEYXRlOiBX ZWQsIDI4IE1heSAyMDA4IDExOjQyOjEyIC0wNDAwClN1YmplY3Q6IFtQRlJdICAgICAgICAgUHJp bnQgZXhjZXB0aW9ucyBmcm9tIFByZXR0eVBhdGNoIHRvIHN0ZG91dAoKICAgICAgICBUaGlzIHdp bGwgbWFrZSBpdCBtdWNoIGVhc2llciB0byBkZWJ1ZyBwcm9ibGVtcyB3aXRoIFByZXR0eVBhdGNo LAogICAgICAgIHNpbmNlIHdlJ2xsIGJlIGFibGUgdG8gc2VlIHRoZSBleGNlcHRpb25zIGluIHRo ZSBicm93c2VyLgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAg KiBQcmV0dHlQYXRjaC9wcmV0dGlmeS5yYjogQWRkZWQgYSAtLWh0bWwtZXhjZXB0aW9ucyBvcHRp b24sIHdoaWNoCiAgICAgICAgd2lsbCBwcmludCBleGNlcHRpb25zIHRvIHN0ZG91dCBhcyBIVE1M LgogICAgICAgICogYXR0YWNobWVudC5jZ2k6IENoYW5nZWQgdG8gcGFzcyAtLWh0bWwtZXhjZXB0 aW9ucyB0byBwcmV0dGlmeS5yYi4KLS0tCiBCdWdzU2l0ZS9DaGFuZ2VMb2cgICAgICAgICAgICAg ICB8ICAgMTMgKysrKysrKysrKysrKwogQnVnc1NpdGUvUHJldHR5UGF0Y2gvcHJldHRpZnkucmIg fCAgIDIzICsrKysrKysrKysrKysrKysrKysrKystCiBCdWdzU2l0ZS9hdHRhY2htZW50LmNnaSAg ICAgICAgICB8ICAgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMiBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9CdWdzU2l0ZS9DaGFuZ2VMb2cgYi9CdWdzU2l0ZS9D aGFuZ2VMb2cKaW5kZXggNWFlZTVjYS4uNTgzNGI5YiAxMDA2NDQKLS0tIGEvQnVnc1NpdGUvQ2hh bmdlTG9nCisrKyBiL0J1Z3NTaXRlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDA4LTA1 LTI4ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KKworICAgICAgICBQcmludCBleGNl cHRpb25zIGZyb20gUHJldHR5UGF0Y2ggdG8gc3Rkb3V0CisKKyAgICAgICAgVGhpcyB3aWxsIG1h a2UgaXQgbXVjaCBlYXNpZXIgdG8gZGVidWcgcHJvYmxlbXMgd2l0aCBQcmV0dHlQYXRjaCwKKyAg ICAgICAgc2luY2Ugd2UnbGwgYmUgYWJsZSB0byBzZWUgdGhlIGV4Y2VwdGlvbnMgaW4gdGhlIGJy b3dzZXIuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBQcmV0dHlQYXRjaC9wcmV0dGlmeS5yYjogQWRkZWQgYSAtLWh0bWwtZXhjZXB0aW9ucyBvcHRp b24sIHdoaWNoCisgICAgICAgIHdpbGwgcHJpbnQgZXhjZXB0aW9ucyB0byBzdGRvdXQgYXMgSFRN TC4KKyAgICAgICAgKiBhdHRhY2htZW50LmNnaTogQ2hhbmdlZCB0byBwYXNzIC0taHRtbC1leGNl cHRpb25zIHRvIHByZXR0aWZ5LnJiLgorCiAyMDA4LTA0LTI2ICBEYXZpZCBLaWx6ZXIgIDxkZGtp bHplckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlZCB0ZW1wIGZpbGVzIGFuZCBhZGRlZCBh cHByb3ByaWF0ZSBzdm46aWdub3JlIHByb3BlcnRpZXMuCmRpZmYgLS1naXQgYS9CdWdzU2l0ZS9Q cmV0dHlQYXRjaC9wcmV0dGlmeS5yYiBiL0J1Z3NTaXRlL1ByZXR0eVBhdGNoL3ByZXR0aWZ5LnJi CmluZGV4IDY1MDJmZmEuLmZjMTkwMjAgMTAwNzU1Ci0tLSBhL0J1Z3NTaXRlL1ByZXR0eVBhdGNo L3ByZXR0aWZ5LnJiCisrKyBiL0J1Z3NTaXRlL1ByZXR0eVBhdGNoL3ByZXR0aWZ5LnJiCkBAIC0x LDYgKzEsMTkgQEAKICMhL3Vzci9iaW4vcnVieQogCiByZXF1aXJlICdQcmV0dHlQYXRjaCcKK3Jl cXVpcmUgJ29wdHBhcnNlJworcmVxdWlyZSAnd2Vicmljay9odG1sdXRpbHMnCisKK0JBQ0tUUkFD RV9TRVBBUkFUT1IgPSAiXG5cdGZyb20gIgorCitvcHRpb25zID0geyA6aHRtbF9leGNlcHRpb25z ID0+IGZhbHNlIH0KK09wdGlvblBhcnNlci5uZXcgZG8gfG9wdHN8CisgICAgb3B0cy5iYW5uZXIg PSAiVXNhZ2U6ICN7RmlsZS5iYXNlbmFtZSgkMCl9IFtvcHRpb25zXSBbcGF0Y2gtZmlsZV0iCisK KyAgICBvcHRzLnNlcGFyYXRvciAiIgorCisgICAgb3B0cy5vbigiLS1odG1sLWV4Y2VwdGlvbnMi LCAiUHJpbnQgZXhjZXB0aW9ucyB0byBzdGRvdXQgYXMgSFRNTCIpIHsgfHB8IG9wdGlvbnNbOmh0 bWxfZXhjZXB0aW9uc10gPSBwIH0KK2VuZC5wYXJzZSEKIAogcGF0Y2hfZGF0YSA9IG5pbAogaWYg QVJHVi5sZW5ndGggPT0gMCB8fCBBUkdWWzBdID09ICctJyB0aGVuCkBAIC05LDQgKzIyLDEyIEBA IGVsc2UKICAgICBGaWxlLm9wZW4oQVJHVlswXSkgeyB8ZmlsZXwgcGF0Y2hfZGF0YSA9IGZpbGUu cmVhZCB9CiBlbmQKIAotcHV0cyBQcmV0dHlQYXRjaC5wcmV0dGlmeShwYXRjaF9kYXRhKQorYmVn aW4KKyAgICBwdXRzIFByZXR0eVBhdGNoLnByZXR0aWZ5KHBhdGNoX2RhdGEpCityZXNjdWUgPT4g ZXhjZXB0aW9uCisgICAgcmFpc2UgdW5sZXNzIG9wdGlvbnNbOmh0bWxfZXhjZXB0aW9uc10KKwor ICAgIGJhY2t0cmFjZSA9IGV4Y2VwdGlvbi5iYWNrdHJhY2UKKyAgICBiYWNrdHJhY2VbMF0gKz0g IjogIiArIGV4Y2VwdGlvbiArICIgKCIgKyBleGNlcHRpb24uY2xhc3MudG9fcyArICIpIgorICAg IHByaW50ICI8cHJlPlxuIiwgV0VCcmljazo6SFRNTFV0aWxzOjplc2NhcGUoYmFja3RyYWNlLmpv aW4oIlxuXHRmcm9tICIpKSwgIlxuPC9wcmU+XG4iCitlbmQKZGlmZiAtLWdpdCBhL0J1Z3NTaXRl L2F0dGFjaG1lbnQuY2dpIGIvQnVnc1NpdGUvYXR0YWNobWVudC5jZ2kKaW5kZXggY2RhYzJjOS4u MDA4Yjg2NyAxMDA3NTUKLS0tIGEvQnVnc1NpdGUvYXR0YWNobWVudC5jZ2kKKysrIGIvQnVnc1Np dGUvYXR0YWNobWVudC5jZ2kKQEAgLTczMyw3ICs3MzMsNyBAQCBzdWIgcHJldHR5UGF0Y2gKICAg cHJpbnQgJGNnaS0+aGVhZGVyKC10eXBlID0+ICd0ZXh0L2h0bWwnLAogICAgICAgICAgICAgICAg ICAgICAgLWV4cGlyZXMgPT4gJyszTScpOwogCi0gIG9wZW4yKFwqT1VULCBcKklOLCAiL3Vzci9i aW4vcnVieSIsICItSSIsICJQcmV0dHlQYXRjaCIsICJQcmV0dHlQYXRjaC9wcmV0dGlmeS5yYiIp OworICBvcGVuMihcKk9VVCwgXCpJTiwgIi91c3IvYmluL3J1YnkiLCAiLUkiLCAiUHJldHR5UGF0 Y2giLCAiUHJldHR5UGF0Y2gvcHJldHRpZnkucmIiLCAiLS1odG1sLWV4Y2VwdGlvbnMiKTsKICAg cHJpbnQgSU4gJHRoZWRhdGEgLiAiXG4iOwogICBjbG9zZShJTik7CiAgIHdoaWxlICg8T1VUPikg ewotLSAKMS41LjUuMS4xNDEuZ2Q1NWIKCg== 21389 2008-05-28 08:41:56 -0700 2008-05-28 08:52:42 -0700 print exceptions from PrettyPatch to stdou 0001--Print-exceptions-from-PrettyPatch-to-stdout.patch text/plain 3282 aroben RnJvbSA1OTU0YTY4ZTA0ODQ2NWUzOTk5NjU2NDg3M2ZhMDQ5ZWI1YzQ1YTI3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBZGFtIFJvYmVuIDxhcm9iZW5AYXBwbGUuY29tPgpEYXRlOiBX ZWQsIDI4IE1heSAyMDA4IDExOjQyOjEyIC0wNDAwClN1YmplY3Q6IFtQRlJdICAgICAgICAgUHJp bnQgZXhjZXB0aW9ucyBmcm9tIFByZXR0eVBhdGNoIHRvIHN0ZG91dAoKICAgICAgICBUaGlzIHdp bGwgbWFrZSBpdCBtdWNoIGVhc2llciB0byBkZWJ1ZyBwcm9ibGVtcyB3aXRoIFByZXR0eVBhdGNo LAogICAgICAgIHNpbmNlIHdlJ2xsIGJlIGFibGUgdG8gc2VlIHRoZSBleGNlcHRpb25zIGluIHRo ZSBicm93c2VyLgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAg KiBQcmV0dHlQYXRjaC9wcmV0dGlmeS5yYjogQWRkZWQgYSAtLWh0bWwtZXhjZXB0aW9ucyBvcHRp b24sIHdoaWNoCiAgICAgICAgd2lsbCBwcmludCBleGNlcHRpb25zIHRvIHN0ZG91dCBhcyBIVE1M LgogICAgICAgICogYXR0YWNobWVudC5jZ2k6IENoYW5nZWQgdG8gcGFzcyAtLWh0bWwtZXhjZXB0 aW9ucyB0byBwcmV0dGlmeS5yYi4KLS0tCiBCdWdzU2l0ZS9DaGFuZ2VMb2cgICAgICAgICAgICAg ICB8ICAgMTMgKysrKysrKysrKysrKwogQnVnc1NpdGUvUHJldHR5UGF0Y2gvcHJldHRpZnkucmIg fCAgIDIzICsrKysrKysrKysrKysrKysrKysrKystCiBCdWdzU2l0ZS9hdHRhY2htZW50LmNnaSAg ICAgICAgICB8ICAgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMiBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9CdWdzU2l0ZS9DaGFuZ2VMb2cgYi9CdWdzU2l0ZS9D aGFuZ2VMb2cKaW5kZXggNWFlZTVjYS4uNTgzNGI5YiAxMDA2NDQKLS0tIGEvQnVnc1NpdGUvQ2hh bmdlTG9nCisrKyBiL0J1Z3NTaXRlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDA4LTA1 LTI4ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KKworICAgICAgICBQcmludCBleGNl cHRpb25zIGZyb20gUHJldHR5UGF0Y2ggdG8gc3Rkb3V0CisKKyAgICAgICAgVGhpcyB3aWxsIG1h a2UgaXQgbXVjaCBlYXNpZXIgdG8gZGVidWcgcHJvYmxlbXMgd2l0aCBQcmV0dHlQYXRjaCwKKyAg ICAgICAgc2luY2Ugd2UnbGwgYmUgYWJsZSB0byBzZWUgdGhlIGV4Y2VwdGlvbnMgaW4gdGhlIGJy b3dzZXIuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBQcmV0dHlQYXRjaC9wcmV0dGlmeS5yYjogQWRkZWQgYSAtLWh0bWwtZXhjZXB0aW9ucyBvcHRp b24sIHdoaWNoCisgICAgICAgIHdpbGwgcHJpbnQgZXhjZXB0aW9ucyB0byBzdGRvdXQgYXMgSFRN TC4KKyAgICAgICAgKiBhdHRhY2htZW50LmNnaTogQ2hhbmdlZCB0byBwYXNzIC0taHRtbC1leGNl cHRpb25zIHRvIHByZXR0aWZ5LnJiLgorCiAyMDA4LTA0LTI2ICBEYXZpZCBLaWx6ZXIgIDxkZGtp bHplckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlZCB0ZW1wIGZpbGVzIGFuZCBhZGRlZCBh cHByb3ByaWF0ZSBzdm46aWdub3JlIHByb3BlcnRpZXMuCmRpZmYgLS1naXQgYS9CdWdzU2l0ZS9Q cmV0dHlQYXRjaC9wcmV0dGlmeS5yYiBiL0J1Z3NTaXRlL1ByZXR0eVBhdGNoL3ByZXR0aWZ5LnJi CmluZGV4IDY1MDJmZmEuLjA3ZDQxZmUgMTAwNzU1Ci0tLSBhL0J1Z3NTaXRlL1ByZXR0eVBhdGNo L3ByZXR0aWZ5LnJiCisrKyBiL0J1Z3NTaXRlL1ByZXR0eVBhdGNoL3ByZXR0aWZ5LnJiCkBAIC0x LDYgKzEsMTkgQEAKICMhL3Vzci9iaW4vcnVieQogCiByZXF1aXJlICdQcmV0dHlQYXRjaCcKK3Jl cXVpcmUgJ29wdHBhcnNlJworcmVxdWlyZSAnd2Vicmljay9odG1sdXRpbHMnCisKK0JBQ0tUUkFD RV9TRVBBUkFUT1IgPSAiXG5cdGZyb20gIgorCitvcHRpb25zID0geyA6aHRtbF9leGNlcHRpb25z ID0+IGZhbHNlIH0KK09wdGlvblBhcnNlci5uZXcgZG8gfG9wdHN8CisgICAgb3B0cy5iYW5uZXIg PSAiVXNhZ2U6ICN7RmlsZS5iYXNlbmFtZSgkMCl9IFtvcHRpb25zXSBbcGF0Y2gtZmlsZV0iCisK KyAgICBvcHRzLnNlcGFyYXRvciAiIgorCisgICAgb3B0cy5vbigiLS1odG1sLWV4Y2VwdGlvbnMi LCAiUHJpbnQgZXhjZXB0aW9ucyB0byBzdGRvdXQgYXMgSFRNTCIpIHsgfGh8IG9wdGlvbnNbOmh0 bWxfZXhjZXB0aW9uc10gPSBoIH0KK2VuZC5wYXJzZSEKIAogcGF0Y2hfZGF0YSA9IG5pbAogaWYg QVJHVi5sZW5ndGggPT0gMCB8fCBBUkdWWzBdID09ICctJyB0aGVuCkBAIC05LDQgKzIyLDEyIEBA IGVsc2UKICAgICBGaWxlLm9wZW4oQVJHVlswXSkgeyB8ZmlsZXwgcGF0Y2hfZGF0YSA9IGZpbGUu cmVhZCB9CiBlbmQKIAotcHV0cyBQcmV0dHlQYXRjaC5wcmV0dGlmeShwYXRjaF9kYXRhKQorYmVn aW4KKyAgICBwdXRzIFByZXR0eVBhdGNoLnByZXR0aWZ5KHBhdGNoX2RhdGEpCityZXNjdWUgPT4g ZXhjZXB0aW9uCisgICAgcmFpc2UgdW5sZXNzIG9wdGlvbnNbOmh0bWxfZXhjZXB0aW9uc10KKwor ICAgIGJhY2t0cmFjZSA9IGV4Y2VwdGlvbi5iYWNrdHJhY2UKKyAgICBiYWNrdHJhY2VbMF0gKz0g IjogIiArIGV4Y2VwdGlvbiArICIgKCIgKyBleGNlcHRpb24uY2xhc3MudG9fcyArICIpIgorICAg IHByaW50ICI8cHJlPlxuIiwgV0VCcmljazo6SFRNTFV0aWxzOjplc2NhcGUoYmFja3RyYWNlLmpv aW4oQkFDS1RSQUNFX1NFUEFSQVRPUikpLCAiXG48L3ByZT5cbiIKK2VuZApkaWZmIC0tZ2l0IGEv QnVnc1NpdGUvYXR0YWNobWVudC5jZ2kgYi9CdWdzU2l0ZS9hdHRhY2htZW50LmNnaQppbmRleCBj ZGFjMmM5Li4wMDhiODY3IDEwMDc1NQotLS0gYS9CdWdzU2l0ZS9hdHRhY2htZW50LmNnaQorKysg Yi9CdWdzU2l0ZS9hdHRhY2htZW50LmNnaQpAQCAtNzMzLDcgKzczMyw3IEBAIHN1YiBwcmV0dHlQ YXRjaAogICBwcmludCAkY2dpLT5oZWFkZXIoLXR5cGUgPT4gJ3RleHQvaHRtbCcsCiAgICAgICAg ICAgICAgICAgICAgICAtZXhwaXJlcyA9PiAnKzNNJyk7CiAKLSAgb3BlbjIoXCpPVVQsIFwqSU4s ICIvdXNyL2Jpbi9ydWJ5IiwgIi1JIiwgIlByZXR0eVBhdGNoIiwgIlByZXR0eVBhdGNoL3ByZXR0 aWZ5LnJiIik7CisgIG9wZW4yKFwqT1VULCBcKklOLCAiL3Vzci9iaW4vcnVieSIsICItSSIsICJQ cmV0dHlQYXRjaCIsICJQcmV0dHlQYXRjaC9wcmV0dGlmeS5yYiIsICItLWh0bWwtZXhjZXB0aW9u cyIpOwogICBwcmludCBJTiAkdGhlZGF0YSAuICJcbiI7CiAgIGNsb3NlKElOKTsKICAgd2hpbGUg KDxPVVQ+KSB7Ci0tIAoxLjUuNS4xLjE0MS5nZDU1YgoK 21392 2008-05-28 10:19:05 -0700 2008-05-28 10:20:53 -0700 Fix most of the patches listed in this bug 0001--Make-PrettyPatch-able-to-handle-diffs-taken.patch text/plain 3487 aroben RnJvbSAxZmE3Y2RmMDY5MjhmMTc3Yjc4ZmIzMDRiZDNmNTRiNDMwNDRlY2ZkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBZGFtIFJvYmVuIDxhcm9iZW5AYXBwbGUuY29tPgpEYXRlOiBX ZWQsIDI4IE1heSAyMDA4IDEzOjE5OjIzIC0wNDAwClN1YmplY3Q6IFtQRlJdICAgICAgICAgTWFr ZSBQcmV0dHlQYXRjaCBhYmxlIHRvIGhhbmRsZSBkaWZmcyB0YWtlbiBmcm9tIG91dHNpZGUgdGhl IFdlYktpdCBzb3VyY2UgdHJlZQoKICAgICAgICBQYXJ0IG9mIEJ1ZyAxOTI5MDogTW9yZSBwYXRj aGVzIG5vdCBoYW5kbGVkIGJ5IFByZXR0eVBhdGNoLnJiCiAgICAgICAgPGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTI5MD4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCgogICAgICAgICogUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmI6CiAgICAg ICAgKFByZXR0eVBhdGNoLmZpbmRfdXJsX2FuZF9wYXRoKTogQWRkZWQuIFNlYXJjaGVzIHRoZSBm aWxlIHBhdGggZnJvbQogICAgICAgIHRoZSBib3R0b20gdXAgbG9va2luZyBmb3IgYSBkaXJlY3Rv cnkgdGhhdCBleGlzdHMgaW4gdGhlIHNvdXJjZSB0cmVlLgogICAgICAgIChQcmV0dHlQYXRjaC5s aW5raWZ5RmlsZW5hbWUpOiBDaGFuZ2VkIHRvIGNhbGwgZmluZF91cmxfYW5kX3BhdGguCi0tLQog QnVnc1NpdGUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgfCAgIDE1ICsrKysrKysrKysrKysr KwogQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIgfCAgIDI2ICsrKysrKysrKysr KysrKysrKy0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKyksIDggZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvQnVnc1NpdGUvQ2hhbmdlTG9nIGIvQnVnc1NpdGUvQ2hh bmdlTG9nCmluZGV4IGJiNGE4NTQuLjM3ZDdkOTEgMTAwNjQ0Ci0tLSBhL0J1Z3NTaXRlL0NoYW5n ZUxvZworKysgYi9CdWdzU2l0ZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMCBAQAogMjAwOC0wNS0y OCAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKKyAgICAgICAgTWFrZSBQcmV0dHlQ YXRjaCBhYmxlIHRvIGhhbmRsZSBkaWZmcyB0YWtlbiBmcm9tIG91dHNpZGUgdGhlIFdlYktpdAor ICAgICAgICBzb3VyY2UgdHJlZQorCisgICAgICAgIFBhcnQgb2YgQnVnIDE5MjkwOiBNb3JlIHBh dGNoZXMgbm90IGhhbmRsZWQgYnkgUHJldHR5UGF0Y2gucmIKKyAgICAgICAgPGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTI5MD4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJi OgorICAgICAgICAoUHJldHR5UGF0Y2guZmluZF91cmxfYW5kX3BhdGgpOiBBZGRlZC4gU2VhcmNo ZXMgdGhlIGZpbGUgcGF0aCBmcm9tCisgICAgICAgIHRoZSBib3R0b20gdXAgbG9va2luZyBmb3Ig YSBkaXJlY3RvcnkgdGhhdCBleGlzdHMgaW4gdGhlIHNvdXJjZSB0cmVlLgorICAgICAgICAoUHJl dHR5UGF0Y2gubGlua2lmeUZpbGVuYW1lKTogQ2hhbmdlZCB0byBjYWxsIGZpbmRfdXJsX2FuZF9w YXRoLgorCisyMDA4LTA1LTI4ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KKwogICAg ICAgICBQcmludCBleGNlcHRpb25zIGZyb20gUHJldHR5UGF0Y2ggdG8gc3Rkb3V0CiAKICAgICAg ICAgVGhpcyB3aWxsIG1ha2UgaXQgbXVjaCBlYXNpZXIgdG8gZGVidWcgcHJvYmxlbXMgd2l0aCBQ cmV0dHlQYXRjaCwKZGlmZiAtLWdpdCBhL0J1Z3NTaXRlL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNo LnJiIGIvQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIKaW5kZXggZGVkMGQ2Yy4u OTBhYWE1MCAxMDA2NDQKLS0tIGEvQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIK KysrIGIvQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIKQEAgLTUyLDYgKzUyLDcg QEAgcHJpdmF0ZQogICAgICAgICAiSmF2YVNjcmlwdEdsdWUiLAogICAgICAgICAiTGF5b3V0VGVz dFJlc3VsdHMiLAogICAgICAgICAiTGF5b3V0VGVzdHMiLAorICAgICAgICAiT3BlblNvdXJjZSIs CiAgICAgICAgICJQYWdlTG9hZFRlc3RzIiwKICAgICAgICAgIldlYkNvcmUiLAogICAgICAgICAi V2ViS2l0IiwKQEAgLTYxLDE1ICs2MiwyNCBAQCBwcml2YXRlCiAgICAgICAgICJXZWJLaXRUb29s cyIsCiAgICAgXQogCisgICAgZGVmIHNlbGYuZmluZF91cmxfYW5kX3BhdGgoZmlsZV9wYXRoKQor ICAgICAgICAjIFNlYXJjaCBmaWxlX3BhdGggZnJvbSB0aGUgYm90dG9tIHVwLCBhdCBlYWNoIGxl dmVsIGNoZWNraW5nIHdoZXRoZXIKKyAgICAgICAgIyB3ZSd2ZSBmb3VuZCBhIGRpcmVjdG9yeSB3 ZSBrbm93IGV4aXN0cyBpbiB0aGUgc291cmNlIHRyZWUuCisKKyAgICAgICAgZGlybmFtZSwgYmFz ZW5hbWUgPSBGaWxlLnNwbGl0KGZpbGVfcGF0aCkKKyAgICAgICAgZGlybmFtZS5zcGxpdCgvXC8v KS5yZXZlcnNlLmluamVjdChiYXNlbmFtZSkgZG8gfHBhdGgsIGRpcmVjdG9yeXwKKyAgICAgICAg ICAgIHBhdGggPSBkaXJlY3RvcnkgKyAiLyIgKyBwYXRoCisKKyAgICAgICAgICAgIHJldHVybiBb T1BFTlNPVVJDRV9UUkFDX1VSTCwgcGF0aF0gaWYgT1BFTlNPVVJDRV9ESVJTLmluY2x1ZGU/KGRp cmVjdG9yeSkKKworICAgICAgICAgICAgcGF0aAorICAgICAgICBlbmQKKworICAgICAgICBbbmls LCBmaWxlX3BhdGhdCisgICAgZW5kCisKICAgICBkZWYgc2VsZi5saW5raWZ5RmlsZW5hbWUoZmls ZW5hbWUpCi0gICAgICAgIGRpcmVjdG9yeSA9IC9eKFteXC9dKykvLm1hdGNoKGZpbGVuYW1lKVsx XQotICAgICAgICB1cmwsIHBhdGhCZW5lYXRoVHJ1bmsgPSBpZiBmaWxlbmFtZSA9fiAvXGJPcGVu U291cmNlXC8vIHRoZW4KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFtPUEVO U09VUkNFX1RSQUNfVVJMLCBmaWxlbmFtZS5nc3ViKC9eLipcYk9wZW5Tb3VyY2VcLy8sICcnKV0K LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZWxzaWYgT1BFTlNPVVJDRV9ESVJTLmlu Y2x1ZGU/KGRpcmVjdG9yeSkgdGhlbgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgW09QRU5TT1VSQ0VfVFJBQ19VUkwsIGZpbGVuYW1lXQotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbbmls LCBuaWxdCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVuZAorICAgICAgICB1cmws IHBhdGhCZW5lYXRoVHJ1bmsgPSBmaW5kX3VybF9hbmRfcGF0aChmaWxlbmFtZSkKIAogICAgICAg ICB1cmwubmlsPyA/IGZpbGVuYW1lIDogIjxhIGhyZWY9JyN7dXJsfWJyb3dzZXIvdHJ1bmsvI3tw YXRoQmVuZWF0aFRydW5rfSc+I3tmaWxlbmFtZX08L2E+IgogICAgIGVuZAotLSAKMS41LjUuMS4x NDEuZ2Q1NWIKCg== 21393 2008-05-28 10:20:53 -0700 2008-05-28 13:10:12 -0700 Fix most of the patches listed in this bug 0001--Make-PrettyPatch-able-to-handle-diffs-taken.patch text/plain 3291 aroben RnJvbSBjOTkyZTBlNTQzMDc3NDhkZmQ5NDkxYjcyZTYxYjllNzE0NWIxMTQ4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBZGFtIFJvYmVuIDxhcm9iZW5AYXBwbGUuY29tPgpEYXRlOiBX ZWQsIDI4IE1heSAyMDA4IDEzOjE5OjIzIC0wNDAwClN1YmplY3Q6IFtQRlJdICAgICAgICAgTWFr ZSBQcmV0dHlQYXRjaCBhYmxlIHRvIGhhbmRsZSBkaWZmcyB0YWtlbiBmcm9tIG91dHNpZGUgdGhl IFdlYktpdCBzb3VyY2UgdHJlZQoKICAgICAgICBQYXJ0IG9mIEJ1ZyAxOTI5MDogTW9yZSBwYXRj aGVzIG5vdCBoYW5kbGVkIGJ5IFByZXR0eVBhdGNoLnJiCiAgICAgICAgPGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTI5MD4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCgogICAgICAgICogUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmI6CiAgICAg ICAgKFByZXR0eVBhdGNoLmZpbmRfdXJsX2FuZF9wYXRoKTogQWRkZWQuIFNlYXJjaGVzIHRoZSBm aWxlIHBhdGggZnJvbQogICAgICAgIHRoZSBib3R0b20gdXAgbG9va2luZyBmb3IgYSBkaXJlY3Rv cnkgdGhhdCBleGlzdHMgaW4gdGhlIHNvdXJjZSB0cmVlLgogICAgICAgIChQcmV0dHlQYXRjaC5s aW5raWZ5RmlsZW5hbWUpOiBDaGFuZ2VkIHRvIGNhbGwgZmluZF91cmxfYW5kX3BhdGguCi0tLQog QnVnc1NpdGUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgfCAgIDE1ICsrKysrKysrKysrKysr KwogQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIgfCAgIDI1ICsrKysrKysrKysr KysrKysrLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgOCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9CdWdzU2l0ZS9DaGFuZ2VMb2cgYi9CdWdzU2l0ZS9DaGFu Z2VMb2cKaW5kZXggYmI0YTg1NC4uMzdkN2Q5MSAxMDA2NDQKLS0tIGEvQnVnc1NpdGUvQ2hhbmdl TG9nCisrKyBiL0J1Z3NTaXRlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDA4LTA1LTI4 ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAorICAgICAgICBNYWtlIFByZXR0eVBh dGNoIGFibGUgdG8gaGFuZGxlIGRpZmZzIHRha2VuIGZyb20gb3V0c2lkZSB0aGUgV2ViS2l0Cisg ICAgICAgIHNvdXJjZSB0cmVlCisKKyAgICAgICAgUGFydCBvZiBCdWcgMTkyOTA6IE1vcmUgcGF0 Y2hlcyBub3QgaGFuZGxlZCBieSBQcmV0dHlQYXRjaC5yYgorICAgICAgICA8aHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MjkwPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmI6 CisgICAgICAgIChQcmV0dHlQYXRjaC5maW5kX3VybF9hbmRfcGF0aCk6IEFkZGVkLiBTZWFyY2hl cyB0aGUgZmlsZSBwYXRoIGZyb20KKyAgICAgICAgdGhlIGJvdHRvbSB1cCBsb29raW5nIGZvciBh IGRpcmVjdG9yeSB0aGF0IGV4aXN0cyBpbiB0aGUgc291cmNlIHRyZWUuCisgICAgICAgIChQcmV0 dHlQYXRjaC5saW5raWZ5RmlsZW5hbWUpOiBDaGFuZ2VkIHRvIGNhbGwgZmluZF91cmxfYW5kX3Bh dGguCisKKzIwMDgtMDUtMjggIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgorCiAgICAg ICAgIFByaW50IGV4Y2VwdGlvbnMgZnJvbSBQcmV0dHlQYXRjaCB0byBzdGRvdXQKIAogICAgICAg ICBUaGlzIHdpbGwgbWFrZSBpdCBtdWNoIGVhc2llciB0byBkZWJ1ZyBwcm9ibGVtcyB3aXRoIFBy ZXR0eVBhdGNoLApkaWZmIC0tZ2l0IGEvQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gu cmIgYi9CdWdzU2l0ZS9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYgppbmRleCBkZWQwZDZjLi40 MmRmYTFlIDEwMDY0NAotLS0gYS9CdWdzU2l0ZS9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYgor KysgYi9CdWdzU2l0ZS9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYgpAQCAtNjEsMTUgKzYxLDI0 IEBAIHByaXZhdGUKICAgICAgICAgIldlYktpdFRvb2xzIiwKICAgICBdCiAKKyAgICBkZWYgc2Vs Zi5maW5kX3VybF9hbmRfcGF0aChmaWxlX3BhdGgpCisgICAgICAgICMgU2VhcmNoIGZpbGVfcGF0 aCBmcm9tIHRoZSBib3R0b20gdXAsIGF0IGVhY2ggbGV2ZWwgY2hlY2tpbmcgd2hldGhlcgorICAg ICAgICAjIHdlJ3ZlIGZvdW5kIGEgZGlyZWN0b3J5IHdlIGtub3cgZXhpc3RzIGluIHRoZSBzb3Vy Y2UgdHJlZS4KKworICAgICAgICBkaXJuYW1lLCBiYXNlbmFtZSA9IEZpbGUuc3BsaXQoZmlsZV9w YXRoKQorICAgICAgICBkaXJuYW1lLnNwbGl0KC9cLy8pLnJldmVyc2UuaW5qZWN0KGJhc2VuYW1l KSBkbyB8cGF0aCwgZGlyZWN0b3J5fAorICAgICAgICAgICAgcGF0aCA9IGRpcmVjdG9yeSArICIv IiArIHBhdGgKKworICAgICAgICAgICAgcmV0dXJuIFtPUEVOU09VUkNFX1RSQUNfVVJMLCBwYXRo XSBpZiBPUEVOU09VUkNFX0RJUlMuaW5jbHVkZT8oZGlyZWN0b3J5KQorCisgICAgICAgICAgICBw YXRoCisgICAgICAgIGVuZAorCisgICAgICAgIFtuaWwsIGZpbGVfcGF0aF0KKyAgICBlbmQKKwog ICAgIGRlZiBzZWxmLmxpbmtpZnlGaWxlbmFtZShmaWxlbmFtZSkKLSAgICAgICAgZGlyZWN0b3J5 ID0gL14oW15cL10rKS8ubWF0Y2goZmlsZW5hbWUpWzFdCi0gICAgICAgIHVybCwgcGF0aEJlbmVh dGhUcnVuayA9IGlmIGZpbGVuYW1lID1+IC9cYk9wZW5Tb3VyY2VcLy8gdGhlbgotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgW09QRU5TT1VSQ0VfVFJBQ19VUkwsIGZpbGVuYW1l LmdzdWIoL14uKlxiT3BlblNvdXJjZVwvLywgJycpXQotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBlbHNpZiBPUEVOU09VUkNFX0RJUlMuaW5jbHVkZT8oZGlyZWN0b3J5KSB0aGVuCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbT1BFTlNPVVJDRV9UUkFDX1VSTCwg ZmlsZW5hbWVdCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFtuaWwsIG5pbF0KLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZW5kCisgICAgICAgIHVybCwgcGF0aEJlbmVhdGhUcnVuayA9IGZpbmRf dXJsX2FuZF9wYXRoKGZpbGVuYW1lKQogCiAgICAgICAgIHVybC5uaWw/ID8gZmlsZW5hbWUgOiAi PGEgaHJlZj0nI3t1cmx9YnJvd3Nlci90cnVuay8je3BhdGhCZW5lYXRoVHJ1bmt9Jz4je2ZpbGVu YW1lfTwvYT4iCiAgICAgZW5kCi0tIAoxLjUuNS4xLjE0MS5nZDU1YgoK 21469 2008-06-02 15:10:17 -0700 2008-06-24 17:35:32 -0700 Fix remaining patches bug-19290-part2.diff text/plain 2691 ddkilzer SW5kZXg6IEJ1Z3NTaXRlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBCdWdzU2l0ZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDM0MzI0KQorKysgQnVnc1NpdGUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMjEgQEAKKzIwMDgtMDYtMDIgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFw cGxlLmNvbT4KKworICAgICAgICBNYWtlIFByZXR0eVBhdGNoIGhhbmRsZSBkaWZmcyB3aXRoIG5v IEluZGV4IG9yIGRpZmYgaGVhZGVycworCisgICAgICAgIFBhcnQgb2YgQnVnIDE5MjkwOiBNb3Jl IHBhdGNoZXMgbm90IGhhbmRsZWQgYnkgUHJldHR5UGF0Y2gucmIKKyAgICAgICAgPGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTI5MD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFByZXR0eVBhdGNoL1ByZXR0eVBhdGNo LnJiOgorICAgICAgICAoUHJldHR5UGF0Y2guRElGRl9IRUFERVJfRk9STUFUUyk6IEFkZGVkIHJl Z3VsYXIgZXhwcmVzc2lvbiB0bworICAgICAgICBtYXRjaCBvbiAiLS0tICIgbGluZXMgZm9yIHBh dGNoZXMgd2l0aCBubyAiSW5kZXgiIG9yICJkaWZmIiBoZWFkZXIuCisgICAgICAgIChQcmV0dHlQ YXRjaC5GaWxlRGlmZi5pbml0aWFsaXplKTogQ2hhbmdlIHN0YXJ0IGluZGV4IG9mIGZvciBsb29w CisgICAgICAgIHdoZW4gdGhlIGZpcnN0IGxpbmUgb2YgYSBwYXRjaCBoYXMgbm8gIkluZGV4IiBv ciAiZGlmZiIgaGVhZGVyLgorICAgICAgICAoUHJldHR5UGF0Y2guRmlsZURpZmYucGFyc2UpOiBB ZGRlZCBoYXZlU2VlbkRpZmZIZWFkZXIgc3RhdGUKKyAgICAgICAgdmFyaWFibGUgdG8gZGV0ZXJt aW5lIHdoZW4gbm8gIkluZGV4IiBvciAiZGlmZiIgaGVhZGVyIGhhcyBiZWVuCisgICAgICAgIGZv dW5kLCBidXQgYSBuZXcgcGF0Y2ggaGFzIHN0YXJ0ZWQuCisKIDIwMDgtMDUtMjkgIEFkYW0gUm9i ZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBQcmV0dHlQYXRjaCBkaXJl Y3RvcnkgbGlzdApJbmRleDogQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIJKHJldmlzaW9u IDM0MzEzKQorKysgQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIJKHdvcmtpbmcg Y29weSkKQEAgLTI5LDcgKzI5LDggQEAgcHVibGljCiBwcml2YXRlCiAgICAgRElGRl9IRUFERVJf Rk9STUFUUyA9IFsKICAgICAgICAgL15JbmRleDogKC4qKVxyPyQvLAotICAgICAgICAvXmRpZmYg LS1naXQgYVwvLisgYlwvKC4rKVxyPyQvCisgICAgICAgIC9eZGlmZiAtLWdpdCBhXC8uKyBiXC8o LispXHI/JC8sCisgICAgICAgIC9eLS0tICguKilcdC4qXHI/JC8KICAgICBdCiAKICAgICBSRUxB WEVEX0RJRkZfSEVBREVSX0ZPUk1BVFMgPSBbCkBAIC0xNzcsNyArMTc4LDggQEAgRU9GCiAgICAg ICAgIGRlZiBpbml0aWFsaXplKGxpbmVzKQogICAgICAgICAgICAgQGZpbGVuYW1lID0gUHJldHR5 UGF0Y2guZmlsZW5hbWVfZnJvbV9kaWZmX2hlYWRlcihsaW5lc1swXS5jaG9tcCkKICAgICAgICAg ICAgIHN0YXJ0T2ZTZWN0aW9ucyA9IDEKLSAgICAgICAgICAgIGZvciBpIGluIDEuLi5saW5lcy5s ZW5ndGgKKyAgICAgICAgICAgIGxpbmVzU3RhcnRJbmRleCA9IGxpbmVzWzBdID1+IC9eLS0tIC8g PyAwIDogMQorICAgICAgICAgICAgZm9yIGkgaW4gbGluZXNTdGFydEluZGV4Li4ubGluZXMubGVu Z3RoCiAgICAgICAgICAgICAgICAgY2FzZSBsaW5lc1tpXQogICAgICAgICAgICAgICAgIHdoZW4g L14tLS0gLwogICAgICAgICAgICAgICAgICAgICBAZnJvbSA9IFByZXR0eVBhdGNoLnJldmlzaW9u T3JEZXNjcmlwdGlvbihsaW5lc1tpXSkKQEAgLTIwMCw4ICsyMDIsMTUgQEAgRU9GCiAgICAgICAg IGVuZAogCiAgICAgICAgIGRlZiBzZWxmLnBhcnNlKHN0cmluZykKKyAgICAgICAgICAgIGhhdmVT ZWVuRGlmZkhlYWRlciA9IGZhbHNlCiAgICAgICAgICAgICBsaW5lc0ZvckRpZmZzID0gc3RyaW5n LmluamVjdChbXSkgZG8gfGRpZmZDaHVua3MsIGxpbmV8Ci0gICAgICAgICAgICAgICAgZGlmZkNo dW5rcyA8PCBbXSBpZiBQcmV0dHlQYXRjaC5kaWZmX2hlYWRlcj8obGluZSkKKyAgICAgICAgICAg ICAgICBpZiAoUHJldHR5UGF0Y2guZGlmZl9oZWFkZXI/KGxpbmUpKQorICAgICAgICAgICAgICAg ICAgICBkaWZmQ2h1bmtzIDw8IFtdCisgICAgICAgICAgICAgICAgICAgIGhhdmVTZWVuRGlmZkhl YWRlciA9IHRydWUKKyAgICAgICAgICAgICAgICBlbHNpZiAoIWhhdmVTZWVuRGlmZkhlYWRlciAm JiBsaW5lID1+IC9eLS0tIC8pCisgICAgICAgICAgICAgICAgICAgIGRpZmZDaHVua3MgPDwgW10K KyAgICAgICAgICAgICAgICAgICAgaGF2ZVNlZW5EaWZmSGVhZGVyID0gZmFsc2UKKyAgICAgICAg ICAgICAgICBlbmQKICAgICAgICAgICAgICAgICBkaWZmQ2h1bmtzLmxhc3QgPDwgbGluZSB1bmxl c3MgZGlmZkNodW5rcy5sYXN0Lm5pbD8KICAgICAgICAgICAgICAgICBkaWZmQ2h1bmtzCiAgICAg ICAgICAgICBlbmQK 21918 2008-06-24 17:35:32 -0700 2008-06-25 12:47:26 -0700 Fix remaining patches v2 bug-19290-part2-v2.diff text/plain 2908 ddkilzer SW5kZXg6IEJ1Z3NTaXRlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBCdWdzU2l0ZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDM0NzY4KQorKysgQnVnc1NpdGUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMjEgQEAKKzIwMDgtMDYtMjQgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFw cGxlLmNvbT4KKworICAgICAgICBNYWtlIFByZXR0eVBhdGNoIGhhbmRsZSBkaWZmcyB3aXRoIG5v IEluZGV4IG9yIGRpZmYgaGVhZGVycworCisgICAgICAgIFBhcnQgb2YgQnVnIDE5MjkwOiBNb3Jl IHBhdGNoZXMgbm90IGhhbmRsZWQgYnkgUHJldHR5UGF0Y2gucmIKKyAgICAgICAgPGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTI5MD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFByZXR0eVBhdGNoL1ByZXR0eVBhdGNo LnJiOgorICAgICAgICAoUHJldHR5UGF0Y2guRElGRl9IRUFERVJfRk9STUFUUyk6IEFkZGVkIHJl Z3VsYXIgZXhwcmVzc2lvbiB0bworICAgICAgICBtYXRjaCBvbiAiKysrICIgbGluZXMgZm9yIHBh dGNoZXMgd2l0aCBubyAiSW5kZXgiIG9yICJkaWZmIiBoZWFkZXIuCisgICAgICAgIChQcmV0dHlQ YXRjaC5GaWxlRGlmZi5pbml0aWFsaXplKTogTG9vayBmb3IgZmlsZW5hbWUgb24gIisrKyAiIGxp bmUKKyAgICAgICAgd2hlbiB0aGUgZmlyc3QgbGluZSBvZiBhIHBhdGNoIGhhcyBubyAiSW5kZXgi IG9yICJkaWZmIiBoZWFkZXIuCisgICAgICAgIChQcmV0dHlQYXRjaC5GaWxlRGlmZi5wYXJzZSk6 IEFkZGVkIGhhdmVTZWVuRGlmZkhlYWRlciBzdGF0ZQorICAgICAgICB2YXJpYWJsZSB0byBkZXRl cm1pbmUgd2hlbiBubyAiSW5kZXgiIG9yICJkaWZmIiBoZWFkZXIgaGFzIGJlZW4KKyAgICAgICAg Zm91bmQsIGJ1dCBhIG5ldyBwYXRjaCBoYXMgc3RhcnRlZCB3aXRoIGEgIi0tLSAiIGxpbmUuCisK IDIwMDgtMDYtMDggIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBBZGFtIFJvYmVuLgpJbmRleDogQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5 UGF0Y2gucmIKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gu cmIJKHJldmlzaW9uIDM0NzY4KQorKysgQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gu cmIJKHdvcmtpbmcgY29weSkKQEAgLTI5LDcgKzI5LDggQEAKIHByaXZhdGUKICAgICBESUZGX0hF QURFUl9GT1JNQVRTID0gWwogICAgICAgICAvXkluZGV4OiAoLiopXHI/JC8sCi0gICAgICAgIC9e ZGlmZiAtLWdpdCBhXC8uKyBiXC8oLispXHI/JC8KKyAgICAgICAgL15kaWZmIC0tZ2l0IGFcLy4r IGJcLyguKylccj8kLywKKyAgICAgICAgL15cK1wrXCsgKFteXHRdKykoXHQuKik/XHI/JC8KICAg ICBdCiAKICAgICBSRUxBWEVEX0RJRkZfSEVBREVSX0ZPUk1BVFMgPSBbCkBAIC0xNzcsMTEgKzE3 OCwxMiBAQAogICAgICAgICBkZWYgaW5pdGlhbGl6ZShsaW5lcykKICAgICAgICAgICAgIEBmaWxl bmFtZSA9IFByZXR0eVBhdGNoLmZpbGVuYW1lX2Zyb21fZGlmZl9oZWFkZXIobGluZXNbMF0uY2hv bXApCiAgICAgICAgICAgICBzdGFydE9mU2VjdGlvbnMgPSAxCi0gICAgICAgICAgICBmb3IgaSBp biAxLi4ubGluZXMubGVuZ3RoCisgICAgICAgICAgICBmb3IgaSBpbiAwLi4ubGluZXMubGVuZ3Ro CiAgICAgICAgICAgICAgICAgY2FzZSBsaW5lc1tpXQogICAgICAgICAgICAgICAgIHdoZW4gL14t LS0gLwogICAgICAgICAgICAgICAgICAgICBAZnJvbSA9IFByZXR0eVBhdGNoLnJldmlzaW9uT3JE ZXNjcmlwdGlvbihsaW5lc1tpXSkKICAgICAgICAgICAgICAgICB3aGVuIC9eXCtcK1wrIC8KKyAg ICAgICAgICAgICAgICAgICAgQGZpbGVuYW1lID0gUHJldHR5UGF0Y2guZmlsZW5hbWVfZnJvbV9k aWZmX2hlYWRlcihsaW5lc1tpXS5jaG9tcCkgaWYgQGZpbGVuYW1lLm5pbD8KICAgICAgICAgICAg ICAgICAgICAgQHRvID0gUHJldHR5UGF0Y2gucmV2aXNpb25PckRlc2NyaXB0aW9uKGxpbmVzW2ld KQogICAgICAgICAgICAgICAgICAgICBzdGFydE9mU2VjdGlvbnMgPSBpICsgMQogICAgICAgICAg ICAgICAgICAgICBicmVhawpAQCAtMjAwLDggKzIwMiwxNSBAQAogICAgICAgICBlbmQKIAogICAg ICAgICBkZWYgc2VsZi5wYXJzZShzdHJpbmcpCisgICAgICAgICAgICBoYXZlU2VlbkRpZmZIZWFk ZXIgPSBmYWxzZQogICAgICAgICAgICAgbGluZXNGb3JEaWZmcyA9IHN0cmluZy5pbmplY3QoW10p IGRvIHxkaWZmQ2h1bmtzLCBsaW5lfAotICAgICAgICAgICAgICAgIGRpZmZDaHVua3MgPDwgW10g aWYgUHJldHR5UGF0Y2guZGlmZl9oZWFkZXI/KGxpbmUpCisgICAgICAgICAgICAgICAgaWYgKFBy ZXR0eVBhdGNoLmRpZmZfaGVhZGVyPyhsaW5lKSkKKyAgICAgICAgICAgICAgICAgICAgZGlmZkNo dW5rcyA8PCBbXQorICAgICAgICAgICAgICAgICAgICBoYXZlU2VlbkRpZmZIZWFkZXIgPSB0cnVl CisgICAgICAgICAgICAgICAgZWxzaWYgKCFoYXZlU2VlbkRpZmZIZWFkZXIgJiYgbGluZSA9fiAv Xi0tLSAvKQorICAgICAgICAgICAgICAgICAgICBkaWZmQ2h1bmtzIDw8IFtdCisgICAgICAgICAg ICAgICAgICAgIGhhdmVTZWVuRGlmZkhlYWRlciA9IGZhbHNlCisgICAgICAgICAgICAgICAgZW5k CiAgICAgICAgICAgICAgICAgZGlmZkNodW5rcy5sYXN0IDw8IGxpbmUgdW5sZXNzIGRpZmZDaHVu a3MubGFzdC5uaWw/CiAgICAgICAgICAgICAgICAgZGlmZkNodW5rcwogICAgICAgICAgICAgZW5k Cg==