157413 2016-05-05 22:20:49 -0700 [iOS] WebCore does not need to link to CoreAudio, GraphicsServices, SystemConfiguration frameworks 2016-05-05 23:24:55 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=126841 InRadar P2 Normal --- 1 ddkilzer ddkilzer achristensen aestes barraclough bfulgham commit-queue jer.noble mmaxfield oldest_to_newest 1190614 0 ddkilzer 2016-05-05 22:20:49 -0700 WebCore does not need to link to CoreAudio.framework, GraphicsServices.framework, or SystemConfiguration.framework on iOS. It probably used GraphicsServices.framework at one time in the past (for fonts, among other things), but the other two frameworks were likely added for OS X code at some point, and just came along for the ride because they existed on iOS at the same path, even though they were unused. 1190615 1 ddkilzer 2016-05-05 22:21:11 -0700 <rdar://problem/26104189> 1190617 2 278234 ddkilzer 2016-05-05 22:26:21 -0700 Created attachment 278234 Patch v1 1190630 3 278234 commit-queue 2016-05-05 23:24:50 -0700 Comment on attachment 278234 Patch v1 Clearing flags on attachment: 278234 Committed r200507: <http://trac.webkit.org/changeset/200507> 1190631 4 commit-queue 2016-05-05 23:24:55 -0700 All reviewed patches have been landed. Closing bug. 278234 2016-05-05 22:26:21 -0700 2016-05-05 23:24:50 -0700 Patch v1 bug-157413-20160505222702.patch text/plain 10269 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwNDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmVkYWMzZTQ4ZjYzOWI0 NGY2ODlkOWRjNjNkZDg3YjFkZDdmZTlmYi4uOWJlMjMwMzJhZjY2Mjc4NGYwODIzODA5YWYxNjFl ZWIzZGYzZjAzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE2LTA1LTA1ICBEYXZp ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gV2ViQ29yZSBk b2VzIG5vdCBuZWVkIHRvIGxpbmsgdG8gQ29yZUF1ZGlvLCBHcmFwaGljc1NlcnZpY2VzLCBTeXN0 ZW1Db25maWd1cmF0aW9uIGZyYW1ld29ya3MKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9i LzE1NzQxMz4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI2MTA0MTg5PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQ29uZmlndXJhdGlvbnMvV2Vi Q29yZS54Y2NvbmZpZzoKKyAgICAgICAgKE9USEVSX0xERkxBR1NfQkFTRV9pb3MpOiBSZW1vdmUg Ii1mcmFtZXdvcmsgR3JhcGhpY3NTZXJ2aWNlcyIuCisgICAgICAgIChPVEhFUl9MREZMQUdTX1BM QVRGT1JNW3Nkaz1tYWNvc3gqXSk6IEFkZCAiLWZyYW1ld29yayBDb3JlQXVkaW8iCisgICAgICAg IGFuZCAiLWZyYW1ld29yayBTeXN0ZW1Db25maWd1cmF0aW9uIi4KKyAgICAgICAgKiBXZWJDb3Jl Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6IFJlbW92ZSBDb3JlQXVkaW8uZnJhbWV3b3JrCisg ICAgICAgIGFuZCBTeXN0ZW1Db25maWd1cmF0aW9uLmZyYW1ld29yayBmcm9tIHRoZSBwcm9qZWN0 IGZpbGUuCisKIDIwMTYtMDUtMDUgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29t PgogCiAgICAgICAgIEZpeCBhc3NlcnRpb25zIGluIGRlYnVnIGJ1aWxkcyBmb3IgdGhlIEdUSysg cG9ydC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NvbmZpZ3VyYXRpb25zL1dlYkNvcmUu eGNjb25maWcgYi9Tb3VyY2UvV2ViQ29yZS9Db25maWd1cmF0aW9ucy9XZWJDb3JlLnhjY29uZmln CmluZGV4IDQzY2E3ZmFlYTAxZTJmMmVmNzRiZjZkYmE5ZTg4MWQ1NjBiMzNjZmEuLjM3YTE4YWRi NjU2NDdkY2ZkNWRjZDMwM2MxOWQxOWQ5Yjg3MDk3YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL0NvbmZpZ3VyYXRpb25zL1dlYkNvcmUueGNjb25maWcKKysrIGIvU291cmNlL1dlYkNvcmUv Q29uZmlndXJhdGlvbnMvV2ViQ29yZS54Y2NvbmZpZwpAQCAtNTAsMTAgKzUwLDEwIEBAIFBST0RV Q1RfTkFNRSA9IFdlYkNvcmU7CiBVTkVYUE9SVEVEX1NZTUJPTFNfRklMRSA9IENvbmZpZ3VyYXRp b25zL1dlYkNvcmUudW5leHA7CiBPVEhFUl9MREZMQUdTID0gJChpbmhlcml0ZWQpICQoT1RIRVJf TERGTEFHU19QTEFURk9STSk7CiBPVEhFUl9MREZMQUdTX0JBU0UgPSAtbHNxbGl0ZTMgLWxvYmpj IC1sQU5HTEU7Ci1PVEhFUl9MREZMQUdTX0JBU0VfaW9zID0gJChPVEhFUl9MREZMQUdTX0JBU0Up IC1mcmFtZXdvcmsgQ0ZOZXR3b3JrIC1mcmFtZXdvcmsgQ29yZUdyYXBoaWNzIC1mcmFtZXdvcmsg Q29yZVRleHQgLWZyYW1ld29yayBGb3VuZGF0aW9uIC1mcmFtZXdvcmsgR3JhcGhpY3NTZXJ2aWNl cyAtZnJhbWV3b3JrIEltYWdlSU8gLWZyYW1ld29yayBPcGVuR0xFUyAtbE1vYmlsZUdlc3RhbHQ7 CitPVEhFUl9MREZMQUdTX0JBU0VfaW9zID0gJChPVEhFUl9MREZMQUdTX0JBU0UpIC1mcmFtZXdv cmsgQ0ZOZXR3b3JrIC1mcmFtZXdvcmsgQ29yZUdyYXBoaWNzIC1mcmFtZXdvcmsgQ29yZVRleHQg LWZyYW1ld29yayBGb3VuZGF0aW9uIC1mcmFtZXdvcmsgSW1hZ2VJTyAtZnJhbWV3b3JrIE9wZW5H TEVTIC1sTW9iaWxlR2VzdGFsdDsKIE9USEVSX0xERkxBR1NfUExBVEZPUk1bc2RrPWlwaG9uZW9z Kl0gPSAkKE9USEVSX0xERkxBR1NfQkFTRV9pb3MpIC1mcmFtZXdvcmsgSU9TdXJmYWNlOwogT1RI RVJfTERGTEFHU19QTEFURk9STVtzZGs9aXBob25lc2ltdWxhdG9yKl0gPSAkKE9USEVSX0xERkxB R1NfQkFTRV9pb3MpOwotT1RIRVJfTERGTEFHU19QTEFURk9STVtzZGs9bWFjb3N4Kl0gPSAkKE9U SEVSX0xERkxBR1NfQkFTRSkgLXN1Yl9saWJyYXJ5IGxpYm9iamMgLXVtYnJlbGxhIFdlYktpdCAt YWxsb3dhYmxlX2NsaWVudCBXZWJDb3JlVGVzdFN1cHBvcnQgLWFsbG93YWJsZV9jbGllbnQgV2Vi S2l0MiAtYWxsb3dhYmxlX2NsaWVudCBXZWJLaXRMZWdhY3kgLWZyYW1ld29yayBBcHBsaWNhdGlv blNlcnZpY2VzIC1mcmFtZXdvcmsgQXVkaW9Vbml0IC1mcmFtZXdvcmsgQ2FyYm9uIC1mcmFtZXdv cmsgQ29jb2EgLWZyYW1ld29yayBEYXRhRGV0ZWN0b3JzQ29yZSAtZnJhbWV3b3JrIElPU3VyZmFj ZSAtZnJhbWV3b3JrIE9wZW5HTDsKK09USEVSX0xERkxBR1NfUExBVEZPUk1bc2RrPW1hY29zeCpd ID0gJChPVEhFUl9MREZMQUdTX0JBU0UpIC1zdWJfbGlicmFyeSBsaWJvYmpjIC11bWJyZWxsYSBX ZWJLaXQgLWFsbG93YWJsZV9jbGllbnQgV2ViQ29yZVRlc3RTdXBwb3J0IC1hbGxvd2FibGVfY2xp ZW50IFdlYktpdDIgLWFsbG93YWJsZV9jbGllbnQgV2ViS2l0TGVnYWN5IC1mcmFtZXdvcmsgQXBw bGljYXRpb25TZXJ2aWNlcyAtZnJhbWV3b3JrIEF1ZGlvVW5pdCAtZnJhbWV3b3JrIENhcmJvbiAt ZnJhbWV3b3JrIENvY29hIC1mcmFtZXdvcmsgQ29yZUF1ZGlvIC1mcmFtZXdvcmsgRGF0YURldGVj dG9yc0NvcmUgLWZyYW1ld29yayBJT1N1cmZhY2UgLWZyYW1ld29yayBPcGVuR0wgLWZyYW1ld29y ayBTeXN0ZW1Db25maWd1cmF0aW9uOwogCiBTRUNUT1JERVJfRkxBR1MgPSAkKFNFQ1RPUkRFUl9G TEFHU18kKENPTkZJR1VSQVRJT04pKTsKIFNFQ1RPUkRFUl9GTEFHU19Qcm9kdWN0aW9uW3Nkaz1p cGhvbmVvcypdID0gLVdsLC1vcmRlcl9maWxlLCQoU0RLUk9PVCkvQXBwbGVJbnRlcm5hbC9PcmRl ckZpbGVzL1dlYkNvcmUub3JkZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggMDZiYmQ3MzNiMmYxNDk2YTk5OTFlY2E0M2U5ZGJk OTQ4ZGMzOGQ3Yy4uZDc1OTVmYWY4Y2U4N2JiOTY3Y2M2Mzk3YTE4MTU2YjE5ZjRiNDk1MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q CisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpA QCAtNzc3LDcgKzc3Nyw2IEBACiAJCTFBN0ZBNjE5MEREQTNCM0EwMDI4RjhBNSAvKiBOZXR3b3Jr U3RhdGVOb3RpZmllci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gMUE3RkE2MTgwRERBM0IzQTAwMjhGOEE1IC8qIE5ldHdvcmtTdGF0ZU5vdGlmaWVyLmgg Ki87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJMUE3RkE2 MUIwRERBM0JCRTAwMjhGOEE1IC8qIE5ldHdvcmtTdGF0ZU5vdGlmaWVyLmNwcCBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBN0ZBNjFBMEREQTNCQkUwMDI4 RjhBNSAvKiBOZXR3b3JrU3RhdGVOb3RpZmllci5jcHAgKi87IH07CiAJCTFBN0ZBNjQ5MEREQTND QkEwMDI4RjhBNSAvKiBOZXR3b3JrU3RhdGVOb3RpZmllck1hYy5jcHAgaW4gU291cmNlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTdGQTY0NzBEREEzQ0JBMDAyOEY4QTUg LyogTmV0d29ya1N0YXRlTm90aWZpZXJNYWMuY3BwICovOyB9OwotCQkxQTdGQTdDQzBEREE0Qjc3 MDAyOEY4QTUgLyogU3lzdGVtQ29uZmlndXJhdGlvbi5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTdGQTdDQjBEREE0Qjc3MDAyOEY4 QTUgLyogU3lzdGVtQ29uZmlndXJhdGlvbi5mcmFtZXdvcmsgKi87IH07CiAJCTFBODVCMThGMEEx QjE4QTIwMEQ4Qzg3QyAvKiBKU0hUTUxIdG1sRWxlbWVudC5jcHAgaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTg1QjE4RDBBMUIxOEEyMDBEOEM4N0MgLyog SlNIVE1MSHRtbEVsZW1lbnQuY3BwICovOyB9OwogCQkxQTg1QjE5MDBBMUIxOEEyMDBEOEM4N0Mg LyogSlNIVE1MSHRtbEVsZW1lbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDFBODVCMThFMEExQjE4QTIwMEQ4Qzg3QyAvKiBKU0hUTUxIdG1sRWxlbWVu dC5oICovOyB9OwogCQkxQTg1QjFFNjBBMUIyNDA1MDBEOEM4N0MgLyogSlNIVE1MRGlyZWN0b3J5 RWxlbWVudC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSAxQTg1QjFFMDBBMUIyNDA1MDBEOEM4N0MgLyogSlNIVE1MRGlyZWN0b3J5RWxlbWVudC5jcHAg Ki87IH07CkBAIC02ODg5LDcgKzY4ODgsNiBAQAogCQlGRDIzQTEyNjEzRjVGQTU5MDBGNjcwMDEg LyogSlNNZWRpYUVsZW1lbnRBdWRpb1NvdXJjZU5vZGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZEMjNBMTI0MTNGNUZBNTkwMEY2NzAwMSAvKiBKU01l ZGlhRWxlbWVudEF1ZGlvU291cmNlTm9kZS5oICovOyB9OwogCQlGRDJEQkYxMjEyQjA0OEEzMDBF RDk4QzYgLyogQWNjZWxlcmF0ZS5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRDJEQkYwRTEyQjA0OEEzMDBFRDk4QzYgLyogQWNjZWxl cmF0ZS5mcmFtZXdvcmsgKi87IH07CiAJCUZEMkRCRjEzMTJCMDQ4QTMwMEVEOThDNiAvKiBBdWRp b1Rvb2xib3guZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gRkQyREJGMEYxMkIwNDhBMzAwRUQ5OEM2IC8qIEF1ZGlvVG9vbGJveC5mcmFt ZXdvcmsgKi87IH07Ci0JCUZEMkRCRjE1MTJCMDQ4QTMwMEVEOThDNiAvKiBDb3JlQXVkaW8uZnJh bWV3b3JrIGluIEZyYW1ld29ya3MgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g RkQyREJGMTExMkIwNDhBMzAwRUQ5OEM2IC8qIENvcmVBdWRpby5mcmFtZXdvcmsgKi87IH07CiAJ CUZEMzE1RkY2MTJCMDI2NzYwMEMxQTM1OSAvKiBBdWRpb0Jhc2ljUHJvY2Vzc29yTm9kZS5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRDMxNUZBQzEy QjAyNjc1MDBDMUEzNTkgLyogQXVkaW9CYXNpY1Byb2Nlc3Nvck5vZGUuY3BwICovOyB9OwogCQlG RDMxNUZGNzEyQjAyNjc2MDBDMUEzNTkgLyogQXVkaW9CYXNpY1Byb2Nlc3Nvck5vZGUuaCBpbiBI ZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZEMzE1RkFEMTJCMDI2 NzUwMEMxQTM1OSAvKiBBdWRpb0Jhc2ljUHJvY2Vzc29yTm9kZS5oICovOyB9OwogCQlGRDMxNUZG ODEyQjAyNjc2MDBDMUEzNTkgLyogQXVkaW9CdWZmZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkQzMTVGQUUxMkIwMjY3NTAwQzFBMzU5IC8qIEF1 ZGlvQnVmZmVyLmNwcCAqLzsgfTsKQEAgLTgyMjMsNyArODIyMSw2IEBACiAJCTFBN0ZBNjE4MERE QTNCM0EwMDI4RjhBNSAvKiBOZXR3b3JrU3RhdGVOb3RpZmllci5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IHBhdGggPSBOZXR3b3JrU3RhdGVOb3RpZmllci5oOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQkxQTdGQTYxQTBEREEzQkJFMDAyOEY4QTUgLyogTmV0d29ya1N0YXRlTm90 aWZpZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gTmV0d29ya1N0 YXRlTm90aWZpZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTdGQTY0NzBE REEzQ0JBMDAyOEY4QTUgLyogTmV0d29ya1N0YXRlTm90aWZpZXJNYWMuY3BwICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gTmV0d29ya1N0YXRlTm90aWZpZXJNYWMuY3BwOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQkxQTdGQTdDQjBEREE0Qjc3MDAyOEY4QTUgLyog U3lzdGVtQ29uZmlndXJhdGlvbi5mcmFtZXdvcmsgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgbGFzdEtub3duRmlsZVR5cGUgPSB3cmFwcGVyLmZyYW1ld29yazsgbmFtZSA9IFN5c3RlbUNv bmZpZ3VyYXRpb24uZnJhbWV3b3JrOyBwYXRoID0gL1N5c3RlbS9MaWJyYXJ5L0ZyYW1ld29ya3Mv U3lzdGVtQ29uZmlndXJhdGlvbi5mcmFtZXdvcms7IHNvdXJjZVRyZWUgPSAiPGFic29sdXRlPiI7 IH07CiAJCTFBODVCMTdEMEExQjE4MzYwMEQ4Qzg3QyAvKiBIVE1MSHRtbEVsZW1lbnQuaWRsICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gdGV4dDsgcGF0aCA9IEhUTUxIdG1sRWxlbWVudC5pZGw7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCTFBODVCMThEMEExQjE4QTIwMEQ4Qzg3QyAvKiBKU0hUTUxIdG1sRWxl bWVudC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSlNIVE1MSHRt bEVsZW1lbnQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTg1QjE4RTBBMUIx OEEyMDBEOEM4N0MgLyogSlNIVE1MSHRtbEVsZW1lbnQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IEpTSFRNTEh0bWxFbGVtZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CkBAIC0xNDk5OCw3ICsxNDk5NSw2IEBACiAJCUZEMjNBMTI0MTNGNUZBNTkwMEY2NzAwMSAv KiBKU01lZGlhRWxlbWVudEF1ZGlvU291cmNlTm9kZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBKU01lZGlhRWxlbWVudEF1ZGlvU291cmNlTm9kZS5oOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQlGRDJEQkYwRTEyQjA0OEEzMDBFRDk4QzYgLyogQWNjZWxlcmF0ZS5m cmFtZXdvcmsgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUg PSB3cmFwcGVyLmZyYW1ld29yazsgbmFtZSA9IEFjY2VsZXJhdGUuZnJhbWV3b3JrOyBwYXRoID0g L1N5c3RlbS9MaWJyYXJ5L0ZyYW1ld29ya3MvQWNjZWxlcmF0ZS5mcmFtZXdvcms7IHNvdXJjZVRy ZWUgPSAiPGFic29sdXRlPiI7IH07CiAJCUZEMkRCRjBGMTJCMDQ4QTMwMEVEOThDNiAvKiBBdWRp b1Rvb2xib3guZnJhbWV3b3JrICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93 bkZpbGVUeXBlID0gd3JhcHBlci5mcmFtZXdvcms7IG5hbWUgPSBBdWRpb1Rvb2xib3guZnJhbWV3 b3JrOyBwYXRoID0gL1N5c3RlbS9MaWJyYXJ5L0ZyYW1ld29ya3MvQXVkaW9Ub29sYm94LmZyYW1l d29yazsgc291cmNlVHJlZSA9ICI8YWJzb2x1dGU+IjsgfTsKLQkJRkQyREJGMTExMkIwNDhBMzAw RUQ5OEM2IC8qIENvcmVBdWRpby5mcmFtZXdvcmsgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgbGFzdEtub3duRmlsZVR5cGUgPSB3cmFwcGVyLmZyYW1ld29yazsgbmFtZSA9IENvcmVBdWRp by5mcmFtZXdvcms7IHBhdGggPSAvU3lzdGVtL0xpYnJhcnkvRnJhbWV3b3Jrcy9Db3JlQXVkaW8u ZnJhbWV3b3JrOyBzb3VyY2VUcmVlID0gIjxhYnNvbHV0ZT4iOyB9OwogCQlGRDMxNUZBQzEyQjAy Njc1MDBDMUEzNTkgLyogQXVkaW9CYXNpY1Byb2Nlc3Nvck5vZGUuY3BwICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQXVkaW9CYXNpY1Byb2Nlc3Nvck5vZGUuY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlGRDMxNUZBRDEyQjAyNjc1MDBDMUEzNTkgLyogQXVk aW9CYXNpY1Byb2Nlc3Nvck5vZGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g QXVkaW9CYXNpY1Byb2Nlc3Nvck5vZGUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ RkQzMTVGQUUxMkIwMjY3NTAwQzFBMzU5IC8qIEF1ZGlvQnVmZmVyLmNwcCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEF1ZGlvQnVmZmVyLmNwcDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKQEAgLTE1MzA5LDcgKzE1MzA1LDYgQEAKIAkJCWZpbGVzID0gKAogCQkJCUZE MkRCRjEyMTJCMDQ4QTMwMEVEOThDNiAvKiBBY2NlbGVyYXRlLmZyYW1ld29yayBpbiBGcmFtZXdv cmtzICovLAogCQkJCUZEMkRCRjEzMTJCMDQ4QTMwMEVEOThDNiAvKiBBdWRpb1Rvb2xib3guZnJh bWV3b3JrIGluIEZyYW1ld29ya3MgKi8sCi0JCQkJRkQyREJGMTUxMkIwNDhBMzAwRUQ5OEM2IC8q IENvcmVBdWRpby5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLywKIAkJCQkxQUIzM0RBNTEyNTUx RTMyMDAyNDQ1N0EgLyogSU9LaXQuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8sCiAJCQkJOTNG MTlCMTYwODI0NUU1OTAwMUU5QUJDIC8qIEphdmFTY3JpcHRDb3JlLmZyYW1ld29yayBpbiBGcmFt ZXdvcmtzICovLAogCQkJCTkzRjE5QjE3MDgyNDVFNTkwMDFFOUFCQyAvKiBsaWJpY3Vjb3JlLmR5 bGliIGluIEZyYW1ld29ya3MgKi8sCkBAIC0xNTMxOCw3ICsxNTMxMyw2IEBACiAJCQkJMzc5OTE5 QjIxMjAwREU1MDAwRUEwNDFDIC8qIGxpYnouZHlsaWIgaW4gRnJhbWV3b3JrcyAqLywKIAkJCQlB ODhBRDUyRjA5NTI0QjkyMDAxREQxOTYgLyogUXVhcnR6Q29yZS5mcmFtZXdvcmsgaW4gRnJhbWV3 b3JrcyAqLywKIAkJCQk1RkUxRDI5MjE3OEZEMUYzMDAxQUEzQzMgLyogU2VjdXJpdHkuZnJhbWV3 b3JrIGluIEZyYW1ld29ya3MgKi8sCi0JCQkJMUE3RkE3Q0MwRERBNEI3NzAwMjhGOEE1IC8qIFN5 c3RlbUNvbmZpZ3VyYXRpb24uZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8sCiAJCQkpOwogCQkJ cnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07CkBAIC0xNTc3OSw3 ICsxNTc3Myw2IEBACiAJCQljaGlsZHJlbiA9ICgKIAkJCQlGRDJEQkYwRTEyQjA0OEEzMDBFRDk4 QzYgLyogQWNjZWxlcmF0ZS5mcmFtZXdvcmsgKi8sCiAJCQkJRkQyREJGMEYxMkIwNDhBMzAwRUQ5 OEM2IC8qIEF1ZGlvVG9vbGJveC5mcmFtZXdvcmsgKi8sCi0JCQkJRkQyREJGMTExMkIwNDhBMzAw RUQ5OEM2IC8qIENvcmVBdWRpby5mcmFtZXdvcmsgKi8sCiAJCQkJQUE1RjNCOTAxNkNDNUJFQjAw NDU1RUIwIC8qIENvcmVGb3VuZGF0aW9uLmZyYW1ld29yayAqLywKIAkJCQkxQUIzM0RBNDEyNTUx RTMyMDAyNDQ1N0EgLyogSU9LaXQuZnJhbWV3b3JrICovLAogCQkJCUY4MjE2Mjk5MDI5RjRGQjUw MTAwMDEzMSAvKiBKYXZhU2NyaXB0Q29yZS5mcmFtZXdvcmsgKi8sCkBAIC0xNTc4OSw3ICsxNTc4 Miw2IEBACiAJCQkJMzc5OTE5QjExMjAwREU1MDAwRUEwNDFDIC8qIGxpYnouZHlsaWIgKi8sCiAJ CQkJQTg1RDdBMkYwODc5RUJBOTAwNkE5MTcyIC8qIFF1YXJ0ekNvcmUuZnJhbWV3b3JrICovLAog CQkJCTVGRTFEMjkxMTc4RkQxRjMwMDFBQTNDMyAvKiBTZWN1cml0eS5mcmFtZXdvcmsgKi8sCi0J CQkJMUE3RkE3Q0IwRERBNEI3NzAwMjhGOEE1IC8qIFN5c3RlbUNvbmZpZ3VyYXRpb24uZnJhbWV3 b3JrICovLAogCQkJKTsKIAkJCW5hbWUgPSBGcmFtZXdvcmtzOwogCQkJc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsK