<?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>233304</bug_id>
          
          <creation_ts>2021-11-17 20:44:31 -0800</creation_ts>
          <short_desc>Add missing dependencies for &lt;wtf/Platform.h&gt; when generating derived sources</short_desc>
          <delta_ts>2021-11-18 11:43:25 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebCore Misc.</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          <dependson>212451</dependson>
    
    <dependson>213976</dependson>
    
    <dependson>213979</dependson>
    
    <dependson>213980</dependson>
          <blocked>233152</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="David Kilzer (:ddkilzer)">ddkilzer</reporter>
          <assigned_to name="David Kilzer (:ddkilzer)">ddkilzer</assigned_to>
          <cc>ap</cc>
    
    <cc>bfulgham</cc>
    
    <cc>darin</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>keith_miller</cc>
    
    <cc>mark.lam</cc>
    
    <cc>msaboff</cc>
    
    <cc>saam</cc>
    
    <cc>tzagallo</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1816295</commentid>
    <comment_count>0</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-17 20:44:31 -0800</bug_when>
    <thetext>Add missing dependencies for &lt;wtf/Platform.h&gt; when generating derived sources in JavaScriptCore and WebCore.

This addresses a FIXME comment added for Bug 213980 in r263961.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816296</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-11-17 20:44:45 -0800</bug_when>
    <thetext>&lt;rdar://problem/85533245&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816297</commentid>
    <comment_count>2</comment_count>
      <attachid>444634</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-17 20:50:35 -0800</bug_when>
    <thetext>Created attachment 444634
