<?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>235476</bug_id>
          
          <creation_ts>2022-01-22 06:25:21 -0800</creation_ts>
          <short_desc>[CMake] Stop defaulting to ld.gold</short_desc>
          <delta_ts>2022-02-09 07:21:26 -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>CMake</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Mac (Apple Silicon)</rep_platform>
          <op_sys>Linux</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=236205</see_also>
    
    <see_also>https://bugs.webkit.org/show_bug.cgi?id=236216</see_also>
    
    <see_also>https://bugs.webkit.org/show_bug.cgi?id=236365</see_also>
          <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>235737</dependson>
    
    <dependson>235975</dependson>
          <blocked>235979</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Michael Catanzaro">mcatanzaro</reporter>
          <assigned_to name="Adrian Perez">aperez</assigned_to>
          <cc>achristensen</cc>
    
    <cc>annulen</cc>
    
    <cc>aperez</cc>
    
    <cc>bugs-noreply</cc>
    
    <cc>cgarcia</cc>
    
    <cc>clopez</cc>
    
    <cc>don.olmstead</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>mcatanzaro</cc>
    
    <cc>pgriffis</cc>
    
    <cc>ryuan.choi</cc>
    
    <cc>saam</cc>
    
    <cc>sergio</cc>
    
    <cc>ysuzuki</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1833003</commentid>
    <comment_count>0</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2022-01-22 06:25:21 -0800</bug_when>
    <thetext>The GNU toolchain maintainers say in https://bugzilla.redhat.com/show_bug.cgi?id=2043178#c8:

&quot;Note, ld.gold is abandoned/barely supported in binutils, switching to ld.bfd is what I&apos;d strongly recommend in any case.&quot;

I&apos;ve been hearing this for a year or two now, so it&apos;s probably time to stop overriding the default linker and assume the system default is best. On most systems, this would be ld.bfd. Forcing ld.gold is especially uncool on systems that use ld.lld, or future systems that might use ld.mold.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1833005</commentid>
    <comment_count>1</comment_count>
      <attachid>449732</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2022-01-22 06:39:45 -0800</bug_when>
    <thetext>Created attachment 449732
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1833006</commentid>
    <comment_count>2</comment_count>
      <attachid>449732</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2022-01-22 06:41:37 -0800</bug_when>
    <thetext>Comment on attachment 449732
Patch

