<?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>222381</bug_id>
          
          <creation_ts>2021-02-24 13:54:10 -0800</creation_ts>
          <short_desc>prefers-reduced-motion is not reactive on iOS</short_desc>
          <delta_ts>2021-04-30 14:04:28 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Accessibility</component>
          <version>Safari 14</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=225090</see_also>
    
    <see_also>https://bugs.webkit.org/show_bug.cgi?id=225244</see_also>
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Liam DeBeasi">ldebeasi</reporter>
          <assigned_to name="Per Arne Vollan">pvollan</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>cfleizach</cc>
    
    <cc>jcraig</cc>
    
    <cc>pvollan</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1733067</commentid>
    <comment_count>0</comment_count>
      <attachid>421455</attachid>
    <who name="Liam DeBeasi">ldebeasi</who>
    <bug_when>2021-02-24 13:54:10 -0800</bug_when>
    <thetext>Created attachment 421455
Code reproduction

When toggling the &quot;Reduce Motion&quot; preference in the Accessibility pane on iOS, the `prefers-reduced-motion` media query is not updated in WebKit.

Steps to reproduce:

1. Open attached code reproduction on an iOS device with the &quot;Reduce Motion&quot; toggle off. This option can be accessed via Settings &gt; Accessibility &gt; Motion &gt; Reduce Motion.
2. Observe that there is a blue square with an animation applied. The animation scales the square as well as fades it out.
3. Turn the &quot;Reduce Motion&quot; toggle on.
4. Observe that the square&apos;s animation no longer scales, just fades out.
5. Turn the &quot;Reduce Motion&quot; toggle off.
6. Observe that the square&apos;s animation does not begin scaling again.


Expected Behavior:

I would expect that after turning &quot;Reduce Motion&quot; off in step 5 the scaling would start again in the square&apos;s animation.



Actual Behavior: 

The scaling does not start again.



Other Info:

- I am able to reproduce this on iOS 14.4 as well as the iOS 14.5 developer beta.
- This works as expected on Safari and Chrome for macOS.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1733175</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-02-24 18:08:39 -0800</bug_when>
    <thetext>&lt;rdar://problem/74724161&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755013</commentid>
    <comment_count>2</comment_count>
      <attachid>427263</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-04-28 07:16:45 -0700</bug_when>
    <thetext>Created attachment 427263
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755031</commentid>
    <comment_count>3</comment_count>
      <attachid>427263</attachid>
    <who name="chris fleizach">cfleizach</who>
    <bug_when>2021-04-28 08:21:31 -0700</bug_when>
    <thetext>Comment on attachment 427263
Patch

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

&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1072
&gt; +    constexpr ASCIILiteral key { &quot;reduceMotion&quot;_s };

Are these keys that are coming from the system? Can we use the constants if available?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755049</commentid>
    <comment_count>4</comment_count>
      <attachid>427263</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-04-28 09:51:24 -0700</bug_when>
    <thetext>Comment on attachment 427263
Patch

Please make a way to test this so it doesn&apos;t break again.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755063</commentid>
    <comment_count>5</comment_count>
      <attachid>427263</attachid>
    <who name="chris fleizach">cfleizach</who>
    <bug_when>2021-04-28 10:09:22 -0700</bug_when>
    <thetext>Comment on attachment 427263
Patch

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

&gt;&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1072
&gt;&gt; +    constexpr ASCIILiteral key { &quot;reduceMotion&quot;_s };
&gt; 
&gt; Are these keys that are coming from the system? Can we use the constants if available?

kAXSReduceMotionPreference</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755107</commentid>
    <comment_count>6</comment_count>
      <attachid>427263</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2021-04-28 11:57:33 -0700</bug_when>
    <thetext>Comment on attachment 427263
Patch

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

&gt;&gt;&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1072
&gt;&gt;&gt; +    constexpr ASCIILiteral key { &quot;reduceMotion&quot;_s };
&gt;&gt; 
&gt;&gt; Are these keys that are coming from the system? Can we use the constants if available?
&gt; 
&gt; kAXSReduceMotionPreference

ALSO, which one is it in macCatalyst?

&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1084
&gt; +    return kAXInterfaceReduceMotionStatusDidChangeNotification;
&gt; +#else

Ditto my macCatalyst question.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755110</commentid>
    <comment_count>7</comment_count>
      <attachid>427263</attachid>
    <who name="chris fleizach">cfleizach</who>
    <bug_when>2021-04-28 12:02:55 -0700</bug_when>
    <thetext>Comment on attachment 427263
Patch

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

&gt;&gt;&gt;&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1072
&gt;&gt;&gt;&gt; +    constexpr ASCIILiteral key { &quot;reduceMotion&quot;_s };
&gt;&gt;&gt; 
&gt;&gt;&gt; Are these keys that are coming from the system? Can we use the constants if available?
&gt;&gt; 
&gt;&gt; kAXSReduceMotionPreference
&gt; 
&gt; ALSO, which one is it in macCatalyst?

this one iOS and Mac catalyst:
kAXSReduceMotionPreference

&gt;&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1084
&gt;&gt; +#else
&gt; 
&gt; Ditto my macCatalyst question.

this one is iOS and catalyst
kAXSReduceMotionChangedNotification</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755223</commentid>
    <comment_count>8</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-04-28 16:24:10 -0700</bug_when>
    <thetext>*** Bug 225090 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755415</commentid>
    <comment_count>9</comment_count>
      <attachid>427263</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2021-04-29 09:30:30 -0700</bug_when>
    <thetext>Comment on attachment 427263
Patch

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

I think this looks like a correct fix (modulo the build errors), but please do use the system constants instead of hard coding the strings.

