<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>77725</bug_id>
          
          <creation_ts>2012-02-03 01:59:34 -0800</creation_ts>
          <short_desc>perf-o-matic should store chromium svn revision</short_desc>
          <delta_ts>2012-02-08 03:40:59 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>77037</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Ryosuke Niwa">rniwa</reporter>
          <assigned_to name="Ryosuke Niwa">rniwa</assigned_to>
          <cc>abarth</cc>
    
    <cc>dpranke</cc>
    
    <cc>eric</cc>
    
    <cc>morrita</cc>
    
    <cc>ojan</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>548584</commentid>
    <comment_count>0</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2012-02-03 01:59:34 -0800</bug_when>
    <thetext>Right now, the graph server only stores WebKit&apos;s revision. However, for chromium port, it&apos;ll be also useful to store chromium revision.

This is also a requirement if we were to use the graph server to view results for Chromium perf bots.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>548588</commentid>
    <comment_count>1</comment_count>
      <attachid>125294</attachid>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2012-02-03 02:07:12 -0800</bug_when>
    <thetext>Created attachment 125294
Adds the feature</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>548847</commentid>
    <comment_count>2</comment_count>
      <attachid>125294</attachid>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-02-03 10:46:10 -0800</bug_when>
    <thetext>Comment on attachment 125294
Adds the feature

looks good to me. adam, eric, or ojan might want to glance at it as well.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>548865</commentid>
    <comment_count>3</comment_count>
      <attachid>125294</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2012-02-03 11:05:27 -0800</bug_when>
    <thetext>Comment on attachment 125294
Adds the feature

View in context: https://bugs.webkit.org/attachment.cgi?id=125294&amp;action=review

&gt; Tools/Scripts/webkitpy/common/checkout/scm/scm.py:188
&gt; +    def svn_revision(self, path):
&gt;          self._subclass_must_implement()

Feels a little odd that this doesn&apos;t use any self state.

&gt; Tools/Scripts/webkitpy/layout_tests/port/base.py:906
&gt; +    def repository_paths(self):
&gt; +        &quot;&quot;&quot;Returns a list of (repository_name, repository_path) tuples of its depending code base.
&gt; +        By default it returns a list that only contains a (&apos;webkit&apos;, &lt;webkitRepossitoryPath&gt;) tuple.&quot;&quot;&quot;
&gt; +        return [(&apos;webkit&apos;, self.webkit_base())]

Odd that this belongs on base, since multi-checkouts are a chromium-only concept.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>548960</commentid>
    <comment_count>4</comment_count>
      <attachid>125294</attachid>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-02-03 12:46:32 -0800</bug_when>
    <thetext>Comment on attachment 125294
Adds the feature

View in context: https://bugs.webkit.org/attachment.cgi?id=125294&amp;action=review

&gt;&gt; Tools/Scripts/webkitpy/layout_tests/port/base.py:906
&gt;&gt; +        return [(&apos;webkit&apos;, self.webkit_base())]
&gt; 
&gt; Odd that this belongs on base, since multi-checkouts are a chromium-only concept.

Seems like returning a list is a generic concept since the caller doesn&apos;t know if the port uses one or more checkouts. Maybe I&apos;m not following you?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>548991</commentid>
    <comment_count>5</comment_count>
      <attachid>125294</attachid>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2012-02-03 13:07:01 -0800</bug_when>
    <thetext>Comment on attachment 125294
Adds the feature

View in context: https://bugs.webkit.org/attachment.cgi?id=125294&amp;action=review

&gt; Tools/Scripts/webkitpy/layout_tests/port/chromium.py:340
&gt; +        repos.append((&apos;chromium&apos;, self.path_from_chromium_base()))

Oops, a slight fix needed here. Because Source/WebKit/chromium is still in the WebKit repository, it won&apos;t work inside WebKit checkout (i.e. chromium-revision will be same as webkit-revision). I&apos;ll use self.path_from_chromium_base(&apos;build&apos;) instead.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>548995</commentid>
    <comment_count>6</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2012-02-03 13:10:26 -0800</bug_when>
    <thetext>Committed r106687: &lt;http://trac.webkit.org/changeset/106687&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>551979</commentid>
    <comment_count>7</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2012-02-08 03:40:59 -0800</bug_when>
    <thetext>Build fix landed in http://trac.webkit.org/changeset/107064.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>125294</attachid>
            <date>2012-02-03 02:07:12 -0800</date>
            <delta_ts>2012-02-03 13:07:01 -0800</delta_ts>
            <desc>Adds the feature</desc>
            <filename>bug-77725-20120203020711.patch</filename>
            <type>text/plain</type>
            <size>15902</size>
            <attacher name="Ryosuke Niwa">rniwa</attacher>
            
              <data encoding="base64">SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDEwNjYz
OSkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAy
LTAzICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIHBlcmYtby1t
YXRpYyBzaG91bGQgc3RvcmUgY2hyb21pdW0gc3ZuIHJldmlzaW9uCisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzcyNQorCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3JlIGJvdGggV2ViS2l0IGFuZCBDaHJv
bWl1bSByZXZpc2lvbnMgd2hlbiBib3RoIGFyZSByZXBvcnRlZC4KKworICAgICAgICAqIFdlYnNp
dGVzL3dlYmtpdC1wZXJmLmFwcHNwb3QuY29tL21vZGVscy5weToKKyAgICAgICAgKEJ1aWxkKToK
KyAgICAgICAgKiBXZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90LmNvbS9yZXBvcnRfaGFuZGxl
ci5weToKKyAgICAgICAgKFJlcG9ydEhhbmRsZXIucG9zdCk6CisgICAgICAgIChSZXBvcnRIYW5k
bGVyLl9jcmVhdGVfYnVpbGRfaWZfcG9zc2libGUpOgorICAgICAgICAoUmVwb3J0SGFuZGxlci5f
Y3JlYXRlX2J1aWxkX2lmX3Bvc3NpYmxlLmV4ZWN1dGUpOgorICAgICAgICAqIFdlYnNpdGVzL3dl
YmtpdC1wZXJmLmFwcHNwb3QuY29tL3N0YXRpYy9tYW51YWwtc3VibWl0Lmh0bWw6CisKIDIwMTIt
MDItMDMgIFNoaW55YSBLYXdhbmFrYSAgPHNoaW55YWtAZ29vZ2xlLmNvbT4KIAogICAgICAgICBT
dG9wIGNhbGxpbmcgRWxlbWVudDo6ZW5zdXJlU2hhZG93Um9vdCBpbiBJbnRlcm5hbHMuCkluZGV4
OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lv
biAxMDY2MzkpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwz
OSBAQAorMjAxMi0wMi0wMyAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAg
ICAgICBwZXJmLW8tbWF0aWMgc2hvdWxkIHN0b3JlIGNocm9taXVtIHN2biByZXZpc2lvbgorICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc3MjUKKworICAg
ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXBvcnQgYm90aCBX
ZWJLaXQgYW5kIENocm9taXVtIHJldmlzaW9ucyB0byB0aGUgZ3JhcGggc2VydmVyLiBSZW5hbWVk
IHRlc3RfcmVwb3NpdG9yeV9wYXRocyB0bworICAgICAgICByZXBvc2l0b3J5X3BhdGhzIHNpbmNl
IGl0J3Mgbm90aGluZyB0byBkbyB3aXRoIHRlc3RzLiBBbHNvIHJlZmFjdG9yZWQgc2NtIHNvIHRo
YXQgaGVhZF9zdm5fcmV2aXNpb24KKyAgICAgICAgaXMgaW1wbGVtZW50ZWQgaW4gdGVybXMgb2Yg
bmV3bHkgYWRkZWQgc3ZuX3JldmlzaW9uLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9j
b21tb24vY2hlY2tvdXQvc2NtL2dpdC5weToKKyAgICAgICAgKEdpdC5zdm5fcmV2aXNpb24pOgor
ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHk6Cisg
ICAgICAgIChTQ00uaGVhZF9zdm5fcmV2aXNpb24pOgorICAgICAgICAoU0NNKToKKyAgICAgICAg
KFNDTS5zdm5fcmV2aXNpb24pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No
ZWNrb3V0L3NjbS9zY21fbW9jay5weToKKyAgICAgICAgKE1vY2tTQ00uc3ZuX3JldmlzaW9uKToK
KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5Ogor
ICAgICAgICAoU1ZOLnN2bl9yZXZpc2lvbik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s
YXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9sYXlvdXRfcmVzdWx0c19nZW5lcmF0b3Iu
cHk6CisgICAgICAgIChKU09OTGF5b3V0UmVzdWx0c0dlbmVyYXRvci5fX2luaXRfXyk6CisgICAg
ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9y
ZXN1bHRzX2dlbmVyYXRvci5weToKKyAgICAgICAgKEpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZS5f
aW5zZXJ0X2dlbmVyaWNfbWV0YWRhdGEpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5
b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQucmVwb3NpdG9yeV9wYXRocyk6
CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5w
eToKKyAgICAgICAgKENocm9taXVtUG9ydC5yZXBvc2l0b3J5X3BhdGhzKToKKyAgICAgICAgKiBT
Y3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weToKKyAg
ICAgICAgKFBlcmZUZXN0c1J1bm5lci5fZ2VuZXJhdGVfanNvbik6CisgICAgICAgICogU2NyaXB0
cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXJfdW5pdHRlc3QucHk6
CisgICAgICAgICh0ZXN0X3J1bl90ZXN0X3NldF93aXRoX2pzb25fb3V0cHV0KToKKyAgICAgICAg
KHRlc3RfcnVuX3Rlc3Rfc2V0X3dpdGhfanNvbl9zb3VyY2UpOgorICAgICAgICAodGVzdF9ydW5f
dGVzdF9zZXRfd2l0aF9tdWx0aXBsZV9yZXBvc2l0b3JpZXMpOgorCiAyMDEyLTAyLTAyICBKb2No
ZW4gRWlzaW5nZXIgIDxqb2NoZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0g
YWRkIHN1cHBvcnQgZm9yIC0tbWFrZWFyZ3MgdG8gdGhlIG5pbmphLWJhc2VkIGJ1aWxkCkluZGV4
OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5Cj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQu
cHkJKHJldmlzaW9uIDEwNjYyNCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No
ZWNrb3V0L3NjbS9naXQucHkJKHdvcmtpbmcgY29weSkKQEAgLTIyOSw5ICsyMjksOSBAQCBjbGFz
cyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICBkZWYgZGlzcGxheV9uYW1lKHNlbGYpOgog
ICAgICAgICByZXR1cm4gImdpdCIKIAotICAgIGRlZiBoZWFkX3N2bl9yZXZpc2lvbihzZWxmKToK
KyAgICBkZWYgc3ZuX3JldmlzaW9uKHNlbGYsIHBhdGgpOgogICAgICAgICBfbG9nLmRlYnVnKCdS
dW5uaW5nIGdpdC5oZWFkX3N2bl9yZXZpc2lvbi4uLiAoVGVtcG9yYXJ5IGxvZ2dpbmcgbWVzc2Fn
ZSknKQotICAgICAgICBnaXRfbG9nID0gc2VsZi5ydW4oWydnaXQnLCAnbG9nJywgJy0yNSddKQor
ICAgICAgICBnaXRfbG9nID0gc2VsZi5ydW4oWydnaXQnLCAnbG9nJywgJy0yNScsIHBhdGhdKQog
ICAgICAgICBtYXRjaCA9IHJlLnNlYXJjaCgiXlxzKmdpdC1zdm4taWQ6LipAKD9QPHN2bl9yZXZp
c2lvbj5cZCspXCAiLCBnaXRfbG9nLCByZS5NVUxUSUxJTkUpCiAgICAgICAgIGlmIG5vdCBtYXRj
aDoKICAgICAgICAgICAgIHJldHVybiAiIgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j
b21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dl
YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5CShyZXZpc2lvbiAxMDY2MjQpCisrKyBU
b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5CSh3b3JraW5n
IGNvcHkpCkBAIC0xODIsNiArMTgyLDkgQEAgY2xhc3MgU0NNOgogICAgICAgICBzZWxmLl9zdWJj
bGFzc19tdXN0X2ltcGxlbWVudCgpCiAKICAgICBkZWYgaGVhZF9zdm5fcmV2aXNpb24oc2VsZik6
CisgICAgICAgIHJldHVybiBzZWxmLnN2bl9yZXZpc2lvbihzZWxmLmNoZWNrb3V0X3Jvb3QpCisK
KyAgICBkZWYgc3ZuX3JldmlzaW9uKHNlbGYsIHBhdGgpOgogICAgICAgICBzZWxmLl9zdWJjbGFz
c19tdXN0X2ltcGxlbWVudCgpCiAKICAgICBkZWYgY3JlYXRlX3BhdGNoKHNlbGYsIGdpdF9jb21t
aXQ9Tm9uZSwgY2hhbmdlZF9maWxlcz1Ob25lKToKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0
cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fbW9jay5weQo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T
Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX21vY2sucHkJKHJldmlzaW9u
IDEwNjYyNCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9z
Y21fbW9jay5weQkod29ya2luZyBjb3B5KQpAQCAtNjgsNiArNjgsOSBAQCBjbGFzcyBNb2NrU0NN
KG9iamVjdCk6CiAgICAgZGVmIGhlYWRfc3ZuX3JldmlzaW9uKHNlbGYpOgogICAgICAgICByZXR1
cm4gMTIzNAogCisgICAgZGVmIHN2bl9yZXZpc2lvbihzZWxmLCBwYXRoKToKKyAgICAgICAgcmV0
dXJuIDU2NzgKKwogICAgIGRlZiBjcmVhdGVfcGF0Y2goc2VsZiwgZ2l0X2NvbW1pdCwgY2hhbmdl
ZF9maWxlcz1Ob25lKToKICAgICAgICAgcmV0dXJuICJQYXRjaDEiCiAKSW5kZXg6IFRvb2xzL1Nj
cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQkocmV2aXNp
b24gMTA2NjI0KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt
L3N2bi5weQkod29ya2luZyBjb3B5KQpAQCAtMjM3LDggKzIzNyw4IEBAIGNsYXNzIFNWTihTQ00s
IFNWTlJlcG9zaXRvcnkpOgogICAgIGRlZiBkaXNwbGF5X25hbWUoc2VsZik6CiAgICAgICAgIHJl
dHVybiAic3ZuIgogCi0gICAgZGVmIGhlYWRfc3ZuX3JldmlzaW9uKHNlbGYpOgotICAgICAgICBy
ZXR1cm4gc2VsZi52YWx1ZV9mcm9tX3N2bl9pbmZvKHNlbGYuY2hlY2tvdXRfcm9vdCwgJ1Jldmlz
aW9uJykKKyAgICBkZWYgc3ZuX3JldmlzaW9uKHNlbGYsIHBhdGgpOgorICAgICAgICByZXR1cm4g
c2VsZi52YWx1ZV9mcm9tX3N2bl9pbmZvKHBhdGgsICdSZXZpc2lvbicpCiAKICAgICAjIEZJWE1F
OiBUaGlzIG1ldGhvZCBzaG91bGQgYmUgb24gQ2hlY2tvdXQuCiAgICAgZGVmIGNyZWF0ZV9wYXRj
aChzZWxmLCBnaXRfY29tbWl0PU5vbmUsIGNoYW5nZWRfZmlsZXM9Tm9uZSk6CkluZGV4OiBUb29s
cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX2xheW91
dF9yZXN1bHRzX2dlbmVyYXRvci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtp
dHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX2xheW91dF9yZXN1bHRzX2dlbmVy
YXRvci5weQkocmV2aXNpb24gMTA2NjI0KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv
dXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9sYXlvdXRfcmVzdWx0c19nZW5lcmF0b3IucHkJ
KHdvcmtpbmcgY29weSkKQEAgLTY0LDcgKzY0LDcgQEAgY2xhc3MgSlNPTkxheW91dFJlc3VsdHNH
ZW5lcmF0b3IoanNvbl9yZQogICAgICAgICAiIiIKICAgICAgICAgc3VwZXIoSlNPTkxheW91dFJl
c3VsdHNHZW5lcmF0b3IsIHNlbGYpLl9faW5pdF9fKAogICAgICAgICAgICAgcG9ydCwgYnVpbGRl
cl9uYW1lLCBidWlsZF9uYW1lLCBidWlsZF9udW1iZXIsIHJlc3VsdHNfZmlsZV9iYXNlX3BhdGgs
Ci0gICAgICAgICAgICBidWlsZGVyX2Jhc2VfdXJsLCB7fSwgcG9ydC50ZXN0X3JlcG9zaXRvcnlf
cGF0aHMoKSwKKyAgICAgICAgICAgIGJ1aWxkZXJfYmFzZV91cmwsIHt9LCBwb3J0LnJlcG9zaXRv
cnlfcGF0aHMoKSwKICAgICAgICAgICAgIHRlc3RfcmVzdWx0c19zZXJ2ZXIsIHRlc3RfdHlwZSwg
bWFzdGVyX25hbWUpCiAKICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zID0gZXhwZWN0YXRpb25z
CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2Fn
ZS9qc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv
d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0
b3IucHkJKHJldmlzaW9uIDEwNjYyNCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0
X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0b3IucHkJKHdvcmtpbmcg
Y29weSkKQEAgLTUyOCw2ICs1MjgsMTAgQEAgY2xhc3MgSlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNl
KG9iamVjdCk6CiAKICAgICAgICAgIyBJbmNsdWRlIFNWTiByZXZpc2lvbnMgZm9yIHRoZSBnaXZl
biByZXBvc2l0b3JpZXMuCiAgICAgICAgIGZvciAobmFtZSwgcGF0aCkgaW4gc2VsZi5fc3ZuX3Jl
cG9zaXRvcmllczoKKyAgICAgICAgICAgICMgTm90ZTogZm9yIEpTT04gZmlsZSdzIGJhY2t3YXJk
LWNvbXBhdGliaWxpdHkgd2UgdXNlICdjaHJvbWUnIHJhdGhlcgorICAgICAgICAgICAgIyB0aGFu
ICdjaHJvbWl1bScgaGVyZS4KKyAgICAgICAgICAgIGlmIG5hbWUgPT0gJ2Nocm9taXVtJzoKKyAg
ICAgICAgICAgICAgICBuYW1lID0gJ2Nocm9tZScKICAgICAgICAgICAgIHNlbGYuX2luc2VydF9p
dGVtX2ludG9fcmF3X2xpc3QocmVzdWx0c19mb3JfYnVpbGRlciwKICAgICAgICAgICAgICAgICBz
ZWxmLl9nZXRfc3ZuX3JldmlzaW9uKHBhdGgpLAogICAgICAgICAgICAgICAgIG5hbWUgKyAnUmV2
aXNpb24nKQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9i
YXNlLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz
L3BvcnQvYmFzZS5weQkocmV2aXNpb24gMTA2NjI0KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRw
eS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC05MDAsMTIgKzkw
MCwxMCBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgIHN5bmMgdXAgdGhlIHR3byByZXBv
cy4iIiIKICAgICAgICAgcmV0dXJuIE5vbmUKIAotICAgIGRlZiB0ZXN0X3JlcG9zaXRvcnlfcGF0
aHMoc2VsZik6Ci0gICAgICAgICIiIlJldHVybnMgYSBsaXN0IG9mIChyZXBvc2l0b3J5X25hbWUs
IHJlcG9zaXRvcnlfcGF0aCkgdHVwbGVzCi0gICAgICAgIG9mIGl0cyBkZXBlbmRpbmcgY29kZSBi
YXNlLiAgQnkgZGVmYXVsdCBpdCByZXR1cm5zIGEgbGlzdCB0aGF0IG9ubHkKLSAgICAgICAgY29u
dGFpbnMgYSAoJ3dlYmtpdCcsIDx3ZWJraXRSZXBvc3NpdG9yeVBhdGg+KSB0dXBsZS4KLSAgICAg
ICAgIiIiCi0gICAgICAgIHJldHVybiBbKCd3ZWJraXQnLCBzZWxmLmxheW91dF90ZXN0c19kaXIo
KSldCisgICAgZGVmIHJlcG9zaXRvcnlfcGF0aHMoc2VsZik6CisgICAgICAgICIiIlJldHVybnMg
YSBsaXN0IG9mIChyZXBvc2l0b3J5X25hbWUsIHJlcG9zaXRvcnlfcGF0aCkgdHVwbGVzIG9mIGl0
cyBkZXBlbmRpbmcgY29kZSBiYXNlLgorICAgICAgICBCeSBkZWZhdWx0IGl0IHJldHVybnMgYSBs
aXN0IHRoYXQgb25seSBjb250YWlucyBhICgnd2Via2l0JywgPHdlYmtpdFJlcG9zc2l0b3J5UGF0
aD4pIHR1cGxlLiIiIgorICAgICAgICByZXR1cm4gWygnd2Via2l0Jywgc2VsZi53ZWJraXRfYmFz
ZSgpKV0KIAogCiAgICAgX1dESUZGX0RFTCA9ICcjI1dESUZGX0RFTCMjJwpJbmRleDogVG9vbHMv
U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5
CShyZXZpc2lvbiAxMDY2MjQpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0
cy9wb3J0L2Nocm9taXVtLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zMzUsMTEgKzMzNSw5IEBAIGNs
YXNzIENocm9taXVtUG9ydChQb3J0KToKICAgICAgICAgICAgIGlzX2xpbnRfbW9kZT1GYWxzZSwg
b3ZlcnJpZGVzPW92ZXJyaWRlc19zdHIpCiAgICAgICAgIHJldHVybiBleHBlY3RhdGlvbnMuZ2V0
X3Rlc3RzX3dpdGhfcmVzdWx0X3R5cGUodGVzdF9leHBlY3RhdGlvbnMuU0tJUCkKIAotICAgIGRl
ZiB0ZXN0X3JlcG9zaXRvcnlfcGF0aHMoc2VsZik6Ci0gICAgICAgICMgTm90ZTogZm9yIEpTT04g
ZmlsZSdzIGJhY2t3YXJkLWNvbXBhdGliaWxpdHkgd2UgdXNlICdjaHJvbWUnIHJhdGhlcgotICAg
ICAgICAjIHRoYW4gJ2Nocm9taXVtJyBoZXJlLgotICAgICAgICByZXBvcyA9IHN1cGVyKENocm9t
aXVtUG9ydCwgc2VsZikudGVzdF9yZXBvc2l0b3J5X3BhdGhzKCkKLSAgICAgICAgcmVwb3MuYXBw
ZW5kKCgnY2hyb21lJywgc2VsZi5wYXRoX2Zyb21fY2hyb21pdW1fYmFzZSgpKSkKKyAgICBkZWYg
cmVwb3NpdG9yeV9wYXRocyhzZWxmKToKKyAgICAgICAgcmVwb3MgPSBzdXBlcihDaHJvbWl1bVBv
cnQsIHNlbGYpLnJlcG9zaXRvcnlfcGF0aHMoKQorICAgICAgICByZXBvcy5hcHBlbmQoKCdjaHJv
bWl1bScsIHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoKSkpCiAgICAgICAgIHJldHVybiBy
ZXBvcwogCiAgICAgIwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90
ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr
aXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkJKHJldmlzaW9uIDEwNjYy
NCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3Rz
cnVubmVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNDUsOCArMTQ1LDkgQEAgY2xhc3MgUGVyZlRl
c3RzUnVubmVyKG9iamVjdCk6CiAgICAgICAgIHJldHVybiB1bmV4cGVjdGVkCiAKICAgICBkZWYg
X2dlbmVyYXRlX2pzb24oc2VsZiwgdGltZXN0YW1wLCBvdXRwdXRfanNvbl9wYXRoLCBzb3VyY2Vf
anNvbl9wYXRoLCBicmFuY2gsIHBsYXRmb3JtLCBidWlsZGVyX25hbWUsIGJ1aWxkX251bWJlcik6
Ci0gICAgICAgIHJldmlzaW9uID0gc2VsZi5faG9zdC5zY20oKS5oZWFkX3N2bl9yZXZpc2lvbigp
Ci0gICAgICAgIGNvbnRlbnRzID0geyd0aW1lc3RhbXAnOiBpbnQodGltZXN0YW1wKSwgJ3Jldmlz
aW9uJzogcmV2aXNpb24sICdyZXN1bHRzJzogc2VsZi5fcmVzdWx0c30KKyAgICAgICAgY29udGVu
dHMgPSB7J3RpbWVzdGFtcCc6IGludCh0aW1lc3RhbXApLCAncmVzdWx0cyc6IHNlbGYuX3Jlc3Vs
dHN9CisgICAgICAgIGZvciAobmFtZSwgcGF0aCkgaW4gc2VsZi5fcG9ydC5yZXBvc2l0b3J5X3Bh
dGhzKCk6CisgICAgICAgICAgICBjb250ZW50c1tuYW1lICsgJy1yZXZpc2lvbiddID0gc2VsZi5f
aG9zdC5zY20oKS5zdm5fcmV2aXNpb24ocGF0aCkKIAogICAgICAgICBmb3Iga2V5LCB2YWx1ZSBp
biB7J2JyYW5jaCc6IGJyYW5jaCwgJ3BsYXRmb3JtJzogcGxhdGZvcm0sICdidWlsZGVyLW5hbWUn
OiBidWlsZGVyX25hbWUsICdidWlsZC1udW1iZXInOiBidWlsZF9udW1iZXJ9Lml0ZW1zKCk6CiAg
ICAgICAgICAgICBpZiB2YWx1ZToKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9y
bWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv
b2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyX3Vu
aXR0ZXN0LnB5CShyZXZpc2lvbiAxMDY2MjQpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Bl
cmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lcl91bml0dGVzdC5weQkod29ya2luZyBjb3B5
KQpAQCAtMjAwLDcgKzIwMCw3IEBAIG1heCAxMTIwCiAgICAgICAgICAgICAidGltZXN0YW1wIjog
MTIzNDU2Nzg5LCAicmVzdWx0cyI6CiAgICAgICAgICAgICB7IkJpbmRpbmdzL2V2ZW50LXRhcmdl
dC13cmFwcGVyIjogeyJtYXgiOiAxNTEwLCAiYXZnIjogMTQ4OS4wNSwgIm1lZGlhbiI6IDE0ODcs
ICJtaW4iOiAxNDcxLCAic3RkZXYiOiAxNC40Nn0sCiAgICAgICAgICAgICAiZ3JvdXBfbmFtZTp0
ZXN0X25hbWUiOiA0Mn0sCi0gICAgICAgICAgICAicmV2aXNpb24iOiAxMjM0fSkKKyAgICAgICAg
ICAgICJ3ZWJraXQtcmV2aXNpb24iOiA1Njc4fSkKIAogICAgIGRlZiB0ZXN0X3J1bl90ZXN0X3Nl
dF93aXRoX2pzb25fc291cmNlKHNlbGYpOgogICAgICAgICBidWlsZGJvdF9vdXRwdXQgPSBhcnJh
eV9zdHJlYW0uQXJyYXlTdHJlYW0oKQpAQCAtMjIwLDkgKzIyMCwyMCBAQCBtYXggMTEyMAogICAg
ICAgICAgICAgInRpbWVzdGFtcCI6IDEyMzQ1Njc4OSwgInJlc3VsdHMiOgogICAgICAgICAgICAg
eyJCaW5kaW5ncy9ldmVudC10YXJnZXQtd3JhcHBlciI6IHsibWF4IjogMTUxMCwgImF2ZyI6IDE0
ODkuMDUsICJtZWRpYW4iOiAxNDg3LCAibWluIjogMTQ3MSwgInN0ZGV2IjogMTQuNDZ9LAogICAg
ICAgICAgICAgImdyb3VwX25hbWU6dGVzdF9uYW1lIjogNDJ9LAotICAgICAgICAgICAgInJldmlz
aW9uIjogMTIzNCwKKyAgICAgICAgICAgICJ3ZWJraXQtcmV2aXNpb24iOiA1Njc4LAogICAgICAg
ICAgICAgImtleSI6ICJ2YWx1ZSJ9KQogCisgICAgZGVmIHRlc3RfcnVuX3Rlc3Rfc2V0X3dpdGhf
bXVsdGlwbGVfcmVwb3NpdG9yaWVzKHNlbGYpOgorICAgICAgICBidWlsZGJvdF9vdXRwdXQgPSBh
cnJheV9zdHJlYW0uQXJyYXlTdHJlYW0oKQorICAgICAgICBydW5uZXIgPSBzZWxmLmNyZWF0ZV9y
dW5uZXIoYnVpbGRib3Rfb3V0cHV0LCBhcmdzPVsnLS1vdXRwdXQtanNvbi1wYXRoPS9tb2NrLWNo
ZWNrb3V0L291dHB1dC5qc29uJ10pCisgICAgICAgIHJ1bm5lci5faG9zdC5maWxlc3lzdGVtLmZp
bGVzW3J1bm5lci5fYmFzZV9wYXRoICsgJy9pbnNwZWN0b3IvcGFzcy5odG1sJ10gPSBUcnVlCisg
ICAgICAgIHJ1bm5lci5fdGltZXN0YW1wID0gMTIzNDU2Nzg5CisgICAgICAgIHJ1bm5lci5fcG9y
dC5yZXBvc2l0b3J5X3BhdGhzID0gbGFtYmRhOiBbKCd3ZWJraXQnLCAnL21vY2stY2hlY2tvdXQn
KSwgKCdzb21lJywgJy9tb2NrLWNoZWNrb3V0L3NvbWUnKV0KKyAgICAgICAgc2VsZi5hc3NlcnRF
cXVhbChydW5uZXIucnVuKCksIDApCisKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChqc29uLmxv
YWRzKHJ1bm5lci5faG9zdC5maWxlc3lzdGVtLmZpbGVzWycvbW9jay1jaGVja291dC9vdXRwdXQu
anNvbiddKSwgeworICAgICAgICAgICAgInRpbWVzdGFtcCI6IDEyMzQ1Njc4OSwgInJlc3VsdHMi
OiB7Imdyb3VwX25hbWU6dGVzdF9uYW1lIjogNDIuMH0sICJ3ZWJraXQtcmV2aXNpb24iOiA1Njc4
LCAic29tZS1yZXZpc2lvbiI6IDU2Nzh9KQorCiAgICAgZGVmIHRlc3RfcnVuX3dpdGhfdXBsb2Fk
X2pzb24oc2VsZik6CiAgICAgICAgIHJ1bm5lciA9IHNlbGYuY3JlYXRlX3J1bm5lcihhcmdzPVsn
LS1vdXRwdXQtanNvbi1wYXRoPS9tb2NrLWNoZWNrb3V0L291dHB1dC5qc29uJywKICAgICAgICAg
ICAgICctLXRlc3QtcmVzdWx0cy1zZXJ2ZXInLCAnc29tZS5ob3N0JywgJy0tcGxhdGZvcm0nLCAn
cGxhdGZvcm0xJywgJy0tYnVpbGRlci1uYW1lJywgJ2J1aWxkZXIxJywgJy0tYnVpbGQtbnVtYmVy
JywgJzEyMyddKQpJbmRleDogV2Vic2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5jb20vbW9kZWxz
LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KLS0tIFdlYnNpdGVzL3dlYmtpdC1wZXJmLmFwcHNwb3QuY29tL21vZGVs
cy5weQkocmV2aXNpb24gMTA2NjI0KQorKysgV2Vic2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5j
b20vbW9kZWxzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC05MCw2ICs5MCw3IEBAIGNsYXNzIEJ1aWxk
KGRiLk1vZGVsKToKICAgICBidWlsZGVyID0gZGIuUmVmZXJlbmNlUHJvcGVydHkoQnVpbGRlciwg
cmVxdWlyZWQ9VHJ1ZSwgY29sbGVjdGlvbl9uYW1lPSdidWlsZGVyX2tleScpCiAgICAgYnVpbGRO
dW1iZXIgPSBkYi5JbnRlZ2VyUHJvcGVydHkocmVxdWlyZWQ9VHJ1ZSkKICAgICByZXZpc2lvbiA9
IGRiLkludGVnZXJQcm9wZXJ0eShyZXF1aXJlZD1UcnVlKQorICAgIGNocm9taXVtUmV2aXNpb24g
PSBkYi5JbnRlZ2VyUHJvcGVydHkoKQogICAgIHRpbWVzdGFtcCA9IGRiLkRhdGVUaW1lUHJvcGVy
dHkocmVxdWlyZWQ9VHJ1ZSkKIAogCkluZGV4OiBXZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90
LmNvbS9yZXBvcnRfaGFuZGxlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy93ZWJraXQtcGVy
Zi5hcHBzcG90LmNvbS9yZXBvcnRfaGFuZGxlci5weQkocmV2aXNpb24gMTA2NjI0KQorKysgV2Vi
c2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5jb20vcmVwb3J0X2hhbmRsZXIucHkJKHdvcmtpbmcg
Y29weSkKQEAgLTY3LDggKzY3LDkgQEAgY2xhc3MgUmVwb3J0SGFuZGxlcih3ZWJhcHAyLlJlcXVl
c3RIYW5kbAogICAgICAgICBicmFuY2ggPSBzZWxmLl9tb2RlbF9ieV9rZXlfbmFtZV9pbl9ib2R5
X29yX2Vycm9yKEJyYW5jaCwgJ2JyYW5jaCcpCiAgICAgICAgIHBsYXRmb3JtID0gc2VsZi5fbW9k
ZWxfYnlfa2V5X25hbWVfaW5fYm9keV9vcl9lcnJvcihQbGF0Zm9ybSwgJ3BsYXRmb3JtJykKICAg
ICAgICAgYnVpbGRfbnVtYmVyID0gc2VsZi5faW50ZWdlcl9pbl9ib2R5KCdidWlsZC1udW1iZXIn
KQotICAgICAgICByZXZpc2lvbiA9IHNlbGYuX2ludGVnZXJfaW5fYm9keSgncmV2aXNpb24nKQog
ICAgICAgICB0aW1lc3RhbXAgPSBzZWxmLl90aW1lc3RhbXBfaW5fYm9keSgpCisgICAgICAgIHJl
dmlzaW9uID0gc2VsZi5faW50ZWdlcl9pbl9ib2R5KCd3ZWJraXQtcmV2aXNpb24nKQorICAgICAg
ICBjaHJvbWl1bV9yZXZpc2lvbiA9IHNlbGYuX2ludGVnZXJfaW5fYm9keSgnd2Via2l0LXJldmlz
aW9uJykgaWYgJ2Nocm9taXVtLXJldmlzaW9uJyBpbiBzZWxmLl9ib2R5IGVsc2UgTm9uZQogCiAg
ICAgICAgIGZhaWxlZCA9IEZhbHNlCiAgICAgICAgIGlmIGJ1aWxkZXIgYW5kIG5vdCAoc2VsZi5i
eXBhc3NfYXV0aGVudGljYXRpb24oKSBvciBidWlsZGVyLmF1dGhlbnRpY2F0ZShzZWxmLl9ib2R5
LmdldCgncGFzc3dvcmQnLCAnJykpKToKQEAgLTgyLDcgKzgzLDcgQEAgY2xhc3MgUmVwb3J0SGFu
ZGxlcih3ZWJhcHAyLlJlcXVlc3RIYW5kbAogICAgICAgICBpZiBub3QgKGJ1aWxkZXIgYW5kIGJy
YW5jaCBhbmQgcGxhdGZvcm0gYW5kIGJ1aWxkX251bWJlciBhbmQgcmV2aXNpb24gYW5kIHRpbWVz
dGFtcCkgb3IgZmFpbGVkOgogICAgICAgICAgICAgcmV0dXJuCiAKLSAgICAgICAgYnVpbGQgPSBz
ZWxmLl9jcmVhdGVfYnVpbGRfaWZfcG9zc2libGUoYnVpbGRlciwgYnVpbGRfbnVtYmVyLCBicmFu
Y2gsIHBsYXRmb3JtLCByZXZpc2lvbiwgdGltZXN0YW1wKQorICAgICAgICBidWlsZCA9IHNlbGYu
X2NyZWF0ZV9idWlsZF9pZl9wb3NzaWJsZShidWlsZGVyLCBidWlsZF9udW1iZXIsIGJyYW5jaCwg
cGxhdGZvcm0sIHRpbWVzdGFtcCwgcmV2aXNpb24sIGNocm9taXVtX3JldmlzaW9uKQogICAgICAg
ICBpZiBub3QgYnVpbGQ6CiAgICAgICAgICAgICByZXR1cm4KIApAQCAtMTYyLDcgKzE2Myw3IEBA
IGNsYXNzIFJlcG9ydEhhbmRsZXIod2ViYXBwMi5SZXF1ZXN0SGFuZGwKIAogICAgICAgICByZXR1
cm4gVHJ1ZQogCi0gICAgZGVmIF9jcmVhdGVfYnVpbGRfaWZfcG9zc2libGUoc2VsZiwgYnVpbGRl
ciwgYnVpbGRfbnVtYmVyLCBicmFuY2gsIHBsYXRmb3JtLCByZXZpc2lvbiwgdGltZXN0YW1wKToK
KyAgICBkZWYgX2NyZWF0ZV9idWlsZF9pZl9wb3NzaWJsZShzZWxmLCBidWlsZGVyLCBidWlsZF9u
dW1iZXIsIGJyYW5jaCwgcGxhdGZvcm0sIHRpbWVzdGFtcCwgcmV2aXNpb24sIGNocm9taXVtX3Jl
dmlzaW9uKToKICAgICAgICAga2V5X25hbWUgPSBidWlsZGVyLm5hbWUgKyAnOicgKyBzdHIoaW50
KHRpbWUubWt0aW1lKHRpbWVzdGFtcC50aW1ldHVwbGUoKSkpKQogCiAgICAgICAgIGRlZiBleGVj
dXRlKCk6CkBAIC0xNzEsNyArMTcyLDcgQEAgY2xhc3MgUmVwb3J0SGFuZGxlcih3ZWJhcHAyLlJl
cXVlc3RIYW5kbAogICAgICAgICAgICAgICAgIHJldHVybiBzZWxmLl9vdXRwdXQoJ1RoZSBidWls
ZCBhdCAlcyBhbHJlYWR5IGV4aXN0cyBmb3IgJXMnICUgKHN0cih0aW1lc3RhbXApLCBidWlsZGVy
Lm5hbWUpKQogCiAgICAgICAgICAgICByZXR1cm4gQnVpbGQoYnJhbmNoPWJyYW5jaCwgcGxhdGZv
cm09cGxhdGZvcm0sIGJ1aWxkZXI9YnVpbGRlciwgYnVpbGROdW1iZXI9YnVpbGRfbnVtYmVyLAot
ICAgICAgICAgICAgICAgIHRpbWVzdGFtcD10aW1lc3RhbXAsIHJldmlzaW9uPXJldmlzaW9uLCBr
ZXlfbmFtZT1rZXlfbmFtZSkucHV0KCkKKyAgICAgICAgICAgICAgICB0aW1lc3RhbXA9dGltZXN0
YW1wLCByZXZpc2lvbj1yZXZpc2lvbiwgY2hyb21pdW1SZXZpc2lvbj1jaHJvbWl1bV9yZXZpc2lv
biwga2V5X25hbWU9a2V5X25hbWUpLnB1dCgpCiAgICAgICAgIHJldHVybiBkYi5ydW5faW5fdHJh
bnNhY3Rpb24oZXhlY3V0ZSkKIAogICAgIGRlZiBfYWRkX3Rlc3RfaWZfbmVlZGVkKHNlbGYsIHRl
c3RfbmFtZSwgYnJhbmNoLCBwbGF0Zm9ybSk6CkluZGV4OiBXZWJzaXRlcy93ZWJraXQtcGVyZi5h
cHBzcG90LmNvbS9zdGF0aWMvbWFudWFsLXN1Ym1pdC5odG1sCj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNp
dGVzL3dlYmtpdC1wZXJmLmFwcHNwb3QuY29tL3N0YXRpYy9tYW51YWwtc3VibWl0Lmh0bWwJKHJl
dmlzaW9uIDEwNjYyNCkKKysrIFdlYnNpdGVzL3dlYmtpdC1wZXJmLmFwcHNwb3QuY29tL3N0YXRp
Yy9tYW51YWwtc3VibWl0Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTU1LDcgKzU1LDcgQEAgJCgn
ZGF0YScpLnZhbHVlID0gSlNPTi5zdHJpbmdpZnkoewogICAgICdidWlsZGVyLW5hbWUnOiAnQ2hy
b21pdW0gTWFjIFJlbGVhc2UgKFBlcmYpJywKICAgICAnYnVpbGQtbnVtYmVyJzogJzEyMycsCiAg
ICAgJ3RpbWVzdGFtcCc6IHBhcnNlSW50KERhdGUubm93KCkgLyAxMDAwKSwKLSAgICAncmV2aXNp
b24nOiAxMDQ4NTYsCisgICAgJ3dlYmtpdC1yZXZpc2lvbic6IDEwNDg1NiwKICAgICAncmVzdWx0
cyc6CiAgICAgICAgIHsKICAgICAgICAgICAgICd3ZWJraXRfc3R5bGVfdGVzdCc6IHsnYXZnJzog
MTAwLCAnbWVkaWFuJzogMTAyLCAnc3RkZXYnOiA1LCAnbWluJzogOTAsICdtYXgnOiAxMTB9LAo=
</data>
<flag name="review"
          id="126768"
          type_id="1"
          status="+"
          setter="dpranke"
    />
          </attachment>
      

    </bug>

</bugzilla>