156330 2008-01-21 19:45:15 +0000 [PATCH] Fix plugin loading in kate sessions 2016-06-06 13:14:23 +0000 1 1 2 Applications kate sessions unspecified Ubuntu Linux RESOLVED FIXED VHI critical --- 1 gethemant kwrite-bugs-null a.vanloon aacid alex.oleshkevich annma beat_fasel david.mike.simon dmitry.risenberg g4mba5 gskbyte hein iksdrijf illissius jl kilolima ltwilliams58 lucas markrose massimo.landozzi Michael.McTernan msnkipa MurzNN nik nzimas pickscrape projects.gg.aaron ralph steffenjost sucker_pvn travier will.angenent william.brandino wouter-kde zoom_re 258 oldest_to_newest 573706 0 gethemant 2008-01-21 19:45:15 +0000 Version: (using KDE 4.0.0) Installed from: Ubuntu Packages OS: Linux When using Kate4 from Ubuntu Gutsy builds, I enabled couple of plugins, but on restart they are gone. 578008 1 winfried.simon 2008-02-05 23:35:21 +0000 Hi, I agree to that behaviour, but the behaviour is a little bit more complex. 1) I enabled a couple of plugins, Kate crashes when closing (see also #156559) I deleted ~/.kde4/share/apps/kate/.. Afterwards I could close without crashing. 2) On my Box I can open Kate from Menu and it remembers the enabled plugins. When I open it from e.g. dolphin (by clicking on a text file) kate does not remember the plugins. Also ubuntu 7.10 Best Regards 579246 2 23518 paolo.capriotti 2008-02-10 14:47:19 +0000 Created attachment 23518 Save plugin configuration in the active session AFAICT, this happens because plugin configuration is saved in the global configuration file, but loaded from the session. This patch fixes the problem for me, by saving plugin configuration into the session file. 581254 3 dhaumann 2008-02-18 23:26:41 +0000 Thanks for the patch. Needs review wrt session management. 635124 4 paulo.fidalgo.pt 2008-08-07 13:07:44 +0000 I confir this bug! I think the plugin configuration should be independent of sessions. I don't use sessions, but I would like to have the plugin select on my next use. Best regards 660134 5 lucas 2008-11-04 07:23:35 +0000 Status on patch review? 676500 6 dhaumann 2008-12-06 11:34:24 +0000 *** Bug 177026 has been marked as a duplicate of this bug. *** 719692 7 steffenjost 2009-02-20 11:01:07 +0000 I also confirm this bug Suse11.1 64, KDE4.1.3, Kate 3.1.3: All plugins are deactivated when loading a previously saved session. Highly annoying. 729071 8 markrose 2009-03-11 17:11:59 +0000 This bug is also present in KDE 4.2.0 (Ubuntu Intrepid 64 bit). 759337 9 dhaumann 2009-05-17 23:20:33 +0000 *** Bug 192839 has been marked as a duplicate of this bug. *** 759343 10 dhaumann 2009-05-17 23:25:26 +0000 related: bug #156100 771361 11 dhaumann 2009-06-07 13:15:53 +0000 *** Bug 183297 has been marked as a duplicate of this bug. *** 794365 12 dhaumann 2009-07-18 12:57:22 +0000 *** Bug 200612 has been marked as a duplicate of this bug. *** 798216 13 ralph 2009-07-24 23:37:41 +0000 Not sure it's related. kate started in console gives following output when forgetting plugin kttsd. Calling appendChild() on a null node does nothing. 804475 14 Michael.McTernan 2009-08-04 22:00:12 +0000 kdesdk-4.2.4-1.fc11.i586, Fedora Core 11 is also afflicted - Kate rapidly forgets the plugins when using sessions, and also loses the associated keyboard shortcuts. 804724 15 Michael.McTernan 2009-08-05 10:12:38 +0000 So for kdesdk-4.2.4-1.fc11.i586, I've worked out at least one reproducible cause of plugin's being lost which matches Steffan Jost's report on this bug. The problem comes when you login and KDE tries to restore the previous session by running "kate -session <some long number>". Under this condition the plugin settings are not loaded. Specifically I find 3 possible locations for the settings, all which have the konsole plugin enabled: $ locate "*.katesession" | xargs grep plugin=true /home/mmcternan/.kde/share/apps/kate/default.katesession:kateexternaltoolsplugin=true /home/mmcternan/.kde/share/apps/kate/default.katesession:katefindinfilesplugin=true /home/mmcternan/.kde/share/apps/kate/default.katesession:katekonsoleplugin=true /home/mmcternan/.kde/share/apps/kate/default.katesession:katesnippetsplugin=true /home/mmcternan/.kde/share/apps/kate/sessions/DPCCH%20Searcher.katesession:kateexternaltoolsplugin=true /home/mmcternan/.kde/share/apps/kate/sessions/DPCCH%20Searcher.katesession:katefindinfilesplugin=true /home/mmcternan/.kde/share/apps/kate/sessions/DPCCH%20Searcher.katesession:katekonsoleplugin=true /home/mmcternan/.kde/share/apps/kate/sessions/DPCCH%20Searcher.katesession:katesnippetsplugin=true /usr/share/kde4/apps/kate/default.katesession:katefilebrowserplugin=true /usr/share/kde4/apps/kate/default.katesession:katefindinfilesplugin=true /usr/share/kde4/apps/kate/default.katesession:katekonsoleplugin=true Kate doesn't show any plugins when started with -session. Then, when exiting kate, the defaults are saved back, removing the plugins for subsequent sessions. As a workaround I've made my default settings file read-only (chmod a-w). Now the settings are still not loaded when KDE restores my last desktop session, but exiting kate doesn't nuke my default config; closing and reopening kate gets the plugins back again. Kate is a really nice editor with great features, but this losing of settings is driving me insane. I hope it can be fixed soon. 806627 16 zoom_re 2009-08-05 17:29:34 +0000 (In reply to comment #15) > So for kdesdk-4.2.4-1.fc11.i586, I've worked out at least one reproducible > cause of plugin's being lost which matches Steffan Jost's report on this bug. > > The problem comes when you login and KDE tries to restore the previous session > by running "kate -session <some long number>". Under this condition the plugin settings are not loaded. I can confirm this behavior on KDE 4.3, except that there is no such an option "-session" in kate from KDE 4.3 - there is "-s", which is short form of "--start". If i start kate from console: # kate -s "Default Session" all plugins are loaded ok. But something intrudes, when session manager tries to restore KDE session on login. Kate session restored, but without plugins. So it is probably not a Kate bug > Kate doesn't show any plugins when started with -session. Then, when exiting > kate, the defaults are saved back, removing the plugins for subsequent > sessions. > > As a workaround I've made my default settings file read-only (chmod a-w). Now > the settings are still not loaded when KDE restores my last desktop session, > but exiting kate doesn't nuke my default config; closing and reopening kate > gets the plugins back again. > > Kate is a really nice editor with great features, but this losing of settings > is driving me insane. I hope it can be fixed soon. 810530 17 dhaumann 2009-08-11 23:33:13 +0000 *** Bug 203372 has been marked as a duplicate of this bug. *** 824862 18 dhaumann 2009-09-05 11:40:07 +0000 *** Bug 206014 has been marked as a duplicate of this bug. *** 829809 19 nzimas 2009-09-13 17:15:36 +0000 On Kate 3.3.1, enabled plugins are *NOT* shown in the UI after a previously saved session is reopen, although the checkboxes to activate them appear ticked in Configure Kate > Plugins. KDE: 4.3.1 Kate: 3.3.1 Distribution: PCLinuxOS 849791 20 annma 2009-10-24 15:22:28 +0000 It's still there. Having to go to the configuration dialog each time I start my system to enable the terminal plugin is really an annoying bug. 859191 21 jl 2009-11-10 13:00:46 +0000 am i correct in stating that this bug has been around all the way through intrepid and jaunty? 859248 22 wouter-kde 2009-11-10 14:01:33 +0000 I don't know about Ubuntu, but as it's still present in Debian unstable as of today, it might very well be. 859302 23 anderslund 2009-11-10 15:43:31 +0000 AFAICT, the root of this problem is the default session missing. The solution should be that kate should load a virtual default session, if the user does not select one, and store your settings there. 890251 24 Michael.McTernan 2010-01-01 18:39:13 +0000 (In reply to comment #23) > AFAICT, the root of this problem is the default session missing. > > The solution should be that kate should load a virtual default session, if the > user does not select one, and store your settings there. I'm not sure this is it. When I copy my saved session over the default session and then run Kate, the plugins still don't come: $ pwd ~/.kde/share/apps/kate $ cp sessions/Kate.katesession default.katesession $ kate ... still no plugins until I manually load the 'Kate' session through Sessions->Manage... select my 'Kate' session and then click Ok. Maybe if it's never going to be fixed, the session stuff can be disabled/removed? I'd prefer a single config if it can remember my config from the last run. 890451 25 jl 2010-01-02 08:27:04 +0000 Michael.McTernan.2001: "Maybe if it's never going to be fixed, the session stuff can be disabled/removed? I'd prefer a single config if it can remember my config from the last run." I agree 100% with this. This bug has prevented any of our developers from following me to Karmic. I've had no choice but to use KDevelop and pursuit other editors until this is remedied :-( As with all bugs I'm tracking (eg KNetworkManager), I have seen little to no developer input. Where are the developers? 890469 26 zoom_re 2010-01-02 10:47:19 +0000 (In reply to comment #25) > As with all bugs I'm tracking (eg KNetworkManager), I have seen little to no > developer input. Where are the developers? developers still struggling with vim, no time for some second-league editor :\ (joking, of course. i'm totally agree with free sw's "if you don't like it, fix it youself". This bug is not so irritating for me, due to lack of really useful plugins) 891333 27 dhaumann 2010-01-03 19:07:57 +0000 In upcoming KDE 4.4 Kate will always save the session config. The options were removed what to do on exit (i.e. no ask, no not-safe). 891665 28 zoom_re 2010-01-04 10:38:20 +0000 (In reply to comment #27) > In upcoming KDE 4.4 Kate will always save the session config. The options were > removed what to do on exit (i.e. no ask, no not-safe). Does it supposed to fix this bug? An is this change already included in kde 4.4 beta2 ? 891733 29 jl 2010-01-04 12:54:31 +0000 does anyone know of a kate nightly binary build that we could subscribe to? that would save us *buntu people from 6 months of angst :) thanks 921518 30 dhaumann 2010-02-21 00:55:10 +0000 *** Bug 177240 has been marked as a duplicate of this bug. *** 921630 31 steffenjost 2010-02-21 10:35:21 +0000 I am confused what reply #27 means. The bug is still there in KDE 4.4 final as released for openSuse 11.2. (The version number reads KDE 4.4.00 "release 224".) 921737 32 g4mba5 2010-02-21 14:07:32 +0000 I confirm that plugins are still disabled when restoring sessions in KDE 4.4.0 (Mandriva 2010.0). 921899 33 dhaumann 2010-02-21 17:43:11 +0000 Using name sessions works. When not using sessions, it only works if you invoke Sessions > Save as Default. This is also why the report is still open. 922449 34 zoom_re 2010-02-22 13:19:46 +0000 (In reply to comment #33) > Using name sessions works. When not using sessions, it only works if you invoke > Sessions > Save as Default. This is also why the report is still open. in kde 4.4.0 this still does not work even using sessions: testcase: 1) open few documents in kate 2) in settings enable some plugins (filebrowser, for ex.) - filebrowser tab should appear in one of dockareas 3) save this as a session with some name ('mysession', for ex.) 4) logout and login back - kate restored opened files, and session name 'mysession:' can be seen in window title. but no plugins are enabled. 930681 35 dhaumann 2010-03-08 20:52:23 +0000 *** Bug 229827 has been marked as a duplicate of this bug. *** 931313 36 ewoerner 2010-03-10 01:23:43 +0000 *** Bug 210492 has been marked as a duplicate of this bug. *** 942333 37 travier 2010-03-30 08:30:12 +0000 I've got the same prolem with kate 3.4.1 on KDE 4.4.1 with an Arch Linux box. Kate should save the session and close when I logout (suspend to ram raises the same problem) and restore previous session at statup. 944920 38 nik 2010-04-04 23:00:53 +0000 I can confirm this bug under Kubuntu 9.10 using latest KDE4.4.2. 961975 39 dhaumann 2010-05-14 13:00:14 +0000 *** Bug 237590 has been marked as a duplicate of this bug. *** 972736 40 dhaumann 2010-06-03 19:18:29 +0000 *** Bug 240441 has been marked as a duplicate of this bug. *** 986013 41 nik 2010-07-04 03:42:58 +0000 This bug still exists using Kate 3.4.5 (under Kubuntu Lucid Lynx, 64-bit). 986020 42 aphidia 2010-07-04 05:28:39 +0000 Confirming under 3.4.2 64bit Kubuntu Lucid Lynx KDE 4.4.2 Kate Part 3.4 996415 43 nik 2010-07-30 18:30:27 +0000 The (old) Bug #173283 reported in <https://bugs.launchpad.net/ubuntu/+source/kdebase/+bug/173283> is I guess related(?). Comment #10 in this report is the solution. Cheers, Nikos 996419 44 nik 2010-07-30 18:34:44 +0000 Just to avoid confusions: apologies for ignoring the auto-linking feature to comments and bug reports within "bugs.kde.org". All references in (previous) comment number 43 are related to a report in launchpad (in the provided full-link of course). 996420 45 g4mba5 2010-07-30 18:38:21 +0000 Not related in my case: all my KDE configuration files have the right permissions. With Mandriva 2010.1 and KDE 4.4.3, Kate does not reload plugins at session restoration. But it does when quitting it and lauching it again. 996423 46 nik 2010-07-30 18:49:48 +0000 Sorry to read that gambas. It fixed for me the issue(s). 1001250 47 zoom_re 2010-08-10 22:02:47 +0000 (In reply to comment #46) > Sorry to read that gambas. It fixed for me the issue(s). In my case this is also unrelated. All permissions are fine. 1002654 48 MurzNN 2010-08-13 10:36:12 +0000 I have no permission issues, described in https://bugs.launchpad.net/ubuntu/+source/kdebase/+bug/173283 post #10, but have the problem with plugin loading. System is Kubuntu Lucid, KDE 4.4. KDE 4.5 Beta2 have this issue too. When I enable plugins and quit kate, starts again - enabled plugins are disabled. Doing "Sessions > Save Session as Default" solve the problem for me. 1033966 49 a.vanloon 2010-10-18 22:56:50 +0000 In comment #27 the developer mentioned that in KDE 4.4 Kate will always save the session config so that this problem will be solved. However, with KDE 4.5.1 I still experience this bug. I was wondering if there is an updated time frame on when this bug is going to get fixed? 1036388 50 dhaumann 2010-10-24 13:53:43 +0000 *** Bug 243972 has been marked as a duplicate of this bug. *** 1037003 51 52863 dhaumann 2010-10-25 22:01:24 +0000 Created attachment 52863 Save unnamed sessions to katerc The attached patch is an attempt to eliminate the default.katesession file again. Instead, all config data is saved to katerc. Additionally, "Session > Save as Default" is removed. On Kate exit, an unnamed session is saved to katerc. Please try this patch: 1. first checkout the development version http://kate-editor.org/get-it/ 2. then apply the patch in your checkout with: patch -p1 < default-session-in-katerc.patch 3. compile/install kate and then run it with the run.sh script. Questions: 1. Does that fix the plugin loading bug? 2. Are there other _new_ problems introduced with this change? 1037222 52 dhaumann 2010-10-26 13:50:24 +0000 *** Bug 116511 has been marked as a duplicate of this bug. *** 1037279 53 dhaumann 2010-10-26 15:41:57 +0000 *** Bug 240313 has been marked as a duplicate of this bug. *** 1037282 54 dhaumann 2010-10-26 15:43:53 +0000 *** Bug 211601 has been marked as a duplicate of this bug. *** 1037456 55 dhaumann 2010-10-26 23:09:29 +0000 The patch is committed to gitorious now: http://gitorious.org/kate/kate/commit/c75047e756e5b2db99d410fdc3ee13a57a4b3060 This removes the default.katesession and merges it back into the katerc config file. Unnamed sessions are read and written back to katerc. This way, changes in the plugin settings and the recent-files-menu are saved. Please test this thoroughly by simply following http://kate-editor.org/get-it/ , so we can be sure it's working for KDE 4.6! 1037477 56 dhaumann 2010-10-27 00:00:42 +0000 *** Bug 227497 has been marked as a duplicate of this bug. *** 1037479 57 dhaumann 2010-10-27 00:02:07 +0000 *** Bug 198866 has been marked as a duplicate of this bug. *** 1039054 58 christoph 2010-10-31 16:50:23 +0000 SVN commit 1191600 by cullmann: dhaumann: fix bug #156330: lugin loading in kate sessions This removes the default.katesession and merges it back into the katerc config file. Unnamed sessions are read and written back to katerc. This way, changes in the plugin settings and the recent-files-menu are saved. Please test this thoroughly, so we can be sure it's working for KDE 4.6! BUG: 156330 M +2 -2 app/kateapp.cpp M +4 -1 app/kateconfigdialog.cpp M +0 -4 app/katemainwindow.cpp M +10 -41 app/katesession.cpp M +4 -15 app/katesession.h M +1 -1 data/CMakeLists.txt D data/default.katesession M +0 -4 data/kate.desktop M +30 -1 data/katerc M +0 -1 data/kateui.rc WebSVN link: http://websvn.kde.org/?view=rev&revision=1191600 1379004 59 ltwilliams58 2013-06-24 03:36:47 +0000 I wonder if I should open a new bug since the behavior that got me here persists in Kate 3.10.3 on KDE 4.10.3 1381547 60 cfeck 2013-07-05 12:26:44 +0000 Yes, please report a new bug, with exact steps to reproduce. 1599532 61 william.brandino 2016-06-06 13:14:23 +0000 This is not solved. Occur with frequence when changes sessions. Ubuntu 16.04 - Version 15.12.3 23518 2008-02-10 14:47:19 +0000 2010-10-25 22:01:24 +0000 Save plugin configuration in the active session bug156330.patch text/plain 1007 paolo.capriotti SW5kZXg6IGFwcC9rYXRlY29uZmlnZGlhbG9nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBhcHAva2F0ZWNv bmZpZ2RpYWxvZy5jcHAJKHJldmlzaW9uIDc3MzE2MikKKysrIGFwcC9rYXRlY29uZmlnZGlhbG9n LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjksNiArMjksNyBAQAogI2luY2x1ZGUgImthdGV2aWV3 bWFuYWdlci5oIgogI2luY2x1ZGUgImthdGVhcHAuaCIKICNpbmNsdWRlICJrYXRlZmlsZWxpc3Qu aCIKKyNpbmNsdWRlICJrYXRlc2Vzc2lvbi5oIgogCiAjaW5jbHVkZSA8S1RleHRFZGl0b3IvQ29u ZmlnUGFnZT4KICNpbmNsdWRlIDxLVGV4dEVkaXRvci9FZGl0b3JDaG9vc2VyPgpAQCAtMzk3LDcg KzM5OCwxNCBAQAogICAgIG1fbWFpbldpbmRvdy0+c2F2ZU9wdGlvbnMgKCk7CiAKICAgICAvLyBz YXZlIHBsdWdpbiBjb25maWcgISEKLSAgICBLYXRlQXBwOjpzZWxmKCktPnBsdWdpbk1hbmFnZXIo KS0+d3JpdGVDb25maWcgKEtHbG9iYWw6OmNvbmZpZygpLmRhdGEoKSk7CisgICAgS2F0ZVNlc3Np b25NYW5hZ2VyICpzZXNzaW9ubWFuYWdlciA9IEthdGVTZXNzaW9uTWFuYWdlcjo6c2VsZigpOwor ICAgIEtDb25maWcgKnNjID0gc2Vzc2lvbm1hbmFnZXItPmFjdGl2ZVNlc3Npb24oKS0+Y29uZmln V3JpdGUoKTsKKyAgICBib29sIGRlZmF1bHRTZXNzaW9uID0gIXNjOworICAgIGlmICggZGVmYXVs dFNlc3Npb24gKQorICAgICAgc2MgPSBuZXcgS0NvbmZpZyggc2Vzc2lvbm1hbmFnZXItPmRlZmF1 bHRTZXNzaW9uRmlsZSgpLCBLQ29uZmlnOjpTaW1wbGVDb25maWcgKTsKKyAgICBLYXRlQXBwOjpz ZWxmKCktPnBsdWdpbk1hbmFnZXIoKS0+d3JpdGVDb25maWcgKHNjKTsKKyAgICBpZiAoIGRlZmF1 bHRTZXNzaW9uICkKKyAgICAgIGRlbGV0ZSBzYzsKICAgfQogCiAgIGZvcmVhY2ggKEtUZXh0RWRp dG9yOjpDb25maWdQYWdlICpwYWdlLCBtX2VkaXRvclBhZ2VzKQo= 52863 2010-10-25 22:01:24 +0000 2010-10-25 22:01:24 +0000 Save unnamed sessions to katerc default-session-in-katerc.patch text/plain 11686 dhaumann ZGlmZiAtLWdpdCBhL2thdGUvYXBwL2thdGVhcHAuY3BwIGIva2F0ZS9hcHAva2F0ZWFwcC5jcHAK aW5kZXggMDQ1ZTFlOC4uNTJiNzdmNyAxMDA2NDQKLS0tIGEva2F0ZS9hcHAva2F0ZWFwcC5jcHAK KysrIGIva2F0ZS9hcHAva2F0ZWFwcC5jcHAKQEAgLTE0Nyw3ICsxNDcsNyBAQCB2b2lkIEthdGVB cHA6OmluaXRLYXRlICgpCiB2b2lkIEthdGVBcHA6OnJlc3RvcmVLYXRlICgpCiB7CiAgIC8vIGFj dGl2YXRlIGFnYWluIGNvcnJlY3Qgc2Vzc2lvbiEhIQotICBRU3RyaW5nIGxhc3RTZXNzaW9uIChz ZXNzaW9uQ29uZmlnKCktPmdyb3VwKCJHZW5lcmFsIikucmVhZEVudHJ5ICgiTGFzdCBTZXNzaW9u IiwgImRlZmF1bHQua2F0ZXNlc3Npb24iKSk7CisgIFFTdHJpbmcgbGFzdFNlc3Npb24gKHNlc3Np b25Db25maWcoKS0+Z3JvdXAoIkdlbmVyYWwiKS5yZWFkRW50cnkgKCJMYXN0IFNlc3Npb24iLCBR U3RyaW5nKCkpKTsKICAgc2Vzc2lvbk1hbmFnZXIoKS0+YWN0aXZhdGVTZXNzaW9uIChLYXRlU2Vz c2lvbjo6UHRyKG5ldyBLYXRlU2Vzc2lvbiAoc2Vzc2lvbk1hbmFnZXIoKSwgbGFzdFNlc3Npb24p KSwgZmFsc2UsIGZhbHNlLCBmYWxzZSk7CiAKICAgLy8gcGx1Z2lucwpAQCAtMzg0LDcgKzM4NCw3 IEBAIGJvb2wgS2F0ZUFwcDo6b3BlbklucHV0IChjb25zdCBRU3RyaW5nICZ0ZXh0KQogCiBLYXRl TWFpbldpbmRvdyAqS2F0ZUFwcDo6bmV3TWFpbldpbmRvdyAoS0NvbmZpZyAqc2NvbmZpZ18sIGNv bnN0IFFTdHJpbmcgJnNncm91cF8pCiB7Ci0gIEtDb25maWcgKnNjb25maWcgPSBzY29uZmlnXyA/ IHNjb25maWdfIDogbmV3IEtDb25maWcobV9zZXNzaW9uTWFuYWdlci0+ZGVmYXVsdFNlc3Npb25G aWxlKCkpOworICBLQ29uZmlnICpzY29uZmlnID0gc2NvbmZpZ18gPyBzY29uZmlnXyA6IEtHbG9i YWw6OmNvbmZpZygpLmRhdGEoKTsKICAgUVN0cmluZyBzZ3JvdXAgPSAhc2dyb3VwXy5pc0VtcHR5 KCkgPyBzZ3JvdXBfIDogIk1haW5XaW5kb3cwIjsKIAogICBLYXRlTWFpbldpbmRvdyAqbWFpbldp bmRvdyA9IG5ldyBLYXRlTWFpbldpbmRvdyAoc2NvbmZpZywgc2dyb3VwKTsKZGlmZiAtLWdpdCBh L2thdGUvYXBwL2thdGVjb25maWdkaWFsb2cuY3BwIGIva2F0ZS9hcHAva2F0ZWNvbmZpZ2RpYWxv Zy5jcHAKaW5kZXggYmQzOGE4Yy4uMzYyOThkNCAxMDA2NDQKLS0tIGEva2F0ZS9hcHAva2F0ZWNv bmZpZ2RpYWxvZy5jcHAKKysrIGIva2F0ZS9hcHAva2F0ZWNvbmZpZ2RpYWxvZy5jcHAKQEAgLTI4 LDYgKzI4LDcgQEAKICNpbmNsdWRlICJrYXRlY29uZmlncGx1Z2luZGlhbG9ncGFnZS5oIgogI2lu Y2x1ZGUgImthdGV2aWV3bWFuYWdlci5oIgogI2luY2x1ZGUgImthdGVhcHAuaCIKKyNpbmNsdWRl ICJrYXRlc2Vzc2lvbi5oIgogCiAjaW5jbHVkZSA8S1RleHRFZGl0b3IvQ29uZmlnUGFnZT4KICNp bmNsdWRlIDxLVGV4dEVkaXRvci9FZGl0b3JDaG9vc2VyPgpAQCAtMzcxLDcgKzM3Miw5IEBAIHZv aWQgS2F0ZUNvbmZpZ0RpYWxvZzo6c2xvdEFwcGx5KCkKICAgICBtX21haW5XaW5kb3ctPnNhdmVP cHRpb25zICgpOwogCiAgICAgLy8gc2F2ZSBwbHVnaW4gY29uZmlnICEhCi0gICAgS2F0ZUFwcDo6 c2VsZigpLT5wbHVnaW5NYW5hZ2VyKCktPndyaXRlQ29uZmlnIChLR2xvYmFsOjpjb25maWcoKS5k YXRhKCkpOworICAgIEthdGVTZXNzaW9uTWFuYWdlciAqc2Vzc2lvbm1hbmFnZXIgPSBLYXRlU2Vz c2lvbk1hbmFnZXI6OnNlbGYoKTsKKyAgICBLQ29uZmlnICpzZXNzaW9uQ29uZmlnID0gc2Vzc2lv bm1hbmFnZXItPmFjdGl2ZVNlc3Npb24oKS0+Y29uZmlnV3JpdGUoKTsKKyAgICBLYXRlQXBwOjpz ZWxmKCktPnBsdWdpbk1hbmFnZXIoKS0+d3JpdGVDb25maWcgKHNlc3Npb25Db25maWcpOwogICB9 CiAKICAgZm9yZWFjaCAoUGx1Z2luUGFnZUxpc3RJdGVtICpwbHVnaW4sIG1fcGx1Z2luUGFnZXMu dmFsdWVzKCkpCmRpZmYgLS1naXQgYS9rYXRlL2FwcC9rYXRlbWFpbndpbmRvdy5jcHAgYi9rYXRl L2FwcC9rYXRlbWFpbndpbmRvdy5jcHAKaW5kZXggNmVkM2ExOS4uYjE4MGI4NiAxMDA2NDQKLS0t IGEva2F0ZS9hcHAva2F0ZW1haW53aW5kb3cuY3BwCisrKyBiL2thdGUvYXBwL2thdGVtYWlud2lu ZG93LmNwcApAQCAtMzYzLDEwICszNjMsNiBAQCB2b2lkIEthdGVNYWluV2luZG93OjpzZXR1cEFj dGlvbnMoKQogICBhLT5zZXRJY29uKCBLSWNvbigiZG9jdW1lbnQtc2F2ZS1hcyIpICk7CiAgIGEt PnNldFRleHQoIGkxOG4oIlNhdmUgU2Vzc2lvbiAmQXMuLi4iKSApOwogICBjb25uZWN0KCBhLCBT SUdOQUwoIHRyaWdnZXJlZCgpICksIEthdGVTZXNzaW9uTWFuYWdlcjo6c2VsZigpLCBTTE9UKCBz ZXNzaW9uU2F2ZUFzKCkgKSApOwotICBhID0gYWN0aW9uQ29sbGVjdGlvbigpLT5hZGRBY3Rpb24o ICJzZXNzaW9uc19zYXZlX2RlZmF1bHQiICk7Ci0gIGEtPnNldEljb24oIEtJY29uKCJkb2N1bWVu dC1zYXZlLWFzIikgKTsKLSAgYS0+c2V0VGV4dCggaTE4bigiU2F2ZSBTZXNzaW9uIGFzICZEZWZh dWx0Li4uIikgKTsKLSAgY29ubmVjdCggYSwgU0lHTkFMKCB0cmlnZ2VyZWQoKSApLCBLYXRlU2Vz c2lvbk1hbmFnZXI6OnNlbGYoKSwgU0xPVCggc2Vzc2lvblNhdmVBc0RlZmF1bHQoKSApICk7CiAg IGEgPSBhY3Rpb25Db2xsZWN0aW9uKCktPmFkZEFjdGlvbiggInNlc3Npb25zX21hbmFnZSIgKTsK ICAgYS0+c2V0SWNvbiggS0ljb24oInZpZXctY2hvb3NlIikgKTsKICAgYS0+c2V0VGV4dCggaTE4 bigiJk1hbmFnZSBTZXNzaW9ucy4uLiIpICk7CmRpZmYgLS1naXQgYS9rYXRlL2FwcC9rYXRlc2Vz c2lvbi5jcHAgYi9rYXRlL2FwcC9rYXRlc2Vzc2lvbi5jcHAKaW5kZXggNTBhZDI0Ny4uNzRlNTI3 OCAxMDA2NDQKLS0tIGEva2F0ZS9hcHAva2F0ZXNlc3Npb24uY3BwCisrKyBiL2thdGUvYXBwL2th dGVzZXNzaW9uLmNwcApAQCAtOTYsNiArOTYsMTAgQEAgS2F0ZVNlc3Npb246On5LYXRlU2Vzc2lv biAoKQogCiBRU3RyaW5nIEthdGVTZXNzaW9uOjpzZXNzaW9uRmlsZSAoKSBjb25zdAogeworICBp ZiAobV9zZXNzaW9uRmlsZVJlbC5pc0VtcHR5KCkpIHsKKyAgICByZXR1cm4gUVN0cmluZygpOyAv LyBGSVhNRTogZGg6IGNoZWNrLCB3aGVyZSBzZXNzaW9uRmlsZSgpIGlzIHVzZWQgIyMjCisgIH0K KwogICByZXR1cm4gbV9tYW5hZ2VyLT5zZXNzaW9uc0RpcigpICsgJy8nICsgbV9zZXNzaW9uRmls ZVJlbDsKIH0KIApAQCAtMTY1LDcgKzE2OSw3IEBAIGJvb2wgS2F0ZVNlc3Npb246OnJlbmFtZSAo Y29uc3QgUVN0cmluZyAmbmFtZSkKIEtDb25maWcgKkthdGVTZXNzaW9uOjpjb25maWdSZWFkICgp CiB7CiAgIGlmIChtX3Nlc3Npb25GaWxlUmVsLmlzRW1wdHkoKSkKLSAgICByZXR1cm4gMDsKKyAg ICByZXR1cm4gS0dsb2JhbDo6Y29uZmlnKCkuZGF0YSgpOwogCiAgIGlmIChtX3JlYWRDb25maWcp CiAgICAgcmV0dXJuIG1fcmVhZENvbmZpZzsKQEAgLTE3Niw3ICsxODAsNyBAQCBLQ29uZmlnICpL YXRlU2Vzc2lvbjo6Y29uZmlnUmVhZCAoKQogS0NvbmZpZyAqS2F0ZVNlc3Npb246OmNvbmZpZ1dy aXRlICgpCiB7CiAgIGlmIChtX3Nlc3Npb25GaWxlUmVsLmlzRW1wdHkoKSkKLSAgICByZXR1cm4g MDsKKyAgICByZXR1cm4gS0dsb2JhbDo6Y29uZmlnKCkuZGF0YSgpOwogCiAgIGlmIChtX3dyaXRl Q29uZmlnKQogICAgIHJldHVybiBtX3dyaXRlQ29uZmlnOwpAQCAtMjA4LDcgKzIxMiw2IEBAIEth dGVTZXNzaW9uTWFuYWdlcjo6S2F0ZVNlc3Npb25NYW5hZ2VyIChRT2JqZWN0ICpwYXJlbnQpCiAg ICAgOiBRT2JqZWN0IChwYXJlbnQpCiAgICAgLCBtX3Nlc3Npb25zRGlyIChLU3RhbmRhcmREaXJz Ojpsb2NhdGVMb2NhbCggImRhdGEiLCAia2F0ZS9zZXNzaW9ucyIpKQogICAgICwgbV9hY3RpdmVT ZXNzaW9uIChuZXcgS2F0ZVNlc3Npb24gKHRoaXMsIFFTdHJpbmcoKSkpCi0gICAgLCBtX2RlZmF1 bHRTZXNzaW9uRmlsZShLU3RhbmRhcmREaXJzOjpsb2NhdGUoICJkYXRhIiwgImthdGUvZGVmYXVs dC5rYXRlc2Vzc2lvbiIpKQogewogICBrRGVidWcoKSA8PCAiTE9DQUwgU0VTU0lPTiBESVI6ICIg PDwgbV9zZXNzaW9uc0RpcjsKIApAQCAtMjI0LDExICsyMjcsNiBAQCBLYXRlU2Vzc2lvbk1hbmFn ZXIgKkthdGVTZXNzaW9uTWFuYWdlcjo6c2VsZigpCiAgIHJldHVybiBLYXRlQXBwOjpzZWxmKCkt PnNlc3Npb25NYW5hZ2VyICgpOwogfQogCi1RU3RyaW5nIEthdGVTZXNzaW9uTWFuYWdlcjo6ZGVm YXVsdFNlc3Npb25GaWxlKCkgY29uc3QKLXsKLSAgcmV0dXJuIG1fZGVmYXVsdFNlc3Npb25GaWxl OwotfQotCiB2b2lkIEthdGVTZXNzaW9uTWFuYWdlcjo6ZGlydHkgKGNvbnN0IFFTdHJpbmcgJikK IHsKICAgdXBkYXRlU2Vzc2lvbkxpc3QgKCk7CkBAIC0zMTAsMTMgKzMwOCwxMiBAQCBib29sIEth dGVTZXNzaW9uTWFuYWdlcjo6YWN0aXZhdGVTZXNzaW9uIChLYXRlU2Vzc2lvbjo6UHRyIHNlc3Np b24sCiAgIHsKICAgICAvLyBvcGVuIHRoZSBuZXcgc2Vzc2lvbgogICAgIEtDb25maWcgKnNjID0g YWN0aXZlU2Vzc2lvbigpLT5jb25maWdSZWFkKCk7Ci0gICAgY29uc3QgYm9vbCBsb2FkRG9jcyA9 IChzYyAhPSAwKTsgLy8gZG8gbm90IGxvYWQgZG9jcyBmb3IgbmV3IHNlc3Npb25zCisgICAgY29u c3QgYm9vbCBsb2FkRG9jcyA9IChzYyAhPSBLR2xvYmFsOjpjb25maWcoKS5kYXRhKCkpOyAvLyBk byBub3QgbG9hZCBkb2NzIGZvciBuZXcgc2Vzc2lvbnMKIAogICAgIC8vIGlmIHdlIGhhdmUgbm8g c2Vzc2lvbiBjb25maWcgb2JqZWN0LCB0cnkgdG8gbG9hZCB0aGUgZGVmYXVsdAogICAgIC8vIChh bm9ueW1vdXMvdW5uYW1lZCBzZXNzaW9ucykKICAgICBpZiAoICFzYyApCi0gICAgICBzYyA9IG5l dyBLQ29uZmlnKCBkZWZhdWx0U2Vzc2lvbkZpbGUoKSwgS0NvbmZpZzo6U2ltcGxlQ29uZmlnICk7 Ci0KKyAgICAgIHNjID0gS0dsb2JhbDo6Y29uZmlnKCkuZGF0YSgpOwogICAgIC8vIGxvYWQgcGx1 Z2luIGNvbmZpZyArIHBsdWdpbnMKICAgICBLYXRlUGx1Z2luTWFuYWdlcjo6c2VsZigpLT5sb2Fk Q29uZmlnIChzYyk7CiAKQEAgLTMzMCw3ICszMjcsNyBAQCBib29sIEthdGVTZXNzaW9uTWFuYWdl cjo6YWN0aXZhdGVTZXNzaW9uIChLYXRlU2Vzc2lvbjo6UHRyIHNlc3Npb24sCiAgICAgewogICAg ICAgLy8gYSBuZXcsIG5hbWVkIHNlc3Npb24sIHJlYWQgc2V0dGluZ3Mgb2YgdGhlIGRlZmF1bHQg c2Vzc2lvbi4KICAgICAgIGlmICggISBzYy0+aGFzR3JvdXAoIk9wZW4gTWFpbldpbmRvd3MiKSAp Ci0gICAgICAgIHNjID0gbmV3IEtDb25maWcoIGRlZmF1bHRTZXNzaW9uRmlsZSgpLCBLQ29uZmln OjpTaW1wbGVDb25maWcgKTsKKyAgICAgICAgc2MgPSBLR2xvYmFsOjpjb25maWcoKS5kYXRhKCk7 CiAKICAgICAgIGludCB3Q291bnQgPSBzYy0+Z3JvdXAoIk9wZW4gTWFpbldpbmRvd3MiKS5yZWFk RW50cnkoIkNvdW50IiwgMSk7CiAKQEAgLTQzMiwyMCArNDI5LDkgQEAgYm9vbCBLYXRlU2Vzc2lv bk1hbmFnZXI6OmNob29zZVNlc3Npb24gKCkKICAgS0NvbmZpZ0dyb3VwIGMoS0dsb2JhbDo6Y29u ZmlnKCksICJHZW5lcmFsIik7CiAKICAgLy8gZ2V0IGxhc3QgdXNlZCBzZXNzaW9uLCBkZWZhdWx0 IHRvIGRlZmF1bHQgc2Vzc2lvbgotICBRU3RyaW5nIGxhc3RTZXNzaW9uIChjLnJlYWRFbnRyeSAo Ikxhc3QgU2Vzc2lvbiIsIGRlZmF1bHRTZXNzaW9uRmlsZSgpKSk7CisgIFFTdHJpbmcgbGFzdFNl c3Npb24gKGMucmVhZEVudHJ5ICgiTGFzdCBTZXNzaW9uIiwgUVN0cmluZygpKSk7CiAgIFFTdHJp bmcgc2VzU3RhcnQgKGMucmVhZEVudHJ5ICgiU3RhcnR1cCBTZXNzaW9uIiwgIm1hbnVhbCIpKTsK IAotICAvLyBpZiB0aGlzIGlzIHRoZSBmaXJzdCB0aW1lIEthdGUgQXBwIHN0YXJ0cywgY3JlYXRl IGEgaTE4bmVkIGRlZmF1bHQua2F0ZXNlc3Npb24KLSAgYm9vbCBmaXJzdFN0YXJ0ID0gYy5yZWFk RW50cnkgKCJGaXJzdCBTdGFydCIsIHRydWUpOwotICBpZiAoZmlyc3RTdGFydCkgewotICAgIGMu d3JpdGVFbnRyeSAoIkZpcnN0IFN0YXJ0IiwgZmFsc2UpOwotICAgIFFGaWxlOjpjb3B5KGRlZmF1 bHRTZXNzaW9uRmlsZSgpLCBzZXNzaW9uc0RpcigpICsgIi9kZWZhdWx0LmthdGVzZXNzaW9uIik7 Ci0gICAgS2F0ZVNlc3Npb24gKmRzID0gbmV3IEthdGVTZXNzaW9uKHRoaXMsICJkZWZhdWx0Lmth dGVzZXNzaW9uIik7Ci0gICAgZHMtPnJlbmFtZShpMThuKCJEZWZhdWx0IFNlc3Npb24iKSk7Ci0g ICAgbGFzdFNlc3Npb249ZHMtPnNlc3Npb25GaWxlUmVsYXRpdmUoKTsKLSAgICBkZWxldGUgZHM7 Ci0gIH0KLQogICAvLyB1aGgsIGp1c3Qgb3BlbiBsYXN0IHVzZWQgc2Vzc2lvbiwgc2hvdyBubyBj aG9vc2VyCiAgIGlmIChzZXNTdGFydCA9PSAibGFzdCIpCiAgIHsKQEAgLTYwNCwyMyArNTkwLDYg QEAgYm9vbCBLYXRlU2Vzc2lvbk1hbmFnZXI6Om5ld1Nlc3Npb25OYW1lKCkKICAgcmV0dXJuIHRy dWU7CiB9CiAKLXZvaWQgS2F0ZVNlc3Npb25NYW5hZ2VyOjpzZXNzaW9uU2F2ZUFzRGVmYXVsdCAo KQotewotICAvLyBnZXQgcGF0aCBvZiBsb2NhbCBkZWZhdWx0LmthdGVzZXNzaW9uIGZpbGUKLSAg UVN0cmluZyBsb2NhbFNlc3Npb25GaWxlID0gS1N0YW5kYXJkRGlyczo6bG9jYXRlTG9jYWwoImRh dGEiLCAia2F0ZS9kZWZhdWx0LmthdGVzZXNzaW9uIik7Ci0KLSAgLy8gdXNlIHRoaXMgbG9jYWwg ZmlsZSB0byBzdG9yZSB0aGUgZGVmYXVsdHMgdG8KLSAgS0NvbmZpZyBkZWZhdWx0Q29uZmlnKGxv Y2FsU2Vzc2lvbkZpbGUsIEtDb25maWc6OlNpbXBsZUNvbmZpZyk7Ci0vLyAgZGVmYXVsdENvbmZp Zy5ncm91cCgiR2VuZXJhbCIpLndyaXRlRW50cnkgKCJOYW1lIiwgUVN0cmluZygpKTsKLQotICBz YXZlU2Vzc2lvblRvKCZkZWZhdWx0Q29uZmlnKTsKLQotICAvLyBpbiBjYXNlIHRoZSBsb2NhbCBk ZWZhdWx0LmthdGVzZXNzaW9uIGRpZCBub3QgZXhpc3QsIHRoZSBLYXRlU2Vzc2lvbk1hbmFnZXIK LSAgLy8gY29uc3RydWN0b3Igc2V0IHRoZSBkZWZhdWx0LmthdGVzZXNzaW9uIHRvIHRoZSBnbG9i YWwgS0RFIGRpcmVjdG9yeS4gQnV0Ci0gIC8vIG5vdyB3ZSBhcmUgc3VyZSB0aGUgbG9jYWwgZmls ZSBleGlzdHMsIHNvIHBvaW50IHRvIGlmIGZyb20gbm93IG9uLi4uCi0gIG1fZGVmYXVsdFNlc3Np b25GaWxlID0gbG9jYWxTZXNzaW9uRmlsZTsKLX0KLQogdm9pZCBLYXRlU2Vzc2lvbk1hbmFnZXI6 OnNlc3Npb25NYW5hZ2UgKCkKIHsKICAgS2F0ZVNlc3Npb25NYW5hZ2VEaWFsb2cgKmRsZyA9IG5l dyBLYXRlU2Vzc2lvbk1hbmFnZURpYWxvZyAoMCk7CmRpZmYgLS1naXQgYS9rYXRlL2FwcC9rYXRl c2Vzc2lvbi5oIGIva2F0ZS9hcHAva2F0ZXNlc3Npb24uaAppbmRleCAwOTQ4MGE1Li44MmVjMTk5 IDEwMDY0NAotLS0gYS9rYXRlL2FwcC9rYXRlc2Vzc2lvbi5oCisrKyBiL2thdGUvYXBwL2thdGVz ZXNzaW9uLmgKQEAgLTExNCw2ICsxMTQsOCBAQCBjbGFzcyBLYXRlU2Vzc2lvbiAgOiBwdWJsaWMg S1NoYXJlZAogICAgICAqIG9uIGZpcnN0IGFjY2Vzcywgd2lsbCBjcmVhdGUgdGhlIGNvbmZpZyBv YmplY3QsIGRlbGV0ZSB3aWxsIGJlIGRvbmUgYXV0b21hZ2ljCiAgICAgICogcmV0dXJuIDAgaWYg d2UgaGF2ZSBubyBmaWxlIHRvIHJlYWQgY29uZmlnIGZyb20gYXRtCiAgICAgICogQHJldHVybiBj b25maWcgdG8gcmVhZCBmcm9tCisgICAgICogQG5vdGUgbmV2ZXIgZGVsZXRlIGNvbmZpZ1JlYWQo KSwgYmVjYXVzZSB0aGUgcmV0dXJuIHZhbHVlIG1pZ2h0IGJlCisgICAgICogICAgICAgS0dsb2Jh bDo6Y29uZmlnKCkuIE9ubHkgZGVsZXRlIHRoZSBtZW1iZXIgdmFyaWFibGVzIGRpcmVjdGx5Lgog ICAgICAqLwogICAgIEtDb25maWcgKmNvbmZpZ1JlYWQgKCk7CiAKQEAgLTEyMiw2ICsxMjQsOCBA QCBjbGFzcyBLYXRlU2Vzc2lvbiAgOiBwdWJsaWMgS1NoYXJlZAogICAgICAqIG9uIGZpcnN0IGFj Y2Vzcywgd2lsbCBjcmVhdGUgdGhlIGNvbmZpZyBvYmplY3QsIGRlbGV0ZSB3aWxsIGJlIGRvbmUg YXV0b21hZ2ljCiAgICAgICogcmV0dXJuIDAgaWYgd2UgaGF2ZSBubyBmaWxlIHRvIHdyaXRlIGNv bmZpZyB0byBhdG0KICAgICAgKiBAcmV0dXJuIGNvbmZpZyB0byB3cml0ZSBmcm9tCisgICAgICog QG5vdGUgbmV2ZXIgZGVsZXRlIGNvbmZpZ1dyaXRlKCksIGJlY2F1c2UgdGhlIHJldHVybiB2YWx1 ZSBtaWdodCBiZQorICAgICAqICAgICAgIEtHbG9iYWw6OmNvbmZpZygpLiBPbmx5IGRlbGV0ZSB0 aGUgbWVtYmVyIHZhcmlhYmxlcyBkaXJlY3RseS4KICAgICAgKi8KICAgICBLQ29uZmlnICpjb25m aWdXcml0ZSAoKTsKIApAQCAtMjQwLDE0ICsyNDQsNiBAQCBjbGFzcyBLYXRlU2Vzc2lvbk1hbmFn ZXIgOiBwdWJsaWMgUU9iamVjdAogICAgIH0KIAogICAgIC8qKgotICAgICAqIFJldHVybnMgdGhl IHVybCB0byB0aGUgZGVmYXVsdC5rYXRlc2Vzc2lvbiBmaWxlLgotICAgICAqIFRoZSB1cmwgaXMg dGhlIGdsb2JhbCBmaWxlLCBpZiB0aGUgbG9jYWwgZmlsZSAoaS5lLiBpbiB0aGUgLmtkZS1mb2xk ZXIpCi0gICAgICogZG9lcyBub3QgZXhpc3QuIFRoZSB1cmwgY2hhbmdlcywgYXMgc29vbiBhcyB0 aGUgbG9jYWwgZmlsZSBleGlzdHMgKHRoaXMKLSAgICAgKiBoYXBwZW5zLCB3aGVuIHRoZSB1c2Vy cyBpbnZva2VzICJTZXNzaW9uIiA+ICJTYXZlIEFzIERlZmF1bHQiKQotICAgICAqLwotICAgIFFT dHJpbmcgZGVmYXVsdFNlc3Npb25GaWxlKCkgY29uc3Q7Ci0KLSAgICAvKioKICAgICAgKiBpbml0 aWFsIHNlc3Npb24gY2hvb3Nlciwgb24gYXBwIHN0YXJ0CiAgICAgICogQHJldHVybiBzdWNjZXNz LCBpZiBmYWxzZSwgYXBwIHNob3VsZCBleGl0CiAgICAgICovCkBAIC0yNzYsMTEgKzI3Miw2IEBA IGNsYXNzIEthdGVTZXNzaW9uTWFuYWdlciA6IHB1YmxpYyBRT2JqZWN0CiAgICAgdm9pZCBzZXNz aW9uU2F2ZUFzICgpOwogCiAgICAgLyoqCi0gICAgICogc2F2ZSB0aGUgY3VycmVudCBzZXNzaW9u J3MgcHJvcGVydGllcyBmb3IgbmV3IHNlc3Npb25zLgotICAgICAqLwotICAgIHZvaWQgc2Vzc2lv blNhdmVBc0RlZmF1bHQgKCk7Ci0KLSAgICAvKioKICAgICAgKiBzaG93IGRpYWxvZyB0byBtYW5h Z2Ugb3VyIHNlc3Npb25zCiAgICAgICovCiAgICAgdm9pZCBzZXNzaW9uTWFuYWdlICgpOwpAQCAt MzIyLDggKzMxMyw2IEBAIGNsYXNzIEthdGVTZXNzaW9uTWFuYWdlciA6IHB1YmxpYyBRT2JqZWN0 CiAgICAgICogY3VycmVudCBhY3RpdmUgc2Vzc2lvbgogICAgICAqLwogICAgIEthdGVTZXNzaW9u OjpQdHIgbV9hY3RpdmVTZXNzaW9uOwotCi0gICAgUVN0cmluZyBtX2RlZmF1bHRTZXNzaW9uRmls ZTsKIH07CiAKIGNsYXNzIEthdGVTZXNzaW9uQ2hvb3NlciA6IHB1YmxpYyBLRGlhbG9nCmRpZmYg LS1naXQgYS9rYXRlL2RhdGEvQ01ha2VMaXN0cy50eHQgYi9rYXRlL2RhdGEvQ01ha2VMaXN0cy50 eHQKaW5kZXggZTU3NmJjNi4uOTNiNmI2OSAxMDA2NDQKLS0tIGEva2F0ZS9kYXRhL0NNYWtlTGlz dHMudHh0CisrKyBiL2thdGUvZGF0YS9DTWFrZUxpc3RzLnR4dApAQCAtMSw1ICsxLDUgQEAKIGlu c3RhbGwoIFBST0dSQU1TIGthdGUuZGVza3RvcCAgREVTVElOQVRJT04gICR7WERHX0FQUFNfSU5T VEFMTF9ESVJ9ICkKIGluc3RhbGwoIEZJTEVTIGthdGVyYyAgREVTVElOQVRJT04gICR7Q09ORklH X0lOU1RBTExfRElSfSApCi1pbnN0YWxsKCBGSUxFUyBkZWZhdWx0LmthdGVzZXNzaW9uIHRpcHMg a2F0ZXVpLnJjIERFU1RJTkFUSU9OICAke0RBVEFfSU5TVEFMTF9ESVJ9L2thdGUgKQoraW5zdGFs bCggRklMRVMgdGlwcyBrYXRldWkucmMgREVTVElOQVRJT04gICR7REFUQV9JTlNUQUxMX0RJUn0v a2F0ZSApCiBpbnN0YWxsKCBGSUxFUyBrYXRlcGx1Z2luLmRlc2t0b3AgIERFU1RJTkFUSU9OICAk e1NFUlZJQ0VUWVBFU19JTlNUQUxMX0RJUn0gKQogaW5zdGFsbCggRklMRVMga2F0ZS0yLjQudXBk ICBERVNUSU5BVElPTiAgJHtLQ09ORl9VUERBVEVfSU5TVEFMTF9ESVJ9ICkKZGlmZiAtLWdpdCBh L2thdGUvZGF0YS9rYXRlcmMgYi9rYXRlL2RhdGEva2F0ZXJjCmluZGV4IDMzMWEzMDQuLjFiMGI2 ZjYgMTAwNjQ0Ci0tLSBhL2thdGUvZGF0YS9rYXRlcmMKKysrIGIva2F0ZS9kYXRhL2thdGVyYwpA QCAtMSwyICsxLDMxIEBACiBbS05ld1N0dWZmXQotUHJvdmlkZXJzVXJsPWh0dHA6Ly9rYXRlLmtk ZS5vcmcvc2hhcmUvcHJvdmlkZXJzLnhtbApcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKK1By b3ZpZGVyc1VybD1odHRwOi8va2F0ZS5rZGUub3JnL3NoYXJlL3Byb3ZpZGVycy54bWwKKworW0th dGUgUGx1Z2luc10KK2thdGVmaW5kaW5maWxlc3BsdWdpbj10cnVlCitrYXRla29uc29sZXBsdWdp bj10cnVlCisKK1tNYWluV2luZG93MF0KK0FjdGl2ZSBWaWV3U3BhY2U9MAorS2F0ZS1NREktSC1T cGxpdHRlcj0yMDAsNTYwLDIwMAorS2F0ZS1NREktU2lkZWJhci0wLVNwbGl0dGVyPTQ4MAorS2F0 ZS1NREktU2lkZWJhci0xLVNwbGl0dGVyPQorS2F0ZS1NREktU2lkZWJhci0yLVNwbGl0dGVyPQor S2F0ZS1NREktU2lkZWJhci0zLVNwbGl0dGVyPTAKK0thdGUtTURJLVNpZGViYXItU3R5bGU9Mwor S2F0ZS1NREktU2lkZWJhci1WaXNpYmxlPXRydWUKK0thdGUtTURJLVRvb2xWaWV3LWthdGVfZmls ZWxpc3QtUGVyc2lzdGVudD1mYWxzZQorS2F0ZS1NREktVG9vbFZpZXcta2F0ZV9maWxlbGlzdC1Q b3NpdGlvbj0wCitLYXRlLU1ESS1Ub29sVmlldy1rYXRlX2ZpbGVsaXN0LVNpZGViYXItUG9zaXRp b249MAorS2F0ZS1NREktVG9vbFZpZXcta2F0ZV9maWxlbGlzdC1WaXNpYmxlPXRydWUKK0thdGUt TURJLVRvb2xWaWV3LWthdGVfcHJpdmF0ZV9wbHVnaW5fa2F0ZWZpbmRpbmZpbGVzcGx1Z2luLVBl cnNpc3RlbnQ9ZmFsc2UKK0thdGUtTURJLVRvb2xWaWV3LWthdGVfcHJpdmF0ZV9wbHVnaW5fa2F0 ZWZpbmRpbmZpbGVzcGx1Z2luLVBvc2l0aW9uPTMKK0thdGUtTURJLVRvb2xWaWV3LWthdGVfcHJp dmF0ZV9wbHVnaW5fa2F0ZWZpbmRpbmZpbGVzcGx1Z2luLVNpZGViYXItUG9zaXRpb249MAorS2F0 ZS1NREktVG9vbFZpZXcta2F0ZV9wcml2YXRlX3BsdWdpbl9rYXRlZmluZGluZmlsZXNwbHVnaW4t VmlzaWJsZT1mYWxzZQorS2F0ZS1NREktVi1TcGxpdHRlcj0xNTAsNDYxLDIwMAorU3RhdGU9QUFB QS93QUFBQUQ5QUFBQUFBQUFBeG9BQUFIbEFBQUFCQUFBQUFRQUFBQUlBQUFBQ1B3QUFBQUJBQUFB QWdBQUFBRUFBQUFXQUcwQVlRQnBBRzRBVkFCdkFHOEFiQUJDQUdFQWNnRUFBQUFBQUFBREdnQUFB QUFBQUFBQQorCitbTWFpbldpbmRvdzAtU3BsaXR0ZXIgMF0KK0NoaWxkcmVuPU1haW5XaW5kb3cw LVZpZXdTcGFjZSAwCitPcmllbnRhdGlvbj0xCitTaXplcz01NjAKZGlmZiAtLWdpdCBhL2thdGUv ZGF0YS9rYXRldWkucmMgYi9rYXRlL2RhdGEva2F0ZXVpLnJjCmluZGV4IGE4NGE3YjIuLmI5ZTVm ZmEgMTAwNjQ0Ci0tLSBhL2thdGUvZGF0YS9rYXRldWkucmMKKysrIGIva2F0ZS9kYXRhL2thdGV1 aS5yYwpAQCAtODEsNyArODEsNiBAQAogICAgIDxTZXBhcmF0b3IgLz4KICAgICA8QWN0aW9uIG5h bWU9InNlc3Npb25zX3NhdmUiLz4KICAgICA8QWN0aW9uIG5hbWU9InNlc3Npb25zX3NhdmVfYXMi Lz4KLSAgICA8QWN0aW9uIG5hbWU9InNlc3Npb25zX3NhdmVfZGVmYXVsdCIvPgogICAgIDxTZXBh cmF0b3IgLz4KICAgICA8QWN0aW9uIG5hbWU9InNlc3Npb25zX21hbmFnZSIvPgogICA8L01lbnU+ Cg==