<?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>232642</bug_id>
          
          <creation_ts>2021-11-02 15:17:33 -0700</creation_ts>
          <short_desc>Fix consistency issues with localized strings, and regenerate localizable.strings</short_desc>
          <delta_ts>2021-11-24 15:30:46 -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>WebCore Misc.</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=233483</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>
          <dependson>218879</dependson>
    
    <dependson>226361</dependson>
    
    <dependson>226888</dependson>
    
    <dependson>232462</dependson>
          <blocked>232686</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="David Kilzer (:ddkilzer)">ddkilzer</reporter>
          <assigned_to name="David Kilzer (:ddkilzer)">ddkilzer</assigned_to>
          <cc>achristensen</cc>
    
    <cc>cgarcia</cc>
    
    <cc>darin</cc>
    
    <cc>hi</cc>
    
    <cc>megan_gardner</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1811291</commentid>
    <comment_count>0</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-02 15:17:33 -0700</bug_when>
    <thetext>Fix consistency issues with localized strings and regenerate localizable.strings.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1811296</commentid>
    <comment_count>1</comment_count>
      <attachid>443138</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-02 15:23:31 -0700</bug_when>
    <thetext>Created attachment 443138
Patch v1</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1811298</commentid>
    <comment_count>2</comment_count>
      <attachid>443138</attachid>
    <who name="Devin Rousso">hi</who>
    <bug_when>2021-11-02 15:26:37 -0700</bug_when>
    <thetext>Comment on attachment 443138
Patch v1

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

&gt; Source/WebCore/en.lproj/Localizable.strings:38
&gt; +&quot;%@ Easy (text track)&quot; = &quot;%@ Easy Reader&quot;;

this should actually probably be fixed in the corresponding code 😅</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1811303</commentid>
    <comment_count>3</comment_count>
      <attachid>443138</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-02 15:55:39 -0700</bug_when>
    <thetext>Comment on attachment 443138
Patch v1

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

&gt;&gt; Source/WebCore/en.lproj/Localizable.strings:38
&gt;&gt; +&quot;%@ Easy (text track)&quot; = &quot;%@ Easy Reader&quot;;
&gt; 
&gt; this should actually probably be fixed in the corresponding code 😅

Ah, I wasn&apos;t sure which way to go.  I will change the code to match the format string.  Thanks!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1811305</commentid>
    <comment_count>4</comment_count>
      <attachid>443138</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-02 16:16:08 -0700</bug_when>
    <thetext>Comment on attachment 443138
Patch v1

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

&gt; Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm:280
&gt; -    return [NSString localizedStringWithFormat:WEB_UI_NSSTRING(@&quot;Use no more than %d character(s)&quot;, @&quot;Validation message for form control elements with a value shorter than maximum allowed length&quot;), maxLength];
&gt; +    return formatLocalizedString(WEB_UI_CFSTRING(&quot;Use no more than %d character(s)&quot;, &quot;Validation message for form control elements with a value shorter than maximum allowed length&quot;), maxLength);

This caused a regression, so I&apos;m going to remove it from this patch.  (It will appear in a follow-up patch, though.)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1811312</commentid>
    <comment_count>5</comment_count>
      <attachid>443143</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-02 16:25:20 -0700</bug_when>
    <thetext>Created attachment 443143
Patch v2</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1811675</commentid>
    <comment_count>6</comment_count>
      <attachid>443143</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-03 14:59:17 -0700</bug_when>
    <thetext>Comment on attachment 443143
Patch v2

Thanks Megan!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1811680</commentid>
    <comment_count>7</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-11-03 15:07:32 -0700</bug_when>
    <thetext>Committed r285234 (243855@main): &lt;https://commits.webkit.org/243855@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 443143.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1811681</commentid>
    <comment_count>8</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-11-03 15:08:19 -0700</bug_when>
    <thetext>&lt;rdar://problem/84993811&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443138</attachid>
            <date>2021-11-02 15:23:31 -0700</date>
            <delta_ts>2021-11-02 16:25:17 -0700</delta_ts>
            <desc>Patch v1</desc>
            <filename>bug-232642-20211102152330.patch</filename>
            <type>text/plain</type>
            <size>11923</size>
            <attacher name="David Kilzer (:ddkilzer)">ddkilzer</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjk0OTZjYWYyOGI4YzRm
YmEyNGUyMmIyNTRiYWY5NmRlYzFlNzM5Mi4uZDkzNWY2OWMxMmI1ZGY2MzdhMTFjMWZmNWRmZDU1
M2YwNGUzOWFjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDIxLTExLTAyICBEYXZp
ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IGNvbnNpc3RlbmN5
IGlzc3VlcyB3aXRoIGxvY2FsaXplZCBzdHJpbmdzIGFuZCByZWdlbmVyYXRlIGxvY2FsaXphYmxl
LnN0cmluZ3MKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIzMjY0Mj4KKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGVuLmxwcm9qL0xvY2Fs
aXphYmxlLnN0cmluZ3M6CisgICAgICAgIC0gUmVnZW5lcmF0ZSB0aGUgZmlsZSB1c2luZyB1cGRh
dGUtd2Via2l0LWxvY2FsaXphYmxlLXN0cmluZ3MuCisgICAgICAgIC0gTGlzdCBvZiBzdHJpbmdz
IHJlYWxwaGFiZXRpemVkLCBleGNlcHQgYXMgbm90ZWQgYmVsb3cuCisgICAgICAgICgiJUAgKCVA
IEludGVybmV0IHBsdWctaW4pIik6IERlbGV0ZS4KKyAgICAgICAgLSBSZW1vdmVkIGluIHIyODUw
NDcgZm9yIEJ1ZyAyMzI0NjIuCisgICAgICAgICgiJUAgRWFzeSBSZWFkZXIgKHRleHQgdHJhY2sp
Iik6IERlbGV0ZS4KKyAgICAgICAgKCIlQCBFYXN5ICh0ZXh0IHRyYWNrKSIpOiBBZGQuCisgICAg
ICAgIC0gRml4IHVubG9jYWxpemVkIHN0cmluZyB0aGF0IHJlZ3Jlc3NlZCBpbiByMjc4MjAyIGZv
cgorICAgICAgICAgIEJ1ZyAyMjYzNjEuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9Mb2NhbGl6ZWRT
dHJpbmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnVzZUJsb2NrZWRQbHVnSW5Db250ZXh0TWVu
dVRpdGxlKToKKyAgICAgICAgLSBSZW1vdmUgdW5uZWVkZWQgY2FsbCB0byBXZWJDb3JlOjpmb3Jt
YXRMb2NhbGl6ZWRTdHJpbmcoKSBzaW5jZQorICAgICAgICAgIHRoZXJlIGFyZSBubyBwbGFjZWhv
bGRlcnMgdG8gcmVwbGFjZS4KKworICAgICAgICAqIHBsYXRmb3JtL2NvY29hL0xvY2FsaXplZFN0
cmluZ3NDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6OmNvbnRleHRNZW51SXRlbVRhZ1NlYXJj
aFdlYik6CisgICAgICAgIChXZWJDb3JlOjpjb250ZXh0TWVudUl0ZW1UYWdTaG93Rm9udHMpOgor
ICAgICAgICAtIFN3aXRjaCBmcm9tIGNhbGxpbmcgV2ViQ29yZTo6bG9jYWxpemVkTlNTdHJpbmco
KSBkaXJlY3RseSB0bworICAgICAgICAgIHVzaW5nIFdFQl9VSV9TVFJJTkcoKSBzbyB0aGVzZSBz
dHJpbmdzIHdpbGwgYmUgZm91bmQgYnkKKyAgICAgICAgICB1cGRhdGUtd2Via2l0LWxvY2FsaXph
YmxlLXN0cmluZ3MuICBUaGlzIHJlZ3Jlc3NlZCBpbiByMjY5ODY1CisgICAgICAgICAgZm9yIEJ1
ZyAyMTg4NzkgKHNlZSBhbHNvIHIyNzg3NjcgZm9yIEJ1ZyAyMjY4ODgpLgorICAgICAgICAoV2Vi
Q29yZTo6dmFsaWRhdGlvbk1lc3NhZ2VUb29Mb25nVGV4dCk6CisgICAgICAgIC0gU3dpdGNoIGZy
b20gK1tOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0Ol0gYW5kCisgICAgICAgICAgV0VCX1VJX05T
U1RSSU5HKCkgdG8gV2ViQ29yZTo6Zm9ybWF0TG9jYWxpemVkU3RyaW5nKCkgYW5kCisgICAgICAg
ICAgV0VCX1VJX0NGU1RSSU5HKCkgZm9yIGNvbnNpc3RlbmN5LgorCiAyMDIxLTExLTAyICBBbnR0
aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJbnRlZ3JhdGlv
bl0gUHJvdmlkZSBiaWRpIHByb3BlcnRpZXMgd2hlbiBjb25zdHJ1Y3RpbmcgVGV4dFJ1bgpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5ncyBiL1Nv
dXJjZS9XZWJDb3JlL2VuLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MKaW5kZXggYTA1OWQ3YmIy
ZTBiYWYzYjIwMGY5NGZmNzEyMzAyOWM4MDlkYjY0Ny4uMDVmNzE0MWJhNTgyYThjZWYyNmI2N2Q3
YTY5OTBmYWU2N2M4NTNhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZW4ubHByb2ovTG9j
YWxpemFibGUuc3RyaW5ncworKysgYi9Tb3VyY2UvV2ViQ29yZS9lbi5scHJvai9Mb2NhbGl6YWJs
ZS5zdHJpbmdzCkBAIC0xMyw5ICsxMyw2IEBACiAvKiB3aW5kb3cgdGl0bGUgZm9yIGEgc3RhbmRh
bG9uZSBpbWFnZSAodXNlcyBtdWx0aXBsaWNhdGlvbiBzeW1ib2wsIG5vdCB4KSAqLwogIiVAICVA
w5clQCBwaXhlbHMiID0gIiVAICVAw5clQCBwaXhlbHMiOwogCi0vKiB2aXNpYmxlIG5hbWUgb2Yg
dGhlIHBsdWctaW4gaG9zdCBwcm9jZXNzLiBUaGUgZmlyc3QgYXJndW1lbnQgaXMgdGhlIHBsdWct
aW4gbmFtZSBhbmQgdGhlIHNlY29uZCBhcmd1bWVudCBpcyB0aGUgYXBwbGljYXRpb24gbmFtZS4g
Ki8KLSIlQCAoJUAgSW50ZXJuZXQgcGx1Zy1pbikiID0gIiVAICglQCBJbnRlcm5ldCBwbHVnLWlu
KSI7Ci0KIC8qIEF1ZGlvL1RleHQgdHJhY2sgZGlzcGxheSBuYW1lIGZvcm1hdCB0aGF0IGluY2x1
ZGVzIHRoZSBsYWJlbCBhbmQgbGFuZ3VhZ2Ugb2YgdGhlIHRyYWNrLCBpbiB0aGUgZm9ybSBvZiAn
TGFuZ3VhZ2UgKExhYmVsKScuICovCiAiJUAgKCVAKSAoYXVkaW8vdGV4dCB0cmFjaykiID0gIiVA
ICglQCkiOwogCkBAIC0zOCw3ICszNSw3IEBACiAiJUAgRGVzY3JpcHRpb25zICh0ZXh0IHRyYWNr
KSIgPSAiJUAgRGVzY3JpcHRpb25zIjsKIAogLyogRWFzeSBSZWFkZXIgKGkuZS4gM3JkLWdyYWRl
IGxldmVsKSB0ZXh0IHRyYWNrIGRpc3BsYXkgbmFtZSBmb3JtYXQgdGhhdCBpbmNsdWRlcyB0aGUg
bGFuZ3VhZ2UgYW5kL29yIGxvY2FsZSAoZS5nLiAnRW5nbGlzaCBFYXN5IFJlYWRlcicpLiAqLwot
IiVAIEVhc3kgUmVhZGVyICh0ZXh0IHRyYWNrKSIgPSAiJUAgRWFzeSBSZWFkZXIiOworIiVAIEVh
c3kgKHRleHQgdHJhY2spIiA9ICIlQCBFYXN5IFJlYWRlciI7CiAKIC8qIEZvcmNlZCB0ZXh0IHRy
YWNrIGRpc3BsYXkgbmFtZSBmb3JtYXQgdGhhdCBpbmNsdWRlcyB0aGUgbGFuZ3VhZ2UgYW5kL29y
IGxvY2FsZSAoZS5nLiAnRW5nbGlzaCBGb3JjZWQnKS4gKi8KICIlQCBGb3JjZWQgKHRleHQgdHJh
Y2spIiA9ICIlQCBGb3JjZWQiOwpAQCAtMTAzLDggKzEwMCw4IEBACiAvKiBQcmVzZW50IHRoZSBl
bGVtZW50IDxzZWxlY3QgbXVsdGlwbGU+IHdoZW4gYSBzaW5nbGUgPG9wdGlvbj4gaXMgc2VsZWN0
ZWQgKGlPUyBvbmx5KSAqLwogIjEgSXRlbSIgPSAiMSBJdGVtIjsKIAotLyogMcOXIG1lZGlhIGNv
bnRyb2xzIGNvbnRleHQgbWVudSBwbGF5YmFjayBzcGVlZCBsYWJlbCAqLwotIjHDlyAoTWVkaWEg
Q29udHJvbHMgTWVudSBQbGF5YmFjayBTcGVlZCkiID0gIjHDlyI7CisvKiBPcHRpb24gaW4gc2Vn
bWVudGVkIGNvbnRyb2wgZm9yIGNob29zaW5nIGxpc3QgdHlwZSBpbiB0ZXh0IGVkaXRpbmcgKi8K
KyIxLiAyLiAzLiIgPSAiMS4gMi4gMy4iOwogCiAvKiAxLjI1w5cgbWVkaWEgY29udHJvbHMgY29u
dGV4dCBtZW51IHBsYXliYWNrIHNwZWVkIGxhYmVsICovCiAiMS4yNcOXIChNZWRpYSBDb250cm9s
cyBNZW51IFBsYXliYWNrIFNwZWVkKSIgPSAiMS4yNcOXIjsKQEAgLTExMiwxNSArMTA5LDE1IEBA
CiAvKiAxLjXDlyBtZWRpYSBjb250cm9scyBjb250ZXh0IG1lbnUgcGxheWJhY2sgc3BlZWQgbGFi
ZWwgKi8KICIxLjXDlyAoTWVkaWEgQ29udHJvbHMgTWVudSBQbGF5YmFjayBTcGVlZCkiID0gIjEu
NcOXIjsKIAotLyogT3B0aW9uIGluIHNlZ21lbnRlZCBjb250cm9sIGZvciBjaG9vc2luZyBsaXN0
IHR5cGUgaW4gdGV4dCBlZGl0aW5nICovCi0iMS4gMi4gMy4iID0gIjEuIDIuIDMuIjsKLQotLyog
MsOXIG1lZGlhIGNvbnRyb2xzIGNvbnRleHQgbWVudSBwbGF5YmFjayBzcGVlZCBsYWJlbCAqLwot
IjLDlyAoTWVkaWEgQ29udHJvbHMgTWVudSBQbGF5YmFjayBTcGVlZCkiID0gIjLDlyI7CisvKiAx
w5cgbWVkaWEgY29udHJvbHMgY29udGV4dCBtZW51IHBsYXliYWNrIHNwZWVkIGxhYmVsICovCisi
McOXIChNZWRpYSBDb250cm9scyBNZW51IFBsYXliYWNrIFNwZWVkKSIgPSAiMcOXIjsKIAogLyog
TWVudSBpdGVtIHRpdGxlIGZvciBLRVlHRU4gcG9wLXVwIG1lbnUgKi8KICIyMDQ4IChIaWdoIEdy
YWRlKSIgPSAiMjA0OCAoSGlnaCBHcmFkZSkiOwogCisvKiAyw5cgbWVkaWEgY29udHJvbHMgY29u
dGV4dCBtZW51IHBsYXliYWNrIHNwZWVkIGxhYmVsICovCisiMsOXIChNZWRpYSBDb250cm9scyBN
ZW51IFBsYXliYWNrIFNwZWVkKSIgPSAiMsOXIjsKKwogLyogTmFtZSBvZiBhcHBsaWNhdGlvbidz
IHNpbmdsZSBXZWJDcnlwdG8gbWFzdGVyIGtleSBpbiBLZXljaGFpbiAqLwogIjxhcHBsaWNhdGlv
bj4gV2ViQ3J5cHRvIE1hc3RlciBLZXkiID0gIjxhcHBsaWNhdGlvbj4gV2ViQ3J5cHRvIE1hc3Rl
ciBLZXkiOwogCkBAIC0xMzAsMTUgKzEyNywxNSBAQAogLyogV0tFcnJvckphdmFTY3JpcHRFeGNl
cHRpb25PY2N1cnJlZCBkZXNjcmlwdGlvbiAqLwogIkEgSmF2YVNjcmlwdCBleGNlcHRpb24gb2Nj
dXJyZWQiID0gIkEgSmF2YVNjcmlwdCBleGNlcHRpb24gb2NjdXJyZWQiOwogCi0vKiBBZGQgdG8g
UXVpY2sgTm90ZSBjb250ZXh0IG1lbnUgaXRlbS4gKi8KLSJBZGQgdG8gUXVpY2sgTm90ZSIgPSAi
QWRkIHRvIFF1aWNrIE5vdGUiOwotCiAvKiBMYWJlbCBmb3IgdGhlIGFkZCBtb25leSB3aXRoIEFw
cGxlIFBheSBidXR0b24uICovCiAiQWRkIG1vbmV5IHdpdGggQXBwbGUgUGF5IiA9ICJBZGQgbW9u
ZXkgd2l0aCBBcHBsZSBQYXkiOwogCiAvKiBUaXRsZSBmb3IgQWRkIHRvIFBob3RvcyBhY3Rpb24g
YnV0dG9uICovCiAiQWRkIHRvIFBob3RvcyIgPSAiQWRkIHRvIFBob3RvcyI7CiAKKy8qIEFkZCB0
byBRdWljayBOb3RlIGNvbnRleHQgbWVudSBpdGVtLiAqLworIkFkZCB0byBRdWljayBOb3RlIiA9
ICJBZGQgdG8gUXVpY2sgTm90ZSI7CisKIC8qIFRpdGxlIGZvciBBZGQgdG8gUmVhZGluZyBMaXN0
IGFjdGlvbiBidXR0b24gKi8KICJBZGQgdG8gUmVhZGluZyBMaXN0IiA9ICJBZGQgdG8gUmVhZGlu
ZyBMaXN0IjsKIApAQCAtMTU3LDI0ICsxNTQsMjQgQEAKIC8qIEFsbG93IGJ1dHRvbiB0aXRsZSBp
biBnZW9sb2NhdGlvbiBwcm9tcHQgKi8KICJBbGxvdyAoZ2VvbG9jYXRpb24pIiA9ICJBbGxvdyI7
CiAKKy8qIEFsbG93IGJ1dHRvbiB0aXRsZSBpbiBzY3JlZW4gc2hhcmluZyBwcm9tcHQgKi8KKyJB
bGxvdyAoc2NyZWVuc2hhcmluZykiID0gIkFsbG93IjsKKwogLyogQWxsb3cgYnV0dG9uIHRpdGxl
IGluIHNwZWVjaCByZWNvZ25pdGlvbiBwcm9tcHQgKi8KICJBbGxvdyAoc3BlZWNocmVjb2duaXRp
b24pIiA9ICJBbGxvdyI7CiAKIC8qIEFsbG93IGJ1dHRvbiB0aXRsZSBpbiB1c2VyIG1lZGlhIHBy
b21wdCAqLwogIkFsbG93ICh1c2VybWVkaWEpIiA9ICJBbGxvdyI7CiAKLS8qIEFsbG93IGJ1dHRv
biB0aXRsZSBpbiBzY3JlZW4gc2hhcmluZyBwcm9tcHQgKi8KLSJBbGxvdyAoc2NyZWVuc2hhcmlu
ZykiID0gIkFsbG93IjsKLQogLyogTWVzc2FnZSBmb3IgcmVxdWVzdGluZyBjcm9zcy1zaXRlIGNv
b2tpZSBhbmQgd2Vic2l0ZSBkYXRhIGFjY2Vzcy4gKi8KICJBbGxvdyDigJwlQOKAnSBhbmQg4oCc
JUDigJ0gdG8gdXNlIGNvb2tpZXMgYW5kIHdlYnNpdGUgZGF0YSB3aGlsZSBicm93c2luZyDigJwl
QOKAnT8iID0gIkFsbG93IOKAnCVA4oCdIGFuZCDigJwlQOKAnSB0byB1c2UgY29va2llcyBhbmQg
d2Vic2l0ZSBkYXRhIHdoaWxlIGJyb3dzaW5nIOKAnCVA4oCdPyI7CiAKLS8qIE1lc3NhZ2UgZm9y
IGdlb2xvY2F0aW9uIHByb21wdCAqLwotIkFsbG93IOKAnCVA4oCdIHRvIHVzZSB5b3VyIGN1cnJl
bnQgbG9jYXRpb24/IiA9ICJBbGxvdyDigJwlQOKAnSB0byB1c2UgeW91ciBjdXJyZW50IGxvY2F0
aW9uPyI7Ci0KIC8qIE1lc3NhZ2UgZm9yIHNwZWNocmVjb2duaXRpb24gcHJvbXB0ICovCiAiQWxs
b3cg4oCcJUDigJ0gdG8gY2FwdHVyZSB5b3VyIGF1ZGlvIGFuZCB1c2UgaXQgZm9yIHNwZWVjaCBy
ZWNvZ25pdGlvbj8iID0gIkFsbG93IOKAnCVA4oCdIHRvIGNhcHR1cmUgeW91ciBhdWRpbyBhbmQg
dXNlIGl0IGZvciBzcGVlY2ggcmVjb2duaXRpb24/IjsKIAorLyogTWVzc2FnZSBmb3Igc2NyZWVu
IHNoYXJpbmcgcHJvbXB0ICovCisiQWxsb3cg4oCcJUDigJ0gdG8gb2JzZXJ2ZSB5b3VyIHNjcmVl
bj8iID0gIkFsbG93IOKAnCVA4oCdIHRvIG9ic2VydmUgeW91ciBzY3JlZW4/IjsKKwogLyogTWVz
c2FnZSBmb3IgcmVxdWVzdGluZyBjcm9zcy1zaXRlIGNvb2tpZSBhbmQgd2Vic2l0ZSBkYXRhIGFj
Y2Vzcy4gKi8KICJBbGxvdyDigJwlQOKAnSB0byB1c2UgY29va2llcyBhbmQgd2Vic2l0ZSBkYXRh
IHdoaWxlIGJyb3dzaW5nIOKAnCVA4oCdPyIgPSAiQWxsb3cg4oCcJUDigJ0gdG8gdXNlIGNvb2tp
ZXMgYW5kIHdlYnNpdGUgZGF0YSB3aGlsZSBicm93c2luZyDigJwlQOKAnT8iOwogCkBAIC0xODQs
MTIgKzE4MSwxMiBAQAogLyogTWVzc2FnZSBmb3IgdXNlciBjYW1lcmEgYWNjZXNzIHByb21wdCAq
LwogIkFsbG93IOKAnCVA4oCdIHRvIHVzZSB5b3VyIGNhbWVyYT8iID0gIkFsbG93IOKAnCVA4oCd
IHRvIHVzZSB5b3VyIGNhbWVyYT8iOwogCisvKiBNZXNzYWdlIGZvciBnZW9sb2NhdGlvbiBwcm9t
cHQgKi8KKyJBbGxvdyDigJwlQOKAnSB0byB1c2UgeW91ciBjdXJyZW50IGxvY2F0aW9uPyIgPSAi
QWxsb3cg4oCcJUDigJ0gdG8gdXNlIHlvdXIgY3VycmVudCBsb2NhdGlvbj8iOworCiAvKiBNZXNz
YWdlIGZvciB1c2VyIG1pY3JvcGhvbmUgYWNjZXNzIHByb21wdCAqLwogIkFsbG93IOKAnCVA4oCd
IHRvIHVzZSB5b3VyIG1pY3JvcGhvbmU/IiA9ICJBbGxvdyDigJwlQOKAnSB0byB1c2UgeW91ciBt
aWNyb3Bob25lPyI7CiAKLS8qIE1lc3NhZ2UgZm9yIHNjcmVlbiBzaGFyaW5nIHByb21wdC4gKi8K
LSJBbGxvdyDigJwlQOKAnSB0byBvYnNlcnZlIHlvdXIgc2NyZWVuPyIgPSAiQWxsb3cg4oCcJUDi
gJ0gdG8gb2JzZXJ2ZSB5b3VyIHNjcmVlbj8iOwotCiAvKiBXS0Vycm9yVW5rbm93biBkZXNjcmlw
dGlvbiAqLwogIkFuIHVua25vd24gZXJyb3Igb2NjdXJyZWQiID0gIkFuIHVua25vd24gZXJyb3Ig
b2NjdXJyZWQiOwogCkBAIC0zOTEsMTUgKzM4OCwxNSBAQAogLyogRGlzYWxsb3cgYnV0dG9uIHRp
dGxlIGluIGdlb2xvY2F0aW9uIHByb21wdCAqLwogIkRvbuKAmXQgQWxsb3cgKGdlb2xvY2F0aW9u
KSIgPSAiRG9u4oCZdCBBbGxvdyI7CiAKKy8qIERpc2FsbG93IGJ1dHRvbiB0aXRsZSBpbiBzY3Jl
ZW4gc2hhcmluZyBwcm9tcHQgKi8KKyJEb27igJl0IEFsbG93IChzY3JlZW5zaGFyaW5nKSIgPSAi
RG9u4oCZdCBBbGxvdyI7CisKIC8qIERpc2FsbG93IGJ1dHRvbiB0aXRsZSBpbiBzcGVlY2ggcmVj
b2duaXRpb24gcHJvbXB0ICovCiAiRG9u4oCZdCBBbGxvdyAoc3BlZWNocmVjb2duaXRpb24pIiA9
ICJEb27igJl0IEFsbG93IjsKIAogLyogRGlzYWxsb3cgYnV0dG9uIHRpdGxlIGluIHVzZXIgbWVk
aWEgcHJvbXB0ICovCiAiRG9u4oCZdCBBbGxvdyAodXNlcm1lZGlhKSIgPSAiRG9u4oCZdCBBbGxv
dyI7CiAKLS8qIERpc2FsbG93IGJ1dHRvbiB0aXRsZSBpbiBzY3JlZW4gc2hhcmluZyBwcm9tcHQg
Ki8KLSJEb27igJl0IEFsbG93IChzY3JlZW5zaGFyaW5nKSIgPSAiRG9u4oCZdCBBbGxvdyI7Ci0K
IC8qIERvd25sb2FkIEF1ZGlvIFRvIERpc2sgY29udGV4dCBtZW51IGl0ZW0gKi8KICJEb3dubG9h
ZCBBdWRpbyIgPSAiRG93bmxvYWQgQXVkaW8iOwogCkBAIC03MzksMTIgKzczNiwxMiBAQAogLyog
TWVkaWEgUGxheSBjb250ZXh0IG1lbnUgaXRlbSAqLwogIlBsYXkiID0gIlBsYXkiOwogCi0vKiBQ
bGF5YmFjayBTcGVlZCBtZWRpYSBjb250cm9scyBjb250ZXh0IG1lbnUgdGl0bGUgKi8KLSJQbGF5
YmFjayBTcGVlZCAoTWVkaWEgQ29udHJvbHMgTWVudSkiID0gIlBsYXliYWNrIFNwZWVkIjsKLQog
LyogYWNjZXNzaWJpbGl0eSBoZWxwIHRleHQgZm9yIGVudGVyIGZ1bGwgc2NyZWVuIGJ1dHRvbiAq
LwogIlBsYXkgbW92aWUgaW4gZnVsbCBzY3JlZW4gbW9kZSIgPSAiUGxheSBtb3ZpZSBpbiBmdWxs
IHNjcmVlbiBtb2RlIjsKIAorLyogUGxheWJhY2sgU3BlZWQgbWVkaWEgY29udHJvbHMgY29udGV4
dCBtZW51IHRpdGxlICovCisiUGxheWJhY2sgU3BlZWQgKE1lZGlhIENvbnRyb2xzIE1lbnUpIiA9
ICJQbGF5YmFjayBTcGVlZCI7CisKIC8qIExhYmVsIHRleHQgdG8gYmUgdXNlZCB3aGVuIGEgcGx1
Zy1pbiB3YXMgYmxvY2tlZCBmcm9tIGxvYWRpbmcgYmVjYXVzZSBpdCB3YXMgdG9vIHNtYWxsICov
CiAiUGx1Zy1JbiB0b28gc21hbGwiID0gIlBsdWctSW4gdG9vIHNtYWxsIjsKIApAQCAtMTA5MCwx
MiArMTA4NywxMiBAQAogLyogVW5kbyBhY3Rpb24gbmFtZSAqLwogIlVuZGVybGluZSAoVW5kbyBh
Y3Rpb24gbmFtZSkiID0gIlVuZGVybGluZSI7CiAKLS8qIFVua25vd24gZmlsZXNpemUgRlRQIGRp
cmVjdG9yeSBsaXN0aW5nIGl0ZW0gKi8KLSJVbmtub3duIChmaWxlc2l6ZSkiID0gIlVua25vd24i
OwotCiAvKiBNZW51IGl0ZW0gbGFiZWwgZm9yIGEgYXVkaW8vdGV4dCB0cmFjayB0aGF0IGhhcyBu
byBvdGhlciBuYW1lLiAqLwogIlVua25vd24gKGF1ZGlvL3RleHQgdHJhY2spIiA9ICJVbmtub3du
IjsKIAorLyogVW5rbm93biBmaWxlc2l6ZSBGVFAgZGlyZWN0b3J5IGxpc3RpbmcgaXRlbSAqLwor
IlVua25vd24gKGZpbGVzaXplKSIgPSAiVW5rbm93biI7CisKIC8qIFVuZG8gYWN0aW9uIG5hbWUg
Ki8KICJVbmxpbmsgKFVuZG8gYWN0aW9uIG5hbWUpIiA9ICJVbmxpbmsiOwogCkBAIC0xNjM5LDYg
KzE2MzYsOSBAQAogLyogTWVzc2FnZSBmb3IgcmVxdWVzdGluZyBhY2Nlc3MgdG8gdGhlIGRldmlj
ZSBtb3Rpb24gYW5kIG9yaWVudGF0aW9uICovCiAi4oCcJUDigJ0gV291bGQgTGlrZSB0byBBY2Nl
c3MgTW90aW9uIGFuZCBPcmllbnRhdGlvbiIgPSAi4oCcJUDigJ0gV291bGQgTGlrZSB0byBBY2Nl
c3MgTW90aW9uIGFuZCBPcmllbnRhdGlvbiI7CiAKKy8qIFRoZSBkb21haW4gYW5kIGFwcGxpY2F0
aW9uIHVzaW5nIHRoZSBjYW1lcmEgYW5kL29yIG1pY3JvcGhvbmUuIFRoZSBmaXJzdCBhcmd1bWVu
dCBpcyBkb21haW4sIHRoZSBzZWNvbmQgaXMgdGhlIGFwcGxpY2F0aW9uIG5hbWUgKGlPUyBvbmx5
KS4gKi8KKyLigJwlQOKAnSBpbiDigJwlJUDigJ0iID0gIuKAnCVA4oCdIGluIOKAnCUlQOKAnSI7
CisKIC8qIEFsbG93IHRoZSBzcGVjaWZpZWQgYnVuZGxlIHRvIHNpZ24gaW4gdG8gdGhlIHNwZWNp
ZmllZCB3ZWJzaXRlICovCiAi4oCcJUDigJ0gd291bGQgbGlrZSB0byBzaWduIGluIHRvIOKAnCVA
4oCdLiIgPSAi4oCcJUDigJ0gd291bGQgbGlrZSB0byBzaWduIGluIHRvIOKAnCVA4oCdLiI7CiAK
QEAgLTE2NDgsNSArMTY0OCwzIEBACiAvKiBPcHRpb24gaW4gc2VnbWVudGVkIGNvbnRyb2wgZm9y
IGNob29zaW5nIGxpc3QgdHlwZSBpbiB0ZXh0IGVkaXRpbmcgKi8KICLigKIiID0gIuKAoiI7CiAK
LS8qIFRoZSBkb21haW4gYW5kIGFwcGxpY2F0aW9uIHVzaW5nIHRoZSBjYW1lcmEgYW5kL29yIG1p
Y3JvcGhvbmUuIFRoZSBmaXJzdCBhcmd1bWVudCBpcyBkb21haW4sIHRoZSBzZWNvbmQgaXMgdGhl
IGFwcGxpY2F0aW9uIG5hbWUgKGlPUyBvbmx5KS4gKi8KLSLigJwlQOKAnSBpbiDigJwlJUDigJ0i
ID0gIuKAnCVA4oCdIGluIOKAnCUlQOKAnSI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xv
Y2FsaXplZFN0cmluZ3MuY3BwCmluZGV4IDA4ZjNiYTNjNzhhNWFlOTFmODdhYWFjMDBiMTljYTlh
N2FiZjJjYmUuLmQzZWNjZTc2ZjU3YWQwY2U3YmYxNDlkZGM3YzlhN2I1ZDllNGI4YTEgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuY3BwCisrKyBi
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuY3BwCkBAIC0xMjQ4LDcg
KzEyNDgsNyBAQCBTdHJpbmcgc25hcHNob3R0ZWRQbHVnSW5MYWJlbFN1YnRpdGxlKCkKIAogU3Ry
aW5nIHVzZUJsb2NrZWRQbHVnSW5Db250ZXh0TWVudVRpdGxlKCkKIHsKLSAgICByZXR1cm4gZm9y
bWF0TG9jYWxpemVkU3RyaW5nKFdFQl9VSV9TVFJJTkcoIlNob3cgaW4gYmxvY2tlZCBwbHVnLWlu
IiwgIlRpdGxlIG9mIHRoZSBjb250ZXh0IG1lbnUgaXRlbSB0byBzaG93IHdoZW4gUERGUGx1Z2lu
IHdhcyB1c2VkIGluc3RlYWQgb2YgYSBibG9ja2VkIHBsdWdpbiIpKTsKKyAgICByZXR1cm4gV0VC
X1VJX1NUUklORygiU2hvdyBpbiBibG9ja2VkIHBsdWctaW4iLCAiVGl0bGUgb2YgdGhlIGNvbnRl
eHQgbWVudSBpdGVtIHRvIHNob3cgd2hlbiBQREZQbHVnaW4gd2FzIHVzZWQgaW5zdGVhZCBvZiBh
IGJsb2NrZWQgcGx1Z2luIik7CiB9CiAKICNpZiBFTkFCTEUoV0VCX0NSWVBUTykKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL0xvY2FsaXplZFN0cmluZ3NDb2NvYS5t
bSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL0xvY2FsaXplZFN0cmluZ3NDb2NvYS5t
bQppbmRleCAxZThmY2RhNzVhODBlNWY0ZDU4MjQwNWRkNTk4YjIwY2FkNmY4MzBlLi5jMTI3ZjIw
ZmQ1MjI3OWU0MzdhNjAzOWEyNTNlYzNlMjY2YWFjOTY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9jb2NvYS9Mb2NhbGl6ZWRTdHJpbmdzQ29jb2EubW0KKysrIGIvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvTG9jYWxpemVkU3RyaW5nc0NvY29hLm1tCkBAIC02MCwx
MiArNjAsMTIgQEAgU3RyaW5nIGNvcHlJbWFnZVVua25vd25GaWxlTGFiZWwoKQogI2lmIEVOQUJM
RShBUFBfSElHSExJR0hUUykKIFN0cmluZyBjb250ZXh0TWVudUl0ZW1UYWdBZGRIaWdobGlnaHRU
b0N1cnJlbnRRdWlja05vdGUoKQogewotICAgIHJldHVybiBsb2NhbGl6ZWROU1N0cmluZyhAIkFk
ZCB0byBRdWljayBOb3RlIik7CisgICAgcmV0dXJuIFdFQl9VSV9TVFJJTkcoIkFkZCB0byBRdWlj
ayBOb3RlIiwgIkFkZCB0byBRdWljayBOb3RlIGNvbnRleHQgbWVudSBpdGVtLiIpOwogfQogCiBT
dHJpbmcgY29udGV4dE1lbnVJdGVtVGFnQWRkSGlnaGxpZ2h0VG9OZXdRdWlja05vdGUoKQogewot
ICAgIHJldHVybiBsb2NhbGl6ZWROU1N0cmluZyhAIk5ldyBRdWljayBOb3RlIik7CisgICAgcmV0
dXJuIFdFQl9VSV9TVFJJTkcoIk5ldyBRdWljayBOb3RlIiwgIk5ldyBRdWljayBOb3RlIGNvbnRl
eHQgbWVudSBpdGVtLiIpOwogfQogI2VuZGlmCiAKQEAgLTI3Nyw3ICsyNzcsNyBAQCBTdHJpbmcg
Zm9ybUNvbnRyb2xEb25lQnV0dG9uVGl0bGUoKQogCiBTdHJpbmcgdmFsaWRhdGlvbk1lc3NhZ2VU
b29Mb25nVGV4dChpbnQsIGludCBtYXhMZW5ndGgpCiB7Ci0gICAgcmV0dXJuIFtOU1N0cmluZyBs
b2NhbGl6ZWRTdHJpbmdXaXRoRm9ybWF0OldFQl9VSV9OU1NUUklORyhAIlVzZSBubyBtb3JlIHRo
YW4gJWQgY2hhcmFjdGVyKHMpIiwgQCJWYWxpZGF0aW9uIG1lc3NhZ2UgZm9yIGZvcm0gY29udHJv
bCBlbGVtZW50cyB3aXRoIGEgdmFsdWUgc2hvcnRlciB0aGFuIG1heGltdW0gYWxsb3dlZCBsZW5n
dGgiKSwgbWF4TGVuZ3RoXTsKKyAgICByZXR1cm4gZm9ybWF0TG9jYWxpemVkU3RyaW5nKFdFQl9V
SV9DRlNUUklORygiVXNlIG5vIG1vcmUgdGhhbiAlZCBjaGFyYWN0ZXIocykiLCAiVmFsaWRhdGlv
biBtZXNzYWdlIGZvciBmb3JtIGNvbnRyb2wgZWxlbWVudHMgd2l0aCBhIHZhbHVlIHNob3J0ZXIg
dGhhbiBtYXhpbXVtIGFsbG93ZWQgbGVuZ3RoIiksIG1heExlbmd0aCk7CiB9CiAKICNpZiBQTEFU
Rk9STShNQUMpCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443143</attachid>
            <date>2021-11-02 16:25:20 -0700</date>
            <delta_ts>2021-11-03 15:07:33 -0700</delta_ts>
            <desc>Patch v2</desc>
            <filename>bug-232642-20211102162519.patch</filename>
            <type>text/plain</type>
            <size>11386</size>
            <attacher name="David Kilzer (:ddkilzer)">ddkilzer</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjk0OTZjYWYyOGI4YzRm
