<?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>228581</bug_id>
          
          <creation_ts>2021-07-29 04:56:30 -0700</creation_ts>
          <short_desc>[CMake] Use an imported target for the libgcrypt library</short_desc>
          <delta_ts>2021-07-30 01:29:40 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>CMake</component>
          <version>WebKit Local Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          <dependson>228609</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Adrian Perez">aperez</reporter>
          <assigned_to name="Adrian Perez">aperez</assigned_to>
          <cc>annulen</cc>
    
    <cc>cgarcia</cc>
    
    <cc>clopez</cc>
    
    <cc>don.olmstead</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>fujii</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>lmoura</cc>
    
    <cc>mcatanzaro</cc>
    
    <cc>pnormand</cc>
    
    <cc>ryuan.choi</cc>
    
    <cc>sergio</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1780358</commentid>
    <comment_count>0</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2021-07-29 04:56:30 -0700</bug_when>
    <thetext>SSIA ^_^</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780359</commentid>
    <comment_count>1</comment_count>
      <attachid>434515</attachid>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2021-07-29 05:02:47 -0700</bug_when>
    <thetext>Created attachment 434515
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780360</commentid>
    <comment_count>2</comment_count>
      <attachid>434516</attachid>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2021-07-29 05:21:26 -0700</bug_when>
    <thetext>Created attachment 434516
