<?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>226344</bug_id>
          
          <creation_ts>2021-05-27 10:34:40 -0700</creation_ts>
          <short_desc>[run-webkit-tests] Move helper out of Port instance</short_desc>
          <delta_ts>2021-06-01 16:23:30 -0700</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>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=226234</see_also>
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Jonathan Bedard">jbedard</reporter>
          <assigned_to name="Jonathan Bedard">jbedard</assigned_to>
          <cc>aakash_jain</cc>
    
    <cc>dewei_zhu</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>slewis</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1764398</commentid>
    <comment_count>0</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-05-27 10:34:40 -0700</bug_when>
    <thetext>Associating the helper process with Port instances doesn&apos;t make sense, since there should only ever be a single helper process, and that process should only be managed by the parent process of run-webkit-tests.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1764400</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-05-27 10:34:59 -0700</bug_when>
    <thetext>&lt;rdar://problem/78575542&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1764401</commentid>
    <comment_count>2</comment_count>
      <attachid>429900</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-05-27 10:37:22 -0700</bug_when>
    <thetext>Created attachment 429900
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1764557</commentid>
    <comment_count>3</comment_count>
      <attachid>429900</attachid>
    <who name="">dewei_zhu</who>
    <bug_when>2021-05-27 15:52:15 -0700</bug_when>
    <thetext>Comment on attachment 429900
Patch

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

&gt; Tools/Scripts/webkitpy/port/base.py:963
&gt;          it isn&apos;t, or it isn&apos;t available. If a port overrides start_helper()
&gt;          it must override this routine as well.&quot;&quot;&quot;

We may want to update the comment here because MacPort does not overwrite this routine.

&gt; Tools/Scripts/webkitpy/port/base.py:964
&gt; +        if Port.helper:

Do we want this to be &apos;self.helper&apos;, otherwise, MacPort.stop_helper() will do nothing.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1764575</commentid>
    <comment_count>4</comment_count>
      <attachid>429953</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-05-27 16:37:42 -0700</bug_when>
    <thetext>Created attachment 429953
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1764576</commentid>
    <comment_count>5</comment_count>
      <attachid>429954</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-05-27 16:39:55 -0700</bug_when>
    <thetext>Created attachment 429954
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1765694</commentid>
    <comment_count>6</comment_count>
      <attachid>430280</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-06-01 11:48:45 -0700</bug_when>
    <thetext>Created attachment 430280
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1765791</commentid>
    <comment_count>7</comment_count>
      <attachid>430280</attachid>
    <who name="">dewei_zhu</who>
    <bug_when>2021-06-01 15:20:25 -0700</bug_when>
    <thetext>Comment on attachment 430280
Patch

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

r=me with comment.

&gt; Tools/ChangeLog:12
&gt; +        (Port.stop_helper): All classes should share the same code to stop the helper process.

Might worth mentioning we are doing this because popen object is not pickleable.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1765804</commentid>
    <comment_count>8</comment_count>
      <attachid>430300</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-06-01 15:42:54 -0700</bug_when>
    <thetext>Created attachment 430300
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1765815</commentid>
    <comment_count>9</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-06-01 16:23:28 -0700</bug_when>
    <thetext>Committed r278332 (238365@main): &lt;https://commits.webkit.org/238365@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 430300.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>429900</attachid>
            <date>2021-05-27 10:37:22 -0700</date>
            <delta_ts>2021-05-27 16:37:40 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226344-20210527103721.patch</filename>
            <type>text/plain</type>
            <size>4018</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI3ODE2NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE5IEBACisyMDIxLTA1LTI3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gTW92ZSBoZWxwZXIgb3V0IG9mIFBvcnQg
