143897 2015-04-17 14:12:08 -0700 prepare-ChangeLog sometimes includes unmodified functions on purely subtractive hunks 2016-07-21 17:27:20 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 matthew_hanson webkit-unassigned dburkart webkit-bug-importer oldest_to_newest 1086410 0 matthew_hanson 2015-04-17 14:12:08 -0700 When a Git combined diff hunk only includes one deletion, prepare-ChangeLog reports that the previous function/method has been modified. 1086413 1 251045 matthew_hanson 2015-04-17 14:14:27 -0700 Created attachment 251045 prepare-ChangeLog should ignore the preceeding function when processing the removal of a function. 1086415 2 matthew_hanson 2015-04-17 14:16:02 -0700 rdar://problem/20043230 1086416 3 webkit-bug-importer 2015-04-17 14:16:52 -0700 <rdar://problem/20593033> 1086417 4 matthew_hanson 2015-04-17 14:18:16 -0700 <rdar://problem/20043230> 1086424 5 251045 ddkilzer 2015-04-17 14:28:39 -0700 Comment on attachment 251045 prepare-ChangeLog should ignore the preceeding function when processing the removal of a function. View in context: https://bugs.webkit.org/attachment.cgi?id=251045&action=review r- for commented out code. > Tools/Scripts/prepare-ChangeLog:291 > + # if ($after_start >= 0 && $after_end >= 0 && $after_end >= $after_start) { This shouldn't be commented out. We don't check in commented out code. 1086426 6 251048 matthew_hanson 2015-04-17 14:33:00 -0700 Created attachment 251048 v2: prepare-ChangeLog should ignore the preceeding function when processing the removal of a function. 1086431 7 251048 ddkilzer 2015-04-17 14:45:49 -0700 Comment on attachment 251048 v2: prepare-ChangeLog should ignore the preceeding function when processing the removal of a function. r=me. If this causes any regressions, we should create some Perl unit tests before re-landing. 1086918 8 matthew_hanson 2015-04-20 15:08:34 -0700 Committed https://trac.webkit.org/r183030. 1213431 9 dbates 2016-07-21 17:27:20 -0700 *** Bug 137889 has been marked as a duplicate of this bug. *** 251045 2015-04-17 14:14:27 -0700 2015-04-17 14:28:39 -0700 prepare-ChangeLog should ignore the preceeding function when processing the removal of a function. 0001-prepare-ChangeLog-should-ignore-the-preceeding-funct.patch text/plain 6375 matthew_hanson RnJvbSAzZGQzNTZiZGEzZTdkYTA2NjM1MTBjNjk5ZDVlOGEwYmM0Y2FiMGVmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXR0aGV3IEhhbnNvbiA8bWF0dGhld19oYW5zb25AYXBwbGUu Y29tPgpEYXRlOiBGcmksIDE3IEFwciAyMDE1IDE0OjEyOjM0IC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gcHJlcGFyZS1DaGFuZ2VMb2cgc2hvdWxkIGlnbm9yZSB0aGUgcHJlY2VlZGluZyBmdW5jdGlv biB3aGVuCiBwcm9jZXNzaW5nIHRoZSByZW1vdmFsIG9mIGEgZnVuY3Rpb24uCiBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzODk3CgpSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KClRoaXMgaXMgYSBzcGVjdWxhdGl2ZSBmaXggdGhhdCBhZGRyZXNzZXMgdHdvIGlz c3VlczoKCjEuIEFuIG9mZi1ieS1vbmUgZXJyb3Igd2hpY2ggYWxsb3dlZCBlbmRpbmcgbGluZXMg dG8gYmUgbGVzcyB0aGFuIHN0YXJ0aW5nIGxpbmVzIHdoZW4gYSBodW5rIHdhcyBhIHB1cmUgZGVs ZXRlLgpXZSB3ZXJlIGRldGVybWluaW5nIGVuZGluZyBsaW5lcyBmcm9tIGNvbWJpbmVkIGRpZmZz IHVzaW5nIHRoZSBsb2dpYzogRW5kID0gU3RhcnQgKyBPZmZzZXQgLSAxLgoKU28gZm9yIGEgaHVu ayBsaWtlICJAQCAtNzIzLDEwICs3MjEsMCBAQCBib29sIGZvb2JhciIsIHdlIHdlcmUgZ2VuZXJh dGluZyB0aGUgZm9sbG93aW5nIHN0YXJ0aW5nL2VuZGluZyBsaW5lIHBhaXJzOgpCZWZvcmU6ICg3 MjMsIDcyOSkKQWZ0ZXI6ICg3MjEsIDcyMCkKCkJlZm9yZSBpcyBjb3JyZWN0LCBidXQgQWZ0ZXIg c2hvdWxkIGJlICg3MjEsIDcyMSksIHNpbmNlIGl0IHJlcHJlc2VudHMgdGhlIGJlZ2lubmluZyBh bmQgZW5kaW5nIGxpbmVzIGZvciB0aGUgaHVuay4KV2hldGhlciB0aGVyZSBhcmUgemVybyBsaW5l cyBvciBvbmUgbGluZSBpbiB0aGUgaHVuaywgdGhlIHN0YXJ0aW5nIGFuZCBlbmRpbmcgbGluZSBh cmUgdGhlIHNhbWUuCgpUaGlzIGVycm9yIHdhcyBjYXVzaW5nIGJhZCBiZWhhdmlvciBvbiBwdXJl bHkgYWRkaXRpdmUgYW5kIHB1cmVseSBzdWJ0cmFjdGl2ZSBodW5rcywgYnV0IHNpbmNlIHdlIG9u bHkgcmVmZXIKdG8gQWZ0ZXIgd2hlbiBnZW5lcmF0aW5nIENoYW5nZUxvZyBvdXRwdXQsIHRoZSBl eHRyYWN0TGluZVJhbmdlQmVmb3JlQ2hhbmdlIGhhZCBubyB2aXNpYmxlIGVmZmVjdCBvbiBwcm9n cmFtIG91dHB1dC4KClRoZSBmaXggaXMgdG8gc2V0IEVuZCB0byB0aGUgbWF4IG9mIFN0YXJ0ICsg T2Zmc2V0IC0gMSBhbmQgU3RhcnQsIHJhdGhlciB0aGFuIGFsd2F5cyB1c2luZyB0aGUgZm9ybWVy LgoKMi4gQ3JlYXRpbmcgZ2l0IGRpZmZzIGZyb20gSEVBRCBhbmQgbm90IG9yaWdpbi9tYXN0ZXIg YnkgZGVmYXVsdC4KCkhhcmQtY29kaW5nIG9yaWdpbi9tYXN0ZXIgaW50byB0aGUgb3JpZ2luYWxG aWxlIGNvbW1hbmQgaGFzIHRoZSBkaXNhZHZhbnRhZ2Ugb2YgY2F1c2luZyB0aGUgZGlmZiB0byBm YWlsIGVudGlyZWx5CndoZW4gb3JpZ2luL21hc3RlciBkb2VzIG5vdCBleGlzdCwgYW5kIHRvIGRv IHRoZSB3cm9uZyB0aGluZyB3aGVuIGRldGVybWluaW5nIGRlbGV0ZWQgZnVuY3Rpb25zL21ldGhv ZHMuCgoqIFNjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2c6CihvcmlnaW5hbEZpbGUpOgpVc2UgSEVB RCBpbnN0ZWFkIG9mIG9yaWdpbi9tYXN0ZXIgaW4gZGVmYXVsdCBHaXQgY2FzZS4KCihnZW5lcmF0 ZUZ1bmN0aW9uTGlzdHMpOgpFbnN1cmUgdGhhdCB0aGUgZW5kIGxpbmUgaXMgbm90IGxlc3MgdGhh biB0aGUgc3RhcnQgbGluZS4KCihleHRyYWN0TGluZVJhbmdlQWZ0ZXJDaGFuZ2UpOgpTZXQgdGhl IGVuZCBsaW5lIHRvIHRoZSBzdGFydCBsaW5lIGlmIHRoZSBlbmQgbGluZSBpcyBsZXNzIHRoYW4g dGhlIHN0YXJ0IGxpbmUuCgooZXh0cmFjdExpbmVSYW5nZUJlZm9yZUNoYW5nZSk6CkRpdHRvLgot LS0KIFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgfCA0MiArKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKwogVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxv ZyB8ICA5ICsrKysrLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA0NyBpbnNlcnRpb25zKCspLCA0IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxv ZwppbmRleCA1NTdhNGJkLi4wNDRkYjVmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDcgQEAKIDIwMTUtMDQtMTcgIE1hdHRoZXcg SGFuc29uICA8bWF0dGhld19oYW5zb25AYXBwbGUuY29tPgogCisgICAgICAgIHByZXBhcmUtQ2hh bmdlTG9nIHNob3VsZCBpZ25vcmUgdGhlIHByZWNlZWRpbmcgZnVuY3Rpb24gd2hlbiBwcm9jZXNz aW5nIHRoZSByZW1vdmFsIG9mIGEgZnVuY3Rpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM4OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGEgc3BlY3VsYXRpdmUgZml4IHRoYXQgYWRk cmVzc2VzIHR3byBpc3N1ZXM6CisKKyAgICAgICAgMS4gQW4gb2ZmLWJ5LW9uZSBlcnJvciB3aGlj aCBhbGxvd2VkIGVuZGluZyBsaW5lcyB0byBiZSBsZXNzIHRoYW4gc3RhcnRpbmcgbGluZXMgd2hl biBhIGh1bmsgd2FzIGEgcHVyZSBkZWxldGUuCisgICAgICAgIFdlIHdlcmUgZGV0ZXJtaW5pbmcg ZW5kaW5nIGxpbmVzIGZyb20gY29tYmluZWQgZGlmZnMgdXNpbmcgdGhlIGxvZ2ljOiBFbmQgPSBT dGFydCArIE9mZnNldCAtIDEuCisKKyAgICAgICAgU28gZm9yIGEgaHVuayBsaWtlICJAQCAtNzIz LDEwICs3MjEsMCBAQCBib29sIGZvb2JhciIsIHdlIHdlcmUgZ2VuZXJhdGluZyB0aGUgZm9sbG93 aW5nIHN0YXJ0aW5nL2VuZGluZyBsaW5lIHBhaXJzOgorICAgICAgICBCZWZvcmU6ICg3MjMsIDcy OSkKKyAgICAgICAgQWZ0ZXI6ICg3MjEsIDcyMCkKKworICAgICAgICBCZWZvcmUgaXMgY29ycmVj dCwgYnV0IEFmdGVyIHNob3VsZCBiZSAoNzIxLCA3MjEpLCBzaW5jZSBpdCByZXByZXNlbnRzIHRo ZSBiZWdpbm5pbmcgYW5kIGVuZGluZyBsaW5lcyBmb3IgdGhlIGh1bmsuCisgICAgICAgIFdoZXRo ZXIgdGhlcmUgYXJlIHplcm8gbGluZXMgb3Igb25lIGxpbmUgaW4gdGhlIGh1bmssIHRoZSBzdGFy dGluZyBhbmQgZW5kaW5nIGxpbmUgYXJlIHRoZSBzYW1lLgorCisgICAgICAgIFRoaXMgZXJyb3Ig d2FzIGNhdXNpbmcgYmFkIGJlaGF2aW9yIG9uIHB1cmVseSBhZGRpdGl2ZSBhbmQgcHVyZWx5IHN1 YnRyYWN0aXZlIGh1bmtzLCBidXQgc2luY2Ugd2Ugb25seSByZWZlcgorICAgICAgICB0byBBZnRl ciB3aGVuIGdlbmVyYXRpbmcgQ2hhbmdlTG9nIG91dHB1dCwgdGhlIGV4dHJhY3RMaW5lUmFuZ2VC ZWZvcmVDaGFuZ2UgaGFkIG5vIHZpc2libGUgZWZmZWN0IG9uIHByb2dyYW0gb3V0cHV0LgorCisg ICAgICAgIFRoZSBmaXggaXMgdG8gc2V0IEVuZCB0byB0aGUgbWF4IG9mIFN0YXJ0ICsgT2Zmc2V0 IC0gMSBhbmQgU3RhcnQsIHJhdGhlciB0aGFuIGFsd2F5cyB1c2luZyB0aGUgZm9ybWVyLgorCisg ICAgICAgIDIuIENyZWF0aW5nIGdpdCBkaWZmcyBmcm9tIEhFQUQgYW5kIG5vdCBvcmlnaW4vbWFz dGVyIGJ5IGRlZmF1bHQuCisKKyAgICAgICAgSGFyZC1jb2Rpbmcgb3JpZ2luL21hc3RlciBpbnRv IHRoZSBvcmlnaW5hbEZpbGUgY29tbWFuZCBoYXMgdGhlIGRpc2FkdmFudGFnZSBvZiBjYXVzaW5n IHRoZSBkaWZmIHRvIGZhaWwgZW50aXJlbHkKKyAgICAgICAgd2hlbiBvcmlnaW4vbWFzdGVyIGRv ZXMgbm90IGV4aXN0LCBhbmQgdG8gZG8gdGhlIHdyb25nIHRoaW5nIHdoZW4gZGV0ZXJtaW5pbmcg ZGVsZXRlZCBmdW5jdGlvbnMvbWV0aG9kcy4KKworICAgICAgICAqIFNjcmlwdHMvcHJlcGFyZS1D aGFuZ2VMb2c6CisgICAgICAgIChvcmlnaW5hbEZpbGUpOgorICAgICAgICBVc2UgSEVBRCBpbnN0 ZWFkIG9mIG9yaWdpbi9tYXN0ZXIgaW4gZGVmYXVsdCBHaXQgY2FzZS4KKworICAgICAgICAoZ2Vu ZXJhdGVGdW5jdGlvbkxpc3RzKToKKyAgICAgICAgRW5zdXJlIHRoYXQgdGhlIGVuZCBsaW5lIGlz IG5vdCBsZXNzIHRoYW4gdGhlIHN0YXJ0IGxpbmUuCisKKyAgICAgICAgKGV4dHJhY3RMaW5lUmFu Z2VBZnRlckNoYW5nZSk6CisgICAgICAgIFNldCB0aGUgZW5kIGxpbmUgdG8gdGhlIHN0YXJ0IGxp bmUgaWYgdGhlIGVuZCBsaW5lIGlzIGxlc3MgdGhhbiB0aGUgc3RhcnQgbGluZS4KKworICAgICAg ICAoZXh0cmFjdExpbmVSYW5nZUJlZm9yZUNoYW5nZSk6CisgICAgICAgIERpdHRvLgorCisyMDE1 LTA0LTE3ICBNYXR0aGV3IEhhbnNvbiAgPG1hdHRoZXdfaGFuc29uQGFwcGxlLmNvbT4KKwogICAg ICAgICBTdXBwcmVzcyB3YXJuaW5nIGluIHByZXBhcmUtQ2hhbmdlTG9nLgogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzODgyCiAKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cgYi9Ub29scy9TY3JpcHRzL3ByZXBhcmUt Q2hhbmdlTG9nCmluZGV4IDRkNjhmNWMuLjFhODQxN2MgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvcHJlcGFyZS1DaGFuZ2VMb2cKKysrIGIvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxv ZwpAQCAtNjAsNyArNjAsNyBAQCB1c2UgRmlsZTo6U3BlYzsKIHVzZSBGaW5kQmluOwogdXNlIEdl dG9wdDo6TG9uZzsKIHVzZSBsaWIgJEZpbmRCaW46OkJpbjsKLXVzZSBMaXN0OjpVdGlsIHF3L2Fu eS87Cit1c2UgTGlzdDo6VXRpbCBxdy9hbnkgbWF4LzsKIHVzZSBQT1NJWCBxdyhzdHJmdGltZSk7 CiB1c2UgVkNTVXRpbHM7CiAKQEAgLTI1Nyw3ICsyNTcsNyBAQCBzdWIgb3JpZ2luYWxGaWxlKCQk JCQpCiAgICAgICAgIGlmICgkbWVyZ2VCYXNlKSB7CiAgICAgICAgICAgICAkY29tbWFuZCAuPSAi JG1lcmdlQmFzZSI7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAkY29tbWFuZCAuPSAi b3JpZ2luL21hc3RlciI7CisgICAgICAgICAgICAkY29tbWFuZCAuPSAiSEVBRCI7CiAgICAgICAg IH0KICAgICAgICAgJGNvbW1hbmQgLj0gIjokZmlsZSI7CiAgICAgfQpAQCAtMjg4LDYgKzI4OCw3 IEBAIHN1YiBnZW5lcmF0ZUZ1bmN0aW9uTGlzdHMoJCQkJCQpCiAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgICAgIG15ICgkYWZ0ZXJfc3RhcnQsICRhZnRlcl9lbmQpID0gZXh0cmFjdExp bmVSYW5nZUFmdGVyQ2hhbmdlKCRfKTsKICAgICAgICAgICAgICAgICBpZiAoJGFmdGVyX3N0YXJ0 ID49IDAgJiYgJGFmdGVyX2VuZCA+PSAwKSB7CisgICAgICAgICAgICAgICAgIyBpZiAoJGFmdGVy X3N0YXJ0ID49IDAgJiYgJGFmdGVyX2VuZCA+PSAwICYmICRhZnRlcl9lbmQgPj0gJGFmdGVyX3N0 YXJ0KSB7CiAgICAgICAgICAgICAgICAgICAgIHB1c2ggQHskbGluZV9yYW5nZXNfYWZ0ZXJfY2hh bmdlZHskZmlsZX19LCBbICRhZnRlcl9zdGFydCwgJGFmdGVyX2VuZCBdOwogICAgICAgICAgICAg ICAgIH0gZWxzaWYgKC9ET19OT1RfQ09NTUlULykgewogICAgICAgICAgICAgICAgICAgICBwcmlu dCBTVERFUlIgIldBUk5JTkc6IGZpbGUgJGZpbGUgY29udGFpbnMgdGhlIHN0cmluZyBET19OT1Rf Q09NTUlULCBsaW5lICQuXG4iOwpAQCAtMjEwOCw3ICsyMTA5LDcgQEAgc3ViIGV4dHJhY3RMaW5l UmFuZ2VBZnRlckNoYW5nZSgkKQogICAgICAgICAkZW5kID0gJDQgfHwgJDI7CiAgICAgfSBlbHNp ZiAoaXNHaXQoKSAmJiAkc3RyaW5nID1+IC9eQEAgLVxkKygsXGQrKT8gXCsoXGQrKSgsKFxkKykp PyBAQC8pIHsKICAgICAgICAgJHN0YXJ0ID0gJDI7Ci0gICAgICAgICRlbmQgPSBkZWZpbmVkKCQ0 KSA/ICQ0ICsgJDIgLSAxIDogJDI7CisgICAgICAgICRlbmQgPSBkZWZpbmVkKCQ0KSA/IG1heCgk c3RhcnQgKyAkNCAtIDEsICRzdGFydCkgOiAkc3RhcnQ7CiAgICAgfQogCiAgICAgcmV0dXJuICgk c3RhcnQsICRlbmQpOwpAQCAtMjEyNSw3ICsyMTI2LDcgQEAgc3ViIGV4dHJhY3RMaW5lUmFuZ2VC ZWZvcmVDaGFuZ2UoJCkKICAgICAgICAgJGVuZCA9ICQzIHx8ICQxIGlmICQ0IG5lICJhIjsKICAg ICB9IGVsc2lmIChpc0dpdCgpICYmICRzdHJpbmcgPX4gL15AQCAtKFxkKykoLChcZCspKT8gXCtc ZCsoLFxkKyk/IEBALykgewogICAgICAgICAkc3RhcnQgPSAkMTsKLSAgICAgICAgJGVuZCA9IGRl ZmluZWQoJDMpID8gJDMgKyAkMSAtIDEgOiAkMTsKKyAgICAgICAgJGVuZCA9IGRlZmluZWQoJDMp ID8gbWF4KCRzdGFydCArICQzIC0gMSwgJHN0YXJ0KSA6ICRzdGFydDsKICAgICB9CiAKICAgICBy ZXR1cm4gKCRzdGFydCwgJGVuZCk7Ci0tIAoyLjIuMSAoQXBwbGUgR2l0LTUzKQoK 251048 2015-04-17 14:33:00 -0700 2015-04-17 14:45:49 -0700 v2: prepare-ChangeLog should ignore the preceeding function when processing the removal of a function. 0001-prepare-ChangeLog-should-ignore-the-preceeding-funct.patch text/plain 6476 matthew_hanson RnJvbSA2ZWRjZWI0NjkxNDBkZjUwZDgzMzk3OTkxMmVkNmFiYzg4NTU0OGI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXR0aGV3IEhhbnNvbiA8bWF0dGhld19oYW5zb25AYXBwbGUu Y29tPgpEYXRlOiBGcmksIDE3IEFwciAyMDE1IDE0OjEyOjM0IC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gcHJlcGFyZS1DaGFuZ2VMb2cgc2hvdWxkIGlnbm9yZSB0aGUgcHJlY2VlZGluZyBmdW5jdGlv biB3aGVuCiBwcm9jZXNzaW5nIHRoZSByZW1vdmFsIG9mIGEgZnVuY3Rpb24uCiBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzODk3CgpSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KClRoaXMgaXMgYSBzcGVjdWxhdGl2ZSBmaXggdGhhdCBhZGRyZXNzZXMgdHdvIGlz c3VlczoKCjEuIEFuIG9mZi1ieS1vbmUgZXJyb3Igd2hpY2ggYWxsb3dlZCBlbmRpbmcgbGluZXMg dG8gYmUgbGVzcyB0aGFuIHN0YXJ0aW5nIGxpbmVzIHdoZW4gYSBodW5rIHdhcyBhIHB1cmUgZGVs ZXRlLgpXZSB3ZXJlIGRldGVybWluaW5nIGVuZGluZyBsaW5lcyBmcm9tIGNvbWJpbmVkIGRpZmZz IHVzaW5nIHRoZSBsb2dpYzogRW5kID0gU3RhcnQgKyBPZmZzZXQgLSAxLgoKU28gZm9yIGEgaHVu ayBsaWtlICJAQCAtNzIzLDEwICs3MjEsMCBAQCBib29sIGZvb2JhciIsIHdlIHdlcmUgZ2VuZXJh dGluZyB0aGUgZm9sbG93aW5nIHN0YXJ0aW5nL2VuZGluZyBsaW5lIHBhaXJzOgpCZWZvcmU6ICg3 MjMsIDcyOSkKQWZ0ZXI6ICg3MjEsIDcyMCkKCkJlZm9yZSBpcyBjb3JyZWN0LCBidXQgQWZ0ZXIg c2hvdWxkIGJlICg3MjEsIDcyMSksIHNpbmNlIGl0IHJlcHJlc2VudHMgdGhlIGJlZ2lubmluZyBh bmQgZW5kaW5nIGxpbmVzIGZvciB0aGUgaHVuay4KV2hldGhlciB0aGVyZSBhcmUgemVybyBsaW5l cyBvciBvbmUgbGluZSBpbiB0aGUgaHVuaywgdGhlIHN0YXJ0aW5nIGFuZCBlbmRpbmcgbGluZSBh cmUgdGhlIHNhbWUuCgpUaGlzIGVycm9yIHdhcyBjYXVzaW5nIGJhZCBiZWhhdmlvciBvbiBwdXJl bHkgYWRkaXRpdmUgYW5kIHB1cmVseSBzdWJ0cmFjdGl2ZSBodW5rcywgYnV0IHNpbmNlIHdlIG9u bHkgcmVmZXIKdG8gQWZ0ZXIgd2hlbiBnZW5lcmF0aW5nIENoYW5nZUxvZyBvdXRwdXQsIHRoZSBl eHRyYWN0TGluZVJhbmdlQmVmb3JlQ2hhbmdlIGhhZCBubyB2aXNpYmxlIGVmZmVjdCBvbiBwcm9n cmFtIG91dHB1dC4KClRoZSBmaXggaXMgdG8gc2V0IEVuZCB0byB0aGUgbWF4IG9mIFN0YXJ0ICsg T2Zmc2V0IC0gMSBhbmQgU3RhcnQsIHJhdGhlciB0aGFuIGFsd2F5cyB1c2luZyB0aGUgZm9ybWVy LgoKMi4gQ3JlYXRpbmcgZ2l0IGRpZmZzIGZyb20gSEVBRCBhbmQgbm90IG9yaWdpbi9tYXN0ZXIg YnkgZGVmYXVsdC4KCkhhcmQtY29kaW5nIG9yaWdpbi9tYXN0ZXIgaW50byB0aGUgb3JpZ2luYWxG aWxlIGNvbW1hbmQgaGFzIHRoZSBkaXNhZHZhbnRhZ2Ugb2YgY2F1c2luZyB0aGUgZGlmZiB0byBm YWlsIGVudGlyZWx5CndoZW4gb3JpZ2luL21hc3RlciBkb2VzIG5vdCBleGlzdCwgYW5kIHRvIGRv IHRoZSB3cm9uZyB0aGluZyB3aGVuIGRldGVybWluaW5nIGRlbGV0ZWQgZnVuY3Rpb25zL21ldGhv ZHMuCgoqIFNjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2c6CihvcmlnaW5hbEZpbGUpOgpVc2UgSEVB RCBpbnN0ZWFkIG9mIG9yaWdpbi9tYXN0ZXIgaW4gZGVmYXVsdCBHaXQgY2FzZS4KCihnZW5lcmF0 ZUZ1bmN0aW9uTGlzdHMpOgpFbnN1cmUgdGhhdCB0aGUgZW5kIGxpbmUgaXMgbm90IGxlc3MgdGhh biB0aGUgc3RhcnQgbGluZS4KCihleHRyYWN0TGluZVJhbmdlQWZ0ZXJDaGFuZ2UpOgpTZXQgdGhl IGVuZCBsaW5lIHRvIHRoZSBzdGFydCBsaW5lIGlmIHRoZSBlbmQgbGluZSBpcyBsZXNzIHRoYW4g dGhlIHN0YXJ0IGxpbmUuCgooZXh0cmFjdExpbmVSYW5nZUJlZm9yZUNoYW5nZSk6CkRpdHRvLgot LS0KIFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgfCA0MiArKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKwogVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxv ZyB8IDEwICsrKysrLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgNSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VM b2cKaW5kZXggYWYyYmJiZS4uOTI2MmIwZCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ3IEBACiAyMDE1LTA0LTE3ICBNYXR0aGV3 IEhhbnNvbiAgPG1hdHRoZXdfaGFuc29uQGFwcGxlLmNvbT4KIAorICAgICAgICBwcmVwYXJlLUNo YW5nZUxvZyBzaG91bGQgaWdub3JlIHRoZSBwcmVjZWVkaW5nIGZ1bmN0aW9uIHdoZW4gcHJvY2Vz c2luZyB0aGUgcmVtb3ZhbCBvZiBhIGZ1bmN0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzODk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBhIHNwZWN1bGF0aXZlIGZpeCB0aGF0IGFk ZHJlc3NlcyB0d28gaXNzdWVzOgorCisgICAgICAgIDEuIEFuIG9mZi1ieS1vbmUgZXJyb3Igd2hp Y2ggYWxsb3dlZCBlbmRpbmcgbGluZXMgdG8gYmUgbGVzcyB0aGFuIHN0YXJ0aW5nIGxpbmVzIHdo ZW4gYSBodW5rIHdhcyBhIHB1cmUgZGVsZXRlLgorICAgICAgICBXZSB3ZXJlIGRldGVybWluaW5n IGVuZGluZyBsaW5lcyBmcm9tIGNvbWJpbmVkIGRpZmZzIHVzaW5nIHRoZSBsb2dpYzogRW5kID0g U3RhcnQgKyBPZmZzZXQgLSAxLgorCisgICAgICAgIFNvIGZvciBhIGh1bmsgbGlrZSAiQEAgLTcy MywxMCArNzIxLDAgQEAgYm9vbCBmb29iYXIiLCB3ZSB3ZXJlIGdlbmVyYXRpbmcgdGhlIGZvbGxv d2luZyBzdGFydGluZy9lbmRpbmcgbGluZSBwYWlyczoKKyAgICAgICAgQmVmb3JlOiAoNzIzLCA3 MjkpCisgICAgICAgIEFmdGVyOiAoNzIxLCA3MjApCisKKyAgICAgICAgQmVmb3JlIGlzIGNvcnJl Y3QsIGJ1dCBBZnRlciBzaG91bGQgYmUgKDcyMSwgNzIxKSwgc2luY2UgaXQgcmVwcmVzZW50cyB0 aGUgYmVnaW5uaW5nIGFuZCBlbmRpbmcgbGluZXMgZm9yIHRoZSBodW5rLgorICAgICAgICBXaGV0 aGVyIHRoZXJlIGFyZSB6ZXJvIGxpbmVzIG9yIG9uZSBsaW5lIGluIHRoZSBodW5rLCB0aGUgc3Rh cnRpbmcgYW5kIGVuZGluZyBsaW5lIGFyZSB0aGUgc2FtZS4KKworICAgICAgICBUaGlzIGVycm9y IHdhcyBjYXVzaW5nIGJhZCBiZWhhdmlvciBvbiBwdXJlbHkgYWRkaXRpdmUgYW5kIHB1cmVseSBz dWJ0cmFjdGl2ZSBodW5rcywgYnV0IHNpbmNlIHdlIG9ubHkgcmVmZXIKKyAgICAgICAgdG8gQWZ0 ZXIgd2hlbiBnZW5lcmF0aW5nIENoYW5nZUxvZyBvdXRwdXQsIHRoZSBleHRyYWN0TGluZVJhbmdl QmVmb3JlQ2hhbmdlIGhhZCBubyB2aXNpYmxlIGVmZmVjdCBvbiBwcm9ncmFtIG91dHB1dC4KKwor ICAgICAgICBUaGUgZml4IGlzIHRvIHNldCBFbmQgdG8gdGhlIG1heCBvZiBTdGFydCArIE9mZnNl dCAtIDEgYW5kIFN0YXJ0LCByYXRoZXIgdGhhbiBhbHdheXMgdXNpbmcgdGhlIGZvcm1lci4KKwor ICAgICAgICAyLiBDcmVhdGluZyBnaXQgZGlmZnMgZnJvbSBIRUFEIGFuZCBub3Qgb3JpZ2luL21h c3RlciBieSBkZWZhdWx0LgorCisgICAgICAgIEhhcmQtY29kaW5nIG9yaWdpbi9tYXN0ZXIgaW50 byB0aGUgb3JpZ2luYWxGaWxlIGNvbW1hbmQgaGFzIHRoZSBkaXNhZHZhbnRhZ2Ugb2YgY2F1c2lu ZyB0aGUgZGlmZiB0byBmYWlsIGVudGlyZWx5CisgICAgICAgIHdoZW4gb3JpZ2luL21hc3RlciBk b2VzIG5vdCBleGlzdCwgYW5kIHRvIGRvIHRoZSB3cm9uZyB0aGluZyB3aGVuIGRldGVybWluaW5n IGRlbGV0ZWQgZnVuY3Rpb25zL21ldGhvZHMuCisKKyAgICAgICAgKiBTY3JpcHRzL3ByZXBhcmUt Q2hhbmdlTG9nOgorICAgICAgICAob3JpZ2luYWxGaWxlKToKKyAgICAgICAgVXNlIEhFQUQgaW5z dGVhZCBvZiBvcmlnaW4vbWFzdGVyIGluIGRlZmF1bHQgR2l0IGNhc2UuCisKKyAgICAgICAgKGdl bmVyYXRlRnVuY3Rpb25MaXN0cyk6CisgICAgICAgIEVuc3VyZSB0aGF0IHRoZSBlbmQgbGluZSBp cyBub3QgbGVzcyB0aGFuIHRoZSBzdGFydCBsaW5lLgorCisgICAgICAgIChleHRyYWN0TGluZVJh bmdlQWZ0ZXJDaGFuZ2UpOgorICAgICAgICBTZXQgdGhlIGVuZCBsaW5lIHRvIHRoZSBzdGFydCBs aW5lIGlmIHRoZSBlbmQgbGluZSBpcyBsZXNzIHRoYW4gdGhlIHN0YXJ0IGxpbmUuCisKKyAgICAg ICAgKGV4dHJhY3RMaW5lUmFuZ2VCZWZvcmVDaGFuZ2UpOgorICAgICAgICBEaXR0by4KKworMjAx NS0wNC0xNyAgTWF0dGhldyBIYW5zb24gIDxtYXR0aGV3X2hhbnNvbkBhcHBsZS5jb20+CisKICAg ICAgICAgU3VwcHJlc3Mgd2FybmluZyBpbiBwcmVwYXJlLUNoYW5nZUxvZy4KICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0Mzg4MgogCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvVG9vbHMvU2NyaXB0cy9wcmVwYXJl LUNoYW5nZUxvZwppbmRleCA0ZDY4ZjVjLi4xOTJlNDJlIDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp cHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VM b2cKQEAgLTYwLDcgKzYwLDcgQEAgdXNlIEZpbGU6OlNwZWM7CiB1c2UgRmluZEJpbjsKIHVzZSBH ZXRvcHQ6Okxvbmc7CiB1c2UgbGliICRGaW5kQmluOjpCaW47Ci11c2UgTGlzdDo6VXRpbCBxdy9h bnkvOwordXNlIExpc3Q6OlV0aWwgcXcvYW55IG1heC87CiB1c2UgUE9TSVggcXcoc3RyZnRpbWUp OwogdXNlIFZDU1V0aWxzOwogCkBAIC0yNTcsNyArMjU3LDcgQEAgc3ViIG9yaWdpbmFsRmlsZSgk JCQkKQogICAgICAgICBpZiAoJG1lcmdlQmFzZSkgewogICAgICAgICAgICAgJGNvbW1hbmQgLj0g IiRtZXJnZUJhc2UiOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgJGNvbW1hbmQgLj0g Im9yaWdpbi9tYXN0ZXIiOworICAgICAgICAgICAgJGNvbW1hbmQgLj0gIkhFQUQiOwogICAgICAg ICB9CiAgICAgICAgICRjb21tYW5kIC49ICI6JGZpbGUiOwogICAgIH0KQEAgLTI4Nyw3ICsyODcs NyBAQCBzdWIgZ2VuZXJhdGVGdW5jdGlvbkxpc3RzKCQkJCQkKQogICAgICAgICAgICAgICAgICAg ICBwcmludCBTVERFUlIgIldBUk5JTkc6IGZpbGUgJGZpbGUgY29udGFpbnMgdGhlIHN0cmluZyBE T19OT1RfQ09NTUlULCBsaW5lICQuXG4iOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAg ICAgICBteSAoJGFmdGVyX3N0YXJ0LCAkYWZ0ZXJfZW5kKSA9IGV4dHJhY3RMaW5lUmFuZ2VBZnRl ckNoYW5nZSgkXyk7Ci0gICAgICAgICAgICAgICAgaWYgKCRhZnRlcl9zdGFydCA+PSAwICYmICRh ZnRlcl9lbmQgPj0gMCkgeworICAgICAgICAgICAgICAgIGlmICgkYWZ0ZXJfc3RhcnQgPj0gMCAm JiAkYWZ0ZXJfZW5kID49IDAgJiYgJGFmdGVyX2VuZCA+PSAkYWZ0ZXJfc3RhcnQpIHsKICAgICAg ICAgICAgICAgICAgICAgcHVzaCBAeyRsaW5lX3Jhbmdlc19hZnRlcl9jaGFuZ2VkeyRmaWxlfX0s IFsgJGFmdGVyX3N0YXJ0LCAkYWZ0ZXJfZW5kIF07CiAgICAgICAgICAgICAgICAgfSBlbHNpZiAo L0RPX05PVF9DT01NSVQvKSB7CiAgICAgICAgICAgICAgICAgICAgIHByaW50IFNUREVSUiAiV0FS TklORzogZmlsZSAkZmlsZSBjb250YWlucyB0aGUgc3RyaW5nIERPX05PVF9DT01NSVQsIGxpbmUg JC5cbiI7CkBAIC0yMTA4LDcgKzIxMDgsNyBAQCBzdWIgZXh0cmFjdExpbmVSYW5nZUFmdGVyQ2hh bmdlKCQpCiAgICAgICAgICRlbmQgPSAkNCB8fCAkMjsKICAgICB9IGVsc2lmIChpc0dpdCgpICYm ICRzdHJpbmcgPX4gL15AQCAtXGQrKCxcZCspPyBcKyhcZCspKCwoXGQrKSk/IEBALykgewogICAg ICAgICAkc3RhcnQgPSAkMjsKLSAgICAgICAgJGVuZCA9IGRlZmluZWQoJDQpID8gJDQgKyAkMiAt IDEgOiAkMjsKKyAgICAgICAgJGVuZCA9IGRlZmluZWQoJDQpID8gbWF4KCRzdGFydCArICQ0IC0g MSwgJHN0YXJ0KSA6ICRzdGFydDsKICAgICB9CiAKICAgICByZXR1cm4gKCRzdGFydCwgJGVuZCk7 CkBAIC0yMTI1LDcgKzIxMjUsNyBAQCBzdWIgZXh0cmFjdExpbmVSYW5nZUJlZm9yZUNoYW5nZSgk KQogICAgICAgICAkZW5kID0gJDMgfHwgJDEgaWYgJDQgbmUgImEiOwogICAgIH0gZWxzaWYgKGlz R2l0KCkgJiYgJHN0cmluZyA9fiAvXkBAIC0oXGQrKSgsKFxkKykpPyBcK1xkKygsXGQrKT8gQEAv KSB7CiAgICAgICAgICRzdGFydCA9ICQxOwotICAgICAgICAkZW5kID0gZGVmaW5lZCgkMykgPyAk MyArICQxIC0gMSA6ICQxOworICAgICAgICAkZW5kID0gZGVmaW5lZCgkMykgPyBtYXgoJHN0YXJ0 ICsgJDMgLSAxLCAkc3RhcnQpIDogJHN0YXJ0OwogICAgIH0KIAogICAgIHJldHVybiAoJHN0YXJ0 LCAkZW5kKTsKLS0gCjIuMi4xIChBcHBsZSBHaXQtNTMpCgo=