<?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>221511</bug_id>
          
          <creation_ts>2021-02-05 18:04:06 -0800</creation_ts>
          <short_desc>[LayoutTests] Convert http/tests/css convert PHP to Python</short_desc>
          <delta_ts>2021-02-10 08:53:19 -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>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=220749</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="Chris Gambrell">cgambrell</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>ap</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>hi</cc>
    
    <cc>jbedard</cc>
    
    <cc>ryanhaddad</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1726341</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Gambrell">cgambrell</who>
    <bug_when>2021-02-05 18:04:06 -0800</bug_when>
    <thetext>Replacing PHP with equivalent Python CGI scripts</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1726342</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-02-05 18:05:26 -0800</bug_when>
    <thetext>&lt;rdar://problem/74049585&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1727320</commentid>
    <comment_count>2</comment_count>
      <attachid>419782</attachid>
    <who name="Chris Gambrell">cgambrell</who>
    <bug_when>2021-02-09 16:12:33 -0800</bug_when>
    <thetext>Created attachment 419782
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1727347</commentid>
    <comment_count>3</comment_count>
      <attachid>419782</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-02-09 17:07:48 -0800</bug_when>
    <thetext>Comment on attachment 419782
Patch

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

&gt; LayoutTests/http/tests/css/resources/500.py:9
&gt; +    &apos;HTTP/1.0 500 Internal Error\r\n&apos;

Shouldn&apos;t this just be: &apos;status: 500\r\n&apos;?

&gt; LayoutTests/http/tests/css/resources/webfont-request.py:21
&gt; +sys.path.insert(0, http_root)

Does not look like we actually need this, since you aren&apos;t using any shared code

&gt; LayoutTests/http/tests/css/resources/webfont-request.py:37
&gt; +        &apos;Content-Type: application/octet-stream\r\n\r\n&apos;

&quot;echo&quot; results in a newline, so we should add a \n to this string

&gt; LayoutTests/http/tests/css/resources/webfont-request.py:44
&gt; +        &apos;{}&apos;.format(currentCount)