YmEyNGUyMmIyNTRiYWY5NmRlYzFlNzM5Mi4uYmVkYTI1ZmRmZjI4MTBkZDlkMDZhMGVkNjE2NmFk
ODc3NzIzNTA1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIxLTExLTAyICBEYXZp
ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IGNvbnNpc3RlbmN5
IGlzc3VlcyB3aXRoIGxvY2FsaXplZCBzdHJpbmdzIGFuZCByZWdlbmVyYXRlIGxvY2FsaXphYmxl
LnN0cmluZ3MKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIzMjY0Mj4KKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGVuLmxwcm9qL0xvY2Fs
aXphYmxlLnN0cmluZ3M6CisgICAgICAgIC0gUmVnZW5lcmF0ZSB0aGUgZmlsZSB1c2luZyB1cGRh
dGUtd2Via2l0LWxvY2FsaXphYmxlLXN0cmluZ3MuCisgICAgICAgIC0gTGlzdCBvZiBzdHJpbmdz
IHJlYWxwaGFiZXRpemVkLCBleGNlcHQgYXMgbm90ZWQgYmVsb3cuCisgICAgICAgICgiJUAgKCVA
IEludGVybmV0IHBsdWctaW4pIik6IERlbGV0ZS4KKyAgICAgICAgLSBSZW1vdmVkIGluIHIyODUw
NDcgZm9yIEJ1ZyAyMzI0NjIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdz
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmFkZFRleHRUcmFja0tpbmRFYXN5UmVhZGVyU3VmZml4
KToKKyAgICAgICAgLSBGaXggdW5sb2NhbGl6ZWQgc3RyaW5nIHRoYXQgcmVncmVzc2VkIGluIHIy
NzgyMDIgZm9yCisgICAgICAgICAgQnVnIDIyNjM2MS4KKyAgICAgICAgKFdlYkNvcmU6OnVzZUJs
b2NrZWRQbHVnSW5Db250ZXh0TWVudVRpdGxlKToKKyAgICAgICAgLSBSZW1vdmUgdW5uZWVkZWQg
Y2FsbCB0byBXZWJDb3JlOjpmb3JtYXRMb2NhbGl6ZWRTdHJpbmcoKSBzaW5jZQorICAgICAgICAg
IHRoZXJlIGFyZSBubyBwbGFjZWhvbGRlcnMgdG8gcmVwbGFjZS4KKworICAgICAgICAqIHBsYXRm
b3JtL2NvY29hL0xvY2FsaXplZFN0cmluZ3NDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6OmNv
bnRleHRNZW51SXRlbVRhZ1NlYXJjaFdlYik6CisgICAgICAgIChXZWJDb3JlOjpjb250ZXh0TWVu
dUl0ZW1UYWdTaG93Rm9udHMpOgorICAgICAgICAtIFN3aXRjaCBmcm9tIGNhbGxpbmcgV2ViQ29y
ZTo6bG9jYWxpemVkTlNTdHJpbmcoKSBkaXJlY3RseSB0bworICAgICAgICAgIHVzaW5nIFdFQl9V
SV9OU1NUUklORygpIHNvIHRoZXNlIHN0cmluZ3Mgd2lsbCBiZSBmb3VuZCBieQorICAgICAgICAg
IHVwZGF0ZS13ZWJraXQtbG9jYWxpemFibGUtc3RyaW5ncy4KKwogMjAyMS0xMS0wMiAgQW50dGkg
S29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d
IFByb3ZpZGUgYmlkaSBwcm9wZXJ0aWVzIHdoZW4gY29uc3RydWN0aW5nIFRleHRSdW4KZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VuLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MgYi9Tb3Vy
Y2UvV2ViQ29yZS9lbi5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCmluZGV4IGEwNTlkN2JiMmUw
YmFmM2IyMDBmOTRmZjcxMjMwMjljODA5ZGI2NDcuLmFjNzQ1MzI2ZDcyYWNmMGRlYWRlY2VjZGUy
MTgwNTc5YjZiZmFiNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VuLmxwcm9qL0xvY2Fs
aXphYmxlLnN0cmluZ3MKKysrIGIvU291cmNlL1dlYkNvcmUvZW4ubHByb2ovTG9jYWxpemFibGUu
c3RyaW5ncwpAQCAtMTMsOSArMTMsNiBAQAogLyogd2luZG93IHRpdGxlIGZvciBhIHN0YW5kYWxv
bmUgaW1hZ2UgKHVzZXMgbXVsdGlwbGljYXRpb24gc3ltYm9sLCBub3QgeCkgKi8KICIlQCAlQMOX
JUAgcGl4ZWxzIiA9ICIlQCAlQMOXJUAgcGl4ZWxzIjsKIAotLyogdmlzaWJsZSBuYW1lIG9mIHRo
ZSBwbHVnLWluIGhvc3QgcHJvY2Vzcy4gVGhlIGZpcnN0IGFyZ3VtZW50IGlzIHRoZSBwbHVnLWlu
IG5hbWUgYW5kIHRoZSBzZWNvbmQgYXJndW1lbnQgaXMgdGhlIGFwcGxpY2F0aW9uIG5hbWUuICov
Ci0iJUAgKCVAIEludGVybmV0IHBsdWctaW4pIiA9ICIlQCAoJUAgSW50ZXJuZXQgcGx1Zy1pbiki
OwotCiAvKiBBdWRpby9UZXh0IHRyYWNrIGRpc3BsYXkgbmFtZSBmb3JtYXQgdGhhdCBpbmNsdWRl
cyB0aGUgbGFiZWwgYW5kIGxhbmd1YWdlIG9mIHRoZSB0cmFjaywgaW4gdGhlIGZvcm0gb2YgJ0xh
bmd1YWdlIChMYWJlbCknLiAqLwogIiVAICglQCkgKGF1ZGlvL3RleHQgdHJhY2spIiA9ICIlQCAo
JUApIjsKIApAQCAtMTAzLDggKzEwMCw4IEBACiAvKiBQcmVzZW50IHRoZSBlbGVtZW50IDxzZWxl
Y3QgbXVsdGlwbGU+IHdoZW4gYSBzaW5nbGUgPG9wdGlvbj4gaXMgc2VsZWN0ZWQgKGlPUyBvbmx5
KSAqLwogIjEgSXRlbSIgPSAiMSBJdGVtIjsKIAotLyogMcOXIG1lZGlhIGNvbnRyb2xzIGNvbnRl
eHQgbWVudSBwbGF5YmFjayBzcGVlZCBsYWJlbCAqLwotIjHDlyAoTWVkaWEgQ29udHJvbHMgTWVu
dSBQbGF5YmFjayBTcGVlZCkiID0gIjHDlyI7CisvKiBPcHRpb24gaW4gc2VnbWVudGVkIGNvbnRy
b2wgZm9yIGNob29zaW5nIGxpc3QgdHlwZSBpbiB0ZXh0IGVkaXRpbmcgKi8KKyIxLiAyLiAzLiIg
PSAiMS4gMi4gMy4iOwogCiAvKiAxLjI1w5cgbWVkaWEgY29udHJvbHMgY29udGV4dCBtZW51IHBs
YXliYWNrIHNwZWVkIGxhYmVsICovCiAiMS4yNcOXIChNZWRpYSBDb250cm9scyBNZW51IFBsYXli
YWNrIFNwZWVkKSIgPSAiMS4yNcOXIjsKQEAgLTExMiwxNSArMTA5LDE1IEBACiAvKiAxLjXDlyBt
ZWRpYSBjb250cm9scyBjb250ZXh0IG1lbnUgcGxheWJhY2sgc3BlZWQgbGFiZWwgKi8KICIxLjXD
lyAoTWVkaWEgQ29udHJvbHMgTWVudSBQbGF5YmFjayBTcGVlZCkiID0gIjEuNcOXIjsKIAotLyog
T3B0aW9uIGluIHNlZ21lbnRlZCBjb250cm9sIGZvciBjaG9vc2luZyBsaXN0IHR5cGUgaW4gdGV4
dCBlZGl0aW5nICovCi0iMS4gMi4gMy4iID0gIjEuIDIuIDMuIjsKLQotLyogMsOXIG1lZGlhIGNv
bnRyb2xzIGNvbnRleHQgbWVudSBwbGF5YmFjayBzcGVlZCBsYWJlbCAqLwotIjLDlyAoTWVkaWEg
Q29udHJvbHMgTWVudSBQbGF5YmFjayBTcGVlZCkiID0gIjLDlyI7CisvKiAxw5cgbWVkaWEgY29u
dHJvbHMgY29udGV4dCBtZW51IHBsYXliYWNrIHNwZWVkIGxhYmVsICovCisiMcOXIChNZWRpYSBD
b250cm9scyBNZW51IFBsYXliYWNrIFNwZWVkKSIgPSAiMcOXIjsKIAogLyogTWVudSBpdGVtIHRp
dGxlIGZvciBLRVlHRU4gcG9wLXVwIG1lbnUgKi8KICIyMDQ4IChIaWdoIEdyYWRlKSIgPSAiMjA0
OCAoSGlnaCBHcmFkZSkiOwogCisvKiAyw5cgbWVkaWEgY29udHJvbHMgY29udGV4dCBtZW51IHBs
YXliYWNrIHNwZWVkIGxhYmVsICovCisiMsOXIChNZWRpYSBDb250cm9scyBNZW51IFBsYXliYWNr
IFNwZWVkKSIgPSAiMsOXIjsKKwogLyogTmFtZSBvZiBhcHBsaWNhdGlvbidzIHNpbmdsZSBXZWJD
cnlwdG8gbWFzdGVyIGtleSBpbiBLZXljaGFpbiAqLwogIjxhcHBsaWNhdGlvbj4gV2ViQ3J5cHRv
IE1hc3RlciBLZXkiID0gIjxhcHBsaWNhdGlvbj4gV2ViQ3J5cHRvIE1hc3RlciBLZXkiOwogCkBA
IC0xMzAsMTUgKzEyNywxNSBAQAogLyogV0tFcnJvckphdmFTY3JpcHRFeGNlcHRpb25PY2N1cnJl
ZCBkZXNjcmlwdGlvbiAqLwogIkEgSmF2YVNjcmlwdCBleGNlcHRpb24gb2NjdXJyZWQiID0gIkEg
SmF2YVNjcmlwdCBleGNlcHRpb24gb2NjdXJyZWQiOwogCi0vKiBBZGQgdG8gUXVpY2sgTm90ZSBj
b250ZXh0IG1lbnUgaXRlbS4gKi8KLSJBZGQgdG8gUXVpY2sgTm90ZSIgPSAiQWRkIHRvIFF1aWNr
IE5vdGUiOwotCiAvKiBMYWJlbCBmb3IgdGhlIGFkZCBtb25leSB3aXRoIEFwcGxlIFBheSBidXR0
b24uICovCiAiQWRkIG1vbmV5IHdpdGggQXBwbGUgUGF5IiA9ICJBZGQgbW9uZXkgd2l0aCBBcHBs
ZSBQYXkiOwogCiAvKiBUaXRsZSBmb3IgQWRkIHRvIFBob3RvcyBhY3Rpb24gYnV0dG9uICovCiAi
QWRkIHRvIFBob3RvcyIgPSAiQWRkIHRvIFBob3RvcyI7CiAKKy8qIEFkZCB0byBRdWljayBOb3Rl
IGNvbnRleHQgbWVudSBpdGVtLiAqLworIkFkZCB0byBRdWljayBOb3RlIiA9ICJBZGQgdG8gUXVp
Y2sgTm90ZSI7CisKIC8qIFRpdGxlIGZvciBBZGQgdG8gUmVhZGluZyBMaXN0IGFjdGlvbiBidXR0
b24gKi8KICJBZGQgdG8gUmVhZGluZyBMaXN0IiA9ICJBZGQgdG8gUmVhZGluZyBMaXN0IjsKIApA
QCAtMTU3LDI0ICsxNTQsMjQgQEAKIC8qIEFsbG93IGJ1dHRvbiB0aXRsZSBpbiBnZW9sb2NhdGlv
biBwcm9tcHQgKi8KICJBbGxvdyAoZ2VvbG9jYXRpb24pIiA9ICJBbGxvdyI7CiAKKy8qIEFsbG93
IGJ1dHRvbiB0aXRsZSBpbiBzY3JlZW4gc2hhcmluZyBwcm9tcHQgKi8KKyJBbGxvdyAoc2NyZWVu
c2hhcmluZykiID0gIkFsbG93IjsKKwogLyogQWxsb3cgYnV0dG9uIHRpdGxlIGluIHNwZWVjaCBy
ZWNvZ25pdGlvbiBwcm9tcHQgKi8KICJBbGxvdyAoc3BlZWNocmVjb2duaXRpb24pIiA9ICJBbGxv
dyI7CiAKIC8qIEFsbG93IGJ1dHRvbiB0aXRsZSBpbiB1c2VyIG1lZGlhIHByb21wdCAqLwogIkFs
bG93ICh1c2VybWVkaWEpIiA9ICJBbGxvdyI7CiAKLS8qIEFsbG93IGJ1dHRvbiB0aXRsZSBpbiBz
Y3JlZW4gc2hhcmluZyBwcm9tcHQgKi8KLSJBbGxvdyAoc2NyZWVuc2hhcmluZykiID0gIkFsbG93
IjsKLQogLyogTWVzc2FnZSBmb3IgcmVxdWVzdGluZyBjcm9zcy1zaXRlIGNvb2tpZSBhbmQgd2Vi
c2l0ZSBkYXRhIGFjY2Vzcy4gKi8KICJBbGxvdyDigJwlQOKAnSBhbmQg4oCcJUDigJ0gdG8gdXNl
IGNvb2tpZXMgYW5kIHdlYnNpdGUgZGF0YSB3aGlsZSBicm93c2luZyDigJwlQOKAnT8iID0gIkFs
bG93IOKAnCVA4oCdIGFuZCDigJwlQOKAnSB0byB1c2UgY29va2llcyBhbmQgd2Vic2l0ZSBkYXRh
IHdoaWxlIGJyb3dzaW5nIOKAnCVA4oCdPyI7CiAKLS8qIE1lc3NhZ2UgZm9yIGdlb2xvY2F0aW9u
IHByb21wdCAqLwotIkFsbG93IOKAnCVA4oCdIHRvIHVzZSB5b3VyIGN1cnJlbnQgbG9jYXRpb24/
IiA9ICJBbGxvdyDigJwlQOKAnSB0byB1c2UgeW91ciBjdXJyZW50IGxvY2F0aW9uPyI7Ci0KIC8q
IE1lc3NhZ2UgZm9yIHNwZWNocmVjb2duaXRpb24gcHJvbXB0ICovCiAiQWxsb3cg4oCcJUDigJ0g
dG8gY2FwdHVyZSB5b3VyIGF1ZGlvIGFuZCB1c2UgaXQgZm9yIHNwZWVjaCByZWNvZ25pdGlvbj8i
ID0gIkFsbG93IOKAnCVA4oCdIHRvIGNhcHR1cmUgeW91ciBhdWRpbyBhbmQgdXNlIGl0IGZvciBz
cGVlY2ggcmVjb2duaXRpb24/IjsKIAorLyogTWVzc2FnZSBmb3Igc2NyZWVuIHNoYXJpbmcgcHJv
bXB0ICovCisiQWxsb3cg4oCcJUDigJ0gdG8gb2JzZXJ2ZSB5b3VyIHNjcmVlbj8iID0gIkFsbG93
IOKAnCVA4oCdIHRvIG9ic2VydmUgeW91ciBzY3JlZW4/IjsKKwogLyogTWVzc2FnZSBmb3IgcmVx
dWVzdGluZyBjcm9zcy1zaXRlIGNvb2tpZSBhbmQgd2Vic2l0ZSBkYXRhIGFjY2Vzcy4gKi8KICJB
bGxvdyDigJwlQOKAnSB0byB1c2UgY29va2llcyBhbmQgd2Vic2l0ZSBkYXRhIHdoaWxlIGJyb3dz
aW5nIOKAnCVA4oCdPyIgPSAiQWxsb3cg4oCcJUDigJ0gdG8gdXNlIGNvb2tpZXMgYW5kIHdlYnNp
dGUgZGF0YSB3aGlsZSBicm93c2luZyDigJwlQOKAnT8iOwogCkBAIC0xODQsMTIgKzE4MSwxMiBA
QAogLyogTWVzc2FnZSBmb3IgdXNlciBjYW1lcmEgYWNjZXNzIHByb21wdCAqLwogIkFsbG93IOKA
nCVA4oCdIHRvIHVzZSB5b3VyIGNhbWVyYT8iID0gIkFsbG93IOKAnCVA4oCdIHRvIHVzZSB5b3Vy
IGNhbWVyYT8iOwogCisvKiBNZXNzYWdlIGZvciBnZW9sb2NhdGlvbiBwcm9tcHQgKi8KKyJBbGxv
dyDigJwlQOKAnSB0byB1c2UgeW91ciBjdXJyZW50IGxvY2F0aW9uPyIgPSAiQWxsb3cg4oCcJUDi
gJ0gdG8gdXNlIHlvdXIgY3VycmVudCBsb2NhdGlvbj8iOworCiAvKiBNZXNzYWdlIGZvciB1c2Vy
IG1pY3JvcGhvbmUgYWNjZXNzIHByb21wdCAqLwogIkFsbG93IOKAnCVA4oCdIHRvIHVzZSB5b3Vy
IG1pY3JvcGhvbmU/IiA9ICJBbGxvdyDigJwlQOKAnSB0byB1c2UgeW91ciBtaWNyb3Bob25lPyI7
CiAKLS8qIE1lc3NhZ2UgZm9yIHNjcmVlbiBzaGFyaW5nIHByb21wdC4gKi8KLSJBbGxvdyDigJwl
QOKAnSB0byBvYnNlcnZlIHlvdXIgc2NyZWVuPyIgPSAiQWxsb3cg4oCcJUDigJ0gdG8gb2JzZXJ2
ZSB5b3VyIHNjcmVlbj8iOwotCiAvKiBXS0Vycm9yVW5rbm93biBkZXNjcmlwdGlvbiAqLwogIkFu
IHVua25vd24gZXJyb3Igb2NjdXJyZWQiID0gIkFuIHVua25vd24gZXJyb3Igb2NjdXJyZWQiOwog
CkBAIC0zOTEsMTUgKzM4OCwxNSBAQAogLyogRGlzYWxsb3cgYnV0dG9uIHRpdGxlIGluIGdlb2xv
Y2F0aW9uIHByb21wdCAqLwogIkRvbuKAmXQgQWxsb3cgKGdlb2xvY2F0aW9uKSIgPSAiRG9u4oCZ
dCBBbGxvdyI7CiAKKy8qIERpc2FsbG93IGJ1dHRvbiB0aXRsZSBpbiBzY3JlZW4gc2hhcmluZyBw
cm9tcHQgKi8KKyJEb27igJl0IEFsbG93IChzY3JlZW5zaGFyaW5nKSIgPSAiRG9u4oCZdCBBbGxv
dyI7CisKIC8qIERpc2FsbG93IGJ1dHRvbiB0aXRsZSBpbiBzcGVlY2ggcmVjb2duaXRpb24gcHJv
bXB0ICovCiAiRG9u4oCZdCBBbGxvdyAoc3BlZWNocmVjb2duaXRpb24pIiA9ICJEb27igJl0IEFs
bG93IjsKIAogLyogRGlzYWxsb3cgYnV0dG9uIHRpdGxlIGluIHVzZXIgbWVkaWEgcHJvbXB0ICov
CiAiRG9u4oCZdCBBbGxvdyAodXNlcm1lZGlhKSIgPSAiRG9u4oCZdCBBbGxvdyI7CiAKLS8qIERp
c2FsbG93IGJ1dHRvbiB0aXRsZSBpbiBzY3JlZW4gc2hhcmluZyBwcm9tcHQgKi8KLSJEb27igJl0
IEFsbG93IChzY3JlZW5zaGFyaW5nKSIgPSAiRG9u4oCZdCBBbGxvdyI7Ci0KIC8qIERvd25sb2Fk
IEF1ZGlvIFRvIERpc2sgY29udGV4dCBtZW51IGl0ZW0gKi8KICJEb3dubG9hZCBBdWRpbyIgPSAi
RG93bmxvYWQgQXVkaW8iOwogCkBAIC03MzksMTIgKzczNiwxMiBAQAogLyogTWVkaWEgUGxheSBj
b250ZXh0IG1lbnUgaXRlbSAqLwogIlBsYXkiID0gIlBsYXkiOwogCi0vKiBQbGF5YmFjayBTcGVl
ZCBtZWRpYSBjb250cm9scyBjb250ZXh0IG1lbnUgdGl0bGUgKi8KLSJQbGF5YmFjayBTcGVlZCAo
TWVkaWEgQ29udHJvbHMgTWVudSkiID0gIlBsYXliYWNrIFNwZWVkIjsKLQogLyogYWNjZXNzaWJp
bGl0eSBoZWxwIHRleHQgZm9yIGVudGVyIGZ1bGwgc2NyZWVuIGJ1dHRvbiAqLwogIlBsYXkgbW92
aWUgaW4gZnVsbCBzY3JlZW4gbW9kZSIgPSAiUGxheSBtb3ZpZSBpbiBmdWxsIHNjcmVlbiBtb2Rl
IjsKIAorLyogUGxheWJhY2sgU3BlZWQgbWVkaWEgY29udHJvbHMgY29udGV4dCBtZW51IHRpdGxl
ICovCisiUGxheWJhY2sgU3BlZWQgKE1lZGlhIENvbnRyb2xzIE1lbnUpIiA9ICJQbGF5YmFjayBT
cGVlZCI7CisKIC8qIExhYmVsIHRleHQgdG8gYmUgdXNlZCB3aGVuIGEgcGx1Zy1pbiB3YXMgYmxv
Y2tlZCBmcm9tIGxvYWRpbmcgYmVjYXVzZSBpdCB3YXMgdG9vIHNtYWxsICovCiAiUGx1Zy1JbiB0
b28gc21hbGwiID0gIlBsdWctSW4gdG9vIHNtYWxsIjsKIApAQCAtMTA5MCwxMiArMTA4NywxMiBA
QAogLyogVW5kbyBhY3Rpb24gbmFtZSAqLwogIlVuZGVybGluZSAoVW5kbyBhY3Rpb24gbmFtZSki
ID0gIlVuZGVybGluZSI7CiAKLS8qIFVua25vd24gZmlsZXNpemUgRlRQIGRpcmVjdG9yeSBsaXN0
aW5nIGl0ZW0gKi8KLSJVbmtub3duIChmaWxlc2l6ZSkiID0gIlVua25vd24iOwotCiAvKiBNZW51
IGl0ZW0gbGFiZWwgZm9yIGEgYXVkaW8vdGV4dCB0cmFjayB0aGF0IGhhcyBubyBvdGhlciBuYW1l
LiAqLwogIlVua25vd24gKGF1ZGlvL3RleHQgdHJhY2spIiA9ICJVbmtub3duIjsKIAorLyogVW5r
bm93biBmaWxlc2l6ZSBGVFAgZGlyZWN0b3J5IGxpc3RpbmcgaXRlbSAqLworIlVua25vd24gKGZp
bGVzaXplKSIgPSAiVW5rbm93biI7CisKIC8qIFVuZG8gYWN0aW9uIG5hbWUgKi8KICJVbmxpbmsg
KFVuZG8gYWN0aW9uIG5hbWUpIiA9ICJVbmxpbmsiOwogCkBAIC0xNjM5LDYgKzE2MzYsOSBAQAog
LyogTWVzc2FnZSBmb3IgcmVxdWVzdGluZyBhY2Nlc3MgdG8gdGhlIGRldmljZSBtb3Rpb24gYW5k
IG9yaWVudGF0aW9uICovCiAi4oCcJUDigJ0gV291bGQgTGlrZSB0byBBY2Nlc3MgTW90aW9uIGFu
ZCBPcmllbnRhdGlvbiIgPSAi4oCcJUDigJ0gV291bGQgTGlrZSB0byBBY2Nlc3MgTW90aW9uIGFu
ZCBPcmllbnRhdGlvbiI7CiAKKy8qIFRoZSBkb21haW4gYW5kIGFwcGxpY2F0aW9uIHVzaW5nIHRo
ZSBjYW1lcmEgYW5kL29yIG1pY3JvcGhvbmUuIFRoZSBmaXJzdCBhcmd1bWVudCBpcyBkb21haW4s
IHRoZSBzZWNvbmQgaXMgdGhlIGFwcGxpY2F0aW9uIG5hbWUgKGlPUyBvbmx5KS4gKi8KKyLigJwl
QOKAnSBpbiDigJwlJUDigJ0iID0gIuKAnCVA4oCdIGluIOKAnCUlQOKAnSI7CisKIC8qIEFsbG93
IHRoZSBzcGVjaWZpZWQgYnVuZGxlIHRvIHNpZ24gaW4gdG8gdGhlIHNwZWNpZmllZCB3ZWJzaXRl
ICovCiAi4oCcJUDigJ0gd291bGQgbGlrZSB0byBzaWduIGluIHRvIOKAnCVA4oCdLiIgPSAi4oCc
JUDigJ0gd291bGQgbGlrZSB0byBzaWduIGluIHRvIOKAnCVA4oCdLiI7CiAKQEAgLTE2NDgsNSAr
MTY0OCwzIEBACiAvKiBPcHRpb24gaW4gc2VnbWVudGVkIGNvbnRyb2wgZm9yIGNob29zaW5nIGxp
c3QgdHlwZSBpbiB0ZXh0IGVkaXRpbmcgKi8KICLigKIiID0gIuKAoiI7CiAKLS8qIFRoZSBkb21h
aW4gYW5kIGFwcGxpY2F0aW9uIHVzaW5nIHRoZSBjYW1lcmEgYW5kL29yIG1pY3JvcGhvbmUuIFRo
ZSBmaXJzdCBhcmd1bWVudCBpcyBkb21haW4sIHRoZSBzZWNvbmQgaXMgdGhlIGFwcGxpY2F0aW9u
IG5hbWUgKGlPUyBvbmx5KS4gKi8KLSLigJwlQOKAnSBpbiDigJwlJUDigJ0iID0gIuKAnCVA4oCd
IGluIOKAnCUlQOKAnSI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2Nh
bGl6ZWRTdHJpbmdzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmlu
Z3MuY3BwCmluZGV4IDA4ZjNiYTNjNzhhNWFlOTFmODdhYWFjMDBiMTljYTlhN2FiZjJjYmUuLjEx
NzNlZjZhMWIyODczOGYxMDExMGFiMGM3Mzg5YWVhZjU4NDFjNjQgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuY3BwCkBAIC0xMTkzLDcgKzExOTMsNyBAQCBT
dHJpbmcgYWRkVGV4dFRyYWNrS2luZEVhc3lSZWFkZXJTdWZmaXgoY29uc3QgU3RyaW5nJiB0ZXh0
KQogewogICAgIGlmICh0ZXh0LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIHRleHRUcmFja0tp
bmRFYXN5UmVhZGVyRGlzcGxheU5hbWUoKTsKLSAgICByZXR1cm4gZm9ybWF0TG9jYWxpemVkU3Ry
aW5nKFdFQl9VSV9DRlNUUklOR19LRVkoIiVAIEVhc3kgUmVhZGVyIiwgIiVAIEVhc3kgKHRleHQg
dHJhY2spIiwgIkVhc3kgUmVhZGVyIChpLmUuIDNyZC1ncmFkZSBsZXZlbCkgdGV4dCB0cmFjayBk
aXNwbGF5IG5hbWUgZm9ybWF0IHRoYXQgaW5jbHVkZXMgdGhlIGxhbmd1YWdlIGFuZC9vciBsb2Nh
bGUgKGUuZy4gJ0VuZ2xpc2ggRWFzeSBSZWFkZXInKS4iKSwgdGV4dC5jcmVhdGVDRlN0cmluZygp
LmdldCgpKTsKKyAgICByZXR1cm4gZm9ybWF0TG9jYWxpemVkU3RyaW5nKFdFQl9VSV9DRlNUUklO
R19LRVkoIiVAIEVhc3kgUmVhZGVyIiwgIiVAIEVhc3kgUmVhZGVyICh0ZXh0IHRyYWNrKSIsICJF
YXN5IFJlYWRlciAoaS5lLiAzcmQtZ3JhZGUgbGV2ZWwpIHRleHQgdHJhY2sgZGlzcGxheSBuYW1l
IGZvcm1hdCB0aGF0IGluY2x1ZGVzIHRoZSBsYW5ndWFnZSBhbmQvb3IgbG9jYWxlIChlLmcuICdF
bmdsaXNoIEVhc3kgUmVhZGVyJykuIiksIHRleHQuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSk7CiB9
CiAKIFN0cmluZyB0ZXh0VHJhY2tLaW5kRm9yY2VkRGlzcGxheU5hbWUoKQpAQCAtMTI0OCw3ICsx
MjQ4LDcgQEAgU3RyaW5nIHNuYXBzaG90dGVkUGx1Z0luTGFiZWxTdWJ0aXRsZSgpCiAKIFN0cmlu
ZyB1c2VCbG9ja2VkUGx1Z0luQ29udGV4dE1lbnVUaXRsZSgpCiB7Ci0gICAgcmV0dXJuIGZvcm1h
dExvY2FsaXplZFN0cmluZyhXRUJfVUlfU1RSSU5HKCJTaG93IGluIGJsb2NrZWQgcGx1Zy1pbiIs
ICJUaXRsZSBvZiB0aGUgY29udGV4dCBtZW51IGl0ZW0gdG8gc2hvdyB3aGVuIFBERlBsdWdpbiB3
YXMgdXNlZCBpbnN0ZWFkIG9mIGEgYmxvY2tlZCBwbHVnaW4iKSk7CisgICAgcmV0dXJuIFdFQl9V
SV9TVFJJTkcoIlNob3cgaW4gYmxvY2tlZCBwbHVnLWluIiwgIlRpdGxlIG9mIHRoZSBjb250ZXh0
IG1lbnUgaXRlbSB0byBzaG93IHdoZW4gUERGUGx1Z2luIHdhcyB1c2VkIGluc3RlYWQgb2YgYSBi
bG9ja2VkIHBsdWdpbiIpOwogfQogCiAjaWYgRU5BQkxFKFdFQl9DUllQVE8pCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9Mb2NhbGl6ZWRTdHJpbmdzQ29jb2EubW0g
Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9Mb2NhbGl6ZWRTdHJpbmdzQ29jb2EubW0K
aW5kZXggMWU4ZmNkYTc1YTgwZTVmNGQ1ODI0MDVkZDU5OGIyMGNhZDZmODMwZS4uZmMzNmJmY2Ey
NWYwMzBiOWY4MjljMjRiNWI5NWVmMjZkMmE0YTBmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vY29jb2EvTG9jYWxpemVkU3RyaW5nc0NvY29hLm1tCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2NvY29hL0xvY2FsaXplZFN0cmluZ3NDb2NvYS5tbQpAQCAtNTcsMTUg
KzU3LDE2IEBAIFN0cmluZyBjb3B5SW1hZ2VVbmtub3duRmlsZUxhYmVsKCkKIHsKICAgICByZXR1
cm4gV0VCX1VJX1NUUklORygidW5rbm93biIsICJVbmtub3duIGZpbGVuYW1lIik7CiB9CisKICNp
ZiBFTkFCTEUoQVBQX0hJR0hMSUdIVFMpCiBTdHJpbmcgY29udGV4dE1lbnVJdGVtVGFnQWRkSGln
aGxpZ2h0VG9DdXJyZW50UXVpY2tOb3RlKCkKIHsKLSAgICByZXR1cm4gbG9jYWxpemVkTlNTdHJp
bmcoQCJBZGQgdG8gUXVpY2sgTm90ZSIpOworICAgIHJldHVybiBXRUJfVUlfTlNTVFJJTkcoQCJB
ZGQgdG8gUXVpY2sgTm90ZSIsICJBZGQgdG8gUXVpY2sgTm90ZSBjb250ZXh0IG1lbnUgaXRlbS4i
KTsKIH0KIAogU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ0FkZEhpZ2hsaWdodFRvTmV3UXVpY2tO
b3RlKCkKIHsKLSAgICByZXR1cm4gbG9jYWxpemVkTlNTdHJpbmcoQCJOZXcgUXVpY2sgTm90ZSIp
OworICAgIHJldHVybiBXRUJfVUlfTlNTVFJJTkcoQCJOZXcgUXVpY2sgTm90ZSIsICJOZXcgUXVp
Y2sgTm90ZSBjb250ZXh0IG1lbnUgaXRlbS4iKTsKIH0KICNlbmRpZgogCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>