&gt;&gt;&gt;&gt;&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1072
&gt;&gt;&gt;&gt;&gt; +    constexpr ASCIILiteral key { &quot;reduceMotion&quot;_s };
&gt;&gt;&gt;&gt; 
&gt;&gt;&gt;&gt; Are these keys that are coming from the system? Can we use the constants if available?
&gt;&gt;&gt; 
&gt;&gt;&gt; kAXSReduceMotionPreference
&gt;&gt; 
&gt;&gt; ALSO, which one is it in macCatalyst?
&gt; 
&gt; this one iOS and Mac catalyst:
&gt; kAXSReduceMotionPreference

@Chris: So it&apos;s the same constant for the preference key on both platforms?

&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1076
&gt; +    static NeverDestroyed&lt;WTF::String&gt; key(MAKE_STATIC_STRING_IMPL(key));

You use &apos;key&apos; twice here. Maybe label the constant as &apos;keyString&apos; or something?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755416</commentid>
    <comment_count>10</comment_count>
      <attachid>427263</attachid>
    <who name="chris fleizach">cfleizach</who>
    <bug_when>2021-04-29 09:33:17 -0700</bug_when>
    <thetext>Comment on attachment 427263
Patch

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

&gt;&gt;&gt;&gt;&gt;&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1072
&gt;&gt;&gt;&gt;&gt;&gt; +    constexpr ASCIILiteral key { &quot;reduceMotion&quot;_s };
&gt;&gt;&gt;&gt;&gt; 
&gt;&gt;&gt;&gt;&gt; Are these keys that are coming from the system? Can we use the constants if available?
&gt;&gt;&gt;&gt; 
&gt;&gt;&gt;&gt; kAXSReduceMotionPreference
&gt;&gt;&gt; 
&gt;&gt;&gt; ALSO, which one is it in macCatalyst?
&gt;&gt; 
&gt;&gt; this one iOS and Mac catalyst:
&gt;&gt; kAXSReduceMotionPreference
&gt; 
&gt; @Chris: So it&apos;s the same constant for the preference key on both platforms?

it looks like it&apos;s this one on the Mac 

