5543 2010-07-01 12:46:00 -0700 Implement multilingual spec 2013-02-06 16:23:50 -0800 1 1 1 Unclassified PKP-LIB General 2.0 PC Linux RESOLVED FIXED P5 enhancement --- 1 alec alec jmacgreg juan.sieira pkp-support OCS 2.3.3 OHS 2.3.1 OJS 2.3.3 OMP 1.0 19901 alec 2010-07-01 12:46:11 -0700 Implement the multilingual spec. See <https://secure.marbletank.com/redmine/wiki/omp/Multilingual_Input>. In brief: 1. Language is specified on a per-submission basis based on those locales specified in the press setup, and the submission files are for that language only. 2. Translated metadata may be entered for each of those locales 3. If the actual work (e.g. article, book) has been translated, it is considered a brand new submission. 4. Users always by default enter information in the locale of the interface if the press accepts submission in that locale. 19902 3122 alec 2010-07-01 14:59:23 -0700 Created attachment 3122 Patch against OJS pre-2.3.2 CVS Step 1: move article primary locale into articles, instead of journals. 19903 alec 2010-07-01 15:23:03 -0700 Committed first part to OCS as well, http://github.com/pkp/ocs/commit/714ee6718303942886e2ed86ecb39f4b2ea4356a 19904 alec 2010-07-01 15:40:11 -0700 Also committed to OMP. The following statements will revive your installs. OJS --- UPDATE articles a, journals j SET a.locale = j.primary_locale WHERE a.journal_id = j.journal_id OCS --- UPDATE papers p, conferences c, sched_confs sc SET p.locale = c.primary_locale WHERE p.sched_conf_id = sc.sched_conf_id AND sc.conference_id = c.conference_id OMP --- UPDATE monographs m, presses p SET m.locale = p.primary_locale WHERE m.press_id = p.press_id 19908 alec 2010-07-02 11:01:25 -0700 *** Bug 5525 has been marked as a duplicate of this bug. *** 19926 3125 alec 2010-07-05 15:39:38 -0700 Created attachment 3125 Patch against OJS pre-2.3.2 CVS Step 2: Add "submissions" checkboxes to manager's languages interface; allow choice for authors in beginning of submission process. 19929 alec 2010-07-06 10:38:02 -0700 Implemented step 2 in all apps. You probably need to go to your language settings page and choose some submission languages. 20023 jmacgreg 2010-07-12 21:06:12 -0700 (In reply to comment #6) > Implemented step 2 in all apps. You probably need to go to your language > settings page and choose some submission languages. This step is a problem if you only have one language (eg. English) installed at the journal level -- the JM isn't shown the different checkboxes for the one languages, but it doesn't appear that the submissions option is enabled by default for one language only. Let me know if this should be filed as a separate bug, but I thought I'd put it here as this one is still open. 20033 alec 2010-07-13 09:16:05 -0700 James, I've just committed a change that should address your comment #7. 20034 jmacgreg 2010-07-13 09:36:00 -0700 (In reply to comment #8) > James, I've just committed a change that should address your comment #7. Hi Alec, I'm getting multiple strange/inconsistent behaviours with the language option now -- I'm going to investigate a little more thoroughly and post as a new bug if that's ok. 32917 juan.sieira 2013-01-16 02:54:01 -0800 I've got 2.3.7 version. If I want to submit in a language different from the primary locale, I can't. The system requires me to submit only in this primary language 32920 alec 2013-01-16 08:25:29 -0800 Juan, please post this at http://pkp.sfu.ca/support/forum -- it's the best place to go for this kind of support. 32921 alec 2013-01-16 08:26:24 -0800 James, is this entry still relevant? I suspect not. See e.g. comment #9. 3122 2010-07-01 14:59:00 -0700 2010-07-01 14:59:23 -0700 Patch against OJS pre-2.3.2 CVS 5543a.diff text/plain 19805 alec ZGlmZiAtLWdpdCBhL2NsYXNzZXMvYXJ0aWNsZS9BcnRpY2xlREFPLmluYy5waHAgYi9jbGFzc2Vz L2FydGljbGUvQXJ0aWNsZURBTy5pbmMucGhwCmluZGV4IDY1OTc2NzguLjQ0YzQyZjggMTAwNjQ0 Ci0tLSBhL2NsYXNzZXMvYXJ0aWNsZS9BcnRpY2xlREFPLmluYy5waHAKKysrIGIvY2xhc3Nlcy9h cnRpY2xlL0FydGljbGVEQU8uaW5jLnBocApAQCAtMTQwLDYgKzE0MCw3IEBAIGNsYXNzIEFydGlj bGVEQU8gZXh0ZW5kcyBEQU8gewogCSAqLwogCWZ1bmN0aW9uIF9hcnRpY2xlRnJvbVJvdygmJGFy dGljbGUsICYkcm93KSB7CiAJCSRhcnRpY2xlLT5zZXRJZCgkcm93WydhcnRpY2xlX2lkJ10pOwor CQkkYXJ0aWNsZS0+c2V0TG9jYWxlKCRyb3dbJ2xvY2FsZSddKTsKIAkJJGFydGljbGUtPnNldFVz ZXJJZCgkcm93Wyd1c2VyX2lkJ10pOwogCQkkYXJ0aWNsZS0+c2V0Sm91cm5hbElkKCRyb3dbJ2pv dXJuYWxfaWQnXSk7CiAJCSRhcnRpY2xlLT5zZXRTZWN0aW9uSWQoJHJvd1snc2VjdGlvbl9pZCdd KTsKQEAgLTE3OSwxMSArMTgwLDEyIEBAIGNsYXNzIEFydGljbGVEQU8gZXh0ZW5kcyBEQU8gewog CQkkYXJ0aWNsZS0+c3RhbXBNb2RpZmllZCgpOwogCQkkdGhpcy0+dXBkYXRlKAogCQkJc3ByaW50 ZignSU5TRVJUIElOVE8gYXJ0aWNsZXMKLQkJCQkodXNlcl9pZCwgam91cm5hbF9pZCwgc2VjdGlv bl9pZCwgbGFuZ3VhZ2UsIGNvbW1lbnRzX3RvX2VkLCBjaXRhdGlvbnMsIGRhdGVfc3VibWl0dGVk LCBkYXRlX3N0YXR1c19tb2RpZmllZCwgbGFzdF9tb2RpZmllZCwgc3RhdHVzLCBzdWJtaXNzaW9u X3Byb2dyZXNzLCBjdXJyZW50X3JvdW5kLCBzdWJtaXNzaW9uX2ZpbGVfaWQsIHJldmlzZWRfZmls ZV9pZCwgcmV2aWV3X2ZpbGVfaWQsIGVkaXRvcl9maWxlX2lkLCBwYWdlcywgZmFzdF90cmFja2Vk LCBoaWRlX2F1dGhvciwgY29tbWVudHNfc3RhdHVzKQorCQkJCShsb2NhbGUsIHVzZXJfaWQsIGpv dXJuYWxfaWQsIHNlY3Rpb25faWQsIGxhbmd1YWdlLCBjb21tZW50c190b19lZCwgY2l0YXRpb25z LCBkYXRlX3N1Ym1pdHRlZCwgZGF0ZV9zdGF0dXNfbW9kaWZpZWQsIGxhc3RfbW9kaWZpZWQsIHN0 YXR1cywgc3VibWlzc2lvbl9wcm9ncmVzcywgY3VycmVudF9yb3VuZCwgc3VibWlzc2lvbl9maWxl X2lkLCByZXZpc2VkX2ZpbGVfaWQsIHJldmlld19maWxlX2lkLCBlZGl0b3JfZmlsZV9pZCwgcGFn ZXMsIGZhc3RfdHJhY2tlZCwgaGlkZV9hdXRob3IsIGNvbW1lbnRzX3N0YXR1cykKIAkJCQlWQUxV RVMKLQkJCQkoPywgPywgPywgPywgPywgPywgJXMsICVzLCAlcywgPywgPywgPywgPywgPywgPywg PywgPywgPywgPywgPyknLAorCQkJCSg/LCA/LCA/LCA/LCA/LCA/LCA/LCAlcywgJXMsICVzLCA/ LCA/LCA/LCA/LCA/LCA/LCA/LCA/LCA/LCA/LCA/KScsCiAJCQkJJHRoaXMtPmRhdGV0aW1lVG9E QigkYXJ0aWNsZS0+Z2V0RGF0ZVN1Ym1pdHRlZCgpKSwgJHRoaXMtPmRhdGV0aW1lVG9EQigkYXJ0 aWNsZS0+Z2V0RGF0ZVN0YXR1c01vZGlmaWVkKCkpLCAkdGhpcy0+ZGF0ZXRpbWVUb0RCKCRhcnRp Y2xlLT5nZXRMYXN0TW9kaWZpZWQoKSkpLAogCQkJYXJyYXkoCisJCQkJJGFydGljbGUtPmdldExv Y2FsZSgpLAogCQkJCSRhcnRpY2xlLT5nZXRVc2VySWQoKSwKIAkJCQkkYXJ0aWNsZS0+Z2V0Sm91 cm5hbElkKCksCiAJCQkJJGFydGljbGUtPmdldFNlY3Rpb25JZCgpLApkaWZmIC0tZ2l0IGEvY2xh c3Nlcy9hcnRpY2xlL1B1Ymxpc2hlZEFydGljbGVEQU8uaW5jLnBocCBiL2NsYXNzZXMvYXJ0aWNs ZS9QdWJsaXNoZWRBcnRpY2xlREFPLmluYy5waHAKaW5kZXggN2U2MGM5YS4uMmY5Zjc1MyAxMDA2 NDQKLS0tIGEvY2xhc3Nlcy9hcnRpY2xlL1B1Ymxpc2hlZEFydGljbGVEQU8uaW5jLnBocAorKysg Yi9jbGFzc2VzL2FydGljbGUvUHVibGlzaGVkQXJ0aWNsZURBTy5pbmMucGhwCkBAIC00ODksNyAr NDg5LDcgQEAgY2xhc3MgUHVibGlzaGVkQXJ0aWNsZURBTyBleHRlbmRzIERBTyB7CiAJZnVuY3Rp b24gJmdldFB1Ymxpc2hlZEFydGljbGVJZHNBbHBoYWJldGl6ZWRCeUpvdXJuYWwoJGpvdXJuYWxJ ZCA9IG51bGwsICR1c2VDYWNoZSA9IHRydWUpIHsKIAkJJHBhcmFtcyA9IGFycmF5KAogCQkJJ2Ns ZWFuVGl0bGUnLCBMb2NhbGU6OmdldExvY2FsZSgpLAotCQkJJ2NsZWFuVGl0bGUnLCBMb2NhbGU6 OmdldFByaW1hcnlMb2NhbGUoKQorCQkJJ2NsZWFuVGl0bGUnCiAJCSk7CiAJCWlmIChpc3NldCgk am91cm5hbElkKSkgJHBhcmFtc1tdID0gJGpvdXJuYWxJZDsKIApAQCAtNTAzLDcgKzUwMyw3IEBA IGNsYXNzIFB1Ymxpc2hlZEFydGljbGVEQU8gZXh0ZW5kcyBEQU8gewogCQkJCWFydGljbGVzIGEK IAkJCQlMRUZUIEpPSU4gc2VjdGlvbnMgcyBPTiBzLnNlY3Rpb25faWQgPSBhLnNlY3Rpb25faWQK IAkJCQlMRUZUIEpPSU4gYXJ0aWNsZV9zZXR0aW5ncyBhdGwgT04gKGEuYXJ0aWNsZV9pZCA9IGF0 bC5hcnRpY2xlX2lkIEFORCBhdGwuc2V0dGluZ19uYW1lID0gPyBBTkQgYXRsLmxvY2FsZSA9ID8p Ci0JCQkJTEVGVCBKT0lOIGFydGljbGVfc2V0dGluZ3MgYXRwbCBPTiAoYS5hcnRpY2xlX2lkID0g YXRwbC5hcnRpY2xlX2lkIEFORCBhdHBsLnNldHRpbmdfbmFtZSA9ID8gQU5EIGF0cGwubG9jYWxl ID0gPykKKwkJCQlMRUZUIEpPSU4gYXJ0aWNsZV9zZXR0aW5ncyBhdHBsIE9OIChhLmFydGljbGVf aWQgPSBhdHBsLmFydGljbGVfaWQgQU5EIGF0cGwuc2V0dGluZ19uYW1lID0gPyBBTkQgYXRwbC5s b2NhbGUgPSBhLmxvY2FsZSkKIAkJCVdIRVJFCXBhLmFydGljbGVfaWQgPSBhLmFydGljbGVfaWQK IAkJCQlBTkQgaS5pc3N1ZV9pZCA9IHBhLmlzc3VlX2lkCiAJCQkJQU5EIGkucHVibGlzaGVkID0g MQpkaWZmIC0tZ2l0IGEvY2xhc3Nlcy9hdXRob3IvZm9ybS9zdWJtaXQvQXV0aG9yU3VibWl0U3Rl cDFGb3JtLmluYy5waHAgYi9jbGFzc2VzL2F1dGhvci9mb3JtL3N1Ym1pdC9BdXRob3JTdWJtaXRT dGVwMUZvcm0uaW5jLnBocAppbmRleCA3MzQyN2U1Li5kMmNmNTE1IDEwMDY0NAotLS0gYS9jbGFz c2VzL2F1dGhvci9mb3JtL3N1Ym1pdC9BdXRob3JTdWJtaXRTdGVwMUZvcm0uaW5jLnBocAorKysg Yi9jbGFzc2VzL2F1dGhvci9mb3JtL3N1Ym1pdC9BdXRob3JTdWJtaXRTdGVwMUZvcm0uaW5jLnBo cApAQCAtMTEzLDYgKzExMyw3IEBAIGNsYXNzIEF1dGhvclN1Ym1pdFN0ZXAxRm9ybSBleHRlbmRz IEF1dGhvclN1Ym1pdEZvcm0gewogCQkJJHVzZXIgPSYgUmVxdWVzdDo6Z2V0VXNlcigpOwogCiAJ CQkkdGhpcy0+YXJ0aWNsZSA9IG5ldyBBcnRpY2xlKCk7CisJCQkkdGhpcy0+YXJ0aWNsZS0+c2V0 TG9jYWxlKExvY2FsZTo6Z2V0TG9jYWxlKCkpOyAvLyBGSVhNRSBpbiBidWcgIzU1NDMKIAkJCSR0 aGlzLT5hcnRpY2xlLT5zZXRVc2VySWQoJHVzZXItPmdldElkKCkpOwogCQkJJHRoaXMtPmFydGlj bGUtPnNldEpvdXJuYWxJZCgkam91cm5hbC0+Z2V0SWQoKSk7CiAJCQkkdGhpcy0+YXJ0aWNsZS0+ c2V0U2VjdGlvbklkKCR0aGlzLT5nZXREYXRhKCdzZWN0aW9uSWQnKSk7CmRpZmYgLS1naXQgYS9j bGFzc2VzL3N1Ym1pc3Npb24vYXV0aG9yL0F1dGhvclN1Ym1pc3Npb25EQU8uaW5jLnBocCBiL2Ns YXNzZXMvc3VibWlzc2lvbi9hdXRob3IvQXV0aG9yU3VibWlzc2lvbkRBTy5pbmMucGhwCmluZGV4 IDhkZWQ1M2YuLmM0MWFhMmUgMTAwNjQ0Ci0tLSBhL2NsYXNzZXMvc3VibWlzc2lvbi9hdXRob3Iv QXV0aG9yU3VibWlzc2lvbkRBTy5pbmMucGhwCisrKyBiL2NsYXNzZXMvc3VibWlzc2lvbi9hdXRo b3IvQXV0aG9yU3VibWlzc2lvbkRBTy5pbmMucGhwCkBAIC0xNzgsNyArMTc4LDcgQEAgY2xhc3Mg QXV0aG9yU3VibWlzc2lvbkRBTyBleHRlbmRzIERBTyB7CiAJCQkJQ09BTEVTQ0Uoc2FsLnNldHRp bmdfdmFsdWUsIHNhcGwuc2V0dGluZ192YWx1ZSkgQVMgc2VjdGlvbl9hYmJyZXYKIAkJCUZST00J YXJ0aWNsZXMgYQogCQkJCUxFRlQgSk9JTiBhdXRob3JzIGFhIE9OIChhYS5zdWJtaXNzaW9uX2lk ID0gYS5hcnRpY2xlX2lkIEFORCBhYS5wcmltYXJ5X2NvbnRhY3QgPSAxKQotCQkJCUxFRlQgSk9J TiBhcnRpY2xlX3NldHRpbmdzIGF0cGwgT04gKGF0cGwuYXJ0aWNsZV9pZCA9IGEuYXJ0aWNsZV9p ZCBBTkQgYXRwbC5zZXR0aW5nX25hbWUgPSA/IEFORCBhdHBsLmxvY2FsZSA9ID8pCisJCQkJTEVG VCBKT0lOIGFydGljbGVfc2V0dGluZ3MgYXRwbCBPTiAoYXRwbC5hcnRpY2xlX2lkID0gYS5hcnRp Y2xlX2lkIEFORCBhdHBsLnNldHRpbmdfbmFtZSA9ID8gQU5EIGF0cGwubG9jYWxlID0gYS5sb2Nh bGUpCiAJCQkJTEVGVCBKT0lOIGFydGljbGVfc2V0dGluZ3MgYXRsIE9OIChhdGwuYXJ0aWNsZV9p ZCA9IGEuYXJ0aWNsZV9pZCBBTkQgYXRsLnNldHRpbmdfbmFtZSA9ID8gQU5EIGF0bC5sb2NhbGUg PSA/KQogCQkJCUxFRlQgSk9JTiBzZWN0aW9ucyBzIE9OIChzLnNlY3Rpb25faWQgPSBhLnNlY3Rp b25faWQpCiAJCQkJTEVGVCBKT0lOIHNlY3Rpb25fc2V0dGluZ3Mgc3RwbCBPTiAocy5zZWN0aW9u X2lkID0gc3RwbC5zZWN0aW9uX2lkIEFORCBzdHBsLnNldHRpbmdfbmFtZSA9ID8gQU5EIHN0cGwu bG9jYWxlID0gPykKQEAgLTE5MSw3ICsxOTEsNiBAQCBjbGFzcyBBdXRob3JTdWJtaXNzaW9uREFP IGV4dGVuZHMgREFPIHsKIAkJCWFycmF5KAogCQkJCSRsb2NhbGUsCiAJCQkJJ2NsZWFuVGl0bGUn LAotCQkJCSRwcmltYXJ5TG9jYWxlLAogCQkJCSdjbGVhblRpdGxlJywKIAkJCQkkbG9jYWxlLAog CQkJCSd0aXRsZScsCmRpZmYgLS1naXQgYS9jbGFzc2VzL3N1Ym1pc3Npb24vY29weWVkaXRvci9D b3B5ZWRpdG9yU3VibWlzc2lvbkRBTy5pbmMucGhwIGIvY2xhc3Nlcy9zdWJtaXNzaW9uL2NvcHll ZGl0b3IvQ29weWVkaXRvclN1Ym1pc3Npb25EQU8uaW5jLnBocAppbmRleCA5ZjkzODM5Li5mZDRk YWVjIDEwMDY0NAotLS0gYS9jbGFzc2VzL3N1Ym1pc3Npb24vY29weWVkaXRvci9Db3B5ZWRpdG9y U3VibWlzc2lvbkRBTy5pbmMucGhwCisrKyBiL2NsYXNzZXMvc3VibWlzc2lvbi9jb3B5ZWRpdG9y L0NvcHllZGl0b3JTdWJtaXNzaW9uREFPLmluYy5waHAKQEAgLTE0NCw3ICsxNDQsNiBAQCBjbGFz cyBDb3B5ZWRpdG9yU3VibWlzc2lvbkRBTyBleHRlbmRzIERBTyB7CiAJCQknYWJicmV2JywKIAkJ CSRsb2NhbGUsCiAJCQknY2xlYW5UaXRsZScsIC8vIEFydGljbGUgdGl0bGUKLQkJCSRwcmltYXJ5 TG9jYWxlLAogCQkJJ2NsZWFuVGl0bGUnLCAvLyBBcnRpY2xlIHRpdGxlCiAJCQkkbG9jYWxlLAog CQkJQVNTT0NfVFlQRV9BUlRJQ0xFLApAQCAtMjYzLDcgKzI2Miw3IEBAIGNsYXNzIENvcHllZGl0 b3JTdWJtaXNzaW9uREFPIGV4dGVuZHMgREFPIHsKIAkJCQlMRUZUIEpPSU4gc2VjdGlvbl9zZXR0 aW5ncyBzdGwgT04gKHMuc2VjdGlvbl9pZCA9IHN0bC5zZWN0aW9uX2lkIEFORCBzdGwuc2V0dGlu Z19uYW1lID0gPyBBTkQgc3RsLmxvY2FsZSA9ID8pCiAJCQkJTEVGVCBKT0lOIHNlY3Rpb25fc2V0 dGluZ3Mgc2FwbCBPTiAocy5zZWN0aW9uX2lkID0gc2FwbC5zZWN0aW9uX2lkIEFORCBzYXBsLnNl dHRpbmdfbmFtZSA9ID8gQU5EIHNhcGwubG9jYWxlID0gPykKIAkJCQlMRUZUIEpPSU4gc2VjdGlv bl9zZXR0aW5ncyBzYWwgT04gKHMuc2VjdGlvbl9pZCA9IHNhbC5zZWN0aW9uX2lkIEFORCBzYWwu c2V0dGluZ19uYW1lID0gPyBBTkQgc2FsLmxvY2FsZSA9ID8pCi0JCQkJTEVGVCBKT0lOIGFydGlj bGVfc2V0dGluZ3MgYXRwbCBPTiAoYXRwbC5hcnRpY2xlX2lkID0gYS5hcnRpY2xlX2lkIEFORCBh dHBsLnNldHRpbmdfbmFtZSA9ID8gQU5EIGF0cGwubG9jYWxlID0gPykKKwkJCQlMRUZUIEpPSU4g YXJ0aWNsZV9zZXR0aW5ncyBhdHBsIE9OIChhdHBsLmFydGljbGVfaWQgPSBhLmFydGljbGVfaWQg QU5EIGF0cGwuc2V0dGluZ19uYW1lID0gPyBBTkQgYXRwbC5sb2NhbGUgPSBhLmxvY2FsZSkKIAkJ CQlMRUZUIEpPSU4gYXJ0aWNsZV9zZXR0aW5ncyBhdGwgT04gKGEuYXJ0aWNsZV9pZCA9IGF0bC5h cnRpY2xlX2lkIEFORCBhdGwuc2V0dGluZ19uYW1lID0gPyBBTkQgYXRsLmxvY2FsZSA9ID8pCiAJ CQkJTEVGVCBKT0lOIHNpZ25vZmZzIHNjcGYgT04gKGEuYXJ0aWNsZV9pZCA9IHNjcGYuYXNzb2Nf aWQgQU5EIHNjcGYuYXNzb2NfdHlwZSA9ID8gQU5EIHNjcGYuc3ltYm9saWMgPSA/KQogCQkJCUxF RlQgSk9JTiBzaWdub2ZmcyBzbGUgT04gKGEuYXJ0aWNsZV9pZCA9IHNsZS5hc3NvY19pZCBBTkQg c2xlLmFzc29jX3R5cGUgPSA/IEFORCBzbGUuc3ltYm9saWMgPSA/KQpkaWZmIC0tZ2l0IGEvY2xh c3Nlcy9zdWJtaXNzaW9uL2VkaXRvci9FZGl0b3JTdWJtaXNzaW9uREFPLmluYy5waHAgYi9jbGFz c2VzL3N1Ym1pc3Npb24vZWRpdG9yL0VkaXRvclN1Ym1pc3Npb25EQU8uaW5jLnBocAppbmRleCBl MDA3ZjU2Li42NDU0OWI2IDEwMDY0NAotLS0gYS9jbGFzc2VzL3N1Ym1pc3Npb24vZWRpdG9yL0Vk aXRvclN1Ym1pc3Npb25EQU8uaW5jLnBocAorKysgYi9jbGFzc2VzL3N1Ym1pc3Npb24vZWRpdG9y L0VkaXRvclN1Ym1pc3Npb25EQU8uaW5jLnBocApAQCAtMTk3LDcgKzE5Nyw2IEBAIGNsYXNzIEVk aXRvclN1Ym1pc3Npb25EQU8gZXh0ZW5kcyBEQU8gewogCQkJJ2FiYnJldicsCiAJCQkkbG9jYWxl LAogCQkJJ2NsZWFuVGl0bGUnLCAvLyBBcnRpY2xlIHRpdGxlCi0JCQkkcHJpbWFyeUxvY2FsZSwK IAkJCSdjbGVhblRpdGxlJywKIAkJCSRsb2NhbGUsCiAJCQkkam91cm5hbElkCkBAIC0yOTgsNyAr Mjk3LDcgQEAgY2xhc3MgRWRpdG9yU3VibWlzc2lvbkRBTyBleHRlbmRzIERBTyB7CiAJCQkJTEVG VCBKT0lOIHNlY3Rpb25fc2V0dGluZ3Mgc3RsIE9OIChzLnNlY3Rpb25faWQgPSBzdGwuc2VjdGlv bl9pZCBBTkQgc3RsLnNldHRpbmdfbmFtZSA9ID8gQU5EIHN0bC5sb2NhbGUgPSA/KQogCQkJCUxF RlQgSk9JTiBzZWN0aW9uX3NldHRpbmdzIHNhcGwgT04gKHMuc2VjdGlvbl9pZCA9IHNhcGwuc2Vj dGlvbl9pZCBBTkQgc2FwbC5zZXR0aW5nX25hbWUgPSA/IEFORCBzYXBsLmxvY2FsZSA9ID8pCiAJ CQkJTEVGVCBKT0lOIHNlY3Rpb25fc2V0dGluZ3Mgc2FsIE9OIChzLnNlY3Rpb25faWQgPSBzYWwu c2VjdGlvbl9pZCBBTkQgc2FsLnNldHRpbmdfbmFtZSA9ID8gQU5EIHNhbC5sb2NhbGUgPSA/KQot CQkJCUxFRlQgSk9JTiBhcnRpY2xlX3NldHRpbmdzIGF0cGwgT04gKGEuYXJ0aWNsZV9pZCA9IGF0 cGwuYXJ0aWNsZV9pZCBBTkQgYXRwbC5zZXR0aW5nX25hbWUgPSA/IEFORCBhdHBsLmxvY2FsZSA9 ID8pCisJCQkJTEVGVCBKT0lOIGFydGljbGVfc2V0dGluZ3MgYXRwbCBPTiAoYS5hcnRpY2xlX2lk ID0gYXRwbC5hcnRpY2xlX2lkIEFORCBhdHBsLnNldHRpbmdfbmFtZSA9ID8gQU5EIGF0cGwubG9j YWxlID0gYS5sb2NhbGUpCiAJCQkJTEVGVCBKT0lOIGFydGljbGVfc2V0dGluZ3MgYXRsIE9OIChh LmFydGljbGVfaWQgPSBhdGwuYXJ0aWNsZV9pZCBBTkQgYXRsLnNldHRpbmdfbmFtZSA9ID8gQU5E IGF0bC5sb2NhbGUgPSA/KQogCQkJCUxFRlQgSk9JTiBlZGl0X2Fzc2lnbm1lbnRzIGVhIE9OIChh LmFydGljbGVfaWQgPSBlYS5hcnRpY2xlX2lkKQogCQkJCUxFRlQgSk9JTiBlZGl0X2Fzc2lnbm1l bnRzIGVhMiBPTiAoYS5hcnRpY2xlX2lkID0gZWEyLmFydGljbGVfaWQgQU5EIGVhLmVkaXRfaWQg PCBlYTIuZWRpdF9pZCkKZGlmZiAtLWdpdCBhL2NsYXNzZXMvc3VibWlzc2lvbi9sYXlvdXRFZGl0 b3IvTGF5b3V0RWRpdG9yU3VibWlzc2lvbkRBTy5pbmMucGhwIGIvY2xhc3Nlcy9zdWJtaXNzaW9u L2xheW91dEVkaXRvci9MYXlvdXRFZGl0b3JTdWJtaXNzaW9uREFPLmluYy5waHAKaW5kZXggMGVm YWQ4Zi4uYzBlOWQ4ZCAxMDA2NDQKLS0tIGEvY2xhc3Nlcy9zdWJtaXNzaW9uL2xheW91dEVkaXRv ci9MYXlvdXRFZGl0b3JTdWJtaXNzaW9uREFPLmluYy5waHAKKysrIGIvY2xhc3Nlcy9zdWJtaXNz aW9uL2xheW91dEVkaXRvci9MYXlvdXRFZGl0b3JTdWJtaXNzaW9uREFPLmluYy5waHAKQEAgLTEy OSwxNiArMTI5LDE1IEBAIGNsYXNzIExheW91dEVkaXRvclN1Ym1pc3Npb25EQU8gZXh0ZW5kcyBE QU8gewogCQkkcHJpbWFyeUxvY2FsZSA9IExvY2FsZTo6Z2V0UHJpbWFyeUxvY2FsZSgpOwogCQkk bG9jYWxlID0gTG9jYWxlOjpnZXRMb2NhbGUoKTsKIAkJJHBhcmFtcyA9IGFycmF5KAotCQkJJ3Rp dGxlJywKKwkJCSd0aXRsZScsIC8vIFNlY3Rpb24gdGl0bGUKIAkJCSRwcmltYXJ5TG9jYWxlLAog CQkJJ3RpdGxlJywKIAkJCSRsb2NhbGUsCi0JCQknYWJicmV2JywKKwkJCSdhYmJyZXYnLCAvLyBT ZWN0aW9uIGFiYnJldi4KIAkJCSRwcmltYXJ5TG9jYWxlLAogCQkJJ2FiYnJldicsCiAJCQkkbG9j YWxlLAotCQkJJ2NsZWFuVGl0bGUnLAotCQkJJHByaW1hcnlMb2NhbGUsCisJCQknY2xlYW5UaXRs ZScsIC8vIEFydGljbGUgdGl0bGUKIAkJCSdjbGVhblRpdGxlJywKIAkJCSRsb2NhbGUsCiAJCQlB U1NPQ19UWVBFX0FSVElDTEUsCkBAIC0yNTYsNyArMjU1LDcgQEAgY2xhc3MgTGF5b3V0RWRpdG9y U3VibWlzc2lvbkRBTyBleHRlbmRzIERBTyB7CiAJCQkJTEVGVCBKT0lOIHNlY3Rpb25fc2V0dGlu Z3Mgc3RsIE9OIChzLnNlY3Rpb25faWQgPSBzdGwuc2VjdGlvbl9pZCBBTkQgc3RsLnNldHRpbmdf bmFtZSA9ID8gQU5EIHN0bC5sb2NhbGUgPSA/KQogCQkJCUxFRlQgSk9JTiBzZWN0aW9uX3NldHRp bmdzIHNhcGwgT04gKHMuc2VjdGlvbl9pZCA9IHNhcGwuc2VjdGlvbl9pZCBBTkQgc2FwbC5zZXR0 aW5nX25hbWUgPSA/IEFORCBzYXBsLmxvY2FsZSA9ID8pCiAJCQkJTEVGVCBKT0lOIHNlY3Rpb25f c2V0dGluZ3Mgc2FsIE9OIChzLnNlY3Rpb25faWQgPSBzYWwuc2VjdGlvbl9pZCBBTkQgc2FsLnNl dHRpbmdfbmFtZSA9ID8gQU5EIHNhbC5sb2NhbGUgPSA/KQotCQkJCUxFRlQgSk9JTiBhcnRpY2xl X3NldHRpbmdzIGF0cGwgT04gKGF0cGwuYXJ0aWNsZV9pZCA9IGEuYXJ0aWNsZV9pZCBBTkQgYXRw bC5zZXR0aW5nX25hbWUgPSA/IEFORCBhdHBsLmxvY2FsZSA9ID8pCisJCQkJTEVGVCBKT0lOIGFy dGljbGVfc2V0dGluZ3MgYXRwbCBPTiAoYXRwbC5hcnRpY2xlX2lkID0gYS5hcnRpY2xlX2lkIEFO RCBhdHBsLnNldHRpbmdfbmFtZSA9ID8gQU5EIGF0cGwubG9jYWxlID0gYS5sb2NhbGUpCiAJCQkJ TEVGVCBKT0lOIGFydGljbGVfc2V0dGluZ3MgYXRsIE9OIChhLmFydGljbGVfaWQgPSBhdGwuYXJ0 aWNsZV9pZCBBTkQgYXRsLnNldHRpbmdfbmFtZSA9ID8gQU5EIGF0bC5sb2NhbGUgPSA/KQogCQkJ CUxFRlQgSk9JTiBzaWdub2ZmcyBzY3BmIE9OIChhLmFydGljbGVfaWQgPSBzY3BmLmFzc29jX2lk IEFORCBzY3BmLmFzc29jX3R5cGUgPSA/IEFORCBzY3BmLnN5bWJvbGljID0gPykKIAkJCQlMRUZU IEpPSU4gc2lnbm9mZnMgc2xlIE9OIChhLmFydGljbGVfaWQgPSBzbGUuYXNzb2NfaWQgQU5EIHNs ZS5hc3NvY190eXBlID0gPyBBTkQgc2xlLnN5bWJvbGljID0gPykKZGlmZiAtLWdpdCBhL2NsYXNz ZXMvc3VibWlzc2lvbi9wcm9vZnJlYWRlci9Qcm9vZnJlYWRlclN1Ym1pc3Npb25EQU8uaW5jLnBo cCBiL2NsYXNzZXMvc3VibWlzc2lvbi9wcm9vZnJlYWRlci9Qcm9vZnJlYWRlclN1Ym1pc3Npb25E QU8uaW5jLnBocAppbmRleCBiMjFjOTM4Li5hNjUzMzdiIDEwMDY0NAotLS0gYS9jbGFzc2VzL3N1 Ym1pc3Npb24vcHJvb2ZyZWFkZXIvUHJvb2ZyZWFkZXJTdWJtaXNzaW9uREFPLmluYy5waHAKKysr IGIvY2xhc3Nlcy9zdWJtaXNzaW9uL3Byb29mcmVhZGVyL1Byb29mcmVhZGVyU3VibWlzc2lvbkRB Ty5pbmMucGhwCkBAIC0xMzEsMTYgKzEzMSwxNSBAQCBjbGFzcyBQcm9vZnJlYWRlclN1Ym1pc3Np b25EQU8gZXh0ZW5kcyBEQU8gewogCQkkbG9jYWxlID0gTG9jYWxlOjpnZXRMb2NhbGUoKTsKIAog CQkkcGFyYW1zID0gYXJyYXkoCi0JCQkndGl0bGUnLAorCQkJJ3RpdGxlJywgLy8gU2VjdGlvbiB0 aXRsZQogCQkJJHByaW1hcnlMb2NhbGUsCiAJCQkndGl0bGUnLAogCQkJJGxvY2FsZSwKLQkJCSdh YmJyZXYnLAorCQkJJ2FiYnJldicsIC8vIFNlY3Rpb24gYWJicmV2LgogCQkJJHByaW1hcnlMb2Nh bGUsCiAJCQknYWJicmV2JywKIAkJCSRsb2NhbGUsCi0JCQknY2xlYW5UaXRsZScsCi0JCQkkcHJp bWFyeUxvY2FsZSwKKwkJCSdjbGVhblRpdGxlJywgLy8gQXJ0aWNsZSB0aXRsZQogCQkJJ2NsZWFu VGl0bGUnLAogCQkJJGxvY2FsZSwKIAkJCUFTU09DX1RZUEVfQVJUSUNMRSwgCkBAIC0yNTcsNyAr MjU2LDcgQEAgY2xhc3MgUHJvb2ZyZWFkZXJTdWJtaXNzaW9uREFPIGV4dGVuZHMgREFPIHsKIAkJ CQlMRUZUIEpPSU4gc2VjdGlvbl9zZXR0aW5ncyBzdGwgT04gKHMuc2VjdGlvbl9pZCA9IHN0bC5z ZWN0aW9uX2lkIEFORCBzdGwuc2V0dGluZ19uYW1lID0gPyBBTkQgc3RsLmxvY2FsZSA9ID8pCiAJ CQkJTEVGVCBKT0lOIHNlY3Rpb25fc2V0dGluZ3Mgc2FwbCBPTiAocy5zZWN0aW9uX2lkID0gc2Fw bC5zZWN0aW9uX2lkIEFORCBzYXBsLnNldHRpbmdfbmFtZSA9ID8gQU5EIHNhcGwubG9jYWxlID0g PykKIAkJCQlMRUZUIEpPSU4gc2VjdGlvbl9zZXR0aW5ncyBzYWwgT04gKHMuc2VjdGlvbl9pZCA9 IHNhbC5zZWN0aW9uX2lkIEFORCBzYWwuc2V0dGluZ19uYW1lID0gPyBBTkQgc2FsLmxvY2FsZSA9 ID8pCi0JCQkJTEVGVCBKT0lOIGFydGljbGVfc2V0dGluZ3MgYXRwbCBPTiAoYXRwbC5hcnRpY2xl X2lkID0gYS5hcnRpY2xlX2lkIEFORCBhdHBsLnNldHRpbmdfbmFtZSA9ID8gQU5EIGF0cGwubG9j YWxlID0gPykKKwkJCQlMRUZUIEpPSU4gYXJ0aWNsZV9zZXR0aW5ncyBhdHBsIE9OIChhdHBsLmFy dGljbGVfaWQgPSBhLmFydGljbGVfaWQgQU5EIGF0cGwuc2V0dGluZ19uYW1lID0gPyBBTkQgYXRw bC5sb2NhbGUgPSBhLmxvY2FsZSkKIAkJCQlMRUZUIEpPSU4gYXJ0aWNsZV9zZXR0aW5ncyBhdGwg T04gKGEuYXJ0aWNsZV9pZCA9IGF0bC5hcnRpY2xlX2lkIEFORCBhdGwuc2V0dGluZ19uYW1lID0g PyBhbmQgYXRsLmxvY2FsZSA9ID8pCiAJCQkJTEVGVCBKT0lOIHNpZ25vZmZzIHNjcGYgT04gKGEu YXJ0aWNsZV9pZCA9IHNjcGYuYXNzb2NfaWQgQU5EIHNjcGYuYXNzb2NfdHlwZSA9ID8gQU5EIHNj cGYuc3ltYm9saWMgPSA/KQogCQkJCUxFRlQgSk9JTiBzaWdub2ZmcyBzbGUgT04gKGEuYXJ0aWNs ZV9pZCA9IHNsZS5hc3NvY19pZCBBTkQgc2xlLmFzc29jX3R5cGUgPSA/IEFORCBzbGUuc3ltYm9s aWMgPSA/KQpkaWZmIC0tZ2l0IGEvY2xhc3Nlcy9zdWJtaXNzaW9uL3Jldmlld2VyL1Jldmlld2Vy U3VibWlzc2lvbkRBTy5pbmMucGhwIGIvY2xhc3Nlcy9zdWJtaXNzaW9uL3Jldmlld2VyL1Jldmll d2VyU3VibWlzc2lvbkRBTy5pbmMucGhwCmluZGV4IDQwYjBkMmEuLjRlNWJjMzYgMTAwNjQ0Ci0t LSBhL2NsYXNzZXMvc3VibWlzc2lvbi9yZXZpZXdlci9SZXZpZXdlclN1Ym1pc3Npb25EQU8uaW5j LnBocAorKysgYi9jbGFzc2VzL3N1Ym1pc3Npb24vcmV2aWV3ZXIvUmV2aWV3ZXJTdWJtaXNzaW9u REFPLmluYy5waHAKQEAgLTIxMCw3ICsyMTAsNyBAQCBjbGFzcyBSZXZpZXdlclN1Ym1pc3Npb25E QU8gZXh0ZW5kcyBEQU8gewogCQkJCUNPQUxFU0NFKHNhbC5zZXR0aW5nX3ZhbHVlLCBzYXBsLnNl dHRpbmdfdmFsdWUpIEFTIHNlY3Rpb25fYWJicmV2CiAJCQlGUk9NCWFydGljbGVzIGEKIAkJCQlM RUZUIEpPSU4gcmV2aWV3X2Fzc2lnbm1lbnRzIHIgT04gKGEuYXJ0aWNsZV9pZCA9IHIuc3VibWlz c2lvbl9pZCkKLQkJCQlMRUZUIEpPSU4gYXJ0aWNsZV9zZXR0aW5ncyBhdHBsIE9OIChhdHBsLmFy dGljbGVfaWQgPSBhLmFydGljbGVfaWQgQU5EIGF0cGwuc2V0dGluZ19uYW1lID0gPyBBTkQgYXRw bC5sb2NhbGUgPSA/KQorCQkJCUxFRlQgSk9JTiBhcnRpY2xlX3NldHRpbmdzIGF0cGwgT04gKGF0 cGwuYXJ0aWNsZV9pZCA9IGEuYXJ0aWNsZV9pZCBBTkQgYXRwbC5zZXR0aW5nX25hbWUgPSA/IEFO RCBhdHBsLmxvY2FsZSA9IGEubG9jYWxlKQogCQkJCUxFRlQgSk9JTiBhcnRpY2xlX3NldHRpbmdz IGF0bCBPTiAoYXRsLmFydGljbGVfaWQgPSBhLmFydGljbGVfaWQgQU5EIGF0bC5zZXR0aW5nX25h bWUgPSA/IEFORCBhdGwubG9jYWxlID0gPykKIAkJCQlMRUZUIEpPSU4gc2VjdGlvbnMgcyBPTiAo cy5zZWN0aW9uX2lkID0gYS5zZWN0aW9uX2lkKQogCQkJCUxFRlQgSk9JTiB1c2VycyB1IE9OIChy LnJldmlld2VyX2lkID0gdS51c2VyX2lkKQpAQCAtMjM2LDE1ICsyMzYsMTQgQEAgY2xhc3MgUmV2 aWV3ZXJTdWJtaXNzaW9uREFPIGV4dGVuZHMgREFPIHsKIAkJJHJlc3VsdCA9JiAkdGhpcy0+cmV0 cmlldmVSYW5nZSgKIAkJCSRzcWwsCiAJCQlhcnJheSgKLQkJCQknY2xlYW5UaXRsZScsCi0JCQkJ JHByaW1hcnlMb2NhbGUsCisJCQkJJ2NsZWFuVGl0bGUnLCAvLyBBcnRpY2xlIHRpdGxlCiAJCQkJ J2NsZWFuVGl0bGUnLAogCQkJCSRsb2NhbGUsCi0JCQkJJ3RpdGxlJywKKwkJCQkndGl0bGUnLCAv LyBTZWN0aW9uIHRpdGxlCiAJCQkJJHByaW1hcnlMb2NhbGUsCiAJCQkJJ3RpdGxlJywKIAkJCQkk bG9jYWxlLAotCQkJCSdhYmJyZXYnLAorCQkJCSdhYmJyZXYnLCAvLyBTZWN0aW9uIGFiYnJldmlh dGlvbgogCQkJCSRwcmltYXJ5TG9jYWxlLAogCQkJCSdhYmJyZXYnLAogCQkJCSRsb2NhbGUsCmRp ZmYgLS1naXQgYS9jbGFzc2VzL3N1Ym1pc3Npb24vc2VjdGlvbkVkaXRvci9TZWN0aW9uRWRpdG9y U3VibWlzc2lvbkRBTy5pbmMucGhwIGIvY2xhc3Nlcy9zdWJtaXNzaW9uL3NlY3Rpb25FZGl0b3Iv U2VjdGlvbkVkaXRvclN1Ym1pc3Npb25EQU8uaW5jLnBocAppbmRleCBlZDY0ZTlhLi5lZDdlYTg5 IDEwMDY0NAotLS0gYS9jbGFzc2VzL3N1Ym1pc3Npb24vc2VjdGlvbkVkaXRvci9TZWN0aW9uRWRp dG9yU3VibWlzc2lvbkRBTy5pbmMucGhwCisrKyBiL2NsYXNzZXMvc3VibWlzc2lvbi9zZWN0aW9u RWRpdG9yL1NlY3Rpb25FZGl0b3JTdWJtaXNzaW9uREFPLmluYy5waHAKQEAgLTM0Niw5ICszNDYs OCBAQCBjbGFzcyBTZWN0aW9uRWRpdG9yU3VibWlzc2lvbkRBTyBleHRlbmRzIERBTyB7CiAJCQkn YWJicmV2JywKIAkJCSRsb2NhbGUsCiAJCQknY2xlYW5UaXRsZScsIC8vIEFydGljbGUgdGl0bGUK KwkJCSdjbGVhblRpdGxlJywKIAkJCSRsb2NhbGUsCi0JCQknY2xlYW5UaXRsZScsIC8vIEFydGlj bGUgdGl0bGUKLQkJCSRwcmltYXJ5TG9jYWxlLAogCQkJJGpvdXJuYWxJZCwKIAkJCSRzZWN0aW9u RWRpdG9ySWQKIAkJKTsKQEAgLTQ2Niw3ICs0NjUsNyBAQCBjbGFzcyBTZWN0aW9uRWRpdG9yU3Vi bWlzc2lvbkRBTyBleHRlbmRzIERBTyB7CiAJCQkJTEVGVCBKT0lOIHNlY3Rpb25fc2V0dGluZ3Mg c3RsIE9OIChzLnNlY3Rpb25faWQgPSBzdGwuc2VjdGlvbl9pZCBBTkQgc3RsLnNldHRpbmdfbmFt ZSA9ID8gQU5EIHN0bC5sb2NhbGUgPSA/KQogCQkJCUxFRlQgSk9JTiBzZWN0aW9uX3NldHRpbmdz IHNhcGwgT04gKHMuc2VjdGlvbl9pZCA9IHNhcGwuc2VjdGlvbl9pZCBBTkQgc2FwbC5zZXR0aW5n X25hbWUgPSA/IEFORCBzYXBsLmxvY2FsZSA9ID8pCiAJCQkJTEVGVCBKT0lOIHNlY3Rpb25fc2V0 dGluZ3Mgc2FsIE9OIChzLnNlY3Rpb25faWQgPSBzYWwuc2VjdGlvbl9pZCBBTkQgc2FsLnNldHRp bmdfbmFtZSA9ID8gQU5EIHNhbC5sb2NhbGUgPSA/KQotCQkJCUxFRlQgSk9JTiBhcnRpY2xlX3Nl dHRpbmdzIGF0cGwgT04gKGF0cGwuYXJ0aWNsZV9pZCA9IGEuYXJ0aWNsZV9pZCBBTkQgYXRwbC5z ZXR0aW5nX25hbWUgPSA/IEFORCBhdHBsLmxvY2FsZSA9ID8pCisJCQkJTEVGVCBKT0lOIGFydGlj bGVfc2V0dGluZ3MgYXRwbCBPTiAoYXRwbC5hcnRpY2xlX2lkID0gYS5hcnRpY2xlX2lkIEFORCBh dHBsLnNldHRpbmdfbmFtZSA9ID8gQU5EIGF0cGwubG9jYWxlID0gYS5sb2NhbGUpCiAJCQkJTEVG VCBKT0lOIGFydGljbGVfc2V0dGluZ3MgYXRsIE9OIChhLmFydGljbGVfaWQgPSBhdGwuYXJ0aWNs ZV9pZCBBTkQgYXRsLnNldHRpbmdfbmFtZSA9ID8gQU5EIGF0bC5sb2NhbGUgPSA/KQogCQkJCUxF RlQgSk9JTiBlZGl0X2RlY2lzaW9ucyBlZGVjIE9OIChhLmFydGljbGVfaWQgPSBlZGVjLmFydGlj bGVfaWQpCiAJCQkJTEVGVCBKT0lOIGVkaXRfZGVjaXNpb25zIGVkZWMyIE9OIChhLmFydGljbGVf aWQgPSBlZGVjMi5hcnRpY2xlX2lkIEFORCBlZGVjLmVkaXRfZGVjaXNpb25faWQgPCBlZGVjMi5l ZGl0X2RlY2lzaW9uX2lkKQpkaWZmIC0tZ2l0IGEvZGJzY3JpcHRzL3htbC9vanNfc2NoZW1hLnht bCBiL2Ric2NyaXB0cy94bWwvb2pzX3NjaGVtYS54bWwKaW5kZXggNjNhNDdjMy4uNDI2ZjNlMiAx MDA2NDQKLS0tIGEvZGJzY3JpcHRzL3htbC9vanNfc2NoZW1hLnhtbAorKysgYi9kYnNjcmlwdHMv eG1sL29qc19zY2hlbWEueG1sCkBAIC00MjMsNiArNDIzLDcgQEAKIAkJCTxLRVkgLz4KIAkJCTxB VVRPSU5DUkVNRU5UIC8+CiAJCTwvZmllbGQ+CisJCTxmaWVsZCBuYW1lPSJsb2NhbGUiIHR5cGU9 IkMyIiBzaXplPSI1IiAvPgogCQk8ZmllbGQgbmFtZT0idXNlcl9pZCIgdHlwZT0iSTgiPgogCQkJ PE5PVE5VTEwgLz4KIAkJPC9maWVsZD4KZGlmZiAtLWdpdCBhL2Ric2NyaXB0cy94bWwvdXBncmFk ZS8yLjMuMl91cGRhdGUueG1sIGIvZGJzY3JpcHRzL3htbC91cGdyYWRlLzIuMy4yX3VwZGF0ZS54 bWwKaW5kZXggNTg1ZjNlZi4uYTFmOTc2NSAxMDA2NDQKLS0tIGEvZGJzY3JpcHRzL3htbC91cGdy YWRlLzIuMy4yX3VwZGF0ZS54bWwKKysrIGIvZGJzY3JpcHRzL3htbC91cGdyYWRlLzIuMy4yX3Vw ZGF0ZS54bWwKQEAgLTMyLDQgKzMyLDEzIEBACiAJPHNxbD4KIAkJPHF1ZXJ5PlVQREFURSBub3Rl cyBTRVQgYXNzb2NfdHlwZSA9IDI1NzwvcXVlcnk+PCEtLSBBU1NPQ19UWVBFX0FSVElDTEUgLS0+ CiAJPC9zcWw+CisJPCEtLSBCdWcgIzU1NDM6IEltcGxlbWVudCBtdWx0aWxpbmd1YWwgc3BlY2lm aWNhdGlvbiAtLT4KKwk8c3FsPgorCQk8cXVlcnkgZHJpdmVyPSJteXNxbCI+CisJCQlVUERBVEUg YXJ0aWNsZXMgYSwgam91cm5hbHMgaiBTRVQgYS5sb2NhbGUgPSBqLnByaW1hcnlfbG9jYWxlIFdI RVJFIGEuam91cm5hbF9pZCA9IGouam91cm5hbF9pZAorCQk8L3F1ZXJ5PgorCQk8cXVlcnkgZHJp dmVyPSJwb3N0Z3JlczciPgorCQkJVVBEQVRFIGFydGljbGVzIFNFVCBsb2NhbGUgPSBqLnByaW1h cnlfbG9jYWxlIEZST00gam91cm5hbHMgaiBXSEVSRSBhcnRpY2xlcy5qb3VybmFsX2lkID0gai5q b3VybmFsX2lkCisJCTwvcXVlcnk+CisJPC9zcWw+CiA8L2RhdGE+CmRpZmYgLS1naXQgYS9saWIv cGtwIGIvbGliL3BrcAppbmRleCA3OTRkYTA1Li4wMTcxYTRkIDE2MDAwMAotLS0gYS9saWIvcGtw CisrKyBiL2xpYi9wa3AKQEAgLTEgKzEgQEAKLVN1YnByb2plY3QgY29tbWl0IDc5NGRhMDUwNzNl YmNjYjNiY2NkMWIyYjAyNGZhYjc0MmM0NDRhZTcKK1N1YnByb2plY3QgY29tbWl0IDAxNzFhNGRj NWNkMTc3MjJhM2Y1YzIzZTM1YzgxNzI2YzhhNGFiZmUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvaW1w b3J0ZXhwb3J0L25hdGl2ZS9OYXRpdmVJbXBvcnREb20uaW5jLnBocCBiL3BsdWdpbnMvaW1wb3J0 ZXhwb3J0L25hdGl2ZS9OYXRpdmVJbXBvcnREb20uaW5jLnBocAppbmRleCBlNzIxNDg0Li5mOTEz NzM5IDEwMDY0NAotLS0gYS9wbHVnaW5zL2ltcG9ydGV4cG9ydC9uYXRpdmUvTmF0aXZlSW1wb3J0 RG9tLmluYy5waHAKKysrIGIvcGx1Z2lucy9pbXBvcnRleHBvcnQvbmF0aXZlL05hdGl2ZUltcG9y dERvbS5pbmMucGhwCkBAIC02MzYsNiArNjM2LDcgQEAgY2xhc3MgTmF0aXZlSW1wb3J0RG9tIHsK IAkJJGFydGljbGVEYW8gPSYgREFPUmVnaXN0cnk6OmdldERBTygnQXJ0aWNsZURBTycpOwogCiAJ CSRhcnRpY2xlID0gbmV3IEFydGljbGUoKTsKKwkJJGFydGljbGUtPnNldExvY2FsZSgkam91cm5h bFByaW1hcnlMb2NhbGUpOyAvLyBGSVhNRSBpbiBidWcgIzU1NDMKIAkJJGFydGljbGUtPnNldEpv dXJuYWxJZCgkam91cm5hbC0+Z2V0SWQoKSk7CiAJCSRhcnRpY2xlLT5zZXRVc2VySWQoJHVzZXIt PmdldElkKCkpOwogCQkkYXJ0aWNsZS0+c2V0U2VjdGlvbklkKCRzZWN0aW9uLT5nZXRJZCgpKTsK ZGlmZiAtLWdpdCBhL3BsdWdpbnMvaW1wb3J0ZXhwb3J0L3F1aWNrU3VibWl0L1F1aWNrU3VibWl0 Rm9ybS5pbmMucGhwIGIvcGx1Z2lucy9pbXBvcnRleHBvcnQvcXVpY2tTdWJtaXQvUXVpY2tTdWJt aXRGb3JtLmluYy5waHAKaW5kZXggYzg0ZWZjYi4uZGM1ZjA3MCAxMDA2NDQKLS0tIGEvcGx1Z2lu cy9pbXBvcnRleHBvcnQvcXVpY2tTdWJtaXQvUXVpY2tTdWJtaXRGb3JtLmluYy5waHAKKysrIGIv cGx1Z2lucy9pbXBvcnRleHBvcnQvcXVpY2tTdWJtaXQvUXVpY2tTdWJtaXRGb3JtLmluYy5waHAK QEAgLTE1NCw2ICsxNTQsNyBAQCBjbGFzcyBRdWlja1N1Ym1pdEZvcm0gZXh0ZW5kcyBGb3JtIHsK IAkJJHVzZXIgPSYgUmVxdWVzdDo6Z2V0VXNlcigpOwogCiAJCSRhcnRpY2xlID0gbmV3IEFydGlj bGUoKTsKKwkJJGFydGljbGUtPnNldExvY2FsZSgkam91cm5hbC0+Z2V0UHJpbWFyeUxvY2FsZSgp KTsgLy8gRklYTUUgaW4gYnVnICM1NTQzCiAJCSRhcnRpY2xlLT5zZXRVc2VySWQoJHVzZXItPmdl dElkKCkpOwogCQkkYXJ0aWNsZS0+c2V0Sm91cm5hbElkKCRqb3VybmFsLT5nZXRJZCgpKTsKIAkJ JGFydGljbGUtPnNldFNlY3Rpb25JZCgkdGhpcy0+Z2V0RGF0YSgnc2VjdGlvbklkJykpOwpkaWZm IC0tZ2l0IGEvcGx1Z2lucy9yZXBvcnRzL2FydGljbGVzL0FydGljbGVSZXBvcnREQU8uaW5jLnBo cCBiL3BsdWdpbnMvcmVwb3J0cy9hcnRpY2xlcy9BcnRpY2xlUmVwb3J0REFPLmluYy5waHAKaW5k ZXggZDEwNzg3Mi4uZDkwZTlmZCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9yZXBvcnRzL2FydGljbGVz L0FydGljbGVSZXBvcnREQU8uaW5jLnBocAorKysgYi9wbHVnaW5zL3JlcG9ydHMvYXJ0aWNsZXMv QXJ0aWNsZVJlcG9ydERBTy5pbmMucGhwCkBAIC0zNSwyNCArMzUsMjAgQEAgY2xhc3MgQXJ0aWNs ZVJlcG9ydERBTyBleHRlbmRzIERBTyB7CiAJCQkJQ09BTEVTQ0Uoc2wuc2V0dGluZ192YWx1ZSwg c3BsLnNldHRpbmdfdmFsdWUpIEFTIHNlY3Rpb25fdGl0bGUsCiAJCQkJYS5zdGF0dXMgQVMgc3Rh dHVzLAogCQkJCWEubGFuZ3VhZ2UgQVMgbGFuZ3VhZ2UKLQkJCUZST00KLQkJCQlhcnRpY2xlcyBh Ci0JCQkJCUxFRlQgSk9JTiBhcnRpY2xlX3NldHRpbmdzIGFzcGwxIE9OIChhc3BsMS5hcnRpY2xl X2lkPWEuYXJ0aWNsZV9pZCBBTkQgYXNwbDEuc2V0dGluZ19uYW1lID0gPyBBTkQgYXNwbDEubG9j YWxlID0gPykKLQkJCQkJTEVGVCBKT0lOIGFydGljbGVfc2V0dGluZ3MgYXNsMSBPTiAoYXNsMS5h cnRpY2xlX2lkPWEuYXJ0aWNsZV9pZCBBTkQgYXNsMS5zZXR0aW5nX25hbWUgPSA/IEFORCBhc2wx LmxvY2FsZSA9ID8pCi0JCQkJCUxFRlQgSk9JTiBhcnRpY2xlX3NldHRpbmdzIGFzcGwyIE9OIChh c3BsMi5hcnRpY2xlX2lkPWEuYXJ0aWNsZV9pZCBBTkQgYXNwbDIuc2V0dGluZ19uYW1lID0gPyBB TkQgYXNwbDIubG9jYWxlID0gPykKLQkJCQkJTEVGVCBKT0lOIGFydGljbGVfc2V0dGluZ3MgYXNs MiBPTiAoYXNsMi5hcnRpY2xlX2lkPWEuYXJ0aWNsZV9pZCBBTkQgYXNsMi5zZXR0aW5nX25hbWUg PSA/IEFORCBhc2wyLmxvY2FsZSA9ID8pCi0JCQkJCUxFRlQgSk9JTiBzZWN0aW9uX3NldHRpbmdz IHNwbCBPTiAoc3BsLnNlY3Rpb25faWQ9YS5zZWN0aW9uX2lkIEFORCBzcGwuc2V0dGluZ19uYW1l ID0gPyBBTkQgc3BsLmxvY2FsZSA9ID8pCi0JCQkJCUxFRlQgSk9JTiBzZWN0aW9uX3NldHRpbmdz IHNsIE9OIChzbC5zZWN0aW9uX2lkPWEuc2VjdGlvbl9pZCBBTkQgc2wuc2V0dGluZ19uYW1lID0g PyBBTkQgc2wubG9jYWxlID0gPykKLQkJCVdIRVJFCi0JCQkJYS5qb3VybmFsX2lkID0gPworCQkJ RlJPTQlhcnRpY2xlcyBhCisJCQkJTEVGVCBKT0lOIGFydGljbGVfc2V0dGluZ3MgYXNwbDEgT04g KGFzcGwxLmFydGljbGVfaWQ9YS5hcnRpY2xlX2lkIEFORCBhc3BsMS5zZXR0aW5nX25hbWUgPSA/ IEFORCBhc3BsMS5sb2NhbGUgPSBhLmxvY2FsZSkKKwkJCQlMRUZUIEpPSU4gYXJ0aWNsZV9zZXR0 aW5ncyBhc2wxIE9OIChhc2wxLmFydGljbGVfaWQ9YS5hcnRpY2xlX2lkIEFORCBhc2wxLnNldHRp bmdfbmFtZSA9ID8gQU5EIGFzbDEubG9jYWxlID0gPykKKwkJCQlMRUZUIEpPSU4gYXJ0aWNsZV9z ZXR0aW5ncyBhc3BsMiBPTiAoYXNwbDIuYXJ0aWNsZV9pZD1hLmFydGljbGVfaWQgQU5EIGFzcGwy LnNldHRpbmdfbmFtZSA9ID8gQU5EIGFzcGwyLmxvY2FsZSA9IGEubG9jYWxlKQorCQkJCUxFRlQg Sk9JTiBhcnRpY2xlX3NldHRpbmdzIGFzbDIgT04gKGFzbDIuYXJ0aWNsZV9pZD1hLmFydGljbGVf aWQgQU5EIGFzbDIuc2V0dGluZ19uYW1lID0gPyBBTkQgYXNsMi5sb2NhbGUgPSA/KQorCQkJCUxF RlQgSk9JTiBzZWN0aW9uX3NldHRpbmdzIHNwbCBPTiAoc3BsLnNlY3Rpb25faWQ9YS5zZWN0aW9u X2lkIEFORCBzcGwuc2V0dGluZ19uYW1lID0gPyBBTkQgc3BsLmxvY2FsZSA9ID8pCisJCQkJTEVG VCBKT0lOIHNlY3Rpb25fc2V0dGluZ3Mgc2wgT04gKHNsLnNlY3Rpb25faWQ9YS5zZWN0aW9uX2lk IEFORCBzbC5zZXR0aW5nX25hbWUgPSA/IEFORCBzbC5sb2NhbGUgPSA/KQorCQkJV0hFUkUJYS5q b3VybmFsX2lkID0gPwogCQkJT1JERVIgQlkgYS5hcnRpY2xlX2lkJywKIAkJCWFycmF5KAotCQkJ CSd0aXRsZScsCi0JCQkJJHByaW1hcnlMb2NhbGUsCisJCQkJJ3RpdGxlJywgLy8gQXJ0aWNsZSB0 aXRsZQogCQkJCSd0aXRsZScsCiAJCQkJJGxvY2FsZSwKLQkJCQknYWJzdHJhY3QnLAotCQkJCSRw cmltYXJ5TG9jYWxlLAorCQkJCSdhYnN0cmFjdCcsIC8vIEFydGljbGUgYWJzdHJhY3QKIAkJCQkn YWJzdHJhY3QnLAogCQkJCSRsb2NhbGUsCiAJCQkJJ3RpdGxlJywKZGlmZiAtLWdpdCBhL3BsdWdp bnMvcmVwb3J0cy9yZXZpZXdzL1Jldmlld1JlcG9ydERBTy5pbmMucGhwIGIvcGx1Z2lucy9yZXBv cnRzL3Jldmlld3MvUmV2aWV3UmVwb3J0REFPLmluYy5waHAKaW5kZXggMGRkYjc5MC4uZjIxNzkz ZCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9yZXBvcnRzL3Jldmlld3MvUmV2aWV3UmVwb3J0REFPLmlu Yy5waHAKKysrIGIvcGx1Z2lucy9yZXBvcnRzL3Jldmlld3MvUmV2aWV3UmVwb3J0REFPLmluYy5w aHAKQEAgLTYyLDE0ICs2MiwxMyBAQCBjbGFzcyBSZXZpZXdSZXBvcnREQU8gZXh0ZW5kcyBEQU8g ewogCQkJRlJPTQlyZXZpZXdfYXNzaWdubWVudHMgcgogCQkJCUxFRlQgSk9JTiBhcnRpY2xlcyBh IE9OIHIuc3VibWlzc2lvbl9pZCA9IGEuYXJ0aWNsZV9pZAogCQkJCUxFRlQgSk9JTiBhcnRpY2xl X3NldHRpbmdzIGFzbCBPTiAoYS5hcnRpY2xlX2lkPWFzbC5hcnRpY2xlX2lkIEFORCBhc2wubG9j YWxlPT8gQU5EIGFzbC5zZXR0aW5nX25hbWU9PykKLQkJCQlMRUZUIEpPSU4gYXJ0aWNsZV9zZXR0 aW5ncyBhc3BsIE9OIChhLmFydGljbGVfaWQ9YXNwbC5hcnRpY2xlX2lkIEFORCBhc3BsLmxvY2Fs ZT0/IEFORCBhc3BsLnNldHRpbmdfbmFtZT0/KSwKKwkJCQlMRUZUIEpPSU4gYXJ0aWNsZV9zZXR0 aW5ncyBhc3BsIE9OIChhLmFydGljbGVfaWQ9YXNwbC5hcnRpY2xlX2lkIEFORCBhc3BsLmxvY2Fs ZT1hLmxvY2FsZSBBTkQgYXNwbC5zZXR0aW5nX25hbWU9PyksCiAJCQkJdXNlcnMgdQogCQkJV0hF UkUJdS51c2VyX2lkPXIucmV2aWV3ZXJfaWQgQU5EIGEuam91cm5hbF9pZD0gPwogCQkJT1JERVIg QlkgYXJ0aWNsZScsCiAJCQlhcnJheSgKLQkJCQkkbG9jYWxlLAorCQkJCSRsb2NhbGUsIC8vIEFy dGljbGUgdGl0bGUKIAkJCQkndGl0bGUnLAotCQkJCSRwcmltYXJ5TG9jYWxlLAogCQkJCSd0aXRs ZScsCiAJCQkJJGpvdXJuYWxJZAogCQkJKQo= 3125 2010-07-05 15:39:00 -0700 2010-07-05 15:39:38 -0700 Patch against OJS pre-2.3.2 CVS 5543.diff text/plain 16322 alec ZGlmZiAtLWdpdCBhL2NsYXNzZXMvYXV0aG9yL2Zvcm0vc3VibWl0L0F1dGhvclN1Ym1pdFN0ZXAx Rm9ybS5pbmMucGhwIGIvY2xhc3Nlcy9hdXRob3IvZm9ybS9zdWJtaXQvQXV0aG9yU3VibWl0U3Rl cDFGb3JtLmluYy5waHAKaW5kZXggZDJjZjUxNS4uNDIwZTc1OSAxMDA2NDQKLS0tIGEvY2xhc3Nl cy9hdXRob3IvZm9ybS9zdWJtaXQvQXV0aG9yU3VibWl0U3RlcDFGb3JtLmluYy5waHAKKysrIGIv Y2xhc3Nlcy9hdXRob3IvZm9ybS9zdWJtaXQvQXV0aG9yU3VibWl0U3RlcDFGb3JtLmluYy5waHAK QEAgLTMwLDYgKzMwLDcgQEAgY2xhc3MgQXV0aG9yU3VibWl0U3RlcDFGb3JtIGV4dGVuZHMgQXV0 aG9yU3VibWl0Rm9ybSB7CiAJCS8vIFZhbGlkYXRpb24gY2hlY2tzIGZvciB0aGlzIGZvcm0KIAkJ JHRoaXMtPmFkZENoZWNrKG5ldyBGb3JtVmFsaWRhdG9yKCR0aGlzLCAnc2VjdGlvbklkJywgJ3Jl cXVpcmVkJywgJ2F1dGhvci5zdWJtaXQuZm9ybS5zZWN0aW9uUmVxdWlyZWQnKSk7CiAJCSR0aGlz LT5hZGRDaGVjayhuZXcgRm9ybVZhbGlkYXRvckN1c3RvbSgkdGhpcywgJ3NlY3Rpb25JZCcsICdy ZXF1aXJlZCcsICdhdXRob3Iuc3VibWl0LmZvcm0uc2VjdGlvblJlcXVpcmVkJywgYXJyYXkoREFP UmVnaXN0cnk6OmdldERBTygnU2VjdGlvbkRBTycpLCAnc2VjdGlvbkV4aXN0cycpLCBhcnJheSgk am91cm5hbC0+Z2V0SWQoKSkpKTsKKwkJJHRoaXMtPmFkZENoZWNrKG5ldyBGb3JtVmFsaWRhdG9y SW5TZXQoJHRoaXMsICdsb2NhbGUnLCAncmVxdWlyZWQnLCAnYXV0aG9yLnN1Ym1pdC5mb3JtLmxv Y2FsZVJlcXVpcmVkJywgJGpvdXJuYWwtPmdldFNldHRpbmcoJ3N1cHBvcnRlZFN1Ym1pc3Npb25M b2NhbGVzJykpKTsKIAl9CiAKIAkvKioKQEAgLTQ0LDExICs0NSwxMyBAQCBjbGFzcyBBdXRob3JT dWJtaXRTdGVwMUZvcm0gZXh0ZW5kcyBBdXRob3JTdWJtaXRGb3JtIHsKIAkJLy8gR2V0IHNlY3Rp b25zIGZvciB0aGlzIGpvdXJuYWwKIAkJJHNlY3Rpb25EYW8gPSYgREFPUmVnaXN0cnk6OmdldERB TygnU2VjdGlvbkRBTycpOwogCi0JCS8vIElmIHRoaXMgdXNlciBpcyBhIHNlY3Rpb24gZWRpdG9y IG9yIGFuIGVkaXRvciwgdGhleSBhcmUgYWxsb3dlZAotCQkvLyB0byBzdWJtaXQgdG8gc2VjdGlv bnMgZmxhZ2dlZCBhcyAiZWRpdG9yLW9ubHkiIGZvciBzdWJtaXNzaW9ucy4KLQkJLy8gT3RoZXJ3 aXNlLCBkaXNwbGF5IG9ubHkgc2VjdGlvbnMgdGhleSBhcmUgYWxsb3dlZCB0byBzdWJtaXQgdG8u CisJCS8vIElmIHRoaXMgdXNlciBpcyBhIHNlY3Rpb24gZWRpdG9yIG9yIGFuIGVkaXRvciwgdGhl eSBhcmUKKwkJLy8gYWxsb3dlZCB0byBzdWJtaXQgdG8gc2VjdGlvbnMgZmxhZ2dlZCBhcyAiZWRp dG9yLW9ubHkiIGZvcgorCQkvLyBzdWJtaXNzaW9ucy4gT3RoZXJ3aXNlLCBkaXNwbGF5IG9ubHkg c2VjdGlvbnMgdGhleSBhcmUKKwkJLy8gYWxsb3dlZCB0byBzdWJtaXQgdG8uCiAJCSRyb2xlRGFv ID0mIERBT1JlZ2lzdHJ5OjpnZXREQU8oJ1JvbGVEQU8nKTsKIAkJJGlzRWRpdG9yID0gJHJvbGVE YW8tPnJvbGVFeGlzdHMoJGpvdXJuYWwtPmdldElkKCksICR1c2VyLT5nZXRJZCgpLCBST0xFX0lE X0VESVRPUikgfHwgJHJvbGVEYW8tPnJvbGVFeGlzdHMoJGpvdXJuYWwtPmdldElkKCksICR1c2Vy LT5nZXRJZCgpLCBST0xFX0lEX1NFQ1RJT05fRURJVE9SKTsKKwkJJHRlbXBsYXRlTWdyLT5hc3Np Z24oJ3NlY3Rpb25PcHRpb25zJywgYXJyYXkoJzAnID0+IExvY2FsZTo6dHJhbnNsYXRlKCdhdXRo b3Iuc3VibWl0LnNlbGVjdFNlY3Rpb24nKSkgKyAkc2VjdGlvbkRhby0+Z2V0U2VjdGlvblRpdGxl cygkam91cm5hbC0+Z2V0SWQoKSwgISRpc0VkaXRvcikpOwogCiAJCS8vIFNldCB1cCByZXF1aXJl ZCBQYXltZW50IFJlbGF0ZWQgSW5mb3JtYXRpb24KIAkJaW1wb3J0KCdjbGFzc2VzLnBheW1lbnQu b2pzLk9KU1BheW1lbnRNYW5hZ2VyJyk7CkBAIC01OCwxNiArNjEsMjYgQEAgY2xhc3MgQXV0aG9y U3VibWl0U3RlcDFGb3JtIGV4dGVuZHMgQXV0aG9yU3VibWl0Rm9ybSB7CiAJCQkkY29tcGxldGVk UGF5bWVudERBTyA9JiBEQU9SZWdpc3RyeTo6Z2V0REFPKCdPSlNDb21wbGV0ZWRQYXltZW50REFP Jyk7CiAJCQkkYXJ0aWNsZUlkID0gJHRoaXMtPmFydGljbGVJZDsKIAotCQkJaWYgKCAkcGF5bWVu dE1hbmFnZXItPnN1Ym1pc3Npb25FbmFibGVkKCkgKSB7Ci0JCQkJJHRlbXBsYXRlTWdyLT5hc3Np Z25fYnlfcmVmKCdzdWJtaXNzaW9uUGF5bWVudCcsICRjb21wbGV0ZWRQYXltZW50REFPLT5nZXRT dWJtaXNzaW9uQ29tcGxldGVkUGF5bWVudCAoICRqb3VybmFsLT5nZXRJZCgpLCAkYXJ0aWNsZUlk ICkpOworCQkJaWYgKCRwYXltZW50TWFuYWdlci0+c3VibWlzc2lvbkVuYWJsZWQoKSkgeworCQkJ CSR0ZW1wbGF0ZU1nci0+YXNzaWduX2J5X3JlZignc3VibWlzc2lvblBheW1lbnQnLCAkY29tcGxl dGVkUGF5bWVudERBTy0+Z2V0U3VibWlzc2lvbkNvbXBsZXRlZFBheW1lbnQgKCRqb3VybmFsLT5n ZXRJZCgpLCAkYXJ0aWNsZUlkKSk7CiAJCQl9CiAKLQkJCWlmICggJHBheW1lbnRNYW5hZ2VyLT5m YXN0VHJhY2tFbmFibGVkKCkgICkgewotCQkJCSR0ZW1wbGF0ZU1nci0+YXNzaWduX2J5X3JlZign ZmFzdFRyYWNrUGF5bWVudCcsICRjb21wbGV0ZWRQYXltZW50REFPLT5nZXRGYXN0VHJhY2tDb21w bGV0ZWRQYXltZW50ICggJGpvdXJuYWwtPmdldElkKCksICRhcnRpY2xlSWQgKSk7CisJCQlpZiAo JHBheW1lbnRNYW5hZ2VyLT5mYXN0VHJhY2tFbmFibGVkKCkpIHsKKwkJCQkkdGVtcGxhdGVNZ3It PmFzc2lnbl9ieV9yZWYoJ2Zhc3RUcmFja1BheW1lbnQnLCAkY29tcGxldGVkUGF5bWVudERBTy0+ Z2V0RmFzdFRyYWNrQ29tcGxldGVkUGF5bWVudCAoJGpvdXJuYWwtPmdldElkKCksICRhcnRpY2xl SWQpKTsKIAkJCX0KIAkJfQogCi0JCSR0ZW1wbGF0ZU1nci0+YXNzaWduKCdzZWN0aW9uT3B0aW9u cycsIGFycmF5KCcwJyA9PiBMb2NhbGU6OnRyYW5zbGF0ZSgnYXV0aG9yLnN1Ym1pdC5zZWxlY3RT ZWN0aW9uJykpICsgJHNlY3Rpb25EYW8tPmdldFNlY3Rpb25UaXRsZXMoJGpvdXJuYWwtPmdldElk KCksICEkaXNFZGl0b3IpKTsKKwkJLy8gUHJvdmlkZSBhdmFpbGFibGUgc3VibWlzc2lvbiBsYW5n dWFnZXMuIChDb252ZXJ0IHRoZSBhcnJheQorCQkvLyBvZiBsb2NhbGUgc3ltYm9saWMgbmFtZXMg eHhfWFggaW50byBhbiBhc3NvY2lhdGl2ZSBhcnJheQorCQkvLyBvZiBzeW1ib2xpYyBuYW1lcyA9 PiByZWFkYWJsZSBuYW1lcy4pCisJCSR0ZW1wbGF0ZU1nci0+YXNzaWduKAorCQkJJ3N1cHBvcnRl ZFN1Ym1pc3Npb25Mb2NhbGVOYW1lcycsCisJCQlhcnJheV9mbGlwKGFycmF5X2ludGVyc2VjdCgK KwkJCQlhcnJheV9mbGlwKExvY2FsZTo6Z2V0QWxsTG9jYWxlcygpKSwKKwkJCQkkam91cm5hbC0+ Z2V0U2V0dGluZygnc3VwcG9ydGVkU3VibWlzc2lvbkxvY2FsZXMnKQorCQkJKSkKKwkJKTsKKwog CQlwYXJlbnQ6OmRpc3BsYXkoKTsKIAl9CiAKQEAgLTc4LDggKzkxLDI4IEBAIGNsYXNzIEF1dGhv clN1Ym1pdFN0ZXAxRm9ybSBleHRlbmRzIEF1dGhvclN1Ym1pdEZvcm0gewogCQlpZiAoaXNzZXQo JHRoaXMtPmFydGljbGUpKSB7CiAJCQkkdGhpcy0+X2RhdGEgPSBhcnJheSgKIAkJCQknc2VjdGlv bklkJyA9PiAkdGhpcy0+YXJ0aWNsZS0+Z2V0U2VjdGlvbklkKCksCisJCQkJJ2xvY2FsZScgPT4g JHRoaXMtPmFydGljbGUtPmdldExvY2FsZSgpLAogCQkJCSdjb21tZW50c1RvRWRpdG9yJyA9PiAk dGhpcy0+YXJ0aWNsZS0+Z2V0Q29tbWVudHNUb0VkaXRvcigpCiAJCQkpOworCQl9IGVsc2Ugewor CQkJJGpvdXJuYWwgPSYgUmVxdWVzdDo6Z2V0Sm91cm5hbCgpOworCQkJJHN1cHBvcnRlZFN1Ym1p c3Npb25Mb2NhbGVzID0gJGpvdXJuYWwtPmdldFNldHRpbmcoJ3N1cHBvcnRlZFN1Ym1pc3Npb25M b2NhbGVzJyk7CisJCQkvLyBUcnkgdGhlc2UgbG9jYWxlcyBpbiBvcmRlciB1bnRpbCB3ZSBmaW5k IG9uZSB0aGF0J3MKKwkJCS8vIHN1cHBvcnRlZCB0byB1c2UgYXMgYSBkZWZhdWx0LgorCQkJJHRy eUxvY2FsZXMgPSBhcnJheSgKKwkJCQkkdGhpcy0+Z2V0Rm9ybUxvY2FsZSgpLCAvLyBDdXJyZW50 IGZvcm0gbG9jYWxlCisJCQkJTG9jYWxlOjpnZXRMb2NhbGUoKSwgLy8gQ3VycmVudCBVSSBsb2Nh bGUKKwkJCQkkam91cm5hbC0+Z2V0UHJpbWFyeUxvY2FsZSgpLCAvLyBKb3VybmFsIGxvY2FsZQor CQkJCSRzdXBwb3J0ZWRTdWJtaXNzaW9uTG9jYWxlc1thcnJheV9zaGlmdChhcnJheV9rZXlzKCRz dXBwb3J0ZWRTdWJtaXNzaW9uTG9jYWxlcykpXSAvLyBGYWxsYmFjazogZmlyc3Qgb25lIG9uIHRo ZSBsaXN0CisJCQkpOworCQkJJHRoaXMtPl9kYXRhID0gYXJyYXkoKTsKKwkJCWZvcmVhY2ggKCR0 cnlMb2NhbGVzIGFzICRsb2NhbGUpIHsKKwkJCQlpZiAoaW5fYXJyYXkoJGxvY2FsZSwgJHN1cHBv cnRlZFN1Ym1pc3Npb25Mb2NhbGVzKSkgeworCQkJCQkvLyBGb3VuZCBhIGRlZmF1bHQgdG8gdXNl CisJCQkJCSR0aGlzLT5fZGF0YVsnbG9jYWxlJ10gPSAkbG9jYWxlOworCQkJCQlicmVhazsKKwkJ CQl9CisJCQl9CiAJCX0KIAl9CiAKQEAgLTg3LDcgKzEyMCw3IEBAIGNsYXNzIEF1dGhvclN1Ym1p dFN0ZXAxRm9ybSBleHRlbmRzIEF1dGhvclN1Ym1pdEZvcm0gewogCSAqIEFzc2lnbiBmb3JtIGRh dGEgdG8gdXNlci1zdWJtaXR0ZWQgZGF0YS4KIAkgKi8KIAlmdW5jdGlvbiByZWFkSW5wdXREYXRh KCkgewotCQkkdGhpcy0+cmVhZFVzZXJWYXJzKGFycmF5KCdzdWJtaXNzaW9uQ2hlY2tsaXN0Jywg J2NvcHlyaWdodE5vdGljZUFncmVlJywgJ3NlY3Rpb25JZCcsICdjb21tZW50c1RvRWRpdG9yJykp OworCQkkdGhpcy0+cmVhZFVzZXJWYXJzKGFycmF5KCdsb2NhbGUnLCAnc3VibWlzc2lvbkNoZWNr bGlzdCcsICdjb3B5cmlnaHROb3RpY2VBZ3JlZScsICdzZWN0aW9uSWQnLCAnY29tbWVudHNUb0Vk aXRvcicpKTsKIAl9CiAKIAkvKioKQEAgLTExMyw3ICsxNDYsNyBAQCBjbGFzcyBBdXRob3JTdWJt aXRTdGVwMUZvcm0gZXh0ZW5kcyBBdXRob3JTdWJtaXRGb3JtIHsKIAkJCSR1c2VyID0mIFJlcXVl c3Q6OmdldFVzZXIoKTsKIAogCQkJJHRoaXMtPmFydGljbGUgPSBuZXcgQXJ0aWNsZSgpOwotCQkJ JHRoaXMtPmFydGljbGUtPnNldExvY2FsZShMb2NhbGU6OmdldExvY2FsZSgpKTsgLy8gRklYTUUg aW4gYnVnICM1NTQzCisJCQkkdGhpcy0+YXJ0aWNsZS0+c2V0TG9jYWxlKCR0aGlzLT5nZXREYXRh KCdsb2NhbGUnKSk7CiAJCQkkdGhpcy0+YXJ0aWNsZS0+c2V0VXNlcklkKCR1c2VyLT5nZXRJZCgp KTsKIAkJCSR0aGlzLT5hcnRpY2xlLT5zZXRKb3VybmFsSWQoJGpvdXJuYWwtPmdldElkKCkpOwog CQkJJHRoaXMtPmFydGljbGUtPnNldFNlY3Rpb25JZCgkdGhpcy0+Z2V0RGF0YSgnc2VjdGlvbklk JykpOwpkaWZmIC0tZ2l0IGEvY2xhc3Nlcy9tYW5hZ2VyL2Zvcm0vTGFuZ3VhZ2VTZXR0aW5nc0Zv cm0uaW5jLnBocCBiL2NsYXNzZXMvbWFuYWdlci9mb3JtL0xhbmd1YWdlU2V0dGluZ3NGb3JtLmlu Yy5waHAKaW5kZXggMjY2ODZlMS4uNzc2YjRhYiAxMDA2NDQKLS0tIGEvY2xhc3Nlcy9tYW5hZ2Vy L2Zvcm0vTGFuZ3VhZ2VTZXR0aW5nc0Zvcm0uaW5jLnBocAorKysgYi9jbGFzc2VzL21hbmFnZXIv Zm9ybS9MYW5ndWFnZVNldHRpbmdzRm9ybS5pbmMucGhwCkBAIC0zMyw2ICszMyw3IEBAIGNsYXNz IExhbmd1YWdlU2V0dGluZ3NGb3JtIGV4dGVuZHMgRm9ybSB7CiAKIAkJJHRoaXMtPnNldHRpbmdz ID0gYXJyYXkoCiAJCQknc3VwcG9ydGVkTG9jYWxlcycgPT4gJ29iamVjdCcsCisJCQknc3VwcG9y dGVkU3VibWlzc2lvbkxvY2FsZXMnID0+ICdvYmplY3QnLAogCQkJJ3N1cHBvcnRlZEZvcm1Mb2Nh bGVzJyA9PiAnb2JqZWN0JwogCQkpOwogCkBAIC02OSw3ICs3MCw3IEBAIGNsYXNzIExhbmd1YWdl U2V0dGluZ3NGb3JtIGV4dGVuZHMgRm9ybSB7CiAKIAkJJHRoaXMtPnNldERhdGEoJ3ByaW1hcnlM b2NhbGUnLCAkam91cm5hbC0+Z2V0UHJpbWFyeUxvY2FsZSgpKTsKIAotCQlmb3JlYWNoIChhcnJh eSgnc3VwcG9ydGVkRm9ybUxvY2FsZXMnLCAnc3VwcG9ydGVkTG9jYWxlcycpIGFzICRuYW1lKSB7 CisJCWZvcmVhY2ggKGFycmF5KCdzdXBwb3J0ZWRGb3JtTG9jYWxlcycsICdzdXBwb3J0ZWRTdWJt aXNzaW9uTG9jYWxlcycsICdzdXBwb3J0ZWRMb2NhbGVzJykgYXMgJG5hbWUpIHsKIAkJCWlmICgk dGhpcy0+Z2V0RGF0YSgkbmFtZSkgPT0gbnVsbCB8fCAhaXNfYXJyYXkoJHRoaXMtPmdldERhdGEo JG5hbWUpKSkgewogCQkJCSR0aGlzLT5zZXREYXRhKCRuYW1lLCBhcnJheSgpKTsKIAkJCX0KQEAg LTg0LDcgKzg1LDcgQEAgY2xhc3MgTGFuZ3VhZ2VTZXR0aW5nc0Zvcm0gZXh0ZW5kcyBGb3JtIHsK IAkJJHZhcnNbXSA9ICdwcmltYXJ5TG9jYWxlJzsKIAkJJHRoaXMtPnJlYWRVc2VyVmFycygkdmFy cyk7CiAKLQkJZm9yZWFjaCAoYXJyYXkoJ3N1cHBvcnRlZEZvcm1Mb2NhbGVzJywgJ3N1cHBvcnRl ZExvY2FsZXMnKSBhcyAkbmFtZSkgeworCQlmb3JlYWNoIChhcnJheSgnc3VwcG9ydGVkRm9ybUxv Y2FsZXMnLCAnc3VwcG9ydGVkU3VibWlzc2lvbkxvY2FsZXMnLCAnc3VwcG9ydGVkTG9jYWxlcycp IGFzICRuYW1lKSB7CiAJCQlpZiAoJHRoaXMtPmdldERhdGEoJG5hbWUpID09IG51bGwgfHwgIWlz X2FycmF5KCR0aGlzLT5nZXREYXRhKCRuYW1lKSkpIHsKIAkJCQkkdGhpcy0+c2V0RGF0YSgkbmFt ZSwgYXJyYXkoKSk7CiAJCQl9CkBAIC05OSw3ICsxMDAsNyBAQCBjbGFzcyBMYW5ndWFnZVNldHRp bmdzRm9ybSBleHRlbmRzIEZvcm0gewogCQkkc2V0dGluZ3NEYW8gPSYgREFPUmVnaXN0cnk6Omdl dERBTygnSm91cm5hbFNldHRpbmdzREFPJyk7CiAKIAkJLy8gVmVyaWZ5IGFkZGl0aW9uYWwgbG9j YWxlcwotCQlmb3JlYWNoIChhcnJheSgnc3VwcG9ydGVkTG9jYWxlcycsICdzdXBwb3J0ZWRGb3Jt TG9jYWxlcycpIGFzICRuYW1lKSB7CisJCWZvcmVhY2ggKGFycmF5KCdzdXBwb3J0ZWRMb2NhbGVz JywgJ3N1cHBvcnRlZFN1Ym1pc3Npb25Mb2NhbGVzJywgJ3N1cHBvcnRlZEZvcm1Mb2NhbGVzJykg YXMgJG5hbWUpIHsKIAkJCSQkbmFtZSA9IGFycmF5KCk7CiAJCQlmb3JlYWNoICgkdGhpcy0+Z2V0 RGF0YSgkbmFtZSkgYXMgJGxvY2FsZSkgewogCQkJCWlmIChMb2NhbGU6OmlzTG9jYWxlVmFsaWQo JGxvY2FsZSkgJiYgaW5fYXJyYXkoJGxvY2FsZSwgJHRoaXMtPmF2YWlsYWJsZUxvY2FsZXMpKSB7 CkBAIC0xMTIsMTMgKzExMywxNCBAQCBjbGFzcyBMYW5ndWFnZVNldHRpbmdzRm9ybSBleHRlbmRz IEZvcm0gewogCiAJCS8vIE1ha2Ugc3VyZSBhdCBsZWFzdCB0aGUgcHJpbWFyeSBsb2NhbGUgaXMg Y2hvc2VuIGFzIGF2YWlsYWJsZQogCQlpZiAoJHByaW1hcnlMb2NhbGUgIT0gbnVsbCAmJiAhZW1w dHkoJHByaW1hcnlMb2NhbGUpKSB7Ci0JCQlmb3JlYWNoIChhcnJheSgnc3VwcG9ydGVkTG9jYWxl cycsICdzdXBwb3J0ZWRGb3JtTG9jYWxlcycpIGFzICRuYW1lKSB7CisJCQlmb3JlYWNoIChhcnJh eSgnc3VwcG9ydGVkTG9jYWxlcycsICdzdXBwb3J0ZWRTdWJtaXNzaW9uTG9jYWxlcycsICdzdXBw b3J0ZWRGb3JtTG9jYWxlcycpIGFzICRuYW1lKSB7CiAJCQkJaWYgKCFpbl9hcnJheSgkcHJpbWFy eUxvY2FsZSwgJCRuYW1lKSkgewogCQkJCQlhcnJheV9wdXNoKCQkbmFtZSwgJHByaW1hcnlMb2Nh bGUpOwogCQkJCX0KIAkJCX0KIAkJfQogCQkkdGhpcy0+c2V0RGF0YSgnc3VwcG9ydGVkTG9jYWxl cycsICRzdXBwb3J0ZWRMb2NhbGVzKTsKKwkJJHRoaXMtPnNldERhdGEoJ3N1cHBvcnRlZFN1Ym1p c3Npb25Mb2NhbGVzJywgJHN1cHBvcnRlZFN1Ym1pc3Npb25Mb2NhbGVzKTsKIAkJJHRoaXMtPnNl dERhdGEoJ3N1cHBvcnRlZEZvcm1Mb2NhbGVzJywgJHN1cHBvcnRlZEZvcm1Mb2NhbGVzKTsKIAog CQlmb3JlYWNoICgkdGhpcy0+X2RhdGEgYXMgJG5hbWUgPT4gJHZhbHVlKSB7CmRpZmYgLS1naXQg YS9kYnNjcmlwdHMveG1sL3VwZ3JhZGUvMi4zLjJfdXBkYXRlLnhtbCBiL2Ric2NyaXB0cy94bWwv dXBncmFkZS8yLjMuMl91cGRhdGUueG1sCmluZGV4IGExZjk3NjUuLmYzNTg5ZDggMTAwNjQ0Ci0t LSBhL2Ric2NyaXB0cy94bWwvdXBncmFkZS8yLjMuMl91cGRhdGUueG1sCisrKyBiL2Ric2NyaXB0 cy94bWwvdXBncmFkZS8yLjMuMl91cGRhdGUueG1sCkBAIC00MCw1ICs0MCw5IEBACiAJCTxxdWVy eSBkcml2ZXI9InBvc3RncmVzNyI+CiAJCQlVUERBVEUgYXJ0aWNsZXMgU0VUIGxvY2FsZSA9IGou cHJpbWFyeV9sb2NhbGUgRlJPTSBqb3VybmFscyBqIFdIRVJFIGFydGljbGVzLmpvdXJuYWxfaWQg PSBqLmpvdXJuYWxfaWQKIAkJPC9xdWVyeT4KKwkJPCEtLSBVc2UgdGhlIGN1cnJlbnQgc2V0IG9m IGZvcm0gbG9jYWxlcyBhcyBhIGRlZmF1bHQgZm9yIHN1cHBvcnRlZCBzdWJtaXNzaW9uIGxvY2Fs ZXMgLS0+CisJCTxxdWVyeT4KKwkJCUlOU0VSVCBJTlRPIGpvdXJuYWxfc2V0dGluZ3MgKGpvdXJu YWxfaWQsIGxvY2FsZSwgc2V0dGluZ19uYW1lLCBzZXR0aW5nX3ZhbHVlLCBzZXR0aW5nX3R5cGUp IFNFTEVDVCBqb3VybmFsX2lkLCBsb2NhbGUsICdzdXBwb3J0ZWRTdWJtaXNzaW9uTG9jYWxlcycs IHNldHRpbmdfdmFsdWUsIHNldHRpbmdfdHlwZSBGUk9NIGpvdXJuYWxfc2V0dGluZ3MgV0hFUkUg c2V0dGluZ19uYW1lID0gJ3N1cHBvcnRlZEZvcm1Mb2NhbGVzJworCQk8L3F1ZXJ5PgogCTwvc3Fs PgogPC9kYXRhPgpkaWZmIC0tZ2l0IGEvbG9jYWxlL2VuX1VTL2F1dGhvci54bWwgYi9sb2NhbGUv ZW5fVVMvYXV0aG9yLnhtbAppbmRleCAwMGI0NDkxLi43OTk2NGU1IDEwMDY0NAotLS0gYS9sb2Nh bGUvZW5fVVMvYXV0aG9yLnhtbAorKysgYi9sb2NhbGUvZW5fVVMvYXV0aG9yLnhtbApAQCAtNTEs NiArNTEsOCBAQAogCTxtZXNzYWdlIGtleT0iYXV0aG9yLnN1Ym1pdC5qb3VybmFsU2VjdGlvbiI+ Sm91cm5hbCBTZWN0aW9uPC9tZXNzYWdlPgogCTxtZXNzYWdlIGtleT0iYXV0aG9yLnN1Ym1pdC5q b3VybmFsU2VjdGlvbkRlc2NyaXB0aW9uIj48IVtDREFUQVtTZWxlY3QgdGhlIGFwcHJvcHJpYXRl IHNlY3Rpb24gZm9yIHRoaXMgc3VibWlzc2lvbiAoc2VlIFNlY3Rpb25zIGFuZCBQb2xpY2llcyBp biA8YSBocmVmPSJ7JGFib3V0VXJsfSIgdGFyZ2V0PSJfbmV3Ij5BYm91dDwvYT4gdGhlIEpvdXJu YWwpLl1dPjwvbWVzc2FnZT4KIAk8bWVzc2FnZSBrZXk9ImF1dGhvci5zdWJtaXQuc2VsZWN0U2Vj dGlvbiI+UGxlYXNlIHNlbGVjdCBhIHNlY3Rpb24uLi48L21lc3NhZ2U+CisJPG1lc3NhZ2Uga2V5 PSJhdXRob3Iuc3VibWl0LnN1Ym1pc3Npb25Mb2NhbGUiPlN1Ym1pc3Npb24gTGFuZ3VhZ2U8L21l c3NhZ2U+CisJPG1lc3NhZ2Uga2V5PSJhdXRob3Iuc3VibWl0LnN1Ym1pc3Npb25Mb2NhbGVEZXNj cmlwdGlvbiI+VGhpcyBqb3VybmFsIGFjY2VwdHMgc3VibWlzc2lvbnMgaW4gc2V2ZXJhbCBsYW5n dWFnZXMuIENob29zZSB0aGUgcHJpbWFyeSBsYW5ndWFnZSBvZiB0aGUgc3VibWlzc2lvbiBmcm9t IHRoZSBwdWxsZG93biBiZWxvdy48L21lc3NhZ2U+CiAJPG1lc3NhZ2Uga2V5PSJhdXRob3Iuc3Vi bWl0LnN1Ym1pc3Npb25DaGVja2xpc3QiPlN1Ym1pc3Npb24gQ2hlY2tsaXN0PC9tZXNzYWdlPgog CTxtZXNzYWdlIGtleT0iYXV0aG9yLnN1Ym1pdC5zdWJtaXNzaW9uQ2hlY2tsaXN0RGVzY3JpcHRp b24iPkluZGljYXRlIHRoYXQgdGhpcyBzdWJtaXNzaW9uIGlzIHJlYWR5IHRvIGJlIGNvbnNpZGVy ZWQgYnkgdGhpcyBqb3VybmFsIGJ5IGNoZWNraW5nIG9mZiB0aGUgZm9sbG93aW5nIChjb21tZW50 cyB0byB0aGUgZWRpdG9yIGNhbiBiZSBhZGRlZCBiZWxvdykuPC9tZXNzYWdlPgogCTxtZXNzYWdl IGtleT0iYXV0aG9yLnN1Ym1pdC52ZXJpZnlDaGVja2xpc3QiPllvdSBtdXN0IG1ha2Ugc3VyZSBh bGwgaXRlbXMgaW4gdGhlIHN1Ym1pc3Npb24gY2hlY2tsaXN0IGFyZSBzYXRpc2ZpZWQgYmVmb3Jl IGNvbnRpbnVpbmcuPC9tZXNzYWdlPgpAQCAtNTksNiArNjEsNyBAQAogCTxtZXNzYWdlIGtleT0i YXV0aG9yLnN1Ym1pdC5jb21tZW50c0ZvckVkaXRvciI+Q29tbWVudHMgZm9yIHRoZSBFZGl0b3I8 L21lc3NhZ2U+CiAJPG1lc3NhZ2Uga2V5PSJhdXRob3Iuc3VibWl0LmNvbW1lbnRzIj5FbnRlciB0 ZXh0IChvcHRpb25hbCk8L21lc3NhZ2U+CiAJPG1lc3NhZ2Uga2V5PSJhdXRob3Iuc3VibWl0LmZv cm0uc2VjdGlvblJlcXVpcmVkIj5QbGVhc2Ugc2VsZWN0IGFuIGFwcHJvcHJpYXRlIGpvdXJuYWwg c2VjdGlvbiBmb3IgdGhpcyBzdWJtaXNzaW9uLjwvbWVzc2FnZT4KKwk8bWVzc2FnZSBrZXk9ImF1 dGhvci5zdWJtaXQuZm9ybS5sb2NhbGVSZXF1aXJlZCI+UGxlYXNlIHNlbGVjdCBhIHN1Ym1pc3Np b24gbGFuZ3VhZ2UuPC9tZXNzYWdlPgogCTxtZXNzYWdlIGtleT0iYXV0aG9yLnN1Ym1pdC5wcml2 YWN5U3RhdGVtZW50Ij5Kb3VybmFsJ3MgUHJpdmFjeSBTdGF0ZW1lbnQ8L21lc3NhZ2U+CiAJPG1l c3NhZ2Uga2V5PSJhdXRob3Iuc3VibWl0LnJlb3JkZXJJbnN0cnVjdGlvbnMiPlJlb3JkZXIgYXV0 aG9ycyB0byBhcHBlYXIgaW4gdGhlIG9yZGVyIHRoZXkgd2lsbCBiZSBsaXN0ZWQgb24gcHVibGlj YXRpb24uPC9tZXNzYWdlPgogCTxtZXNzYWdlIGtleT0iYXV0aG9yLnN1Ym1pdC5yZW9yZGVyIj5S ZW9yZGVyIGF1dGhvcidzIG5hbWU8L21lc3NhZ2U+CmRpZmYgLS1naXQgYS9sb2NhbGUvZW5fVVMv bWFuYWdlci54bWwgYi9sb2NhbGUvZW5fVVMvbWFuYWdlci54bWwKaW5kZXggNGZmNWIyNS4uYTlm ZjhhNiAxMDA2NDQKLS0tIGEvbG9jYWxlL2VuX1VTL21hbmFnZXIueG1sCisrKyBiL2xvY2FsZS9l bl9VUy9tYW5hZ2VyLnhtbApAQCAtMjQsOSArMjQsMTAgQEAKIAk8bWVzc2FnZSBrZXk9Im1hbmFn ZXIuZ3JvdXBzLm5vbmVDcmVhdGVkIj5ObyBlZGl0b3JpYWwgdGVhbSBwb3NpdGlvbnMgaGF2ZSBi ZWVuIGNyZWF0ZWQuPC9tZXNzYWdlPgogCTxtZXNzYWdlIGtleT0ibWFuYWdlci5qb3VybmFsTWFu YWdlbWVudCI+Sm91cm5hbCBNYW5hZ2VtZW50PC9tZXNzYWdlPgogCTxtZXNzYWdlIGtleT0ibWFu YWdlci5sYW5ndWFnZS51aSI+VUk8L21lc3NhZ2U+CisJPG1lc3NhZ2Uga2V5PSJtYW5hZ2VyLmxh bmd1YWdlLnN1Ym1pc3Npb25zIj5TdWJtaXNzaW9uczwvbWVzc2FnZT4KIAk8bWVzc2FnZSBrZXk9 Im1hbmFnZXIubGFuZ3VhZ2UuZm9ybXMiPkZvcm1zPC9tZXNzYWdlPgogCTxtZXNzYWdlIGtleT0i bWFuYWdlci5sYW5ndWFnZS5jb25maXJtRGVmYXVsdFNldHRpbmdzT3ZlcndyaXRlIj5UaGlzIHdp bGwgcmVwbGFjZSBhbnkgbG9jYWxlLXNwZWNpZmljIGpvdXJuYWwgc2V0dGluZ3MgeW91IGhhZCBm b3IgdGhpcyBsb2NhbGU8L21lc3NhZ2U+Ci0JPG1lc3NhZ2Uga2V5PSJtYW5hZ2VyLmxhbmd1YWdl LnJlbG9hZExvY2FsaXplZERlZmF1bHRTZXR0aW5ncyI+UmVsb2FkIGxvY2FsZS1zcGVjaWZpYyBk ZWZhdWx0IHNldHRpbmdzPC9tZXNzYWdlPgorCTxtZXNzYWdlIGtleT0ibWFuYWdlci5sYW5ndWFn ZS5yZWxvYWRMb2NhbGl6ZWREZWZhdWx0U2V0dGluZ3MiPlJlbG9hZCBkZWZhdWx0czwvbWVzc2Fn ZT4KIAk8bWVzc2FnZSBrZXk9Im1hbmFnZXIubGFuZ3VhZ2VzLmxhbmd1YWdlSW5zdHJ1Y3Rpb25z Ij48IVtDREFUQVtPSlMgY2FuIGJlIG1hZGUgYXZhaWxhYmxlIHRvIHVzZXJzIGluIGFueSBvZiBz ZXZlcmFsIHN1cHBvcnRlZCBsYW5ndWFnZXMuIEFzIHdlbGwsIE9KUyBjYW4gb3BlcmF0ZSBhcyBh IG11bHRpbGluZ3VhbCBzeXN0ZW0sIHByb3ZpZGluZyB1c2VycyB3aXRoIGFuIGFiaWxpdHkgdG8g dG9nZ2xlIGJldHdlZW4gbGFuZ3VhZ2VzIG9uIGVhY2ggcGFnZSwgYW5kIGFsbG93aW5nIGNlcnRh aW4gZGF0YSB0byBiZSBlbnRlcmVkIGluIHNldmVyYWwgYWRkaXRpb25hbCBsYW5ndWFnZXMuPGJy IC8+PGJyLz5JZiBhIGxhbmd1YWdlIHN1cHBvcnRlZCBieSBPSlMgaXMgbm90IGxpc3RlZCBiZWxv dywgYXNrIHlvdXIgc2l0ZSBhZG1pbmlzdHJhdG9yIHRvIGluc3RhbGwgdGhlIGxhbmd1YWdlIGZy b20gdGhlIHNpdGUgYWRtaW5pc3RyYXRpb24gaW50ZXJmYWNlLiBGb3IgaW5zdHJ1Y3Rpb25zIG9u IGFkZGluZyBzdXBwb3J0IGZvciBuZXcgbGFuZ3VhZ2VzLCBwbGVhc2UgY29uc3VsdCB0aGUgT0pT IGRvY3VtZW50YXRpb24uXV0+PC9tZXNzYWdlPgogCTxtZXNzYWdlIGtleT0ibWFuYWdlci5sYW5n dWFnZXMubm9uZUF2YWlsYWJsZSI+U29ycnksIG5vIGFkZGl0aW9uYWwgbGFuZ3VhZ2VzIGFyZSBh dmFpbGFibGUuIENvbnRhY3QgeW91ciBzaXRlIGFkbWluaXN0cmF0b3IgaWYgeW91IHdpc2ggdG8g dXNlIGFkZGl0aW9uYWwgbGFuZ3VhZ2VzIHdpdGggdGhpcyBqb3VybmFsLjwvbWVzc2FnZT4KIAk8 bWVzc2FnZSBrZXk9Im1hbmFnZXIubGFuZ3VhZ2VzLnByaW1hcnlMb2NhbGVJbnN0cnVjdGlvbnMi PlRoaXMgd2lsbCBiZSB0aGUgZGVmYXVsdCBsYW5ndWFnZSBmb3IgdGhlIGpvdXJuYWwgc2l0ZS48 L21lc3NhZ2U+CmRpZmYgLS1naXQgYS90ZW1wbGF0ZXMvYXV0aG9yL3N1Ym1pdC9zdGVwMS50cGwg Yi90ZW1wbGF0ZXMvYXV0aG9yL3N1Ym1pdC9zdGVwMS50cGwKaW5kZXggMWFkNzA4NC4uODE3OGIz ZCAxMDA2NDQKLS0tIGEvdGVtcGxhdGVzL2F1dGhvci9zdWJtaXQvc3RlcDEudHBsCisrKyBiL3Rl bXBsYXRlcy9hdXRob3Ivc3VibWl0L3N0ZXAxLnRwbApAQCAtMjEsMTMgKzIxLDE0IEBACiAKIDxk aXYgY2xhc3M9InNlcGFyYXRvciI+PC9kaXY+CiAKKzxmb3JtIG5hbWU9InN1Ym1pdCIgbWV0aG9k PSJwb3N0IiBhY3Rpb249Int1cmwgb3A9InNhdmVTdWJtaXQiIHBhdGg9JHN1Ym1pdFN0ZXB9IiBv bnN1Ym1pdD0icmV0dXJuIGNoZWNrU3VibWlzc2lvbkNoZWNrbGlzdCgpIj4KK3tpbmNsdWRlIGZp bGU9ImNvbW1vbi9mb3JtRXJyb3JzLnRwbCJ9Cit7aWYgJGFydGljbGVJZH08aW5wdXQgdHlwZT0i aGlkZGVuIiBuYW1lPSJhcnRpY2xlSWQiIHZhbHVlPSJ7JGFydGljbGVJZHxlc2NhcGV9IiAvPnsv aWZ9CisKIHtpZiBjb3VudCgkc2VjdGlvbk9wdGlvbnMpIDw9IDF9CiAJPHA+e3RyYW5zbGF0ZSBr ZXk9ImF1dGhvci5zdWJtaXQubm90QWNjZXB0aW5nIn08L3A+CiB7ZWxzZX0KIAotPGZvcm0gbmFt ZT0ic3VibWl0IiBtZXRob2Q9InBvc3QiIGFjdGlvbj0ie3VybCBvcD0ic2F2ZVN1Ym1pdCIgcGF0 aD0kc3VibWl0U3RlcH0iIG9uc3VibWl0PSJyZXR1cm4gY2hlY2tTdWJtaXNzaW9uQ2hlY2tsaXN0 KCkiPgote2luY2x1ZGUgZmlsZT0iY29tbW9uL2Zvcm1FcnJvcnMudHBsIn0KLQoge2lmIGNvdW50 KCRzZWN0aW9uT3B0aW9ucykgPT0gMn0KIAl7KiBJZiB0aGVyZSdzIG9ubHkgb25lIHNlY3Rpb24s IGZvcmNlIGl0IGFuZCBza2lwIHRoZSBzZWN0aW9uIHBhcnRzCiAJICAgb2YgdGhlIGludGVyZmFj ZS4gKn0KQEAgLTQyLDkgKzQzLDYgQEAKIHt1cmx8YXNzaWduOiJ1cmwiIHBhZ2U9ImFib3V0In0K IDxwPnt0cmFuc2xhdGUga2V5PSJhdXRob3Iuc3VibWl0LmpvdXJuYWxTZWN0aW9uRGVzY3JpcHRp b24iIGFib3V0VXJsPSR1cmx9PC9wPgogCi17aWYgJGFydGljbGVJZH0KLQk8aW5wdXQgdHlwZT0i aGlkZGVuIiBuYW1lPSJhcnRpY2xlSWQiIHZhbHVlPSJ7JGFydGljbGVJZHxlc2NhcGV9IiAvPgot ey9pZn0KIDxpbnB1dCB0eXBlPSJoaWRkZW4iIG5hbWU9InN1Ym1pc3Npb25DaGVja2xpc3QiIHZh bHVlPSIxIiAvPgogCiA8dGFibGUgY2xhc3M9ImRhdGEiIHdpZHRoPSIxMDAlIj4KQEAgLTYwLDYg KzU4LDMwIEBACiAKIHsvaWZ9eyogaWYgY291bnQoJHNlY3Rpb25PcHRpb25zKSA9PSAyICp9CiAK K3tpZiBjb3VudCgkc3VwcG9ydGVkU3VibWlzc2lvbkxvY2FsZU5hbWVzKSA9PSAxfQorCXsqIFRo ZXJlIGlzIG9ubHkgb25lIHN1cHBvcnRlZCBzdWJtaXNzaW9uIGxvY2FsZTsgY2hvb3NlIGl0IGlu dmlzaWJseSAqfQorCXtmb3JlYWNoIGZyb209JHN1cHBvcnRlZFN1Ym1pc3Npb25Mb2NhbGVOYW1l cyBpdGVtPWxvY2FsZX0KKwkJPGlucHV0IHR5cGU9ImhpZGRlbiIgbmFtZT0ibG9jYWxlIiB2YWx1 ZT0ieyRsb2NhbGV8ZXNjYXBlfSIgLz4KKwl7L2ZvcmVhY2h9Cit7ZWxzZX0KKwl7KiBUaGVyZSBh cmUgc2V2ZXJhbCBzdWJtaXNzaW9uIGxvY2FsZXMgYXZhaWxhYmxlOyBhbGxvdyBjaG9pY2UgKn0K Kwk8ZGl2IGlkPSJzdWJtaXNzaW9uTG9jYWxlIj4KKworCTxoMz57dHJhbnNsYXRlIGtleT0iYXV0 aG9yLnN1Ym1pdC5zdWJtaXNzaW9uTG9jYWxlIn08L2gzPgorCTxwPnt0cmFuc2xhdGUga2V5PSJh dXRob3Iuc3VibWl0LnN1Ym1pc3Npb25Mb2NhbGVEZXNjcmlwdGlvbiJ9PC9wPgorCisJPHRhYmxl IGNsYXNzPSJkYXRhIiB3aWR0aD0iMTAwJSI+CisJCTx0ciB2YWxpZ249InRvcCI+CQorCQkJPHRk IHdpZHRoPSIyMCUiIGNsYXNzPSJsYWJlbCI+e2ZpZWxkTGFiZWwgbmFtZT0ibG9jYWxlIiByZXF1 aXJlZD0idHJ1ZSIga2V5PSJhcnRpY2xlLmxhbmd1YWdlIn08L3RkPgorCQkJPHRkIHdpZHRoPSI4 MCUiIGNsYXNzPSJ2YWx1ZSI+PHNlbGVjdCBuYW1lPSJsb2NhbGUiIGlkPSJsb2NhbGUiIHNpemU9 IjEiIGNsYXNzPSJzZWxlY3RNZW51Ij57aHRtbF9vcHRpb25zIG9wdGlvbnM9JHN1cHBvcnRlZFN1 Ym1pc3Npb25Mb2NhbGVOYW1lcyBzZWxlY3RlZD0kbG9jYWxlfTwvc2VsZWN0PjwvdGQ+CisJCTwv dHI+CisJPC90YWJsZT4KKworCTxkaXYgY2xhc3M9InNlcGFyYXRvciI+PC9kaXY+CisKKwk8L2Rp dj57KiBzdWJtaXNzaW9uTG9jYWxlICp9Cit7L2lmfXsqIGNvdW50KCRzdXBwb3J0ZWRTdWJtaXNz aW9uTG9jYWxlTmFtZXMpID09IDEgKn0KKwogPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQi Pgoge2xpdGVyYWx9CiA8IS0tCmRpZmYgLS1naXQgYS90ZW1wbGF0ZXMvbWFuYWdlci9sYW5ndWFn ZVNldHRpbmdzLnRwbCBiL3RlbXBsYXRlcy9tYW5hZ2VyL2xhbmd1YWdlU2V0dGluZ3MudHBsCmlu ZGV4IDVlNDdiZjQuLjVkMTFiMDYgMTAwNjQ0Ci0tLSBhL3RlbXBsYXRlcy9tYW5hZ2VyL2xhbmd1 YWdlU2V0dGluZ3MudHBsCisrKyBiL3RlbXBsYXRlcy9tYW5hZ2VyL2xhbmd1YWdlU2V0dGluZ3Mu dHBsCkBAIC0zOSw2ICszOSw3IEBACiAJCTx0ciB2YWxpZ249InRvcCI+CiAJCQk8dGQgd2lkdGg9 IjIwJSI+Jm5ic3A7PC90ZD4KIAkJCTx0ZCBhbGlnbj0iY2VudGVyIiB3aWR0aD0iMTAlIj57dHJh bnNsYXRlIGtleT0ibWFuYWdlci5sYW5ndWFnZS51aSJ9PC90ZD4KKwkJCTx0ZCBhbGlnbj0iY2Vu dGVyIiB3aWR0aD0iMjAlIj57dHJhbnNsYXRlIGtleT0ibWFuYWdlci5sYW5ndWFnZS5zdWJtaXNz aW9ucyJ9PC90ZD4KIAkJCTx0ZCBhbGlnbj0iY2VudGVyIiB3aWR0aD0iMTAlIj57dHJhbnNsYXRl IGtleT0ibWFuYWdlci5sYW5ndWFnZS5mb3JtcyJ9PC90ZD4KIAkJCTx0ZCB3aWR0aD0iNjAlIj4m bmJzcDs8L3RkPgogCQk8L3RyPgpAQCAtNDYsNiArNDcsNyBAQAogCQkJPHRyPgogCQkJCTx0ZD57 JGxvY2FsZU5hbWV8ZXNjYXBlfTwvdGQ+CiAJCQkJPHRkIGFsaWduPSJjZW50ZXIiPjxpbnB1dCB0 eXBlPSJjaGVja2JveCIgbmFtZT0ic3VwcG9ydGVkTG9jYWxlc1tdIiB2YWx1ZT0ieyRsb2NhbGVL ZXl8ZXNjYXBlfSJ7aWYgaW5fYXJyYXkoJGxvY2FsZUtleSwgJHN1cHBvcnRlZExvY2FsZXMpfSBj aGVja2VkPSJjaGVja2VkInsvaWZ9Lz48L3RkPgorCQkJCTx0ZCBhbGlnbj0iY2VudGVyIj48aW5w dXQgdHlwZT0iY2hlY2tib3giIG5hbWU9InN1cHBvcnRlZFN1Ym1pc3Npb25Mb2NhbGVzW10iIHZh bHVlPSJ7JGxvY2FsZUtleXxlc2NhcGV9IntpZiBpbl9hcnJheSgkbG9jYWxlS2V5LCAkc3VwcG9y dGVkU3VibWlzc2lvbkxvY2FsZXMpfSBjaGVja2VkPSJjaGVja2VkInsvaWZ9Lz48L3RkPgogCQkJ CTx0ZCBhbGlnbj0iY2VudGVyIj48aW5wdXQgdHlwZT0iY2hlY2tib3giIG5hbWU9InN1cHBvcnRl ZEZvcm1Mb2NhbGVzW10iIHZhbHVlPSJ7JGxvY2FsZUtleXxlc2NhcGV9IntpZiBpbl9hcnJheSgk bG9jYWxlS2V5LCAkc3VwcG9ydGVkRm9ybUxvY2FsZXMpfSBjaGVja2VkPSJjaGVja2VkInsvaWZ9 Lz48L3RkPgogCQkJCTx0ZD48YSBocmVmPSJ7dXJsIG9wPSJyZWxvYWRMb2NhbGl6ZWREZWZhdWx0 U2V0dGluZ3MiIGxvY2FsZVRvTG9hZD0kbG9jYWxlS2V5fSIgb25jbGljaz0icmV0dXJuIGNvbmZp cm0oJ3t0cmFuc2xhdGV8ZXNjYXBlOiJqc3BhcmFtIiBrZXk9Im1hbmFnZXIubGFuZ3VhZ2UuY29u ZmlybURlZmF1bHRTZXR0aW5nc092ZXJ3cml0ZSJ9JykiIGNsYXNzPSJhY3Rpb24iPnt0cmFuc2xh dGUga2V5PSJtYW5hZ2VyLmxhbmd1YWdlLnJlbG9hZExvY2FsaXplZERlZmF1bHRTZXR0aW5ncyJ9 PC9hPjwvdGQ+CiAJCQk8L3RyPgo=