&quot;echo&quot; results in a newline, so we should add a \n to this string</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1727368</commentid>
    <comment_count>4</comment_count>
      <attachid>419796</attachid>
    <who name="Chris Gambrell">cgambrell</who>
    <bug_when>2021-02-09 17:35:40 -0800</bug_when>
    <thetext>Created attachment 419796
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1727371</commentid>
    <comment_count>5</comment_count>
      <attachid>419798</attachid>
    <who name="Chris Gambrell">cgambrell</who>
    <bug_when>2021-02-09 17:45:14 -0800</bug_when>
    <thetext>Created attachment 419798
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1727373</commentid>
    <comment_count>6</comment_count>
      <attachid>419799</attachid>
    <who name="Chris Gambrell">cgambrell</who>
    <bug_when>2021-02-09 17:59:40 -0800</bug_when>
    <thetext>Created attachment 419799
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1727374</commentid>
    <comment_count>7</comment_count>
      <attachid>419800</attachid>
    <who name="Chris Gambrell">cgambrell</who>
    <bug_when>2021-02-09 18:03:15 -0800</bug_when>
    <thetext>Created attachment 419800
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1727375</commentid>
    <comment_count>8</comment_count>
    <who name="Chris Gambrell">cgambrell</who>
    <bug_when>2021-02-09 18:04:16 -0800</bug_when>
    <thetext>(In reply to Jonathan Bedard from comment #3)
&gt; Comment on attachment 419782 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=419782&amp;action=review
&gt; 
&gt; &gt; LayoutTests/http/tests/css/resources/500.py:9
&gt; &gt; +    &apos;HTTP/1.0 500 Internal Error\r\n&apos;
&gt; 
&gt; Shouldn&apos;t this just be: &apos;status: 500\r\n&apos;?
&gt; 

Changed the header to match correct python style


&gt; &gt; LayoutTests/http/tests/css/resources/webfont-request.py:21
&gt; &gt; +sys.path.insert(0, http_root)
&gt; 
&gt; Does not look like we actually need this, since you aren&apos;t using any shared
&gt; code
&gt; 

Removed 3 unused lines


&gt; &gt; LayoutTests/http/tests/css/resources/webfont-request.py:37
&gt; &gt; +        &apos;Content-Type: application/octet-stream\r\n\r\n&apos;
&gt; 
&gt; &quot;echo&quot; results in a newline, so we should add a \n to this string
&gt; 

Found out that PHP&apos;s echo doesn&apos;t add a new line, must be the print func


&gt; &gt; LayoutTests/http/tests/css/resources/webfont-request.py:44
&gt; &gt; +        &apos;{}&apos;.format(currentCount)
&gt; 
&gt; &quot;echo&quot; results in a newline, so we should add a \n to this string
&gt; 

Found out that PHP&apos;s echo doesn&apos;t add a new line, must be the print func</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1727555</commentid>
    <comment_count>9</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-02-10 08:53:17 -0800</bug_when>
    <thetext>Committed r272656: &lt;https://commits.webkit.org/r272656&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 419800.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>419782</attachid>
            <date>2021-02-09 16:12:33 -0800</date>
            <delta_ts>2021-02-09 17:35:38 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221511-20210209181232.patch</filename>
            <type>text/plain</type>
            <size>7484</size>
            <attacher name="Chris Gambrell">cgambrell</attacher>
            
              <data encoding="base64">SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D
aGFuZ2VMb2cJKHJldmlzaW9uIDI3MjYxNykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y
a2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAyLTA5ICBDaHJpcyBHYW1icmVsbCAg
PGNnYW1icmVsbEBhcHBsZS5jb20+CisKKyAgICAgICAgW0xheW91dFRlc3RzXSBDb252ZXJ0IGh0
dHAvdGVzdHMvY3NzIGNvbnZlcnQgUEhQIHRvIFB5dGhvbgorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNTExCisgICAgICAgIDxyZGFyOi8vcHJvYmxl
bS83NDA0OTU4NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICAqIGh0dHAvdGVzdHMvY3NzL2ZvbnQtZmFjZS1zcmMtbG9hZGluZy5odG1sOgorICAgICAg
ICAqIGh0dHAvdGVzdHMvY3NzL2xpbmstY3NzLWRpc2FibGVkLXZhbHVlLXdpdGgtc2xvdy1sb2Fk
aW5nLXNoZWV0LWluLWVycm9yLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3Vy
Y2VzLzUwMC5waHA6IFJlbW92ZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2Vz
LzUwMC5weTogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzL3dlYmZv
bnQtcmVxdWVzdC5waHA6IFJlbW92ZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3Vy
Y2VzL3dlYmZvbnQtcmVxdWVzdC5weTogQWRkZWQuCisgICAgICAgIChnZXRSZXF1ZXN0Q291bnQp
OgorICAgICAgICAoc2V0UmVxdWVzdENvdW50KToKKwogMjAyMS0wMi0wOSAgUnlhbiBIYWRkYWQg
IDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcg
cjI3MjQyNi4KSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL2ZvbnQtZmFjZS1zcmMt
bG9hZGluZy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL2Zv
bnQtZmFjZS1zcmMtbG9hZGluZy5odG1sCShyZXZpc2lvbiAyNzI2MTcpCisrKyBMYXlvdXRUZXN0
cy9odHRwL3Rlc3RzL2Nzcy9mb250LWZhY2Utc3JjLWxvYWRpbmcuaHRtbAkod29ya2luZyBjb3B5
KQpAQCAtMiw3ICsyLDcgQEAKIDxzdHlsZT4KIEBmb250LWZhY2UgewogICAgIGZvbnQtZmFtaWx5
OiAnd2ViZm9udCc7Ci0gICAgc3JjOiB1cmwoaHR0cDovL2xvY2FsaG9zdDo4MDAwL2Nzcy9yZXNv
dXJjZXMvd2ViZm9udC1yZXF1ZXN0LnBocD9tb2RlPWdldEZvbnQmZmlsZW5hbWU9d2ViZm9udFJl
cXVlc3RDb3VudC50eHQpIGZvcm1hdCgndHJ1ZXR5cGUnKTsKKyAgICBzcmM6IHVybChodHRwOi8v
bG9jYWxob3N0OjgwMDAvY3NzL3Jlc291cmNlcy93ZWJmb250LXJlcXVlc3QucHk/bW9kZT1nZXRG
b250JmZpbGVuYW1lPXdlYmZvbnRSZXF1ZXN0Q291bnQudHh0KSBmb3JtYXQoJ3RydWV0eXBlJyk7
CiB9CiA8L3N0eWxlPgogPHNjcmlwdD4KQEAgLTQxLDcgKzQxLDcgQEAgZnVuY3Rpb24gZ2V0UmVx
dWVzdENvdW50KCkgewogICAgICAgICBpZiAoeGhyLnJlYWR5U3RhdGUgPT0geGhyLkRPTkUpCiAg
ICAgICAgICAgICBjaGVja1JlcXVlc3RDb3VudCgpOwogICAgIH07Ci0gICAgeGhyLm9wZW4oJ0dF
VCcsICdodHRwOi8vbG9jYWxob3N0OjgwMDAvY3NzL3Jlc291cmNlcy93ZWJmb250LXJlcXVlc3Qu
cGhwP21vZGU9Z2V0UmVxdWVzdENvdW50JicgKyBmaWxlbmFtZSwgdHJ1ZSk7CisgICAgeGhyLm9w
ZW4oJ0dFVCcsICdodHRwOi8vbG9jYWxob3N0OjgwMDAvY3NzL3Jlc291cmNlcy93ZWJmb250LXJl
cXVlc3QucHk/bW9kZT1nZXRSZXF1ZXN0Q291bnQmJyArIGZpbGVuYW1lLCB0cnVlKTsKICAgICB4
aHIuc2VuZCgpOwogfQogCkluZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Nzcy9saW5rLWNz
cy1kaXNhYmxlZC12YWx1ZS13aXRoLXNsb3ctbG9hZGluZy1zaGVldC1pbi1lcnJvci5odG1sCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL2xpbmstY3NzLWRpc2FibGVk
LXZhbHVlLXdpdGgtc2xvdy1sb2FkaW5nLXNoZWV0LWluLWVycm9yLmh0bWwJKHJldmlzaW9uIDI3
MjYxNykKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL2xpbmstY3NzLWRpc2FibGVkLXZh
bHVlLXdpdGgtc2xvdy1sb2FkaW5nLXNoZWV0LWluLWVycm9yLmh0bWwJKHdvcmtpbmcgY29weSkK
QEAgLTIsNyArMiw3IEBACiA8aHRtbD4KIDxoZWFkPgogPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBo
cmVmPSJyZXNvdXJjZXMvZW1wdHkuY3NzP2xpbmstY3NzLWRpc2FibGVkLXZhbHVlLXdpdGgtc2xv
dy1sb2FkaW5nLXNoZWV0LWluLWVycm9yJmRlZmF1bHQiIG1lZGlhPSJhbGwiIHRpdGxlPSJEZWZh
dWx0IFN0eWxlIFNoZWV0IiB0eXBlPSJ0ZXh0L2NzcyI+Ci08bGluayByZWw9ImFsdGVybmF0ZSBz
dHlsZXNoZWV0IiBocmVmPSJyZXNvdXJjZXMvNTAwLnBocCIgbWVkaWE9ImFsbCIgdGl0bGU9Imdy
ZWVuIiB0eXBlPSJ0ZXh0L2NzcyI+Cis8bGluayByZWw9ImFsdGVybmF0ZSBzdHlsZXNoZWV0IiBo
cmVmPSJyZXNvdXJjZXMvNTAwLnB5IiBtZWRpYT0iYWxsIiB0aXRsZT0iZ3JlZW4iIHR5cGU9InRl
eHQvY3NzIj4KIDxzY3JpcHQgc3JjPSIvanMtdGVzdC1yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMi
Pjwvc2NyaXB0PgogPC9oZWFkPgogPGJvZHk+CkluZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3Rz
L2Nzcy9yZXNvdXJjZXMvNTAwLnBocAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rl
c3RzL2Nzcy9yZXNvdXJjZXMvNTAwLnBocAkocmV2aXNpb24gMjcyNjE3KQorKysgTGF5b3V0VGVz
dHMvaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzLzUwMC5waHAJKG5vbmV4aXN0ZW50KQpAQCAtMSwx
MyArMCwwIEBACi08P3BocAotLy8gV2Ugc2xlZXAgaGVyZSBzbyB0aGF0IHdlIGFyZSBoYXZlIGVu
b3VnaCB0aW1lIHRvIHRlc3QgdGhlIGRpZmZlcmVudCBhdHRyaWJ1dGVzIGJlZm9yZSB0aGUgc3R5
bGVzaGVldCBpcyBmdWxseSBsb2FkZWQuCi11c2xlZXAoMTAwKTsKLQotaGVhZGVyKCJIVFRQLzEu
MCA1MDAgSW50ZXJuYWwgRXJyb3IiKTsKLWhlYWRlcigiRXhwaXJlczogVGh1LCAwMSBEZWMgMjAw
MyAxNjowMDowMCBHTVQiKTsKLWhlYWRlcigiQ2FjaGUtQ29udHJvbDogbm8tY2FjaGUsIG5vLXN0
b3JlLCBtdXN0LXJldmFsaWRhdGUiKTsKLWhlYWRlcigiUHJhZ21hOiBuby1jYWNoZSIpOwotaGVh
ZGVyKCJDb250ZW50LVR5cGU6IHRleHQvY3NzIik7Ci0KLW9iX2ZsdXNoKCk7Ci1mbHVzaCgpOwot
Pz4KSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jlc291cmNlcy81MDAucHkKPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzLzUwMC5weQko
bm9uZXhpc3RlbnQpCisrKyBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Nzcy9yZXNvdXJjZXMvNTAw
LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMTYgQEAKKyMhL3Vzci9iaW4vZW52IHB5dGhv
bjMKKworaW1wb3J0IHN5cworaW1wb3J0IHRpbWUKKwordGltZS5zbGVlcCgwLjAwMDEpCisKK3N5
cy5zdGRvdXQud3JpdGUoCisgICAgJ0hUVFAvMS4wIDUwMCBJbnRlcm5hbCBFcnJvclxyXG4nCisg
ICAgJ0V4cGlyZXM6IFRodSwgMDEgRGVjIDIwMDMgMTY6MDA6MDAgR01UXHJcbicKKyAgICAnQ2Fj
aGUtQ29udHJvbDogbm8tY2FjaGUsIG5vLXN0b3JlLCBtdXN0LXJldmFsaWRhdGVcclxuJworICAg
ICdQcmFnbWE6IG5vLWNhY2hlXHJcbicKKyAgICAnQ29udGVudC1UeXBlOiB0ZXh0L2Nzc1xyXG5c
clxuJworKQorCitzeXMuc3Rkb3V0LmZsdXNoKCkKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxl
CgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Nzcy9yZXNvdXJj
ZXMvNTAwLnB5Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2bjpleGVjdXRhYmxlCiMjIC0wLDAgKzEgIyMK
KyoKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0eQpJbmRleDogTGF5b3V0VGVzdHMvaHR0
cC90ZXN0cy9jc3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5waHAKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5waHAJ
KHJldmlzaW9uIDI3MjYxNykKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jlc291cmNl
cy93ZWJmb250LXJlcXVlc3QucGhwCShub25leGlzdGVudCkKQEAgLTEsMzYgKzAsMCBAQAotPD9w
aHAKLXJlcXVpcmVfb25jZSAiLi4vLi4vcmVzb3VyY2VzL3BvcnRhYmlsaXR5TGF5ZXIucGhwIjsK
LQotZnVuY3Rpb24gZ2V0UmVxdWVzdENvdW50KCRmaWxlKQotewotICAgIGlmICghZmlsZV9leGlz
dHMoJGZpbGUpKSB7Ci0gICAgICAgIHJldHVybiAwOwotICAgIH0KLSAgICByZXR1cm4gKGludClm
aWxlX2dldF9jb250ZW50cygkZmlsZSk7Ci19Ci0KLWZ1bmN0aW9uIHNldFJlcXVlc3RDb3VudCgk
ZmlsZSwgJGNvdW50KQotewotICAgIGZpbGVfcHV0X2NvbnRlbnRzKCRmaWxlLCAkY291bnQpOwot
fQotCi0kdG1wRmlsZSA9IHN5c19nZXRfdGVtcF9kaXIoKSAuICIvIiAuICRfR0VUWyJmaWxlbmFt
ZSJdOwotCi0kY3VycmVudENvdW50ID0gZ2V0UmVxdWVzdENvdW50KCR0bXBGaWxlKTsKLSRtb2Rl
ID0gJF9HRVRbIm1vZGUiXTsKLQotaWYgKCRtb2RlID09ICJnZXRGb250IikgewotICAgIHNldFJl
cXVlc3RDb3VudCgkdG1wRmlsZSwgJGN1cnJlbnRDb3VudCArIDEpOwotICAgIGhlYWRlcigiQWNj
ZXNzLWNvbnRyb2wtbWF4LWFnZTogMCIpOwotICAgIGhlYWRlcigiQWNjZXNzLWNvbnRyb2wtYWxs
b3ctb3JpZ2luOiAqIik7Ci0gICAgaGVhZGVyKCJBY2Nlc3MtY29udHJvbC1hbGxvdy1tZXRob2Rz
OiAqIik7Ci0gICAgaGVhZGVyKCJDYWNoZS1Db250cm9sOiBtYXgtYWdlPTAiKTsKLSAgICBoZWFk
ZXIoIkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtIik7Ci0gICAgZWNobyAi
IjsKLX0gZWxzZSBpZiAoJG1vZGUgPT0gImdldFJlcXVlc3RDb3VudCIpIHsKLSAgICBoZWFkZXIo
IkFjY2Vzcy1jb250cm9sLW1heC1hZ2U6IDAiKTsKLSAgICBoZWFkZXIoIkFjY2Vzcy1jb250cm9s
LWFsbG93LW9yaWdpbjogKiIpOwotICAgIGhlYWRlcigiQWNjZXNzLWNvbnRyb2wtYWxsb3ctbWV0
aG9kczogKiIpOwotICAgIGVjaG8gJGN1cnJlbnRDb3VudDsKLX0KLT8+CkluZGV4OiBMYXlvdXRU
ZXN0cy9odHRwL3Rlc3RzL2Nzcy9yZXNvdXJjZXMvd2ViZm9udC1yZXF1ZXN0LnB5Cj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jlc291cmNlcy93ZWJmb250LXJlcXVl
c3QucHkJKG5vbmV4aXN0ZW50KQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVzb3Vy
Y2VzL3dlYmZvbnQtcmVxdWVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDQ1IEBACisj
IS91c3IvYmluL2VudiBweXRob24zCisKK2ltcG9ydCBvcworaW1wb3J0IHN5cworaW1wb3J0IHRl
bXBmaWxlCitmcm9tIHVybGxpYi5wYXJzZSBpbXBvcnQgcGFyc2VfcXMKKworZGVmIGdldFJlcXVl
c3RDb3VudChmaWxlKToKKyAgICBpZiBub3Qgb3MucGF0aC5pc2ZpbGUoZmlsZSk6CisgICAgICAg
IHJldHVybiAwCisKKyAgICB3aXRoIG9wZW4oZmlsZSwgJ3InKSBhcyBmaWxlOgorICAgICAgICBy
ZXR1cm4gaW50KGZpbGUucmVhZCgpKQorCitkZWYgc2V0UmVxdWVzdENvdW50KGZpbGUsIGNvdW50
KToKKyAgICB3aXRoIG9wZW4oZmlsZSwgJ3InKSBhcyBmaWxlOgorICAgICAgICBmaWxlLndyaXRl
KGNvdW50KQorCitmaWxlID0gX19maWxlX18uc3BsaXQoJzovY3lnd2luJylbLTFdCitodHRwX3Jv
b3QgPSBvcy5wYXRoLmRpcm5hbWUob3MucGF0aC5kaXJuYW1lKG9zLnBhdGguYWJzcGF0aChvcy5w
YXRoLmRpcm5hbWUoZmlsZSkpKSkKK3N5cy5wYXRoLmluc2VydCgwLCBodHRwX3Jvb3QpCisKK3F1
ZXJ5ID0gcGFyc2VfcXMob3MuZW52aXJvbi5nZXQoJ1FVRVJZX1NUUklORycsICcnKSwga2VlcF9i
bGFua192YWx1ZXM9VHJ1ZSkKK2ZpbGVuYW1lID0gcXVlcnkuZ2V0KCdmaWxlbmFtZScsIFsnJ10p
WzBdCittb2RlID0gcXVlcnkuZ2V0KCdtb2RlJywgWycnXSlbMF0KKwordG1wRmlsZSA9IG9zLnBh
dGguam9pbih0ZW1wZmlsZS5nZXR0ZW1wZGlyKCksIGZpbGVuYW1lKQorY3VycmVudENvdW50ID0g
Z2V0UmVxdWVzdENvdW50KHRtcEZpbGUpCisKK2lmIG1vZGUgPT0gJ2dldEZvbnQnOgorICAgIHNl
dFJlcXVlc3RDb3VudCh0bXBGaWxlLCBjdXJyZW50Q291bnQgKyAxKQorICAgIHN5cy5zdGRvdXQu
d3JpdGUoCisgICAgICAgICdBY2Nlc3MtY29udHJvbC1tYXgtYWdlOiAwXHJcbicKKyAgICAgICAg
J0FjY2Vzcy1jb250cm9sLWFsbG93LW9yaWdpbjogKlxyXG4nCisgICAgICAgICdBY2Nlc3MtY29u
dHJvbC1hbGxvdy1tZXRob2RzOiAqXHJcbicKKyAgICAgICAgJ0NhY2hlLUNvbnRyb2w6IG1heC1h
Z2U9MFxyXG4nCisgICAgICAgICdDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL29jdGV0LXN0cmVh
bVxyXG5cclxuJworICAgICkKK2Vsc2U6CisgICAgc3lzLnN0ZG91dC53cml0ZSgKKyAgICAgICAg
J0FjY2Vzcy1jb250cm9sLW1heC1hZ2U6IDBcclxuJworICAgICAgICAnQWNjZXNzLWNvbnRyb2wt
YWxsb3ctb3JpZ2luOiAqXHJcbicKKyAgICAgICAgJ0FjY2Vzcy1jb250cm9sLWFsbG93LW1ldGhv
ZHM6ICpcclxuXHJcbicKKyAgICAgICAgJ3t9Jy5mb3JtYXQoY3VycmVudENvdW50KQorICAgICkK
XCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBMYXlvdXRU
ZXN0cy9odHRwL3Rlc3RzL2Nzcy9yZXNvdXJjZXMvd2ViZm9udC1yZXF1ZXN0LnB5Cl9fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X18KQWRkZWQ6IHN2bjpleGVjdXRhYmxlCiMjIC0wLDAgKzEgIyMKKyoKXCBObyBuZXdsaW5lIGF0
IGVuZCBvZiBwcm9wZXJ0eQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>419796</attachid>
            <date>2021-02-09 17:35:40 -0800</date>
            <delta_ts>2021-02-09 17:45:11 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221511-20210209193539.patch</filename>
            <type>text/plain</type>
            <size>7491</size>
            <attacher name="Chris Gambrell">cgambrell</attacher>
            
              <data encoding="base64">SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D
aGFuZ2VMb2cJKHJldmlzaW9uIDI3MjYyOCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y
a2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAyLTA5ICBDaHJpcyBHYW1icmVsbCAg
PGNnYW1icmVsbEBhcHBsZS5jb20+CisKKyAgICAgICAgW0xheW91dFRlc3RzXSBDb252ZXJ0IGh0
dHAvdGVzdHMvY3NzIGNvbnZlcnQgUEhQIHRvIFB5dGhvbgorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNTExCisgICAgICAgIDxyZGFyOi8vcHJvYmxl
bS83NDA0OTU4NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICAqIGh0dHAvdGVzdHMvY3NzL2ZvbnQtZmFjZS1zcmMtbG9hZGluZy5odG1sOgorICAgICAg
ICAqIGh0dHAvdGVzdHMvY3NzL2xpbmstY3NzLWRpc2FibGVkLXZhbHVlLXdpdGgtc2xvdy1sb2Fk
aW5nLXNoZWV0LWluLWVycm9yLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3Vy
Y2VzLzUwMC5waHA6IFJlbW92ZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2Vz
LzUwMC5weTogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzL3dlYmZv
bnQtcmVxdWVzdC5waHA6IFJlbW92ZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3Vy
Y2VzL3dlYmZvbnQtcmVxdWVzdC5weTogQWRkZWQuCisgICAgICAgIChnZXRSZXF1ZXN0Q291bnQp
OgorICAgICAgICAoc2V0UmVxdWVzdENvdW50KToKKwogMjAyMS0wMi0wOSAgQW5kcmVzIEdvbnph
bGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAKICAgICAgICAgRGVzY2VuZGFudHMgb2Ygcm93
IGFuZCBjb2x1bW4gaGVhZGVycyBzaG91bGQgZXhwb3NlIHRoZSBhcmlhLXNvcnQgYXR0cmlidXRl
LgpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvZm9udC1mYWNlLXNyYy1sb2FkaW5n
Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvZm9udC1mYWNl
LXNyYy1sb2FkaW5nLmh0bWwJKHJldmlzaW9uIDI3MjYxNykKKysrIExheW91dFRlc3RzL2h0dHAv
dGVzdHMvY3NzL2ZvbnQtZmFjZS1zcmMtbG9hZGluZy5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0y
LDcgKzIsNyBAQAogPHN0eWxlPgogQGZvbnQtZmFjZSB7CiAgICAgZm9udC1mYW1pbHk6ICd3ZWJm
b250JzsKLSAgICBzcmM6IHVybChodHRwOi8vbG9jYWxob3N0OjgwMDAvY3NzL3Jlc291cmNlcy93
ZWJmb250LXJlcXVlc3QucGhwP21vZGU9Z2V0Rm9udCZmaWxlbmFtZT13ZWJmb250UmVxdWVzdENv
dW50LnR4dCkgZm9ybWF0KCd0cnVldHlwZScpOworICAgIHNyYzogdXJsKGh0dHA6Ly9sb2NhbGhv
c3Q6ODAwMC9jc3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5weT9tb2RlPWdldEZvbnQmZmls
ZW5hbWU9d2ViZm9udFJlcXVlc3RDb3VudC50eHQpIGZvcm1hdCgndHJ1ZXR5cGUnKTsKIH0KIDwv
c3R5bGU+CiA8c2NyaXB0PgpAQCAtNDEsNyArNDEsNyBAQCBmdW5jdGlvbiBnZXRSZXF1ZXN0Q291
bnQoKSB7CiAgICAgICAgIGlmICh4aHIucmVhZHlTdGF0ZSA9PSB4aHIuRE9ORSkKICAgICAgICAg
ICAgIGNoZWNrUmVxdWVzdENvdW50KCk7CiAgICAgfTsKLSAgICB4aHIub3BlbignR0VUJywgJ2h0
dHA6Ly9sb2NhbGhvc3Q6ODAwMC9jc3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5waHA/bW9k
ZT1nZXRSZXF1ZXN0Q291bnQmJyArIGZpbGVuYW1lLCB0cnVlKTsKKyAgICB4aHIub3BlbignR0VU
JywgJ2h0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9jc3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5w
eT9tb2RlPWdldFJlcXVlc3RDb3VudCYnICsgZmlsZW5hbWUsIHRydWUpOwogICAgIHhoci5zZW5k
KCk7CiB9CiAKSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL2xpbmstY3NzLWRpc2Fi
bGVkLXZhbHVlLXdpdGgtc2xvdy1sb2FkaW5nLXNoZWV0LWluLWVycm9yLmh0bWwKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvbGluay1jc3MtZGlzYWJsZWQtdmFsdWUt
d2l0aC1zbG93LWxvYWRpbmctc2hlZXQtaW4tZXJyb3IuaHRtbAkocmV2aXNpb24gMjcyNjE3KQor
KysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvbGluay1jc3MtZGlzYWJsZWQtdmFsdWUtd2l0
aC1zbG93LWxvYWRpbmctc2hlZXQtaW4tZXJyb3IuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMiw3
ICsyLDcgQEAKIDxodG1sPgogPGhlYWQ+CiA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9InJl
c291cmNlcy9lbXB0eS5jc3M/bGluay1jc3MtZGlzYWJsZWQtdmFsdWUtd2l0aC1zbG93LWxvYWRp
bmctc2hlZXQtaW4tZXJyb3ImZGVmYXVsdCIgbWVkaWE9ImFsbCIgdGl0bGU9IkRlZmF1bHQgU3R5
bGUgU2hlZXQiIHR5cGU9InRleHQvY3NzIj4KLTxsaW5rIHJlbD0iYWx0ZXJuYXRlIHN0eWxlc2hl
ZXQiIGhyZWY9InJlc291cmNlcy81MDAucGhwIiBtZWRpYT0iYWxsIiB0aXRsZT0iZ3JlZW4iIHR5
cGU9InRleHQvY3NzIj4KKzxsaW5rIHJlbD0iYWx0ZXJuYXRlIHN0eWxlc2hlZXQiIGhyZWY9InJl
c291cmNlcy81MDAucHkiIG1lZGlhPSJhbGwiIHRpdGxlPSJncmVlbiIgdHlwZT0idGV4dC9jc3Mi
PgogPHNjcmlwdCBzcmM9Ii9qcy10ZXN0LXJlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3Jp
cHQ+CiA8L2hlYWQ+CiA8Ym9keT4KSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jl
c291cmNlcy81MDAucGhwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3Nz
L3Jlc291cmNlcy81MDAucGhwCShyZXZpc2lvbiAyNzI2MTcpCisrKyBMYXlvdXRUZXN0cy9odHRw
L3Rlc3RzL2Nzcy9yZXNvdXJjZXMvNTAwLnBocAkobm9uZXhpc3RlbnQpCkBAIC0xLDEzICswLDAg
QEAKLTw/cGhwCi0vLyBXZSBzbGVlcCBoZXJlIHNvIHRoYXQgd2UgYXJlIGhhdmUgZW5vdWdoIHRp
bWUgdG8gdGVzdCB0aGUgZGlmZmVyZW50IGF0dHJpYnV0ZXMgYmVmb3JlIHRoZSBzdHlsZXNoZWV0
IGlzIGZ1bGx5IGxvYWRlZC4KLXVzbGVlcCgxMDApOwotCi1oZWFkZXIoIkhUVFAvMS4wIDUwMCBJ
bnRlcm5hbCBFcnJvciIpOwotaGVhZGVyKCJFeHBpcmVzOiBUaHUsIDAxIERlYyAyMDAzIDE2OjAw
OjAwIEdNVCIpOwotaGVhZGVyKCJDYWNoZS1Db250cm9sOiBuby1jYWNoZSwgbm8tc3RvcmUsIG11
c3QtcmV2YWxpZGF0ZSIpOwotaGVhZGVyKCJQcmFnbWE6IG5vLWNhY2hlIik7Ci1oZWFkZXIoIkNv
bnRlbnQtVHlwZTogdGV4dC9jc3MiKTsKLQotb2JfZmx1c2goKTsKLWZsdXNoKCk7Ci0/PgpJbmRl
eDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzLzUwMC5weQo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Nzcy9yZXNvdXJjZXMvNTAwLnB5CShub25leGlz
dGVudCkKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jlc291cmNlcy81MDAucHkJKHdv
cmtpbmcgY29weSkKQEAgLTAsMCArMSwxNiBAQAorIyEvdXNyL2Jpbi9lbnYgcHl0aG9uMworCitp
bXBvcnQgc3lzCitpbXBvcnQgdGltZQorCit0aW1lLnNsZWVwKDAuMDAwMSkKKworc3lzLnN0ZG91
dC53cml0ZSgKKyAgICAnc3RhdHVzOiA1MDBcclxuJworICAgICdFeHBpcmVzOiBUaHUsIDAxIERl
YyAyMDAzIDE2OjAwOjAwIEdNVFxyXG4nCisgICAgJ0NhY2hlLUNvbnRyb2w6IG5vLWNhY2hlLCBu
by1zdG9yZSwgbXVzdC1yZXZhbGlkYXRlXHJcbicKKyAgICAnUHJhZ21hOiBuby1jYWNoZVxyXG4n
CisgICAgJ0NvbnRlbnQtVHlwZTogdGV4dC9jc3NcclxuXHJcbicKKykKKworc3lzLnN0ZG91dC5m
bHVzaCgpClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQoKUHJvcGVydHkgY2hhbmdlcyBvbjog
TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzLzUwMC5weQpfX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFk
ZGVkOiBzdm46ZXhlY3V0YWJsZQojIyAtMCwwICsxICMjCisqClwgTm8gbmV3bGluZSBhdCBlbmQg
b2YgcHJvcGVydHkKSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jlc291cmNlcy93
ZWJmb250LXJlcXVlc3QucGhwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMv
Y3NzL3Jlc291cmNlcy93ZWJmb250LXJlcXVlc3QucGhwCShyZXZpc2lvbiAyNzI2MTcpCisrKyBM
YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Nzcy9yZXNvdXJjZXMvd2ViZm9udC1yZXF1ZXN0LnBocAko
bm9uZXhpc3RlbnQpCkBAIC0xLDM2ICswLDAgQEAKLTw/cGhwCi1yZXF1aXJlX29uY2UgIi4uLy4u
L3Jlc291cmNlcy9wb3J0YWJpbGl0eUxheWVyLnBocCI7Ci0KLWZ1bmN0aW9uIGdldFJlcXVlc3RD
b3VudCgkZmlsZSkKLXsKLSAgICBpZiAoIWZpbGVfZXhpc3RzKCRmaWxlKSkgewotICAgICAgICBy
ZXR1cm4gMDsKLSAgICB9Ci0gICAgcmV0dXJuIChpbnQpZmlsZV9nZXRfY29udGVudHMoJGZpbGUp
OwotfQotCi1mdW5jdGlvbiBzZXRSZXF1ZXN0Q291bnQoJGZpbGUsICRjb3VudCkKLXsKLSAgICBm
aWxlX3B1dF9jb250ZW50cygkZmlsZSwgJGNvdW50KTsKLX0KLQotJHRtcEZpbGUgPSBzeXNfZ2V0
X3RlbXBfZGlyKCkgLiAiLyIgLiAkX0dFVFsiZmlsZW5hbWUiXTsKLQotJGN1cnJlbnRDb3VudCA9
IGdldFJlcXVlc3RDb3VudCgkdG1wRmlsZSk7Ci0kbW9kZSA9ICRfR0VUWyJtb2RlIl07Ci0KLWlm
ICgkbW9kZSA9PSAiZ2V0Rm9udCIpIHsKLSAgICBzZXRSZXF1ZXN0Q291bnQoJHRtcEZpbGUsICRj
dXJyZW50Q291bnQgKyAxKTsKLSAgICBoZWFkZXIoIkFjY2Vzcy1jb250cm9sLW1heC1hZ2U6IDAi
KTsKLSAgICBoZWFkZXIoIkFjY2Vzcy1jb250cm9sLWFsbG93LW9yaWdpbjogKiIpOwotICAgIGhl
YWRlcigiQWNjZXNzLWNvbnRyb2wtYWxsb3ctbWV0aG9kczogKiIpOwotICAgIGhlYWRlcigiQ2Fj
aGUtQ29udHJvbDogbWF4LWFnZT0wIik7Ci0gICAgaGVhZGVyKCJDb250ZW50LVR5cGU6IGFwcGxp
Y2F0aW9uL29jdGV0LXN0cmVhbSIpOwotICAgIGVjaG8gIiI7Ci19IGVsc2UgaWYgKCRtb2RlID09
ICJnZXRSZXF1ZXN0Q291bnQiKSB7Ci0gICAgaGVhZGVyKCJBY2Nlc3MtY29udHJvbC1tYXgtYWdl
OiAwIik7Ci0gICAgaGVhZGVyKCJBY2Nlc3MtY29udHJvbC1hbGxvdy1vcmlnaW46ICoiKTsKLSAg
ICBoZWFkZXIoIkFjY2Vzcy1jb250cm9sLWFsbG93LW1ldGhvZHM6ICoiKTsKLSAgICBlY2hvICRj
dXJyZW50Q291bnQ7Ci19Ci0/PgpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVz
b3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRw
L3Rlc3RzL2Nzcy9yZXNvdXJjZXMvd2ViZm9udC1yZXF1ZXN0LnB5CShub25leGlzdGVudCkKKysr
IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jlc291cmNlcy93ZWJmb250LXJlcXVlc3QucHkJ
KHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw0NCBAQAorIyEvdXNyL2Jpbi9lbnYgcHl0aG9uMwor
CitpbXBvcnQgb3MKK2ltcG9ydCBzeXMKK2ltcG9ydCB0ZW1wZmlsZQorZnJvbSB1cmxsaWIucGFy
c2UgaW1wb3J0IHBhcnNlX3FzCisKK2RlZiBnZXRSZXF1ZXN0Q291bnQoZmlsZSk6CisgICAgaWYg
bm90IG9zLnBhdGguaXNmaWxlKGZpbGUpOgorICAgICAgICByZXR1cm4gMAorCisgICAgd2l0aCBv
cGVuKGZpbGUsICdyJykgYXMgZmlsZToKKyAgICAgICAgcmV0dXJuIGludChmaWxlLnJlYWQoKSkK
KworZGVmIHNldFJlcXVlc3RDb3VudChmaWxlLCBjb3VudCk6CisgICAgd2l0aCBvcGVuKGZpbGUs
ICdyJykgYXMgZmlsZToKKyAgICAgICAgZmlsZS53cml0ZShjb3VudCkKKworZmlsZSA9IF9fZmls
ZV9fLnNwbGl0KCc6L2N5Z3dpbicpWy0xXQoraHR0cF9yb290ID0gb3MucGF0aC5kaXJuYW1lKG9z
LnBhdGguZGlybmFtZShvcy5wYXRoLmFic3BhdGgob3MucGF0aC5kaXJuYW1lKGZpbGUpKSkpCisK
K3F1ZXJ5ID0gcGFyc2VfcXMob3MuZW52aXJvbi5nZXQoJ1FVRVJZX1NUUklORycsICcnKSwga2Vl
cF9ibGFua192YWx1ZXM9VHJ1ZSkKK2ZpbGVuYW1lID0gcXVlcnkuZ2V0KCdmaWxlbmFtZScsIFsn
J10pWzBdCittb2RlID0gcXVlcnkuZ2V0KCdtb2RlJywgWycnXSlbMF0KKwordG1wRmlsZSA9IG9z
LnBhdGguam9pbih0ZW1wZmlsZS5nZXR0ZW1wZGlyKCksIGZpbGVuYW1lKQorY3VycmVudENvdW50
ID0gZ2V0UmVxdWVzdENvdW50KHRtcEZpbGUpCisKK2lmIG1vZGUgPT0gJ2dldEZvbnQnOgorICAg
IHNldFJlcXVlc3RDb3VudCh0bXBGaWxlLCBjdXJyZW50Q291bnQgKyAxKQorICAgIHN5cy5zdGRv
dXQud3JpdGUoCisgICAgICAgICdBY2Nlc3MtY29udHJvbC1tYXgtYWdlOiAwXHJcbicKKyAgICAg
ICAgJ0FjY2Vzcy1jb250cm9sLWFsbG93LW9yaWdpbjogKlxyXG4nCisgICAgICAgICdBY2Nlc3Mt
Y29udHJvbC1hbGxvdy1tZXRob2RzOiAqXHJcbicKKyAgICAgICAgJ0NhY2hlLUNvbnRyb2w6IG1h
eC1hZ2U9MFxyXG4nCisgICAgICAgICdDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL29jdGV0LXN0
cmVhbVxyXG5cclxuXG4nCisgICAgKQorZWxzZToKKyAgICBzeXMuc3Rkb3V0LndyaXRlKAorICAg
ICAgICAnQWNjZXNzLWNvbnRyb2wtbWF4LWFnZTogMFxyXG4nCisgICAgICAgICdBY2Nlc3MtY29u
dHJvbC1hbGxvdy1vcmlnaW46ICpcclxuJworICAgICAgICAnQWNjZXNzLWNvbnRyb2wtYWxsb3ct
bWV0aG9kczogKlxyXG5cclxuJworICAgICAgICAne31cbicuZm9ybWF0KGN1cnJlbnRDb3VudCkK
KyAgICApClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQoKUHJvcGVydHkgY2hhbmdlcyBvbjog
TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5weQpf
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fCkFkZGVkOiBzdm46ZXhlY3V0YWJsZQojIyAtMCwwICsxICMjCisqClwgTm8gbmV3
bGluZSBhdCBlbmQgb2YgcHJvcGVydHkK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>419798</attachid>
            <date>2021-02-09 17:45:14 -0800</date>
            <delta_ts>2021-02-09 17:59:38 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221511-20210209194513.patch</filename>
            <type>text/plain</type>
            <size>7364</size>
            <attacher name="Chris Gambrell">cgambrell</attacher>
            
              <data encoding="base64">SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D
aGFuZ2VMb2cJKHJldmlzaW9uIDI3MjYyOCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y
a2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAyLTA5ICBDaHJpcyBHYW1icmVsbCAg
PGNnYW1icmVsbEBhcHBsZS5jb20+CisKKyAgICAgICAgW0xheW91dFRlc3RzXSBDb252ZXJ0IGh0
dHAvdGVzdHMvY3NzIGNvbnZlcnQgUEhQIHRvIFB5dGhvbgorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNTExCisgICAgICAgIDxyZGFyOi8vcHJvYmxl
bS83NDA0OTU4NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICAqIGh0dHAvdGVzdHMvY3NzL2ZvbnQtZmFjZS1zcmMtbG9hZGluZy5odG1sOgorICAgICAg
ICAqIGh0dHAvdGVzdHMvY3NzL2xpbmstY3NzLWRpc2FibGVkLXZhbHVlLXdpdGgtc2xvdy1sb2Fk
aW5nLXNoZWV0LWluLWVycm9yLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3Vy
Y2VzLzUwMC5waHA6IFJlbW92ZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2Vz
LzUwMC5weTogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzL3dlYmZv
bnQtcmVxdWVzdC5waHA6IFJlbW92ZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3Vy
Y2VzL3dlYmZvbnQtcmVxdWVzdC5weTogQWRkZWQuCisgICAgICAgIChnZXRSZXF1ZXN0Q291bnQp
OgorICAgICAgICAoc2V0UmVxdWVzdENvdW50KToKKwogMjAyMS0wMi0wOSAgQW5kcmVzIEdvbnph
bGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAKICAgICAgICAgRGVzY2VuZGFudHMgb2Ygcm93
IGFuZCBjb2x1bW4gaGVhZGVycyBzaG91bGQgZXhwb3NlIHRoZSBhcmlhLXNvcnQgYXR0cmlidXRl
LgpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvZm9udC1mYWNlLXNyYy1sb2FkaW5n
Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvZm9udC1mYWNl
LXNyYy1sb2FkaW5nLmh0bWwJKHJldmlzaW9uIDI3MjYxNykKKysrIExheW91dFRlc3RzL2h0dHAv
dGVzdHMvY3NzL2ZvbnQtZmFjZS1zcmMtbG9hZGluZy5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0y
LDcgKzIsNyBAQAogPHN0eWxlPgogQGZvbnQtZmFjZSB7CiAgICAgZm9udC1mYW1pbHk6ICd3ZWJm
b250JzsKLSAgICBzcmM6IHVybChodHRwOi8vbG9jYWxob3N0OjgwMDAvY3NzL3Jlc291cmNlcy93
ZWJmb250LXJlcXVlc3QucGhwP21vZGU9Z2V0Rm9udCZmaWxlbmFtZT13ZWJmb250UmVxdWVzdENv
dW50LnR4dCkgZm9ybWF0KCd0cnVldHlwZScpOworICAgIHNyYzogdXJsKGh0dHA6Ly9sb2NhbGhv
c3Q6ODAwMC9jc3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5weT9tb2RlPWdldEZvbnQmZmls
ZW5hbWU9d2ViZm9udFJlcXVlc3RDb3VudC50eHQpIGZvcm1hdCgndHJ1ZXR5cGUnKTsKIH0KIDwv
c3R5bGU+CiA8c2NyaXB0PgpAQCAtNDEsNyArNDEsNyBAQCBmdW5jdGlvbiBnZXRSZXF1ZXN0Q291
bnQoKSB7CiAgICAgICAgIGlmICh4aHIucmVhZHlTdGF0ZSA9PSB4aHIuRE9ORSkKICAgICAgICAg
ICAgIGNoZWNrUmVxdWVzdENvdW50KCk7CiAgICAgfTsKLSAgICB4aHIub3BlbignR0VUJywgJ2h0
dHA6Ly9sb2NhbGhvc3Q6ODAwMC9jc3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5waHA/bW9k
ZT1nZXRSZXF1ZXN0Q291bnQmJyArIGZpbGVuYW1lLCB0cnVlKTsKKyAgICB4aHIub3BlbignR0VU
JywgJ2h0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9jc3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5w
eT9tb2RlPWdldFJlcXVlc3RDb3VudCYnICsgZmlsZW5hbWUsIHRydWUpOwogICAgIHhoci5zZW5k
KCk7CiB9CiAKSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL2xpbmstY3NzLWRpc2Fi
bGVkLXZhbHVlLXdpdGgtc2xvdy1sb2FkaW5nLXNoZWV0LWluLWVycm9yLmh0bWwKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvbGluay1jc3MtZGlzYWJsZWQtdmFsdWUt
d2l0aC1zbG93LWxvYWRpbmctc2hlZXQtaW4tZXJyb3IuaHRtbAkocmV2aXNpb24gMjcyNjE3KQor
KysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvbGluay1jc3MtZGlzYWJsZWQtdmFsdWUtd2l0
aC1zbG93LWxvYWRpbmctc2hlZXQtaW4tZXJyb3IuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMiw3
ICsyLDcgQEAKIDxodG1sPgogPGhlYWQ+CiA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9InJl
c291cmNlcy9lbXB0eS5jc3M/bGluay1jc3MtZGlzYWJsZWQtdmFsdWUtd2l0aC1zbG93LWxvYWRp
bmctc2hlZXQtaW4tZXJyb3ImZGVmYXVsdCIgbWVkaWE9ImFsbCIgdGl0bGU9IkRlZmF1bHQgU3R5
bGUgU2hlZXQiIHR5cGU9InRleHQvY3NzIj4KLTxsaW5rIHJlbD0iYWx0ZXJuYXRlIHN0eWxlc2hl
ZXQiIGhyZWY9InJlc291cmNlcy81MDAucGhwIiBtZWRpYT0iYWxsIiB0aXRsZT0iZ3JlZW4iIHR5
cGU9InRleHQvY3NzIj4KKzxsaW5rIHJlbD0iYWx0ZXJuYXRlIHN0eWxlc2hlZXQiIGhyZWY9InJl
c291cmNlcy81MDAucHkiIG1lZGlhPSJhbGwiIHRpdGxlPSJncmVlbiIgdHlwZT0idGV4dC9jc3Mi
PgogPHNjcmlwdCBzcmM9Ii9qcy10ZXN0LXJlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3Jp
cHQ+CiA8L2hlYWQ+CiA8Ym9keT4KSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jl
c291cmNlcy81MDAucGhwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3Nz
L3Jlc291cmNlcy81MDAucGhwCShyZXZpc2lvbiAyNzI2MTcpCisrKyBMYXlvdXRUZXN0cy9odHRw
L3Rlc3RzL2Nzcy9yZXNvdXJjZXMvNTAwLnBocAkobm9uZXhpc3RlbnQpCkBAIC0xLDEzICswLDAg
QEAKLTw/cGhwCi0vLyBXZSBzbGVlcCBoZXJlIHNvIHRoYXQgd2UgYXJlIGhhdmUgZW5vdWdoIHRp
bWUgdG8gdGVzdCB0aGUgZGlmZmVyZW50IGF0dHJpYnV0ZXMgYmVmb3JlIHRoZSBzdHlsZXNoZWV0
IGlzIGZ1bGx5IGxvYWRlZC4KLXVzbGVlcCgxMDApOwotCi1oZWFkZXIoIkhUVFAvMS4wIDUwMCBJ
bnRlcm5hbCBFcnJvciIpOwotaGVhZGVyKCJFeHBpcmVzOiBUaHUsIDAxIERlYyAyMDAzIDE2OjAw
OjAwIEdNVCIpOwotaGVhZGVyKCJDYWNoZS1Db250cm9sOiBuby1jYWNoZSwgbm8tc3RvcmUsIG11
c3QtcmV2YWxpZGF0ZSIpOwotaGVhZGVyKCJQcmFnbWE6IG5vLWNhY2hlIik7Ci1oZWFkZXIoIkNv
bnRlbnQtVHlwZTogdGV4dC9jc3MiKTsKLQotb2JfZmx1c2goKTsKLWZsdXNoKCk7Ci0/PgpJbmRl
eDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzLzUwMC5weQo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Nzcy9yZXNvdXJjZXMvNTAwLnB5CShub25leGlz
dGVudCkKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jlc291cmNlcy81MDAucHkJKHdv
cmtpbmcgY29weSkKQEAgLTAsMCArMSwxNiBAQAorIyEvdXNyL2Jpbi9lbnYgcHl0aG9uMworCitp
bXBvcnQgc3lzCitpbXBvcnQgdGltZQorCit0aW1lLnNsZWVwKDAuMDAwMSkKKworc3lzLnN0ZG91
dC53cml0ZSgKKyAgICAnc3RhdHVzOiA1MDBcclxuJworICAgICdFeHBpcmVzOiBUaHUsIDAxIERl
YyAyMDAzIDE2OjAwOjAwIEdNVFxyXG4nCisgICAgJ0NhY2hlLUNvbnRyb2w6IG5vLWNhY2hlLCBu
by1zdG9yZSwgbXVzdC1yZXZhbGlkYXRlXHJcbicKKyAgICAnUHJhZ21hOiBuby1jYWNoZVxyXG4n
CisgICAgJ0NvbnRlbnQtVHlwZTogdGV4dC9jc3NcclxuXHJcbicKKykKKworc3lzLnN0ZG91dC5m
bHVzaCgpClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQoKUHJvcGVydHkgY2hhbmdlcyBvbjog
TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzLzUwMC5weQpfX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFk
ZGVkOiBzdm46ZXhlY3V0YWJsZQojIyAtMCwwICsxICMjCisqClwgTm8gbmV3bGluZSBhdCBlbmQg
b2YgcHJvcGVydHkKSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jlc291cmNlcy93
ZWJmb250LXJlcXVlc3QucGhwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMv
Y3NzL3Jlc291cmNlcy93ZWJmb250LXJlcXVlc3QucGhwCShyZXZpc2lvbiAyNzI2MTcpCisrKyBM
YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Nzcy9yZXNvdXJjZXMvd2ViZm9udC1yZXF1ZXN0LnBocAko
bm9uZXhpc3RlbnQpCkBAIC0xLDM2ICswLDAgQEAKLTw/cGhwCi1yZXF1aXJlX29uY2UgIi4uLy4u
L3Jlc291cmNlcy9wb3J0YWJpbGl0eUxheWVyLnBocCI7Ci0KLWZ1bmN0aW9uIGdldFJlcXVlc3RD
b3VudCgkZmlsZSkKLXsKLSAgICBpZiAoIWZpbGVfZXhpc3RzKCRmaWxlKSkgewotICAgICAgICBy
ZXR1cm4gMDsKLSAgICB9Ci0gICAgcmV0dXJuIChpbnQpZmlsZV9nZXRfY29udGVudHMoJGZpbGUp
OwotfQotCi1mdW5jdGlvbiBzZXRSZXF1ZXN0Q291bnQoJGZpbGUsICRjb3VudCkKLXsKLSAgICBm
aWxlX3B1dF9jb250ZW50cygkZmlsZSwgJGNvdW50KTsKLX0KLQotJHRtcEZpbGUgPSBzeXNfZ2V0
X3RlbXBfZGlyKCkgLiAiLyIgLiAkX0dFVFsiZmlsZW5hbWUiXTsKLQotJGN1cnJlbnRDb3VudCA9
IGdldFJlcXVlc3RDb3VudCgkdG1wRmlsZSk7Ci0kbW9kZSA9ICRfR0VUWyJtb2RlIl07Ci0KLWlm
ICgkbW9kZSA9PSAiZ2V0Rm9udCIpIHsKLSAgICBzZXRSZXF1ZXN0Q291bnQoJHRtcEZpbGUsICRj
dXJyZW50Q291bnQgKyAxKTsKLSAgICBoZWFkZXIoIkFjY2Vzcy1jb250cm9sLW1heC1hZ2U6IDAi
KTsKLSAgICBoZWFkZXIoIkFjY2Vzcy1jb250cm9sLWFsbG93LW9yaWdpbjogKiIpOwotICAgIGhl
YWRlcigiQWNjZXNzLWNvbnRyb2wtYWxsb3ctbWV0aG9kczogKiIpOwotICAgIGhlYWRlcigiQ2Fj
aGUtQ29udHJvbDogbWF4LWFnZT0wIik7Ci0gICAgaGVhZGVyKCJDb250ZW50LVR5cGU6IGFwcGxp
Y2F0aW9uL29jdGV0LXN0cmVhbSIpOwotICAgIGVjaG8gIiI7Ci19IGVsc2UgaWYgKCRtb2RlID09
ICJnZXRSZXF1ZXN0Q291bnQiKSB7Ci0gICAgaGVhZGVyKCJBY2Nlc3MtY29udHJvbC1tYXgtYWdl
OiAwIik7Ci0gICAgaGVhZGVyKCJBY2Nlc3MtY29udHJvbC1hbGxvdy1vcmlnaW46ICoiKTsKLSAg
ICBoZWFkZXIoIkFjY2Vzcy1jb250cm9sLWFsbG93LW1ldGhvZHM6ICoiKTsKLSAgICBlY2hvICRj
dXJyZW50Q291bnQ7Ci19Ci0/PgpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVz
b3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRw
L3Rlc3RzL2Nzcy9yZXNvdXJjZXMvd2ViZm9udC1yZXF1ZXN0LnB5CShub25leGlzdGVudCkKKysr
IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jlc291cmNlcy93ZWJmb250LXJlcXVlc3QucHkJ
KHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw0MSBAQAorIyEvdXNyL2Jpbi9lbnYgcHl0aG9uMwor
CitpbXBvcnQgb3MKK2ltcG9ydCBzeXMKK2ltcG9ydCB0ZW1wZmlsZQorZnJvbSB1cmxsaWIucGFy
c2UgaW1wb3J0IHBhcnNlX3FzCisKK2RlZiBnZXRSZXF1ZXN0Q291bnQoZmlsZSk6CisgICAgaWYg
bm90IG9zLnBhdGguaXNmaWxlKGZpbGUpOgorICAgICAgICByZXR1cm4gMAorCisgICAgd2l0aCBv
cGVuKGZpbGUsICdyJykgYXMgZmlsZToKKyAgICAgICAgcmV0dXJuIGludChmaWxlLnJlYWQoKSkK
KworZGVmIHNldFJlcXVlc3RDb3VudChmaWxlLCBjb3VudCk6CisgICAgd2l0aCBvcGVuKGZpbGUs
ICdyJykgYXMgZmlsZToKKyAgICAgICAgZmlsZS53cml0ZShjb3VudCkKKworcXVlcnkgPSBwYXJz
ZV9xcyhvcy5lbnZpcm9uLmdldCgnUVVFUllfU1RSSU5HJywgJycpLCBrZWVwX2JsYW5rX3ZhbHVl
cz1UcnVlKQorZmlsZW5hbWUgPSBxdWVyeS5nZXQoJ2ZpbGVuYW1lJywgWycnXSlbMF0KK21vZGUg
PSBxdWVyeS5nZXQoJ21vZGUnLCBbJyddKVswXQorCit0bXBGaWxlID0gb3MucGF0aC5qb2luKHRl
bXBmaWxlLmdldHRlbXBkaXIoKSwgZmlsZW5hbWUpCitjdXJyZW50Q291bnQgPSBnZXRSZXF1ZXN0
Q291bnQodG1wRmlsZSkKKworaWYgbW9kZSA9PSAnZ2V0Rm9udCc6CisgICAgc2V0UmVxdWVzdENv
dW50KHRtcEZpbGUsIGN1cnJlbnRDb3VudCArIDEpCisgICAgc3lzLnN0ZG91dC53cml0ZSgKKyAg
ICAgICAgJ0FjY2Vzcy1jb250cm9sLW1heC1hZ2U6IDBcclxuJworICAgICAgICAnQWNjZXNzLWNv
bnRyb2wtYWxsb3ctb3JpZ2luOiAqXHJcbicKKyAgICAgICAgJ0FjY2Vzcy1jb250cm9sLWFsbG93
LW1ldGhvZHM6ICpcclxuJworICAgICAgICAnQ2FjaGUtQ29udHJvbDogbWF4LWFnZT0wXHJcbicK
KyAgICAgICAgJ0NvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtXHJcblxyXG5c
bicKKyAgICApCitlbHNlOgorICAgIHN5cy5zdGRvdXQud3JpdGUoCisgICAgICAgICdBY2Nlc3Mt
Y29udHJvbC1tYXgtYWdlOiAwXHJcbicKKyAgICAgICAgJ0FjY2Vzcy1jb250cm9sLWFsbG93LW9y
aWdpbjogKlxyXG4nCisgICAgICAgICdBY2Nlc3MtY29udHJvbC1hbGxvdy1tZXRob2RzOiAqXHJc
blxyXG4nCisgICAgICAgICd7fVxuJy5mb3JtYXQoY3VycmVudENvdW50KQorICAgICkKXCBObyBu
ZXdsaW5lIGF0IGVuZCBvZiBmaWxlCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBMYXlvdXRUZXN0cy9o
dHRwL3Rlc3RzL2Nzcy9yZXNvdXJjZXMvd2ViZm9udC1yZXF1ZXN0LnB5Cl9fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWRk
ZWQ6IHN2bjpleGVjdXRhYmxlCiMjIC0wLDAgKzEgIyMKKyoKXCBObyBuZXdsaW5lIGF0IGVuZCBv
ZiBwcm9wZXJ0eQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>419799</attachid>
            <date>2021-02-09 17:59:40 -0800</date>
            <delta_ts>2021-02-09 18:03:13 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221511-20210209195939.patch</filename>
            <type>text/plain</type>
            <size>7524</size>
            <attacher name="Chris Gambrell">cgambrell</attacher>
            
              <data encoding="base64">SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D
aGFuZ2VMb2cJKHJldmlzaW9uIDI3MjYyOSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y
a2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAyLTA5ICBDaHJpcyBHYW1icmVsbCAg
PGNnYW1icmVsbEBhcHBsZS5jb20+CisKKyAgICAgICAgW0xheW91dFRlc3RzXSBDb252ZXJ0IGh0
dHAvdGVzdHMvY3NzIGNvbnZlcnQgUEhQIHRvIFB5dGhvbgorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNTExCisgICAgICAgIDxyZGFyOi8vcHJvYmxl
bS83NDA0OTU4NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICAqIGh0dHAvdGVzdHMvY3NzL2ZvbnQtZmFjZS1zcmMtbG9hZGluZy5odG1sOgorICAgICAg
ICAqIGh0dHAvdGVzdHMvY3NzL2xpbmstY3NzLWRpc2FibGVkLXZhbHVlLXdpdGgtc2xvdy1sb2Fk
aW5nLXNoZWV0LWluLWVycm9yLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3Vy
Y2VzLzUwMC5waHA6IFJlbW92ZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2Vz
LzUwMC5weTogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzL3dlYmZv
bnQtcmVxdWVzdC5waHA6IFJlbW92ZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3Vy
Y2VzL3dlYmZvbnQtcmVxdWVzdC5weTogQWRkZWQuCisgICAgICAgIChnZXRSZXF1ZXN0Q291bnQp
OgorICAgICAgICAoc2V0UmVxdWVzdENvdW50KToKKwogMjAyMS0wMi0wOSAgQW5kcmVzIEdvbnph
bGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAKICAgICAgICAgRGVzY2VuZGFudHMgb2Ygcm93
IGFuZCBjb2x1bW4gaGVhZGVycyBzaG91bGQgZXhwb3NlIHRoZSBhcmlhLXNvcnQgYXR0cmlidXRl
LgpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvZm9udC1mYWNlLXNyYy1sb2FkaW5n
Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvZm9udC1mYWNl
LXNyYy1sb2FkaW5nLmh0bWwJKHJldmlzaW9uIDI3MjYxNykKKysrIExheW91dFRlc3RzL2h0dHAv
dGVzdHMvY3NzL2ZvbnQtZmFjZS1zcmMtbG9hZGluZy5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0y
LDcgKzIsNyBAQAogPHN0eWxlPgogQGZvbnQtZmFjZSB7CiAgICAgZm9udC1mYW1pbHk6ICd3ZWJm
b250JzsKLSAgICBzcmM6IHVybChodHRwOi8vbG9jYWxob3N0OjgwMDAvY3NzL3Jlc291cmNlcy93
ZWJmb250LXJlcXVlc3QucGhwP21vZGU9Z2V0Rm9udCZmaWxlbmFtZT13ZWJmb250UmVxdWVzdENv
dW50LnR4dCkgZm9ybWF0KCd0cnVldHlwZScpOworICAgIHNyYzogdXJsKGh0dHA6Ly9sb2NhbGhv
c3Q6ODAwMC9jc3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5weT9tb2RlPWdldEZvbnQmZmls
ZW5hbWU9d2ViZm9udFJlcXVlc3RDb3VudC50eHQpIGZvcm1hdCgndHJ1ZXR5cGUnKTsKIH0KIDwv
c3R5bGU+CiA8c2NyaXB0PgpAQCAtNDEsNyArNDEsNyBAQCBmdW5jdGlvbiBnZXRSZXF1ZXN0Q291
bnQoKSB7CiAgICAgICAgIGlmICh4aHIucmVhZHlTdGF0ZSA9PSB4aHIuRE9ORSkKICAgICAgICAg
ICAgIGNoZWNrUmVxdWVzdENvdW50KCk7CiAgICAgfTsKLSAgICB4aHIub3BlbignR0VUJywgJ2h0
dHA6Ly9sb2NhbGhvc3Q6ODAwMC9jc3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5waHA/bW9k
ZT1nZXRSZXF1ZXN0Q291bnQmJyArIGZpbGVuYW1lLCB0cnVlKTsKKyAgICB4aHIub3BlbignR0VU
JywgJ2h0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9jc3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5w
eT9tb2RlPWdldFJlcXVlc3RDb3VudCYnICsgZmlsZW5hbWUsIHRydWUpOwogICAgIHhoci5zZW5k
KCk7CiB9CiAKSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL2xpbmstY3NzLWRpc2Fi
bGVkLXZhbHVlLXdpdGgtc2xvdy1sb2FkaW5nLXNoZWV0LWluLWVycm9yLmh0bWwKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvbGluay1jc3MtZGlzYWJsZWQtdmFsdWUt
d2l0aC1zbG93LWxvYWRpbmctc2hlZXQtaW4tZXJyb3IuaHRtbAkocmV2aXNpb24gMjcyNjE3KQor
KysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvbGluay1jc3MtZGlzYWJsZWQtdmFsdWUtd2l0
aC1zbG93LWxvYWRpbmctc2hlZXQtaW4tZXJyb3IuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMiw3
ICsyLDcgQEAKIDxodG1sPgogPGhlYWQ+CiA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9InJl
c291cmNlcy9lbXB0eS5jc3M/bGluay1jc3MtZGlzYWJsZWQtdmFsdWUtd2l0aC1zbG93LWxvYWRp
bmctc2hlZXQtaW4tZXJyb3ImZGVmYXVsdCIgbWVkaWE9ImFsbCIgdGl0bGU9IkRlZmF1bHQgU3R5
bGUgU2hlZXQiIHR5cGU9InRleHQvY3NzIj4KLTxsaW5rIHJlbD0iYWx0ZXJuYXRlIHN0eWxlc2hl
ZXQiIGhyZWY9InJlc291cmNlcy81MDAucGhwIiBtZWRpYT0iYWxsIiB0aXRsZT0iZ3JlZW4iIHR5
cGU9InRleHQvY3NzIj4KKzxsaW5rIHJlbD0iYWx0ZXJuYXRlIHN0eWxlc2hlZXQiIGhyZWY9InJl
c291cmNlcy81MDAucHkiIG1lZGlhPSJhbGwiIHRpdGxlPSJncmVlbiIgdHlwZT0idGV4dC9jc3Mi
PgogPHNjcmlwdCBzcmM9Ii9qcy10ZXN0LXJlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3Jp
cHQ+CiA8L2hlYWQ+CiA8Ym9keT4KSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jl
c291cmNlcy81MDAucGhwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3Nz
L3Jlc291cmNlcy81MDAucGhwCShyZXZpc2lvbiAyNzI2MTcpCisrKyBMYXlvdXRUZXN0cy9odHRw
L3Rlc3RzL2Nzcy9yZXNvdXJjZXMvNTAwLnBocAkobm9uZXhpc3RlbnQpCkBAIC0xLDEzICswLDAg
QEAKLTw/cGhwCi0vLyBXZSBzbGVlcCBoZXJlIHNvIHRoYXQgd2UgYXJlIGhhdmUgZW5vdWdoIHRp
bWUgdG8gdGVzdCB0aGUgZGlmZmVyZW50IGF0dHJpYnV0ZXMgYmVmb3JlIHRoZSBzdHlsZXNoZWV0
IGlzIGZ1bGx5IGxvYWRlZC4KLXVzbGVlcCgxMDApOwotCi1oZWFkZXIoIkhUVFAvMS4wIDUwMCBJ
bnRlcm5hbCBFcnJvciIpOwotaGVhZGVyKCJFeHBpcmVzOiBUaHUsIDAxIERlYyAyMDAzIDE2OjAw
OjAwIEdNVCIpOwotaGVhZGVyKCJDYWNoZS1Db250cm9sOiBuby1jYWNoZSwgbm8tc3RvcmUsIG11
c3QtcmV2YWxpZGF0ZSIpOwotaGVhZGVyKCJQcmFnbWE6IG5vLWNhY2hlIik7Ci1oZWFkZXIoIkNv
bnRlbnQtVHlwZTogdGV4dC9jc3MiKTsKLQotb2JfZmx1c2goKTsKLWZsdXNoKCk7Ci0/PgpJbmRl
eDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzLzUwMC5weQo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Nzcy9yZXNvdXJjZXMvNTAwLnB5CShub25leGlz
dGVudCkKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jlc291cmNlcy81MDAucHkJKHdv
cmtpbmcgY29weSkKQEAgLTAsMCArMSwxNiBAQAorIyEvdXNyL2Jpbi9lbnYgcHl0aG9uMworCitp
bXBvcnQgc3lzCitpbXBvcnQgdGltZQorCit0aW1lLnNsZWVwKDAuMDAwMSkKKworc3lzLnN0ZG91
dC53cml0ZSgKKyAgICAnc3RhdHVzOiA1MDBcclxuJworICAgICdFeHBpcmVzOiBUaHUsIDAxIERl
YyAyMDAzIDE2OjAwOjAwIEdNVFxyXG4nCisgICAgJ0NhY2hlLUNvbnRyb2w6IG5vLWNhY2hlLCBu
by1zdG9yZSwgbXVzdC1yZXZhbGlkYXRlXHJcbicKKyAgICAnUHJhZ21hOiBuby1jYWNoZVxyXG4n
CisgICAgJ0NvbnRlbnQtVHlwZTogdGV4dC9jc3NcclxuXHJcbicKKykKKworc3lzLnN0ZG91dC5m
bHVzaCgpClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQoKUHJvcGVydHkgY2hhbmdlcyBvbjog
TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzLzUwMC5weQpfX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFk
ZGVkOiBzdm46ZXhlY3V0YWJsZQojIyAtMCwwICsxICMjCisqClwgTm8gbmV3bGluZSBhdCBlbmQg
b2YgcHJvcGVydHkKSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jlc291cmNlcy93
ZWJmb250LXJlcXVlc3QucGhwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMv
Y3NzL3Jlc291cmNlcy93ZWJmb250LXJlcXVlc3QucGhwCShyZXZpc2lvbiAyNzI2MTcpCisrKyBM
YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Nzcy9yZXNvdXJjZXMvd2ViZm9udC1yZXF1ZXN0LnBocAko
bm9uZXhpc3RlbnQpCkBAIC0xLDM2ICswLDAgQEAKLTw/cGhwCi1yZXF1aXJlX29uY2UgIi4uLy4u
L3Jlc291cmNlcy9wb3J0YWJpbGl0eUxheWVyLnBocCI7Ci0KLWZ1bmN0aW9uIGdldFJlcXVlc3RD
b3VudCgkZmlsZSkKLXsKLSAgICBpZiAoIWZpbGVfZXhpc3RzKCRmaWxlKSkgewotICAgICAgICBy
ZXR1cm4gMDsKLSAgICB9Ci0gICAgcmV0dXJuIChpbnQpZmlsZV9nZXRfY29udGVudHMoJGZpbGUp
OwotfQotCi1mdW5jdGlvbiBzZXRSZXF1ZXN0Q291bnQoJGZpbGUsICRjb3VudCkKLXsKLSAgICBm
aWxlX3B1dF9jb250ZW50cygkZmlsZSwgJGNvdW50KTsKLX0KLQotJHRtcEZpbGUgPSBzeXNfZ2V0
X3RlbXBfZGlyKCkgLiAiLyIgLiAkX0dFVFsiZmlsZW5hbWUiXTsKLQotJGN1cnJlbnRDb3VudCA9
IGdldFJlcXVlc3RDb3VudCgkdG1wRmlsZSk7Ci0kbW9kZSA9ICRfR0VUWyJtb2RlIl07Ci0KLWlm
ICgkbW9kZSA9PSAiZ2V0Rm9udCIpIHsKLSAgICBzZXRSZXF1ZXN0Q291bnQoJHRtcEZpbGUsICRj
dXJyZW50Q291bnQgKyAxKTsKLSAgICBoZWFkZXIoIkFjY2Vzcy1jb250cm9sLW1heC1hZ2U6IDAi
KTsKLSAgICBoZWFkZXIoIkFjY2Vzcy1jb250cm9sLWFsbG93LW9yaWdpbjogKiIpOwotICAgIGhl
YWRlcigiQWNjZXNzLWNvbnRyb2wtYWxsb3ctbWV0aG9kczogKiIpOwotICAgIGhlYWRlcigiQ2Fj
aGUtQ29udHJvbDogbWF4LWFnZT0wIik7Ci0gICAgaGVhZGVyKCJDb250ZW50LVR5cGU6IGFwcGxp
Y2F0aW9uL29jdGV0LXN0cmVhbSIpOwotICAgIGVjaG8gIiI7Ci19IGVsc2UgaWYgKCRtb2RlID09
ICJnZXRSZXF1ZXN0Q291bnQiKSB7Ci0gICAgaGVhZGVyKCJBY2Nlc3MtY29udHJvbC1tYXgtYWdl
OiAwIik7Ci0gICAgaGVhZGVyKCJBY2Nlc3MtY29udHJvbC1hbGxvdy1vcmlnaW46ICoiKTsKLSAg
ICBoZWFkZXIoIkFjY2Vzcy1jb250cm9sLWFsbG93LW1ldGhvZHM6ICoiKTsKLSAgICBlY2hvICRj
dXJyZW50Q291bnQ7Ci19Ci0/PgpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVz
b3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRw
L3Rlc3RzL2Nzcy9yZXNvdXJjZXMvd2ViZm9udC1yZXF1ZXN0LnB5CShub25leGlzdGVudCkKKysr
IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jlc291cmNlcy93ZWJmb250LXJlcXVlc3QucHkJ
KHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw0NSBAQAorIyEvdXNyL2Jpbi9lbnYgcHl0aG9uMwor
CitpbXBvcnQgb3MKK2ltcG9ydCBzeXMKK2ltcG9ydCB0ZW1wZmlsZQorZnJvbSB1cmxsaWIucGFy
c2UgaW1wb3J0IHBhcnNlX3FzCisKK2RlZiBnZXRSZXF1ZXN0Q291bnQoZmlsZSk6CisgICAgaWYg
bm90IG9zLnBhdGguaXNmaWxlKGZpbGUpOgorICAgICAgICByZXR1cm4gMAorCisgICAgd2l0aCBv
cGVuKGZpbGUsICdyJykgYXMgZmlsZToKKyAgICAgICAgcmV0dXJuIGludChmaWxlLnJlYWQoKSkK
KworZGVmIHNldFJlcXVlc3RDb3VudChmaWxlLCBjb3VudCk6CisgICAgd2l0aCBvcGVuKGZpbGUs
ICdyJykgYXMgZmlsZToKKyAgICAgICAgZmlsZS53cml0ZShjb3VudCkKKworIyBmaWxlID0gX19m
aWxlX18uc3BsaXQoJzovY3lnd2luJylbLTFdCisjIGh0dHBfcm9vdCA9IG9zLnBhdGguZGlybmFt
ZShvcy5wYXRoLmRpcm5hbWUob3MucGF0aC5hYnNwYXRoKG9zLnBhdGguZGlybmFtZShmaWxlKSkp
KQorIyBzeXMucGF0aC5pbnNlcnQoMCwgaHR0cF9yb290KQorCitxdWVyeSA9IHBhcnNlX3FzKG9z
LmVudmlyb24uZ2V0KCdRVUVSWV9TVFJJTkcnLCAnJyksIGtlZXBfYmxhbmtfdmFsdWVzPVRydWUp
CitmaWxlbmFtZSA9IHF1ZXJ5LmdldCgnZmlsZW5hbWUnLCBbJyddKVswXQorbW9kZSA9IHF1ZXJ5
LmdldCgnbW9kZScsIFsnJ10pWzBdCisKK3RtcEZpbGUgPSBvcy5wYXRoLmpvaW4odGVtcGZpbGUu
Z2V0dGVtcGRpcigpLCBmaWxlbmFtZSkKK2N1cnJlbnRDb3VudCA9IGdldFJlcXVlc3RDb3VudCh0
bXBGaWxlKQorCitpZiBtb2RlID09ICdnZXRGb250JzoKKyAgICBzZXRSZXF1ZXN0Q291bnQodG1w
RmlsZSwgY3VycmVudENvdW50ICsgMSkKKyAgICBzeXMuc3Rkb3V0LndyaXRlKAorICAgICAgICAn
QWNjZXNzLWNvbnRyb2wtbWF4LWFnZTogMFxyXG4nCisgICAgICAgICdBY2Nlc3MtY29udHJvbC1h
bGxvdy1vcmlnaW46ICpcclxuJworICAgICAgICAnQWNjZXNzLWNvbnRyb2wtYWxsb3ctbWV0aG9k
czogKlxyXG4nCisgICAgICAgICdDYWNoZS1Db250cm9sOiBtYXgtYWdlPTBcclxuJworICAgICAg
ICAnQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW1cclxuXHJcbicKKyAgICAp
CitlbHNlOgorICAgIHN5cy5zdGRvdXQud3JpdGUoCisgICAgICAgICdBY2Nlc3MtY29udHJvbC1t
YXgtYWdlOiAwXHJcbicKKyAgICAgICAgJ0FjY2Vzcy1jb250cm9sLWFsbG93LW9yaWdpbjogKlxy
XG4nCisgICAgICAgICdBY2Nlc3MtY29udHJvbC1hbGxvdy1tZXRob2RzOiAqXHJcblxyXG4nCisg
ICAgICAgICd7fScuZm9ybWF0KGN1cnJlbnRDb3VudCkKKyAgICApClwgTm8gbmV3bGluZSBhdCBl
bmQgb2YgZmlsZQoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9j
c3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5weQpfX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBzdm46ZXhl
Y3V0YWJsZQojIyAtMCwwICsxICMjCisqClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgcHJvcGVydHkK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>419800</attachid>
            <date>2021-02-09 18:03:15 -0800</date>
            <delta_ts>2021-02-10 08:53:18 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221511-20210209200314.patch</filename>
            <type>text/plain</type>
            <size>7360</size>
            <attacher name="Chris Gambrell">cgambrell</attacher>
            
              <data encoding="base64">SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D
aGFuZ2VMb2cJKHJldmlzaW9uIDI3MjYyOSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y
a2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAyLTA5ICBDaHJpcyBHYW1icmVsbCAg
PGNnYW1icmVsbEBhcHBsZS5jb20+CisKKyAgICAgICAgW0xheW91dFRlc3RzXSBDb252ZXJ0IGh0
dHAvdGVzdHMvY3NzIGNvbnZlcnQgUEhQIHRvIFB5dGhvbgorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNTExCisgICAgICAgIDxyZGFyOi8vcHJvYmxl
bS83NDA0OTU4NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICAqIGh0dHAvdGVzdHMvY3NzL2ZvbnQtZmFjZS1zcmMtbG9hZGluZy5odG1sOgorICAgICAg
ICAqIGh0dHAvdGVzdHMvY3NzL2xpbmstY3NzLWRpc2FibGVkLXZhbHVlLXdpdGgtc2xvdy1sb2Fk
aW5nLXNoZWV0LWluLWVycm9yLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3Vy
Y2VzLzUwMC5waHA6IFJlbW92ZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2Vz
LzUwMC5weTogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzL3dlYmZv
bnQtcmVxdWVzdC5waHA6IFJlbW92ZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jc3MvcmVzb3Vy
Y2VzL3dlYmZvbnQtcmVxdWVzdC5weTogQWRkZWQuCisgICAgICAgIChnZXRSZXF1ZXN0Q291bnQp
OgorICAgICAgICAoc2V0UmVxdWVzdENvdW50KToKKwogMjAyMS0wMi0wOSAgQW5kcmVzIEdvbnph
bGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAKICAgICAgICAgRGVzY2VuZGFudHMgb2Ygcm93
IGFuZCBjb2x1bW4gaGVhZGVycyBzaG91bGQgZXhwb3NlIHRoZSBhcmlhLXNvcnQgYXR0cmlidXRl
LgpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvZm9udC1mYWNlLXNyYy1sb2FkaW5n
Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvZm9udC1mYWNl
LXNyYy1sb2FkaW5nLmh0bWwJKHJldmlzaW9uIDI3MjYxNykKKysrIExheW91dFRlc3RzL2h0dHAv
dGVzdHMvY3NzL2ZvbnQtZmFjZS1zcmMtbG9hZGluZy5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0y
LDcgKzIsNyBAQAogPHN0eWxlPgogQGZvbnQtZmFjZSB7CiAgICAgZm9udC1mYW1pbHk6ICd3ZWJm
b250JzsKLSAgICBzcmM6IHVybChodHRwOi8vbG9jYWxob3N0OjgwMDAvY3NzL3Jlc291cmNlcy93
ZWJmb250LXJlcXVlc3QucGhwP21vZGU9Z2V0Rm9udCZmaWxlbmFtZT13ZWJmb250UmVxdWVzdENv
dW50LnR4dCkgZm9ybWF0KCd0cnVldHlwZScpOworICAgIHNyYzogdXJsKGh0dHA6Ly9sb2NhbGhv
c3Q6ODAwMC9jc3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5weT9tb2RlPWdldEZvbnQmZmls
ZW5hbWU9d2ViZm9udFJlcXVlc3RDb3VudC50eHQpIGZvcm1hdCgndHJ1ZXR5cGUnKTsKIH0KIDwv
c3R5bGU+CiA8c2NyaXB0PgpAQCAtNDEsNyArNDEsNyBAQCBmdW5jdGlvbiBnZXRSZXF1ZXN0Q291
bnQoKSB7CiAgICAgICAgIGlmICh4aHIucmVhZHlTdGF0ZSA9PSB4aHIuRE9ORSkKICAgICAgICAg
ICAgIGNoZWNrUmVxdWVzdENvdW50KCk7CiAgICAgfTsKLSAgICB4aHIub3BlbignR0VUJywgJ2h0
dHA6Ly9sb2NhbGhvc3Q6ODAwMC9jc3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5waHA/bW9k
ZT1nZXRSZXF1ZXN0Q291bnQmJyArIGZpbGVuYW1lLCB0cnVlKTsKKyAgICB4aHIub3BlbignR0VU
JywgJ2h0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9jc3MvcmVzb3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5w
eT9tb2RlPWdldFJlcXVlc3RDb3VudCYnICsgZmlsZW5hbWUsIHRydWUpOwogICAgIHhoci5zZW5k
KCk7CiB9CiAKSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL2xpbmstY3NzLWRpc2Fi
bGVkLXZhbHVlLXdpdGgtc2xvdy1sb2FkaW5nLXNoZWV0LWluLWVycm9yLmh0bWwKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvbGluay1jc3MtZGlzYWJsZWQtdmFsdWUt
d2l0aC1zbG93LWxvYWRpbmctc2hlZXQtaW4tZXJyb3IuaHRtbAkocmV2aXNpb24gMjcyNjE3KQor
KysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvbGluay1jc3MtZGlzYWJsZWQtdmFsdWUtd2l0
aC1zbG93LWxvYWRpbmctc2hlZXQtaW4tZXJyb3IuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMiw3
ICsyLDcgQEAKIDxodG1sPgogPGhlYWQ+CiA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9InJl
c291cmNlcy9lbXB0eS5jc3M/bGluay1jc3MtZGlzYWJsZWQtdmFsdWUtd2l0aC1zbG93LWxvYWRp
bmctc2hlZXQtaW4tZXJyb3ImZGVmYXVsdCIgbWVkaWE9ImFsbCIgdGl0bGU9IkRlZmF1bHQgU3R5
bGUgU2hlZXQiIHR5cGU9InRleHQvY3NzIj4KLTxsaW5rIHJlbD0iYWx0ZXJuYXRlIHN0eWxlc2hl
ZXQiIGhyZWY9InJlc291cmNlcy81MDAucGhwIiBtZWRpYT0iYWxsIiB0aXRsZT0iZ3JlZW4iIHR5
cGU9InRleHQvY3NzIj4KKzxsaW5rIHJlbD0iYWx0ZXJuYXRlIHN0eWxlc2hlZXQiIGhyZWY9InJl
c291cmNlcy81MDAucHkiIG1lZGlhPSJhbGwiIHRpdGxlPSJncmVlbiIgdHlwZT0idGV4dC9jc3Mi
PgogPHNjcmlwdCBzcmM9Ii9qcy10ZXN0LXJlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3Jp
cHQ+CiA8L2hlYWQ+CiA8Ym9keT4KSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jl
c291cmNlcy81MDAucGhwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3Nz
L3Jlc291cmNlcy81MDAucGhwCShyZXZpc2lvbiAyNzI2MTcpCisrKyBMYXlvdXRUZXN0cy9odHRw
L3Rlc3RzL2Nzcy9yZXNvdXJjZXMvNTAwLnBocAkobm9uZXhpc3RlbnQpCkBAIC0xLDEzICswLDAg
QEAKLTw/cGhwCi0vLyBXZSBzbGVlcCBoZXJlIHNvIHRoYXQgd2UgYXJlIGhhdmUgZW5vdWdoIHRp
bWUgdG8gdGVzdCB0aGUgZGlmZmVyZW50IGF0dHJpYnV0ZXMgYmVmb3JlIHRoZSBzdHlsZXNoZWV0
IGlzIGZ1bGx5IGxvYWRlZC4KLXVzbGVlcCgxMDApOwotCi1oZWFkZXIoIkhUVFAvMS4wIDUwMCBJ
bnRlcm5hbCBFcnJvciIpOwotaGVhZGVyKCJFeHBpcmVzOiBUaHUsIDAxIERlYyAyMDAzIDE2OjAw
OjAwIEdNVCIpOwotaGVhZGVyKCJDYWNoZS1Db250cm9sOiBuby1jYWNoZSwgbm8tc3RvcmUsIG11
c3QtcmV2YWxpZGF0ZSIpOwotaGVhZGVyKCJQcmFnbWE6IG5vLWNhY2hlIik7Ci1oZWFkZXIoIkNv
bnRlbnQtVHlwZTogdGV4dC9jc3MiKTsKLQotb2JfZmx1c2goKTsKLWZsdXNoKCk7Ci0/PgpJbmRl
eDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzLzUwMC5weQo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Nzcy9yZXNvdXJjZXMvNTAwLnB5CShub25leGlz
dGVudCkKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jlc291cmNlcy81MDAucHkJKHdv
cmtpbmcgY29weSkKQEAgLTAsMCArMSwxNiBAQAorIyEvdXNyL2Jpbi9lbnYgcHl0aG9uMworCitp
bXBvcnQgc3lzCitpbXBvcnQgdGltZQorCit0aW1lLnNsZWVwKDAuMDAwMSkKKworc3lzLnN0ZG91
dC53cml0ZSgKKyAgICAnc3RhdHVzOiA1MDBcclxuJworICAgICdFeHBpcmVzOiBUaHUsIDAxIERl
YyAyMDAzIDE2OjAwOjAwIEdNVFxyXG4nCisgICAgJ0NhY2hlLUNvbnRyb2w6IG5vLWNhY2hlLCBu
by1zdG9yZSwgbXVzdC1yZXZhbGlkYXRlXHJcbicKKyAgICAnUHJhZ21hOiBuby1jYWNoZVxyXG4n
CisgICAgJ0NvbnRlbnQtVHlwZTogdGV4dC9jc3NcclxuXHJcbicKKykKKworc3lzLnN0ZG91dC5m
bHVzaCgpClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQoKUHJvcGVydHkgY2hhbmdlcyBvbjog
TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVzb3VyY2VzLzUwMC5weQpfX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFk
ZGVkOiBzdm46ZXhlY3V0YWJsZQojIyAtMCwwICsxICMjCisqClwgTm8gbmV3bGluZSBhdCBlbmQg
b2YgcHJvcGVydHkKSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jlc291cmNlcy93
ZWJmb250LXJlcXVlc3QucGhwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMv
Y3NzL3Jlc291cmNlcy93ZWJmb250LXJlcXVlc3QucGhwCShyZXZpc2lvbiAyNzI2MTcpCisrKyBM
YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Nzcy9yZXNvdXJjZXMvd2ViZm9udC1yZXF1ZXN0LnBocAko
bm9uZXhpc3RlbnQpCkBAIC0xLDM2ICswLDAgQEAKLTw/cGhwCi1yZXF1aXJlX29uY2UgIi4uLy4u
L3Jlc291cmNlcy9wb3J0YWJpbGl0eUxheWVyLnBocCI7Ci0KLWZ1bmN0aW9uIGdldFJlcXVlc3RD
b3VudCgkZmlsZSkKLXsKLSAgICBpZiAoIWZpbGVfZXhpc3RzKCRmaWxlKSkgewotICAgICAgICBy
ZXR1cm4gMDsKLSAgICB9Ci0gICAgcmV0dXJuIChpbnQpZmlsZV9nZXRfY29udGVudHMoJGZpbGUp
OwotfQotCi1mdW5jdGlvbiBzZXRSZXF1ZXN0Q291bnQoJGZpbGUsICRjb3VudCkKLXsKLSAgICBm
aWxlX3B1dF9jb250ZW50cygkZmlsZSwgJGNvdW50KTsKLX0KLQotJHRtcEZpbGUgPSBzeXNfZ2V0
X3RlbXBfZGlyKCkgLiAiLyIgLiAkX0dFVFsiZmlsZW5hbWUiXTsKLQotJGN1cnJlbnRDb3VudCA9
IGdldFJlcXVlc3RDb3VudCgkdG1wRmlsZSk7Ci0kbW9kZSA9ICRfR0VUWyJtb2RlIl07Ci0KLWlm
ICgkbW9kZSA9PSAiZ2V0Rm9udCIpIHsKLSAgICBzZXRSZXF1ZXN0Q291bnQoJHRtcEZpbGUsICRj
dXJyZW50Q291bnQgKyAxKTsKLSAgICBoZWFkZXIoIkFjY2Vzcy1jb250cm9sLW1heC1hZ2U6IDAi
KTsKLSAgICBoZWFkZXIoIkFjY2Vzcy1jb250cm9sLWFsbG93LW9yaWdpbjogKiIpOwotICAgIGhl
YWRlcigiQWNjZXNzLWNvbnRyb2wtYWxsb3ctbWV0aG9kczogKiIpOwotICAgIGhlYWRlcigiQ2Fj
aGUtQ29udHJvbDogbWF4LWFnZT0wIik7Ci0gICAgaGVhZGVyKCJDb250ZW50LVR5cGU6IGFwcGxp
Y2F0aW9uL29jdGV0LXN0cmVhbSIpOwotICAgIGVjaG8gIiI7Ci19IGVsc2UgaWYgKCRtb2RlID09
ICJnZXRSZXF1ZXN0Q291bnQiKSB7Ci0gICAgaGVhZGVyKCJBY2Nlc3MtY29udHJvbC1tYXgtYWdl
OiAwIik7Ci0gICAgaGVhZGVyKCJBY2Nlc3MtY29udHJvbC1hbGxvdy1vcmlnaW46ICoiKTsKLSAg
ICBoZWFkZXIoIkFjY2Vzcy1jb250cm9sLWFsbG93LW1ldGhvZHM6ICoiKTsKLSAgICBlY2hvICRj
dXJyZW50Q291bnQ7Ci19Ci0/PgpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jc3MvcmVz
b3VyY2VzL3dlYmZvbnQtcmVxdWVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRw
L3Rlc3RzL2Nzcy9yZXNvdXJjZXMvd2ViZm9udC1yZXF1ZXN0LnB5CShub25leGlzdGVudCkKKysr
IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY3NzL3Jlc291cmNlcy93ZWJmb250LXJlcXVlc3QucHkJ
KHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw0MSBAQAorIyEvdXNyL2Jpbi9lbnYgcHl0aG9uMwor
CitpbXBvcnQgb3MKK2ltcG9ydCBzeXMKK2ltcG9ydCB0ZW1wZmlsZQorZnJvbSB1cmxsaWIucGFy
c2UgaW1wb3J0IHBhcnNlX3FzCisKK2RlZiBnZXRSZXF1ZXN0Q291bnQoZmlsZSk6CisgICAgaWYg
bm90IG9zLnBhdGguaXNmaWxlKGZpbGUpOgorICAgICAgICByZXR1cm4gMAorCisgICAgd2l0aCBv
cGVuKGZpbGUsICdyJykgYXMgZmlsZToKKyAgICAgICAgcmV0dXJuIGludChmaWxlLnJlYWQoKSkK
KworZGVmIHNldFJlcXVlc3RDb3VudChmaWxlLCBjb3VudCk6CisgICAgd2l0aCBvcGVuKGZpbGUs
ICdyJykgYXMgZmlsZToKKyAgICAgICAgZmlsZS53cml0ZShjb3VudCkKKworcXVlcnkgPSBwYXJz
ZV9xcyhvcy5lbnZpcm9uLmdldCgnUVVFUllfU1RSSU5HJywgJycpLCBrZWVwX2JsYW5rX3ZhbHVl
cz1UcnVlKQorZmlsZW5hbWUgPSBxdWVyeS5nZXQoJ2ZpbGVuYW1lJywgWycnXSlbMF0KK21vZGUg
PSBxdWVyeS5nZXQoJ21vZGUnLCBbJyddKVswXQorCit0bXBGaWxlID0gb3MucGF0aC5qb2luKHRl
bXBmaWxlLmdldHRlbXBkaXIoKSwgZmlsZW5hbWUpCitjdXJyZW50Q291bnQgPSBnZXRSZXF1ZXN0
Q291bnQodG1wRmlsZSkKKworaWYgbW9kZSA9PSAnZ2V0Rm9udCc6CisgICAgc2V0UmVxdWVzdENv
dW50KHRtcEZpbGUsIGN1cnJlbnRDb3VudCArIDEpCisgICAgc3lzLnN0ZG91dC53cml0ZSgKKyAg
ICAgICAgJ0FjY2Vzcy1jb250cm9sLW1heC1hZ2U6IDBcclxuJworICAgICAgICAnQWNjZXNzLWNv
bnRyb2wtYWxsb3ctb3JpZ2luOiAqXHJcbicKKyAgICAgICAgJ0FjY2Vzcy1jb250cm9sLWFsbG93
LW1ldGhvZHM6ICpcclxuJworICAgICAgICAnQ2FjaGUtQ29udHJvbDogbWF4LWFnZT0wXHJcbicK
KyAgICAgICAgJ0NvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtXHJcblxyXG4n
CisgICAgKQorZWxzZToKKyAgICBzeXMuc3Rkb3V0LndyaXRlKAorICAgICAgICAnQWNjZXNzLWNv
bnRyb2wtbWF4LWFnZTogMFxyXG4nCisgICAgICAgICdBY2Nlc3MtY29udHJvbC1hbGxvdy1vcmln
aW46ICpcclxuJworICAgICAgICAnQWNjZXNzLWNvbnRyb2wtYWxsb3ctbWV0aG9kczogKlxyXG5c
clxuJworICAgICAgICAne30nLmZvcm1hdChjdXJyZW50Q291bnQpCisgICAgKQpcIE5vIG5ld2xp
bmUgYXQgZW5kIG9mIGZpbGUKClByb3BlcnR5IGNoYW5nZXMgb246IExheW91dFRlc3RzL2h0dHAv
dGVzdHMvY3NzL3Jlc291cmNlcy93ZWJmb250LXJlcXVlc3QucHkKX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpBZGRlZDog
c3ZuOmV4ZWN1dGFibGUKIyMgLTAsMCArMSAjIworKgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIHBy
b3BlcnR5Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>