206327 2020-01-15 17:05:05 -0800 Add support for categories and custom post types to the social meta plugin 2020-01-16 14:27:15 -0800 1 1 1 Unclassified WebKit WebKit Website WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jond jond commit-queue hi jond webkit-bug-importer oldest_to_newest 1607248 0 jond 2020-01-15 17:05:05 -0800 Update the social meta plugin to support generic blog archive categories and custom post type archives. 1607253 1 387874 jond 2020-01-15 17:13:12 -0800 Created attachment 387874 Patch 1607260 2 387874 hi 2020-01-15 17:26:38 -0800 Comment on attachment 387874 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387874&action=review r=me > Websites/webkit.org/wp-content/plugins/social-meta.php:35 > + $description = get_bloginfo('name') . " blog archive."; NIT: should we use "category" instead of `is_category()`? > Websites/webkit.org/wp-content/plugins/social-meta.php:42 > + $url = get_category_link($category_term_id); Should we only override `$url` if `get_category_link(...)` returns a non-empty string (which indicates an error)? > Websites/webkit.org/wp-content/plugins/social-meta.php:49 > + $post_type_obj = get_post_type_object( $post_type ); Style: extra spacing around `(` and `)` > Websites/webkit.org/wp-content/plugins/social-meta.php:50 > + Style: unnecessary newline > Websites/webkit.org/wp-content/plugins/social-meta.php:51 > + if ( isset( $post_type_obj->description ) ) Ditto (49) Also, should we null-check `$post_type_obj` too in case there was an error? > Websites/webkit.org/wp-content/plugins/social-meta.php:54 > + $url = get_post_type_archive_link($post_type); Ditto (42) 1607557 3 387935 jond 2020-01-16 11:19:47 -0800 Created attachment 387935 Patch 1607574 4 387935 hi 2020-01-16 11:43:17 -0800 Comment on attachment 387935 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387935&action=review r=me, but this needs to be rebased > Websites/webkit.org/wp-content/plugins/social-meta.php:32 > + $description = "A repository of all ".get_bloginfo('name')."blog posts."; Style: I think we should have spaces around `.` Also, I think there should be a space before "blog". > Websites/webkit.org/wp-content/plugins/social-meta.php:48 > + $title = get_bloginfo('name')." Blog ".get_the_archive_title(); > + $description = "A collection of ".get_bloginfo('name')." blog posts."; Ditto (32) > Websites/webkit.org/wp-content/plugins/social-meta.php:60 > + preg_match_all('/<img.+src(set)?=[\'"]([^\s\'"]+).*[\'"].*>/i', $post->post_content, $matches); This means that we will never use dark mode images. Is that OK, or do we prefer that instead? > Websites/webkit.org/wp-content/plugins/social-meta.php:61 > + if (isset($matches[2][0])) $image_url = $matches[2][0]; Style: please put the body of the `if` on a separate line. 1607623 5 387950 jond 2020-01-16 13:28:38 -0800 Created attachment 387950 Patch 1607638 6 387950 hi 2020-01-16 13:44:27 -0800 Comment on attachment 387950 Patch r=me, thanks for iterating! 1607667 7 387950 commit-queue 2020-01-16 14:26:50 -0800 Comment on attachment 387950 Patch Clearing flags on attachment: 387950 Committed r254709: <https://trac.webkit.org/changeset/254709> 1607668 8 commit-queue 2020-01-16 14:26:51 -0800 All reviewed patches have been landed. Closing bug. 1607669 9 webkit-bug-importer 2020-01-16 14:27:15 -0800 <rdar://problem/58658007> 387874 2020-01-15 17:13:12 -0800 2020-01-16 11:19:46 -0800 Patch bug-206327-20200115171109.patch text/plain 4514 jond U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NTY5CmRpZmYgLS1naXQgYS9XZWJzaXRlcy93ZWJraXQu b3JnL0NoYW5nZUxvZyBiL1dlYnNpdGVzL3dlYmtpdC5vcmcvQ2hhbmdlTG9nCmluZGV4IDc5NGNi ZGQwYmJmNzg1MWI0ZTMxMmIyOTYxYmMzZmUzYTg1YmNjNjkuLjEzYTdiYjJjMjk2YThjM2QyYjFj MWI0MGE5OWUzM2NmMjJlOTA3YjkgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3dlYmtpdC5vcmcvQ2hh bmdlTG9nCisrKyBiL1dlYnNpdGVzL3dlYmtpdC5vcmcvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMjAtMDEtMTUgIEpvbiBEYXZpcyAgPGpvbmRAYXBwbGUuY29tPgorCisgICAgICAgIEFk ZCBzdXBwb3J0IGZvciBjYXRlZ29yaWVzIGFuZCBjdXN0b20gcG9zdCB0eXBlcyB0byB0aGUgc29j aWFsIG1ldGEgcGx1Z2luCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDYzMjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHdwLWNvbnRlbnQvcGx1Z2lucy9zb2NpYWwtbWV0YS5waHA6CisgICAgICAgICog d3AtY29udGVudC9wbHVnaW5zL3dlYi1pbnNwZWN0b3ItcGFnZXMucGhwOgorICAgICAgICAqIHdw LWNvbnRlbnQvdGhlbWVzL3dlYmtpdC9hcmNoaXZlLXdlYl9pbnNwZWN0b3JfcGFnZS5waHA6CisK IDIwMjAtMDEtMTUgIEpvbiBEYXZpcyAgPGpvbmRAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBX ZWIgSW5zcGVjdG9yIFJlZmVyZW5jZSBub3RpY2UgdG8gV2ViIEluc3BlY3RvciBibG9nIHBvc3Rz CmRpZmYgLS1naXQgYS9XZWJzaXRlcy93ZWJraXQub3JnL3dwLWNvbnRlbnQvcGx1Z2lucy9zb2Np YWwtbWV0YS5waHAgYi9XZWJzaXRlcy93ZWJraXQub3JnL3dwLWNvbnRlbnQvcGx1Z2lucy9zb2Np YWwtbWV0YS5waHAKaW5kZXggYWZjNWJjZGQyZDE3MDA0MDMzMjMwYzg5ZGZlODM3OWUwMTIyNTdl OC4uYzFlMDQ2YzI2OTFmMzkxNjUzMGRjYWY2ZTgwYzI1NDBhODc3ZTFmNSAxMDA2NDQKLS0tIGEv V2Vic2l0ZXMvd2Via2l0Lm9yZy93cC1jb250ZW50L3BsdWdpbnMvc29jaWFsLW1ldGEucGhwCisr KyBiL1dlYnNpdGVzL3dlYmtpdC5vcmcvd3AtY29udGVudC9wbHVnaW5zL3NvY2lhbC1tZXRhLnBo cApAQCAtMTIsNyArMTIsNyBAQCBhZGRfYWN0aW9uKCd3cF9oZWFkJywgZnVuY3Rpb24oKSB7CiAg ICAgJHRpdGxlID0gdGhlX3RpdGxlX2F0dHJpYnV0ZSgnZWNobz0wJyk7CiAgICAgJGRlc2NyaXB0 aW9uID0gZ2V0X3RoZV9leGNlcnB0KCk7CiAgICAgJHR5cGUgPSAnYXJ0aWNsZSc7Ci0KKyAgICAk dXJsID0gZ2V0X3RoZV9wZXJtYWxpbmsoKTsKICAgICAkY2F0ZWdvcmllcyA9IGFycmF5KCk7CiAg ICAgJHRhZ3MgPSBhcnJheSgpOwogICAgICRpbWFnZV91cmwgPSBnZXRfc3R5bGVzaGVldF9kaXJl Y3RvcnlfdXJpKCkgLiAnL2ltYWdlcy9vZ2ltYWdlLnBuZyc7CkBAIC0yOSwxMCArMjksMzAgQEAg YWRkX2FjdGlvbignd3BfaGVhZCcsIGZ1bmN0aW9uKCkgewogICAgICAgICAkdGl0bGUgPSBnZXRf YmxvZ2luZm8oJ25hbWUnKTsKICAgICAgICAgJGRlc2NyaXB0aW9uID0gZ2V0X2Jsb2dpbmZvKCdk ZXNjcmlwdGlvbicpOwogICAgICAgICAkdHlwZSA9ICd3ZWJzaXRlJzsKLSAgICB9CisgICAgfSBl bHNlaWYgKGlzX2FyY2hpdmUoKSB8fCBpc19jYXRlZ29yeSgpKSB7CisgICAgICAgICR0eXBlID0g J3dlYnNpdGUnOworICAgICAgICAkdGl0bGUgPSBnZXRfdGhlX2FyY2hpdmVfdGl0bGUoKTsKKyAg ICAgICAgJGRlc2NyaXB0aW9uID0gZ2V0X2Jsb2dpbmZvKCduYW1lJykgLiAiIGJsb2cgYXJjaGl2 ZS4iOworCisgICAgICAgIGlmIChpc19jYXRlZ29yeSgpKSB7CisgICAgICAgICAgICAkY2F0ZWdv cnlfb2JqZWN0cyA9IGdldF90aGVfY2F0ZWdvcnkoKTsKKyAgICAgICAgICAgICRjYXRlZ29yeV90 ZXJtX2lkID0gZmFsc2U7CisgICAgICAgICAgICBpZiAoaXNzZXQoJGNhdGVnb3J5X29iamVjdHNb MF0pKQorICAgICAgICAgICAgICAgICRjYXRlZ29yeV90ZXJtX2lkID0gJGNhdGVnb3J5X29iamVj dHNbMF0tPnRlcm1faWQ7CisgICAgICAgICAgICAkdXJsID0gZ2V0X2NhdGVnb3J5X2xpbmsoJGNh dGVnb3J5X3Rlcm1faWQpOworICAgICAgICB9CiAKLSAgICBpZiAoaXNfc2luZ2xlKCkpIHsKKyAg ICB9IGVsc2VpZiAoaXNfcG9zdF90eXBlX2FyY2hpdmUoKSkgeworICAgICAgICAkcG9zdF90eXBl ID0gZ2V0X3Bvc3RfdHlwZSgpOworICAgICAgICAkdHlwZSA9ICd3ZWJzaXRlJzsKKyAgICAgICAg JHRpdGxlID0gcG9zdF90eXBlX2FyY2hpdmVfdGl0bGUoJycsIGZhbHNlKTsKKyAgICAgICAgJHBv c3RfdHlwZV9vYmogPSBnZXRfcG9zdF90eXBlX29iamVjdCggJHBvc3RfdHlwZSApOworCisgICAg ICAgIGlmICggaXNzZXQoICRwb3N0X3R5cGVfb2JqLT5kZXNjcmlwdGlvbiApICkKKyAgICAgICAg ICAgICRkZXNjcmlwdGlvbiA9ICRwb3N0X3R5cGVfb2JqLT5kZXNjcmlwdGlvbjsKIAorICAgICAg ICAkdXJsID0gZ2V0X3Bvc3RfdHlwZV9hcmNoaXZlX2xpbmsoJHBvc3RfdHlwZSk7CisgICAgfSBl bHNlaWYgKGlzX3NpbmdsZSgpKSB7CiAgICAgICAgICRwb3N0ID0gZ2V0X3Bvc3QoKTsKIAogICAg ICAgICBpZiAoIGhhc19wb3N0X3RodW1ibmFpbCgpICkgewpAQCAtNTEsNyArNzEsNiBAQCBhZGRf YWN0aW9uKCd3cF9oZWFkJywgZnVuY3Rpb24oKSB7CiAgICAgICAgICRwdWJsaXNoZWRfdGltZSA9 IGdldF90aGVfdGltZSgnYycpOwogICAgICAgICAkbW9kaWZpZWRfdGltZSA9IGdldF90aGVfbW9k aWZpZWRfZGF0ZSgnYycpOwogICAgIH0KLQogPz4KIAogICAgIDwhLS0gU2NoZW1hLm9yZyBtYXJr dXAgLS0+CkBAIC04MCw3ICs5OSw3IEBAIGFkZF9hY3Rpb24oJ3dwX2hlYWQnLCBmdW5jdGlvbigp IHsKICAgICA8IS0tIE9wZW4gR3JhcGggZGF0YSAtLT4KICAgICA8bWV0YSBwcm9wZXJ0eT0ib2c6 dGl0bGUiIGNvbnRlbnQ9Ijw/cGhwIGVjaG8gZXNjX2F0dHIoJHRpdGxlKTsgPz4iPgogICAgIDxt ZXRhIHByb3BlcnR5PSJvZzp0eXBlIiBjb250ZW50PSI8P3BocCBlY2hvIGVzY19hdHRyKCR0eXBl KTsgPz4iPgotICAgIDxtZXRhIHByb3BlcnR5PSJvZzp1cmwiIGNvbnRlbnQ9Ijw/cGhwIHRoZV9w ZXJtYWxpbmsoKTsgPz4iPgorICAgIDxtZXRhIHByb3BlcnR5PSJvZzp1cmwiIGNvbnRlbnQ9Ijw/ cGhwIGVjaG8gZXNjX3VybCgkdXJsKTsgPz4iPgogPD9waHAgaWYgKCRpbWFnZV91cmwpOiA/Pgog ICAgIDxtZXRhIHByb3BlcnR5PSJvZzppbWFnZSIgY29udGVudD0iPD9waHAgZWNobyBlc2NfdXJs KCRpbWFnZV91cmwpOyA/PiI+CiA8P3BocCBlbmRpZjsgPz4KZGlmZiAtLWdpdCBhL1dlYnNpdGVz L3dlYmtpdC5vcmcvd3AtY29udGVudC9wbHVnaW5zL3dlYi1pbnNwZWN0b3ItcGFnZXMucGhwIGIv V2Vic2l0ZXMvd2Via2l0Lm9yZy93cC1jb250ZW50L3BsdWdpbnMvd2ViLWluc3BlY3Rvci1wYWdl cy5waHAKaW5kZXggMGI1YTFjOTQ3MzZkMGM2MzM3M2QwYzgzM2ZlOGFiNDQ5MjcwYWY3Yy4uMmZk NTViNjllZTM4NGE4MTYwOTI0NDlkNTA0NjcyMDU5YmM0NjQ3MiAxMDA2NDQKLS0tIGEvV2Vic2l0 ZXMvd2Via2l0Lm9yZy93cC1jb250ZW50L3BsdWdpbnMvd2ViLWluc3BlY3Rvci1wYWdlcy5waHAK KysrIGIvV2Vic2l0ZXMvd2Via2l0Lm9yZy93cC1jb250ZW50L3BsdWdpbnMvd2ViLWluc3BlY3Rv ci1wYWdlcy5waHAKQEAgLTY4LDEwICs2OCwxMCBAQCByZWdpc3Rlcl9hY3RpdmF0aW9uX2hvb2so X19GSUxFX18sIGZ1bmN0aW9uICgpIHsKIGFkZF9hY3Rpb24oJ2luaXQnLCBmdW5jdGlvbiAoKSB7 ICAgIAogICAgIHJlZ2lzdGVyX3Bvc3RfdHlwZSgnd2ViX2luc3BlY3Rvcl9wYWdlJywgYXJyYXko CiAgICAgICAgICdsYWJlbCcgICAgICAgICAgICAgICAgID0+ICdXZWIgSW5zcGVjdG9yIFBhZ2Un LAotICAgICAgICAnZGVzY3JpcHRpb24nICAgICAgICAgICA9PiAnUmVmZXJlbmNlIHBhZ2VzIGZv ciBXZWIgSW5zcGVjdG9yJywKKyAgICAgICAgJ2Rlc2NyaXB0aW9uJyAgICAgICAgICAgPT4gJ1Jl ZmVyZW5jZSBkb2N1bWVudGF0aW9uIGZvciBXZWIgSW5zcGVjdG9yLicsCiAgICAgICAgICdtZW51 X2ljb24nICAgICAgICAgICAgID0+ICdkYXNoaWNvbnMtbWVkaWEtZG9jdW1lbnQnLAogICAgICAg ICAnbGFiZWxzJyAgICAgICAgICAgICAgICA9PiBhcnJheSgKLSAgICAgICAgICAgICduYW1lJyAg ICAgICAgICAgICAgICAgID0+ICdXZWIgSW5zcGVjdG9yIFBhZ2VzJywKKyAgICAgICAgICAgICdu YW1lJyAgICAgICAgICAgICAgICAgID0+ICdXZWIgSW5zcGVjdG9yIFJlZmVyZW5jZScsCiAgICAg ICAgICAgICAnc2luZ3VsYXJfbmFtZScgICAgICAgICA9PiAnV2ViIEluc3BlY3RvciBQYWdlJywK ICAgICAgICAgICAgICdtZW51X25hbWUnICAgICAgICAgICAgID0+ICdXZWIgSW5zcGVjdG9yIFBh Z2VzJywKICAgICAgICAgICAgICduYW1lX2FkbWluX2JhcicgICAgICAgID0+ICdXZWIgSW5zcGVj dG9yIFBhZ2UnLAo= 387935 2020-01-16 11:19:47 -0800 2020-01-16 13:28:37 -0800 Patch bug-206327-20200116111946.patch text/plain 7426 jond U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NTY5CmRpZmYgLS1naXQgYS9XZWJzaXRlcy93ZWJraXQu b3JnL0NoYW5nZUxvZyBiL1dlYnNpdGVzL3dlYmtpdC5vcmcvQ2hhbmdlTG9nCmluZGV4IDc5NGNi ZGQwYmJmNzg1MWI0ZTMxMmIyOTYxYmMzZmUzYTg1YmNjNjkuLjEzYTdiYjJjMjk2YThjM2QyYjFj MWI0MGE5OWUzM2NmMjJlOTA3YjkgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3dlYmtpdC5vcmcvQ2hh bmdlTG9nCisrKyBiL1dlYnNpdGVzL3dlYmtpdC5vcmcvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMjAtMDEtMTUgIEpvbiBEYXZpcyAgPGpvbmRAYXBwbGUuY29tPgorCisgICAgICAgIEFk ZCBzdXBwb3J0IGZvciBjYXRlZ29yaWVzIGFuZCBjdXN0b20gcG9zdCB0eXBlcyB0byB0aGUgc29j aWFsIG1ldGEgcGx1Z2luCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDYzMjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHdwLWNvbnRlbnQvcGx1Z2lucy9zb2NpYWwtbWV0YS5waHA6CisgICAgICAgICog d3AtY29udGVudC9wbHVnaW5zL3dlYi1pbnNwZWN0b3ItcGFnZXMucGhwOgorICAgICAgICAqIHdw LWNvbnRlbnQvdGhlbWVzL3dlYmtpdC9hcmNoaXZlLXdlYl9pbnNwZWN0b3JfcGFnZS5waHA6CisK IDIwMjAtMDEtMTUgIEpvbiBEYXZpcyAgPGpvbmRAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBX ZWIgSW5zcGVjdG9yIFJlZmVyZW5jZSBub3RpY2UgdG8gV2ViIEluc3BlY3RvciBibG9nIHBvc3Rz CmRpZmYgLS1naXQgYS9XZWJzaXRlcy93ZWJraXQub3JnL3dwLWNvbnRlbnQvcGx1Z2lucy9zb2Np YWwtbWV0YS5waHAgYi9XZWJzaXRlcy93ZWJraXQub3JnL3dwLWNvbnRlbnQvcGx1Z2lucy9zb2Np YWwtbWV0YS5waHAKaW5kZXggYWZjNWJjZGQyZDE3MDA0MDMzMjMwYzg5ZGZlODM3OWUwMTIyNTdl OC4uMjA4YWE3NGVhNmVkMDIzNTZkZTNkODEyYTQ0Zjc4ZGQ1YTkyMzBlMyAxMDA2NDQKLS0tIGEv V2Vic2l0ZXMvd2Via2l0Lm9yZy93cC1jb250ZW50L3BsdWdpbnMvc29jaWFsLW1ldGEucGhwCisr KyBiL1dlYnNpdGVzL3dlYmtpdC5vcmcvd3AtY29udGVudC9wbHVnaW5zL3NvY2lhbC1tZXRhLnBo cApAQCAtMTIsMzcgKzEyLDU0IEBAIGFkZF9hY3Rpb24oJ3dwX2hlYWQnLCBmdW5jdGlvbigpIHsK ICAgICAkdGl0bGUgPSB0aGVfdGl0bGVfYXR0cmlidXRlKCdlY2hvPTAnKTsKICAgICAkZGVzY3Jp cHRpb24gPSBnZXRfdGhlX2V4Y2VycHQoKTsKICAgICAkdHlwZSA9ICdhcnRpY2xlJzsKLQorICAg ICR1cmwgPSBnZXRfdGhlX3Blcm1hbGluaygpOwogICAgICRjYXRlZ29yaWVzID0gYXJyYXkoKTsK ICAgICAkdGFncyA9IGFycmF5KCk7Ci0gICAgJGltYWdlX3VybCA9IGdldF9zdHlsZXNoZWV0X2Rp cmVjdG9yeV91cmkoKSAuICcvaW1hZ2VzL29naW1hZ2UucG5nJzsKICAgICAkdHdpdHRlcl9oYW5k bGUgPSAnJzsKICAgICAkcHVibGlzaGVkX3RpbWUgPSAnJzsKICAgICAkbW9kaWZpZWRfdGltZSA9 ICcnOwogCiAgICAgJGZiX2FkbWlucyA9IGFycmF5KAotICAgICAgICAnSm9uIERhdmlzJyA9PiAn MTA4NTA4ODg2NScsCi0gICAgICAgICdUaW0gSGF0Y2hlcicgPT4gJzg1NDU2NTMwNicKKyAgICAg ICAgJ0pvbiBEYXZpcycgPT4gJzEwODUwODg4NjUnCiAgICAgKTsKIAotICAgIGlmIChpc19mcm9u dF9wYWdlKCkgfHwgaXNfaG9tZSgpKSB7CisgICAgaWYgKGlzX2Zyb250X3BhZ2UoKSkgeyAvLyBM YW5kaW5nIHBhZ2UKICAgICAgICAgJHRpdGxlID0gZ2V0X2Jsb2dpbmZvKCduYW1lJyk7CiAgICAg ICAgICRkZXNjcmlwdGlvbiA9IGdldF9ibG9naW5mbygnZGVzY3JpcHRpb24nKTsKICAgICAgICAg JHR5cGUgPSAnd2Vic2l0ZSc7Ci0gICAgfQotCi0gICAgaWYgKGlzX3NpbmdsZSgpKSB7Ci0KKyAg ICB9IGVsc2VpZiAoaXNfaG9tZSgpKSB7IC8vIEJsb2cgInBhZ2UiCisgICAgICAgICR0aXRsZSA9 IGdldF9ibG9naW5mbygnbmFtZScpOworICAgICAgICAkZGVzY3JpcHRpb24gPSAiQSByZXBvc2l0 b3J5IG9mIGFsbCAiLmdldF9ibG9naW5mbygnbmFtZScpLiJibG9nIHBvc3RzLiI7CisgICAgICAg ICR0eXBlID0gJ3dlYnNpdGUnOworICAgICAgICAkdXJsID0gZ2V0X2hvbWVfdXJsKG51bGwsICcv YmxvZy8nKTsKKyAgICB9IGVsc2VpZiAoaXNfcG9zdF90eXBlX2FyY2hpdmUoKSkgeyAvLyBjdXN0 b20gcG9zdCB0eXBlIGFyY2hpdmUgInBhZ2UiCisgICAgICAgICRwb3N0X3R5cGUgPSBnZXRfcG9z dF90eXBlKCk7CisgICAgICAgICRwb3N0X3R5cGVfYXJjaGl2ZV91cmwgPSBnZXRfcG9zdF90eXBl X2FyY2hpdmVfbGluaygkcG9zdF90eXBlKTsKKyAgICAgICAgJHR5cGUgPSAnd2Vic2l0ZSc7Cisg ICAgICAgICR0aXRsZSA9IHBvc3RfdHlwZV9hcmNoaXZlX3RpdGxlKCcnLCBmYWxzZSk7CisgICAg ICAgICRwb3N0X3R5cGVfb2JqID0gZ2V0X3Bvc3RfdHlwZV9vYmplY3QoJHBvc3RfdHlwZSk7Cisg ICAgICAgIGlmIChpc3NldCgkcG9zdF90eXBlX29iai0+ZGVzY3JpcHRpb24pKQorICAgICAgICAg ICAgJGRlc2NyaXB0aW9uID0gJHBvc3RfdHlwZV9vYmotPmRlc2NyaXB0aW9uOworICAgICAgICBp ZiAoIWVtcHR5KCRwb3N0X3R5cGVfYXJjaGl2ZV91cmwpKQorICAgICAgICAgICAgJHVybCA9ICRw b3N0X3R5cGVfYXJjaGl2ZV91cmw7CisgICAgfSBlbHNlaWYgKGlzX2FyY2hpdmUoKSkgeyAvLyBh cmNoaXZlcyBhbmQgY2F0ZWdvcnkgInBhZ2VzIgorICAgICAgICAkdHlwZSA9ICd3ZWJzaXRlJzsK KyAgICAgICAgJHRpdGxlID0gZ2V0X2Jsb2dpbmZvKCduYW1lJykuIiBCbG9nICIuZ2V0X3RoZV9h cmNoaXZlX3RpdGxlKCk7CisgICAgICAgICRkZXNjcmlwdGlvbiA9ICJBIGNvbGxlY3Rpb24gb2Yg Ii5nZXRfYmxvZ2luZm8oJ25hbWUnKS4iIGJsb2cgcG9zdHMuIjsKKyAgICAgICAgaWYgKGlzX2Nh dGVnb3J5KCkpIHsKKyAgICAgICAgICAgICRjYXRlZ29yeV9vYmplY3RzID0gZ2V0X3RoZV9jYXRl Z29yeSgpOworICAgICAgICAgICAgaWYgKGlzc2V0KCRjYXRlZ29yeV9vYmplY3RzWzBdLT50ZXJt X2lkKSkKKyAgICAgICAgICAgICAgICAkdXJsID0gZ2V0X2NhdGVnb3J5X2xpbmsoJGNhdGVnb3J5 X29iamVjdHNbMF0tPnRlcm1faWQpOworICAgICAgICB9CisgICAgfSBlbHNlaWYgKGlzX3Npbmds ZSgpIHx8IGlzX3BhZ2UoKSkgeyAvLyBQb3N0cyBhbmQgUGFnZXMKICAgICAgICAgJHBvc3QgPSBn ZXRfcG9zdCgpOwotCi0gICAgICAgIGlmICggaGFzX3Bvc3RfdGh1bWJuYWlsKCkgKSB7Ci0gICAg ICAgICAgICAkaW1hZ2Vfc3JjID0gd3BfZ2V0X2F0dGFjaG1lbnRfaW1hZ2Vfc3JjKCBnZXRfcG9z dF90aHVtYm5haWxfaWQoJHBvc3RfaWQpLCAnbGFyZ2UnICk7CisgICAgICAgIGlmIChoYXNfcG9z dF90aHVtYm5haWwoKSkgeworICAgICAgICAgICAgJGltYWdlX3NyYyA9IHdwX2dldF9hdHRhY2ht ZW50X2ltYWdlX3NyYyhnZXRfcG9zdF90aHVtYm5haWxfaWQoJHBvc3RfaWQpLCAnbGFyZ2UnKTsK ICAgICAgICAgICAgICRpbWFnZV91cmwgPSAkaW1hZ2Vfc3JjWzBdOwotICAgICAgICB9IGVsc2Ug ewotICAgICAgICAgICAgcHJlZ19tYXRjaF9hbGwoJy88aW1nLitzcmM9W1wnIl0oW15cJyJdKylb XCciXS4qPi9pJywgJHBvc3QtPnBvc3RfY29udGVudCwgJG1hdGNoZXMpOwotICAgICAgICAgICAg aWYgKCRtYXRjaGVzWzFdWzBdKSAkaW1hZ2VfdXJsID0gJG1hdGNoZXNbMV1bMF07CisgICAgICAg IH0gZWxzZWlmIChpc19zaW5nbGUoKSkgeworICAgICAgICAgICAgcHJlZ19tYXRjaF9hbGwoJy88 aW1nLitzcmMoc2V0KT89W1wnIl0oW15cc1wnIl0rKS4qW1wnIl0uKj4vaScsICRwb3N0LT5wb3N0 X2NvbnRlbnQsICRtYXRjaGVzKTsKKyAgICAgICAgICAgIGlmIChpc3NldCgkbWF0Y2hlc1syXVsw XSkpICRpbWFnZV91cmwgPSAkbWF0Y2hlc1syXVswXTsKICAgICAgICAgfQotCiAgICAgICAgICRj YXRlZ29yaWVzID0gd3BfZ2V0X29iamVjdF90ZXJtcyhnZXRfdGhlX0lEKCksICdjYXRlZ29yeScs IGFycmF5KCdmaWVsZHMnID0+ICduYW1lcycpKTsKICAgICAgICAgJHRhZ3MgPSB3cF9nZXRfb2Jq ZWN0X3Rlcm1zKGdldF90aGVfSUQoKSwgJ3Bvc3RfdGFnJywgYXJyYXkoJ2ZpZWxkcycgPT4gJ25h bWVzJykpOwogCkBAIC01MSw3ICs2OCw2IEBAIGFkZF9hY3Rpb24oJ3dwX2hlYWQnLCBmdW5jdGlv bigpIHsKICAgICAgICAgJHB1Ymxpc2hlZF90aW1lID0gZ2V0X3RoZV90aW1lKCdjJyk7CiAgICAg ICAgICRtb2RpZmllZF90aW1lID0gZ2V0X3RoZV9tb2RpZmllZF9kYXRlKCdjJyk7CiAgICAgfQot CiA/PgogCiAgICAgPCEtLSBTY2hlbWEub3JnIG1hcmt1cCAtLT4KQEAgLTY0LDcgKzgwLDEwIEBA IGFkZF9hY3Rpb24oJ3dwX2hlYWQnLCBmdW5jdGlvbigpIHsKIDw/cGhwIGVuZGlmOyA/PgogCiAg ICAgPCEtLSBUd2l0dGVyIENhcmQgZGF0YSAtLT4KKzw/cGhwIGlmICgkaW1hZ2VfdXJsKTogLy8g VHdpdHRlciBzdW1tYXJ5IGNhcmQgd2l0aCBsYXJnZSBpbWFnZSBtdXN0IGJlIGF0IGxlYXN0IDI4 MHgxNTBweCA/PgogICAgIDxtZXRhIG5hbWU9InR3aXR0ZXI6Y2FyZCIgY29udGVudD0ic3VtbWFy eV9sYXJnZV9pbWFnZSI+CisgICAgPG1ldGEgbmFtZT0idHdpdHRlcjppbWFnZTpzcmMiIGNvbnRl bnQ9Ijw/cGhwIGVjaG8gZXNjX3VybCgkaW1hZ2VfdXJsKTsgPz4iPgorPD9waHAgZW5kaWY7ID8+ CiAgICAgPG1ldGEgbmFtZT0idHdpdHRlcjpzaXRlIiBjb250ZW50PSJAd2Via2l0Ij4KICAgICA8 bWV0YSBuYW1lPSJ0d2l0dGVyOnRpdGxlIiBjb250ZW50PSI8P3BocCBlY2hvIGVzY19hdHRyKCR0 aXRsZSk7ID8+Ij4KIDw/cGhwIGlmICgkZGVzY3JpcHRpb24pOiA/PgpAQCAtNzMsMTQgKzkyLDEx IEBAIGFkZF9hY3Rpb24oJ3dwX2hlYWQnLCBmdW5jdGlvbigpIHsKIDw/cGhwIGlmICgkdHdpdHRl cl9oYW5kbGUpOiA/PgogICAgIDxtZXRhIG5hbWU9InR3aXR0ZXI6Y3JlYXRvciIgY29udGVudD0i QDw/cGhwIGVjaG8gZXNjX2F0dHIoJHR3aXR0ZXJfaGFuZGxlKTsgPz4iPgogPD9waHAgZW5kaWY7 ID8+Ci08P3BocCBpZiAoJGltYWdlX3VybCk6IC8vIFR3aXR0ZXIgc3VtbWFyeSBjYXJkIHdpdGgg bGFyZ2UgaW1hZ2UgbXVzdCBiZSBhdCBsZWFzdCAyODB4MTUwcHggPz4KLSAgICA8bWV0YSBuYW1l PSJ0d2l0dGVyOmltYWdlOnNyYyIgY29udGVudD0iPD9waHAgZWNobyBlc2NfdXJsKCRpbWFnZV91 cmwpOyA/PiI+Ci08P3BocCBlbmRpZjsgPz4KIAogICAgIDwhLS0gT3BlbiBHcmFwaCBkYXRhIC0t PgogICAgIDxtZXRhIHByb3BlcnR5PSJvZzp0aXRsZSIgY29udGVudD0iPD9waHAgZWNobyBlc2Nf YXR0cigkdGl0bGUpOyA/PiI+CiAgICAgPG1ldGEgcHJvcGVydHk9Im9nOnR5cGUiIGNvbnRlbnQ9 Ijw/cGhwIGVjaG8gZXNjX2F0dHIoJHR5cGUpOyA/PiI+Ci0gICAgPG1ldGEgcHJvcGVydHk9Im9n OnVybCIgY29udGVudD0iPD9waHAgdGhlX3Blcm1hbGluaygpOyA/PiI+CisgICAgPG1ldGEgcHJv cGVydHk9Im9nOnVybCIgY29udGVudD0iPD9waHAgZWNobyBlc2NfdXJsKCR1cmwpOyA/PiI+CiA8 P3BocCBpZiAoJGltYWdlX3VybCk6ID8+CiAgICAgPG1ldGEgcHJvcGVydHk9Im9nOmltYWdlIiBj b250ZW50PSI8P3BocCBlY2hvIGVzY191cmwoJGltYWdlX3VybCk7ID8+Ij4KIDw/cGhwIGVuZGlm OyA/PgpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvd2Via2l0Lm9yZy93cC1jb250ZW50L3BsdWdpbnMv d2ViLWluc3BlY3Rvci1wYWdlcy5waHAgYi9XZWJzaXRlcy93ZWJraXQub3JnL3dwLWNvbnRlbnQv cGx1Z2lucy93ZWItaW5zcGVjdG9yLXBhZ2VzLnBocAppbmRleCAwYjVhMWM5NDczNmQwYzYzMzcz ZDBjODMzZmU4YWI0NDkyNzBhZjdjLi4yOWVlMTVlZmQ4YmJlMGNhYjIyOWQzNWFhMTgxYWVhMTQ2 NmVjNTM5IDEwMDY0NAotLS0gYS9XZWJzaXRlcy93ZWJraXQub3JnL3dwLWNvbnRlbnQvcGx1Z2lu cy93ZWItaW5zcGVjdG9yLXBhZ2VzLnBocAorKysgYi9XZWJzaXRlcy93ZWJraXQub3JnL3dwLWNv bnRlbnQvcGx1Z2lucy93ZWItaW5zcGVjdG9yLXBhZ2VzLnBocApAQCAtNjgsMTAgKzY4LDEwIEBA IHJlZ2lzdGVyX2FjdGl2YXRpb25faG9vayhfX0ZJTEVfXywgZnVuY3Rpb24gKCkgewogYWRkX2Fj dGlvbignaW5pdCcsIGZ1bmN0aW9uICgpIHsgICAgCiAgICAgcmVnaXN0ZXJfcG9zdF90eXBlKCd3 ZWJfaW5zcGVjdG9yX3BhZ2UnLCBhcnJheSgKICAgICAgICAgJ2xhYmVsJyAgICAgICAgICAgICAg ICAgPT4gJ1dlYiBJbnNwZWN0b3IgUGFnZScsCi0gICAgICAgICdkZXNjcmlwdGlvbicgICAgICAg ICAgID0+ICdSZWZlcmVuY2UgcGFnZXMgZm9yIFdlYiBJbnNwZWN0b3InLAorICAgICAgICAnZGVz Y3JpcHRpb24nICAgICAgICAgICA9PiAnUmVmZXJlbmNlIGRvY3VtZW50YXRpb24gZm9yIFdlYiBJ bnNwZWN0b3IuJywKICAgICAgICAgJ21lbnVfaWNvbicgICAgICAgICAgICAgPT4gJ2Rhc2hpY29u cy1tZWRpYS1kb2N1bWVudCcsCiAgICAgICAgICdsYWJlbHMnICAgICAgICAgICAgICAgID0+IGFy cmF5KAotICAgICAgICAgICAgJ25hbWUnICAgICAgICAgICAgICAgICAgPT4gJ1dlYiBJbnNwZWN0 b3IgUGFnZXMnLAorICAgICAgICAgICAgJ25hbWUnICAgICAgICAgICAgICAgICAgPT4gJ1dlYiBJ bnNwZWN0b3IgUmVmZXJlbmNlJywKICAgICAgICAgICAgICdzaW5ndWxhcl9uYW1lJyAgICAgICAg ID0+ICdXZWIgSW5zcGVjdG9yIFBhZ2UnLAogICAgICAgICAgICAgJ21lbnVfbmFtZScgICAgICAg ICAgICAgPT4gJ1dlYiBJbnNwZWN0b3IgUGFnZXMnLAogICAgICAgICAgICAgJ25hbWVfYWRtaW5f YmFyJyAgICAgICAgPT4gJ1dlYiBJbnNwZWN0b3IgUGFnZScsCkBAIC0xMzEsNyArMTMxLDcgQEAg YWRkX2FjdGlvbignaW5pdCcsIGZ1bmN0aW9uICgpIHsKICAgICAgICAgJ21hcF9tZXRhX2NhcCcg ICAgICAgICAgPT4gdHJ1ZSwKICAgICAgICAgJ3Nob3dfaW5fcmVzdCcgICAgICAgICAgPT4gdHJ1 ZQogICAgICkpOwotIAorCiAgICAgcmVnaXN0ZXJfdGF4b25vbXkoJ3dlYl9pbnNwZWN0b3JfdG9w aWNzJywgYXJyYXkoJ3dlYl9pbnNwZWN0b3JfcGFnZScpLCBhcnJheSgKICAgICAgICAgJ2xhYmVs cycgICAgICAgICAgICAgICAgICAgICA9PiBhcnJheSgKICAgICAgICAgICAgICduYW1lJyAgICAg ICAgICAgICAgICAgICAgICAgPT4gX3goJ1dlYiBJbnNwZWN0b3IgVG9waWNzJywgJ1RheG9ub215 IEdlbmVyYWwgTmFtZScpLApAQCAtMTY0LDQgKzE2NCw0IEBAIGFkZF9hY3Rpb24oJ2luaXQnLCBm dW5jdGlvbiAoKSB7CiAgICAgKSk7CiAKICAgICBhZGRfcG9zdF90eXBlX3N1cHBvcnQoJ3dlYl9p bnNwZWN0b3JfcGFnZScsICd3cGNvbS1tYXJrZG93bicpOwotfSk7Cit9KTsKXCBObyBuZXdsaW5l IGF0IGVuZCBvZiBmaWxlCg== 387950 2020-01-16 13:28:38 -0800 2020-01-16 14:26:50 -0800 Patch bug-206327-20200116132838.patch text/plain 7880 jond U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NzAzCmRpZmYgLS1naXQgYS9XZWJzaXRlcy93ZWJraXQu b3JnL0NoYW5nZUxvZyBiL1dlYnNpdGVzL3dlYmtpdC5vcmcvQ2hhbmdlTG9nCmluZGV4IDA0NGYy N2E1NmIyZjZjM2E0ZGFmOTY3NzNhNWRjZDlkMWE3NDg3NmYuLmMwOWJjMWU1NWY2OTM5YmM5ZDUy MDJhNjQ2Y2I2MjlhYWY1OTEzOWYgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3dlYmtpdC5vcmcvQ2hh bmdlTG9nCisrKyBiL1dlYnNpdGVzL3dlYmtpdC5vcmcvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMjAtMDEtMTUgIEpvbiBEYXZpcyAgPGpvbmRAYXBwbGUuY29tPgorCisgICAgICAgIEFk ZCBzdXBwb3J0IGZvciBjYXRlZ29yaWVzIGFuZCBjdXN0b20gcG9zdCB0eXBlcyB0byB0aGUgc29j aWFsIG1ldGEgcGx1Z2luCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDYzMjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHdwLWNvbnRlbnQvcGx1Z2lucy9zb2NpYWwtbWV0YS5waHA6CisgICAgICAgICog d3AtY29udGVudC9wbHVnaW5zL3dlYi1pbnNwZWN0b3ItcGFnZXMucGhwOgorICAgICAgICAqIHdw LWNvbnRlbnQvdGhlbWVzL3dlYmtpdC9hcmNoaXZlLXdlYl9pbnNwZWN0b3JfcGFnZS5waHA6CisK IDIwMjAtMDEtMTUgIEpvbiBEYXZpcyAgPGpvbmRAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBX ZWIgSW5zcGVjdG9yIFJlZmVyZW5jZSBub3RpY2UgdG8gV2ViIEluc3BlY3RvciBibG9nIHBvc3Rz CmRpZmYgLS1naXQgYS9XZWJzaXRlcy93ZWJraXQub3JnL3dwLWNvbnRlbnQvcGx1Z2lucy9zb2Np YWwtbWV0YS5waHAgYi9XZWJzaXRlcy93ZWJraXQub3JnL3dwLWNvbnRlbnQvcGx1Z2lucy9zb2Np YWwtbWV0YS5waHAKaW5kZXggYWZjNWJjZGQyZDE3MDA0MDMzMjMwYzg5ZGZlODM3OWUwMTIyNTdl OC4uMWRkNzI4YzM2ZDA3NjRiZDRhZjJhMGQyODk0OTYyYjM3OGQyMTNlMiAxMDA2NDQKLS0tIGEv V2Vic2l0ZXMvd2Via2l0Lm9yZy93cC1jb250ZW50L3BsdWdpbnMvc29jaWFsLW1ldGEucGhwCisr KyBiL1dlYnNpdGVzL3dlYmtpdC5vcmcvd3AtY29udGVudC9wbHVnaW5zL3NvY2lhbC1tZXRhLnBo cApAQCAtMTIsMzcgKzEyLDU5IEBAIGFkZF9hY3Rpb24oJ3dwX2hlYWQnLCBmdW5jdGlvbigpIHsK ICAgICAkdGl0bGUgPSB0aGVfdGl0bGVfYXR0cmlidXRlKCdlY2hvPTAnKTsKICAgICAkZGVzY3Jp cHRpb24gPSBnZXRfdGhlX2V4Y2VycHQoKTsKICAgICAkdHlwZSA9ICdhcnRpY2xlJzsKLQorICAg ICR1cmwgPSBnZXRfdGhlX3Blcm1hbGluaygpOwogICAgICRjYXRlZ29yaWVzID0gYXJyYXkoKTsK ICAgICAkdGFncyA9IGFycmF5KCk7Ci0gICAgJGltYWdlX3VybCA9IGdldF9zdHlsZXNoZWV0X2Rp cmVjdG9yeV91cmkoKSAuICcvaW1hZ2VzL29naW1hZ2UucG5nJzsKICAgICAkdHdpdHRlcl9oYW5k bGUgPSAnJzsKICAgICAkcHVibGlzaGVkX3RpbWUgPSAnJzsKICAgICAkbW9kaWZpZWRfdGltZSA9 ICcnOwogCiAgICAgJGZiX2FkbWlucyA9IGFycmF5KAotICAgICAgICAnSm9uIERhdmlzJyA9PiAn MTA4NTA4ODg2NScsCi0gICAgICAgICdUaW0gSGF0Y2hlcicgPT4gJzg1NDU2NTMwNicKKyAgICAg ICAgJ0pvbiBEYXZpcycgPT4gJzEwODUwODg4NjUnCiAgICAgKTsKIAotICAgIGlmIChpc19mcm9u dF9wYWdlKCkgfHwgaXNfaG9tZSgpKSB7CisgICAgaWYgKGlzX2Zyb250X3BhZ2UoKSkgeyAvLyBM YW5kaW5nIHBhZ2UKICAgICAgICAgJHRpdGxlID0gZ2V0X2Jsb2dpbmZvKCduYW1lJyk7CiAgICAg ICAgICRkZXNjcmlwdGlvbiA9IGdldF9ibG9naW5mbygnZGVzY3JpcHRpb24nKTsKICAgICAgICAg JHR5cGUgPSAnd2Vic2l0ZSc7Ci0gICAgfQotCi0gICAgaWYgKGlzX3NpbmdsZSgpKSB7Ci0KKyAg ICB9IGVsc2VpZiAoaXNfaG9tZSgpKSB7IC8vIEJsb2cgInBhZ2UiCisgICAgICAgICR0aXRsZSA9 IGdldF9ibG9naW5mbygnbmFtZScpOworICAgICAgICAkZGVzY3JpcHRpb24gPSAiQSBjb2xsZWN0 aW9uIG9mIGFsbCAiIC4gZ2V0X2Jsb2dpbmZvKCduYW1lJykgLiAiIGJsb2cgcG9zdHMuIjsKKyAg ICAgICAgJHR5cGUgPSAnd2Vic2l0ZSc7CisgICAgICAgICR1cmwgPSBnZXRfaG9tZV91cmwobnVs bCwgJy9ibG9nLycpOworICAgIH0gZWxzZWlmIChpc19wb3N0X3R5cGVfYXJjaGl2ZSgpKSB7IC8v IGN1c3RvbSBwb3N0IHR5cGUgYXJjaGl2ZSAicGFnZSIKKyAgICAgICAgJHBvc3RfdHlwZSA9IGdl dF9wb3N0X3R5cGUoKTsKKyAgICAgICAgJHBvc3RfdHlwZV9hcmNoaXZlX3VybCA9IGdldF9wb3N0 X3R5cGVfYXJjaGl2ZV9saW5rKCRwb3N0X3R5cGUpOworICAgICAgICAkdHlwZSA9ICd3ZWJzaXRl JzsKKyAgICAgICAgJHRpdGxlID0gcG9zdF90eXBlX2FyY2hpdmVfdGl0bGUoJycsIGZhbHNlKTsK KyAgICAgICAgJHBvc3RfdHlwZV9vYmogPSBnZXRfcG9zdF90eXBlX29iamVjdCgkcG9zdF90eXBl KTsKKyAgICAgICAgaWYgKGlzc2V0KCRwb3N0X3R5cGVfb2JqLT5kZXNjcmlwdGlvbikpCisgICAg ICAgICAgICAkZGVzY3JpcHRpb24gPSAkcG9zdF90eXBlX29iai0+ZGVzY3JpcHRpb247CisgICAg ICAgIGlmICghZW1wdHkoJHBvc3RfdHlwZV9hcmNoaXZlX3VybCkpCisgICAgICAgICAgICAkdXJs ID0gJHBvc3RfdHlwZV9hcmNoaXZlX3VybDsKKyAgICB9IGVsc2VpZiAoaXNfYXJjaGl2ZSgpKSB7 IC8vIGFyY2hpdmVzIGFuZCBjYXRlZ29yeSAicGFnZXMiCisgICAgICAgICR0eXBlID0gJ3dlYnNp dGUnOworICAgICAgICAkdGl0bGUgPSBnZXRfYmxvZ2luZm8oJ25hbWUnKS4iIEJsb2cgIi5nZXRf dGhlX2FyY2hpdmVfdGl0bGUoKTsKKyAgICAgICAgJGRlc2NyaXB0aW9uID0gIkEgY29sbGVjdGlv biBvZiAiIC4gZ2V0X2Jsb2dpbmZvKCduYW1lJykgLiAiIGJsb2cgcG9zdHMuIjsKKyAgICAgICAg aWYgKGlzX2NhdGVnb3J5KCkpIHsKKyAgICAgICAgICAgICRjYXRlZ29yeV9vYmplY3RzID0gZ2V0 X3RoZV9jYXRlZ29yeSgpOworICAgICAgICAgICAgaWYgKGlzc2V0KCRjYXRlZ29yeV9vYmplY3Rz WzBdLT50ZXJtX2lkKSkKKyAgICAgICAgICAgICAgICAkdXJsID0gZ2V0X2NhdGVnb3J5X2xpbmso JGNhdGVnb3J5X29iamVjdHNbMF0tPnRlcm1faWQpOworICAgICAgICB9CisgICAgfSBlbHNlaWYg KGlzX3NpbmdsZSgpIHx8IGlzX3BhZ2UoKSkgeyAvLyBQb3N0cyBhbmQgUGFnZXMKICAgICAgICAg JHBvc3QgPSBnZXRfcG9zdCgpOwotCi0gICAgICAgIGlmICggaGFzX3Bvc3RfdGh1bWJuYWlsKCkg KSB7Ci0gICAgICAgICAgICAkaW1hZ2Vfc3JjID0gd3BfZ2V0X2F0dGFjaG1lbnRfaW1hZ2Vfc3Jj KCBnZXRfcG9zdF90aHVtYm5haWxfaWQoJHBvc3RfaWQpLCAnbGFyZ2UnICk7Ci0gICAgICAgICAg ICAkaW1hZ2VfdXJsID0gJGltYWdlX3NyY1swXTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgIHByZWdfbWF0Y2hfYWxsKCcvPGltZy4rc3JjPVtcJyJdKFteXCciXSspW1wnIl0uKj4vaScs ICRwb3N0LT5wb3N0X2NvbnRlbnQsICRtYXRjaGVzKTsKLSAgICAgICAgICAgIGlmICgkbWF0Y2hl c1sxXVswXSkgJGltYWdlX3VybCA9ICRtYXRjaGVzWzFdWzBdOworICAgICAgICAkc29jaWFsX2lt YWdlX3VybCA9IGdldF9wb3N0X21ldGEoZ2V0X3RoZV9JRCgpLCAnb2ctaW1hZ2UtdXJsJywgdHJ1 ZSk7CisgICAgICAgIGlmICghZW1wdHkoJHNvY2lhbF9pbWFnZV91cmwpKSB7CisgICAgICAgICAg ICAkaW1hZ2VfdXJsID0gJHNvY2lhbF9pbWFnZV91cmw7CisgICAgICAgIH0gZWxzZWlmIChoYXNf cG9zdF90aHVtYm5haWwoKSkgeworICAgICAgICAgICAgJGltYWdlX3NyYyA9IHdwX2dldF9hdHRh Y2htZW50X2ltYWdlX3NyYyhnZXRfcG9zdF90aHVtYm5haWxfaWQoJHBvc3RfaWQpLCAnbGFyZ2Un KTsKKyAgICAgICAgICAgIGlmIChpc3NldCgkaW1hZ2Vfc3JjWzBdKSkKKyAgICAgICAgICAgICAg ICAkaW1hZ2VfdXJsID0gJGltYWdlX3NyY1swXTsKKyAgICAgICAgfSBlbHNlaWYgKGlzX3Npbmds ZSgpKSB7CisgICAgICAgICAgICBwcmVnX21hdGNoX2FsbCgnLzxpbWcuK3NyYyhzZXQpPz1bXCci XShbXlxzXCciXSspLipbXCciXS4qPi9pJywgJHBvc3QtPnBvc3RfY29udGVudCwgJG1hdGNoZXMp OworICAgICAgICAgICAgaWYgKGlzc2V0KCRtYXRjaGVzWzJdWzBdKSkKKyAgICAgICAgICAgICAg ICAkaW1hZ2VfdXJsID0gJG1hdGNoZXNbMl1bMF07CiAgICAgICAgIH0KLQogICAgICAgICAkY2F0 ZWdvcmllcyA9IHdwX2dldF9vYmplY3RfdGVybXMoZ2V0X3RoZV9JRCgpLCAnY2F0ZWdvcnknLCBh cnJheSgnZmllbGRzJyA9PiAnbmFtZXMnKSk7CiAgICAgICAgICR0YWdzID0gd3BfZ2V0X29iamVj dF90ZXJtcyhnZXRfdGhlX0lEKCksICdwb3N0X3RhZycsIGFycmF5KCdmaWVsZHMnID0+ICduYW1l cycpKTsKIApAQCAtNTEsNyArNzMsNiBAQCBhZGRfYWN0aW9uKCd3cF9oZWFkJywgZnVuY3Rpb24o KSB7CiAgICAgICAgICRwdWJsaXNoZWRfdGltZSA9IGdldF90aGVfdGltZSgnYycpOwogICAgICAg ICAkbW9kaWZpZWRfdGltZSA9IGdldF90aGVfbW9kaWZpZWRfZGF0ZSgnYycpOwogICAgIH0KLQog Pz4KIAogICAgIDwhLS0gU2NoZW1hLm9yZyBtYXJrdXAgLS0+CkBAIC02NCw3ICs4NSwxMCBAQCBh ZGRfYWN0aW9uKCd3cF9oZWFkJywgZnVuY3Rpb24oKSB7CiA8P3BocCBlbmRpZjsgPz4KIAogICAg IDwhLS0gVHdpdHRlciBDYXJkIGRhdGEgLS0+Cis8P3BocCBpZiAoJGltYWdlX3VybCk6IC8vIFR3 aXR0ZXIgc3VtbWFyeSBjYXJkIHdpdGggbGFyZ2UgaW1hZ2UgbXVzdCBiZSBhdCBsZWFzdCAyODB4 MTUwcHggPz4KICAgICA8bWV0YSBuYW1lPSJ0d2l0dGVyOmNhcmQiIGNvbnRlbnQ9InN1bW1hcnlf bGFyZ2VfaW1hZ2UiPgorICAgIDxtZXRhIG5hbWU9InR3aXR0ZXI6aW1hZ2U6c3JjIiBjb250ZW50 PSI8P3BocCBlY2hvIGVzY191cmwoJGltYWdlX3VybCk7ID8+Ij4KKzw/cGhwIGVuZGlmOyA/Pgog ICAgIDxtZXRhIG5hbWU9InR3aXR0ZXI6c2l0ZSIgY29udGVudD0iQHdlYmtpdCI+CiAgICAgPG1l dGEgbmFtZT0idHdpdHRlcjp0aXRsZSIgY29udGVudD0iPD9waHAgZWNobyBlc2NfYXR0cigkdGl0 bGUpOyA/PiI+CiA8P3BocCBpZiAoJGRlc2NyaXB0aW9uKTogPz4KQEAgLTczLDE0ICs5NywxMSBA QCBhZGRfYWN0aW9uKCd3cF9oZWFkJywgZnVuY3Rpb24oKSB7CiA8P3BocCBpZiAoJHR3aXR0ZXJf aGFuZGxlKTogPz4KICAgICA8bWV0YSBuYW1lPSJ0d2l0dGVyOmNyZWF0b3IiIGNvbnRlbnQ9IkA8 P3BocCBlY2hvIGVzY19hdHRyKCR0d2l0dGVyX2hhbmRsZSk7ID8+Ij4KIDw/cGhwIGVuZGlmOyA/ PgotPD9waHAgaWYgKCRpbWFnZV91cmwpOiAvLyBUd2l0dGVyIHN1bW1hcnkgY2FyZCB3aXRoIGxh cmdlIGltYWdlIG11c3QgYmUgYXQgbGVhc3QgMjgweDE1MHB4ID8+Ci0gICAgPG1ldGEgbmFtZT0i dHdpdHRlcjppbWFnZTpzcmMiIGNvbnRlbnQ9Ijw/cGhwIGVjaG8gZXNjX3VybCgkaW1hZ2VfdXJs KTsgPz4iPgotPD9waHAgZW5kaWY7ID8+CiAKICAgICA8IS0tIE9wZW4gR3JhcGggZGF0YSAtLT4K ICAgICA8bWV0YSBwcm9wZXJ0eT0ib2c6dGl0bGUiIGNvbnRlbnQ9Ijw/cGhwIGVjaG8gZXNjX2F0 dHIoJHRpdGxlKTsgPz4iPgogICAgIDxtZXRhIHByb3BlcnR5PSJvZzp0eXBlIiBjb250ZW50PSI8 P3BocCBlY2hvIGVzY19hdHRyKCR0eXBlKTsgPz4iPgotICAgIDxtZXRhIHByb3BlcnR5PSJvZzp1 cmwiIGNvbnRlbnQ9Ijw/cGhwIHRoZV9wZXJtYWxpbmsoKTsgPz4iPgorICAgIDxtZXRhIHByb3Bl cnR5PSJvZzp1cmwiIGNvbnRlbnQ9Ijw/cGhwIGVjaG8gZXNjX3VybCgkdXJsKTsgPz4iPgogPD9w aHAgaWYgKCRpbWFnZV91cmwpOiA/PgogICAgIDxtZXRhIHByb3BlcnR5PSJvZzppbWFnZSIgY29u dGVudD0iPD9waHAgZWNobyBlc2NfdXJsKCRpbWFnZV91cmwpOyA/PiI+CiA8P3BocCBlbmRpZjsg Pz4KZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3dlYmtpdC5vcmcvd3AtY29udGVudC9wbHVnaW5zL3dl Yi1pbnNwZWN0b3ItcGFnZXMucGhwIGIvV2Vic2l0ZXMvd2Via2l0Lm9yZy93cC1jb250ZW50L3Bs dWdpbnMvd2ViLWluc3BlY3Rvci1wYWdlcy5waHAKaW5kZXggY2I0NmI3N2NiY2YxNDI3MGVkNTg3 MzhmYTE2ODI4M2YxNTQ1NjkzOS4uY2M3MzczMThjYzI0NzdkZGY2NDkwNzg3NmRkYzJkNzhmY2M1 MTUxYyAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvd2Via2l0Lm9yZy93cC1jb250ZW50L3BsdWdpbnMv d2ViLWluc3BlY3Rvci1wYWdlcy5waHAKKysrIGIvV2Vic2l0ZXMvd2Via2l0Lm9yZy93cC1jb250 ZW50L3BsdWdpbnMvd2ViLWluc3BlY3Rvci1wYWdlcy5waHAKQEAgLTE4LDcgKzE4LDcgQEAgcmVn aXN0ZXJfYWN0aXZhdGlvbl9ob29rKF9fRklMRV9fLCBmdW5jdGlvbiAoKSB7CiAgICAgICAgICdk ZWxldGVfd2ViX2luc3BlY3Rvcl9wYWdlJyA9PiB0cnVlLAogICAgICAgICAnZGVsZXRlX3dlYl9p bnNwZWN0b3JfcGFnZXMnID0+IHRydWUsCiAgICAgICAgICdwdWJsaXNoX3dlYl9pbnNwZWN0b3Jf cGFnZXMnID0+IHRydWUsCi0gICAgICAgIAorCiAgICAgICAgIC8vIFN0YW5kYXJkIEVkaXRvciBD YXBhYmlsaXRpZXMKICAgICAgICAgJ2RlbGV0ZV9vdGhlcnNfcGFnZXMnID0+IHRydWUsCiAgICAg ICAgICdkZWxldGVfb3RoZXJzX3Bvc3RzJyA9PiB0cnVlLApAQCAtNjgsMTAgKzY4LDEwIEBAIHJl Z2lzdGVyX2FjdGl2YXRpb25faG9vayhfX0ZJTEVfXywgZnVuY3Rpb24gKCkgewogYWRkX2FjdGlv bignaW5pdCcsIGZ1bmN0aW9uICgpIHsgICAgCiAgICAgcmVnaXN0ZXJfcG9zdF90eXBlKCd3ZWJf aW5zcGVjdG9yX3BhZ2UnLCBhcnJheSgKICAgICAgICAgJ2xhYmVsJyAgICAgICAgICAgICAgICAg PT4gJ1dlYiBJbnNwZWN0b3IgUGFnZScsCi0gICAgICAgICdkZXNjcmlwdGlvbicgICAgICAgICAg ID0+ICdSZWZlcmVuY2UgcGFnZXMgZm9yIFdlYiBJbnNwZWN0b3InLAorICAgICAgICAnZGVzY3Jp cHRpb24nICAgICAgICAgICA9PiAnUmVmZXJlbmNlIGRvY3VtZW50YXRpb24gZm9yIFdlYiBJbnNw ZWN0b3IuJywKICAgICAgICAgJ21lbnVfaWNvbicgICAgICAgICAgICAgPT4gJ2Rhc2hpY29ucy1t ZWRpYS1kb2N1bWVudCcsCiAgICAgICAgICdsYWJlbHMnICAgICAgICAgICAgICAgID0+IGFycmF5 KAotICAgICAgICAgICAgJ25hbWUnICAgICAgICAgICAgICAgICAgPT4gJ1dlYiBJbnNwZWN0b3Ig UGFnZXMnLAorICAgICAgICAgICAgJ25hbWUnICAgICAgICAgICAgICAgICAgPT4gJ1dlYiBJbnNw ZWN0b3IgUmVmZXJlbmNlJywKICAgICAgICAgICAgICdzaW5ndWxhcl9uYW1lJyAgICAgICAgID0+ ICdXZWIgSW5zcGVjdG9yIFBhZ2UnLAogICAgICAgICAgICAgJ21lbnVfbmFtZScgICAgICAgICAg ICAgPT4gJ1dlYiBJbnNwZWN0b3IgUGFnZXMnLAogICAgICAgICAgICAgJ25hbWVfYWRtaW5fYmFy JyAgICAgICAgPT4gJ1dlYiBJbnNwZWN0b3IgUGFnZScsCkBAIC0xMzEsNyArMTMxLDcgQEAgYWRk X2FjdGlvbignaW5pdCcsIGZ1bmN0aW9uICgpIHsKICAgICAgICAgJ21hcF9tZXRhX2NhcCcgICAg ICAgICAgPT4gdHJ1ZSwKICAgICAgICAgJ3Nob3dfaW5fcmVzdCcgICAgICAgICAgPT4gdHJ1ZQog ICAgICkpOwotIAorCiAgICAgcmVnaXN0ZXJfdGF4b25vbXkoJ3dlYl9pbnNwZWN0b3JfdG9waWNz JywgYXJyYXkoJ3dlYl9pbnNwZWN0b3JfcGFnZScpLCBhcnJheSgKICAgICAgICAgJ2xhYmVscycg ICAgICAgICAgICAgICAgICAgICA9PiBhcnJheSgKICAgICAgICAgICAgICduYW1lJyAgICAgICAg ICAgICAgICAgICAgICAgPT4gX3goJ1dlYiBJbnNwZWN0b3IgVG9waWNzJywgJ1RheG9ub215IEdl bmVyYWwgTmFtZScpLAo=