aW5zdGFuY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIyNjM0NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzg1NzU1NDI+CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Bv
cnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQpOiBNYWtlIGhlbHBlciBjbGFzcyB2YXJpYWJsZS4K
KyAgICAgICAgKFBvcnQuX19pbml0X18pOgorICAgICAgICAoUG9ydC5zdG9wX2hlbHBlcik6IEFs
bCBjbGFzc2VzIHNob3VsZCBzaGFyZSB0aGUgc2FtZSBjb2RlIHRvIHN0b3AgdGhlIGhlbHBlciBw
cm9jZXNzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHk6CisgICAgICAg
IChNYWNQb3J0LnN0YXJ0X2hlbHBlcik6IFVzZSBjbGFzcyB2YXJpYWJsZS4KKyAgICAgICAgKE1h
Y1BvcnQuc3RvcF9oZWxwZXIpOiBNb3ZlZCB0byBiYXNlIGNsYXNzLi4KKwogMjAyMS0wNS0yNyAg
QW5nZWxvcyBPaWtvbm9tb3BvdWxvcyAgPGFuZ2Vsb3NAaWdhbGlhLmNvbT4KIAogICAgICAgICBb
SlNDXSBJbXBsZW1lbnQgaGlnaC1sZXZlbCByZXRyeSBsb29wIGZvciBydW4tanNjLXN0cmVzcy10
ZXN0cwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJKHJldmlzaW9uIDI3ODE2
NikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CSh3b3JraW5nIGNvcHkp
CkBAIC04MSw2ICs4MSw4IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICBERVZJQ0VfVFlQRSA9
IE5vbmUKICAgICBERUZBVUxUX0RFVklDRV9UWVBFUyA9IFtdCiAKKyAgICBoZWxwZXIgPSBOb25l
CisKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgZGV0ZXJtaW5lX2Z1bGxfcG9ydF9uYW1lKGNs
cywgaG9zdCwgb3B0aW9ucywgcG9ydF9uYW1lKToKICAgICAgICAgIiIiUmV0dXJuIGEgZnVsbHkt
c3BlY2lmaWVkIHBvcnQgbmFtZSB0aGF0IGNhbiBiZSB1c2VkIHRvIGNvbnN0cnVjdCBvYmplY3Rz
LiIiIgpAQCAtMTE1LDcgKzExNyw2IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgc2Vs
Zi5fY29uZmlnID0gcG9ydF9jb25maWcuQ29uZmlnKHNlbGYuX2V4ZWN1dGl2ZSwgc2VsZi5fZmls
ZXN5c3RlbSwgc2VsZi5wb3J0X25hbWUpCiAgICAgICAgIHNlbGYucHJldHR5X3BhdGNoID0gUHJl
dHR5UGF0Y2goc2VsZi5fZXhlY3V0aXZlLCBzZWxmLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgpLCBz
ZWxmLl9maWxlc3lzdGVtKQogCi0gICAgICAgIHNlbGYuX2hlbHBlciA9IE5vbmUKICAgICAgICAg
c2VsZi5faHR0cF9zZXJ2ZXIgPSBOb25lCiAgICAgICAgIHNlbGYuX3dlYnNvY2tldF9zZXJ2ZXIg
PSBOb25lCiAgICAgICAgIHNlbGYuX3dlYnNvY2tldF9zZWN1cmVfc2VydmVyID0gTm9uZQpAQCAt
OTYwLDcgKzk2MSwxNSBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgICIiIlNodXQgZG93
biB0aGUgdGVzdCBoZWxwZXIgaWYgaXQgaXMgcnVubmluZy4gRG8gbm90aGluZyBpZgogICAgICAg
ICBpdCBpc24ndCwgb3IgaXQgaXNuJ3QgYXZhaWxhYmxlLiBJZiBhIHBvcnQgb3ZlcnJpZGVzIHN0
YXJ0X2hlbHBlcigpCiAgICAgICAgIGl0IG11c3Qgb3ZlcnJpZGUgdGhpcyByb3V0aW5lIGFzIHdl
bGwuIiIiCi0gICAgICAgIHBhc3MKKyAgICAgICAgaWYgUG9ydC5oZWxwZXI6CisgICAgICAgICAg
ICBfbG9nLmRlYnVnKCJTdG9wcGluZyBMYXlvdXRUZXN0SGVscGVyIikKKyAgICAgICAgICAgIHRy
eToKKyAgICAgICAgICAgICAgICBQb3J0LmhlbHBlci5zdGRpbi53cml0ZShiInhcbiIpCisgICAg
ICAgICAgICAgICAgUG9ydC5oZWxwZXIuc3RkaW4uY2xvc2UoKQorICAgICAgICAgICAgICAgIFBv
cnQuaGVscGVyLndhaXQoKQorICAgICAgICAgICAgZXhjZXB0IElPRXJyb3IgYXMgZToKKyAgICAg
ICAgICAgICAgICBfbG9nLmRlYnVnKCJJT0Vycm9yIHJhaXNlZCB3aGlsZSBzdG9wcGluZyBoZWxw
ZXI6ICVzIiAlIHN0cihlKSkKKyAgICAgICAgICAgIFBvcnQuaGVscGVyID0gTm9uZQogCiAgICAg
ZGVmIHN0b3BfaHR0cF9zZXJ2ZXIoc2VsZik6CiAgICAgICAgICIiIlNodXQgZG93biB0aGUgaHR0
cCBzZXJ2ZXIgaWYgaXQgaXMgcnVubmluZy4gRG8gbm90aGluZyBpZiBpdCBpc24ndC4iIiIKSW5k
ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v
bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQkocmV2aXNpb24gMjc4MTY2KQorKysgVG9v
bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQkod29ya2luZyBjb3B5KQpAQCAtMjUzLDkg
KzI1Myw5IEBAIGNsYXNzIE1hY1BvcnQoRGFyd2luUG9ydCk6CiAgICAgICAgIGFyZ3VtZW50cyA9
IFtoZWxwZXJfcGF0aCwgJy0taW5zdGFsbC1jb2xvci1wcm9maWxlJ10KICAgICAgICAgaWYgcHJl
ZmVyX2ludGVncmF0ZWRfZ3B1OgogICAgICAgICAgICAgYXJndW1lbnRzLmFwcGVuZCgnLS1wcmVm
ZXItaW50ZWdyYXRlZC1ncHUnKQotICAgICAgICBzZWxmLl9oZWxwZXIgPSBzZWxmLl9leGVjdXRp
dmUucG9wZW4oYXJndW1lbnRzLAorICAgICAgICBNYWNQb3J0LmhlbHBlciA9IHNlbGYuX2V4ZWN1
dGl2ZS5wb3Blbihhcmd1bWVudHMsCiAgICAgICAgICAgICBzdGRpbj1zZWxmLl9leGVjdXRpdmUu
UElQRSwgc3Rkb3V0PXNlbGYuX2V4ZWN1dGl2ZS5QSVBFLCBzdGRlcnI9Tm9uZSkKLSAgICAgICAg
aXNfcmVhZHkgPSBzZWxmLl9oZWxwZXIuc3Rkb3V0LnJlYWRsaW5lKCkKKyAgICAgICAgaXNfcmVh
ZHkgPSBNYWNQb3J0LmhlbHBlci5zdGRvdXQucmVhZGxpbmUoKQogICAgICAgICBpZiBub3QgaXNf
cmVhZHkuc3RhcnRzd2l0aChiJ3JlYWR5Jyk6CiAgICAgICAgICAgICBfbG9nLmVycm9yKCJMYXlv
dXRUZXN0SGVscGVyIGNvdWxkIG5vdCBzdGFydCIpCiAgICAgICAgICAgICByZXR1cm4gRmFsc2UK
QEAgLTI3MiwxNyArMjcyLDYgQEAgY2xhc3MgTWFjUG9ydChEYXJ3aW5Qb3J0KToKICAgICAgICAg
ICAgICAgICBpZiBlLmV4aXRfY29kZSAhPSAxOgogICAgICAgICAgICAgICAgICAgICByYWlzZSBl
CiAKLSAgICBkZWYgc3RvcF9oZWxwZXIoc2VsZik6Ci0gICAgICAgIGlmIHNlbGYuX2hlbHBlcjoK
LSAgICAgICAgICAgIF9sb2cuZGVidWcoIlN0b3BwaW5nIExheW91dFRlc3RIZWxwZXIiKQotICAg
ICAgICAgICAgdHJ5OgotICAgICAgICAgICAgICAgIHNlbGYuX2hlbHBlci5zdGRpbi53cml0ZShi
InhcbiIpCi0gICAgICAgICAgICAgICAgc2VsZi5faGVscGVyLnN0ZGluLmNsb3NlKCkKLSAgICAg
ICAgICAgICAgICBzZWxmLl9oZWxwZXIud2FpdCgpCi0gICAgICAgICAgICBleGNlcHQgSU9FcnJv
ciBhcyBlOgotICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoIklPRXJyb3IgcmFpc2VkIHdoaWxl
IHN0b3BwaW5nIGhlbHBlcjogJXMiICUgc3RyKGUpKQotICAgICAgICAgICAgc2VsZi5faGVscGVy
ID0gTm9uZQotCiAgICAgZGVmIGxvZ2dpbmdfcGF0dGVybnNfdG9fc3RyaXAoc2VsZik6CiAgICAg
ICAgIGxvZ2dpbmdfcGF0dGVybnMgPSBbXQogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>429953</attachid>
            <date>2021-05-27 16:37:42 -0700</date>
            <delta_ts>2021-05-27 16:39:53 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226344-20210527163741.patch</filename>
            <type>text/plain</type>
            <size>4398</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI3ODE4MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE5IEBACisyMDIxLTA1LTI3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gTW92ZSBoZWxwZXIgb3V0IG9mIFBvcnQg
