96358 2012-09-11 00:21:02 -0700 [Qt] Build on Windows requires bison/flex in PATH 2012-09-12 09:43:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 96359 1 hausmann hausmann abecsi dino kevin.funk vestbo webkit.review.bot oldest_to_newest 716894 0 hausmann 2012-09-11 00:21:02 -0700 [Qt] Build on Windows requires bison/flex in PATH 716897 1 163292 hausmann 2012-09-11 00:26:45 -0700 Created attachment 163292 Patch 716952 2 163305 hausmann 2012-09-11 01:57:53 -0700 Created attachment 163305 Patch Updated patch to accomodate ANGLE windows build 717969 3 163526 hausmann 2012-09-11 23:54:17 -0700 Created attachment 163526 Patch Updated patch that modifies the tools-in-PATH check on Windows to look for win_flex instead of flex 718337 4 163305 webkit.review.bot 2012-09-12 07:34:40 -0700 Comment on attachment 163305 Patch Clearing flags on attachment: 163305 Committed r128308: <http://trac.webkit.org/changeset/128308> 718338 5 webkit.review.bot 2012-09-12 07:34:44 -0700 All reviewed patches have been landed. Closing bug. 718425 6 kevin.funk 2012-09-12 09:02:12 -0700 Note: This patch breaks the generator commands in case GNUTOOLS references an invalid directory, please reconsider. '$${GNUTOOLS} && $$val_escape($${generator}.commands)' then evaluates to 'SOME_DIR && ...' which breaks compilation. 718460 7 hausmann 2012-09-12 09:34:11 -0700 (In reply to comment #6) > Note: This patch breaks the generator commands in case GNUTOOLS references an invalid directory, please reconsider. > > '$${GNUTOOLS} && $$val_escape($${generator}.commands)' then evaluates to 'SOME_DIR && ...' which breaks compilation. Ooops! Well spotted. I'll fix it right away. 718468 8 hausmann 2012-09-12 09:43:09 -0700 Prospectively fixed in http://trac.webkit.org/changeset/128328 163292 2012-09-11 00:26:45 -0700 2012-09-11 01:57:48 -0700 Patch bug-96358-20120911092830.patch text/plain 4365 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MTUwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWM0NDYxMTBlMmEzNzlmMDE5NzlhMzVjNzgxMDIxZjUy MTdmNDk4Yi4uOTA5ZGJhNTk3NWM0Y2NmMzM2Y2EwNGVlZWY4NjQzZTQ0ZmEwNmExMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDEyLTA5LTExICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNv bT4KKworICAgICAgICBbUXRdIEJ1aWxkIG9uIFdpbmRvd3MgcmVxdWlyZXMgYmlzb24vZmxleCBp biBQQVRICisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 NjM1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo ZSBidWlsZCByZXF1aXJlcyBmbGV4LCBiaXNvbiwgZXRjLiBhbmQgdGhleSBuZWVkIHRvIGJlIGlu IHRoZSBQQVRIIHdoZW4gYnVpbGRpbmcuIE9uIE1hYyBPUyBYCisgICAgICAgIGFuZCBMaW51eCB0 aGF0IGlzIHJhcmVseSBhIHByb2JsZW0gZ2l2ZW4gaG93IGVhc2lseSBhdmFpbGFibGUgdGhlIHRv b2xzIGFyZS4gT24gV2luZG93cyBob3dldmVyCisgICAgICAgIGEgc2VwYXJhdGUgaW5zdGFsbGF0 aW9uIG9mIHZhcmlvdXMgR05VIHRvb2xzIGlzIHJlcXVpcmVkIGFzIHRoZSBvcGVyYXRpbmcgc3lz dGVtIGRvZXNuJ3QgY29tZSB3aXRoCisgICAgICAgIHRoZW0uIFRvIG1ha2UgdGhlIGRldmVsb3Bt ZW50IG1vcmUgY29udmVuaWVudCwgUXQgNSBwcm92aWRlcyBhIGNvcHkgb2YgdGhlIG1vc3QgZXNz ZW50aWFsIHRvb2xzIGluCisgICAgICAgIHRoZSBnbnV3aW4zMiBkaXJlY3Rvcnkgb2YgdGhlIHF0 NS5naXQgdG9wLWxldmVsIHJlcG9zaXRvcnkuCisKKyAgICAgICAgVGhpcyBwYXRjaCB0cmllcyB0 byBkZXRlY3QgdGhlIHByZXNlbmNlIG9mIHRob3NlIHRvb2xzIGFuZCBwcmVwZW5kcyB0aGVtIHRv IHRoZSBQQVRIIGlmIGZvdW5kLgorCisgICAgICAgIFRoaXMgaXMgcmVxdWlyZWQgaW4gcHJlcGFy YXRpb24gZm9yIHRoZSBlbGltaW5hdGlvbiBvZiBxdDUvcXR3ZWJraXQucHJpLCB3aGljaCBjdXJy ZW50bHkgZXhwYW5kcworICAgICAgICBQQVRIIGJlZm9yZSBjYWxsaW5nIGJ1aWxkLXdlYmtpdC4g SXQgaXQgYWxzbyByZXF1aXJlZCBmb3IgdGhlIHVwY29taW5nIGludHJvZHVjdGlvbiBvZiB3aW5f ZmxleAorICAgICAgICBhcyBkZXBlbmRlbmN5IG92ZXIgZmxleCwgd2hpY2ggY2FuIGJlIGRvbmUg d2l0aCBsZXNzIGhhc3NsZSB3aGVuIHF0NSdzIGdudXdpbjMyIGRpcmVjdG9yeSBoYXMgYmVlbgor ICAgICAgICB1cGRhdGVkIHdpdGggdGhlIG5ldyB0b29sLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRkaXJzLnBtOgorICAgICAgICAoY2hlY2tSZXF1aXJlZFN5c3RlbUNvbmZpZyk6CisgICAg ICAgICogcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9kZWZhdWx0X3Bvc3QucHJmOgorCiAyMDEyLTA5 LTEwICBKb2FubWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KIAogICAgICAgICBQcm9w ZXJseSBleHBvc2UgPGxlZ2VuZD4gZWxlbWVudHMgdG8gQVRzCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXgg NGJiZTJkODVkZTU4N2U3YmU1OGZlNTFjMTI3NmY3MmQ1MzQ3MmMzOS4uMTMyNzg2NjhjNDI0Yjdi ZDJjNTU4OGNjMWVhODViNmVjNzllYmJjYSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMTU2MSw2ICsx NTYxLDE0IEBAIHN1YiBjaGVja1JlcXVpcmVkU3lzdGVtQ29uZmlnCiAgICAgfSBlbHNpZiAoaXNH dGsoKSBvciBpc1F0KCkgb3IgaXNXeCgpIG9yIGlzRWZsKCkpIHsKICAgICAgICAgbXkgQGNtZHMg PSBxdyhmbGV4IGJpc29uIGdwZXJmKTsKICAgICAgICAgbXkgQG1pc3NpbmcgPSAoKTsKKyAgICAg ICAgbXkgJG9sZFBhdGggPSAkRU5We1BBVEh9OworICAgICAgICBpZiAoaXNRdCgpIGFuZCBpc1dp bmRvd3MoKSkgeworICAgICAgICAgICAgY2hvbXAobXkgJGdudVdpbjMyRGlyID0gYCRxbWFrZWJp biAtcXVlcnkgUVRfSE9TVF9EQVRBYCk7CisgICAgICAgICAgICAkZ251V2luMzJEaXIgPSBGaWxl OjpTcGVjLT5jYXRmaWxlKCRnbnVXaW4zMkRpciwgIi4uIiwgImdudXdpbjMyIiwgImJpbiIpOwor ICAgICAgICAgICAgaWYgKC1kICIkZ251V2luMzJEaXIiKSB7CisgICAgICAgICAgICAgICAgJEVO VntQQVRIfSA9ICRnbnVXaW4zMkRpciAuICI7IiAuICRFTlZ7UEFUSH07CisgICAgICAgICAgICB9 CisgICAgICAgIH0KICAgICAgICAgZm9yZWFjaCBteSAkY21kIChAY21kcykgewogICAgICAgICAg ICAgcHVzaCBAbWlzc2luZywgJGNtZCBpZiBub3QgY29tbWFuZEV4aXN0cygkY21kKTsKICAgICAg ICAgfQpAQCAtMTU2OSw2ICsxNTc3LDkgQEAgc3ViIGNoZWNrUmVxdWlyZWRTeXN0ZW1Db25maWcK ICAgICAgICAgICAgIG15ICRsaXN0ID0gam9pbiAiLCAiLCBAbWlzc2luZzsKICAgICAgICAgICAg IGRpZSAiRVJST1I6ICRsaXN0IG1pc3NpbmcgYnV0IHJlcXVpcmVkIHRvIGJ1aWxkIFdlYktpdC5c biI7CiAgICAgICAgIH0KKyAgICAgICAgaWYgKGlzUXQoKSBhbmQgaXNXaW5kb3dzKCkpIHsKKyAg ICAgICAgICAgICRFTlZ7UEFUSH0gPSAkb2xkUGF0aDsKKyAgICAgICAgfQogICAgIH0KICAgICAj IFdpbjMyIGFuZCBvdGhlciBwbGF0Zm9ybXMgbWF5IHdhbnQgdG8gY2hlY2sgZm9yIG1pbmltdW0g Y29uZmlnCiB9CmRpZmYgLS1naXQgYS9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2RlZmF1 bHRfcG9zdC5wcmYgYi9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2RlZmF1bHRfcG9zdC5w cmYKaW5kZXggNWY1MTNmYTA4MWJlNjhlNmJlYmY0OTc3MzQ0N2QxOTg0MGE3NmIwOC4uMTJmMDkz YTU5OTFhYzhkYjY4YmUwODZlNmFjOTE0YTkxZGJmZDM1YiAxMDA2NDQKLS0tIGEvVG9vbHMvcW1h a2UvbWtzcGVjcy9mZWF0dXJlcy9kZWZhdWx0X3Bvc3QucHJmCisrKyBiL1Rvb2xzL3FtYWtlL21r c3BlY3MvZmVhdHVyZXMvZGVmYXVsdF9wb3N0LnByZgpAQCAtNjQsNiArNjQsMTcgQEAgY29udGFp bnMoVEVNUExBVEUsIGRlcml2ZWQpIHsKIAogICAgIENPTkZJRyAtPSBkZWJ1Z19hbmRfcmVsZWFz ZQogCisgICAgIyBBIGxvdCBvZiBvdXIgY29kZSBnZW5lcmF0b3JzIHJlcXVpcmUgR05VIHRvb2xz LCByZWFkaWx5IGF2YWlsYWJsZQorICAgICMgb24gTGludXggYW5kIE1hYyBPUyBYLiBPbiBXaW5k b3dzIHdlIGRvIGhhdmUgYSBjb252ZW5pZW5jZSBjb3B5IGluCisgICAgIyBRdDUncyB0b3AtbGV2 ZWwgcmVwb3NpdG9yeSwgc28gbGV0J3MgYWRkIHRoYXQgdG8gdGhlIFBBVEggaWYgd2UgY2FuCisg ICAgIyBmaW5kIGl0LgorICAgIHdpbjMyIHsKKyAgICAgICAgR05VVE9PTFM9JCRbUVRfSE9TVF9E QVRBXS8uLi9nbnV3aW4zMi9iaW4KKyAgICAgICAgZXhpc3RzKCQkR05VVE9PTFMvZ3BlcmYuZXhl KSB7CisgICAgICAgICAgICBHTlVUT09MUyA9ICIoc2V0ICQkZXNjYXBlX2V4cGFuZChcXFwiKVBB VEg9JCR0b1N5c3RlbVBhdGgoJCRHTlVUT09MUyk7JVBBVEglJCRlc2NhcGVfZXhwYW5kKFxcXCIp KSIKKyAgICAgICAgfQorICAgIH0KKwogICAgIGZvcihnZW5lcmF0b3IsIEdFTkVSQVRPUlMpIHsK ICAgICAgICAgZXZhbCgkJHtnZW5lcmF0b3J9LkNPTkZJRyA9IHRhcmdldF9wcmVkZXBzIG5vX2xp bmspCiAgICAgICAgIGV2YWwoJCR7Z2VuZXJhdG9yfS5kZXBlbmRlbmN5X3R5cGUgPSBUWVBFX0Mp CkBAIC03NSw2ICs4NiwxMSBAQCBjb250YWlucyhURU1QTEFURSwgZGVyaXZlZCkgewogICAgICAg ICBzY3JpcHQgPSAkJGV2YWwoJCR7Z2VuZXJhdG9yfS5zY3JpcHQpCiAgICAgICAgIGV2YWwoJCR7 Z2VuZXJhdG9yfS5kZXBlbmRzICs9ICQkc2NyaXB0KQogCisgICAgICAgIGNvbW1hbmRzID0gJCRl dmFsKCQke2dlbmVyYXRvcn0uY29tbWFuZHMpCisgICAgICAgICFpc0VtcHR5KGNvbW1hbmRzKToh aXNFbXB0eShHTlVUT09MUykgeworICAgICAgICAgICAgZXZhbCgkJHtnZW5lcmF0b3J9LmNvbW1h bmRzID0gJCR7R05VVE9PTFN9ICYmICQkdmFsX2VzY2FwZSgkJHtnZW5lcmF0b3J9LmNvbW1hbmRz KSkKKyAgICAgICAgfQorCiAgICAgICAgICFpc0VtcHR5KCQke2dlbmVyYXRvcn0uaW5wdXQpIHsK ICAgICAgICAgICAgICMgQ29tcGlsZXItc3R5bGUgZ2VuZXJhdG9yCiAgICAgICAgICAgICBRTUFL RV9FWFRSQV9DT01QSUxFUlMgKz0gJCRnZW5lcmF0b3IK 163305 2012-09-11 01:57:53 -0700 2012-09-12 07:34:40 -0700 Patch bug-96358-20120911105938.patch text/plain 5957 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggMDc5NzYzYTk1MTM4MTRmNThhYmI2MDZkYmRiMWFkY2U2MjRlY2Q0My4uMmUxMmY5N2FjYjJi MTY1YzZiNzRmMzE2NjE1YmM1NzM1OTNhODE5NyAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA5LTExICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhh dXNtYW5uQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIEJ1aWxkIG9uIFdpbmRvd3MgcmVxdWly ZXMgYmlzb24vZmxleCBpbiBQQVRICisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05NjM1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFVzZSBNQUtFRklMRV9OT09QX0NPTU1BTkQgaW5zdGVhZCBvZiB0aGUgXG5c dCB0cmljayB0byBnZW5lcmF0ZSBhIGR1bW15IGNvbW1hbmQuIE90aGVyd2lzZQorICAgICAgICB0 aGUgUEFUSCBwcmVwZW5kIHRyaWNrIHdpbGwgYnJlYWsgYmVjYXVzZSBpdCBnZW5lcmF0ZXMgYSBj b21tYW5kIGxpbmUgYWxvbmcgdGhlIGxpbmVzIG9mCisgICAgICAgIChzZXQgUEFUSD0iLi4uIikg JiYgd2l0aCBqdXN0IHRoYXQgdHJhaWxpbmcgYW1wZXJzYW5kIHBhaXIuCisKKyAgICAgICAgKiBE ZXJpdmVkU291cmNlcy5wcmk6CisKIDIwMTItMDktMDYgIEFuZHJhcyBCZWNzaSAgPGFuZHJhcy5i ZWNzaUBub2tpYS5jb20+CiAKICAgICAgICAgW0FOR0xFXSBGaXggdGhlIGJ1aWxkIHdpdGggZ2Nj IDQuNwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvRGVyaXZlZFNvdXJjZXMu cHJpIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvRGVyaXZlZFNvdXJjZXMucHJpCmluZGV4IDc5 MWU1MjczNTE0ZTczYWQ2NTBhYmM3YzU1YjNjMGFiNTRmNWU2N2UuLjA0YWU4YzFjMzNmZmVhYjk5 ZTNlZjZjYWFkMzA3ZjYyNGI0NzMwNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL0Rlcml2ZWRTb3VyY2VzLnByaQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9EZXJp dmVkU291cmNlcy5wcmkKQEAgLTMxLDcgKzMxLDcgQEAgYW5nbGViaXNvbl9kZWNsLnZhcmlhYmxl X291dCA9IEdFTkVSQVRFRF9GSUxFUwogR0VORVJBVE9SUyArPSBhbmdsZWJpc29uX2RlY2wKIAog YW5nbGViaXNvbl9pbXBsLmlucHV0ID0gQU5HTEVfQklTT05fU09VUkNFUwotYW5nbGViaXNvbl9p bXBsLmNvbW1hbmRzID0gJCRlc2NhcGVfZXhwYW5kKFxcbikKK2FuZ2xlYmlzb25faW1wbC5jb21t YW5kcyA9ICQkTUFLRUZJTEVfTk9PUF9DT01NQU5ECiBhbmdsZWJpc29uX2ltcGwuZGVwZW5kcyA9 ICQkR0VORVJBVEVEX1NPVVJDRVNfREVTVERJUi8ke1FNQUtFX0ZJTEVfQkFTRX1fdGFiLmgKIGFu Z2xlYmlzb25faW1wbC5vdXRwdXQgPSAke1FNQUtFX0ZJTEVfQkFTRX1fdGFiLmNwcAogR0VORVJB VE9SUyArPSBhbmdsZWJpc29uX2ltcGwKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rv b2xzL0NoYW5nZUxvZwppbmRleCA5YzQ0NjExMGUyYTM3OWYwMTk3OWEzNWM3ODEwMjFmNTIxN2Y0 OThiLi45MDlkYmE1OTc1YzRjY2YzMzZjYTA0ZWVlZjg2NDNlNDRmYTA2YTEwIDEwMDY0NAotLS0g YS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAK KzIwMTItMDktMTEgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgor CisgICAgICAgIFtRdF0gQnVpbGQgb24gV2luZG93cyByZXF1aXJlcyBiaXNvbi9mbGV4IGluIFBB VEgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2MzU4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGJ1 aWxkIHJlcXVpcmVzIGZsZXgsIGJpc29uLCBldGMuIGFuZCB0aGV5IG5lZWQgdG8gYmUgaW4gdGhl IFBBVEggd2hlbiBidWlsZGluZy4gT24gTWFjIE9TIFgKKyAgICAgICAgYW5kIExpbnV4IHRoYXQg aXMgcmFyZWx5IGEgcHJvYmxlbSBnaXZlbiBob3cgZWFzaWx5IGF2YWlsYWJsZSB0aGUgdG9vbHMg YXJlLiBPbiBXaW5kb3dzIGhvd2V2ZXIKKyAgICAgICAgYSBzZXBhcmF0ZSBpbnN0YWxsYXRpb24g b2YgdmFyaW91cyBHTlUgdG9vbHMgaXMgcmVxdWlyZWQgYXMgdGhlIG9wZXJhdGluZyBzeXN0ZW0g ZG9lc24ndCBjb21lIHdpdGgKKyAgICAgICAgdGhlbS4gVG8gbWFrZSB0aGUgZGV2ZWxvcG1lbnQg bW9yZSBjb252ZW5pZW50LCBRdCA1IHByb3ZpZGVzIGEgY29weSBvZiB0aGUgbW9zdCBlc3NlbnRp YWwgdG9vbHMgaW4KKyAgICAgICAgdGhlIGdudXdpbjMyIGRpcmVjdG9yeSBvZiB0aGUgcXQ1Lmdp dCB0b3AtbGV2ZWwgcmVwb3NpdG9yeS4KKworICAgICAgICBUaGlzIHBhdGNoIHRyaWVzIHRvIGRl dGVjdCB0aGUgcHJlc2VuY2Ugb2YgdGhvc2UgdG9vbHMgYW5kIHByZXBlbmRzIHRoZW0gdG8gdGhl IFBBVEggaWYgZm91bmQuCisKKyAgICAgICAgVGhpcyBpcyByZXF1aXJlZCBpbiBwcmVwYXJhdGlv biBmb3IgdGhlIGVsaW1pbmF0aW9uIG9mIHF0NS9xdHdlYmtpdC5wcmksIHdoaWNoIGN1cnJlbnRs eSBleHBhbmRzCisgICAgICAgIFBBVEggYmVmb3JlIGNhbGxpbmcgYnVpbGQtd2Via2l0LiBJdCBp dCBhbHNvIHJlcXVpcmVkIGZvciB0aGUgdXBjb21pbmcgaW50cm9kdWN0aW9uIG9mIHdpbl9mbGV4 CisgICAgICAgIGFzIGRlcGVuZGVuY3kgb3ZlciBmbGV4LCB3aGljaCBjYW4gYmUgZG9uZSB3aXRo IGxlc3MgaGFzc2xlIHdoZW4gcXQ1J3MgZ251d2luMzIgZGlyZWN0b3J5IGhhcyBiZWVuCisgICAg ICAgIHVwZGF0ZWQgd2l0aCB0aGUgbmV3IHRvb2wuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dGRpcnMucG06CisgICAgICAgIChjaGVja1JlcXVpcmVkU3lzdGVtQ29uZmlnKToKKyAgICAgICAg KiBxbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2RlZmF1bHRfcG9zdC5wcmY6CisKIDIwMTItMDktMTAg IEpvYW5tYXJpZSBEaWdncyAgPGpkaWdnc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFByb3Blcmx5 IGV4cG9zZSA8bGVnZW5kPiBlbGVtZW50cyB0byBBVHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCA0YmJl MmQ4NWRlNTg3ZTdiZTU4ZmU1MWMxMjc2ZjcyZDUzNDcyYzM5Li4xMzI3ODY2OGM0MjRiN2JkMmM1 NTg4Y2MxZWE4NWI2ZWM3OWViYmNhIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0xNTYxLDYgKzE1NjEs MTQgQEAgc3ViIGNoZWNrUmVxdWlyZWRTeXN0ZW1Db25maWcKICAgICB9IGVsc2lmIChpc0d0aygp IG9yIGlzUXQoKSBvciBpc1d4KCkgb3IgaXNFZmwoKSkgewogICAgICAgICBteSBAY21kcyA9IHF3 KGZsZXggYmlzb24gZ3BlcmYpOwogICAgICAgICBteSBAbWlzc2luZyA9ICgpOworICAgICAgICBt eSAkb2xkUGF0aCA9ICRFTlZ7UEFUSH07CisgICAgICAgIGlmIChpc1F0KCkgYW5kIGlzV2luZG93 cygpKSB7CisgICAgICAgICAgICBjaG9tcChteSAkZ251V2luMzJEaXIgPSBgJHFtYWtlYmluIC1x dWVyeSBRVF9IT1NUX0RBVEFgKTsKKyAgICAgICAgICAgICRnbnVXaW4zMkRpciA9IEZpbGU6OlNw ZWMtPmNhdGZpbGUoJGdudVdpbjMyRGlyLCAiLi4iLCAiZ251d2luMzIiLCAiYmluIik7CisgICAg ICAgICAgICBpZiAoLWQgIiRnbnVXaW4zMkRpciIpIHsKKyAgICAgICAgICAgICAgICAkRU5We1BB VEh9ID0gJGdudVdpbjMyRGlyIC4gIjsiIC4gJEVOVntQQVRIfTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgfQogICAgICAgICBmb3JlYWNoIG15ICRjbWQgKEBjbWRzKSB7CiAgICAgICAgICAgICBw dXNoIEBtaXNzaW5nLCAkY21kIGlmIG5vdCBjb21tYW5kRXhpc3RzKCRjbWQpOwogICAgICAgICB9 CkBAIC0xNTY5LDYgKzE1NzcsOSBAQCBzdWIgY2hlY2tSZXF1aXJlZFN5c3RlbUNvbmZpZwogICAg ICAgICAgICAgbXkgJGxpc3QgPSBqb2luICIsICIsIEBtaXNzaW5nOwogICAgICAgICAgICAgZGll ICJFUlJPUjogJGxpc3QgbWlzc2luZyBidXQgcmVxdWlyZWQgdG8gYnVpbGQgV2ViS2l0LlxuIjsK ICAgICAgICAgfQorICAgICAgICBpZiAoaXNRdCgpIGFuZCBpc1dpbmRvd3MoKSkgeworICAgICAg ICAgICAgJEVOVntQQVRIfSA9ICRvbGRQYXRoOworICAgICAgICB9CiAgICAgfQogICAgICMgV2lu MzIgYW5kIG90aGVyIHBsYXRmb3JtcyBtYXkgd2FudCB0byBjaGVjayBmb3IgbWluaW11bSBjb25m aWcKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvZGVmYXVsdF9w b3N0LnByZiBiL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvZGVmYXVsdF9wb3N0LnByZgpp bmRleCA1ZjUxM2ZhMDgxYmU2OGU2YmViZjQ5NzczNDQ3ZDE5ODQwYTc2YjA4Li4xMmYwOTNhNTk5 MWFjOGRiNjhiZTA4NmU2YWM5MTRhOTFkYmZkMzViIDEwMDY0NAotLS0gYS9Ub29scy9xbWFrZS9t a3NwZWNzL2ZlYXR1cmVzL2RlZmF1bHRfcG9zdC5wcmYKKysrIGIvVG9vbHMvcW1ha2UvbWtzcGVj cy9mZWF0dXJlcy9kZWZhdWx0X3Bvc3QucHJmCkBAIC02NCw2ICs2NCwxNyBAQCBjb250YWlucyhU RU1QTEFURSwgZGVyaXZlZCkgewogCiAgICAgQ09ORklHIC09IGRlYnVnX2FuZF9yZWxlYXNlCiAK KyAgICAjIEEgbG90IG9mIG91ciBjb2RlIGdlbmVyYXRvcnMgcmVxdWlyZSBHTlUgdG9vbHMsIHJl YWRpbHkgYXZhaWxhYmxlCisgICAgIyBvbiBMaW51eCBhbmQgTWFjIE9TIFguIE9uIFdpbmRvd3Mg d2UgZG8gaGF2ZSBhIGNvbnZlbmllbmNlIGNvcHkgaW4KKyAgICAjIFF0NSdzIHRvcC1sZXZlbCBy ZXBvc2l0b3J5LCBzbyBsZXQncyBhZGQgdGhhdCB0byB0aGUgUEFUSCBpZiB3ZSBjYW4KKyAgICAj IGZpbmQgaXQuCisgICAgd2luMzIgeworICAgICAgICBHTlVUT09MUz0kJFtRVF9IT1NUX0RBVEFd Ly4uL2dudXdpbjMyL2JpbgorICAgICAgICBleGlzdHMoJCRHTlVUT09MUy9ncGVyZi5leGUpIHsK KyAgICAgICAgICAgIEdOVVRPT0xTID0gIihzZXQgJCRlc2NhcGVfZXhwYW5kKFxcXCIpUEFUSD0k JHRvU3lzdGVtUGF0aCgkJEdOVVRPT0xTKTslUEFUSCUkJGVzY2FwZV9leHBhbmQoXFxcIikpIgor ICAgICAgICB9CisgICAgfQorCiAgICAgZm9yKGdlbmVyYXRvciwgR0VORVJBVE9SUykgewogICAg ICAgICBldmFsKCQke2dlbmVyYXRvcn0uQ09ORklHID0gdGFyZ2V0X3ByZWRlcHMgbm9fbGluaykK ICAgICAgICAgZXZhbCgkJHtnZW5lcmF0b3J9LmRlcGVuZGVuY3lfdHlwZSA9IFRZUEVfQykKQEAg LTc1LDYgKzg2LDExIEBAIGNvbnRhaW5zKFRFTVBMQVRFLCBkZXJpdmVkKSB7CiAgICAgICAgIHNj cmlwdCA9ICQkZXZhbCgkJHtnZW5lcmF0b3J9LnNjcmlwdCkKICAgICAgICAgZXZhbCgkJHtnZW5l cmF0b3J9LmRlcGVuZHMgKz0gJCRzY3JpcHQpCiAKKyAgICAgICAgY29tbWFuZHMgPSAkJGV2YWwo JCR7Z2VuZXJhdG9yfS5jb21tYW5kcykKKyAgICAgICAgIWlzRW1wdHkoY29tbWFuZHMpOiFpc0Vt cHR5KEdOVVRPT0xTKSB7CisgICAgICAgICAgICBldmFsKCQke2dlbmVyYXRvcn0uY29tbWFuZHMg PSAkJHtHTlVUT09MU30gJiYgJCR2YWxfZXNjYXBlKCQke2dlbmVyYXRvcn0uY29tbWFuZHMpKQor ICAgICAgICB9CisKICAgICAgICAgIWlzRW1wdHkoJCR7Z2VuZXJhdG9yfS5pbnB1dCkgewogICAg ICAgICAgICAgIyBDb21waWxlci1zdHlsZSBnZW5lcmF0b3IKICAgICAgICAgICAgIFFNQUtFX0VY VFJBX0NPTVBJTEVSUyArPSAkJGdlbmVyYXRvcgo= 163526 2012-09-11 23:54:17 -0700 2012-09-11 23:55:40 -0700 Patch bug-96358-20120912085603.patch text/plain 6261 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MjY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggZmFlZDk0ZTY5MTUyOTExNDBhMDhkMDRhNzZhNzUzOTY1M2M3MmQ5MS4uOWQ2NmE5MjEyZjVm ZmNlYjI0NWNkZjI4NTZhMjQwZTBhYWU2NTk2OSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA5LTExICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhh dXNtYW5uQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIEJ1aWxkIG9uIFdpbmRvd3MgcmVxdWly ZXMgYmlzb24vZmxleCBpbiBQQVRICisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05NjM1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFVzZSBNQUtFRklMRV9OT09QX0NPTU1BTkQgaW5zdGVhZCBvZiB0aGUgXG5c dCB0cmljayB0byBnZW5lcmF0ZSBhIGR1bW15IGNvbW1hbmQuIE90aGVyd2lzZQorICAgICAgICB0 aGUgUEFUSCBwcmVwZW5kIHRyaWNrIHdpbGwgYnJlYWsgYmVjYXVzZSBpdCBnZW5lcmF0ZXMgYSBj b21tYW5kIGxpbmUgYWxvbmcgdGhlIGxpbmVzIG9mCisgICAgICAgIChzZXQgUEFUSD0iLi4uIikg JiYgd2l0aCBqdXN0IHRoYXQgdHJhaWxpbmcgYW1wZXJzYW5kIHBhaXIuCisKKyAgICAgICAgKiBE ZXJpdmVkU291cmNlcy5wcmk6CisKIDIwMTItMDktMTAgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBw bGUuY29tPgogCiAgICAgICAgIFtBcHBsZV0gSW5zdGFsbCBwbGlzdCBmb3IgQXBwbGUgT3BlbiBT b3VyY2UgYnVpbGQgc3lzdGVtCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9E ZXJpdmVkU291cmNlcy5wcmkgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9EZXJpdmVkU291cmNl cy5wcmkKaW5kZXggNzkxZTUyNzM1MTRlNzNhZDY1MGFiYzdjNTViM2MwYWI1NGY1ZTY3ZS4uMDRh ZThjMWMzM2ZmZWFiOTllM2VmNmNhYWQzMDdmNjI0YjQ3MzA3NiAxMDA2NDQKLS0tIGEvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvRGVyaXZlZFNvdXJjZXMucHJpCisrKyBiL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL0Rlcml2ZWRTb3VyY2VzLnByaQpAQCAtMzEsNyArMzEsNyBAQCBhbmdsZWJpc29u X2RlY2wudmFyaWFibGVfb3V0ID0gR0VORVJBVEVEX0ZJTEVTCiBHRU5FUkFUT1JTICs9IGFuZ2xl Ymlzb25fZGVjbAogCiBhbmdsZWJpc29uX2ltcGwuaW5wdXQgPSBBTkdMRV9CSVNPTl9TT1VSQ0VT Ci1hbmdsZWJpc29uX2ltcGwuY29tbWFuZHMgPSAkJGVzY2FwZV9leHBhbmQoXFxuKQorYW5nbGVi aXNvbl9pbXBsLmNvbW1hbmRzID0gJCRNQUtFRklMRV9OT09QX0NPTU1BTkQKIGFuZ2xlYmlzb25f aW1wbC5kZXBlbmRzID0gJCRHRU5FUkFURURfU09VUkNFU19ERVNURElSLyR7UU1BS0VfRklMRV9C QVNFfV90YWIuaAogYW5nbGViaXNvbl9pbXBsLm91dHB1dCA9ICR7UU1BS0VfRklMRV9CQVNFfV90 YWIuY3BwCiBHRU5FUkFUT1JTICs9IGFuZ2xlYmlzb25faW1wbApkaWZmIC0tZ2l0IGEvVG9vbHMv Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDJkZTU2NWVlYjcxNDhkOWMxMTRhOTM5 Yjg4YjU1OWIyMjYzMTYxOTguLjk5YzU1OTgwMmNiNWVhY2EyZmRiMDUwZDY5MmZjNDBiNmQ3ZTZi YTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyNyBAQAorMjAxMi0wOS0xMSAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFu bkBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XSBCdWlsZCBvbiBXaW5kb3dzIHJlcXVpcmVzIGJp c29uL2ZsZXggaW4gUEFUSAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTYzNTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGUgYnVpbGQgcmVxdWlyZXMgZmxleCwgYmlzb24sIGV0Yy4gYW5kIHRoZXkgbmVl ZCB0byBiZSBpbiB0aGUgUEFUSCB3aGVuIGJ1aWxkaW5nLiBPbiBNYWMgT1MgWAorICAgICAgICBh bmQgTGludXggdGhhdCBpcyByYXJlbHkgYSBwcm9ibGVtIGdpdmVuIGhvdyBlYXNpbHkgYXZhaWxh YmxlIHRoZSB0b29scyBhcmUuIE9uIFdpbmRvd3MgaG93ZXZlcgorICAgICAgICBhIHNlcGFyYXRl IGluc3RhbGxhdGlvbiBvZiB2YXJpb3VzIEdOVSB0b29scyBpcyByZXF1aXJlZCBhcyB0aGUgb3Bl cmF0aW5nIHN5c3RlbSBkb2Vzbid0IGNvbWUgd2l0aAorICAgICAgICB0aGVtLiBUbyBtYWtlIHRo ZSBkZXZlbG9wbWVudCBtb3JlIGNvbnZlbmllbnQsIFF0IDUgcHJvdmlkZXMgYSBjb3B5IG9mIHRo ZSBtb3N0IGVzc2VudGlhbCB0b29scyBpbgorICAgICAgICB0aGUgZ251d2luMzIgZGlyZWN0b3J5 IG9mIHRoZSBxdDUuZ2l0IHRvcC1sZXZlbCByZXBvc2l0b3J5LgorCisgICAgICAgIFRoaXMgcGF0 Y2ggdHJpZXMgdG8gZGV0ZWN0IHRoZSBwcmVzZW5jZSBvZiB0aG9zZSB0b29scyBhbmQgcHJlcGVu ZHMgdGhlbSB0byB0aGUgUEFUSCBpZiBmb3VuZC4KKworICAgICAgICBUaGlzIGlzIHJlcXVpcmVk IGluIHByZXBhcmF0aW9uIGZvciB0aGUgZWxpbWluYXRpb24gb2YgcXQ1L3F0d2Via2l0LnByaSwg d2hpY2ggY3VycmVudGx5IGV4cGFuZHMKKyAgICAgICAgUEFUSCBiZWZvcmUgY2FsbGluZyBidWls ZC13ZWJraXQuIEl0IGl0IGFsc28gcmVxdWlyZWQgZm9yIHRoZSB1cGNvbWluZyBpbnRyb2R1Y3Rp b24gb2Ygd2luX2ZsZXgKKyAgICAgICAgYXMgZGVwZW5kZW5jeSBvdmVyIGZsZXgsIHdoaWNoIGNh biBiZSBkb25lIHdpdGggbGVzcyBoYXNzbGUgd2hlbiBxdDUncyBnbnV3aW4zMiBkaXJlY3Rvcnkg aGFzIGJlZW4KKyAgICAgICAgdXBkYXRlZCB3aXRoIHRoZSBuZXcgdG9vbC4KKworICAgICAgICAq IFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGNoZWNrUmVxdWlyZWRTeXN0ZW1Db25m aWcpOgorICAgICAgICAqIHFtYWtlL21rc3BlY3MvZmVhdHVyZXMvZGVmYXVsdF9wb3N0LnByZjoK KwogMjAxMi0wOS0xMSAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ftc3VuZy5jb20+CiAKICAg ICAgICAgW0NNQUtFXSBTdXBwbHkgZmVhdHVyZSBkZWZpbmVzIHRvIENvZGVHZW5lcmF0b3JUZXN0 UnVubmVyLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IDVjMGU4ZDNiOGU3YjhkNDA2N2YzN2FhZmJkNDY3 MjBiYTQ4YTVkMWIuLmJkY2JlMGJmZGFmOTNmMWFkODQ1Y2FhMjI1MjYyN2JmN2ZjYmRmNzQgMTAw NzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdGRpcnMucG0KQEAgLTE1NDIsOCArMTU0MiwyMSBAQCBzdWIgY2hlY2tSZXF1aXJlZFN5 c3RlbUNvbmZpZwogICAgICAgICAgICAgcHJpbnQgIioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKipcbiI7CiAgICAgICAgIH0KICAgICB9 IGVsc2lmIChpc0d0aygpIG9yIGlzUXQoKSBvciBpc1d4KCkgb3IgaXNFZmwoKSkgewotICAgICAg ICBteSBAY21kcyA9IHF3KGZsZXggYmlzb24gZ3BlcmYpOworICAgICAgICBteSBAY21kcyA9IHF3 KGJpc29uIGdwZXJmKTsKKyAgICAgICAgaWYgKGlzUXQoKSBhbmQgaXNXaW5kb3dzKCkpIHsKKyAg ICAgICAgICAgIHB1c2ggQGNtZHMsICJ3aW5fZmxleCI7CisgICAgICAgIH0gZWxzZSB7CisgICAg ICAgICAgICBwdXNoIEBjbWRzLCAiZmxleCI7CisgICAgICAgIH0KICAgICAgICAgbXkgQG1pc3Np bmcgPSAoKTsKKyAgICAgICAgbXkgJG9sZFBhdGggPSAkRU5We1BBVEh9OworICAgICAgICBpZiAo aXNRdCgpIGFuZCBpc1dpbmRvd3MoKSkgeworICAgICAgICAgICAgY2hvbXAobXkgJGdudVdpbjMy RGlyID0gYCRxbWFrZWJpbiAtcXVlcnkgUVRfSE9TVF9EQVRBYCk7CisgICAgICAgICAgICAkZ251 V2luMzJEaXIgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRnbnVXaW4zMkRpciwgIi4uIiwgImdudXdp bjMyIiwgImJpbiIpOworICAgICAgICAgICAgaWYgKC1kICIkZ251V2luMzJEaXIiKSB7CisgICAg ICAgICAgICAgICAgJEVOVntQQVRIfSA9ICRnbnVXaW4zMkRpciAuICI7IiAuICRFTlZ7UEFUSH07 CisgICAgICAgICAgICB9CisgICAgICAgIH0KICAgICAgICAgZm9yZWFjaCBteSAkY21kIChAY21k cykgewogICAgICAgICAgICAgcHVzaCBAbWlzc2luZywgJGNtZCBpZiBub3QgY29tbWFuZEV4aXN0 cygkY21kKTsKICAgICAgICAgfQpAQCAtMTU1Miw2ICsxNTY1LDkgQEAgc3ViIGNoZWNrUmVxdWly ZWRTeXN0ZW1Db25maWcKICAgICAgICAgICAgIG15ICRsaXN0ID0gam9pbiAiLCAiLCBAbWlzc2lu ZzsKICAgICAgICAgICAgIGRpZSAiRVJST1I6ICRsaXN0IG1pc3NpbmcgYnV0IHJlcXVpcmVkIHRv IGJ1aWxkIFdlYktpdC5cbiI7CiAgICAgICAgIH0KKyAgICAgICAgaWYgKGlzUXQoKSBhbmQgaXNX aW5kb3dzKCkpIHsKKyAgICAgICAgICAgICRFTlZ7UEFUSH0gPSAkb2xkUGF0aDsKKyAgICAgICAg fQogICAgIH0KICAgICAjIFdpbjMyIGFuZCBvdGhlciBwbGF0Zm9ybXMgbWF5IHdhbnQgdG8gY2hl Y2sgZm9yIG1pbmltdW0gY29uZmlnCiB9CmRpZmYgLS1naXQgYS9Ub29scy9xbWFrZS9ta3NwZWNz L2ZlYXR1cmVzL2RlZmF1bHRfcG9zdC5wcmYgYi9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVz L2RlZmF1bHRfcG9zdC5wcmYKaW5kZXggZjNlNjA0YzhlYTE0ZDFhYTA5MTRlMzFjN2NlZGNiYmRh MjA4Y2E2Yy4uOTExNTUwZDIxMjZmMjQ2MTFlZmJiOTk1M2NhM2RiYjMxYmQzNzZmYyAxMDA2NDQK LS0tIGEvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9kZWZhdWx0X3Bvc3QucHJmCisrKyBi L1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvZGVmYXVsdF9wb3N0LnByZgpAQCAtNjgsNiAr NjgsMTcgQEAgY29udGFpbnMoVEVNUExBVEUsIGRlcml2ZWQpIHsKIAogICAgIENPTkZJRyAtPSBk ZWJ1Z19hbmRfcmVsZWFzZQogCisgICAgIyBBIGxvdCBvZiBvdXIgY29kZSBnZW5lcmF0b3JzIHJl cXVpcmUgR05VIHRvb2xzLCByZWFkaWx5IGF2YWlsYWJsZQorICAgICMgb24gTGludXggYW5kIE1h YyBPUyBYLiBPbiBXaW5kb3dzIHdlIGRvIGhhdmUgYSBjb252ZW5pZW5jZSBjb3B5IGluCisgICAg IyBRdDUncyB0b3AtbGV2ZWwgcmVwb3NpdG9yeSwgc28gbGV0J3MgYWRkIHRoYXQgdG8gdGhlIFBB VEggaWYgd2UgY2FuCisgICAgIyBmaW5kIGl0LgorICAgIHdpbjMyIHsKKyAgICAgICAgR05VVE9P TFM9JCRbUVRfSE9TVF9EQVRBXS8uLi9nbnV3aW4zMi9iaW4KKyAgICAgICAgZXhpc3RzKCQkR05V VE9PTFMvZ3BlcmYuZXhlKSB7CisgICAgICAgICAgICBHTlVUT09MUyA9ICIoc2V0ICQkZXNjYXBl X2V4cGFuZChcXFwiKVBBVEg9JCR0b1N5c3RlbVBhdGgoJCRHTlVUT09MUyk7JVBBVEglJCRlc2Nh cGVfZXhwYW5kKFxcXCIpKSIKKyAgICAgICAgfQorICAgIH0KKwogICAgIGZvcihnZW5lcmF0b3Is IEdFTkVSQVRPUlMpIHsKICAgICAgICAgZXZhbCgkJHtnZW5lcmF0b3J9LkNPTkZJRyA9IHRhcmdl dF9wcmVkZXBzIG5vX2xpbmspCiAgICAgICAgIGV2YWwoJCR7Z2VuZXJhdG9yfS5kZXBlbmRlbmN5 X3R5cGUgPSBUWVBFX0MpCkBAIC03OSw2ICs5MCwxMSBAQCBjb250YWlucyhURU1QTEFURSwgZGVy aXZlZCkgewogICAgICAgICBzY3JpcHQgPSAkJGV2YWwoJCR7Z2VuZXJhdG9yfS5zY3JpcHQpCiAg ICAgICAgIGV2YWwoJCR7Z2VuZXJhdG9yfS5kZXBlbmRzICs9ICQkc2NyaXB0KQogCisgICAgICAg IGNvbW1hbmRzID0gJCRldmFsKCQke2dlbmVyYXRvcn0uY29tbWFuZHMpCisgICAgICAgICFpc0Vt cHR5KGNvbW1hbmRzKTohaXNFbXB0eShHTlVUT09MUykgeworICAgICAgICAgICAgZXZhbCgkJHtn ZW5lcmF0b3J9LmNvbW1hbmRzID0gJCR7R05VVE9PTFN9ICYmICQkdmFsX2VzY2FwZSgkJHtnZW5l cmF0b3J9LmNvbW1hbmRzKSkKKyAgICAgICAgfQorCiAgICAgICAgICFpc0VtcHR5KCQke2dlbmVy YXRvcn0uaW5wdXQpIHsKICAgICAgICAgICAgICMgQ29tcGlsZXItc3R5bGUgZ2VuZXJhdG9yCiAg ICAgICAgICAgICBRTUFLRV9FWFRSQV9DT01QSUxFUlMgKz0gJCRnZW5lcmF0b3IK