193884 2019-01-27 11:02:28 -0800 REGRESSION (r236481): Move soft-linking of LocalAuthentication.framework out of LocalAuthenticationSoftLink.h 2019-01-28 18:10:54 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=193750 InRadar P2 Normal --- 1 ddkilzer ddkilzer cdumez commit-queue ews-watchlist glenn jiewen_tan webkit-bug-importer oldest_to_newest 1498876 0 ddkilzer 2019-01-27 11:02:28 -0800 Move soft-linking of LocalAuthentication.framework out of LocalAuthenticationSoftLink.h. This regressed in <https://trac.webkit.org/r236481> when LocalAuthenticationSoftLink.{h,mm} were moved out of Source/WebCore. See Bug 193750 for why we don't want to put the soft-linking macros in headers. 1498881 1 360300 ddkilzer 2019-01-27 11:18:56 -0800 Created attachment 360300 Patch v1 1498909 2 360300 jiewen_tan 2019-01-27 15:27:07 -0800 Comment on attachment 360300 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=360300&action=review Thanks Dave for making the correction. LGTM. r=me. > Source/WebKit/SourcesCocoa.txt:473 > +UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.mm @no-unify Do we really need this? 1499110 3 360300 ddkilzer 2019-01-28 11:31:48 -0800 Comment on attachment 360300 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=360300&action=review >> Source/WebKit/SourcesCocoa.txt:473 >> +UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.mm @no-unify > > Do we really need this? Are you asking about the "@no-unify" keyword, or the entry in SourcesCocoa.txt? I think it's safe to include LocalAuthenticationSoftLink.mm in the Unified Sources as it doesn't do anything like including a #define that redefines a constant variable, but the general policy is not to include *SoftLink.{cpp,mm} in Unified Sources, so I would just leave it as-is. 1499291 4 360300 jiewen_tan 2019-01-28 17:15:21 -0800 Comment on attachment 360300 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=360300&action=review >>> Source/WebKit/SourcesCocoa.txt:473 >>> +UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.mm @no-unify >> >> Do we really need this? > > Are you asking about the "@no-unify" keyword, or the entry in SourcesCocoa.txt? > > I think it's safe to include LocalAuthenticationSoftLink.mm in the Unified Sources as it doesn't do anything like including a #define that redefines a constant variable, but the general policy is not to include *SoftLink.{cpp,mm} in Unified Sources, so I would just leave it as-is. The line really confuses me: you add this line to indicate the file to be included in Unified Sources, but then you add @no-unify to indicate it should not be included. It just confuses me. 1499310 5 360300 ddkilzer 2019-01-28 17:39:30 -0800 Comment on attachment 360300 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=360300&action=review >>>> Source/WebKit/SourcesCocoa.txt:473 >>>> +UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.mm @no-unify >>> >>> Do we really need this? >> >> Are you asking about the "@no-unify" keyword, or the entry in SourcesCocoa.txt? >> >> I think it's safe to include LocalAuthenticationSoftLink.mm in the Unified Sources as it doesn't do anything like including a #define that redefines a constant variable, but the general policy is not to include *SoftLink.{cpp,mm} in Unified Sources, so I would just leave it as-is. > > The line really confuses me: you add this line to indicate the file to be included in Unified Sources, but then you add @no-unify to indicate it should not be included. It just confuses me. Okay. I was following the convention used in Sources/WebCore/Sources[Cocoa].txt: $ grep @no-unify Source/WebCore/Sources*.txt | wc -l 77 $ grep @no-unify Source/WebKit/Sources*.txt | wc -l 282 1499312 6 360300 ddkilzer 2019-01-28 17:40:47 -0800 Comment on attachment 360300 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=360300&action=review >>>>> Source/WebKit/SourcesCocoa.txt:473 >>>>> +UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.mm @no-unify >>>> >>>> Do we really need this? >>> >>> Are you asking about the "@no-unify" keyword, or the entry in SourcesCocoa.txt? >>> >>> I think it's safe to include LocalAuthenticationSoftLink.mm in the Unified Sources as it doesn't do anything like including a #define that redefines a constant variable, but the general policy is not to include *SoftLink.{cpp,mm} in Unified Sources, so I would just leave it as-is. >> >> The line really confuses me: you add this line to indicate the file to be included in Unified Sources, but then you add @no-unify to indicate it should not be included. It just confuses me. > > Okay. I was following the convention used in Sources/WebCore/Sources[Cocoa].txt: > > $ grep @no-unify Source/WebCore/Sources*.txt | wc -l > 77 > > $ grep @no-unify Source/WebKit/Sources*.txt | wc -l > 282 I suspect @no-unify sources are included so someone doesn't try to add it later (thinking it's missing), then it gets mistakenly included in unified sources when it shouldn't. 1499327 7 360300 commit-queue 2019-01-28 17:58:39 -0800 Comment on attachment 360300 Patch v1 Clearing flags on attachment: 360300 Committed r240631: <https://trac.webkit.org/changeset/240631> 1499328 8 commit-queue 2019-01-28 17:58:41 -0800 All reviewed patches have been landed. Closing bug. 1499330 9 webkit-bug-importer 2019-01-28 17:59:28 -0800 <rdar://problem/47618985> 1499334 10 jiewen_tan 2019-01-28 18:10:54 -0800 (In reply to David Kilzer (:ddkilzer) from comment #6) > Comment on attachment 360300 [details] > Patch v1 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=360300&action=review > > >>>>> Source/WebKit/SourcesCocoa.txt:473 > >>>>> +UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.mm @no-unify > >>>> > >>>> Do we really need this? > >>> > >>> Are you asking about the "@no-unify" keyword, or the entry in SourcesCocoa.txt? > >>> > >>> I think it's safe to include LocalAuthenticationSoftLink.mm in the Unified Sources as it doesn't do anything like including a #define that redefines a constant variable, but the general policy is not to include *SoftLink.{cpp,mm} in Unified Sources, so I would just leave it as-is. > >> > >> The line really confuses me: you add this line to indicate the file to be included in Unified Sources, but then you add @no-unify to indicate it should not be included. It just confuses me. > > > > Okay. I was following the convention used in Sources/WebCore/Sources[Cocoa].txt: > > > > $ grep @no-unify Source/WebCore/Sources*.txt | wc -l > > 77 > > > > $ grep @no-unify Source/WebKit/Sources*.txt | wc -l > > 282 > > I suspect @no-unify sources are included so someone doesn't try to add it > later (thinking it's missing), then it gets mistakenly included in unified > sources when it shouldn't. That makes sense now. 360300 2019-01-27 11:18:56 -0800 2019-01-28 17:58:39 -0800 Patch v1 bug-193884-20190127111855.patch text/plain 12176 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNDg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIzYzE0MDZiYzQ0MDUyNGUz NDgwNjI0ZWE5NDRmMmJlMjFlMGM0MjAuLmIwNWExZWYxMDZjNGQ2ZmRmMzVjMmNjMWZlM2Y3YTcx MDdkYjk1NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDEtMjcgIERhdmlkIEtp bHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjM2NDgx KTogTW92ZSBzb2Z0LWxpbmtpbmcgb2YgTG9jYWxBdXRoZW50aWNhdGlvbi5mcmFtZXdvcmsgb3V0 IG9mIExvY2FsQXV0aGVudGljYXRpb25Tb2Z0TGluay5oCisgICAgICAgIDxodHRwczovL3dlYmtp dC5vcmcvYi8xOTM4ODQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBTb3VyY2VzQ29jb2EudHh0OgorICAgICAgICAqIFVuaWZpZWRTb3VyY2VzLWlu cHV0LnhjZmlsZWxpc3Q6CisgICAgICAgICogV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2o6CisgICAgICAgIC0gQWRkIExvY2FsQXV0aGVudGljYXRpb25Tb2Z0TGluay5tbSB0byB0aGUg cHJvamVjdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9M b2NhbEF1dGhlbnRpY2F0aW9uU29mdExpbmsuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQXV0 aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdGlvblNvZnRMaW5rLm1tOiBDb3BpZWQg ZnJvbSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2Nh bEF1dGhlbnRpY2F0aW9uU29mdExpbmsuaC4KKyAgICAgICAgLSBNb3ZlIHNvZnQtbGlua2luZyBp bXBsZW1lbnRhdGlvbiB0bworICAgICAgICAgIExvY2FsQXV0aGVudGljYXRpb25Tb2Z0TGluay5t bS4KKwogMjAxOS0wMS0yNiAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIE1vdmUgc29mdC1saW5raW5nIG9mIE1hbmFnZWRDb25maWd1cmF0aW9uLmZyYW1ld29y ayBvdXQgb2YgTWFuYWdlZENvbmZpZ3VyYXRpb25TUEkuaApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9Tb3VyY2VzQ29jb2EudHh0IGIvU291cmNlL1dlYktpdC9Tb3VyY2VzQ29jb2EudHh0Cmlu ZGV4IDY2OTY0Y2Q1MWIxMjliMmU0ZjExN2JlZGQ4ZjA0MmI1ZWQyZTFiNmIuLjRkYjA4ZmZlYTI4 NzY4MzI3NjVjODU5NTY4MTNkY2M2OGYwNDZjNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv U291cmNlc0NvY29hLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L1NvdXJjZXNDb2NvYS50eHQKQEAg LTQ3MCw2ICs0NzAsNyBAQCBVSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGlu Z1RyZWUuY3BwCiAKIFVJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9IaWRDb25uZWN0 aW9uLm1tCiBVSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvSGlkU2VydmljZS5tbQor VUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRpb25Tb2Z0 TGluay5tbSBAbm8tdW5pZnkKIFVJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2Nh bEF1dGhlbnRpY2F0b3IubW0KIFVJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2Nh bENvbm5lY3Rpb24ubW0KIFVJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbFNl cnZpY2UubW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRp Y2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRpb25Tb2Z0TGluay5oIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdGlvblNv ZnRMaW5rLmgKaW5kZXggZGMzYmIzMzQ5NzcxMWQ1MzQ2YzFmMzI2OTQwYTM4ZDE1NWU3NTEwOS4u MTU1MmIyNzM5MDNhYTY0ODJhMzkzYjhkMzg3OWEwM2Y0OGU2NTVhMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50 aWNhdGlvblNvZnRMaW5rLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVu dGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdGlvblNvZnRMaW5rLmgKQEAgLTEsNSArMSw1 IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE4IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxOC0yMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjgsNiArMjgsNiBA QAogI2ltcG9ydCA8TG9jYWxBdXRoZW50aWNhdGlvbi9Mb2NhbEF1dGhlbnRpY2F0aW9uLmg+CiAj aW1wb3J0IDx3dGYvU29mdExpbmtpbmcuaD4KIAotU09GVF9MSU5LX0ZSQU1FV09SSyhMb2NhbEF1 dGhlbnRpY2F0aW9uKTsKK1NPRlRfTElOS19GUkFNRVdPUktfRk9SX0hFQURFUihXZWJLaXQsIExv Y2FsQXV0aGVudGljYXRpb24pOwogCi1TT0ZUX0xJTktfQ0xBU1MoTG9jYWxBdXRoZW50aWNhdGlv biwgTEFDb250ZXh0KTsKK1NPRlRfTElOS19DTEFTU19GT1JfSEVBREVSKFdlYktpdCwgTEFDb250 ZXh0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0 aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRpb25Tb2Z0TGluay5tbSBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRpb25Tb2Z0 TGluay5tbQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi5kYzM5NWQyNDY0NThmYjU3NmE0YjU5Y2YxNzdmZmQ1ZDY5ZGVj OTVhCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVu dGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdGlvblNvZnRMaW5rLm1tCkBAIC0wLDAgKzEs MzIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTgtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6 CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFi b3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFy eSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0 aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3 aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBC WSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBF WFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklU TkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBF VkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBG T1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwg T1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NT IE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikg SE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElO CisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJ R0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNF IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbXBvcnQgImNvbmZpZy5oIgorCisjaW1wb3J0IDx3 dGYvU29mdExpbmtpbmcuaD4KKworU09GVF9MSU5LX0ZSQU1FV09SS19GT1JfU09VUkNFKFdlYktp dCwgTG9jYWxBdXRoZW50aWNhdGlvbik7CisKK1NPRlRfTElOS19DTEFTU19GT1JfU09VUkNFKFdl YktpdCwgTG9jYWxBdXRoZW50aWNhdGlvbiwgTEFDb250ZXh0KTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVW5pZmllZFNvdXJjZXMtaW5wdXQueGNmaWxlbGlzdCBiL1NvdXJjZS9XZWJLaXQv VW5pZmllZFNvdXJjZXMtaW5wdXQueGNmaWxlbGlzdAppbmRleCAxNWI4MDk5ZTY5ZGJmY2QyODM3 Nzg5ZDZkYjBjMWI5ZWYzMzZlMjM1Li4zM2IxMzdiY2FmOTQ5MGNmYzcxMGY1MWNjMDM4YzllNDJj NDQ0MmY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VuaWZpZWRTb3VyY2VzLWlucHV0Lnhj ZmlsZWxpc3QKKysrIGIvU291cmNlL1dlYktpdC9VbmlmaWVkU291cmNlcy1pbnB1dC54Y2ZpbGVs aXN0CkBAIC01NzYsNiArNTc2LDcgQEAgJChTUkNST09UKS9VSVByb2Nlc3MvV2ViQXV0aGVudGlj YXRpb24vQXV0aGVudGljYXRvck1hbmFnZXIuY3BwCiAkKFNSQ1JPT1QpL1VJUHJvY2Vzcy9XZWJB dXRoZW50aWNhdGlvbi9BdXRoZW50aWNhdG9yVHJhbnNwb3J0U2VydmljZS5jcHAKICQoU1JDUk9P VCkvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0hpZENvbm5lY3Rpb24ubW0KICQo U1JDUk9PVCkvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0hpZFNlcnZpY2UubW0K KyQoU1JDUk9PVCkvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVu dGljYXRpb25Tb2Z0TGluay5tbQogJChTUkNST09UKS9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRp b24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tCiAkKFNSQ1JPT1QpL1VJUHJvY2Vzcy9XZWJB dXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbENvbm5lY3Rpb24ubW0KICQoU1JDUk9PVCkvVUlQcm9j ZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsU2VydmljZS5tbQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9X ZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggMTRkNTYwODlmNTg2 YTNhMDdhNGNiOTBmMjZmYjhmMmNlOWM0ZTVkNC4uODQ0MTc3MzQ4YjM3NjQ4ZTVlMDcyYmU1YmEy Zjg2ZjdiZTJmNjY3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qCkBAIC04ODQsNiArODg0LDcgQEAKIAkJNDFGQUJEMkExRjRERTAwMTAwNkE2 Qzk3IC8qIENhY2hlU3RvcmFnZUVuZ2luZUNhY2hlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0MUZBQkQyODFGNERERkRDMDA2QTZDOTcgLyogQ2FjaGVT dG9yYWdlRW5naW5lQ2FjaGUuaCAqLzsgfTsKIAkJNDFGQUY1RjUxRTNDMDY0OTAwMUFFNjc4IC8q IFdlYlJUQ1Jlc29sdmVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSA0MUZBRjVGNDFFM0MwNjQxMDAxQUU2NzggLyogV2ViUlRDUmVzb2x2ZXIuaCAqLzsg fTsKIAkJNDFGQUY1RjgxRTNDMTAyMTAwMUFFNjc4IC8qIExpYldlYlJUQ1Jlc29sdmVyLmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0MUZBRjVGNjFFM0Mw QjQ3MDAxQUU2NzggLyogTGliV2ViUlRDUmVzb2x2ZXIuaCAqLzsgfTsKKwkJNDQ5RDkwREEyMUZE QzMwQjAwRjY3N0MwIC8qIExvY2FsQXV0aGVudGljYXRpb25Tb2Z0TGluay5tbSBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQ0OUQ5MEQ4MjFGRDYzRkUwMEY2 NzdDMCAvKiBMb2NhbEF1dGhlbnRpY2F0aW9uU29mdExpbmsubW0gKi87IH07CiAJCTQ2MEY0ODhG MUY5OTZGNzEwMENGNEI4NyAvKiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbk1lc3NhZ2VS ZWNlaXZlci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSA0NjBGNDg4RDFGOTk2RjZDMDBDRjRCODcgLyogV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rp b25NZXNzYWdlUmVjZWl2ZXIuY3BwICovOyB9OwogCQk0NjBGNDg5MDFGOTk2RjcxMDBDRjRCODcg LyogV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb25NZXNzYWdlcy5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNDYwRjQ4OEUxRjk5NkY2QzAwQ0Y0Qjg3 IC8qIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uTWVzc2FnZXMuaCAqLzsgfTsKIAkJNDYz RkQ0ODAxRUI5NDU5NjAwQTI5ODJDIC8qIFdLUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uLmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0NjNGRDQ3RjFFQjk0 NTg0MDBBMjk4MkMgLyogV0tQcm9jZXNzVGVybWluYXRpb25SZWFzb24uaCAqLzsgc2V0dGluZ3Mg PSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwpAQCAtMzA3MCw2ICszMDcxLDcgQEAK IAkJNDFGQkU4MjMyMDZEQTc5QzAwMEYwNzQxIC8qIE5ldHdvcmtDb250ZW50UnVsZUxpc3RNYW5h Z2VyLm1lc3NhZ2VzLmluICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IE5ldHdvcmtDb250ZW50UnVs ZUxpc3RNYW5hZ2VyLm1lc3NhZ2VzLmluOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0 MUZCRTgyNDIwNkRBNzlDMDAwRjA3NDEgLyogTmV0d29ya0NvbnRlbnRSdWxlTGlzdE1hbmFnZXIu Y3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gTmV0d29ya0NvbnRlbnRS dWxlTGlzdE1hbmFnZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NDUwQUVC RjFEQzNGQUU1MDA5OTQzRjIgLyogU2hhcmVkTWVtb3J5Q29jb2EuY3BwICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gU2hhcmVkTWVtb3J5Q29jb2EuY3BwOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OworCQk0NDlEOTBEODIxRkQ2M0ZFMDBGNjc3QzAgLyogTG9jYWxBdXRo ZW50aWNhdGlvblNvZnRMaW5rLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBw YXRoID0gTG9jYWxBdXRoZW50aWNhdGlvblNvZnRMaW5rLm1tOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQk0NEE0ODFDNjIxRjJEMjdCMDBGMkY5MTkgLyogQ2xpZW50Q2VydGlmaWNhdGVB dXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBDbGllbnRD ZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmNwcDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJNDYwRjQ4OEQxRjk5NkY2QzAwQ0Y0Qjg3IC8qIFdlYlNXQ29udGV4dE1h bmFnZXJDb25uZWN0aW9uTWVzc2FnZVJlY2VpdmVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Y3BwLmNwcDsgbmFtZSA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uTWVzc2FnZVJlY2Vp dmVyLmNwcDsgcGF0aCA9IERlcml2ZWRTb3VyY2VzL1dlYktpdDIvV2ViU1dDb250ZXh0TWFuYWdl ckNvbm5lY3Rpb25NZXNzYWdlUmVjZWl2ZXIuY3BwOyBzb3VyY2VUcmVlID0gQlVJTFRfUFJPRFVD VFNfRElSOyB9OwogCQk0NjBGNDg4RTFGOTk2RjZDMDBDRjRCODcgLyogV2ViU1dDb250ZXh0TWFu YWdlckNvbm5lY3Rpb25NZXNzYWdlcy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5hbWUg PSBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbk1lc3NhZ2VzLmg7IHBhdGggPSBEZXJpdmVk U291cmNlcy9XZWJLaXQyL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uTWVzc2FnZXMuaDsg c291cmNlVHJlZSA9IEJVSUxUX1BST0RVQ1RTX0RJUjsgfTsKQEAgLTY3NTgsNiArNjc2MCw3IEBA CiAJCQkJNTc3MkYyMDQyMTdEQkQ2QTAwNTZCRjJDIC8qIEhpZFNlcnZpY2UuaCAqLywKIAkJCQk1 NzcyRjIwNTIxN0RCRDZBMDA1NkJGMkMgLyogSGlkU2VydmljZS5tbSAqLywKIAkJCQk1NzhEQzI5 NzIxNTVBMDAxMDA3NEU4MTUgLyogTG9jYWxBdXRoZW50aWNhdGlvblNvZnRMaW5rLmggKi8sCisJ CQkJNDQ5RDkwRDgyMUZENjNGRTAwRjY3N0MwIC8qIExvY2FsQXV0aGVudGljYXRpb25Tb2Z0TGlu ay5tbSAqLywKIAkJCQk1N0RDRURBMTIxNDlDMUUyMDAxNkI4NDcgLyogTG9jYWxBdXRoZW50aWNh dG9yLmggKi8sCiAJCQkJNTdEQ0VEQTMyMTQ5REZGNTAwMTZCODQ3IC8qIExvY2FsQXV0aGVudGlj YXRvci5tbSAqLywKIAkJCQk1N0RDRURBNzIxNEE1NjhCMDAxNkI4NDcgLyogTG9jYWxDb25uZWN0 aW9uLmggKi8sCkBAIC0xMDcyOCw2ICsxMDczMSw3IEBACiAJCQkJMkQ5MTM0NDIyMTJDRjlGMDAw MTI4QUZEIC8qIEpTTlBPYmplY3QuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJMjk4NEY1ODgxNjRC QTA5NTAwNEJDMEM2IC8qIExlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlck1lc3NhZ2VSZWNlaXZl ci5jcHAgaW4gU291cmNlcyAqLywKIAkJCQkyOTg0RjU3QzE2NEI5MTVGMDA0QkMwQzYgLyogTGVn YWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJveHlNZXNzYWdlUmVjZWl2ZXIuY3BwIGluIFNvdXJj ZXMgKi8sCisJCQkJNDQ5RDkwREEyMUZEQzMwQjAwRjY3N0MwIC8qIExvY2FsQXV0aGVudGljYXRp b25Tb2Z0TGluay5tbSBpbiBTb3VyY2VzICovLAogCQkJCTJEOTJBNzc5MjEyQjZBNjEwMEY0OTNG RCAvKiBMb2dnaW5nLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTJEOTJBNzgxMjEyQjZBNzEwMEY0 OTNGRCAvKiBNZXNzYWdlUmVjZWl2ZXJNYXAuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJMkQ5MkE3 ODIyMTJCNkE3MTAwRjQ5M0ZEIC8qIE1lc3NhZ2VTZW5kZXIuY3BwIGluIFNvdXJjZXMgKi8sCmRp ZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTU0NDZm ZWIxNjAwYzliMWI3YjI0YjE3YWRmMzEzZGNjODI0ZjBmMS4uZmE2MmJlZjI0ZmUxYTU4ZTNjMzMz NzE0N2E1MmQxMjhkOWIzMmEwMCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTAxLTI3ICBEYXZpZCBLaWx6ZXIg IDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjIzNjQ4MSk6IE1v dmUgc29mdC1saW5raW5nIG9mIExvY2FsQXV0aGVudGljYXRpb24uZnJhbWV3b3JrIG91dCBvZiBM b2NhbEF1dGhlbnRpY2F0aW9uU29mdExpbmsuaAorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3Jn L2IvMTkzODg0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHk6CisgICAgICAgIChj aGVja19sYW5ndWFnZSk6IEFkZCBMb2NhbEF1dGhlbnRpY2F0aW9uIHRvCisgICAgICAgIGBmcmFt ZXdvcmtzX3dpdGhfc29mdF9saW5rc2AuCisKIDIwMTktMDEtMjUgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZWdyZXNzaW9uKFBTT04pIGNyb3NzLXNpdGUgcHJv dmlzaW9uYWwgcGFnZSBpcyBub3QgY2FuY2VsZWQgaWYgYSBuZXcgc2FtZS1zaXRlIG9uZSBpcyBz dGFydGVkCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJz L2NwcC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5Cmlu ZGV4IGE1YWZhYzhhYTZkMzMwMzM1YWFmZmU3NTM3OThlMzdhOWY5OTYyOTcuLjQ4NzdiMDI2ODgw Mjc0ZGUxNzFjMzJmMzg4M2NjMzgyMDBhMGM1Y2MgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CkBAIC0zMzM5LDcgKzMzMzksNyBAQCBkZWYgY2hlY2tf bGFuZ3VhZ2UoZmlsZW5hbWUsIGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZmlsZV9leHRlbnNp b24sIGluY2x1ZGVfcwogICAgICAgICAgICAgZXJyb3IobGluZV9udW1iZXIsICdzb2Z0bGluay9o ZWFkZXInLCA1LAogICAgICAgICAgICAgICAgICAgJ05ldmVyIHNvZnQtbGluayBmcmFtZXdvcmtz IGluIGhlYWRlcnMuIFB1dCB0aGUgc29mdC1saW5rIG1hY3JvcyBpbiBhIHNvdXJjZSBmaWxlLCBv ciBjcmVhdGUge2ZyYW1ld29ya31Tb2Z0TGluay57e2NwcCxtbX19IGluc3RlYWQuJy5mb3JtYXQo ZnJhbWV3b3JrPWZyYW1ld29ya19uYW1lKSkKIAotICAgICAgICBmcmFtZXdvcmtzX3dpdGhfc29m dF9saW5rcyA9IFsnQ29yZU1lZGlhJywgJ0NvcmVWaWRlbycsICdEYXRhRGV0ZWN0b3JzQ29yZScs ICdNZWRpYUFjY2Vzc2liaWxpdHknLCAnTWVkaWFSZW1vdGUnLCAnUGFzc0tpdCcsICdRdWlja0xv b2snLCAnVUlLaXQnLCAnVmlkZW9Ub29sYm94J10KKyAgICAgICAgZnJhbWV3b3Jrc193aXRoX3Nv ZnRfbGlua3MgPSBbJ0NvcmVNZWRpYScsICdDb3JlVmlkZW8nLCAnRGF0YURldGVjdG9yc0NvcmUn LCAnTG9jYWxBdXRoZW50aWNhdGlvbicsICdNZWRpYUFjY2Vzc2liaWxpdHknLCAnTWVkaWFSZW1v dGUnLCAnUGFzc0tpdCcsICdRdWlja0xvb2snLCAnVUlLaXQnLCAnVmlkZW9Ub29sYm94J10KICAg ICAgICAgaWYgZnJhbWV3b3JrX25hbWUgaW4gZnJhbWV3b3Jrc193aXRoX3NvZnRfbGlua3MgYW5k IG5vdCByZS5jb21waWxlKCdeXHMqU09GVF9MSU5LXyhQUklWQVRFXyk/RlJBTUVXT1JLX0ZPUl8o SEVBREVSfFNPVVJDRSkoX1dJVEhfRVhQT1JUKT9cKHt9XCknLmZvcm1hdChmcmFtZXdvcmtfbmFt ZSkpLnNlYXJjaChsaW5lKToKICAgICAgICAgICAgIGVycm9yKGxpbmVfbnVtYmVyLCAnc29mdGxp bmsvZnJhbWV3b3JrJywgNSwKICAgICAgICAgICAgICAgICAgICdVc2Uge2ZyYW1ld29ya31Tb2Z0 TGluay57e2NwcCxoLG1tfX0gdG8gc29mdC1saW5rIHRvIHtmcmFtZXdvcmt9LmZyYW1ld29yay4n LmZvcm1hdChmcmFtZXdvcms9ZnJhbWV3b3JrX25hbWUpKQo=