aW5zdGFuY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIyNjM0NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzg1NzU1NDI+CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Bv
cnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQpOiBNYWtlIGhlbHBlciBjbGFzcyB2YXJpYWJsZS4K
KyAgICAgICAgKFBvcnQuX19pbml0X18pOgorICAgICAgICAoUG9ydC5zdG9wX2hlbHBlcik6IEFs
bCBjbGFzc2VzIHNob3VsZCBzaGFyZSB0aGUgc2FtZSBjb2RlIHRvIHN0b3AgdGhlIGhlbHBlciBw
cm9jZXNzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHk6CisgICAgICAg
IChNYWNQb3J0LnN0YXJ0X2hlbHBlcik6IFVzZSBjbGFzcyB2YXJpYWJsZS4KKyAgICAgICAgKE1h
Y1BvcnQuc3RvcF9oZWxwZXIpOiBNb3ZlZCB0byBiYXNlIGNsYXNzLi4KKwogMjAyMS0wNS0yNyAg
RnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbcnVu
LXdlYmtpdC10ZXN0c11bV2luXSBTdHJpcCBQSFAgc3VwcG9ydCBmcm9tIHdlYnNlcnZlcgpJbmRl
eDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v
bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJKHJldmlzaW9uIDI3ODE4MikKKysrIFRv
b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC04MSw2
ICs4MSw4IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICBERVZJQ0VfVFlQRSA9IE5vbmUKICAg
ICBERUZBVUxUX0RFVklDRV9UWVBFUyA9IFtdCiAKKyAgICBoZWxwZXIgPSBOb25lCisKICAgICBA
Y2xhc3NtZXRob2QKICAgICBkZWYgZGV0ZXJtaW5lX2Z1bGxfcG9ydF9uYW1lKGNscywgaG9zdCwg
b3B0aW9ucywgcG9ydF9uYW1lKToKICAgICAgICAgIiIiUmV0dXJuIGEgZnVsbHktc3BlY2lmaWVk
IHBvcnQgbmFtZSB0aGF0IGNhbiBiZSB1c2VkIHRvIGNvbnN0cnVjdCBvYmplY3RzLiIiIgpAQCAt
MTE1LDcgKzExNyw2IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgc2VsZi5fY29uZmln
ID0gcG9ydF9jb25maWcuQ29uZmlnKHNlbGYuX2V4ZWN1dGl2ZSwgc2VsZi5fZmlsZXN5c3RlbSwg
c2VsZi5wb3J0X25hbWUpCiAgICAgICAgIHNlbGYucHJldHR5X3BhdGNoID0gUHJldHR5UGF0Y2go
c2VsZi5fZXhlY3V0aXZlLCBzZWxmLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgpLCBzZWxmLl9maWxl
c3lzdGVtKQogCi0gICAgICAgIHNlbGYuX2hlbHBlciA9IE5vbmUKICAgICAgICAgc2VsZi5faHR0
cF9zZXJ2ZXIgPSBOb25lCiAgICAgICAgIHNlbGYuX3dlYnNvY2tldF9zZXJ2ZXIgPSBOb25lCiAg
ICAgICAgIHNlbGYuX3dlYnNvY2tldF9zZWN1cmVfc2VydmVyID0gTm9uZQpAQCAtOTYwLDcgKzk2
MSwxNSBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgICIiIlNodXQgZG93biB0aGUgdGVz
dCBoZWxwZXIgaWYgaXQgaXMgcnVubmluZy4gRG8gbm90aGluZyBpZgogICAgICAgICBpdCBpc24n
dCwgb3IgaXQgaXNuJ3QgYXZhaWxhYmxlLiBJZiBhIHBvcnQgb3ZlcnJpZGVzIHN0YXJ0X2hlbHBl
cigpCiAgICAgICAgIGl0IG11c3Qgb3ZlcnJpZGUgdGhpcyByb3V0aW5lIGFzIHdlbGwuIiIiCi0g
ICAgICAgIHBhc3MKKyAgICAgICAgaWYgUG9ydC5oZWxwZXI6CisgICAgICAgICAgICBfbG9nLmRl
YnVnKCJTdG9wcGluZyBMYXlvdXRUZXN0SGVscGVyIikKKyAgICAgICAgICAgIHRyeToKKyAgICAg
ICAgICAgICAgICBQb3J0LmhlbHBlci5zdGRpbi53cml0ZShiInhcbiIpCisgICAgICAgICAgICAg
ICAgUG9ydC5oZWxwZXIuc3RkaW4uY2xvc2UoKQorICAgICAgICAgICAgICAgIFBvcnQuaGVscGVy
LndhaXQoKQorICAgICAgICAgICAgZXhjZXB0IElPRXJyb3IgYXMgZToKKyAgICAgICAgICAgICAg
ICBfbG9nLmRlYnVnKCJJT0Vycm9yIHJhaXNlZCB3aGlsZSBzdG9wcGluZyBoZWxwZXI6ICVzIiAl
IHN0cihlKSkKKyAgICAgICAgICAgIFBvcnQuaGVscGVyID0gTm9uZQogCiAgICAgZGVmIHN0b3Bf
aHR0cF9zZXJ2ZXIoc2VsZik6CiAgICAgICAgICIiIlNodXQgZG93biB0aGUgaHR0cCBzZXJ2ZXIg
aWYgaXQgaXMgcnVubmluZy4gRG8gbm90aGluZyBpZiBpdCBpc24ndC4iIiIKSW5kZXg6IFRvb2xz
L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0
cy93ZWJraXRweS9wb3J0L21hYy5weQkocmV2aXNpb24gMjc4MTgyKQorKysgVG9vbHMvU2NyaXB0
cy93ZWJraXRweS9wb3J0L21hYy5weQkod29ya2luZyBjb3B5KQpAQCAtMzcsNiArMzcsNyBAQCBm
cm9tIHdlYmtpdHB5LmNvbW1vbi5tZW1vaXplZCBpbXBvcnQgbWVtCiBmcm9tIHdlYmtpdHB5LmNv
bW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBTY3JpcHRFcnJvcgogZnJvbSB3ZWJraXRweS5j
b21tb24udmVyc2lvbl9uYW1lX21hcCBpbXBvcnQgUFVCTElDX1RBQkxFLCBJTlRFUk5BTF9UQUJM
RQogZnJvbSB3ZWJraXRweS5jb21tb24udmVyc2lvbl9uYW1lX21hcCBpbXBvcnQgVmVyc2lvbk5h
bWVNYXAKK2Zyb20gd2Via2l0cHkucG9ydC5iYXNlIGltcG9ydCBQb3J0CiBmcm9tIHdlYmtpdHB5
LnBvcnQuY29uZmlnIGltcG9ydCBhcHBsZV9hZGRpdGlvbnMsIENvbmZpZwogZnJvbSB3ZWJraXRw
eS5wb3J0LmRhcndpbiBpbXBvcnQgRGFyd2luUG9ydAogCkBAIC0yNTMsOSArMjU0LDkgQEAgY2xh
c3MgTWFjUG9ydChEYXJ3aW5Qb3J0KToKICAgICAgICAgYXJndW1lbnRzID0gW2hlbHBlcl9wYXRo
LCAnLS1pbnN0YWxsLWNvbG9yLXByb2ZpbGUnXQogICAgICAgICBpZiBwcmVmZXJfaW50ZWdyYXRl
ZF9ncHU6CiAgICAgICAgICAgICBhcmd1bWVudHMuYXBwZW5kKCctLXByZWZlci1pbnRlZ3JhdGVk
LWdwdScpCi0gICAgICAgIHNlbGYuX2hlbHBlciA9IHNlbGYuX2V4ZWN1dGl2ZS5wb3Blbihhcmd1
bWVudHMsCisgICAgICAgIFBvcnQuaGVscGVyID0gc2VsZi5fZXhlY3V0aXZlLnBvcGVuKGFyZ3Vt
ZW50cywKICAgICAgICAgICAgIHN0ZGluPXNlbGYuX2V4ZWN1dGl2ZS5QSVBFLCBzdGRvdXQ9c2Vs
Zi5fZXhlY3V0aXZlLlBJUEUsIHN0ZGVycj1Ob25lKQotICAgICAgICBpc19yZWFkeSA9IHNlbGYu
X2hlbHBlci5zdGRvdXQucmVhZGxpbmUoKQorICAgICAgICBpc19yZWFkeSA9IFBvcnQuaGVscGVy
LnN0ZG91dC5yZWFkbGluZSgpCiAgICAgICAgIGlmIG5vdCBpc19yZWFkeS5zdGFydHN3aXRoKGIn
cmVhZHknKToKICAgICAgICAgICAgIF9sb2cuZXJyb3IoIkxheW91dFRlc3RIZWxwZXIgY291bGQg
bm90IHN0YXJ0IikKICAgICAgICAgICAgIHJldHVybiBGYWxzZQpAQCAtMjcyLDE3ICsyNzMsNiBA
QCBjbGFzcyBNYWNQb3J0KERhcndpblBvcnQpOgogICAgICAgICAgICAgICAgIGlmIGUuZXhpdF9j
b2RlICE9IDE6CiAgICAgICAgICAgICAgICAgICAgIHJhaXNlIGUKIAotICAgIGRlZiBzdG9wX2hl
bHBlcihzZWxmKToKLSAgICAgICAgaWYgc2VsZi5faGVscGVyOgotICAgICAgICAgICAgX2xvZy5k
ZWJ1ZygiU3RvcHBpbmcgTGF5b3V0VGVzdEhlbHBlciIpCi0gICAgICAgICAgICB0cnk6Ci0gICAg
ICAgICAgICAgICAgc2VsZi5faGVscGVyLnN0ZGluLndyaXRlKGIieFxuIikKLSAgICAgICAgICAg
ICAgICBzZWxmLl9oZWxwZXIuc3RkaW4uY2xvc2UoKQotICAgICAgICAgICAgICAgIHNlbGYuX2hl
bHBlci53YWl0KCkKLSAgICAgICAgICAgIGV4Y2VwdCBJT0Vycm9yIGFzIGU6Ci0gICAgICAgICAg
ICAgICAgX2xvZy5kZWJ1ZygiSU9FcnJvciByYWlzZWQgd2hpbGUgc3RvcHBpbmcgaGVscGVyOiAl
cyIgJSBzdHIoZSkpCi0gICAgICAgICAgICBzZWxmLl9oZWxwZXIgPSBOb25lCi0KICAgICBkZWYg
bG9nZ2luZ19wYXR0ZXJuc190b19zdHJpcChzZWxmKToKICAgICAgICAgbG9nZ2luZ19wYXR0ZXJu
cyA9IFtdCiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>429954</attachid>
            <date>2021-05-27 16:39:55 -0700</date>
            <delta_ts>2021-06-01 11:48:41 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226344-20210527163954.patch</filename>
            <type>text/plain</type>
            <size>4473</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI3ODE4MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE5IEBACisyMDIxLTA1LTI3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gTW92ZSBoZWxwZXIgb3V0IG9mIFBvcnQg
