74992 2011-12-20 21:45:47 -0800 In prepare-ChangeLog, replace constant global variables with "use constant" 2011-12-22 02:33:34 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 73531 74994 1 haraken haraken darin dbates ddkilzer rniwa webkit.review.bot oldest_to_newest 525091 0 haraken 2011-12-20 21:45:47 -0800 I found that we need to completely remove (even constant) global variables from prepare-ChangeLog in order to load it by LoadAsModule.pm (bug 74836). Thus we need to replace constant global variables in prepare-ChangeLog with "use constant". 525093 1 120141 haraken 2011-12-20 21:50:56 -0800 Created attachment 120141 Patch 525142 2 120141 rniwa 2011-12-21 00:09:06 -0800 Comment on attachment 120141 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=120141&action=review Looks sane to me. > Tools/Scripts/prepare-ChangeLog:320 > + my $command = GIT . " log --max-count=1 --pretty=\"format:%an\" \"$gitCommit\""; Why don't we use single quotations here? 525154 3 120156 haraken 2011-12-21 00:17:46 -0800 Created attachment 120156 patch for commit 525157 4 120157 haraken 2011-12-21 00:21:15 -0800 Created attachment 120157 patch for commit 525171 5 120157 webkit.review.bot 2011-12-21 00:54:39 -0800 Comment on attachment 120157 patch for commit Clearing flags on attachment: 120157 Committed r103399: <http://trac.webkit.org/changeset/103399> 120141 2011-12-20 21:50:56 -0800 2011-12-22 02:33:34 -0800 Patch bug-74992-20111221145055.patch text/plain 8427 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMzY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWFlNTY4YTRmMWYzZmIxZjFkZWIxZjJmYmU2NDgyY2Q2 MjM3Mjc3Yi4uNTU3NjA1MTI2ODQ2NzI0NWYwZjQwZWNiMTg0N2M0NDYxOGMwYWQyOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5 IEBACisyMDExLTEyLTIwICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBJbiBwcmVwYXJlLUNoYW5nZUxvZywgcmVwbGFjZSBjb25zdGFudCBnbG9iYWwgdmFy aWFibGVzIHdpdGggInVzZSBjb25zdGFudCIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTc0OTkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZXBsYWNlcyB0aGUgZm9sbG93aW5nIGNvbnN0 YW50IGdsb2JhbCB2YXJpYWJsZXMgd2l0aCAidXNlIGNvbnN0YW50InMuCisgICAgICAgICAgICAt ICRjaGFuZ2VMb2dUaW1lWm9uZQorICAgICAgICAgICAgLSAkU1ZOCisgICAgICAgICAgICAtICRH SVQKKyAgICAgICAgICAgIC0gJXN1cHBvcnRlZFRlc3RFeHRlbnNpb25zCisKKyAgICAgICAgKiBT Y3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nOgorICAgICAgICAoY2hhbmdlTG9nTmFtZUZyb21Bcmdz KToKKyAgICAgICAgKGNoYW5nZUxvZ0VtYWlsQWRkcmVzc0Zyb21BcmdzKToKKyAgICAgICAgKHJl c29sdmVDb25mbGljdGVkQ2hhbmdlTG9ncyk6CisgICAgICAgIChnZW5lcmF0ZU5ld0NoYW5nZUxv Z3MpOgorICAgICAgICAoZGlmZkNvbW1hbmQpOgorICAgICAgICAoc3RhdHVzQ29tbWFuZCk6Cisg ICAgICAgIChjcmVhdGVQYXRjaENvbW1hbmQpOgorICAgICAgICAoZmluZE9yaWdpbmFsRmlsZUZy b21Tdm4pOgorICAgICAgICAoZGV0ZXJtaW5lUHJvcGVydHlDaGFuZ2VzKToKKyAgICAgICAgKGdl bmVyYXRlRmlsZUxpc3QpOgorICAgICAgICAocmV2aWV3ZXJBbmREZXNjcmlwdGlvbkZvckdpdENv bW1pdCk6CisKIDIwMTEtMTItMjAgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgbnJ3dDogcmVuYW1lIGZpZWxkIHJlZmVyZW5jZXMgZnJvbSBfZnMgdG8gX2Zp bGVzeXN0ZW0KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cgYi9U b29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCmluZGV4IDRhNmQ5NjFmNTFiMjVmZjMwNzQ4 NWY2ZWU5MmNmNzE3MGFjN2UxMGIuLjk5NzdlNjNiN2EzOWUxOGE4M2UxZjlkZmViZjFjYjFkNTI4 NGM3MWYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKKysrIGIv VG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwpAQCAtMTA3LDEyICsxMDcsMTAgQEAgc3Vi IHRlc3RMaXN0Rm9yQ2hhbmdlTG9nKEApOwogCiAjIyMgQ29uc3RhbnQgdmFyaWFibGVzLgogIyBQ cm9qZWN0IHRpbWUgem9uZSBmb3IgQ3VwZXJ0aW5vLCBDQSwgVVMKLW15ICRjaGFuZ2VMb2dUaW1l Wm9uZSA9ICJQU1Q4UERUIjsKLQotbXkgJFNWTiA9ICJzdm4iOwotbXkgJEdJVCA9ICJnaXQiOwot Ci1teSAlc3VwcG9ydGVkVGVzdEV4dGVuc2lvbnMgPSBtYXAgeyAkXyA9PiAxIH0gcXcoaHRtbCBz aHRtbCBzdmcgeG1sIHhodG1sIHBsIHBocCk7Cit1c2UgY29uc3RhbnQgQ2hhbmdlTG9nVGltZVpv bmUgPT4gIlBTVDhQRFQiOwordXNlIGNvbnN0YW50IFNWTiA9PiAic3ZuIjsKK3VzZSBjb25zdGFu dCBHSVQgPT4gImdpdCI7Cit1c2UgY29uc3RhbnQgU3VwcG9ydGVkVGVzdEV4dGVuc2lvbnMgPT4g e21hcCB7ICRfID0+IDEgfSBxdyhodG1sIHNodG1sIHN2ZyB4bWwgeGh0bWwgcGwgcGhwKX07CiAK IGV4aXQobWFpbigpKTsKIApAQCAtMzE5LDcgKzMxNyw4IEBAIHN1YiBjaGFuZ2VMb2dOYW1lRnJv bUFyZ3MoJCQpCiB7CiAgICAgbXkgKCRuYW1lRnJvbUFyZ3MsICRnaXRDb21taXQpID0gQF87CiAg ICAgIyBTaWxlbnRseSBhbGxvdyAtLWdpdC1jb21taXQgdG8gd2luLCB3ZSBjb3VsZCB3YXJuIGlm ICRuYW1lRnJvbUFyZ3MgaXMgZGVmaW5lZC4KLSAgICByZXR1cm4gYCRHSVQgbG9nIC0tbWF4LWNv dW50PTEgLS1wcmV0dHk9XCJmb3JtYXQ6JWFuXCIgXCIkZ2l0Q29tbWl0XCJgIGlmICRnaXRDb21t aXQ7CisgICAgbXkgJGNvbW1hbmQgPSBHSVQgLiAiIGxvZyAtLW1heC1jb3VudD0xIC0tcHJldHR5 PVwiZm9ybWF0OiVhblwiIFwiJGdpdENvbW1pdFwiIjsKKyAgICByZXR1cm4gYCRjb21tYW5kYCBp ZiAkZ2l0Q29tbWl0OwogCiAgICAgcmV0dXJuICRuYW1lRnJvbUFyZ3MgfHwgY2hhbmdlTG9nTmFt ZSgpOwogfQpAQCAtMzI4LDcgKzMyNyw4IEBAIHN1YiBjaGFuZ2VMb2dFbWFpbEFkZHJlc3NGcm9t QXJncygkJCkKIHsKICAgICBteSAoJGVtYWlsQWRkcmVzc0Zyb21BcmdzLCAkZ2l0Q29tbWl0KSA9 IEBfOwogICAgICMgU2lsZW50bHkgYWxsb3cgLS1naXQtY29tbWl0IHRvIHdpbiwgd2UgY291bGQg d2FybiBpZiAkZW1haWxBZGRyZXNzRnJvbUFyZ3MgaXMgZGVmaW5lZC4KLSAgICByZXR1cm4gYCRH SVQgbG9nIC0tbWF4LWNvdW50PTEgLS1wcmV0dHk9XCJmb3JtYXQ6JWFlXCIgXCIkZ2l0Q29tbWl0 XCJgIGlmICRnaXRDb21taXQ7CisgICAgbXkgJGNvbW1hbmQgPSBHSVQgLiAiIGxvZyAtLW1heC1j b3VudD0xIC0tcHJldHR5PVwiZm9ybWF0OiVhZVwiIFwiJGdpdENvbW1pdFwiIjsKKyAgICByZXR1 cm4gYCRjb21tYW5kYCBpZiAkZ2l0Q29tbWl0OwogCiAgICAgcmV0dXJuICRlbWFpbEFkZHJlc3NG cm9tQXJncyB8fCBjaGFuZ2VMb2dFbWFpbEFkZHJlc3MoKTsKIH0KQEAgLTQzMCw3ICs0MzAsNyBA QCBzdWIgcmVzb2x2ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKCQpCiAgICAgbXkgKCRjaGFuZ2VMb2dz KSA9IEBfOwogCiAgICAgcHJpbnQgU1RERVJSICIgIFJ1bm5pbmcgJ3N2biB1cGRhdGUnIHRvIHVw ZGF0ZSBDaGFuZ2VMb2cgZmlsZXMuXG4iOwotICAgIG9wZW4gRVJST1JTLCAiLXwiLCAkU1ZOLCAi dXBkYXRlIiwgQCRjaGFuZ2VMb2dzCisgICAgb3BlbiBFUlJPUlMsICItfCIsIFNWTiwgInVwZGF0 ZSIsIEAkY2hhbmdlTG9ncwogICAgICAgICBvciBkaWUgIlRoZSBzdm4gdXBkYXRlIG9mIENoYW5n ZUxvZyBmaWxlcyBmYWlsZWQ6ICQhLlxuIjsKICAgICBteSBAY29uZmxpY3RlZENoYW5nZUxvZ3M7 CiAgICAgd2hpbGUgKG15ICRsaW5lID0gPEVSUk9SUz4pIHsKQEAgLTQ3Nyw3ICs0NzcsNyBAQCBz dWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQkJCQkJCQkJCQkKQogICAgICAgICAgICAgcHJpbnQg c3Vic3RyKCRwcmVmaXgsIDAsIGxlbmd0aCgkcHJlZml4KSAtIDEpIC4gIjpcblxuIiB1bmxlc3Mg KHNjYWxhciBAJHByZWZpeGVzKSA9PSAxOwogICAgICAgICB9CiAKLSAgICAgICAgbXkgJGRhdGUg PSBjaGFuZ2VMb2dEYXRlKCRjaGFuZ2VMb2dUaW1lWm9uZSk7CisgICAgICAgIG15ICRkYXRlID0g Y2hhbmdlTG9nRGF0ZShDaGFuZ2VMb2dUaW1lWm9uZSk7CiAgICAgICAgIHByaW50IENIQU5HRV9M T0cgbm9ybWFsaXplTGluZUVuZGluZ3MoIiRkYXRlICAkbmFtZSAgPCRlbWFpbEFkZHJlc3M+XG5c biIsICRlbmRsKTsKIAogICAgICAgICBteSAoJHJldmlld2VyLCAkZGVzY3JpcHRpb24pID0gcmV2 aWV3ZXJBbmREZXNjcmlwdGlvbkZvckdpdENvbW1pdCgkZ2l0Q29tbWl0LCAkZ2l0UmV2aWV3ZXIp IGlmICRnaXRDb21taXQ7CkBAIC0xNDUwLDEwICsxNDUwLDEwIEBAIHN1YiBkaWZmQ29tbWFuZCgk JCQkKQogICAgIGlmIChpc1NWTigpKSB7CiAgICAgICAgIG15IEBlc2NhcGVkUGF0aHMgPSBtYXAo ZXNjYXBlU3VidmVyc2lvblBhdGgoJF8pLCBAJHBhdGhzKTsKICAgICAgICAgbXkgJGVzY2FwZWRQ YXRoc1N0cmluZyA9ICInIiAuIGpvaW4oIicgJyIsIEBlc2NhcGVkUGF0aHMpIC4gIiciOwotICAg ICAgICAkY29tbWFuZCA9ICIkU1ZOIGRpZmYgLS1kaWZmLWNtZCBkaWZmIC14IC1OICRlc2NhcGVk UGF0aHNTdHJpbmciOworICAgICAgICAkY29tbWFuZCA9IFNWTiAuICIgZGlmZiAtLWRpZmYtY21k IGRpZmYgLXggLU4gJGVzY2FwZWRQYXRoc1N0cmluZyI7CiAgICAgfSBlbHNpZiAoaXNHaXQoKSkg ewogICAgICAgICBteSAkcGF0aHNTdHJpbmcgPSAiJyIgLiBqb2luKCInICciLCBAJHBhdGhzKSAu ICInIjsgCi0gICAgICAgICRjb21tYW5kID0gIiRHSVQgZGlmZiAtLW5vLWV4dC1kaWZmIC1VMCAi IC4gZGlmZkZyb21Ub1N0cmluZygkZ2l0Q29tbWl0LCAkZ2l0SW5kZXgsICRtZXJnZUJhc2UpOwor ICAgICAgICAkY29tbWFuZCA9IEdJVCAuICIgZGlmZiAtLW5vLWV4dC1kaWZmIC1VMCAiIC4gZGlm ZkZyb21Ub1N0cmluZygkZ2l0Q29tbWl0LCAkZ2l0SW5kZXgsICRtZXJnZUJhc2UpOwogICAgICAg ICAkY29tbWFuZCAuPSAiIC0tICRwYXRoc1N0cmluZyIgdW5sZXNzICRnaXRDb21taXQgb3IgJG1l cmdlQmFzZTsKICAgICB9CiAKQEAgLTE0NjgsMTAgKzE0NjgsMTAgQEAgc3ViIHN0YXR1c0NvbW1h bmQoJCQkJCkKICAgICBpZiAoaXNTVk4oKSkgewogICAgICAgICBteSBAZXNjYXBlZEZpbGVzID0g bWFwKGVzY2FwZVN1YnZlcnNpb25QYXRoKCRfKSwga2V5cyAlJHBhdGhzKTsKICAgICAgICAgbXkg JGVzY2FwZWRGaWxlc1N0cmluZyA9ICInIiAuIGpvaW4oIicgJyIsIEBlc2NhcGVkRmlsZXMpIC4g IiciOwotICAgICAgICAkY29tbWFuZCA9ICIkU1ZOIHN0YXQgJGVzY2FwZWRGaWxlc1N0cmluZyI7 CisgICAgICAgICRjb21tYW5kID0gU1ZOIC4gIiBzdGF0ICRlc2NhcGVkRmlsZXNTdHJpbmciOwog ICAgIH0gZWxzaWYgKGlzR2l0KCkpIHsKICAgICAgICAgbXkgJGZpbGVzU3RyaW5nID0gJyInIC4g am9pbignIiAiJywga2V5cyAlJHBhdGhzKSAuICciJzsKLSAgICAgICAgJGNvbW1hbmQgPSAiJEdJ VCBkaWZmIC1yIC0tbmFtZS1zdGF0dXMgLU0gLUMgIiAuIGRpZmZGcm9tVG9TdHJpbmcoJGdpdENv bW1pdCwgJGdpdEluZGV4LCAkbWVyZ2VCYXNlKTsKKyAgICAgICAgJGNvbW1hbmQgPSBHSVQgLiAi IGRpZmYgLXIgLS1uYW1lLXN0YXR1cyAtTSAtQyAiIC4gZGlmZkZyb21Ub1N0cmluZygkZ2l0Q29t bWl0LCAkZ2l0SW5kZXgsICRtZXJnZUJhc2UpOwogICAgICAgICAkY29tbWFuZCAuPSAiIC0tICRm aWxlc1N0cmluZyIgdW5sZXNzICRnaXRDb21taXQ7CiAgICAgfQogCkBAIC0xNDg2LDcgKzE0ODYs NyBAQCBzdWIgY3JlYXRlUGF0Y2hDb21tYW5kKCQkJCQpCiAgICAgaWYgKGlzU1ZOKCkpIHsKICAg ICAgICAgJGNvbW1hbmQgPSAiJyRGaW5kQmluOjpCaW4vc3ZuLWNyZWF0ZS1wYXRjaCcgJGNoYW5n ZWRGaWxlc1N0cmluZyI7CiAgICAgfSBlbHNpZiAoaXNHaXQoKSkgewotICAgICAgICAkY29tbWFu ZCA9ICIkR0lUIGRpZmYgLU0gLUMgIiAuIGRpZmZGcm9tVG9TdHJpbmcoJGdpdENvbW1pdCwgJGdp dEluZGV4LCAkbWVyZ2VCYXNlKTsKKyAgICAgICAgJGNvbW1hbmQgPSBHSVQgLiAiIGRpZmYgLU0g LUMgIiAuIGRpZmZGcm9tVG9TdHJpbmcoJGdpdENvbW1pdCwgJGdpdEluZGV4LCAkbWVyZ2VCYXNl KTsKICAgICAgICAgJGNvbW1hbmQgLj0gIiAtLSAkY2hhbmdlZEZpbGVzU3RyaW5nIiB1bmxlc3Mg JGdpdENvbW1pdDsKICAgICB9CiAKQEAgLTE1MDMsNyArMTUwMyw3IEBAIHN1YiBmaW5kT3JpZ2lu YWxGaWxlRnJvbVN2bigkKQogewogICAgIG15ICgkZmlsZSkgPSBAXzsKICAgICBteSAkYmFzZVVy bDsKLSAgICBvcGVuIElORk8sICIkU1ZOIGluZm8gLiB8IiBvciBkaWU7CisgICAgb3BlbiBJTkZP LCBTVk4gLiAiIGluZm8gLiB8IiBvciBkaWU7CiAgICAgd2hpbGUgKDxJTkZPPikgewogICAgICAg ICBpZiAoL15VUkw6ICguKz8pW1xyXG5dKiQvKSB7CiAgICAgICAgICAgICAkYmFzZVVybCA9ICQx OwpAQCAtMTUxMiw3ICsxNTEyLDcgQEAgc3ViIGZpbmRPcmlnaW5hbEZpbGVGcm9tU3ZuKCQpCiAg ICAgY2xvc2UgSU5GTzsKICAgICBteSAkc291cmNlRmlsZTsKICAgICBteSAkZXNjYXBlZEZpbGUg PSBlc2NhcGVTdWJ2ZXJzaW9uUGF0aCgkZmlsZSk7Ci0gICAgb3BlbiBJTkZPLCAiJFNWTiBpbmZv ICckZXNjYXBlZEZpbGUnIHwiIG9yIGRpZTsKKyAgICBvcGVuIElORk8sIFNWTiAuICIgaW5mbyAn JGVzY2FwZWRGaWxlJyB8IiBvciBkaWU7CiAgICAgd2hpbGUgKDxJTkZPPikgewogICAgICAgICBp ZiAoL15Db3BpZWQgRnJvbSBVUkw6ICguKz8pW1xyXG5dKiQvKSB7CiAgICAgICAgICAgICAkc291 cmNlRmlsZSA9IEZpbGU6OlNwZWMtPmFiczJyZWwoJDEsICRiYXNlVXJsKTsKQEAgLTE1MzEsMTQg KzE1MzEsMTQgQEAgc3ViIGRldGVybWluZVByb3BlcnR5Q2hhbmdlcygkJCQpCiAgICAgaWYgKCRp c0FkZCkgewogICAgICAgICBteSAlYWRkZWRQcm9wZXJ0aWVzOwogICAgICAgICBteSAlcmVtb3Zl ZFByb3BlcnRpZXM7Ci0gICAgICAgIG9wZW4gUFJPUExJU1QsICIkU1ZOIHByb3BsaXN0ICckZXNj YXBlZEZpbGUnIHwiIG9yIGRpZTsKKyAgICAgICAgb3BlbiBQUk9QTElTVCwgU1ZOIC4gIiBwcm9w bGlzdCAnJGVzY2FwZWRGaWxlJyB8IiBvciBkaWU7CiAgICAgICAgIHdoaWxlICg8UFJPUExJU1Q+ KSB7CiAgICAgICAgICAgICAkYWRkZWRQcm9wZXJ0aWVzeyQxfSA9IDEgaWYgL14gICguKz8pW1xy XG5dKiQvICYmICQxIG5lICdzdm46bWVyZ2VpbmZvJzsKICAgICAgICAgfQogICAgICAgICBjbG9z ZSBQUk9QTElTVDsKICAgICAgICAgaWYgKCRvcmlnaW5hbCkgewogICAgICAgICAgICAgbXkgJGVz Y2FwZWRPcmlnaW5hbCA9IGVzY2FwZVN1YnZlcnNpb25QYXRoKCRvcmlnaW5hbCk7Ci0gICAgICAg ICAgICBvcGVuIFBST1BMSVNULCAiJFNWTiBwcm9wbGlzdCAnJGVzY2FwZWRPcmlnaW5hbCcgfCIg b3IgZGllOworICAgICAgICAgICAgb3BlbiBQUk9QTElTVCwgU1ZOIC4gIiBwcm9wbGlzdCAnJGVz Y2FwZWRPcmlnaW5hbCcgfCIgb3IgZGllOwogICAgICAgICAgICAgd2hpbGUgKDxQUk9QTElTVD4p IHsKICAgICAgICAgICAgICAgICBuZXh0IHVubGVzcyAvXiAgKC4rPylbXHJcbl0qJC87CiAgICAg ICAgICAgICAgICAgbXkgJHByb3BlcnR5ID0gJDE7CkBAIC0xNTUyLDcgKzE1NTIsNyBAQCBzdWIg ZGV0ZXJtaW5lUHJvcGVydHlDaGFuZ2VzKCQkJCkKICAgICAgICAgJGNoYW5nZXN7IkEifSA9IFtz b3J0IGtleXMgJWFkZGVkUHJvcGVydGllc10gaWYgJWFkZGVkUHJvcGVydGllczsKICAgICAgICAg JGNoYW5nZXN7IkQifSA9IFtzb3J0IGtleXMgJXJlbW92ZWRQcm9wZXJ0aWVzXSBpZiAlcmVtb3Zl ZFByb3BlcnRpZXM7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgb3BlbiBESUZGLCAiJFNWTiBkaWZm ICckZXNjYXBlZEZpbGUnIHwiIG9yIGRpZTsKKyAgICAgICAgb3BlbiBESUZGLCBTVk4gLiAiIGRp ZmYgJyRlc2NhcGVkRmlsZScgfCIgb3IgZGllOwogICAgICAgICB3aGlsZSAoPERJRkY+KSB7CiAg ICAgICAgICAgICBpZiAoL15Qcm9wZXJ0eSBjaGFuZ2VzIG9uOi8pIHsKICAgICAgICAgICAgICAg ICB3aGlsZSAoPERJRkY+KSB7CkBAIC0xNjU3LDcgKzE2NTcsNyBAQCBzdWIgZ2VuZXJhdGVGaWxl TGlzdChcJSQkJCkKICAgICAgICAgICAgICAgICBwdXNoIEBhZGRlZFJlZ3Jlc3Npb25UZXN0cywg JGZpbGUKICAgICAgICAgICAgICAgICAgICAgaWYgaXNBZGRlZFN0YXR1cygkc3RhdHVzKQogICAg ICAgICAgICAgICAgICAgICAgICAmJiAkZmlsZSA9fiAvXC4oW2EtekEtWl0rKSQvCi0gICAgICAg ICAgICAgICAgICAgICAgICYmICRzdXBwb3J0ZWRUZXN0RXh0ZW5zaW9uc3tsYygkMSl9CisgICAg ICAgICAgICAgICAgICAgICAgICYmIFN1cHBvcnRlZFRlc3RFeHRlbnNpb25zLT57bGMoJDEpfQog ICAgICAgICAgICAgICAgICAgICAgICAmJiAhc2NhbGFyKGdyZXAoL15yZXNvdXJjZXMkL2ksIEBj b21wb25lbnRzKSkKICAgICAgICAgICAgICAgICAgICAgICAgJiYgIXNjYWxhcihncmVwKC9ec2Ny aXB0LXRlc3RzJC9pLCBAY29tcG9uZW50cykpOwogICAgICAgICAgICAgfQpAQCAtMTgyMiw5ICsx ODIyLDkgQEAgc3ViIHJldmlld2VyQW5kRGVzY3JpcHRpb25Gb3JHaXRDb21taXQoJCQpCiAgICAg bXkgJGdpdExvZzsKICAgICB7CiAgICAgICAgIGxvY2FsICQvID0gdW5kZWY7Ci0gICAgICAgIG9w ZW4oR0lULCAiLXwiLCAkR0lULCBAYXJncywgJGNvbW1pdCkgfHwgZGllOwotICAgICAgICAkZ2l0 TG9nID0gPEdJVD47Ci0gICAgICAgIGNsb3NlKEdJVCk7CisgICAgICAgIG9wZW4oR0lUTE9HLCAi LXwiLCBHSVQsIEBhcmdzLCAkY29tbWl0KSB8fCBkaWU7CisgICAgICAgICRnaXRMb2cgPSA8R0lU TE9HPjsKKyAgICAgICAgY2xvc2UoR0lUTE9HKTsKICAgICB9CiAKICAgICBteSBAY29tbWl0TG9n cyA9IHNwbGl0KC9eW0NjXW9tbWl0IFthLWYwLTldezQwfS9tLCAkZ2l0TG9nKTsK 120156 2011-12-21 00:17:46 -0800 2011-12-21 00:17:46 -0800 patch for commit bug-74992-20111221171744.patch text/plain 8417 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMzY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWFlNTY4YTRmMWYzZmIxZjFkZWIxZjJmYmU2NDgyY2Q2 MjM3Mjc3Yi4uZjExN2M0NmJiODI4MzEzOWYyOTM4ZTUwNTdkOWUwODIyMWNjNWE0MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5 IEBACisyMDExLTEyLTIwICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBJbiBwcmVwYXJlLUNoYW5nZUxvZywgcmVwbGFjZSBjb25zdGFudCBnbG9iYWwgdmFy aWFibGVzIHdpdGggInVzZSBjb25zdGFudCIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTc0OTkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBO aXdhLgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmVwbGFjZXMgdGhlIGZvbGxvd2luZyBjb25zdGFu dCBnbG9iYWwgdmFyaWFibGVzIHdpdGggInVzZSBjb25zdGFudCJzLgorICAgICAgICAgICAgLSAk Y2hhbmdlTG9nVGltZVpvbmUKKyAgICAgICAgICAgIC0gJFNWTgorICAgICAgICAgICAgLSAkR0lU CisgICAgICAgICAgICAtICVzdXBwb3J0ZWRUZXN0RXh0ZW5zaW9ucworCisgICAgICAgICogU2Ny aXB0cy9wcmVwYXJlLUNoYW5nZUxvZzoKKyAgICAgICAgKGNoYW5nZUxvZ05hbWVGcm9tQXJncyk6 CisgICAgICAgIChjaGFuZ2VMb2dFbWFpbEFkZHJlc3NGcm9tQXJncyk6CisgICAgICAgIChyZXNv bHZlQ29uZmxpY3RlZENoYW5nZUxvZ3MpOgorICAgICAgICAoZ2VuZXJhdGVOZXdDaGFuZ2VMb2dz KToKKyAgICAgICAgKGRpZmZDb21tYW5kKToKKyAgICAgICAgKHN0YXR1c0NvbW1hbmQpOgorICAg ICAgICAoY3JlYXRlUGF0Y2hDb21tYW5kKToKKyAgICAgICAgKGZpbmRPcmlnaW5hbEZpbGVGcm9t U3ZuKToKKyAgICAgICAgKGRldGVybWluZVByb3BlcnR5Q2hhbmdlcyk6CisgICAgICAgIChnZW5l cmF0ZUZpbGVMaXN0KToKKyAgICAgICAgKHJldmlld2VyQW5kRGVzY3JpcHRpb25Gb3JHaXRDb21t aXQpOgorCiAyMDExLTEyLTIwICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIG5yd3Q6IHJlbmFtZSBmaWVsZCByZWZlcmVuY2VzIGZyb20gX2ZzIHRvIF9maWxl c3lzdGVtCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvVG9v bHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwppbmRleCA0YTZkOTYxZjUxYjI1ZmYzMDc0ODVm NmVlOTJjZjcxNzBhYzdlMTBiLi4xYjIyMDVjMzU0NmJiYzQ5Yjc1ZTFjNGJkMWYzZjNlMWY5NTRl N2IxIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKQEAgLTEwNywxMiArMTA3LDEwIEBAIHN1YiB0 ZXN0TGlzdEZvckNoYW5nZUxvZyhAKTsKIAogIyMjIENvbnN0YW50IHZhcmlhYmxlcy4KICMgUHJv amVjdCB0aW1lIHpvbmUgZm9yIEN1cGVydGlubywgQ0EsIFVTCi1teSAkY2hhbmdlTG9nVGltZVpv bmUgPSAiUFNUOFBEVCI7Ci0KLW15ICRTVk4gPSAic3ZuIjsKLW15ICRHSVQgPSAiZ2l0IjsKLQot bXkgJXN1cHBvcnRlZFRlc3RFeHRlbnNpb25zID0gbWFwIHsgJF8gPT4gMSB9IHF3KGh0bWwgc2h0 bWwgc3ZnIHhtbCB4aHRtbCBwbCBwaHApOwordXNlIGNvbnN0YW50IENoYW5nZUxvZ1RpbWVab25l ID0+ICJQU1Q4UERUIjsKK3VzZSBjb25zdGFudCBTVk4gPT4gInN2biI7Cit1c2UgY29uc3RhbnQg R0lUID0+ICJnaXQiOwordXNlIGNvbnN0YW50IFN1cHBvcnRlZFRlc3RFeHRlbnNpb25zID0+IHtt YXAgeyAkXyA9PiAxIH0gcXcoaHRtbCBzaHRtbCBzdmcgeG1sIHhodG1sIHBsIHBocCl9OwogCiBl eGl0KG1haW4oKSk7CiAKQEAgLTMxOSw3ICszMTcsOCBAQCBzdWIgY2hhbmdlTG9nTmFtZUZyb21B cmdzKCQkKQogewogICAgIG15ICgkbmFtZUZyb21BcmdzLCAkZ2l0Q29tbWl0KSA9IEBfOwogICAg ICMgU2lsZW50bHkgYWxsb3cgLS1naXQtY29tbWl0IHRvIHdpbiwgd2UgY291bGQgd2FybiBpZiAk bmFtZUZyb21BcmdzIGlzIGRlZmluZWQuCi0gICAgcmV0dXJuIGAkR0lUIGxvZyAtLW1heC1jb3Vu dD0xIC0tcHJldHR5PVwiZm9ybWF0OiVhblwiIFwiJGdpdENvbW1pdFwiYCBpZiAkZ2l0Q29tbWl0 OworICAgIG15ICRjb21tYW5kID0gR0lUIC4gJyBsb2cgLS1tYXgtY291bnQ9MSAtLXByZXR0eT0i Zm9ybWF0OiVhbiIgIiRnaXRDb21taXQiJzsKKyAgICByZXR1cm4gYCRjb21tYW5kYCBpZiAkZ2l0 Q29tbWl0OwogCiAgICAgcmV0dXJuICRuYW1lRnJvbUFyZ3MgfHwgY2hhbmdlTG9nTmFtZSgpOwog fQpAQCAtMzI4LDcgKzMyNyw4IEBAIHN1YiBjaGFuZ2VMb2dFbWFpbEFkZHJlc3NGcm9tQXJncygk JCkKIHsKICAgICBteSAoJGVtYWlsQWRkcmVzc0Zyb21BcmdzLCAkZ2l0Q29tbWl0KSA9IEBfOwog ICAgICMgU2lsZW50bHkgYWxsb3cgLS1naXQtY29tbWl0IHRvIHdpbiwgd2UgY291bGQgd2FybiBp ZiAkZW1haWxBZGRyZXNzRnJvbUFyZ3MgaXMgZGVmaW5lZC4KLSAgICByZXR1cm4gYCRHSVQgbG9n IC0tbWF4LWNvdW50PTEgLS1wcmV0dHk9XCJmb3JtYXQ6JWFlXCIgXCIkZ2l0Q29tbWl0XCJgIGlm ICRnaXRDb21taXQ7CisgICAgbXkgJGNvbW1hbmQgPSBHSVQgLiAnIGxvZyAtLW1heC1jb3VudD0x IC0tcHJldHR5PSJmb3JtYXQ6JWFlIiAiJGdpdENvbW1pdCInOworICAgIHJldHVybiBgJGNvbW1h bmRgIGlmICRnaXRDb21taXQ7CiAKICAgICByZXR1cm4gJGVtYWlsQWRkcmVzc0Zyb21BcmdzIHx8 IGNoYW5nZUxvZ0VtYWlsQWRkcmVzcygpOwogfQpAQCAtNDMwLDcgKzQzMCw3IEBAIHN1YiByZXNv bHZlQ29uZmxpY3RlZENoYW5nZUxvZ3MoJCkKICAgICBteSAoJGNoYW5nZUxvZ3MpID0gQF87CiAK ICAgICBwcmludCBTVERFUlIgIiAgUnVubmluZyAnc3ZuIHVwZGF0ZScgdG8gdXBkYXRlIENoYW5n ZUxvZyBmaWxlcy5cbiI7Ci0gICAgb3BlbiBFUlJPUlMsICItfCIsICRTVk4sICJ1cGRhdGUiLCBA JGNoYW5nZUxvZ3MKKyAgICBvcGVuIEVSUk9SUywgIi18IiwgU1ZOLCAidXBkYXRlIiwgQCRjaGFu Z2VMb2dzCiAgICAgICAgIG9yIGRpZSAiVGhlIHN2biB1cGRhdGUgb2YgQ2hhbmdlTG9nIGZpbGVz IGZhaWxlZDogJCEuXG4iOwogICAgIG15IEBjb25mbGljdGVkQ2hhbmdlTG9nczsKICAgICB3aGls ZSAobXkgJGxpbmUgPSA8RVJST1JTPikgewpAQCAtNDc3LDcgKzQ3Nyw3IEBAIHN1YiBnZW5lcmF0 ZU5ld0NoYW5nZUxvZ3MoJCQkJCQkJCQkJCQpCiAgICAgICAgICAgICBwcmludCBzdWJzdHIoJHBy ZWZpeCwgMCwgbGVuZ3RoKCRwcmVmaXgpIC0gMSkgLiAiOlxuXG4iIHVubGVzcyAoc2NhbGFyIEAk cHJlZml4ZXMpID09IDE7CiAgICAgICAgIH0KIAotICAgICAgICBteSAkZGF0ZSA9IGNoYW5nZUxv Z0RhdGUoJGNoYW5nZUxvZ1RpbWVab25lKTsKKyAgICAgICAgbXkgJGRhdGUgPSBjaGFuZ2VMb2dE YXRlKENoYW5nZUxvZ1RpbWVab25lKTsKICAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxp emVMaW5lRW5kaW5ncygiJGRhdGUgICRuYW1lICA8JGVtYWlsQWRkcmVzcz5cblxuIiwgJGVuZGwp OwogCiAgICAgICAgIG15ICgkcmV2aWV3ZXIsICRkZXNjcmlwdGlvbikgPSByZXZpZXdlckFuZERl c2NyaXB0aW9uRm9yR2l0Q29tbWl0KCRnaXRDb21taXQsICRnaXRSZXZpZXdlcikgaWYgJGdpdENv bW1pdDsKQEAgLTE0NTAsMTAgKzE0NTAsMTAgQEAgc3ViIGRpZmZDb21tYW5kKCQkJCQpCiAgICAg aWYgKGlzU1ZOKCkpIHsKICAgICAgICAgbXkgQGVzY2FwZWRQYXRocyA9IG1hcChlc2NhcGVTdWJ2 ZXJzaW9uUGF0aCgkXyksIEAkcGF0aHMpOwogICAgICAgICBteSAkZXNjYXBlZFBhdGhzU3RyaW5n ID0gIiciIC4gam9pbigiJyAnIiwgQGVzY2FwZWRQYXRocykgLiAiJyI7Ci0gICAgICAgICRjb21t YW5kID0gIiRTVk4gZGlmZiAtLWRpZmYtY21kIGRpZmYgLXggLU4gJGVzY2FwZWRQYXRoc1N0cmlu ZyI7CisgICAgICAgICRjb21tYW5kID0gU1ZOIC4gIiBkaWZmIC0tZGlmZi1jbWQgZGlmZiAteCAt TiAkZXNjYXBlZFBhdGhzU3RyaW5nIjsKICAgICB9IGVsc2lmIChpc0dpdCgpKSB7CiAgICAgICAg IG15ICRwYXRoc1N0cmluZyA9ICInIiAuIGpvaW4oIicgJyIsIEAkcGF0aHMpIC4gIiciOyAKLSAg ICAgICAgJGNvbW1hbmQgPSAiJEdJVCBkaWZmIC0tbm8tZXh0LWRpZmYgLVUwICIgLiBkaWZmRnJv bVRvU3RyaW5nKCRnaXRDb21taXQsICRnaXRJbmRleCwgJG1lcmdlQmFzZSk7CisgICAgICAgICRj b21tYW5kID0gR0lUIC4gIiBkaWZmIC0tbm8tZXh0LWRpZmYgLVUwICIgLiBkaWZmRnJvbVRvU3Ry aW5nKCRnaXRDb21taXQsICRnaXRJbmRleCwgJG1lcmdlQmFzZSk7CiAgICAgICAgICRjb21tYW5k IC49ICIgLS0gJHBhdGhzU3RyaW5nIiB1bmxlc3MgJGdpdENvbW1pdCBvciAkbWVyZ2VCYXNlOwog ICAgIH0KIApAQCAtMTQ2OCwxMCArMTQ2OCwxMCBAQCBzdWIgc3RhdHVzQ29tbWFuZCgkJCQkKQog ICAgIGlmIChpc1NWTigpKSB7CiAgICAgICAgIG15IEBlc2NhcGVkRmlsZXMgPSBtYXAoZXNjYXBl U3VidmVyc2lvblBhdGgoJF8pLCBrZXlzICUkcGF0aHMpOwogICAgICAgICBteSAkZXNjYXBlZEZp bGVzU3RyaW5nID0gIiciIC4gam9pbigiJyAnIiwgQGVzY2FwZWRGaWxlcykgLiAiJyI7Ci0gICAg ICAgICRjb21tYW5kID0gIiRTVk4gc3RhdCAkZXNjYXBlZEZpbGVzU3RyaW5nIjsKKyAgICAgICAg JGNvbW1hbmQgPSBTVk4gLiAiIHN0YXQgJGVzY2FwZWRGaWxlc1N0cmluZyI7CiAgICAgfSBlbHNp ZiAoaXNHaXQoKSkgewogICAgICAgICBteSAkZmlsZXNTdHJpbmcgPSAnIicgLiBqb2luKCciICIn LCBrZXlzICUkcGF0aHMpIC4gJyInOwotICAgICAgICAkY29tbWFuZCA9ICIkR0lUIGRpZmYgLXIg LS1uYW1lLXN0YXR1cyAtTSAtQyAiIC4gZGlmZkZyb21Ub1N0cmluZygkZ2l0Q29tbWl0LCAkZ2l0 SW5kZXgsICRtZXJnZUJhc2UpOworICAgICAgICAkY29tbWFuZCA9IEdJVCAuICIgZGlmZiAtciAt LW5hbWUtc3RhdHVzIC1NIC1DICIgLiBkaWZmRnJvbVRvU3RyaW5nKCRnaXRDb21taXQsICRnaXRJ bmRleCwgJG1lcmdlQmFzZSk7CiAgICAgICAgICRjb21tYW5kIC49ICIgLS0gJGZpbGVzU3RyaW5n IiB1bmxlc3MgJGdpdENvbW1pdDsKICAgICB9CiAKQEAgLTE0ODYsNyArMTQ4Niw3IEBAIHN1YiBj cmVhdGVQYXRjaENvbW1hbmQoJCQkJCkKICAgICBpZiAoaXNTVk4oKSkgewogICAgICAgICAkY29t bWFuZCA9ICInJEZpbmRCaW46OkJpbi9zdm4tY3JlYXRlLXBhdGNoJyAkY2hhbmdlZEZpbGVzU3Ry aW5nIjsKICAgICB9IGVsc2lmIChpc0dpdCgpKSB7Ci0gICAgICAgICRjb21tYW5kID0gIiRHSVQg ZGlmZiAtTSAtQyAiIC4gZGlmZkZyb21Ub1N0cmluZygkZ2l0Q29tbWl0LCAkZ2l0SW5kZXgsICRt ZXJnZUJhc2UpOworICAgICAgICAkY29tbWFuZCA9IEdJVCAuICIgZGlmZiAtTSAtQyAiIC4gZGlm ZkZyb21Ub1N0cmluZygkZ2l0Q29tbWl0LCAkZ2l0SW5kZXgsICRtZXJnZUJhc2UpOwogICAgICAg ICAkY29tbWFuZCAuPSAiIC0tICRjaGFuZ2VkRmlsZXNTdHJpbmciIHVubGVzcyAkZ2l0Q29tbWl0 OwogICAgIH0KIApAQCAtMTUwMyw3ICsxNTAzLDcgQEAgc3ViIGZpbmRPcmlnaW5hbEZpbGVGcm9t U3ZuKCQpCiB7CiAgICAgbXkgKCRmaWxlKSA9IEBfOwogICAgIG15ICRiYXNlVXJsOwotICAgIG9w ZW4gSU5GTywgIiRTVk4gaW5mbyAuIHwiIG9yIGRpZTsKKyAgICBvcGVuIElORk8sIFNWTiAuICIg aW5mbyAuIHwiIG9yIGRpZTsKICAgICB3aGlsZSAoPElORk8+KSB7CiAgICAgICAgIGlmICgvXlVS TDogKC4rPylbXHJcbl0qJC8pIHsKICAgICAgICAgICAgICRiYXNlVXJsID0gJDE7CkBAIC0xNTEy LDcgKzE1MTIsNyBAQCBzdWIgZmluZE9yaWdpbmFsRmlsZUZyb21Tdm4oJCkKICAgICBjbG9zZSBJ TkZPOwogICAgIG15ICRzb3VyY2VGaWxlOwogICAgIG15ICRlc2NhcGVkRmlsZSA9IGVzY2FwZVN1 YnZlcnNpb25QYXRoKCRmaWxlKTsKLSAgICBvcGVuIElORk8sICIkU1ZOIGluZm8gJyRlc2NhcGVk RmlsZScgfCIgb3IgZGllOworICAgIG9wZW4gSU5GTywgU1ZOIC4gIiBpbmZvICckZXNjYXBlZEZp bGUnIHwiIG9yIGRpZTsKICAgICB3aGlsZSAoPElORk8+KSB7CiAgICAgICAgIGlmICgvXkNvcGll ZCBGcm9tIFVSTDogKC4rPylbXHJcbl0qJC8pIHsKICAgICAgICAgICAgICRzb3VyY2VGaWxlID0g RmlsZTo6U3BlYy0+YWJzMnJlbCgkMSwgJGJhc2VVcmwpOwpAQCAtMTUzMSwxNCArMTUzMSwxNCBA QCBzdWIgZGV0ZXJtaW5lUHJvcGVydHlDaGFuZ2VzKCQkJCkKICAgICBpZiAoJGlzQWRkKSB7CiAg ICAgICAgIG15ICVhZGRlZFByb3BlcnRpZXM7CiAgICAgICAgIG15ICVyZW1vdmVkUHJvcGVydGll czsKLSAgICAgICAgb3BlbiBQUk9QTElTVCwgIiRTVk4gcHJvcGxpc3QgJyRlc2NhcGVkRmlsZScg fCIgb3IgZGllOworICAgICAgICBvcGVuIFBST1BMSVNULCBTVk4gLiAiIHByb3BsaXN0ICckZXNj YXBlZEZpbGUnIHwiIG9yIGRpZTsKICAgICAgICAgd2hpbGUgKDxQUk9QTElTVD4pIHsKICAgICAg ICAgICAgICRhZGRlZFByb3BlcnRpZXN7JDF9ID0gMSBpZiAvXiAgKC4rPylbXHJcbl0qJC8gJiYg JDEgbmUgJ3N2bjptZXJnZWluZm8nOwogICAgICAgICB9CiAgICAgICAgIGNsb3NlIFBST1BMSVNU OwogICAgICAgICBpZiAoJG9yaWdpbmFsKSB7CiAgICAgICAgICAgICBteSAkZXNjYXBlZE9yaWdp bmFsID0gZXNjYXBlU3VidmVyc2lvblBhdGgoJG9yaWdpbmFsKTsKLSAgICAgICAgICAgIG9wZW4g UFJPUExJU1QsICIkU1ZOIHByb3BsaXN0ICckZXNjYXBlZE9yaWdpbmFsJyB8IiBvciBkaWU7Cisg ICAgICAgICAgICBvcGVuIFBST1BMSVNULCBTVk4gLiAiIHByb3BsaXN0ICckZXNjYXBlZE9yaWdp bmFsJyB8IiBvciBkaWU7CiAgICAgICAgICAgICB3aGlsZSAoPFBST1BMSVNUPikgewogICAgICAg ICAgICAgICAgIG5leHQgdW5sZXNzIC9eICAoLis/KVtcclxuXSokLzsKICAgICAgICAgICAgICAg ICBteSAkcHJvcGVydHkgPSAkMTsKQEAgLTE1NTIsNyArMTU1Miw3IEBAIHN1YiBkZXRlcm1pbmVQ cm9wZXJ0eUNoYW5nZXMoJCQkKQogICAgICAgICAkY2hhbmdlc3siQSJ9ID0gW3NvcnQga2V5cyAl YWRkZWRQcm9wZXJ0aWVzXSBpZiAlYWRkZWRQcm9wZXJ0aWVzOwogICAgICAgICAkY2hhbmdlc3si RCJ9ID0gW3NvcnQga2V5cyAlcmVtb3ZlZFByb3BlcnRpZXNdIGlmICVyZW1vdmVkUHJvcGVydGll czsKICAgICB9IGVsc2UgewotICAgICAgICBvcGVuIERJRkYsICIkU1ZOIGRpZmYgJyRlc2NhcGVk RmlsZScgfCIgb3IgZGllOworICAgICAgICBvcGVuIERJRkYsIFNWTiAuICIgZGlmZiAnJGVzY2Fw ZWRGaWxlJyB8IiBvciBkaWU7CiAgICAgICAgIHdoaWxlICg8RElGRj4pIHsKICAgICAgICAgICAg IGlmICgvXlByb3BlcnR5IGNoYW5nZXMgb246LykgewogICAgICAgICAgICAgICAgIHdoaWxlICg8 RElGRj4pIHsKQEAgLTE2NTcsNyArMTY1Nyw3IEBAIHN1YiBnZW5lcmF0ZUZpbGVMaXN0KFwlJCQk KQogICAgICAgICAgICAgICAgIHB1c2ggQGFkZGVkUmVncmVzc2lvblRlc3RzLCAkZmlsZQogICAg ICAgICAgICAgICAgICAgICBpZiBpc0FkZGVkU3RhdHVzKCRzdGF0dXMpCiAgICAgICAgICAgICAg ICAgICAgICAgICYmICRmaWxlID1+IC9cLihbYS16QS1aXSspJC8KLSAgICAgICAgICAgICAgICAg ICAgICAgJiYgJHN1cHBvcnRlZFRlc3RFeHRlbnNpb25ze2xjKCQxKX0KKyAgICAgICAgICAgICAg ICAgICAgICAgJiYgU3VwcG9ydGVkVGVzdEV4dGVuc2lvbnMtPntsYygkMSl9CiAgICAgICAgICAg ICAgICAgICAgICAgICYmICFzY2FsYXIoZ3JlcCgvXnJlc291cmNlcyQvaSwgQGNvbXBvbmVudHMp KQogICAgICAgICAgICAgICAgICAgICAgICAmJiAhc2NhbGFyKGdyZXAoL15zY3JpcHQtdGVzdHMk L2ksIEBjb21wb25lbnRzKSk7CiAgICAgICAgICAgICB9CkBAIC0xODIyLDkgKzE4MjIsOSBAQCBz dWIgcmV2aWV3ZXJBbmREZXNjcmlwdGlvbkZvckdpdENvbW1pdCgkJCkKICAgICBteSAkZ2l0TG9n OwogICAgIHsKICAgICAgICAgbG9jYWwgJC8gPSB1bmRlZjsKLSAgICAgICAgb3BlbihHSVQsICIt fCIsICRHSVQsIEBhcmdzLCAkY29tbWl0KSB8fCBkaWU7Ci0gICAgICAgICRnaXRMb2cgPSA8R0lU PjsKLSAgICAgICAgY2xvc2UoR0lUKTsKKyAgICAgICAgb3BlbihHSVRMT0csICItfCIsIEdJVCwg QGFyZ3MsICRjb21taXQpIHx8IGRpZTsKKyAgICAgICAgJGdpdExvZyA9IDxHSVRMT0c+OworICAg ICAgICBjbG9zZShHSVRMT0cpOwogICAgIH0KIAogICAgIG15IEBjb21taXRMb2dzID0gc3BsaXQo L15bQ2Ndb21taXQgW2EtZjAtOV17NDB9L20sICRnaXRMb2cpOwo= 120157 2011-12-21 00:21:15 -0800 2011-12-21 00:54:39 -0800 patch for commit bug-74992-20111221172114.patch text/plain 8433 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMzY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWFlNTY4YTRmMWYzZmIxZjFkZWIxZjJmYmU2NDgyY2Q2 MjM3Mjc3Yi4uZjExN2M0NmJiODI4MzEzOWYyOTM4ZTUwNTdkOWUwODIyMWNjNWE0MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5 IEBACisyMDExLTEyLTIwICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBJbiBwcmVwYXJlLUNoYW5nZUxvZywgcmVwbGFjZSBjb25zdGFudCBnbG9iYWwgdmFy aWFibGVzIHdpdGggInVzZSBjb25zdGFudCIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTc0OTkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBO aXdhLgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmVwbGFjZXMgdGhlIGZvbGxvd2luZyBjb25zdGFu dCBnbG9iYWwgdmFyaWFibGVzIHdpdGggInVzZSBjb25zdGFudCJzLgorICAgICAgICAgICAgLSAk Y2hhbmdlTG9nVGltZVpvbmUKKyAgICAgICAgICAgIC0gJFNWTgorICAgICAgICAgICAgLSAkR0lU CisgICAgICAgICAgICAtICVzdXBwb3J0ZWRUZXN0RXh0ZW5zaW9ucworCisgICAgICAgICogU2Ny aXB0cy9wcmVwYXJlLUNoYW5nZUxvZzoKKyAgICAgICAgKGNoYW5nZUxvZ05hbWVGcm9tQXJncyk6 CisgICAgICAgIChjaGFuZ2VMb2dFbWFpbEFkZHJlc3NGcm9tQXJncyk6CisgICAgICAgIChyZXNv bHZlQ29uZmxpY3RlZENoYW5nZUxvZ3MpOgorICAgICAgICAoZ2VuZXJhdGVOZXdDaGFuZ2VMb2dz KToKKyAgICAgICAgKGRpZmZDb21tYW5kKToKKyAgICAgICAgKHN0YXR1c0NvbW1hbmQpOgorICAg ICAgICAoY3JlYXRlUGF0Y2hDb21tYW5kKToKKyAgICAgICAgKGZpbmRPcmlnaW5hbEZpbGVGcm9t U3ZuKToKKyAgICAgICAgKGRldGVybWluZVByb3BlcnR5Q2hhbmdlcyk6CisgICAgICAgIChnZW5l cmF0ZUZpbGVMaXN0KToKKyAgICAgICAgKHJldmlld2VyQW5kRGVzY3JpcHRpb25Gb3JHaXRDb21t aXQpOgorCiAyMDExLTEyLTIwICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIG5yd3Q6IHJlbmFtZSBmaWVsZCByZWZlcmVuY2VzIGZyb20gX2ZzIHRvIF9maWxl c3lzdGVtCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvVG9v bHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwppbmRleCA0YTZkOTYxZjUxYjI1ZmYzMDc0ODVm NmVlOTJjZjcxNzBhYzdlMTBiLi5iMmYwN2VmOTU4OWQwMWQ5Njc3ZjdiM2Q5ZDNjMTQ5OWEzNDY1 MmFlIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKQEAgLTEwNywxMiArMTA3LDEwIEBAIHN1YiB0 ZXN0TGlzdEZvckNoYW5nZUxvZyhAKTsKIAogIyMjIENvbnN0YW50IHZhcmlhYmxlcy4KICMgUHJv amVjdCB0aW1lIHpvbmUgZm9yIEN1cGVydGlubywgQ0EsIFVTCi1teSAkY2hhbmdlTG9nVGltZVpv bmUgPSAiUFNUOFBEVCI7Ci0KLW15ICRTVk4gPSAic3ZuIjsKLW15ICRHSVQgPSAiZ2l0IjsKLQot bXkgJXN1cHBvcnRlZFRlc3RFeHRlbnNpb25zID0gbWFwIHsgJF8gPT4gMSB9IHF3KGh0bWwgc2h0 bWwgc3ZnIHhtbCB4aHRtbCBwbCBwaHApOwordXNlIGNvbnN0YW50IENoYW5nZUxvZ1RpbWVab25l ID0+ICJQU1Q4UERUIjsKK3VzZSBjb25zdGFudCBTVk4gPT4gInN2biI7Cit1c2UgY29uc3RhbnQg R0lUID0+ICJnaXQiOwordXNlIGNvbnN0YW50IFN1cHBvcnRlZFRlc3RFeHRlbnNpb25zID0+IHtt YXAgeyAkXyA9PiAxIH0gcXcoaHRtbCBzaHRtbCBzdmcgeG1sIHhodG1sIHBsIHBocCl9OwogCiBl eGl0KG1haW4oKSk7CiAKQEAgLTMxOSw3ICszMTcsOCBAQCBzdWIgY2hhbmdlTG9nTmFtZUZyb21B cmdzKCQkKQogewogICAgIG15ICgkbmFtZUZyb21BcmdzLCAkZ2l0Q29tbWl0KSA9IEBfOwogICAg ICMgU2lsZW50bHkgYWxsb3cgLS1naXQtY29tbWl0IHRvIHdpbiwgd2UgY291bGQgd2FybiBpZiAk bmFtZUZyb21BcmdzIGlzIGRlZmluZWQuCi0gICAgcmV0dXJuIGAkR0lUIGxvZyAtLW1heC1jb3Vu dD0xIC0tcHJldHR5PVwiZm9ybWF0OiVhblwiIFwiJGdpdENvbW1pdFwiYCBpZiAkZ2l0Q29tbWl0 OworICAgIG15ICRjb21tYW5kID0gR0lUIC4gJyBsb2cgLS1tYXgtY291bnQ9MSAtLXByZXR0eT0i Zm9ybWF0OiVhbiIgIicgLiAkZ2l0Q29tbWl0IC4gJyInOworICAgIHJldHVybiBgJGNvbW1hbmRg IGlmICRnaXRDb21taXQ7CiAKICAgICByZXR1cm4gJG5hbWVGcm9tQXJncyB8fCBjaGFuZ2VMb2dO YW1lKCk7CiB9CkBAIC0zMjgsNyArMzI3LDggQEAgc3ViIGNoYW5nZUxvZ0VtYWlsQWRkcmVzc0Zy b21BcmdzKCQkKQogewogICAgIG15ICgkZW1haWxBZGRyZXNzRnJvbUFyZ3MsICRnaXRDb21taXQp ID0gQF87CiAgICAgIyBTaWxlbnRseSBhbGxvdyAtLWdpdC1jb21taXQgdG8gd2luLCB3ZSBjb3Vs ZCB3YXJuIGlmICRlbWFpbEFkZHJlc3NGcm9tQXJncyBpcyBkZWZpbmVkLgotICAgIHJldHVybiBg JEdJVCBsb2cgLS1tYXgtY291bnQ9MSAtLXByZXR0eT1cImZvcm1hdDolYWVcIiBcIiRnaXRDb21t aXRcImAgaWYgJGdpdENvbW1pdDsKKyAgICBteSAkY29tbWFuZCA9IEdJVCAuICcgbG9nIC0tbWF4 LWNvdW50PTEgLS1wcmV0dHk9ImZvcm1hdDolYWUiICInIC4gJGdpdENvbW1pdCAuICciJzsKKyAg ICByZXR1cm4gYCRjb21tYW5kYCBpZiAkZ2l0Q29tbWl0OwogCiAgICAgcmV0dXJuICRlbWFpbEFk ZHJlc3NGcm9tQXJncyB8fCBjaGFuZ2VMb2dFbWFpbEFkZHJlc3MoKTsKIH0KQEAgLTQzMCw3ICs0 MzAsNyBAQCBzdWIgcmVzb2x2ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKCQpCiAgICAgbXkgKCRjaGFu Z2VMb2dzKSA9IEBfOwogCiAgICAgcHJpbnQgU1RERVJSICIgIFJ1bm5pbmcgJ3N2biB1cGRhdGUn IHRvIHVwZGF0ZSBDaGFuZ2VMb2cgZmlsZXMuXG4iOwotICAgIG9wZW4gRVJST1JTLCAiLXwiLCAk U1ZOLCAidXBkYXRlIiwgQCRjaGFuZ2VMb2dzCisgICAgb3BlbiBFUlJPUlMsICItfCIsIFNWTiwg InVwZGF0ZSIsIEAkY2hhbmdlTG9ncwogICAgICAgICBvciBkaWUgIlRoZSBzdm4gdXBkYXRlIG9m IENoYW5nZUxvZyBmaWxlcyBmYWlsZWQ6ICQhLlxuIjsKICAgICBteSBAY29uZmxpY3RlZENoYW5n ZUxvZ3M7CiAgICAgd2hpbGUgKG15ICRsaW5lID0gPEVSUk9SUz4pIHsKQEAgLTQ3Nyw3ICs0Nzcs NyBAQCBzdWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQkJCQkJCQkJCQkKQogICAgICAgICAgICAg cHJpbnQgc3Vic3RyKCRwcmVmaXgsIDAsIGxlbmd0aCgkcHJlZml4KSAtIDEpIC4gIjpcblxuIiB1 bmxlc3MgKHNjYWxhciBAJHByZWZpeGVzKSA9PSAxOwogICAgICAgICB9CiAKLSAgICAgICAgbXkg JGRhdGUgPSBjaGFuZ2VMb2dEYXRlKCRjaGFuZ2VMb2dUaW1lWm9uZSk7CisgICAgICAgIG15ICRk YXRlID0gY2hhbmdlTG9nRGF0ZShDaGFuZ2VMb2dUaW1lWm9uZSk7CiAgICAgICAgIHByaW50IENI QU5HRV9MT0cgbm9ybWFsaXplTGluZUVuZGluZ3MoIiRkYXRlICAkbmFtZSAgPCRlbWFpbEFkZHJl c3M+XG5cbiIsICRlbmRsKTsKIAogICAgICAgICBteSAoJHJldmlld2VyLCAkZGVzY3JpcHRpb24p ID0gcmV2aWV3ZXJBbmREZXNjcmlwdGlvbkZvckdpdENvbW1pdCgkZ2l0Q29tbWl0LCAkZ2l0UmV2 aWV3ZXIpIGlmICRnaXRDb21taXQ7CkBAIC0xNDUwLDEwICsxNDUwLDEwIEBAIHN1YiBkaWZmQ29t bWFuZCgkJCQkKQogICAgIGlmIChpc1NWTigpKSB7CiAgICAgICAgIG15IEBlc2NhcGVkUGF0aHMg PSBtYXAoZXNjYXBlU3VidmVyc2lvblBhdGgoJF8pLCBAJHBhdGhzKTsKICAgICAgICAgbXkgJGVz Y2FwZWRQYXRoc1N0cmluZyA9ICInIiAuIGpvaW4oIicgJyIsIEBlc2NhcGVkUGF0aHMpIC4gIici OwotICAgICAgICAkY29tbWFuZCA9ICIkU1ZOIGRpZmYgLS1kaWZmLWNtZCBkaWZmIC14IC1OICRl c2NhcGVkUGF0aHNTdHJpbmciOworICAgICAgICAkY29tbWFuZCA9IFNWTiAuICIgZGlmZiAtLWRp ZmYtY21kIGRpZmYgLXggLU4gJGVzY2FwZWRQYXRoc1N0cmluZyI7CiAgICAgfSBlbHNpZiAoaXNH aXQoKSkgewogICAgICAgICBteSAkcGF0aHNTdHJpbmcgPSAiJyIgLiBqb2luKCInICciLCBAJHBh dGhzKSAuICInIjsgCi0gICAgICAgICRjb21tYW5kID0gIiRHSVQgZGlmZiAtLW5vLWV4dC1kaWZm IC1VMCAiIC4gZGlmZkZyb21Ub1N0cmluZygkZ2l0Q29tbWl0LCAkZ2l0SW5kZXgsICRtZXJnZUJh c2UpOworICAgICAgICAkY29tbWFuZCA9IEdJVCAuICIgZGlmZiAtLW5vLWV4dC1kaWZmIC1VMCAi IC4gZGlmZkZyb21Ub1N0cmluZygkZ2l0Q29tbWl0LCAkZ2l0SW5kZXgsICRtZXJnZUJhc2UpOwog ICAgICAgICAkY29tbWFuZCAuPSAiIC0tICRwYXRoc1N0cmluZyIgdW5sZXNzICRnaXRDb21taXQg b3IgJG1lcmdlQmFzZTsKICAgICB9CiAKQEAgLTE0NjgsMTAgKzE0NjgsMTAgQEAgc3ViIHN0YXR1 c0NvbW1hbmQoJCQkJCkKICAgICBpZiAoaXNTVk4oKSkgewogICAgICAgICBteSBAZXNjYXBlZEZp bGVzID0gbWFwKGVzY2FwZVN1YnZlcnNpb25QYXRoKCRfKSwga2V5cyAlJHBhdGhzKTsKICAgICAg ICAgbXkgJGVzY2FwZWRGaWxlc1N0cmluZyA9ICInIiAuIGpvaW4oIicgJyIsIEBlc2NhcGVkRmls ZXMpIC4gIiciOwotICAgICAgICAkY29tbWFuZCA9ICIkU1ZOIHN0YXQgJGVzY2FwZWRGaWxlc1N0 cmluZyI7CisgICAgICAgICRjb21tYW5kID0gU1ZOIC4gIiBzdGF0ICRlc2NhcGVkRmlsZXNTdHJp bmciOwogICAgIH0gZWxzaWYgKGlzR2l0KCkpIHsKICAgICAgICAgbXkgJGZpbGVzU3RyaW5nID0g JyInIC4gam9pbignIiAiJywga2V5cyAlJHBhdGhzKSAuICciJzsKLSAgICAgICAgJGNvbW1hbmQg PSAiJEdJVCBkaWZmIC1yIC0tbmFtZS1zdGF0dXMgLU0gLUMgIiAuIGRpZmZGcm9tVG9TdHJpbmco JGdpdENvbW1pdCwgJGdpdEluZGV4LCAkbWVyZ2VCYXNlKTsKKyAgICAgICAgJGNvbW1hbmQgPSBH SVQgLiAiIGRpZmYgLXIgLS1uYW1lLXN0YXR1cyAtTSAtQyAiIC4gZGlmZkZyb21Ub1N0cmluZygk Z2l0Q29tbWl0LCAkZ2l0SW5kZXgsICRtZXJnZUJhc2UpOwogICAgICAgICAkY29tbWFuZCAuPSAi IC0tICRmaWxlc1N0cmluZyIgdW5sZXNzICRnaXRDb21taXQ7CiAgICAgfQogCkBAIC0xNDg2LDcg KzE0ODYsNyBAQCBzdWIgY3JlYXRlUGF0Y2hDb21tYW5kKCQkJCQpCiAgICAgaWYgKGlzU1ZOKCkp IHsKICAgICAgICAgJGNvbW1hbmQgPSAiJyRGaW5kQmluOjpCaW4vc3ZuLWNyZWF0ZS1wYXRjaCcg JGNoYW5nZWRGaWxlc1N0cmluZyI7CiAgICAgfSBlbHNpZiAoaXNHaXQoKSkgewotICAgICAgICAk Y29tbWFuZCA9ICIkR0lUIGRpZmYgLU0gLUMgIiAuIGRpZmZGcm9tVG9TdHJpbmcoJGdpdENvbW1p dCwgJGdpdEluZGV4LCAkbWVyZ2VCYXNlKTsKKyAgICAgICAgJGNvbW1hbmQgPSBHSVQgLiAiIGRp ZmYgLU0gLUMgIiAuIGRpZmZGcm9tVG9TdHJpbmcoJGdpdENvbW1pdCwgJGdpdEluZGV4LCAkbWVy Z2VCYXNlKTsKICAgICAgICAgJGNvbW1hbmQgLj0gIiAtLSAkY2hhbmdlZEZpbGVzU3RyaW5nIiB1 bmxlc3MgJGdpdENvbW1pdDsKICAgICB9CiAKQEAgLTE1MDMsNyArMTUwMyw3IEBAIHN1YiBmaW5k T3JpZ2luYWxGaWxlRnJvbVN2bigkKQogewogICAgIG15ICgkZmlsZSkgPSBAXzsKICAgICBteSAk YmFzZVVybDsKLSAgICBvcGVuIElORk8sICIkU1ZOIGluZm8gLiB8IiBvciBkaWU7CisgICAgb3Bl biBJTkZPLCBTVk4gLiAiIGluZm8gLiB8IiBvciBkaWU7CiAgICAgd2hpbGUgKDxJTkZPPikgewog ICAgICAgICBpZiAoL15VUkw6ICguKz8pW1xyXG5dKiQvKSB7CiAgICAgICAgICAgICAkYmFzZVVy bCA9ICQxOwpAQCAtMTUxMiw3ICsxNTEyLDcgQEAgc3ViIGZpbmRPcmlnaW5hbEZpbGVGcm9tU3Zu KCQpCiAgICAgY2xvc2UgSU5GTzsKICAgICBteSAkc291cmNlRmlsZTsKICAgICBteSAkZXNjYXBl ZEZpbGUgPSBlc2NhcGVTdWJ2ZXJzaW9uUGF0aCgkZmlsZSk7Ci0gICAgb3BlbiBJTkZPLCAiJFNW TiBpbmZvICckZXNjYXBlZEZpbGUnIHwiIG9yIGRpZTsKKyAgICBvcGVuIElORk8sIFNWTiAuICIg aW5mbyAnJGVzY2FwZWRGaWxlJyB8IiBvciBkaWU7CiAgICAgd2hpbGUgKDxJTkZPPikgewogICAg ICAgICBpZiAoL15Db3BpZWQgRnJvbSBVUkw6ICguKz8pW1xyXG5dKiQvKSB7CiAgICAgICAgICAg ICAkc291cmNlRmlsZSA9IEZpbGU6OlNwZWMtPmFiczJyZWwoJDEsICRiYXNlVXJsKTsKQEAgLTE1 MzEsMTQgKzE1MzEsMTQgQEAgc3ViIGRldGVybWluZVByb3BlcnR5Q2hhbmdlcygkJCQpCiAgICAg aWYgKCRpc0FkZCkgewogICAgICAgICBteSAlYWRkZWRQcm9wZXJ0aWVzOwogICAgICAgICBteSAl cmVtb3ZlZFByb3BlcnRpZXM7Ci0gICAgICAgIG9wZW4gUFJPUExJU1QsICIkU1ZOIHByb3BsaXN0 ICckZXNjYXBlZEZpbGUnIHwiIG9yIGRpZTsKKyAgICAgICAgb3BlbiBQUk9QTElTVCwgU1ZOIC4g IiBwcm9wbGlzdCAnJGVzY2FwZWRGaWxlJyB8IiBvciBkaWU7CiAgICAgICAgIHdoaWxlICg8UFJP UExJU1Q+KSB7CiAgICAgICAgICAgICAkYWRkZWRQcm9wZXJ0aWVzeyQxfSA9IDEgaWYgL14gICgu Kz8pW1xyXG5dKiQvICYmICQxIG5lICdzdm46bWVyZ2VpbmZvJzsKICAgICAgICAgfQogICAgICAg ICBjbG9zZSBQUk9QTElTVDsKICAgICAgICAgaWYgKCRvcmlnaW5hbCkgewogICAgICAgICAgICAg bXkgJGVzY2FwZWRPcmlnaW5hbCA9IGVzY2FwZVN1YnZlcnNpb25QYXRoKCRvcmlnaW5hbCk7Ci0g ICAgICAgICAgICBvcGVuIFBST1BMSVNULCAiJFNWTiBwcm9wbGlzdCAnJGVzY2FwZWRPcmlnaW5h bCcgfCIgb3IgZGllOworICAgICAgICAgICAgb3BlbiBQUk9QTElTVCwgU1ZOIC4gIiBwcm9wbGlz dCAnJGVzY2FwZWRPcmlnaW5hbCcgfCIgb3IgZGllOwogICAgICAgICAgICAgd2hpbGUgKDxQUk9Q TElTVD4pIHsKICAgICAgICAgICAgICAgICBuZXh0IHVubGVzcyAvXiAgKC4rPylbXHJcbl0qJC87 CiAgICAgICAgICAgICAgICAgbXkgJHByb3BlcnR5ID0gJDE7CkBAIC0xNTUyLDcgKzE1NTIsNyBA QCBzdWIgZGV0ZXJtaW5lUHJvcGVydHlDaGFuZ2VzKCQkJCkKICAgICAgICAgJGNoYW5nZXN7IkEi fSA9IFtzb3J0IGtleXMgJWFkZGVkUHJvcGVydGllc10gaWYgJWFkZGVkUHJvcGVydGllczsKICAg ICAgICAgJGNoYW5nZXN7IkQifSA9IFtzb3J0IGtleXMgJXJlbW92ZWRQcm9wZXJ0aWVzXSBpZiAl cmVtb3ZlZFByb3BlcnRpZXM7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgb3BlbiBESUZGLCAiJFNW TiBkaWZmICckZXNjYXBlZEZpbGUnIHwiIG9yIGRpZTsKKyAgICAgICAgb3BlbiBESUZGLCBTVk4g LiAiIGRpZmYgJyRlc2NhcGVkRmlsZScgfCIgb3IgZGllOwogICAgICAgICB3aGlsZSAoPERJRkY+ KSB7CiAgICAgICAgICAgICBpZiAoL15Qcm9wZXJ0eSBjaGFuZ2VzIG9uOi8pIHsKICAgICAgICAg ICAgICAgICB3aGlsZSAoPERJRkY+KSB7CkBAIC0xNjU3LDcgKzE2NTcsNyBAQCBzdWIgZ2VuZXJh dGVGaWxlTGlzdChcJSQkJCkKICAgICAgICAgICAgICAgICBwdXNoIEBhZGRlZFJlZ3Jlc3Npb25U ZXN0cywgJGZpbGUKICAgICAgICAgICAgICAgICAgICAgaWYgaXNBZGRlZFN0YXR1cygkc3RhdHVz KQogICAgICAgICAgICAgICAgICAgICAgICAmJiAkZmlsZSA9fiAvXC4oW2EtekEtWl0rKSQvCi0g ICAgICAgICAgICAgICAgICAgICAgICYmICRzdXBwb3J0ZWRUZXN0RXh0ZW5zaW9uc3tsYygkMSl9 CisgICAgICAgICAgICAgICAgICAgICAgICYmIFN1cHBvcnRlZFRlc3RFeHRlbnNpb25zLT57bGMo JDEpfQogICAgICAgICAgICAgICAgICAgICAgICAmJiAhc2NhbGFyKGdyZXAoL15yZXNvdXJjZXMk L2ksIEBjb21wb25lbnRzKSkKICAgICAgICAgICAgICAgICAgICAgICAgJiYgIXNjYWxhcihncmVw KC9ec2NyaXB0LXRlc3RzJC9pLCBAY29tcG9uZW50cykpOwogICAgICAgICAgICAgfQpAQCAtMTgy Miw5ICsxODIyLDkgQEAgc3ViIHJldmlld2VyQW5kRGVzY3JpcHRpb25Gb3JHaXRDb21taXQoJCQp CiAgICAgbXkgJGdpdExvZzsKICAgICB7CiAgICAgICAgIGxvY2FsICQvID0gdW5kZWY7Ci0gICAg ICAgIG9wZW4oR0lULCAiLXwiLCAkR0lULCBAYXJncywgJGNvbW1pdCkgfHwgZGllOwotICAgICAg ICAkZ2l0TG9nID0gPEdJVD47Ci0gICAgICAgIGNsb3NlKEdJVCk7CisgICAgICAgIG9wZW4oR0lU TE9HLCAiLXwiLCBHSVQsIEBhcmdzLCAkY29tbWl0KSB8fCBkaWU7CisgICAgICAgICRnaXRMb2cg PSA8R0lUTE9HPjsKKyAgICAgICAgY2xvc2UoR0lUTE9HKTsKICAgICB9CiAKICAgICBteSBAY29t bWl0TG9ncyA9IHNwbGl0KC9eW0NjXW9tbWl0IFthLWYwLTldezQwfS9tLCAkZ2l0TG9nKTsK