Patch v2</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780375</commentid>
    <comment_count>3</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-07-29 08:16:09 -0700</bug_when>
    <thetext>Committed r280423 (240063@main): &lt;https://commits.webkit.org/240063@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 434516.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780461</commentid>
    <comment_count>4</comment_count>
    <who name="Lauro Moura">lmoura</who>
    <bug_when>2021-07-29 11:21:00 -0700</bug_when>
    <thetext>Reopening for debug build fixes regarding gpg-error not being pulled as dependency automatically by libgcrypt.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780509</commentid>
    <comment_count>5</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2021-07-29 12:24:49 -0700</bug_when>
    <thetext>(In reply to Lauro Moura from comment #4)
&gt; Reopening for debug build fixes regarding gpg-error not being pulled as
&gt; dependency automatically by libgcrypt.

Gah! I assumed that libgcrypt.pc would list gpg-error as a dependency,
but it does not — which is what manually adding -lgpg-error was
workarounding.

I will submit a patch adding also a LibGcrypt::GpgError imported target
and make LibGcrypt::LibGcrypt depend on it :|</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780517</commentid>
    <comment_count>6</comment_count>
      <attachid>434559</attachid>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2021-07-29 12:50:15 -0700</bug_when>
    <thetext>Created attachment 434559
Follow-up Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780524</commentid>
    <comment_count>7</comment_count>
    <who name="Carlos Alberto Lopez Perez">clopez</who>
    <bug_when>2021-07-29 13:04:50 -0700</bug_when>
    <thetext>Build failure here: https://build.webkit.org/#/builders/43/builds/3684</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780674</commentid>
    <comment_count>8</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-07-29 18:44:58 -0700</bug_when>
    <thetext>Committed r280461 (240096@main): &lt;https://commits.webkit.org/240096@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 434559.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780695</commentid>
    <comment_count>9</comment_count>
    <who name="Carlos Alberto Lopez Perez">clopez</who>
    <bug_when>2021-07-29 21:04:03 -0700</bug_when>
    <thetext>I&apos;m afraid we would have to revert this, or at least modify it to not rely on the pkg-config files


After r280423 is not longer possible to build WebKit on Debian 10.

See the failure on our bot: https://build.webkit.org/#/builders/46/builds/5192

I can reproduce this on buildbox with:

$ rm -fr WebKitBuild # wipe build so there is no flatpak
$ Tools/Scripts/build-webkit --gtk  --no-experimental-features

It seems the issue is that the package that Debian 10 ships for libgcrypt20-dev doesn&apos;t have a libgcrypt.pc file, and I can&apos;t find this file shipped by any other package on the distro.

I can see on the libgcrypt upstream repository that the pc file was added in 

$ git describe 97194b422bc89a6137f4e218d4cdee118c63e96e
libgcrypt-1.9-base-91-g97194b42

And Debian 10 still ships libgcrypt 1.8.4</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780700</commentid>
    <comment_count>10</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2021-07-29 22:43:25 -0700</bug_when>
    <thetext>(In reply to Carlos Alberto Lopez Perez from comment #9)
&gt; I&apos;m afraid we would have to revert this, or at least modify it to not rely
&gt; on the pkg-config files
&gt; 
&gt; 
&gt; After r280423 is not longer possible to build WebKit on Debian 10.
&gt; 
&gt; See the failure on our bot:
&gt; https://build.webkit.org/#/builders/46/builds/5192
&gt; 
&gt; I can reproduce this on buildbox with:
&gt; 
&gt; $ rm -fr WebKitBuild # wipe build so there is no flatpak
&gt; $ Tools/Scripts/build-webkit --gtk  --no-experimental-features
&gt; 
&gt; It seems the issue is that the package that Debian 10 ships for
&gt; libgcrypt20-dev doesn&apos;t have a libgcrypt.pc file, and I can&apos;t find this file
&gt; shipped by any other package on the distro.
&gt; 
&gt; I can see on the libgcrypt upstream repository that the pc file was added in 
&gt; 
&gt; $ git describe 97194b422bc89a6137f4e218d4cdee118c63e96e
&gt; libgcrypt-1.9-base-91-g97194b42
&gt; 
&gt; And Debian 10 still ships libgcrypt 1.8.4

Not having a .pc file should not be a failure, there is a fallback
path that uses the “libgcrypt-config” script, which is part of the
Debian package in versions &lt;1.9, see:

  https://packages.debian.org/buster/amd64/libgcrypt20-dev/filelist

From the build log you linked I see that the fallback is being tried
but I made some mistake there. I would not revert; so let&apos;s reopen
this and I will submit a follow-up with a fix in the next hour or so :)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780708</commentid>
    <comment_count>11</comment_count>
      <attachid>434608</attachid>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2021-07-30 00:12:35 -0700</bug_when>
    <thetext>Created attachment 434608
Follow-up Patch (bis)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780715</commentid>
    <comment_count>12</comment_count>
      <attachid>434608</attachid>
    <who name="Carlos Alberto Lopez Perez">clopez</who>
    <bug_when>2021-07-30 00:38:18 -0700</bug_when>
    <thetext>Comment on attachment 434608
Follow-up Patch (bis)

nice! thanks!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780722</commentid>
    <comment_count>13</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-07-30 01:29:37 -0700</bug_when>
    <thetext>Committed r280469 (240104@main): &lt;https://commits.webkit.org/240104@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 434608.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434515</attachid>
            <date>2021-07-29 05:02:47 -0700</date>
            <delta_ts>2021-07-29 05:21:20 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228581-20210729150246.patch</filename>
            <type>text/plain</type>
            <size>9555</size>
            <attacher name="Adrian Perez">aperez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjJhYjQwZjE1OWQxMDdj
OWEzMzZkNDM3ZmFjZTVjY2IzOWMwMDJjOC4uZDVjZGIzMmVhZmZkOWQzNmVmNzViMDQ4NTJkMTgy
NTk3ZjI3M2EyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA3LTI5ICBBZHJp
YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0NNYWtl
XSBVc2UgYW4gaW1wb3J0ZWQgdGFyZ2V0IGZvciB0aGUgbGliZ2NyeXB0IGxpYnJhcnkKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODU4MQorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBu
ZWVkZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9HQ3J5cHQuY21ha2U6IFVzZSB0aGUgTGliR2Ny
eXB0OjpMaWJHY3J5cHQgaW1wb3J0ZWQgdGFyZ2V0LgorICAgICAgICAqIHBsYXRmb3JtL0dTdHJl
YW1lci5jbWFrZTogUmVtb3ZlIHVubmVlZGVkIHVzYWdlIG9mICR7TElCR0NSWVBUX0lOQ0xVREVf
RElSU30gYW5kCisgICAgICAgICR7TElCR0NSWVBUX0xJQlJBUklFU30sIGFzIHRob3NlIGFyZSBo
YW5kbGVkIG5vdyBieSBtYWtpbmcgV2ViQ29yZSBkZXBlbmQgb24gdGhlCisgICAgICAgIExpYkdj
cnlwdDo6TGliR2NyeXB0IGltcG9ydGVkIHRhcmdldC4KKwogMjAyMS0wNy0yOCAgUnlvc3VrZSBO
aXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBEZXBsb3kgbW9yZSB1c2Ugb2Ygc21h
cnQgcG9pbnRlcnMgaW4gRG9jdW1lbnQuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9HQ3J5cHQuY21ha2UgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9HQ3J5cHQuY21h
a2UKaW5kZXggMGI1MjZiNzhmMjUyNTIyOGU5YmI3NWVmYmM1OWI3MjA1ZjU0NDU3NC4uOTUyZTMx
MWZjODg3MTJlYWMwZTYzZjZhMDcyZmFhZWM1NWZmNTEzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vR0NyeXB0LmNtYWtlCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt
L0dDcnlwdC5jbWFrZQpAQCAtNSw4ICs1LDUgQEAgaWYgKEVOQUJMRV9XRUJfQ1JZUFRPKQogZW5k
aWYgKCkKIAogbGlzdChBUFBFTkQgV2ViQ29yZV9MSUJSQVJJRVMKLSAgICAke0xJQkdDUllQVF9M
SUJSQVJJRVN9Ci0pCi1saXN0KEFQUEVORCBXZWJDb3JlX1NZU1RFTV9JTkNMVURFX0RJUkVDVE9S
SUVTCi0gICAgJHtMSUJHQ1JZUFRfSU5DTFVERV9ESVJTfQorICAgIExpYkdjcnlwdDo6TGliR2Ny
eXB0CiApCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9HU3RyZWFtZXIuY21h
a2UgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9HU3RyZWFtZXIuY21ha2UKaW5kZXggNTcxODkz
ZDU0OTk3ZDc4MTAxNWQxOTk3NWQyMjhlNzIxNTg5MTIxNy4uNWMzM2M4Yjg3OTQxOGFmZTY0NDA1
YjU3NmU2OWM5ZTBiMWE2NTI2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
R1N0cmVhbWVyLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0dTdHJlYW1lci5j
bWFrZQpAQCAtMTg3LDE0ICsxODcsNiBAQCBpZiAoRU5BQkxFX0VOQ1JZUFRFRF9NRURJQSkKICAg
ICAgICAgcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1Qcm94eUNsZWFyS2V5LmNw
cAogICAgICkKIAotICAgIGxpc3QoQVBQRU5EIFdlYkNvcmVfU1lTVEVNX0lOQ0xVREVfRElSRUNU
T1JJRVMKLSAgICAgICAgJHtMSUJHQ1JZUFRfSU5DTFVERV9ESVJTfQotICAgICkKLQotICAgIGxp
c3QoQVBQRU5EIFdlYkNvcmVfTElCUkFSSUVTCi0gICAgICAgICR7TElCR0NSWVBUX0xJQlJBUklF
U30gLWxncGctZXJyb3IKLSAgICApCi0KICAgICBpZiAoRU5BQkxFX1RIVU5ERVIpCiAgICAgICAg
IGxpc3QoQVBQRU5EIFdlYkNvcmVfU1lTVEVNX0lOQ0xVREVfRElSRUNUT1JJRVMKICAgICAgICAg
ICAgICR7VEhVTkRFUl9JTkNMVURFX0RJUlN9CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvRmlu
ZExpYkdjcnlwdC5jbWFrZSBiL1NvdXJjZS9jbWFrZS9GaW5kTGliR2NyeXB0LmNtYWtlCmluZGV4
IDFhM2Q0YTVkNmU4NzliNDBmNGNjYTNhY2NlMWE5NzdkMDc3NDZhNjAuLjJiMWFjZTMwMzE2NGJm
ZjU3M2Q5NmNkNjk0YWU5MTNjNjdkNjBhOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9GaW5k
TGliR2NyeXB0LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9GaW5kTGliR2NyeXB0LmNtYWtlCkBA
IC0xLDIyICsxLDUgQEAKLSMucnN0Ci0jIEZpbmRMaWJHY3J5cHQKLSMgLS0tLS0tLS0tLS0tLQot
IwotIyBGaW5kcyB0aGUgTGliZ2NyeXB0IGxpYnJhcnkuCi0jCi0jIFRoaXMgd2lsbCBkZWZpbmUg
dGhlIGZvbGxvd2luZyB2YXJpYWJsZXM6Ci0jCi0jIGBgTElCR0NSWVBUX0ZPVU5EYGAKLSMgICAg
IFRydWUgaWYgdGhlIHJlcXVlc3RlZCB2ZXJzaW9uIG9mIGdjcnlwdCB3YXMgZm91bmQKLSMgYGBM
SUJHQ1JZUFRfVkVSU0lPTmBgCi0jICAgICBUaGUgdmVyc2lvbiBvZiBnY3J5cHQgdGhhdCB3YXMg
Zm91bmQKLSMgYGBMSUJHQ1JZUFRfSU5DTFVERV9ESVJTYGAKLSMgICAgIFRoZSBnY3J5cHQgaW5j
bHVkZSBkaXJlY3RvcmllcwotIyBgYExJQkdDUllQVF9MSUJSQVJJRVNgYAotIyAgICAgVGhlIGxp
bmtlciBsaWJyYXJpZXMgbmVlZGVkIHRvIHVzZSB0aGUgZ2NyeXB0IGxpYnJhcnkKLQogIyBDb3B5
cmlnaHQgMjAxNCBOaWNvbMOhcyBBbHZhcmV6IDxuaWNvbGFzLmFsdmFyZXpAZ21haWwuY29tPgot
IyBDb3B5cmlnaHQgMjAxNiBJZ2FsaWEgUy5MCisjIENvcHlyaWdodCAyMDE2LCAyMDIxIElnYWxp
YSBTLkwKICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm
b3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92
aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNDEsNTEgKzI0LDk0IEBACiAj
IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP
VVQgT0YgVEhFIFVTRSBPRgogIyBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF
IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCisjWz09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Wy5yc3Q6CitG
aW5kR2NyeXB0CistLS0tLS0tLS0tCisKK0ZpbmQgbGliZ2NyeXB0IGhlYWRlcnMgYW5kIGxpYnJh
cmllcy4KKworSW1wb3J0ZWQgVGFyZ2V0cworXl5eXl5eXl5eXl5eXl5eXgorCitgYExpYkdjcnlw
dDo6TGliR2NyeXB0YGAKKyAgVGhlIGxpYmdjcnlwdCBsaWJyYXJ5LCBpZiBmb3VuZC4KKworI109
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PV0KKworZmluZF9wYWNrYWdlKFBrZ0NvbmZpZyBRVUlFVCkKIGZpbmRfcHJv
Z3JhbShMSUJHQ1JZUFRDT05GSUdfU0NSSVBUIE5BTUVTIGxpYmdjcnlwdC1jb25maWcpCi1pZiAo
TElCR0NSWVBUQ09ORklHX1NDUklQVCkKK2lmIChQa2dDb25maWdfRk9VTkQpCisgICAgcGtnX2No
ZWNrX21vZHVsZXMoUENfR0NSWVBUIFFVSUVUIGxpYmdjcnlwdCkKKyAgICBzZXQoTGliR2NyeXB0
X0NPTVBJTEVfT1BUSU9OUyAke1BDX0dDUllQVF9DRkxBR1NfT1RIRVJ9KQorICAgIHNldChMaWJH
Y3J5cHRfVkVSU0lPTiAke1BDX0dDUllQVF9WRVJTSU9OfSkKK2Vsc2VpZiAoTElCR0NSWVBUQ09O
RklHX1NDUklQVCkKICAgICBleGVjdXRlX3Byb2Nlc3MoCiAgICAgICAgIENPTU1BTkQgIiR7TElC
R0NSWVBUQ09ORklHX1NDUklQVH0iIC0tcHJlZml4CiAgICAgICAgIFJFU1VMVF9WQVJJQUJMRSBD
T05GSUdTQ1JJUFRfUkVTVUxUCi0gICAgICAgIE9VVFBVVF9WQVJJQUJMRSBQUkVGSVgKKyAgICAg
ICAgT1VUUFVUX1ZBUklBQkxFIExJQkdDUllQVF9QUkVGSVgKICAgICAgICAgT1VUUFVUX1NUUklQ
X1RSQUlMSU5HX1dISVRFU1BBQ0UKICAgICApCiAgICAgaWYgKENPTkZJR1NDUklQVF9SRVNVTFQg
RVFVQUwgMCkKLSAgICAgICAgc2V0KExJQkdDUllQVF9MSUJfSElOVCAiJHtQUkVGSVh9L2xpYiIp
Ci0gICAgICAgIHNldChMSUJHQ1JZUFRfSU5DTFVERV9ISU5UICIke1BSRUZJWH0vaW5jbHVkZSIp
CisgICAgICAgIHNldChMSUJHQ1JZUFRfU0NSSVBUX0xJQl9ISU5UICIke0xJQkdDUllQVF9QUkVG
SVh9L2xpYiIpCisgICAgICAgIHNldChMSUJHQ1JZUFRfU0NSSVBUX0lOQ0xVREVfSElOVCAiJHtM
SUJHQ1JZUFRfUFJFRklYfS9pbmNsdWRlIikKKyAgICBlbmRpZiAoKQorCisgICAgZXhlY3V0ZV9w
cm9jZXNzKAorICAgICAgICBDT01NQU5EICIke0xJQkdDUllQVENPTkZJR19TQ1JJUFR9IiAtLWNm
bGFncworICAgICAgICBSRVNVTFRfVkFSSUFCTEUgQ09ORklHU0NSSVBUX1JFU1VMVAorICAgICAg
ICBPVVRQVVRfVkFSSUFCTEUgQ09ORklHU0NSSVBUX1ZBTFVFCisgICAgICAgIE9VVFBVVF9TVFJJ
UF9UUkFJTElOR19XSElURVNQQUNFCisgICAgKQorICAgIGlmIChDT05GSUdTQ1JJUFRfUkVTVUxU
IEVRVUFMIDApCisgICAgICAgIHNldChMaWJHY3J5cHRfQ09NUElMRV9PUFRJT05TICR7Q09ORklH
U0NSSVBUX1ZBTFVFfSkKKyAgICBlbmRpZiAoKQorCisgICAgZXhlY3V0ZV9wcm9jZXNzKAorICAg
ICAgICBDT01NQU5EICIke0xJQkdDUllQVENPTkZJR19TQ1JJUFR9IiAtLWNmbGFncworICAgICAg
ICBSRVNVTFRfVkFSSUFCTEUgQ09ORklHU0NSSVBUX1JFU1VMVAorICAgICAgICBPVVRQVVRfVkFS
SUFCTEUgQ09ORklHU0NSSVBUX1ZBTFVFCisgICAgICAgIE9VVFBVVF9TVFJJUF9UUkFJTElOR19X
SElURVNQQUNFCisgICAgKQorICAgIGlmIChDT05GSUdTQ1JJUFRfUkVTVUxUIEVRVUFMIDApCisg
ICAgICAgIHN0cmluZyhSRUdFWCBNQVRDSCAiXihbMC05XStcLlswLTldK1wuWzAtOV0rKSIgTGli
R2NyeXB0X1ZFUlNJT04gIiR7Q09ORklHU0NSSVBUX1ZBTFVFfSIpCiAgICAgZW5kaWYgKCkKIGVu
ZGlmICgpCiAKLWZpbmRfbGlicmFyeShMSUJHQ1JZUFRfTElCUkFSWQotICAgIE5BTUVTIGdjcnlw
dAotICAgIEhJTlRTICR7TElCR0NSWVBUX0xJQl9ISU5UfQotKQotZmluZF9wYXRoKExJQkdDUllQ
VF9JTkNMVURFX0RJUgorZmluZF9wYXRoKExpYkdjcnlwdF9JTkNMVURFX0RJUgogICAgIE5BTUVT
IGdjcnlwdC5oCi0gICAgSElOVFMgJHtMSUJHQ1JZUFRfSU5DTFVERV9ISU5UfQorICAgIEhJTlRT
ICR7UENfR0NSWVBUX0lOQ0xVREVESVJ9ICR7UENfR0NSWVBUX0lOQ0xVREVfRElSU30KKyAgICAg
ICAgICAke0xJQkdDUllQVF9TQ1JJUFRfSU5DTFVERV9ISU5UfSAke0xpYkdjcnlwdF9JTkNMVURF
X0RJUn0KICkKIAotaWYgKExJQkdDUllQVF9JTkNMVURFX0RJUikKK2ZpbmRfbGlicmFyeShMaWJH
Y3J5cHRfTElCUkFSWQorICAgIE5BTUVTICR7TGliR2NyeXB0X05BTUVTfSBnY3J5cHQgbGliZ2Ny
eXB0CisgICAgSElOVFMgJHtQQ19HQ1JZUFRfTElCRElSfSAke1BDX0dDUllQVF9MSUJSQVJZX0RJ
UlN9ICR7TElCR0NSWVBUX1NDUklQVF9MSUJfSElOVH0KKykKKworaWYgKExpYkdjcnlwdF9JTkNM
VURFX0RJUiBBTkQgTk9UIExpYkdjcnlwdF9WRVJTSU9OKQogICAgIGZpbGUoU1RSSU5HUyAke0xJ
QkdDUllQVF9JTkNMVURFX0RJUn0vZ2NyeXB0LmggR0NSWVBUX0ggUkVHRVggIl4jZGVmaW5lIEdD
UllQVF9WRVJTSU9OICIpCi0gICAgc3RyaW5nKFJFR0VYIFJFUExBQ0UgIl4jZGVmaW5lIEdDUllQ
VF9WRVJTSU9OIFwiKC4qKVwiLiokIiAiXFwxIiBMSUJHQ1JZUFRfVkVSU0lPTiAiJHtHQ1JZUFRf
SH0iKQorICAgIHN0cmluZyhSRUdFWCBSRVBMQUNFICJeI2RlZmluZSBHQ1JZUFRfVkVSU0lPTiBc
IiguKilcIi4qJCIgIlxcMSIgTGliR2NyeXB0X1ZFUlNJT04gIiR7R0NSWVBUX0h9IikKIGVuZGlm
ICgpCiAKIGluY2x1ZGUoRmluZFBhY2thZ2VIYW5kbGVTdGFuZGFyZEFyZ3MpCi0KIGZpbmRfcGFj
a2FnZV9oYW5kbGVfc3RhbmRhcmRfYXJncyhMaWJHY3J5cHQKLSAgICBGT1VORF9WQVIgTElCR0NS
WVBUX0ZPVU5ECi0gICAgUkVRVUlSRURfVkFSUyBMSUJHQ1JZUFRfTElCUkFSWSBMSUJHQ1JZUFRf
SU5DTFVERV9ESVIKLSAgICBWRVJTSU9OX1ZBUiBMSUJHQ1JZUFRfVkVSU0lPTgorICAgIEZPVU5E
X1ZBUiBMaWJHY3J5cHRfRk9VTkQKKyAgICBSRVFVSVJFRF9WQVJTIExpYkdjcnlwdF9MSUJSQVJZ
IExpYkdjcnlwdF9JTkNMVURFX0RJUgorICAgIFZFUlNJT05fVkFSIExpYkdjcnlwdF9WRVJTSU9O
CiApCi1pZiAoTElCR0NSWVBUX0ZPVU5EKQotICAgIHNldChMSUJHQ1JZUFRfTElCUkFSSUVTICR7
TElCR0NSWVBUX0xJQlJBUll9KQotICAgIHNldChMSUJHQ1JZUFRfSU5DTFVERV9ESVJTICR7TElC
R0NSWVBUX0lOQ0xVREVfRElSfSkKKworaWYgKExpYkdjcnlwdF9MSUJSQVJZIEFORCBOT1QgVEFS
R0VUIExpYkdjcnlwdDo6TGliR2NyeXB0KQorICAgIGFkZF9saWJyYXJ5KExpYkdjcnlwdDo6TGli
R2NyeXB0IFVOS05PV04gSU1QT1JURUQgR0xPQkFMKQorICAgIHNldF90YXJnZXRfcHJvcGVydGll
cyhMaWJHY3J5cHQ6OkxpYkdjcnlwdCBQUk9QRVJUSUVTCisgICAgICAgIElNUE9SVEVEX0xPQ0FU
SU9OICIke0xpYkdjcnlwdF9MSUJSQVJZfSIKKyAgICAgICAgSU5URVJGQUNFX0NPTVBJTEVfT1BU
SU9OUyAiJHtMaWJHY3J5cHRfQ09NUElMRV9PUFRJT05TfSIKKyAgICAgICAgSU5URVJGQUNFX0lO
Q0xVREVfRElSRUNUT1JJRVMgIiR7TGliR2NyeXB0X0lOQ0xVREVfRElSfSIKKyAgICApCiBlbmRp
ZiAoKQogCi1tYXJrX2FzX2FkdmFuY2VkKExJQkdDUllQVF9MSUJSQVJZIExJQkdDUllQVF9JTkNM
VURFX0RJUiBMSUJHQ1JZUFRDT05GSUdfU0NSSVBUKQotCi1pbmNsdWRlKEZlYXR1cmVTdW1tYXJ5
KQotc2V0X3BhY2thZ2VfcHJvcGVydGllcyhMaWJHY3J5cHQgUFJPUEVSVElFUwotICAgIERFU0NS
SVBUSU9OICJBIGdlbmVyYWwgcHVycG9zZSBjcnlwdG9ncmFwaGljIGxpYnJhcnkgYmFzZWQgb24g
dGhlIGNvZGUgZnJvbSBHbnVQRy4iCi0gICAgVVJMICJodHRwOi8vd3d3LmdudS5vcmcvc29mdHdh
cmUvbGliZ2NyeXB0LyIKLSkKK21hcmtfYXNfYWR2YW5jZWQoTGliR2NyeXB0X0lOQ0xVREVfRElS
IExpYkdjcnlwdF9MSUJSQVJZKQogCitpZiAoTGliR2NyeXB0X0ZPVU5EKQorICAgIHNldChMaWJH
Y3J5cHRfTElCUkFSSUVTICR7TGliR2NyeXB0X0xJQlJBUll9KQorICAgIHNldChMaWJHY3J5cHRf
SU5DTFVERV9ESVJTICR7TGliR2NyeXB0X0lOQ0xVREVfRElSfSkKK2VuZGlmICgpCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25z
R1RLLmNtYWtlCmluZGV4IGI3YjJhMzMxMmY2MGZmOTk4NmRkOTE0ZjNlMDNlZThiYTY1NTlkMDMu
LjQ3NjYwY2IzYzg1NWI1MmUyODVjM2NkM2Q2MDk1Nzg0NjdmMThkNjIgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RL
LmNtYWtlCkBAIC0zMjAsNyArMzIwLDcgQEAgaWYgKEVOQUJMRV9XRUJfQ1JZUFRPKQogICAgIGlm
IChOT1QgTElCVEFTTjFfRk9VTkQpCiAgICAgICAgIG1lc3NhZ2UoRkFUQUxfRVJST1IgImxpYnRh
c24xIGlzIHJlcXVpcmVkIHRvIGVuYWJsZSBXZWIgQ3J5cHRvIEFQSSBzdXBwb3J0LiIpCiAgICAg
ZW5kaWYgKCkKLSAgICBpZiAoTElCR0NSWVBUX1ZFUlNJT04gVkVSU0lPTl9MRVNTIDEuNy4wKQor
ICAgIGlmIChMaWJHY3J5cHRfVkVSU0lPTiBWRVJTSU9OX0xFU1MgMS43LjApCiAgICAgICAgIG1l
c3NhZ2UoRkFUQUxfRVJST1IgImxpYmdjcnlwdCAxLjcuMCBpcyByZXF1aXJlZCB0byBlbmFibGUg
V2ViIENyeXB0byBBUEkgc3VwcG9ydC4iKQogICAgIGVuZGlmICgpCiBlbmRpZiAoKQpkaWZmIC0t
Z2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNXUEUuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9u
c1dQRS5jbWFrZQppbmRleCA4ZDE0NDczOTNkNmUwMDYwMTE0YWUxMGI3ZTQxZGMzMGFjZTAwMDc0
Li5lM2Y0YzhmZmVhMWZhZTU2YzkyNzc2MzA3MzYxYzVmYTQ1Y2U5ZjNhIDEwMDY0NAotLS0gYS9T
b3VyY2UvY21ha2UvT3B0aW9uc1dQRS5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc1dQ
RS5jbWFrZQpAQCAtMTg0LDcgKzE4NCw3IEBAIGlmIChFTkFCTEVfV0VCX0NSWVBUTykKICAgICBp
ZiAoTk9UIExJQlRBU04xX0ZPVU5EKQogICAgICAgICBtZXNzYWdlKEZBVEFMX0VSUk9SICJsaWJ0
YXNuMSBpcyByZXF1aXJlZCB0byBlbmFibGUgV2ViIENyeXB0byBBUEkgc3VwcG9ydC4iKQogICAg
IGVuZGlmICgpCi0gICAgaWYgKExJQkdDUllQVF9WRVJTSU9OIFZFUlNJT05fTEVTUyAxLjcuMCkK
KyAgICBpZiAoTGliR2NyeXB0X1ZFUlNJT05fTEVTUyAxLjcuMCkKICAgICAgICAgbWVzc2FnZShG
QVRBTF9FUlJPUiAibGliZ2NyeXB0IDEuNy4wIGlzIHJlcXVpcmVkIHRvIGVuYWJsZSBXZWIgQ3J5
cHRvIEFQSSBzdXBwb3J0LiIpCiAgICAgZW5kaWYgKCkKIGVuZGlmICgpCmRpZmYgLS1naXQgYS9D
aGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggN2QzMjhlOTU0MmE3N2QzOGYwNWU5NjY4YjViYWU2
NWQ2ZjEzZWFhZi4uYmU3ZGQ4ZDYxM2ZlODBkNTk5OWI5YmUzZGFiZTg5OTMyNjVkMzA1MyAxMDA2
NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIx
LTA3LTI5ICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAg
ICAgICAgW0NNYWtlXSBVc2UgYW4gaW1wb3J0ZWQgdGFyZ2V0IGZvciB0aGUgbGliZ2NyeXB0IGxp
YnJhcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
ODU4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog
U291cmNlL2NtYWtlL0ZpbmRMaWJHY3J5cHQuY21ha2U6IFJlcGxhY2VkIGZpbmQgbW9kdWxlIGJ5
IGEgbmV3IG9uZSB3aGljaCBkZWZpbmVzIGEKKyAgICAgICAgTGliR2NyeXB0OjpMaWJHY3J5cHQg
aW1wb3J0ZWQgdGFyZ2V0LCB1c2luZyBtb3JlIG1vZGVybiBDTWFrZSBjb25zdHJ1Y3RzLgorICAg
ICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlOiBVc2UgdGhlIExpYkdjcnlwdDo6
TGliR2NyeXB0IGltcG9ydGVkIHRhcmdldC4KKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9u
c1dQRS5jbWFrZTogRGl0dG8uCisKIDIwMjEtMDctMjggIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9y
bWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXUEVdW0dUS10gU1ZOX1JFVklTSU9OIGRyaWZ0
aW5nIGF3YXkgaWYgYm90cyBkb24ndCByZS1ydW4gY21ha2UK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434516</attachid>
            <date>2021-07-29 05:21:26 -0700</date>
            <delta_ts>2021-07-29 12:50:09 -0700</delta_ts>
            <desc>Patch v2</desc>
            <filename>bug-228581-20210729152124.patch</filename>
            <type>text/plain</type>
            <size>9563</size>
            <attacher name="Adrian Perez">aperez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjJhYjQwZjE1OWQxMDdj
OWEzMzZkNDM3ZmFjZTVjY2IzOWMwMDJjOC4uZDVjZGIzMmVhZmZkOWQzNmVmNzViMDQ4NTJkMTgy
NTk3ZjI3M2EyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA3LTI5ICBBZHJp
YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0NNYWtl
XSBVc2UgYW4gaW1wb3J0ZWQgdGFyZ2V0IGZvciB0aGUgbGliZ2NyeXB0IGxpYnJhcnkKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODU4MQorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBu
ZWVkZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9HQ3J5cHQuY21ha2U6IFVzZSB0aGUgTGliR2Ny
eXB0OjpMaWJHY3J5cHQgaW1wb3J0ZWQgdGFyZ2V0LgorICAgICAgICAqIHBsYXRmb3JtL0dTdHJl
YW1lci5jbWFrZTogUmVtb3ZlIHVubmVlZGVkIHVzYWdlIG9mICR7TElCR0NSWVBUX0lOQ0xVREVf
RElSU30gYW5kCisgICAgICAgICR7TElCR0NSWVBUX0xJQlJBUklFU30sIGFzIHRob3NlIGFyZSBo
YW5kbGVkIG5vdyBieSBtYWtpbmcgV2ViQ29yZSBkZXBlbmQgb24gdGhlCisgICAgICAgIExpYkdj
cnlwdDo6TGliR2NyeXB0IGltcG9ydGVkIHRhcmdldC4KKwogMjAyMS0wNy0yOCAgUnlvc3VrZSBO
aXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBEZXBsb3kgbW9yZSB1c2Ugb2Ygc21h
cnQgcG9pbnRlcnMgaW4gRG9jdW1lbnQuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9HQ3J5cHQuY21ha2UgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9HQ3J5cHQuY21h
a2UKaW5kZXggMGI1MjZiNzhmMjUyNTIyOGU5YmI3NWVmYmM1OWI3MjA1ZjU0NDU3NC4uOTUyZTMx
MWZjODg3MTJlYWMwZTYzZjZhMDcyZmFhZWM1NWZmNTEzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vR0NyeXB0LmNtYWtlCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt
L0dDcnlwdC5jbWFrZQpAQCAtNSw4ICs1LDUgQEAgaWYgKEVOQUJMRV9XRUJfQ1JZUFRPKQogZW5k
aWYgKCkKIAogbGlzdChBUFBFTkQgV2ViQ29yZV9MSUJSQVJJRVMKLSAgICAke0xJQkdDUllQVF9M
SUJSQVJJRVN9Ci0pCi1saXN0KEFQUEVORCBXZWJDb3JlX1NZU1RFTV9JTkNMVURFX0RJUkVDVE9S
SUVTCi0gICAgJHtMSUJHQ1JZUFRfSU5DTFVERV9ESVJTfQorICAgIExpYkdjcnlwdDo6TGliR2Ny
eXB0CiApCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9HU3RyZWFtZXIuY21h
a2UgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9HU3RyZWFtZXIuY21ha2UKaW5kZXggNTcxODkz
ZDU0OTk3ZDc4MTAxNWQxOTk3NWQyMjhlNzIxNTg5MTIxNy4uNWMzM2M4Yjg3OTQxOGFmZTY0NDA1
YjU3NmU2OWM5ZTBiMWE2NTI2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
R1N0cmVhbWVyLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0dTdHJlYW1lci5j
bWFrZQpAQCAtMTg3LDE0ICsxODcsNiBAQCBpZiAoRU5BQkxFX0VOQ1JZUFRFRF9NRURJQSkKICAg
ICAgICAgcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1Qcm94eUNsZWFyS2V5LmNw
cAogICAgICkKIAotICAgIGxpc3QoQVBQRU5EIFdlYkNvcmVfU1lTVEVNX0lOQ0xVREVfRElSRUNU
T1JJRVMKLSAgICAgICAgJHtMSUJHQ1JZUFRfSU5DTFVERV9ESVJTfQotICAgICkKLQotICAgIGxp
c3QoQVBQRU5EIFdlYkNvcmVfTElCUkFSSUVTCi0gICAgICAgICR7TElCR0NSWVBUX0xJQlJBUklF
U30gLWxncGctZXJyb3IKLSAgICApCi0KICAgICBpZiAoRU5BQkxFX1RIVU5ERVIpCiAgICAgICAg
IGxpc3QoQVBQRU5EIFdlYkNvcmVfU1lTVEVNX0lOQ0xVREVfRElSRUNUT1JJRVMKICAgICAgICAg
ICAgICR7VEhVTkRFUl9JTkNMVURFX0RJUlN9CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvRmlu
ZExpYkdjcnlwdC5jbWFrZSBiL1NvdXJjZS9jbWFrZS9GaW5kTGliR2NyeXB0LmNtYWtlCmluZGV4
IDFhM2Q0YTVkNmU4NzliNDBmNGNjYTNhY2NlMWE5NzdkMDc3NDZhNjAuLjJiMWFjZTMwMzE2NGJm
ZjU3M2Q5NmNkNjk0YWU5MTNjNjdkNjBhOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9GaW5k
TGliR2NyeXB0LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9GaW5kTGliR2NyeXB0LmNtYWtlCkBA
IC0xLDIyICsxLDUgQEAKLSMucnN0Ci0jIEZpbmRMaWJHY3J5cHQKLSMgLS0tLS0tLS0tLS0tLQot
IwotIyBGaW5kcyB0aGUgTGliZ2NyeXB0IGxpYnJhcnkuCi0jCi0jIFRoaXMgd2lsbCBkZWZpbmUg
dGhlIGZvbGxvd2luZyB2YXJpYWJsZXM6Ci0jCi0jIGBgTElCR0NSWVBUX0ZPVU5EYGAKLSMgICAg
IFRydWUgaWYgdGhlIHJlcXVlc3RlZCB2ZXJzaW9uIG9mIGdjcnlwdCB3YXMgZm91bmQKLSMgYGBM
SUJHQ1JZUFRfVkVSU0lPTmBgCi0jICAgICBUaGUgdmVyc2lvbiBvZiBnY3J5cHQgdGhhdCB3YXMg
Zm91bmQKLSMgYGBMSUJHQ1JZUFRfSU5DTFVERV9ESVJTYGAKLSMgICAgIFRoZSBnY3J5cHQgaW5j
bHVkZSBkaXJlY3RvcmllcwotIyBgYExJQkdDUllQVF9MSUJSQVJJRVNgYAotIyAgICAgVGhlIGxp
bmtlciBsaWJyYXJpZXMgbmVlZGVkIHRvIHVzZSB0aGUgZ2NyeXB0IGxpYnJhcnkKLQogIyBDb3B5
cmlnaHQgMjAxNCBOaWNvbMOhcyBBbHZhcmV6IDxuaWNvbGFzLmFsdmFyZXpAZ21haWwuY29tPgot
IyBDb3B5cmlnaHQgMjAxNiBJZ2FsaWEgUy5MCisjIENvcHlyaWdodCAyMDE2LCAyMDIxIElnYWxp
YSBTLkwKICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm
b3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92
aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNDEsNTEgKzI0LDk0IEBACiAj
IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP
VVQgT0YgVEhFIFVTRSBPRgogIyBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF
IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCisjWz09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Wy5yc3Q6CitG
aW5kR2NyeXB0CistLS0tLS0tLS0tCisKK0ZpbmQgbGliZ2NyeXB0IGhlYWRlcnMgYW5kIGxpYnJh
cmllcy4KKworSW1wb3J0ZWQgVGFyZ2V0cworXl5eXl5eXl5eXl5eXl5eXgorCitgYExpYkdjcnlw
dDo6TGliR2NyeXB0YGAKKyAgVGhlIGxpYmdjcnlwdCBsaWJyYXJ5LCBpZiBmb3VuZC4KKworI109
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PV0KKworZmluZF9wYWNrYWdlKFBrZ0NvbmZpZyBRVUlFVCkKIGZpbmRfcHJv
Z3JhbShMSUJHQ1JZUFRDT05GSUdfU0NSSVBUIE5BTUVTIGxpYmdjcnlwdC1jb25maWcpCi1pZiAo
TElCR0NSWVBUQ09ORklHX1NDUklQVCkKK2lmIChQa2dDb25maWdfRk9VTkQpCisgICAgcGtnX2No
ZWNrX21vZHVsZXMoUENfR0NSWVBUIFFVSUVUIGxpYmdjcnlwdCkKKyAgICBzZXQoTGliR2NyeXB0
X0NPTVBJTEVfT1BUSU9OUyAke1BDX0dDUllQVF9DRkxBR1NfT1RIRVJ9KQorICAgIHNldChMaWJH
Y3J5cHRfVkVSU0lPTiAke1BDX0dDUllQVF9WRVJTSU9OfSkKK2Vsc2VpZiAoTElCR0NSWVBUQ09O
RklHX1NDUklQVCkKICAgICBleGVjdXRlX3Byb2Nlc3MoCiAgICAgICAgIENPTU1BTkQgIiR7TElC
R0NSWVBUQ09ORklHX1NDUklQVH0iIC0tcHJlZml4CiAgICAgICAgIFJFU1VMVF9WQVJJQUJMRSBD
T05GSUdTQ1JJUFRfUkVTVUxUCi0gICAgICAgIE9VVFBVVF9WQVJJQUJMRSBQUkVGSVgKKyAgICAg
ICAgT1VUUFVUX1ZBUklBQkxFIExJQkdDUllQVF9QUkVGSVgKICAgICAgICAgT1VUUFVUX1NUUklQ
X1RSQUlMSU5HX1dISVRFU1BBQ0UKICAgICApCiAgICAgaWYgKENPTkZJR1NDUklQVF9SRVNVTFQg
RVFVQUwgMCkKLSAgICAgICAgc2V0KExJQkdDUllQVF9MSUJfSElOVCAiJHtQUkVGSVh9L2xpYiIp
Ci0gICAgICAgIHNldChMSUJHQ1JZUFRfSU5DTFVERV9ISU5UICIke1BSRUZJWH0vaW5jbHVkZSIp
CisgICAgICAgIHNldChMSUJHQ1JZUFRfU0NSSVBUX0xJQl9ISU5UICIke0xJQkdDUllQVF9QUkVG
SVh9L2xpYiIpCisgICAgICAgIHNldChMSUJHQ1JZUFRfU0NSSVBUX0lOQ0xVREVfSElOVCAiJHtM
SUJHQ1JZUFRfUFJFRklYfS9pbmNsdWRlIikKKyAgICBlbmRpZiAoKQorCisgICAgZXhlY3V0ZV9w
cm9jZXNzKAorICAgICAgICBDT01NQU5EICIke0xJQkdDUllQVENPTkZJR19TQ1JJUFR9IiAtLWNm
bGFncworICAgICAgICBSRVNVTFRfVkFSSUFCTEUgQ09ORklHU0NSSVBUX1JFU1VMVAorICAgICAg
ICBPVVRQVVRfVkFSSUFCTEUgQ09ORklHU0NSSVBUX1ZBTFVFCisgICAgICAgIE9VVFBVVF9TVFJJ
UF9UUkFJTElOR19XSElURVNQQUNFCisgICAgKQorICAgIGlmIChDT05GSUdTQ1JJUFRfUkVTVUxU
IEVRVUFMIDApCisgICAgICAgIHNldChMaWJHY3J5cHRfQ09NUElMRV9PUFRJT05TICR7Q09ORklH
U0NSSVBUX1ZBTFVFfSkKKyAgICBlbmRpZiAoKQorCisgICAgZXhlY3V0ZV9wcm9jZXNzKAorICAg
ICAgICBDT01NQU5EICIke0xJQkdDUllQVENPTkZJR19TQ1JJUFR9IiAtLWNmbGFncworICAgICAg
ICBSRVNVTFRfVkFSSUFCTEUgQ09ORklHU0NSSVBUX1JFU1VMVAorICAgICAgICBPVVRQVVRfVkFS
SUFCTEUgQ09ORklHU0NSSVBUX1ZBTFVFCisgICAgICAgIE9VVFBVVF9TVFJJUF9UUkFJTElOR19X
SElURVNQQUNFCisgICAgKQorICAgIGlmIChDT05GSUdTQ1JJUFRfUkVTVUxUIEVRVUFMIDApCisg
ICAgICAgIHN0cmluZyhSRUdFWCBNQVRDSCAiXihbMC05XStcLlswLTldK1wuWzAtOV0rKSIgTGli
R2NyeXB0X1ZFUlNJT04gIiR7Q09ORklHU0NSSVBUX1ZBTFVFfSIpCiAgICAgZW5kaWYgKCkKIGVu
ZGlmICgpCiAKLWZpbmRfbGlicmFyeShMSUJHQ1JZUFRfTElCUkFSWQotICAgIE5BTUVTIGdjcnlw
dAotICAgIEhJTlRTICR7TElCR0NSWVBUX0xJQl9ISU5UfQotKQotZmluZF9wYXRoKExJQkdDUllQ
VF9JTkNMVURFX0RJUgorZmluZF9wYXRoKExpYkdjcnlwdF9JTkNMVURFX0RJUgogICAgIE5BTUVT
IGdjcnlwdC5oCi0gICAgSElOVFMgJHtMSUJHQ1JZUFRfSU5DTFVERV9ISU5UfQorICAgIEhJTlRT
ICR7UENfR0NSWVBUX0lOQ0xVREVESVJ9ICR7UENfR0NSWVBUX0lOQ0xVREVfRElSU30KKyAgICAg
ICAgICAke0xJQkdDUllQVF9TQ1JJUFRfSU5DTFVERV9ISU5UfSAke0xpYkdjcnlwdF9JTkNMVURF
X0RJUn0KICkKIAotaWYgKExJQkdDUllQVF9JTkNMVURFX0RJUikKK2ZpbmRfbGlicmFyeShMaWJH
Y3J5cHRfTElCUkFSWQorICAgIE5BTUVTICR7TGliR2NyeXB0X05BTUVTfSBnY3J5cHQgbGliZ2Ny
eXB0CisgICAgSElOVFMgJHtQQ19HQ1JZUFRfTElCRElSfSAke1BDX0dDUllQVF9MSUJSQVJZX0RJ
UlN9ICR7TElCR0NSWVBUX1NDUklQVF9MSUJfSElOVH0KKykKKworaWYgKExpYkdjcnlwdF9JTkNM
VURFX0RJUiBBTkQgTk9UIExpYkdjcnlwdF9WRVJTSU9OKQogICAgIGZpbGUoU1RSSU5HUyAke0xJ
QkdDUllQVF9JTkNMVURFX0RJUn0vZ2NyeXB0LmggR0NSWVBUX0ggUkVHRVggIl4jZGVmaW5lIEdD
UllQVF9WRVJTSU9OICIpCi0gICAgc3RyaW5nKFJFR0VYIFJFUExBQ0UgIl4jZGVmaW5lIEdDUllQ
VF9WRVJTSU9OIFwiKC4qKVwiLiokIiAiXFwxIiBMSUJHQ1JZUFRfVkVSU0lPTiAiJHtHQ1JZUFRf
SH0iKQorICAgIHN0cmluZyhSRUdFWCBSRVBMQUNFICJeI2RlZmluZSBHQ1JZUFRfVkVSU0lPTiBc
IiguKilcIi4qJCIgIlxcMSIgTGliR2NyeXB0X1ZFUlNJT04gIiR7R0NSWVBUX0h9IikKIGVuZGlm
ICgpCiAKIGluY2x1ZGUoRmluZFBhY2thZ2VIYW5kbGVTdGFuZGFyZEFyZ3MpCi0KIGZpbmRfcGFj
a2FnZV9oYW5kbGVfc3RhbmRhcmRfYXJncyhMaWJHY3J5cHQKLSAgICBGT1VORF9WQVIgTElCR0NS
WVBUX0ZPVU5ECi0gICAgUkVRVUlSRURfVkFSUyBMSUJHQ1JZUFRfTElCUkFSWSBMSUJHQ1JZUFRf
SU5DTFVERV9ESVIKLSAgICBWRVJTSU9OX1ZBUiBMSUJHQ1JZUFRfVkVSU0lPTgorICAgIEZPVU5E
X1ZBUiBMaWJHY3J5cHRfRk9VTkQKKyAgICBSRVFVSVJFRF9WQVJTIExpYkdjcnlwdF9MSUJSQVJZ
IExpYkdjcnlwdF9JTkNMVURFX0RJUgorICAgIFZFUlNJT05fVkFSIExpYkdjcnlwdF9WRVJTSU9O
CiApCi1pZiAoTElCR0NSWVBUX0ZPVU5EKQotICAgIHNldChMSUJHQ1JZUFRfTElCUkFSSUVTICR7
TElCR0NSWVBUX0xJQlJBUll9KQotICAgIHNldChMSUJHQ1JZUFRfSU5DTFVERV9ESVJTICR7TElC
R0NSWVBUX0lOQ0xVREVfRElSfSkKKworaWYgKExpYkdjcnlwdF9MSUJSQVJZIEFORCBOT1QgVEFS
R0VUIExpYkdjcnlwdDo6TGliR2NyeXB0KQorICAgIGFkZF9saWJyYXJ5KExpYkdjcnlwdDo6TGli
R2NyeXB0IFVOS05PV04gSU1QT1JURUQgR0xPQkFMKQorICAgIHNldF90YXJnZXRfcHJvcGVydGll
cyhMaWJHY3J5cHQ6OkxpYkdjcnlwdCBQUk9QRVJUSUVTCisgICAgICAgIElNUE9SVEVEX0xPQ0FU
SU9OICIke0xpYkdjcnlwdF9MSUJSQVJZfSIKKyAgICAgICAgSU5URVJGQUNFX0NPTVBJTEVfT1BU
SU9OUyAiJHtMaWJHY3J5cHRfQ09NUElMRV9PUFRJT05TfSIKKyAgICAgICAgSU5URVJGQUNFX0lO
Q0xVREVfRElSRUNUT1JJRVMgIiR7TGliR2NyeXB0X0lOQ0xVREVfRElSfSIKKyAgICApCiBlbmRp
ZiAoKQogCi1tYXJrX2FzX2FkdmFuY2VkKExJQkdDUllQVF9MSUJSQVJZIExJQkdDUllQVF9JTkNM
VURFX0RJUiBMSUJHQ1JZUFRDT05GSUdfU0NSSVBUKQotCi1pbmNsdWRlKEZlYXR1cmVTdW1tYXJ5
KQotc2V0X3BhY2thZ2VfcHJvcGVydGllcyhMaWJHY3J5cHQgUFJPUEVSVElFUwotICAgIERFU0NS
SVBUSU9OICJBIGdlbmVyYWwgcHVycG9zZSBjcnlwdG9ncmFwaGljIGxpYnJhcnkgYmFzZWQgb24g
dGhlIGNvZGUgZnJvbSBHbnVQRy4iCi0gICAgVVJMICJodHRwOi8vd3d3LmdudS5vcmcvc29mdHdh
cmUvbGliZ2NyeXB0LyIKLSkKK21hcmtfYXNfYWR2YW5jZWQoTGliR2NyeXB0X0lOQ0xVREVfRElS
IExpYkdjcnlwdF9MSUJSQVJZKQogCitpZiAoTGliR2NyeXB0X0ZPVU5EKQorICAgIHNldChMaWJH
Y3J5cHRfTElCUkFSSUVTICR7TGliR2NyeXB0X0xJQlJBUll9KQorICAgIHNldChMaWJHY3J5cHRf
SU5DTFVERV9ESVJTICR7TGliR2NyeXB0X0lOQ0xVREVfRElSfSkKK2VuZGlmICgpCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25z
R1RLLmNtYWtlCmluZGV4IGI3YjJhMzMxMmY2MGZmOTk4NmRkOTE0ZjNlMDNlZThiYTY1NTlkMDMu
LjQ3NjYwY2IzYzg1NWI1MmUyODVjM2NkM2Q2MDk1Nzg0NjdmMThkNjIgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RL
LmNtYWtlCkBAIC0zMjAsNyArMzIwLDcgQEAgaWYgKEVOQUJMRV9XRUJfQ1JZUFRPKQogICAgIGlm
IChOT1QgTElCVEFTTjFfRk9VTkQpCiAgICAgICAgIG1lc3NhZ2UoRkFUQUxfRVJST1IgImxpYnRh
c24xIGlzIHJlcXVpcmVkIHRvIGVuYWJsZSBXZWIgQ3J5cHRvIEFQSSBzdXBwb3J0LiIpCiAgICAg
ZW5kaWYgKCkKLSAgICBpZiAoTElCR0NSWVBUX1ZFUlNJT04gVkVSU0lPTl9MRVNTIDEuNy4wKQor
ICAgIGlmIChMaWJHY3J5cHRfVkVSU0lPTiBWRVJTSU9OX0xFU1MgMS43LjApCiAgICAgICAgIG1l
c3NhZ2UoRkFUQUxfRVJST1IgImxpYmdjcnlwdCAxLjcuMCBpcyByZXF1aXJlZCB0byBlbmFibGUg
V2ViIENyeXB0byBBUEkgc3VwcG9ydC4iKQogICAgIGVuZGlmICgpCiBlbmRpZiAoKQpkaWZmIC0t
Z2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNXUEUuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9u
c1dQRS5jbWFrZQppbmRleCA4ZDE0NDczOTNkNmUwMDYwMTE0YWUxMGI3ZTQxZGMzMGFjZTAwMDc0
Li5kNTZkZWI4OTYyMWM1NTU5MTViZDYzYWFmZTg5ZjE5MzhkZTFkOTIwIDEwMDY0NAotLS0gYS9T
b3VyY2UvY21ha2UvT3B0aW9uc1dQRS5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc1dQ
RS5jbWFrZQpAQCAtMTg0LDcgKzE4NCw3IEBAIGlmIChFTkFCTEVfV0VCX0NSWVBUTykKICAgICBp
ZiAoTk9UIExJQlRBU04xX0ZPVU5EKQogICAgICAgICBtZXNzYWdlKEZBVEFMX0VSUk9SICJsaWJ0
YXNuMSBpcyByZXF1aXJlZCB0byBlbmFibGUgV2ViIENyeXB0byBBUEkgc3VwcG9ydC4iKQogICAg
IGVuZGlmICgpCi0gICAgaWYgKExJQkdDUllQVF9WRVJTSU9OIFZFUlNJT05fTEVTUyAxLjcuMCkK
KyAgICBpZiAoTGliR2NyeXB0X1ZFUlNJT04gVkVSU0lPTl9MRVNTIDEuNy4wKQogICAgICAgICBt
ZXNzYWdlKEZBVEFMX0VSUk9SICJsaWJnY3J5cHQgMS43LjAgaXMgcmVxdWlyZWQgdG8gZW5hYmxl
IFdlYiBDcnlwdG8gQVBJIHN1cHBvcnQuIikKICAgICBlbmRpZiAoKQogZW5kaWYgKCkKZGlmZiAt
LWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA3ZDMyOGU5NTQyYTc3ZDM4ZjA1ZTk2
NjhiNWJhZTY1ZDZmMTNlYWFmLi5iZTdkZDhkNjEzZmU4MGQ1OTk5YjliZTNkYWJlODk5MzI2NWQz
MDUzIDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg
QEAKKzIwMjEtMDctMjkgIEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNv
bT4KKworICAgICAgICBbQ01ha2VdIFVzZSBhbiBpbXBvcnRlZCB0YXJnZXQgZm9yIHRoZSBsaWJn
Y3J5cHQgbGlicmFyeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjI4NTgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgKiBTb3VyY2UvY21ha2UvRmluZExpYkdjcnlwdC5jbWFrZTogUmVwbGFjZWQgZmluZCBt
b2R1bGUgYnkgYSBuZXcgb25lIHdoaWNoIGRlZmluZXMgYQorICAgICAgICBMaWJHY3J5cHQ6Okxp
YkdjcnlwdCBpbXBvcnRlZCB0YXJnZXQsIHVzaW5nIG1vcmUgbW9kZXJuIENNYWtlIGNvbnN0cnVj
dHMuCisgICAgICAgICogU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2U6IFVzZSB0aGUgTGli
R2NyeXB0OjpMaWJHY3J5cHQgaW1wb3J0ZWQgdGFyZ2V0LgorICAgICAgICAqIFNvdXJjZS9jbWFr
ZS9PcHRpb25zV1BFLmNtYWtlOiBEaXR0by4KKwogMjAyMS0wNy0yOCAgUGhpbGlwcGUgTm9ybWFu
ZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dQRV1bR1RLXSBTVk5fUkVWSVNJ
T04gZHJpZnRpbmcgYXdheSBpZiBib3RzIGRvbid0IHJlLXJ1biBjbWFrZQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434559</attachid>
            <date>2021-07-29 12:50:15 -0700</date>
            <delta_ts>2021-07-30 00:12:30 -0700</delta_ts>
            <desc>Follow-up Patch</desc>
            <filename>bug-228581-20210729225013.patch</filename>
            <type>text/plain</type>
            <size>4453</size>
            <attacher name="Adrian Perez">aperez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvRmlu
ZExpYkdjcnlwdC5jbWFrZSBiL1NvdXJjZS9jbWFrZS9GaW5kTGliR2NyeXB0LmNtYWtlCmluZGV4
IDJiMWFjZTMwMzE2NGJmZjU3M2Q5NmNkNjk0YWU5MTNjNjdkNjBhOTkuLjVkYTcxOGU0ZjE0ZDIx
OTI4NTg3M2EzZGE3OWJmY2U3YjQwOTIwZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9GaW5k
TGliR2NyeXB0LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9GaW5kTGliR2NyeXB0LmNtYWtlCkBA
IC00MSw4ICs0MSwxMSBAQCBJbXBvcnRlZCBUYXJnZXRzCiBmaW5kX3BhY2thZ2UoUGtnQ29uZmln
IFFVSUVUKQogZmluZF9wcm9ncmFtKExJQkdDUllQVENPTkZJR19TQ1JJUFQgTkFNRVMgbGliZ2Ny
eXB0LWNvbmZpZykKIGlmIChQa2dDb25maWdfRk9VTkQpCisgICAgIyBYWFg6IFRoZSBsaWJnY3J5
cHQucGMgZmlsZSBkb2VzIG5vdCBsaXN0IGdwZy1lcnJvciBhcyBhIGRlcGVuZGVuY3ksCisgICAg
IyAgICAgIHJlc3VsdGluZyBpbiBsaW5raW5nIGVycm9yczsgc2VhcmNoIGZvciB0aGUgbGF0dGVy
IGFzIHdlbGwuCiAgICAgcGtnX2NoZWNrX21vZHVsZXMoUENfR0NSWVBUIFFVSUVUIGxpYmdjcnlw
dCkKLSAgICBzZXQoTGliR2NyeXB0X0NPTVBJTEVfT1BUSU9OUyAke1BDX0dDUllQVF9DRkxBR1Nf
T1RIRVJ9KQorICAgIHBrZ19jaGVja19tb2R1bGVzKFBDX0dQR0VSUk9SIFFVSUVUIGdwZy1lcnJv
cikKKyAgICBzZXQoTGliR2NyeXB0X0NPTVBJTEVfT1BUSU9OUyAke1BDX0dDUllQVF9DRkxBR1Nf
T1RIRVJ9ICR7UENfR1BHRVJST1JfQ0ZMQUdTX09USEVSfSkKICAgICBzZXQoTGliR2NyeXB0X1ZF
UlNJT04gJHtQQ19HQ1JZUFRfVkVSU0lPTn0pCiBlbHNlaWYgKExJQkdDUllQVENPTkZJR19TQ1JJ
UFQpCiAgICAgZXhlY3V0ZV9wcm9jZXNzKApAQCAtNjcsNyArNzAsNyBAQCBlbHNlaWYgKExJQkdD
UllQVENPTkZJR19TQ1JJUFQpCiAgICAgZW5kaWYgKCkKIAogICAgIGV4ZWN1dGVfcHJvY2VzcygK
LSAgICAgICAgQ09NTUFORCAiJHtMSUJHQ1JZUFRDT05GSUdfU0NSSVBUfSIgLS1jZmxhZ3MKKyAg
ICAgICAgQ09NTUFORCAiJHtMSUJHQ1JZUFRDT05GSUdfU0NSSVBUfSIgLS12ZXJzaW9uCiAgICAg
ICAgIFJFU1VMVF9WQVJJQUJMRSBDT05GSUdTQ1JJUFRfUkVTVUxUCiAgICAgICAgIE9VVFBVVF9W
QVJJQUJMRSBDT05GSUdTQ1JJUFRfVkFMVUUKICAgICAgICAgT1VUUFVUX1NUUklQX1RSQUlMSU5H
X1dISVRFU1BBQ0UKQEAgLTc3LDYgKzgwLDE5IEBAIGVsc2VpZiAoTElCR0NSWVBUQ09ORklHX1ND
UklQVCkKICAgICBlbmRpZiAoKQogZW5kaWYgKCkKIAorZmluZF9wYXRoKExpYkdjcnlwdF9HcGdF
cnJvcl9JTkNMVURFX0RJUgorICAgIE5BTUVTIGdwZy1lcnJvci5oCisgICAgSElOVFMgJHtQQ19H
UEdFUlJPUl9JTkNMVURFRElSfSAke1BDX0dQR0VSUk9SX0lOQ0xVREVfRElSU30KKyAgICAgICAg
ICAke1BDX0dDUllQVF9JTkNMVURFRElSfSAke1BDX0dDUllQVF9JTkNMVURFX0RJUlN9CisgICAg
ICAgICAgJHtMSUJHQ1JZUFRfU0NSSVBUX0lOQ0xVREVfSElOVH0gJHtMaWJHY3J5cHRfSU5DTFVE
RV9ESVJ9CispCisKK2ZpbmRfbGlicmFyeShMaWJHY3J5cHRfR3BnRXJyb3JfTElCUkFSWQorICAg
IE5BTUVTICR7TGliR2NyeXB0X0dwZ0Vycm9yX05BTUVTfSBncGctZXJyb3IgbGliZ3BnLWVycm9y
CisgICAgSElOVFMgJHtQQ19HUEdFUlJPUl9MSUJESVJ9ICR7UENfR1BHRVJST1JfTElCUkFSWV9E
SVJTfQorICAgICAgICAgICR7UENfR0NSWVBUX0xJQkRJUn0gJHtQQ19HQ1JZUFRfTElCUkFSWV9E
SVJTfSAke0xJQkdDUllQVF9TQ1JJUFRfTElCX0hJTlR9CispCisKIGZpbmRfcGF0aChMaWJHY3J5
cHRfSU5DTFVERV9ESVIKICAgICBOQU1FUyBnY3J5cHQuaAogICAgIEhJTlRTICR7UENfR0NSWVBU
X0lOQ0xVREVESVJ9ICR7UENfR0NSWVBUX0lOQ0xVREVfRElSU30KQEAgLTk3LDkgKzExMywxOCBA
QCBpbmNsdWRlKEZpbmRQYWNrYWdlSGFuZGxlU3RhbmRhcmRBcmdzKQogZmluZF9wYWNrYWdlX2hh
bmRsZV9zdGFuZGFyZF9hcmdzKExpYkdjcnlwdAogICAgIEZPVU5EX1ZBUiBMaWJHY3J5cHRfRk9V
TkQKICAgICBSRVFVSVJFRF9WQVJTIExpYkdjcnlwdF9MSUJSQVJZIExpYkdjcnlwdF9JTkNMVURF
X0RJUgorICAgICAgICAgICAgICAgICAgTGliR2NyeXB0X0dwZ0Vycm9yX0xJQlJBUlkgTGliR2Ny
eXB0X0dwZ0Vycm9yX0lOQ0xVREVfRElSCiAgICAgVkVSU0lPTl9WQVIgTGliR2NyeXB0X1ZFUlNJ
T04KICkKIAoraWYgKExpYkdjcnlwdF9HcGdFcnJvcl9MSUJSQVJZIEFORCBOT1QgVEFSR0VUIExp
YkdjcnlwdDo6R3BnRXJyb3IpCisgICAgYWRkX2xpYnJhcnkoTGliR2NyeXB0OjpHcGdFcnJvciBV
TktOT1dOIElNUE9SVEVEIEdMT0JBTCkKKyAgICBzZXRfdGFyZ2V0X3Byb3BlcnRpZXMoTGliR2Ny
eXB0OjpHcGdFcnJvciBQUk9QRVJUSUVTCisgICAgICAgIElNUE9SVEVEX0xPQ0FUSU9OICIke0xp
YkdjcnlwdF9HcGdFcnJvcl9MSUJSQVJZfSIKKyAgICAgICAgSU5URVJGQUNFX0lOQ0xVREVfRElS
RUNUT1JJRVMgIiR7TGliR2NyeXB0X0dwZ0Vycm9yX0lOQ0xVREVfRElSfSIKKyAgICApCitlbmRp
ZiAoKQorCiBpZiAoTGliR2NyeXB0X0xJQlJBUlkgQU5EIE5PVCBUQVJHRVQgTGliR2NyeXB0OjpM
aWJHY3J5cHQpCiAgICAgYWRkX2xpYnJhcnkoTGliR2NyeXB0OjpMaWJHY3J5cHQgVU5LTk9XTiBJ
TVBPUlRFRCBHTE9CQUwpCiAgICAgc2V0X3RhcmdldF9wcm9wZXJ0aWVzKExpYkdjcnlwdDo6TGli
R2NyeXB0IFBST1BFUlRJRVMKQEAgLTEwNywxMSArMTMyLDEzIEBAIGlmIChMaWJHY3J5cHRfTElC
UkFSWSBBTkQgTk9UIFRBUkdFVCBMaWJHY3J5cHQ6OkxpYkdjcnlwdCkKICAgICAgICAgSU5URVJG
QUNFX0NPTVBJTEVfT1BUSU9OUyAiJHtMaWJHY3J5cHRfQ09NUElMRV9PUFRJT05TfSIKICAgICAg
ICAgSU5URVJGQUNFX0lOQ0xVREVfRElSRUNUT1JJRVMgIiR7TGliR2NyeXB0X0lOQ0xVREVfRElS
fSIKICAgICApCisgICAgdGFyZ2V0X2xpbmtfbGlicmFyaWVzKExpYkdjcnlwdDo6TGliR2NyeXB0
IElOVEVSRkFDRSBMaWJHY3J5cHQ6OkdwZ0Vycm9yKQogZW5kaWYgKCkKIAotbWFya19hc19hZHZh
bmNlZChMaWJHY3J5cHRfSU5DTFVERV9ESVIgTGliR2NyeXB0X0xJQlJBUlkpCittYXJrX2FzX2Fk
dmFuY2VkKExpYkdjcnlwdF9JTkNMVURFX0RJUiBMaWJHY3J5cHRfTElCUkFSWQorICAgIExpYkdj
cnlwdF9HcGdFcnJvcl9JTkNMVURFX0RJUiBMaWJHY3J5cHRfR3BnRXJyb3JfTElCUkFSWSkKIAog
aWYgKExpYkdjcnlwdF9GT1VORCkKLSAgICBzZXQoTGliR2NyeXB0X0xJQlJBUklFUyAke0xpYkdj
cnlwdF9MSUJSQVJZfSkKLSAgICBzZXQoTGliR2NyeXB0X0lOQ0xVREVfRElSUyAke0xpYkdjcnlw
dF9JTkNMVURFX0RJUn0pCisgICAgc2V0KExpYkdjcnlwdF9MSUJSQVJJRVMgJHtMaWJHY3J5cHRf
TElCUkFSWX0gJHtMaWJHY3J5cHRfR3BnRXJyb3JfTElCUkFSWX0pCisgICAgc2V0KExpYkdjcnlw
dF9JTkNMVURFX0RJUlMgJHtMaWJHY3J5cHRfSU5DTFVERV9ESVJ9ICR7TGliR2NyeXB0X0dwZ0Vy
cm9yX0lOQ0xVREVfRElSfSkKIGVuZGlmICgpCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFu
Z2VMb2cKaW5kZXggNjE2ZjA2MGMxOGU2MWE5ZDkyN2YzNGU5MjE0ODhiOWIyMmEyYjE1Yi4uMjRj
OWI1MjMxNDkxNTVlNjdjYTA3YjdmODVjM2NlYmQ1NmJjZmI5NiAxMDA2NDQKLS0tIGEvQ2hhbmdl
TG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA3LTI5ICBBZHJpYW4g
UGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0NNYWtlXSBG
aXggbWlzc2luZyBsaWJncGctZXJyb3Igbm90IGFkZGVkIHRvIGxpbmsgY29tbWFuZHMgYXMgbGli
Z2NyeXB0IGRlcCBhZnRlciByMjgwNDIzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0yMjg1ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICAqIFNvdXJjZS9jbWFrZS9GaW5kTGliR2NyeXB0LmNtYWtlOiBNYW51
YWxseSBzZWFyY2ggZm9yIGxpYmdwZy1lcnJvciwgd2hpY2ggaXMgbm90IGxpc3RlZAorICAgICAg
ICBpbiBsaWJnY3J5cHQucGMgYXMgYSBkZXBlbmRlbmN5LCBhZGQgYW4gaW1wb3J0ZWQgdGFyZ2V0
IGZvciBpdCwgYW5kIGFkZCBpdCBhcyBhIGRlcGVuZGVuY3kKKyAgICAgICAgb2YgTGliR2NyeXB0
OjpMaWJHY3J5cHQgdG8gYXZvaWQgbWlzc2luZyBzeW1ib2xzIGF0IGxpbmsgdGltZS4KKwogMjAy
MS0wNy0yOSAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgogCiAg
ICAgICAgIFtDTWFrZV0gVXNlIGFuIGltcG9ydGVkIHRhcmdldCBmb3IgdGhlIGxpYmdjcnlwdCBs
aWJyYXJ5Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434608</attachid>
            <date>2021-07-30 00:12:35 -0700</date>
            <delta_ts>2021-07-30 01:29:39 -0700</delta_ts>
            <desc>Follow-up Patch (bis)</desc>
            <filename>bug-228581-20210730101233.patch</filename>
            <type>text/plain</type>
            <size>2144</size>
            <attacher name="Adrian Perez">aperez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvRmlu
ZExpYkdjcnlwdC5jbWFrZSBiL1NvdXJjZS9jbWFrZS9GaW5kTGliR2NyeXB0LmNtYWtlCmluZGV4
IDVkYTcxOGU0ZjE0ZDIxOTI4NTg3M2EzZGE3OWJmY2U3YjQwOTIwZTQuLjhiZWU3Mjk2MzkwMjhh
MjJkNTI2OWJjYTU5OTNjNzVlM2JlOTMwZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9GaW5k
TGliR2NyeXB0LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9GaW5kTGliR2NyeXB0LmNtYWtlCkBA
IC00Nyw3ICs0Nyw5IEBAIGlmIChQa2dDb25maWdfRk9VTkQpCiAgICAgcGtnX2NoZWNrX21vZHVs
ZXMoUENfR1BHRVJST1IgUVVJRVQgZ3BnLWVycm9yKQogICAgIHNldChMaWJHY3J5cHRfQ09NUElM
RV9PUFRJT05TICR7UENfR0NSWVBUX0NGTEFHU19PVEhFUn0gJHtQQ19HUEdFUlJPUl9DRkxBR1Nf
T1RIRVJ9KQogICAgIHNldChMaWJHY3J5cHRfVkVSU0lPTiAke1BDX0dDUllQVF9WRVJTSU9OfSkK
LWVsc2VpZiAoTElCR0NSWVBUQ09ORklHX1NDUklQVCkKK2VuZGlmICgpCisKK2lmIChMSUJHQ1JZ
UFRDT05GSUdfU0NSSVBUIEFORCBOT1QgUENfR0NSWVBUKQogICAgIGV4ZWN1dGVfcHJvY2VzcygK
ICAgICAgICAgQ09NTUFORCAiJHtMSUJHQ1JZUFRDT05GSUdfU0NSSVBUfSIgLS1wcmVmaXgKICAg
ICAgICAgUkVTVUxUX1ZBUklBQkxFIENPTkZJR1NDUklQVF9SRVNVTFQKQEAgLTEwNSw4ICsxMDcs
OCBAQCBmaW5kX2xpYnJhcnkoTGliR2NyeXB0X0xJQlJBUlkKICkKIAogaWYgKExpYkdjcnlwdF9J
TkNMVURFX0RJUiBBTkQgTk9UIExpYkdjcnlwdF9WRVJTSU9OKQotICAgIGZpbGUoU1RSSU5HUyAk
e0xJQkdDUllQVF9JTkNMVURFX0RJUn0vZ2NyeXB0LmggR0NSWVBUX0ggUkVHRVggIl4jZGVmaW5l
IEdDUllQVF9WRVJTSU9OICIpCi0gICAgc3RyaW5nKFJFR0VYIFJFUExBQ0UgIl4jZGVmaW5lIEdD
UllQVF9WRVJTSU9OIFwiKC4qKVwiLiokIiAiXFwxIiBMaWJHY3J5cHRfVkVSU0lPTiAiJHtHQ1JZ
UFRfSH0iKQorICAgIGZpbGUoU1RSSU5HUyAke0xpYkdjcnlwdF9JTkNMVURFX0RJUn0vZ2NyeXB0
LmggR0NSWVBUX0ggUkVHRVggIl4jZGVmaW5lIEdDUllQVF9WRVJTSU9OICIpCisgICAgc3RyaW5n
KFJFR0VYIFJFUExBQ0UgIl4jZGVmaW5lIEdDUllQVF9WRVJTSU9OIFwiKFswLTkuXVwrKVteXCJd
KlwiLiokIiAiXFwxIiBMaWJHY3J5cHRfVkVSU0lPTiAiJHtHQ1JZUFRfSH0iKQogZW5kaWYgKCkK
IAogaW5jbHVkZShGaW5kUGFja2FnZUhhbmRsZVN0YW5kYXJkQXJncykKZGlmZiAtLWdpdCBhL0No
YW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAxNjZiODFiNmNkYjBmZTM0NzlmOWNlNDViNmU2Njdk
MDk1NTBjODRkLi4xMTIzNDhiMzZhMDE3NWI5MWIxNzZhMTZjMGViNDFmMTdhM2E3MTZiIDEwMDY0
NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEt
MDctMzAgIEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KKworICAg
ICAgICBbQ01ha2VdIEZpeCBmYWxsYmFjayBtZXRob2RzIGluIHRoZSBsaWJnY3J5cHQgZmluZCBt
b2R1bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
ODU4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog
U291cmNlL2NtYWtlL0ZpbmRMaWJHY3J5cHQuY21ha2U6IE1ha2Ugc3VyZSB0byB1c2UgdGhlIGxp
YmdjcnlwdC1jb25maWcgc2NyaXB0IGFzCisgICAgICAgIGZpcnN0IGZhbGxiYWNrIGlmIGxpYmdj
cnlwdC5wYyBpcyBub3QgcHJlc2VudCwgYW5kIGZpeCB0aGUgcmVnZXhwIHVzZWQgYXMgbGFzdCBm
YWxsYmFjaworICAgICAgICB0aGF0IGNoZWNrcyB0aGUgdmVyc2lvbiBmcm9tIHRoZSBnY3J5cHQu
aCBoZWFkZXIgYXMgbGFzdCBmYWxsYmFjayB0byBvbmx5IGluY2x1ZGUgZGlnaXRzCisgICAgICAg
IGFuZCBwZXJpb2RzLgorCiAyMDIxLTA3LTI5ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVs
ZEBhcHBsZS5jb20+CiAKICAgICAgICAgU3RvcCBidWlsZGluZyBXZWJHUFUgYW5kIHRoZSBXSExT
TCBjb21waWxlciB0byBkZWNyZWFzZSBiaW5hcnkgc2l6ZQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>