aW5zdGFuY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIyNjM0NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzg1NzU1NDI+CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Bv
cnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQpOiBNYWtlIGhlbHBlciBjbGFzcyB2YXJpYWJsZS4K
KyAgICAgICAgKFBvcnQuX19pbml0X18pOgorICAgICAgICAoUG9ydC5zdG9wX2hlbHBlcik6IEFs
bCBjbGFzc2VzIHNob3VsZCBzaGFyZSB0aGUgc2FtZSBjb2RlIHRvIHN0b3AgdGhlIGhlbHBlciBw
cm9jZXNzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHk6CisgICAgICAg
IChNYWNQb3J0LnN0YXJ0X2hlbHBlcik6IFVzZSBjbGFzcyB2YXJpYWJsZS4KKyAgICAgICAgKE1h
Y1BvcnQuc3RvcF9oZWxwZXIpOiBNb3ZlZCB0byBiYXNlIGNsYXNzLi4KKwogMjAyMS0wNS0yNyAg
RnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbcnVu
LXdlYmtpdC10ZXN0c11bV2luXSBTdHJpcCBQSFAgc3VwcG9ydCBmcm9tIHdlYnNlcnZlcgpJbmRl
eDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v
bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJKHJldmlzaW9uIDI3ODE4MikKKysrIFRv
b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC04MSw2
ICs4MSw4IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICBERVZJQ0VfVFlQRSA9IE5vbmUKICAg
ICBERUZBVUxUX0RFVklDRV9UWVBFUyA9IFtdCiAKKyAgICBoZWxwZXIgPSBOb25lCisKICAgICBA
Y2xhc3NtZXRob2QKICAgICBkZWYgZGV0ZXJtaW5lX2Z1bGxfcG9ydF9uYW1lKGNscywgaG9zdCwg
b3B0aW9ucywgcG9ydF9uYW1lKToKICAgICAgICAgIiIiUmV0dXJuIGEgZnVsbHktc3BlY2lmaWVk
IHBvcnQgbmFtZSB0aGF0IGNhbiBiZSB1c2VkIHRvIGNvbnN0cnVjdCBvYmplY3RzLiIiIgpAQCAt
MTE1LDcgKzExNyw2IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgc2VsZi5fY29uZmln
ID0gcG9ydF9jb25maWcuQ29uZmlnKHNlbGYuX2V4ZWN1dGl2ZSwgc2VsZi5fZmlsZXN5c3RlbSwg
c2VsZi5wb3J0X25hbWUpCiAgICAgICAgIHNlbGYucHJldHR5X3BhdGNoID0gUHJldHR5UGF0Y2go
c2VsZi5fZXhlY3V0aXZlLCBzZWxmLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgpLCBzZWxmLl9maWxl
c3lzdGVtKQogCi0gICAgICAgIHNlbGYuX2hlbHBlciA9IE5vbmUKICAgICAgICAgc2VsZi5faHR0
cF9zZXJ2ZXIgPSBOb25lCiAgICAgICAgIHNlbGYuX3dlYnNvY2tldF9zZXJ2ZXIgPSBOb25lCiAg
ICAgICAgIHNlbGYuX3dlYnNvY2tldF9zZWN1cmVfc2VydmVyID0gTm9uZQpAQCAtOTU4LDkgKzk1
OSwxNiBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAKICAgICBkZWYgc3RvcF9oZWxwZXIoc2VsZik6
CiAgICAgICAgICIiIlNodXQgZG93biB0aGUgdGVzdCBoZWxwZXIgaWYgaXQgaXMgcnVubmluZy4g
RG8gbm90aGluZyBpZgotICAgICAgICBpdCBpc24ndCwgb3IgaXQgaXNuJ3QgYXZhaWxhYmxlLiBJ
ZiBhIHBvcnQgb3ZlcnJpZGVzIHN0YXJ0X2hlbHBlcigpCi0gICAgICAgIGl0IG11c3Qgb3ZlcnJp
ZGUgdGhpcyByb3V0aW5lIGFzIHdlbGwuIiIiCi0gICAgICAgIHBhc3MKKyAgICAgICAgaXQgaXNu
J3QsIG9yIGl0IGlzbid0IGF2YWlsYWJsZS4iIiIKKyAgICAgICAgaWYgUG9ydC5oZWxwZXI6Cisg
ICAgICAgICAgICBfbG9nLmRlYnVnKCJTdG9wcGluZyBMYXlvdXRUZXN0SGVscGVyIikKKyAgICAg
ICAgICAgIHRyeToKKyAgICAgICAgICAgICAgICBQb3J0LmhlbHBlci5zdGRpbi53cml0ZShiInhc
biIpCisgICAgICAgICAgICAgICAgUG9ydC5oZWxwZXIuc3RkaW4uY2xvc2UoKQorICAgICAgICAg
ICAgICAgIFBvcnQuaGVscGVyLndhaXQoKQorICAgICAgICAgICAgZXhjZXB0IElPRXJyb3IgYXMg
ZToKKyAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCJJT0Vycm9yIHJhaXNlZCB3aGlsZSBzdG9w
cGluZyBoZWxwZXI6ICVzIiAlIHN0cihlKSkKKyAgICAgICAgICAgIFBvcnQuaGVscGVyID0gTm9u
ZQogCiAgICAgZGVmIHN0b3BfaHR0cF9zZXJ2ZXIoc2VsZik6CiAgICAgICAgICIiIlNodXQgZG93
biB0aGUgaHR0cCBzZXJ2ZXIgaWYgaXQgaXMgcnVubmluZy4gRG8gbm90aGluZyBpZiBpdCBpc24n
dC4iIiIKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQkocmV2aXNpb24gMjc4MTgy
KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQkod29ya2luZyBjb3B5KQpA
QCAtMzcsNiArMzcsNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5tZW1vaXplZCBpbXBvcnQgbWVt
CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBTY3JpcHRFcnJv
cgogZnJvbSB3ZWJraXRweS5jb21tb24udmVyc2lvbl9uYW1lX21hcCBpbXBvcnQgUFVCTElDX1RB
QkxFLCBJTlRFUk5BTF9UQUJMRQogZnJvbSB3ZWJraXRweS5jb21tb24udmVyc2lvbl9uYW1lX21h
cCBpbXBvcnQgVmVyc2lvbk5hbWVNYXAKK2Zyb20gd2Via2l0cHkucG9ydC5iYXNlIGltcG9ydCBQ
b3J0CiBmcm9tIHdlYmtpdHB5LnBvcnQuY29uZmlnIGltcG9ydCBhcHBsZV9hZGRpdGlvbnMsIENv
bmZpZwogZnJvbSB3ZWJraXRweS5wb3J0LmRhcndpbiBpbXBvcnQgRGFyd2luUG9ydAogCkBAIC0y
NTMsOSArMjU0LDkgQEAgY2xhc3MgTWFjUG9ydChEYXJ3aW5Qb3J0KToKICAgICAgICAgYXJndW1l
bnRzID0gW2hlbHBlcl9wYXRoLCAnLS1pbnN0YWxsLWNvbG9yLXByb2ZpbGUnXQogICAgICAgICBp
ZiBwcmVmZXJfaW50ZWdyYXRlZF9ncHU6CiAgICAgICAgICAgICBhcmd1bWVudHMuYXBwZW5kKCct
LXByZWZlci1pbnRlZ3JhdGVkLWdwdScpCi0gICAgICAgIHNlbGYuX2hlbHBlciA9IHNlbGYuX2V4
ZWN1dGl2ZS5wb3Blbihhcmd1bWVudHMsCisgICAgICAgIFBvcnQuaGVscGVyID0gc2VsZi5fZXhl
Y3V0aXZlLnBvcGVuKGFyZ3VtZW50cywKICAgICAgICAgICAgIHN0ZGluPXNlbGYuX2V4ZWN1dGl2
ZS5QSVBFLCBzdGRvdXQ9c2VsZi5fZXhlY3V0aXZlLlBJUEUsIHN0ZGVycj1Ob25lKQotICAgICAg
ICBpc19yZWFkeSA9IHNlbGYuX2hlbHBlci5zdGRvdXQucmVhZGxpbmUoKQorICAgICAgICBpc19y
ZWFkeSA9IFBvcnQuaGVscGVyLnN0ZG91dC5yZWFkbGluZSgpCiAgICAgICAgIGlmIG5vdCBpc19y
ZWFkeS5zdGFydHN3aXRoKGIncmVhZHknKToKICAgICAgICAgICAgIF9sb2cuZXJyb3IoIkxheW91
dFRlc3RIZWxwZXIgY291bGQgbm90IHN0YXJ0IikKICAgICAgICAgICAgIHJldHVybiBGYWxzZQpA
QCAtMjcyLDE3ICsyNzMsNiBAQCBjbGFzcyBNYWNQb3J0KERhcndpblBvcnQpOgogICAgICAgICAg
ICAgICAgIGlmIGUuZXhpdF9jb2RlICE9IDE6CiAgICAgICAgICAgICAgICAgICAgIHJhaXNlIGUK
IAotICAgIGRlZiBzdG9wX2hlbHBlcihzZWxmKToKLSAgICAgICAgaWYgc2VsZi5faGVscGVyOgot
ICAgICAgICAgICAgX2xvZy5kZWJ1ZygiU3RvcHBpbmcgTGF5b3V0VGVzdEhlbHBlciIpCi0gICAg
ICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgc2VsZi5faGVscGVyLnN0ZGluLndyaXRlKGIi
eFxuIikKLSAgICAgICAgICAgICAgICBzZWxmLl9oZWxwZXIuc3RkaW4uY2xvc2UoKQotICAgICAg
ICAgICAgICAgIHNlbGYuX2hlbHBlci53YWl0KCkKLSAgICAgICAgICAgIGV4Y2VwdCBJT0Vycm9y
IGFzIGU6Ci0gICAgICAgICAgICAgICAgX2xvZy5kZWJ1ZygiSU9FcnJvciByYWlzZWQgd2hpbGUg
c3RvcHBpbmcgaGVscGVyOiAlcyIgJSBzdHIoZSkpCi0gICAgICAgICAgICBzZWxmLl9oZWxwZXIg
PSBOb25lCi0KICAgICBkZWYgbG9nZ2luZ19wYXR0ZXJuc190b19zdHJpcChzZWxmKToKICAgICAg
ICAgbG9nZ2luZ19wYXR0ZXJucyA9IFtdCiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>430280</attachid>
            <date>2021-06-01 11:48:45 -0700</date>
            <delta_ts>2021-06-01 15:42:51 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226344-20210601114843.patch</filename>
            <type>text/plain</type>
            <size>5395</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI3ODMxNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE5IEBACisyMDIxLTA2LTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gTW92ZSBoZWxwZXIgb3V0IG9mIFBvcnQg
