<?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>197934</bug_id>
          
          <creation_ts>2019-05-15 16:45:17 -0700</creation_ts>
          <short_desc>[CMake] Use builtin FindICU</short_desc>
          <delta_ts>2019-07-26 00:52:41 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>CMake</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=130064</see_also>
    
    <see_also>https://bugs.webkit.org/show_bug.cgi?id=200124</see_also>
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Don Olmstead">don.olmstead</reporter>
          <assigned_to name="Don Olmstead">don.olmstead</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>cturner</cc>
    
    <cc>fujii</cc>
    
    <cc>mcatanzaro</cc>
    
    <cc>ticaiolima</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1536662</commentid>
    <comment_count>0</comment_count>
    <who name="Don Olmstead">don.olmstead</who>
    <bug_when>2019-05-15 16:45:17 -0700</bug_when>
    <thetext>FindICU is present since CMake 3.7 https://cmake.org/cmake/help/v3.7/module/FindICU.html

Need to bump the version and it&apos;d be nice to make it an icu target.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1536694</commentid>
    <comment_count>1</comment_count>
      <attachid>370016</attachid>
    <who name="Don Olmstead">don.olmstead</who>
    <bug_when>2019-05-15 18:41:59 -0700</bug_when>
    <thetext>Created attachment 370016
WIP Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1536695</commentid>
    <comment_count>2</comment_count>
      <attachid>370016</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2019-05-15 18:52:24 -0700</bug_when>
    <thetext>Comment on attachment 370016
WIP Patch

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

&gt; CMakeLists.txt:5
&gt; -# NOTE: cmake_minimum_required() and project() *MUST* be the two fist commands
&gt; +# NOTE: cmake_minimum_required() and project() *MUST* be the two first commands

✊

&gt; Source/cmake/OptionsPlayStation.cmake:131
&gt; -set(WTF_LIBRARY_TYPE STATIC)
&gt; -set(JavaScriptCore_LIBRARY_TYPE STATIC)
&gt; -set(WebCore_LIBRARY_TYPE STATIC)
&gt; +set(WTF_LIBRARY_TYPE SHARED)
&gt; +set(JavaScriptCore_LIBRARY_TYPE SHARED)
&gt; +set(PAL_LIBRARY_TYPE SHARED)
&gt; +set(WebCore_LIBRARY_TYPE SHARED)

You&apos;re going a little wild here.

I agree with the end goal, of course. Especially with your experiment to switch from ICU_INCLUDE_DIRS/ICU_LIBRARIES to the build targets. But surely &quot;fundamentally change how the PlayStation port is linked&quot; is rather a lot to bury in a &quot;use the system FindICU&quot; patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1536827</commentid>
    <comment_count>3</comment_count>
      <attachid>370016</attachid>
    <who name="Don Olmstead">don.olmstead</who>
    <bug_when>2019-05-16 10:17:15 -0700</bug_when>
    <thetext>Comment on attachment 370016
WIP Patch

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

Thank you for the unexpected review. I wasn&apos;t sure if this would break the build for any ports so I just threw it at the bots. Apple ports can&apos;t use the find_package(ICU) so for those I manually have to create the targets. Will fix that and it looks like we&apos;re good to go.

&gt;&gt; CMakeLists.txt:5
&gt;&gt; +# NOTE: cmake_minimum_required() and project() *MUST* be the two first commands
&gt; 
&gt; ✊

Actually ✊✊

&gt;&gt; Source/cmake/OptionsPlayStation.cmake:131
&gt;&gt; +set(WebCore_LIBRARY_TYPE SHARED)
&gt; 
&gt; You&apos;re going a little wild here.
&gt; 
&gt; I agree with the end goal, of course. Especially with your experiment to switch from ICU_INCLUDE_DIRS/ICU_LIBRARIES to the build targets. But surely &quot;fundamentally change how the PlayStation port is linked&quot; is rather a lot to bury in a &quot;use the system FindICU&quot; patch.

Yea I&apos;m going to remove that. It slipped in when I was seeing how ICU::* was propagating. ${_target}_LIBRARIES are default PUBLIC which is something that should probably be changed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1537256</commentid>
    <comment_count>4</comment_count>
      <attachid>370152</attachid>
    <who name="Don Olmstead">don.olmstead</who>
    <bug_when>2019-05-17 14:30:05 -0700</bug_when>
    <thetext>Created attachment 370152
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1537272</commentid>
    <comment_count>5</comment_count>
      <attachid>370152</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2019-05-17 14:46:59 -0700</bug_when>
    <thetext>Comment on attachment 370152
Patch

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

This is beginning to look a lot like a better future.

More targets, please!

&gt; Source/cmake/target/icu.cmake:2
&gt; +# Apple ports provide their own ICU that can&apos;t be found by find_package(ICU).
&gt; +# This file will create targets that would be created by find_package(ICU).

Well, we removed a find module and grew... basically another find module? Anyway, it&apos;s fine.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1537364</commentid>
    <comment_count>6</comment_count>
      <attachid>370152</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-05-17 19:38:45 -0700</bug_when>
    <thetext>Comment on attachment 370152
Patch

Clearing flags on attachment: 370152

Committed r245492: &lt;https://trac.webkit.org/changeset/245492&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1537365</commentid>
    <comment_count>7</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-05-17 19:38:46 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1539270</commentid>
    <comment_count>8</comment_count>
    <who name="Caio Lima">ticaiolima</who>
    <bug_when>2019-05-26 10:21:17 -0700</bug_when>
    <thetext>After this change, I&apos;m not able to use `build-jsc --jsc-only` on macOS anymore. The output is:

```
CMake Error at Source/cmake/OptionsJSCOnly.cmake:102 (include):
  include could not find load file:

    target/icu.cmake
Call Stack (most recent call first):
  Source/cmake/WebKitCommon.cmake:56 (include)
  CMakeLists.txt:167 (include)
```

If I put the full path to include `target/icu.cmake`, the error is then:

```
+  cmake --build ~/webkit/WebKitBuild/Release --config Release -- jsc testb3 testair testapi testmasm testdfg -j12
ninja: error: &apos;libicucore.dylib&apos;, needed by &apos;bin/LLIntSettingsExtractor&apos;, missing and no known rule to make it
```</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552952</commentid>
    <comment_count>9</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2019-07-15 13:43:05 -0700</bug_when>
    <thetext>Hey Don, I think we&apos;re going to have to roll this out. Charlie discovered that CMake&apos;s FindICU.cmake isn&apos;t using pkg-config and is somehow not using the ICU from our jhbuild environment. So that&apos;s bad. We need it for consistent layout test results.

