87841 2012-05-30 03:58:31 -0700 [Qt] Add config tests for WEBP imagedecoder 2012-06-11 07:06:22 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All Linux RESOLVED FIXED Qt P2 Normal --- 1 zoltan zoltan hausmann noel.gordon vestbo webkit.review.bot oldest_to_newest 637094 0 zoltan 2012-05-30 03:58:31 -0700 Add config tests for WEBP, enable building of WEBP imagedecoder if WEBP library is installed on the system. 637095 1 144778 zoltan 2012-05-30 04:00:31 -0700 Created attachment 144778 proposed patch 637111 2 144778 hausmann 2012-05-30 04:48:02 -0700 Comment on attachment 144778 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=144778&action=review > Source/WebCore/WebCore.pri:246 > + contains(config_test_libwebp, yes) { > + DEFINES += WTF_USE_WEBP=1 In an ideal world WTF_USE_WEBP=1 would be consistent with HAVE_LIBJPEG. I guess the latter (jpeg/png) is considered really essential for web browsing, while webp is optional (and the define is used by others, too). 637142 3 144793 zoltan 2012-05-30 06:15:38 -0700 Created attachment 144793 patch If you wish I can split the patch to 2 parts. (USE-HAVE change, configtest) What is your opinion? 637161 4 noel.gordon 2012-05-30 06:51:13 -0700 + DEFINES += WTF_USE_WEBP=1 + DEFINES += HAVE_WEBP=1 Would make for a smaller change. We've used USE(XXXXX) everywhere, USE(ICCJPEG), USE(SKIA), USE(FOOBAR), and so on. What does HAVE buy us? 638040 5 zoltan 2012-05-30 23:53:18 -0700 (In reply to comment #4) > + DEFINES += WTF_USE_WEBP=1 > + DEFINES += HAVE_WEBP=1 > > Would make for a smaller change. We've used USE(XXXXX) everywhere, USE(ICCJPEG), USE(SKIA), USE(FOOBAR), and so on. What does HAVE buy us? In my opinion using of these decoders is more depending on that we HAVE the required libraries than we just want to USE. So if we have them, then we can always use them. It indicates me that using of HAVE is more natural. From platform.h: /* HAVE() - specific system features (headers, functions or similar) that are present or not */ /* USE() - use a particular third-party library or optional OS service */ 638120 6 noel.gordon 2012-05-31 01:54:56 -0700 So HAVE is for system header files it seems. WTF/wtf has examples: ack HAVE Source/WTF/wtf/DateMath.cpp 89:#if HAVE(ERRNO_H) 93:#if HAVE(SYS_TIME_H) 97:#if HAVE(SYS_TIMEB_H) 373:#if HAVE(TM_GMTOFF) 376:#if HAVE(TM_ZONE) 380:#if HAVE(TIMEGM) > /* USE() - use a particular third-party library or optional OS service */ For libwebp, libjpeg, libpng (third-party libs) etc, this comment suggests that it should be USE. Of course we must have a lib available :) but that doesn't mean we USE it :) Don't mean to hold you up here Zoltan. I just found HAVE for a third party lib a little unusual based on my reading of WebKit code. 638135 7 zoltan 2012-05-31 02:09:48 -0700 (In reply to comment #6) > For libwebp, libjpeg, libpng (third-party libs) etc, this comment suggests that it should be USE. Of course we must have a lib available :) but that doesn't mean we USE it :) > > Don't mean to hold you up here Zoltan. I just found HAVE for a third party lib a little unusual based on my reading of WebKit code. Thanks for collecting the examples. I see your point! Our goal is to be consistent, so I'm okay with the USE macro also. If we made a decision to use that, then I'll update the patch. :) I look forward to hear other's opinions also. Simon, Tor Arne? 639966 8 hausmann 2012-06-01 23:47:00 -0700 (In reply to comment #7) > (In reply to comment #6) > > > For libwebp, libjpeg, libpng (third-party libs) etc, this comment suggests that it should be USE. Of course we must have a lib available :) but that doesn't mean we USE it :) > > > > Don't mean to hold you up here Zoltan. I just found HAVE for a third party lib a little unusual based on my reading of WebKit code. > > Thanks for collecting the examples. I see your point! Our goal is to be consistent, so I'm okay with the USE macro also. If we made a decision to use that, then I'll update the patch. :) > > I look forward to hear other's opinions also. > > Simon, Tor Arne? I agree with Noel, let's use USE() and set it in the build system if it turns out that we also _have_ it. That still gives the option of _not_ using it even if the library is present. In other words: It seems HAVE() should be used when there's no doubt that all about whether we should use the feature if it's present in the system or not. USE() on the other hand is for things that _are_ optional, and that is the case here as well as with the other image decoders. 640550 9 145576 zoltan 2012-06-04 06:58:08 -0700 Created attachment 145576 proposed patch Config-test + HAVE->USE modification. 645976 10 zoltan 2012-06-11 07:06:22 -0700 Committed r119977: <http://trac.webkit.org/changeset/119977> 144778 2012-05-30 04:00:31 -0700 2012-05-30 06:15:38 -0700 proposed patch webpconfigtest.patch text/plain 4671 zoltan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2MzQ1YjcyLi5jNzc5ZWM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTgg QEAKIDIwMTItMDUtMzAgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CiAKKyAg ICAgICAgW1F0XSBBZGQgY29uZmlnIHRlc3RzIGZvciBXRUJQIGltYWdlZGVjb2RlciBsaWJyYXJ5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Nzg0MQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBjb25m aWcgdGVzdHMgZm9yIFdFQlAsIGVuYWJsZSBidWlsZGluZyBvZiBXRUJQIGltYWdlZGVjb2RlciBp ZiBXRUJQIGxpYnJhcnkgaXMgaW5zdGFsbGVkIG9uIHRoZSBzeXN0ZW0uCisKKyAgICAgICAgQ29u ZmlnIHRlc3RzIGFkZGVkLgorCisgICAgICAgICogV2ViQ29yZS5wcmk6CisKKzIwMTItMDUtMzAg IFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKICAgICAgICAgW1F0XSBTZXQg V2ViQ29yZSBpbWFnZWRlY29kZXJzIGFzIGRlZmF1bHQgYW5kIGFkZCBmYWxsYmFjayB0byBRSW1h Z2VEZWNvZGVyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04MDQwMAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnByaSBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUucHJpCmluZGV4IDA4ZGI2NGMuLjAxNjE2YjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUucHJpCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu cHJpCkBAIC0yMjgsMTEgKzIyOCw2IEBAIGNvbnRhaW5zKERFRklORVMsIFdURl9VU0VfVEVYVFVS RV9NQVBQRVJfR0w9MSl8Y29udGFpbnMoREVGSU5FUywgRU5BQkxFX1dFQkdMPTEpCiAgICAgTElC UyArPSAtbHNxbGl0ZTMKIH0KIAotY29udGFpbnMoREVGSU5FUywgV1RGX1VTRV9XRUJQPTEpIHsK LSAgICBJTkNMVURFUEFUSCArPSAkJFNPVVJDRV9ESVIvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMv d2VicAotICAgIExJQlMgKz0gLWx3ZWJwCi19Ci0KIGhhdmVRdCg1KSB7CiAgICAgIyBRdDUgYWxs b3dzIHVzIHRvIHVzZSBjb25maWcgdGVzdHMgdG8gY2hlY2sgZm9yIHRoZSBwcmVzZW5jZSBvZiB0 aGVzZSBsaWJyYXJpZXMKICAgICBjb250YWlucyhjb25maWdfdGVzdF9saWJqcGVnLCB5ZXMpIHsK QEAgLTI0Nyw2ICsyNDIsMTAgQEAgaGF2ZVF0KDUpIHsKICAgICB9IGVsc2UgewogICAgICAgICB3 YXJuaW5nKCJQTkcgbGlicmFyeSBub3QgZm91bmQhIFFJbWFnZURlY29kZXIgd2lsbCBkZWNvZGUg UE5HIGltYWdlcy4iKQogICAgIH0KKyAgICBjb250YWlucyhjb25maWdfdGVzdF9saWJ3ZWJwLCB5 ZXMpIHsKKyAgICAgICAgREVGSU5FUyArPSBXVEZfVVNFX1dFQlA9MQorICAgICAgICBMSUJTICs9 IC1sd2VicAorICAgIH0KIH0gZWxzZSB7CiAgICAgIXdpbjMyLSo6IW1hYyB7CiAgICAgICAgIERF RklORVMgKz0gSEFWRV9MSUJKUEVHPTEgSEFWRV9MSUJQTkc9MQpkaWZmIC0tZ2l0IGEvVG9vbHMv Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDI4NmM5M2MuLjYyMjE5YWYgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NSBAQAorMjAxMi0wNS0zMCAgWm9sdGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9yZz4KKwor ICAgICAgICBbUXRdIEFkZCBjb25maWcgdGVzdHMgZm9yIFdFQlAgaW1hZ2VkZWNvZGVyIGxpYnJh cnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3ODQx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBxbWFr ZS9jb25maWcudGVzdHMvbGlid2VicC9saWJ3ZWJwLmNwcDogQWRkZWQuCisgICAgICAgIChtYWlu KToKKyAgICAgICAgKiBxbWFrZS9jb25maWcudGVzdHMvbGlid2VicC9saWJ3ZWJwLnBybzogQWRk ZWQuCisgICAgICAgICogcW1ha2Uvc3luYy5wcm9maWxlOgorCiAyMDEyLTA1LTI5ICBKw6Fub3Mg QmFkaWNzICA8amJhZGljc0BpbmYudS1zemVnZWQuaHU+CiAKICAgICAgICAgW1F0XSBNb2RpZmll ZCBPUldUIGFuZCBOUldUIHRvIGNoZWNrIGZvciB0ZXN0IGV4cGVjdGF0aW9ucyBpbiBwbGF0Zm9y bS9xdC01LjAtd2sxIHRvbwpkaWZmIC0tZ2l0IGEvVG9vbHMvcW1ha2UvY29uZmlnLnRlc3RzL2xp YndlYnAvbGlid2VicC5jcHAgYi9Ub29scy9xbWFrZS9jb25maWcudGVzdHMvbGlid2VicC9saWJ3 ZWJwLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45NzQ2MDNkCi0tLSAv ZGV2L251bGwKKysrIGIvVG9vbHMvcW1ha2UvY29uZmlnLnRlc3RzL2xpYndlYnAvbGlid2VicC5j cHAKQEAgLTAsMCArMSwzMyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgWm9sdGFuIEhvcnZhdGgg KHpvbHRhbkB3ZWJraXQub3JnKSAyMDEyIFVuaXZlcnNpdHkgb2YgU3plZ2VkLgorICoKKyAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor ICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJT IEFORCBDT05UUklCVVRPUlMKKyAqICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQg V0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElF RCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyAqIEEgUEFS VElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09Q WVJJR0hUCisgKiBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNU LCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyAqIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VR VUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFBST0NV UkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorICog REFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQgT04gQU5ZCisgKiBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNU LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1Ig T1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCisgKi8KKworI2luY2x1ZGUgIndlYnAvZGVjb2RlLmgiCisKK2ludCBtYWluKGludCwgY2hh cioqKQoreworICAgIFdlYlBEZWNvZGVyQ29uZmlnIGNvbmZpZzsKKyAgICBXZWJQSW5pdERlY29k ZXJDb25maWcoJmNvbmZpZyk7CisgICAgcmV0dXJuIDA7Cit9CmRpZmYgLS1naXQgYS9Ub29scy9x bWFrZS9jb25maWcudGVzdHMvbGlid2VicC9saWJ3ZWJwLnBybyBiL1Rvb2xzL3FtYWtlL2NvbmZp Zy50ZXN0cy9saWJ3ZWJwL2xpYndlYnAucHJvCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLjkyNTcyNTIKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9xbWFrZS9jb25maWcudGVz dHMvbGlid2VicC9saWJ3ZWJwLnBybwpAQCAtMCwwICsxLDMgQEAKK1NPVVJDRVMgPSBsaWJ3ZWJw LmNwcAorT0JKRUNUU19ESVIgPSBvYmoKK0xJQlMgKz0gLWx3ZWJwCmRpZmYgLS1naXQgYS9Ub29s cy9xbWFrZS9zeW5jLnByb2ZpbGUgYi9Ub29scy9xbWFrZS9zeW5jLnByb2ZpbGUKaW5kZXggYzA3 MzQ2MC4uM2VkMWEzZCAxMDA2NDQKLS0tIGEvVG9vbHMvcW1ha2Uvc3luYy5wcm9maWxlCisrKyBi L1Rvb2xzL3FtYWtlL3N5bmMucHJvZmlsZQpAQCAtNCw2ICs0LDcgQEAKICAgICBnY2NkZXBlbmRz ID0+IHt9LAogICAgIGxpYnBuZyA9PiB7fSwKICAgICBsaWJqcGVnID0+IHt9LAorICAgIGxpYndl YnAgPT4ge30sCiAgICAgbGlieG1sMiA9PiB7fSwKICAgICBsaWJ4c2x0ID0+IHt9LAogKTsK 144793 2012-05-30 06:15:38 -0700 2012-06-04 06:58:08 -0700 patch webpconfigtest.patch text/plain 10157 zoltan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2MzQ1YjcyLi4yOGU4NGMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkg QEAKIDIwMTItMDUtMzAgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CiAKKyAg ICAgICAgW1F0XSBBZGQgY29uZmlnIHRlc3RzIGZvciBXRUJQIGltYWdlZGVjb2RlciBsaWJyYXJ5 LCBtb2RpZnkgVVNFKFdFQlApIHRvIEhBVkUoTElCV0VCUCkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3ODQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGNvbmZpZyB0ZXN0cyBmb3IgV0VCUCwgZW5h YmxlIGJ1aWxkaW5nIG9mIFdFQlAgaW1hZ2VkZWNvZGVyIGlmIFdFQlAgbGlicmFyeSBpcyBpbnN0 YWxsZWQgb24gdGhlIHN5c3RlbS4KKyAgICAgICAgTW9kaWZ5IFdURl9VU0VfV0VCUCBtYWNybyB0 byBIQVZFX0xJQldFQlAgbWFjcm8gdG8gYmUgY29uc2lzdGVudCB3aXRoIHRoZSBvdGhlciBpbWFn ZWRlY29kZXJzLgorCisgICAgICAgIENvbmZpZyB0ZXN0cyBhZGRlZC4KKworICAgICAgICAqIFdl YkNvcmUucHJpOgorCisyMDEyLTA1LTMwICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQu b3JnPgorCiAgICAgICAgIFtRdF0gU2V0IFdlYkNvcmUgaW1hZ2VkZWNvZGVycyBhcyBkZWZhdWx0 IGFuZCBhZGQgZmFsbGJhY2sgdG8gUUltYWdlRGVjb2RlcgogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODA0MDAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvVGFyZ2V0LnByaSBiL1NvdXJjZS9XZWJDb3JlL1RhcmdldC5wcmkKaW5kZXggNWU2NzU3 Zi4uN2ZmOGQ0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaQorKysgYi9T b3VyY2UvV2ViQ29yZS9UYXJnZXQucHJpCkBAIC00MDczLDcgKzQwNzMsNyBAQCBjb250YWlucyhE RUZJTkVTLCBIQVZFX0xJQkpQRUc9MSkgewogICAgIFNPVVJDRVMgKz0gcGxhdGZvcm0vaW1hZ2Ut ZGVjb2RlcnMvanBlZy9KUEVHSW1hZ2VEZWNvZGVyLmNwcAogfQogCi1jb250YWlucyhERUZJTkVT LCBXVEZfVVNFX1dFQlA9MSkgeworY29udGFpbnMoREVGSU5FUywgSEFWRV9MSUJXRUJQPTEpIHsK ICAgICBJTkNMVURFUEFUSCArPSBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy93ZWJwCiAgICAgSEVB REVSUyArPSBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy93ZWJwL1dFQlBJbWFnZURlY29kZXIuaAog ICAgIFNPVVJDRVMgKz0gcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvd2VicC9XRUJQSW1hZ2VEZWNv ZGVyLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcmkgYi9Tb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLnByaQppbmRleCAwOGRiNjRjLi5iZmFkNTVmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLnByaQorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnBy aQpAQCAtMjI4LDExICsyMjgsNiBAQCBjb250YWlucyhERUZJTkVTLCBXVEZfVVNFX1RFWFRVUkVf TUFQUEVSX0dMPTEpfGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9XRUJHTD0xKQogICAgIExJQlMg Kz0gLWxzcWxpdGUzCiB9CiAKLWNvbnRhaW5zKERFRklORVMsIFdURl9VU0VfV0VCUD0xKSB7Ci0g ICAgSU5DTFVERVBBVEggKz0gJCRTT1VSQ0VfRElSL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3dl YnAKLSAgICBMSUJTICs9IC1sd2VicAotfQotCiBoYXZlUXQoNSkgewogICAgICMgUXQ1IGFsbG93 cyB1cyB0byB1c2UgY29uZmlnIHRlc3RzIHRvIGNoZWNrIGZvciB0aGUgcHJlc2VuY2Ugb2YgdGhl c2UgbGlicmFyaWVzCiAgICAgY29udGFpbnMoY29uZmlnX3Rlc3RfbGlianBlZywgeWVzKSB7CkBA IC0yNDcsNiArMjQyLDEwIEBAIGhhdmVRdCg1KSB7CiAgICAgfSBlbHNlIHsKICAgICAgICAgd2Fy bmluZygiUE5HIGxpYnJhcnkgbm90IGZvdW5kISBRSW1hZ2VEZWNvZGVyIHdpbGwgZGVjb2RlIFBO RyBpbWFnZXMuIikKICAgICB9CisgICAgY29udGFpbnMoY29uZmlnX3Rlc3RfbGlid2VicCwgeWVz KSB7CisgICAgICAgIERFRklORVMgKz0gSEFWRV9XRUJQPTEKKyAgICAgICAgTElCUyArPSAtbHdl YnAKKyAgICB9CiB9IGVsc2UgewogICAgICF3aW4zMi0qOiFtYWMgewogICAgICAgICBERUZJTkVT ICs9IEhBVkVfTElCSlBFRz0xIEhBVkVfTElCUE5HPTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2Nocm9taXVtL01JTUVUeXBlUmVnaXN0cnlDaHJvbWl1bS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9NSU1FVHlwZVJlZ2lzdHJ5Q2hyb21pdW0uY3Bw CmluZGV4IGY3NjRjM2QuLjI4NTkxOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL01JTUVUeXBlUmVnaXN0cnlDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vTUlNRVR5cGVSZWdpc3RyeUNocm9taXVtLmNwcApAQCAt MTA0LDcgKzEwNCw3IEBAIGJvb2wgTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1J TUVUeXBlRm9yRW5jb2RpbmcoY29uc3QgU3RyaW5nJiBtaW1lVHlwCiB7CiAgICAgaWYgKG1pbWVU eXBlID09ICJpbWFnZS9qcGVnIiB8fCBtaW1lVHlwZSA9PSAiaW1hZ2UvcG5nIikKICAgICAgICAg cmV0dXJuIHRydWU7Ci0jaWYgVVNFKFdFQlApCisjaWYgSEFWRShMSUJXRUJQKQogICAgIGlmICht aW1lVHlwZSA9PSAiaW1hZ2Uvd2VicCIpCiAgICAgICAgIHJldHVybiB0cnVlOwogI2VuZGlmCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlQnVm ZmVyU2tpYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdl QnVmZmVyU2tpYS5jcHAKaW5kZXggOGIwODZhMC4uYTVhNWJmOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZmZXJTa2lhLmNw cApAQCAtMzQ0LDcgKzM0NCw3IEBAIHN0YXRpYyBib29sIGVuY29kZUltYWdlKFQmIHNvdXJjZSwg Y29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgZG91YmxlKiBxdWFsaXR5CiAgICAgICAgICAg ICBjb21wcmVzc2lvblF1YWxpdHkgPSBzdGF0aWNfY2FzdDxpbnQ+KCpxdWFsaXR5ICogMTAwICsg MC41KTsKICAgICAgICAgaWYgKCFKUEVHSW1hZ2VFbmNvZGVyOjplbmNvZGUoc291cmNlLCBjb21w cmVzc2lvblF1YWxpdHksIGVuY29kZWRJbWFnZSkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 Ci0jaWYgVVNFKFdFQlApCisjaWYgSEFWRShMSUJXRUJQKQogICAgIH0gZWxzZSBpZiAobWltZVR5 cGUgPT0gImltYWdlL3dlYnAiKSB7CiAgICAgICAgIGludCBjb21wcmVzc2lvblF1YWxpdHkgPSBX RUJQSW1hZ2VFbmNvZGVyOjpEZWZhdWx0Q29tcHJlc3Npb25RdWFsaXR5OwogICAgICAgICBpZiAo cXVhbGl0eSAmJiAqcXVhbGl0eSA+PSAwLjAgJiYgKnF1YWxpdHkgPD0gMS4wKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5j cHAKaW5kZXggMDJhYTY4Yy4uNjUzMzhkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuY3BwCkBAIC0zMSw3ICszMSw3 IEBACiAjaW5jbHVkZSAiSlBFR0ltYWdlRGVjb2Rlci5oIgogI2luY2x1ZGUgIlBOR0ltYWdlRGVj b2Rlci5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgotI2lmIFVTRShXRUJQKQorI2lmIEhB VkUoTElCV0VCUCkKICNpbmNsdWRlICJXRUJQSW1hZ2VEZWNvZGVyLmgiCiAjZW5kaWYKIApAQCAt NzQsNyArNzQsNyBAQCBib29sIG1hdGNoZXNKUEVHU2lnbmF0dXJlKGNoYXIqIGNvbnRlbnRzKQog ICAgIHJldHVybiAhbWVtY21wKGNvbnRlbnRzLCAiXHhGRlx4RDhceEZGIiwgMyk7CiB9CiAKLSNp ZiBVU0UoV0VCUCkKKyNpZiBIQVZFKExJQldFQlApCiBib29sIG1hdGNoZXNXZWJQU2lnbmF0dXJl KGNoYXIqIGNvbnRlbnRzKQogewogICAgIHJldHVybiAhbWVtY21wKGNvbnRlbnRzLCAiUklGRiIs IDQpICYmICFtZW1jbXAoY29udGVudHMgKyA4LCAiV0VCUFZQIiwgNik7CkBAIC0xMjIsNyArMTIy LDcgQEAgSW1hZ2VEZWNvZGVyKiBJbWFnZURlY29kZXI6OmNyZWF0ZShjb25zdCBTaGFyZWRCdWZm ZXImIGRhdGEsIEltYWdlU291cmNlOjpBbHBoYU8KICAgICAgICAgcmV0dXJuIG5ldyBKUEVHSW1h Z2VEZWNvZGVyKGFscGhhT3B0aW9uLCBnYW1tYUFuZENvbG9yUHJvZmlsZU9wdGlvbik7CiAjZW5k aWYKIAotI2lmIFVTRShXRUJQKQorI2lmIEhBVkUoTElCV0VCUCkKICAgICBpZiAobWF0Y2hlc1dl YlBTaWduYXR1cmUoY29udGVudHMpKQogICAgICAgICByZXR1cm4gbmV3IFdFQlBJbWFnZURlY29k ZXIoYWxwaGFPcHRpb24sIGdhbW1hQW5kQ29sb3JQcm9maWxlT3B0aW9uKTsKICNlbmRpZgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvd2VicC9XRUJQ SW1hZ2VEZWNvZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJz L3dlYnAvV0VCUEltYWdlRGVjb2Rlci5jcHAKaW5kZXggYjhkM2I0MS4uOWQ2ZWIyNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvd2VicC9XRUJQSW1h Z2VEZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVy cy93ZWJwL1dFQlBJbWFnZURlY29kZXIuY3BwCkBAIC0yOSw3ICsyOSw3IEBACiAjaW5jbHVkZSAi Y29uZmlnLmgiCiAjaW5jbHVkZSAiV0VCUEltYWdlRGVjb2Rlci5oIgogCi0jaWYgVVNFKFdFQlAp CisjaWYgSEFWRShMSUJXRUJQKQogCiAjaW5jbHVkZSAid2VicC9kZWNvZGUuaCIKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvd2VicC9XRUJQSW1h Z2VEZWNvZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy93ZWJw L1dFQlBJbWFnZURlY29kZXIuaAppbmRleCA2MWVhMTM5Li42NTVkMTQwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy93ZWJwL1dFQlBJbWFnZURlY29k ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy93ZWJwL1dF QlBJbWFnZURlY29kZXIuaApAQCAtMzEsNyArMzEsNyBAQAogCiAjaW5jbHVkZSAiSW1hZ2VEZWNv ZGVyLmgiCiAKLSNpZiBVU0UoV0VCUCkKKyNpZiBIQVZFKExJQldFQlApCiAKIHR5cGVkZWYgc3Ry dWN0IFdlYlBJRGVjb2RlciBXZWJQSURlY29kZXI7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2ltYWdlLWVuY29kZXJzL3NraWEvV0VCUEltYWdlRW5jb2Rlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1lbmNvZGVycy9za2lhL1dFQlBJbWFnZUVuY29k ZXIuY3BwCmluZGV4IGViYzI5OWQuLmZkZDQxYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2ltYWdlLWVuY29kZXJzL3NraWEvV0VCUEltYWdlRW5jb2Rlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tpYS9XRUJQSW1hZ2VFbmNv ZGVyLmNwcApAQCAtMzEsNyArMzEsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUg IldFQlBJbWFnZUVuY29kZXIuaCIKIAotI2lmIFVTRShXRUJQKQorI2lmIEhBVkUoTElCV0VCUCkK IAogI2luY2x1ZGUgIkltYWdlRGF0YS5oIgogI2luY2x1ZGUgIkludFNpemUuaCIKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWVuY29kZXJzL3NraWEvV0VCUEltYWdl RW5jb2Rlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tpYS9X RUJQSW1hZ2VFbmNvZGVyLmgKaW5kZXggNGVjOTI4ZS4uZDEzNDkzOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tpYS9XRUJQSW1hZ2VFbmNvZGVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tpYS9XRUJQ SW1hZ2VFbmNvZGVyLmgKQEAgLTMzLDcgKzMzLDcgQEAKIAogI2luY2x1ZGUgPHd0Zi9WZWN0b3Iu aD4KIAotI2lmIFVTRShXRUJQKQorI2lmIEhBVkUoTElCV0VCUCkKIAogY2xhc3MgU2tCaXRtYXA7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vZmVhdHVyZXMuZ3lwaSBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vZmVhdHVyZXMuZ3lwaQppbmRleCBmNzczY2M0Li5iOGEwZTBh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2ZlYXR1cmVzLmd5cGkKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9mZWF0dXJlcy5neXBpCkBAIC0xMjMsNyArMTIzLDcgQEAK ICAgICAgICdXVEZfVVNFX09QRU5UWVBFX1NBTklUSVpFUj0xJywKICAgICAgICdXVEZfVVNFX1JU TF9TQ1JPTExCQVI9MScsCiAgICAgICAnV1RGX1VTRV9TS0lBX1RFWFQ9PChlbmFibGVfc2tpYV90 ZXh0KScsCi0gICAgICAnV1RGX1VTRV9XRUJQPTEnLAorICAgICAgJ0hBVkVfTElCV0VCUD0xJywK ICAgICAgICdXVEZfVVNFX1dFQktJVF9JTUFHRV9ERUNPREVSUz0xJywKICAgICBdLAogICAgICMg V2UgaGF2ZSB0byBuZXN0IHZhcmlhYmxlcyBpbnNpZGUgdmFyaWFibGVzIHNvIHRoYXQgdGhleSBj YW4gYmUgb3ZlcnJpZGRlbgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hh bmdlTG9nCmluZGV4IDI4NmM5M2MuLmZlZDg1NzIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0wNS0zMCAgWm9s dGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBbUXRdIEFkZCBjb25m aWcgdGVzdHMgZm9yIFdFQlAgaW1hZ2VkZWNvZGVyIGxpYnJhcnksIG1vZGlmeSBVU0UoV0VCUCkg dG8gSEFWRShMSUJXRUJQKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODc4NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHFtYWtlL2NvbmZpZy50ZXN0cy9saWJ3ZWJwL2xpYndlYnAuY3BwOiBBZGRlZC4K KyAgICAgICAgKG1haW4pOgorICAgICAgICAqIHFtYWtlL2NvbmZpZy50ZXN0cy9saWJ3ZWJwL2xp YndlYnAucHJvOiBBZGRlZC4KKyAgICAgICAgKiBxbWFrZS9zeW5jLnByb2ZpbGU6CisKIDIwMTIt MDUtMjkgIErDoW5vcyBCYWRpY3MgIDxqYmFkaWNzQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAg ICBbUXRdIE1vZGlmaWVkIE9SV1QgYW5kIE5SV1QgdG8gY2hlY2sgZm9yIHRlc3QgZXhwZWN0YXRp b25zIGluIHBsYXRmb3JtL3F0LTUuMC13azEgdG9vCmRpZmYgLS1naXQgYS9Ub29scy9xbWFrZS9j b25maWcudGVzdHMvbGlid2VicC9saWJ3ZWJwLmNwcCBiL1Rvb2xzL3FtYWtlL2NvbmZpZy50ZXN0 cy9saWJ3ZWJwL2xpYndlYnAuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu Ljk3NDYwM2QKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9xbWFrZS9jb25maWcudGVzdHMvbGli d2VicC9saWJ3ZWJwLmNwcApAQCAtMCwwICsxLDMzIEBACisvKgorICogQ29weXJpZ2h0IChDKSBa b2x0YW4gSG9ydmF0aCAoem9sdGFuQHdlYmtpdC5vcmcpIDIwMTIgVW5pdmVyc2l0eSBvZiBTemVn ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAg IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBk aXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09Q WVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworICogIkFTIElTIiBBTkQgQU5ZIEVYUFJF U1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQg VE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNT IEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5U IFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUg Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBM QVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorICogTElN SVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9T UyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04p IEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRI RVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcg TkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT RQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAid2VicC9kZWNvZGUuaCIKKworaW50 IG1haW4oaW50LCBjaGFyKiopCit7CisgICAgV2ViUERlY29kZXJDb25maWcgY29uZmlnOworICAg IFdlYlBJbml0RGVjb2RlckNvbmZpZygmY29uZmlnKTsKKyAgICByZXR1cm4gMDsKK30KZGlmZiAt LWdpdCBhL1Rvb2xzL3FtYWtlL2NvbmZpZy50ZXN0cy9saWJ3ZWJwL2xpYndlYnAucHJvIGIvVG9v bHMvcW1ha2UvY29uZmlnLnRlc3RzL2xpYndlYnAvbGlid2VicC5wcm8KbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMC4uOTI1NzI1MgotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL3Ft YWtlL2NvbmZpZy50ZXN0cy9saWJ3ZWJwL2xpYndlYnAucHJvCkBAIC0wLDAgKzEsMyBAQAorU09V UkNFUyA9IGxpYndlYnAuY3BwCitPQkpFQ1RTX0RJUiA9IG9iagorTElCUyArPSAtbHdlYnAKZGlm ZiAtLWdpdCBhL1Rvb2xzL3FtYWtlL3N5bmMucHJvZmlsZSBiL1Rvb2xzL3FtYWtlL3N5bmMucHJv ZmlsZQppbmRleCBjMDczNDYwLi4zZWQxYTNkIDEwMDY0NAotLS0gYS9Ub29scy9xbWFrZS9zeW5j LnByb2ZpbGUKKysrIGIvVG9vbHMvcW1ha2Uvc3luYy5wcm9maWxlCkBAIC00LDYgKzQsNyBAQAog ICAgIGdjY2RlcGVuZHMgPT4ge30sCiAgICAgbGlicG5nID0+IHt9LAogICAgIGxpYmpwZWcgPT4g e30sCisgICAgbGlid2VicCA9PiB7fSwKICAgICBsaWJ4bWwyID0+IHt9LAogICAgIGxpYnhzbHQg PT4ge30sCiApOwo= 145576 2012-06-04 06:58:08 -0700 2012-06-11 01:11:27 -0700 proposed patch webpconfigtest.patch text/plain 7475 zoltan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2YjY1ZDFhLi5kYzliNWI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTItMDYtMDQgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgW1F0XSBBZGQgY29uZmlnIHRlc3RzIGZvciBXRUJQIGltYWdlZGVjb2RlciBsaWJyYXJ5 LCBtb2RpZnkgSEFWRShkZWNvZGVybGlicmFyeSkgdG8gVVNFKC4uLikkCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Nzg0MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyB3ZXJlIG5lZWRl ZC4KKworICAgICAgICAqIFRhcmdldC5wcmk6CisgICAgICAgICogV2ViQ29yZS5wcmk6CisgICAg ICAgICogcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkltYWdlRGVjb2Rlcjo6Y3JlYXRlKToKKwogMjAxMi0wNi0wNCAgQWxleGVpIEZp bGlwcG92ICA8YWxleGVpZkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog c3BlZWQgdXAgX2NhbGN1bGF0ZVJldGFpbmVkU2l6ZXMgZnVuY3Rpb24KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL1RhcmdldC5wcmkgYi9Tb3VyY2UvV2ViQ29yZS9UYXJnZXQucHJpCmluZGV4 IGJjMDExN2IuLmU0ZDg1Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1RhcmdldC5wcmkK KysrIGIvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaQpAQCAtNDA2NywxNyArNDA2NywxNiBAQCBj b250YWlucyhERUZJTkVTLCBFTkFCTEVfTUhUTUw9MSkgewogICAgICAgICBwYWdlL1BhZ2VTZXJp YWxpemVyLmNwcAogfQogCi1jb250YWlucyhERUZJTkVTLCBIQVZFX0xJQlBORz0xKSB7Citjb250 YWlucyhERUZJTkVTLCBXVEZfVVNFX0xJQlBORz0xKSB7CiAgICAgU09VUkNFUyArPSBwbGF0Zm9y bS9pbWFnZS1kZWNvZGVycy9pY28vSUNPSW1hZ2VEZWNvZGVyLmNwcCBcCiAgICAgICAgICAgICAg ICBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9wbmcvUE5HSW1hZ2VEZWNvZGVyLmNwcAogfQogCi1j b250YWlucyhERUZJTkVTLCBIQVZFX0xJQkpQRUc9MSkgeworY29udGFpbnMoREVGSU5FUywgV1RG X1VTRV9MSUJKUEVHPTEpIHsKICAgICBTT1VSQ0VTICs9IHBsYXRmb3JtL2ltYWdlLWRlY29kZXJz L2pwZWcvSlBFR0ltYWdlRGVjb2Rlci5jcHAKIH0KIAotY29udGFpbnMoREVGSU5FUywgV1RGX1VT RV9XRUJQPTEpIHsKLSAgICBJTkNMVURFUEFUSCArPSBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy93 ZWJwCitjb250YWlucyhERUZJTkVTLCBXVEZfVVNFX0xJQldFQlA9MSkgewogICAgIEhFQURFUlMg Kz0gcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvd2VicC9XRUJQSW1hZ2VEZWNvZGVyLmgKICAgICBT T1VSQ0VTICs9IHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3dlYnAvV0VCUEltYWdlRGVjb2Rlci5j cHAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUucHJpIGIvU291cmNlL1dl YkNvcmUvV2ViQ29yZS5wcmkKaW5kZXggMDhkYjY0Yy4uZmVkMTBiNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5wcmkKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcmkK QEAgLTcwLDYgKzcwLDcgQEAgSU5DTFVERVBBVEggKz0gXAogICAgICQkU09VUkNFX0RJUi9wbGF0 Zm9ybS9pbWFnZS1kZWNvZGVycy9naWYgXAogICAgICQkU09VUkNFX0RJUi9wbGF0Zm9ybS9pbWFn ZS1kZWNvZGVycy9qcGVnIFwKICAgICAkJFNPVVJDRV9ESVIvcGxhdGZvcm0vaW1hZ2UtZGVjb2Rl cnMvcG5nIFwKKyAgICAkJFNPVVJDRV9ESVIvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvd2VicCBc CiAgICAgJCRTT1VSQ0VfRElSL3BsYXRmb3JtL2xldmVsZGIgXAogICAgICQkU09VUkNFX0RJUi9w bGF0Zm9ybS9tb2NrIFwKICAgICAkJFNPVVJDRV9ESVIvcGxhdGZvcm0vbmV0d29yayBcCkBAIC0y MjgsMjggKzIyOSwyNyBAQCBjb250YWlucyhERUZJTkVTLCBXVEZfVVNFX1RFWFRVUkVfTUFQUEVS X0dMPTEpfGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9XRUJHTD0xKQogICAgIExJQlMgKz0gLWxz cWxpdGUzCiB9CiAKLWNvbnRhaW5zKERFRklORVMsIFdURl9VU0VfV0VCUD0xKSB7Ci0gICAgSU5D TFVERVBBVEggKz0gJCRTT1VSQ0VfRElSL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3dlYnAKLSAg ICBMSUJTICs9IC1sd2VicAotfQotCiBoYXZlUXQoNSkgewogICAgICMgUXQ1IGFsbG93cyB1cyB0 byB1c2UgY29uZmlnIHRlc3RzIHRvIGNoZWNrIGZvciB0aGUgcHJlc2VuY2Ugb2YgdGhlc2UgbGli cmFyaWVzCiAgICAgY29udGFpbnMoY29uZmlnX3Rlc3RfbGlianBlZywgeWVzKSB7Ci0gICAgICAg IERFRklORVMgKz0gSEFWRV9MSUJKUEVHPTEKKyAgICAgICAgREVGSU5FUyArPSBXVEZfVVNFX0xJ QkpQRUc9MQogICAgICAgICBMSUJTICs9IC1sanBlZwogICAgIH0gZWxzZSB7CiAgICAgICAgIHdh cm5pbmcoIkpQRUcgbGlicmFyeSBub3QgZm91bmQhIFFJbWFnZURlY29kZXIgd2lsbCBkZWNvZGUg SlBFRyBpbWFnZXMuIikKICAgICB9CiAgICAgY29udGFpbnMoY29uZmlnX3Rlc3RfbGlicG5nLCB5 ZXMpIHsKLSAgICAgICAgREVGSU5FUyArPSBIQVZFX0xJQlBORz0xCisgICAgICAgIERFRklORVMg Kz0gV1RGX1VTRV9MSUJQTkc9MQogICAgICAgICBMSUJTICs9IC1scG5nCiAgICAgfSBlbHNlIHsK ICAgICAgICAgd2FybmluZygiUE5HIGxpYnJhcnkgbm90IGZvdW5kISBRSW1hZ2VEZWNvZGVyIHdp bGwgZGVjb2RlIFBORyBpbWFnZXMuIikKICAgICB9CisgICAgY29udGFpbnMoY29uZmlnX3Rlc3Rf bGlid2VicCwgeWVzKSB7CisgICAgICAgIERFRklORVMgKz0gV1RGX1VTRV9XRUJQPTEKKyAgICAg ICAgTElCUyArPSAtbHdlYnAKKyAgICB9CiB9IGVsc2UgewogICAgICF3aW4zMi0qOiFtYWMgewot ICAgICAgICBERUZJTkVTICs9IEhBVkVfTElCSlBFRz0xIEhBVkVfTElCUE5HPTEKKyAgICAgICAg REVGSU5FUyArPSBXVEZfVVNFX0xJQkpQRUc9MSBXVEZfVVNFX0xJQlBORz0xCiAgICAgICAgIExJ QlMgKz0gLWxqcGVnIC1scG5nCiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5jcHAKaW5kZXggMDJhYTY4Yy4u NzJiNWRkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2Rl cnMvSW1hZ2VEZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1k ZWNvZGVycy9JbWFnZURlY29kZXIuY3BwCkBAIC0xMDksNyArMTA5LDcgQEAgSW1hZ2VEZWNvZGVy KiBJbWFnZURlY29kZXI6OmNyZWF0ZShjb25zdCBTaGFyZWRCdWZmZXImIGRhdGEsIEltYWdlU291 cmNlOjpBbHBoYU8KICAgICBpZiAobWF0Y2hlc0dJRlNpZ25hdHVyZShjb250ZW50cykpCiAgICAg ICAgIHJldHVybiBuZXcgR0lGSW1hZ2VEZWNvZGVyKGFscGhhT3B0aW9uLCBnYW1tYUFuZENvbG9y UHJvZmlsZU9wdGlvbik7CiAKLSNpZiAhUExBVEZPUk0oUVQpIHx8IChQTEFURk9STShRVCkgJiYg SEFWRShMSUJQTkcpKQorI2lmICFQTEFURk9STShRVCkgfHwgKFBMQVRGT1JNKFFUKSAmJiBVU0Uo TElCUE5HKSkKICAgICBpZiAobWF0Y2hlc1BOR1NpZ25hdHVyZShjb250ZW50cykpCiAgICAgICAg IHJldHVybiBuZXcgUE5HSW1hZ2VEZWNvZGVyKGFscGhhT3B0aW9uLCBnYW1tYUFuZENvbG9yUHJv ZmlsZU9wdGlvbik7CiAKQEAgLTExNyw3ICsxMTcsNyBAQCBJbWFnZURlY29kZXIqIEltYWdlRGVj b2Rlcjo6Y3JlYXRlKGNvbnN0IFNoYXJlZEJ1ZmZlciYgZGF0YSwgSW1hZ2VTb3VyY2U6OkFscGhh TwogICAgICAgICByZXR1cm4gbmV3IElDT0ltYWdlRGVjb2RlcihhbHBoYU9wdGlvbiwgZ2FtbWFB bmRDb2xvclByb2ZpbGVPcHRpb24pOwogI2VuZGlmCiAKLSNpZiAhUExBVEZPUk0oUVQpIHx8IChQ TEFURk9STShRVCkgJiYgSEFWRShMSUJKUEVHKSkKKyNpZiAhUExBVEZPUk0oUVQpIHx8IChQTEFU Rk9STShRVCkgJiYgVVNFKExJQkpQRUcpKQogICAgIGlmIChtYXRjaGVzSlBFR1NpZ25hdHVyZShj b250ZW50cykpCiAgICAgICAgIHJldHVybiBuZXcgSlBFR0ltYWdlRGVjb2RlcihhbHBoYU9wdGlv biwgZ2FtbWFBbmRDb2xvclByb2ZpbGVPcHRpb24pOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Ub29s cy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODkzYTVlMS4uN2E4YTU2NiAxMDA2 NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE1IEBACisyMDEyLTA2LTA0ICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgor CisgICAgICAgIFtRdF0gQWRkIGNvbmZpZyB0ZXN0cyBmb3IgV0VCUCBpbWFnZWRlY29kZXIgbGli cmFyeSwgbW9kaWZ5IEhBVkUoZGVjb2RlcmxpYnJhcnkpIHRvIFVTRSguLi4pCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Nzg0MQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcW1ha2UvY29uZmlnLnRlc3Rz L2xpYndlYnAvbGlid2VicC5jcHA6IEFkZGVkLgorICAgICAgICAobWFpbik6CisgICAgICAgICog cW1ha2UvY29uZmlnLnRlc3RzL2xpYndlYnAvbGlid2VicC5wcm86IEFkZGVkLgorICAgICAgICAq IHFtYWtlL3N5bmMucHJvZmlsZToKKwogMjAxMi0wNi0wNCAgTWlraGFpbCBQb3pkbnlha292ICA8 bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4KIAogICAgICAgICBbRUZMXSBSZXNldCAiV2Vi S2l0VGFiVG9MaW5rc1ByZWZlcmVuY2VLZXkiIGluIER1bXBSZW5kZXJUcmVlQ2hyb21lOjpyZXNl dERlZmF1bHRzVG9Db25zaXN0ZW50VmFsdWVzCmRpZmYgLS1naXQgYS9Ub29scy9xbWFrZS9jb25m aWcudGVzdHMvbGlid2VicC9saWJ3ZWJwLmNwcCBiL1Rvb2xzL3FtYWtlL2NvbmZpZy50ZXN0cy9s aWJ3ZWJwL2xpYndlYnAuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjk3 NDYwM2QKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9xbWFrZS9jb25maWcudGVzdHMvbGlid2Vi cC9saWJ3ZWJwLmNwcApAQCAtMCwwICsxLDMzIEBACisvKgorICogQ29weXJpZ2h0IChDKSBab2x0 YW4gSG9ydmF0aCAoem9sdGFuQHdlYmtpdC5vcmcpIDIwMTIgVW5pdmVyc2l0eSBvZiBTemVnZWQu CisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRp c3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdo dAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3Qg cmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRv Y3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0 cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJ R0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8s IFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNI QUxMIFRIRSBDT1BZUklHSFQKKyAqIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9S IEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZ LCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRF RCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBP RiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhP V0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIg SU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVH TElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQor ICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBP RiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAid2VicC9kZWNvZGUuaCIKKworaW50IG1h aW4oaW50LCBjaGFyKiopCit7CisgICAgV2ViUERlY29kZXJDb25maWcgY29uZmlnOworICAgIFdl YlBJbml0RGVjb2RlckNvbmZpZygmY29uZmlnKTsKKyAgICByZXR1cm4gMDsKK30KZGlmZiAtLWdp dCBhL1Rvb2xzL3FtYWtlL2NvbmZpZy50ZXN0cy9saWJ3ZWJwL2xpYndlYnAucHJvIGIvVG9vbHMv cW1ha2UvY29uZmlnLnRlc3RzL2xpYndlYnAvbGlid2VicC5wcm8KbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uOTI1NzI1MgotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL3FtYWtl L2NvbmZpZy50ZXN0cy9saWJ3ZWJwL2xpYndlYnAucHJvCkBAIC0wLDAgKzEsMyBAQAorU09VUkNF UyA9IGxpYndlYnAuY3BwCitPQkpFQ1RTX0RJUiA9IG9iagorTElCUyArPSAtbHdlYnAKZGlmZiAt LWdpdCBhL1Rvb2xzL3FtYWtlL3N5bmMucHJvZmlsZSBiL1Rvb2xzL3FtYWtlL3N5bmMucHJvZmls ZQppbmRleCBjMDczNDYwLi4zZWQxYTNkIDEwMDY0NAotLS0gYS9Ub29scy9xbWFrZS9zeW5jLnBy b2ZpbGUKKysrIGIvVG9vbHMvcW1ha2Uvc3luYy5wcm9maWxlCkBAIC00LDYgKzQsNyBAQAogICAg IGdjY2RlcGVuZHMgPT4ge30sCiAgICAgbGlicG5nID0+IHt9LAogICAgIGxpYmpwZWcgPT4ge30s CisgICAgbGlid2VicCA9PiB7fSwKICAgICBsaWJ4bWwyID0+IHt9LAogICAgIGxpYnhzbHQgPT4g e30sCiApOwo=