aW5zdGFuY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIyNjM0NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzg1NzU1NDI+CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Bv
cnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQpOiBNYWtlIGhlbHBlciBjbGFzcyB2YXJpYWJsZS4K
KyAgICAgICAgKFBvcnQuX19pbml0X18pOgorICAgICAgICAoUG9ydC5zdG9wX2hlbHBlcik6IEFs
bCBjbGFzc2VzIHNob3VsZCBzaGFyZSB0aGUgc2FtZSBjb2RlIHRvIHN0b3AgdGhlIGhlbHBlciBw
cm9jZXNzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHk6CisgICAgICAg
IChNYWNQb3J0LnN0YXJ0X2hlbHBlcik6IFVzZSBjbGFzcyB2YXJpYWJsZS4KKyAgICAgICAgKE1h
Y1BvcnQuc3RvcF9oZWxwZXIpOiBNb3ZlZCB0byBiYXNlIGNsYXNzLi4KKwogMjAyMS0wNi0wMSAg
QWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUHJpbnQgYm90
IGNvbmZpZ3VyYXRpb24gaW4gYnVpbGQud2Via2l0Lm9yZyBidWlsZHMKSW5kZXg6IFRvb2xzL1Nj
cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKPT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv
bWFuYWdlci5weQkocmV2aXNpb24gMjc4MzE1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s
YXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQkod29ya2luZyBjb3B5KQpAQCAtNTc1
LDcgKzU3NSw2IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgICAgIHJldHVybiBG
YWxzZQogCiAgICAgICAgIF9sb2cuZGVidWcoIlJlc3RhcnRpbmcgaGVscGVyIikKLSAgICAgICAg
c2VsZi5fcG9ydC5zdG9wX2hlbHBlcigpCiAgICAgICAgIHNlbGYuX29wdGlvbnMucGl4ZWxfdGVz
dHMgPSBUcnVlCiAgICAgICAgIHJldHVybiBzZWxmLl9wb3J0LnN0YXJ0X2hlbHBlcihwcmVmZXJf
aW50ZWdyYXRlZF9ncHU9c2VsZi5fb3B0aW9ucy5wcmVmZXJfaW50ZWdyYXRlZF9ncHUpCiAKSW5k
ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5Cj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv
b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CShyZXZpc2lvbiAyNzgzMTUpCisrKyBU
b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQkod29ya2luZyBjb3B5KQpAQCAtODEs
NiArODEsOCBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgREVWSUNFX1RZUEUgPSBOb25lCiAg
ICAgREVGQVVMVF9ERVZJQ0VfVFlQRVMgPSBbXQogCisgICAgaGVscGVyID0gTm9uZQorCiAgICAg
QGNsYXNzbWV0aG9kCiAgICAgZGVmIGRldGVybWluZV9mdWxsX3BvcnRfbmFtZShjbHMsIGhvc3Qs
IG9wdGlvbnMsIHBvcnRfbmFtZSk6CiAgICAgICAgICIiIlJldHVybiBhIGZ1bGx5LXNwZWNpZmll
ZCBwb3J0IG5hbWUgdGhhdCBjYW4gYmUgdXNlZCB0byBjb25zdHJ1Y3Qgb2JqZWN0cy4iIiIKQEAg
LTExNSw3ICsxMTcsNiBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgIHNlbGYuX2NvbmZp
ZyA9IHBvcnRfY29uZmlnLkNvbmZpZyhzZWxmLl9leGVjdXRpdmUsIHNlbGYuX2ZpbGVzeXN0ZW0s
IHNlbGYucG9ydF9uYW1lKQogICAgICAgICBzZWxmLnByZXR0eV9wYXRjaCA9IFByZXR0eVBhdGNo
KHNlbGYuX2V4ZWN1dGl2ZSwgc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoKSwgc2VsZi5fZmls
ZXN5c3RlbSkKIAotICAgICAgICBzZWxmLl9oZWxwZXIgPSBOb25lCiAgICAgICAgIHNlbGYuX2h0
dHBfc2VydmVyID0gTm9uZQogICAgICAgICBzZWxmLl93ZWJzb2NrZXRfc2VydmVyID0gTm9uZQog
ICAgICAgICBzZWxmLl93ZWJzb2NrZXRfc2VjdXJlX3NlcnZlciA9IE5vbmUKQEAgLTk1OCw5ICs5
NTksMTYgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogCiAgICAgZGVmIHN0b3BfaGVscGVyKHNlbGYp
OgogICAgICAgICAiIiJTaHV0IGRvd24gdGhlIHRlc3QgaGVscGVyIGlmIGl0IGlzIHJ1bm5pbmcu
IERvIG5vdGhpbmcgaWYKLSAgICAgICAgaXQgaXNuJ3QsIG9yIGl0IGlzbid0IGF2YWlsYWJsZS4g
SWYgYSBwb3J0IG92ZXJyaWRlcyBzdGFydF9oZWxwZXIoKQotICAgICAgICBpdCBtdXN0IG92ZXJy
aWRlIHRoaXMgcm91dGluZSBhcyB3ZWxsLiIiIgotICAgICAgICBwYXNzCisgICAgICAgIGl0IGlz
bid0LCBvciBpdCBpc24ndCBhdmFpbGFibGUuIiIiCisgICAgICAgIGlmIFBvcnQuaGVscGVyOgor
ICAgICAgICAgICAgX2xvZy5kZWJ1ZygiU3RvcHBpbmcgTGF5b3V0VGVzdEhlbHBlciIpCisgICAg
ICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgUG9ydC5oZWxwZXIuc3RkaW4ud3JpdGUoYiJ4
XG4iKQorICAgICAgICAgICAgICAgIFBvcnQuaGVscGVyLnN0ZGluLmNsb3NlKCkKKyAgICAgICAg
ICAgICAgICBQb3J0LmhlbHBlci53YWl0KCkKKyAgICAgICAgICAgIGV4Y2VwdCBJT0Vycm9yIGFz
IGU6CisgICAgICAgICAgICAgICAgX2xvZy5kZWJ1ZygiSU9FcnJvciByYWlzZWQgd2hpbGUgc3Rv
cHBpbmcgaGVscGVyOiAlcyIgJSBzdHIoZSkpCisgICAgICAgICAgICBQb3J0LmhlbHBlciA9IE5v
bmUKIAogICAgIGRlZiBzdG9wX2h0dHBfc2VydmVyKHNlbGYpOgogICAgICAgICAiIiJTaHV0IGRv
d24gdGhlIGh0dHAgc2VydmVyIGlmIGl0IGlzIHJ1bm5pbmcuIERvIG5vdGhpbmcgaWYgaXQgaXNu
J3QuIiIiCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjLnB5Cj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkJKHJldmlzaW9uIDI3ODMx
NSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkJKHdvcmtpbmcgY29weSkK
QEAgLTM3LDYgKzM3LDcgQEAgZnJvbSB3ZWJraXRweS5jb21tb24ubWVtb2l6ZWQgaW1wb3J0IG1l
bQogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJy
b3IKIGZyb20gd2Via2l0cHkuY29tbW9uLnZlcnNpb25fbmFtZV9tYXAgaW1wb3J0IFBVQkxJQ19U
QUJMRSwgSU5URVJOQUxfVEFCTEUKIGZyb20gd2Via2l0cHkuY29tbW9uLnZlcnNpb25fbmFtZV9t
YXAgaW1wb3J0IFZlcnNpb25OYW1lTWFwCitmcm9tIHdlYmtpdHB5LnBvcnQuYmFzZSBpbXBvcnQg
UG9ydAogZnJvbSB3ZWJraXRweS5wb3J0LmNvbmZpZyBpbXBvcnQgYXBwbGVfYWRkaXRpb25zLCBD
b25maWcKIGZyb20gd2Via2l0cHkucG9ydC5kYXJ3aW4gaW1wb3J0IERhcndpblBvcnQKIApAQCAt
MjQ1LDYgKzI0Niw4IEBAIGNsYXNzIE1hY1BvcnQoRGFyd2luUG9ydCk6CiAgICAgICAgIHJldHVy
biBtaW4oc3VwcG9ydGFibGVfaW5zdGFuY2VzLCBkZWZhdWx0X2NvdW50KQogCiAgICAgZGVmIHN0
YXJ0X2hlbHBlcihzZWxmLCBwaXhlbF90ZXN0cz1GYWxzZSwgcHJlZmVyX2ludGVncmF0ZWRfZ3B1
PUZhbHNlKToKKyAgICAgICAgc2VsZi5zdG9wX2hlbHBlcigpCisKICAgICAgICAgaGVscGVyX3Bh
dGggPSBzZWxmLl9wYXRoX3RvX2hlbHBlcigpCiAgICAgICAgIGlmIG5vdCBoZWxwZXJfcGF0aDoK
ICAgICAgICAgICAgIF9sb2cuZXJyb3IoIk5vIHBhdGggdG8gTGF5b3V0VGVzdEhlbHBlciBiaW5h
cnkiKQpAQCAtMjUzLDkgKzI1Niw5IEBAIGNsYXNzIE1hY1BvcnQoRGFyd2luUG9ydCk6CiAgICAg
ICAgIGFyZ3VtZW50cyA9IFtoZWxwZXJfcGF0aCwgJy0taW5zdGFsbC1jb2xvci1wcm9maWxlJ10K
ICAgICAgICAgaWYgcHJlZmVyX2ludGVncmF0ZWRfZ3B1OgogICAgICAgICAgICAgYXJndW1lbnRz
LmFwcGVuZCgnLS1wcmVmZXItaW50ZWdyYXRlZC1ncHUnKQotICAgICAgICBzZWxmLl9oZWxwZXIg
PSBzZWxmLl9leGVjdXRpdmUucG9wZW4oYXJndW1lbnRzLAorICAgICAgICBQb3J0LmhlbHBlciA9
IHNlbGYuX2V4ZWN1dGl2ZS5wb3Blbihhcmd1bWVudHMsCiAgICAgICAgICAgICBzdGRpbj1zZWxm
Ll9leGVjdXRpdmUuUElQRSwgc3Rkb3V0PXNlbGYuX2V4ZWN1dGl2ZS5QSVBFLCBzdGRlcnI9Tm9u
ZSkKLSAgICAgICAgaXNfcmVhZHkgPSBzZWxmLl9oZWxwZXIuc3Rkb3V0LnJlYWRsaW5lKCkKKyAg
ICAgICAgaXNfcmVhZHkgPSBQb3J0LmhlbHBlci5zdGRvdXQucmVhZGxpbmUoKQogICAgICAgICBp
ZiBub3QgaXNfcmVhZHkuc3RhcnRzd2l0aChiJ3JlYWR5Jyk6CiAgICAgICAgICAgICBfbG9nLmVy
cm9yKCJMYXlvdXRUZXN0SGVscGVyIGNvdWxkIG5vdCBzdGFydCIpCiAgICAgICAgICAgICByZXR1
cm4gRmFsc2UKQEAgLTI3MiwxNyArMjc1LDYgQEAgY2xhc3MgTWFjUG9ydChEYXJ3aW5Qb3J0KToK
ICAgICAgICAgICAgICAgICBpZiBlLmV4aXRfY29kZSAhPSAxOgogICAgICAgICAgICAgICAgICAg
ICByYWlzZSBlCiAKLSAgICBkZWYgc3RvcF9oZWxwZXIoc2VsZik6Ci0gICAgICAgIGlmIHNlbGYu
X2hlbHBlcjoKLSAgICAgICAgICAgIF9sb2cuZGVidWcoIlN0b3BwaW5nIExheW91dFRlc3RIZWxw
ZXIiKQotICAgICAgICAgICAgdHJ5OgotICAgICAgICAgICAgICAgIHNlbGYuX2hlbHBlci5zdGRp
bi53cml0ZShiInhcbiIpCi0gICAgICAgICAgICAgICAgc2VsZi5faGVscGVyLnN0ZGluLmNsb3Nl
KCkKLSAgICAgICAgICAgICAgICBzZWxmLl9oZWxwZXIud2FpdCgpCi0gICAgICAgICAgICBleGNl
cHQgSU9FcnJvciBhcyBlOgotICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoIklPRXJyb3IgcmFp
c2VkIHdoaWxlIHN0b3BwaW5nIGhlbHBlcjogJXMiICUgc3RyKGUpKQotICAgICAgICAgICAgc2Vs
Zi5faGVscGVyID0gTm9uZQotCiAgICAgZGVmIGxvZ2dpbmdfcGF0dGVybnNfdG9fc3RyaXAoc2Vs
Zik6CiAgICAgICAgIGxvZ2dpbmdfcGF0dGVybnMgPSBbXQogCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>430300</attachid>
            <date>2021-06-01 15:42:54 -0700</date>
            <delta_ts>2021-06-01 16:23:29 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226344-20210601154252.patch</filename>
            <type>text/plain</type>
            <size>5779</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MzMxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTdlOTBhN2ZjMzFhNWRmODMwYTgwOTA3ZjYzNmI1ZmJl