Er wait, this patch is broken, I can see another use of USE_LD_GOLD in the diff itself. &lt;_&lt; It is required for DEBUG_FISSION. Sigh....</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1833007</commentid>
    <comment_count>3</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2022-01-22 06:42:31 -0800</bug_when>
    <thetext>Let&apos;s abandon this for now. We cannot give up debug fission as that makes debug builds take impractically long.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1834711</commentid>
    <comment_count>4</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-27 14:41:52 -0800</bug_when>
    <thetext>(In reply to Michael Catanzaro from comment #2)
&gt; Comment on attachment 449732 [details]
&gt; Patch
&gt; 
&gt; Er wait, this patch is broken, I can see another use of USE_LD_GOLD in the
&gt; diff itself. &lt;_&lt; It is required for DEBUG_FISSION. Sigh....

This shouldn&apos;t be the case, ld.bfd has supported split-debug for a good
while. You can try yourself:

   % cat hello.cc         
   #include &lt;cstdio&gt;
   extern const char* whom();
   int main() { std::printf(&quot;Hello, %s!\n&quot;, whom()); }
   % cat other.cc         
   const char* whom() { return &quot;Pete&quot;; }
   % g++ -gsplit-dwarf -ggdb -c hello.cc                  
   % g++ -gsplit-dwarf -ggdb -c other.cc  
   % g++ -gsplit-dwarf -ggdb -fuse-ld=bfd -o hello hello.o other.o        
   % dwarfdump hello | grep DW_AT_dwo_name | sort -u 
                    DW_AT_dwo_name              hello.dwo
                    DW_AT_dwo_name              other.dwo
  %

So I think it is still a good idea to use ld.bfd by default, and do not
make the DEBUG_FISSION option depend on USE_LD_GOLD. As a matter of fact,
split-debug is *also* supported by lld and mold. GCC is annoying in that
it does not allow passing -fuse-ld=mold, for example, but you can do the
linking command replacing s/g++/clang++/ and the “clang” compiler driver
will use whatever linker you throw at it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1834715</commentid>
    <comment_count>5</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-27 14:46:05 -0800</bug_when>
    <thetext>Let&apos;s do one step at a time and make DEBUG_FISSION not depend on
USE_LD_GOLD first, TBD in bug #235737</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1834872</commentid>
    <comment_count>6</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-28 03:11:48 -0800</bug_when>
    <thetext>So a tricky thing here: even if we do not set USE_LD_GOLD=ON by
default, the system compiler can have been built to use Gold as the
default, or chosen by something like Debian&apos;s update-alternatives,
or an user could run “ln -nf /usr/bin/{ld.gold,ld}”... This means
the build might still be using Gold even with USE_LD_GOLD=OFF.

I think the (most) correct way to go about this is trying to match
the output “${CXX} -Wl,--version” and match the output to determine
what&apos;s the default linker. Then, if no USE_LD_{GOLD,LLD} were set,
and the linker flags do not include a “-fuse-ld=...” flag, arrange
to pass “-fuse-ld=bfd” as the default.

Or should we just keep it simple and set USE_LD_GOLD=OFF by default?
We know that in the Flatpak SDK both the GCC and Clang drivers use
ld.bfd by default so in that case the correct choice would be used,
then packagers would be responsible to not use by default a linker
(Gold in this case) that could break arbitrarily.

Opinions?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1834873</commentid>
    <comment_count>7</comment_count>
      <attachid>450218</attachid>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-28 03:19:05 -0800</bug_when>
    <thetext>Created attachment 450218
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1834874</commentid>
    <comment_count>8</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-28 03:20:44 -0800</bug_when>
    <thetext>(In reply to Adrian Perez from comment #7)
&gt; Created attachment 450218 [details]
&gt; Patch

This version of the patch uses my last suggested approach: do not
try to disable gold if it&apos;s the default and leave that choice to
packagers. Checking which linker is actually in use was needed
anyway to determine whether --gdb-index can be passed to it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1834979</commentid>
    <comment_count>9</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-28 08:10:42 -0800</bug_when>
    <thetext>I have been looking a bit at the red EWS bubbles and finally have
been able to reproduce it here: if there is a previous build done
with ld.gold, and the dirty build directory is used after applying
this patch, *and* at least one static (.a) library does not get
rebuilt, then ld.bfd will fail linking.

The difference I can see is that when choosing ld.bfd in a new build
directory then the generated static libraries are regular archives;
but the ones left from a previous run with ld.gold are thin archives
instead. Could it be that ld.bfd does not like thin archives? I will
try and figure that out.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1834980</commentid>
    <comment_count>10</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-28 08:16:03 -0800</bug_when>
    <thetext>(In reply to Adrian Perez from comment #9)

&gt; The difference I can see is that when choosing ld.bfd in a new build
&gt; directory then the generated static libraries are regular archives;
&gt; but the ones left from a previous run with ld.gold are thin archives
&gt; instead. Could it be that ld.bfd does not like thin archives? I will
&gt; try and figure that out.

Possibly https://sourceware.org/bugzilla/show_bug.cgi?id=28138 - I&apos;ll
see if applying that patch to Binutils solves the problem. Other than
that, thin archives should work just fine with ld.bfd :|</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1834989</commentid>
    <comment_count>11</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2022-01-28 08:43:59 -0800</bug_when>
    <thetext>(In reply to Adrian Perez from comment #6)
&gt; So a tricky thing here: even if we do not set USE_LD_GOLD=ON by
&gt; default, the system compiler can have been built to use Gold as the
&gt; default, or chosen by something like Debian&apos;s update-alternatives,
&gt; or an user could run “ln -nf /usr/bin/{ld.gold,ld}”... This means
&gt; the build might still be using Gold even with USE_LD_GOLD=OFF.

Of course, but that&apos;s fine. This flag is an override &quot;use ld.gold no matter what if ON.&quot; It doesn&apos;t mean &quot;avoid ld.gold no matter what if OFF.&quot;

&gt; I think the (most) correct way to go about this is trying to match
&gt; the output “${CXX} -Wl,--version” and match the output to determine
&gt; what&apos;s the default linker. Then, if no USE_LD_{GOLD,LLD} were set,
&gt; and the linker flags do not include a “-fuse-ld=...” flag, arrange
&gt; to pass “-fuse-ld=bfd” as the default.

Overkill.

&gt; Or should we just keep it simple and set USE_LD_GOLD=OFF by default?
&gt; We know that in the Flatpak SDK both the GCC and Clang drivers use
&gt; ld.bfd by default so in that case the correct choice would be used,
&gt; then packagers would be responsible to not use by default a linker
&gt; (Gold in this case) that could break arbitrarily.

I would just remove the setting. If we want it OFF by default, what&apos;s the point of having it at all? People know how to use -fuse-ld=gold if they really want it, but nobody is going to want it.

(In reply to Adrian Perez from comment #8)
&gt; This version of the patch uses my last suggested approach: do not
&gt; try to disable gold if it&apos;s the default and leave that choice to
&gt; packagers. Checking which linker is actually in use was needed
&gt; anyway to determine whether --gdb-index can be passed to it.

A little web searching indicates that --gdb-index makes gdb faster. I wonder why this flag only exists for certain linkers. Real shame that it has to be different. :/

(In reply to Adrian Perez from comment #10)
&gt; Possibly https://sourceware.org/bugzilla/show_bug.cgi?id=28138 - I&apos;ll
&gt; see if applying that patch to Binutils solves the problem. Other than
&gt; that, thin archives should work just fine with ld.bfd :|

Oh wow... so I don&apos;t know what to do now. Try to get the fixes into Debian? Sounds better than installing a custom binutils on our EWS bots?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835524</commentid>
    <comment_count>12</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-31 07:07:08 -0800</bug_when>
    <thetext>(In reply to Michael Catanzaro from comment #11)
&gt; (In reply to Adrian Perez from comment #6)
&gt; &gt; So a tricky thing here: even if we do not set USE_LD_GOLD=ON by
&gt; &gt; default, the system compiler can have been built to use Gold as the
&gt; &gt; default, or chosen by something like Debian&apos;s update-alternatives,
&gt; &gt; or an user could run “ln -nf /usr/bin/{ld.gold,ld}”... This means
&gt; &gt; the build might still be using Gold even with USE_LD_GOLD=OFF.
&gt; 
&gt; Of course, but that&apos;s fine. This flag is an override &quot;use ld.gold no matter
&gt; what if ON.&quot; It doesn&apos;t mean &quot;avoid ld.gold no matter what if OFF.&quot;

Good, let&apos;s go ahed with the simpler ways :)

&gt; &gt; [...]
&gt; 
&gt; I would just remove the setting. If we want it OFF by default, what&apos;s the
&gt; point of having it at all? People know how to use -fuse-ld=gold if they
&gt; really want it, but nobody is going to want it.

I like this 💣️

&gt; (In reply to Adrian Perez from comment #8)
&gt; &gt; This version of the patch uses my last suggested approach: do not
&gt; &gt; try to disable gold if it&apos;s the default and leave that choice to
&gt; &gt; packagers. Checking which linker is actually in use was needed
&gt; &gt; anyway to determine whether --gdb-index can be passed to it.
&gt; 
&gt; A little web searching indicates that --gdb-index makes gdb faster. I wonder
&gt; why this flag only exists for certain linkers. Real shame that it has to be
&gt; different. :/

Yeah, bit of a pity. Also I don&apos;t like much having to match the output
of “-Wl,--version” to determine whether we can pass “--gdb-index”, I am
looking into changing this to actually run the linker to see whether it
will gladly accept the command line flag—stay tuned for v2 of the patch.

&gt; (In reply to Adrian Perez from comment #10)
&gt; &gt; Possibly https://sourceware.org/bugzilla/show_bug.cgi?id=28138 - I&apos;ll
&gt; &gt; see if applying that patch to Binutils solves the problem. Other than
&gt; &gt; that, thin archives should work just fine with ld.bfd :|
&gt; 
&gt; Oh wow... so I don&apos;t know what to do now. Try to get the fixes into Debian?
&gt; Sounds better than installing a custom binutils on our EWS bots?

I am also looking into determining automatically whether thin archives are
supported by the linker in use. Again, doing feature checks is nicer than
knowing which linker is in use and assuming the options we pass will always
work—a linker from an unpatched binutils will fail the feature test and thin
archives would be disabled (at the cost of more disk space, of course) but
at least the build would not fail.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835529</commentid>
    <comment_count>13</comment_count>
      <attachid>450409</attachid>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-31 07:22:19 -0800</bug_when>
    <thetext>Created attachment 450409
Patch v2</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835530</commentid>
    <comment_count>14</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-31 07:25:21 -0800</bug_when>
    <thetext>(In reply to Adrian Perez from comment #13)
&gt; Created attachment 450409 [details]
&gt; Patch v2

Note that we may still need to clean the CMake cache files for incremental
builds to succeed, because the value of the USE_THIN_ARCHIVES option gets
stored there.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835534</commentid>
    <comment_count>15</comment_count>
      <attachid>450410</attachid>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-31 07:51:26 -0800</bug_when>
    <thetext>Created attachment 450410
Patch v3

Fixes usage of CMAKE_&lt;foo&gt;_{SUFFIX,EXTENSION} variables</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835592</commentid>
    <comment_count>16</comment_count>
      <attachid>450410</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2022-01-31 11:03:44 -0800</bug_when>
    <thetext>Comment on attachment 450410
Patch v3

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

&gt; Source/cmake/OptionsCommon.cmake:134
&gt; +    # Check wether the linker supports --gdb-index. Use try_compile() directly

whether

&gt; Source/cmake/OptionsCommon.cmake:138
&gt; +        &quot;int main(int argc, char** argv) { (void) argc; (void) argv; return 0; }&quot;)

You can simplify this by writing &quot;int main(void)&quot;

&gt; ChangeLog:17
&gt; +        While at it, also feature check whether the linker supports thin archives, in order
&gt; +        to enable them only when actually usable. This avoids situations in which thin archives
&gt; +        can be created by the archiver but later on the linker will not be able to consume them.

This is really far removed from ld.gold -&gt; ld.bfd. Please split it out into a separate bug. r=me applies to the ld.gold changes. I haven&apos;t devoted enough brainpower to think about the thin archive stuff yet, just enough to see that you added more code than removed, which is not ideal.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835607</commentid>
    <comment_count>17</comment_count>
    <who name="Carlos Alberto Lopez Perez">clopez</who>
    <bug_when>2022-01-31 11:23:37 -0800</bug_when>
    <thetext>My understanding is that gold is faster when linking than bfd. I&apos;m not sure if that is still the case.

But if it is, then maybe we should leave gold as default for developer builds in order to speed up the build?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835649</commentid>
    <comment_count>18</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2022-01-31 12:53:35 -0800</bug_when>
    <thetext>(In reply to Carlos Alberto Lopez Perez from comment #17)
&gt; My understanding is that gold is faster when linking than bfd. I&apos;m not sure
&gt; if that is still the case.

I think that may be true, and also it uses significantly less RAM than ld.bfd.

&gt; But if it is, then maybe we should leave gold as default for developer
&gt; builds in order to speed up the build?

That&apos;s certainly an option.

Ultimately, I think it&apos;s more important to use a linker that is well-maintained and expected to work reliably.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835680</commentid>
    <comment_count>19</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-31 13:29:36 -0800</bug_when>
    <thetext>(In reply to Michael Catanzaro from comment #16)
&gt; Comment on attachment 450410 [details]
&gt; Patch v3
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=450410&amp;action=review
&gt; 
&gt; &gt; Source/cmake/OptionsCommon.cmake:134
&gt; &gt; +    # Check wether the linker supports --gdb-index. Use try_compile() directly
&gt; 
&gt; whether

Aye, will fix.

&gt; &gt; Source/cmake/OptionsCommon.cmake:138
&gt; &gt; +        &quot;int main(int argc, char** argv) { (void) argc; (void) argv; return 0; }&quot;)
&gt; 
&gt; You can simplify this by writing &quot;int main(void)&quot;

Good point. I thought the C compiler would be more strict with the
definition of main() but after trying a few different -std=… options
your version works even with -Wall. Let&apos;s simplify this.

&gt; &gt; ChangeLog:17
&gt; &gt; +        While at it, also feature check whether the linker supports thin archives, in order
&gt; &gt; +        to enable them only when actually usable. This avoids situations in which thin archives
&gt; &gt; +        can be created by the archiver but later on the linker will not be able to consume them.
&gt; 
&gt; This is really far removed from ld.gold -&gt; ld.bfd. Please split it out into
&gt; a separate bug. r=me applies to the ld.gold changes. I haven&apos;t devoted
&gt; enough brainpower to think about the thin archive stuff yet, just enough to
&gt; see that you added more code than removed, which is not ideal.

If I split this into a separate bug/patch, we&apos;ll need this one to depend
on the new one, because currently thin archives are enabled by default if
running “ar -V” prints “GNU” — the ability of the linker to *consume* them
is not taken into account! This is why switching to ld.bfd results in builds
failing due to bug https://sourceware.org/bugzilla/show_bug.cgi?id=28138

What the new CHECK_THIN_ARCHIVE_SUPPORT() function does is:

 - Compile test-thin-archive.c → test-thin-archive.o → libtest-thin-archive.a
 - Compile test-thin-archive-main.c → test-thin-archive-main.o
 - Link test-thin-archive-main.o + libtest-thin-archive.a → test-thin-archive

If any of the above steps fails, it returns OFF/FALSE; if all the steps
succeed, then it returns ON/TRUE. Or, in other words: it tries to create
and use a thin archive — that&apos;s all. Hopefully the explanation helps out
with reviewing… or would you still prefer this part as a separate patch?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835682</commentid>
    <comment_count>20</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-31 13:32:04 -0800</bug_when>
    <thetext>(In reply to Michael Catanzaro from comment #18)
&gt; (In reply to Carlos Alberto Lopez Perez from comment #17)
&gt; &gt; My understanding is that gold is faster when linking than bfd. I&apos;m not sure
&gt; &gt; if that is still the case.
&gt; 
&gt; I think that may be true, and also it uses significantly less RAM than
&gt; ld.bfd.

Yet lld and mold are faster than gold anyway. So I would rather default
to using lld if available. We have lld already in the Flatpak SDK, which
is what most developers and build bots use anyway.

If we combine this with a follow-up patch to default to lld, we get
both *even faster* builds and stop using a poorly maintainer program.

&gt; &gt; But if it is, then maybe we should leave gold as default for developer
&gt; &gt; builds in order to speed up the build?
&gt; 
&gt; That&apos;s certainly an option.
&gt;
&gt; Ultimately, I think it&apos;s more important to use a linker that is
&gt; well-maintained and expected to work reliably.

Reliability and correctness are the key here. I would rather default to
lld for developer builds than to gold.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835726</commentid>
    <comment_count>21</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2022-01-31 14:29:46 -0800</bug_when>
    <thetext>(In reply to Adrian Perez from comment #19)
&gt; If any of the above steps fails, it returns OFF/FALSE; if all the steps
&gt; succeed, then it returns ON/TRUE. Or, in other words: it tries to create
&gt; and use a thin archive — that&apos;s all. Hopefully the explanation helps out
&gt; with reviewing… or would you still prefer this part as a separate patch?

Well since it is directly related, I think it&apos;s fine in one patch. Real shame that we need to add so much test code, though. :( And all just to handle an ld.bfd bug that is already fixed.

I have a counterproposal: instead of adding this test code to the CMakeLists.txt, let&apos;s configure any affected EWS to build with -fuse-ld=gold, with a pointer to this issue so that we can remove that in the future when they upgrade to a newer Debian with fixed ld.bfd. What do you think? I am trying to avoid the need to bloat the file so much as a workaround for an old bug.

Audacious alternative: we could request that the Debian binutils maintainer backport the patch that fixed this.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835738</commentid>
    <comment_count>22</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-31 15:05:15 -0800</bug_when>
    <thetext>(In reply to Michael Catanzaro from comment #21)
&gt; (In reply to Adrian Perez from comment #19)
&gt; &gt; If any of the above steps fails, it returns OFF/FALSE; if all the steps
&gt; &gt; succeed, then it returns ON/TRUE. Or, in other words: it tries to create
&gt; &gt; and use a thin archive — that&apos;s all. Hopefully the explanation helps out
&gt; &gt; with reviewing… or would you still prefer this part as a separate patch?
&gt; 
&gt; Well since it is directly related, I think it&apos;s fine in one patch. Real
&gt; shame that we need to add so much test code, though. :( And all just to
&gt; handle an ld.bfd bug that is already fixed.

It does not “just” to handle the ld.bfd bug. Let me rephrase something I
wrote above:

 - Currently thin archives are enabled if “ar” can create them.
 - Currently we do NOT test that the linker (whichever is is use)
   reads thin archives.

Therefore:

 - If the linker (any linker, not just ld.bfd!) cannot read thin
   archives, the build will fail.

For example, building on MacOS “llvm-ar” would be used as the archiver,
and it supports thin archives, but the default “ld64” linker does NOT
support reading them… resulting in a failed build.

The only 100% reliable solution is:

 - Test that “ar” can create thin archives, and
 - Test that the linker (whichever is in use) can read thin archives.

&gt; I have a counterproposal: instead of adding this test code to the
&gt; CMakeLists.txt, let&apos;s configure any affected EWS to build with
&gt; -fuse-ld=gold, with a pointer to this issue so that we can remove that in
&gt; the future when they upgrade to a newer Debian with fixed ld.bfd. What do
&gt; you think? I am trying to avoid the need to bloat the file so much as a
&gt; workaround for an old bug.

That would be a workaround, and as explained above would not cover
setups that can be reasonably found in the wild.

&gt; Audacious alternative: we could request that the Debian binutils maintainer
&gt; backport the patch that fixed this.

We can ask about that in parallel, but we will still need to check
whether the linker currently being used can ingest thin archives.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835768</commentid>
    <comment_count>23</comment_count>
      <attachid>450476</attachid>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-01-31 16:50:23 -0800</bug_when>
    <thetext>Created attachment 450476
Patch v4

Applies edits suggested by Michael, simplifies things</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835783</commentid>
    <comment_count>24</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2022-01-31 17:20:11 -0800</bug_when>
    <thetext>Could we just use thin archives only on Linux? Sure it would be less accurate, but as a practical matter, thin archives are expected to work on Linux unless you are using a seriously oddball toolchain (sans bugs).

I&apos;m not going to r- this. If you really want these checks, well, OK. But I&apos;m not enthused about adding so many new tests and enlarging this file, as it doesn&apos;t really seem needed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835854</commentid>
    <comment_count>25</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-02-01 00:57:55 -0800</bug_when>
    <thetext>(In reply to Michael Catanzaro from comment #24)
&gt; Could we just use thin archives only on Linux? Sure it would be less
&gt; accurate, but as a practical matter, thin archives are expected to work on
&gt; Linux unless you are using a seriously oddball toolchain (sans bugs).

We can go back to matching the output from “${CC} -Wl,--version” and
matching those linkers we know support thin archives. Maybe that is
better as it implies “this is the list of linkers actually tested to
be working”, dunno 🤔️ 

&gt; I&apos;m not going to r- this. If you really want these checks, well, OK. But I&apos;m
&gt; not enthused about adding so many new tests and enlarging this file, as it
&gt; doesn&apos;t really seem needed.

Well, I&apos;m not going to cq+ it either because I just found a case in which
the checks are failing to disable thin archives ~_~

It seems I will be submitting a fifth iteration of the patch in the end.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1835938</commentid>
    <comment_count>26</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2022-02-01 06:39:37 -0800</bug_when>
    <thetext>(In reply to Adrian Perez from comment #25)
&gt; Well, I&apos;m not going to cq+ it either because I just found a case in which
&gt; the checks are failing to disable thin archives ~_~

It seems the EWS has also found this case. I see red. :(</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1836156</commentid>
    <comment_count>27</comment_count>
      <attachid>450570</attachid>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-02-01 14:47:42 -0800</bug_when>
    <thetext>Created attachment 450570
Patch v5


Go back to explicitly listing which features known linkers and archivers
support, which covers the ones I have successfully tested. Note that we
need the patch from bug #235975 and an updated Flatpak SDK deployed before
the EWS will be happy.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1836164</commentid>
    <comment_count>28</comment_count>
      <attachid>450570</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2022-02-01 14:56:31 -0800</bug_when>
    <thetext>Comment on attachment 450570
Patch v5

Meh. This isn&apos;t great, but I can&apos;t think of anything better.

r=me if you can make EWS happy.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1836189</commentid>
    <comment_count>29</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-02-01 15:29:49 -0800</bug_when>
    <thetext>(In reply to Michael Catanzaro from comment #28)
&gt; Comment on attachment 450570 [details]
&gt; Patch v5
&gt; 
&gt; Meh. This isn&apos;t great, but I can&apos;t think of anything better.
&gt; 
&gt; r=me if you can make EWS happy.

The EWS will eventually be happy, once we deploy the Flatpak SDK with
the binutils patch.

Also I now realized looking at your first patch that we should do
something like:

  if (ARM_TRADITIONAL_DETECTED AND LD_VARIANT STREQUAL GOLD)
      message(WARNING &quot;Using ld.gold when targeting traditional ARM may result in errors&quot;)
  endif ()

Or should we just go ahead and use message(FATAL_ERROR …) instead?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1836196</commentid>
    <comment_count>30</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2022-02-01 15:53:29 -0800</bug_when>
    <thetext>(In reply to Adrian Perez from comment #29) 
&gt;   if (ARM_TRADITIONAL_DETECTED AND LD_VARIANT STREQUAL GOLD)
&gt;       message(WARNING &quot;Using ld.gold when targeting traditional ARM may
&gt; result in errors&quot;)
&gt;   endif ()
&gt; 
&gt; Or should we just go ahead and use message(FATAL_ERROR …) instead?

I would just remove it. We no longer force use of ld.gold, so it&apos;s not really our problem. If somebody tries it and finds that it doesn&apos;t work, they&apos;ll probably switch back to the default linker and move on.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1836197</commentid>
    <comment_count>31</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2022-02-01 15:55:09 -0800</bug_when>
    <thetext>In case it&apos;s not clear, I have a strong bias for removing as much CMake goo as possible, except for the goo that we really need to do useful stuff. Most build systems do not care about which linker is being used. We probably really need most of this goo, for debug fission and also because thin archives are probably important with our massive static libs(?). But if there&apos;s any question whether it&apos;s really needed, I&apos;d say probably not.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1836381</commentid>
    <comment_count>32</comment_count>
      <attachid>450627</attachid>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-02-02 02:04:40 -0800</bug_when>
    <thetext>Created attachment 450627
Patch v6

Hopefuly &quot;patch for landing&quot; :-)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1836396</commentid>
    <comment_count>33</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-02-02 03:17:47 -0800</bug_when>
    <thetext>(In reply to Michael Catanzaro from comment #31)
&gt; In case it&apos;s not clear, I have a strong bias for removing as much CMake goo
&gt; as possible, except for the goo that we really need to do useful stuff. Most
&gt; build systems do not care about which linker is being used. We probably
&gt; really need most of this goo, for debug fission and also because thin
&gt; archives are probably important with our massive static libs(?). But if
&gt; there&apos;s any question whether it&apos;s really needed, I&apos;d say probably not.

I have removed the ARM_TRADITIONAL_DETECTED leftover in the end, and now
the EWS builders are greed after deploying an updated Flatpak SDK with the
binutils fix for thin archives applied 🙌️</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1836397</commentid>
    <comment_count>34</comment_count>
    <who name="Adrian Perez">aperez</who>
    <bug_when>2022-02-02 03:24:24 -0800</bug_when>
    <thetext>(In reply to Adrian Perez from comment #20)
&gt; (In reply to Michael Catanzaro from comment #18)
&gt; &gt; (In reply to Carlos Alberto Lopez Perez from comment #17)
&gt; &gt; &gt; My understanding is that gold is faster when linking than bfd. I&apos;m not sure
&gt; &gt; &gt; if that is still the case.
&gt; &gt; 
&gt; &gt; I think that may be true, and also it uses significantly less RAM than
&gt; &gt; ld.bfd.
&gt; 
&gt; Yet lld and mold are faster than gold anyway. So I would rather default
&gt; to using lld if available. We have lld already in the Flatpak SDK, which
&gt; is what most developers and build bots use anyway.
&gt; 
&gt; If we combine this with a follow-up patch to default to lld, we get
&gt; both *even faster* builds and stop using a poorly maintainer program.

That will be bug #235979 — it will take me a few days to get to it, so
if someone else wants to try making the patch in the meantime after this
one lands I can find a moment to help with reviews.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1836620</commentid>
    <comment_count>35</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-02-02 13:42:18 -0800</bug_when>
    <thetext>Committed r288994 (246713@main): &lt;https://commits.webkit.org/246713@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 450627.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449732</attachid>
            <date>2022-01-22 06:39:45 -0800</date>
            <delta_ts>2022-01-22 06:41:37 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235476-20220122083944.patch</filename>
            <type>text/plain</type>
            <size>3124</size>
            <attacher name="Michael Catanzaro">mcatanzaro</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4Mzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0
aW9uc0NvbW1vbi5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCmluZGV4
IDE0MTZjNTg3ZjViMTFmZWY2YWFhNGNmNzVjMjg2MGY5OTNhZjQyMmYuLjJlOTZmNjljMGQwNTNh
OGEzMmY0Y2YzZDUzNDRhOTc1N2E3N2FhZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRp
b25zQ29tbW9uLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCkBA
IC0yNSw3ICsyNSw2IEBAIGVuZGlmICgpCiBzZXRfcHJvcGVydHkoR0xPQkFMIFBST1BFUlRZIFVT
RV9GT0xERVJTIE9OKQogZGVmaW5lX3Byb3BlcnR5KFRBUkdFVCBQUk9QRVJUWSBGT0xERVIgSU5I
RVJJVEVEIEJSSUVGX0RPQ1MgImZvbGRlciIgRlVMTF9ET0NTICJJREUgZm9sZGVyIG5hbWUiKQog
Ci1zZXQoQVJNX1RSQURJVElPTkFMX0RFVEVDVEVEIEZBTFNFKQogaWYgKFdURl9DUFVfQVJNKQog
ICAgIHNldChBUk1fVEhVTUIyX1RFU1RfU09VUkNFCiAgICAgIgpAQCAtMzYsMTYgKzM1LDExIEBA
IGlmIChXVEZfQ1BVX0FSTSkKICAgICIpCiAKICAgICBDSEVDS19DWFhfU09VUkNFX0NPTVBJTEVT
KCIke0FSTV9USFVNQjJfVEVTVF9TT1VSQ0V9IiBBUk1fVEhVTUIyX0RFVEVDVEVEKQotICAgIGlm
IChOT1QgQVJNX1RIVU1CMl9ERVRFQ1RFRCkKLSAgICAgICAgc2V0KEFSTV9UUkFESVRJT05BTF9E
RVRFQ1RFRCBUUlVFKQotICAgICAgICAjIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MTU5ODgwI2M0IGZvciBkZXRhaWxzLgotICAgICAgICBtZXNzYWdlKFNUQVRV
UyAiRGlzYWJsaW5nIEdOVSBnb2xkIGxpbmtlciwgYmVjYXVzZSBpdCBkb2Vzbid0IHN1cHBvcnQg
QVJNIGluc3RydWN0aW9uIHNldCBwcm9wZXJseS4iKQotICAgIGVuZGlmICgpCiBlbmRpZiAoKQog
CiAjIFVzZSBsZC5sbGQgd2hlbiBidWlsZGluZyB3aXRoIExUTwogQ01BS0VfREVQRU5ERU5UX09Q
VElPTihVU0VfTERfTExEICJVc2UgTExEIGxpbmtlciIgT04KLSAgICAgICAgICAgICAgICAgICAg
ICAgIkxUT19NT0RFO05PVCBVU0VfTERfR09MRDtOT1QgV0lOMzIiIE9GRikKKyAgICAgICAgICAg
ICAgICAgICAgICAgIkxUT19NT0RFO05PVCBXSU4zMiIgT0ZGKQogaWYgKFVTRV9MRF9MTEQpCiAg
ICAgZXhlY3V0ZV9wcm9jZXNzKENPTU1BTkQgJHtDTUFLRV9DX0NPTVBJTEVSfSAtZnVzZS1sZD1s
bGQgLVdsLC0tdmVyc2lvbiBFUlJPUl9RVUlFVCBPVVRQVVRfVkFSSUFCTEUgTERfVkVSU0lPTikK
ICAgICBpZiAoIiR7TERfVkVSU0lPTn0iIE1BVENIRVMgIkxMRCIpCkBAIC01NywyMSArNTEsNiBA
QCBpZiAoVVNFX0xEX0xMRCkKICAgICBlbmRpZiAoKQogZW5kaWYgKCkKIAotIyBVc2UgbGQuZ29s
ZCBpZiBpdCBpcyBhdmFpbGFibGUgYW5kIGlzbid0IGRpc2FibGVkIGV4cGxpY2l0bHkKLUNNQUtF
X0RFUEVOREVOVF9PUFRJT04oVVNFX0xEX0dPTEQgIlVzZSBHTlUgZ29sZCBsaW5rZXIiIE9OCi0g
ICAgICAgICAgICAgICAgICAgICAgICJOT1QgQ1hYX0FDQ0VQVFNfTUZJWF9DT1JURVhfQTUzXzgz
NTc2OTtOT1QgQVJNX1RSQURJVElPTkFMX0RFVEVDVEVEO05PVCBXSU4zMjtOT1QgQVBQTEU7Tk9U
IFVTRV9MRF9MTEQiIE9GRikKLWlmIChVU0VfTERfR09MRCkKLSAgICBleGVjdXRlX3Byb2Nlc3Mo
Q09NTUFORCAke0NNQUtFX0NfQ09NUElMRVJ9IC1mdXNlLWxkPWdvbGQgLVdsLC0tdmVyc2lvbiBF
UlJPUl9RVUlFVCBPVVRQVVRfVkFSSUFCTEUgTERfVkVSU0lPTikKLSAgICBpZiAoIiR7TERfVkVS
U0lPTn0iIE1BVENIRVMgIkdOVSBnb2xkIikKLSAgICAgICAgc3RyaW5nKEFQUEVORCBDTUFLRV9F
WEVfTElOS0VSX0ZMQUdTICIgLWZ1c2UtbGQ9Z29sZCAtV2wsLS1kaXNhYmxlLW5ldy1kdGFncyIp
Ci0gICAgICAgIHN0cmluZyhBUFBFTkQgQ01BS0VfU0hBUkVEX0xJTktFUl9GTEFHUyAiIC1mdXNl
LWxkPWdvbGQgLVdsLC0tZGlzYWJsZS1uZXctZHRhZ3MiKQotICAgICAgICBzdHJpbmcoQVBQRU5E
IENNQUtFX01PRFVMRV9MSU5LRVJfRkxBR1MgIiAtZnVzZS1sZD1nb2xkIC1XbCwtLWRpc2FibGUt
bmV3LWR0YWdzIikKLSAgICBlbHNlICgpCi0gICAgICAgIG1lc3NhZ2UoV0FSTklORyAiR05VIGdv
bGQgbGlua2VyIGlzbid0IGF2YWlsYWJsZSwgdXNpbmcgdGhlIGRlZmF1bHQgc3lzdGVtIGxpbmtl
ci4iKQotICAgICAgICBzZXQoVVNFX0xEX0dPTEQgT0ZGKQotICAgIGVuZGlmICgpCi1lbmRpZiAo
KQotCiBzZXQoRU5BQkxFX0RFQlVHX0ZJU1NJT05fREVGQVVMVCBPRkYpCiBpZiAoVVNFX0xEX0dP
TEQgQU5EIENNQUtFX0JVSUxEX1RZUEUgU1RSRVFVQUwgIkRlYnVnIikKICAgICBjaGVja19jeHhf
Y29tcGlsZXJfZmxhZygtZ3NwbGl0LWR3YXJmIENYWF9DT01QSUxFUl9TVVBQT1JUU19HU1BMSVRf
RFdBUkYpCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggMWUzZTA5Yjhm
NTJlZTg1NWRhYTgyNjJmMWRhM2U2ZmNiNTc0NWIyMy4uMTAzZGNhMDVjMDczOWZjZWUyN2NiNWUy
NThhNjRmZDIzZDM4YjZjNCAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpA
QCAtMSwzICsxLDE1IEBACisyMDIyLTAxLTIyICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnph
cm9AZ25vbWUub3JnPgorCisgICAgICAgIFN0b3AgZGVmYXVsdGluZyB0byBsZC5nb2xkCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU0NzYKKworICAg
ICAgICBsZC5nb2xkIGlzIGFiYW5kb25lZCBhbmQgYmFyZWx5IHN1cHBvcnRlZCwgc28gaXQgbm8g
bG9uZ2VyIG1ha2VzIHNlbnNlIHRvIHByZWZlciBpdCB0byB0aGUKKyAgICAgICAgc3lzdGVtIGRl
ZmF1bHQgbGlua2VyLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgICogU291cmNlL2NtYWtlL09wdGlvbnNDb21tb24uY21ha2U6CisKIDIwMjItMDEtMjAg
IEVsbGlvdHQgV2lsbGlhbXMgIDxlbXdAYXBwbGUuY29tPgogCiAgICAgICAgIFtYQ0J1aWxkXSBC
dWlsZCB2aWEgdGhlIHdvcmtzcGFjZSB3aXRoIFVTRV9XT1JLU1BBQ0U9WUVTCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>450218</attachid>
            <date>2022-01-28 03:19:05 -0800</date>
            <delta_ts>2022-01-31 07:22:13 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-235476-20220128131904.patch</filename>
            <type>text/plain</type>
            <size>3358</size>
            <attacher name="Adrian Perez">aperez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0
aW9uc0NvbW1vbi5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCmluZGV4
IGZiNmU4YTEyMjE0NWM2MjUxNzk4ZmQ0MjFmNmFmNzAyOWNiMjI5MGIuLjRlZGZhNzUzNmU4YTlj
NTY0MjhkMmMxMTYxNjRkNDRmY2EzYjQzZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRp
b25zQ29tbW9uLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCkBA
IC01Nyw4ICs1Nyw5IEBAIGlmIChVU0VfTERfTExEKQogICAgIGVuZGlmICgpCiBlbmRpZiAoKQog
Ci0jIFVzZSBsZC5nb2xkIGlmIGl0IGlzIGF2YWlsYWJsZSBhbmQgaXNuJ3QgZGlzYWJsZWQgZXhw
bGljaXRseQotQ01BS0VfREVQRU5ERU5UX09QVElPTihVU0VfTERfR09MRCAiVXNlIEdOVSBnb2xk
IGxpbmtlciIgT04KKyMgRG8gbm90IHVzZSBsZC5nb2xkIGJ5IGRlZmF1bHQgYXMgaXQgaXMgcHJh
Y3RpY2FsbHkgdW5tYWludGFpbmVkLgorIyBNb3JlIGRldGFpbHMgYXQgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTQ3NgorQ01BS0VfREVQRU5ERU5UX09QVElPTihV
U0VfTERfR09MRCAiVXNlIEdOVSBnb2xkIGxpbmtlciIgT0ZGCiAgICAgICAgICAgICAgICAgICAg
ICAgICJOT1QgQ1hYX0FDQ0VQVFNfTUZJWF9DT1JURVhfQTUzXzgzNTc2OTtOT1QgQVJNX1RSQURJ
VElPTkFMX0RFVEVDVEVEO05PVCBXSU4zMjtOT1QgQVBQTEU7Tk9UIFVTRV9MRF9MTEQiIE9GRikK
IGlmIChVU0VfTERfR09MRCkKICAgICBleGVjdXRlX3Byb2Nlc3MoQ09NTUFORCAke0NNQUtFX0Nf
Q09NUElMRVJ9IC1mdXNlLWxkPWdvbGQgLVdsLC0tdmVyc2lvbiBFUlJPUl9RVUlFVCBPVVRQVVRf
VkFSSUFCTEUgTERfVkVSU0lPTikKQEAgLTgwLDE0ICs4MSwzMyBAQCBpZiAoQ01BS0VfQlVJTERf
VFlQRSBTVFJFUVVBTCAiRGVidWciKQogICAgIGVuZGlmICgpCiBlbmRpZiAoKQogCisjIERldGVy
bWluZSB3aGljaCBsaW5rZXIgaXMgYmVpbmcgdXNlZCB3aXRoIHRoZSBjaG9zZW4gbGlua2VyIGZs
YWdzLgorZXhlY3V0ZV9wcm9jZXNzKAorICAgIENPTU1BTkQgJHtDTUFLRV9DX0NPTVBJTEVSfSAk
e0NNQUtFX0VYRV9MSU5LRVJfRkxBR1N9IC1XbCwtLXZlcnNpb24KKyAgICBPVVRQVVRfVkFSSUFC
TEUgTERfVkVSU0lPTgorICAgIEVSUk9SX1FVSUVUCispCitpZiAoTERfVkVSU0lPTiBNQVRDSEVT
ICJeTExEICIpCisgICAgc2V0KExEX1ZBUklBTlQgTExEKQorZWxzZWlmIChMRF9WRVJTSU9OIE1B
VENIRVMgIl5tb2xkICIpCisgICAgc2V0KExEX1ZBUklBTlQgTU9MRCkKK2Vsc2VpZiAoTERfVkVS
U0lPTiBNQVRDSEVTICJeR05VIGdvbGQgIikKKyAgICBzZXQoTERfVkFSSUFOVCBHT0xEKQorZWxz
ZWlmIChMRF9WRVJTSU9OIE1BVENIRVMgIl5HTlUgbGQgIikKKyAgICBzZXQoTERfVkFSSUFOVCBC
RkQpCitlbHNlICgpCisgICAgc2V0KExEX1ZBUklBTlQgVU5LTk9XTikKK2VuZGlmICgpCit1bnNl
dChMRF9WRVJTSU9OKQorbWVzc2FnZShTVEFUVVMgIkxpbmtlciB2YXJpYW50IGluIHVzZSBkZXRl
Y3RlZDogJHtMRF9WQVJJQU5UfSIpCisKIG9wdGlvbihERUJVR19GSVNTSU9OICJVc2UgRGVidWcg
Rmlzc2lvbiBzdXBwb3J0IiAke0VOQUJMRV9ERUJVR19GSVNTSU9OX0RFRkFVTFR9KQogCiBpZiAo
REVCVUdfRklTU0lPTikKICAgICBzZXQoQ01BS0VfQ19GTEFHUyAiJHtDTUFLRV9DX0ZMQUdTfSAt
Z3NwbGl0LWR3YXJmIikKICAgICBzZXQoQ01BS0VfQ1hYX0ZMQUdTICIke0NNQUtFX0NYWF9GTEFH
U30gLWdzcGxpdC1kd2FyZiIpCiAKLSAgICAjIFRoZSBsZC5iZmQgbGlua2VyIGRvZXMgbm90IHN1
cHBvcnQgLS1nZGItaW5kZXgsIHBvc3NpYmx5IG90aGVycyBhcyB3ZWxsLgotICAgIGlmIChVU0Vf
TERfR09MRCBPUiBVU0VfTERfTExEKQorICAgIGlmIChMRF9WQVJJQU5UIFNUUkVRVUFMIExMRCBP
UiBMRF9WQVJJQU5UIFNUUkVRVUFMIEdPTEQgT1IgTERfVkFSSUFOVCBTVFJFUVVBTCBNT0xEKQog
ICAgICAgICBzZXQoQ01BS0VfRVhFX0xJTktFUl9GTEFHUyAiJHtDTUFLRV9FWEVfTElOS0VSX0ZM
QUdTfSAtV2wsLS1nZGItaW5kZXgiKQogICAgICAgICBzZXQoQ01BS0VfU0hBUkVEX0xJTktFUl9G
TEFHUyAiJHtDTUFLRV9FWEVfTElOS0VSX0ZMQUdTfSAtV2wsLS1nZGItaW5kZXgiKQogICAgIGVu
ZGlmICgpCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggZjQwNTE3N2E2
NDlhODgzOWMzY2Q2MTRiOGU4MGVhMDAxY2I4YmY0Mi4uMTBkOWVhMDQ1YzhjNzVmNjRiMzNjMzcy
YzQ0YWYzMWFkMWRjOTEzYiAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpA
QCAtMSwzICsxLDIxIEBACisyMDIyLTAxLTI4ICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBl
cmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0NNYWtlXSBTdG9wIGRlZmF1bHRpbmcgdG8gbGQu
Z29sZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1
NDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGlz
YWJsZSBVU0VfTERfR09MRCBieSBkZWZhdWx0LCBidXQga2VlcCB0aGUgb3B0aW9uIHRvIGF2b2lk
IGJyZWFraW5nIGJ1aWxkIHNjcmlwdHMKKyAgICAgICAgdGhhdCB1c2UgaXQuCisKKyAgICAgICAg
V2hpbGUgYXQgaXQsIHRyeSBkZXRlY3QgZXhhY3RseSB3aGljaCBsaW5rZXIgaXMgYWN0dWFsbHkg
YmVpbmcgdXNlZCBhZnRlciBvcHRpb25zIGFyZQorICAgICAgICBhcHBsaWVkLCB3aGljaCBhbHNv
IHRha2VzIGludG8gYWNjb3VudCAtZnVzZS1sZD0gZmxhZ3Mgc2V0IGluIG90aGVyIGZyb20gdGhl
IGVudmlyb25tZW50CisgICAgICAgIG9yIGluIHRoZSBDTWFrZSBjb21tYW5kIGxpbmUuIEZvciBu
b3cgdGhpcyBpcyBuZWVkZWQgdG8gZGVjaWRlIHdoZXRoZXIgdG8gcGFzcyB0aGUKKyAgICAgICAg
LS1nZGItaW5kZXggZmxhZyB0byB0aGUgbGlua2VyLCBidXQgbWlnaHQgY29tZSBpbiBoYW5keSBp
biB0aGUgZnV0dXJlIChmb3IgZXhhbXBsZSB0bworICAgICAgICBmb3JjaWJseSBkaXNhYmxlIExU
TyB3aGVuIE1vbGQgaXMgaW4gdXNlLCBhcyBpdCBpcyBjdXJyZW50bHkgdW5zdXBwb3J0ZWQgaW4g
TW9sZCkuCisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0NvbW1vbi5jbWFrZToKKwog
MjAyMi0wMS0yNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAK
ICAgICAgICAgW1dQRV1bYTExeV0gQWRkIG9wdGlvbiB0byBidWlsZCB3aXRoIEFUU1BJCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>450409</attachid>
            <date>2022-01-31 07:22:19 -0800</date>
            <delta_ts>2022-01-31 07:51:20 -0800</delta_ts>
            <desc>Patch v2</desc>
            <filename>bug-235476-20220131172218.patch</filename>
            <type>text/plain</type>
            <size>8003</size>
            <attacher name="Adrian Perez">aperez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0
aW9uc0NvbW1vbi5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCmluZGV4
IGZiNmU4YTEyMjE0NWM2MjUxNzk4ZmQ0MjFmNmFmNzAyOWNiMjI5MGIuLjliODhiNjRhYzUxNGFi
ZDRmMmIxYzhjYzkwYmFkNDZkYzMyZGM1N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRp
b25zQ29tbW9uLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCkBA
IC02LDIwICs2LDgwIEBAIGFkZF9kZWZpbml0aW9ucygtREJVSUxESU5HX1dJVEhfQ01BS0U9MSkK
IGFkZF9kZWZpbml0aW9ucygtREhBVkVfQ09ORklHX0g9MSkKIGFkZF9kZWZpbml0aW9ucygtRFBB
U19CTUFMTE9DPTEpCiAKLW9wdGlvbihVU0VfVEhJTl9BUkNISVZFUyAiUHJvZHVjZSBhbGwgc3Rh
dGljIGxpYnJhcmllcyBhcyB0aGluIGFyY2hpdmVzIiBPTikKK2Z1bmN0aW9uKENIRUNLX1RISU5f
QVJDSElWRV9TVVBQT1JUIF9yZXN1bHRfdmFyKQorICAgIHNldCgke19yZXN1bHRfdmFyfSBPRkYg
UEFSRU5UX1NDT1BFKQorCisgICAgZmlsZShXUklURQorICAgICAgICAke0NNQUtFX0NVUlJFTlRf
QklOQVJZX0RJUn0vdGVzdC10aGluLWFyY2hpdmUuYworICAgICAgICAiaW50IGdldF9tZSh2b2lk
KSB7IHJldHVybiA0MjsgfSIKKyAgICApCisgICAgZmlsZShXUklURQorICAgICAgICAke0NNQUtF
X0NVUlJFTlRfQklOQVJZX0RJUn0vdGVzdC10aGluLWFyY2hpdmUtbWFpbi5jCisgICAgICAgICJl
eHRlcm4gaW50IGdldF9tZSh2b2lkKTsKKyAgICAgICAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIq
KiBhcmd2KSB7IHJldHVybiBnZXRfbWUoKTsgfSIKKyAgICApCisKKyAgICAjIENvbXBpbGUgdGhl
IEMgc291cmNlcy4KKyAgICBleGVjdXRlX3Byb2Nlc3MoCisgICAgICAgIFdPUktJTkdfRElSRUNU
T1JZICR7Q01BS0VfQ1VSUkVOVF9CSU5BUllfRElSfQorICAgICAgICBPVVRQVVRfUVVJRVQgRVJS
T1JfUVVJRVQgUkVTVUxUX1ZBUklBQkxFIF9zdGF0dXMKKyAgICAgICAgQ09NTUFORCAke0NNQUtF
X0NfQ09NUElMRVJ9IC1jCisgICAgICAgICAgICAtbyB0ZXN0LXRoaW4tYXJjaGl2ZS4ke0NNQUtF
X0NfT1VUUFVUX0VYVEVOU0lPTn0KKyAgICAgICAgICAgIHRlc3QtdGhpbi1hcmNoaXZlLmMKKyAg
ICApCisgICAgaWYgKE5PVCBfc3RhdHVzIEVRVUFMIDApCisgICAgICAgIHJldHVybigpCisgICAg
ZW5kaWYgKCkKKworICAgIGV4ZWN1dGVfcHJvY2VzcygKKyAgICAgICAgV09SS0lOR19ESVJFQ1RP
UlkgJHtDTUFLRV9DVVJSRU5UX0JJTkFSWV9ESVJ9CisgICAgICAgIE9VVFBVVF9RVUlFVCBFUlJP
Ul9RVUlFVCBSRVNVTFRfVkFSSUFCTEUgX3N0YXR1cworICAgICAgICBDT01NQU5EICR7Q01BS0Vf
Q19DT01QSUxFUn0gLWMKKyAgICAgICAgICAgIC1vIHRlc3QtdGhpbi1hcmNoaXZlLW1haW4uJHtD
TUFLRV9DX09VVFBVVF9FWFRFTlNJT059CisgICAgICAgICAgICB0ZXN0LXRoaW4tYXJjaGl2ZS1t
YWluLmMKKyAgICApCisgICAgaWYgKE5PVCBfc3RhdHVzIEVRVUFMIDApCisgICAgICAgIHJldHVy
bigpCisgICAgZW5kaWYgKCkKKworICAgICMgVHJ5IG1ha2luZyBhIHRoaW4gYXJjaGl2ZSB3aXRo
IHRoZSBsaWJyYXJ5IG9iamVjdC4KKyAgICBleGVjdXRlX3Byb2Nlc3MoCisgICAgICAgIFdPUktJ
TkdfRElSRUNUT1JZICR7Q01BS0VfQ1VSUkVOVF9CSU5BUllfRElSfQorICAgICAgICBPVVRQVVRf
UVVJRVQgRVJST1JfUVVJRVQgUkVTVUxUX1ZBUklBQkxFIF9zdGF0dXMKKyAgICAgICAgQ09NTUFO
RAorICAgICAgICAgICAgJHtDTUFLRV9BUn0gcWNUCisgICAgICAgICAgICAke0NNQUtFX1NUQVRJ
Q19MSUJSQVJZX1BSRUZJWH10ZXN0LXRoaW4tYXJjaGl2ZS4ke0NNQUtFX1NUQVRJQ19MSUJSQVJZ
X1NVRkZJWH0KKyAgICAgICAgICAgIHRlc3QtdGhpbi1hcmNoaXZlLiR7Q01BS0VfQ19PVVRQVVRf
RVhURU5TSU9OfQorICAgICkKKyAgICBpZiAoTk9UIF9zdGF0dXMgRVFVQUwgMCkKKyAgICAgICAg
cmV0dXJuKCkKKyAgICBlbmRpZiAoKQorCisgICAgIyBMaW5rIGJvdGggdGhlIG1haW4gcHJvZ3Jh
bSBhbmQgdGhlIHRoaW4gbGlicmFyeS4gSXQgaXMgaW1wb3J0YW50CisgICAgIyB0byAjIHRlc3Qg
dGhhdCB0aGluIGFyY2hpdmVzIGNhbiBiZSBjb25zdW1lZCBieSB0aGUgbGlua2VyIGFzIHdlbGwu
CisgICAgZXhlY3V0ZV9wcm9jZXNzKAorICAgICAgICBXT1JLSU5HX0RJUkVDVE9SWSAke0NNQUtF
X0NVUlJFTlRfQklOQVJZX0RJUn0KKyAgICAgICAgT1VUUFVUX1FVSUVUIEVSUk9SX1FVSUVUIFJF
U1VMVF9WQVJJQUJMRSBfc3RhdHVzCisgICAgICAgIENPTU1BTkQKKyAgICAgICAgICAgICR7Q01B
S0VfQ19DT01QSUxFUn0gJHtDTUFLRV9DX0ZMQUdTfSAke0NNQUtFX0NfTElOS19GTEFHU30KKyAg
ICAgICAgICAgIC1vIHRlc3QtdGhpbi1hcmNoaXZlLW1haW4ke0NNQUtFX0VYRUNVVEFCTEVfU1VG
RklYfQorICAgICAgICAgICAgdGVzdC10aGluLWFyY2hpdmUtbWFpbi4ke0NNQUtFX0NfT1VUUFVU
X0VYVEVOU0lPTn0KKyAgICAgICAgICAgICR7Q01BS0VfU1RBVElDX0xJQlJBUllfUFJFRklYfXRl
c3QtdGhpbi1hcmNoaXZlLiR7Q01BS0VfU1RBVElDX0xJQlJBUllfU1VGRklYfQorICAgICkKKwor
ICAgIGlmIChfc3RhdHVzIEVRVUFMIDApCisgICAgICAgIHNldCgke19yZXN1bHRfdmFyfSBPTiBQ
QVJFTlRfU0NPUEUpCisgICAgZW5kaWYgKCkKK2VuZGZ1bmN0aW9uKCkKKworQ0hFQ0tfVEhJTl9B
UkNISVZFX1NVUFBPUlQoVVNFX1RISU5fQVJDSElWRVNfREVGQVVMVCkKK29wdGlvbihVU0VfVEhJ
Tl9BUkNISVZFUyAiUHJvZHVjZSBhbGwgc3RhdGljIGxpYnJhcmllcyBhcyB0aGluIGFyY2hpdmVz
IiAke1VTRV9USElOX0FSQ0hJVkVTX0RFRkFVTFR9KQorCiBpZiAoVVNFX1RISU5fQVJDSElWRVMp
Ci0gICAgZXhlY3V0ZV9wcm9jZXNzKENPTU1BTkQgJHtDTUFLRV9BUn0gLVYgT1VUUFVUX1ZBUklB
QkxFIEFSX1ZFUlNJT04gRVJST1JfVkFSSUFCTEUgQVJfRVJST1IpCi0gICAgaWYgKCIke0FSX0VS
Uk9SfSIgTUFUQ0hFUyAiXnVzYWdlOiIpCi0gICAgICAgICMgVGhpcyBgYXJgIGRvZXNuJ3QgdW5k
ZXJzdGFuZCAiLVYiLiBJZ25vcmUgdGhlIGVycm9yIGFuZCB0cmVhdCB0aGlzIGFzCi0gICAgICAg
ICMgYW4gdW5zdXBwb3J0ZWQgYGFyYC4gVE9ETzogRGV0ZXJtaW5lIEJTRCBvciBYY29kZSBlcXVp
dmFsZW50LgotICAgIGVsc2VpZiAoIiR7QVJfRVJST1J9IikKLSAgICAgICAgbWVzc2FnZShXQVJO
SU5HICJFcnJvciBmcm9tIGBhcmA6ICR7QVJfRVJST1J9IikKLSAgICBlbHNlaWYgKCIke0FSX1ZF
UlNJT059IiBNQVRDSEVTICJeR05VIGFyIikKLSAgICAgICAgc2V0KENNQUtFX0NYWF9BUkNISVZF
X0NSRUFURSAiPENNQUtFX0FSPiBjclQgPFRBUkdFVD4gPExJTktfRkxBR1M+IDxPQkpFQ1RTPiIp
Ci0gICAgICAgIHNldChDTUFLRV9DX0FSQ0hJVkVfQ1JFQVRFICI8Q01BS0VfQVI+IGNyVCA8VEFS
R0VUPiA8TElOS19GTEFHUz4gPE9CSkVDVFM+IikKLSAgICAgICAgc2V0KENNQUtFX0NYWF9BUkNI
SVZFX0FQUEVORCAiPENNQUtFX0FSPiByVCA8VEFSR0VUPiA8TElOS19GTEFHUz4gPE9CSkVDVFM+
IikKLSAgICAgICAgc2V0KENNQUtFX0NfQVJDSElWRV9BUFBFTkQgIjxDTUFLRV9BUj4gclQgPFRB
UkdFVD4gPExJTktfRkxBR1M+IDxPQkpFQ1RTPiIpCi0gICAgZW5kaWYgKCkKKyAgICBzZXQoQ01B
S0VfQ1hYX0FSQ0hJVkVfQ1JFQVRFICI8Q01BS0VfQVI+IGNyVCA8VEFSR0VUPiA8TElOS19GTEFH
Uz4gPE9CSkVDVFM+IikKKyAgICBzZXQoQ01BS0VfQ19BUkNISVZFX0NSRUFURSAiPENNQUtFX0FS
PiBjclQgPFRBUkdFVD4gPExJTktfRkxBR1M+IDxPQkpFQ1RTPiIpCisgICAgc2V0KENNQUtFX0NY
WF9BUkNISVZFX0FQUEVORCAiPENNQUtFX0FSPiByVCA8VEFSR0VUPiA8TElOS19GTEFHUz4gPE9C
SkVDVFM+IikKKyAgICBzZXQoQ01BS0VfQ19BUkNISVZFX0FQUEVORCAiPENNQUtFX0FSPiByVCA8
VEFSR0VUPiA8TElOS19GTEFHUz4gPE9CSkVDVFM+IikKIGVuZGlmICgpCiAKIHNldF9wcm9wZXJ0
eShHTE9CQUwgUFJPUEVSVFkgVVNFX0ZPTERFUlMgT04pCkBAIC00NSw3ICsxMDUsNyBAQCBlbmRp
ZiAoKQogCiAjIFVzZSBsZC5sbGQgd2hlbiBidWlsZGluZyB3aXRoIExUTwogQ01BS0VfREVQRU5E
RU5UX09QVElPTihVU0VfTERfTExEICJVc2UgTExEIGxpbmtlciIgT04KLSAgICAgICAgICAgICAg
ICAgICAgICAgIkxUT19NT0RFO05PVCBVU0VfTERfR09MRDtOT1QgV0lOMzIiIE9GRikKKyAgICAg
ICAgICAgICAgICAgICAgICAgIkxUT19NT0RFO05PVCBXSU4zMiIgT0ZGKQogaWYgKFVTRV9MRF9M
TEQpCiAgICAgZXhlY3V0ZV9wcm9jZXNzKENPTU1BTkQgJHtDTUFLRV9DX0NPTVBJTEVSfSAtZnVz
ZS1sZD1sbGQgLVdsLC0tdmVyc2lvbiBFUlJPUl9RVUlFVCBPVVRQVVRfVkFSSUFCTEUgTERfVkVS
U0lPTikKICAgICBpZiAoIiR7TERfVkVSU0lPTn0iIE1BVENIRVMgIkxMRCIpCkBAIC01NywyMSAr
MTE3LDYgQEAgaWYgKFVTRV9MRF9MTEQpCiAgICAgZW5kaWYgKCkKIGVuZGlmICgpCiAKLSMgVXNl
IGxkLmdvbGQgaWYgaXQgaXMgYXZhaWxhYmxlIGFuZCBpc24ndCBkaXNhYmxlZCBleHBsaWNpdGx5
Ci1DTUFLRV9ERVBFTkRFTlRfT1BUSU9OKFVTRV9MRF9HT0xEICJVc2UgR05VIGdvbGQgbGlua2Vy
IiBPTgotICAgICAgICAgICAgICAgICAgICAgICAiTk9UIENYWF9BQ0NFUFRTX01GSVhfQ09SVEVY
X0E1M184MzU3Njk7Tk9UIEFSTV9UUkFESVRJT05BTF9ERVRFQ1RFRDtOT1QgV0lOMzI7Tk9UIEFQ
UExFO05PVCBVU0VfTERfTExEIiBPRkYpCi1pZiAoVVNFX0xEX0dPTEQpCi0gICAgZXhlY3V0ZV9w
cm9jZXNzKENPTU1BTkQgJHtDTUFLRV9DX0NPTVBJTEVSfSAtZnVzZS1sZD1nb2xkIC1XbCwtLXZl
cnNpb24gRVJST1JfUVVJRVQgT1VUUFVUX1ZBUklBQkxFIExEX1ZFUlNJT04pCi0gICAgaWYgKCIk
e0xEX1ZFUlNJT059IiBNQVRDSEVTICJHTlUgZ29sZCIpCi0gICAgICAgIHN0cmluZyhBUFBFTkQg
Q01BS0VfRVhFX0xJTktFUl9GTEFHUyAiIC1mdXNlLWxkPWdvbGQgLVdsLC0tZGlzYWJsZS1uZXct
ZHRhZ3MiKQotICAgICAgICBzdHJpbmcoQVBQRU5EIENNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1Mg
IiAtZnVzZS1sZD1nb2xkIC1XbCwtLWRpc2FibGUtbmV3LWR0YWdzIikKLSAgICAgICAgc3RyaW5n
KEFQUEVORCBDTUFLRV9NT0RVTEVfTElOS0VSX0ZMQUdTICIgLWZ1c2UtbGQ9Z29sZCAtV2wsLS1k
aXNhYmxlLW5ldy1kdGFncyIpCi0gICAgZWxzZSAoKQotICAgICAgICBtZXNzYWdlKFdBUk5JTkcg
IkdOVSBnb2xkIGxpbmtlciBpc24ndCBhdmFpbGFibGUsIHVzaW5nIHRoZSBkZWZhdWx0IHN5c3Rl
bSBsaW5rZXIuIikKLSAgICAgICAgc2V0KFVTRV9MRF9HT0xEIE9GRikKLSAgICBlbmRpZiAoKQot
ZW5kaWYgKCkKLQogc2V0KEVOQUJMRV9ERUJVR19GSVNTSU9OX0RFRkFVTFQgT0ZGKQogaWYgKENN
QUtFX0JVSUxEX1RZUEUgU1RSRVFVQUwgIkRlYnVnIikKICAgICBjaGVja19jeHhfY29tcGlsZXJf
ZmxhZygtZ3NwbGl0LWR3YXJmIENYWF9DT01QSUxFUl9TVVBQT1JUU19HU1BMSVRfRFdBUkYpCkBA
IC04NiwxMSArMTMxLDIyIEBAIGlmIChERUJVR19GSVNTSU9OKQogICAgIHNldChDTUFLRV9DX0ZM
QUdTICIke0NNQUtFX0NfRkxBR1N9IC1nc3BsaXQtZHdhcmYiKQogICAgIHNldChDTUFLRV9DWFhf
RkxBR1MgIiR7Q01BS0VfQ1hYX0ZMQUdTfSAtZ3NwbGl0LWR3YXJmIikKIAotICAgICMgVGhlIGxk
LmJmZCBsaW5rZXIgZG9lcyBub3Qgc3VwcG9ydCAtLWdkYi1pbmRleCwgcG9zc2libHkgb3RoZXJz
IGFzIHdlbGwuCi0gICAgaWYgKFVTRV9MRF9HT0xEIE9SIFVTRV9MRF9MTEQpCisgICAgIyBDaGVj
ayB3ZXRoZXIgdGhlIGxpbmtlciBzdXBwb3J0cyAtLWdkYi1pbmRleC4gVXNlIHRyeV9jb21waWxl
KCkgZGlyZWN0bHkKKyAgICAjIGluc3RlYWQgb2YgY2hlY2tfe2MsY3h4fV9jb21waWxlcl9mbGFn
KCkgYmVjYXVzZSB0aGUgbGF0dGVyIGRvIG5vdCB0cnkKKyAgICAjIHRvIHJ1biBmaW5hbCBsaW5r
LgorICAgIGZpbGUoV1JJVEUgIiR7Q01BS0VfQ1VSUkVOVF9CSU5BUllfRElSfS9jaGVjay1saW5r
ZXItZ2RiLWluZGV4LmMiCisgICAgICAgICJpbnQgbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3Yp
IHsgKHZvaWQpIGFyZ2M7ICh2b2lkKSBhcmd2OyByZXR1cm4gMDsgfSIpCisgICAgdHJ5X2NvbXBp
bGUoTERfU1VQUE9SVFNfR0RCX0lOREVYCisgICAgICAgICR7Q01BS0VfQ1VSUkVOVF9CSU5BUllf
RElSfQorICAgICAgICAke0NNQUtFX0NVUlJFTlRfQklOQVJZX0RJUn0vY2hlY2stbGlua2VyLWdk
Yi1pbmRleC5jCisgICAgICAgIExJTktfT1BUSU9OUyAtV2wsLS1nZGItaW5kZXgKKyAgICApCisK
KyAgICBpZiAoTERfU1VQUE9SVFNfR0RCX0lOREVYKQogICAgICAgICBzZXQoQ01BS0VfRVhFX0xJ
TktFUl9GTEFHUyAiJHtDTUFLRV9FWEVfTElOS0VSX0ZMQUdTfSAtV2wsLS1nZGItaW5kZXgiKQog
ICAgICAgICBzZXQoQ01BS0VfU0hBUkVEX0xJTktFUl9GTEFHUyAiJHtDTUFLRV9FWEVfTElOS0VS
X0ZMQUdTfSAtV2wsLS1nZGItaW5kZXgiKQogICAgIGVuZGlmICgpCisgICAgdW5zZXQoTERfU1VQ
UE9SVFNfR0RCX0lOREVYKQogZW5kaWYgKCkKIAogc2V0KEdDQ19PRkZMSU5FQVNNX1NPVVJDRV9N
QVBfREVGQVVMVCBPRkYpCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXgg
MjQzYzllODNmYmYyODdmNzU0Zjg1ZTAyNzgwMGIzMDljNzljMjU4Yy4uYTQ1ODE1MTMzNWRmYmVm
NzJiY2M4NGM4NzA4MjNhZWYzMzk4NDBjNSAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0No
YW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAxLTMxICBBZHJpYW4gUGVyZXogZGUgQ2Fz
dHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0NNYWtlXSBTdG9wIGRlZmF1bHRp
bmcgdG8gbGQuZ29sZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjM1NDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgUmVtb3ZlIHRoZSBVU0VfTERfR09MRCBvcHRpb24sIGFuZCBsZXQgdGhlIGJ1aWxkIHVz
ZSBieSBkZWZhdWx0IHRoZSBzeXN0ZW0gbGlua2VyLgorCisgICAgICAgIEluIG9yZGVyIHRvIG1h
a2Ugc3VyZSB3aGV0aGVyIHRoZSBsaW5rZXIgaW4gdXNlIHN1cHBvcnRzIC0tZ2RiLWluZGV4IGEg
ZmVhdHVyZSBjaGVjaworICAgICAgICBpcyBhZGRlZCB0aGF0IHRyaWVzIHRvIGxpbmsgYW4gZW1w
dHkgcHJvZ3JhbSBwYXNzaW5nIHRoZSBvcHRpb24gaW5zdGVhZCBvZiBhZGRpbmcKKyAgICAgICAg
aXQgd2hlbiBhIGNlcnRhaW4gbGlua2VyIGlzIGluIHVzZSwgd2hpY2ggZW5hYmxlcyAtLWdkYi1p
bmRleCBmb3IgYW55IG90aGVyIGxpbmtlcgorICAgICAgICB0aGF0IHN1cHBvcnRzIHRoZSBvcHRp
b24uCisKKyAgICAgICAgV2hpbGUgYXQgaXQsIGFsc28gZmVhdHVyZSBjaGVjayB3aGV0aGVyIHRo
ZSBsaW5rZXIgc3VwcG9ydHMgdGhpbiBhcmNoaXZlcywgaW4gb3JkZXIKKyAgICAgICAgdG8gZW5h
YmxlIHRoZW0gb25seSB3aGVuIGFjdHVhbGx5IHVzYWJsZS4gVGhpcyBhdm9pZHMgc2l0dWF0aW9u
cyBpbiB3aGljaCB0aGluIGFyY2hpdmVzCisgICAgICAgIGNhbiBiZSBjcmVhdGVkIGJ5IHRoZSBh
cmNoaXZlciBidXQgbGF0ZXIgb24gdGhlIGxpbmtlciB3aWxsIG5vdCBiZSBhYmxlIHRvIGNvbnN1
bWUgdGhlbS4KKworICAgICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlOgor
CiAyMDIyLTAxLTI4ICBFbGxpb3R0IFdpbGxpYW1zICA8ZW13QGFwcGxlLmNvbT4KIAogICAgICAg
ICBbWENCdWlsZF0gU21hbGwgY29ycmVjdGlvbnMgdG8gYnVpbGQtd2Via2l0IGFuZCBNYWtlZmls
ZSBmb3Igd29ya3NwYWNlIGJ1aWxkcwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>450410</attachid>
            <date>2022-01-31 07:51:26 -0800</date>
            <delta_ts>2022-01-31 16:50:17 -0800</delta_ts>
            <desc>Patch v3</desc>
            <filename>bug-235476-20220131175125.patch</filename>
            <type>text/plain</type>
            <size>7998</size>
            <attacher name="Adrian Perez">aperez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0
aW9uc0NvbW1vbi5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCmluZGV4
IGZiNmU4YTEyMjE0NWM2MjUxNzk4ZmQ0MjFmNmFmNzAyOWNiMjI5MGIuLjNiYzQ2ZjUwMzE0MmU1
NTdmMmM5MzUyNWI1NWFlMjZhNDljMGFjZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRp
b25zQ29tbW9uLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCkBA
IC02LDIwICs2LDgwIEBAIGFkZF9kZWZpbml0aW9ucygtREJVSUxESU5HX1dJVEhfQ01BS0U9MSkK
IGFkZF9kZWZpbml0aW9ucygtREhBVkVfQ09ORklHX0g9MSkKIGFkZF9kZWZpbml0aW9ucygtRFBB
U19CTUFMTE9DPTEpCiAKLW9wdGlvbihVU0VfVEhJTl9BUkNISVZFUyAiUHJvZHVjZSBhbGwgc3Rh
dGljIGxpYnJhcmllcyBhcyB0aGluIGFyY2hpdmVzIiBPTikKK2Z1bmN0aW9uKENIRUNLX1RISU5f
QVJDSElWRV9TVVBQT1JUIF9yZXN1bHRfdmFyKQorICAgIHNldCgke19yZXN1bHRfdmFyfSBPRkYg
UEFSRU5UX1NDT1BFKQorCisgICAgZmlsZShXUklURQorICAgICAgICAke0NNQUtFX0NVUlJFTlRf
QklOQVJZX0RJUn0vdGVzdC10aGluLWFyY2hpdmUuYworICAgICAgICAiaW50IGdldF9tZSh2b2lk
KSB7IHJldHVybiA0MjsgfSIKKyAgICApCisgICAgZmlsZShXUklURQorICAgICAgICAke0NNQUtF
X0NVUlJFTlRfQklOQVJZX0RJUn0vdGVzdC10aGluLWFyY2hpdmUtbWFpbi5jCisgICAgICAgICJl
eHRlcm4gaW50IGdldF9tZSh2b2lkKTsKKyAgICAgICAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIq
KiBhcmd2KSB7IHJldHVybiBnZXRfbWUoKTsgfSIKKyAgICApCisKKyAgICAjIENvbXBpbGUgdGhl
IEMgc291cmNlcy4KKyAgICBleGVjdXRlX3Byb2Nlc3MoCisgICAgICAgIFdPUktJTkdfRElSRUNU
T1JZICR7Q01BS0VfQ1VSUkVOVF9CSU5BUllfRElSfQorICAgICAgICBPVVRQVVRfUVVJRVQgRVJS
T1JfUVVJRVQgUkVTVUxUX1ZBUklBQkxFIF9zdGF0dXMKKyAgICAgICAgQ09NTUFORCAke0NNQUtF
X0NfQ09NUElMRVJ9IC1jCisgICAgICAgICAgICAtbyB0ZXN0LXRoaW4tYXJjaGl2ZSR7Q01BS0Vf
Q19PVVRQVVRfRVhURU5TSU9OfQorICAgICAgICAgICAgdGVzdC10aGluLWFyY2hpdmUuYworICAg
ICkKKyAgICBpZiAoTk9UIF9zdGF0dXMgRVFVQUwgMCkKKyAgICAgICAgcmV0dXJuKCkKKyAgICBl
bmRpZiAoKQorCisgICAgZXhlY3V0ZV9wcm9jZXNzKAorICAgICAgICBXT1JLSU5HX0RJUkVDVE9S
WSAke0NNQUtFX0NVUlJFTlRfQklOQVJZX0RJUn0KKyAgICAgICAgT1VUUFVUX1FVSUVUIEVSUk9S
X1FVSUVUIFJFU1VMVF9WQVJJQUJMRSBfc3RhdHVzCisgICAgICAgIENPTU1BTkQgJHtDTUFLRV9D
X0NPTVBJTEVSfSAtYworICAgICAgICAgICAgLW8gdGVzdC10aGluLWFyY2hpdmUtbWFpbiR7Q01B
S0VfQ19PVVRQVVRfRVhURU5TSU9OfQorICAgICAgICAgICAgdGVzdC10aGluLWFyY2hpdmUtbWFp
bi5jCisgICAgKQorICAgIGlmIChOT1QgX3N0YXR1cyBFUVVBTCAwKQorICAgICAgICByZXR1cm4o
KQorICAgIGVuZGlmICgpCisKKyAgICAjIFRyeSBtYWtpbmcgYSB0aGluIGFyY2hpdmUgd2l0aCB0
aGUgbGlicmFyeSBvYmplY3QuCisgICAgZXhlY3V0ZV9wcm9jZXNzKAorICAgICAgICBXT1JLSU5H
X0RJUkVDVE9SWSAke0NNQUtFX0NVUlJFTlRfQklOQVJZX0RJUn0KKyAgICAgICAgT1VUUFVUX1FV
SUVUIEVSUk9SX1FVSUVUIFJFU1VMVF9WQVJJQUJMRSBfc3RhdHVzCisgICAgICAgIENPTU1BTkQK
KyAgICAgICAgICAgICR7Q01BS0VfQVJ9IHFjVAorICAgICAgICAgICAgJHtDTUFLRV9TVEFUSUNf
TElCUkFSWV9QUkVGSVh9dGVzdC10aGluLWFyY2hpdmUke0NNQUtFX1NUQVRJQ19MSUJSQVJZX1NV
RkZJWH0KKyAgICAgICAgICAgIHRlc3QtdGhpbi1hcmNoaXZlJHtDTUFLRV9DX09VVFBVVF9FWFRF
TlNJT059CisgICAgKQorICAgIGlmIChOT1QgX3N0YXR1cyBFUVVBTCAwKQorICAgICAgICByZXR1
cm4oKQorICAgIGVuZGlmICgpCisKKyAgICAjIExpbmsgYm90aCB0aGUgbWFpbiBwcm9ncmFtIGFu
ZCB0aGUgdGhpbiBsaWJyYXJ5LiBJdCBpcyBpbXBvcnRhbnQKKyAgICAjIHRvICMgdGVzdCB0aGF0
IHRoaW4gYXJjaGl2ZXMgY2FuIGJlIGNvbnN1bWVkIGJ5IHRoZSBsaW5rZXIgYXMgd2VsbC4KKyAg
ICBleGVjdXRlX3Byb2Nlc3MoCisgICAgICAgIFdPUktJTkdfRElSRUNUT1JZICR7Q01BS0VfQ1VS
UkVOVF9CSU5BUllfRElSfQorICAgICAgICBPVVRQVVRfUVVJRVQgRVJST1JfUVVJRVQgUkVTVUxU
X1ZBUklBQkxFIF9zdGF0dXMKKyAgICAgICAgQ09NTUFORAorICAgICAgICAgICAgJHtDTUFLRV9D
X0NPTVBJTEVSfSAke0NNQUtFX0NfRkxBR1N9ICR7Q01BS0VfQ19MSU5LX0ZMQUdTfQorICAgICAg
ICAgICAgLW8gdGVzdC10aGluLWFyY2hpdmUtbWFpbiR7Q01BS0VfRVhFQ1VUQUJMRV9TVUZGSVh9
CisgICAgICAgICAgICB0ZXN0LXRoaW4tYXJjaGl2ZS1tYWluLiR7Q01BS0VfQ19PVVRQVVRfRVhU
RU5TSU9OfQorICAgICAgICAgICAgJHtDTUFLRV9TVEFUSUNfTElCUkFSWV9QUkVGSVh9dGVzdC10
aGluLWFyY2hpdmUke0NNQUtFX1NUQVRJQ19MSUJSQVJZX1NVRkZJWH0KKyAgICApCisKKyAgICBp
ZiAoX3N0YXR1cyBFUVVBTCAwKQorICAgICAgICBzZXQoJHtfcmVzdWx0X3Zhcn0gT04gUEFSRU5U
X1NDT1BFKQorICAgIGVuZGlmICgpCitlbmRmdW5jdGlvbigpCisKK0NIRUNLX1RISU5fQVJDSElW
RV9TVVBQT1JUKFVTRV9USElOX0FSQ0hJVkVTX0RFRkFVTFQpCitvcHRpb24oVVNFX1RISU5fQVJD
SElWRVMgIlByb2R1Y2UgYWxsIHN0YXRpYyBsaWJyYXJpZXMgYXMgdGhpbiBhcmNoaXZlcyIgJHtV
U0VfVEhJTl9BUkNISVZFU19ERUZBVUxUfSkKKwogaWYgKFVTRV9USElOX0FSQ0hJVkVTKQotICAg
IGV4ZWN1dGVfcHJvY2VzcyhDT01NQU5EICR7Q01BS0VfQVJ9IC1WIE9VVFBVVF9WQVJJQUJMRSBB
Ul9WRVJTSU9OIEVSUk9SX1ZBUklBQkxFIEFSX0VSUk9SKQotICAgIGlmICgiJHtBUl9FUlJPUn0i
IE1BVENIRVMgIl51c2FnZToiKQotICAgICAgICAjIFRoaXMgYGFyYCBkb2Vzbid0IHVuZGVyc3Rh
bmQgIi1WIi4gSWdub3JlIHRoZSBlcnJvciBhbmQgdHJlYXQgdGhpcyBhcwotICAgICAgICAjIGFu
IHVuc3VwcG9ydGVkIGBhcmAuIFRPRE86IERldGVybWluZSBCU0Qgb3IgWGNvZGUgZXF1aXZhbGVu
dC4KLSAgICBlbHNlaWYgKCIke0FSX0VSUk9SfSIpCi0gICAgICAgIG1lc3NhZ2UoV0FSTklORyAi
RXJyb3IgZnJvbSBgYXJgOiAke0FSX0VSUk9SfSIpCi0gICAgZWxzZWlmICgiJHtBUl9WRVJTSU9O
fSIgTUFUQ0hFUyAiXkdOVSBhciIpCi0gICAgICAgIHNldChDTUFLRV9DWFhfQVJDSElWRV9DUkVB
VEUgIjxDTUFLRV9BUj4gY3JUIDxUQVJHRVQ+IDxMSU5LX0ZMQUdTPiA8T0JKRUNUUz4iKQotICAg
ICAgICBzZXQoQ01BS0VfQ19BUkNISVZFX0NSRUFURSAiPENNQUtFX0FSPiBjclQgPFRBUkdFVD4g
PExJTktfRkxBR1M+IDxPQkpFQ1RTPiIpCi0gICAgICAgIHNldChDTUFLRV9DWFhfQVJDSElWRV9B
UFBFTkQgIjxDTUFLRV9BUj4gclQgPFRBUkdFVD4gPExJTktfRkxBR1M+IDxPQkpFQ1RTPiIpCi0g
ICAgICAgIHNldChDTUFLRV9DX0FSQ0hJVkVfQVBQRU5EICI8Q01BS0VfQVI+IHJUIDxUQVJHRVQ+
IDxMSU5LX0ZMQUdTPiA8T0JKRUNUUz4iKQotICAgIGVuZGlmICgpCisgICAgc2V0KENNQUtFX0NY
WF9BUkNISVZFX0NSRUFURSAiPENNQUtFX0FSPiBjclQgPFRBUkdFVD4gPExJTktfRkxBR1M+IDxP
QkpFQ1RTPiIpCisgICAgc2V0KENNQUtFX0NfQVJDSElWRV9DUkVBVEUgIjxDTUFLRV9BUj4gY3JU
IDxUQVJHRVQ+IDxMSU5LX0ZMQUdTPiA8T0JKRUNUUz4iKQorICAgIHNldChDTUFLRV9DWFhfQVJD
SElWRV9BUFBFTkQgIjxDTUFLRV9BUj4gclQgPFRBUkdFVD4gPExJTktfRkxBR1M+IDxPQkpFQ1RT
PiIpCisgICAgc2V0KENNQUtFX0NfQVJDSElWRV9BUFBFTkQgIjxDTUFLRV9BUj4gclQgPFRBUkdF
VD4gPExJTktfRkxBR1M+IDxPQkpFQ1RTPiIpCiBlbmRpZiAoKQogCiBzZXRfcHJvcGVydHkoR0xP
QkFMIFBST1BFUlRZIFVTRV9GT0xERVJTIE9OKQpAQCAtNDUsNyArMTA1LDcgQEAgZW5kaWYgKCkK
IAogIyBVc2UgbGQubGxkIHdoZW4gYnVpbGRpbmcgd2l0aCBMVE8KIENNQUtFX0RFUEVOREVOVF9P
UFRJT04oVVNFX0xEX0xMRCAiVXNlIExMRCBsaW5rZXIiIE9OCi0gICAgICAgICAgICAgICAgICAg
ICAgICJMVE9fTU9ERTtOT1QgVVNFX0xEX0dPTEQ7Tk9UIFdJTjMyIiBPRkYpCisgICAgICAgICAg
ICAgICAgICAgICAgICJMVE9fTU9ERTtOT1QgV0lOMzIiIE9GRikKIGlmIChVU0VfTERfTExEKQog
ICAgIGV4ZWN1dGVfcHJvY2VzcyhDT01NQU5EICR7Q01BS0VfQ19DT01QSUxFUn0gLWZ1c2UtbGQ9
bGxkIC1XbCwtLXZlcnNpb24gRVJST1JfUVVJRVQgT1VUUFVUX1ZBUklBQkxFIExEX1ZFUlNJT04p
CiAgICAgaWYgKCIke0xEX1ZFUlNJT059IiBNQVRDSEVTICJMTEQiKQpAQCAtNTcsMjEgKzExNyw2
IEBAIGlmIChVU0VfTERfTExEKQogICAgIGVuZGlmICgpCiBlbmRpZiAoKQogCi0jIFVzZSBsZC5n
b2xkIGlmIGl0IGlzIGF2YWlsYWJsZSBhbmQgaXNuJ3QgZGlzYWJsZWQgZXhwbGljaXRseQotQ01B
S0VfREVQRU5ERU5UX09QVElPTihVU0VfTERfR09MRCAiVXNlIEdOVSBnb2xkIGxpbmtlciIgT04K
LSAgICAgICAgICAgICAgICAgICAgICAgIk5PVCBDWFhfQUNDRVBUU19NRklYX0NPUlRFWF9BNTNf
ODM1NzY5O05PVCBBUk1fVFJBRElUSU9OQUxfREVURUNURUQ7Tk9UIFdJTjMyO05PVCBBUFBMRTtO
T1QgVVNFX0xEX0xMRCIgT0ZGKQotaWYgKFVTRV9MRF9HT0xEKQotICAgIGV4ZWN1dGVfcHJvY2Vz
cyhDT01NQU5EICR7Q01BS0VfQ19DT01QSUxFUn0gLWZ1c2UtbGQ9Z29sZCAtV2wsLS12ZXJzaW9u
IEVSUk9SX1FVSUVUIE9VVFBVVF9WQVJJQUJMRSBMRF9WRVJTSU9OKQotICAgIGlmICgiJHtMRF9W
RVJTSU9OfSIgTUFUQ0hFUyAiR05VIGdvbGQiKQotICAgICAgICBzdHJpbmcoQVBQRU5EIENNQUtF
X0VYRV9MSU5LRVJfRkxBR1MgIiAtZnVzZS1sZD1nb2xkIC1XbCwtLWRpc2FibGUtbmV3LWR0YWdz
IikKLSAgICAgICAgc3RyaW5nKEFQUEVORCBDTUFLRV9TSEFSRURfTElOS0VSX0ZMQUdTICIgLWZ1
c2UtbGQ9Z29sZCAtV2wsLS1kaXNhYmxlLW5ldy1kdGFncyIpCi0gICAgICAgIHN0cmluZyhBUFBF
TkQgQ01BS0VfTU9EVUxFX0xJTktFUl9GTEFHUyAiIC1mdXNlLWxkPWdvbGQgLVdsLC0tZGlzYWJs
ZS1uZXctZHRhZ3MiKQotICAgIGVsc2UgKCkKLSAgICAgICAgbWVzc2FnZShXQVJOSU5HICJHTlUg
Z29sZCBsaW5rZXIgaXNuJ3QgYXZhaWxhYmxlLCB1c2luZyB0aGUgZGVmYXVsdCBzeXN0ZW0gbGlu
a2VyLiIpCi0gICAgICAgIHNldChVU0VfTERfR09MRCBPRkYpCi0gICAgZW5kaWYgKCkKLWVuZGlm
ICgpCi0KIHNldChFTkFCTEVfREVCVUdfRklTU0lPTl9ERUZBVUxUIE9GRikKIGlmIChDTUFLRV9C
VUlMRF9UWVBFIFNUUkVRVUFMICJEZWJ1ZyIpCiAgICAgY2hlY2tfY3h4X2NvbXBpbGVyX2ZsYWco
LWdzcGxpdC1kd2FyZiBDWFhfQ09NUElMRVJfU1VQUE9SVFNfR1NQTElUX0RXQVJGKQpAQCAtODYs
MTEgKzEzMSwyMiBAQCBpZiAoREVCVUdfRklTU0lPTikKICAgICBzZXQoQ01BS0VfQ19GTEFHUyAi
JHtDTUFLRV9DX0ZMQUdTfSAtZ3NwbGl0LWR3YXJmIikKICAgICBzZXQoQ01BS0VfQ1hYX0ZMQUdT
ICIke0NNQUtFX0NYWF9GTEFHU30gLWdzcGxpdC1kd2FyZiIpCiAKLSAgICAjIFRoZSBsZC5iZmQg
bGlua2VyIGRvZXMgbm90IHN1cHBvcnQgLS1nZGItaW5kZXgsIHBvc3NpYmx5IG90aGVycyBhcyB3
ZWxsLgotICAgIGlmIChVU0VfTERfR09MRCBPUiBVU0VfTERfTExEKQorICAgICMgQ2hlY2sgd2V0
aGVyIHRoZSBsaW5rZXIgc3VwcG9ydHMgLS1nZGItaW5kZXguIFVzZSB0cnlfY29tcGlsZSgpIGRp
cmVjdGx5CisgICAgIyBpbnN0ZWFkIG9mIGNoZWNrX3tjLGN4eH1fY29tcGlsZXJfZmxhZygpIGJl
Y2F1c2UgdGhlIGxhdHRlciBkbyBub3QgdHJ5CisgICAgIyB0byBydW4gZmluYWwgbGluay4KKyAg
ICBmaWxlKFdSSVRFICIke0NNQUtFX0NVUlJFTlRfQklOQVJZX0RJUn0vY2hlY2stbGlua2VyLWdk
Yi1pbmRleC5jIgorICAgICAgICAiaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KSB7ICh2
b2lkKSBhcmdjOyAodm9pZCkgYXJndjsgcmV0dXJuIDA7IH0iKQorICAgIHRyeV9jb21waWxlKExE
X1NVUFBPUlRTX0dEQl9JTkRFWAorICAgICAgICAke0NNQUtFX0NVUlJFTlRfQklOQVJZX0RJUn0K
KyAgICAgICAgJHtDTUFLRV9DVVJSRU5UX0JJTkFSWV9ESVJ9L2NoZWNrLWxpbmtlci1nZGItaW5k
ZXguYworICAgICAgICBMSU5LX09QVElPTlMgLVdsLC0tZ2RiLWluZGV4CisgICAgKQorCisgICAg
aWYgKExEX1NVUFBPUlRTX0dEQl9JTkRFWCkKICAgICAgICAgc2V0KENNQUtFX0VYRV9MSU5LRVJf
RkxBR1MgIiR7Q01BS0VfRVhFX0xJTktFUl9GTEFHU30gLVdsLC0tZ2RiLWluZGV4IikKICAgICAg
ICAgc2V0KENNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1MgIiR7Q01BS0VfRVhFX0xJTktFUl9GTEFH
U30gLVdsLC0tZ2RiLWluZGV4IikKICAgICBlbmRpZiAoKQorICAgIHVuc2V0KExEX1NVUFBPUlRT
X0dEQl9JTkRFWCkKIGVuZGlmICgpCiAKIHNldChHQ0NfT0ZGTElORUFTTV9TT1VSQ0VfTUFQX0RF
RkFVTFQgT0ZGKQpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IDI0M2M5
ZTgzZmJmMjg3Zjc1NGY4NWUwMjc4MDBiMzA5Yzc5YzI1OGMuLmE0NTgxNTEzMzVkZmJlZjcyYmNj
ODRjODcwODIzYWVmMzM5ODQwYzUgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VM
b2cKQEAgLTEsMyArMSwyMyBAQAorMjAyMi0wMS0zMSAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAg
PGFwZXJlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtDTWFrZV0gU3RvcCBkZWZhdWx0aW5nIHRv
IGxkLmdvbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIzNTQ3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IFJlbW92ZSB0aGUgVVNFX0xEX0dPTEQgb3B0aW9uLCBhbmQgbGV0IHRoZSBidWlsZCB1c2UgYnkg
ZGVmYXVsdCB0aGUgc3lzdGVtIGxpbmtlci4KKworICAgICAgICBJbiBvcmRlciB0byBtYWtlIHN1
cmUgd2hldGhlciB0aGUgbGlua2VyIGluIHVzZSBzdXBwb3J0cyAtLWdkYi1pbmRleCBhIGZlYXR1
cmUgY2hlY2sKKyAgICAgICAgaXMgYWRkZWQgdGhhdCB0cmllcyB0byBsaW5rIGFuIGVtcHR5IHBy
b2dyYW0gcGFzc2luZyB0aGUgb3B0aW9uIGluc3RlYWQgb2YgYWRkaW5nCisgICAgICAgIGl0IHdo
ZW4gYSBjZXJ0YWluIGxpbmtlciBpcyBpbiB1c2UsIHdoaWNoIGVuYWJsZXMgLS1nZGItaW5kZXgg
Zm9yIGFueSBvdGhlciBsaW5rZXIKKyAgICAgICAgdGhhdCBzdXBwb3J0cyB0aGUgb3B0aW9uLgor
CisgICAgICAgIFdoaWxlIGF0IGl0LCBhbHNvIGZlYXR1cmUgY2hlY2sgd2hldGhlciB0aGUgbGlu
a2VyIHN1cHBvcnRzIHRoaW4gYXJjaGl2ZXMsIGluIG9yZGVyCisgICAgICAgIHRvIGVuYWJsZSB0
aGVtIG9ubHkgd2hlbiBhY3R1YWxseSB1c2FibGUuIFRoaXMgYXZvaWRzIHNpdHVhdGlvbnMgaW4g
d2hpY2ggdGhpbiBhcmNoaXZlcworICAgICAgICBjYW4gYmUgY3JlYXRlZCBieSB0aGUgYXJjaGl2
ZXIgYnV0IGxhdGVyIG9uIHRoZSBsaW5rZXIgd2lsbCBub3QgYmUgYWJsZSB0byBjb25zdW1lIHRo
ZW0uCisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0NvbW1vbi5jbWFrZToKKwogMjAy
Mi0wMS0yOCAgRWxsaW90dCBXaWxsaWFtcyAgPGVtd0BhcHBsZS5jb20+CiAKICAgICAgICAgW1hD
QnVpbGRdIFNtYWxsIGNvcnJlY3Rpb25zIHRvIGJ1aWxkLXdlYmtpdCBhbmQgTWFrZWZpbGUgZm9y
IHdvcmtzcGFjZSBidWlsZHMK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>450476</attachid>
            <date>2022-01-31 16:50:23 -0800</date>
            <delta_ts>2022-02-01 14:47:36 -0800</delta_ts>
            <desc>Patch v4</desc>
            <filename>bug-235476-20220201025022.patch</filename>
            <type>text/plain</type>
            <size>7925</size>
            <attacher name="Adrian Perez">aperez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0
aW9uc0NvbW1vbi5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCmluZGV4
IGZiNmU4YTEyMjE0NWM2MjUxNzk4ZmQ0MjFmNmFmNzAyOWNiMjI5MGIuLjMzNjk2ODlmOWM4MDQ4
OTFkYmJiMTU2YjdmOWFiMWFhYmU5OWViODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRp
b25zQ29tbW9uLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCkBA
IC02LDIwICs2LDgwIEBAIGFkZF9kZWZpbml0aW9ucygtREJVSUxESU5HX1dJVEhfQ01BS0U9MSkK
IGFkZF9kZWZpbml0aW9ucygtREhBVkVfQ09ORklHX0g9MSkKIGFkZF9kZWZpbml0aW9ucygtRFBB
U19CTUFMTE9DPTEpCiAKLW9wdGlvbihVU0VfVEhJTl9BUkNISVZFUyAiUHJvZHVjZSBhbGwgc3Rh
dGljIGxpYnJhcmllcyBhcyB0aGluIGFyY2hpdmVzIiBPTikKK2Z1bmN0aW9uKENIRUNLX1RISU5f
QVJDSElWRV9TVVBQT1JUIF9yZXN1bHRfdmFyKQorICAgIHNldCgke19yZXN1bHRfdmFyfSBPRkYg
UEFSRU5UX1NDT1BFKQorCisgICAgZmlsZShXUklURQorICAgICAgICAke0NNQUtFX0NVUlJFTlRf
QklOQVJZX0RJUn0vdGVzdC10aGluLWFyY2hpdmUuYworICAgICAgICAiaW50IGdldF9tZSh2b2lk
KSB7IHJldHVybiA0MjsgfSIKKyAgICApCisgICAgZmlsZShXUklURQorICAgICAgICAke0NNQUtF
X0NVUlJFTlRfQklOQVJZX0RJUn0vdGVzdC10aGluLWFyY2hpdmUtbWFpbi5jCisgICAgICAgICJl
eHRlcm4gaW50IGdldF9tZSh2b2lkKTsKKyAgICAgICAgaW50IG1haW4odm9pZCkgeyByZXR1cm4g
Z2V0X21lKCk7IH0iCisgICAgKQorCisgICAgIyBDb21waWxlIHRoZSBDIHNvdXJjZXMuCisgICAg
ZXhlY3V0ZV9wcm9jZXNzKAorICAgICAgICBXT1JLSU5HX0RJUkVDVE9SWSAke0NNQUtFX0NVUlJF
TlRfQklOQVJZX0RJUn0KKyAgICAgICAgT1VUUFVUX1FVSUVUIEVSUk9SX1FVSUVUIFJFU1VMVF9W
QVJJQUJMRSBfc3RhdHVzCisgICAgICAgIENPTU1BTkQgJHtDTUFLRV9DX0NPTVBJTEVSfSAtYwor
ICAgICAgICAgICAgLW8gdGVzdC10aGluLWFyY2hpdmUke0NNQUtFX0NfT1VUUFVUX0VYVEVOU0lP
Tn0KKyAgICAgICAgICAgIHRlc3QtdGhpbi1hcmNoaXZlLmMKKyAgICApCisgICAgaWYgKE5PVCBf
c3RhdHVzIEVRVUFMIDApCisgICAgICAgIHJldHVybigpCisgICAgZW5kaWYgKCkKKworICAgIGV4
ZWN1dGVfcHJvY2VzcygKKyAgICAgICAgV09SS0lOR19ESVJFQ1RPUlkgJHtDTUFLRV9DVVJSRU5U
X0JJTkFSWV9ESVJ9CisgICAgICAgIE9VVFBVVF9RVUlFVCBFUlJPUl9RVUlFVCBSRVNVTFRfVkFS
SUFCTEUgX3N0YXR1cworICAgICAgICBDT01NQU5EICR7Q01BS0VfQ19DT01QSUxFUn0gLWMKKyAg
ICAgICAgICAgIC1vIHRlc3QtdGhpbi1hcmNoaXZlLW1haW4ke0NNQUtFX0NfT1VUUFVUX0VYVEVO
U0lPTn0KKyAgICAgICAgICAgIHRlc3QtdGhpbi1hcmNoaXZlLW1haW4uYworICAgICkKKyAgICBp
ZiAoTk9UIF9zdGF0dXMgRVFVQUwgMCkKKyAgICAgICAgcmV0dXJuKCkKKyAgICBlbmRpZiAoKQor
CisgICAgIyBUcnkgbWFraW5nIGEgdGhpbiBhcmNoaXZlIHdpdGggdGhlIGxpYnJhcnkgb2JqZWN0
LgorICAgIGV4ZWN1dGVfcHJvY2VzcygKKyAgICAgICAgV09SS0lOR19ESVJFQ1RPUlkgJHtDTUFL
RV9DVVJSRU5UX0JJTkFSWV9ESVJ9CisgICAgICAgIE9VVFBVVF9RVUlFVCBFUlJPUl9RVUlFVCBS
RVNVTFRfVkFSSUFCTEUgX3N0YXR1cworICAgICAgICBDT01NQU5ECisgICAgICAgICAgICAke0NN
QUtFX0FSfSBxY1QKKyAgICAgICAgICAgICR7Q01BS0VfU1RBVElDX0xJQlJBUllfUFJFRklYfXRl
c3QtdGhpbi1hcmNoaXZlJHtDTUFLRV9TVEFUSUNfTElCUkFSWV9TVUZGSVh9CisgICAgICAgICAg
ICB0ZXN0LXRoaW4tYXJjaGl2ZSR7Q01BS0VfQ19PVVRQVVRfRVhURU5TSU9OfQorICAgICkKKyAg
ICBpZiAoTk9UIF9zdGF0dXMgRVFVQUwgMCkKKyAgICAgICAgcmV0dXJuKCkKKyAgICBlbmRpZiAo
KQorCisgICAgIyBMaW5rIGJvdGggdGhlIG1haW4gcHJvZ3JhbSBhbmQgdGhlIHRoaW4gbGlicmFy
eS4gSXQgaXMgaW1wb3J0YW50CisgICAgIyB0byAjIHRlc3QgdGhhdCB0aGluIGFyY2hpdmVzIGNh
biBiZSBjb25zdW1lZCBieSB0aGUgbGlua2VyIGFzIHdlbGwuCisgICAgZXhlY3V0ZV9wcm9jZXNz
KAorICAgICAgICBXT1JLSU5HX0RJUkVDVE9SWSAke0NNQUtFX0NVUlJFTlRfQklOQVJZX0RJUn0K
KyAgICAgICAgT1VUUFVUX1FVSUVUIEVSUk9SX1FVSUVUIFJFU1VMVF9WQVJJQUJMRSBfc3RhdHVz
CisgICAgICAgIENPTU1BTkQKKyAgICAgICAgICAgICR7Q01BS0VfQ19DT01QSUxFUn0gJHtDTUFL
RV9DX0xJTktfRkxBR1N9CisgICAgICAgICAgICAtbyB0ZXN0LXRoaW4tYXJjaGl2ZS1tYWluJHtD
TUFLRV9FWEVDVVRBQkxFX1NVRkZJWH0KKyAgICAgICAgICAgIHRlc3QtdGhpbi1hcmNoaXZlLW1h
aW4ke0NNQUtFX0NfT1VUUFVUX0VYVEVOU0lPTn0KKyAgICAgICAgICAgICR7Q01BS0VfU1RBVElD
X0xJQlJBUllfUFJFRklYfXRlc3QtdGhpbi1hcmNoaXZlJHtDTUFLRV9TVEFUSUNfTElCUkFSWV9T
VUZGSVh9CisgICAgKQorCisgICAgaWYgKF9zdGF0dXMgRVFVQUwgMCkKKyAgICAgICAgc2V0KCR7
X3Jlc3VsdF92YXJ9IE9OIFBBUkVOVF9TQ09QRSkKKyAgICBlbmRpZiAoKQorZW5kZnVuY3Rpb24o
KQorCitDSEVDS19USElOX0FSQ0hJVkVfU1VQUE9SVChVU0VfVEhJTl9BUkNISVZFU19ERUZBVUxU
KQorb3B0aW9uKFVTRV9USElOX0FSQ0hJVkVTICJQcm9kdWNlIGFsbCBzdGF0aWMgbGlicmFyaWVz
IGFzIHRoaW4gYXJjaGl2ZXMiICR7VVNFX1RISU5fQVJDSElWRVNfREVGQVVMVH0pCisKIGlmIChV
U0VfVEhJTl9BUkNISVZFUykKLSAgICBleGVjdXRlX3Byb2Nlc3MoQ09NTUFORCAke0NNQUtFX0FS
fSAtViBPVVRQVVRfVkFSSUFCTEUgQVJfVkVSU0lPTiBFUlJPUl9WQVJJQUJMRSBBUl9FUlJPUikK
LSAgICBpZiAoIiR7QVJfRVJST1J9IiBNQVRDSEVTICJedXNhZ2U6IikKLSAgICAgICAgIyBUaGlz
IGBhcmAgZG9lc24ndCB1bmRlcnN0YW5kICItViIuIElnbm9yZSB0aGUgZXJyb3IgYW5kIHRyZWF0
IHRoaXMgYXMKLSAgICAgICAgIyBhbiB1bnN1cHBvcnRlZCBgYXJgLiBUT0RPOiBEZXRlcm1pbmUg
QlNEIG9yIFhjb2RlIGVxdWl2YWxlbnQuCi0gICAgZWxzZWlmICgiJHtBUl9FUlJPUn0iKQotICAg
ICAgICBtZXNzYWdlKFdBUk5JTkcgIkVycm9yIGZyb20gYGFyYDogJHtBUl9FUlJPUn0iKQotICAg
IGVsc2VpZiAoIiR7QVJfVkVSU0lPTn0iIE1BVENIRVMgIl5HTlUgYXIiKQotICAgICAgICBzZXQo
Q01BS0VfQ1hYX0FSQ0hJVkVfQ1JFQVRFICI8Q01BS0VfQVI+IGNyVCA8VEFSR0VUPiA8TElOS19G
TEFHUz4gPE9CSkVDVFM+IikKLSAgICAgICAgc2V0KENNQUtFX0NfQVJDSElWRV9DUkVBVEUgIjxD
TUFLRV9BUj4gY3JUIDxUQVJHRVQ+IDxMSU5LX0ZMQUdTPiA8T0JKRUNUUz4iKQotICAgICAgICBz
ZXQoQ01BS0VfQ1hYX0FSQ0hJVkVfQVBQRU5EICI8Q01BS0VfQVI+IHJUIDxUQVJHRVQ+IDxMSU5L
X0ZMQUdTPiA8T0JKRUNUUz4iKQotICAgICAgICBzZXQoQ01BS0VfQ19BUkNISVZFX0FQUEVORCAi
PENNQUtFX0FSPiByVCA8VEFSR0VUPiA8TElOS19GTEFHUz4gPE9CSkVDVFM+IikKLSAgICBlbmRp
ZiAoKQorICAgIHNldChDTUFLRV9DWFhfQVJDSElWRV9DUkVBVEUgIjxDTUFLRV9BUj4gY3JUIDxU
QVJHRVQ+IDxMSU5LX0ZMQUdTPiA8T0JKRUNUUz4iKQorICAgIHNldChDTUFLRV9DX0FSQ0hJVkVf
Q1JFQVRFICI8Q01BS0VfQVI+IGNyVCA8VEFSR0VUPiA8TElOS19GTEFHUz4gPE9CSkVDVFM+IikK
KyAgICBzZXQoQ01BS0VfQ1hYX0FSQ0hJVkVfQVBQRU5EICI8Q01BS0VfQVI+IHJUIDxUQVJHRVQ+
IDxMSU5LX0ZMQUdTPiA8T0JKRUNUUz4iKQorICAgIHNldChDTUFLRV9DX0FSQ0hJVkVfQVBQRU5E
ICI8Q01BS0VfQVI+IHJUIDxUQVJHRVQ+IDxMSU5LX0ZMQUdTPiA8T0JKRUNUUz4iKQogZW5kaWYg
KCkKIAogc2V0X3Byb3BlcnR5KEdMT0JBTCBQUk9QRVJUWSBVU0VfRk9MREVSUyBPTikKQEAgLTQ1
LDcgKzEwNSw3IEBAIGVuZGlmICgpCiAKICMgVXNlIGxkLmxsZCB3aGVuIGJ1aWxkaW5nIHdpdGgg
TFRPCiBDTUFLRV9ERVBFTkRFTlRfT1BUSU9OKFVTRV9MRF9MTEQgIlVzZSBMTEQgbGlua2VyIiBP
TgotICAgICAgICAgICAgICAgICAgICAgICAiTFRPX01PREU7Tk9UIFVTRV9MRF9HT0xEO05PVCBX
SU4zMiIgT0ZGKQorICAgICAgICAgICAgICAgICAgICAgICAiTFRPX01PREU7Tk9UIFdJTjMyIiBP
RkYpCiBpZiAoVVNFX0xEX0xMRCkKICAgICBleGVjdXRlX3Byb2Nlc3MoQ09NTUFORCAke0NNQUtF
X0NfQ09NUElMRVJ9IC1mdXNlLWxkPWxsZCAtV2wsLS12ZXJzaW9uIEVSUk9SX1FVSUVUIE9VVFBV
VF9WQVJJQUJMRSBMRF9WRVJTSU9OKQogICAgIGlmICgiJHtMRF9WRVJTSU9OfSIgTUFUQ0hFUyAi
TExEIikKQEAgLTU3LDIxICsxMTcsNiBAQCBpZiAoVVNFX0xEX0xMRCkKICAgICBlbmRpZiAoKQog
ZW5kaWYgKCkKIAotIyBVc2UgbGQuZ29sZCBpZiBpdCBpcyBhdmFpbGFibGUgYW5kIGlzbid0IGRp
c2FibGVkIGV4cGxpY2l0bHkKLUNNQUtFX0RFUEVOREVOVF9PUFRJT04oVVNFX0xEX0dPTEQgIlVz
ZSBHTlUgZ29sZCBsaW5rZXIiIE9OCi0gICAgICAgICAgICAgICAgICAgICAgICJOT1QgQ1hYX0FD
Q0VQVFNfTUZJWF9DT1JURVhfQTUzXzgzNTc2OTtOT1QgQVJNX1RSQURJVElPTkFMX0RFVEVDVEVE
O05PVCBXSU4zMjtOT1QgQVBQTEU7Tk9UIFVTRV9MRF9MTEQiIE9GRikKLWlmIChVU0VfTERfR09M
RCkKLSAgICBleGVjdXRlX3Byb2Nlc3MoQ09NTUFORCAke0NNQUtFX0NfQ09NUElMRVJ9IC1mdXNl
LWxkPWdvbGQgLVdsLC0tdmVyc2lvbiBFUlJPUl9RVUlFVCBPVVRQVVRfVkFSSUFCTEUgTERfVkVS
U0lPTikKLSAgICBpZiAoIiR7TERfVkVSU0lPTn0iIE1BVENIRVMgIkdOVSBnb2xkIikKLSAgICAg
ICAgc3RyaW5nKEFQUEVORCBDTUFLRV9FWEVfTElOS0VSX0ZMQUdTICIgLWZ1c2UtbGQ9Z29sZCAt
V2wsLS1kaXNhYmxlLW5ldy1kdGFncyIpCi0gICAgICAgIHN0cmluZyhBUFBFTkQgQ01BS0VfU0hB
UkVEX0xJTktFUl9GTEFHUyAiIC1mdXNlLWxkPWdvbGQgLVdsLC0tZGlzYWJsZS1uZXctZHRhZ3Mi
KQotICAgICAgICBzdHJpbmcoQVBQRU5EIENNQUtFX01PRFVMRV9MSU5LRVJfRkxBR1MgIiAtZnVz
ZS1sZD1nb2xkIC1XbCwtLWRpc2FibGUtbmV3LWR0YWdzIikKLSAgICBlbHNlICgpCi0gICAgICAg
IG1lc3NhZ2UoV0FSTklORyAiR05VIGdvbGQgbGlua2VyIGlzbid0IGF2YWlsYWJsZSwgdXNpbmcg
dGhlIGRlZmF1bHQgc3lzdGVtIGxpbmtlci4iKQotICAgICAgICBzZXQoVVNFX0xEX0dPTEQgT0ZG
KQotICAgIGVuZGlmICgpCi1lbmRpZiAoKQotCiBzZXQoRU5BQkxFX0RFQlVHX0ZJU1NJT05fREVG
QVVMVCBPRkYpCiBpZiAoQ01BS0VfQlVJTERfVFlQRSBTVFJFUVVBTCAiRGVidWciKQogICAgIGNo
ZWNrX2N4eF9jb21waWxlcl9mbGFnKC1nc3BsaXQtZHdhcmYgQ1hYX0NPTVBJTEVSX1NVUFBPUlRT
X0dTUExJVF9EV0FSRikKQEAgLTg2LDExICsxMzEsMjIgQEAgaWYgKERFQlVHX0ZJU1NJT04pCiAg
ICAgc2V0KENNQUtFX0NfRkxBR1MgIiR7Q01BS0VfQ19GTEFHU30gLWdzcGxpdC1kd2FyZiIpCiAg
ICAgc2V0KENNQUtFX0NYWF9GTEFHUyAiJHtDTUFLRV9DWFhfRkxBR1N9IC1nc3BsaXQtZHdhcmYi
KQogCi0gICAgIyBUaGUgbGQuYmZkIGxpbmtlciBkb2VzIG5vdCBzdXBwb3J0IC0tZ2RiLWluZGV4
LCBwb3NzaWJseSBvdGhlcnMgYXMgd2VsbC4KLSAgICBpZiAoVVNFX0xEX0dPTEQgT1IgVVNFX0xE
X0xMRCkKKyAgICAjIENoZWNrIHdoZXRoZXIgdGhlIGxpbmtlciBzdXBwb3J0cyAtLWdkYi1pbmRl
eC4gVXNlIHRyeV9jb21waWxlKCkgZGlyZWN0bHkKKyAgICAjIGluc3RlYWQgb2YgY2hlY2tfe2Ms
Y3h4fV9jb21waWxlcl9mbGFnKCkgYmVjYXVzZSB0aGUgbGF0dGVyIGRvIG5vdCB0cnkKKyAgICAj
IHRvIHJ1biB0aGUgZmluYWwgbGluay4KKyAgICBmaWxlKFdSSVRFICIke0NNQUtFX0NVUlJFTlRf
QklOQVJZX0RJUn0vY2hlY2stbGlua2VyLWdkYi1pbmRleC5jIgorICAgICAgICAiaW50IG1haW4o
dm9pZCkgeyByZXR1cm4gMDsgfSIpCisgICAgdHJ5X2NvbXBpbGUoTERfU1VQUE9SVFNfR0RCX0lO
REVYCisgICAgICAgICR7Q01BS0VfQ1VSUkVOVF9CSU5BUllfRElSfQorICAgICAgICAke0NNQUtF
X0NVUlJFTlRfQklOQVJZX0RJUn0vY2hlY2stbGlua2VyLWdkYi1pbmRleC5jCisgICAgICAgIExJ
TktfT1BUSU9OUyAtV2wsLS1nZGItaW5kZXgKKyAgICApCisKKyAgICBpZiAoTERfU1VQUE9SVFNf
R0RCX0lOREVYKQogICAgICAgICBzZXQoQ01BS0VfRVhFX0xJTktFUl9GTEFHUyAiJHtDTUFLRV9F
WEVfTElOS0VSX0ZMQUdTfSAtV2wsLS1nZGItaW5kZXgiKQogICAgICAgICBzZXQoQ01BS0VfU0hB
UkVEX0xJTktFUl9GTEFHUyAiJHtDTUFLRV9FWEVfTElOS0VSX0ZMQUdTfSAtV2wsLS1nZGItaW5k
ZXgiKQogICAgIGVuZGlmICgpCisgICAgdW5zZXQoTERfU1VQUE9SVFNfR0RCX0lOREVYKQogZW5k
aWYgKCkKIAogc2V0KEdDQ19PRkZMSU5FQVNNX1NPVVJDRV9NQVBfREVGQVVMVCBPRkYpCmRpZmYg
LS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggMjQzYzllODNmYmYyODdmNzU0Zjg1
ZTAyNzgwMGIzMDljNzljMjU4Yy4uMzJmMGQ0ZDQzMWM5M2I1YWI3MzVmMWJjNmQ5ODA2MGU3NjQ3
YTRkMCAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz
IEBACisyMDIyLTAyLTAxICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5j
b20+CisKKyAgICAgICAgW0NNYWtlXSBTdG9wIGRlZmF1bHRpbmcgdG8gbGQuZ29sZAorICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1NDc2CisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHRoZSBVU0Vf
TERfR09MRCBvcHRpb24sIGFuZCBsZXQgdGhlIGJ1aWxkIHVzZSBieSBkZWZhdWx0IHRoZSBzeXN0
ZW0gbGlua2VyLgorCisgICAgICAgIEluIG9yZGVyIHRvIG1ha2Ugc3VyZSB3aGV0aGVyIHRoZSBs
aW5rZXIgaW4gdXNlIHN1cHBvcnRzIC0tZ2RiLWluZGV4IGEgZmVhdHVyZSBjaGVjaworICAgICAg
ICBpcyBhZGRlZCB0aGF0IHRyaWVzIHRvIGxpbmsgYW4gZW1wdHkgcHJvZ3JhbSBwYXNzaW5nIHRo
ZSBvcHRpb24gaW5zdGVhZCBvZiBhZGRpbmcKKyAgICAgICAgaXQgd2hlbiBhIGNlcnRhaW4gbGlu
a2VyIGlzIGluIHVzZSwgd2hpY2ggZW5hYmxlcyAtLWdkYi1pbmRleCBmb3IgYW55IG90aGVyIGxp
bmtlcgorICAgICAgICB0aGF0IHN1cHBvcnRzIHRoZSBvcHRpb24uCisKKyAgICAgICAgV2hpbGUg
YXQgaXQsIGFsc28gZmVhdHVyZSBjaGVjayB3aGV0aGVyIHRoZSBsaW5rZXIgc3VwcG9ydHMgdGhp
biBhcmNoaXZlcywgaW4gb3JkZXIKKyAgICAgICAgdG8gZW5hYmxlIHRoZW0gb25seSB3aGVuIGFj
dHVhbGx5IHVzYWJsZS4gVGhpcyBhdm9pZHMgc2l0dWF0aW9ucyBpbiB3aGljaCB0aGluIGFyY2hp
dmVzCisgICAgICAgIGNhbiBiZSBjcmVhdGVkIGJ5IHRoZSBhcmNoaXZlciBidXQgbGF0ZXIgb24g
dGhlIGxpbmtlciB3aWxsIG5vdCBiZSBhYmxlIHRvIGNvbnN1bWUgdGhlbS4KKworICAgICAgICAq
IFNvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlOgorCiAyMDIyLTAxLTI4ICBFbGxpb3R0
IFdpbGxpYW1zICA8ZW13QGFwcGxlLmNvbT4KIAogICAgICAgICBbWENCdWlsZF0gU21hbGwgY29y
cmVjdGlvbnMgdG8gYnVpbGQtd2Via2l0IGFuZCBNYWtlZmlsZSBmb3Igd29ya3NwYWNlIGJ1aWxk
cwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>450570</attachid>
            <date>2022-02-01 14:47:42 -0800</date>
            <delta_ts>2022-02-02 02:04:34 -0800</delta_ts>
            <desc>Patch v5</desc>
            <filename>bug-235476-20220202004741.patch</filename>
            <type>text/plain</type>
            <size>7676</size>
            <attacher name="Adrian Perez">aperez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0
aW9uc0NvbW1vbi5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCmluZGV4
IGZiNmU4YTEyMjE0NWM2MjUxNzk4ZmQ0MjFmNmFmNzAyOWNiMjI5MGIuLmY4Mjk5YWJiMTY3MjJj
NDIwMzZiYWU4MGRmODE3MjdkMTUwMDc4MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRp
b25zQ29tbW9uLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCkBA
IC02LDIyICs2LDYgQEAgYWRkX2RlZmluaXRpb25zKC1EQlVJTERJTkdfV0lUSF9DTUFLRT0xKQog
YWRkX2RlZmluaXRpb25zKC1ESEFWRV9DT05GSUdfSD0xKQogYWRkX2RlZmluaXRpb25zKC1EUEFT
X0JNQUxMT0M9MSkKIAotb3B0aW9uKFVTRV9USElOX0FSQ0hJVkVTICJQcm9kdWNlIGFsbCBzdGF0
aWMgbGlicmFyaWVzIGFzIHRoaW4gYXJjaGl2ZXMiIE9OKQotaWYgKFVTRV9USElOX0FSQ0hJVkVT
KQotICAgIGV4ZWN1dGVfcHJvY2VzcyhDT01NQU5EICR7Q01BS0VfQVJ9IC1WIE9VVFBVVF9WQVJJ
QUJMRSBBUl9WRVJTSU9OIEVSUk9SX1ZBUklBQkxFIEFSX0VSUk9SKQotICAgIGlmICgiJHtBUl9F
UlJPUn0iIE1BVENIRVMgIl51c2FnZToiKQotICAgICAgICAjIFRoaXMgYGFyYCBkb2Vzbid0IHVu
ZGVyc3RhbmQgIi1WIi4gSWdub3JlIHRoZSBlcnJvciBhbmQgdHJlYXQgdGhpcyBhcwotICAgICAg
ICAjIGFuIHVuc3VwcG9ydGVkIGBhcmAuIFRPRE86IERldGVybWluZSBCU0Qgb3IgWGNvZGUgZXF1
aXZhbGVudC4KLSAgICBlbHNlaWYgKCIke0FSX0VSUk9SfSIpCi0gICAgICAgIG1lc3NhZ2UoV0FS
TklORyAiRXJyb3IgZnJvbSBgYXJgOiAke0FSX0VSUk9SfSIpCi0gICAgZWxzZWlmICgiJHtBUl9W
RVJTSU9OfSIgTUFUQ0hFUyAiXkdOVSBhciIpCi0gICAgICAgIHNldChDTUFLRV9DWFhfQVJDSElW
RV9DUkVBVEUgIjxDTUFLRV9BUj4gY3JUIDxUQVJHRVQ+IDxMSU5LX0ZMQUdTPiA8T0JKRUNUUz4i
KQotICAgICAgICBzZXQoQ01BS0VfQ19BUkNISVZFX0NSRUFURSAiPENNQUtFX0FSPiBjclQgPFRB
UkdFVD4gPExJTktfRkxBR1M+IDxPQkpFQ1RTPiIpCi0gICAgICAgIHNldChDTUFLRV9DWFhfQVJD
SElWRV9BUFBFTkQgIjxDTUFLRV9BUj4gclQgPFRBUkdFVD4gPExJTktfRkxBR1M+IDxPQkpFQ1RT
PiIpCi0gICAgICAgIHNldChDTUFLRV9DX0FSQ0hJVkVfQVBQRU5EICI8Q01BS0VfQVI+IHJUIDxU
QVJHRVQ+IDxMSU5LX0ZMQUdTPiA8T0JKRUNUUz4iKQotICAgIGVuZGlmICgpCi1lbmRpZiAoKQot
CiBzZXRfcHJvcGVydHkoR0xPQkFMIFBST1BFUlRZIFVTRV9GT0xERVJTIE9OKQogZGVmaW5lX3By
b3BlcnR5KFRBUkdFVCBQUk9QRVJUWSBGT0xERVIgSU5IRVJJVEVEIEJSSUVGX0RPQ1MgImZvbGRl
ciIgRlVMTF9ET0NTICJJREUgZm9sZGVyIG5hbWUiKQogCkBAIC00NSw3ICsyOSw3IEBAIGVuZGlm
ICgpCiAKICMgVXNlIGxkLmxsZCB3aGVuIGJ1aWxkaW5nIHdpdGggTFRPCiBDTUFLRV9ERVBFTkRF
TlRfT1BUSU9OKFVTRV9MRF9MTEQgIlVzZSBMTEQgbGlua2VyIiBPTgotICAgICAgICAgICAgICAg
ICAgICAgICAiTFRPX01PREU7Tk9UIFVTRV9MRF9HT0xEO05PVCBXSU4zMiIgT0ZGKQorICAgICAg
ICAgICAgICAgICAgICAgICAiTFRPX01PREU7Tk9UIFdJTjMyIiBPRkYpCiBpZiAoVVNFX0xEX0xM
RCkKICAgICBleGVjdXRlX3Byb2Nlc3MoQ09NTUFORCAke0NNQUtFX0NfQ09NUElMRVJ9IC1mdXNl
LWxkPWxsZCAtV2wsLS12ZXJzaW9uIEVSUk9SX1FVSUVUIE9VVFBVVF9WQVJJQUJMRSBMRF9WRVJT
SU9OKQogICAgIGlmICgiJHtMRF9WRVJTSU9OfSIgTUFUQ0hFUyAiTExEIikKQEAgLTU3LDI1ICs0
MSw3NiBAQCBpZiAoVVNFX0xEX0xMRCkKICAgICBlbmRpZiAoKQogZW5kaWYgKCkKIAotIyBVc2Ug
bGQuZ29sZCBpZiBpdCBpcyBhdmFpbGFibGUgYW5kIGlzbid0IGRpc2FibGVkIGV4cGxpY2l0bHkK
LUNNQUtFX0RFUEVOREVOVF9PUFRJT04oVVNFX0xEX0dPTEQgIlVzZSBHTlUgZ29sZCBsaW5rZXIi
IE9OCi0gICAgICAgICAgICAgICAgICAgICAgICJOT1QgQ1hYX0FDQ0VQVFNfTUZJWF9DT1JURVhf
QTUzXzgzNTc2OTtOT1QgQVJNX1RSQURJVElPTkFMX0RFVEVDVEVEO05PVCBXSU4zMjtOT1QgQVBQ
TEU7Tk9UIFVTRV9MRF9MTEQiIE9GRikKLWlmIChVU0VfTERfR09MRCkKLSAgICBleGVjdXRlX3By
b2Nlc3MoQ09NTUFORCAke0NNQUtFX0NfQ09NUElMRVJ9IC1mdXNlLWxkPWdvbGQgLVdsLC0tdmVy
c2lvbiBFUlJPUl9RVUlFVCBPVVRQVVRfVkFSSUFCTEUgTERfVkVSU0lPTikKLSAgICBpZiAoIiR7
TERfVkVSU0lPTn0iIE1BVENIRVMgIkdOVSBnb2xkIikKLSAgICAgICAgc3RyaW5nKEFQUEVORCBD
TUFLRV9FWEVfTElOS0VSX0ZMQUdTICIgLWZ1c2UtbGQ9Z29sZCAtV2wsLS1kaXNhYmxlLW5ldy1k
dGFncyIpCi0gICAgICAgIHN0cmluZyhBUFBFTkQgQ01BS0VfU0hBUkVEX0xJTktFUl9GTEFHUyAi
IC1mdXNlLWxkPWdvbGQgLVdsLC0tZGlzYWJsZS1uZXctZHRhZ3MiKQotICAgICAgICBzdHJpbmco
QVBQRU5EIENNQUtFX01PRFVMRV9MSU5LRVJfRkxBR1MgIiAtZnVzZS1sZD1nb2xkIC1XbCwtLWRp
c2FibGUtbmV3LWR0YWdzIikKKyMgRGV0ZXJtaW5lIHdoaWNoIGxpbmtlciBpcyBiZWluZyB1c2Vk
IHdpdGggdGhlIGNob3NlbiBsaW5rZXIgZmxhZ3MuCitleGVjdXRlX3Byb2Nlc3MoCisgICAgQ09N
TUFORCAke0NNQUtFX0NfQ09NUElMRVJ9ICR7Q01BS0VfRVhFX0xJTktFUl9GTEFHU30gLVdsLC0t
dmVyc2lvbgorICAgIE9VVFBVVF9WQVJJQUJMRSBMRF9WRVJTSU9OCisgICAgRVJST1JfUVVJRVQK
KykKK3NldChMRF9TVVBQT1JUU19HREJfSU5ERVggVFJVRSkKK3NldChMRF9TVVBQT1JUU19TUExJ
VF9ERUJVRyBUUlVFKQorc2V0KExEX1NVUFBPUlRTX1RISU5fQVJDSElWRVMgVFJVRSkKK2lmIChM
RF9WRVJTSU9OIE1BVENIRVMgIl5MTEQgIikKKyAgICBzZXQoTERfVkFSSUFOVCBMTEQpCitlbHNl
aWYgKExEX1ZFUlNJT04gTUFUQ0hFUyAiXm1vbGQgIikKKyAgICBzZXQoTERfVkFSSUFOVCBNT0xE
KQorZWxzZWlmIChMRF9WRVJTSU9OIE1BVENIRVMgIl5HTlUgZ29sZCAiKQorICAgIHNldChMRF9W
QVJJQU5UIEdPTEQpCitlbHNlaWYgKExEX1ZFUlNJT04gTUFUQ0hFUyAiXkdOVSBsZCAiKQorICAg
IHNldChMRF9WQVJJQU5UIEJGRCkKKyAgICBzZXQoTERfU1VQUE9SVFNfR0RCX0lOREVYIEZBTFNF
KQorZWxzZSAoKQorICAgIHNldChMRF9WQVJJQU5UIFVOS05PV04pCisgICAgc2V0KExEX1NVUFBP
UlRTX0dEQl9JTkRFWCBGQUxTRSkKKyAgICBzZXQoTERfU1VQUE9SVFNfU1BMSVRfREVCVUcgRkFM
U0UpCisgICAgc2V0KExEX1NVUFBPUlRTX1RISU5fQVJDSElWRVMgRkFMU0UpCitlbmRpZiAoKQor
dW5zZXQoTERfVkVSU0lPTikKK21lc3NhZ2UoU1RBVFVTICJMaW5rZXIgdmFyaWFudCBpbiB1c2U6
ICR7TERfVkFSSUFOVH0gKHRoaW4gYXJjaGl2ZXM6ICR7TERfU1VQUE9SVFNfVEhJTl9BUkNISVZF
U30sIHNwbGl0IGRlYnVnOiAke0xEX1NVUFBPUlRTX1NQTElUX0RFQlVHfSwgLS1nZGItaW5kZXg6
ICR7TERfU1VQUE9SVFNfR0RCX0lOREVYfSkiKQorCisjIERldGVybWluZSB3aGV0aGVyIHRoZSBh
cmNoaXZlciBpbiB1c2Ugc3VwcG9ydHMgdGhpbiBhcmNoaXZlcy4KK2V4ZWN1dGVfcHJvY2VzcygK
KyAgICBDT01NQU5EICR7Q01BS0VfQVJ9IC1WCisgICAgT1VUUFVUX1ZBUklBQkxFIEFSX1ZFUlNJ
T04KKyAgICBSRVNVTFRfVkFSSUFCTEUgQVJfU1RBVFVTCisgICAgRVJST1JfUVVJRVQKKykKK3Nl
dChBUl9TVVBQT1JUU19USElOX0FSQ0hJVkVTIEZBTFNFKQoraWYgKEFSX1NUQVRVUyBFUVVBTCAw
KQorICAgIGlmIChBUl9WRVJTSU9OIE1BVENIRVMgIl5HTlUgYXIgIikKKyAgICAgICAgc2V0KEFS
X1ZBUklBTlQgQkZEKQorICAgICAgICBzZXQoQVJfU1VQUE9SVFNfVEhJTl9BUkNISVZFUyBUUlVF
KQorICAgIGVsc2VpZiAoQVJfVkVSU0lPTiBNQVRDSEVTICJeTExWTSAiKQorICAgICAgICBzZXQo
QVJfVkFSSUFOVCBMTFZNKQorICAgICAgICBzZXQoQVJfU1VQUE9SVFNfVEhJTl9BUkNISVZFUyBU
UlVFKQogICAgIGVsc2UgKCkKLSAgICAgICAgbWVzc2FnZShXQVJOSU5HICJHTlUgZ29sZCBsaW5r
ZXIgaXNuJ3QgYXZhaWxhYmxlLCB1c2luZyB0aGUgZGVmYXVsdCBzeXN0ZW0gbGlua2VyLiIpCi0g
ICAgICAgIHNldChVU0VfTERfR09MRCBPRkYpCisgICAgICAgIHNldChBUl9WQVJJQU5UIFVOS05P
V04pCiAgICAgZW5kaWYgKCkKIGVuZGlmICgpCit1bnNldChBUl9WRVJTSU9OKQordW5zZXQoQVJf
U1RBVFVTKQorbWVzc2FnZShTVEFUVVMgIkFyY2hpdmVyIHZhcmlhbnQgaW4gdXNlOiAke0FSX1ZB
UklBTlR9ICh0aGluIGFyY2hpdmVzOiAke0FSX1NVUFBPUlRTX1RISU5fQVJDSElWRVN9KSIpCisK
KyMgUHJlZmVyIHRoaW4gYXJjaGl2ZXMgYnkgZGVmYXVsdCBpZiB0aGV5IGNhbiBiZSBib3RoIGNy
ZWF0ZWQgYnkgdGhlCisjIGFyY2hpdmVyIGFuZCByZWFkIGJhY2sgYnkgdGhlIGxpbmtlci4KK2lm
IChBUl9TVVBQT1JUU19USElOX0FSQ0hJVkVTIEFORCBMRF9TVVBQT1JUU19USElOX0FSQ0hJVkVT
KQorICAgIHNldChVU0VfVEhJTl9BUkNISVZFU19ERUZBVUxUIE9OKQorZWxzZSAoKQorICAgIHNl
dChVU0VfVEhJTl9BUkNISVZFU19ERUZBVUxUIE9GRikKK2VuZGlmICgpCitvcHRpb24oVVNFX1RI
SU5fQVJDSElWRVMgIlByb2R1Y2UgYWxsIHN0YXRpYyBsaWJyYXJpZXMgYXMgdGhpbiBhcmNoaXZl
cyIgJHtVU0VfVEhJTl9BUkNISVZFU19ERUZBVUxUfSkKKworaWYgKFVTRV9USElOX0FSQ0hJVkVT
KQorICAgIHNldChDTUFLRV9DWFhfQVJDSElWRV9DUkVBVEUgIjxDTUFLRV9BUj4gY3JUIDxUQVJH
RVQ+IDxMSU5LX0ZMQUdTPiA8T0JKRUNUUz4iKQorICAgIHNldChDTUFLRV9DX0FSQ0hJVkVfQ1JF
QVRFICI8Q01BS0VfQVI+IGNyVCA8VEFSR0VUPiA8TElOS19GTEFHUz4gPE9CSkVDVFM+IikKKyAg
ICBzZXQoQ01BS0VfQ1hYX0FSQ0hJVkVfQVBQRU5EICI8Q01BS0VfQVI+IHJUIDxUQVJHRVQ+IDxM
SU5LX0ZMQUdTPiA8T0JKRUNUUz4iKQorICAgIHNldChDTUFLRV9DX0FSQ0hJVkVfQVBQRU5EICI8
Q01BS0VfQVI+IHJUIDxUQVJHRVQ+IDxMSU5LX0ZMQUdTPiA8T0JKRUNUUz4iKQorZW5kaWYgKCkK
IAogc2V0KEVOQUJMRV9ERUJVR19GSVNTSU9OX0RFRkFVTFQgT0ZGKQogaWYgKENNQUtFX0JVSUxE
X1RZUEUgU1RSRVFVQUwgIkRlYnVnIikKICAgICBjaGVja19jeHhfY29tcGlsZXJfZmxhZygtZ3Nw
bGl0LWR3YXJmIENYWF9DT01QSUxFUl9TVVBQT1JUU19HU1BMSVRfRFdBUkYpCi0gICAgaWYgKENY
WF9DT01QSUxFUl9TVVBQT1JUU19HU1BMSVRfRFdBUkYpCisgICAgaWYgKENYWF9DT01QSUxFUl9T
VVBQT1JUU19HU1BMSVRfRFdBUkYgQU5EIExEX1NVUFBPUlRTX1NQTElUX0RFQlVHKQogICAgICAg
ICBzZXQoRU5BQkxFX0RFQlVHX0ZJU1NJT05fREVGQVVMVCBPTikKICAgICBlbmRpZiAoKQogZW5k
aWYgKCkKQEAgLTg1LDkgKzEyMCw3IEBAIG9wdGlvbihERUJVR19GSVNTSU9OICJVc2UgRGVidWcg
Rmlzc2lvbiBzdXBwb3J0IiAke0VOQUJMRV9ERUJVR19GSVNTSU9OX0RFRkFVTFR9CiBpZiAoREVC
VUdfRklTU0lPTikKICAgICBzZXQoQ01BS0VfQ19GTEFHUyAiJHtDTUFLRV9DX0ZMQUdTfSAtZ3Nw
bGl0LWR3YXJmIikKICAgICBzZXQoQ01BS0VfQ1hYX0ZMQUdTICIke0NNQUtFX0NYWF9GTEFHU30g
LWdzcGxpdC1kd2FyZiIpCi0KLSAgICAjIFRoZSBsZC5iZmQgbGlua2VyIGRvZXMgbm90IHN1cHBv
cnQgLS1nZGItaW5kZXgsIHBvc3NpYmx5IG90aGVycyBhcyB3ZWxsLgotICAgIGlmIChVU0VfTERf
R09MRCBPUiBVU0VfTERfTExEKQorICAgIGlmIChMRF9TVVBQT1JUU19HREJfSU5ERVgpCiAgICAg
ICAgIHNldChDTUFLRV9FWEVfTElOS0VSX0ZMQUdTICIke0NNQUtFX0VYRV9MSU5LRVJfRkxBR1N9
IC1XbCwtLWdkYi1pbmRleCIpCiAgICAgICAgIHNldChDTUFLRV9TSEFSRURfTElOS0VSX0ZMQUdT
ICIke0NNQUtFX0VYRV9MSU5LRVJfRkxBR1N9IC1XbCwtLWdkYi1pbmRleCIpCiAgICAgZW5kaWYg
KCkKZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAyNDNjOWU4M2ZiZjI4
N2Y3NTRmODVlMDI3ODAwYjMwOWM3OWMyNThjLi41MjlhYTQwYmE1MDU2NWM4ODZmOTUyZDYxZmNj
N2UwZjQyMzE3NzBlIDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0x
LDMgKzEsMjYgQEAKKzIwMjItMDItMDIgIEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpA
aWdhbGlhLmNvbT4KKworICAgICAgICBbQ01ha2VdIFN0b3AgZGVmYXVsdGluZyB0byBsZC5nb2xk
CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU0NzYK
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUg
dGhlIFVTRV9MRF9HT0xEIG9wdGlvbiwgYW5kIGxldCB0aGUgYnVpbGQgdXNlIGJ5IGRlZmF1bHQg
dGhlIHN5c3RlbSBsaW5rZXIuCisKKyAgICAgICAgVGhlIG91dHB1dCBmcm9tIHJ1bm5pbmcgdGhl
IGxpbmtlciB3aXRoIC1XbCwtLXZlcnNpb24gaXMgbWF0Y2hlZCB0byBkZXRlcm1pbmUgd2hpY2gg
bGlua2VyCisgICAgICAgIGlzIGN1cnJlbnRseSBpbiB1c2UsIGFuZCBzZXQgdmFyaWFibGVzIExE
X1NVUFBPUlRTXzxmZWF0dXJlPiBhY2NvcmRpbmdseS4gVGhpcyBpcyBuZWVkZWQKKyAgICAgICAg
YmVjYXVzZSBub3QgYWxsIG9mIHRoZW0gc3VwcG9ydCBjZXJ0YWluIGZlYXR1cmVzIGFuZCBhZnRl
ciBhIGZldyBhdHRlbXB0cyBhdCBkb2luZyBmZWF0dXJlCisgICAgICAgIGNoZWNrcyBpdCB3YXMg
YmVjb21pbmcgY2xlYXIgdGhhdCBvbiBvbmUgaGFuZCB0aGUgY2hlY2tzIHdlcmUgZ2V0dGluZyBn
bmFybHksIGFuZCBvbiB0aGUKKyAgICAgICAgb3RoZXIgaGFuZCB2ZXR0aW5nIGNlcnRhaW4gbGlu
a2VycyBwcm92aWRlcyBhIHN0cm9uZ2VyIGd1YXJhbnRlZSBvZiBzdWNlc3NmdWwgYnVpbGRzLgor
CisgICAgICAgIFNpbWlsYXJseSwgZXh0ZW5kIHRoZSBjaGVjayB1c2VkIHRvIGRldGVybWluZSB3
aGV0aGVyIHRoZSBzdGF0aWMgbGlicmFyeSBhcmNoaXZlciBzdXBwb3J0cworICAgICAgICB0aGlu
IGFyY2hpdmVycyB0byBjb3ZlciB0aGUgb25lIGluY2x1ZGVkIHdpdGggTExWTSAobGx2bS1hciks
IGFuZCBlbmFibGUgdXNhZ2Ugb2YgdGhpbmsKKyAgICAgICAgYXJjaGl2ZXJzIGlmIHRoZXkgY2Fu
IGJlIGJvdGggY3JlYXRlZCBieSB0aGUgYXJjaGl2ZXIgYW5kIGNvbnN1bWVkIGJ5IHRoZSBsaW5r
ZXIuIFByZXZpb3VzbHkKKyAgICAgICAgdGhlIGJ1aWxkIHN5c3RlbSB3YXMgZW5hYmxpbmcgdGhp
biBhcmNoaXZlcyB3aXRob3V0IGtub3dpbmcgd2hldGhlciB0aGUgbGlua2VyIHdvdWxkIHN1Y2Nl
ZWQKKyAgICAgICAgdXNpbmcgdGhlbS4KKworICAgICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25z
Q29tbW9uLmNtYWtlOgorCiAyMDIyLTAxLTI4ICBFbGxpb3R0IFdpbGxpYW1zICA8ZW13QGFwcGxl
LmNvbT4KIAogICAgICAgICBbWENCdWlsZF0gU21hbGwgY29ycmVjdGlvbnMgdG8gYnVpbGQtd2Vi
a2l0IGFuZCBNYWtlZmlsZSBmb3Igd29ya3NwYWNlIGJ1aWxkcwo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>450627</attachid>
            <date>2022-02-02 02:04:40 -0800</date>
            <delta_ts>2022-02-02 13:42:22 -0800</delta_ts>
            <desc>Patch v6</desc>
            <filename>bug-235476-20220202120439.patch</filename>
            <type>text/plain</type>
            <size>8137</size>
            <attacher name="Adrian Perez">aperez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4OTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0
aW9uc0NvbW1vbi5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCmluZGV4
IGZiNmU4YTEyMjE0NWM2MjUxNzk4ZmQ0MjFmNmFmNzAyOWNiMjI5MGIuLjdhODI4MzMzNDg4OGFj
NmJhMWE1ZWFmMWNhNGExYTk2NDJlYmFiYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRp
b25zQ29tbW9uLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCkBA
IC02LDI2ICs2LDkgQEAgYWRkX2RlZmluaXRpb25zKC1EQlVJTERJTkdfV0lUSF9DTUFLRT0xKQog
YWRkX2RlZmluaXRpb25zKC1ESEFWRV9DT05GSUdfSD0xKQogYWRkX2RlZmluaXRpb25zKC1EUEFT
X0JNQUxMT0M9MSkKIAotb3B0aW9uKFVTRV9USElOX0FSQ0hJVkVTICJQcm9kdWNlIGFsbCBzdGF0
aWMgbGlicmFyaWVzIGFzIHRoaW4gYXJjaGl2ZXMiIE9OKQotaWYgKFVTRV9USElOX0FSQ0hJVkVT
KQotICAgIGV4ZWN1dGVfcHJvY2VzcyhDT01NQU5EICR7Q01BS0VfQVJ9IC1WIE9VVFBVVF9WQVJJ
QUJMRSBBUl9WRVJTSU9OIEVSUk9SX1ZBUklBQkxFIEFSX0VSUk9SKQotICAgIGlmICgiJHtBUl9F
UlJPUn0iIE1BVENIRVMgIl51c2FnZToiKQotICAgICAgICAjIFRoaXMgYGFyYCBkb2Vzbid0IHVu
ZGVyc3RhbmQgIi1WIi4gSWdub3JlIHRoZSBlcnJvciBhbmQgdHJlYXQgdGhpcyBhcwotICAgICAg
ICAjIGFuIHVuc3VwcG9ydGVkIGBhcmAuIFRPRE86IERldGVybWluZSBCU0Qgb3IgWGNvZGUgZXF1
aXZhbGVudC4KLSAgICBlbHNlaWYgKCIke0FSX0VSUk9SfSIpCi0gICAgICAgIG1lc3NhZ2UoV0FS
TklORyAiRXJyb3IgZnJvbSBgYXJgOiAke0FSX0VSUk9SfSIpCi0gICAgZWxzZWlmICgiJHtBUl9W
RVJTSU9OfSIgTUFUQ0hFUyAiXkdOVSBhciIpCi0gICAgICAgIHNldChDTUFLRV9DWFhfQVJDSElW
RV9DUkVBVEUgIjxDTUFLRV9BUj4gY3JUIDxUQVJHRVQ+IDxMSU5LX0ZMQUdTPiA8T0JKRUNUUz4i
KQotICAgICAgICBzZXQoQ01BS0VfQ19BUkNISVZFX0NSRUFURSAiPENNQUtFX0FSPiBjclQgPFRB
UkdFVD4gPExJTktfRkxBR1M+IDxPQkpFQ1RTPiIpCi0gICAgICAgIHNldChDTUFLRV9DWFhfQVJD
SElWRV9BUFBFTkQgIjxDTUFLRV9BUj4gclQgPFRBUkdFVD4gPExJTktfRkxBR1M+IDxPQkpFQ1RT
PiIpCi0gICAgICAgIHNldChDTUFLRV9DX0FSQ0hJVkVfQVBQRU5EICI8Q01BS0VfQVI+IHJUIDxU
QVJHRVQ+IDxMSU5LX0ZMQUdTPiA8T0JKRUNUUz4iKQotICAgIGVuZGlmICgpCi1lbmRpZiAoKQot
CiBzZXRfcHJvcGVydHkoR0xPQkFMIFBST1BFUlRZIFVTRV9GT0xERVJTIE9OKQogZGVmaW5lX3By
b3BlcnR5KFRBUkdFVCBQUk9QRVJUWSBGT0xERVIgSU5IRVJJVEVEIEJSSUVGX0RPQ1MgImZvbGRl
ciIgRlVMTF9ET0NTICJJREUgZm9sZGVyIG5hbWUiKQogCi1zZXQoQVJNX1RSQURJVElPTkFMX0RF
VEVDVEVEIEZBTFNFKQogaWYgKFdURl9DUFVfQVJNKQogICAgIHNldChBUk1fVEhVTUIyX1RFU1Rf
U09VUkNFCiAgICAgIgpAQCAtMzYsMTYgKzE5LDExIEBAIGlmIChXVEZfQ1BVX0FSTSkKICAgICIp
CiAKICAgICBDSEVDS19DWFhfU09VUkNFX0NPTVBJTEVTKCIke0FSTV9USFVNQjJfVEVTVF9TT1VS
Q0V9IiBBUk1fVEhVTUIyX0RFVEVDVEVEKQotICAgIGlmIChOT1QgQVJNX1RIVU1CMl9ERVRFQ1RF
RCkKLSAgICAgICAgc2V0KEFSTV9UUkFESVRJT05BTF9ERVRFQ1RFRCBUUlVFKQotICAgICAgICAj
IFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5ODgwI2M0IGZv
ciBkZXRhaWxzLgotICAgICAgICBtZXNzYWdlKFNUQVRVUyAiRGlzYWJsaW5nIEdOVSBnb2xkIGxp
bmtlciwgYmVjYXVzZSBpdCBkb2Vzbid0IHN1cHBvcnQgQVJNIGluc3RydWN0aW9uIHNldCBwcm9w
ZXJseS4iKQotICAgIGVuZGlmICgpCiBlbmRpZiAoKQogCiAjIFVzZSBsZC5sbGQgd2hlbiBidWls
ZGluZyB3aXRoIExUTwogQ01BS0VfREVQRU5ERU5UX09QVElPTihVU0VfTERfTExEICJVc2UgTExE
IGxpbmtlciIgT04KLSAgICAgICAgICAgICAgICAgICAgICAgIkxUT19NT0RFO05PVCBVU0VfTERf
R09MRDtOT1QgV0lOMzIiIE9GRikKKyAgICAgICAgICAgICAgICAgICAgICAgIkxUT19NT0RFO05P
VCBXSU4zMiIgT0ZGKQogaWYgKFVTRV9MRF9MTEQpCiAgICAgZXhlY3V0ZV9wcm9jZXNzKENPTU1B
TkQgJHtDTUFLRV9DX0NPTVBJTEVSfSAtZnVzZS1sZD1sbGQgLVdsLC0tdmVyc2lvbiBFUlJPUl9R
VUlFVCBPVVRQVVRfVkFSSUFCTEUgTERfVkVSU0lPTikKICAgICBpZiAoIiR7TERfVkVSU0lPTn0i
IE1BVENIRVMgIkxMRCIpCkBAIC01NywyNSArMzUsNzYgQEAgaWYgKFVTRV9MRF9MTEQpCiAgICAg
ZW5kaWYgKCkKIGVuZGlmICgpCiAKLSMgVXNlIGxkLmdvbGQgaWYgaXQgaXMgYXZhaWxhYmxlIGFu
ZCBpc24ndCBkaXNhYmxlZCBleHBsaWNpdGx5Ci1DTUFLRV9ERVBFTkRFTlRfT1BUSU9OKFVTRV9M
RF9HT0xEICJVc2UgR05VIGdvbGQgbGlua2VyIiBPTgotICAgICAgICAgICAgICAgICAgICAgICAi
Tk9UIENYWF9BQ0NFUFRTX01GSVhfQ09SVEVYX0E1M184MzU3Njk7Tk9UIEFSTV9UUkFESVRJT05B
TF9ERVRFQ1RFRDtOT1QgV0lOMzI7Tk9UIEFQUExFO05PVCBVU0VfTERfTExEIiBPRkYpCi1pZiAo
VVNFX0xEX0dPTEQpCi0gICAgZXhlY3V0ZV9wcm9jZXNzKENPTU1BTkQgJHtDTUFLRV9DX0NPTVBJ
TEVSfSAtZnVzZS1sZD1nb2xkIC1XbCwtLXZlcnNpb24gRVJST1JfUVVJRVQgT1VUUFVUX1ZBUklB
QkxFIExEX1ZFUlNJT04pCi0gICAgaWYgKCIke0xEX1ZFUlNJT059IiBNQVRDSEVTICJHTlUgZ29s
ZCIpCi0gICAgICAgIHN0cmluZyhBUFBFTkQgQ01BS0VfRVhFX0xJTktFUl9GTEFHUyAiIC1mdXNl
LWxkPWdvbGQgLVdsLC0tZGlzYWJsZS1uZXctZHRhZ3MiKQotICAgICAgICBzdHJpbmcoQVBQRU5E
IENNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1MgIiAtZnVzZS1sZD1nb2xkIC1XbCwtLWRpc2FibGUt
bmV3LWR0YWdzIikKLSAgICAgICAgc3RyaW5nKEFQUEVORCBDTUFLRV9NT0RVTEVfTElOS0VSX0ZM
QUdTICIgLWZ1c2UtbGQ9Z29sZCAtV2wsLS1kaXNhYmxlLW5ldy1kdGFncyIpCisjIERldGVybWlu
ZSB3aGljaCBsaW5rZXIgaXMgYmVpbmcgdXNlZCB3aXRoIHRoZSBjaG9zZW4gbGlua2VyIGZsYWdz
LgorZXhlY3V0ZV9wcm9jZXNzKAorICAgIENPTU1BTkQgJHtDTUFLRV9DX0NPTVBJTEVSfSAke0NN
QUtFX0VYRV9MSU5LRVJfRkxBR1N9IC1XbCwtLXZlcnNpb24KKyAgICBPVVRQVVRfVkFSSUFCTEUg
TERfVkVSU0lPTgorICAgIEVSUk9SX1FVSUVUCispCitzZXQoTERfU1VQUE9SVFNfR0RCX0lOREVY
IFRSVUUpCitzZXQoTERfU1VQUE9SVFNfU1BMSVRfREVCVUcgVFJVRSkKK3NldChMRF9TVVBQT1JU
U19USElOX0FSQ0hJVkVTIFRSVUUpCitpZiAoTERfVkVSU0lPTiBNQVRDSEVTICJeTExEICIpCisg
ICAgc2V0KExEX1ZBUklBTlQgTExEKQorZWxzZWlmIChMRF9WRVJTSU9OIE1BVENIRVMgIl5tb2xk
ICIpCisgICAgc2V0KExEX1ZBUklBTlQgTU9MRCkKK2Vsc2VpZiAoTERfVkVSU0lPTiBNQVRDSEVT
ICJeR05VIGdvbGQgIikKKyAgICBzZXQoTERfVkFSSUFOVCBHT0xEKQorZWxzZWlmIChMRF9WRVJT
SU9OIE1BVENIRVMgIl5HTlUgbGQgIikKKyAgICBzZXQoTERfVkFSSUFOVCBCRkQpCisgICAgc2V0
KExEX1NVUFBPUlRTX0dEQl9JTkRFWCBGQUxTRSkKK2Vsc2UgKCkKKyAgICBzZXQoTERfVkFSSUFO
VCBVTktOT1dOKQorICAgIHNldChMRF9TVVBQT1JUU19HREJfSU5ERVggRkFMU0UpCisgICAgc2V0
KExEX1NVUFBPUlRTX1NQTElUX0RFQlVHIEZBTFNFKQorICAgIHNldChMRF9TVVBQT1JUU19USElO
X0FSQ0hJVkVTIEZBTFNFKQorZW5kaWYgKCkKK3Vuc2V0KExEX1ZFUlNJT04pCittZXNzYWdlKFNU
QVRVUyAiTGlua2VyIHZhcmlhbnQgaW4gdXNlOiAke0xEX1ZBUklBTlR9ICh0aGluIGFyY2hpdmVz
OiAke0xEX1NVUFBPUlRTX1RISU5fQVJDSElWRVN9LCBzcGxpdCBkZWJ1ZzogJHtMRF9TVVBQT1JU
U19TUExJVF9ERUJVR30sIC0tZ2RiLWluZGV4OiAke0xEX1NVUFBPUlRTX0dEQl9JTkRFWH0pIikK
KworIyBEZXRlcm1pbmUgd2hldGhlciB0aGUgYXJjaGl2ZXIgaW4gdXNlIHN1cHBvcnRzIHRoaW4g
YXJjaGl2ZXMuCitleGVjdXRlX3Byb2Nlc3MoCisgICAgQ09NTUFORCAke0NNQUtFX0FSfSAtVgor
ICAgIE9VVFBVVF9WQVJJQUJMRSBBUl9WRVJTSU9OCisgICAgUkVTVUxUX1ZBUklBQkxFIEFSX1NU
QVRVUworICAgIEVSUk9SX1FVSUVUCispCitzZXQoQVJfU1VQUE9SVFNfVEhJTl9BUkNISVZFUyBG
QUxTRSkKK2lmIChBUl9TVEFUVVMgRVFVQUwgMCkKKyAgICBpZiAoQVJfVkVSU0lPTiBNQVRDSEVT
ICJeR05VIGFyICIpCisgICAgICAgIHNldChBUl9WQVJJQU5UIEJGRCkKKyAgICAgICAgc2V0KEFS
X1NVUFBPUlRTX1RISU5fQVJDSElWRVMgVFJVRSkKKyAgICBlbHNlaWYgKEFSX1ZFUlNJT04gTUFU
Q0hFUyAiXkxMVk0gIikKKyAgICAgICAgc2V0KEFSX1ZBUklBTlQgTExWTSkKKyAgICAgICAgc2V0
KEFSX1NVUFBPUlRTX1RISU5fQVJDSElWRVMgVFJVRSkKICAgICBlbHNlICgpCi0gICAgICAgIG1l
c3NhZ2UoV0FSTklORyAiR05VIGdvbGQgbGlua2VyIGlzbid0IGF2YWlsYWJsZSwgdXNpbmcgdGhl
IGRlZmF1bHQgc3lzdGVtIGxpbmtlci4iKQotICAgICAgICBzZXQoVVNFX0xEX0dPTEQgT0ZGKQor
ICAgICAgICBzZXQoQVJfVkFSSUFOVCBVTktOT1dOKQogICAgIGVuZGlmICgpCiBlbmRpZiAoKQor
dW5zZXQoQVJfVkVSU0lPTikKK3Vuc2V0KEFSX1NUQVRVUykKK21lc3NhZ2UoU1RBVFVTICJBcmNo
aXZlciB2YXJpYW50IGluIHVzZTogJHtBUl9WQVJJQU5UfSAodGhpbiBhcmNoaXZlczogJHtBUl9T
VVBQT1JUU19USElOX0FSQ0hJVkVTfSkiKQorCisjIFByZWZlciB0aGluIGFyY2hpdmVzIGJ5IGRl
ZmF1bHQgaWYgdGhleSBjYW4gYmUgYm90aCBjcmVhdGVkIGJ5IHRoZQorIyBhcmNoaXZlciBhbmQg
cmVhZCBiYWNrIGJ5IHRoZSBsaW5rZXIuCitpZiAoQVJfU1VQUE9SVFNfVEhJTl9BUkNISVZFUyBB
TkQgTERfU1VQUE9SVFNfVEhJTl9BUkNISVZFUykKKyAgICBzZXQoVVNFX1RISU5fQVJDSElWRVNf
REVGQVVMVCBPTikKK2Vsc2UgKCkKKyAgICBzZXQoVVNFX1RISU5fQVJDSElWRVNfREVGQVVMVCBP
RkYpCitlbmRpZiAoKQorb3B0aW9uKFVTRV9USElOX0FSQ0hJVkVTICJQcm9kdWNlIGFsbCBzdGF0
aWMgbGlicmFyaWVzIGFzIHRoaW4gYXJjaGl2ZXMiICR7VVNFX1RISU5fQVJDSElWRVNfREVGQVVM
VH0pCisKK2lmIChVU0VfVEhJTl9BUkNISVZFUykKKyAgICBzZXQoQ01BS0VfQ1hYX0FSQ0hJVkVf
Q1JFQVRFICI8Q01BS0VfQVI+IGNyVCA8VEFSR0VUPiA8TElOS19GTEFHUz4gPE9CSkVDVFM+IikK
KyAgICBzZXQoQ01BS0VfQ19BUkNISVZFX0NSRUFURSAiPENNQUtFX0FSPiBjclQgPFRBUkdFVD4g
PExJTktfRkxBR1M+IDxPQkpFQ1RTPiIpCisgICAgc2V0KENNQUtFX0NYWF9BUkNISVZFX0FQUEVO
RCAiPENNQUtFX0FSPiByVCA8VEFSR0VUPiA8TElOS19GTEFHUz4gPE9CSkVDVFM+IikKKyAgICBz
ZXQoQ01BS0VfQ19BUkNISVZFX0FQUEVORCAiPENNQUtFX0FSPiByVCA8VEFSR0VUPiA8TElOS19G
TEFHUz4gPE9CSkVDVFM+IikKK2VuZGlmICgpCiAKIHNldChFTkFCTEVfREVCVUdfRklTU0lPTl9E
RUZBVUxUIE9GRikKIGlmIChDTUFLRV9CVUlMRF9UWVBFIFNUUkVRVUFMICJEZWJ1ZyIpCiAgICAg
Y2hlY2tfY3h4X2NvbXBpbGVyX2ZsYWcoLWdzcGxpdC1kd2FyZiBDWFhfQ09NUElMRVJfU1VQUE9S
VFNfR1NQTElUX0RXQVJGKQotICAgIGlmIChDWFhfQ09NUElMRVJfU1VQUE9SVFNfR1NQTElUX0RX
QVJGKQorICAgIGlmIChDWFhfQ09NUElMRVJfU1VQUE9SVFNfR1NQTElUX0RXQVJGIEFORCBMRF9T
VVBQT1JUU19TUExJVF9ERUJVRykKICAgICAgICAgc2V0KEVOQUJMRV9ERUJVR19GSVNTSU9OX0RF
RkFVTFQgT04pCiAgICAgZW5kaWYgKCkKIGVuZGlmICgpCkBAIC04NSw5ICsxMTQsNyBAQCBvcHRp
b24oREVCVUdfRklTU0lPTiAiVXNlIERlYnVnIEZpc3Npb24gc3VwcG9ydCIgJHtFTkFCTEVfREVC
VUdfRklTU0lPTl9ERUZBVUxUfQogaWYgKERFQlVHX0ZJU1NJT04pCiAgICAgc2V0KENNQUtFX0Nf
RkxBR1MgIiR7Q01BS0VfQ19GTEFHU30gLWdzcGxpdC1kd2FyZiIpCiAgICAgc2V0KENNQUtFX0NY
WF9GTEFHUyAiJHtDTUFLRV9DWFhfRkxBR1N9IC1nc3BsaXQtZHdhcmYiKQotCi0gICAgIyBUaGUg
bGQuYmZkIGxpbmtlciBkb2VzIG5vdCBzdXBwb3J0IC0tZ2RiLWluZGV4LCBwb3NzaWJseSBvdGhl
cnMgYXMgd2VsbC4KLSAgICBpZiAoVVNFX0xEX0dPTEQgT1IgVVNFX0xEX0xMRCkKKyAgICBpZiAo
TERfU1VQUE9SVFNfR0RCX0lOREVYKQogICAgICAgICBzZXQoQ01BS0VfRVhFX0xJTktFUl9GTEFH
UyAiJHtDTUFLRV9FWEVfTElOS0VSX0ZMQUdTfSAtV2wsLS1nZGItaW5kZXgiKQogICAgICAgICBz
ZXQoQ01BS0VfU0hBUkVEX0xJTktFUl9GTEFHUyAiJHtDTUFLRV9FWEVfTElOS0VSX0ZMQUdTfSAt
V2wsLS1nZGItaW5kZXgiKQogICAgIGVuZGlmICgpCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9D
aGFuZ2VMb2cKaW5kZXggMTA5M2ZlMTg3NDU0OWM4MWE2ZmJmZDFhZjRiOTM0MDMxNDBiM2FhYS4u
NmUwZTIzZGFhNTgxOTgyODMzNDIwZjA4ZTQ1NzQ0MjcxNjdhNDY0MSAxMDA2NDQKLS0tIGEvQ2hh
bmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIyLTAyLTAyICBBZHJp
YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0NNYWtl
XSBTdG9wIGRlZmF1bHRpbmcgdG8gbGQuZ29sZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1NDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHRoZSBVU0VfTERfR09MRCBvcHRpb24sIGFuZCBs
ZXQgdGhlIGJ1aWxkIHVzZSBieSBkZWZhdWx0IHRoZSBzeXN0ZW0gbGlua2VyLgorCisgICAgICAg
IFRoZSBvdXRwdXQgZnJvbSBydW5uaW5nIHRoZSBsaW5rZXIgd2l0aCAtV2wsLS12ZXJzaW9uIGlz
IG1hdGNoZWQgdG8gZGV0ZXJtaW5lIHdoaWNoIGxpbmtlcgorICAgICAgICBpcyBjdXJyZW50bHkg
aW4gdXNlLCBhbmQgc2V0IHZhcmlhYmxlcyBMRF9TVVBQT1JUU188ZmVhdHVyZT4gYWNjb3JkaW5n
bHkuIFRoaXMgaXMgbmVlZGVkCisgICAgICAgIGJlY2F1c2Ugbm90IGFsbCBvZiB0aGVtIHN1cHBv
cnQgY2VydGFpbiBmZWF0dXJlcyBhbmQgYWZ0ZXIgYSBmZXcgYXR0ZW1wdHMgYXQgZG9pbmcgZmVh
dHVyZQorICAgICAgICBjaGVja3MgaXQgd2FzIGJlY29taW5nIGNsZWFyIHRoYXQgb24gb25lIGhh
bmQgdGhlIGNoZWNrcyB3ZXJlIGdldHRpbmcgZ25hcmx5LCBhbmQgb24gdGhlCisgICAgICAgIG90
aGVyIGhhbmQgdmV0dGluZyBjZXJ0YWluIGxpbmtlcnMgcHJvdmlkZXMgYSBzdHJvbmdlciBndWFy
YW50ZWUgb2Ygc3VjZXNzZnVsIGJ1aWxkcy4KKworICAgICAgICBTaW1pbGFybHksIGV4dGVuZCB0
aGUgY2hlY2sgdXNlZCB0byBkZXRlcm1pbmUgd2hldGhlciB0aGUgc3RhdGljIGxpYnJhcnkgYXJj
aGl2ZXIgc3VwcG9ydHMKKyAgICAgICAgdGhpbiBhcmNoaXZlcnMgdG8gY292ZXIgdGhlIG9uZSBp
bmNsdWRlZCB3aXRoIExMVk0gKGxsdm0tYXIpLCBhbmQgZW5hYmxlIHVzYWdlIG9mIHRoaW5rCisg
ICAgICAgIGFyY2hpdmVycyBpZiB0aGV5IGNhbiBiZSBib3RoIGNyZWF0ZWQgYnkgdGhlIGFyY2hp
dmVyIGFuZCBjb25zdW1lZCBieSB0aGUgbGlua2VyLiBQcmV2aW91c2x5CisgICAgICAgIHRoZSBi
dWlsZCBzeXN0ZW0gd2FzIGVuYWJsaW5nIHRoaW4gYXJjaGl2ZXMgd2l0aG91dCBrbm93aW5nIHdo
ZXRoZXIgdGhlIGxpbmtlciB3b3VsZCBzdWNjZWVkCisgICAgICAgIHVzaW5nIHRoZW0uCisKKyAg
ICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0NvbW1vbi5jbWFrZToKKwogMjAyMi0wMi0wMSAg
Q2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dU
S11bV1BFXSBTd2l0Y2ggdG8gdXNlIEFUU1BJIGluc3RlYWQgb2YgQVRLCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>