31990 2009-11-30 11:54:42 -0800 [GTK] Recognize oga as audio/ogg 2009-12-09 05:54:06 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 pnormand webkit-unassigned abarth commit-queue eric gustavo webkit.review.bot oldest_to_newest 167312 0 pnormand 2009-11-30 11:54:42 -0800 GStreamer advertizes oga files as audio/x-vorbis. Our player should handle this case and replace audio/x-vorbis with audio/ogg where appropriate. 167314 1 44034 pnormand 2009-11-30 11:58:05 -0800 Created attachment 44034 advertize audio/ogg correctly 167394 2 abarth 2009-11-30 12:53:02 -0800 style-queue ran check-webkit-style on attachment 44034 without any errors. 167498 3 eric 2009-11-30 21:45:14 -0800 The patch looks for "video/x-vorbis" instead of autio/x-vorbis. Was that intentional? Is the original bug comment simply wrong? I'm confused. 167533 4 pnormand 2009-12-01 00:00:15 -0800 (In reply to comment #3) > The patch looks for "video/x-vorbis" instead of autio/x-vorbis. Was that > intentional? Is the original bug comment simply wrong? I'm confused. Sorry, indeed the patch is wrong, will attach a new version. 167536 5 44059 pnormand 2009-12-01 00:25:06 -0800 Created attachment 44059 advertize audio/ogg correctly 167537 6 webkit.review.bot 2009-12-01 00:28:19 -0800 style-queue ran check-webkit-style on attachment 44059 without any errors. 167590 7 eric 2009-12-01 07:10:47 -0800 How do we test this and how did you test this? How do we know that we aren't missing other mappings here? Should we assert in some way that we've mapped all of these capabilities to their web equivalents, or should that not be necessary? 167662 8 pnormand 2009-12-01 10:18:44 -0800 (In reply to comment #7) > How do we test this and how did you test this? How do we know that we aren't > missing other mappings here? Should we assert in some way that we've mapped > all of these capabilities to their web equivalents, or should that not be > necessary? Well I can update media/video-can-play-type.html and add checks for audio/ogg and video/ogg but I'm afraid this would fail on mac for instance. Generally this depends on the platform and if codecs are installed for the given mime-type, it's not a trivial scenario. So I'm not sure what to do exactly :( 168050 9 44059 gustavo 2009-12-02 10:15:06 -0800 Comment on attachment 44059 advertize audio/ogg correctly (In reply to comment #8) > (In reply to comment #7) > Well I can update media/video-can-play-type.html and add checks for audio/ogg > and video/ogg but I'm afraid this would fail on mac for instance. Generally > this depends on the platform and if codecs are installed for the given > mime-type, it's not a trivial scenario. I have a number of recomendations regarding this: First of all, I think we should refactor this code following this recommendation: Nov 05 14:32:29 <slomo> kov: get the GstStructure(s) from them, use the gst_structure_* API :) Perhaps you want to write that patch? As for how to test, I would recommend adding a separate test similar to media/video-can-play-type.html, and add it to the Skipped file for all platforms that are not supposed to pass it right now. I'll say r- for now. 168053 10 gustavo 2009-12-02 10:16:21 -0800 (In reply to comment #9) > Nov 05 14:32:29 <slomo> kov: get the GstStructure(s) from them, use the > gst_structure_* API :) Just to make it clear, this was related to the fact that the current code parses the caps using string manipulation. I didn't know we had a smarter way of doing it back then. Manipulating GstStructure objects should be saner. 168383 11 44236 pnormand 2009-12-03 06:26:36 -0800 Created attachment 44236 advertize audio/ogg correctly and refactored mime-type cache building 168384 12 44237 pnormand 2009-12-03 06:26:50 -0800 Created attachment 44237 new test for ogg containers 168386 13 webkit.review.bot 2009-12-03 06:28:10 -0800 style-queue ran check-webkit-style on attachment 44236 without any errors. 168395 14 44240 pnormand 2009-12-03 07:11:18 -0800 Created attachment 44240 advertize audio/ogg correctly and refactored mime-type cache building 168398 15 webkit.review.bot 2009-12-03 07:14:55 -0800 style-queue ran check-webkit-style on attachment 44240 without any errors. 168422 16 44246 pnormand 2009-12-03 08:57:49 -0800 Created attachment 44246 advertize audio/ogg correctly and refactored mime-type cache building explicitely add audio/mpeg in the cache as suggested by Gustavo. 168424 17 webkit.review.bot 2009-12-03 08:58:16 -0800 style-queue ran check-webkit-style on attachment 44246 without any errors. 168427 18 44246 gustavo 2009-12-03 09:03:42 -0800 Comment on attachment 44246 advertize audio/ogg correctly and refactored mime-type cache building OK, LGTM, thanks! 168523 19 44246 commit-queue 2009-12-03 13:30:18 -0800 Comment on attachment 44246 advertize audio/ogg correctly and refactored mime-type cache building Rejecting patch 44246 from commit-queue. Failed to run "['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--quiet', '--exit-after-n-failures=1']" exit_code: 1 Running build-dumprendertree Running tests from /Users/eseidel/Projects/CommitQueue/LayoutTests Testing 11718 test cases. websocket/tests/simple.html -> failed Exiting early after 1 failures. 11713 tests run. 371.98s total testing time 11712 test cases (99%) succeeded 1 test case (<1%) had incorrect layout 6 test cases (<1%) had stderr output 168525 20 44246 gustavo 2009-12-03 13:35:27 -0800 Comment on attachment 44246 advertize audio/ogg correctly and refactored mime-type cache building Failure not related to the patch/test, so I'm setting cq+ again. 168528 21 44246 commit-queue 2009-12-03 13:37:59 -0800 Comment on attachment 44246 advertize audio/ogg correctly and refactored mime-type cache building Rejecting patch 44246 from commit-queue. Failed to run "['/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', '--reviewer', 'Gustavo Noronha Silva', '--force']" exit_code: 1 Last 500 characters of output: kipped patching file LayoutTests/platform/mac/Skipped patching file LayoutTests/platform/qt-mac/Skipped patching file LayoutTests/platform/qt-win/Skipped patching file LayoutTests/platform/qt/Skipped patching file LayoutTests/platform/win/Skipped Hunk #1 FAILED at 722. 1 out of 1 hunk FAILED -- saving rejects to file LayoutTests/platform/win/Skipped.rej patching file WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp 168532 22 eric 2009-12-03 13:45:10 -0800 I'm concerned about the bogus websocket failure. I'll investigate. 168559 23 eric 2009-12-03 15:09:42 -0800 I believe the bogus websocket failure was just bug 30098. 169057 24 gustavo 2009-12-05 17:50:43 -0800 Landed as r51734. 169385 25 ap 2009-12-07 11:00:17 -0800 The test wasn't landed in r51734. 169664 26 pnormand 2009-12-08 07:15:17 -0800 (In reply to comment #25) > The test wasn't landed in r51734. Gustavo, can you commit the html test file please? It is in the patch you reviewed, thanks! 169982 27 gustavo 2009-12-09 05:54:06 -0800 Just saw the replies on the bug now. I had forgotten to add the files, but ap pinged me on IRC, so I landed them, sorry for the trouble =(. 44034 2009-11-30 11:58:05 -0800 2009-12-01 00:25:06 -0800 advertize audio/ogg correctly advertize-audioogg-correctly.patch text/plain 1734 pnormand RnJvbSBmNThkYjkzMzRlNmViMDhiODdmZjY4NDUxNmFhZmU4ZDgzNjljM2EzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBGcmksIDE2IE9jdCAyMDA5IDE0OjE4OjU1ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g YWR2ZXJ0aXplIGF1ZGlvL29nZyBjb3JyZWN0bHkKCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEyICsrKysrKysrKysrKwogLi4uL2dy YXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwICAgfCAgICAzICsrKwog MiBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAwIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTgxMGNh ZC4uMThhN2E4ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0xMS0zMCAgUGhpbGlwcGUgTm9ybWFuZCAg PHBub3JtYW5kQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW0dUS10gUmVjb2duaXplIG9nYSBhcyBhdWRpby9vZ2cKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxOTkwCisKKyAgICAgICAg QWR2ZXJ0aXplIGF1ZGlvL29nZyBjb3JyZWN0bHkgaW5zaWRlIG91ciBpbnRlcm5hbCBtaW1lLXR5 cGUgY2FjaGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om1pbWVUeXBlQ2FjaGUpOgor CiAyMDA5LTExLTMwICBFcmlrIEFydmlkc3NvbiAgPGFydkBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4 IDkyZGUzOTIuLjIyZTE3OWYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtODAzLDYg KzgwMyw5IEBAIHN0YXRpYyBIYXNoU2V0PFN0cmluZz4gbWltZVR5cGVDYWNoZSgpCiAgICAgICAg ICAgICAgICAgaWYgKGdfc3RyX2VxdWFsKGNhcGFiaWxpdHlbMF0sICJ2aWRlby94LXRoZW9yYSIp KQogICAgICAgICAgICAgICAgICAgICBjYWNoZS5hZGQoU3RyaW5nKCJ2aWRlby9vZ2ciKSk7CiAK KyAgICAgICAgICAgICAgICBpZiAoZ19zdHJfZXF1YWwoY2FwYWJpbGl0eVswXSwgInZpZGVvL3gt dm9yYmlzIikpCisgICAgICAgICAgICAgICAgICAgIGNhY2hlLmFkZChTdHJpbmcoImF1ZGlvL29n ZyIpKTsKKwogICAgICAgICAgICAgICAgIGlmIChnX3N0cl9lcXVhbChjYXBhYmlsaXR5WzBdLCAi YXVkaW8veC13YXYiKSkKICAgICAgICAgICAgICAgICAgICAgY2FjaGUuYWRkKFN0cmluZygiYXVk aW8vd2F2IikpOwogCi0tIAoxLjYuMy4z 44059 2009-12-01 00:25:06 -0800 2009-12-03 06:26:36 -0800 advertize audio/ogg correctly advertize-audioogg-correctly.patch text/plain 1734 pnormand RnJvbSBkZGM3MDdiMmM5NGU2NGIyYmMzY2NjMjkyOGQ5YjhiM2UxNjBhOGQ3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBGcmksIDE2IE9jdCAyMDA5IDE0OjE4OjU1ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g YWR2ZXJ0aXplIGF1ZGlvL29nZyBjb3JyZWN0bHkKCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEyICsrKysrKysrKysrKwogLi4uL2dy YXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwICAgfCAgICAzICsrKwog MiBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAwIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTgxMGNh ZC4uMThhN2E4ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0xMS0zMCAgUGhpbGlwcGUgTm9ybWFuZCAg PHBub3JtYW5kQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW0dUS10gUmVjb2duaXplIG9nYSBhcyBhdWRpby9vZ2cKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxOTkwCisKKyAgICAgICAg QWR2ZXJ0aXplIGF1ZGlvL29nZyBjb3JyZWN0bHkgaW5zaWRlIG91ciBpbnRlcm5hbCBtaW1lLXR5 cGUgY2FjaGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om1pbWVUeXBlQ2FjaGUpOgor CiAyMDA5LTExLTMwICBFcmlrIEFydmlkc3NvbiAgPGFydkBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4 IDkyZGUzOTIuLmM5ZjMwMWMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtODAzLDYg KzgwMyw5IEBAIHN0YXRpYyBIYXNoU2V0PFN0cmluZz4gbWltZVR5cGVDYWNoZSgpCiAgICAgICAg ICAgICAgICAgaWYgKGdfc3RyX2VxdWFsKGNhcGFiaWxpdHlbMF0sICJ2aWRlby94LXRoZW9yYSIp KQogICAgICAgICAgICAgICAgICAgICBjYWNoZS5hZGQoU3RyaW5nKCJ2aWRlby9vZ2ciKSk7CiAK KyAgICAgICAgICAgICAgICBpZiAoZ19zdHJfZXF1YWwoY2FwYWJpbGl0eVswXSwgImF1ZGlvL3gt dm9yYmlzIikpCisgICAgICAgICAgICAgICAgICAgIGNhY2hlLmFkZChTdHJpbmcoImF1ZGlvL29n ZyIpKTsKKwogICAgICAgICAgICAgICAgIGlmIChnX3N0cl9lcXVhbChjYXBhYmlsaXR5WzBdLCAi YXVkaW8veC13YXYiKSkKICAgICAgICAgICAgICAgICAgICAgY2FjaGUuYWRkKFN0cmluZygiYXVk aW8vd2F2IikpOwogCi0tIAoxLjYuMy4z 44236 2009-12-03 06:26:36 -0800 2009-12-03 07:11:18 -0800 advertize audio/ogg correctly and refactored mime-type cache building advertize-audioogg-correctly-and-refactored-mime-t.patch text/plain 7116 pnormand RnJvbSBjN2M2NzUwOGJjNjcwZjliMzZmYmYyZWQ0YzZkYTEyZGJkMTBhNDIwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBGcmksIDE2IE9jdCAyMDA5IDE0OjE4OjU1ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g YWR2ZXJ0aXplIGF1ZGlvL29nZyBjb3JyZWN0bHkgYW5kIHJlZmFjdG9yZWQgbWltZS10eXBlIGNh Y2hlIGJ1aWxkaW5nCgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHwgICAxMiArKysKIC4uLi9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyLmNwcCAgIHwgICA4NyArKysrKysrKysrKystLS0tLS0tLQogMiBmaWxlcyBj aGFuZ2VkLCA2NSBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGM3MmIzYmUuLjU0Yzhj MWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMTEtMzAgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFu ZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtHVEtdIFJlY29nbml6ZSBvZ2EgYXMgYXVkaW8vb2dnCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTk5MAorCisgICAgICAgIEFkdmVydGl6 ZSBhdWRpby9vZ2cgY29ycmVjdGx5IGluc2lkZSBvdXIgaW50ZXJuYWwgbWltZS10eXBlIGNhY2hl LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjptaW1lVHlwZUNhY2hlKToKKwogMjAwOS0x Mi0wMiAgWXVzdWtlIFNhdG8gIDx5dXN1a2VzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IDkyZGUz OTIuLjNlZWE1OWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtNzc3LDU2ICs3Nzcs NzUgQEAgc3RhdGljIEhhc2hTZXQ8U3RyaW5nPiBtaW1lVHlwZUNhY2hlKCkKICAgICAgICAgICAg IEdzdFR5cGVGaW5kRmFjdG9yeSogZmFjdG9yeSA9IEdTVF9UWVBFX0ZJTkRfRkFDVE9SWShpdGVy YXRvci0+ZGF0YSk7CiAgICAgICAgICAgICBHc3RDYXBzKiBjYXBzID0gZ3N0X3R5cGVfZmluZF9m YWN0b3J5X2dldF9jYXBzKGZhY3RvcnkpOwogCi0gICAgICAgICAgICAvLyBTcGxpdHRpbmcgdGhl IGNhcGFiaWxpdHkgYnkgY29tbWEgYW5kIHRha2luZyB0aGUgZmlyc3QgcGFydAotICAgICAgICAg ICAgLy8gYXMgY2FwYWJpbGl0eSBjYW4gYmUgc29tZXRoaW5nIGxpa2UgImF1ZGlvL3gtd2F2cGFj aywgZnJhbWVkPShib29sZWFuKWZhbHNlIgotICAgICAgICAgICAgR093blB0cjxnY2hhcj4gY2Fw YWJpbGl0eVN0cmluZyhnc3RfY2Fwc190b19zdHJpbmcoY2FwcykpOwotICAgICAgICAgICAgZ2No YXIqKiBjYXBhYmlsaXR5ID0gZ19zdHJzcGxpdChjYXBhYmlsaXR5U3RyaW5nLmdldCgpLCAiLCIs IDIpOwotICAgICAgICAgICAgZ2NoYXIqKiBtaW1ldHlwZSA9IGdfc3Ryc3BsaXQoY2FwYWJpbGl0 eVswXSwgIi8iLCAyKTsKLQotICAgICAgICAgICAgLy8gR1N0cmVhbWVyIHBsdWdpbnMgY2FuIGJl IGNhcGFibGUgb2Ygc3VwcG9ydGluZyB0eXBlcyB3aGljaCBXZWJLaXQgc3VwcG9ydHMKLSAgICAg ICAgICAgIC8vIGJ5IGRlZmF1bHQuIEluIHRoYXQgY2FzZSwgd2Ugc2hvdWxkIG5vdCBjb25zaWRl ciB0aGVzZSB0eXBlcyBzdXBwb3J0YWJsZSBieSBHU3RyZWFtZXIuCi0gICAgICAgICAgICAvLyBF eGFtcGxlcyBvZiB3aGF0IEdTdHJlYW1lciBjYW4gc3VwcG9ydCBidXQgc2hvdWxkIG5vdCBiZSBh ZGRlZDoKLSAgICAgICAgICAgIC8vIHRleHQvcGxhaW4sIHRleHQvaHRtbCwgaW1hZ2UvanBlZywg YXBwbGljYXRpb24veG1sCi0gICAgICAgICAgICBpZiAoZ19zdHJfZXF1YWwobWltZXR5cGVbMF0s ICJhdWRpbyIpCi0gICAgICAgICAgICAgICAgfHwgZ19zdHJfZXF1YWwobWltZXR5cGVbMF0sICJ2 aWRlbyIpCi0gICAgICAgICAgICAgICAgfHwgKGdfc3RyX2VxdWFsKG1pbWV0eXBlWzBdLCAiYXBw bGljYXRpb24iKQotICAgICAgICAgICAgICAgICAgICAmJiAhaWdub3JlZEFwcGxpY2F0aW9uU3Vi dHlwZXMuY29udGFpbnMoU3RyaW5nKG1pbWV0eXBlWzFdKSkpKSB7Ci0gICAgICAgICAgICAgICAg Y2FjaGUuYWRkKFN0cmluZyhjYXBhYmlsaXR5WzBdKSk7Ci0KLSAgICAgICAgICAgICAgICAvLyBU aGVzZSBmb3JtYXRzIGFyZSBzdXBwb3J0ZWQgYnkgR1N0cmVhbWVyLCBidXQgbm90IGNvcnJlY3Rs eSBhZHZlcnRpc2VkCi0gICAgICAgICAgICAgICAgaWYgKGdfc3RyX2VxdWFsKGNhcGFiaWxpdHlb MF0sICJ2aWRlby94LWgyNjQiKQotICAgICAgICAgICAgICAgICAgICB8fCBnX3N0cl9lcXVhbChj YXBhYmlsaXR5WzBdLCAiYXVkaW8veC1tNGEiKSkgeworICAgICAgICAgICAgaWYgKCFjYXBzKQor ICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICBmb3IgKGd1aW50IHN0cnVj dHVyZUluZGV4ID0gMDsgc3RydWN0dXJlSW5kZXggPCBnc3RfY2Fwc19nZXRfc2l6ZShjYXBzKTsg c3RydWN0dXJlSW5kZXgrKykgeworICAgICAgICAgICAgICAgIEdzdFN0cnVjdHVyZSogc3RydWN0 dXJlID0gZ3N0X2NhcHNfZ2V0X3N0cnVjdHVyZShjYXBzLCBzdHJ1Y3R1cmVJbmRleCk7CisgICAg ICAgICAgICAgICAgY29uc3QgZ2NoYXIqIG5hbWUgPSBnc3Rfc3RydWN0dXJlX2dldF9uYW1lKHN0 cnVjdHVyZSk7CisgICAgICAgICAgICAgICAgYm9vbCBjYWNoZWQgPSBmYWxzZTsKKworICAgICAg ICAgICAgICAgIC8vIFRoZXNlIGZvcm1hdHMgYXJlIHN1cHBvcnRlZCBieSBHU3RyZWFtZXIsIGJ1 dCBub3QKKyAgICAgICAgICAgICAgICAvLyBjb3JyZWN0bHkgYWR2ZXJ0aXNlZC4KKyAgICAgICAg ICAgICAgICBpZiAoZ19zdHJfZXF1YWwobmFtZSwgInZpZGVvL3gtaDI2NCIpCisgICAgICAgICAg ICAgICAgICAgIHx8IGdfc3RyX2VxdWFsKG5hbWUsICJhdWRpby94LW00YSIpKSB7CiAgICAgICAg ICAgICAgICAgICAgIGNhY2hlLmFkZChTdHJpbmcoInZpZGVvL21wNCIpKTsKICAgICAgICAgICAg ICAgICAgICAgY2FjaGUuYWRkKFN0cmluZygiYXVkaW8vYWFjIikpOworICAgICAgICAgICAgICAg ICAgICBjYWNoZWQgPSB0cnVlOwogICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAg IGlmIChnX3N0cl9lcXVhbChjYXBhYmlsaXR5WzBdLCAidmlkZW8veC10aGVvcmEiKSkKKyAgICAg ICAgICAgICAgICBpZiAoZ19zdHJfZXF1YWwobmFtZSwgInZpZGVvL3gtdGhlb3JhIikpIHsKICAg ICAgICAgICAgICAgICAgICAgY2FjaGUuYWRkKFN0cmluZygidmlkZW8vb2dnIikpOworICAgICAg ICAgICAgICAgICAgICBjYWNoZWQgPSB0cnVlOworICAgICAgICAgICAgICAgIH0KIAotICAgICAg ICAgICAgICAgIGlmIChnX3N0cl9lcXVhbChjYXBhYmlsaXR5WzBdLCAiYXVkaW8veC13YXYiKSkK LSAgICAgICAgICAgICAgICAgICAgY2FjaGUuYWRkKFN0cmluZygiYXVkaW8vd2F2IikpOworICAg ICAgICAgICAgICAgIGlmIChnX3N0cl9lcXVhbChuYW1lLCAiYXVkaW8veC12b3JiaXMiKSkgewor ICAgICAgICAgICAgICAgICAgICBjYWNoZS5hZGQoU3RyaW5nKCJhdWRpby9vZ2ciKSk7CisgICAg ICAgICAgICAgICAgICAgIGNhY2hlZCA9IHRydWU7CisgICAgICAgICAgICAgICAgfQogCi0gICAg ICAgICAgICAgICAgaWYgKGdfc3RyX2VxdWFsKGNhcGFiaWxpdHlbMF0sICJhdWRpby9tcGVnIikp IHsKLSAgICAgICAgICAgICAgICAgICAgLy8gVGhpcyBpcyB3aGF0IHdlIGFyZSBoYW5kbGluZzog bXBlZ3ZlcnNpb249KGludCkxLCBsYXllcj0oaW50KVsgMSwgMyBdCi0gICAgICAgICAgICAgICAg ICAgIGdjaGFyKiogdmVyc2lvbkFuZExheWVyID0gZ19zdHJzcGxpdChjYXBhYmlsaXR5WzFdLCAi LCIsIDIpOworICAgICAgICAgICAgICAgIGlmIChnX3N0cl9lcXVhbChuYW1lLCAiYXVkaW8veC13 YXYiKSkgeworICAgICAgICAgICAgICAgICAgICBjYWNoZS5hZGQoU3RyaW5nKCJhdWRpby93YXYi KSk7CisgICAgICAgICAgICAgICAgICAgIGNhY2hlZCA9IHRydWU7CisgICAgICAgICAgICAgICAg fQogCi0gICAgICAgICAgICAgICAgICAgIGlmIChnX3N0cl9oYXNfc3VmZml4KHZlcnNpb25BbmRM YXllclswXSwgIihpbnQpMSIpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBmb3IgKGludCBp ID0gMDsgdmVyc2lvbkFuZExheWVyWzFdW2ldICE9ICdcMCc7IGkrKykgewotICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGlmICh2ZXJzaW9uQW5kTGF5ZXJbMV1baV0gPT0gJzEnKQorICAgICAg ICAgICAgICAgIGlmIChnX3N0cl9lcXVhbChuYW1lLCAiYXVkaW8vbXBlZyIpKSB7CisgICAgICAg ICAgICAgICAgICAgIC8vIFRoaXMgaXMgd2hhdCB3ZSBhcmUgaGFuZGxpbmc6CisgICAgICAgICAg ICAgICAgICAgIC8vIG1wZWd2ZXJzaW9uPShpbnQpMSwgbGF5ZXI9KGludClbIDEsIDMgXQorICAg ICAgICAgICAgICAgICAgICBnaW50IG1wZWdWZXJzaW9uID0gMDsKKyAgICAgICAgICAgICAgICAg ICAgaWYgKGdzdF9zdHJ1Y3R1cmVfZ2V0X2ludChzdHJ1Y3R1cmUsICJtcGVndmVyc2lvbiIsICZt cGVnVmVyc2lvbikgJiYgKG1wZWdWZXJzaW9uID09IDEpKSB7CisgICAgICAgICAgICAgICAgICAg ICAgICBjb25zdCBHVmFsdWUqIGxheWVyID0gZ3N0X3N0cnVjdHVyZV9nZXRfdmFsdWUoc3RydWN0 dXJlLCAibGF5ZXIiKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChHX1ZBTFVFX1RZUEUo bGF5ZXIpID09IEdTVF9UWVBFX0lOVF9SQU5HRSkgeworICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGdpbnQgbWluTGF5ZXIgPSBnc3RfdmFsdWVfZ2V0X2ludF9yYW5nZV9taW4obGF5ZXIpOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdpbnQgbWF4TGF5ZXIgPSBnc3RfdmFsdWVfZ2V0 X2ludF9yYW5nZV9tYXgobGF5ZXIpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICht aW5MYXllciA8PSAxIDw9IG1heExheWVyKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjYWNoZS5hZGQoU3RyaW5nKCJhdWRpby9tcDEiKSk7Ci0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgZWxzZSBpZiAodmVyc2lvbkFuZExheWVyWzFdW2ldID09ICcyJykKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpZiAobWluTGF5ZXIgPD0gMiA8PSBtYXhMYXllcikKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY2FjaGUuYWRkKFN0cmluZygiYXVkaW8vbXAyIikpOwot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UgaWYgKHZlcnNpb25BbmRMYXllclsxXVtp XSA9PSAnMycpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG1pbkxheWVyIDw9IDMg PD0gbWF4TGF5ZXIpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNhY2hlLmFkZChT dHJpbmcoImF1ZGlvL21wMyIpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgICAgICBn X3N0cmZyZWV2KHZlcnNpb25BbmRMYXllcik7CisgICAgICAgICAgICAgICAgaWYgKCFjYWNoZWQp IHsKKyAgICAgICAgICAgICAgICAgICAgLy8gR1N0cmVhbWVyIHBsdWdpbnMgY2FuIGJlIGNhcGFi bGUgb2Ygc3VwcG9ydGluZworICAgICAgICAgICAgICAgICAgICAvLyB0eXBlcyB3aGljaCBXZWJL aXQgc3VwcG9ydHMgYnkgZGVmYXVsdC4gSW4gdGhhdAorICAgICAgICAgICAgICAgICAgICAvLyBj YXNlLCB3ZSBzaG91bGQgbm90IGNvbnNpZGVyIHRoZXNlIHR5cGVzCisgICAgICAgICAgICAgICAg ICAgIC8vIHN1cHBvcnRhYmxlIGJ5IEdTdHJlYW1lci4gIEV4YW1wbGVzIG9mIHdoYXQKKyAgICAg ICAgICAgICAgICAgICAgLy8gR1N0cmVhbWVyIGNhbiBzdXBwb3J0IGJ1dCBzaG91bGQgbm90IGJl IGFkZGVkOgorICAgICAgICAgICAgICAgICAgICAvLyB0ZXh0L3BsYWluLCB0ZXh0L2h0bWwsIGlt YWdlL2pwZWcsCisgICAgICAgICAgICAgICAgICAgIC8vIGFwcGxpY2F0aW9uL3htbAorICAgICAg ICAgICAgICAgICAgICBnY2hhcioqIG1pbWV0eXBlID0gZ19zdHJzcGxpdChuYW1lLCAiLyIsIDIp OworICAgICAgICAgICAgICAgICAgICBpZiAoZ19zdHJfZXF1YWwobWltZXR5cGVbMF0sICJhdWRp byIpCisgICAgICAgICAgICAgICAgICAgICAgICB8fCBnX3N0cl9lcXVhbChtaW1ldHlwZVswXSwg InZpZGVvIikKKyAgICAgICAgICAgICAgICAgICAgICAgIHx8IChnX3N0cl9lcXVhbChtaW1ldHlw ZVswXSwgImFwcGxpY2F0aW9uIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAmJiAhaWdu b3JlZEFwcGxpY2F0aW9uU3VidHlwZXMuY29udGFpbnMoU3RyaW5nKG1pbWV0eXBlWzFdKSkpKQor ICAgICAgICAgICAgICAgICAgICAgICAgY2FjaGUuYWRkKFN0cmluZyhuYW1lKSk7CisKKyAgICAg ICAgICAgICAgICAgICAgZ19zdHJmcmVldihtaW1ldHlwZSk7CiAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBnX3N0cmZyZWV2KGNhcGFiaWxpdHkpOwotICAg ICAgICAgICAgZ19zdHJmcmVldihtaW1ldHlwZSk7CiAgICAgICAgIH0KIAogICAgICAgICBnc3Rf cGx1Z2luX2ZlYXR1cmVfbGlzdF9mcmVlKGZhY3Rvcmllcyk7Ci0tIAoxLjYuMy4z 44237 2009-12-03 06:26:50 -0800 2009-12-03 07:11:18 -0800 new test for ogg containers new-test-for-ogg-containers.patch text/plain 6472 pnormand RnJvbSA0NDQ1ODQyODU3MGRmNDRjZWVhMDY1OTJhNzc2ZDE2Y2ZiNGYzYzY3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUaHUsIDMgRGVjIDIwMDkgMTU6MDk6NDkgKzAxMDAKU3ViamVjdDogW1BBVENIXSBu ZXcgdGVzdCBmb3Igb2dnIGNvbnRhaW5lcnMKCi0tLQogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjAgKysrKysrKysrKysrKysrKysrCiBMYXlv dXRUZXN0cy9tZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2ctZXhwZWN0ZWQudHh0IHwgICAgNiArKysr KwogTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtY2FuLXBsYXktb2dnLmh0bWwgICAgICAgICB8ICAg MjMgKysrKysrKysrKysrKysrKysrKysrCiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtbGVvcGFy ZC9Ta2lwcGVkICAgICAgICAgIHwgICAgMyArKwogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXNu b3dsZW9wYXJkL1NraXBwZWQgICAgICB8ICAgIDIgKwogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFj LXRpZ2VyL1NraXBwZWQgICAgICAgICAgICB8ICAgIDMgKysKIExheW91dFRlc3RzL3BsYXRmb3Jt L21hYy9Ta2lwcGVkICAgICAgICAgICAgICAgICAgfCAgICA0ICsrKwogTGF5b3V0VGVzdHMvcGxh dGZvcm0vcXQtbWFjL1NraXBwZWQgICAgICAgICAgICAgICB8ICAgIDMgKysKIExheW91dFRlc3Rz L3BsYXRmb3JtL3F0LXdpbi9Ta2lwcGVkICAgICAgICAgICAgICAgfCAgICAzICsrCiBMYXlvdXRU ZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkICAgICAgICAgICAgICAgICAgIHwgICAgMyArKwogTGF5 b3V0VGVzdHMvcGxhdGZvcm0vd2luL1NraXBwZWQgICAgICAgICAgICAgICAgICB8ICAgIDMgKysK IDExIGZpbGVzIGNoYW5nZWQsIDczIGluc2VydGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCiBjcmVh dGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtY2FuLXBsYXktb2dnLWV4cGVj dGVkLnR4dAogY3JlYXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL21lZGlhL21lZGlhLWNhbi1w bGF5LW9nZy5odG1sCgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDczOGZhMGEuLmM3YWY5ZDAgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy MyBAQAorMjAwOS0xMi0wMyAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmV3IHRl c3QgZm9yIHZpZGVvLmNhblBsYXlUeXBlIGFuZCBvZ2cgY29udGFpbmVycy4KKworICAgICAgICBb R1RLXSBSZWNvZ25pemUgb2dhIGFzIGF1ZGlvL29nZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE5OTAKKworICAgICAgICAqIG1lZGlhL21lZGlhLWNh bi1wbGF5LW9nZy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL21lZGlhLWNh bi1wbGF5LW9nZy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMtbGVvcGFyZC9T a2lwcGVkOgorICAgICAgICAqIHBsYXRmb3JtL21hYy1zbm93bGVvcGFyZC9Ta2lwcGVkOgorICAg ICAgICAqIHBsYXRmb3JtL21hYy10aWdlci9Ta2lwcGVkOgorICAgICAgICAqIHBsYXRmb3JtL21h Yy9Ta2lwcGVkOgorICAgICAgICAqIHBsYXRmb3JtL3F0LW1hYy9Ta2lwcGVkOgorICAgICAgICAq IHBsYXRmb3JtL3F0LXdpbi9Ta2lwcGVkOgorICAgICAgICAqIHBsYXRmb3JtL3F0L1NraXBwZWQ6 CisgICAgICAgICogcGxhdGZvcm0vd2luL1NraXBwZWQ6CisKIDIwMDktMTItMDIgIFNoaW5pY2hp cm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBE YXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21lZGlhLWNhbi1wbGF5 LW9nZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2ct ZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjE4ZmYwNTgK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2ct ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNiBAQAorVGVzdCBIVE1MTWVkaWFFbGVtZW50IGNhblBs YXlUeXBlKCkgbWV0aG9kIGZvciBvZ2cgbWVkaWEgY29udGFpbmVycy4KKworRVhQRUNURUQgKHZp ZGVvLmNhblBsYXlUeXBlKCdhdWRpby9vZ2cnKSA9PSAnbWF5YmUnKSBPSworRVhQRUNURUQgKHZp ZGVvLmNhblBsYXlUeXBlKCd2aWRlby9vZ2cnKSA9PSAnbWF5YmUnKSBPSworRU5EIE9GIFRFU1QK KwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtY2FuLXBsYXktb2dnLmh0bWwg Yi9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2cuaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwLi4yOWZkYTU1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvbWVkaWEvbWVkaWEtY2FuLXBsYXktb2dnLmh0bWwKQEAgLTAsMCArMSwyMyBAQAorPGh0 bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDxzdHlsZT4KKyAgICAgICAgICAgIHZpZGVvIHsgYmFj a2dyb3VuZC1jb2xvcjogeWVsbG93OyB3aWR0aDogMzIwcHg7IGhlaWdodDogMjQwcHg7fQorICAg ICAgICA8L3N0eWxlPgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4KKworICAgICAgICA8dmlkZW8g Y29udHJvbHMgPjwvdmlkZW8+CisKKyAgICAgICAgPHA+VGVzdCBIVE1MTWVkaWFFbGVtZW50IDxl bT5jYW5QbGF5VHlwZSgpPC9lbT4gbWV0aG9kIGZvciBvZ2cgbWVkaWEgY29udGFpbmVycy48L3A+ CisKKyAgICAgICAgPHNjcmlwdCBzcmM9dmlkZW8tdGVzdC5qcz48L3NjcmlwdD4KKyAgICAgICAg PHNjcmlwdD4KKyAgICAgICAgICAgIHZpZGVvID0gbWVkaWFFbGVtZW50ID0gZG9jdW1lbnQuZ2V0 RWxlbWVudHNCeVRhZ05hbWUoJ3ZpZGVvJylbMF07CisKKyAgICAgICAgICAgIHRlc3RFeHBlY3Rl ZCgidmlkZW8uY2FuUGxheVR5cGUoJ2F1ZGlvL29nZycpIiwgIm1heWJlIik7CisgICAgICAgICAg ICB0ZXN0RXhwZWN0ZWQoInZpZGVvLmNhblBsYXlUeXBlKCd2aWRlby9vZ2cnKSIsICJtYXliZSIp OworCisgICAgICAgICAgICBlbmRUZXN0KCk7CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvYm9k eT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy1sZW9wYXJk L1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtbGVvcGFyZC9Ta2lwcGVkCmluZGV4 IDA1YmY5ZDMuLmM1ODc3YWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy1s ZW9wYXJkL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLWxlb3BhcmQvU2tp cHBlZApAQCAtMjcsMyArMjcsNiBAQCBtZWRpYS9tZWRpYS1mdWxsc2NyZWVuLW5vdC1pbi1kb2N1 bWVudC5odG1sCiAKICMgVGVzdHMgb2YgYWNjZXNzaWJpbGl0eSBmdW5jdGlvbmFsaXR5IG5vdCBz dXBwb3J0ZWQgb24gTGVvcGFyZAogYWNjZXNzaWJpbGl0eS9hcmlhLWxpc3QtYW5kLWxpc3RpdGVt Lmh0bWwKKworIyBUaGlzIHRlc3QgcmVxdWlyZXMgb2dnIGNvZGVjcworbWVkaWEvbWVkaWEtY2Fu LXBsYXktb2dnLmh0bWwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy1zbm93 bGVvcGFyZC9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXNub3dsZW9wYXJkL1Nr aXBwZWQKaW5kZXggMDZkZGYxZi4uOWJhMmI0MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjLXNub3dsZW9wYXJkL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjLXNub3dsZW9wYXJkL1NraXBwZWQKQEAgLTQ5LDMgKzQ5LDUgQEAgc3ZnL2Nzcy9nbHlwaC1v cmllbnRhdGlvbi1yb3VuZGluZy10ZXN0LnhodG1sCiAjIHRocm93bgogcGx1Z2lucy9uZXRzY2Fw ZS1pbnZva2UtZmFpbHVyZS5odG1sCiAKKyMgVGhpcyB0ZXN0IHJlcXVpcmVzIG9nZyBjb2RlY3MK K21lZGlhL21lZGlhLWNhbi1wbGF5LW9nZy5odG1sCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMtdGlnZXIvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy10aWdl ci9Ta2lwcGVkCmluZGV4IDFkZDdhODguLjUxZmZiMTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L3BsYXRmb3JtL21hYy10aWdlci9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21h Yy10aWdlci9Ta2lwcGVkCkBAIC03NywzICs3Nyw2IEBAIGluc3BlY3Rvci9jb25zb2xlLWRpcnht bC5odG1sCiBpbnNwZWN0b3IvY29uc29sZS1mb3JtYXQtY29sbGVjdGlvbnMuaHRtbAogaW5zcGVj dG9yL2NvbnNvbGUtZm9ybWF0Lmh0bWwKIGluc3BlY3Rvci9jb25zb2xlLXRlc3RzLmh0bWwKKwor IyBUaGlzIHRlc3QgcmVxdWlyZXMgb2dnIGNvZGVjcworbWVkaWEvbWVkaWEtY2FuLXBsYXktb2dn Lmh0bWwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9Ta2lwcGVkIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQKaW5kZXggYTM2MmU5NC4uNWNhOWM2YiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQKKysrIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL1NraXBwZWQKQEAgLTEwOCwzICsxMDgsNyBAQCBwbHVnaW5zL3JlbG9h ZHBsdWdpbnMtbm8tcGFnZXMuaHRtbAogCiAjIFRoZXNlIHRlc3QgcmVxdWlyZSBRdCBXaWRnZXRz CiBwbHVnaW5zL3F0LXF3aWRnZXQtcGx1Z2luLmh0bWwKKworIyBUaGlzIHRlc3QgcmVxdWlyZXMg b2dnIGNvZGVjcworbWVkaWEvbWVkaWEtY2FuLXBsYXktb2dnLmh0bWwKKwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQtbWFjL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9xdC1tYWMvU2tpcHBlZAppbmRleCBlNjlkZTI5Li40MTQ4Zjg3IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9xdC1tYWMvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9xdC1tYWMvU2tpcHBlZApAQCAtMCwwICsxLDMgQEAKKworIyBUaGlzIHRlc3QgcmVxdWlyZXMg b2dnIGNvZGVjcworbWVkaWEvbWVkaWEtY2FuLXBsYXktb2dnLmh0bWwKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL3F0LXdpbi9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v cXQtd2luL1NraXBwZWQKaW5kZXggZTY5ZGUyOS4uNDE0OGY4NyAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vcXQtd2luL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v cXQtd2luL1NraXBwZWQKQEAgLTAsMCArMSwzIEBACisKKyMgVGhpcyB0ZXN0IHJlcXVpcmVzIG9n ZyBjb2RlY3MKK21lZGlhL21lZGlhLWNhbi1wbGF5LW9nZy5odG1sCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tp cHBlZAppbmRleCA2NDQ1M2NhLi44ZDdiOGI0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKQEAg LTUyODEsMyArNTI4MSw2IEBAIGZhc3QvY3NzL25hbWVzcGFjZXMvbmFtZXNwYWNlcy1lbXB0eS54 bWwKICMgRmFpbHVyZSBpbnRyb2R1Y2VkIGJ5IGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdl c2V0LzUxNDI5CiAjIGhhbWFqaSB3aWxsIGxvb2sgaW50byB0aGlzLgogZWRpdGluZy9zZWxlY3Rp b24vbGFzdC1lbXB0eS1pbmxpbmUuaHRtbAorCisjIFRoaXMgdGVzdCByZXF1aXJlcyBvZ2cgY29k ZWNzCittZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2cuaHRtbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvcGxhdGZvcm0vd2luL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBl ZAppbmRleCBhMTcwNjFiLi5jYTE0OTk5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9y bS93aW4vU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZApAQCAt NzIyLDMgKzcyMiw2IEBAIGluc3BlY3Rvci90aW1lbGluZS1uZXR3b3JrLXJlc291cmNlLmh0bWwK IAogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzIwMzggLSBGbGFr eSBvbiBXaW5kb3dzCiBodHRwL3Rlc3RzL2NhY2hlL3N1YnJlc291cmNlLWZhaWxvdmVyLXRvLW5l dHdvcmsuaHRtbAorCisjIFRoaXMgdGVzdCByZXF1aXJlcyBvZ2cgY29kZWNzCittZWRpYS9tZWRp YS1jYW4tcGxheS1vZ2cuaHRtbAotLSAKMS42LjMuMw== 44240 2009-12-03 07:11:18 -0800 2009-12-03 08:57:49 -0800 advertize audio/ogg correctly and refactored mime-type cache building advertize-audioogg-correctly-and-refactored-mime-t.patch text/plain 13588 pnormand RnJvbSBhOTBhNDljZDk0ZDQ2NWIwY2MxMDhjN2QyNDUzNGYzZWQ5YmQzZjRjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBGcmksIDE2IE9jdCAyMDA5IDE0OjE4OjU1ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g YWR2ZXJ0aXplIGF1ZGlvL29nZyBjb3JyZWN0bHkgYW5kIHJlZmFjdG9yZWQgbWltZS10eXBlIGNh Y2hlIGJ1aWxkaW5nCgotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHwgICAyMCArKysrKwogTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtY2FuLXBs YXktb2dnLWV4cGVjdGVkLnR4dCAgfCAgICA2ICsrCiBMYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1j YW4tcGxheS1vZ2cuaHRtbCAgICAgICAgICB8ICAgMjMgKysrKysKIExheW91dFRlc3RzL3BsYXRm b3JtL21hYy1sZW9wYXJkL1NraXBwZWQgICAgICAgICAgIHwgICAgMyArCiBMYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMtc25vd2xlb3BhcmQvU2tpcHBlZCAgICAgICB8ICAgIDIgKwogTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjLXRpZ2VyL1NraXBwZWQgICAgICAgICAgICAgfCAgICAzICsKIExheW91 dFRlc3RzL3BsYXRmb3JtL21hYy9Ta2lwcGVkICAgICAgICAgICAgICAgICAgIHwgICAgNCArCiBM YXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC1tYWMvU2tpcHBlZCAgICAgICAgICAgICAgICB8ICAgIDMg KwogTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQtd2luL1NraXBwZWQgICAgICAgICAgICAgICAgfCAg ICAzICsKIExheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgICAgICAgICAgICAgICAgICAg IHwgICAgMyArCiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZCAgICAgICAgICAgICAg ICAgICB8ICAgIDMgKwogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgfCAgIDE1ICsrKysKIC4uLi9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyLmNwcCAgIHwgICA4NyArKysrKysrKysrKystLS0tLS0tLQogMTMgZmlsZXMgY2hh bmdlZCwgMTQxIGluc2VydGlvbnMoKyksIDM0IGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAw NjQ0IExheW91dFRlc3RzL21lZGlhL21lZGlhLWNhbi1wbGF5LW9nZy1leHBlY3RlZC50eHQKIGNy ZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2cuaHRt bAoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwppbmRleCA3ZmFlMjlkLi5kMDkzODcyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDkt MTItMDMgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5ldyB0ZXN0IGZvciB2aWRl by5jYW5QbGF5VHlwZSBhbmQgb2dnIGNvbnRhaW5lcnMuCisKKyAgICAgICAgW0dUS10gUmVjb2du aXplIG9nYSBhcyBhdWRpby9vZ2cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTMxOTkwCisKKyAgICAgICAgKiBtZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2ct ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2cu aHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFjLWxlb3BhcmQvU2tpcHBlZDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9tYWMtc25vd2xlb3BhcmQvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9tYWMtdGlnZXIvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2tpcHBlZDoK KyAgICAgICAgKiBwbGF0Zm9ybS9xdC1tYWMvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0Zm9ybS9x dC13aW4vU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9Ta2lwcGVkOgorICAgICAgICAq IHBsYXRmb3JtL3dpbi9Ta2lwcGVkOgorCiAyMDA5LTEyLTAzICBBbmRyYXMgQmVjc2kgIDxhYmVj c2lAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUg Q2hyaXN0aWFuc2VuLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtY2FuLXBs YXktb2dnLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL21lZGlhL21lZGlhLWNhbi1wbGF5LW9n Zy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMThmZjA1 OAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21lZGlhLWNhbi1wbGF5LW9n Zy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw2IEBACitUZXN0IEhUTUxNZWRpYUVsZW1lbnQgY2Fu UGxheVR5cGUoKSBtZXRob2QgZm9yIG9nZyBtZWRpYSBjb250YWluZXJzLgorCitFWFBFQ1RFRCAo dmlkZW8uY2FuUGxheVR5cGUoJ2F1ZGlvL29nZycpID09ICdtYXliZScpIE9LCitFWFBFQ1RFRCAo dmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL29nZycpID09ICdtYXliZScpIE9LCitFTkQgT0YgVEVT VAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2cuaHRt bCBiL0xheW91dFRlc3RzL21lZGlhL21lZGlhLWNhbi1wbGF5LW9nZy5odG1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjI5ZmRhNTUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9tZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2cuaHRtbApAQCAtMCwwICsxLDIzIEBACis8 aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPHN0eWxlPgorICAgICAgICAgICAgdmlkZW8geyBi YWNrZ3JvdW5kLWNvbG9yOiB5ZWxsb3c7IHdpZHRoOiAzMjBweDsgaGVpZ2h0OiAyNDBweDt9Cisg ICAgICAgIDwvc3R5bGU+CisgICAgPC9oZWFkPgorICAgIDxib2R5PgorCisgICAgICAgIDx2aWRl byBjb250cm9scyA+PC92aWRlbz4KKworICAgICAgICA8cD5UZXN0IEhUTUxNZWRpYUVsZW1lbnQg PGVtPmNhblBsYXlUeXBlKCk8L2VtPiBtZXRob2QgZm9yIG9nZyBtZWRpYSBjb250YWluZXJzLjwv cD4KKworICAgICAgICA8c2NyaXB0IHNyYz12aWRlby10ZXN0LmpzPjwvc2NyaXB0PgorICAgICAg ICA8c2NyaXB0PgorICAgICAgICAgICAgdmlkZW8gPSBtZWRpYUVsZW1lbnQgPSBkb2N1bWVudC5n ZXRFbGVtZW50c0J5VGFnTmFtZSgndmlkZW8nKVswXTsKKworICAgICAgICAgICAgdGVzdEV4cGVj dGVkKCJ2aWRlby5jYW5QbGF5VHlwZSgnYXVkaW8vb2dnJykiLCAibWF5YmUiKTsKKyAgICAgICAg ICAgIHRlc3RFeHBlY3RlZCgidmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL29nZycpIiwgIm1heWJl Iik7CisKKyAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9i b2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLWxlb3Bh cmQvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy1sZW9wYXJkL1NraXBwZWQKaW5k ZXggMDViZjlkMy4uYzU4NzdhYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFj LWxlb3BhcmQvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtbGVvcGFyZC9T a2lwcGVkCkBAIC0yNywzICsyNyw2IEBAIG1lZGlhL21lZGlhLWZ1bGxzY3JlZW4tbm90LWluLWRv Y3VtZW50Lmh0bWwKIAogIyBUZXN0cyBvZiBhY2Nlc3NpYmlsaXR5IGZ1bmN0aW9uYWxpdHkgbm90 IHN1cHBvcnRlZCBvbiBMZW9wYXJkCiBhY2Nlc3NpYmlsaXR5L2FyaWEtbGlzdC1hbmQtbGlzdGl0 ZW0uaHRtbAorCisjIFRoaXMgdGVzdCByZXF1aXJlcyBvZ2cgY29kZWNzCittZWRpYS9tZWRpYS1j YW4tcGxheS1vZ2cuaHRtbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXNu b3dsZW9wYXJkL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtc25vd2xlb3BhcmQv U2tpcHBlZAppbmRleCAwNmRkZjFmLi45YmEyYjQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMtc25vd2xlb3BhcmQvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMtc25vd2xlb3BhcmQvU2tpcHBlZApAQCAtNDksMyArNDksNSBAQCBzdmcvY3NzL2dseXBo LW9yaWVudGF0aW9uLXJvdW5kaW5nLXRlc3QueGh0bWwKICMgdGhyb3duCiBwbHVnaW5zL25ldHNj YXBlLWludm9rZS1mYWlsdXJlLmh0bWwKIAorIyBUaGlzIHRlc3QgcmVxdWlyZXMgb2dnIGNvZGVj cworbWVkaWEvbWVkaWEtY2FuLXBsYXktb2dnLmh0bWwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L3BsYXRmb3JtL21hYy10aWdlci9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXRp Z2VyL1NraXBwZWQKaW5kZXggMWRkN2E4OC4uNTFmZmIxMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjLXRpZ2VyL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjLXRpZ2VyL1NraXBwZWQKQEAgLTc3LDMgKzc3LDYgQEAgaW5zcGVjdG9yL2NvbnNvbGUtZGly eG1sLmh0bWwKIGluc3BlY3Rvci9jb25zb2xlLWZvcm1hdC1jb2xsZWN0aW9ucy5odG1sCiBpbnNw ZWN0b3IvY29uc29sZS1mb3JtYXQuaHRtbAogaW5zcGVjdG9yL2NvbnNvbGUtdGVzdHMuaHRtbAor CisjIFRoaXMgdGVzdCByZXF1aXJlcyBvZ2cgY29kZWNzCittZWRpYS9tZWRpYS1jYW4tcGxheS1v Z2cuaHRtbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQgYi9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZAppbmRleCBhMzYyZTk0Li41Y2E5YzZiIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZAorKysgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZApAQCAtMTA4LDMgKzEwOCw3IEBAIHBsdWdpbnMvcmVs b2FkcGx1Z2lucy1uby1wYWdlcy5odG1sCiAKICMgVGhlc2UgdGVzdCByZXF1aXJlIFF0IFdpZGdl dHMKIHBsdWdpbnMvcXQtcXdpZGdldC1wbHVnaW4uaHRtbAorCisjIFRoaXMgdGVzdCByZXF1aXJl cyBvZ2cgY29kZWNzCittZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2cuaHRtbAorCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC1tYWMvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRm b3JtL3F0LW1hYy9Ta2lwcGVkCmluZGV4IGU2OWRlMjkuLjQxNDhmODcgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL3F0LW1hYy9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRm b3JtL3F0LW1hYy9Ta2lwcGVkCkBAIC0wLDAgKzEsMyBAQAorCisjIFRoaXMgdGVzdCByZXF1aXJl cyBvZ2cgY29kZWNzCittZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2cuaHRtbApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQtd2luL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9xdC13aW4vU2tpcHBlZAppbmRleCBlNjlkZTI5Li40MTQ4Zjg3IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9xdC13aW4vU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9xdC13aW4vU2tpcHBlZApAQCAtMCwwICsxLDMgQEAKKworIyBUaGlzIHRlc3QgcmVxdWlyZXMg b2dnIGNvZGVjcworbWVkaWEvbWVkaWEtY2FuLXBsYXktb2dnLmh0bWwKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9T a2lwcGVkCmluZGV4IDIzNWQyZWYuLjAxMWE4OTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL3F0L1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZApA QCAtNTE3MywzICs1MTczLDYgQEAgaHR0cC90ZXN0cy9zZWN1cml0eS9kYXRhVVJML3hzcy1ERU5J RUQtZnJvbS1kYXRhLXVybC1pbi1mb3JlaWduLWRvbWFpbi13aW5kb3ctb3AKIGh0dHAvdGVzdHMv c2VjdXJpdHkvZGF0YVVSTC94c3MtREVOSUVELWZyb20tamF2YXNjcmlwdC11cmwtd2luZG93LW9w ZW4uaHRtbAogaHR0cC90ZXN0cy9zZWN1cml0eS9qYXZhc2NyaXB0VVJML3hzcy1BTExPV0VELWZy b20tamF2YXNjcmlwdC11cmwtd2luZG93LW9wZW4uaHRtbAogaHR0cC90ZXN0cy9zZWN1cml0eS9q YXZhc2NyaXB0VVJML3hzcy1ERU5JRUQtZnJvbS1qYXZhc2NyaXB0LXVybC1pbi1mb3JlaWduLWRv bWFpbi13aW5kb3ctb3Blbi5odG1sCisKKyMgVGhpcyB0ZXN0IHJlcXVpcmVzIG9nZyBjb2RlY3MK K21lZGlhL21lZGlhLWNhbi1wbGF5LW9nZy5odG1sCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS93aW4vU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lwcGVkCmlu ZGV4IGExNzA2MWIuLmNhMTQ5OTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dp bi9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lwcGVkCkBAIC03MjIs MyArNzIyLDYgQEAgaW5zcGVjdG9yL3RpbWVsaW5lLW5ldHdvcmstcmVzb3VyY2UuaHRtbAogCiAj IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjAzOCAtIEZsYWt5IG9u IFdpbmRvd3MKIGh0dHAvdGVzdHMvY2FjaGUvc3VicmVzb3VyY2UtZmFpbG92ZXItdG8tbmV0d29y ay5odG1sCisKKyMgVGhpcyB0ZXN0IHJlcXVpcmVzIG9nZyBjb2RlY3MKK21lZGlhL21lZGlhLWNh bi1wbGF5LW9nZy5odG1sCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IDg3NWM2ZTQuLjIyODY3NGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMDktMTIt MDMgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkdmVydGl6ZSBhdWRpby9vZ2cg Y29ycmVjdGx5IGFuZCByZWZhY3RvcmVkIG1pbWUtdHlwZSBjYWNoZQorICAgICAgICBidWlsZGlu Zy4KKworICAgICAgICBbR1RLXSBSZWNvZ25pemUgb2dhIGFzIGF1ZGlvL29nZworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE5OTAKKworICAgICAgICBU ZXN0OiBtZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2cuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjptaW1lVHlwZUNhY2hlKToKKwogMjAwOS0xMi0wMyAgUmFmYWVsIEFudG9nbm9sbGkg IDxhbnRvZ25vbGxpQHByb2Z1c2lvbi5tb2JpPiwgS2VubmV0aCBDaHJpc3RpYW5zZW4gPGtlbm5l dGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCA5MmRlMzkyLi4zZWVhNTlkIDEwMDY0NAotLS0gYS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIu Y3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHAKQEAgLTc3Nyw1NiArNzc3LDc1IEBAIHN0YXRpYyBIYXNoU2V0PFN0cmlu Zz4gbWltZVR5cGVDYWNoZSgpCiAgICAgICAgICAgICBHc3RUeXBlRmluZEZhY3RvcnkqIGZhY3Rv cnkgPSBHU1RfVFlQRV9GSU5EX0ZBQ1RPUlkoaXRlcmF0b3ItPmRhdGEpOwogICAgICAgICAgICAg R3N0Q2FwcyogY2FwcyA9IGdzdF90eXBlX2ZpbmRfZmFjdG9yeV9nZXRfY2FwcyhmYWN0b3J5KTsK IAotICAgICAgICAgICAgLy8gU3BsaXR0aW5nIHRoZSBjYXBhYmlsaXR5IGJ5IGNvbW1hIGFuZCB0 YWtpbmcgdGhlIGZpcnN0IHBhcnQKLSAgICAgICAgICAgIC8vIGFzIGNhcGFiaWxpdHkgY2FuIGJl IHNvbWV0aGluZyBsaWtlICJhdWRpby94LXdhdnBhY2ssIGZyYW1lZD0oYm9vbGVhbilmYWxzZSIK LSAgICAgICAgICAgIEdPd25QdHI8Z2NoYXI+IGNhcGFiaWxpdHlTdHJpbmcoZ3N0X2NhcHNfdG9f c3RyaW5nKGNhcHMpKTsKLSAgICAgICAgICAgIGdjaGFyKiogY2FwYWJpbGl0eSA9IGdfc3Ryc3Bs aXQoY2FwYWJpbGl0eVN0cmluZy5nZXQoKSwgIiwiLCAyKTsKLSAgICAgICAgICAgIGdjaGFyKiog bWltZXR5cGUgPSBnX3N0cnNwbGl0KGNhcGFiaWxpdHlbMF0sICIvIiwgMik7Ci0KLSAgICAgICAg ICAgIC8vIEdTdHJlYW1lciBwbHVnaW5zIGNhbiBiZSBjYXBhYmxlIG9mIHN1cHBvcnRpbmcgdHlw ZXMgd2hpY2ggV2ViS2l0IHN1cHBvcnRzCi0gICAgICAgICAgICAvLyBieSBkZWZhdWx0LiBJbiB0 aGF0IGNhc2UsIHdlIHNob3VsZCBub3QgY29uc2lkZXIgdGhlc2UgdHlwZXMgc3VwcG9ydGFibGUg YnkgR1N0cmVhbWVyLgotICAgICAgICAgICAgLy8gRXhhbXBsZXMgb2Ygd2hhdCBHU3RyZWFtZXIg Y2FuIHN1cHBvcnQgYnV0IHNob3VsZCBub3QgYmUgYWRkZWQ6Ci0gICAgICAgICAgICAvLyB0ZXh0 L3BsYWluLCB0ZXh0L2h0bWwsIGltYWdlL2pwZWcsIGFwcGxpY2F0aW9uL3htbAotICAgICAgICAg ICAgaWYgKGdfc3RyX2VxdWFsKG1pbWV0eXBlWzBdLCAiYXVkaW8iKQotICAgICAgICAgICAgICAg IHx8IGdfc3RyX2VxdWFsKG1pbWV0eXBlWzBdLCAidmlkZW8iKQotICAgICAgICAgICAgICAgIHx8 IChnX3N0cl9lcXVhbChtaW1ldHlwZVswXSwgImFwcGxpY2F0aW9uIikKLSAgICAgICAgICAgICAg ICAgICAgJiYgIWlnbm9yZWRBcHBsaWNhdGlvblN1YnR5cGVzLmNvbnRhaW5zKFN0cmluZyhtaW1l dHlwZVsxXSkpKSkgewotICAgICAgICAgICAgICAgIGNhY2hlLmFkZChTdHJpbmcoY2FwYWJpbGl0 eVswXSkpOwotCi0gICAgICAgICAgICAgICAgLy8gVGhlc2UgZm9ybWF0cyBhcmUgc3VwcG9ydGVk IGJ5IEdTdHJlYW1lciwgYnV0IG5vdCBjb3JyZWN0bHkgYWR2ZXJ0aXNlZAotICAgICAgICAgICAg ICAgIGlmIChnX3N0cl9lcXVhbChjYXBhYmlsaXR5WzBdLCAidmlkZW8veC1oMjY0IikKLSAgICAg ICAgICAgICAgICAgICAgfHwgZ19zdHJfZXF1YWwoY2FwYWJpbGl0eVswXSwgImF1ZGlvL3gtbTRh IikpIHsKKyAgICAgICAgICAgIGlmICghY2FwcykKKyAgICAgICAgICAgICAgICBjb250aW51ZTsK KworICAgICAgICAgICAgZm9yIChndWludCBzdHJ1Y3R1cmVJbmRleCA9IDA7IHN0cnVjdHVyZUlu ZGV4IDwgZ3N0X2NhcHNfZ2V0X3NpemUoY2Fwcyk7IHN0cnVjdHVyZUluZGV4KyspIHsKKyAgICAg ICAgICAgICAgICBHc3RTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IGdzdF9jYXBzX2dldF9zdHJ1Y3R1 cmUoY2Fwcywgc3RydWN0dXJlSW5kZXgpOworICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyKiBu YW1lID0gZ3N0X3N0cnVjdHVyZV9nZXRfbmFtZShzdHJ1Y3R1cmUpOworICAgICAgICAgICAgICAg IGJvb2wgY2FjaGVkID0gZmFsc2U7CisKKyAgICAgICAgICAgICAgICAvLyBUaGVzZSBmb3JtYXRz IGFyZSBzdXBwb3J0ZWQgYnkgR1N0cmVhbWVyLCBidXQgbm90CisgICAgICAgICAgICAgICAgLy8g Y29ycmVjdGx5IGFkdmVydGlzZWQuCisgICAgICAgICAgICAgICAgaWYgKGdfc3RyX2VxdWFsKG5h bWUsICJ2aWRlby94LWgyNjQiKQorICAgICAgICAgICAgICAgICAgICB8fCBnX3N0cl9lcXVhbChu YW1lLCAiYXVkaW8veC1tNGEiKSkgewogICAgICAgICAgICAgICAgICAgICBjYWNoZS5hZGQoU3Ry aW5nKCJ2aWRlby9tcDQiKSk7CiAgICAgICAgICAgICAgICAgICAgIGNhY2hlLmFkZChTdHJpbmco ImF1ZGlvL2FhYyIpKTsKKyAgICAgICAgICAgICAgICAgICAgY2FjaGVkID0gdHJ1ZTsKICAgICAg ICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAgICBpZiAoZ19zdHJfZXF1YWwoY2FwYWJpbGl0 eVswXSwgInZpZGVvL3gtdGhlb3JhIikpCisgICAgICAgICAgICAgICAgaWYgKGdfc3RyX2VxdWFs KG5hbWUsICJ2aWRlby94LXRoZW9yYSIpKSB7CiAgICAgICAgICAgICAgICAgICAgIGNhY2hlLmFk ZChTdHJpbmcoInZpZGVvL29nZyIpKTsKKyAgICAgICAgICAgICAgICAgICAgY2FjaGVkID0gdHJ1 ZTsKKyAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAgICBpZiAoZ19zdHJfZXF1YWwo Y2FwYWJpbGl0eVswXSwgImF1ZGlvL3gtd2F2IikpCi0gICAgICAgICAgICAgICAgICAgIGNhY2hl LmFkZChTdHJpbmcoImF1ZGlvL3dhdiIpKTsKKyAgICAgICAgICAgICAgICBpZiAoZ19zdHJfZXF1 YWwobmFtZSwgImF1ZGlvL3gtdm9yYmlzIikpIHsKKyAgICAgICAgICAgICAgICAgICAgY2FjaGUu YWRkKFN0cmluZygiYXVkaW8vb2dnIikpOworICAgICAgICAgICAgICAgICAgICBjYWNoZWQgPSB0 cnVlOworICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgIGlmIChnX3N0cl9lcXVh bChjYXBhYmlsaXR5WzBdLCAiYXVkaW8vbXBlZyIpKSB7Ci0gICAgICAgICAgICAgICAgICAgIC8v IFRoaXMgaXMgd2hhdCB3ZSBhcmUgaGFuZGxpbmc6IG1wZWd2ZXJzaW9uPShpbnQpMSwgbGF5ZXI9 KGludClbIDEsIDMgXQotICAgICAgICAgICAgICAgICAgICBnY2hhcioqIHZlcnNpb25BbmRMYXll ciA9IGdfc3Ryc3BsaXQoY2FwYWJpbGl0eVsxXSwgIiwiLCAyKTsKKyAgICAgICAgICAgICAgICBp ZiAoZ19zdHJfZXF1YWwobmFtZSwgImF1ZGlvL3gtd2F2IikpIHsKKyAgICAgICAgICAgICAgICAg ICAgY2FjaGUuYWRkKFN0cmluZygiYXVkaW8vd2F2IikpOworICAgICAgICAgICAgICAgICAgICBj YWNoZWQgPSB0cnVlOworICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgICAgICBp ZiAoZ19zdHJfaGFzX3N1ZmZpeCh2ZXJzaW9uQW5kTGF5ZXJbMF0sICIoaW50KTEiKSkgewotICAg ICAgICAgICAgICAgICAgICAgICAgZm9yIChpbnQgaSA9IDA7IHZlcnNpb25BbmRMYXllclsxXVtp XSAhPSAnXDAnOyBpKyspIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAodmVyc2lv bkFuZExheWVyWzFdW2ldID09ICcxJykKKyAgICAgICAgICAgICAgICBpZiAoZ19zdHJfZXF1YWwo bmFtZSwgImF1ZGlvL21wZWciKSkgeworICAgICAgICAgICAgICAgICAgICAvLyBUaGlzIGlzIHdo YXQgd2UgYXJlIGhhbmRsaW5nOgorICAgICAgICAgICAgICAgICAgICAvLyBtcGVndmVyc2lvbj0o aW50KTEsIGxheWVyPShpbnQpWyAxLCAzIF0KKyAgICAgICAgICAgICAgICAgICAgZ2ludCBtcGVn VmVyc2lvbiA9IDA7CisgICAgICAgICAgICAgICAgICAgIGlmIChnc3Rfc3RydWN0dXJlX2dldF9p bnQoc3RydWN0dXJlLCAibXBlZ3ZlcnNpb24iLCAmbXBlZ1ZlcnNpb24pICYmIChtcGVnVmVyc2lv biA9PSAxKSkgeworICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgR1ZhbHVlKiBsYXllciA9 IGdzdF9zdHJ1Y3R1cmVfZ2V0X3ZhbHVlKHN0cnVjdHVyZSwgImxheWVyIik7CisgICAgICAgICAg ICAgICAgICAgICAgICBpZiAoR19WQUxVRV9UWVBFKGxheWVyKSA9PSBHU1RfVFlQRV9JTlRfUkFO R0UpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBnaW50IG1pbkxheWVyID0gZ3N0X3Zh bHVlX2dldF9pbnRfcmFuZ2VfbWluKGxheWVyKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICBnaW50IG1heExheWVyID0gZ3N0X3ZhbHVlX2dldF9pbnRfcmFuZ2VfbWF4KGxheWVyKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAobWluTGF5ZXIgPD0gMSA8PSBtYXhMYXllcikK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FjaGUuYWRkKFN0cmluZygiYXVkaW8v bXAxIikpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UgaWYgKHZlcnNpb25BbmRM YXllclsxXVtpXSA9PSAnMicpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG1pbkxh eWVyIDw9IDIgPD0gbWF4TGF5ZXIpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNh Y2hlLmFkZChTdHJpbmcoImF1ZGlvL21wMiIpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICBlbHNlIGlmICh2ZXJzaW9uQW5kTGF5ZXJbMV1baV0gPT0gJzMnKQorICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGlmIChtaW5MYXllciA8PSAzIDw9IG1heExheWVyKQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjYWNoZS5hZGQoU3RyaW5nKCJhdWRpby9tcDMiKSk7CiAgICAg ICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg ICAgICB9CiAKLSAgICAgICAgICAgICAgICAgICAgZ19zdHJmcmVldih2ZXJzaW9uQW5kTGF5ZXIp OworICAgICAgICAgICAgICAgIGlmICghY2FjaGVkKSB7CisgICAgICAgICAgICAgICAgICAgIC8v IEdTdHJlYW1lciBwbHVnaW5zIGNhbiBiZSBjYXBhYmxlIG9mIHN1cHBvcnRpbmcKKyAgICAgICAg ICAgICAgICAgICAgLy8gdHlwZXMgd2hpY2ggV2ViS2l0IHN1cHBvcnRzIGJ5IGRlZmF1bHQuIElu IHRoYXQKKyAgICAgICAgICAgICAgICAgICAgLy8gY2FzZSwgd2Ugc2hvdWxkIG5vdCBjb25zaWRl ciB0aGVzZSB0eXBlcworICAgICAgICAgICAgICAgICAgICAvLyBzdXBwb3J0YWJsZSBieSBHU3Ry ZWFtZXIuICBFeGFtcGxlcyBvZiB3aGF0CisgICAgICAgICAgICAgICAgICAgIC8vIEdTdHJlYW1l ciBjYW4gc3VwcG9ydCBidXQgc2hvdWxkIG5vdCBiZSBhZGRlZDoKKyAgICAgICAgICAgICAgICAg ICAgLy8gdGV4dC9wbGFpbiwgdGV4dC9odG1sLCBpbWFnZS9qcGVnLAorICAgICAgICAgICAgICAg ICAgICAvLyBhcHBsaWNhdGlvbi94bWwKKyAgICAgICAgICAgICAgICAgICAgZ2NoYXIqKiBtaW1l dHlwZSA9IGdfc3Ryc3BsaXQobmFtZSwgIi8iLCAyKTsKKyAgICAgICAgICAgICAgICAgICAgaWYg KGdfc3RyX2VxdWFsKG1pbWV0eXBlWzBdLCAiYXVkaW8iKQorICAgICAgICAgICAgICAgICAgICAg ICAgfHwgZ19zdHJfZXF1YWwobWltZXR5cGVbMF0sICJ2aWRlbyIpCisgICAgICAgICAgICAgICAg ICAgICAgICB8fCAoZ19zdHJfZXF1YWwobWltZXR5cGVbMF0sICJhcHBsaWNhdGlvbiIpCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJiYgIWlnbm9yZWRBcHBsaWNhdGlvblN1YnR5cGVzLmNv bnRhaW5zKFN0cmluZyhtaW1ldHlwZVsxXSkpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGNh Y2hlLmFkZChTdHJpbmcobmFtZSkpOworCisgICAgICAgICAgICAgICAgICAgIGdfc3RyZnJlZXYo bWltZXR5cGUpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KLQotICAgICAgICAg ICAgZ19zdHJmcmVldihjYXBhYmlsaXR5KTsKLSAgICAgICAgICAgIGdfc3RyZnJlZXYobWltZXR5 cGUpOwogICAgICAgICB9CiAKICAgICAgICAgZ3N0X3BsdWdpbl9mZWF0dXJlX2xpc3RfZnJlZShm YWN0b3JpZXMpOwotLSAKMS42LjMuMw== 44246 2009-12-03 08:57:49 -0800 2009-12-03 13:37:59 -0800 advertize audio/ogg correctly and refactored mime-type cache building advertize-audioogg-correctly-and-refactored-mime-t.patch text/plain 13671 pnormand RnJvbSA1ZTc3OTU2NWM2NzM1YjdlZjg4YWU1NWY0M2ZiYTFlODU2Mjc2MTFlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBGcmksIDE2IE9jdCAyMDA5IDE0OjE4OjU1ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g YWR2ZXJ0aXplIGF1ZGlvL29nZyBjb3JyZWN0bHkgYW5kIHJlZmFjdG9yZWQgbWltZS10eXBlIGNh Y2hlIGJ1aWxkaW5nCgotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHwgICAyMCArKysrKwogTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtY2FuLXBs YXktb2dnLWV4cGVjdGVkLnR4dCAgfCAgICA2ICsrCiBMYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1j YW4tcGxheS1vZ2cuaHRtbCAgICAgICAgICB8ICAgMjMgKysrKysKIExheW91dFRlc3RzL3BsYXRm b3JtL21hYy1sZW9wYXJkL1NraXBwZWQgICAgICAgICAgIHwgICAgMyArCiBMYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMtc25vd2xlb3BhcmQvU2tpcHBlZCAgICAgICB8ICAgIDIgKwogTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjLXRpZ2VyL1NraXBwZWQgICAgICAgICAgICAgfCAgICAzICsKIExheW91 dFRlc3RzL3BsYXRmb3JtL21hYy9Ta2lwcGVkICAgICAgICAgICAgICAgICAgIHwgICAgNCArCiBM YXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC1tYWMvU2tpcHBlZCAgICAgICAgICAgICAgICB8ICAgIDMg KwogTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQtd2luL1NraXBwZWQgICAgICAgICAgICAgICAgfCAg ICAzICsKIExheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgICAgICAgICAgICAgICAgICAg IHwgICAgMyArCiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZCAgICAgICAgICAgICAg ICAgICB8ICAgIDMgKwogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgfCAgIDE1ICsrKwogLi4uL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuY3BwICAgfCAgIDkwICsrKysrKysrKysrKy0tLS0tLS0tCiAxMyBmaWxlcyBjaGFu Z2VkLCAxNDQgaW5zZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2 NDQgTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtY2FuLXBsYXktb2dnLWV4cGVjdGVkLnR4dAogY3Jl YXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL21lZGlhL21lZGlhLWNhbi1wbGF5LW9nZy5odG1s CgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCmluZGV4IDdmYWUyOWQuLmQwOTM4NzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAwOS0x Mi0wMyAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmV3IHRlc3QgZm9yIHZpZGVv LmNhblBsYXlUeXBlIGFuZCBvZ2cgY29udGFpbmVycy4KKworICAgICAgICBbR1RLXSBSZWNvZ25p emUgb2dhIGFzIGF1ZGlvL29nZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzE5OTAKKworICAgICAgICAqIG1lZGlhL21lZGlhLWNhbi1wbGF5LW9nZy1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL21lZGlhLWNhbi1wbGF5LW9nZy5o dG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMtbGVvcGFyZC9Ta2lwcGVkOgorICAg ICAgICAqIHBsYXRmb3JtL21hYy1zbm93bGVvcGFyZC9Ta2lwcGVkOgorICAgICAgICAqIHBsYXRm b3JtL21hYy10aWdlci9Ta2lwcGVkOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9Ta2lwcGVkOgor ICAgICAgICAqIHBsYXRmb3JtL3F0LW1hYy9Ta2lwcGVkOgorICAgICAgICAqIHBsYXRmb3JtL3F0 LXdpbi9Ta2lwcGVkOgorICAgICAgICAqIHBsYXRmb3JtL3F0L1NraXBwZWQ6CisgICAgICAgICog cGxhdGZvcm0vd2luL1NraXBwZWQ6CisKIDIwMDktMTItMDMgIEFuZHJhcyBCZWNzaSAgPGFiZWNz aUBpbmYudS1zemVnZWQuaHU+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBD aHJpc3RpYW5zZW4uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1jYW4tcGxh eS1vZ2ctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtY2FuLXBsYXktb2dn LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xOGZmMDU4 Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtY2FuLXBsYXktb2dn LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDYgQEAKK1Rlc3QgSFRNTE1lZGlhRWxlbWVudCBjYW5Q bGF5VHlwZSgpIG1ldGhvZCBmb3Igb2dnIG1lZGlhIGNvbnRhaW5lcnMuCisKK0VYUEVDVEVEICh2 aWRlby5jYW5QbGF5VHlwZSgnYXVkaW8vb2dnJykgPT0gJ21heWJlJykgT0sKK0VYUEVDVEVEICh2 aWRlby5jYW5QbGF5VHlwZSgndmlkZW8vb2dnJykgPT0gJ21heWJlJykgT0sKK0VORCBPRiBURVNU CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21lZGlhLWNhbi1wbGF5LW9nZy5odG1s IGIvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtY2FuLXBsYXktb2dnLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjlmZGE1NQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL21lZGlhL21lZGlhLWNhbi1wbGF5LW9nZy5odG1sCkBAIC0wLDAgKzEsMjMgQEAKKzxo dG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c3R5bGU+CisgICAgICAgICAgICB2aWRlbyB7IGJh Y2tncm91bmQtY29sb3I6IHllbGxvdzsgd2lkdGg6IDMyMHB4OyBoZWlnaHQ6IDI0MHB4O30KKyAg ICAgICAgPC9zdHlsZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+CisKKyAgICAgICAgPHZpZGVv IGNvbnRyb2xzID48L3ZpZGVvPgorCisgICAgICAgIDxwPlRlc3QgSFRNTE1lZGlhRWxlbWVudCA8 ZW0+Y2FuUGxheVR5cGUoKTwvZW0+IG1ldGhvZCBmb3Igb2dnIG1lZGlhIGNvbnRhaW5lcnMuPC9w PgorCisgICAgICAgIDxzY3JpcHQgc3JjPXZpZGVvLXRlc3QuanM+PC9zY3JpcHQ+CisgICAgICAg IDxzY3JpcHQ+CisgICAgICAgICAgICB2aWRlbyA9IG1lZGlhRWxlbWVudCA9IGRvY3VtZW50Lmdl dEVsZW1lbnRzQnlUYWdOYW1lKCd2aWRlbycpWzBdOworCisgICAgICAgICAgICB0ZXN0RXhwZWN0 ZWQoInZpZGVvLmNhblBsYXlUeXBlKCdhdWRpby9vZ2cnKSIsICJtYXliZSIpOworICAgICAgICAg ICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jYW5QbGF5VHlwZSgndmlkZW8vb2dnJykiLCAibWF5YmUi KTsKKworICAgICAgICAgICAgZW5kVGVzdCgpOworICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2Jv ZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtbGVvcGFy ZC9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLWxlb3BhcmQvU2tpcHBlZAppbmRl eCAwNWJmOWQzLi5jNTg3N2FhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMt bGVvcGFyZC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy1sZW9wYXJkL1Nr aXBwZWQKQEAgLTI3LDMgKzI3LDYgQEAgbWVkaWEvbWVkaWEtZnVsbHNjcmVlbi1ub3QtaW4tZG9j dW1lbnQuaHRtbAogCiAjIFRlc3RzIG9mIGFjY2Vzc2liaWxpdHkgZnVuY3Rpb25hbGl0eSBub3Qg c3VwcG9ydGVkIG9uIExlb3BhcmQKIGFjY2Vzc2liaWxpdHkvYXJpYS1saXN0LWFuZC1saXN0aXRl bS5odG1sCisKKyMgVGhpcyB0ZXN0IHJlcXVpcmVzIG9nZyBjb2RlY3MKK21lZGlhL21lZGlhLWNh bi1wbGF5LW9nZy5odG1sCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtc25v d2xlb3BhcmQvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy1zbm93bGVvcGFyZC9T a2lwcGVkCmluZGV4IDA2ZGRmMWYuLjliYTJiNDAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL21hYy1zbm93bGVvcGFyZC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L21hYy1zbm93bGVvcGFyZC9Ta2lwcGVkCkBAIC00OSwzICs0OSw1IEBAIHN2Zy9jc3MvZ2x5cGgt b3JpZW50YXRpb24tcm91bmRpbmctdGVzdC54aHRtbAogIyB0aHJvd24KIHBsdWdpbnMvbmV0c2Nh cGUtaW52b2tlLWZhaWx1cmUuaHRtbAogCisjIFRoaXMgdGVzdCByZXF1aXJlcyBvZ2cgY29kZWNz CittZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2cuaHRtbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vbWFjLXRpZ2VyL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtdGln ZXIvU2tpcHBlZAppbmRleCAxZGQ3YTg4Li41MWZmYjEzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMtdGlnZXIvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMtdGlnZXIvU2tpcHBlZApAQCAtNzcsMyArNzcsNiBAQCBpbnNwZWN0b3IvY29uc29sZS1kaXJ4 bWwuaHRtbAogaW5zcGVjdG9yL2NvbnNvbGUtZm9ybWF0LWNvbGxlY3Rpb25zLmh0bWwKIGluc3Bl Y3Rvci9jb25zb2xlLWZvcm1hdC5odG1sCiBpbnNwZWN0b3IvY29uc29sZS10ZXN0cy5odG1sCisK KyMgVGhpcyB0ZXN0IHJlcXVpcmVzIG9nZyBjb2RlY3MKK21lZGlhL21lZGlhLWNhbi1wbGF5LW9n Zy5odG1sCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZCBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL21hYy9Ta2lwcGVkCmluZGV4IGEzNjJlOTQuLjVjYTljNmIgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9Ta2lwcGVkCisrKyBiL0xheW91dFRl c3RzL3BsYXRmb3JtL21hYy9Ta2lwcGVkCkBAIC0xMDgsMyArMTA4LDcgQEAgcGx1Z2lucy9yZWxv YWRwbHVnaW5zLW5vLXBhZ2VzLmh0bWwKIAogIyBUaGVzZSB0ZXN0IHJlcXVpcmUgUXQgV2lkZ2V0 cwogcGx1Z2lucy9xdC1xd2lkZ2V0LXBsdWdpbi5odG1sCisKKyMgVGhpcyB0ZXN0IHJlcXVpcmVz IG9nZyBjb2RlY3MKK21lZGlhL21lZGlhLWNhbi1wbGF5LW9nZy5odG1sCisKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL3BsYXRmb3JtL3F0LW1hYy9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vcXQtbWFjL1NraXBwZWQKaW5kZXggZTY5ZGUyOS4uNDE0OGY4NyAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vcXQtbWFjL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vcXQtbWFjL1NraXBwZWQKQEAgLTAsMCArMSwzIEBACisKKyMgVGhpcyB0ZXN0IHJlcXVpcmVz IG9nZyBjb2RlY3MKK21lZGlhL21lZGlhLWNhbi1wbGF5LW9nZy5odG1sCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC13aW4vU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L3F0LXdpbi9Ta2lwcGVkCmluZGV4IGU2OWRlMjkuLjQxNDhmODcgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL3BsYXRmb3JtL3F0LXdpbi9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L3F0LXdpbi9Ta2lwcGVkCkBAIC0wLDAgKzEsMyBAQAorCisjIFRoaXMgdGVzdCByZXF1aXJlcyBv Z2cgY29kZWNzCittZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2cuaHRtbApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1Nr aXBwZWQKaW5kZXggMjM1ZDJlZi4uMDExYTg5MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxh dGZvcm0vcXQvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCkBA IC01MTczLDMgKzUxNzMsNiBAQCBodHRwL3Rlc3RzL3NlY3VyaXR5L2RhdGFVUkwveHNzLURFTklF RC1mcm9tLWRhdGEtdXJsLWluLWZvcmVpZ24tZG9tYWluLXdpbmRvdy1vcAogaHR0cC90ZXN0cy9z ZWN1cml0eS9kYXRhVVJML3hzcy1ERU5JRUQtZnJvbS1qYXZhc2NyaXB0LXVybC13aW5kb3ctb3Bl bi5odG1sCiBodHRwL3Rlc3RzL3NlY3VyaXR5L2phdmFzY3JpcHRVUkwveHNzLUFMTE9XRUQtZnJv bS1qYXZhc2NyaXB0LXVybC13aW5kb3ctb3Blbi5odG1sCiBodHRwL3Rlc3RzL3NlY3VyaXR5L2ph dmFzY3JpcHRVUkwveHNzLURFTklFRC1mcm9tLWphdmFzY3JpcHQtdXJsLWluLWZvcmVpZ24tZG9t YWluLXdpbmRvdy1vcGVuLmh0bWwKKworIyBUaGlzIHRlc3QgcmVxdWlyZXMgb2dnIGNvZGVjcwor bWVkaWEvbWVkaWEtY2FuLXBsYXktb2dnLmh0bWwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL3dpbi9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL1NraXBwZWQKaW5k ZXggYTE3MDYxYi4uY2ExNDk5OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2lu L1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL1NraXBwZWQKQEAgLTcyMiwz ICs3MjIsNiBAQCBpbnNwZWN0b3IvdGltZWxpbmUtbmV0d29yay1yZXNvdXJjZS5odG1sCiAKICMg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyMDM4IC0gRmxha3kgb24g V2luZG93cwogaHR0cC90ZXN0cy9jYWNoZS9zdWJyZXNvdXJjZS1mYWlsb3Zlci10by1uZXR3b3Jr Lmh0bWwKKworIyBUaGlzIHRlc3QgcmVxdWlyZXMgb2dnIGNvZGVjcworbWVkaWEvbWVkaWEtY2Fu LXBsYXktb2dnLmh0bWwKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggODc1YzZlNC4uMjI4Njc0ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0xMi0w MyAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWR2ZXJ0aXplIGF1ZGlvL29nZyBj b3JyZWN0bHkgYW5kIHJlZmFjdG9yZWQgbWltZS10eXBlIGNhY2hlCisgICAgICAgIGJ1aWxkaW5n LgorCisgICAgICAgIFtHVEtdIFJlY29nbml6ZSBvZ2EgYXMgYXVkaW8vb2dnCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTk5MAorCisgICAgICAgIFRl c3Q6IG1lZGlhL21lZGlhLWNhbi1wbGF5LW9nZy5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Om1pbWVUeXBlQ2FjaGUpOgorCiAyMDA5LTEyLTAzICBSYWZhZWwgQW50b2dub2xsaSAg PGFudG9nbm9sbGlAcHJvZnVzaW9uLm1vYmk+LCBLZW5uZXRoIENocmlzdGlhbnNlbiA8a2VubmV0 aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IDkyZGUzOTIuLmQzMGM5NDIgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5j cHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyLmNwcApAQCAtNzc3LDU2ICs3NzcsNzggQEAgc3RhdGljIEhhc2hTZXQ8U3RyaW5n PiBtaW1lVHlwZUNhY2hlKCkKICAgICAgICAgICAgIEdzdFR5cGVGaW5kRmFjdG9yeSogZmFjdG9y eSA9IEdTVF9UWVBFX0ZJTkRfRkFDVE9SWShpdGVyYXRvci0+ZGF0YSk7CiAgICAgICAgICAgICBH c3RDYXBzKiBjYXBzID0gZ3N0X3R5cGVfZmluZF9mYWN0b3J5X2dldF9jYXBzKGZhY3RvcnkpOwog Ci0gICAgICAgICAgICAvLyBTcGxpdHRpbmcgdGhlIGNhcGFiaWxpdHkgYnkgY29tbWEgYW5kIHRh a2luZyB0aGUgZmlyc3QgcGFydAotICAgICAgICAgICAgLy8gYXMgY2FwYWJpbGl0eSBjYW4gYmUg c29tZXRoaW5nIGxpa2UgImF1ZGlvL3gtd2F2cGFjaywgZnJhbWVkPShib29sZWFuKWZhbHNlIgot ICAgICAgICAgICAgR093blB0cjxnY2hhcj4gY2FwYWJpbGl0eVN0cmluZyhnc3RfY2Fwc190b19z dHJpbmcoY2FwcykpOwotICAgICAgICAgICAgZ2NoYXIqKiBjYXBhYmlsaXR5ID0gZ19zdHJzcGxp dChjYXBhYmlsaXR5U3RyaW5nLmdldCgpLCAiLCIsIDIpOwotICAgICAgICAgICAgZ2NoYXIqKiBt aW1ldHlwZSA9IGdfc3Ryc3BsaXQoY2FwYWJpbGl0eVswXSwgIi8iLCAyKTsKLQotICAgICAgICAg ICAgLy8gR1N0cmVhbWVyIHBsdWdpbnMgY2FuIGJlIGNhcGFibGUgb2Ygc3VwcG9ydGluZyB0eXBl cyB3aGljaCBXZWJLaXQgc3VwcG9ydHMKLSAgICAgICAgICAgIC8vIGJ5IGRlZmF1bHQuIEluIHRo YXQgY2FzZSwgd2Ugc2hvdWxkIG5vdCBjb25zaWRlciB0aGVzZSB0eXBlcyBzdXBwb3J0YWJsZSBi eSBHU3RyZWFtZXIuCi0gICAgICAgICAgICAvLyBFeGFtcGxlcyBvZiB3aGF0IEdTdHJlYW1lciBj YW4gc3VwcG9ydCBidXQgc2hvdWxkIG5vdCBiZSBhZGRlZDoKLSAgICAgICAgICAgIC8vIHRleHQv cGxhaW4sIHRleHQvaHRtbCwgaW1hZ2UvanBlZywgYXBwbGljYXRpb24veG1sCi0gICAgICAgICAg ICBpZiAoZ19zdHJfZXF1YWwobWltZXR5cGVbMF0sICJhdWRpbyIpCi0gICAgICAgICAgICAgICAg fHwgZ19zdHJfZXF1YWwobWltZXR5cGVbMF0sICJ2aWRlbyIpCi0gICAgICAgICAgICAgICAgfHwg KGdfc3RyX2VxdWFsKG1pbWV0eXBlWzBdLCAiYXBwbGljYXRpb24iKQotICAgICAgICAgICAgICAg ICAgICAmJiAhaWdub3JlZEFwcGxpY2F0aW9uU3VidHlwZXMuY29udGFpbnMoU3RyaW5nKG1pbWV0 eXBlWzFdKSkpKSB7Ci0gICAgICAgICAgICAgICAgY2FjaGUuYWRkKFN0cmluZyhjYXBhYmlsaXR5 WzBdKSk7Ci0KLSAgICAgICAgICAgICAgICAvLyBUaGVzZSBmb3JtYXRzIGFyZSBzdXBwb3J0ZWQg YnkgR1N0cmVhbWVyLCBidXQgbm90IGNvcnJlY3RseSBhZHZlcnRpc2VkCi0gICAgICAgICAgICAg ICAgaWYgKGdfc3RyX2VxdWFsKGNhcGFiaWxpdHlbMF0sICJ2aWRlby94LWgyNjQiKQotICAgICAg ICAgICAgICAgICAgICB8fCBnX3N0cl9lcXVhbChjYXBhYmlsaXR5WzBdLCAiYXVkaW8veC1tNGEi KSkgeworICAgICAgICAgICAgaWYgKCFjYXBzKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOwor CisgICAgICAgICAgICBmb3IgKGd1aW50IHN0cnVjdHVyZUluZGV4ID0gMDsgc3RydWN0dXJlSW5k ZXggPCBnc3RfY2Fwc19nZXRfc2l6ZShjYXBzKTsgc3RydWN0dXJlSW5kZXgrKykgeworICAgICAg ICAgICAgICAgIEdzdFN0cnVjdHVyZSogc3RydWN0dXJlID0gZ3N0X2NhcHNfZ2V0X3N0cnVjdHVy ZShjYXBzLCBzdHJ1Y3R1cmVJbmRleCk7CisgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIqIG5h bWUgPSBnc3Rfc3RydWN0dXJlX2dldF9uYW1lKHN0cnVjdHVyZSk7CisgICAgICAgICAgICAgICAg Ym9vbCBjYWNoZWQgPSBmYWxzZTsKKworICAgICAgICAgICAgICAgIC8vIFRoZXNlIGZvcm1hdHMg YXJlIHN1cHBvcnRlZCBieSBHU3RyZWFtZXIsIGJ1dCBub3QKKyAgICAgICAgICAgICAgICAvLyBj b3JyZWN0bHkgYWR2ZXJ0aXNlZC4KKyAgICAgICAgICAgICAgICBpZiAoZ19zdHJfZXF1YWwobmFt ZSwgInZpZGVvL3gtaDI2NCIpCisgICAgICAgICAgICAgICAgICAgIHx8IGdfc3RyX2VxdWFsKG5h bWUsICJhdWRpby94LW00YSIpKSB7CiAgICAgICAgICAgICAgICAgICAgIGNhY2hlLmFkZChTdHJp bmcoInZpZGVvL21wNCIpKTsKICAgICAgICAgICAgICAgICAgICAgY2FjaGUuYWRkKFN0cmluZygi YXVkaW8vYWFjIikpOworICAgICAgICAgICAgICAgICAgICBjYWNoZWQgPSB0cnVlOwogICAgICAg ICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgIGlmIChnX3N0cl9lcXVhbChjYXBhYmlsaXR5 WzBdLCAidmlkZW8veC10aGVvcmEiKSkKKyAgICAgICAgICAgICAgICBpZiAoZ19zdHJfZXF1YWwo bmFtZSwgInZpZGVvL3gtdGhlb3JhIikpIHsKICAgICAgICAgICAgICAgICAgICAgY2FjaGUuYWRk KFN0cmluZygidmlkZW8vb2dnIikpOworICAgICAgICAgICAgICAgICAgICBjYWNoZWQgPSB0cnVl OworICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgIGlmIChnX3N0cl9lcXVhbChj YXBhYmlsaXR5WzBdLCAiYXVkaW8veC13YXYiKSkKLSAgICAgICAgICAgICAgICAgICAgY2FjaGUu YWRkKFN0cmluZygiYXVkaW8vd2F2IikpOworICAgICAgICAgICAgICAgIGlmIChnX3N0cl9lcXVh bChuYW1lLCAiYXVkaW8veC12b3JiaXMiKSkgeworICAgICAgICAgICAgICAgICAgICBjYWNoZS5h ZGQoU3RyaW5nKCJhdWRpby9vZ2ciKSk7CisgICAgICAgICAgICAgICAgICAgIGNhY2hlZCA9IHRy dWU7CisgICAgICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAgICAgaWYgKGdfc3RyX2VxdWFs KGNhcGFiaWxpdHlbMF0sICJhdWRpby9tcGVnIikpIHsKLSAgICAgICAgICAgICAgICAgICAgLy8g VGhpcyBpcyB3aGF0IHdlIGFyZSBoYW5kbGluZzogbXBlZ3ZlcnNpb249KGludCkxLCBsYXllcj0o aW50KVsgMSwgMyBdCi0gICAgICAgICAgICAgICAgICAgIGdjaGFyKiogdmVyc2lvbkFuZExheWVy ID0gZ19zdHJzcGxpdChjYXBhYmlsaXR5WzFdLCAiLCIsIDIpOworICAgICAgICAgICAgICAgIGlm IChnX3N0cl9lcXVhbChuYW1lLCAiYXVkaW8veC13YXYiKSkgeworICAgICAgICAgICAgICAgICAg ICBjYWNoZS5hZGQoU3RyaW5nKCJhdWRpby93YXYiKSk7CisgICAgICAgICAgICAgICAgICAgIGNh Y2hlZCA9IHRydWU7CisgICAgICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAgICAgICAgIGlm IChnX3N0cl9oYXNfc3VmZml4KHZlcnNpb25BbmRMYXllclswXSwgIihpbnQpMSIpKSB7Ci0gICAg ICAgICAgICAgICAgICAgICAgICBmb3IgKGludCBpID0gMDsgdmVyc2lvbkFuZExheWVyWzFdW2ld ICE9ICdcMCc7IGkrKykgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICh2ZXJzaW9u QW5kTGF5ZXJbMV1baV0gPT0gJzEnKQorICAgICAgICAgICAgICAgIGlmIChnX3N0cl9lcXVhbChu YW1lLCAiYXVkaW8vbXBlZyIpKSB7CisgICAgICAgICAgICAgICAgICAgIGNhY2hlLmFkZChTdHJp bmcobmFtZSkpOworICAgICAgICAgICAgICAgICAgICBjYWNoZWQgPSB0cnVlOworCisgICAgICAg ICAgICAgICAgICAgIC8vIFRoaXMgaXMgd2hhdCB3ZSBhcmUgaGFuZGxpbmc6CisgICAgICAgICAg ICAgICAgICAgIC8vIG1wZWd2ZXJzaW9uPShpbnQpMSwgbGF5ZXI9KGludClbIDEsIDMgXQorICAg ICAgICAgICAgICAgICAgICBnaW50IG1wZWdWZXJzaW9uID0gMDsKKyAgICAgICAgICAgICAgICAg ICAgaWYgKGdzdF9zdHJ1Y3R1cmVfZ2V0X2ludChzdHJ1Y3R1cmUsICJtcGVndmVyc2lvbiIsICZt cGVnVmVyc2lvbikgJiYgKG1wZWdWZXJzaW9uID09IDEpKSB7CisgICAgICAgICAgICAgICAgICAg ICAgICBjb25zdCBHVmFsdWUqIGxheWVyID0gZ3N0X3N0cnVjdHVyZV9nZXRfdmFsdWUoc3RydWN0 dXJlLCAibGF5ZXIiKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChHX1ZBTFVFX1RZUEUo bGF5ZXIpID09IEdTVF9UWVBFX0lOVF9SQU5HRSkgeworICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGdpbnQgbWluTGF5ZXIgPSBnc3RfdmFsdWVfZ2V0X2ludF9yYW5nZV9taW4obGF5ZXIpOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdpbnQgbWF4TGF5ZXIgPSBnc3RfdmFsdWVfZ2V0 X2ludF9yYW5nZV9tYXgobGF5ZXIpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICht aW5MYXllciA8PSAxIDw9IG1heExheWVyKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjYWNoZS5hZGQoU3RyaW5nKCJhdWRpby9tcDEiKSk7Ci0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgZWxzZSBpZiAodmVyc2lvbkFuZExheWVyWzFdW2ldID09ICcyJykKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpZiAobWluTGF5ZXIgPD0gMiA8PSBtYXhMYXllcikKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY2FjaGUuYWRkKFN0cmluZygiYXVkaW8vbXAyIikpOwot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UgaWYgKHZlcnNpb25BbmRMYXllclsxXVtp XSA9PSAnMycpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG1pbkxheWVyIDw9IDMg PD0gbWF4TGF5ZXIpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNhY2hlLmFkZChT dHJpbmcoImF1ZGlvL21wMyIpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgICAgICBn X3N0cmZyZWV2KHZlcnNpb25BbmRMYXllcik7CisgICAgICAgICAgICAgICAgaWYgKCFjYWNoZWQp IHsKKyAgICAgICAgICAgICAgICAgICAgLy8gR1N0cmVhbWVyIHBsdWdpbnMgY2FuIGJlIGNhcGFi bGUgb2Ygc3VwcG9ydGluZworICAgICAgICAgICAgICAgICAgICAvLyB0eXBlcyB3aGljaCBXZWJL aXQgc3VwcG9ydHMgYnkgZGVmYXVsdC4gSW4gdGhhdAorICAgICAgICAgICAgICAgICAgICAvLyBj YXNlLCB3ZSBzaG91bGQgbm90IGNvbnNpZGVyIHRoZXNlIHR5cGVzCisgICAgICAgICAgICAgICAg ICAgIC8vIHN1cHBvcnRhYmxlIGJ5IEdTdHJlYW1lci4gIEV4YW1wbGVzIG9mIHdoYXQKKyAgICAg ICAgICAgICAgICAgICAgLy8gR1N0cmVhbWVyIGNhbiBzdXBwb3J0IGJ1dCBzaG91bGQgbm90IGJl IGFkZGVkOgorICAgICAgICAgICAgICAgICAgICAvLyB0ZXh0L3BsYWluLCB0ZXh0L2h0bWwsIGlt YWdlL2pwZWcsCisgICAgICAgICAgICAgICAgICAgIC8vIGFwcGxpY2F0aW9uL3htbAorICAgICAg ICAgICAgICAgICAgICBnY2hhcioqIG1pbWV0eXBlID0gZ19zdHJzcGxpdChuYW1lLCAiLyIsIDIp OworICAgICAgICAgICAgICAgICAgICBpZiAoZ19zdHJfZXF1YWwobWltZXR5cGVbMF0sICJhdWRp byIpCisgICAgICAgICAgICAgICAgICAgICAgICB8fCBnX3N0cl9lcXVhbChtaW1ldHlwZVswXSwg InZpZGVvIikKKyAgICAgICAgICAgICAgICAgICAgICAgIHx8IChnX3N0cl9lcXVhbChtaW1ldHlw ZVswXSwgImFwcGxpY2F0aW9uIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAmJiAhaWdu b3JlZEFwcGxpY2F0aW9uU3VidHlwZXMuY29udGFpbnMoU3RyaW5nKG1pbWV0eXBlWzFdKSkpKQor ICAgICAgICAgICAgICAgICAgICAgICAgY2FjaGUuYWRkKFN0cmluZyhuYW1lKSk7CisKKyAgICAg ICAgICAgICAgICAgICAgZ19zdHJmcmVldihtaW1ldHlwZSk7CiAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBnX3N0cmZyZWV2KGNhcGFiaWxpdHkpOwotICAg ICAgICAgICAgZ19zdHJmcmVldihtaW1ldHlwZSk7CiAgICAgICAgIH0KIAogICAgICAgICBnc3Rf cGx1Z2luX2ZlYXR1cmVfbGlzdF9mcmVlKGZhY3Rvcmllcyk7Ci0tIAoxLjYuMy4z