ZjgwZGEzOC4uN2M5YzEwMDgzYTUwNTg2N2JiMGNhZTBlOTVhYjQ0ZTI5YmE1ZjczNCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy
IEBACisyMDIxLTA2LTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor
ICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gTW92ZSBoZWxwZXIgb3V0IG9mIFBvcnQgaW5zdGFu
Y2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjM0
NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzg1NzU1NDI+CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgRGV3ZWkgWmh1LgorCisgICAgICAgIFRoZSAiaGVscGVyIiBpcyBhIHBvcGVuIG9iamVjdCwg
d2hpY2ggYXJlIG5vdCBwaWNrbGVhYmxlLCBhbmQgY2Fubm90CisgICAgICAgIGJlbG9uZyB0byBh
biBpbnN0YW50aWF0ZWQgcG9ydCBvYmplY3QuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5
L3BvcnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQpOiBNYWtlIGhlbHBlciBjbGFzcyB2YXJpYWJs
ZS4KKyAgICAgICAgKFBvcnQuX19pbml0X18pOgorICAgICAgICAoUG9ydC5zdG9wX2hlbHBlcik6
IEFsbCBjbGFzc2VzIHNob3VsZCBzaGFyZSB0aGUgc2FtZSBjb2RlIHRvIHN0b3AgdGhlIGhlbHBl
ciBwcm9jZXNzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHk6CisgICAg
ICAgIChNYWNQb3J0LnN0YXJ0X2hlbHBlcik6IFVzZSBjbGFzcyB2YXJpYWJsZS4KKyAgICAgICAg
KE1hY1BvcnQuc3RvcF9oZWxwZXIpOiBNb3ZlZCB0byBiYXNlIGNsYXNzLi4KKwogMjAyMS0wNi0w
MSAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBT
eW5jIFRvb2xzL3dpbi9ETExMYXVuY2hlci9ETExMYXVuY2hlck1haW4uY3BwIHdpdGggU291cmNl
L0phdmFTY3JpcHRDb3JlL3NoZWxsL0RMTExhdW5jaGVyTWFpbi5jcHAKZGlmZiAtLWdpdCBhL1Rv
b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkg
Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2Vy
LnB5CmluZGV4IGFkZWE4NmYxYmI0NmZjMmY1OWIyNmEwYmY4MDFjNWZjNDc4MjYyMzIuLjIzNzFk
ODA3OWUyODA0YzU4NjA1MjhlM2YwY2I2YjNmYjZkNGI0NTcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj
cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKKysrIGIv
VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5w
eQpAQCAtNTc1LDcgKzU3NSw2IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgICAg
IHJldHVybiBGYWxzZQogCiAgICAgICAgIF9sb2cuZGVidWcoIlJlc3RhcnRpbmcgaGVscGVyIikK
LSAgICAgICAgc2VsZi5fcG9ydC5zdG9wX2hlbHBlcigpCiAgICAgICAgIHNlbGYuX29wdGlvbnMu
cGl4ZWxfdGVzdHMgPSBUcnVlCiAgICAgICAgIHJldHVybiBzZWxmLl9wb3J0LnN0YXJ0X2hlbHBl
cihwcmVmZXJfaW50ZWdyYXRlZF9ncHU9c2VsZi5fb3B0aW9ucy5wcmVmZXJfaW50ZWdyYXRlZF9n
cHUpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5IGIv
VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKaW5kZXggMDVkNGQ3NDY0YTU5NzNk
YzJhNWM0NDFjYjAzZjk5OTNiNDQ5NjZhNy4uMDk3NmQ4Yzg5ZWY1MmIyNjAyZDgwNDYwNTI1YjNh
NWE5ZDJjYTVkMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2Uu
cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKQEAgLTgxLDYgKzgx
LDggQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgIERFVklDRV9UWVBFID0gTm9uZQogICAgIERF
RkFVTFRfREVWSUNFX1RZUEVTID0gW10KIAorICAgIGhlbHBlciA9IE5vbmUKKwogICAgIEBjbGFz
c21ldGhvZAogICAgIGRlZiBkZXRlcm1pbmVfZnVsbF9wb3J0X25hbWUoY2xzLCBob3N0LCBvcHRp
b25zLCBwb3J0X25hbWUpOgogICAgICAgICAiIiJSZXR1cm4gYSBmdWxseS1zcGVjaWZpZWQgcG9y
dCBuYW1lIHRoYXQgY2FuIGJlIHVzZWQgdG8gY29uc3RydWN0IG9iamVjdHMuIiIiCkBAIC0xMTUs
NyArMTE3LDYgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICBzZWxmLl9jb25maWcgPSBw
b3J0X2NvbmZpZy5Db25maWcoc2VsZi5fZXhlY3V0aXZlLCBzZWxmLl9maWxlc3lzdGVtLCBzZWxm
LnBvcnRfbmFtZSkKICAgICAgICAgc2VsZi5wcmV0dHlfcGF0Y2ggPSBQcmV0dHlQYXRjaChzZWxm
Ll9leGVjdXRpdmUsIHNlbGYucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCksIHNlbGYuX2ZpbGVzeXN0
ZW0pCiAKLSAgICAgICAgc2VsZi5faGVscGVyID0gTm9uZQogICAgICAgICBzZWxmLl9odHRwX3Nl
cnZlciA9IE5vbmUKICAgICAgICAgc2VsZi5fd2Vic29ja2V0X3NlcnZlciA9IE5vbmUKICAgICAg
ICAgc2VsZi5fd2Vic29ja2V0X3NlY3VyZV9zZXJ2ZXIgPSBOb25lCkBAIC05NTgsOSArOTU5LDE2
IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKIAogICAgIGRlZiBzdG9wX2hlbHBlcihzZWxmKToKICAg
ICAgICAgIiIiU2h1dCBkb3duIHRoZSB0ZXN0IGhlbHBlciBpZiBpdCBpcyBydW5uaW5nLiBEbyBu
b3RoaW5nIGlmCi0gICAgICAgIGl0IGlzbid0LCBvciBpdCBpc24ndCBhdmFpbGFibGUuIElmIGEg
cG9ydCBvdmVycmlkZXMgc3RhcnRfaGVscGVyKCkKLSAgICAgICAgaXQgbXVzdCBvdmVycmlkZSB0
aGlzIHJvdXRpbmUgYXMgd2VsbC4iIiIKLSAgICAgICAgcGFzcworICAgICAgICBpdCBpc24ndCwg
b3IgaXQgaXNuJ3QgYXZhaWxhYmxlLiIiIgorICAgICAgICBpZiBQb3J0LmhlbHBlcjoKKyAgICAg
ICAgICAgIF9sb2cuZGVidWcoIlN0b3BwaW5nIExheW91dFRlc3RIZWxwZXIiKQorICAgICAgICAg
ICAgdHJ5OgorICAgICAgICAgICAgICAgIFBvcnQuaGVscGVyLnN0ZGluLndyaXRlKGIieFxuIikK
KyAgICAgICAgICAgICAgICBQb3J0LmhlbHBlci5zdGRpbi5jbG9zZSgpCisgICAgICAgICAgICAg
ICAgUG9ydC5oZWxwZXIud2FpdCgpCisgICAgICAgICAgICBleGNlcHQgSU9FcnJvciBhcyBlOgor
ICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoIklPRXJyb3IgcmFpc2VkIHdoaWxlIHN0b3BwaW5n
IGhlbHBlcjogJXMiICUgc3RyKGUpKQorICAgICAgICAgICAgUG9ydC5oZWxwZXIgPSBOb25lCiAK
ICAgICBkZWYgc3RvcF9odHRwX3NlcnZlcihzZWxmKToKICAgICAgICAgIiIiU2h1dCBkb3duIHRo
ZSBodHRwIHNlcnZlciBpZiBpdCBpcyBydW5uaW5nLiBEbyBub3RoaW5nIGlmIGl0IGlzbid0LiIi
IgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weSBiL1Rvb2xz
L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkKaW5kZXggNzczZTAxODdhOTc4NzAyY2MyZDNm
ZDE4MGEwN2U3YzY3ZDc2ZWM4OS4uMWFlZDRhOTQxNThiNmRlZWY0N2U5MjZkNzdjZWRjZDA2ZDcy
NjUzMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQorKysg
Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjLnB5CkBAIC0zNyw2ICszNyw3IEBAIGZy
b20gd2Via2l0cHkuY29tbW9uLm1lbW9pemVkIGltcG9ydCBtZW1vaXplZAogZnJvbSB3ZWJraXRw
eS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJyb3IKIGZyb20gd2Via2l0
cHkuY29tbW9uLnZlcnNpb25fbmFtZV9tYXAgaW1wb3J0IFBVQkxJQ19UQUJMRSwgSU5URVJOQUxf
VEFCTEUKIGZyb20gd2Via2l0cHkuY29tbW9uLnZlcnNpb25fbmFtZV9tYXAgaW1wb3J0IFZlcnNp
b25OYW1lTWFwCitmcm9tIHdlYmtpdHB5LnBvcnQuYmFzZSBpbXBvcnQgUG9ydAogZnJvbSB3ZWJr
aXRweS5wb3J0LmNvbmZpZyBpbXBvcnQgYXBwbGVfYWRkaXRpb25zLCBDb25maWcKIGZyb20gd2Vi
a2l0cHkucG9ydC5kYXJ3aW4gaW1wb3J0IERhcndpblBvcnQKIApAQCAtMjQ1LDYgKzI0Niw4IEBA
IGNsYXNzIE1hY1BvcnQoRGFyd2luUG9ydCk6CiAgICAgICAgIHJldHVybiBtaW4oc3VwcG9ydGFi
bGVfaW5zdGFuY2VzLCBkZWZhdWx0X2NvdW50KQogCiAgICAgZGVmIHN0YXJ0X2hlbHBlcihzZWxm
LCBwaXhlbF90ZXN0cz1GYWxzZSwgcHJlZmVyX2ludGVncmF0ZWRfZ3B1PUZhbHNlKToKKyAgICAg
ICAgc2VsZi5zdG9wX2hlbHBlcigpCisKICAgICAgICAgaGVscGVyX3BhdGggPSBzZWxmLl9wYXRo
X3RvX2hlbHBlcigpCiAgICAgICAgIGlmIG5vdCBoZWxwZXJfcGF0aDoKICAgICAgICAgICAgIF9s
b2cuZXJyb3IoIk5vIHBhdGggdG8gTGF5b3V0VGVzdEhlbHBlciBiaW5hcnkiKQpAQCAtMjUzLDkg
KzI1Niw5IEBAIGNsYXNzIE1hY1BvcnQoRGFyd2luUG9ydCk6CiAgICAgICAgIGFyZ3VtZW50cyA9
IFtoZWxwZXJfcGF0aCwgJy0taW5zdGFsbC1jb2xvci1wcm9maWxlJ10KICAgICAgICAgaWYgcHJl
ZmVyX2ludGVncmF0ZWRfZ3B1OgogICAgICAgICAgICAgYXJndW1lbnRzLmFwcGVuZCgnLS1wcmVm
ZXItaW50ZWdyYXRlZC1ncHUnKQotICAgICAgICBzZWxmLl9oZWxwZXIgPSBzZWxmLl9leGVjdXRp
dmUucG9wZW4oYXJndW1lbnRzLAorICAgICAgICBQb3J0LmhlbHBlciA9IHNlbGYuX2V4ZWN1dGl2
ZS5wb3Blbihhcmd1bWVudHMsCiAgICAgICAgICAgICBzdGRpbj1zZWxmLl9leGVjdXRpdmUuUElQ
RSwgc3Rkb3V0PXNlbGYuX2V4ZWN1dGl2ZS5QSVBFLCBzdGRlcnI9Tm9uZSkKLSAgICAgICAgaXNf
cmVhZHkgPSBzZWxmLl9oZWxwZXIuc3Rkb3V0LnJlYWRsaW5lKCkKKyAgICAgICAgaXNfcmVhZHkg
PSBQb3J0LmhlbHBlci5zdGRvdXQucmVhZGxpbmUoKQogICAgICAgICBpZiBub3QgaXNfcmVhZHku
c3RhcnRzd2l0aChiJ3JlYWR5Jyk6CiAgICAgICAgICAgICBfbG9nLmVycm9yKCJMYXlvdXRUZXN0
SGVscGVyIGNvdWxkIG5vdCBzdGFydCIpCiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKQEAgLTI3
MiwxNyArMjc1LDYgQEAgY2xhc3MgTWFjUG9ydChEYXJ3aW5Qb3J0KToKICAgICAgICAgICAgICAg
ICBpZiBlLmV4aXRfY29kZSAhPSAxOgogICAgICAgICAgICAgICAgICAgICByYWlzZSBlCiAKLSAg
ICBkZWYgc3RvcF9oZWxwZXIoc2VsZik6Ci0gICAgICAgIGlmIHNlbGYuX2hlbHBlcjoKLSAgICAg
ICAgICAgIF9sb2cuZGVidWcoIlN0b3BwaW5nIExheW91dFRlc3RIZWxwZXIiKQotICAgICAgICAg
ICAgdHJ5OgotICAgICAgICAgICAgICAgIHNlbGYuX2hlbHBlci5zdGRpbi53cml0ZShiInhcbiIp
Ci0gICAgICAgICAgICAgICAgc2VsZi5faGVscGVyLnN0ZGluLmNsb3NlKCkKLSAgICAgICAgICAg
ICAgICBzZWxmLl9oZWxwZXIud2FpdCgpCi0gICAgICAgICAgICBleGNlcHQgSU9FcnJvciBhcyBl
OgotICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoIklPRXJyb3IgcmFpc2VkIHdoaWxlIHN0b3Bw
aW5nIGhlbHBlcjogJXMiICUgc3RyKGUpKQotICAgICAgICAgICAgc2VsZi5faGVscGVyID0gTm9u
ZQotCiAgICAgZGVmIGxvZ2dpbmdfcGF0dGVybnNfdG9fc3RyaXAoc2VsZik6CiAgICAgICAgIGxv
Z2dpbmdfcGF0dGVybnMgPSBbXQogCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>