Patch v1</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816298</commentid>
    <comment_count>3</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-17 20:56:32 -0800</bug_when>
    <thetext>(In reply to David Kilzer (:ddkilzer) from comment #0)
&gt; This addresses a FIXME comment added for Bug 213980 in r263961.

The original FIXME was added for Bug 212451 in r262309.

Hmmm...I see Source/WebKitLegacy/mac/MigrateHeaders.make contains a similar FIXME.

I could fix that as well (tomorrow).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816299</commentid>
    <comment_count>4</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-17 20:58:33 -0800</bug_when>
    <thetext>(In reply to David Kilzer (:ddkilzer) from comment #3)
&gt; The original FIXME was added for Bug 212451 in r262309.
&gt; 
&gt; Hmmm...I see Source/WebKitLegacy/mac/MigrateHeaders.make contains a similar
&gt; FIXME.
&gt; 
&gt; I could fix that as well (tomorrow).

That FIXME has since been removed, so it looks like it&apos;s just the two DerivedSources.make files that need this change.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816377</commentid>
    <comment_count>5</comment_count>
      <attachid>444634</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-11-18 03:39:45 -0800</bug_when>
    <thetext>Comment on attachment 444634
Patch v1

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

I’ll say r+ even though I have questions, assuming the answers are all good

&gt; Source/JavaScriptCore/ChangeLog:3
&gt; +        Add missing dependencies for &lt;wtf/Platform.h&gt; when generating derived sources

Hard coding Platorm.h doesn’t seem exactly right. But I suppose it’s better than missing these dependencies. Maybe it’s really literally just Platform.h though, in which case it’s fine.

&gt; Source/WebCore/ChangeLog:21
&gt; +        - Add an input depdency on the script run from the build phase

This dependency only mentions the main script source files themselves. The scripts don’t in turn depend on any additional files? Our perl and python scripts typically do but maybe these shell scripts are simpler than that?

Also typo: “depdency”

Comments apply to the other similar case above too.

&gt; Source/JavaScriptCore/DerivedSources-input.xcfilelist:2
&gt; +$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/AdditionalFeatureDefines.h

How can this be right? These files are installed as part of JavaScriptCore build, aren’t they? Later than this. So how can they be inputs? Or is this all installed as part of building other projects earlier?

If you understand why this is right, that’s good. To me it looks obviously wrong, but this could just be me getting educated.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816447</commentid>
    <comment_count>6</comment_count>
      <attachid>444634</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-18 08:40:01 -0800</bug_when>
    <thetext>Comment on attachment 444634
Patch v1

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

&gt;&gt; Source/JavaScriptCore/ChangeLog:3
&gt;&gt; +        Add missing dependencies for &lt;wtf/Platform.h&gt; when generating derived sources
&gt; 
&gt; Hard coding Platorm.h doesn’t seem exactly right. But I suppose it’s better than missing these dependencies. Maybe it’s really literally just Platform.h though, in which case it’s fine.

This is correct because we&apos;re generating a list of header dependencies for `FEATURE_AND_PLATFORM_DEFINES` (two lines up in both DerivedSources.make files):

FEATURE_AND_PLATFORM_DEFINES := $(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include &quot;wtf/Platform.h&quot; /dev/null | $(PERL) -ne &quot;print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/&quot;)

The missing dependency bug occurs when only Platform.h or other #included headers change to disable a feature, but an incremental build doesn&apos;t regenerate derived sources, and then the build fails because the derived sources still reference the now-disabled feature.

This is exactly what happened in the first two patches for Bug 233152.

In case you ask, I decided it was too complicated to try to use the output from one command to generate both the macros and the list of dependencies.  (I could, however, extract most of the compiler command into another variable if that would be better..)

&gt;&gt; Source/WebCore/ChangeLog:21
&gt;&gt; +        - Add an input depdency on the script run from the build phase
&gt; 
&gt; This dependency only mentions the main script source files themselves. The scripts don’t in turn depend on any additional files? Our perl and python scripts typically do but maybe these shell scripts are simpler than that?
&gt; 
&gt; Also typo: “depdency”
&gt; 
&gt; Comments apply to the other similar case above too.

In the case of both &quot;Generate Derived Sources&quot; build phase scripts, the DerivedSources-input.xcfilelist files list the _other_ dependencies, but they don&apos;t list the dependency on the initial generate-derived-sources.sh file itself (if only it changed).

Now I wonder whether the &quot;Check .xcfilelist&quot; build phase scripts purposefully didn&apos;t have any dependencies listed so Xcode would have to run it every time.  I&apos;ll remove that one in the next patch for both projects.

However, I think &quot;Generate Derived Sources&quot; build phase scripts should have an input dependency on the initial script being run in case it changes since it has a list of generated inputs (which is what this patch is updating to include Platform.h header dependencies).

Will fix the typos.

&gt;&gt; Source/JavaScriptCore/DerivedSources-input.xcfilelist:2
&gt;&gt; +$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/AdditionalFeatureDefines.h
&gt; 
&gt; How can this be right? These files are installed as part of JavaScriptCore build, aren’t they? Later than this. So how can they be inputs? Or is this all installed as part of building other projects earlier?
&gt; 
&gt; If you understand why this is right, that’s good. To me it looks obviously wrong, but this could just be me getting educated.

&gt; Or is this all installed as part of building other projects earlier?

Yes.  These headers are installed as part of other projects before JavaScriptCore.  Also, these dependencies are most beneficial on incremental (engineering) builds.  On clean builds (such as Production builds), the dependencies don&apos;t matter because the scripts have to run to generate the output file(s) regardless.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816468</commentid>
    <comment_count>7</comment_count>
      <attachid>444634</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-11-18 08:55:26 -0800</bug_when>
    <thetext>Comment on attachment 444634
Patch v1

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

&gt;&gt;&gt; Source/JavaScriptCore/ChangeLog:3
&gt;&gt;&gt; +        Add missing dependencies for &lt;wtf/Platform.h&gt; when generating derived sources
&gt;&gt; 
&gt;&gt; Hard coding Platorm.h doesn’t seem exactly right. But I suppose it’s better than missing these dependencies. Maybe it’s really literally just Platform.h though, in which case it’s fine.
&gt; 
&gt; This is correct because we&apos;re generating a list of header dependencies for `FEATURE_AND_PLATFORM_DEFINES` (two lines up in both DerivedSources.make files):
&gt; 
&gt; FEATURE_AND_PLATFORM_DEFINES := $(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include &quot;wtf/Platform.h&quot; /dev/null | $(PERL) -ne &quot;print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/&quot;)
&gt; 
&gt; The missing dependency bug occurs when only Platform.h or other #included headers change to disable a feature, but an incremental build doesn&apos;t regenerate derived sources, and then the build fails because the derived sources still reference the now-disabled feature.
&gt; 
&gt; This is exactly what happened in the first two patches for Bug 233152.
&gt; 
&gt; In case you ask, I decided it was too complicated to try to use the output from one command to generate both the macros and the list of dependencies.  (I could, however, extract most of the compiler command into another variable if that would be better..)

My only worry about compiling twice  is compile time for fast path no-changes incremental builds. if this compilation runs every time we run make.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816478</commentid>
    <comment_count>8</comment_count>
      <attachid>444689</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-18 09:11:35 -0800</bug_when>
    <thetext>Created attachment 444689
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816483</commentid>
    <comment_count>9</comment_count>
      <attachid>444634</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-18 09:19:15 -0800</bug_when>
    <thetext>Comment on attachment 444634
Patch v1

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

&gt;&gt;&gt;&gt; Source/JavaScriptCore/ChangeLog:3
&gt;&gt;&gt;&gt; +        Add missing dependencies for &lt;wtf/Platform.h&gt; when generating derived sources
&gt;&gt;&gt; 
&gt;&gt;&gt; Hard coding Platorm.h doesn’t seem exactly right. But I suppose it’s better than missing these dependencies. Maybe it’s really literally just Platform.h though, in which case it’s fine.
&gt;&gt; 
&gt;&gt; This is correct because we&apos;re generating a list of header dependencies for `FEATURE_AND_PLATFORM_DEFINES` (two lines up in both DerivedSources.make files):
&gt;&gt; 
&gt;&gt; FEATURE_AND_PLATFORM_DEFINES := $(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include &quot;wtf/Platform.h&quot; /dev/null | $(PERL) -ne &quot;print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/&quot;)
&gt;&gt; 
&gt;&gt; The missing dependency bug occurs when only Platform.h or other #included headers change to disable a feature, but an incremental build doesn&apos;t regenerate derived sources, and then the build fails because the derived sources still reference the now-disabled feature.
&gt;&gt; 
&gt;&gt; This is exactly what happened in the first two patches for Bug 233152.
&gt;&gt; 
&gt;&gt; In case you ask, I decided it was too complicated to try to use the output from one command to generate both the macros and the list of dependencies.  (I could, however, extract most of the compiler command into another variable if that would be better..)
&gt; 
&gt; My only worry about compiling twice  is compile time for fast path no-changes incremental builds. if this compilation runs every time we run make.

The compiler command itself takes less than a second, and it&apos;s only run when dependency inputs change.

Here&apos;s an equivalent command on a 2015 15&quot; MBP (which uses xcrun, so it will take longer):

$ time xcrun -sdk macosx.internal clang -std=gnu++1z -x c++ -M -IWebKitBuild/Debug/usr/local/include -include &quot;wtf/Platform.h&quot; /dev/null &gt; /dev/null

real	0m0.391s
user	0m0.025s
sys	0m0.286s

The second time it&apos;s even faster:

$ time xcrun -sdk macosx.internal clang -std=gnu++1z -x c++ -M -IWebKitBuild/Debug/usr/local/include -include &quot;wtf/Platform.h&quot; /dev/null &gt; /dev/null

real	0m0.048s
user	0m0.022s
sys	0m0.022s</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816486</commentid>
    <comment_count>10</comment_count>
      <attachid>444634</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-18 09:28:34 -0800</bug_when>
    <thetext>Comment on attachment 444634
Patch v1

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

&gt;&gt;&gt;&gt;&gt; Source/JavaScriptCore/ChangeLog:3
&gt;&gt;&gt;&gt;&gt; +        Add missing dependencies for &lt;wtf/Platform.h&gt; when generating derived sources
&gt;&gt;&gt;&gt; 
&gt;&gt;&gt;&gt; Hard coding Platorm.h doesn’t seem exactly right. But I suppose it’s better than missing these dependencies. Maybe it’s really literally just Platform.h though, in which case it’s fine.
&gt;&gt;&gt; 
&gt;&gt;&gt; This is correct because we&apos;re generating a list of header dependencies for `FEATURE_AND_PLATFORM_DEFINES` (two lines up in both DerivedSources.make files):
&gt;&gt;&gt; 
&gt;&gt;&gt; FEATURE_AND_PLATFORM_DEFINES := $(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include &quot;wtf/Platform.h&quot; /dev/null | $(PERL) -ne &quot;print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/&quot;)
&gt;&gt;&gt; 
&gt;&gt;&gt; The missing dependency bug occurs when only Platform.h or other #included headers change to disable a feature, but an incremental build doesn&apos;t regenerate derived sources, and then the build fails because the derived sources still reference the now-disabled feature.
&gt;&gt;&gt; 
&gt;&gt;&gt; This is exactly what happened in the first two patches for Bug 233152.
&gt;&gt;&gt; 
&gt;&gt;&gt; In case you ask, I decided it was too complicated to try to use the output from one command to generate both the macros and the list of dependencies.  (I could, however, extract most of the compiler command into another variable if that would be better..)
&gt;&gt; 
&gt;&gt; My only worry about compiling twice  is compile time for fast path no-changes incremental builds. if this compilation runs every time we run make.
&gt; 
&gt; The compiler command itself takes less than a second, and it&apos;s only run when dependency inputs change.
&gt; 
&gt; Here&apos;s an equivalent command on a 2015 15&quot; MBP (which uses xcrun, so it will take longer):
&gt; 
&gt; $ time xcrun -sdk macosx.internal clang -std=gnu++1z -x c++ -M -IWebKitBuild/Debug/usr/local/include -include &quot;wtf/Platform.h&quot; /dev/null &gt; /dev/null
&gt; 
&gt; real	0m0.391s
&gt; user	0m0.025s
&gt; sys	0m0.286s
&gt; 
&gt; The second time it&apos;s even faster:
&gt; 
&gt; $ time xcrun -sdk macosx.internal clang -std=gnu++1z -x c++ -M -IWebKitBuild/Debug/usr/local/include -include &quot;wtf/Platform.h&quot; /dev/null &gt; /dev/null
&gt; 
&gt; real	0m0.048s
&gt; user	0m0.022s
&gt; sys	0m0.022s

Also, having to do a clean build (because dependencies are missing/broken) when one of the Platform.h headers changes (but derived sources aren&apos;t regenerated correctly) is going to take longer (and be much more frustrating) than running this compiler command.

You could argue that a change to a header file might not always change the macros defined, but you could also come up with a similar scenario for any of the dependent files--not just header files--which would cause derived sources to be regenerated.  I think dependency correctness wins here.  (It may be possible to add a step to check if previously generated feature macros actually changed, too, and only regenerate if they changed--if this change regenerates derived sources too often.)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816517</commentid>
    <comment_count>11</comment_count>
      <attachid>444689</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-18 10:56:37 -0800</bug_when>
    <thetext>Comment on attachment 444689
Patch for landing

Marking cq+ since all Apple OSes have built successfully at least once.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816519</commentid>
    <comment_count>12</comment_count>
      <attachid>444689</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-11-18 10:56:53 -0800</bug_when>
    <thetext>Comment on attachment 444689
Patch for landing

Off by one!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816526</commentid>
    <comment_count>13</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-11-18 11:31:00 -0800</bug_when>
    <thetext>Committed r286018 (244407@main): &lt;https://commits.webkit.org/244407@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 444689.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1816534</commentid>
    <comment_count>14</comment_count>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-11-18 11:43:25 -0800</bug_when>
    <thetext>(In reply to David Kilzer (:ddkilzer) from comment #9)
&gt; &gt; My only worry about compiling twice  is compile time for fast path no-changes incremental builds. if this compilation runs every time we run make.
&gt; 
&gt; The compiler command itself takes less than a second, and it&apos;s only run when
&gt; dependency inputs change.

Great! It’s the latter that matters more to me.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>444634</attachid>
            <date>2021-11-17 20:50:35 -0800</date>
            <delta_ts>2021-11-18 09:11:32 -0800</delta_ts>
            <desc>Patch v1</desc>
            <filename>bug-233304-20211117205034.patch</filename>
            <type>text/plain</type>
            <size>11495</size>
            <attacher name="David Kilzer (:ddkilzer)">ddkilzer</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh
MTM1NWUwY2NjYjcyYWRjZTAyYjc0YTAxMzZjOGMwZjIwZTEyNjIzLi4wMzNjZTg4NThjMWY3Mzli
MzdkYWRiZTBhYzAyZTQyODhmYTQ3ODQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyNiBAQAorMjAyMS0xMS0xNyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29t
PgorCisgICAgICAgIEFkZCBtaXNzaW5nIGRlcGVuZGVuY2llcyBmb3IgPHd0Zi9QbGF0Zm9ybS5o
PiB3aGVuIGdlbmVyYXRpbmcgZGVyaXZlZCBzb3VyY2VzCisgICAgICAgIDxodHRwczovL3dlYmtp
dC5vcmcvYi8yMzMzMDQ+CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NTUzMzI0NT4KKworICAg
ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIERlcml2ZWRTb3Vy
Y2VzLWlucHV0LnhjZmlsZWxpc3Q6CisgICAgICAgIC0gVXBkYXRlIGFmdGVyIGNoYW5nZXMgdG8g
RGVyaXZlZFNvdXJlcy5tYWtlLiAgV1RGIGhlYWRlcnMKKyAgICAgICAgICBpbmNsdWRlZCBieSA8
d3RmL1BsYXRmb3JtLmg+IGFyZSBub3cgbGlzdGVkLgorICAgICAgICAqIERlcml2ZWRTb3VyY2Vz
Lm1ha2U6CisgICAgICAgIChQTEFURk9STV9IRUFERVJfRElSKTogQWRkLgorICAgICAgICAoUExB
VEZPUk1fSEVBREVSX0RFUEVOREVOQ0lFUyk6IEFkZC4KKyAgICAgICAgKEZFQVRVUkVfQU5EX1BM
QVRGT1JNX0RFRklORV9ERVBFTkRFTkNJRVMpOgorICAgICAgICAtIEdlbmVyYXRlIGEgbWFrZWZp
bGUgZGVwZW5kZW5jeSBsaXN0IGZvciA8d3RmL1BsYXRmb3JtLmg+LCB0aGVuCisgICAgICAgICAg
ZmlsdGVyIGl0IHRvIGxpc3Qgb25seSBXZWJLaXQgcHJvamVjdCBoZWFkZXJzLgorICAgICAgICAq
IEphdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgIChKYXZh
U2NyaXB0Q29yZSA6IENoZWNrIC54Y2ZpbGVsaXN0cyk6CisgICAgICAgIChEZXJpdmVkIFNvdXJj
ZXMgOiBHZW5lcmF0ZSBEZXJpdmVkIFNvdXJjZXMpOgorICAgICAgICAtIEFkZCBhbiBpbnB1dCBk
ZXBkZW5jeSBvbiB0aGUgc2NyaXB0IHJ1biBmcm9tIHRoZSBidWlsZCBwaGFzZQorICAgICAgICAg
IHNjcmlwdC4KKwogMjAyMS0xMS0xNCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t
PgogCiAgICAgICAgIFtKU0NdIFVzZSBDYWxsTGlua0luZm8gaW4gTExJbnQKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRl
eCA1Y2RhOWJlYTk3ZWZmZjYwMmE2Mjc4Y2MyNjZjNDk0M2YwZDk0YWVlLi43YzU3ZjZhOGQzNmE2
NTg1MWE3M2FkMWQ3OThmZjUyN2RiNTRiNTdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAK
KzIwMjEtMTEtMTcgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAg
ICBBZGQgbWlzc2luZyBkZXBlbmRlbmNpZXMgZm9yIDx3dGYvUGxhdGZvcm0uaD4gd2hlbiBnZW5l
cmF0aW5nIGRlcml2ZWQgc291cmNlcworICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMjMz
MzA0PgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODU1MzMyNDU+CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBEZXJpdmVkU291cmNlcy1pbnB1dC54
Y2ZpbGVsaXN0OgorICAgICAgICAtIFVwZGF0ZSBhZnRlciBjaGFuZ2VzIHRvIERlcml2ZWRTb3Vy
ZXMubWFrZS4gIFdURiBoZWFkZXJzCisgICAgICAgICAgaW5jbHVkZWQgYnkgPHd0Zi9QbGF0Zm9y
bS5oPiBhcmUgbm93IGxpc3RlZC4KKyAgICAgICAgKiBEZXJpdmVkU291cmNlcy5tYWtlOgorICAg
ICAgICAoUExBVEZPUk1fSEVBREVSX0RJUik6IEFkZC4KKyAgICAgICAgKFBMQVRGT1JNX0hFQURF
Ul9ERVBFTkRFTkNJRVMpOiBBZGQuCisgICAgICAgIChGRUFUVVJFX0FORF9QTEFURk9STV9ERUZJ
TkVfREVQRU5ERU5DSUVTKToKKyAgICAgICAgLSBHZW5lcmF0ZSBhIG1ha2VmaWxlIGRlcGVuZGVu
Y3kgbGlzdCBmb3IgPHd0Zi9QbGF0Zm9ybS5oPiwgdGhlbgorICAgICAgICAgIGZpbHRlciBpdCB0
byBsaXN0IG9ubHkgV2ViS2l0IHByb2plY3QgaGVhZGVycy4KKyAgICAgICAgKiBXZWJDb3JlLnhj
b2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgIChXZWJDb3JlIDogQ2hlY2sgLnhjZmls
ZWxpc3RzKToKKyAgICAgICAgKERlcml2ZWQgU291cmNlcyA6IEdlbmVyYXRlIERlcml2ZWQgU291
cmNlcyk6CisgICAgICAgIC0gQWRkIGFuIGlucHV0IGRlcGRlbmN5IG9uIHRoZSBzY3JpcHQgcnVu
IGZyb20gdGhlIGJ1aWxkIHBoYXNlCisgICAgICAgICAgc2NyaXB0LgorCiAyMDIxLTExLTE2ICBE
YXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgRGlzYWJsZSBleHBl
cmltZW50YWwgd2ViIGZlYXR1cmVzIG9uIHBsYXRmb3JtcyB3aXRob3V0IFVJIHRvIGVuYWJsZSB0
aGVtCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvRGVyaXZlZFNvdXJjZXMtaW5w
dXQueGNmaWxlbGlzdCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9EZXJpdmVkU291cmNlcy1pbnB1
dC54Y2ZpbGVsaXN0CmluZGV4IDc2ODEzMGIwYjcwM2VhZTIwNTYxODNhYjY4YTc0MzU2ZjI3N2Y4
M2QuLjE1MzQ0OTY1ZDU1ZTFjMDE4NWIzZWQwNTFjMWQxMjlhMDI4Njc3ZTkgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9EZXJpdmVkU291cmNlcy1pbnB1dC54Y2ZpbGVsaXN0Cisr
KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9EZXJpdmVkU291cmNlcy1pbnB1dC54Y2ZpbGVsaXN0
CkBAIC0xLDQgKzEsMTggQEAKICMgVGhpcyBmaWxlIGlzIGdlbmVyYXRlZCBieSB0aGUgZ2VuZXJh
dGUteGNmaWxlbGlzdHMgc2NyaXB0LgorJChCVUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9p
bmNsdWRlL1dlYktpdEFkZGl0aW9ucy9BZGRpdGlvbmFsRmVhdHVyZURlZmluZXMuaAorJChCVUlM
VF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL1dlYktpdEFkZGl0aW9ucy9BZGRpdGlv
bmFsUGxhdGZvcm0uaAorJChCVUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL2Jt
YWxsb2MvQkNvbXBpbGVyLmgKKyQoQlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVk
ZS9ibWFsbG9jL0JQbGF0Zm9ybS5oCiskKEJVSUxUX1BST0RVQ1RTX0RJUikvdXNyL2xvY2FsL2lu
Y2x1ZGUvd3RmL0NvbXBpbGVyLmgKKyQoQlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5j
bHVkZS93dGYvUGxhdGZvcm0uaAorJChCVUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNs
dWRlL3d0Zi9QbGF0Zm9ybUNQVS5oCiskKEJVSUxUX1BST0RVQ1RTX0RJUikvdXNyL2xvY2FsL2lu
Y2x1ZGUvd3RmL1BsYXRmb3JtQ2FsbGluZ0NvbnZlbnRpb25zLmgKKyQoQlVJTFRfUFJPRFVDVFNf
RElSKS91c3IvbG9jYWwvaW5jbHVkZS93dGYvUGxhdGZvcm1FbmFibGUuaAorJChCVUlMVF9QUk9E
VUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL3d0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmgKKyQo
QlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVkZS93dGYvUGxhdGZvcm1IYXZlLmgK
KyQoQlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVkZS93dGYvUGxhdGZvcm1MZWdh
Y3kuaAorJChCVUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL3d0Zi9QbGF0Zm9y
bU9TLmgKKyQoQlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVkZS93dGYvUGxhdGZv
cm1Vc2UuaAogJChQUk9KRUNUX0RJUikvRGVyaXZlZFNvdXJjZXMubWFrZQogJChQUk9KRUNUX0RJ
UikvS2V5d29yZExvb2t1cEdlbmVyYXRvci5weQogJChQUk9KRUNUX0RJUikvU2NyaXB0cy9VcGRh
dGVDb250ZW50cy5weQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0Rlcml2ZWRT
b3VyY2VzLm1ha2UgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvRGVyaXZlZFNvdXJjZXMubWFrZQpp
bmRleCA0ZWNhZTNmMDU5ODEzOThjYmY2M2E0Njc5ZWU4ZGZjZmViNDY4NmZhLi5kNTZlZTcxYzAy
MWRhYjBmMGJkYjFhY2I1OWIzNDA0YmQ4ZThkOGExIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj
cmlwdENvcmUvRGVyaXZlZFNvdXJjZXMubWFrZQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv
RGVyaXZlZFNvdXJjZXMubWFrZQpAQCAtMSw0ICsxLDQgQEAKLSMgQ29weXJpZ2h0IChDKSAyMDA2
LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIw
MDYtMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0
aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAog
IyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n
IGNvbmRpdGlvbnMKQEAgLTQ1LDggKzQ1LDkgQEAgRlJBTUVXT1JLX0ZMQUdTIDo9ICQoc2hlbGwg
ZWNobyAkKEJVSUxUX1BST0RVQ1RTX0RJUikgJChGUkFNRVdPUktfU0VBUkNIX1BBVEhTKQogSEVB
REVSX0ZMQUdTIDo9ICQoc2hlbGwgZWNobyAkKEJVSUxUX1BST0RVQ1RTX0RJUikgJChIRUFERVJf
U0VBUkNIX1BBVEhTKSAkKFNZU1RFTV9IRUFERVJfU0VBUkNIX1BBVEhTKSB8ICQoUEVSTCkgLWUg
J3ByaW50ICItSSIgLiBqb2luKCIgLUkiLCBzcGxpdCgiICIsIDw+KSk7JykKIEZFQVRVUkVfQU5E
X1BMQVRGT1JNX0RFRklORVMgOj0gJChzaGVsbCAkKENDKSAtc3RkPWdudSsrMXogLXggYysrIC1F
IC1QIC1kTSAkKFNES19GTEFHUykgJChUQVJHRVRfVFJJUExFX0ZMQUdTKSAkKEZSQU1FV09SS19G
TEFHUykgJChIRUFERVJfRkxBR1MpIC1pbmNsdWRlICJ3dGYvUGxhdGZvcm0uaCIgL2Rldi9udWxs
IHwgJChQRVJMKSAtbmUgInByaW50IGlmIHMvXCNkZWZpbmUgKChIQVZFX3xVU0VffEVOQUJMRV98
V1RGX1BMQVRGT1JNXylcdyspIDEvXDEvIikKIAotIyBGSVhNRTogVGhpcyBzaG91bGQgbGlzdCBQ
bGF0Zm9ybS5oIGFuZCBhbGwgdGhlIHRoaW5ncyBpdCBpbmNsdWRlcy4gQ291bGQgZG8gdGhhdCBi
eSB1c2luZyB0aGUgLU1EIGZsYWcgaW4gdGhlIENDIGxpbmUgYWJvdmUuCi1GRUFUVVJFX0FORF9Q
TEFURk9STV9ERUZJTkVfREVQRU5ERU5DSUVTID0gRGVyaXZlZFNvdXJjZXMubWFrZQorUExBVEZP
Uk1fSEVBREVSX0RJUiA6PSAkKHJlYWxwYXRoICQoQlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9j
YWwvaW5jbHVkZSkKK1BMQVRGT1JNX0hFQURFUl9ERVBFTkRFTkNJRVMgOj0gJChmaWx0ZXIgJChQ
TEFURk9STV9IRUFERVJfRElSKS8lLCQocmVhbHBhdGggJChzaGVsbCAkKENDKSAtc3RkPWdudSsr
MXogLXggYysrIC1NICQoU0RLX0ZMQUdTKSAkKFRBUkdFVF9UUklQTEVfRkxBR1MpICQoRlJBTUVX
T1JLX0ZMQUdTKSAkKEhFQURFUl9GTEFHUykgLWluY2x1ZGUgInd0Zi9QbGF0Zm9ybS5oIiAvZGV2
L251bGwgfCAkKFBFUkwpIC1lICJsb2NhbCBcJCQvOyBteSAoXCQkdGFyZ2V0LCBcJCRkZXBzKSA9
IHNwbGl0KC86LywgPD4pOyBwcmludCBzcGxpdCgvXFxcXC8sIFwkJGRlcHMpOyIpKSkKK0ZFQVRV
UkVfQU5EX1BMQVRGT1JNX0RFRklORV9ERVBFTkRFTkNJRVMgPSBEZXJpdmVkU291cmNlcy5tYWtl
ICQoUExBVEZPUk1fSEVBREVSX0RFUEVOREVOQ0lFUykKIAogIyAtLS0tLS0tLQogCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2pl
Y3QucGJ4cHJvaiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXBy
b2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDJmMWQyOTVlMmY0MWFkMTVhMjE0ZWRmYzcyOWIxZGUw
MzRlZDk2NjQuLjkyYmI0NGJkNzY4MDQzM2M4NzM5ZGUzZDA2NDJhM2U2Njc4NjkzNWQgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJv
amVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54
Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0xMTUwNyw2ICsxMTUwNyw3IEBACiAJCQlpbnB1
dEZpbGVMaXN0UGF0aHMgPSAoCiAJCQkpOwogCQkJaW5wdXRQYXRocyA9ICgKKwkJCQkiJChTUkNS
T09UKS9TY3JpcHRzL2NoZWNrLXhjZmlsZWxpc3RzLnNoIiwKIAkJCSk7CiAJCQluYW1lID0gIkNo
ZWNrIC54Y2ZpbGVsaXN0cyI7CiAJCQlvdXRwdXRGaWxlTGlzdFBhdGhzID0gKApAQCAtMTE2NjIs
NiArMTE2NjMsNyBAQAogCQkJCSIkKFNSQ1JPT1QpL0Rlcml2ZWRTb3VyY2VzLWlucHV0LnhjZmls
ZWxpc3QiLAogCQkJKTsKIAkJCWlucHV0UGF0aHMgPSAoCisJCQkJIiQoU1JDUk9PVCkvU2NyaXB0
cy9nZW5lcmF0ZS1kZXJpdmVkLXNvdXJjZXMuc2giLAogCQkJKTsKIAkJCW5hbWUgPSAiR2VuZXJh
dGUgRGVyaXZlZCBTb3VyY2VzIjsKIAkJCW91dHB1dEZpbGVMaXN0UGF0aHMgPSAoCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9EZXJpdmVkU291cmNlcy1pbnB1dC54Y2ZpbGVsaXN0IGIvU291
cmNlL1dlYkNvcmUvRGVyaXZlZFNvdXJjZXMtaW5wdXQueGNmaWxlbGlzdAppbmRleCBmM2NlZWNk
NDhkOTk1ZWIzNzI2MmJkZjM0MjQ2ZjlkOGQ2ZDNiNTIyLi4xZTllMTdjMmMxYTg0NDkyNDcwZjRi
ZDRjYzZhNWM2Y2ZkNzM1MDdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9EZXJpdmVkU291
cmNlcy1pbnB1dC54Y2ZpbGVsaXN0CisrKyBiL1NvdXJjZS9XZWJDb3JlL0Rlcml2ZWRTb3VyY2Vz
LWlucHV0LnhjZmlsZWxpc3QKQEAgLTEsNCArMSwxNyBAQAogIyBUaGlzIGZpbGUgaXMgZ2VuZXJh
dGVkIGJ5IHRoZSBnZW5lcmF0ZS14Y2ZpbGVsaXN0cyBzY3JpcHQuCiskKEJVSUxUX1BST0RVQ1RT
X0RJUikvdXNyL2xvY2FsL2luY2x1ZGUvV2ViS2l0QWRkaXRpb25zL0FkZGl0aW9uYWxGZWF0dXJl
RGVmaW5lcy5oCiskKEJVSUxUX1BST0RVQ1RTX0RJUikvdXNyL2xvY2FsL2luY2x1ZGUvYm1hbGxv
Yy9CQ29tcGlsZXIuaAorJChCVUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL2Jt
YWxsb2MvQlBsYXRmb3JtLmgKKyQoQlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVk
ZS93dGYvQ29tcGlsZXIuaAorJChCVUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRl
L3d0Zi9QbGF0Zm9ybS5oCiskKEJVSUxUX1BST0RVQ1RTX0RJUikvdXNyL2xvY2FsL2luY2x1ZGUv
d3RmL1BsYXRmb3JtQ1BVLmgKKyQoQlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVk
ZS93dGYvUGxhdGZvcm1DYWxsaW5nQ29udmVudGlvbnMuaAorJChCVUlMVF9QUk9EVUNUU19ESVIp
L3Vzci9sb2NhbC9pbmNsdWRlL3d0Zi9QbGF0Zm9ybUVuYWJsZS5oCiskKEJVSUxUX1BST0RVQ1RT
X0RJUikvdXNyL2xvY2FsL2luY2x1ZGUvd3RmL1BsYXRmb3JtRW5hYmxlQ29jb2EuaAorJChCVUlM
VF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL3d0Zi9QbGF0Zm9ybUhhdmUuaAorJChC
VUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL3d0Zi9QbGF0Zm9ybUxlZ2FjeS5o
CiskKEJVSUxUX1BST0RVQ1RTX0RJUikvdXNyL2xvY2FsL2luY2x1ZGUvd3RmL1BsYXRmb3JtT1Mu
aAorJChCVUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL3d0Zi9QbGF0Zm9ybVVz
ZS5oCiAkKEJVSUxUX1BST0RVQ1RTX0RJUikvdXNyL2xvY2FsL2luY2x1ZGUvd3RmL1NjcmlwdHMv
UHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXMueWFtbAogJChCVUlMVF9QUk9EVUNUU19ESVIpL3Vz
ci9sb2NhbC9pbmNsdWRlL3d0Zi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzRGVi
dWcueWFtbAogJChCVUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL3d0Zi9TY3Jp
cHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzRXhwZXJpbWVudGFsLnlhbWwKQEAgLTE1OCw2
ICsxNzEsNyBAQCAkKFBST0pFQ1RfRElSKS9Nb2R1bGVzL1dlYkdQVS9HUFVWZXJ0ZXhTdGF0ZS5p
ZGwKICQoUFJPSkVDVF9ESVIpL01vZHVsZXMvV2ViR1BVL0dQVVZlcnRleFN0ZXBNb2RlLmlkbAog
JChQUk9KRUNUX0RJUikvTW9kdWxlcy9XZWJHUFUvTmF2aWdhdG9yR1BVLmlkbAogJChQUk9KRUNU
X0RJUikvTW9kdWxlcy9haXJwbGF5L1dlYktpdFBsYXliYWNrVGFyZ2V0QXZhaWxhYmlsaXR5RXZl
bnQuaWRsCiskKFBST0pFQ1RfRElSKS9Nb2R1bGVzL2FwcGxlcGF5LWFtcy11aS9BcHBsZVBheUFN
U1VJUmVxdWVzdC5pZGwKICQoUFJPSkVDVF9ESVIpL01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlD
YW5jZWxFdmVudC5pZGwKICQoUFJPSkVDVF9ESVIpL01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlD
b250YWN0RmllbGQuaWRsCiAkKFBST0pFQ1RfRElSKS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5
Q291cG9uQ29kZUNoYW5nZWRFdmVudC5pZGwKQEAgLTIwNSw3ICsyMTksNiBAQCAkKFBST0pFQ1Rf
RElSKS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2hpcHBpbmdNZXRob2RVcGRhdGUuaWRsCiAk
KFBST0pFQ1RfRElSKS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5VmFsaWRhdGVNZXJjaGFudEV2
ZW50LmlkbAogJChQUk9KRUNUX0RJUikvTW9kdWxlcy9hcHBsZXBheS9wYXltZW50cmVxdWVzdC9B
cHBsZVBheU1vZGlmaWVyLmlkbAogJChQUk9KRUNUX0RJUikvTW9kdWxlcy9hcHBsZXBheS9wYXlt
ZW50cmVxdWVzdC9BcHBsZVBheVJlcXVlc3QuaWRsCi0kKFBST0pFQ1RfRElSKS9Nb2R1bGVzL2Fw
cGxlcGF5LWFtcy11aS9BcHBsZVBheUFNU1VJUmVxdWVzdC5pZGwKICQoUFJPSkVDVF9ESVIpL01v
ZHVsZXMvYXN5bmMtY2xpcGJvYXJkL0NsaXBib2FyZC5pZGwKICQoUFJPSkVDVF9ESVIpL01vZHVs
ZXMvYXN5bmMtY2xpcGJvYXJkL0NsaXBib2FyZEl0ZW0uaWRsCiAkKFBST0pFQ1RfRElSKS9Nb2R1
bGVzL2FzeW5jLWNsaXBib2FyZC9OYXZpZ2F0b3IrQ2xpcGJvYXJkLmlkbApkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvRGVyaXZlZFNvdXJjZXMubWFrZSBiL1NvdXJjZS9XZWJDb3JlL0Rlcml2
ZWRTb3VyY2VzLm1ha2UKaW5kZXggZjg4ZTYzOWI5ZDc0YjlkZDU0NDhjZWQ5OTE4MWMwZGYwZjUy
ODE0NC4uMTRiNzFlZDExNTk0NWFhZWJmMTJhZTViODNhYmNmZWMxZWQ3M2ViNiAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvRGVyaXZlZFNvdXJjZXMubWFrZQorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9EZXJpdmVkU291cmNlcy5tYWtlCkBAIC00Nyw4ICs0Nyw5IEBAIEZSQU1FV09SS19GTEFHUyA6
PSAkKHNoZWxsIGVjaG8gJChCVUlMVF9QUk9EVUNUU19ESVIpICQoRlJBTUVXT1JLX1NFQVJDSF9Q
QVRIUykKIEhFQURFUl9GTEFHUyA6PSAkKHNoZWxsIGVjaG8gJChCVUlMVF9QUk9EVUNUU19ESVIp
ICQoSEVBREVSX1NFQVJDSF9QQVRIUykgJChTWVNURU1fSEVBREVSX1NFQVJDSF9QQVRIUykgfCAk
KFBFUkwpIC1lICdwcmludCAiLUkiIC4gam9pbigiIC1JIiwgc3BsaXQoIiAiLCA8PikpOycpCiBG
RUFUVVJFX0FORF9QTEFURk9STV9ERUZJTkVTIDo9ICQoc2hlbGwgJChDQykgLXN0ZD1nbnUrKzF6
IC14IGMrKyAtRSAtUCAtZE0gJChTREtfRkxBR1MpICQoVEFSR0VUX1RSSVBMRV9GTEFHUykgJChG
UkFNRVdPUktfRkxBR1MpICQoSEVBREVSX0ZMQUdTKSAtaW5jbHVkZSAid3RmL1BsYXRmb3JtLmgi
IC9kZXYvbnVsbCB8ICQoUEVSTCkgLW5lICJwcmludCBpZiBzL1wjZGVmaW5lICgoSEFWRV98VVNF
X3xFTkFCTEVffFdURl9QTEFURk9STV8pXHcrKSAxL1wxLyIpCiAKLSMgRklYTUU6IFRoaXMgc2hv
dWxkIGxpc3QgUGxhdGZvcm0uaCBhbmQgYWxsIHRoZSB0aGluZ3MgaXQgaW5jbHVkZXMuIENvdWxk
IGRvIHRoYXQgYnkgdXNpbmcgdGhlIC1NRCBmbGFnIGluIHRoZSBDQyBsaW5lIGFib3ZlLgotRkVB
VFVSRV9BTkRfUExBVEZPUk1fREVGSU5FX0RFUEVOREVOQ0lFUyA9ICQoV2ViQ29yZSkvRGVyaXZl
ZFNvdXJjZXMubWFrZQorUExBVEZPUk1fSEVBREVSX0RJUiA6PSAkKHJlYWxwYXRoICQoQlVJTFRf
UFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVkZSkKK1BMQVRGT1JNX0hFQURFUl9ERVBFTkRF
TkNJRVMgOj0gJChmaWx0ZXIgJChQTEFURk9STV9IRUFERVJfRElSKS8lLCQocmVhbHBhdGggJChz
aGVsbCAkKENDKSAtc3RkPWdudSsrMXogLXggYysrIC1NICQoU0RLX0ZMQUdTKSAkKFRBUkdFVF9U
UklQTEVfRkxBR1MpICQoRlJBTUVXT1JLX0ZMQUdTKSAkKEhFQURFUl9GTEFHUykgLWluY2x1ZGUg
Ind0Zi9QbGF0Zm9ybS5oIiAvZGV2L251bGwgfCAkKFBFUkwpIC1lICJsb2NhbCBcJCQvOyBteSAo
XCQkdGFyZ2V0LCBcJCRkZXBzKSA9IHNwbGl0KC86LywgPD4pOyBwcmludCBzcGxpdCgvXFxcXC8s
IFwkJGRlcHMpOyIpKSkKK0ZFQVRVUkVfQU5EX1BMQVRGT1JNX0RFRklORV9ERVBFTkRFTkNJRVMg
PSAkKFdlYkNvcmUpL0Rlcml2ZWRTb3VyY2VzLm1ha2UgJChQTEFURk9STV9IRUFERVJfREVQRU5E
RU5DSUVTKQogCiAjIC0tLS0tLS0tCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNv
cmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNv
ZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA5OTgxMGViODIwM2NjZGE2YjVjOWUzODE2MTRi
NjJiZTZlZjJhMWNjLi4xOTg4ZGM0MDdhNmRhYmZhNDk1MzVhZTM3M2MxNzQ0ZDU2M2Y5N2NjIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy
b2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q
CkBAIC0zNzI3MCw2ICszNzI3MCw3IEBACiAJCQlpbnB1dEZpbGVMaXN0UGF0aHMgPSAoCiAJCQkp
OwogCQkJaW5wdXRQYXRocyA9ICgKKwkJCQkiJChTUkNST09UKS9TY3JpcHRzL2NoZWNrLXhjZmls
ZWxpc3RzLnNoIiwKIAkJCSk7CiAJCQluYW1lID0gIkNoZWNrIC54Y2ZpbGVsaXN0cyI7CiAJCQlv
dXRwdXRGaWxlTGlzdFBhdGhzID0gKApAQCAtMzczNjksNiArMzczNzAsNyBAQAogCQkJCSIkKFdL
X1dFQkNPUkVfREVSSVZFRFNPVVJDRVNfSU5QVVRfWENGSUxFTElTVF9BRERJVElPTlMpIiwKIAkJ
CSk7CiAJCQlpbnB1dFBhdGhzID0gKAorCQkJCSIkKFNSQ1JPT1QpL1NjcmlwdHMvZ2VuZXJhdGUt
ZGVyaXZlZC1zb3VyY2VzLnNoIiwKIAkJCSk7CiAJCQluYW1lID0gIkdlbmVyYXRlIERlcml2ZWQg
U291cmNlcyI7CiAJCQlvdXRwdXRGaWxlTGlzdFBhdGhzID0gKAo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>444689</attachid>
            <date>2021-11-18 09:11:35 -0800</date>
            <delta_ts>2021-11-18 11:31:01 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-233304-20211118091134.patch</filename>
            <type>text/plain</type>
            <size>12034</size>
            <attacher name="David Kilzer (:ddkilzer)">ddkilzer</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh
MTM1NWUwY2NjYjcyYWRjZTAyYjc0YTAxMzZjOGMwZjIwZTEyNjIzLi42NTdhODEzZWI1NzM3YzQ3
ZmMzNDY4NWNmYWEyMjQxZjY4NDM2OWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyOSBAQAorMjAyMS0xMS0xOCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29t
PgorCisgICAgICAgIEFkZCBtaXNzaW5nIGRlcGVuZGVuY2llcyBmb3IgPHd0Zi9QbGF0Zm9ybS5o
PiB3aGVuIGdlbmVyYXRpbmcgZGVyaXZlZCBzb3VyY2VzCisgICAgICAgIDxodHRwczovL3dlYmtp
dC5vcmcvYi8yMzMzMDQ+CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NTUzMzI0NT4KKworICAg
ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICAqIEphdmFTY3JpcHRDb3Jl
Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgIChEZXJpdmVkIFNvdXJjZXMgOiBH
ZW5lcmF0ZSBEZXJpdmVkIFNvdXJjZXMpOgorICAgICAgICAtIEFkZCBhbiBpbnB1dCBkZXBlbmRl
bmN5IG9uIHRoZSBzY3JpcHQgcnVuIGZyb20gdGhlIGJ1aWxkIHBoYXNlCisgICAgICAgICAgc2Ny
aXB0LgorCisgICAgICAgICogRGVyaXZlZFNvdXJjZXMtaW5wdXQueGNmaWxlbGlzdDoKKyAgICAg
ICAgLSBVcGRhdGUgYWZ0ZXIgY2hhbmdlcyB0byBEZXJpdmVkU291cmVzLm1ha2UuICBXZWJLaXQg
aGVhZGVycworICAgICAgICAgIGluY2x1ZGVkIGJ5IDx3dGYvUGxhdGZvcm0uaD4gYXJlIG5vdyBs
aXN0ZWQuCisgICAgICAgICogRGVyaXZlZFNvdXJjZXMubWFrZToKKyAgICAgICAgKHBsYXRmb3Jt
X2hfY29tcGlsZXJfY29tbWFuZCk6IEFkZC4KKyAgICAgICAgKEZFQVRVUkVfQU5EX1BMQVRGT1JN
X0RFRklORVMpOgorICAgICAgICAtIEV4dHJhY3QgY29tcGlsZXIgY29tbWFuZCBpbnRvIGEgY2Fs
bCByb3V0aW5lIGZvciByZXVzZS4KKyAgICAgICAgKFBMQVRGT1JNX0hFQURFUl9ESVIpOiBBZGQu
CisgICAgICAgIChQTEFURk9STV9IRUFERVJfREVQRU5ERU5DSUVTKTogQWRkLgorICAgICAgICAo
RkVBVFVSRV9BTkRfUExBVEZPUk1fREVGSU5FX0RFUEVOREVOQ0lFUyk6CisgICAgICAgIC0gR2Vu
ZXJhdGUgYSBtYWtlZmlsZSBkZXBlbmRlbmN5IGxpc3QgZm9yIDx3dGYvUGxhdGZvcm0uaD4sIHRo
ZW4KKyAgICAgICAgICBmaWx0ZXIgaXQgdG8gbGlzdCBvbmx5IFdlYktpdCBwcm9qZWN0IGhlYWRl
cnMuCisKIDIwMjEtMTEtMTQgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAog
ICAgICAgICBbSlNDXSBVc2UgQ2FsbExpbmtJbmZvIGluIExMSW50CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWNk
YTliZWE5N2VmZmY2MDJhNjI3OGNjMjY2YzQ5NDNmMGQ5NGFlZS4uZTBhZThmZjIzNzIzMjk2ZTUw
YTYxMjYwN2VlOGNmYjIyYTRhOTU2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl
TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIx
LTExLTE4ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRk
IG1pc3NpbmcgZGVwZW5kZW5jaWVzIGZvciA8d3RmL1BsYXRmb3JtLmg+IHdoZW4gZ2VuZXJhdGlu
ZyBkZXJpdmVkIHNvdXJjZXMKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIzMzMwND4K
KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg1NTMzMjQ1PgorCisgICAgICAgIFJldmlld2VkIGJ5
IERhcmluIEFkbGVyLgorCisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw
cm9qOgorICAgICAgICAoRGVyaXZlZCBTb3VyY2VzIDogR2VuZXJhdGUgRGVyaXZlZCBTb3VyY2Vz
KToKKyAgICAgICAgLSBBZGQgYW4gaW5wdXQgZGVwZW5kZW5jeSBvbiB0aGUgc2NyaXB0IHJ1biBm
cm9tIHRoZSBidWlsZCBwaGFzZQorICAgICAgICAgIHNjcmlwdC4KKworICAgICAgICAqIERlcml2
ZWRTb3VyY2VzLWlucHV0LnhjZmlsZWxpc3Q6CisgICAgICAgIC0gVXBkYXRlIGFmdGVyIGNoYW5n
ZXMgdG8gRGVyaXZlZFNvdXJlcy5tYWtlLiAgV2ViS2l0IGhlYWRlcnMKKyAgICAgICAgICBpbmNs
dWRlZCBieSA8d3RmL1BsYXRmb3JtLmg+IGFyZSBub3cgbGlzdGVkLgorICAgICAgICAqIERlcml2
ZWRTb3VyY2VzLm1ha2U6CisgICAgICAgIChwbGF0Zm9ybV9oX2NvbXBpbGVyX2NvbW1hbmQpOiBB
ZGQuCisgICAgICAgIChGRUFUVVJFX0FORF9QTEFURk9STV9ERUZJTkVTKToKKyAgICAgICAgLSBF
eHRyYWN0IGNvbXBpbGVyIGNvbW1hbmQgaW50byBhIGNhbGwgcm91dGluZSBmb3IgcmV1c2UuCisg
ICAgICAgIChQTEFURk9STV9IRUFERVJfRElSKTogQWRkLgorICAgICAgICAoUExBVEZPUk1fSEVB
REVSX0RFUEVOREVOQ0lFUyk6IEFkZC4KKyAgICAgICAgKEZFQVRVUkVfQU5EX1BMQVRGT1JNX0RF
RklORV9ERVBFTkRFTkNJRVMpOgorICAgICAgICAtIEdlbmVyYXRlIGEgbWFrZWZpbGUgZGVwZW5k
ZW5jeSBsaXN0IGZvciA8d3RmL1BsYXRmb3JtLmg+LCB0aGVuCisgICAgICAgICAgZmlsdGVyIGl0
IHRvIGxpc3Qgb25seSBXZWJLaXQgcHJvamVjdCBoZWFkZXJzLgorCiAyMDIxLTExLTE2ICBEYXZp
ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgRGlzYWJsZSBleHBlcmlt
ZW50YWwgd2ViIGZlYXR1cmVzIG9uIHBsYXRmb3JtcyB3aXRob3V0IFVJIHRvIGVuYWJsZSB0aGVt
CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvRGVyaXZlZFNvdXJjZXMtaW5wdXQu
eGNmaWxlbGlzdCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9EZXJpdmVkU291cmNlcy1pbnB1dC54
Y2ZpbGVsaXN0CmluZGV4IDc2ODEzMGIwYjcwM2VhZTIwNTYxODNhYjY4YTc0MzU2ZjI3N2Y4M2Qu
LjE1MzQ0OTY1ZDU1ZTFjMDE4NWIzZWQwNTFjMWQxMjlhMDI4Njc3ZTkgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9KYXZhU2NyaXB0Q29yZS9EZXJpdmVkU291cmNlcy1pbnB1dC54Y2ZpbGVsaXN0CisrKyBi
L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9EZXJpdmVkU291cmNlcy1pbnB1dC54Y2ZpbGVsaXN0CkBA
IC0xLDQgKzEsMTggQEAKICMgVGhpcyBmaWxlIGlzIGdlbmVyYXRlZCBieSB0aGUgZ2VuZXJhdGUt
eGNmaWxlbGlzdHMgc2NyaXB0LgorJChCVUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNs
dWRlL1dlYktpdEFkZGl0aW9ucy9BZGRpdGlvbmFsRmVhdHVyZURlZmluZXMuaAorJChCVUlMVF9Q
Uk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL1dlYktpdEFkZGl0aW9ucy9BZGRpdGlvbmFs
UGxhdGZvcm0uaAorJChCVUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL2JtYWxs
b2MvQkNvbXBpbGVyLmgKKyQoQlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVkZS9i
bWFsbG9jL0JQbGF0Zm9ybS5oCiskKEJVSUxUX1BST0RVQ1RTX0RJUikvdXNyL2xvY2FsL2luY2x1
ZGUvd3RmL0NvbXBpbGVyLmgKKyQoQlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVk
ZS93dGYvUGxhdGZvcm0uaAorJChCVUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRl
L3d0Zi9QbGF0Zm9ybUNQVS5oCiskKEJVSUxUX1BST0RVQ1RTX0RJUikvdXNyL2xvY2FsL2luY2x1
ZGUvd3RmL1BsYXRmb3JtQ2FsbGluZ0NvbnZlbnRpb25zLmgKKyQoQlVJTFRfUFJPRFVDVFNfRElS
KS91c3IvbG9jYWwvaW5jbHVkZS93dGYvUGxhdGZvcm1FbmFibGUuaAorJChCVUlMVF9QUk9EVUNU
U19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL3d0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmgKKyQoQlVJ
TFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVkZS93dGYvUGxhdGZvcm1IYXZlLmgKKyQo
QlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVkZS93dGYvUGxhdGZvcm1MZWdhY3ku
aAorJChCVUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL3d0Zi9QbGF0Zm9ybU9T
LmgKKyQoQlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVkZS93dGYvUGxhdGZvcm1V
c2UuaAogJChQUk9KRUNUX0RJUikvRGVyaXZlZFNvdXJjZXMubWFrZQogJChQUk9KRUNUX0RJUikv
S2V5d29yZExvb2t1cEdlbmVyYXRvci5weQogJChQUk9KRUNUX0RJUikvU2NyaXB0cy9VcGRhdGVD
b250ZW50cy5weQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0Rlcml2ZWRTb3Vy
Y2VzLm1ha2UgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvRGVyaXZlZFNvdXJjZXMubWFrZQppbmRl
eCA0ZWNhZTNmMDU5ODEzOThjYmY2M2E0Njc5ZWU4ZGZjZmViNDY4NmZhLi5kZWU3MzQ0ZTZiMTI2
MzViYTRmOTBkYzFmYWE5YzAwYmU0NjgyZDcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvRGVyaXZlZFNvdXJjZXMubWFrZQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvRGVy
aXZlZFNvdXJjZXMubWFrZQpAQCAtMSw0ICsxLDQgQEAKLSMgQ29weXJpZ2h0IChDKSAyMDA2LTIw
MjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMDYt
MjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9u
IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBt
b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv
bmRpdGlvbnMKQEAgLTQzLDEwICs0MywxNCBAQCBlbmRpZgogCiBGUkFNRVdPUktfRkxBR1MgOj0g
JChzaGVsbCBlY2hvICQoQlVJTFRfUFJPRFVDVFNfRElSKSAkKEZSQU1FV09SS19TRUFSQ0hfUEFU
SFMpICQoU1lTVEVNX0ZSQU1FV09SS19TRUFSQ0hfUEFUSFMpIHwgJChQRVJMKSAtZSAncHJpbnQg
Ii1GICIgLiBqb2luKCIgLUYgIiwgc3BsaXQoIiAiLCA8PikpOycpCiBIRUFERVJfRkxBR1MgOj0g
JChzaGVsbCBlY2hvICQoQlVJTFRfUFJPRFVDVFNfRElSKSAkKEhFQURFUl9TRUFSQ0hfUEFUSFMp
ICQoU1lTVEVNX0hFQURFUl9TRUFSQ0hfUEFUSFMpIHwgJChQRVJMKSAtZSAncHJpbnQgIi1JIiAu
IGpvaW4oIiAtSSIsIHNwbGl0KCIgIiwgPD4pKTsnKQotRkVBVFVSRV9BTkRfUExBVEZPUk1fREVG
SU5FUyA6PSAkKHNoZWxsICQoQ0MpIC1zdGQ9Z251KysxeiAteCBjKysgLUUgLVAgLWRNICQoU0RL
X0ZMQUdTKSAkKFRBUkdFVF9UUklQTEVfRkxBR1MpICQoRlJBTUVXT1JLX0ZMQUdTKSAkKEhFQURF
Ul9GTEFHUykgLWluY2x1ZGUgInd0Zi9QbGF0Zm9ybS5oIiAvZGV2L251bGwgfCAkKFBFUkwpIC1u
ZSAicHJpbnQgaWYgcy9cI2RlZmluZSAoKEhBVkVffFVTRV98RU5BQkxFX3xXVEZfUExBVEZPUk1f
KVx3KykgMS9cMS8iKQogCi0jIEZJWE1FOiBUaGlzIHNob3VsZCBsaXN0IFBsYXRmb3JtLmggYW5k
IGFsbCB0aGUgdGhpbmdzIGl0IGluY2x1ZGVzLiBDb3VsZCBkbyB0aGF0IGJ5IHVzaW5nIHRoZSAt
TUQgZmxhZyBpbiB0aGUgQ0MgbGluZSBhYm92ZS4KLUZFQVRVUkVfQU5EX1BMQVRGT1JNX0RFRklO
RV9ERVBFTkRFTkNJRVMgPSBEZXJpdmVkU291cmNlcy5tYWtlCitwbGF0Zm9ybV9oX2NvbXBpbGVy
X2NvbW1hbmQgPSAkKENDKSAtc3RkPWdudSsrMXogLXggYysrICQoMSkgJChTREtfRkxBR1MpICQo
VEFSR0VUX1RSSVBMRV9GTEFHUykgJChGUkFNRVdPUktfRkxBR1MpICQoSEVBREVSX0ZMQUdTKSAt
aW5jbHVkZSAid3RmL1BsYXRmb3JtLmgiIC9kZXYvbnVsbAorCitGRUFUVVJFX0FORF9QTEFURk9S
TV9ERUZJTkVTIDo9ICQoc2hlbGwgJChjYWxsIHBsYXRmb3JtX2hfY29tcGlsZXJfY29tbWFuZCwt
RSAtUCAtZE0pIHwgJChQRVJMKSAtbmUgInByaW50IGlmIHMvXCNkZWZpbmUgKChIQVZFX3xVU0Vf
fEVOQUJMRV98V1RGX1BMQVRGT1JNXylcdyspIDEvXDEvIikKKworUExBVEZPUk1fSEVBREVSX0RJ
UiA6PSAkKHJlYWxwYXRoICQoQlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVkZSkK
K1BMQVRGT1JNX0hFQURFUl9ERVBFTkRFTkNJRVMgOj0gJChmaWx0ZXIgJChQTEFURk9STV9IRUFE
RVJfRElSKS8lLCQocmVhbHBhdGggJChzaGVsbCAkKGNhbGwgcGxhdGZvcm1faF9jb21waWxlcl9j
b21tYW5kLC1NKSB8ICQoUEVSTCkgLWUgImxvY2FsIFwkJC87IG15IChcJCR0YXJnZXQsIFwkJGRl
cHMpID0gc3BsaXQoLzovLCA8Pik7IHByaW50IHNwbGl0KC9cXFxcLywgXCQkZGVwcyk7IikpKQor
RkVBVFVSRV9BTkRfUExBVEZPUk1fREVGSU5FX0RFUEVOREVOQ0lFUyA9IERlcml2ZWRTb3VyY2Vz
Lm1ha2UgJChQTEFURk9STV9IRUFERVJfREVQRU5ERU5DSUVTKQogCiAjIC0tLS0tLS0tCiAKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ov
cHJvamVjdC5wYnhwcm9qIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhj
b2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggMmYxZDI5NWUyZjQxYWQxNWEyMTRlZGZjNzI5
YjFkZTAzNGVkOTY2NC4uNTg1MmJjODUyZGE3N2I5OWQ1N2JiMjMyOWRmNTc3NzllMzk3MzhhNSAx
MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJv
ai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRD
b3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTExNjYyLDYgKzExNjYyLDcgQEAKIAkJ
CQkiJChTUkNST09UKS9EZXJpdmVkU291cmNlcy1pbnB1dC54Y2ZpbGVsaXN0IiwKIAkJCSk7CiAJ
CQlpbnB1dFBhdGhzID0gKAorCQkJCSIkKFNSQ1JPT1QpL1NjcmlwdHMvZ2VuZXJhdGUtZGVyaXZl
ZC1zb3VyY2VzLnNoIiwKIAkJCSk7CiAJCQluYW1lID0gIkdlbmVyYXRlIERlcml2ZWQgU291cmNl
cyI7CiAJCQlvdXRwdXRGaWxlTGlzdFBhdGhzID0gKApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvRGVyaXZlZFNvdXJjZXMtaW5wdXQueGNmaWxlbGlzdCBiL1NvdXJjZS9XZWJDb3JlL0Rlcml2
ZWRTb3VyY2VzLWlucHV0LnhjZmlsZWxpc3QKaW5kZXggZjNjZWVjZDQ4ZDk5NWViMzcyNjJiZGYz
NDI0NmY5ZDhkNmQzYjUyMi4uMWU5ZTE3YzJjMWE4NDQ5MjQ3MGY0YmQ0Y2M2YTVjNmNmZDczNTA3
ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvRGVyaXZlZFNvdXJjZXMtaW5wdXQueGNmaWxl
bGlzdAorKysgYi9Tb3VyY2UvV2ViQ29yZS9EZXJpdmVkU291cmNlcy1pbnB1dC54Y2ZpbGVsaXN0
CkBAIC0xLDQgKzEsMTcgQEAKICMgVGhpcyBmaWxlIGlzIGdlbmVyYXRlZCBieSB0aGUgZ2VuZXJh
dGUteGNmaWxlbGlzdHMgc2NyaXB0LgorJChCVUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9p
bmNsdWRlL1dlYktpdEFkZGl0aW9ucy9BZGRpdGlvbmFsRmVhdHVyZURlZmluZXMuaAorJChCVUlM
VF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL2JtYWxsb2MvQkNvbXBpbGVyLmgKKyQo
QlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVkZS9ibWFsbG9jL0JQbGF0Zm9ybS5o
CiskKEJVSUxUX1BST0RVQ1RTX0RJUikvdXNyL2xvY2FsL2luY2x1ZGUvd3RmL0NvbXBpbGVyLmgK
KyQoQlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVkZS93dGYvUGxhdGZvcm0uaAor
JChCVUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL3d0Zi9QbGF0Zm9ybUNQVS5o
CiskKEJVSUxUX1BST0RVQ1RTX0RJUikvdXNyL2xvY2FsL2luY2x1ZGUvd3RmL1BsYXRmb3JtQ2Fs
bGluZ0NvbnZlbnRpb25zLmgKKyQoQlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVk
ZS93dGYvUGxhdGZvcm1FbmFibGUuaAorJChCVUlMVF9QUk9EVUNUU19ESVIpL3Vzci9sb2NhbC9p
bmNsdWRlL3d0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmgKKyQoQlVJTFRfUFJPRFVDVFNfRElSKS91
c3IvbG9jYWwvaW5jbHVkZS93dGYvUGxhdGZvcm1IYXZlLmgKKyQoQlVJTFRfUFJPRFVDVFNfRElS
KS91c3IvbG9jYWwvaW5jbHVkZS93dGYvUGxhdGZvcm1MZWdhY3kuaAorJChCVUlMVF9QUk9EVUNU
U19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL3d0Zi9QbGF0Zm9ybU9TLmgKKyQoQlVJTFRfUFJPRFVD
VFNfRElSKS91c3IvbG9jYWwvaW5jbHVkZS93dGYvUGxhdGZvcm1Vc2UuaAogJChCVUlMVF9QUk9E
VUNUU19ESVIpL3Vzci9sb2NhbC9pbmNsdWRlL3d0Zi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlBy
ZWZlcmVuY2VzLnlhbWwKICQoQlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVkZS93
dGYvU2NyaXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVmZXJlbmNlc0RlYnVnLnlhbWwKICQoQlVJTFRf
UFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVkZS93dGYvU2NyaXB0cy9QcmVmZXJlbmNlcy9X
ZWJQcmVmZXJlbmNlc0V4cGVyaW1lbnRhbC55YW1sCkBAIC0xNTgsNiArMTcxLDcgQEAgJChQUk9K
RUNUX0RJUikvTW9kdWxlcy9XZWJHUFUvR1BVVmVydGV4U3RhdGUuaWRsCiAkKFBST0pFQ1RfRElS
KS9Nb2R1bGVzL1dlYkdQVS9HUFVWZXJ0ZXhTdGVwTW9kZS5pZGwKICQoUFJPSkVDVF9ESVIpL01v
ZHVsZXMvV2ViR1BVL05hdmlnYXRvckdQVS5pZGwKICQoUFJPSkVDVF9ESVIpL01vZHVsZXMvYWly
cGxheS9XZWJLaXRQbGF5YmFja1RhcmdldEF2YWlsYWJpbGl0eUV2ZW50LmlkbAorJChQUk9KRUNU
X0RJUikvTW9kdWxlcy9hcHBsZXBheS1hbXMtdWkvQXBwbGVQYXlBTVNVSVJlcXVlc3QuaWRsCiAk
KFBST0pFQ1RfRElSKS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5Q2FuY2VsRXZlbnQuaWRsCiAk
KFBST0pFQ1RfRElSKS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5Q29udGFjdEZpZWxkLmlkbAog
JChQUk9KRUNUX0RJUikvTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheUNvdXBvbkNvZGVDaGFuZ2Vk
RXZlbnQuaWRsCkBAIC0yMDUsNyArMjE5LDYgQEAgJChQUk9KRUNUX0RJUikvTW9kdWxlcy9hcHBs
ZXBheS9BcHBsZVBheVNoaXBwaW5nTWV0aG9kVXBkYXRlLmlkbAogJChQUk9KRUNUX0RJUikvTW9k
dWxlcy9hcHBsZXBheS9BcHBsZVBheVZhbGlkYXRlTWVyY2hhbnRFdmVudC5pZGwKICQoUFJPSkVD
VF9ESVIpL01vZHVsZXMvYXBwbGVwYXkvcGF5bWVudHJlcXVlc3QvQXBwbGVQYXlNb2RpZmllci5p
ZGwKICQoUFJPSkVDVF9ESVIpL01vZHVsZXMvYXBwbGVwYXkvcGF5bWVudHJlcXVlc3QvQXBwbGVQ
YXlSZXF1ZXN0LmlkbAotJChQUk9KRUNUX0RJUikvTW9kdWxlcy9hcHBsZXBheS1hbXMtdWkvQXBw
bGVQYXlBTVNVSVJlcXVlc3QuaWRsCiAkKFBST0pFQ1RfRElSKS9Nb2R1bGVzL2FzeW5jLWNsaXBi
b2FyZC9DbGlwYm9hcmQuaWRsCiAkKFBST0pFQ1RfRElSKS9Nb2R1bGVzL2FzeW5jLWNsaXBib2Fy
ZC9DbGlwYm9hcmRJdGVtLmlkbAogJChQUk9KRUNUX0RJUikvTW9kdWxlcy9hc3luYy1jbGlwYm9h
cmQvTmF2aWdhdG9yK0NsaXBib2FyZC5pZGwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0Rl
cml2ZWRTb3VyY2VzLm1ha2UgYi9Tb3VyY2UvV2ViQ29yZS9EZXJpdmVkU291cmNlcy5tYWtlCmlu
ZGV4IGY4OGU2MzliOWQ3NGI5ZGQ1NDQ4Y2VkOTkxODFjMGRmMGY1MjgxNDQuLjNjZjdkYzAwMzI5
NzNlMTNkN2Q2Y2QyOGI3ZDQwMDBjMzAzZjllMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L0Rlcml2ZWRTb3VyY2VzLm1ha2UKKysrIGIvU291cmNlL1dlYkNvcmUvRGVyaXZlZFNvdXJjZXMu
bWFrZQpAQCAtNDUsMTAgKzQ1LDE0IEBAIGVuZGlmCiAKIEZSQU1FV09SS19GTEFHUyA6PSAkKHNo
ZWxsIGVjaG8gJChCVUlMVF9QUk9EVUNUU19ESVIpICQoRlJBTUVXT1JLX1NFQVJDSF9QQVRIUykg
JChTWVNURU1fRlJBTUVXT1JLX1NFQVJDSF9QQVRIUykgfCAkKFBFUkwpIC1lICdwcmludCAiLUYg
IiAuIGpvaW4oIiAtRiAiLCBzcGxpdCgiICIsIDw+KSk7JykKIEhFQURFUl9GTEFHUyA6PSAkKHNo
ZWxsIGVjaG8gJChCVUlMVF9QUk9EVUNUU19ESVIpICQoSEVBREVSX1NFQVJDSF9QQVRIUykgJChT
WVNURU1fSEVBREVSX1NFQVJDSF9QQVRIUykgfCAkKFBFUkwpIC1lICdwcmludCAiLUkiIC4gam9p
bigiIC1JIiwgc3BsaXQoIiAiLCA8PikpOycpCi1GRUFUVVJFX0FORF9QTEFURk9STV9ERUZJTkVT
IDo9ICQoc2hlbGwgJChDQykgLXN0ZD1nbnUrKzF6IC14IGMrKyAtRSAtUCAtZE0gJChTREtfRkxB
R1MpICQoVEFSR0VUX1RSSVBMRV9GTEFHUykgJChGUkFNRVdPUktfRkxBR1MpICQoSEVBREVSX0ZM
QUdTKSAtaW5jbHVkZSAid3RmL1BsYXRmb3JtLmgiIC9kZXYvbnVsbCB8ICQoUEVSTCkgLW5lICJw
cmludCBpZiBzL1wjZGVmaW5lICgoSEFWRV98VVNFX3xFTkFCTEVffFdURl9QTEFURk9STV8pXHcr
KSAxL1wxLyIpCiAKLSMgRklYTUU6IFRoaXMgc2hvdWxkIGxpc3QgUGxhdGZvcm0uaCBhbmQgYWxs
IHRoZSB0aGluZ3MgaXQgaW5jbHVkZXMuIENvdWxkIGRvIHRoYXQgYnkgdXNpbmcgdGhlIC1NRCBm
bGFnIGluIHRoZSBDQyBsaW5lIGFib3ZlLgotRkVBVFVSRV9BTkRfUExBVEZPUk1fREVGSU5FX0RF
UEVOREVOQ0lFUyA9ICQoV2ViQ29yZSkvRGVyaXZlZFNvdXJjZXMubWFrZQorcGxhdGZvcm1faF9j
b21waWxlcl9jb21tYW5kID0gJChDQykgLXN0ZD1nbnUrKzF6IC14IGMrKyAkKDEpICQoU0RLX0ZM
QUdTKSAkKFRBUkdFVF9UUklQTEVfRkxBR1MpICQoRlJBTUVXT1JLX0ZMQUdTKSAkKEhFQURFUl9G
TEFHUykgLWluY2x1ZGUgInd0Zi9QbGF0Zm9ybS5oIiAvZGV2L251bGwKKworRkVBVFVSRV9BTkRf
UExBVEZPUk1fREVGSU5FUyA6PSAkKHNoZWxsICQoY2FsbCBwbGF0Zm9ybV9oX2NvbXBpbGVyX2Nv
bW1hbmQsLUUgLVAgLWRNKSB8ICQoUEVSTCkgLW5lICJwcmludCBpZiBzL1wjZGVmaW5lICgoSEFW
RV98VVNFX3xFTkFCTEVffFdURl9QTEFURk9STV8pXHcrKSAxL1wxLyIpCisKK1BMQVRGT1JNX0hF
QURFUl9ESVIgOj0gJChyZWFscGF0aCAkKEJVSUxUX1BST0RVQ1RTX0RJUikvdXNyL2xvY2FsL2lu
Y2x1ZGUpCitQTEFURk9STV9IRUFERVJfREVQRU5ERU5DSUVTIDo9ICQoZmlsdGVyICQoUExBVEZP
Uk1fSEVBREVSX0RJUikvJSwkKHJlYWxwYXRoICQoc2hlbGwgJChjYWxsIHBsYXRmb3JtX2hfY29t
cGlsZXJfY29tbWFuZCwtTSkgfCAkKFBFUkwpIC1lICJsb2NhbCBcJCQvOyBteSAoXCQkdGFyZ2V0
LCBcJCRkZXBzKSA9IHNwbGl0KC86LywgPD4pOyBwcmludCBzcGxpdCgvXFxcXC8sIFwkJGRlcHMp
OyIpKSkKK0ZFQVRVUkVfQU5EX1BMQVRGT1JNX0RFRklORV9ERVBFTkRFTkNJRVMgPSAkKFdlYkNv
cmUpL0Rlcml2ZWRTb3VyY2VzLm1ha2UgJChQTEFURk9STV9IRUFERVJfREVQRU5ERU5DSUVTKQog
CiAjIC0tLS0tLS0tCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVw
cm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3By
b2plY3QucGJ4cHJvagppbmRleCA5OTgxMGViODIwM2NjZGE2YjVjOWUzODE2MTRiNjJiZTZlZjJh
MWNjLi5lMzIxYThhODdmNjNkNDJkMDJlNzUzMTNlZDhhNzU0NThhY2VjYjNhIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIv
U291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0zNzM2
OSw2ICszNzM2OSw3IEBACiAJCQkJIiQoV0tfV0VCQ09SRV9ERVJJVkVEU09VUkNFU19JTlBVVF9Y
Q0ZJTEVMSVNUX0FERElUSU9OUykiLAogCQkJKTsKIAkJCWlucHV0UGF0aHMgPSAoCisJCQkJIiQo
U1JDUk9PVCkvU2NyaXB0cy9nZW5lcmF0ZS1kZXJpdmVkLXNvdXJjZXMuc2giLAogCQkJKTsKIAkJ
CW5hbWUgPSAiR2VuZXJhdGUgRGVyaXZlZCBTb3VyY2VzIjsKIAkJCW91dHB1dEZpbGVMaXN0UGF0
aHMgPSAoCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>