201851 2019-09-16 17:29:09 -0700 Remove some support for < iOS 12 2019-10-10 12:53:00 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=201903 https://bugs.webkit.org/show_bug.cgi?id=201967 https://bugs.webkit.org/show_bug.cgi?id=201969 https://bugs.webkit.org/show_bug.cgi?id=201971 https://bugs.webkit.org/show_bug.cgi?id=201973 https://bugs.webkit.org/show_bug.cgi?id=202027 https://bugs.webkit.org/show_bug.cgi?id=202032 https://bugs.webkit.org/show_bug.cgi?id=202054 https://bugs.webkit.org/show_bug.cgi?id=202119 https://bugs.webkit.org/show_bug.cgi?id=202371 https://bugs.webkit.org/show_bug.cgi?id=202386 https://bugs.webkit.org/show_bug.cgi?id=202549 https://bugs.webkit.org/show_bug.cgi?id=202819 https://bugs.webkit.org/show_bug.cgi?id=202820 https://bugs.webkit.org/show_bug.cgi?id=202822 InRadar P2 Normal --- 1 krollin krollin ap commit-queue ddkilzer ews-watchlist jiewen_tan ryanhaddad webkit-bug-importer oldest_to_newest 1571351 0 krollin 2019-09-16 17:29:09 -0700 Remove some support for iOS versions less than 13.0. Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED and __MAC_OS_X_VERSION_MAX_ALLOWED, assuming that they both have values >= 130000. This means that expressions like "__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and "__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. This removal is part of a series of patches effecting such removal. 1571352 1 webkit-bug-importer 2019-09-16 17:29:20 -0700 <rdar://problem/55422044> 1571353 2 krollin 2019-09-16 17:33:12 -0700 s/__MAC_OS_X_VERSION_MAX_ALLOWED/__IPHONE_OS_VERSION_MAX_ALLOWED/ 1571355 3 378919 krollin 2019-09-16 17:34:27 -0700 Created attachment 378919 Patch 1571360 4 378919 jiewen_tan 2019-09-16 17:45:50 -0700 Comment on attachment 378919 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=378919&action=review > Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h:-95 > -#if (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || PLATFORM(MAC) Any reason why PLATFORM(MAC) is removed as well? > Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm:146 > +#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR)) Any reason why PLATFORM(IOS_FAMILY) is not used anymore? 1571365 5 krollin 2019-09-16 17:52:03 -0700 (In reply to Jiewen Tan from comment #4) > > Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h:-95 > > -#if (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || PLATFORM(MAC) > > Any reason why PLATFORM(MAC) is removed as well? When removing the version test, the expression becomes #if PLATFORM(IOS_FAMILY) || PLATFORM(MAC) This in turn means #if PLATFORM(COCOA). And this is a Cocoa-only file, so we can already assume PLATFORM(COCOA) is true. > > Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm:146 > > +#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR)) > > Any reason why PLATFORM(IOS_FAMILY) is not used anymore? I talked with Kilzer about this and that's what he recommended. 1571367 6 krollin 2019-09-16 18:11:51 -0700 (In reply to Keith Rollin from comment #5) > (In reply to Jiewen Tan from comment #4) > > Any reason why PLATFORM(IOS_FAMILY) is not used anymore? > > I talked with Kilzer about this and that's what he recommended. I should elaborate. First, Kilzer was the one who added the code, so that's what I talked with him. Second, the check originally was for IOS; it was changed to IOS_FAMILY in ap's Grand Change. Third, tvOS and watchOS were filtered out due to the iOS version check, so IOS_FAMILY was effectively IOS anyway. 1571368 7 jiewen_tan 2019-09-16 18:18:34 -0700 (In reply to Keith Rollin from comment #6) > (In reply to Keith Rollin from comment #5) > > (In reply to Jiewen Tan from comment #4) > > > Any reason why PLATFORM(IOS_FAMILY) is not used anymore? > > > > I talked with Kilzer about this and that's what he recommended. > > I should elaborate. First, Kilzer was the one who added the code, so that's > what I talked with him. Second, the check originally was for IOS; it was > changed to IOS_FAMILY in ap's Grand Change. Third, tvOS and watchOS were > filtered out due to the iOS version check, so IOS_FAMILY was effectively IOS > anyway. Got you. LGTM. r=me. 1571405 8 ap 2019-09-16 20:20:03 -0700 Please don’t land this yet, WebKit CI is still on iOS 12. 1571406 9 krollin 2019-09-16 20:22:13 -0700 This patch doesn't actually remove support for iOS 12. These particular changes were chosen at this time because they affect iOS 11 and older. 1571407 10 ap 2019-09-16 20:22:40 -0700 Also, how is this building on EWS?! 1571408 11 krollin 2019-09-16 20:27:35 -0700 Why wouldn't it build on EWS? 1571559 12 ap 2019-09-17 09:21:51 -0700 > This patch doesn't actually remove support for iOS 12. These particular changes were chosen at this time because they affect iOS 11 and older. Please re-title accordingly before landing. It's super misleading to land a patch that says "Remove some support for < iOS 13" when it doesn't. > Why wouldn't it build on EWS? EWS is on iOS 12, and you claimed that you removed support for it. 1571564 13 378970 krollin 2019-09-17 09:25:50 -0700 Created attachment 378970 Patch 1571622 14 378970 commit-queue 2019-09-17 12:29:40 -0700 Comment on attachment 378970 Patch Rejecting attachment 378970 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'validate-changelog', '--check-oops', '--non-interactive', 378970, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: https://webkit-queues.webkit.org/results/13040584 1571629 15 378979 krollin 2019-09-17 12:35:52 -0700 Created attachment 378979 Patch 1571650 16 378979 commit-queue 2019-09-17 13:20:44 -0700 Comment on attachment 378979 Patch Clearing flags on attachment: 378979 Committed r249978: <https://trac.webkit.org/changeset/249978> 1571651 17 commit-queue 2019-09-17 13:20:46 -0700 All reviewed patches have been landed. Closing bug. 378919 2019-09-16 17:34:27 -0700 2019-09-17 09:25:49 -0700 Patch bug-201851-20190916173426.patch text/plain 8032 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5OTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNkNzk3ZWIxMGEwYmEy OGQ4MmNiN2M5MTJkYWQ3OTFiOTY4Mzc0Yi4uNmQ5ZGU1MzAwM2FiMGU5OTY0ZTQ2ZWIwMGUwYWE0 YjI3NGExYTI2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTA5LTE2ICBLZWl0 aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgc29tZSBzdXBw b3J0IGZvciA8IGlPUyAxMworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjAxODUxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NTQyMjA0ND4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgc29tZSBz dXBwb3J0IGZvciBpT1MgdmVyc2lvbnMgbGVzcyB0aGFuIDEzLjAuCisKKyAgICAgICAgVXBkYXRl IGNvbmRpdGlvbmFscyB0aGF0IHJlZmVyZW5jZSBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFV SVJFRAorICAgICAgICBhbmQgX19JUEhPTkVfT1NfVkVSU0lPTl9NQVhfQUxMT1dFRCwgYXNzdW1p bmcgdGhhdCB0aGV5IGJvdGggaGF2ZQorICAgICAgICB2YWx1ZXMgPj0gMTMwMDAwLiBUaGlzIG1l YW5zIHRoYXQgZXhwcmVzc2lvbnMgbGlrZQorICAgICAgICAiX19JUEhPTkVfT1NfVkVSU0lPTl9N SU5fUkVRVUlSRUQgPCAxMDEzMDAiIGFyZSBhbHdheXMgRmFsc2UgYW5kCisgICAgICAgICJfX0lQ SE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEzMDAiIGFyZSBhbHdheXMgVHJ1ZS4K KworICAgICAgICBUaGlzIHJlbW92YWwgaXMgcGFydCBvZiBhIHNlcmllcyBvZiBwYXRjaGVzIGVm ZmVjdGluZyBzdWNoIHJlbW92YWwuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC0tIG5vIG5ldyBv ciBjaGFuZ2VkIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBjcnlwdG8vbWFjL0NyeXB0b0tl eVJTQU1hYy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDcnlwdG9LZXlSU0E6OmNyZWF0ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpjYXN0RGF0YUFyZ3VtZW50VG9DQ1JTQUNyeXB0b3JDcmVhdGVGcm9t RGF0YUlmTmVlZGVkKTogRGVsZXRlZC4KKwogMjAxOS0wOS0xNiAgWmFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIEFsd2F5cyBwcm92aWRlIGEgY29udGFpbmlu ZyBibG9jayB3aWR0aCB2YWx1ZSB0byBjb21wdXRlKiBmdW5jdGlvbnMuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxv ZwppbmRleCA5YjYxMGU2NTkzZjNkZDg1MTg3NjAzZGFkMmQ5YjQ3OTZhNWYzM2JkLi4xOTA4NGEy ZjhhN2I1MjE1N2M3NjY0ZmE5NDdiYWRmMDZjMTExODgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9QQUwvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMyBAQAorMjAxOS0wOS0xNiAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5j b20+CisKKyAgICAgICAgUmVtb3ZlIHNvbWUgc3VwcG9ydCBmb3IgPCBpT1MgMTMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTg1MQorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNTU0MjIwNDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHNvbWUgc3VwcG9ydCBmb3IgaU9TIHZlcnNpb25zIGxl c3MgdGhhbiAxMy4wLgorCisgICAgICAgIFVwZGF0ZSBjb25kaXRpb25hbHMgdGhhdCByZWZlcmVu Y2UgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQKKyAgICAgICAgYW5kIF9fSVBIT05F X09TX1ZFUlNJT05fTUFYX0FMTE9XRUQsIGFzc3VtaW5nIHRoYXQgdGhleSBib3RoIGhhdmUKKyAg ICAgICAgdmFsdWVzID49IDEzMDAwMC4gVGhpcyBtZWFucyB0aGF0IGV4cHJlc3Npb25zIGxpa2UK KyAgICAgICAgIl9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxMzAwIiBhcmUg YWx3YXlzIEZhbHNlIGFuZAorICAgICAgICAiX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPj0gMTAxMzAwIiBhcmUgYWx3YXlzIFRydWUuCisKKyAgICAgICAgVGhpcyByZW1vdmFsIGlz IHBhcnQgb2YgYSBzZXJpZXMgb2YgcGF0Y2hlcyBlZmZlY3Rpbmcgc3VjaCByZW1vdmFsLgorCisg ICAgICAgICogcGFsL3NwaS9jb2NvYS9JT1N1cmZhY2VTUEkuaDoKKwogMjAxOS0wOS0xMyAgWW91 ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIFdlYlByb2Nlc3Mg cHJvY2Vzc0lkZW50aWZpZXIgdG8gaWRlbnRpZnkgU2VydmljZSBXb3JrZXIgY29ubmVjdGlvbnMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0lPU3VyZmFjZVNQ SS5oIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvSU9TdXJmYWNlU1BJLmgKaW5k ZXggMGEzZWJiMWM3YmY1MzliMmYxMDVkNWQ3MTRlMDYwYWY2MjJjZTExNy4uZjE5ZjcyMmJkYTg1 ZDAwZTQ4NDEyMzI3YTdlYjJkYjkyYTkyOTcwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv UEFML3BhbC9zcGkvY29jb2EvSU9TdXJmYWNlU1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUvUEFM L3BhbC9zcGkvY29jb2EvSU9TdXJmYWNlU1BJLmgKQEAgLTQwLDEyICs0MCw2IEBACiAKIHR5cGVk ZWYgc3RydWN0IF9fSU9TdXJmYWNlICpJT1N1cmZhY2VSZWY7CiAKLSNpZiBQTEFURk9STShJT1Nf RkFNSUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDExMDAwMAotZW51 bSB7Ci0gICAga0lPU3VyZmFjZUxvY2tSZWFkT25seSAgPSAweDAwMDAwMDAxLAotfTsKLSNlbmRp ZgotCiAjZW5kaWYKIAogV1RGX0VYVEVSTl9DX0JFR0lOCkBAIC05MiwxOSArODYsOCBAQCBXVEZf RVhURVJOX0NfRU5ECiAKICNlbHNlCiAKLSNpZiAoUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgX19J UEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwKSB8fCBQTEFURk9STShNQUMp Ci0KICNpbXBvcnQgPElPU3VyZmFjZS9JT1N1cmZhY2VUeXBlcy5oPgogCi0jZWxzZQotZW51bSB7 Ci0gICAga0lPU3VyZmFjZVB1cmdlYWJsZU5vblZvbGF0aWxlID0gMCwKLSAgICBrSU9TdXJmYWNl UHVyZ2VhYmxlVm9sYXRpbGUgPSAxLAotICAgIGtJT1N1cmZhY2VQdXJnZWFibGVFbXB0eSA9IDIs Ci0gICAga0lPU3VyZmFjZVB1cmdlYWJsZUtlZXBDdXJyZW50ID0gMywKLX07Ci0jZW5kaWYKLQog I2VuZGlmCiAKIFdURl9FWFRFUk5fQ19CRUdJTgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Y3J5cHRvL21hYy9DcnlwdG9LZXlSU0FNYWMuY3BwIGIvU291cmNlL1dlYkNvcmUvY3J5cHRvL21h Yy9DcnlwdG9LZXlSU0FNYWMuY3BwCmluZGV4IDZkOGQ2NGQxYzIxYmQ2ZGRlOTI5ZWFlY2UxNzIw Y2JlZjI2ZmZjMTMuLjI3NTVlNzM1ZmU2ZGM4NDZiYjRmMWJlOGRkZTUyYzE0N2I5ZjA5OTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRvS2V5UlNBTWFjLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vbWFjL0NyeXB0b0tleVJTQU1hYy5jcHAKQEAgLTQx LDE4ICs0MSw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotI2lmIChQTEFURk9STShJT1Nf RkFNSUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDExMDAwMCkKLWlu bGluZSB1aW50OF90KiBjYXN0RGF0YUFyZ3VtZW50VG9DQ1JTQUNyeXB0b3JDcmVhdGVGcm9tRGF0 YUlmTmVlZGVkKGNvbnN0IHVpbnQ4X3QqIHZhbHVlKQotewotICAgIHJldHVybiBjb25zdF9jYXN0 PHVpbnQ4X3QqPih2YWx1ZSk7Ci19Ci0jZWxzZQotaW5saW5lIGNvbnN0IHVpbnQ4X3QqIGNhc3RE YXRhQXJndW1lbnRUb0NDUlNBQ3J5cHRvckNyZWF0ZUZyb21EYXRhSWZOZWVkZWQoY29uc3QgdWlu dDhfdCogdmFsdWUpCi17Ci0gICAgcmV0dXJuIHZhbHVlOwotfQotI2VuZGlmCi0KIC8vIE9JRCBy c2FFbmNyeXB0aW9uOiAxLjIuODQwLjExMzU0OS4xLjEuMS4gUGVyIGh0dHBzOi8vdG9vbHMuaWV0 Zi5vcmcvaHRtbC9yZmMzMjc5I3NlY3Rpb24tMi4zLjEKIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBj aGFyIFJTQU9JREhlYWRlcltdID0gezB4MzAsIDB4MGQsIDB4MDYsIDB4MDksIDB4MmEsIDB4ODYs IDB4NDgsIDB4ODYsIDB4ZjcsIDB4MGQsIDB4MDEsIDB4MDEsIDB4MDEsIDB4MDUsIDB4MDB9Owog CkBAIC0xNTAsMTAgKzEzOCwxMCBAQCBSZWZQdHI8Q3J5cHRvS2V5UlNBPiBDcnlwdG9LZXlSU0E6 OmNyZWF0ZShDcnlwdG9BbGdvcml0aG1JZGVudGlmaWVyIGlkZW50aWZpZXIsCiAgICAgLy8gU2Vl IDxyZGFyOi8vcHJvYmxlbS8xNTQ1MjMyND4uCiAgICAgQ0NDcnlwdG9yU3RhdHVzIHN0YXR1cyA9 IENDUlNBQ3J5cHRvckNyZWF0ZUZyb21EYXRhKAogICAgICAgICBrZXlEYXRhLnR5cGUoKSA9PSBD cnlwdG9LZXlSU0FDb21wb25lbnRzOjpUeXBlOjpQdWJsaWMgPyBjY1JTQUtleVB1YmxpYyA6IGNj UlNBS2V5UHJpdmF0ZSwKLSAgICAgICAgY2FzdERhdGFBcmd1bWVudFRvQ0NSU0FDcnlwdG9yQ3Jl YXRlRnJvbURhdGFJZk5lZWRlZChrZXlEYXRhLm1vZHVsdXMoKS5kYXRhKCkpLCBrZXlEYXRhLm1v ZHVsdXMoKS5zaXplKCksCi0gICAgICAgIGNhc3REYXRhQXJndW1lbnRUb0NDUlNBQ3J5cHRvckNy ZWF0ZUZyb21EYXRhSWZOZWVkZWQoa2V5RGF0YS5leHBvbmVudCgpLmRhdGEoKSksIGtleURhdGEu ZXhwb25lbnQoKS5zaXplKCksCi0gICAgICAgIGNhc3REYXRhQXJndW1lbnRUb0NDUlNBQ3J5cHRv ckNyZWF0ZUZyb21EYXRhSWZOZWVkZWQoa2V5RGF0YS5maXJzdFByaW1lSW5mbygpLnByaW1lRmFj dG9yLmRhdGEoKSksIGtleURhdGEuZmlyc3RQcmltZUluZm8oKS5wcmltZUZhY3Rvci5zaXplKCks Ci0gICAgICAgIGNhc3REYXRhQXJndW1lbnRUb0NDUlNBQ3J5cHRvckNyZWF0ZUZyb21EYXRhSWZO ZWVkZWQoa2V5RGF0YS5zZWNvbmRQcmltZUluZm8oKS5wcmltZUZhY3Rvci5kYXRhKCkpLCBrZXlE YXRhLnNlY29uZFByaW1lSW5mbygpLnByaW1lRmFjdG9yLnNpemUoKSwKKyAgICAgICAga2V5RGF0 YS5tb2R1bHVzKCkuZGF0YSgpLCBrZXlEYXRhLm1vZHVsdXMoKS5zaXplKCksCisgICAgICAgIGtl eURhdGEuZXhwb25lbnQoKS5kYXRhKCksIGtleURhdGEuZXhwb25lbnQoKS5zaXplKCksCisgICAg ICAgIGtleURhdGEuZmlyc3RQcmltZUluZm8oKS5wcmltZUZhY3Rvci5kYXRhKCksIGtleURhdGEu Zmlyc3RQcmltZUluZm8oKS5wcmltZUZhY3Rvci5zaXplKCksCisgICAgICAgIGtleURhdGEuc2Vj b25kUHJpbWVJbmZvKCkucHJpbWVGYWN0b3IuZGF0YSgpLCBrZXlEYXRhLnNlY29uZFByaW1lSW5m bygpLnByaW1lRmFjdG9yLnNpemUoKSwKICAgICAgICAgJmNyeXB0b3IpOwogCiAgICAgaWYgKHN0 YXR1cykgewpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmlu ZGV4IDkzMTczZmE2MDhhOGIwNjVmMjJhYmJiODg4M2Q4OTI4MjdjNzE3ZmYuLjJiZWRkZTQxYmI2 N2U3ODY3NzFlMmY3NDhmNWNjNWRmZDJmNzQ5MWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxOS0wOS0xNiAgS2Vp dGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHNvbWUgc3Vw cG9ydCBmb3IgPCBpT1MgMTMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwMTg1MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTU0MjIwNDQ+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHNvbWUg c3VwcG9ydCBmb3IgaU9TIHZlcnNpb25zIGxlc3MgdGhhbiAxMy4wLgorCisgICAgICAgIFVwZGF0 ZSBjb25kaXRpb25hbHMgdGhhdCByZWZlcmVuY2UgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVR VUlSRUQKKyAgICAgICAgYW5kIF9fSVBIT05FX09TX1ZFUlNJT05fTUFYX0FMTE9XRUQsIGFzc3Vt aW5nIHRoYXQgdGhleSBib3RoIGhhdmUKKyAgICAgICAgdmFsdWVzID49IDEzMDAwMC4gVGhpcyBt ZWFucyB0aGF0IGV4cHJlc3Npb25zIGxpa2UKKyAgICAgICAgIl9fSVBIT05FX09TX1ZFUlNJT05f TUlOX1JFUVVJUkVEIDwgMTAxMzAwIiBhcmUgYWx3YXlzIEZhbHNlIGFuZAorICAgICAgICAiX19J UEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMzAwIiBhcmUgYWx3YXlzIFRydWUu CisKKyAgICAgICAgVGhpcyByZW1vdmFsIGlzIHBhcnQgb2YgYSBzZXJpZXMgb2YgcGF0Y2hlcyBl ZmZlY3Rpbmcgc3VjaCByZW1vdmFsLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9jb2NvYS9BY3RpdmF0ZUZvbnRzQ29jb2EubW06CisgICAgICAgIChXVFI6Omlu c3RhbGxGYWtlSGVsdmV0aWNhKToKKwogMjAxOS0wOS0xNiAgRGF2aWQgS2lsemVyICA8ZGRraWx6 ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBsZWFrcyBpbiBEdW1wUmVuZGVyVHJlZSBhbmQg V2ViS2l0VGVzdFJ1bm5lcgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9jb2NvYS9BY3RpdmF0ZUZvbnRzQ29jb2EubW0gYi9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL0luamVjdGVkQnVuZGxlL2NvY29hL0FjdGl2YXRlRm9udHNDb2NvYS5tbQppbmRleCBk Y2E3Y2FhMTVmMDY1YmNkMzk5ZjYzMDY5Zjg3NmQ1ZjdmZDc3MTc2Li5kMWNmN2Y1NTA0ZWVlMGJj MzI5ZjE5M2QyNTViNmYyYzQ0MzkyY2UxIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL0luamVjdGVkQnVuZGxlL2NvY29hL0FjdGl2YXRlRm9udHNDb2NvYS5tbQorKysgYi9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2NvY29hL0FjdGl2YXRlRm9udHNDb2Nv YS5tbQpAQCAtMTQzLDcgKzE0Myw3IEBAIHZvaWQgaW5zdGFsbEZha2VIZWx2ZXRpY2EoV0tTdHJp bmdSZWYgY29uZmlndXJhdGlvbikKICAgICBOU1VSTCAqcmVzb3VyY2VVUkwgPSBbcmVzb3VyY2Vz RGlyZWN0b3J5VVJMKCkgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OltOU1N0cmluZyBzdHJp bmdXaXRoRm9ybWF0OkAiRmFrZUhlbHZldGljYS0lQC50dGYiLCBjb25maWd1cmF0aW9uU3RyaW5n LmdldCgpXSBpc0RpcmVjdG9yeTpOT107CiAgICAgQ0ZFcnJvclJlZiBlcnJvciA9IG51bGxwdHI7 CiAgICAgaWYgKCFDVEZvbnRNYW5hZ2VyUmVnaXN0ZXJGb250c0ZvclVSTCgoX19icmlkZ2UgQ0ZV UkxSZWYpcmVzb3VyY2VVUkwsIGtDVEZvbnRNYW5hZ2VyU2NvcGVQcm9jZXNzLCAmZXJyb3IpKSB7 Ci0jaWYgKFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+ PSAxMDE0MDApIHx8IChQTEFURk9STShJT1NfRkFNSUxZKSAmJiAhUExBVEZPUk0oSU9TX0ZBTUlM WV9TSU1VTEFUT1IpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEyMDAw MCkKKyNpZiAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVE ID49IDEwMTQwMCkgfHwgKFBMQVRGT1JNKElPUykgJiYgIVBMQVRGT1JNKElPU19GQU1JTFlfU0lN VUxBVE9SKSkKICAgICAgICAgLy8gUmVnaXN0ZXJpbmcgc2hhZG93IGZvbnRzIGlzIG9ubHkgc3Vw cG9ydGVkIG9uIG1hY09TIE1vamF2ZSBhbmQgaU9TIDEyIG9yIG5ld2VyLCBidXQgbm90IGlPUyBT aW11bGF0b3IuIFNlZSBCdWdzIDE4MDA2MiAmIDE5NDc2MS4KICAgICAgICAgTlNMb2coQCJGYWls ZWQgdG8gYWN0aXZhdGUgZmFrZSBIZWx2ZXRpY2E6ICVAIiwgZXJyb3IpOwogI2VuZGlmCg== 378970 2019-09-17 09:25:50 -0700 2019-09-17 12:35:51 -0700 Patch bug-201851-20190917092549.patch text/plain 8032 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5OTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNkNzk3ZWIxMGEwYmEy OGQ4MmNiN2M5MTJkYWQ3OTFiOTY4Mzc0Yi4uNmNlMjVkNzJkZjY3YzVkY2EzMDM5ZDJjMDliNmRm M2ExNjViN2QxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTA5LTE2ICBLZWl0 aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgc29tZSBzdXBw b3J0IGZvciA8IGlPUyAxMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjAxODUxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NTQyMjA0ND4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgc29tZSBz dXBwb3J0IGZvciBpT1MgdmVyc2lvbnMgbGVzcyB0aGFuIDEyLjAuCisKKyAgICAgICAgVXBkYXRl IGNvbmRpdGlvbmFscyB0aGF0IHJlZmVyZW5jZSBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFV SVJFRAorICAgICAgICBhbmQgX19JUEhPTkVfT1NfVkVSU0lPTl9NQVhfQUxMT1dFRCwgYXNzdW1p bmcgdGhhdCB0aGV5IGJvdGggaGF2ZQorICAgICAgICB2YWx1ZXMgPj0gMTIwMDAwLiBUaGlzIG1l YW5zIHRoYXQgZXhwcmVzc2lvbnMgbGlrZQorICAgICAgICAiX19JUEhPTkVfT1NfVkVSU0lPTl9N SU5fUkVRVUlSRUQgPCAxMDEyMDAiIGFyZSBhbHdheXMgRmFsc2UgYW5kCisgICAgICAgICJfX0lQ SE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEyMDAiIGFyZSBhbHdheXMgVHJ1ZS4K KworICAgICAgICBUaGlzIHJlbW92YWwgaXMgcGFydCBvZiBhIHNlcmllcyBvZiBwYXRjaGVzIGVm ZmVjdGluZyBzdWNoIHJlbW92YWwuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC0tIG5vIG5ldyBv ciBjaGFuZ2VkIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBjcnlwdG8vbWFjL0NyeXB0b0tl eVJTQU1hYy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDcnlwdG9LZXlSU0E6OmNyZWF0ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpjYXN0RGF0YUFyZ3VtZW50VG9DQ1JTQUNyeXB0b3JDcmVhdGVGcm9t RGF0YUlmTmVlZGVkKTogRGVsZXRlZC4KKwogMjAxOS0wOS0xNiAgWmFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIEFsd2F5cyBwcm92aWRlIGEgY29udGFpbmlu ZyBibG9jayB3aWR0aCB2YWx1ZSB0byBjb21wdXRlKiBmdW5jdGlvbnMuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxv ZwppbmRleCA5YjYxMGU2NTkzZjNkZDg1MTg3NjAzZGFkMmQ5YjQ3OTZhNWYzM2JkLi5kOTZlYjg0 ZDgxZTQ2MDZiODQ4Njg5OWE5NTM4ZjIxYjMxOTMxMmI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9QQUwvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMyBAQAorMjAxOS0wOS0xNiAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5j b20+CisKKyAgICAgICAgUmVtb3ZlIHNvbWUgc3VwcG9ydCBmb3IgPCBpT1MgMTIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTg1MQorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNTU0MjIwNDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHNvbWUgc3VwcG9ydCBmb3IgaU9TIHZlcnNpb25zIGxl c3MgdGhhbiAxMi4wLgorCisgICAgICAgIFVwZGF0ZSBjb25kaXRpb25hbHMgdGhhdCByZWZlcmVu Y2UgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQKKyAgICAgICAgYW5kIF9fSVBIT05F X09TX1ZFUlNJT05fTUFYX0FMTE9XRUQsIGFzc3VtaW5nIHRoYXQgdGhleSBib3RoIGhhdmUKKyAg ICAgICAgdmFsdWVzID49IDEyMDAwMC4gVGhpcyBtZWFucyB0aGF0IGV4cHJlc3Npb25zIGxpa2UK KyAgICAgICAgIl9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxMjAwIiBhcmUg YWx3YXlzIEZhbHNlIGFuZAorICAgICAgICAiX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPj0gMTAxMjAwIiBhcmUgYWx3YXlzIFRydWUuCisKKyAgICAgICAgVGhpcyByZW1vdmFsIGlz IHBhcnQgb2YgYSBzZXJpZXMgb2YgcGF0Y2hlcyBlZmZlY3Rpbmcgc3VjaCByZW1vdmFsLgorCisg ICAgICAgICogcGFsL3NwaS9jb2NvYS9JT1N1cmZhY2VTUEkuaDoKKwogMjAxOS0wOS0xMyAgWW91 ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIFdlYlByb2Nlc3Mg cHJvY2Vzc0lkZW50aWZpZXIgdG8gaWRlbnRpZnkgU2VydmljZSBXb3JrZXIgY29ubmVjdGlvbnMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0lPU3VyZmFjZVNQ SS5oIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvSU9TdXJmYWNlU1BJLmgKaW5k ZXggMGEzZWJiMWM3YmY1MzliMmYxMDVkNWQ3MTRlMDYwYWY2MjJjZTExNy4uZjE5ZjcyMmJkYTg1 ZDAwZTQ4NDEyMzI3YTdlYjJkYjkyYTkyOTcwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv UEFML3BhbC9zcGkvY29jb2EvSU9TdXJmYWNlU1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUvUEFM L3BhbC9zcGkvY29jb2EvSU9TdXJmYWNlU1BJLmgKQEAgLTQwLDEyICs0MCw2IEBACiAKIHR5cGVk ZWYgc3RydWN0IF9fSU9TdXJmYWNlICpJT1N1cmZhY2VSZWY7CiAKLSNpZiBQTEFURk9STShJT1Nf RkFNSUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDExMDAwMAotZW51 bSB7Ci0gICAga0lPU3VyZmFjZUxvY2tSZWFkT25seSAgPSAweDAwMDAwMDAxLAotfTsKLSNlbmRp ZgotCiAjZW5kaWYKIAogV1RGX0VYVEVSTl9DX0JFR0lOCkBAIC05MiwxOSArODYsOCBAQCBXVEZf RVhURVJOX0NfRU5ECiAKICNlbHNlCiAKLSNpZiAoUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgX19J UEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwKSB8fCBQTEFURk9STShNQUMp Ci0KICNpbXBvcnQgPElPU3VyZmFjZS9JT1N1cmZhY2VUeXBlcy5oPgogCi0jZWxzZQotZW51bSB7 Ci0gICAga0lPU3VyZmFjZVB1cmdlYWJsZU5vblZvbGF0aWxlID0gMCwKLSAgICBrSU9TdXJmYWNl UHVyZ2VhYmxlVm9sYXRpbGUgPSAxLAotICAgIGtJT1N1cmZhY2VQdXJnZWFibGVFbXB0eSA9IDIs Ci0gICAga0lPU3VyZmFjZVB1cmdlYWJsZUtlZXBDdXJyZW50ID0gMywKLX07Ci0jZW5kaWYKLQog I2VuZGlmCiAKIFdURl9FWFRFUk5fQ19CRUdJTgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Y3J5cHRvL21hYy9DcnlwdG9LZXlSU0FNYWMuY3BwIGIvU291cmNlL1dlYkNvcmUvY3J5cHRvL21h Yy9DcnlwdG9LZXlSU0FNYWMuY3BwCmluZGV4IDZkOGQ2NGQxYzIxYmQ2ZGRlOTI5ZWFlY2UxNzIw Y2JlZjI2ZmZjMTMuLjI3NTVlNzM1ZmU2ZGM4NDZiYjRmMWJlOGRkZTUyYzE0N2I5ZjA5OTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRvS2V5UlNBTWFjLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vbWFjL0NyeXB0b0tleVJTQU1hYy5jcHAKQEAgLTQx LDE4ICs0MSw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotI2lmIChQTEFURk9STShJT1Nf RkFNSUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDExMDAwMCkKLWlu bGluZSB1aW50OF90KiBjYXN0RGF0YUFyZ3VtZW50VG9DQ1JTQUNyeXB0b3JDcmVhdGVGcm9tRGF0 YUlmTmVlZGVkKGNvbnN0IHVpbnQ4X3QqIHZhbHVlKQotewotICAgIHJldHVybiBjb25zdF9jYXN0 PHVpbnQ4X3QqPih2YWx1ZSk7Ci19Ci0jZWxzZQotaW5saW5lIGNvbnN0IHVpbnQ4X3QqIGNhc3RE YXRhQXJndW1lbnRUb0NDUlNBQ3J5cHRvckNyZWF0ZUZyb21EYXRhSWZOZWVkZWQoY29uc3QgdWlu dDhfdCogdmFsdWUpCi17Ci0gICAgcmV0dXJuIHZhbHVlOwotfQotI2VuZGlmCi0KIC8vIE9JRCBy c2FFbmNyeXB0aW9uOiAxLjIuODQwLjExMzU0OS4xLjEuMS4gUGVyIGh0dHBzOi8vdG9vbHMuaWV0 Zi5vcmcvaHRtbC9yZmMzMjc5I3NlY3Rpb24tMi4zLjEKIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBj aGFyIFJTQU9JREhlYWRlcltdID0gezB4MzAsIDB4MGQsIDB4MDYsIDB4MDksIDB4MmEsIDB4ODYs IDB4NDgsIDB4ODYsIDB4ZjcsIDB4MGQsIDB4MDEsIDB4MDEsIDB4MDEsIDB4MDUsIDB4MDB9Owog CkBAIC0xNTAsMTAgKzEzOCwxMCBAQCBSZWZQdHI8Q3J5cHRvS2V5UlNBPiBDcnlwdG9LZXlSU0E6 OmNyZWF0ZShDcnlwdG9BbGdvcml0aG1JZGVudGlmaWVyIGlkZW50aWZpZXIsCiAgICAgLy8gU2Vl IDxyZGFyOi8vcHJvYmxlbS8xNTQ1MjMyND4uCiAgICAgQ0NDcnlwdG9yU3RhdHVzIHN0YXR1cyA9 IENDUlNBQ3J5cHRvckNyZWF0ZUZyb21EYXRhKAogICAgICAgICBrZXlEYXRhLnR5cGUoKSA9PSBD cnlwdG9LZXlSU0FDb21wb25lbnRzOjpUeXBlOjpQdWJsaWMgPyBjY1JTQUtleVB1YmxpYyA6IGNj UlNBS2V5UHJpdmF0ZSwKLSAgICAgICAgY2FzdERhdGFBcmd1bWVudFRvQ0NSU0FDcnlwdG9yQ3Jl YXRlRnJvbURhdGFJZk5lZWRlZChrZXlEYXRhLm1vZHVsdXMoKS5kYXRhKCkpLCBrZXlEYXRhLm1v ZHVsdXMoKS5zaXplKCksCi0gICAgICAgIGNhc3REYXRhQXJndW1lbnRUb0NDUlNBQ3J5cHRvckNy ZWF0ZUZyb21EYXRhSWZOZWVkZWQoa2V5RGF0YS5leHBvbmVudCgpLmRhdGEoKSksIGtleURhdGEu ZXhwb25lbnQoKS5zaXplKCksCi0gICAgICAgIGNhc3REYXRhQXJndW1lbnRUb0NDUlNBQ3J5cHRv ckNyZWF0ZUZyb21EYXRhSWZOZWVkZWQoa2V5RGF0YS5maXJzdFByaW1lSW5mbygpLnByaW1lRmFj dG9yLmRhdGEoKSksIGtleURhdGEuZmlyc3RQcmltZUluZm8oKS5wcmltZUZhY3Rvci5zaXplKCks Ci0gICAgICAgIGNhc3REYXRhQXJndW1lbnRUb0NDUlNBQ3J5cHRvckNyZWF0ZUZyb21EYXRhSWZO ZWVkZWQoa2V5RGF0YS5zZWNvbmRQcmltZUluZm8oKS5wcmltZUZhY3Rvci5kYXRhKCkpLCBrZXlE YXRhLnNlY29uZFByaW1lSW5mbygpLnByaW1lRmFjdG9yLnNpemUoKSwKKyAgICAgICAga2V5RGF0 YS5tb2R1bHVzKCkuZGF0YSgpLCBrZXlEYXRhLm1vZHVsdXMoKS5zaXplKCksCisgICAgICAgIGtl eURhdGEuZXhwb25lbnQoKS5kYXRhKCksIGtleURhdGEuZXhwb25lbnQoKS5zaXplKCksCisgICAg ICAgIGtleURhdGEuZmlyc3RQcmltZUluZm8oKS5wcmltZUZhY3Rvci5kYXRhKCksIGtleURhdGEu Zmlyc3RQcmltZUluZm8oKS5wcmltZUZhY3Rvci5zaXplKCksCisgICAgICAgIGtleURhdGEuc2Vj b25kUHJpbWVJbmZvKCkucHJpbWVGYWN0b3IuZGF0YSgpLCBrZXlEYXRhLnNlY29uZFByaW1lSW5m bygpLnByaW1lRmFjdG9yLnNpemUoKSwKICAgICAgICAgJmNyeXB0b3IpOwogCiAgICAgaWYgKHN0 YXR1cykgewpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmlu ZGV4IDkzMTczZmE2MDhhOGIwNjVmMjJhYmJiODg4M2Q4OTI4MjdjNzE3ZmYuLjUwMjUyNDM2OTY0 ODkzODA5ZGY3ZDBmNzEwN2IwMGQzZTdmMWVjYzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxOS0wOS0xNiAgS2Vp dGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHNvbWUgc3Vw cG9ydCBmb3IgPCBpT1MgMTIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwMTg1MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTU0MjIwNDQ+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHNvbWUg c3VwcG9ydCBmb3IgaU9TIHZlcnNpb25zIGxlc3MgdGhhbiAxMi4wLgorCisgICAgICAgIFVwZGF0 ZSBjb25kaXRpb25hbHMgdGhhdCByZWZlcmVuY2UgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVR VUlSRUQKKyAgICAgICAgYW5kIF9fSVBIT05FX09TX1ZFUlNJT05fTUFYX0FMTE9XRUQsIGFzc3Vt aW5nIHRoYXQgdGhleSBib3RoIGhhdmUKKyAgICAgICAgdmFsdWVzID49IDEyMDAwMC4gVGhpcyBt ZWFucyB0aGF0IGV4cHJlc3Npb25zIGxpa2UKKyAgICAgICAgIl9fSVBIT05FX09TX1ZFUlNJT05f TUlOX1JFUVVJUkVEIDwgMTAxMjAwIiBhcmUgYWx3YXlzIEZhbHNlIGFuZAorICAgICAgICAiX19J UEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMjAwIiBhcmUgYWx3YXlzIFRydWUu CisKKyAgICAgICAgVGhpcyByZW1vdmFsIGlzIHBhcnQgb2YgYSBzZXJpZXMgb2YgcGF0Y2hlcyBl ZmZlY3Rpbmcgc3VjaCByZW1vdmFsLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9jb2NvYS9BY3RpdmF0ZUZvbnRzQ29jb2EubW06CisgICAgICAgIChXVFI6Omlu c3RhbGxGYWtlSGVsdmV0aWNhKToKKwogMjAxOS0wOS0xNiAgRGF2aWQgS2lsemVyICA8ZGRraWx6 ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBsZWFrcyBpbiBEdW1wUmVuZGVyVHJlZSBhbmQg V2ViS2l0VGVzdFJ1bm5lcgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9jb2NvYS9BY3RpdmF0ZUZvbnRzQ29jb2EubW0gYi9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL0luamVjdGVkQnVuZGxlL2NvY29hL0FjdGl2YXRlRm9udHNDb2NvYS5tbQppbmRleCBk Y2E3Y2FhMTVmMDY1YmNkMzk5ZjYzMDY5Zjg3NmQ1ZjdmZDc3MTc2Li5kMWNmN2Y1NTA0ZWVlMGJj MzI5ZjE5M2QyNTViNmYyYzQ0MzkyY2UxIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL0luamVjdGVkQnVuZGxlL2NvY29hL0FjdGl2YXRlRm9udHNDb2NvYS5tbQorKysgYi9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2NvY29hL0FjdGl2YXRlRm9udHNDb2Nv YS5tbQpAQCAtMTQzLDcgKzE0Myw3IEBAIHZvaWQgaW5zdGFsbEZha2VIZWx2ZXRpY2EoV0tTdHJp bmdSZWYgY29uZmlndXJhdGlvbikKICAgICBOU1VSTCAqcmVzb3VyY2VVUkwgPSBbcmVzb3VyY2Vz RGlyZWN0b3J5VVJMKCkgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OltOU1N0cmluZyBzdHJp bmdXaXRoRm9ybWF0OkAiRmFrZUhlbHZldGljYS0lQC50dGYiLCBjb25maWd1cmF0aW9uU3RyaW5n LmdldCgpXSBpc0RpcmVjdG9yeTpOT107CiAgICAgQ0ZFcnJvclJlZiBlcnJvciA9IG51bGxwdHI7 CiAgICAgaWYgKCFDVEZvbnRNYW5hZ2VyUmVnaXN0ZXJGb250c0ZvclVSTCgoX19icmlkZ2UgQ0ZV UkxSZWYpcmVzb3VyY2VVUkwsIGtDVEZvbnRNYW5hZ2VyU2NvcGVQcm9jZXNzLCAmZXJyb3IpKSB7 Ci0jaWYgKFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+ PSAxMDE0MDApIHx8IChQTEFURk9STShJT1NfRkFNSUxZKSAmJiAhUExBVEZPUk0oSU9TX0ZBTUlM WV9TSU1VTEFUT1IpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEyMDAw MCkKKyNpZiAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVE ID49IDEwMTQwMCkgfHwgKFBMQVRGT1JNKElPUykgJiYgIVBMQVRGT1JNKElPU19GQU1JTFlfU0lN VUxBVE9SKSkKICAgICAgICAgLy8gUmVnaXN0ZXJpbmcgc2hhZG93IGZvbnRzIGlzIG9ubHkgc3Vw cG9ydGVkIG9uIG1hY09TIE1vamF2ZSBhbmQgaU9TIDEyIG9yIG5ld2VyLCBidXQgbm90IGlPUyBT aW11bGF0b3IuIFNlZSBCdWdzIDE4MDA2MiAmIDE5NDc2MS4KICAgICAgICAgTlNMb2coQCJGYWls ZWQgdG8gYWN0aXZhdGUgZmFrZSBIZWx2ZXRpY2E6ICVAIiwgZXJyb3IpOwogI2VuZGlmCg== 378979 2019-09-17 12:35:52 -0700 2019-09-17 13:20:44 -0700 Patch bug-201851-20190917123551.patch text/plain 8092 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5OTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNkNzk3ZWIxMGEwYmEy OGQ4MmNiN2M5MTJkYWQ3OTFiOTY4Mzc0Yi4uNjhkNWYxMWQwZjk2YzUzNWEyMDExZDM4ZTEyZjE1 ZmZmOGFjNWRkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTA5LTE3ICBLZWl0 aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgc29tZSBzdXBw b3J0IGZvciA8IGlPUyAxMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjAxODUxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NTQyMjA0ND4KKworICAg ICAgICBSZXZpZXdlZCBieSBKaWV3ZW4gVGFuIGFuZCBBbGV4ZXkgUHJvc2t1cnlha292LgorCisg ICAgICAgIFJlbW92ZSBzb21lIHN1cHBvcnQgZm9yIGlPUyB2ZXJzaW9ucyBsZXNzIHRoYW4gMTIu MC4KKworICAgICAgICBVcGRhdGUgY29uZGl0aW9uYWxzIHRoYXQgcmVmZXJlbmNlIF9fSVBIT05F X09TX1ZFUlNJT05fTUlOX1JFUVVJUkVECisgICAgICAgIGFuZCBfX0lQSE9ORV9PU19WRVJTSU9O X01BWF9BTExPV0VELCBhc3N1bWluZyB0aGF0IHRoZXkgYm90aCBoYXZlCisgICAgICAgIHZhbHVl cyA+PSAxMjAwMDAuIFRoaXMgbWVhbnMgdGhhdCBleHByZXNzaW9ucyBsaWtlCisgICAgICAgICJf X0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDEwMTIwMCIgYXJlIGFsd2F5cyBGYWxz ZSBhbmQKKyAgICAgICAgIl9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTIw MCIgYXJlIGFsd2F5cyBUcnVlLgorCisgICAgICAgIFRoaXMgcmVtb3ZhbCBpcyBwYXJ0IG9mIGEg c2VyaWVzIG9mIHBhdGNoZXMgZWZmZWN0aW5nIHN1Y2ggcmVtb3ZhbC4KKworICAgICAgICBObyBu ZXcgdGVzdHMgLS0gbm8gbmV3IG9yIGNoYW5nZWQgZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAq IGNyeXB0by9tYWMvQ3J5cHRvS2V5UlNBTWFjLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNyeXB0 b0tleVJTQTo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OmNhc3REYXRhQXJndW1lbnRUb0ND UlNBQ3J5cHRvckNyZWF0ZUZyb21EYXRhSWZOZWVkZWQpOiBEZWxldGVkLgorCiAyMDE5LTA5LTE2 ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ10gQWx3YXlz IHByb3ZpZGUgYSBjb250YWluaW5nIGJsb2NrIHdpZHRoIHZhbHVlIHRvIGNvbXB1dGUqIGZ1bmN0 aW9ucy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViQ29yZS9QQUwvQ2hhbmdlTG9nCmluZGV4IDliNjEwZTY1OTNmM2RkODUxODc2MDNkYWQyZDli NDc5NmE1ZjMzYmQuLjg0NWNlZjlkNjlhMzBmZWZkNTAyNTQzMWFiNmZkMGIwNWMwMWRjNzkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA5LTE3ICBLZWl0aCBSb2xs aW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgc29tZSBzdXBwb3J0IGZv ciA8IGlPUyAxMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjAxODUxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NTQyMjA0ND4KKworICAgICAgICBS ZXZpZXdlZCBieSBKaWV3ZW4gVGFuIGFuZCBBbGV4ZXkgUHJvc2t1cnlha292LgorCisgICAgICAg IFJlbW92ZSBzb21lIHN1cHBvcnQgZm9yIGlPUyB2ZXJzaW9ucyBsZXNzIHRoYW4gMTIuMC4KKwor ICAgICAgICBVcGRhdGUgY29uZGl0aW9uYWxzIHRoYXQgcmVmZXJlbmNlIF9fSVBIT05FX09TX1ZF UlNJT05fTUlOX1JFUVVJUkVECisgICAgICAgIGFuZCBfX0lQSE9ORV9PU19WRVJTSU9OX01BWF9B TExPV0VELCBhc3N1bWluZyB0aGF0IHRoZXkgYm90aCBoYXZlCisgICAgICAgIHZhbHVlcyA+PSAx MjAwMDAuIFRoaXMgbWVhbnMgdGhhdCBleHByZXNzaW9ucyBsaWtlCisgICAgICAgICJfX0lQSE9O RV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDEwMTIwMCIgYXJlIGFsd2F5cyBGYWxzZSBhbmQK KyAgICAgICAgIl9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTIwMCIgYXJl IGFsd2F5cyBUcnVlLgorCisgICAgICAgIFRoaXMgcmVtb3ZhbCBpcyBwYXJ0IG9mIGEgc2VyaWVz IG9mIHBhdGNoZXMgZWZmZWN0aW5nIHN1Y2ggcmVtb3ZhbC4KKworICAgICAgICAqIHBhbC9zcGkv Y29jb2EvSU9TdXJmYWNlU1BJLmg6CisKIDIwMTktMDktMTMgIFlvdWVubiBGYWJsZXQgIDx5b3Vl bm5AYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBXZWJQcm9jZXNzIHByb2Nlc3NJZGVudGlmaWVy IHRvIGlkZW50aWZ5IFNlcnZpY2UgV29ya2VyIGNvbm5lY3Rpb25zCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9JT1N1cmZhY2VTUEkuaCBiL1NvdXJjZS9XZWJD b3JlL1BBTC9wYWwvc3BpL2NvY29hL0lPU3VyZmFjZVNQSS5oCmluZGV4IDBhM2ViYjFjN2JmNTM5 YjJmMTA1ZDVkNzE0ZTA2MGFmNjIyY2UxMTcuLmYxOWY3MjJiZGE4NWQwMGU0ODQxMjMyN2E3ZWIy ZGI5MmE5Mjk3MDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29h L0lPU3VyZmFjZVNQSS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0lP U3VyZmFjZVNQSS5oCkBAIC00MCwxMiArNDAsNiBAQAogCiB0eXBlZGVmIHN0cnVjdCBfX0lPU3Vy ZmFjZSAqSU9TdXJmYWNlUmVmOwogCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgX19JUEhP TkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMTAwMDAKLWVudW0gewotICAgIGtJT1N1cmZh Y2VMb2NrUmVhZE9ubHkgID0gMHgwMDAwMDAwMSwKLX07Ci0jZW5kaWYKLQogI2VuZGlmCiAKIFdU Rl9FWFRFUk5fQ19CRUdJTgpAQCAtOTIsMTkgKzg2LDggQEAgV1RGX0VYVEVSTl9DX0VORAogCiAj ZWxzZQogCi0jaWYgKFBMQVRGT1JNKElPU19GQU1JTFkpICYmIF9fSVBIT05FX09TX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDExMDAwMCkgfHwgUExBVEZPUk0oTUFDKQotCiAjaW1wb3J0IDxJT1N1 cmZhY2UvSU9TdXJmYWNlVHlwZXMuaD4KIAotI2Vsc2UKLWVudW0gewotICAgIGtJT1N1cmZhY2VQ dXJnZWFibGVOb25Wb2xhdGlsZSA9IDAsCi0gICAga0lPU3VyZmFjZVB1cmdlYWJsZVZvbGF0aWxl ID0gMSwKLSAgICBrSU9TdXJmYWNlUHVyZ2VhYmxlRW1wdHkgPSAyLAotICAgIGtJT1N1cmZhY2VQ dXJnZWFibGVLZWVwQ3VycmVudCA9IDMsCi19OwotI2VuZGlmCi0KICNlbmRpZgogCiBXVEZfRVhU RVJOX0NfQkVHSU4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRv S2V5UlNBTWFjLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRvS2V5UlNBTWFj LmNwcAppbmRleCA2ZDhkNjRkMWMyMWJkNmRkZTkyOWVhZWNlMTcyMGNiZWYyNmZmYzEzLi4yNzU1 ZTczNWZlNmRjODQ2YmI0ZjFiZThkZGU1MmMxNDdiOWYwOTkyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jcnlwdG8vbWFjL0NyeXB0b0tleVJTQU1hYy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvY3J5cHRvL21hYy9DcnlwdG9LZXlSU0FNYWMuY3BwCkBAIC00MSwxOCArNDEsNiBAQAogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKLSNpZiAoUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgX19JUEhP TkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMTAwMDApCi1pbmxpbmUgdWludDhfdCogY2Fz dERhdGFBcmd1bWVudFRvQ0NSU0FDcnlwdG9yQ3JlYXRlRnJvbURhdGFJZk5lZWRlZChjb25zdCB1 aW50OF90KiB2YWx1ZSkKLXsKLSAgICByZXR1cm4gY29uc3RfY2FzdDx1aW50OF90Kj4odmFsdWUp OwotfQotI2Vsc2UKLWlubGluZSBjb25zdCB1aW50OF90KiBjYXN0RGF0YUFyZ3VtZW50VG9DQ1JT QUNyeXB0b3JDcmVhdGVGcm9tRGF0YUlmTmVlZGVkKGNvbnN0IHVpbnQ4X3QqIHZhbHVlKQotewot ICAgIHJldHVybiB2YWx1ZTsKLX0KLSNlbmRpZgotCiAvLyBPSUQgcnNhRW5jcnlwdGlvbjogMS4y Ljg0MC4xMTM1NDkuMS4xLjEuIFBlciBodHRwczovL3Rvb2xzLmlldGYub3JnL2h0bWwvcmZjMzI3 OSNzZWN0aW9uLTIuMy4xCiBzdGF0aWMgY29uc3QgdW5zaWduZWQgY2hhciBSU0FPSURIZWFkZXJb XSA9IHsweDMwLCAweDBkLCAweDA2LCAweDA5LCAweDJhLCAweDg2LCAweDQ4LCAweDg2LCAweGY3 LCAweDBkLCAweDAxLCAweDAxLCAweDAxLCAweDA1LCAweDAwfTsKIApAQCAtMTUwLDEwICsxMzgs MTAgQEAgUmVmUHRyPENyeXB0b0tleVJTQT4gQ3J5cHRvS2V5UlNBOjpjcmVhdGUoQ3J5cHRvQWxn b3JpdGhtSWRlbnRpZmllciBpZGVudGlmaWVyLAogICAgIC8vIFNlZSA8cmRhcjovL3Byb2JsZW0v MTU0NTIzMjQ+LgogICAgIENDQ3J5cHRvclN0YXR1cyBzdGF0dXMgPSBDQ1JTQUNyeXB0b3JDcmVh dGVGcm9tRGF0YSgKICAgICAgICAga2V5RGF0YS50eXBlKCkgPT0gQ3J5cHRvS2V5UlNBQ29tcG9u ZW50czo6VHlwZTo6UHVibGljID8gY2NSU0FLZXlQdWJsaWMgOiBjY1JTQUtleVByaXZhdGUsCi0g ICAgICAgIGNhc3REYXRhQXJndW1lbnRUb0NDUlNBQ3J5cHRvckNyZWF0ZUZyb21EYXRhSWZOZWVk ZWQoa2V5RGF0YS5tb2R1bHVzKCkuZGF0YSgpKSwga2V5RGF0YS5tb2R1bHVzKCkuc2l6ZSgpLAot ICAgICAgICBjYXN0RGF0YUFyZ3VtZW50VG9DQ1JTQUNyeXB0b3JDcmVhdGVGcm9tRGF0YUlmTmVl ZGVkKGtleURhdGEuZXhwb25lbnQoKS5kYXRhKCkpLCBrZXlEYXRhLmV4cG9uZW50KCkuc2l6ZSgp LAotICAgICAgICBjYXN0RGF0YUFyZ3VtZW50VG9DQ1JTQUNyeXB0b3JDcmVhdGVGcm9tRGF0YUlm TmVlZGVkKGtleURhdGEuZmlyc3RQcmltZUluZm8oKS5wcmltZUZhY3Rvci5kYXRhKCkpLCBrZXlE YXRhLmZpcnN0UHJpbWVJbmZvKCkucHJpbWVGYWN0b3Iuc2l6ZSgpLAotICAgICAgICBjYXN0RGF0 YUFyZ3VtZW50VG9DQ1JTQUNyeXB0b3JDcmVhdGVGcm9tRGF0YUlmTmVlZGVkKGtleURhdGEuc2Vj b25kUHJpbWVJbmZvKCkucHJpbWVGYWN0b3IuZGF0YSgpKSwga2V5RGF0YS5zZWNvbmRQcmltZUlu Zm8oKS5wcmltZUZhY3Rvci5zaXplKCksCisgICAgICAgIGtleURhdGEubW9kdWx1cygpLmRhdGEo KSwga2V5RGF0YS5tb2R1bHVzKCkuc2l6ZSgpLAorICAgICAgICBrZXlEYXRhLmV4cG9uZW50KCku ZGF0YSgpLCBrZXlEYXRhLmV4cG9uZW50KCkuc2l6ZSgpLAorICAgICAgICBrZXlEYXRhLmZpcnN0 UHJpbWVJbmZvKCkucHJpbWVGYWN0b3IuZGF0YSgpLCBrZXlEYXRhLmZpcnN0UHJpbWVJbmZvKCku cHJpbWVGYWN0b3Iuc2l6ZSgpLAorICAgICAgICBrZXlEYXRhLnNlY29uZFByaW1lSW5mbygpLnBy aW1lRmFjdG9yLmRhdGEoKSwga2V5RGF0YS5zZWNvbmRQcmltZUluZm8oKS5wcmltZUZhY3Rvci5z aXplKCksCiAgICAgICAgICZjcnlwdG9yKTsKIAogICAgIGlmIChzdGF0dXMpIHsKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5MzE3M2ZhNjA4YThi MDY1ZjIyYWJiYjg4ODNkODkyODI3YzcxN2ZmLi40ODgyZDgyZjU4Y2FlYjE0MDMyZTY5NjU4NDQz MjZlZDIxZTQzY2NkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDktMTcgIEtlaXRoIFJvbGxpbiAgPGtyb2xs aW5AYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBzb21lIHN1cHBvcnQgZm9yIDwgaU9TIDEy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE4NTEK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU1NDIyMDQ0PgorCisgICAgICAgIFJldmlld2VkIGJ5 IEppZXdlbiBUYW4gYW5kIEFsZXhleSBQcm9za3VyeWFrb3YuCisKKyAgICAgICAgUmVtb3ZlIHNv bWUgc3VwcG9ydCBmb3IgaU9TIHZlcnNpb25zIGxlc3MgdGhhbiAxMi4wLgorCisgICAgICAgIFVw ZGF0ZSBjb25kaXRpb25hbHMgdGhhdCByZWZlcmVuY2UgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5f UkVRVUlSRUQKKyAgICAgICAgYW5kIF9fSVBIT05FX09TX1ZFUlNJT05fTUFYX0FMTE9XRUQsIGFz c3VtaW5nIHRoYXQgdGhleSBib3RoIGhhdmUKKyAgICAgICAgdmFsdWVzID49IDEyMDAwMC4gVGhp cyBtZWFucyB0aGF0IGV4cHJlc3Npb25zIGxpa2UKKyAgICAgICAgIl9fSVBIT05FX09TX1ZFUlNJ T05fTUlOX1JFUVVJUkVEIDwgMTAxMjAwIiBhcmUgYWx3YXlzIEZhbHNlIGFuZAorICAgICAgICAi X19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMjAwIiBhcmUgYWx3YXlzIFRy dWUuCisKKyAgICAgICAgVGhpcyByZW1vdmFsIGlzIHBhcnQgb2YgYSBzZXJpZXMgb2YgcGF0Y2hl cyBlZmZlY3Rpbmcgc3VjaCByZW1vdmFsLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9J bmplY3RlZEJ1bmRsZS9jb2NvYS9BY3RpdmF0ZUZvbnRzQ29jb2EubW06CisgICAgICAgIChXVFI6 Omluc3RhbGxGYWtlSGVsdmV0aWNhKToKKwogMjAxOS0wOS0xNiAgRGF2aWQgS2lsemVyICA8ZGRr aWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBsZWFrcyBpbiBEdW1wUmVuZGVyVHJlZSBh bmQgV2ViS2l0VGVzdFJ1bm5lcgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9J bmplY3RlZEJ1bmRsZS9jb2NvYS9BY3RpdmF0ZUZvbnRzQ29jb2EubW0gYi9Ub29scy9XZWJLaXRU ZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2NvY29hL0FjdGl2YXRlRm9udHNDb2NvYS5tbQppbmRl eCBkY2E3Y2FhMTVmMDY1YmNkMzk5ZjYzMDY5Zjg3NmQ1ZjdmZDc3MTc2Li5kMWNmN2Y1NTA0ZWVl MGJjMzI5ZjE5M2QyNTViNmYyYzQ0MzkyY2UxIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL0luamVjdGVkQnVuZGxlL2NvY29hL0FjdGl2YXRlRm9udHNDb2NvYS5tbQorKysgYi9U b29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2NvY29hL0FjdGl2YXRlRm9udHND b2NvYS5tbQpAQCAtMTQzLDcgKzE0Myw3IEBAIHZvaWQgaW5zdGFsbEZha2VIZWx2ZXRpY2EoV0tT dHJpbmdSZWYgY29uZmlndXJhdGlvbikKICAgICBOU1VSTCAqcmVzb3VyY2VVUkwgPSBbcmVzb3Vy Y2VzRGlyZWN0b3J5VVJMKCkgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OltOU1N0cmluZyBz dHJpbmdXaXRoRm9ybWF0OkAiRmFrZUhlbHZldGljYS0lQC50dGYiLCBjb25maWd1cmF0aW9uU3Ry aW5nLmdldCgpXSBpc0RpcmVjdG9yeTpOT107CiAgICAgQ0ZFcnJvclJlZiBlcnJvciA9IG51bGxw dHI7CiAgICAgaWYgKCFDVEZvbnRNYW5hZ2VyUmVnaXN0ZXJGb250c0ZvclVSTCgoX19icmlkZ2Ug Q0ZVUkxSZWYpcmVzb3VyY2VVUkwsIGtDVEZvbnRNYW5hZ2VyU2NvcGVQcm9jZXNzLCAmZXJyb3Ip KSB7Ci0jaWYgKFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJF RCA+PSAxMDE0MDApIHx8IChQTEFURk9STShJT1NfRkFNSUxZKSAmJiAhUExBVEZPUk0oSU9TX0ZB TUlMWV9TSU1VTEFUT1IpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEy MDAwMCkKKyNpZiAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJ UkVEID49IDEwMTQwMCkgfHwgKFBMQVRGT1JNKElPUykgJiYgIVBMQVRGT1JNKElPU19GQU1JTFlf U0lNVUxBVE9SKSkKICAgICAgICAgLy8gUmVnaXN0ZXJpbmcgc2hhZG93IGZvbnRzIGlzIG9ubHkg c3VwcG9ydGVkIG9uIG1hY09TIE1vamF2ZSBhbmQgaU9TIDEyIG9yIG5ld2VyLCBidXQgbm90IGlP UyBTaW11bGF0b3IuIFNlZSBCdWdzIDE4MDA2MiAmIDE5NDc2MS4KICAgICAgICAgTlNMb2coQCJG YWlsZWQgdG8gYWN0aXZhdGUgZmFrZSBIZWx2ZXRpY2E6ICVAIiwgZXJyb3IpOwogI2VuZGlmCg==