What we could do is bundle a modified copy of the upstream FindICU that still has the build targets?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1555348</commentid>
    <comment_count>10</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2019-07-24 07:13:01 -0700</bug_when>
    <thetext>(In reply to Michael Catanzaro from comment #9)
&gt; Hey Don, I think we&apos;re going to have to roll this out. Charlie discovered
&gt; that CMake&apos;s FindICU.cmake isn&apos;t using pkg-config and is somehow not using
&gt; the ICU from our jhbuild environment. So that&apos;s bad. We need it for
&gt; consistent layout test results.

We talked about setting some CMake variable that might fix this, but ultimately we should not be using any CMake find module that does not use pkg-config under the hood. That&apos;s silly and unsuitable for Linux. I know that CMake tries very hard in rolling its own custom dependency finding mechanism, but it has zero acceptance on Linux and I don&apos;t want to be using it.

But, I also don&apos;t want to roll this out, because the upstream FindICU does have real nice targets that simplified our build significantly.

Suggestions:
 
 - Just copy the upstream FindICU into our tree, and add back the pkg-config goodness? (easy)
 - Ban use of find modules altogether and just use pkg_check_modules directly everywhere. (harder but best for Linux IMO)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1555445</commentid>
    <comment_count>11</comment_count>
    <who name="Don Olmstead">don.olmstead</who>
    <bug_when>2019-07-24 11:51:39 -0700</bug_when>
    <thetext>I’m not familiar with pkg-config since it doesn’t really work right for Windows. ICU doesn’t have any dependencies though. I’m also not sure why you all aren’t pointing things at the jhbuild directories to search for dependencies like Windows and PlayStation does.

I’d like to use targets throughout WebKit. The problem is that CMake introduced a lot of targets after the version of CMake required for GTK/WPE.

I’m not totally opposed to checking in a modified version of the Find modules within CMake BUT I would prefer we change things upstream before landing in WebKit. I don’t know if there’s any reason why ICU doesn’t do any pkg-config. Could be an oversight or it could be purposeful.

Just my 2 cents on this issue.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1555447</commentid>
    <comment_count>12</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2019-07-24 12:02:45 -0700</bug_when>
    <thetext>(In reply to Don Olmstead from comment #11)
&gt; I’m not familiar with pkg-config since it doesn’t really work right for
&gt; Windows. ICU doesn’t have any dependencies though. I’m also not sure why you
&gt; all aren’t pointing things at the jhbuild directories to search for
&gt; dependencies like Windows and PlayStation does.

jhbuild sets PKG_CONFIG_PATH and LD_LIBRARY_PATH which suffices for everything we&apos;ve ever tried to build, until now. FindICU.cmake seems to be the first find module we have that ignores these standard environment variables. Or, at least, now is the first time we&apos;ve noticed the problem.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1555639</commentid>
    <comment_count>13</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2019-07-24 19:24:37 -0700</bug_when>
    <thetext>(In reply to Don Olmstead from comment #11)
&gt; BUT I would prefer we change things upstream before
&gt; landing in WebKit. I don’t know if there’s any reason why ICU doesn’t do any
&gt; pkg-config. Could be an oversight or it could be purposeful.

I think CMake wouldn&apos;t accept such change because pkg-config is not widely used among platforms CMake supports.
Instead, CMake take CMAKE_PREFIX_PATH into account.

jhbuild sets JHBUILD_PREFIX env var. What about the idea setting CMAKE_PREFIX_PATH based on JHBUILD_PREFIX?

file(TO_CMAKE_PATH $ENV{JHBUILD_PREFIX} CMAKE_PREFIX_PATH)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1555667</commentid>
    <comment_count>14</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2019-07-24 20:12:48 -0700</bug_when>
    <thetext>Hm. jhbuild should surely do that itself if required. (No problem: we can change jhbuild.)

I wonder if this is only a problem for build-webkit because this is the only situation where you would be compiling with jhbuild but not installing into the jhbuild prefix, right? It&apos;s kinda weird that build-webkit does not set any installation directories, but that&apos;s because the built product is not intended to ever be installed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1555685</commentid>
    <comment_count>15</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2019-07-24 20:56:21 -0700</bug_when>
    <thetext>(In reply to Michael Catanzaro from comment #14)
&gt; Hm. jhbuild should surely do that itself if required. (No problem: we can
&gt; change jhbuild.)

I don&apos;t think we should change jhbuild.
Indeed, jhbuild does right. jhbuild sets CMAKE_INSTALL_PREFIX for cmake modules.
https://github.com/GNOME/jhbuild/blob/dde410486ce3af6cb4cc7e7ffad21a6b2ef7f4c7/jhbuild/modtypes/cmake.py#L97

Setting CMAKE_INSTALL_PREFIX also suffices.
https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX.html

&gt; I wonder if this is only a problem for build-webkit because this is the only
&gt; situation where you would be compiling with jhbuild but not installing into
&gt; the jhbuild prefix, right? It&apos;s kinda weird that build-webkit does not set
&gt; any installation directories, but that&apos;s because the built product is not
&gt; intended to ever be installed.

Right.
So, you mean build-webkit should invoke cmake with setting CMAKE_PREFIX_PATH or CMAKE_INSTALL_PREFIX if shouldUseJhbuild() is true, right?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1555760</commentid>
    <comment_count>16</comment_count>
    <who name="Charlie Turner">cturner</who>
    <bug_when>2019-07-25 04:57:13 -0700</bug_when>
    <thetext>FTR what I do to fix this issue is,

    jhbuild -f $JHBUILDRC -m $JHBUILD_MODULES run  \
	  env ICU_ROOT=$THE_JHBUILD_PREFIX cmake ...

And I get the ICU version built inside the jhbuild. The approach of extending the CMAKE_PREFIX_PATH with JHBUILD_PREFIX seems like a better idea..</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1555765</commentid>
    <comment_count>17</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2019-07-25 06:31:14 -0700</bug_when>
    <thetext>(In reply to Fujii Hironori from comment #15)
&gt; So, you mean build-webkit should invoke cmake with setting CMAKE_PREFIX_PATH
&gt; or CMAKE_INSTALL_PREFIX if shouldUseJhbuild() is true, right?

Yes. I guess CMAKE_PREFIX_PATH, because the build result is not intended to be installed. And... I suppose that would do it. Charlie, willing to test a patch?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1555767</commentid>
    <comment_count>18</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2019-07-25 06:39:02 -0700</bug_when>
    <thetext>Hm, it&apos;s already set since r165452, but as an environment variable.

Can CMake variables be set as environment variables? I think it&apos;s not working because I don&apos;t see CMAKE_PREFIX_PATH set in my CMakeCache.txt.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1555776</commentid>
    <comment_count>19</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2019-07-25 07:33:38 -0700</bug_when>
    <thetext>Let&apos;s continue in bug #200124.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1555779</commentid>
    <comment_count>20</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2019-07-25 07:57:06 -0700</bug_when>
    <thetext>Well, reopening. I tried this little patch:

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 1374b4b3f2d..dc5be704897 100755
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -2220,6 +2220,11 @@ sub generateBuildSystemFromCMakeProject
     my @args;
     push @args, &quot;-DPORT=\&quot;$port\&quot;&quot;;
     push @args, &quot;-DCMAKE_INSTALL_PREFIX=\&quot;$prefixPath\&quot;&quot; if $prefixPath;
+    if (shouldUseJhbuild()) {
+        my $jhbuildPath = getJhbuildPath();
+        push @args, &quot;-DCMAKE_PREFIX_PATH=\&quot;$jhbuildPath\&quot;&quot;;
+        push @args, &quot;-DCMAKE_LIBRARY_PATH=\&quot;$jhbuildPath/lib\&quot;&quot;;
+    }
     push @args, &quot;-DCMAKE_EXPORT_COMPILE_COMMANDS=ON&quot;;
     if ($config =~ /release/i) {
         push @args, &quot;-DCMAKE_BUILD_TYPE=Release&quot;;
diff --git a/Tools/jhbuild/jhbuildrc_common.py b/Tools/jhbuild/jhbuildrc_common.py
index 61dfa7ec48e..dafd277623f 100644
--- a/Tools/jhbuild/jhbuildrc_common.py
+++ b/Tools/jhbuild/jhbuildrc_common.py
@@ -78,10 +78,6 @@ def init(jhbuildrc_globals, jhbuild_platform):
         addpath(&apos;PKG_CONFIG_PATH&apos;, os.path.join(libdir, &apos;pkgconfig&apos;))
     addpath(&apos;PKG_CONFIG_PATH&apos;, os.path.join(os.sep, &apos;usr&apos;, &apos;share&apos;, &apos;pkgconfig&apos;))
 
-    prefix = jhbuildrc_globals[&apos;prefix&apos;]
-    addpath(&apos;CMAKE_PREFIX_PATH&apos;, prefix)
-    addpath(&apos;CMAKE_LIBRARY_PATH&apos;, os.path.join(prefix, &apos;lib&apos;))
-
     if &apos;JHBUILD_MIRROR&apos; in os.environ:
         jhbuildrc_globals[&apos;dvcs_mirror_dir&apos;] = os.environ[&apos;JHBUILD_MIRROR&apos;]
         jhbuildrc_globals[&apos;tarballdir&apos;] = os.environ[&apos;JHBUILD_MIRROR&apos;]


But it&apos;s not enough:

//ICU data library (debug)
ICU_DATA_LIBRARY_DEBUG:FILEPATH=ICU_DATA_LIBRARY_DEBUG-NOTFOUND

//ICU data library (release)
ICU_DATA_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libicudata.so

//ICU derb executable
ICU_DERB_EXECUTABLE:FILEPATH=/home/mcatanzaro/Projects/WebKit/WebKitBuild/DependenciesGTK/Root/bin/derb

//ICU genbrk executable
ICU_GENBRK_EXECUTABLE:FILEPATH=/home/mcatanzaro/Projects/WebKit/WebKitBuild/DependenciesGTK/Root/bin/genbrk

//ICU genccode executable
ICU_GENCCODE_EXECUTABLE:FILEPATH=ICU_GENCCODE_EXECUTABLE-NOTFOUND

//ICU gencfu executable
ICU_GENCFU_EXECUTABLE:FILEPATH=/home/mcatanzaro/Projects/WebKit/WebKitBuild/DependenciesGTK/Root/bin/gencfu

//ICU gencmn executable
ICU_GENCMN_EXECUTABLE:FILEPATH=ICU_GENCMN_EXECUTABLE-NOTFOUND

//ICU gencnval executable
ICU_GENCNVAL_EXECUTABLE:FILEPATH=/home/mcatanzaro/Projects/WebKit/WebKitBuild/DependenciesGTK/Root/bin/gencnval

//ICU gendict executable
ICU_GENDICT_EXECUTABLE:FILEPATH=/home/mcatanzaro/Projects/WebKit/WebKitBuild/DependenciesGTK/Root/bin/gendict

//ICU gennorm2 executable
ICU_GENNORM2_EXECUTABLE:FILEPATH=ICU_GENNORM2_EXECUTABLE-NOTFOUND

//ICU genrb executable
ICU_GENRB_EXECUTABLE:FILEPATH=/home/mcatanzaro/Projects/WebKit/WebKitBuild/DependenciesGTK/Root/bin/genrb

//ICU gensprep executable
ICU_GENSPREP_EXECUTABLE:FILEPATH=ICU_GENSPREP_EXECUTABLE-NOTFOUND

//ICU i18n library (debug)
ICU_I18N_LIBRARY_DEBUG:FILEPATH=ICU_I18N_LIBRARY_DEBUG-NOTFOUND

//ICU i18n library (release)
ICU_I18N_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libicui18n.so

//ICU icu-config executable
ICU_ICU-CONFIG_EXECUTABLE:FILEPATH=/home/mcatanzaro/Projects/WebKit/WebKitBuild/DependenciesGTK/Root/bin/icu-config

//ICU icuinfo executable
ICU_ICUINFO_EXECUTABLE:FILEPATH=/home/mcatanzaro/Projects/WebKit/WebKitBuild/DependenciesGTK/Root/bin/icuinfo

//ICU icupkg executable
ICU_ICUPKG_EXECUTABLE:FILEPATH=ICU_ICUPKG_EXECUTABLE-NOTFOUND

//ICU include directory
ICU_INCLUDE_DIR:PATH=/usr/include

//ICU makeconv executable
ICU_MAKECONV_EXECUTABLE:FILEPATH=/home/mcatanzaro/Projects/WebKit/WebKitBuild/DependenciesGTK/Root/bin/makeconv

//ICU Makefile.inc data file
ICU_MAKEFILE_INC:FILEPATH=/usr/lib64/icu/63.2/Makefile.inc

//ICU pkgdata executable
ICU_PKGDATA_EXECUTABLE:FILEPATH=/home/mcatanzaro/Projects/WebKit/WebKitBuild/DependenciesGTK/Root/bin/pkgdata

//ICU pkgdata.inc data file
ICU_PKGDATA_INC:FILEPATH=/usr/lib64/icu/63.2/pkgdata.inc

//ICU uconv executable
ICU_UCONV_EXECUTABLE:FILEPATH=/home/mcatanzaro/Projects/WebKit/WebKitBuild/DependenciesGTK/Root/bin/uconv

//ICU uc library (debug)
ICU_UC_LIBRARY_DEBUG:FILEPATH=ICU_UC_LIBRARY_DEBUG-NOTFOUND

//ICU uc library (release)
ICU_UC_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libicuuc.so


i.e. even with CMAKE_PREFIX_PATH set, FindICU is still improperly using system ICU. I think we just need to accept that CMake&apos;s FindICU is broken....

Talking to Charlie, he&apos;s not actually using build-webkit anyway: he has a custom JHBuild environment. That means when he runs &apos;jhbuild build&apos;, CMAKE_INSTALL_PREFIX must already be set by JHBuild (unlike when using build-webkit) and that should eliminate the need for CMAKE_PREFIX_PATH anyway.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1555784</commentid>
    <comment_count>21</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2019-07-25 08:21:37 -0700</bug_when>
    <thetext>OK, testing this myself, I see when using build-webkit everything already works fine *without* my patch in the other bug. My patch actually broke this. :)

(In reply to Fujii Hironori from comment #15)
&gt; I don&apos;t think we should change jhbuild.
&gt; Indeed, jhbuild does right. jhbuild sets CMAKE_INSTALL_PREFIX for cmake
&gt; modules.
&gt; https://github.com/GNOME/jhbuild/blob/
&gt; dde410486ce3af6cb4cc7e7ffad21a6b2ef7f4c7/jhbuild/modtypes/cmake.py#L97
&gt; 
&gt; Setting CMAKE_INSTALL_PREFIX also suffices.
&gt; https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX.html

I don&apos;t think so.

According to https://cmake.org/cmake/help/latest/command/find_library.html?highlight=find_library, that path is not searched. Looks like CMake treats the install prefix as separate from CMAKE_PREFIX_PATH.

So jhbuild probably *should* set CMAKE_PREFIX_PATH, to fix this sort of issue when used outside build-webkit, which is what Charlie is doing. But as build-webkit already does that (via our jhbuildrc) it is not a problem for WebKit&apos;s jhbuild environment.

So this problem only occurs when using a JHBuild environment other than WebKit&apos;s own. It so happens I do that all the time, so I care about this, but I don&apos;t have ICU in my custom JHBuild because why would I possibly build my own ICU there? Whereas Charlie has done so; that&apos;s why he&apos;s seeing this problem.

I think there&apos;s nothing to change in WebKit, we should just fix jhbuild. I&apos;ll need to decide how traumatic touching that repository again will be for me; I have no shortage of bad memories. :) Closing.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1555797</commentid>
    <comment_count>22</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2019-07-25 08:57:50 -0700</bug_when>
    <thetext>https://gitlab.gnome.org/GNOME/jhbuild/merge_requests/24, marked as WIP until Charlie tells me it works.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1556051</commentid>
    <comment_count>23</comment_count>
    <who name="Charlie Turner">cturner</who>
    <bug_when>2019-07-26 00:52:41 -0700</bug_when>
    <thetext>(In reply to Michael Catanzaro from comment #22)
&gt; https://gitlab.gnome.org/GNOME/jhbuild/merge_requests/24, marked as WIP
&gt; until Charlie tells me it works.

Nice investigation Michael, that does indeed fix the problem for me, thanks for taking the time to look into it!</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>370016</attachid>
            <date>2019-05-15 18:41:59 -0700</date>
            <delta_ts>2019-05-17 14:30:05 -0700</delta_ts>
            <desc>WIP Patch</desc>
            <filename>bug-197934.diff</filename>
            <type>text/plain</type>
            <size>17484</size>
            <attacher name="Don Olmstead">don.olmstead</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0NNYWtlTGlzdHMudHh0IGIvQ01ha2VMaXN0cy50eHQKaW5kZXggZDNlOGEy
M2Y5ZmYuLmU3OWY0MTI1OWU0IDEwMDY0NAotLS0gYS9DTWFrZUxpc3RzLnR4dAorKysgYi9DTWFr
ZUxpc3RzLnR4dApAQCAtMiwxMyArMiwxMyBAQAogIyBEZXRlcm1pbmUgQ01ha2UgdmVyc2lvbiBh
bmQgYnVpbGQgdHlwZS4KICMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICMKLSMgTk9URTogY21ha2Vf
bWluaW11bV9yZXF1aXJlZCgpIGFuZCBwcm9qZWN0KCkgKk1VU1QqIGJlIHRoZSB0d28gZmlzdCBj
b21tYW5kcworIyBOT1RFOiBjbWFrZV9taW5pbXVtX3JlcXVpcmVkKCkgYW5kIHByb2plY3QoKSAq
TVVTVCogYmUgdGhlIHR3byBmaXJzdCBjb21tYW5kcwogIyB1c2VkLCBzZWUgaHR0cHM6Ly9jbWFr
ZS5vcmcvY21ha2UvaGVscC92My4zL2NvbW1hbmQvcHJvamVjdC5odG1sIC0tIHRoZQogIyBsYXR0
ZXIgaW4gcGFydGljdWxhciBoYW5kbGVzIGxvYWRpbmcgYSBidW5jaCBvZiBzaGFyZWQgQ01ha2Ug
ZGVmaW5pdGlvbnMKICMgYW5kIGxvYWRpbmcgdGhlIGNyb3NzLWNvbXBpbGF0aW9uIHNldHRpbmdz
IGZyb20gQ01BS0VfVE9PTENIQUlOX0ZJTEUuCiAjCiAKLWNtYWtlX21pbmltdW1fcmVxdWlyZWQo
VkVSU0lPTiAzLjMpCitjbWFrZV9taW5pbXVtX3JlcXVpcmVkKFZFUlNJT04gMy43KQogCiBwcm9q
ZWN0KFdlYktpdCkKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NNYWtlTGlz
dHMudHh0IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NNYWtlTGlzdHMudHh0CmluZGV4IDVkNmQx
NzAxYjM0Li5lNzE2YzcxNjgyZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NN
YWtlTGlzdHMudHh0CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DTWFrZUxpc3RzLnR4dApA
QCAtNTQsMTAgKzU0LDYgQEAgaWYgKFVTRV9DQVBTVE9ORSkKICAgICBsaXN0KEFQUEVORCBKYXZh
U2NyaXB0Q29yZV9QUklWQVRFX0lOQ0xVREVfRElSRUNUT1JJRVMgIiR7VEhJUkRQQVJUWV9ESVJ9
L2NhcHN0b25lL1NvdXJjZS9pbmNsdWRlIikKIGVuZGlmICgpCiAKLXNldChKYXZhU2NyaXB0Q29y
ZV9TWVNURU1fSU5DTFVERV9ESVJFQ1RPUklFUwotICAgICIke0lDVV9JTkNMVURFX0RJUlN9Igot
KQotCiBzZXQoSmF2YVNjcmlwdENvcmVfT0JKRUNUX0xVVF9TT1VSQ0VTCiAgICAgcnVudGltZS9B
cnJheUNvbnN0cnVjdG9yLmNwcAogICAgIHJ1bnRpbWUvQXN5bmNGcm9tU3luY0l0ZXJhdG9yUHJv
dG90eXBlLmNwcApAQCAtMTIxLDcgKzExNyw2IEBAIHNldChKYXZhU2NyaXB0Q29yZV9PQkpFQ1Rf
TFVUX1NPVVJDRVMKIAogc2V0KEphdmFTY3JpcHRDb3JlX0xJQlJBUklFUwogICAgIFdURiR7REVC
VUdfU1VGRklYfQotICAgICR7SUNVX0kxOE5fTElCUkFSSUVTfQogKQogCiBpZiAoVVNFX0NBUFNU
T05FKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL1BsYXRmb3JtV2luLmNtYWtl
IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL1BsYXRmb3JtV2luLmNtYWtlCmluZGV4IDQyNWI5N2Vj
ZDM0Li5jN2QwZWY1ZmJiNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL1BsYXRm
b3JtV2luLmNtYWtlCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9QbGF0Zm9ybVdpbi5jbWFr
ZQpAQCAtMjcsNyArMjcsNiBAQCBlbmRpZiAoKQogCiBpZiAoTk9UIFdURl9QTEFURk9STV9XSU5f
Q0FJUk8pCiAgICAgbGlzdChBUFBFTkQgSmF2YVNjcmlwdENvcmVfTElCUkFSSUVTCi0gICAgICAg
ICR7SUNVX0xJQlJBUklFU30KICAgICAgICAgd2lubW0KICAgICApCiBlbmRpZiAoKQpkaWZmIC0t
Z2l0IGEvU291cmNlL1dURi93dGYvQ01ha2VMaXN0cy50eHQgYi9Tb3VyY2UvV1RGL3d0Zi9DTWFr
ZUxpc3RzLnR4dAppbmRleCA2ZDY0MDgwMTljZi4uMDdmNTAxYWM2NWIgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XVEYvd3RmL0NNYWtlTGlzdHMudHh0CisrKyBiL1NvdXJjZS9XVEYvd3RmL0NNYWtlTGlz
dHMudHh0CkBAIC00OTEsMTMgKzQ5MSwxMSBAQCBsaXN0KEFQUEVORCBXVEZfU09VUkNFUwogCiAg
ICAgdW5pY29kZS9pY3UvQ29sbGF0b3JJQ1UuY3BwCiApCi1zZXQoV1RGX1NZU1RFTV9JTkNMVURF
X0RJUkVDVE9SSUVTCi0gICAgJHtJQ1VfSU5DTFVERV9ESVJTfQotKQorCiBsaXN0KEFQUEVORCBX
VEZfTElCUkFSSUVTCi0gICAgJHtJQ1VfREFUQV9MSUJSQVJJRVN9Ci0gICAgJHtJQ1VfSTE4Tl9M
SUJSQVJJRVN9Ci0gICAgJHtJQ1VfTElCUkFSSUVTfQorICAgIElDVTo6ZGF0YQorICAgIElDVTo6
aTE4bgorICAgIElDVTo6dWMKICkKIAogV0VCS0lUX0ZSQU1FV09SS19ERUNMQVJFKFdURikKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtUGxheVN0YXRpb24uY21ha2UgYi9Tb3Vy
Y2UvV1RGL3d0Zi9QbGF0Zm9ybVBsYXlTdGF0aW9uLmNtYWtlCmluZGV4IDFhNTI0YjFkNGQwLi45
MzJiMmEzZGE3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvUGxhdGZvcm1QbGF5U3RhdGlv
bi5jbWFrZQorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybVBsYXlTdGF0aW9uLmNtYWtlCkBA
IC0xNyw3ICsxNyw2IEBAIGxpc3QoQVBQRU5EIFdURl9TT1VSQ0VTCiAKIGxpc3QoQVBQRU5EIFdU
Rl9MSUJSQVJJRVMKICAgICAke0NNQUtFX1RIUkVBRF9MSUJTX0lOSVR9Ci0gICAgJHtJQ1VfTElC
UkFSSUVTfQogCiAgICAgJHtDX1NURF9MSUJSQVJZfQogICAgICR7S0VSTkVMX0xJQlJBUll9CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzLnR4dCBiL1NvdXJjZS9XZWJDb3Jl
L0NNYWtlTGlzdHMudHh0CmluZGV4IGZkOTllN2RiZDA4Li41YWU1OTg2NDM3NiAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQKKysrIGIvU291cmNlL1dlYkNvcmUvQ01h
a2VMaXN0cy50eHQKQEAgLTE2Niw3ICsxNjYsNiBAQCBzZXQoV2ViQ29yZV9QUklWQVRFX0lOQ0xV
REVfRElSRUNUT1JJRVMKICkKIAogc2V0KFdlYkNvcmVfU1lTVEVNX0lOQ0xVREVfRElSRUNUT1JJ
RVMKLSAgICAke0lDVV9JTkNMVURFX0RJUlN9CiAgICAgJHtMSUJYTUwyX0lOQ0xVREVfRElSfQog
ICAgICR7TElCWFNMVF9JTkNMVURFX0RJUn0KICAgICAke1NRTElURV9JTkNMVURFX0RJUn0KQEAg
LTExOTYsMTEgKzExOTUsMTEgQEAgc2V0KFdlYkNvcmVfUExVR19JTlNfUkVTT1VSQ0VTCiApCiAK
IHNldChXZWJDb3JlX0xJQlJBUklFUwotICAgICR7SUNVX0xJQlJBUklFU30KICAgICAke0xJQlhN
TDJfTElCUkFSSUVTfQogICAgICR7TElCWFNMVF9MSUJSQVJJRVN9CiAgICAgJHtTUUxJVEVfTElC
UkFSSUVTfQogICAgICR7WkxJQl9MSUJSQVJJRVN9CisgICAgSmF2YVNjcmlwdENvcmUKICAgICBQ
QUwke0RFQlVHX1NVRkZJWH0KICkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3Bh
bC9DTWFrZUxpc3RzLnR4dCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvQ01ha2VMaXN0cy50eHQK
aW5kZXggYzUwYzQ4NWIzYTcuLmE4NDMwMDZhOWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9QQUwvcGFsL0NNYWtlTGlzdHMudHh0CisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvQ01h
a2VMaXN0cy50eHQKQEAgLTI5LDYgKzI5LDcgQEAgc2V0KFBBTF9TT1VSQ0VTCiAKIHNldChQQUxf
UFJJVkFURV9JTkNMVURFX0RJUkVDVE9SSUVTCiAgICAgIiR7Q01BS0VfQklOQVJZX0RJUn0iCisg
ICAgIiR7V1RGX0ZSQU1FV09SS19IRUFERVJTX0RJUn0iCiAgICAgIiR7UEFMX0RFUklWRURfU09V
UkNFU19ESVJ9IgogICAgICIke1BBTF9ESVJ9IgogICAgICIke1BBTF9ESVJ9L3BhbCIKQEAgLTM3
LDEyICszOCw4IEBAIHNldChQQUxfUFJJVkFURV9JTkNMVURFX0RJUkVDVE9SSUVTCiAgICAgIiR7
UEFMX0RJUn0vcGFsL3RleHQiCiApCiAKLXNldChQQUxfU1lTVEVNX0lOQ0xVREVfRElSRUNUT1JJ
RVMKLSAgICAke0lDVV9JTkNMVURFX0RJUlN9Ci0pCi0KIHNldChQQUxfTElCUkFSSUVTCi0gICAg
SmF2YVNjcmlwdENvcmUke0RFQlVHX1NVRkZJWH0KKyAgICBXVEYKICkKIAogV0VCS0lUX0ZSQU1F
V09SS19ERUNMQVJFKFBBTCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvU2Vz
c2lvbklELmggYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL1Nlc3Npb25JRC5oCmluZGV4IDJiMWNk
YjI5ODc0Li45NmM5OWQwMjQ4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9T
ZXNzaW9uSUQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL1Nlc3Npb25JRC5oCkBAIC02
Niw3ICs2Niw3IEBAIHB1YmxpYzoKICAgICB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBzdGF0aWMg
Ym9vbCBkZWNvZGUoRGVjb2RlciYsIFNlc3Npb25JRCYpOwogICAgIHRlbXBsYXRlPGNsYXNzIERl
Y29kZXI+IHN0YXRpYyBPcHRpb25hbDxTZXNzaW9uSUQ+IGRlY29kZShEZWNvZGVyJik7CiAKLSAg
ICBTZXNzaW9uSUQgaXNvbGF0ZWRDb3B5KCkgY29uc3Q7CisgICAgUEFMX0VYUE9SVCBTZXNzaW9u
SUQgaXNvbGF0ZWRDb3B5KCkgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgU2Vzc2lv
bklEKHVpbnQ2NF90IHNlc3Npb25JRCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9w
YWwvc3lzdGVtL0Nsb2NrLmggYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3N5c3RlbS9DbG9jay5o
CmluZGV4IDUwODYwYWRjNzkzLi40MmM5YmFiMzA0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvUEFML3BhbC9zeXN0ZW0vQ2xvY2suaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3N5
c3RlbS9DbG9jay5oCkBAIC0zMyw3ICszMyw3IEBAIG5hbWVzcGFjZSBQQUwgewogY2xhc3MgQ2xv
Y2sgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgotICAgIHN0YXRpYyBz
dGQ6OnVuaXF1ZV9wdHI8Q2xvY2s+IGNyZWF0ZSgpOworICAgIFBBTF9FWFBPUlQgc3RhdGljIHN0
ZDo6dW5pcXVlX3B0cjxDbG9jaz4gY3JlYXRlKCk7CiAgICAgdmlydHVhbCB+Q2xvY2soKSA9IGRl
ZmF1bHQ7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0Q3VycmVudFRpbWUoZG91YmxlKSA9IDA7CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3N5c3RlbS9TeXN0ZW1TbGVlcExpc3Rl
bmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3N5c3RlbS9TeXN0ZW1TbGVlcExpc3RlbmVy
LmgKaW5kZXggYjk2Y2FiMTk5YzcuLjkwZjRiM2MyYTAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9QQUwvcGFsL3N5c3RlbS9TeXN0ZW1TbGVlcExpc3RlbmVyLmgKKysrIGIvU291cmNlL1dl
YkNvcmUvUEFML3BhbC9zeXN0ZW0vU3lzdGVtU2xlZXBMaXN0ZW5lci5oCkBAIC0zNiw3ICszNiw3
IEBAIHB1YmxpYzoKICAgICAgICAgdmlydHVhbCB2b2lkIHN5c3RlbURpZFdha2UoKSA9IDA7CiAg
ICAgfTsKIAotICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8U3lzdGVtU2xlZXBMaXN0ZW5lcj4g
Y3JlYXRlKENsaWVudCYpOworICAgIFBBTF9FWFBPUlQgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxT
eXN0ZW1TbGVlcExpc3RlbmVyPiBjcmVhdGUoQ2xpZW50Jik7CiAgICAgdmlydHVhbCB+U3lzdGVt
U2xlZXBMaXN0ZW5lcigpID0gZGVmYXVsdDsKIAogICAgIENsaWVudCYgY2xpZW50KCkgeyByZXR1
cm4gbV9jbGllbnQ7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtUGxheVN0
YXRpb24uY21ha2UgYi9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybVBsYXlTdGF0aW9uLmNtYWtlCmlu
ZGV4IGQxZWE0NmNlODAwLi43MTkzYmM1YWUxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
UGxhdGZvcm1QbGF5U3RhdGlvbi5jbWFrZQorKysgYi9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybVBs
YXlTdGF0aW9uLmNtYWtlCkBAIC04MSw3ICs4MSw2IEBAIHNldChXZWJDb3JlX1VTRVJfQUdFTlRf
U0NSSVBUUwogKQogCiBsaXN0KEFQUEVORCBXZWJDb3JlX1NZU1RFTV9JTkNMVURFX0RJUkVDVE9S
SUVTCi0gICAgJHtJQ1VfSU5DTFVERV9ESVJTfQogICAgICR7TElCWE1MMl9JTkNMVURFX0RJUn0K
ICAgICAke1NRTElURV9JTkNMVURFX0RJUn0KICAgICAke1pMSUJfSU5DTFVERV9ESVJTfQpAQCAt
ODksNyArODgsNiBAQCBsaXN0KEFQUEVORCBXZWJDb3JlX1NZU1RFTV9JTkNMVURFX0RJUkVDVE9S
SUVTCiApCiAKIGxpc3QoQVBQRU5EIFdlYkNvcmVfTElCUkFSSUVTCi0gICAgJHtJQ1VfTElCUkFS
SUVTfQogICAgICR7TElCWE1MMl9MSUJSQVJJRVN9CiAgICAgJHtTUUxJVEVfTElCUkFSSUVTfQog
ICAgICR7WkxJQl9MSUJSQVJJRVN9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9y
bVdQRS5jbWFrZSBiL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtV1BFLmNtYWtlCmluZGV4IDFjYWQw
ZTYxN2ZiLi40MTAwYzgxNTI1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUGxhdGZvcm1X
UEUuY21ha2UKKysrIGIvU291cmNlL1dlYkNvcmUvUGxhdGZvcm1XUEUuY21ha2UKQEAgLTUyLDcg
KzUyLDYgQEAgbGlzdChBUFBFTkQgV2ViQ29yZV9MSUJSQVJJRVMKICAgICAke0dMSUJfR01PRFVM
RV9MSUJSQVJJRVN9CiAgICAgJHtHTElCX0dPQkpFQ1RfTElCUkFSSUVTfQogICAgICR7R0xJQl9M
SUJSQVJJRVN9Ci0gICAgJHtJQ1VfTElCUkFSSUVTfQogICAgICR7TElCVEFTTjFfTElCUkFSSUVT
fQogICAgICR7VVBPV0VSR0xJQl9MSUJSQVJJRVN9CiAgICAgJHtXUEVfTElCUkFSSUVTfQpAQCAt
NjEsNyArNjAsNiBAQCBsaXN0KEFQUEVORCBXZWJDb3JlX0xJQlJBUklFUwogbGlzdChBUFBFTkQg
V2ViQ29yZV9TWVNURU1fSU5DTFVERV9ESVJFQ1RPUklFUwogICAgICR7R0lPX1VOSVhfSU5DTFVE
RV9ESVJTfQogICAgICR7R0xJQl9JTkNMVURFX0RJUlN9Ci0gICAgJHtJQ1VfSU5DTFVERV9ESVJT
fQogICAgICR7TElCVEFTTjFfSU5DTFVERV9ESVJTfQogICAgICR7VVBPV0VSR0xJQl9JTkNMVURF
X0RJUlN9CiAgICAgJHtXUEVfSU5DTFVERV9ESVJTfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkRy
aXZlci9QbGF0Zm9ybVdQRS5jbWFrZSBiL1NvdXJjZS9XZWJEcml2ZXIvUGxhdGZvcm1XUEUuY21h
a2UKaW5kZXggYmEyMTc5ODk4YTUuLmJkM2NkODExYmQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
RHJpdmVyL1BsYXRmb3JtV1BFLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJEcml2ZXIvUGxhdGZvcm1X
UEUuY21ha2UKQEAgLTIsNyArMiw2IEBAIHNldChXZWJEcml2ZXJfUHJvY2Vzc19PVVRQVVRfTkFN
RSBXUEVXZWJEcml2ZXIpCiAKIGxpc3QoQVBQRU5EIFdlYkRyaXZlcl9TWVNURU1fSU5DTFVERV9E
SVJFQ1RPUklFUwogICAgICIke0dMSUJfSU5DTFVERV9ESVJTfSIKLSAgICAiJHtJQ1VfSU5DTFVE
RV9ESVJTfSIKICAgICAiJHtMSUJTT1VQX0lOQ0xVREVfRElSU30iCiApCiAKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvQ01ha2VMaXN0cy50eHQgYi9Tb3VyY2UvV2ViS2l0L0NNYWtlTGlzdHMu
dHh0CmluZGV4IDRiMGJlYzdjYjgwLi4zMTBmMTY5OGNmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9DTWFrZUxpc3RzLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L0NNYWtlTGlzdHMudHh0CkBA
IC05OCwxMCArOTgsNiBAQCBzZXQoV2ViS2l0X0lOQ0xVREVfRElSRUNUT1JJRVMKIAogc2V0KFBS
T1RPQ09MX0dFTkVSQVRPUl9TQ1JJUFRTX0RJUiAiJHtKQVZBU0NSSVBUQ09SRV9ESVJ9L2luc3Bl
Y3Rvci9zY3JpcHRzIikKIAotc2V0KFdlYktpdF9TWVNURU1fSU5DTFVERV9ESVJFQ1RPUklFUwot
ICAgICR7SUNVX0lOQ0xVREVfRElSU30KLSkKLQogbGlzdChBUFBFTkQgV2ViS2l0X1VOSUZJRURf
U09VUkNFX0xJU1RfRklMRVMKICAgICAiU291cmNlcy50eHQiCiApCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0TGVnYWN5L0NNYWtlTGlzdHMudHh0IGIvU291cmNlL1dlYktpdExlZ2FjeS9DTWFr
ZUxpc3RzLnR4dAppbmRleCBiMGM3N2RkZWJmZi4uOTYwYTk3MGViYjAgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJLaXRMZWdhY3kvQ01ha2VMaXN0cy50eHQKKysrIGIvU291cmNlL1dlYktpdExlZ2Fj
eS9DTWFrZUxpc3RzLnR4dApAQCAtMjUsMTAgKzI1LDYgQEAgc2V0KFdlYktpdExlZ2FjeV9QUklW
QVRFX0lOQ0xVREVfRElSRUNUT1JJRVMKICAgICAiJHtXZWJLaXRMZWdhY3lfREVSSVZFRF9TT1VS
Q0VTX0RJUn0iCiApCiAKLXNldChXZWJLaXRMZWdhY3lfU1lTVEVNX0lOQ0xVREVfRElSRUNUT1JJ
RVMKLSAgICAiJHtJQ1VfSU5DTFVERV9ESVJTfSIKLSkKLQogc2V0KFdlYktpdExlZ2FjeV9MSUJS
QVJJRVMKICAgICBQUklWQVRFIEphdmFTY3JpcHRDb3JlJHtERUJVR19TVUZGSVh9CiAgICAgUFJJ
VkFURSBXZWJDb3JlJHtERUJVR19TVUZGSVh9CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvRmlu
ZElDVS5jbWFrZSBiL1NvdXJjZS9jbWFrZS9GaW5kSUNVLmNtYWtlCmRlbGV0ZWQgZmlsZSBtb2Rl
IDEwMDY0NAppbmRleCBmOWQ3OWMxOTE0My4uMDAwMDAwMDAwMDAKLS0tIGEvU291cmNlL2NtYWtl
L0ZpbmRJQ1UuY21ha2UKKysrIC9kZXYvbnVsbApAQCAtMSwxMTAgKzAsMCBAQAotIyBGaW5kcyB0
aGUgSW50ZXJuYXRpb25hbCBDb21wb25lbnRzIGZvciBVbmljb2RlIChJQ1UpIExpYnJhcnkKLSMK
LSMgIElDVV9GT1VORCAgICAgICAgICAtIFRydWUgaWYgSUNVIGZvdW5kLgotIyAgSUNVX0kxOE5f
Rk9VTkQgICAgIC0gVHJ1ZSBpZiBJQ1UncyBpbnRlcm5hdGlvbmFsaXphdGlvbiBsaWJyYXJ5IGZv
dW5kLgotIyAgSUNVX0lOQ0xVREVfRElSUyAgIC0gRGlyZWN0b3J5IHRvIGluY2x1ZGUgdG8gZ2V0
IElDVSBoZWFkZXJzCi0jICAgICAgICAgICAgICAgICAgICAgICBOb3RlOiBhbHdheXMgaW5jbHVk
ZSBJQ1UgaGVhZGVycyBhcywgZS5nLiwKLSMgICAgICAgICAgICAgICAgICAgICAgIHVuaWNvZGUv
dXR5cGVzLmgKLSMgIElDVV9MSUJSQVJJRVMgICAgICAtIExpYnJhcmllcyB0byBsaW5rIGFnYWlu
c3QgZm9yIHRoZSBjb21tb24gSUNVCi0jICBJQ1VfSTE4Tl9MSUJSQVJJRVMgLSBMaWJyYXJpZXMg
dG8gbGluayBhZ2FpbnN0IGZvciBJQ1UgaW50ZXJuYXRpb25hbGlhdGlvbgotIyAgICAgICAgICAg
ICAgICAgICAgICAgKG5vdGU6IGluIGFkZGl0aW9uIHRvIElDVV9MSUJSQVJJRVMpCi0KLWZpbmRf
cGFja2FnZShQa2dDb25maWcpCi1wa2dfY2hlY2tfbW9kdWxlcyhQQ19JQ1UgaWN1LXVjKQotCi0j
IExvb2sgZm9yIHRoZSBoZWFkZXIgZmlsZS4KLWZpbmRfcGF0aCgKLSAgICBJQ1VfSU5DTFVERV9E
SVIKLSAgICBOQU1FUyB1bmljb2RlL3V0eXBlcy5oCi0gICAgSElOVFMgJHtQQ19JQ1VfSU5DTFVE
RV9ESVJTfQotICAgICAgICAgICR7UENfSUNVX0lOQ0xVREVESVJ9Ci0gICAgICAgICAgJHtXRUJL
SVRfTElCUkFSSUVTX0lOQ0xVREVfRElSfQotICAgIERPQyAiSW5jbHVkZSBkaXJlY3RvcnkgZm9y
IHRoZSBJQ1UgbGlicmFyeSIpCi1tYXJrX2FzX2FkdmFuY2VkKElDVV9JTkNMVURFX0RJUikKLQot
IyBMb29rIGZvciB0aGUgbGlicmFyeS4KLWZpbmRfbGlicmFyeSgKLSAgICBJQ1VfTElCUkFSWQot
ICAgIE5BTUVTIGxpYmljdXVjIGN5Z2ljdXVjIGN5Z2ljdXVjMzIgaWN1dWMKLSAgICBISU5UUyAk
e1BDX0lDVV9MSUJSQVJZX0RJUlN9Ci0gICAgICAgICAgJHtQQ19JQ1VfTElCRElSfQotICAgICAg
ICAgICR7V0VCS0lUX0xJQlJBUklFU19MSU5LX0RJUn0KLSAgICBET0MgIkxpYnJhcmllcyB0byBs
aW5rIGFnYWluc3QgZm9yIHRoZSBjb21tb24gcGFydHMgb2YgSUNVIikKLW1hcmtfYXNfYWR2YW5j
ZWQoSUNVX0xJQlJBUlkpCi0KLSMgQ29weSB0aGUgcmVzdWx0cyB0byB0aGUgb3V0cHV0IHZhcmlh
Ymxlcy4KLWlmIChJQ1VfSU5DTFVERV9ESVIgQU5EIElDVV9MSUJSQVJZKQotICAgIHNldChJQ1Vf
Rk9VTkQgMSkKLSAgICBzZXQoSUNVX0xJQlJBUklFUyAke0lDVV9MSUJSQVJZfSkKLSAgICBzZXQo
SUNVX0lOQ0xVREVfRElSUyAke0lDVV9JTkNMVURFX0RJUn0pCi0KLSAgICBzZXQoSUNVX1ZFUlNJ
T04gMCkKLSAgICBzZXQoSUNVX01BSk9SX1ZFUlNJT04gMCkKLSAgICBzZXQoSUNVX01JTk9SX1ZF
UlNJT04gMCkKLSAgICBmaWxlKFJFQUQgIiR7SUNVX0lOQ0xVREVfRElSfS91bmljb2RlL3V2ZXJz
aW9uLmgiIF9JQ1VfVkVSU0lPTl9DT05FTlRTKQotICAgIHN0cmluZyhSRUdFWCBSRVBMQUNFICIu
KiNkZWZpbmUgVV9JQ1VfVkVSU0lPTl9NQUpPUl9OVU0gKFswLTldKykuKiIgIlxcMSIgSUNVX01B
Sk9SX1ZFUlNJT04gIiR7X0lDVV9WRVJTSU9OX0NPTkVOVFN9IikKLSAgICBzdHJpbmcoUkVHRVgg
UkVQTEFDRSAiLiojZGVmaW5lIFVfSUNVX1ZFUlNJT05fTUlOT1JfTlVNIChbMC05XSspLioiICJc
XDEiIElDVV9NSU5PUl9WRVJTSU9OICIke19JQ1VfVkVSU0lPTl9DT05FTlRTfSIpCi0KLSAgICBz
ZXQoSUNVX1ZFUlNJT04gIiR7SUNVX01BSk9SX1ZFUlNJT059LiR7SUNVX01JTk9SX1ZFUlNJT059
IikKLQotICAgICMgTG9vayBmb3IgdGhlIElDVSBpbnRlcm5hdGlvbmFsaXphdGlvbiBsaWJyYXJp
ZXMKLSAgICBwa2dfY2hlY2tfbW9kdWxlcyhQQ19JQ1VfSTE4TiBpY3UtaTE4bikKLSAgICBmaW5k
X2xpYnJhcnkoCi0gICAgICAgIElDVV9JMThOX0xJQlJBUlkKLSAgICAgICAgTkFNRVMgaWN1aTE4
biBsaWJpY3VpMThuIGxpYmljdWluIGN5Z2ljdWluIGN5Z2ljdWluMzIgaWN1aW4KLSAgICAgICAg
SElOVFMgJHtQQ19JQ1VfSTE4Tl9MSUJSQVJZX0RJUlN9Ci0gICAgICAgICAgICAgICR7UENfSUNV
X0kxOE5fTElCRElSfQotICAgICAgICAgICAgICAke1dFQktJVF9MSUJSQVJJRVNfTElOS19ESVJ9
Ci0gICAgICAgIERPQyAiTGlicmFyaWVzIHRvIGxpbmsgYWdhaW5zdCBmb3IgSUNVIGludGVybmF0
aW9uYWxpemF0aW9uIikKLSAgICBtYXJrX2FzX2FkdmFuY2VkKElDVV9JMThOX0xJQlJBUlkpCi0g
ICAgaWYgKElDVV9JMThOX0xJQlJBUlkpCi0gICAgICAgIHNldChJQ1VfSTE4Tl9GT1VORCAxKQot
ICAgICAgICBzZXQoSUNVX0kxOE5fTElCUkFSSUVTICR7SUNVX0kxOE5fTElCUkFSWX0pCi0gICAg
ZWxzZSAoKQotICAgICAgICBzZXQoSUNVX0kxOE5fRk9VTkQgMCkKLSAgICAgICAgc2V0KElDVV9J
MThOX0xJQlJBUklFUykKLSAgICBlbmRpZiAoKQotCi0gICAgIyBMb29rIGZvciB0aGUgSUNVIGRh
dGEgbGlicmFyaWVzCi0gICAgZmluZF9saWJyYXJ5KAotICAgICAgICBJQ1VfREFUQV9MSUJSQVJZ
Ci0gICAgICAgIE5BTUVTIGljdWRhdGEgbGliaWN1ZGF0YSBjeWdpY3VkYXRhIGN5Z2ljdWRhdGEz
MgotICAgICAgICBISU5UUyAke1BDX0lDVV9JMThOX0xJQlJBUllfRElSU30KLSAgICAgICAgICAg
ICAgJHtQQ19JQ1VfSTE4Tl9MSUJESVJ9Ci0gICAgICAgICAgICAgICR7V0VCS0lUX0xJQlJBUklF
U19MSU5LX0RJUn0KLSAgICAgICAgRE9DICJMaWJyYXJpZXMgdG8gbGluayBhZ2FpbnN0IGZvciBJ
Q1UgZGF0YSIpCi0gICAgbWFya19hc19hZHZhbmNlZChJQ1VfREFUQV9MSUJSQVJZKQotICAgIGlm
IChJQ1VfREFUQV9MSUJSQVJZKQotICAgICAgICBzZXQoSUNVX0RBVEFfRk9VTkQgMSkKLSAgICAg
ICAgc2V0KElDVV9EQVRBX0xJQlJBUklFUyAke0lDVV9EQVRBX0xJQlJBUll9KQotICAgIGVsc2Ug
KCkKLSAgICAgICAgc2V0KElDVV9EQVRBX0ZPVU5EIDApCi0gICAgICAgIHNldChJQ1VfREFUQV9M
SUJSQVJJRVMpCi0gICAgZW5kaWYgKCkKLWVsc2UgKCkKLSAgICBzZXQoSUNVX0ZPVU5EIDApCi0g
ICAgc2V0KElDVV9JMThOX0ZPVU5EIDApCi0gICAgc2V0KElDVV9EQVRBX0ZPVU5EIDApCi0gICAg
c2V0KElDVV9MSUJSQVJJRVMpCi0gICAgc2V0KElDVV9JMThOX0xJQlJBUklFUykKLSAgICBzZXQo
SUNVX0RBVEFfTElCUkFSSUVTKQotICAgIHNldChJQ1VfSU5DTFVERV9ESVJTKQotICAgIHNldChJ
Q1VfVkVSU0lPTikKLSAgICBzZXQoSUNVX01BSk9SX1ZFUlNJT04pCi0gICAgc2V0KElDVV9NSU5P
Ul9WRVJTSU9OKQotZW5kaWYgKCkKLQotaWYgKElDVV9GT1VORCkKLSAgICBpZiAoTk9UIElDVV9G
SU5EX1FVSUVUTFkpCi0gICAgICAgIG1lc3NhZ2UoU1RBVFVTICJGb3VuZCBJQ1UgaGVhZGVyIGZp
bGVzIGluICR7SUNVX0lOQ0xVREVfRElSU30iKQotICAgICAgICBtZXNzYWdlKFNUQVRVUyAiRm91
bmQgSUNVIGxpYnJhcmllczogJHtJQ1VfTElCUkFSSUVTfSIpCi0gICAgICAgIG1lc3NhZ2UoU1RB
VFVTICJGb3VuZCBJQ1UgaW50ZXJuYXRpb25hbGlhdGlvbiBsaWJyYXJpZXM6ICR7SUNVX0kxOE5f
TElCUkFSSUVTfSIpCi0gICAgICAgIG1lc3NhZ2UoU1RBVFVTICJGb3VuZCBJQ1UgZGF0YSBsaWJy
YXJpZXM6ICR7SUNVX0RBVEFfTElCUkFSSUVTfSIpCi0gICAgZW5kaWYgKCkKLWVsc2UgKCkKLSAg
ICBpZiAoSUNVX0ZJTkRfUkVRVUlSRUQpCi0gICAgICAgIG1lc3NhZ2UoRkFUQUxfRVJST1IgIkNv
dWxkIG5vdCBmaW5kIElDVSIpCi0gICAgZWxzZSAoKQotICAgICAgICBtZXNzYWdlKFNUQVRVUyAi
T3B0aW9uYWwgcGFja2FnZSBJQ1Ugd2FzIG5vdCBmb3VuZCIpCi0gICAgZW5kaWYgKCkKLWVuZGlm
ICgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9j
bWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IGQyOTBiZWZmZGQ5Li5iMjFhNThmNTJiYyAxMDA2
NDQKLS0tIGEvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2UKKysrIGIvU291cmNlL2NtYWtl
L09wdGlvbnNHVEsuY21ha2UKQEAgLTI0LDcgKzI0LDcgQEAgZmluZF9wYWNrYWdlKExpYkdjcnlw
dCAxLjYuMCBSRVFVSVJFRCkKIGZpbmRfcGFja2FnZShHVEszIDMuNi4wIFJFUVVJUkVEKQogZmlu
ZF9wYWNrYWdlKEdESzMgMy42LjAgUkVRVUlSRUQpCiBmaW5kX3BhY2thZ2UoSGFyZkJ1enogMC45
LjIgUkVRVUlSRUQpCi1maW5kX3BhY2thZ2UoSUNVIFJFUVVJUkVEKQorZmluZF9wYWNrYWdlKElD
VSBSRVFVSVJFRCBDT01QT05FTlRTIGRhdGEgaTE4biB1YykKIGZpbmRfcGFja2FnZShKUEVHIFJF
UVVJUkVEKQogZmluZF9wYWNrYWdlKExpYlNvdXAgMi40Mi4wIFJFUVVJUkVEKQogZmluZF9wYWNr
YWdlKExpYlhtbDIgMi44LjAgUkVRVUlSRUQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0
aW9uc0pTQ09ubHkuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0pTQ09ubHkuY21ha2UKaW5k
ZXggMmFmZmFiNzI1MGQuLmFlM2MyZWE1ZjVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvT3B0
aW9uc0pTQ09ubHkuY21ha2UKKysrIGIvU291cmNlL2NtYWtlL09wdGlvbnNKU0NPbmx5LmNtYWtl
CkBAIC05Niw3ICs5Niw3IEBAIGVsc2UgKCkKIGVuZGlmICgpCiAKIGlmIChOT1QgQVBQTEUpCi0g
ICAgZmluZF9wYWNrYWdlKElDVSBSRVFVSVJFRCkKKyAgICBmaW5kX3BhY2thZ2UoSUNVIFJFUVVJ
UkVEIENPTVBPTkVOVFMgZGF0YSBpMThuIHVjKQogZWxzZSAoKQogICAgIGFkZF9kZWZpbml0aW9u
cygtRFVfRElTQUJMRV9SRU5BTUlORz0xIC1EVV9TSE9XX0NQTFVTUExVU19BUEk9MCkKICAgICBz
ZXQoSUNVX0lOQ0xVREVfRElSUyAke0NNQUtFX0JJTkFSWV9ESVJ9L0lDVS9IZWFkZXJzKQpkaWZm
IC0tZ2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNQbGF5U3RhdGlvbi5jbWFrZSBiL1NvdXJjZS9j
bWFrZS9PcHRpb25zUGxheVN0YXRpb24uY21ha2UKaW5kZXggYTRlODc5MzM5YWMuLjVhZjdkYzZh
YzFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvT3B0aW9uc1BsYXlTdGF0aW9uLmNtYWtlCisr
KyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zUGxheVN0YXRpb24uY21ha2UKQEAgLTgwLDcgKzgwLDcg
QEAgZmluZF9wYWNrYWdlKEVHTCBSRVFVSVJFRCkKIGZpbmRfcGFja2FnZShGb250Y29uZmlnIFJF
UVVJUkVEKQogZmluZF9wYWNrYWdlKEZyZWV0eXBlIFJFUVVJUkVEKQogZmluZF9wYWNrYWdlKEhh
cmZCdXp6IFJFUVVJUkVEKQotZmluZF9wYWNrYWdlKElDVSBSRVFVSVJFRCkKK2ZpbmRfcGFja2Fn
ZShJQ1UgUkVRVUlSRUQgQ09NUE9ORU5UUyBkYXRhIGkxOG4gdWMpCiBmaW5kX3BhY2thZ2UoSlBF
RyBSRVFVSVJFRCkKIGZpbmRfcGFja2FnZShMaWJQU0wgUkVRVUlSRUQpCiBmaW5kX3BhY2thZ2Uo
TGliWG1sMiBSRVFVSVJFRCkKQEAgLTEyNSw5ICsxMjUsMTAgQEAgU0VUX0FORF9FWFBPU0VfVE9f
QlVJTEQoVVNFX1RFWFRVUkVfTUFQUEVSIE9OKQogU0VUX0FORF9FWFBPU0VfVE9fQlVJTEQoVVNF
X1RFWFRVUkVfTUFQUEVSX0dMIE9OKQogU0VUX0FORF9FWFBPU0VfVE9fQlVJTEQoVVNFX1RJTEVE
X0JBQ0tJTkdfU1RPUkUgT04pCiAKLXNldChXVEZfTElCUkFSWV9UWVBFIFNUQVRJQykKLXNldChK
YXZhU2NyaXB0Q29yZV9MSUJSQVJZX1RZUEUgU1RBVElDKQotc2V0KFdlYkNvcmVfTElCUkFSWV9U
WVBFIFNUQVRJQykKK3NldChXVEZfTElCUkFSWV9UWVBFIFNIQVJFRCkKK3NldChKYXZhU2NyaXB0
Q29yZV9MSUJSQVJZX1RZUEUgU0hBUkVEKQorc2V0KFBBTF9MSUJSQVJZX1RZUEUgU0hBUkVEKQor
c2V0KFdlYkNvcmVfTElCUkFSWV9UWVBFIFNIQVJFRCkKIAogc2V0KEVOQUJMRV9BUElfVEVTVFMg
T04pCiBzZXQoRU5BQkxFX1dFQkNPUkUgT04pCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0
aW9uc1dQRS5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zV1BFLmNtYWtlCmluZGV4IDVmN2Yy
ZjYyZGNlLi5jNzE0NTZhZTdiZiAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL09wdGlvbnNXUEUu
Y21ha2UKKysrIGIvU291cmNlL2NtYWtlL09wdGlvbnNXUEUuY21ha2UKQEAgLTE3LDcgKzE3LDcg
QEAgZmluZF9wYWNrYWdlKEZvbnRjb25maWcgMi44LjAgUkVRVUlSRUQpCiBmaW5kX3BhY2thZ2Uo
RnJlZXR5cGUgMi40LjIgUkVRVUlSRUQpCiBmaW5kX3BhY2thZ2UoR0xJQiAyLjQwLjAgUkVRVUlS
RUQgQ09NUE9ORU5UUyBnaW8gZ2lvLXVuaXggZ29iamVjdCBndGhyZWFkIGdtb2R1bGUpCiBmaW5k
X3BhY2thZ2UoSGFyZkJ1enogMC45LjE4IFJFUVVJUkVEKQotZmluZF9wYWNrYWdlKElDVSBSRVFV
SVJFRCkKK2ZpbmRfcGFja2FnZShJQ1UgUkVRVUlSRUQgQ09NUE9ORU5UUyBkYXRhIGkxOG4gdWMp
CiBmaW5kX3BhY2thZ2UoSlBFRyBSRVFVSVJFRCkKIGZpbmRfcGFja2FnZShMaWJFcG94eSAxLjQu
MCBSRVFVSVJFRCkKIGZpbmRfcGFja2FnZShMaWJHY3J5cHQgMS42LjAgUkVRVUlSRUQpCmRpZmYg
LS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc1dpbi5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRp
b25zV2luLmNtYWtlCmluZGV4IGI2YzEzODYyMzIxLi4zZThmNzY5NzdhNSAxMDA2NDQKLS0tIGEv
U291cmNlL2NtYWtlL09wdGlvbnNXaW4uY21ha2UKKysrIGIvU291cmNlL2NtYWtlL09wdGlvbnNX
aW4uY21ha2UKQEAgLTE2NCw4ICsxNjQsNiBAQCBpZiAoTk9UIEVOQUJMRV9VTklGSUVEX0JVSUxE
UyBBTkQgV2ViQ29yZV9MSUJSQVJZX1RZUEUgTUFUQ0hFUyBTVEFUSUMpCiAgICAgc2V0KFdlYkNv
cmVfTElCUkFSWV9UWVBFIE9CSkVDVCkKIGVuZGlmICgpCiAKLWZpbmRfcGFja2FnZShJQ1UgUkVR
VUlSRUQpCi0KICMgSWYgPHdpbnNvY2syLmg+IGlzIG5vdCBpbmNsdWRlZCBiZWZvcmUgPHdpbmRv
d3MuaD4gcmVkZWZpbml0aW9uIGVycm9ycyBvY2N1cgogIyB1bmxlc3MgX1dJTlNPQ0tBUElfIGlz
IGRlZmluZWQgYmVmb3JlIDx3aW5kb3dzLmg+IGlzIGluY2x1ZGVkCiBhZGRfZGVmaW5pdGlvbnMo
LURfV0lOU09DS0FQSV89KQpkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNXaW5DYWly
by5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zV2luQ2Fpcm8uY21ha2UKaW5kZXggYTcxNmVj
NmYwZWEuLjBmYmFkOTU0NWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvT3B0aW9uc1dpbkNh
aXJvLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zV2luQ2Fpcm8uY21ha2UKQEAgLTQs
NiArNCw3IEBAIGluY2x1ZGUoT3B0aW9uc1dpbikKIAogZmluZF9wYWNrYWdlKENhaXJvIDEuMTUu
MTIgUkVRVUlSRUQpCiBmaW5kX3BhY2thZ2UoQ1VSTCA3LjYwLjAgUkVRVUlSRUQpCitmaW5kX3Bh
Y2thZ2UoSUNVIFJFUVVJUkVEIENPTVBPTkVOVFMgZGF0YSBpMThuIHVjKQogZmluZF9wYWNrYWdl
KEpQRUcgMS41LjIgUkVRVUlSRUQpCiBmaW5kX3BhY2thZ2UoTGliWG1sMiAyLjkuNyBSRVFVSVJF
RCkKIGZpbmRfcGFja2FnZShPcGVuU1NMIDIuMC4wIFJFUVVJUkVEKQpkaWZmIC0tZ2l0IGEvVG9v
bHMvVGVzdFdlYktpdEFQSS9QbGF0Zm9ybU1hYy5jbWFrZSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv
UGxhdGZvcm1NYWMuY21ha2UKaW5kZXggNGUyOTVkNjRjN2QuLjM4OTI1ZGM4OWI0IDEwMDY0NAot
LS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1BsYXRmb3JtTWFjLmNtYWtlCisrKyBiL1Rvb2xzL1Rl
c3RXZWJLaXRBUEkvUGxhdGZvcm1NYWMuY21ha2UKQEAgLTE3LDcgKzE3LDYgQEAgbGlzdChBUFBF
TkQgdGVzdF93dGZfTElCUkFSSUVTCiAgICAgJHtDQVJCT05fTElCUkFSWX0KICAgICAke0NPQ09B
X0xJQlJBUll9CiAgICAgJHtDT1JFRk9VTkRBVElPTl9MSUJSQVJZfQotICAgICR7SUNVX0xJQlJB
UklFU30KICkKIAogbGlzdChBUFBFTkQgVGVzdFdlYktpdEFQSV9MSUJSQVJJRVMKZGlmZiAtLWdp
dCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvUGxhdGZvcm1QbGF5U3RhdGlvbi5jbWFrZSBiL1Rvb2xz
L1Rlc3RXZWJLaXRBUEkvUGxhdGZvcm1QbGF5U3RhdGlvbi5jbWFrZQppbmRleCBhYmI4NjkwZjgw
YS4uOTUyZDA0M2YwNjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvUGxhdGZvcm1Q
bGF5U3RhdGlvbi5jbWFrZQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1BsYXRmb3JtUGxheVN0
YXRpb24uY21ha2UKQEAgLTEwLDEwICsxMCw2IEBAIGxpc3QoQVBQRU5EIFRlc3RXVEZfU09VUkNF
UwogICAgIGdlbmVyaWMvVXRpbGl0aWVzR2VuZXJpYy5jcHAKICkKIAotbGlzdChBUFBFTkQgVGVz
dFdURl9QUklWQVRFX0lOQ0xVREVfRElSRUNUT1JJRVMKLSAgICAke0lDVV9JTkNMVURFX0RJUlN9
Ci0pCi0KIGxpc3QoQVBQRU5EIFRlc3RXZWJDb3JlX1NPVVJDRVMKICAgICAke3Rlc3RfbWFpbl9T
T1VSQ0VTfQogKQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9DTWFrZUxpc3Rz
LnR4dCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvQ01ha2VMaXN0cy50eHQKaW5kZXggMzRmZjY0
YWFmOGUuLjYzMmFhMGIwNjc1IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0NN
YWtlTGlzdHMudHh0CisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvQ01ha2VMaXN0cy50eHQK
QEAgLTUxLDcgKzUxLDYgQEAgc2V0KFdlYktpdFRlc3RSdW5uZXJfSU5DTFVERV9ESVJFQ1RPUklF
UwogCiBzZXQoV2ViS2l0VGVzdFJ1bm5lcl9TWVNURU1fSU5DTFVERV9ESVJFQ1RPUklFUwogICAg
ICR7TElCU09VUF9JTkNMVURFX0RJUlN9Ci0gICAgJHtJQ1VfSU5DTFVERV9ESVJTfQogKQogCiBz
ZXQoV2ViS2l0VGVzdFJ1bm5lckluamVjdGVkQnVuZGxlX1NPVVJDRVMK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>370152</attachid>
            <date>2019-05-17 14:30:05 -0700</date>
            <delta_ts>2019-05-17 19:38:45 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-197934.diff</filename>
            <type>text/plain</type>
            <size>25557</size>
            <attacher name="Don Olmstead">don.olmstead</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0NNYWtlTGlzdHMudHh0IGIvQ01ha2VMaXN0cy50eHQKaW5kZXggZDNlOGEy
M2Y5ZmYuLmU3OWY0MTI1OWU0IDEwMDY0NAotLS0gYS9DTWFrZUxpc3RzLnR4dAorKysgYi9DTWFr
ZUxpc3RzLnR4dApAQCAtMiwxMyArMiwxMyBAQAogIyBEZXRlcm1pbmUgQ01ha2UgdmVyc2lvbiBh
bmQgYnVpbGQgdHlwZS4KICMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICMKLSMgTk9URTogY21ha2Vf
bWluaW11bV9yZXF1aXJlZCgpIGFuZCBwcm9qZWN0KCkgKk1VU1QqIGJlIHRoZSB0d28gZmlzdCBj
b21tYW5kcworIyBOT1RFOiBjbWFrZV9taW5pbXVtX3JlcXVpcmVkKCkgYW5kIHByb2plY3QoKSAq
TVVTVCogYmUgdGhlIHR3byBmaXJzdCBjb21tYW5kcwogIyB1c2VkLCBzZWUgaHR0cHM6Ly9jbWFr
ZS5vcmcvY21ha2UvaGVscC92My4zL2NvbW1hbmQvcHJvamVjdC5odG1sIC0tIHRoZQogIyBsYXR0
ZXIgaW4gcGFydGljdWxhciBoYW5kbGVzIGxvYWRpbmcgYSBidW5jaCBvZiBzaGFyZWQgQ01ha2Ug
ZGVmaW5pdGlvbnMKICMgYW5kIGxvYWRpbmcgdGhlIGNyb3NzLWNvbXBpbGF0aW9uIHNldHRpbmdz
IGZyb20gQ01BS0VfVE9PTENIQUlOX0ZJTEUuCiAjCiAKLWNtYWtlX21pbmltdW1fcmVxdWlyZWQo
VkVSU0lPTiAzLjMpCitjbWFrZV9taW5pbXVtX3JlcXVpcmVkKFZFUlNJT04gMy43KQogCiBwcm9q
ZWN0KFdlYktpdCkKIApkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IDBk
NWNmZTRhNDJiLi5iOTQ3ZTNkNzJhMSAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5n
ZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTA1LTE3ICBEb24gT2xtc3RlYWQgIDxkb24ub2xt
c3RlYWRAc29ueS5jb20+CisKKyAgICAgICAgW0NNYWtlXSBVc2UgYnVpbHRpbiBGaW5kSUNVCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTc5MzQKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgQ01h
a2UgbWluaW11bSByZXF1aXJlZCB0byAzLjcuIDMuNyBoYXMgYSBGaW5kSUNVIG1vZHVsZSBzbyB0
aGUgV2ViS2l0IG9uZQorICAgICAgICBpcyByZW1vdmVkLiBGb3Igbm9uLUFwcGxlIHBvcnRzIHRo
aXMganVzdCByZXF1aXJlcyBhZGRpbmcgaW5kaXZpZHVhbCBjb21wb25lbnRzIG9mCisgICAgICAg
IElDVSB0byBmaW5kX3BhY2thZ2UoSUNVKS4gRm9yIEFwcGxlIHBvcnRzIHRoZSBtb2R1bGUgZG9l
cyBub3Qgd29yayBzbyB0aGUgdGFyZ2V0cworICAgICAgICBjcmVhdGVkIGluIEZpbmRJQ1UgYXJl
IG1pcnJvcmVkIGluIHRhcmdldC9pY3UuY21ha2UuCisKKyAgICAgICAgKiBDTWFrZUxpc3RzLnR4
dDoKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvRmluZElDVS5jbWFrZTogUmVtb3ZlZC4KKyAgICAg
ICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0FwcGxlV2luLmNtYWtlOgorICAgICAgICAqIFNvdXJj
ZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlOgorICAgICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25z
SlNDT25seS5jbWFrZToKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc01hYy5jbWFrZToK
KyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc1BsYXlTdGF0aW9uLmNtYWtlOgorICAgICAg
ICAqIFNvdXJjZS9jbWFrZS9PcHRpb25zV1BFLmNtYWtlOgorICAgICAgICAqIFNvdXJjZS9jbWFr
ZS9PcHRpb25zV2luLmNtYWtlOgorICAgICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25zV2luQ2Fp
cm8uY21ha2U6CisgICAgICAgICogU291cmNlL2NtYWtlL3RhcmdldC9pY3UuY21ha2U6IEFkZGVk
LgorCiAyMDE5LTA1LTA5ICBYYW4gTMOzcGV6ICA8eGFuQGlnYWxpYS5jb20+CiAKICAgICAgICAg
W0NNYWtlXSBEZXRlY3QgU1NFMiBhdCBjb21waWxlIHRpbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9K
YXZhU2NyaXB0Q29yZS9DTWFrZUxpc3RzLnR4dCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DTWFr
ZUxpc3RzLnR4dAppbmRleCA1ZDZkMTcwMWIzNC4uZTcxNmM3MTY4MmQgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9KYXZhU2NyaXB0Q29yZS9DTWFrZUxpc3RzLnR4dAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ01ha2VMaXN0cy50eHQKQEAgLTU0LDEwICs1NCw2IEBAIGlmIChVU0VfQ0FQU1RPTkUp
CiAgICAgbGlzdChBUFBFTkQgSmF2YVNjcmlwdENvcmVfUFJJVkFURV9JTkNMVURFX0RJUkVDVE9S
SUVTICIke1RISVJEUEFSVFlfRElSfS9jYXBzdG9uZS9Tb3VyY2UvaW5jbHVkZSIpCiBlbmRpZiAo
KQogCi1zZXQoSmF2YVNjcmlwdENvcmVfU1lTVEVNX0lOQ0xVREVfRElSRUNUT1JJRVMKLSAgICAi
JHtJQ1VfSU5DTFVERV9ESVJTfSIKLSkKLQogc2V0KEphdmFTY3JpcHRDb3JlX09CSkVDVF9MVVRf
U09VUkNFUwogICAgIHJ1bnRpbWUvQXJyYXlDb25zdHJ1Y3Rvci5jcHAKICAgICBydW50aW1lL0Fz
eW5jRnJvbVN5bmNJdGVyYXRvclByb3RvdHlwZS5jcHAKQEAgLTEyMSw3ICsxMTcsNiBAQCBzZXQo
SmF2YVNjcmlwdENvcmVfT0JKRUNUX0xVVF9TT1VSQ0VTCiAKIHNldChKYXZhU2NyaXB0Q29yZV9M
SUJSQVJJRVMKICAgICBXVEYke0RFQlVHX1NVRkZJWH0KLSAgICAke0lDVV9JMThOX0xJQlJBUklF
U30KICkKIAogaWYgKFVTRV9DQVBTVE9ORSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0
Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDVi
NGRhNDcyZTBjLi41ZmVhMjA1ZjdjNSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl
L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMg
KzEsMTUgQEAKKzIwMTktMDUtMTcgIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNv
bT4KKworICAgICAgICBbQ01ha2VdIFVzZSBidWlsdGluIEZpbmRJQ1UKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzkzNAorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB1c2VzIG9mIElDVV9JTkNM
VURFX0RJUlMgYW5kIElDVV9MSUJSQVJJRVMuCisKKyAgICAgICAgKiBDTWFrZUxpc3RzLnR4dDoK
KyAgICAgICAgKiBQbGF0Zm9ybVdpbi5jbWFrZToKKwogMjAxOS0wNS0xNSAgU2FhbSBCYXJhdGkg
IDxzYmFyYXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBCb3VuZCBsaXZlbmVzcyBvZiBTZXRBcmd1
bWVudE1heWJlIG5vZGVzIHdoZW4gbWF4aW1hbCBmbHVzaCBpbnNlcnRpb24gcGhhc2UgaXMgZW5h
YmxlZApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL1BsYXRmb3JtV2luLmNtYWtl
IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL1BsYXRmb3JtV2luLmNtYWtlCmluZGV4IDQyNWI5N2Vj
ZDM0Li5jN2QwZWY1ZmJiNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL1BsYXRm
b3JtV2luLmNtYWtlCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9QbGF0Zm9ybVdpbi5jbWFr
ZQpAQCAtMjcsNyArMjcsNiBAQCBlbmRpZiAoKQogCiBpZiAoTk9UIFdURl9QTEFURk9STV9XSU5f
Q0FJUk8pCiAgICAgbGlzdChBUFBFTkQgSmF2YVNjcmlwdENvcmVfTElCUkFSSUVTCi0gICAgICAg
ICR7SUNVX0xJQlJBUklFU30KICAgICAgICAgd2lubW0KICAgICApCiBlbmRpZiAoKQpkaWZmIC0t
Z2l0IGEvU291cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwppbmRleCA5
YjMzZDJmNWQ5Zi4uYjU3ODc1ZTc5NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9n
CisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTktMDUtMTcg
IERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KKworICAgICAgICBbQ01ha2Vd
IFVzZSBidWlsdGluIEZpbmRJQ1UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTE5NzkzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp
LgorCisgICAgICAgIFJlbW92ZSB1c2VzIG9mIElDVV9JTkNMVURFX0RJUlMgYW5kIElDVV9MSUJS
QVJJRVMuIFVzZSBJQ1U6OiB0YXJnZXRzIHdoaWNoIGVuZAorICAgICAgICB1cCBwcm9wYWdhdGlu
ZyB0byBhbGwgY29uc3VtZXJzIG9mIFdURi4KKworICAgICAgICAqIHd0Zi9DTWFrZUxpc3RzLnR4
dDoKKyAgICAgICAgKiB3dGYvUGxhdGZvcm1QbGF5U3RhdGlvbi5jbWFrZToKKwogMjAxOS0wNS0x
NSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBNYWtl
IExPR19XSVRIX1NUUkVBTSBtb3JlIGVmZmljaWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93
dGYvQ01ha2VMaXN0cy50eHQgYi9Tb3VyY2UvV1RGL3d0Zi9DTWFrZUxpc3RzLnR4dAppbmRleCA2
ZDY0MDgwMTljZi4uMDdmNTAxYWM2NWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0NNYWtl
TGlzdHMudHh0CisrKyBiL1NvdXJjZS9XVEYvd3RmL0NNYWtlTGlzdHMudHh0CkBAIC00OTEsMTMg
KzQ5MSwxMSBAQCBsaXN0KEFQUEVORCBXVEZfU09VUkNFUwogCiAgICAgdW5pY29kZS9pY3UvQ29s
bGF0b3JJQ1UuY3BwCiApCi1zZXQoV1RGX1NZU1RFTV9JTkNMVURFX0RJUkVDVE9SSUVTCi0gICAg
JHtJQ1VfSU5DTFVERV9ESVJTfQotKQorCiBsaXN0KEFQUEVORCBXVEZfTElCUkFSSUVTCi0gICAg
JHtJQ1VfREFUQV9MSUJSQVJJRVN9Ci0gICAgJHtJQ1VfSTE4Tl9MSUJSQVJJRVN9Ci0gICAgJHtJ
Q1VfTElCUkFSSUVTfQorICAgIElDVTo6ZGF0YQorICAgIElDVTo6aTE4bgorICAgIElDVTo6dWMK
ICkKIAogV0VCS0lUX0ZSQU1FV09SS19ERUNMQVJFKFdURikKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
VEYvd3RmL1BsYXRmb3JtUGxheVN0YXRpb24uY21ha2UgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9y
bVBsYXlTdGF0aW9uLmNtYWtlCmluZGV4IDFhNTI0YjFkNGQwLi45MzJiMmEzZGE3MiAxMDA2NDQK
LS0tIGEvU291cmNlL1dURi93dGYvUGxhdGZvcm1QbGF5U3RhdGlvbi5jbWFrZQorKysgYi9Tb3Vy
Y2UvV1RGL3d0Zi9QbGF0Zm9ybVBsYXlTdGF0aW9uLmNtYWtlCkBAIC0xNyw3ICsxNyw2IEBAIGxp
c3QoQVBQRU5EIFdURl9TT1VSQ0VTCiAKIGxpc3QoQVBQRU5EIFdURl9MSUJSQVJJRVMKICAgICAk
e0NNQUtFX1RIUkVBRF9MSUJTX0lOSVR9Ci0gICAgJHtJQ1VfTElCUkFSSUVTfQogCiAgICAgJHtD
X1NURF9MSUJSQVJZfQogICAgICR7S0VSTkVMX0xJQlJBUll9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9DTWFrZUxpc3RzLnR4dCBiL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0Cmlu
ZGV4IGZkOTllN2RiZDA4Li40NDE2ZjI1ZWQyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
Q01ha2VMaXN0cy50eHQKKysrIGIvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQKQEAgLTE2
Niw3ICsxNjYsNiBAQCBzZXQoV2ViQ29yZV9QUklWQVRFX0lOQ0xVREVfRElSRUNUT1JJRVMKICkK
IAogc2V0KFdlYkNvcmVfU1lTVEVNX0lOQ0xVREVfRElSRUNUT1JJRVMKLSAgICAke0lDVV9JTkNM
VURFX0RJUlN9CiAgICAgJHtMSUJYTUwyX0lOQ0xVREVfRElSfQogICAgICR7TElCWFNMVF9JTkNM
VURFX0RJUn0KICAgICAke1NRTElURV9JTkNMVURFX0RJUn0KQEAgLTExOTYsNyArMTE5NSw2IEBA
IHNldChXZWJDb3JlX1BMVUdfSU5TX1JFU09VUkNFUwogKQogCiBzZXQoV2ViQ29yZV9MSUJSQVJJ
RVMKLSAgICAke0lDVV9MSUJSQVJJRVN9CiAgICAgJHtMSUJYTUwyX0xJQlJBUklFU30KICAgICAk
e0xJQlhTTFRfTElCUkFSSUVTfQogICAgICR7U1FMSVRFX0xJQlJBUklFU30KZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRl
eCBiZGE4MmEzOTNmMC4uYmEyMGFiNWY0MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAor
MjAxOS0wNS0xNyAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29tPgorCisgICAg
ICAgIFtDTWFrZV0gVXNlIGJ1aWx0aW4gRmluZElDVQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3OTM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHVzZXMgb2YgSUNVX0lOQ0xVREVfRElSUyBh
bmQgSUNVX0xJQlJBUklFUy4KKworICAgICAgICAqIENNYWtlTGlzdHMudHh0OgorICAgICAgICAq
IFBsYXRmb3JtUGxheVN0YXRpb24uY21ha2U6CisgICAgICAgICogUGxhdGZvcm1XUEUuY21ha2U6
CisKIDIwMTktMDUtMTUgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAg
ICAgIFdlYiBJbnNwZWN0b3I6IHVzZXIgZ2VzdHVyZSB0b2dnbGUgc2hvdWxkIGFsc28gZm9yY2Ug
dXNlciBpbnRlcmFjdGlvbiBmbGFnCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hh
bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCA5NDgwN2FmZmQ1Zi4u
ZjAzZGJiMzE3ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKKysr
IGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA1
LTE3ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CisKKyAgICAgICAgW0NN
YWtlXSBVc2UgYnVpbHRpbiBGaW5kSUNVCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0xOTc5MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBSZW1vdmUgdXNlcyBvZiBJQ1VfSU5DTFVERV9ESVJTIGFuZCBJQ1Vf
TElCUkFSSUVTLgorCisgICAgICAgICogcGFsL0NNYWtlTGlzdHMudHh0OgorCiAyMDE5LTA1LTE1
ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2Ug
TE9HX1dJVEhfU1RSRUFNIG1vcmUgZWZmaWNpZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9QQUwvcGFsL0NNYWtlTGlzdHMudHh0IGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9DTWFrZUxp
c3RzLnR4dAppbmRleCBjNTBjNDg1YjNhNy4uZmMwMDkxZTMyZmEgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL1BBTC9wYWwvQ01ha2VMaXN0cy50eHQKKysrIGIvU291cmNlL1dlYkNvcmUvUEFM
L3BhbC9DTWFrZUxpc3RzLnR4dApAQCAtMzcsMTAgKzM3LDYgQEAgc2V0KFBBTF9QUklWQVRFX0lO
Q0xVREVfRElSRUNUT1JJRVMKICAgICAiJHtQQUxfRElSfS9wYWwvdGV4dCIKICkKIAotc2V0KFBB
TF9TWVNURU1fSU5DTFVERV9ESVJFQ1RPUklFUwotICAgICR7SUNVX0lOQ0xVREVfRElSU30KLSkK
LQogc2V0KFBBTF9MSUJSQVJJRVMKICAgICBKYXZhU2NyaXB0Q29yZSR7REVCVUdfU1VGRklYfQog
KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUGxhdGZvcm1QbGF5U3RhdGlvbi5jbWFrZSBi
L1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtUGxheVN0YXRpb24uY21ha2UKaW5kZXggZDFlYTQ2Y2U4
MDAuLjcxOTNiYzVhZTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybVBsYXlT
dGF0aW9uLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtUGxheVN0YXRpb24uY21h
a2UKQEAgLTgxLDcgKzgxLDYgQEAgc2V0KFdlYkNvcmVfVVNFUl9BR0VOVF9TQ1JJUFRTCiApCiAK
IGxpc3QoQVBQRU5EIFdlYkNvcmVfU1lTVEVNX0lOQ0xVREVfRElSRUNUT1JJRVMKLSAgICAke0lD
VV9JTkNMVURFX0RJUlN9CiAgICAgJHtMSUJYTUwyX0lOQ0xVREVfRElSfQogICAgICR7U1FMSVRF
X0lOQ0xVREVfRElSfQogICAgICR7WkxJQl9JTkNMVURFX0RJUlN9CkBAIC04OSw3ICs4OCw2IEBA
IGxpc3QoQVBQRU5EIFdlYkNvcmVfU1lTVEVNX0lOQ0xVREVfRElSRUNUT1JJRVMKICkKIAogbGlz
dChBUFBFTkQgV2ViQ29yZV9MSUJSQVJJRVMKLSAgICAke0lDVV9MSUJSQVJJRVN9CiAgICAgJHtM
SUJYTUwyX0xJQlJBUklFU30KICAgICAke1NRTElURV9MSUJSQVJJRVN9CiAgICAgJHtaTElCX0xJ
QlJBUklFU30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtV1BFLmNtYWtlIGIv
U291cmNlL1dlYkNvcmUvUGxhdGZvcm1XUEUuY21ha2UKaW5kZXggMWNhZDBlNjE3ZmIuLjQxMDBj
ODE1MjU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybVdQRS5jbWFrZQorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybVdQRS5jbWFrZQpAQCAtNTIsNyArNTIsNiBAQCBsaXN0
KEFQUEVORCBXZWJDb3JlX0xJQlJBUklFUwogICAgICR7R0xJQl9HTU9EVUxFX0xJQlJBUklFU30K
ICAgICAke0dMSUJfR09CSkVDVF9MSUJSQVJJRVN9CiAgICAgJHtHTElCX0xJQlJBUklFU30KLSAg
ICAke0lDVV9MSUJSQVJJRVN9CiAgICAgJHtMSUJUQVNOMV9MSUJSQVJJRVN9CiAgICAgJHtVUE9X
RVJHTElCX0xJQlJBUklFU30KICAgICAke1dQRV9MSUJSQVJJRVN9CkBAIC02MSw3ICs2MCw2IEBA
IGxpc3QoQVBQRU5EIFdlYkNvcmVfTElCUkFSSUVTCiBsaXN0KEFQUEVORCBXZWJDb3JlX1NZU1RF
TV9JTkNMVURFX0RJUkVDVE9SSUVTCiAgICAgJHtHSU9fVU5JWF9JTkNMVURFX0RJUlN9CiAgICAg
JHtHTElCX0lOQ0xVREVfRElSU30KLSAgICAke0lDVV9JTkNMVURFX0RJUlN9CiAgICAgJHtMSUJU
QVNOMV9JTkNMVURFX0RJUlN9CiAgICAgJHtVUE9XRVJHTElCX0lOQ0xVREVfRElSU30KICAgICAk
e1dQRV9JTkNMVURFX0RJUlN9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViRHJpdmVyL0NoYW5nZUxv
ZyBiL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nCmluZGV4IGUzOGI3YmM1ZTJkLi5hYjQzY2Jk
MDcyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkRyaXZlci9DaGFuZ2VMb2cKKysrIGIvU291cmNl
L1dlYkRyaXZlci9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxOS0wNS0xNyAgRG9uIE9s
bXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29tPgorCisgICAgICAgIFtDTWFrZV0gVXNlIGJ1
aWx0aW4gRmluZElDVQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MTk3OTM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgUmVtb3ZlIHVzZXMgb2YgSUNVX0lOQ0xVREVfRElSUyBhbmQgSUNVX0xJQlJBUklFUy4K
KworICAgICAgICAqIFBsYXRmb3JtV1BFLmNtYWtlOgorCiAyMDE5LTA0LTE0ICBEb24gT2xtc3Rl
YWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CiAKICAgICAgICAgW0NNYWtlXSBKYXZhU2NyaXB0
Q29yZSBkZXJpdmVkIHNvdXJjZXMgc2hvdWxkIG9ubHkgYmUgcmVmZXJlbmNlZCBpbnNpZGUgSmF2
YVNjcmlwdENvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvUGxhdGZvcm1XUEUuY21h
a2UgYi9Tb3VyY2UvV2ViRHJpdmVyL1BsYXRmb3JtV1BFLmNtYWtlCmluZGV4IGJhMjE3OTg5OGE1
Li5iZDNjZDgxMWJkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkRyaXZlci9QbGF0Zm9ybVdQRS5j
bWFrZQorKysgYi9Tb3VyY2UvV2ViRHJpdmVyL1BsYXRmb3JtV1BFLmNtYWtlCkBAIC0yLDcgKzIs
NiBAQCBzZXQoV2ViRHJpdmVyX1Byb2Nlc3NfT1VUUFVUX05BTUUgV1BFV2ViRHJpdmVyKQogCiBs
aXN0KEFQUEVORCBXZWJEcml2ZXJfU1lTVEVNX0lOQ0xVREVfRElSRUNUT1JJRVMKICAgICAiJHtH
TElCX0lOQ0xVREVfRElSU30iCi0gICAgIiR7SUNVX0lOQ0xVREVfRElSU30iCiAgICAgIiR7TElC
U09VUF9JTkNMVURFX0RJUlN9IgogKQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NNYWtl
TGlzdHMudHh0IGIvU291cmNlL1dlYktpdC9DTWFrZUxpc3RzLnR4dAppbmRleCA0YjBiZWM3Y2I4
MC4uMzEwZjE2OThjZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ01ha2VMaXN0cy50eHQK
KysrIGIvU291cmNlL1dlYktpdC9DTWFrZUxpc3RzLnR4dApAQCAtOTgsMTAgKzk4LDYgQEAgc2V0
KFdlYktpdF9JTkNMVURFX0RJUkVDVE9SSUVTCiAKIHNldChQUk9UT0NPTF9HRU5FUkFUT1JfU0NS
SVBUU19ESVIgIiR7SkFWQVNDUklQVENPUkVfRElSfS9pbnNwZWN0b3Ivc2NyaXB0cyIpCiAKLXNl
dChXZWJLaXRfU1lTVEVNX0lOQ0xVREVfRElSRUNUT1JJRVMKLSAgICAke0lDVV9JTkNMVURFX0RJ
UlN9Ci0pCi0KIGxpc3QoQVBQRU5EIFdlYktpdF9VTklGSUVEX1NPVVJDRV9MSVNUX0ZJTEVTCiAg
ICAgIlNvdXJjZXMudHh0IgogKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cg
Yi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBmOWFiNDc3YjY0Yy4uODdhMDY5NmRlMjkg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMDUtMTcgIERvbiBPbG1zdGVhZCAgPGRv
bi5vbG1zdGVhZEBzb255LmNvbT4KKworICAgICAgICBbQ01ha2VdIFVzZSBidWlsdGluIEZpbmRJ
Q1UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Nzkz
NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92
ZSB1c2VzIG9mIElDVV9JTkNMVURFX0RJUlMgYW5kIElDVV9MSUJSQVJJRVMuCisKKyAgICAgICAg
KiBDTWFrZUxpc3RzLnR4dDoKKwogMjAxOS0wNS0xNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0Bh
cHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogdXNlciBnZXN0dXJlIHRvZ2dsZSBz
aG91bGQgYWxzbyBmb3JjZSB1c2VyIGludGVyYWN0aW9uIGZsYWcKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXRMZWdhY3kvQ01ha2VMaXN0cy50eHQgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L0NNYWtl
TGlzdHMudHh0CmluZGV4IGIwYzc3ZGRlYmZmLi45NjBhOTcwZWJiMCAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYktpdExlZ2FjeS9DTWFrZUxpc3RzLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5
L0NNYWtlTGlzdHMudHh0CkBAIC0yNSwxMCArMjUsNiBAQCBzZXQoV2ViS2l0TGVnYWN5X1BSSVZB
VEVfSU5DTFVERV9ESVJFQ1RPUklFUwogICAgICIke1dlYktpdExlZ2FjeV9ERVJJVkVEX1NPVVJD
RVNfRElSfSIKICkKIAotc2V0KFdlYktpdExlZ2FjeV9TWVNURU1fSU5DTFVERV9ESVJFQ1RPUklF
UwotICAgICIke0lDVV9JTkNMVURFX0RJUlN9IgotKQotCiBzZXQoV2ViS2l0TGVnYWN5X0xJQlJB
UklFUwogICAgIFBSSVZBVEUgSmF2YVNjcmlwdENvcmUke0RFQlVHX1NVRkZJWH0KICAgICBQUklW
QVRFIFdlYkNvcmUke0RFQlVHX1NVRkZJWH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdh
Y3kvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9DaGFuZ2VMb2cKaW5kZXggNjk3OTBl
OGU0NWYuLmQzMmYzZDU5ZWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L0NoYW5n
ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBA
CisyMDE5LTA1LTE3ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CisKKyAg
ICAgICAgW0NNYWtlXSBVc2UgYnVpbHRpbiBGaW5kSUNVCisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTc5MzQKKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdXNlcyBvZiBJQ1VfSU5DTFVERV9ESVJT
IGFuZCBJQ1VfTElCUkFSSUVTLgorCisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6CisgICAgICAg
ICogUGxhdGZvcm1XaW4uY21ha2U6CisKIDIwMTktMDUtMDMgIENvbW1pdCBRdWV1ZSAgPGNvbW1p
dC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIy
NDQ4ODEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L1BsYXRmb3JtV2luLmNtYWtl
IGIvU291cmNlL1dlYktpdExlZ2FjeS9QbGF0Zm9ybVdpbi5jbWFrZQppbmRleCA3NDA4OTI4YmYx
OC4uYjQwNWQ2ZDgwYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvUGxhdGZvcm1X
aW4uY21ha2UKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9QbGF0Zm9ybVdpbi5jbWFrZQpAQCAt
MjQsOCArMjQsNiBAQCBlbHNlICgpCiAgICAgICAgIFBSSVZBVEUgQ29yZVRleHQke0RFQlVHX1NV
RkZJWH0KICAgICAgICAgUFJJVkFURSBRdWFydHpDb3JlJHtERUJVR19TVUZGSVh9CiAgICAgICAg
IFBSSVZBVEUgbGliZGlzcGF0Y2gke0RFQlVHX1NVRkZJWH0KLSAgICAgICAgUFJJVkFURSBsaWJp
Y3VpbiR7REVCVUdfU1VGRklYfQotICAgICAgICBQUklWQVRFIGxpYmljdXVjJHtERUJVR19TVUZG
SVh9CiAgICAgICAgIFBSSVZBVEUgJHtMSUJYTUwyX0xJQlJBUklFU30KICAgICAgICAgUFJJVkFU
RSAke0xJQlhTTFRfTElCUkFSSUVTfQogICAgICAgICBQUklWQVRFICR7U1FMSVRFX0xJQlJBUklF
U30KZGlmZiAtLWdpdCBhL1NvdXJjZS9jbWFrZS9GaW5kSUNVLmNtYWtlIGIvU291cmNlL2NtYWtl
L0ZpbmRJQ1UuY21ha2UKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGY5ZDc5YzE5MTQz
Li4wMDAwMDAwMDAwMAotLS0gYS9Tb3VyY2UvY21ha2UvRmluZElDVS5jbWFrZQorKysgL2Rldi9u
dWxsCkBAIC0xLDExMCArMCwwIEBACi0jIEZpbmRzIHRoZSBJbnRlcm5hdGlvbmFsIENvbXBvbmVu
dHMgZm9yIFVuaWNvZGUgKElDVSkgTGlicmFyeQotIwotIyAgSUNVX0ZPVU5EICAgICAgICAgIC0g
VHJ1ZSBpZiBJQ1UgZm91bmQuCi0jICBJQ1VfSTE4Tl9GT1VORCAgICAgLSBUcnVlIGlmIElDVSdz
IGludGVybmF0aW9uYWxpemF0aW9uIGxpYnJhcnkgZm91bmQuCi0jICBJQ1VfSU5DTFVERV9ESVJT
ICAgLSBEaXJlY3RvcnkgdG8gaW5jbHVkZSB0byBnZXQgSUNVIGhlYWRlcnMKLSMgICAgICAgICAg
ICAgICAgICAgICAgIE5vdGU6IGFsd2F5cyBpbmNsdWRlIElDVSBoZWFkZXJzIGFzLCBlLmcuLAot
IyAgICAgICAgICAgICAgICAgICAgICAgdW5pY29kZS91dHlwZXMuaAotIyAgSUNVX0xJQlJBUklF
UyAgICAgIC0gTGlicmFyaWVzIHRvIGxpbmsgYWdhaW5zdCBmb3IgdGhlIGNvbW1vbiBJQ1UKLSMg
IElDVV9JMThOX0xJQlJBUklFUyAtIExpYnJhcmllcyB0byBsaW5rIGFnYWluc3QgZm9yIElDVSBp
bnRlcm5hdGlvbmFsaWF0aW9uCi0jICAgICAgICAgICAgICAgICAgICAgICAobm90ZTogaW4gYWRk
aXRpb24gdG8gSUNVX0xJQlJBUklFUykKLQotZmluZF9wYWNrYWdlKFBrZ0NvbmZpZykKLXBrZ19j
aGVja19tb2R1bGVzKFBDX0lDVSBpY3UtdWMpCi0KLSMgTG9vayBmb3IgdGhlIGhlYWRlciBmaWxl
LgotZmluZF9wYXRoKAotICAgIElDVV9JTkNMVURFX0RJUgotICAgIE5BTUVTIHVuaWNvZGUvdXR5
cGVzLmgKLSAgICBISU5UUyAke1BDX0lDVV9JTkNMVURFX0RJUlN9Ci0gICAgICAgICAgJHtQQ19J
Q1VfSU5DTFVERURJUn0KLSAgICAgICAgICAke1dFQktJVF9MSUJSQVJJRVNfSU5DTFVERV9ESVJ9
Ci0gICAgRE9DICJJbmNsdWRlIGRpcmVjdG9yeSBmb3IgdGhlIElDVSBsaWJyYXJ5IikKLW1hcmtf
YXNfYWR2YW5jZWQoSUNVX0lOQ0xVREVfRElSKQotCi0jIExvb2sgZm9yIHRoZSBsaWJyYXJ5Lgot
ZmluZF9saWJyYXJ5KAotICAgIElDVV9MSUJSQVJZCi0gICAgTkFNRVMgbGliaWN1dWMgY3lnaWN1
dWMgY3lnaWN1dWMzMiBpY3V1YwotICAgIEhJTlRTICR7UENfSUNVX0xJQlJBUllfRElSU30KLSAg
ICAgICAgICAke1BDX0lDVV9MSUJESVJ9Ci0gICAgICAgICAgJHtXRUJLSVRfTElCUkFSSUVTX0xJ
TktfRElSfQotICAgIERPQyAiTGlicmFyaWVzIHRvIGxpbmsgYWdhaW5zdCBmb3IgdGhlIGNvbW1v
biBwYXJ0cyBvZiBJQ1UiKQotbWFya19hc19hZHZhbmNlZChJQ1VfTElCUkFSWSkKLQotIyBDb3B5
IHRoZSByZXN1bHRzIHRvIHRoZSBvdXRwdXQgdmFyaWFibGVzLgotaWYgKElDVV9JTkNMVURFX0RJ
UiBBTkQgSUNVX0xJQlJBUlkpCi0gICAgc2V0KElDVV9GT1VORCAxKQotICAgIHNldChJQ1VfTElC
UkFSSUVTICR7SUNVX0xJQlJBUll9KQotICAgIHNldChJQ1VfSU5DTFVERV9ESVJTICR7SUNVX0lO
Q0xVREVfRElSfSkKLQotICAgIHNldChJQ1VfVkVSU0lPTiAwKQotICAgIHNldChJQ1VfTUFKT1Jf
VkVSU0lPTiAwKQotICAgIHNldChJQ1VfTUlOT1JfVkVSU0lPTiAwKQotICAgIGZpbGUoUkVBRCAi
JHtJQ1VfSU5DTFVERV9ESVJ9L3VuaWNvZGUvdXZlcnNpb24uaCIgX0lDVV9WRVJTSU9OX0NPTkVO
VFMpCi0gICAgc3RyaW5nKFJFR0VYIFJFUExBQ0UgIi4qI2RlZmluZSBVX0lDVV9WRVJTSU9OX01B
Sk9SX05VTSAoWzAtOV0rKS4qIiAiXFwxIiBJQ1VfTUFKT1JfVkVSU0lPTiAiJHtfSUNVX1ZFUlNJ
T05fQ09ORU5UU30iKQotICAgIHN0cmluZyhSRUdFWCBSRVBMQUNFICIuKiNkZWZpbmUgVV9JQ1Vf
VkVSU0lPTl9NSU5PUl9OVU0gKFswLTldKykuKiIgIlxcMSIgSUNVX01JTk9SX1ZFUlNJT04gIiR7
X0lDVV9WRVJTSU9OX0NPTkVOVFN9IikKLQotICAgIHNldChJQ1VfVkVSU0lPTiAiJHtJQ1VfTUFK
T1JfVkVSU0lPTn0uJHtJQ1VfTUlOT1JfVkVSU0lPTn0iKQotCi0gICAgIyBMb29rIGZvciB0aGUg
SUNVIGludGVybmF0aW9uYWxpemF0aW9uIGxpYnJhcmllcwotICAgIHBrZ19jaGVja19tb2R1bGVz
KFBDX0lDVV9JMThOIGljdS1pMThuKQotICAgIGZpbmRfbGlicmFyeSgKLSAgICAgICAgSUNVX0kx
OE5fTElCUkFSWQotICAgICAgICBOQU1FUyBpY3VpMThuIGxpYmljdWkxOG4gbGliaWN1aW4gY3ln
aWN1aW4gY3lnaWN1aW4zMiBpY3VpbgotICAgICAgICBISU5UUyAke1BDX0lDVV9JMThOX0xJQlJB
UllfRElSU30KLSAgICAgICAgICAgICAgJHtQQ19JQ1VfSTE4Tl9MSUJESVJ9Ci0gICAgICAgICAg
ICAgICR7V0VCS0lUX0xJQlJBUklFU19MSU5LX0RJUn0KLSAgICAgICAgRE9DICJMaWJyYXJpZXMg
dG8gbGluayBhZ2FpbnN0IGZvciBJQ1UgaW50ZXJuYXRpb25hbGl6YXRpb24iKQotICAgIG1hcmtf
YXNfYWR2YW5jZWQoSUNVX0kxOE5fTElCUkFSWSkKLSAgICBpZiAoSUNVX0kxOE5fTElCUkFSWSkK
LSAgICAgICAgc2V0KElDVV9JMThOX0ZPVU5EIDEpCi0gICAgICAgIHNldChJQ1VfSTE4Tl9MSUJS
QVJJRVMgJHtJQ1VfSTE4Tl9MSUJSQVJZfSkKLSAgICBlbHNlICgpCi0gICAgICAgIHNldChJQ1Vf
STE4Tl9GT1VORCAwKQotICAgICAgICBzZXQoSUNVX0kxOE5fTElCUkFSSUVTKQotICAgIGVuZGlm
ICgpCi0KLSAgICAjIExvb2sgZm9yIHRoZSBJQ1UgZGF0YSBsaWJyYXJpZXMKLSAgICBmaW5kX2xp
YnJhcnkoCi0gICAgICAgIElDVV9EQVRBX0xJQlJBUlkKLSAgICAgICAgTkFNRVMgaWN1ZGF0YSBs
aWJpY3VkYXRhIGN5Z2ljdWRhdGEgY3lnaWN1ZGF0YTMyCi0gICAgICAgIEhJTlRTICR7UENfSUNV
X0kxOE5fTElCUkFSWV9ESVJTfQotICAgICAgICAgICAgICAke1BDX0lDVV9JMThOX0xJQkRJUn0K
LSAgICAgICAgICAgICAgJHtXRUJLSVRfTElCUkFSSUVTX0xJTktfRElSfQotICAgICAgICBET0Mg
IkxpYnJhcmllcyB0byBsaW5rIGFnYWluc3QgZm9yIElDVSBkYXRhIikKLSAgICBtYXJrX2FzX2Fk
dmFuY2VkKElDVV9EQVRBX0xJQlJBUlkpCi0gICAgaWYgKElDVV9EQVRBX0xJQlJBUlkpCi0gICAg
ICAgIHNldChJQ1VfREFUQV9GT1VORCAxKQotICAgICAgICBzZXQoSUNVX0RBVEFfTElCUkFSSUVT
ICR7SUNVX0RBVEFfTElCUkFSWX0pCi0gICAgZWxzZSAoKQotICAgICAgICBzZXQoSUNVX0RBVEFf
Rk9VTkQgMCkKLSAgICAgICAgc2V0KElDVV9EQVRBX0xJQlJBUklFUykKLSAgICBlbmRpZiAoKQot
ZWxzZSAoKQotICAgIHNldChJQ1VfRk9VTkQgMCkKLSAgICBzZXQoSUNVX0kxOE5fRk9VTkQgMCkK
LSAgICBzZXQoSUNVX0RBVEFfRk9VTkQgMCkKLSAgICBzZXQoSUNVX0xJQlJBUklFUykKLSAgICBz
ZXQoSUNVX0kxOE5fTElCUkFSSUVTKQotICAgIHNldChJQ1VfREFUQV9MSUJSQVJJRVMpCi0gICAg
c2V0KElDVV9JTkNMVURFX0RJUlMpCi0gICAgc2V0KElDVV9WRVJTSU9OKQotICAgIHNldChJQ1Vf
TUFKT1JfVkVSU0lPTikKLSAgICBzZXQoSUNVX01JTk9SX1ZFUlNJT04pCi1lbmRpZiAoKQotCi1p
ZiAoSUNVX0ZPVU5EKQotICAgIGlmIChOT1QgSUNVX0ZJTkRfUVVJRVRMWSkKLSAgICAgICAgbWVz
c2FnZShTVEFUVVMgIkZvdW5kIElDVSBoZWFkZXIgZmlsZXMgaW4gJHtJQ1VfSU5DTFVERV9ESVJT
fSIpCi0gICAgICAgIG1lc3NhZ2UoU1RBVFVTICJGb3VuZCBJQ1UgbGlicmFyaWVzOiAke0lDVV9M
SUJSQVJJRVN9IikKLSAgICAgICAgbWVzc2FnZShTVEFUVVMgIkZvdW5kIElDVSBpbnRlcm5hdGlv
bmFsaWF0aW9uIGxpYnJhcmllczogJHtJQ1VfSTE4Tl9MSUJSQVJJRVN9IikKLSAgICAgICAgbWVz
c2FnZShTVEFUVVMgIkZvdW5kIElDVSBkYXRhIGxpYnJhcmllczogJHtJQ1VfREFUQV9MSUJSQVJJ
RVN9IikKLSAgICBlbmRpZiAoKQotZWxzZSAoKQotICAgIGlmIChJQ1VfRklORF9SRVFVSVJFRCkK
LSAgICAgICAgbWVzc2FnZShGQVRBTF9FUlJPUiAiQ291bGQgbm90IGZpbmQgSUNVIikKLSAgICBl
bHNlICgpCi0gICAgICAgIG1lc3NhZ2UoU1RBVFVTICJPcHRpb25hbCBwYWNrYWdlIElDVSB3YXMg
bm90IGZvdW5kIikKLSAgICBlbmRpZiAoKQotZW5kaWYgKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9j
bWFrZS9PcHRpb25zQXBwbGVXaW4uY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0FwcGxlV2lu
LmNtYWtlCmluZGV4IDgzODEwZTQ3MTNkLi5kZjEzMmY5ZjMyMCAxMDA2NDQKLS0tIGEvU291cmNl
L2NtYWtlL09wdGlvbnNBcHBsZVdpbi5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0Fw
cGxlV2luLmNtYWtlCkBAIC0xNyw2ICsxNyw4IEBAIHNldChTUUxJVEVfTElCUkFSSUVTIFNRTGl0
ZTMke0RFQlVHX1NVRkZJWH0pCiBzZXQoWkxJQl9JTkNMVURFX0RJUlMgIiR7V0VCS0lUX0xJQlJB
UklFU19ESVJ9L2luY2x1ZGUvemxpYiIpCiBzZXQoWkxJQl9MSUJSQVJJRVMgemRsbCR7REVCVUdf
U1VGRklYfSkKIAoraW5jbHVkZSh0YXJnZXQvaWN1KQorCiAjIFVuY29tbWVudCB0aGUgZm9sbG93
aW5nIGxpbmUgdG8gdHJ5IHRoZSBEaXJlY3QyRCBiYWNrZW5kLgogIyBzZXQoVVNFX0RJUkVDVDJE
IDEpCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlIGIvU291cmNl
L2NtYWtlL09wdGlvbnNHVEsuY21ha2UKaW5kZXggZDI5MGJlZmZkZDkuLmIyMWE1OGY1MmJjIDEw
MDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQorKysgYi9Tb3VyY2UvY21h
a2UvT3B0aW9uc0dUSy5jbWFrZQpAQCAtMjQsNyArMjQsNyBAQCBmaW5kX3BhY2thZ2UoTGliR2Ny
eXB0IDEuNi4wIFJFUVVJUkVEKQogZmluZF9wYWNrYWdlKEdUSzMgMy42LjAgUkVRVUlSRUQpCiBm
aW5kX3BhY2thZ2UoR0RLMyAzLjYuMCBSRVFVSVJFRCkKIGZpbmRfcGFja2FnZShIYXJmQnV6eiAw
LjkuMiBSRVFVSVJFRCkKLWZpbmRfcGFja2FnZShJQ1UgUkVRVUlSRUQpCitmaW5kX3BhY2thZ2Uo
SUNVIFJFUVVJUkVEIENPTVBPTkVOVFMgZGF0YSBpMThuIHVjKQogZmluZF9wYWNrYWdlKEpQRUcg
UkVRVUlSRUQpCiBmaW5kX3BhY2thZ2UoTGliU291cCAyLjQyLjAgUkVRVUlSRUQpCiBmaW5kX3Bh
Y2thZ2UoTGliWG1sMiAyLjguMCBSRVFVSVJFRCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9jbWFrZS9P
cHRpb25zSlNDT25seS5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zSlNDT25seS5jbWFrZQpp
bmRleCAyYWZmYWI3MjUwZC4uMTZiM2IyNTc4ODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9P
cHRpb25zSlNDT25seS5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0pTQ09ubHkuY21h
a2UKQEAgLTk2LDkgKzk2LDggQEAgZWxzZSAoKQogZW5kaWYgKCkKIAogaWYgKE5PVCBBUFBMRSkK
LSAgICBmaW5kX3BhY2thZ2UoSUNVIFJFUVVJUkVEKQorICAgIGZpbmRfcGFja2FnZShJQ1UgUkVR
VUlSRUQgQ09NUE9ORU5UUyBkYXRhIGkxOG4gdWMpCiBlbHNlICgpCiAgICAgYWRkX2RlZmluaXRp
b25zKC1EVV9ESVNBQkxFX1JFTkFNSU5HPTEgLURVX1NIT1dfQ1BMVVNQTFVTX0FQST0wKQotICAg
IHNldChJQ1VfSU5DTFVERV9ESVJTICR7Q01BS0VfQklOQVJZX0RJUn0vSUNVL0hlYWRlcnMpCi0g
ICAgc2V0KElDVV9MSUJSQVJJRVMgbGliaWN1Y29yZS5keWxpYikKKyAgICBpbmNsdWRlKHRhcmdl
dC9pY3UuY21ha2UpCiBlbmRpZiAoKQpkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNN
YWMuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc01hYy5jbWFrZQppbmRleCBmYzk0NGUxMTEz
Zi4uNjBmMTlmOTM4NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zTWFjLmNtYWtl
CisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zTWFjLmNtYWtlCkBAIC02MCw1ICs2MCw0IEBAIHNl
dChXZWJDb3JlX0xJQlJBUllfVFlQRSBTSEFSRUQpCiBzZXQoV2ViQ29yZVRlc3RTdXBwb3J0X0xJ
QlJBUllfVFlQRSBTSEFSRUQpCiAKIGFkZF9kZWZpbml0aW9ucygtRFVfRElTQUJMRV9SRU5BTUlO
Rz0xIC1EVV9TSE9XX0NQTFVTUExVU19BUEk9MCkKLXNldChJQ1VfSU5DTFVERV9ESVJTICR7Q01B
S0VfQklOQVJZX0RJUn0vSUNVL0hlYWRlcnMpCi1zZXQoSUNVX0xJQlJBUklFUyBsaWJpY3Vjb3Jl
LmR5bGliKQoraW5jbHVkZSh0YXJnZXQvaWN1LmNtYWtlKQpkaWZmIC0tZ2l0IGEvU291cmNlL2Nt
YWtlL09wdGlvbnNQbGF5U3RhdGlvbi5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zUGxheVN0
YXRpb24uY21ha2UKaW5kZXggYTRlODc5MzM5YWMuLjMzNjlhZjBmYmIwIDEwMDY0NAotLS0gYS9T
b3VyY2UvY21ha2UvT3B0aW9uc1BsYXlTdGF0aW9uLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9P
cHRpb25zUGxheVN0YXRpb24uY21ha2UKQEAgLTgwLDcgKzgwLDcgQEAgZmluZF9wYWNrYWdlKEVH
TCBSRVFVSVJFRCkKIGZpbmRfcGFja2FnZShGb250Y29uZmlnIFJFUVVJUkVEKQogZmluZF9wYWNr
YWdlKEZyZWV0eXBlIFJFUVVJUkVEKQogZmluZF9wYWNrYWdlKEhhcmZCdXp6IFJFUVVJUkVEKQot
ZmluZF9wYWNrYWdlKElDVSBSRVFVSVJFRCkKK2ZpbmRfcGFja2FnZShJQ1UgUkVRVUlSRUQgQ09N
UE9ORU5UUyBkYXRhIGkxOG4gdWMpCiBmaW5kX3BhY2thZ2UoSlBFRyBSRVFVSVJFRCkKIGZpbmRf
cGFja2FnZShMaWJQU0wgUkVRVUlSRUQpCiBmaW5kX3BhY2thZ2UoTGliWG1sMiBSRVFVSVJFRCkK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9jbWFrZS9PcHRpb25zV1BFLmNtYWtlIGIvU291cmNlL2NtYWtl
L09wdGlvbnNXUEUuY21ha2UKaW5kZXggNWY3ZjJmNjJkY2UuLmM3MTQ1NmFlN2JmIDEwMDY0NAot
LS0gYS9Tb3VyY2UvY21ha2UvT3B0aW9uc1dQRS5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0
aW9uc1dQRS5jbWFrZQpAQCAtMTcsNyArMTcsNyBAQCBmaW5kX3BhY2thZ2UoRm9udGNvbmZpZyAy
LjguMCBSRVFVSVJFRCkKIGZpbmRfcGFja2FnZShGcmVldHlwZSAyLjQuMiBSRVFVSVJFRCkKIGZp
bmRfcGFja2FnZShHTElCIDIuNDAuMCBSRVFVSVJFRCBDT01QT05FTlRTIGdpbyBnaW8tdW5peCBn
b2JqZWN0IGd0aHJlYWQgZ21vZHVsZSkKIGZpbmRfcGFja2FnZShIYXJmQnV6eiAwLjkuMTggUkVR
VUlSRUQpCi1maW5kX3BhY2thZ2UoSUNVIFJFUVVJUkVEKQorZmluZF9wYWNrYWdlKElDVSBSRVFV
SVJFRCBDT01QT05FTlRTIGRhdGEgaTE4biB1YykKIGZpbmRfcGFja2FnZShKUEVHIFJFUVVJUkVE
KQogZmluZF9wYWNrYWdlKExpYkVwb3h5IDEuNC4wIFJFUVVJUkVEKQogZmluZF9wYWNrYWdlKExp
YkdjcnlwdCAxLjYuMCBSRVFVSVJFRCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9jbWFrZS9PcHRpb25z
V2luLmNtYWtlIGIvU291cmNlL2NtYWtlL09wdGlvbnNXaW4uY21ha2UKaW5kZXggYjZjMTM4NjIz
MjEuLjNlOGY3Njk3N2E1IDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvT3B0aW9uc1dpbi5jbWFr
ZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc1dpbi5jbWFrZQpAQCAtMTY0LDggKzE2NCw2IEBA
IGlmIChOT1QgRU5BQkxFX1VOSUZJRURfQlVJTERTIEFORCBXZWJDb3JlX0xJQlJBUllfVFlQRSBN
QVRDSEVTIFNUQVRJQykKICAgICBzZXQoV2ViQ29yZV9MSUJSQVJZX1RZUEUgT0JKRUNUKQogZW5k
aWYgKCkKIAotZmluZF9wYWNrYWdlKElDVSBSRVFVSVJFRCkKLQogIyBJZiA8d2luc29jazIuaD4g
aXMgbm90IGluY2x1ZGVkIGJlZm9yZSA8d2luZG93cy5oPiByZWRlZmluaXRpb24gZXJyb3JzIG9j
Y3VyCiAjIHVubGVzcyBfV0lOU09DS0FQSV8gaXMgZGVmaW5lZCBiZWZvcmUgPHdpbmRvd3MuaD4g
aXMgaW5jbHVkZWQKIGFkZF9kZWZpbml0aW9ucygtRF9XSU5TT0NLQVBJXz0pCmRpZmYgLS1naXQg
YS9Tb3VyY2UvY21ha2UvT3B0aW9uc1dpbkNhaXJvLmNtYWtlIGIvU291cmNlL2NtYWtlL09wdGlv
bnNXaW5DYWlyby5jbWFrZQppbmRleCBhNzE2ZWM2ZjBlYS4uMGZiYWQ5NTQ1YzAgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zV2luQ2Fpcm8uY21ha2UKKysrIGIvU291cmNlL2NtYWtl
L09wdGlvbnNXaW5DYWlyby5jbWFrZQpAQCAtNCw2ICs0LDcgQEAgaW5jbHVkZShPcHRpb25zV2lu
KQogCiBmaW5kX3BhY2thZ2UoQ2Fpcm8gMS4xNS4xMiBSRVFVSVJFRCkKIGZpbmRfcGFja2FnZShD
VVJMIDcuNjAuMCBSRVFVSVJFRCkKK2ZpbmRfcGFja2FnZShJQ1UgUkVRVUlSRUQgQ09NUE9ORU5U
UyBkYXRhIGkxOG4gdWMpCiBmaW5kX3BhY2thZ2UoSlBFRyAxLjUuMiBSRVFVSVJFRCkKIGZpbmRf
cGFja2FnZShMaWJYbWwyIDIuOS43IFJFUVVJUkVEKQogZmluZF9wYWNrYWdlKE9wZW5TU0wgMi4w
LjAgUkVRVUlSRUQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvdGFyZ2V0L2ljdS5jbWFrZSBi
L1NvdXJjZS9jbWFrZS90YXJnZXQvaWN1LmNtYWtlCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4
IDAwMDAwMDAwMDAwLi4wOTJlYmE1NWVlMgotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9jbWFr
ZS90YXJnZXQvaWN1LmNtYWtlCkBAIC0wLDAgKzEsNDggQEAKKyMgQXBwbGUgcG9ydHMgcHJvdmlk
ZSB0aGVpciBvd24gSUNVIHRoYXQgY2FuJ3QgYmUgZm91bmQgYnkgZmluZF9wYWNrYWdlKElDVSku
CisjIFRoaXMgZmlsZSB3aWxsIGNyZWF0ZSB0YXJnZXRzIHRoYXQgd291bGQgYmUgY3JlYXRlZCBi
eSBmaW5kX3BhY2thZ2UoSUNVKS4KK2lmIChOT1QgVEFSR0VUIElDVTo6ZGF0YSkKKyAgICBpZiAo
QVBQTEUpCisgICAgICAgIHNldChJQ1VfSU5DTFVERV9ESVJTICR7Q01BS0VfQklOQVJZX0RJUn0v
SUNVL0hlYWRlcnMpCisKKyAgICAgICAgIyBBcHBsZSBqdXN0IGhhcyBhIHNpbmdsZSBkeWxpYiBm
b3IgSUNVCisgICAgICAgIHNldChJQ1VfSTE4Tl9MSUJSQVJZIGxpYmljdWNvcmUuZHlsaWIpCisg
ICAgICAgIHNldChJQ1VfVUNfTElCUkFSWSBsaWJpY3Vjb3JlLmR5bGliKQorICAgICAgICBzZXQo
SUNVX0RBVEFfTElCUkFSWSBsaWJpY3Vjb3JlLmR5bGliKQorCisgICAgICAgIHNldChJQ1VfTElC
UkFSSUVTICR7SUNVX1VDX0xJQlJBUll9KQorICAgIGVsc2VpZiAoV0lOMzIgQU5EIE5PVCBXVEZf
UExBVEZPUk1fV0lOX0NBSVJPKQorICAgICAgICBzZXQoSUNVX0lOQ0xVREVfRElSUyAke1dFQktJ
VF9MSUJSQVJJRVNfSU5DTFVERV9ESVJ9KQorCisgICAgICAgIHNldChJQ1VfSTE4Tl9MSUJSQVJZ
ICR7V0VCS0lUX0xJQlJBUklFU19MSU5LX0RJUn0vbGliaWN1aW4ke0RFQlVHX1NVRkZJWH0ubGli
KQorICAgICAgICBzZXQoSUNVX1VDX0xJQlJBUlkgJHtXRUJLSVRfTElCUkFSSUVTX0xJTktfRElS
fS9saWJpY3V1YyR7REVCVUdfU1VGRklYfS5saWIpCisKKyAgICAgICAgIyBBcHBsZVdpbiBkb2Vz
IG5vdCBwcm92aWRlIGEgc2VwYXJhdGUgZGF0YSBsaWJyYXJ5CisgICAgICAgIHNldChJQ1VfREFU
QV9MSUJSQVJZICR7SUNVX1VDX0xJQlJBUll9KQorCisgICAgICAgIHNldChJQ1VfTElCUkFSSUVT
ICR7SUNVX0kxOE5fTElCUkFSWX0gJHtJQ1VfVUNfTElCUkFSWX0pCisgICAgZWxzZSAoKQorICAg
ICAgICBtZXNzYWdlKEZBVEFMX0VSUk9SICJDb3VsZCBub3QgZmluZCBJQ1UgdGFyZ2V0cy4gVXNl
IGZpbmRfcGFja2FnZShJQ1UgUkVRVUlSRUQgZGF0YSBpMW44IHVjKSIpCisgICAgZW5kaWYgKCkK
KworICAgICMgRW11bGF0ZSBJQ1U6OiB0YXJnZXRzCisgICAgYWRkX2xpYnJhcnkoSUNVOjpkYXRh
IFVOS05PV04gSU1QT1JURUQpCisgICAgc2V0X3RhcmdldF9wcm9wZXJ0aWVzKElDVTo6ZGF0YSBQ
Uk9QRVJUSUVTCisgICAgICAgIElOVEVSRkFDRV9JTkNMVURFX0RJUkVDVE9SSUVTICIke0lDVV9J
TkNMVURFX0RJUlN9IgorICAgICAgICBJTVBPUlRFRF9MSU5LX0lOVEVSRkFDRV9MQU5HVUFHRVMg
IkNYWCIKKyAgICAgICAgSU1QT1JURURfTE9DQVRJT04gIiR7SUNVX0RBVEFfTElCUkFSWX0iCisg
ICAgKQorCisgICAgYWRkX2xpYnJhcnkoSUNVOjppMThuIFVOS05PV04gSU1QT1JURUQpCisgICAg
c2V0X3RhcmdldF9wcm9wZXJ0aWVzKElDVTo6aTE4biBQUk9QRVJUSUVTCisgICAgICAgIElOVEVS
RkFDRV9JTkNMVURFX0RJUkVDVE9SSUVTICIke0lDVV9JTkNMVURFX0RJUlN9IgorICAgICAgICBJ
TVBPUlRFRF9MSU5LX0lOVEVSRkFDRV9MQU5HVUFHRVMgIkNYWCIKKyAgICAgICAgSU1QT1JURURf
TE9DQVRJT04gIiR7SUNVX0kxOE5fTElCUkFSWX0iCisgICAgKQorCisgICAgYWRkX2xpYnJhcnko
SUNVOjp1YyBVTktOT1dOIElNUE9SVEVEKQorICAgIHNldF90YXJnZXRfcHJvcGVydGllcyhJQ1U6
OnVjIFBST1BFUlRJRVMKKyAgICAgICAgSU5URVJGQUNFX0lOQ0xVREVfRElSRUNUT1JJRVMgIiR7
SUNVX0lOQ0xVREVfRElSU30iCisgICAgICAgIElNUE9SVEVEX0xJTktfSU5URVJGQUNFX0xBTkdV
QUdFUyAiQ1hYIgorICAgICAgICBJTVBPUlRFRF9MT0NBVElPTiAiJHtJQ1VfVUNfTElCUkFSWX0i
CisgICAgKQorZW5kaWYgKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No
YW5nZUxvZwppbmRleCA5MTIwOTNmMGZmZS4uM2QxZjIzNjA2ZTAgMTAwNjQ0Ci0tLSBhL1Rvb2xz
L0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxOS0w
NS0xNyAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29tPgorCisgICAgICAgIFtD
TWFrZV0gVXNlIGJ1aWx0aW4gRmluZElDVQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MTk3OTM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP
T1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHVzZXMgb2YgSUNVX0lOQ0xVREVfRElSUyBhbmQgSUNV
X0xJQlJBUklFUy4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvUGxhdGZvcm1NYWMuY21ha2U6
CisgICAgICAgICogVGVzdFdlYktpdEFQSS9QbGF0Zm9ybVBsYXlTdGF0aW9uLmNtYWtlOgorICAg
ICAgICAqIFRlc3RXZWJLaXRBUEkvUGxhdGZvcm1XaW4uY21ha2U6CisgICAgICAgICogV2ViS2l0
VGVzdFJ1bm5lci9DTWFrZUxpc3RzLnR4dDoKKwogMjAxOS0wNS0xNSAgQWFrYXNoIEphaW4gIDxh
YWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVwbGFjZSBkb3VibGUtcXVvdGVzIHdp
dGggc2luZ2xlIHF1b3RlcyBpbiBzdGVwcy5weQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp
dEFQSS9QbGF0Zm9ybU1hYy5jbWFrZSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvUGxhdGZvcm1NYWMu
Y21ha2UKaW5kZXggNGUyOTVkNjRjN2QuLjM4OTI1ZGM4OWI0IDEwMDY0NAotLS0gYS9Ub29scy9U
ZXN0V2ViS2l0QVBJL1BsYXRmb3JtTWFjLmNtYWtlCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv
UGxhdGZvcm1NYWMuY21ha2UKQEAgLTE3LDcgKzE3LDYgQEAgbGlzdChBUFBFTkQgdGVzdF93dGZf
TElCUkFSSUVTCiAgICAgJHtDQVJCT05fTElCUkFSWX0KICAgICAke0NPQ09BX0xJQlJBUll9CiAg
ICAgJHtDT1JFRk9VTkRBVElPTl9MSUJSQVJZfQotICAgICR7SUNVX0xJQlJBUklFU30KICkKIAog
bGlzdChBUFBFTkQgVGVzdFdlYktpdEFQSV9MSUJSQVJJRVMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rl
c3RXZWJLaXRBUEkvUGxhdGZvcm1QbGF5U3RhdGlvbi5jbWFrZSBiL1Rvb2xzL1Rlc3RXZWJLaXRB
UEkvUGxhdGZvcm1QbGF5U3RhdGlvbi5jbWFrZQppbmRleCBhYmI4NjkwZjgwYS4uOTUyZDA0M2Yw
NjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvUGxhdGZvcm1QbGF5U3RhdGlvbi5j
bWFrZQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1BsYXRmb3JtUGxheVN0YXRpb24uY21ha2UK
QEAgLTEwLDEwICsxMCw2IEBAIGxpc3QoQVBQRU5EIFRlc3RXVEZfU09VUkNFUwogICAgIGdlbmVy
aWMvVXRpbGl0aWVzR2VuZXJpYy5jcHAKICkKIAotbGlzdChBUFBFTkQgVGVzdFdURl9QUklWQVRF
X0lOQ0xVREVfRElSRUNUT1JJRVMKLSAgICAke0lDVV9JTkNMVURFX0RJUlN9Ci0pCi0KIGxpc3Qo
QVBQRU5EIFRlc3RXZWJDb3JlX1NPVVJDRVMKICAgICAke3Rlc3RfbWFpbl9TT1VSQ0VTfQogKQpk
aWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9QbGF0Zm9ybVdpbi5jbWFrZSBiL1Rvb2xz
L1Rlc3RXZWJLaXRBUEkvUGxhdGZvcm1XaW4uY21ha2UKaW5kZXggNjUxZWExNTg0ODcuLjRhYTdj
ZDk1MDYxIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1BsYXRmb3JtV2luLmNtYWtl
CisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvUGxhdGZvcm1XaW4uY21ha2UKQEAgLTc4LDggKzc4
LDYgQEAgZWxzZSAoKQogICAgICAgICBXZWJLaXRRdWFydHpDb3JlQWRkaXRpb25zJHtERUJVR19T
VUZGSVh9CiAgICAgICAgIGxpYmRpc3BhdGNoJHtERUJVR19TVUZGSVh9CiAgICAgICAgIGxpYmV4
c2x0JHtERUJVR19TVUZGSVh9Ci0gICAgICAgIGxpYmljdWluJHtERUJVR19TVUZGSVh9Ci0gICAg
ICAgIGxpYmljdXVjJHtERUJVR19TVUZGSVh9CiAgICAgKQogZW5kaWYgKCkKIApkaWZmIC0tZ2l0
IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9DTWFrZUxpc3RzLnR4dCBiL1Rvb2xzL1dlYktpdFRl
c3RSdW5uZXIvQ01ha2VMaXN0cy50eHQKaW5kZXggMzRmZjY0YWFmOGUuLjYzMmFhMGIwNjc1IDEw
MDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0NNYWtlTGlzdHMudHh0CisrKyBiL1Rv
b2xzL1dlYktpdFRlc3RSdW5uZXIvQ01ha2VMaXN0cy50eHQKQEAgLTUxLDcgKzUxLDYgQEAgc2V0
KFdlYktpdFRlc3RSdW5uZXJfSU5DTFVERV9ESVJFQ1RPUklFUwogCiBzZXQoV2ViS2l0VGVzdFJ1
bm5lcl9TWVNURU1fSU5DTFVERV9ESVJFQ1RPUklFUwogICAgICR7TElCU09VUF9JTkNMVURFX0RJ
UlN9Ci0gICAgJHtJQ1VfSU5DTFVERV9ESVJTfQogKQogCiBzZXQoV2ViS2l0VGVzdFJ1bm5lcklu
amVjdGVkQnVuZGxlX1NPVVJDRVMK
</data>

          </attachment>
      

    </bug>

</bugzilla>