105564 2012-12-20 12:10:44 -0800 [GTK] Remove plugin process configuration option 2012-12-23 12:23:24 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 87126 1 mrobinson mrobinson cgarcia zan oldest_to_newest 795645 0 mrobinson 2012-12-20 12:10:44 -0800 Instead of allowing building without the WebKit2 plugin process, it should always be built for the GTK+ port. 795671 1 180387 mrobinson 2012-12-20 12:33:53 -0800 Created attachment 180387 Patch 796166 2 180387 cgarcia 2012-12-20 23:55:32 -0800 Comment on attachment 180387 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180387&action=review This will automatically fix bug #89451. Thanks! > Source/WebKit2/ChangeLog:13 > + I think in-process plugin process is indeed incompatible in GTK+, because WebKit2 depends on GTK+ 3 and plugin process requires GTK+ 2 to work. When built in-process it would use GTK+ 3 and some plugins like flash won't work. You might want to mention it in the ChangeLog to make it clear we are not removing it just for the sake of reducing the configuration options. 796167 3 180387 cgarcia 2012-12-21 00:04:42 -0800 Comment on attachment 180387 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180387&action=review Something happened in my browser and last comment was not included in the comment > configure.ac:1089 > PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= $GTK2_REQUIRED_VERSION gail >= $GAIL2_REQUIRED_VERSION) Instead of checking again here if we are building webkit2, you could just move this above to the previous if test "$enable_webkit2" = "yes" block and check if gtk2 is present before unix printing. 796797 4 mrobinson 2012-12-23 12:23:24 -0800 Committed r138425: <http://trac.webkit.org/changeset/138425> 180387 2012-12-20 12:33:53 -0800 2012-12-21 00:04:42 -0800 Patch bug-105564-20121220153109.patch text/plain 8801 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3ODg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzA2ZDVmMmJhOWRmMzA3 OWFhMDM4ZGYyOTlkMjY2ZWM1YTRkOTliMi4uZWMzNTZhMTIwNTk2MTIxYmRhNjQyODY3NTRjMGVk NmNhNTdjZGI4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEyLTIwICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBSZW1v dmUgcGx1Z2luIHByb2Nlc3MgY29uZmlndXJhdGlvbiBvcHRpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTU2NAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0aGUgLS1lbmFibGUtcGx1Z2lu LXByb2Nlc3MgY29uZmlndXJhdGlvbiBvcHRpb24sIG9wdGluZyBpbnN0ZWFkIHRvCisgICAgICAg IGFsd2F5cyBidWlsZCB0aGUgcGx1Z2luIHByb2Nlc3Mgd2hlbiBidWlsZGluZyBXZWJLaXQyLiBJ dCBpc24ndCB2ZXJ5IGludGVyZXN0aW5nCisgICAgICAgIGZvciBkb3duc3RyZWFtIHRvIGVuYWJs ZSBvciBkaXNhYmxlIHRoZSBwbHVnaW4gcHJvY2Vzcy4gSXQgc2hvdWxkIGFsd2F5cyBiZQorICAg ICAgICBlbmFibGVkIGZvciBXZWJLaXQyIGFuZCBpdCdzIGJldHRlciBmb3IgdXMgbm90IHRvIGhh dmUgdG8ga2VlcCBhIGRpc2FibGVkIHBsdWdpbgorICAgICAgICBwcm9jZXNzIGJ1aWxkaW5nLgor CisgICAgICAgICogR05VbWFrZWZpbGUuYW06IFJlbW92ZSB0aGUgb3B0aW9uLgorICAgICAgICAq IEdOVW1ha2VmaWxlLmxpc3QuYW06IFJlbW90ZSB0aGUgb3B0aW9uLgorCiAyMDEyLTEyLTE2ICBU aW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFBERlBsdWdp bjogVGhlICJPcGVuIGluIFByZXZpZXciIEhVRCBidXR0b24gc2hvdWxkIHdvcmsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtIGIvU291cmNlL1dlYktpdDIvR05VbWFr ZWZpbGUuYW0KaW5kZXggZmE0MmM3OTVjYWExMjYxNDExNzRlNTE1Y2Y1MTgxYjc5YWY1YWMyMS4u MTMyZDJmMjc5NjRkNmZhYjU1OGJlMTM1ODk2YjRjMmExNWFiNmI3MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvR05VbWFrZWZpbGUuYW0KKysrIGIvU291cmNlL1dlYktpdDIvR05VbWFrZWZp bGUuYW0KQEAgLTEsNSArMSwxOSBAQAogaW5jbHVkZSAkKHNyY2RpcikvU291cmNlL1dlYktpdDIv R05VbWFrZWZpbGUubGlzdC5hbQogCitpZiBFTkFCTEVfV0VCS0lUMgorIyBTaGFyZWQgbGlicmFy aWVzCitsaWJfTFRMSUJSQVJJRVMgKz0gXAorCWxpYndlYmtpdDJndGstQFdFQktJVEdUS19BUElf TUFKT1JfVkVSU0lPTkAuQFdFQktJVEdUS19BUElfTUlOT1JfVkVSU0lPTkAubGEKKworIyBXZSBu ZWVkIHRvIG1ha2Ugc3VyZSBwbHVnaW4gcHJvY2VzcyBpcyBhbHdheXMgYnVpbHQgd2l0aCBndGsy LCBiZWNhdXNlIHBsdWdpbnMgbGlrZSBmbGFzaAorIyBzdGlsbCB1c2UgZ3RrMi4gU2luY2Ugd2Vi Y29yZSB3YXMgYnVpbHQgd2l0aCBndGszLCB3ZSBuZWVkIHRvIGJ1aWxkIHdlYmNvcmVndGsgc291 cmNlcyBhZ2FpbiB3aXRoIGd0azIKK25vaW5zdF9MVExJQlJBUklFUyArPSBcCisJbGliV2ViQ29y ZUd0azIubGEKKworbGliZXhlY19QUk9HUkFNUyArPSBcCisJUHJvZ3JhbXMvV2ViS2l0UGx1Z2lu UHJvY2VzcworZW5kaWYKKwogbGlid2Via2l0Mmd0a19AV0VCS0lUR1RLX0FQSV9NQUpPUl9WRVJT SU9OQF9AV0VCS0lUR1RLX0FQSV9NSU5PUl9WRVJTSU9OQF9sYV9IRUFERVJTID0gXAogCSQod2Vi a2l0Ml9oX2FwaSkKIApAQCAtMTAwLDYgKzExNCw3IEBAIGxpYndlYmtpdDJndGtfQFdFQktJVEdU S19BUElfTUFKT1JfVkVSU0lPTkBfQFdFQktJVEdUS19BUElfTUlOT1JfVkVSU0lPTkBfbGFfQ1BQ CiAJLUkkKHRvcF9idWlsZGRpcikvRGVyaXZlZFNvdXJjZXMvV2ViS2l0Mi9pbmNsdWRlL1dlYktp dDIgXAogCS1ETElCRVhFQ0RJUj1cIiIkKGxpYmV4ZWNkaXIpIlwiIFwKIAktRFdFQktJVDJfQ09N UElMQVRJT04gXAorCS1ERU5BQkxFX1BMVUdJTl9QUk9DRVNTPTEgXAogCSQod2ViY29yZV9jcHBm bGFncykgXAogCSQod2ViY29yZWd0a19jcHBmbGFncykgXAogCSQoamF2YXNjcmlwdGNvcmVfY3Bw ZmxhZ3MpIFwKQEAgLTEyMiwxMiArMTM3LDYgQEAgbGlid2Via2l0Mmd0a19AV0VCS0lUR1RLX0FQ SV9NQUpPUl9WRVJTSU9OQF9AV0VCS0lUR1RLX0FQSV9NSU5PUl9WRVJTSU9OQF9sYV9DWFgKIGxp YndlYmtpdDJndGtfQFdFQktJVEdUS19BUElfTUFKT1JfVkVSU0lPTkBfQFdFQktJVEdUS19BUElf TUlOT1JfVkVSU0lPTkBfbGFfQ0ZMQUdTID0gXAogCSQoZ2xvYmFsX2NmbGFncykKIAotaWYgRU5B QkxFX1dFQktJVDIKLSMgU2hhcmVkIGxpYnJhcmllcwotbGliX0xUTElCUkFSSUVTICs9IFwKLQls aWJ3ZWJraXQyZ3RrLUBXRUJLSVRHVEtfQVBJX01BSk9SX1ZFUlNJT05ALkBXRUJLSVRHVEtfQVBJ X01JTk9SX1ZFUlNJT05ALmxhCi1lbmRpZgotCiAjIEFydGlmaWNpYWwgZGVwZW5kZW5jeSB0byBt YWtlIHN1cmUgbGlid2Via2l0Mmd0ayBhbmQgbGlid2Via2l0Z3RrIGFyZSBub3QgbGlua2VkIGF0 IHRoZSBzYW1lIHRpbWUKICMgVGhlIHZhcmlhYmxlIGNyZWF0aW9uIGlzIHRvIGF2b2lkIGhhdmlu ZyBhdXRvbWFrZSBvdmVycmlkZSB0aGUgZW50aXJlIHJ1bGUgaW5zdGVhZCBvZiBhZGRpbmcgdGhl CiAjIGRlcGVuZGVuY3kuCkBAIC0xNDksMTIgKzE1OCw2IEBAIGxpYndlYmtpdDJndGtfQFdFQktJ VEdUS19BUElfTUFKT1JfVkVSU0lPTkBfQFdFQktJVEdUS19BUElfTUlOT1JfVkVSU0lPTkBfbGFf Q1BQCiAJLURNT1pfWDExCiBlbmRpZgogCi0jIFBsdWdpbiBwcm9jZXNzCi1pZiBFTkFCTEVfUExV R0lOX1BST0NFU1MKLWxpYndlYmtpdDJndGtfQFdFQktJVEdUS19BUElfTUFKT1JfVkVSU0lPTkBf QFdFQktJVEdUS19BUElfTUlOT1JfVkVSU0lPTkBfbGFfQ1BQRkxBR1MgKz0gXAotCS1ERU5BQkxF X1BMVUdJTl9QUk9DRVNTPTEKLWVuZGlmCi0KIGxpYndlYmtpdDJndGtfQFdFQktJVEdUS19BUElf TUFKT1JfVkVSU0lPTkBfQFdFQktJVEdUS19BUElfTUlOT1JfVkVSU0lPTkBfbGFfTERGTEFHUyA9 IFwKIAktdmVyc2lvbi1pbmZvIEBMSUJXRUJLSVQyR1RLX1ZFUlNJT05AIFwKIAkkKHZlcnNpb25f c2NyaXB0KSBcCkBAIC00MzcsMTQgKzQ0MCw2IEBAIFByb2dyYW1zX1dlYktpdFdlYlByb2Nlc3Nf TERBREQgPSBcCiAJJChHVEtfVU5JWF9QUklOVElOR19MSUJTKSBcCiAJJChMSUJTT1VQX0xJQlMp CiAKLSMgUGx1Z2luUHJvY2VzcwotaWYgRU5BQkxFX1BMVUdJTl9QUk9DRVNTCi0KLSMgV2UgbmVl ZCB0byBtYWtlIHN1cmUgcGx1Z2luIHByb2Nlc3MgaXMgYWx3YXlzIGJ1aWx0IHdpdGggZ3RrMiwg YmVjYXVzZSBwbHVnaW5zIGxpa2UgZmxhc2gKLSMgc3RpbGwgdXNlIGd0azIuIFNpbmNlIHdlYmNv cmUgd2FzIGJ1aWx0IHdpdGggZ3RrMywgd2UgbmVlZCB0byBidWlsZCB3ZWJjb3JlZ3RrIHNvdXJj ZXMgYWdhaW4gd2l0aCBndGsyCi1ub2luc3RfTFRMSUJSQVJJRVMgKz0gXAotCWxpYldlYkNvcmVH dGsyLmxhCi0KIGxpYldlYkNvcmVHdGsyX2xhX1NPVVJDRVMgPSBcCiAJJCh3ZWJjb3JlZ3RrX3Nv dXJjZXMpCiAKQEAgLTQ4MSw5ICs0NzYsNiBAQCBsaWJXZWJDb3JlR3RrMl9sYV9DUFBGTEFHUyA9 IFwKIAkkKFhSRU5ERVJfQ0ZMQUdTKSBcCiAJJChYVF9DRkxBR1MpCiAKLWxpYmV4ZWNfUFJPR1JB TVMgKz0gXAotCVByb2dyYW1zL1dlYktpdFBsdWdpblByb2Nlc3MKLQogIyBTZXJpYWxpemUgbGlu a2luZyBvZiB0aGUgcGx1Z2luIHByb2Nlc3Mgd2l0aCBib3RoIHdlYmtpdCBsaWJyYXJpZXMuCiBw bHVnaW5fcHJvY2Vzc19mb3JfZGVwID0gUHJvZ3JhbXMvV2ViS2l0UGx1Z2luUHJvY2VzcwogJChw bHVnaW5fcHJvY2Vzc19mb3JfZGVwKTogbGlid2Via2l0Z3RrLUBXRUJLSVRHVEtfQVBJX01BSk9S X1ZFUlNJT05ALkBXRUJLSVRHVEtfQVBJX01JTk9SX1ZFUlNJT05ALmxhIGxpYndlYmtpdDJndGst QFdFQktJVEdUS19BUElfTUFKT1JfVkVSU0lPTkAuQFdFQktJVEdUS19BUElfTUlOT1JfVkVSU0lP TkAubGEKQEAgLTU4OSw4ICs1ODEsNiBAQCBQcm9ncmFtc19XZWJLaXRQbHVnaW5Qcm9jZXNzX0NY WEZMQUdTID0gXAogCSQoU1lNQk9MX1ZJU0lCSUxJVFlfSU5MSU5FUykgXAogCSQoZ2xvYmFsX2N4 eGZsYWdzKQogCi1lbmRpZiAjIEVOQUJMRV9QTFVHSU5fUFJPQ0VTUwotCiBFWFRSQV9ESVNUICs9 IFwKIAkkKFdlYktpdDIpL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1kb2NzLnNn bWwgXAogCSQoV2ViS2l0MikvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLXNlY3Rp b25zLnR4dCBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5saXN0LmFt IGIvU291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUubGlzdC5hbQppbmRleCBkYzk3NjZkZWQ4N2Ji MzYxMzliM2FhMDJhZTJkYTM5ZDUxMDQyNTU4Li43MTQyOWE4YTYyNjRiOWYwMmNjZDk1ZDdlM2Vi NGM2YjhiNjgxNmRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5saXN0 LmFtCisrKyBiL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmxpc3QuYW0KQEAgLTEyMTQsOCAr MTIxNCw2IEBAIHdlYmtpdDJfc291cmNlcyArPSBcCiAgICBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuaAogZW5kaWYgIyBFTkQgVVNFX1RFWFRV UkVfTUFQUEVSX0dMCiAKLWlmIEVOQUJMRV9QTFVHSU5fUFJPQ0VTUwotCiB3ZWJraXQyX3BsdWdp bl9wcm9jZXNzX2J1aWx0X3NvdXJjZXMgKz0gXAogCURlcml2ZWRTb3VyY2VzL1dlYktpdDIvTlBP YmplY3RNZXNzYWdlUmVjZWl2ZXJNZXNzYWdlUmVjZWl2ZXIuY3BwIFwKIAlEZXJpdmVkU291cmNl cy9XZWJLaXQyL05QT2JqZWN0TWVzc2FnZVJlY2VpdmVyTWVzc2FnZXMuaCBcCkBAIC0xMzMwLDUg KzEzMjgsMyBAQCB3ZWJraXQyX3BsdWdpbl9wcm9jZXNzX3NvdXJjZXMgKz0gXAogCVNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpblN0cmVhbS5o IFwKIAlTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUveDExL05ldHNj YXBlUGx1Z2luWDExLmNwcCBcCiAJU291cmNlL1dlYktpdDIvdW5peC9QbHVnaW5NYWluVW5peC5j cHAKLQotZW5kaWYgIyBFTkFCTEVfUExVR0lOX1BST0NFU1MKZGlmZiAtLWdpdCBhL0NoYW5nZUxv ZyBiL0NoYW5nZUxvZwppbmRleCAwYzRhNDQ3YzgwZmFmZmYzMWRhNTUxODFlOTEzMzc1NGIwNWM0 Mjg3Li4xZWQ2ZWMyY2NjZDI4NTU5NjYzMTAwNjU0MWU2NjJjMjI1NzE5MGIzIDEwMDY0NAotLS0g YS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMTItMjAg IE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtd IFJlbW92ZSBwbHVnaW4gcHJvY2VzcyBjb25maWd1cmF0aW9uIG9wdGlvbgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1NTY0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHRoZSAtLWVuYWJsZS1w bHVnaW4tcHJvY2VzcyBjb25maWd1cmF0aW9uIG9wdGlvbiwgb3B0aW5nIGluc3RlYWQgdG8KKyAg ICAgICAgYWx3YXlzIGJ1aWxkIHRoZSBwbHVnaW4gcHJvY2VzcyB3aGVuIGJ1aWxkaW5nIFdlYktp dDIuIEl0IGlzbid0IHZlcnkgaW50ZXJlc3RpbmcKKyAgICAgICAgZm9yIGRvd25zdHJlYW0gdG8g ZW5hYmxlIG9yIGRpc2FibGUgdGhlIHBsdWdpbiBwcm9jZXNzLiBJdCBzaG91bGQgYWx3YXlzIGJl CisgICAgICAgIGVuYWJsZWQgZm9yIFdlYktpdDIgYW5kIGl0J3MgYmV0dGVyIGZvciB1cyBub3Qg dG8gaGF2ZSB0byBrZWVwIGEgZGlzYWJsZWQgcGx1Z2luCisgICAgICAgIHByb2Nlc3MgYnVpbGRp bmcuCisKKyAgICAgICAgKiBjb25maWd1cmUuYWM6IFJlbW92ZSB0aGUgY29uZmlndXJhdGlvbiBv cHRpb24uCisKIDIwMTItMTItMTYgIENoYW5nU2VvayBPaCAgPHNoaXZhbWlkb3dAZ21haWwuY29t PgogCiAgICAgICAgIFtHVEtdW0FDXSBCdWlsZCBmYWlsdXJlIHdpdGggYW4gb3B0aW9uIC0td2l0 aC1hY2NlbGVyYXRpb24tYmFja2VuZD1jbHV0dGVyCmRpZmYgLS1naXQgYS9jb25maWd1cmUuYWMg Yi9jb25maWd1cmUuYWMKaW5kZXggMzRiYTFmMzgzOTA2MGRmOWIxZTMxYTc3OTVmODQ4OGI0NTI1 Y2NhYS4uYWJlYjZmN2EwZTQ4NmI4MjcxYWQ1M2MzYTc5MWM0YjZjNGRjZWNiOCAxMDA2NDQKLS0t IGEvY29uZmlndXJlLmFjCisrKyBiL2NvbmZpZ3VyZS5hYwpAQCAtMTA4NCwyMCArMTA4NCw4IEBA IGlmIHRlc3QgIiRlbmFibGVfd2Via2l0MiIgPSAieWVzIjsgdGhlbgogICAgZmkKIGZpCiAKLSMg UGx1Z2luIFByb2Nlc3MKLUFDX01TR19DSEVDS0lORyhbd2hldGhlciB0byBidWlsZCBwbHVnaW4g cHJvY2VzcyBmb3IgV2ViS2l0Ml0pCi1BQ19BUkdfRU5BQkxFKHBsdWdpbl9wcm9jZXNzLAotICAg ICAgICAgICAgQUNfSEVMUF9TVFJJTkcoWy0tZW5hYmxlLXBsdWdpbi1wcm9jZXNzXSwgW2J1aWxk IHBsdWdpbiBwcm9jZXNzIGZvciBXZWJLaXQyIFtkZWZhdWx0PXllc11dKSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgIFtdLCBbZW5hYmxlX3BsdWdpbl9wcm9jZXNzPSJ5ZXMiXSkKLUFDX01T R19SRVNVTFQoWyRlbmFibGVfcGx1Z2luX3Byb2Nlc3NdKQotCi0jIEJ1aWxkIHRoZSBwbHVnaW4g cHJvY2VzcyBvbmx5IHdoZW4gYnVpbGRpbmcgV2Via2l0Mi4KLWlmIHRlc3QgIiRlbmFibGVfd2Vi a2l0MiIgPSAibm8iOyB0aGVuCi0gICAgZW5hYmxlX3BsdWdpbl9wcm9jZXNzPW5vCi1maQotCiAj IE1ha2Ugc3VyZSB3ZSBoYXZlIEdUSysgMi54IHRvIGJ1aWxkIHRoZSBwbHVnaW4gcHJvY2Vzcy4K LWlmIHRlc3QgIiRlbmFibGVfcGx1Z2luX3Byb2Nlc3MiID0gInllcyI7IHRoZW4KK2lmIHRlc3Qg IiRlbmFibGVfd2Via2l0MiIgPSAieWVzIjsgdGhlbgogICAgUEtHX0NIRUNLX01PRFVMRVMoR1RL MiwgZ3RrKy0yLjAgPj0gJEdUSzJfUkVRVUlSRURfVkVSU0lPTiBnYWlsID49ICRHQUlMMl9SRVFV SVJFRF9WRVJTSU9OKQogZmkKIEFDX1NVQlNUKEdUSzJfQ0ZMQUdTKQpAQCAtMTE3MCw3ICsxMTU4 LDYgQEAgQU1fQ09ORElUSU9OQUwoW0VOQUJMRV9GQVNUX01BTExPQ10sW3Rlc3QgIiRlbmFibGVf ZmFzdF9tYWxsb2MiID0gInllcyJdKQogQU1fQ09ORElUSU9OQUwoW0VOQUJMRV9XRUJfQVVESU9d LFt0ZXN0ICIkZW5hYmxlX3dlYl9hdWRpbyIgPSAieWVzIl0pCiBBTV9DT05ESVRJT05BTChbRU5B QkxFX09QQ09ERV9TVEFUU10sW3Rlc3QgIiRlbmFibGVfb3Bjb2RlX3N0YXRzIiA9ICJ5ZXMiXSkK IEFNX0NPTkRJVElPTkFMKFtFTkFCTEVfV0VCS0lUMl0sW3Rlc3QgIiRlbmFibGVfd2Via2l0MiIg PSAieWVzIl0pCi1BTV9DT05ESVRJT05BTChbRU5BQkxFX1BMVUdJTl9QUk9DRVNTXSxbdGVzdCAi JGVuYWJsZV9wbHVnaW5fcHJvY2VzcyIgPSAieWVzIl0pCiBBTV9DT05ESVRJT05BTChbRU5BQkxF X1NQRUxMQ0hFQ0tdLFt0ZXN0ICIkZW5hYmxlX3NwZWxsY2hlY2siID0gInllcyJdKQogQU1fQ09O RElUSU9OQUwoW0VOQUJMRV9DU1NfRklMVEVSU10sW3Rlc3QgIiRlbmFibGVfY3NzX2ZpbHRlcnMi ID0gInllcyJdKQogQU1fQ09ORElUSU9OQUwoW0VOQUJMRV9DU1NfU0hBREVSU10sW3Rlc3QgIiRl bmFibGVfY3NzX3NoYWRlcnMiID0gInllcyJdKQpAQCAtMTIyNyw2ICsxMjE0LDcgQEAgQnVpbGQg Y29uZmlndXJhdGlvbjoKIAogRmVhdHVyZXM6CiA9PT09PT09CisgV2ViS2l0MiBzdXBwb3J0ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOiAkZW5hYmxlX3dlYmtpdDIK ICBBY2NlbGVyYXRlZCBDb21wb3NpdGluZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICA6ICRlbmFibGVfYWNjZWxlcmF0ZWRfY29tcG9zaXRpbmcKICBHYW1lcGFkIHN1cHBvcnQgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6ICRlbmFibGVfZ2FtZXBhZAog IEdlb2xvY2F0aW9uIHN1cHBvcnQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IDogJGVuYWJsZV9nZW9sb2NhdGlvbgpAQCAtMTI0MSw5ICsxMjI5LDYgQEAgRmVhdHVyZXM6CiAg V2ViR0wgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg OiAkZW5hYmxlX3dlYmdsCiAgWFNMVCBzdXBwb3J0ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgOiAkZW5hYmxlX3hzbHQKIAotV2ViS2l0MiBzdXBwb3J0OgotIFdl YktpdDIgc3VwcG9ydCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDog JGVuYWJsZV93ZWJraXQyCi0gV2ViS2l0MiBwbHVnaW4gcHJvY2VzcyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgOiAkZW5hYmxlX3BsdWdpbl9wcm9jZXNzCiAKIEdUSysgY29uZmln dXJhdGlvbjoKICBHVEsrIHZlcnNpb24gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA6ICR3aXRoX2d0awo=