222054 2021-02-17 11:00:09 -0800 Remove missing files from WebKit Xcode project 2021-02-18 06:09:20 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=197390 https://bugs.webkit.org/show_bug.cgi?id=204343 https://bugs.webkit.org/show_bug.cgi?id=211290 https://bugs.webkit.org/show_bug.cgi?id=219563 https://bugs.webkit.org/show_bug.cgi?id=221748 InRadar P2 Normal --- 188754 1 ddkilzer ddkilzer kkinnunen webkit-bug-importer youennf oldest_to_newest 1730392 0 ddkilzer 2021-02-17 11:00:09 -0800 Remove missing files from WebKit Xcode project. Some cruft has built up since the last time I ran `tidy-Xcode-project-file --missing` from Bug 188754. $ ./Tools/Scripts/tidy-Xcode-project-file --missing Source/WebKit/WebKit.xcodeproj Reading project file Source/WebKit/WebKit.xcodeproj... Searching for missing references to files and groups... MISSING: File or folder "NetworkCacheFileSystemCocoa.mm" is missing at path: Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystemCocoa.mm MISSING: File or folder "ImageDataReference.h" is missing at path: Source/WebKit/Platform/IPC/ImageDataReference.h MISSING: File or folder "WebRTCSocket.messages.in" is missing at path: Source/WebKit/WebProcess/Network/webrtc/WebRTCSocket.messages.in MISSING: File or folder "WebRTCSocket.h" is missing at path: Source/WebKit/WebProcess/Network/webrtc/WebRTCSocket.h MISSING: File or folder "WebRTCSocket.cpp" is missing at path: Source/WebKit/WebProcess/Network/webrtc/WebRTCSocket.cpp MISSING: File or folder "ConcreteShareableImageBuffer.h" is missing at path: Source/WebKit/Shared/ConcreteShareableImageBuffer.h WARNING: Found 6 missing references at ./Tools/Scripts/tidy-Xcode-project-file line 163. Done. See: Bug 188754: Tool to fix folders that should map to directories in Xcode project files <https://bugs.webkit.org/show_bug.cgi?id=188754> 1730413 1 420682 ddkilzer 2021-02-17 11:22:41 -0800 Created attachment 420682 Patch v1 1730499 2 ews-feeder 2021-02-17 13:38:24 -0800 Committed r273025: <https://commits.webkit.org/r273025> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420682. 1730500 3 webkit-bug-importer 2021-02-17 13:39:14 -0800 <rdar://problem/74448028> 1730832 4 kkinnunen 2021-02-18 06:09:20 -0800 Nice! Hope to see the tool in check-webkit-style so I don't make same mistake so often :) 420682 2021-02-17 11:22:41 -0800 2021-02-17 13:38:25 -0800 Patch v1 bug-222054-20210217112240.patch text/plain 16857 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyOTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA4ZTMyZWM2MDMwYTQyMzI4 OTM5MDEyY2FlNzRkNjQ5ZjdlYjBmMDAuLjUxZGY2MTAyZDY3NjZjYzgwY2U4ZmU2ZmRhMjgxMjNi YTVlNjE5NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMjEtMDItMTcgIERhdmlkIEtp bHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgbWlzc2luZyBmaWxl cyBmcm9tIFdlYktpdCBYY29kZSBwcm9qZWN0CisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcv Yi8yMjIwNTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRm91bmQgdXNpbmcgdGlkeS1YY29kZS1wcm9qZWN0LWZpbGUgLS1taXNzaW5nIChzZWUgQnVn CisgICAgICAgIDE4ODc1NCkuCisKKyAgICAgICAgKiBXZWJLaXQueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvajoKKyAgICAgICAgKENvbmNyZXRlU2hhcmVhYmxlSW1hZ2VCdWZmZXIuaCk6CisgICAg ICAgIC0gUmVtb3ZlIHJlZmVyZW5jZXMgdG8gdGhpcyBtaXNzaW5nIGZpbGUuICBUaGlzIHJlZ3Jl c3NlZCBpbgorICAgICAgICAgIHIyNzA0NzAgd2hlbiB0aGUgZmlsZSB3YXMgcmVtb3ZlZC4KKyAg ICAgICAgKEltYWdlRGF0YVJlZmVyZW5jZS5oKToKKyAgICAgICAgLSBSZW1vdmUgcmVmZXJlbmNl cyB0byB0aGlzIG1pc3NpbmcgZmlsZS4gIFRoaXMgcmVncmVzc2VkIGluCisgICAgICAgICAgcjI3 Mjc4NiB3aGVuIHRoZSBmaWxlIHdhcyByZW1vdmVkLgorICAgICAgICAoTmV0d29ya0NhY2hlRmls ZVN5c3RlbUNvY29hLm1tKToKKyAgICAgICAgLSBSZW1vdmUgcmVmZXJlbmNlcyB0byB0aGlzIG1p c3NpbmcgZmlsZS4gIFRoaXMgcmVncmVzc2VkIGluCisgICAgICAgICAgcjI0NDkyMSB3aGVuIHRo ZSBmaWxlIHdhcyByZW1vdmVkLgorICAgICAgICAoUmVjb3ZlcmVkIFJlZmVyZW5jZXMpOgorICAg ICAgICAtIFJlbW92ZSAiUmVjb3ZlcmVkIFJlZmVyZW5jZXMiIGZvbGRlciBhbmQgbWlzc2luZwor ICAgICAgICAgIGNvbS5hcHBsZS5XZWJLaXQuR1BVLnNiIGZpbGUgdGhhdCByZWdyZXNzZWQgaW4K KyAgICAgICAgICByMjUzMDk4LiBUaGUgZmlsZSB3YXMgYWRkZWQgYmFjayBzZXBhcmF0ZWx5IGlu IHIyNTMxMzEuCisgICAgICAgIChXZWJSVENTb2NrZXQuaCk6CisgICAgICAgIChXZWJSVENTb2Nr ZXQuY3BwKToKKyAgICAgICAgKFdlYlJUQ05ldHdvcmsubWVzc2FnZXMuaW4pOgorICAgICAgICAt IFJlbW92ZSByZWZlcmVuY2VzIHRvIHRoZXNlIG1pc3NpbmcgZmlsZXMuICBUaGlzIGFwcGFyZW50 bHkKKyAgICAgICAgICByZWdyZXNzZWQgaW4gcjI2MTE2MyB3aGVuIHRoZSBmaWxlcyB3ZXJlIHJl bmFtZWQgdG8gaGF2ZSBhCisgICAgICAgICAgIkxpYiIgcHJlZml4LCBidXQgdGhlIG9sZCByZWZl cmVuY2VzIHdlcmUgbm90IHJlbW92ZWQuCisKIDIwMjEtMDItMTcgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjcyNjI1KTogRml4IG1p c3NpbmcgaGVhZGVycyBpbiBYY29kZSBwcm9qZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYktpdC9XZWJLaXQu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA2NGQxN2VhY2E0YTM3ZDNhYjU4MjM1NzM1 ZjNmODJjN2I4YzFmMjE0Li5kMTg2MDI5Yzc2NTQwODVlNTU5OGQzYWI0MWQ2Y2Q3ZjhkZjYwNGY3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oK QEAgLTkzNyw3ICs5MzcsNiBAQAogCQk0MUQxMjlEQTFGM0QxMDE4MDBEMTVFNDcgLyogV2ViQ2Fj aGVTdG9yYWdlUHJvdmlkZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDQxRDEyOUQ5MUYzRDEwMTQwMEQxNUU0NyAvKiBXZWJDYWNoZVN0b3JhZ2VQcm92 aWRlci5oICovOyB9OwogCQk0MURDNDU5NjFFM0Q2RTIyMDBCMTFGNTEgLyogTmV0d29ya1JUQ1By b3ZpZGVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0 MURDNDU5NDFFM0Q2RTFFMDBCMTFGNTEgLyogTmV0d29ya1JUQ1Byb3ZpZGVyLmggKi87IH07CiAJ CTQxREM0NTlDMUUzREJCMjgwMEIxMUY1MSAvKiBMaWJXZWJSVENTb2NrZXRDbGllbnQuaCBpbiBI ZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQxREM0NTlBMUUzREJC MjQwMEIxMUY1MSAvKiBMaWJXZWJSVENTb2NrZXRDbGllbnQuaCAqLzsgfTsKLQkJNDFEQzQ1OUYx RTNEQkRBNTAwQjExRjUxIC8qIFdlYlJUQ1NvY2tldC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNDFGQUY1RjMxRTNCRkU3RjAwMUFFNjc4IC8qIFdlYlJU Q1NvY2tldC5oICovOyB9OwogCQk0MURFN0M2QzIyMjc4RjFFMDA1MzJCNjUgLyogU2VydmljZVdv cmtlckZldGNoVGFzay5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSA0MTUxODUzNjIyMjcwNEY2MDA1NDMwQzYgLyogU2VydmljZVdvcmtlckZldGNoVGFz ay5jcHAgKi87IH07CiAJCTQxRTBBN0NCMjNCNjQ1Q0QwMDU2MTA2MCAvKiBXZWJTb2NrZXRDaGFu bmVsLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQx NzkxNUFDMjI1NkJCNzQwMEQ2Rjk3RSAvKiBXZWJTb2NrZXRDaGFubmVsLmNwcCAqLzsgfTsKIAkJ NDFGMDYwRTExNjU0MzE4NTAwRjMyODFDIC8qIFdlYlNvY2tldENoYW5uZWxNZXNzYWdlUmVjZWl2 ZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNDFG MDYwREQxNjU0MzE3NTAwRjMyODFDIC8qIFdlYlNvY2tldENoYW5uZWxNZXNzYWdlUmVjZWl2ZXIu Y3BwICovOyB9OwpAQCAtMjk1Myw3ICsyOTUyLDYgQEAKIAkJMUM4RTJBMzExMjc3ODUyNDAwQkM3 QkQwIC8qIFdlYkluc3BlY3Rvck1lc3NhZ2VSZWNlaXZlci5jcHAgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmNwcC5jcHA7IG5hbWUgPSBXZWJJbnNwZWN0b3JNZXNzYWdlUmVjZWl2ZXIuY3BwOyBwYXRo ID0gRGVyaXZlZFNvdXJjZXMvV2ViS2l0Mi9XZWJJbnNwZWN0b3JNZXNzYWdlUmVjZWl2ZXIuY3Bw OyBzb3VyY2VUcmVlID0gQlVJTFRfUFJPRFVDVFNfRElSOyB9OwogCQkxQzhFMkEzMjEyNzc4NTI0 MDBCQzdCRDAgLyogV2ViSW5zcGVjdG9yTWVzc2FnZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Yy5oOyBuYW1lID0gV2ViSW5zcGVjdG9yTWVzc2FnZXMuaDsgcGF0aCA9IERlcml2ZWRTb3VyY2Vz L1dlYktpdDIvV2ViSW5zcGVjdG9yTWVzc2FnZXMuaDsgc291cmNlVHJlZSA9IEJVSUxUX1BST0RV Q1RTX0RJUjsgfTsKIAkJMUM4RTJEQUQxMjc4QzVCMjAwQkM3QkQwIC8qIFdlYkluc3BlY3RvclVJ TWFjLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gV2ViSW5zcGVj dG9yVUlNYWMubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCTFDOUFGMzYxMjQxMzRE MjMwMEQzRUMwMiAvKiBJbWFnZURhdGFSZWZlcmVuY2UuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSW1hZ2VE YXRhUmVmZXJlbmNlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDOUVCQTVCMjA4 N0U3NEUwMDA1NDQyOSAvKiBOYXRpdmVXZWJNb3VzZUV2ZW50SU9TLm1tICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAub2JqY3BwOyBuYW1lID0gTmF0aXZlV2ViTW91c2VFdmVudElPUy5tbTsgcGF0 aCA9IGlvcy9OYXRpdmVXZWJNb3VzZUV2ZW50SU9TLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQkxQ0E4QjkzNTEyN0M3NzRFMDA1NzZDMkIgLyogV2ViSW5zcGVjdG9yUHJveHlNYWMu bW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBXZWJJbnNwZWN0b3JQ cm94eU1hYy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUNBOEI5NDMxMjdDODgy QTAwNTc2QzJCIC8qIFdlYkluc3BlY3RvclByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IFdlYkluc3BlY3RvclByb3h5TWVzc2FnZVJl Y2VpdmVyLmNwcDsgcGF0aCA9IERlcml2ZWRTb3VyY2VzL1dlYktpdDIvV2ViSW5zcGVjdG9yUHJv eHlNZXNzYWdlUmVjZWl2ZXIuY3BwOyBzb3VyY2VUcmVlID0gQlVJTFRfUFJPRFVDVFNfRElSOyB9 OwpAQCAtMzA5Niw3ICszMDk0LDYgQEAKIAkJMkQxQjVENUMxODU4NjlDODAwNkM2NTk2IC8qIFZp ZXdHZXN0dXJlQ29udHJvbGxlck1lc3NhZ2VzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg bmFtZSA9IFZpZXdHZXN0dXJlQ29udHJvbGxlck1lc3NhZ2VzLmg7IHBhdGggPSBEZXJpdmVkU291 cmNlcy9XZWJLaXQyL1ZpZXdHZXN0dXJlQ29udHJvbGxlck1lc3NhZ2VzLmg7IHNvdXJjZVRyZWUg PSBCVUlMVF9QUk9EVUNUU19ESVI7IH07CiAJCTJEMUU4MjIxMjE2RkZGNTAwMEExNTI2NSAvKiBX S1dlYkV2ZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IFdLV2ViRXZlbnQu aDsgcGF0aCA9IGlvcy9XS1dlYkV2ZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTJEMUU4MjIyMjE2RkZGNTEwMEExNTI2NSAvKiBXS1dlYkV2ZW50Lm1tICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAub2JqY3BwOyBuYW1lID0gV0tXZWJFdmVudC5tbTsgcGF0aCA9IGlvcy9XS1dl YkV2ZW50Lm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQkyRDI1RjMyNzI1NzU4NzI0 MDAyMzFBOEIgLyogQ29uY3JldGVTaGFyZWFibGVJbWFnZUJ1ZmZlci5oICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGgg PSBDb25jcmV0ZVNoYXJlYWJsZUltYWdlQnVmZmVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTJEMjVGMzI4MjU3NThFOTAwMDIzMUE4QiAvKiBJbWFnZUJ1ZmZlclNoYXJlYWJsZUlP U3VyZmFjZUJhY2tlbmQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSW1hZ2VCdWZmZXJTaGFyZWFibGVJT1N1 cmZhY2VCYWNrZW5kLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTJEMjVGMzI5MjU3 NThFOTEwMDIzMUE4QiAvKiBJbWFnZUJ1ZmZlclNoYXJlYWJsZUlPU3VyZmFjZUJhY2tlbmQuY3Bw ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jcHAuY3BwOyBwYXRoID0gSW1hZ2VCdWZmZXJTaGFyZWFibGVJT1N1cmZhY2VCYWNrZW5k LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMkQyOEE0OTUxQUY5NjVBMTAwRjE5 MEM5IC8qIFdLVmlld0xheW91dFN0cmF0ZWd5LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg cGF0aCA9IFdLVmlld0xheW91dFN0cmF0ZWd5Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CkBAIC0zNjY2LDcgKzM2NjMsNiBAQAogCQk0MTMwNzU5QTFERTg0RkIwMDAzOUVDNjkgLyogTmV0 d29ya1JUQ01vbml0b3IuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g TmV0d29ya1JUQ01vbml0b3IuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0MTMw NzU5QjFERTg0RkIwMDAzOUVDNjkgLyogTmV0d29ya1JUQ01vbml0b3IuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gTmV0d29ya1JUQ01vbml0b3IuaDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJNDEzMDc1OUMxREU4NEZCMDAwMzlFQzY5IC8qIE5ldHdvcmtSVENNb25p dG9yLm1lc3NhZ2VzLmluICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IE5ldHdvcmtSVENNb25pdG9y Lm1lc3NhZ2VzLmluOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQk0MTMwNzU5RjFERTg1 RUU3MDAzOUVDNjkgLyogV2ViUlRDU29ja2V0Lm1lc3NhZ2VzLmluICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dDsg bmFtZSA9IFdlYlJUQ1NvY2tldC5tZXNzYWdlcy5pbjsgcGF0aCA9IE5ldHdvcmsvd2VicnRjL1dl YlJUQ1NvY2tldC5tZXNzYWdlcy5pbjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDEz MDc1QTAxREU4NUVFNzAwMzlFQzY5IC8qIExpYldlYlJUQ1NvY2tldC5oICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jLmg7IG5hbWUgPSBMaWJXZWJSVENTb2NrZXQuaDsgcGF0aCA9IE5ldHdvcmsvd2Vi cnRjL0xpYldlYlJUQ1NvY2tldC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0MTMw NzVBMTFERTg1RUU3MDAzOUVDNjkgLyogTGliV2ViUlRDU29ja2V0LmNwcCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IExpYldlYlJUQ1NvY2tldC5jcHA7IHBhdGggPSBOZXR3 b3JrL3dlYnJ0Yy9MaWJXZWJSVENTb2NrZXQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQk0MTMwNzVBMjFERTg1RUU3MDAzOUVDNjkgLyogV2ViUlRDTW9uaXRvci5jcHAgKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IGxpbmVFbmRpbmcgPSAwOyBuYW1lID0gV2ViUlRDTW9u aXRvci5jcHA7IHBhdGggPSBOZXR3b3JrL3dlYnJ0Yy9XZWJSVENNb25pdG9yLmNwcDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgeGNMYW5ndWFnZVNwZWNpZmljYXRpb25JZGVudGlmaWVyID0geGNv ZGUubGFuZy5jcHA7IH07CkBAIC0zNzYyLDcgKzM3NTgsNiBAQAogCQk0MURDNDU5ODFFM0Q2RUQ2 MDBCMTFGNTEgLyogTmV0d29ya1JUQ1Byb3ZpZGVyLm1lc3NhZ2VzLmluICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4 dDsgcGF0aCA9IE5ldHdvcmtSVENQcm92aWRlci5tZXNzYWdlcy5pbjsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJNDFEQzQ1OTkxRTNEQkIyNDAwQjExRjUxIC8qIExpYldlYlJUQ1NvY2tl dENsaWVudC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBMaWJXZWJS VENTb2NrZXRDbGllbnQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0MURDNDU5 QTFFM0RCQjI0MDBCMTFGNTEgLyogTGliV2ViUlRDU29ja2V0Q2xpZW50LmggKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmMuaDsgcGF0aCA9IExpYldlYlJUQ1NvY2tldENsaWVudC5oOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwotCQk0MURDNDU5RDFFM0RCQ0YwMDBCMTFGNTEgLyogV2ViUlRDU29j a2V0LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IFdlYlJUQ1NvY2tl dC5jcHA7IHBhdGggPSBOZXR3b3JrL3dlYnJ0Yy9XZWJSVENTb2NrZXQuY3BwOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQk0MURDNDVBMDFFM0RDNTNDMDBCMTFGNTEgLyogV2ViUlRDUmVz b2x2ZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBuYW1lID0gV2ViUlRDUmVz b2x2ZXIuY3BwOyBwYXRoID0gTmV0d29yay93ZWJydGMvV2ViUlRDUmVzb2x2ZXIuY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0MUUwQTdDNjIzQjYzOTc4MDA1NjEwNjAgLyogTGli V2ViUlRDQ29kZWNzUHJveHkuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gTGliV2ViUlRDQ29kZWNzUHJveHku aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDFFMEE3QzcyM0I2Mzk3OTAwNTYxMDYw IC8qIExpYldlYlJUQ0NvZGVjc1Byb3h5Lm1lc3NhZ2VzLmluICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IExpYldlYlJUQ0NvZGVj c1Byb3h5Lm1lc3NhZ2VzLmluOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtMzc3Miw3 ICszNzY3LDYgQEAKIAkJNDFGMDYwREQxNjU0MzE3NTAwRjMyODFDIC8qIFdlYlNvY2tldENoYW5u ZWxNZXNzYWdlUmVjZWl2ZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBuYW1lID0gV2ViU29ja2V0Q2hhbm5l bE1lc3NhZ2VSZWNlaXZlci5jcHA7IHBhdGggPSBEZXJpdmVkU291cmNlcy9XZWJLaXQyL1dlYlNv Y2tldENoYW5uZWxNZXNzYWdlUmVjZWl2ZXIuY3BwOyBzb3VyY2VUcmVlID0gQlVJTFRfUFJPRFVD VFNfRElSOyB9OwogCQk0MUY5RkQxODIzRUQ4QTgxMDA5OUI1NzkgLyogTGliV2ViUlRDUmVzb2x2 ZXJJZGVudGlmaWVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IExpYldlYlJU Q1Jlc29sdmVySWRlbnRpZmllci5oOyBwYXRoID0gTmV0d29yay93ZWJydGMvTGliV2ViUlRDUmVz b2x2ZXJJZGVudGlmaWVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQxRkFCRDI4 MUY0RERGREMwMDZBNkM5NyAvKiBDYWNoZVN0b3JhZ2VFbmdpbmVDYWNoZS5oICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jLmg7IHBhdGggPSBDYWNoZVN0b3JhZ2VFbmdpbmVDYWNoZS5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwotCQk0MUZBRjVGMzFFM0JGRTdGMDAxQUU2NzggLyogV2ViUlRD U29ja2V0LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IFdlYlJUQ1NvY2tldC5o OyBwYXRoID0gTmV0d29yay93ZWJydGMvV2ViUlRDU29ja2V0Lmg7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CiAJCTQxRkFGNUY0MUUzQzA2NDEwMDFBRTY3OCAvKiBXZWJSVENSZXNvbHZlci5o ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5hbWUgPSBXZWJSVENSZXNvbHZlci5oOyBwYXRo ID0gTmV0d29yay93ZWJydGMvV2ViUlRDUmVzb2x2ZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJNDFGQUY1RjYxRTNDMEI0NzAwMUFFNjc4IC8qIExpYldlYlJUQ1Jlc29sdmVyLmgg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IExpYldlYlJUQ1Jlc29sdmVyLmg7IHBh dGggPSBOZXR3b3JrL3dlYnJ0Yy9MaWJXZWJSVENSZXNvbHZlci5oOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQk0MUZBRjVGNzFFM0MwQjQ3MDAxQUU2NzggLyogTGliV2ViUlRDUmVzb2x2 ZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBuYW1lID0gTGliV2ViUlRDUmVz b2x2ZXIuY3BwOyBwYXRoID0gTmV0d29yay93ZWJydGMvTGliV2ViUlRDUmVzb2x2ZXIuY3BwOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNDQzNCw3ICs0NDI4LDYgQEAKIAkJNUNCQzlC ODkxQzY1MjRBNTAwQThGRENGIC8qIE5ldHdvcmtEYXRhVGFzay5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IHBhdGggPSBOZXR3b3JrRGF0YVRhc2suaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJNUNCQzlCOEIxQzY1MjU3MzAwQThGRENGIC8qIE5ldHdvcmtEYXRhVGFza0NvY29h Lm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gTmV0d29ya0RhdGFU YXNrQ29jb2EubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTVDQzVEQjkxMjE0ODhF MTYwMDZDQjhBOCAvKiBTaGFyZWRCdWZmZXJDb3B5LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu aDsgcGF0aCA9IFNoYXJlZEJ1ZmZlckNvcHkuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK LQkJNUNEMTUwNzYyMjY4RjdGMDAwNkZCNEFGIC8qIE5ldHdvcmtDYWNoZUZpbGVTeXN0ZW1Db2Nv YS5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IE5ldHdvcmtDYWNo ZUZpbGVTeXN0ZW1Db2NvYS5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNUNEMjg2 NDkxRTcyMkY0NDAwOTRGREM4IC8qIF9XS1VzZXJDb250ZW50RmlsdGVyUHJpdmF0ZS5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBfV0tVc2VyQ29udGVudEZpbHRlclByaXZhdGUu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNUNEMjg2NEExRTcyMkY0NDAwOTRGREM4 IC8qIFdLQ29udGVudFJ1bGVMaXN0LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IFdLQ29udGVudFJ1bGVMaXN0Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTVDRDI4 NjRCMUU3MjJGNDQwMDk0RkRDOCAvKiBXS0NvbnRlbnRSdWxlTGlzdC5tbSAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFdLQ29udGVudFJ1bGVMaXN0Lm1tOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwpAQCAtNTAzNCw3ICs1MDI3LDYgQEAKIAkJQTVFRkQzOEIxNkIw RTg4QzAwQjJGMEU4IC8qIFdLUGFnZVZpc2liaWxpdHlUeXBlcy5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IHBhdGggPSBXS1BhZ2VWaXNpYmlsaXR5VHlwZXMuaDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJQTcyRDVEN0YxMjM2Q0JBODAwQTg4QjE1IC8qIEFQSVNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBBUElTZXJpYWxp emVkU2NyaXB0VmFsdWUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQTc4Q0NERDgx OTNBQzlFMzAwNUVDQzI1IC8qIGNvbS5hcHBsZS5XZWJLaXQuTmV0d29ya2luZy5zYiAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGggPSBj b20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtpbmcuc2I7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 Ci0JCUE3OENDREQ4MTkzQUM5RTMwMDVFQ0MyNiAvKiBjb20uYXBwbGUuV2ViS2l0LkdQVS5zYiAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IHBh dGggPSBjb20uYXBwbGUuV2ViS2l0LkdQVS5zYjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK IAkJQTc4Q0NERDkxOTNBQzlFMzAwNUVDQzI1IC8qIGNvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVu dC5zYiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHRl eHQ7IHBhdGggPSBjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQuc2I7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCUE3RDc5MkQ0MTc2N0NCMDkwMDg4MUNCRSAvKiBBY3Rpdml0eUFzc2Vy dGlvbi5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jLmg7IHBhdGggPSBBY3Rpdml0eUFzc2VydGlvbi5oOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQlBN0Q3OTJENTE3NjdDQjZFMDA4ODFDQkUgLyogQWN0aXZpdHlBc3Nl cnRpb24uY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQWN0aXZpdHlB c3NlcnRpb24uY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNjE4Nyw3ICs2MTc5 LDYgQEAKIAkJCQkwODY3RDY5QUZFODQwMjhGQzAyQUFDMDcgLyogRXh0ZXJuYWwgRnJhbWV3b3Jr cyBhbmQgTGlicmFyaWVzICovLAogCQkJCTAzNDc2OERGRkYzOEE1MDQxMURCOUM4QiAvKiBQcm9k dWN0cyAqLywKIAkJCQk1NzUwRjMyOTIwMzJENEUzMDAzODkzNDcgLyogRnJhbWV3b3JrcyAqLywK LQkJCQkyRDdFNDNCQTIzNzUyQ0I1MDBFQTVDQTAgLyogUmVjb3ZlcmVkIFJlZmVyZW5jZXMgKi8s CiAJCQkpOwogCQkJbmFtZSA9IFdlYktpdDI7CiAJCQlzb3VyY2VUcmVlID0gIjxncm91cD4iOwpA QCAtNjU0NCw3ICs2NTM1LDYgQEAKIAkJCQlCQ0YxODYzNzE2N0QwNzFFMDBBMUE4NUEgLyogQ2Fj aGVNb2RlbC5jcHAgKi8sCiAJCQkJQkMzMDY1RjkxMjU5MzQ0RTAwRTcxMjc4IC8qIENhY2hlTW9k ZWwuaCAqLywKIAkJCQk5QkM1OUQ2QzFFRkNDQ0I2MDAxRThEMDkgLyogQ2FsbGJhY2tJRC5oICov LAotCQkJCTJEMjVGMzI3MjU3NTg3MjQwMDIzMUE4QiAvKiBDb25jcmV0ZVNoYXJlYWJsZUltYWdl QnVmZmVyLmggKi8sCiAJCQkJQ0EwNTM5NzgyM0VFMzI0NDAwQTU1M0RDIC8qIENvbnRlbnRBc1N0 cmluZ0luY2x1ZGVzQ2hpbGRGcmFtZXMuaCAqLywKIAkJCQk1MTI5RUIxMTIzRDBERTc4MDBBRjFD RDcgLyogQ29udGVudFdvcmxkU2hhcmVkLmggKi8sCiAJCQkJNTEwNkQ3QkYxOEJEQkU3MzAwMEFC MTY2IC8qIENvbnRleHRNZW51Q29udGV4dERhdGEuY3BwICovLApAQCAtNjk2OCw3ICs2OTU4LDYg QEAKIAkJCQk5QkQ4QUI0OTI1ODIwRTUyMDA1Mzg2RjggLyogRm9udFJlZmVyZW5jZS5oICovLAog CQkJCTQxNTFFNUMzMUZCQjkwQTkwMEU0N0UyRCAvKiBGb3JtRGF0YVJlZmVyZW5jZS5oICovLAog CQkJCUMwQ0U3MkFDMTI0N0U3OEQwMEJDMEVDNCAvKiBIYW5kbGVNZXNzYWdlLmggKi8sCi0JCQkJ MUM5QUYzNjEyNDEzNEQyMzAwRDNFQzAyIC8qIEltYWdlRGF0YVJlZmVyZW5jZS5oICovLAogCQkJ CUEzMUY2MEEzMjVDQzdEQjgwMEFGMTRGNCAvKiBJUENTZW1hcGhvcmUuY3BwICovLAogCQkJCUEz MUY2MEEyMjVDQzdEQjgwMEFGMTRGNCAvKiBJUENTZW1hcGhvcmUuaCAqLywKIAkJCQk5QkY1RUM2 MzI1NDEwRTk5MDA5ODRFNzcgLyogSlNJUENCaW5kaW5nLmNwcCAqLywKQEAgLTc0MDAsMTQgKzcz ODksNiBAQAogCQkJcGF0aCA9ICJEZXJpdmVkU291cmNlcy9XZWJLaXQyL3VuaWZpZWQtc291cmNl cyI7CiAJCQlzb3VyY2VUcmVlID0gQlVJTFRfUFJPRFVDVFNfRElSOwogCQl9OwotCQkyRDdFNDNC QTIzNzUyQ0I1MDBFQTVDQTAgLyogUmVjb3ZlcmVkIFJlZmVyZW5jZXMgKi8gPSB7Ci0JCQlpc2Eg PSBQQlhHcm91cDsKLQkJCWNoaWxkcmVuID0gKAotCQkJCUE3OENDREQ4MTkzQUM5RTMwMDVFQ0My NiAvKiBjb20uYXBwbGUuV2ViS2l0LkdQVS5zYiAqLywKLQkJCSk7Ci0JCQluYW1lID0gIlJlY292 ZXJlZCBSZWZlcmVuY2VzIjsKLQkJCXNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7Ci0JCX07CiAJCTJE N0U0M0JCMjM3NTJDQzQwMEVBNUNBMCAvKiBHUFUgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsK IAkJCWNoaWxkcmVuID0gKApAQCAtODIzMyw5ICs4MjE0LDYgQEAKIAkJCQk0MURDNDVBMDFFM0RD NTNDMDBCMTFGNTEgLyogV2ViUlRDUmVzb2x2ZXIuY3BwICovLAogCQkJCTQxRkFGNUY0MUUzQzA2 NDEwMDFBRTY3OCAvKiBXZWJSVENSZXNvbHZlci5oICovLAogCQkJCTQxQUM4NjgxMUUwNDJFNTMw MDMwMzA3NCAvKiBXZWJSVENSZXNvbHZlci5tZXNzYWdlcy5pbiAqLywKLQkJCQk0MURDNDU5RDFF M0RCQ0YwMDBCMTFGNTEgLyogV2ViUlRDU29ja2V0LmNwcCAqLywKLQkJCQk0MUZBRjVGMzFFM0JG RTdGMDAxQUU2NzggLyogV2ViUlRDU29ja2V0LmggKi8sCi0JCQkJNDEzMDc1OUYxREU4NUVFNzAw MzlFQzY5IC8qIFdlYlJUQ1NvY2tldC5tZXNzYWdlcy5pbiAqLywKIAkJCSk7CiAJCQluYW1lID0g d2VicnRjOwogCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsKQEAgLTExMzQ1LDcgKzExMzIzLDYg QEAKIAkJCQlFNDEzRjU5QjFBQzFBREI2MDAzNDUzNjAgLyogTmV0d29ya0NhY2hlRW50cnkuaCAq LywKIAkJCQlFNDY5N0NDQzFCMjVFQjhGMDAxQjBBNkMgLyogTmV0d29ya0NhY2hlRmlsZVN5c3Rl bS5jcHAgKi8sCiAJCQkJODM0QjI1MEUxQTgzMUE4RDAwQ0ZCMTUwIC8qIE5ldHdvcmtDYWNoZUZp bGVTeXN0ZW0uaCAqLywKLQkJCQk1Q0QxNTA3NjIyNjhGN0YwMDA2RkI0QUYgLyogTmV0d29ya0Nh Y2hlRmlsZVN5c3RlbUNvY29hLm1tICovLAogCQkJCUU0MkUwNjBCMUFBNzQ0MEQwMEIxMTY5OSAv KiBOZXR3b3JrQ2FjaGVJT0NoYW5uZWwuaCAqLywKIAkJCQlFNDJFMDYwRDFBQTc1MEU1MDBCMTE2 OTkgLyogTmV0d29ya0NhY2hlSU9DaGFubmVsQ29jb2EubW0gKi8sCiAJCQkJRTQ0MzZFQzAxQTBD RkRCMjAwRUFEMjA0IC8qIE5ldHdvcmtDYWNoZUtleS5jcHAgKi8sCkBAIC0xMjMxMCw3ICsxMjI4 Nyw2IEBACiAJCQkJN0FGQkQzNjMyMUU1MEYzOTAwNURCQUNCIC8qIFdlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJNDEzMDc1QjAxREU4NUY1ODAwMzlF QzY5IC8qIFdlYlJUQ01vbml0b3IuaCBpbiBIZWFkZXJzICovLAogCQkJCTQxRkFGNUY1MUUzQzA2 NDkwMDFBRTY3OCAvKiBXZWJSVENSZXNvbHZlci5oIGluIEhlYWRlcnMgKi8sCi0JCQkJNDFEQzQ1 OUYxRTNEQkRBNTAwQjExRjUxIC8qIFdlYlJUQ1NvY2tldC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJ N0MzNjFENzMxOTI3RkEzNjAwMzZBNTlEIC8qIFdlYlNjcmlwdE1lc3NhZ2VIYW5kbGVyLmggaW4g SGVhZGVycyAqLywKIAkJCQlEM0I5NDg0OTExRkY0QjY1MDAwMzJCMzkgLyogV2ViU2VhcmNoUG9w dXBNZW51LmggaW4gSGVhZGVycyAqLywKIAkJCQk1MUJFQjYyQzFGM0E1QUQ3MDA1MDI5QjkgLyog V2ViU2VydmljZVdvcmtlclByb3ZpZGVyLmggaW4gSGVhZGVycyAqLywK