extern CFStringRef kAXInterfaceReduceMotionKey;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755424</commentid>
    <comment_count>11</comment_count>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2021-04-29 09:51:22 -0700</bug_when>
    <thetext>(In reply to Simon Fraser (smfr) from comment #4)
&gt; Comment on attachment 427263 [details]
&gt; Patch
&gt; 
&gt; Please make a way to test this so it doesn&apos;t break again.

It looks like there is a test, but it only runs on macOS. Seems like it should be possible to get it working on iOS.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755667</commentid>
    <comment_count>12</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-04-30 06:52:48 -0700</bug_when>
    <thetext>&lt;rdar://75933915&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755668</commentid>
    <comment_count>13</comment_count>
      <attachid>427413</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-04-30 06:55:16 -0700</bug_when>
    <thetext>Created attachment 427413
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755669</commentid>
    <comment_count>14</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-04-30 06:56:56 -0700</bug_when>
    <thetext>(In reply to Simon Fraser (smfr) from comment #4)
&gt; Comment on attachment 427263 [details]
&gt; Patch
&gt; 
&gt; Please make a way to test this so it doesn&apos;t break again.

That&apos;s a good point. We are currently looking into reusing the attached test case.

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755670</commentid>
    <comment_count>15</comment_count>
      <attachid>427414</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-04-30 06:59:14 -0700</bug_when>
    <thetext>Created attachment 427414
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755671</commentid>
    <comment_count>16</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-04-30 07:00:39 -0700</bug_when>
    <thetext>(In reply to Per Arne Vollan from comment #15)
&gt; Created attachment 427414 [details]
&gt; Patch

A new approach has been taken in the latest patch.

Thanks for reviewing, all!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755727</commentid>
    <comment_count>17</comment_count>
      <attachid>427414</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2021-04-30 09:51:35 -0700</bug_when>
    <thetext>Comment on attachment 427414
Patch

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

r=me

&gt; Source/WebKit/ChangeLog:10
&gt; +        the notification in the WebProcess. Resolve this by updating the cached settings values in Accessibility when a

I think it might be more accurate to say:

&quot;... race between the notification that an accessibility preference has been changed by the user, and the the in-memory Accessibility preference cache in the WebContent process. We resolve this by using new SPI to clear the cached Accessibility settings when we are notified of an accessibility change so they always reflect the user&apos;s most recent setting.&quot;

&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1127
&gt; +            WTFLogAlways(&quot;Updating Web Accessibility settings.&quot;);

I suggest using RELEASE_LOG_IF_ALLOWED here, so that the error message is formatted in a way that our triage script can easily consume.

&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1129
&gt; +        }

I suggest logging when the SPI doesn&apos;t exist so we can review logs and verify this is why a user is not seeing the right behavior.

I also suggest using RELEASE_LOG_ERROR_IF_ALLOWED for this non-SPI case so we can catch it in triage.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755731</commentid>
    <comment_count>18</comment_count>
      <attachid>427414</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-04-30 09:53:23 -0700</bug_when>
    <thetext>Comment on attachment 427414
Patch

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

I would prefer we don&apos;t land this without a test.

&gt;&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1127
&gt;&gt; +            WTFLogAlways(&quot;Updating Web Accessibility settings.&quot;);
&gt; 
&gt; I suggest using RELEASE_LOG_IF_ALLOWED here, so that the error message is formatted in a way that our triage script can easily consume.

Please remove.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755782</commentid>
    <comment_count>19</comment_count>
      <attachid>427442</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-04-30 13:25:23 -0700</bug_when>
    <thetext>Created attachment 427442
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755783</commentid>
    <comment_count>20</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-04-30 13:27:30 -0700</bug_when>
    <thetext>(In reply to Brent Fulgham from comment #17)
&gt; Comment on attachment 427414 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=427414&amp;action=review
&gt; 
&gt; r=me
&gt; 
&gt; &gt; Source/WebKit/ChangeLog:10
&gt; &gt; +        the notification in the WebProcess. Resolve this by updating the cached settings values in Accessibility when a
&gt; 
&gt; I think it might be more accurate to say:
&gt; 
&gt; &quot;... race between the notification that an accessibility preference has been
&gt; changed by the user, and the the in-memory Accessibility preference cache in
&gt; the WebContent process. We resolve this by using new SPI to clear the cached
&gt; Accessibility settings when we are notified of an accessibility change so
&gt; they always reflect the user&apos;s most recent setting.&quot;
&gt; 

Fixed!

&gt; &gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1127
&gt; &gt; +            WTFLogAlways(&quot;Updating Web Accessibility settings.&quot;);
&gt; 
&gt; I suggest using RELEASE_LOG_IF_ALLOWED here, so that the error message is
&gt; formatted in a way that our triage script can easily consume.
&gt; 
&gt; &gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1129
&gt; &gt; +        }
&gt; 
&gt; I suggest logging when the SPI doesn&apos;t exist so we can review logs and
&gt; verify this is why a user is not seeing the right behavior.
&gt; 
&gt; I also suggest using RELEASE_LOG_ERROR_IF_ALLOWED for this non-SPI case so
&gt; we can catch it in triage.

I removed the logging, since it was added for debugging purposes.

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755785</commentid>
    <comment_count>21</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-04-30 13:35:24 -0700</bug_when>
    <thetext>(In reply to Simon Fraser (smfr) from comment #18)
&gt; Comment on attachment 427414 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=427414&amp;action=review
&gt; 
&gt; I would prefer we don&apos;t land this without a test.
&gt; 

Yes, that makes sense. Since it&apos;s not trivial to create this test, and we&apos;re currently not close to having the test case ready, I filed https://bugs.webkit.org/show_bug.cgi?id=225243 to track this.

&gt; &gt;&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1127
&gt; &gt;&gt; +            WTFLogAlways(&quot;Updating Web Accessibility settings.&quot;);
&gt; &gt; 
&gt; &gt; I suggest using RELEASE_LOG_IF_ALLOWED here, so that the error message is formatted in a way that our triage script can easily consume.
&gt; 
&gt; Please remove.

Done!

Thanks for reviewing :)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755788</commentid>
    <comment_count>22</comment_count>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2021-04-30 13:40:41 -0700</bug_when>
    <thetext>(In reply to Simon Fraser (smfr) from comment #18)
&gt; Comment on attachment 427414 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=427414&amp;action=review
&gt; 
&gt; I would prefer we don&apos;t land this without a test.

Coming in Bug 225244.

&gt; &gt;&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:1127
&gt; &gt;&gt; +            WTFLogAlways(&quot;Updating Web Accessibility settings.&quot;);
&gt; &gt; 
&gt; &gt; I suggest using RELEASE_LOG_IF_ALLOWED here, so that the error message is formatted in a way that our triage script can easily consume.
&gt; 
&gt; Please remove.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755796</commentid>
    <comment_count>23</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-30 14:04:26 -0700</bug_when>
    <thetext>Committed r276852 (237203@main): &lt;https://commits.webkit.org/237203@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 427442.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="0"
              isprivate="0"
          >
            <attachid>421455</attachid>
            <date>2021-02-24 13:54:10 -0800</date>
            <delta_ts>2021-02-24 13:54:10 -0800</delta_ts>
            <desc>Code reproduction</desc>
            <filename>index.html</filename>
            <type>text/html</type>
            <size>1008</size>
            <attacher name="Liam DeBeasi">ldebeasi</attacher>
            
              <data encoding="base64">PCFET0NUWVBFIGh0bWw+CjxodG1sPgogIDxoZWFkPgogICAgPHRpdGxlPlJlZHVjZSBNb3Rpb24g
VGVzdDwvdGl0bGU+CiAgICA8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2
aWNlLXdpZHRoLCBpbml0aWFsLXNjYWxlPTEuMCwgbWluaW11bS1zY2FsZT0xLjAsIG1heGltdW0t
c2NhbGU9MS4wLCB1c2VyLXNjYWxhYmxlPW5vIj4KICAgIAogICAgPHN0eWxlPgogICAgICBib2R5
IHsKICAgICAgICBtYXJnaW46IDEwMHB4OwogICAgICB9CiAgICAgIAogICAgICBkaXYgewogICAg
ICAgIHdpZHRoOiAxMDBweDsKICAgICAgICBoZWlnaHQ6IDEwMHB4OwogICAgICAgIAogICAgICAg
IGJhY2tncm91bmQ6IHJnYmEoMCwgMCwgMjU1LCAwLjUpOwogICAgICAgCiAgICAgICAgYW5pbWF0
aW9uOiAxcyBlYXNlLWluLW91dCBpbmZpbml0ZSBhbHRlcm5hdGU7CiAgICAgICAgYW5pbWF0aW9u
LW5hbWU6IHB1bHNlQW5kRmFkZTsKICAgICAgfQogICAgICAKICAgICAgQG1lZGlhIChwcmVmZXJz
LXJlZHVjZWQtbW90aW9uOiByZWR1Y2UpIHsKICAgICAgICBkaXYgewogICAgICAgICAgYW5pbWF0
aW9uLW5hbWU6IGZhZGU7CiAgICAgICAgfQogICAgICB9CiAgICAgIAogICAgICBAa2V5ZnJhbWVz
IHB1bHNlQW5kRmFkZSB7CiAgICAgICAgZnJvbSB7CiAgICAgICAgICBvcGFjaXR5OiAxOwogICAg
ICAgICAgdHJhbnNmb3JtOiBzY2FsZSgxKTsKICAgICAgICB9CiAgICAgICAgdG8gewogICAgICAg
ICAgb3BhY2l0eTogMC41OwogICAgICAgICAgdHJhbnNmb3JtOiBzY2FsZSgxLjUpOwogICAgICAg
IH0KICAgICAgfQogICAgICAKICAgICAgQGtleWZyYW1lcyBmYWRlIHsKICAgICAgICBmcm9tIHsK
ICAgICAgICAgIG9wYWNpdHk6IDE7CiAgICAgICAgfQogICAgICAgIHRvIHsKICAgICAgICAgIG9w
YWNpdHk6IDAuNTsKICAgICAgICB9CiAgICAgIH0KICAgIDwvc3R5bGU+CiAgPC9oZWFkPgogIDxi
b2R5PgogICAgPGRpdj48L2Rpdj4KICA8L2JvZHk+CjwvaHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427263</attachid>
            <date>2021-04-28 07:16:45 -0700</date>
            <delta_ts>2021-04-30 06:55:14 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222381-20210428071644.patch</filename>
            <type>text/plain</type>
            <size>3759</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzY3MDcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA0LTI4ICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBwcmVmZXJzLXJlZHVjZWQtbW90
aW9uIGlzIG5vdCByZWFjdGl2ZSBvbiBpT1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyMjM4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIFdpdGggQ0ZQcmVmcyBkaXJlY3QgbW9kZSwgdGhlcmUgaXMgYSBy
YWNlIGJldHdlZW4gc2V0dGluZyB0aGUgcmVkdWNlIG1vdGlvbiBwcmVmZXJlbmNlIGluIHRoZSBX
ZWJQcm9jZXNzIGFuZCBoYW5kbGluZworICAgICAgICB0aGUgbm90aWZpY2F0aW9uIGluIHRoZSBX
ZWJQcm9jZXNzLiBSZXNvbHZlIHRoaXMgYnkgcmUtcG9zdGluZyB0aGUgbm90aWZpY2F0aW9uIHdo
ZW4gdGhlIHByZWZlcmVuY2UgaXMgc2V0IGluIFdlYlByb2Nlc3MuCisKKyAgICAgICAgKiBQbGF0
Zm9ybS9zcGkvQ29jb2EvQWNjZXNzaWJpbGl0eVN1cHBvcnRTUEkuaDoKKyAgICAgICAgKiBXZWJQ
cm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6cmVkdWNl
TW90aW9uUHJlZmVyZW5jZUtleSk6CisgICAgICAgIChXZWJLaXQ6OnJlZHVjZU1vdGlvbk5vdGlm
aWNhdGlvbik6CisgICAgICAgIChXZWJLaXQ6OmRpc3BhdGNoU2ltdWxhdGVkTm90aWZpY2F0aW9u
c0ZvclByZWZlcmVuY2VDaGFuZ2UpOgorCiAyMDIxLTA0LTI4ICBLaW1tbyBLaW5udW5lbiAgPGtr
aW5udW5lbkBhcHBsZS5jb20+CiAKICAgICAgICAgQXNzZXJ0aW5nIHRoYXQgZnVuY3Rpb24gb3Ig
dmFyaWFibGUgaXMgYWNjZXNzZWQgaW4gYSBjZXJ0YWluIHRocmVhZCBzaG91bGQgYmUgc2ltcGxl
ciBhbmQgbW9yZSByb2J1c3QKSW5kZXg6IFNvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL0NvY29h
L0FjY2Vzc2liaWxpdHlTdXBwb3J0U1BJLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9Q
bGF0Zm9ybS9zcGkvQ29jb2EvQWNjZXNzaWJpbGl0eVN1cHBvcnRTUEkuaAkocmV2aXNpb24gMjc2
NTg4KQorKysgU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvQ29jb2EvQWNjZXNzaWJpbGl0eVN1
cHBvcnRTUEkuaAkod29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsOCBAQCBleHRlcm4gQ0ZTdHJp
bmdSZWYga0FYU0Z1bGxLZXlib2FyZEFjY2VzCiBleHRlcm4gQm9vbGVhbiBfQVhTRnVsbEtleWJv
YXJkQWNjZXNzRW5hYmxlZCgpOwogI2VuZGlmCiAKK2V4dGVybiBDRlN0cmluZ1JlZiBrQVhTUmVk
dWNlTW90aW9uQ2hhbmdlZE5vdGlmaWNhdGlvbjsKKwogV1RGX0VYVEVSTl9DX0VORAogCiAjZW5k
aWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2Eu
bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nl
c3NDb2NvYS5tbQkocmV2aXNpb24gMjc2NTg4KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTA2NCwxMyArMTA2
NCwyNyBAQCBzdGF0aWMgY29uc3QgV1RGOjpTdHJpbmcmIHVzZXJIaWdobGlnaHRDCiAgICAgc3Rh
dGljIE5ldmVyRGVzdHJveWVkPFdURjo6U3RyaW5nPiB1c2VySGlnaGxpZ2h0Q29sb3JQcmVmZXJl
bmNlS2V5KE1BS0VfU1RBVElDX1NUUklOR19JTVBMKCJBcHBsZUhpZ2hsaWdodENvbG9yIikpOwog
ICAgIHJldHVybiB1c2VySGlnaGxpZ2h0Q29sb3JQcmVmZXJlbmNlS2V5OwogfQorI2VuZGlmCiAK
IHN0YXRpYyBjb25zdCBXVEY6OlN0cmluZyYgcmVkdWNlTW90aW9uUHJlZmVyZW5jZUtleSgpCiB7
Ci0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFdURjo6U3RyaW5nPiBrZXkoTUFLRV9TVEFUSUNf
U1RSSU5HX0lNUEwoInJlZHVjZU1vdGlvbiIpKTsKKyNpZiBQTEFURk9STShNQUMpCisgICAgY29u
c3RleHByIEFTQ0lJTGl0ZXJhbCBrZXkgeyAicmVkdWNlTW90aW9uIl9zIH07CisjZWxzZQorICAg
IGNvbnN0ZXhwciBBU0NJSUxpdGVyYWwga2V5IHsgIlJlZHVjZU1vdGlvbkVuYWJsZWQiX3MgfTsK
KyNlbmRpZgorICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxXVEY6OlN0cmluZz4ga2V5KE1BS0Vf
U1RBVElDX1NUUklOR19JTVBMKGtleSkpOwogICAgIHJldHVybiBrZXk7CiB9CisKK3N0YXRpYyBD
RlN0cmluZ1JlZiByZWR1Y2VNb3Rpb25Ob3RpZmljYXRpb24oKQoreworI2lmIFBMQVRGT1JNKE1B
QykKKyAgICByZXR1cm4ga0FYSW50ZXJmYWNlUmVkdWNlTW90aW9uU3RhdHVzRGlkQ2hhbmdlTm90
aWZpY2F0aW9uOworI2Vsc2UKKyAgICByZXR1cm4ga0FYU1JlZHVjZU1vdGlvbkNoYW5nZWROb3Rp
ZmljYXRpb247CiAjZW5kaWYKK30KIAogc3RhdGljIHZvaWQgZGlzcGF0Y2hTaW11bGF0ZWROb3Rp
ZmljYXRpb25zRm9yUHJlZmVyZW5jZUNoYW5nZShjb25zdCBTdHJpbmcmIGtleSkKIHsKQEAgLTEw
ODgsMTEgKzExMDIsMTIgQEAgc3RhdGljIHZvaWQgZGlzcGF0Y2hTaW11bGF0ZWROb3RpZmljYXRp
bwogICAgICAgICBhdXRvIG5vdGlmaWNhdGlvbkNlbnRlciA9IFtOU05vdGlmaWNhdGlvbkNlbnRl
ciBkZWZhdWx0Q2VudGVyXTsKICAgICAgICAgW25vdGlmaWNhdGlvbkNlbnRlciBwb3N0Tm90aWZp
Y2F0aW9uTmFtZTpAIk5TU3lzdGVtQ29sb3JzV2lsbENoYW5nZU5vdGlmaWNhdGlvbiIgb2JqZWN0
Om5pbF07CiAgICAgICAgIFtub3RpZmljYXRpb25DZW50ZXIgcG9zdE5vdGlmaWNhdGlvbk5hbWU6
TlNTeXN0ZW1Db2xvcnNEaWRDaGFuZ2VOb3RpZmljYXRpb24gb2JqZWN0Om5pbF07Ci0gICAgfSBl
bHNlIGlmIChrZXkgPT0gcmVkdWNlTW90aW9uUHJlZmVyZW5jZUtleSgpKSB7Ci0gICAgICAgIGF1
dG8gbm90aWZpY2F0aW9uQ2VudGVyID0gQ0ZOb3RpZmljYXRpb25DZW50ZXJHZXREaXN0cmlidXRl
ZENlbnRlcigpOwotICAgICAgICBDRk5vdGlmaWNhdGlvbkNlbnRlclBvc3ROb3RpZmljYXRpb24o
bm90aWZpY2F0aW9uQ2VudGVyLCBrQVhJbnRlcmZhY2VSZWR1Y2VNb3Rpb25TdGF0dXNEaWRDaGFu
Z2VOb3RpZmljYXRpb24sIG51bGxwdHIsIG51bGxwdHIsIHRydWUpOwogICAgIH0KICNlbmRpZgor
ICAgIGlmIChrZXkgPT0gcmVkdWNlTW90aW9uUHJlZmVyZW5jZUtleSgpKSB7CisgICAgICAgIGF1
dG8gbm90aWZpY2F0aW9uQ2VudGVyID0gQ0ZOb3RpZmljYXRpb25DZW50ZXJHZXREaXN0cmlidXRl
ZENlbnRlcigpOworICAgICAgICBDRk5vdGlmaWNhdGlvbkNlbnRlclBvc3ROb3RpZmljYXRpb24o
bm90aWZpY2F0aW9uQ2VudGVyLCByZWR1Y2VNb3Rpb25Ob3RpZmljYXRpb24oKSwgbnVsbHB0ciwg
bnVsbHB0ciwgdHJ1ZSk7CisgICAgfQogfQogCiBzdGF0aWMgdm9pZCBzZXRQcmVmZXJlbmNlVmFs
dWUoY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYga2V5LCBpZCB2YWx1ZSkK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427413</attachid>
            <date>2021-04-30 06:55:16 -0700</date>
            <delta_ts>2021-04-30 06:59:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222381-20210430065515.patch</filename>
            <type>text/plain</type>
            <size>2722</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzY4MzYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA0LTMwICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBwcmVmZXJzLXJlZHVjZWQtbW90
aW9uIGlzIG5vdCByZWFjdGl2ZSBvbiBpT1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyMjM4MQorICAgICAgICA8cmRhcjovLzc1OTMzOTE1PgorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdpdGggQ0ZQcmVm
cyBkaXJlY3QgbW9kZSwgdGhlcmUgaXMgYSByYWNlIGJldHdlZW4gc2V0dGluZyB0aGUgcmVkdWNl
IG1vdGlvbiBwcmVmZXJlbmNlIGluIHRoZSBXZWJQcm9jZXNzIGFuZCBoYW5kbGluZworICAgICAg
ICB0aGUgbm90aWZpY2F0aW9uIGluIHRoZSBXZWJQcm9jZXNzLiBSZXNvbHZlIHRoaXMgYnkgdXBk
YXRpbmcgdGhlIGNhY2hlZCBzZXR0aW5ncyB2YWx1ZXMgaW4gQWNjZXNzaWJpbGl0eSB3aGVuIGEK
KyAgICAgICAgcHJlZmVyZW5jZSBjaGFuZ2UgZm9yIHRoZSBBY2Nlc3NpYmlsaXR5IGRvbWFpbiBp
cyByZWNlaXZlZC4KKworICAgICAgICAqIFBsYXRmb3JtL3NwaS9Db2NvYS9BY2Nlc3NpYmlsaXR5
U3VwcG9ydFNQSS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29h
Lm1tOgorICAgICAgICAoV2ViS2l0OjpzZXRQcmVmZXJlbmNlVmFsdWUpOgorCiAyMDIxLTA0LTI5
ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVt
b3ZlIHNvbWUgdW5uZWVkZWQgY29kZS4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3Bp
L0NvY29hL0FjY2Vzc2liaWxpdHlTdXBwb3J0U1BJLmgKPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl
YktpdC9QbGF0Zm9ybS9zcGkvQ29jb2EvQWNjZXNzaWJpbGl0eVN1cHBvcnRTUEkuaAkocmV2aXNp
b24gMjc2NTg4KQorKysgU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvQ29jb2EvQWNjZXNzaWJp
bGl0eVN1cHBvcnRTUEkuaAkod29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsOCBAQCBleHRlcm4g
Q0ZTdHJpbmdSZWYga0FYU0Z1bGxLZXlib2FyZEFjY2VzCiBleHRlcm4gQm9vbGVhbiBfQVhTRnVs
bEtleWJvYXJkQWNjZXNzRW5hYmxlZCgpOwogI2VuZGlmCiAKK2V4dGVybiBDRlN0cmluZ1JlZiBr
QVhTQWNjZXNzaWJpbGl0eVByZWZlcmVuY2VEb21haW47CisKIFdURl9FWFRFUk5fQ19FTkQKIAog
I2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0Nv
Y29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQ
cm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDI3NjU4OCkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTE2Nyw2ICsx
NjcsMTEgQEAgU09GVF9MSU5LX0ZSQU1FV09SS19JTl9VTUJSRUxMQShBcHBsaWNhdAogU09GVF9M
SU5LX0ZVTkNUSU9OX01BWV9GQUlMX0ZPUl9TT1VSQ0UoV2ViS2l0LCBISVNlcnZpY2VzLCBfQVhT
ZXRBdWRpdFRva2VuSXNBdXRoZW50aWNhdGVkQ2FsbGJhY2ssIHZvaWQsIChBWEF1ZGl0VG9rZW5J
c0F1dGhlbnRpY2F0ZWRDYWxsYmFjayBjYWxsYmFjayksIChjYWxsYmFjaykpCiAjZW5kaWYKIAor
I2lmIFBMQVRGT1JNKElPUykKK1NPRlRfTElOS19MSUJSQVJZKGxpYkFjY2Vzc2liaWxpdHkpCitT
T0ZUX0xJTktfT1BUSU9OQUwobGliQWNjZXNzaWJpbGl0eSwgX0FYU1VwZGF0ZVdlYkFjY2Vzc2li
aWxpdHlTZXR0aW5ncywgdm9pZCwgKCksICgpKTsKKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViS2l0
IHsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCkBAIC0xMTE1LDYgKzExMjAsMTUgQEAgc3Rh
dGljIHZvaWQgc2V0UHJlZmVyZW5jZVZhbHVlKGNvbnN0IFN0cgogCiAgICAgICAgIFdURjo6bGFu
Z3VhZ2VEaWRDaGFuZ2UoKTsKICAgICB9CisKKyNpZiBQTEFURk9STShJT1MpCisgICAgaWYgKGRv
bWFpbiA9PSBTdHJpbmcoa0FYU0FjY2Vzc2liaWxpdHlQcmVmZXJlbmNlRG9tYWluKSkgeworICAg
ICAgICBpZiAoX0FYU1VwZGF0ZVdlYkFjY2Vzc2liaWxpdHlTZXR0aW5nc1B0cigpKSB7CisgICAg
ICAgICAgICBXVEZMb2dBbHdheXMoIlVwZGF0aW5nIFdlYiBBY2Nlc3NpYmlsaXR5IHNldHRpbmdz
LiIpOworICAgICAgICAgICAgX0FYU1VwZGF0ZVdlYkFjY2Vzc2liaWxpdHlTZXR0aW5nc1B0cigp
KCk7CisgICAgICAgIH0KKyAgICB9CisjZW5kaWYKIH0KIAogdm9pZCBXZWJQcm9jZXNzOjpub3Rp
ZnlQcmVmZXJlbmNlc0NoYW5nZWQoY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYg
a2V5LCBjb25zdCBPcHRpb25hbDxTdHJpbmc+JiBlbmNvZGVkVmFsdWUpCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427414</attachid>
            <date>2021-04-30 06:59:14 -0700</date>
            <delta_ts>2021-04-30 09:51:35 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222381-20210430065913.patch</filename>
            <type>text/plain</type>
            <size>2736</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzY4MzYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA0LTMwICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBwcmVmZXJzLXJlZHVjZWQtbW90
aW9uIGlzIG5vdCByZWFjdGl2ZSBvbiBpT1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyMjM4MQorICAgICAgICA8cmRhcjovLzc1OTMzOTE1PgorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdpdGggQ0ZQcmVm
cyBkaXJlY3QgbW9kZSwgdGhlcmUgaXMgYSByYWNlIGJldHdlZW4gc2V0dGluZyB0aGUgcmVkdWNl
IG1vdGlvbiBwcmVmZXJlbmNlIGluIHRoZSBXZWJQcm9jZXNzIGFuZCBoYW5kbGluZworICAgICAg
ICB0aGUgbm90aWZpY2F0aW9uIGluIHRoZSBXZWJQcm9jZXNzLiBSZXNvbHZlIHRoaXMgYnkgdXBk
YXRpbmcgdGhlIGNhY2hlZCBzZXR0aW5ncyB2YWx1ZXMgaW4gQWNjZXNzaWJpbGl0eSB3aGVuIGEK
KyAgICAgICAgcHJlZmVyZW5jZSBjaGFuZ2UgZm9yIHRoZSBBY2Nlc3NpYmlsaXR5IGRvbWFpbiBp
cyByZWNlaXZlZC4KKworICAgICAgICAqIFBsYXRmb3JtL3NwaS9Db2NvYS9BY2Nlc3NpYmlsaXR5
U3VwcG9ydFNQSS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29h
Lm1tOgorICAgICAgICAoV2ViS2l0OjpzZXRQcmVmZXJlbmNlVmFsdWUpOgorCiAyMDIxLTA0LTI5
ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVt
b3ZlIHNvbWUgdW5uZWVkZWQgY29kZS4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3Bp
L0NvY29hL0FjY2Vzc2liaWxpdHlTdXBwb3J0U1BJLmgKPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl
YktpdC9QbGF0Zm9ybS9zcGkvQ29jb2EvQWNjZXNzaWJpbGl0eVN1cHBvcnRTUEkuaAkocmV2aXNp
b24gMjc2NTg4KQorKysgU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvQ29jb2EvQWNjZXNzaWJp
bGl0eVN1cHBvcnRTUEkuaAkod29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsOCBAQCBleHRlcm4g
Q0ZTdHJpbmdSZWYga0FYU0Z1bGxLZXlib2FyZEFjY2VzCiBleHRlcm4gQm9vbGVhbiBfQVhTRnVs
bEtleWJvYXJkQWNjZXNzRW5hYmxlZCgpOwogI2VuZGlmCiAKK2V4dGVybiBDRlN0cmluZ1JlZiBr
QVhTQWNjZXNzaWJpbGl0eVByZWZlcmVuY2VEb21haW47CisKIFdURl9FWFRFUk5fQ19FTkQKIAog
I2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0Nv
Y29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQ
cm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDI3NjU4OCkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTE2Nyw2ICsx
NjcsMTEgQEAgU09GVF9MSU5LX0ZSQU1FV09SS19JTl9VTUJSRUxMQShBcHBsaWNhdAogU09GVF9M
SU5LX0ZVTkNUSU9OX01BWV9GQUlMX0ZPUl9TT1VSQ0UoV2ViS2l0LCBISVNlcnZpY2VzLCBfQVhT
ZXRBdWRpdFRva2VuSXNBdXRoZW50aWNhdGVkQ2FsbGJhY2ssIHZvaWQsIChBWEF1ZGl0VG9rZW5J
c0F1dGhlbnRpY2F0ZWRDYWxsYmFjayBjYWxsYmFjayksIChjYWxsYmFjaykpCiAjZW5kaWYKIAor
I2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCitTT0ZUX0xJTktfTElCUkFSWShsaWJBY2Nlc3NpYmls
aXR5KQorU09GVF9MSU5LX09QVElPTkFMKGxpYkFjY2Vzc2liaWxpdHksIF9BWFNVcGRhdGVXZWJB
Y2Nlc3NpYmlsaXR5U2V0dGluZ3MsIHZvaWQsICgpLCAoKSk7CisjZW5kaWYKKwogbmFtZXNwYWNl
IFdlYktpdCB7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtMTExNSw2ICsxMTIwLDE1
IEBAIHN0YXRpYyB2b2lkIHNldFByZWZlcmVuY2VWYWx1ZShjb25zdCBTdHIKIAogICAgICAgICBX
VEY6Omxhbmd1YWdlRGlkQ2hhbmdlKCk7CiAgICAgfQorCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlM
WSkKKyAgICBpZiAoZG9tYWluID09IFN0cmluZyhrQVhTQWNjZXNzaWJpbGl0eVByZWZlcmVuY2VE
b21haW4pKSB7CisgICAgICAgIGlmIChfQVhTVXBkYXRlV2ViQWNjZXNzaWJpbGl0eVNldHRpbmdz
UHRyKCkpIHsKKyAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygiVXBkYXRpbmcgV2ViIEFjY2Vzc2li
aWxpdHkgc2V0dGluZ3MuIik7CisgICAgICAgICAgICBfQVhTVXBkYXRlV2ViQWNjZXNzaWJpbGl0
eVNldHRpbmdzUHRyKCkoKTsKKyAgICAgICAgfQorICAgIH0KKyNlbmRpZgogfQogCiB2b2lkIFdl
YlByb2Nlc3M6Om5vdGlmeVByZWZlcmVuY2VzQ2hhbmdlZChjb25zdCBTdHJpbmcmIGRvbWFpbiwg
Y29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IE9wdGlvbmFsPFN0cmluZz4mIGVuY29kZWRWYWx1ZSkK
</data>
<flag name="review"
          id="448001"
          type_id="1"
          status="+"
          setter="bfulgham"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427442</attachid>
            <date>2021-04-30 13:25:23 -0700</date>
            <delta_ts>2021-04-30 14:04:27 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222381-20210430132523.patch</filename>
            <type>text/plain</type>
            <size>2830</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzY4NTEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA0LTMwICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBwcmVmZXJzLXJlZHVjZWQtbW90
aW9uIGlzIG5vdCByZWFjdGl2ZSBvbiBpT1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyMjM4MQorICAgICAgICA8cmRhcjovLzc1OTMzOTE1PgorCisg
ICAgICAgIFJldmlld2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAgICAgICAgV2l0aCBDRlByZWZz
IGRpcmVjdCBtb2RlLCB0aGVyZSBpcyBhIHJhY2UgYmV0d2VlbiB0aGUgbm90aWZpY2F0aW9uIHRo
YXQgYW4gYWNjZXNzaWJpbGl0eSBwcmVmZXJlbmNlIGhhcyBiZWVuIGNoYW5nZWQKKyAgICAgICAg
YnkgdGhlIHVzZXIsIGFuZCB0aGUgdGhlIGluLW1lbW9yeSBBY2Nlc3NpYmlsaXR5IHByZWZlcmVu
Y2UgY2FjaGUgaW4gdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4gV2UgcmVzb2x2ZSB0aGlzIGJ5IHVz
aW5nCisgICAgICAgIG5ldyBTUEkgdG8gY2xlYXIgdGhlIGNhY2hlZCBBY2Nlc3NpYmlsaXR5IHNl
dHRpbmdzIHdoZW4gd2UgYXJlIG5vdGlmaWVkIG9mIGFuIGFjY2Vzc2liaWxpdHkgY2hhbmdlIHNv
IHRoZXkgYWx3YXlzCisgICAgICAgIHJlZmxlY3QgdGhlIHVzZXIncyBtb3N0IHJlY2VudCBzZXR0
aW5nLgorCisgICAgICAgICogUGxhdGZvcm0vc3BpL0NvY29hL0FjY2Vzc2liaWxpdHlTdXBwb3J0
U1BJLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW06Cisg
ICAgICAgIChXZWJLaXQ6OnNldFByZWZlcmVuY2VWYWx1ZSk6CisKIDIwMjEtMDQtMzAgIEppZXdl
biBUYW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBfV0tXZWJBdXRoZW50aWNh
dGlvblBhbmVsRGVsZWdhdGUgcmVnaXN0cmF0aW9uIGFuZCBhc3NlcnRpb24gU1BJIGRvZXNuJ3Qg
d29yayB3aXRob3V0IGFuIExBQ29udGV4dCAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvUGxhdGZvcm0v
c3BpL0NvY29hL0FjY2Vzc2liaWxpdHlTdXBwb3J0U1BJLmgKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYktpdC9QbGF0Zm9ybS9zcGkvQ29jb2EvQWNjZXNzaWJpbGl0eVN1cHBvcnRTUEkuaAkocmV2
aXNpb24gMjc2ODUxKQorKysgU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvQ29jb2EvQWNjZXNz
aWJpbGl0eVN1cHBvcnRTUEkuaAkod29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsOCBAQCBleHRl
cm4gQ0ZTdHJpbmdSZWYga0FYU0Z1bGxLZXlib2FyZEFjY2VzCiBleHRlcm4gQm9vbGVhbiBfQVhT
RnVsbEtleWJvYXJkQWNjZXNzRW5hYmxlZCgpOwogI2VuZGlmCiAKK2V4dGVybiBDRlN0cmluZ1Jl
ZiBrQVhTQWNjZXNzaWJpbGl0eVByZWZlcmVuY2VEb21haW47CisKIFdURl9FWFRFUk5fQ19FTkQK
IAogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vz
c0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9X
ZWJQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDI3Njg1MSkKKysrIFNvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTE2Nyw2
ICsxNjcsMTEgQEAgU09GVF9MSU5LX0ZSQU1FV09SS19JTl9VTUJSRUxMQShBcHBsaWNhdAogU09G
VF9MSU5LX0ZVTkNUSU9OX01BWV9GQUlMX0ZPUl9TT1VSQ0UoV2ViS2l0LCBISVNlcnZpY2VzLCBf
QVhTZXRBdWRpdFRva2VuSXNBdXRoZW50aWNhdGVkQ2FsbGJhY2ssIHZvaWQsIChBWEF1ZGl0VG9r
ZW5Jc0F1dGhlbnRpY2F0ZWRDYWxsYmFjayBjYWxsYmFjayksIChjYWxsYmFjaykpCiAjZW5kaWYK
IAorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCitTT0ZUX0xJTktfTElCUkFSWShsaWJBY2Nlc3Np
YmlsaXR5KQorU09GVF9MSU5LX09QVElPTkFMKGxpYkFjY2Vzc2liaWxpdHksIF9BWFNVcGRhdGVX
ZWJBY2Nlc3NpYmlsaXR5U2V0dGluZ3MsIHZvaWQsICgpLCAoKSk7CisjZW5kaWYKKwogbmFtZXNw
YWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtMTExNSw2ICsxMTIw
LDEzIEBAIHN0YXRpYyB2b2lkIHNldFByZWZlcmVuY2VWYWx1ZShjb25zdCBTdHIKIAogICAgICAg
ICBXVEY6Omxhbmd1YWdlRGlkQ2hhbmdlKCk7CiAgICAgfQorCisjaWYgUExBVEZPUk0oSU9TX0ZB
TUlMWSkKKyAgICBpZiAoZG9tYWluID09IFN0cmluZyhrQVhTQWNjZXNzaWJpbGl0eVByZWZlcmVu
Y2VEb21haW4pKSB7CisgICAgICAgIGlmIChfQVhTVXBkYXRlV2ViQWNjZXNzaWJpbGl0eVNldHRp
bmdzUHRyKCkpCisgICAgICAgICAgICBfQVhTVXBkYXRlV2ViQWNjZXNzaWJpbGl0eVNldHRpbmdz
UHRyKCkoKTsKKyAgICB9CisjZW5kaWYKIH0KIAogdm9pZCBXZWJQcm9jZXNzOjpub3RpZnlQcmVm
ZXJlbmNlc0NoYW5nZWQoY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYga2V5LCBj
b25zdCBPcHRpb25hbDxTdHJpbmc+JiBlbmNvZGVkVmFsdWUpCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>