<?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>144746</bug_id>
          
          <creation_ts>2015-05-07 09:07:37 -0700</creation_ts>
          <short_desc>REGRESSION(r183416): [GTK] Checks for DEVELOPMENT_BUILD are all wrong</short_desc>
          <delta_ts>2015-05-08 13:31:13 -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>WebKitGTK</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>PC</rep_platform>
          <op_sys>Linux</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>Gtk, Regression</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          <dependson>144789</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Michael Catanzaro">mcatanzaro</reporter>
          <assigned_to name="Michael Catanzaro">mcatanzaro</assigned_to>
          <cc>cgarcia</cc>
    
    <cc>commit-queue</cc>
    
    <cc>lantw44</cc>
    
    <cc>mcatanzaro</cc>
    
    <cc>mrobinson</cc>
    
    <cc>tpopela</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1092600</commentid>
    <comment_count>0</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-05-07 09:07:37 -0700</bug_when>
    <thetext>/builddir/build/BUILD/webkitgtk-2.9.1/Tools/MiniBrowser/gtk/main.c: In function &apos;main&apos;:
/builddir/build/BUILD/webkitgtk-2.9.1/Tools/MiniBrowser/gtk/main.c:260:45: error: &apos;WEBKIT_INJECTED_BUNDLE_PATH&apos; undeclared (first use in this function)
     g_setenv(&quot;WEBKIT_INJECTED_BUNDLE_PATH&quot;, WEBKIT_INJECTED_BUNDLE_PATH, FALSE);</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092606</commentid>
    <comment_count>1</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-05-07 09:18:47 -0700</bug_when>
    <thetext>#if defined(DEVELOPMENT_BUILD)
    g_setenv(&quot;WEBKIT_INJECTED_BUNDLE_PATH&quot;, WEBKIT_INJECTED_BUNDLE_PATH, FALSE);
#endif

The problem is that WEBKIT_INJECTED_BUNDLE_PATH is only defined when DEVELOPMENT_BUILD is on. Previously DEVELOPMENT_BUILD was defined only for development builds, but now it is defined to 0 when off (using the new SET_AND_EXPOSE_TO_BUILD macro).

Possible fixes:

#if DEVELOPMENT_BUILD
    g_setenv(&quot;WEBKIT_INJECTED_BUNDLE_PATH&quot;, WEBKIT_INJECTED_BUNDLE_PATH, FALSE);
#endif

or:

#ifdef WEBKIT_INJECTED_BUNDLE_PATH
    g_setenv(&quot;WEBKIT_INJECTED_BUNDLE_PATH&quot;, WEBKIT_INJECTED_BUNDLE_PATH, FALSE);
#endif

The later seems best to me.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092611</commentid>
    <comment_count>2</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-05-07 09:27:48 -0700</bug_when>
    <thetext>We need to fix all other uses of DEVELOPMENT_BUILD as well, since we always check whether it&apos;s defined rather than what it is defined to.

Might as well take the opportunity to remove it, since it&apos;s redundant with DEVELOPER_MODE.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092617</commentid>
    <comment_count>3</comment_count>
      <attachid>252595</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-05-07 09:43:28 -0700</bug_when>
    <thetext>Created attachment 252595
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092618</commentid>
    <comment_count>4</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-05-07 09:44:36 -0700</bug_when>
    <thetext>Patch is speculative since I&apos;m having trouble building locally at the moment (can&apos;t install dependencies I&apos;d removed for testing something else, due to some Fedora repository issues); let&apos;s see what EWS thinks.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092619</commentid>
    <comment_count>5</comment_count>
      <attachid>252595</attachid>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2015-05-07 09:45:07 -0700</bug_when>
    <thetext>Comment on attachment 252595
Patch

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

Thanks!

&gt; Tools/ChangeLog:22
&gt; +2015-05-07  Michael Catanzaro  &lt;mcatanzaro@igalia.com&gt;
&gt; +
&gt; +        [GTK] 2.9.1 build broken with ENABLE_MINIBROWSER=ON
&gt; +        https://bugs.webkit.org/show_bug.cgi?id=144746
&gt; +
&gt; +        Reviewed by NOBODY (OOPS!).
&gt; +
&gt; +        * MiniBrowser/gtk/main.c:
&gt; +        (main):
&gt; +

duplicated entry here.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092620</commentid>
    <comment_count>6</comment_count>
      <attachid>252596</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-05-07 09:47:19 -0700</bug_when>
    <thetext>Created attachment 252596
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092622</commentid>
    <comment_count>7</comment_count>
      <attachid>252595</attachid>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2015-05-07 09:50:21 -0700</bug_when>
    <thetext>Comment on attachment 252595
Patch

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

&gt; Source/WebCore/platform/gtk/GtkUtilities.cpp:58
&gt; -#if defined(DEVELOPMENT_BUILD)
&gt; +#if ENABLE(DEVELOPER_MODE)
&gt;  static CString topLevelPath()

How will this work if ENABLE_DEVELOPER_MODE is not defined? I think that build-webkit just defines DEVELOPER_MODE and not ENABLE_DEVELOPER_MODE.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092625</commentid>
    <comment_count>8</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-05-07 10:01:53 -0700</bug_when>
    <thetext>It won&apos;t work, good catch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092628</commentid>
    <comment_count>9</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2015-05-07 10:06:43 -0700</bug_when>
    <thetext>(In reply to comment #7)
&gt; Comment on attachment 252595 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=252595&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/platform/gtk/GtkUtilities.cpp:58
&gt; &gt; -#if defined(DEVELOPMENT_BUILD)
&gt; &gt; +#if ENABLE(DEVELOPER_MODE)
&gt; &gt;  static CString topLevelPath()
&gt; 
&gt; How will this work if ENABLE_DEVELOPER_MODE is not defined? I think that
&gt; build-webkit just defines DEVELOPER_MODE and not ENABLE_DEVELOPER_MODE.

Oops, I assumed it was :-P</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092629</commentid>
    <comment_count>10</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-05-07 10:10:19 -0700</bug_when>
    <thetext>Another speculative patch for EWS. To be clear, this one should work because DEVELOPER_MODE is not defined at all when it is off (whereas DEVELOPMENT_BUILD was defined to 0).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092630</commentid>
    <comment_count>11</comment_count>
      <attachid>252598</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-05-07 10:10:34 -0700</bug_when>
    <thetext>Created attachment 252598
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092635</commentid>
    <comment_count>12</comment_count>
      <attachid>252598</attachid>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2015-05-07 10:33:56 -0700</bug_when>
    <thetext>Comment on attachment 252598
Patch

why changing all #if defined with #ifdef? why not just s/DEVELOPMENT_BUILD/DEVELOPER_MODE/s Or is it always defined but set to 0 now for non devel builds? then it should be just #if, no?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092672</commentid>
    <comment_count>13</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2015-05-07 11:37:18 -0700</bug_when>
    <thetext>I&apos;d also like to include in this patch the new use of the broken idiom from my spellchecking patch. I&apos;m happy to update the patch for that.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092704</commentid>
    <comment_count>14</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-05-07 13:00:28 -0700</bug_when>
    <thetext>(In reply to comment #12)
&gt; Comment on attachment 252598 [details]
&gt; Patch
&gt; 
&gt; why changing all #if defined with #ifdef? why not just
&gt; s/DEVELOPMENT_BUILD/DEVELOPER_MODE/s

It doesn&apos;t matter; I&apos;ll switch it back to #if defined() to make the patch easier to read. But we use #ifdef usually.

&gt;Or is it always defined but set to 0
&gt; now for non devel builds? then it should be just #if, no?

No, that&apos;s why this patch works: DEVELOPER_MODE is not always defined, unlike DEVELOPMENT_BUILD.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092708</commentid>
    <comment_count>15</comment_count>
      <attachid>252608</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-05-07 13:18:35 -0700</bug_when>
    <thetext>Created attachment 252608
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092736</commentid>
    <comment_count>16</comment_count>
      <attachid>252608</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2015-05-07 14:10:25 -0700</bug_when>
    <thetext>Comment on attachment 252608
Patch

Clearing flags on attachment: 252608

Committed r183945: &lt;http://trac.webkit.org/changeset/183945&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1092737</commentid>
    <comment_count>17</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2015-05-07 14:10:30 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093100</commentid>
    <comment_count>18</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2015-05-08 00:40:48 -0700</bug_when>
    <thetext>This broke the world. DEVELOPER_MODE is not exposed to the build, that&apos;s what DEVELOPMENT_BUILD was for.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093102</commentid>
    <comment_count>19</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2015-05-08 00:52:16 -0700</bug_when>
    <thetext>Re-opened since this is blocked by bug 144789</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093114</commentid>
    <comment_count>20</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2015-05-08 01:11:51 -0700</bug_when>
    <thetext>The actual problem is that r183416 removed the -DDEVELOPMENT_BUILD=1 definition.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093115</commentid>
    <comment_count>21</comment_count>
      <attachid>252699</attachid>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2015-05-08 01:13:51 -0700</bug_when>
    <thetext>Created attachment 252699
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093165</commentid>
    <comment_count>22</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-05-08 05:46:57 -0700</bug_when>
    <thetext>I assumed CMake would pass the DEVELOPER_MODE option through to the compiler, but that was a terrible assumption (how would it tell the difference from a real option?). And trying to trust EWS to sanity-check this patch was also a bad idea, because evidently only clean builds broke.

Let&apos;s commit Carlos&apos;s patch as-is first, since it is the minimal patch that fixes the build. The rest is just a matter of style: we can follow-up with /s/DEVELOPMENT_BUILD/DEVELOPER_MODE later on, use SET_AND_EXPOSE_TO_BUILD to get DEVELOPER_MODE, and replace the #if defined() with plain #if.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093166</commentid>
    <comment_count>23</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2015-05-08 06:10:02 -0700</bug_when>
    <thetext>(In reply to comment #22)
&gt; I assumed CMake would pass the DEVELOPER_MODE option through to the
&gt; compiler, but that was a terrible assumption (how would it tell the
&gt; difference from a real option?). And trying to trust EWS to sanity-check
&gt; this patch was also a bad idea, because evidently only clean builds broke.

The build was not broken, but the tests, because the test infrastructure relies on some things that are only done for development builds (like search for binaries in the ui process binary dir). That&apos;s what caused all test to fail, it failed to find all secondary processes.

&gt; Let&apos;s commit Carlos&apos;s patch as-is first, since it is the minimal patch that
&gt; fixes the build. The rest is just a matter of style: we can follow-up with
&gt; /s/DEVELOPMENT_BUILD/DEVELOPER_MODE later on, use SET_AND_EXPOSE_TO_BUILD to
&gt; get DEVELOPER_MODE, and replace the #if defined() with plain #if.

I don&apos;t think we should use SET_AND_EXPOSE_TO_BUILD, because that only adds a define to cmakeconfig.h, and not all sources files include that header, some &quot;external&quot; tools (at least the MiniBrowser) don&apos;t include that header (at least not automatically). So for global compile options it&apos;s safer to use add_definitions(-DFOO=Bar). 

Also I don&apos;t see why we need to rename it. For me a development build is just another thing done by the developer mode, but the developer mode is more than that, it also enables tests and minibrowser, for example.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093173</commentid>
    <comment_count>24</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-05-08 07:48:42 -0700</bug_when>
    <thetext>OK, I have no strong preference about the rest.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093179</commentid>
    <comment_count>25</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2015-05-08 08:08:35 -0700</bug_when>
    <thetext>(In reply to comment #23)

&gt; I don&apos;t think we should use SET_AND_EXPOSE_TO_BUILD, because that only adds
&gt; a define to cmakeconfig.h, and not all sources files include that header,
&gt; some &quot;external&quot; tools (at least the MiniBrowser) don&apos;t include that header
&gt; (at least not automatically). So for global compile options it&apos;s safer to
&gt; use add_definitions(-DFOO=Bar). 

No. We just removed most of the definitions. If the tools need to include cmakeconfig.h they should. Please don&apos;t undo my work.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093180</commentid>
    <comment_count>26</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2015-05-08 08:10:13 -0700</bug_when>
    <thetext>(In reply to comment #23)

&gt; Also I don&apos;t see why we need to rename it. For me a development build is
&gt; just another thing done by the developer mode, but the developer mode is
&gt; more than that, it also enables tests and minibrowser, for example.

This is also inaccurate:

martin@dillardmcburdle:~/WebKit/Tools/MiniBrowser/gtk$ git grep cmakeconfig.h
BrowserDownloadsBar.c:#include &quot;cmakeconfig.h&quot;
BrowserSearchBar.c:#include &quot;cmakeconfig.h&quot;
BrowserWindow.c:#include &quot;cmakeconfig.h&quot;
main.c:#include &quot;cmakeconfig.h&quot;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093183</commentid>
    <comment_count>27</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2015-05-08 08:16:28 -0700</bug_when>
    <thetext>(In reply to comment #26)
&gt; (In reply to comment #23)
&gt; 
&gt; &gt; Also I don&apos;t see why we need to rename it. For me a development build is
&gt; &gt; just another thing done by the developer mode, but the developer mode is
&gt; &gt; more than that, it also enables tests and minibrowser, for example.
&gt; 
&gt; This is also inaccurate:
&gt; 
&gt; martin@dillardmcburdle:~/WebKit/Tools/MiniBrowser/gtk$ git grep cmakeconfig.h
&gt; BrowserDownloadsBar.c:#include &quot;cmakeconfig.h&quot;
&gt; BrowserSearchBar.c:#include &quot;cmakeconfig.h&quot;
&gt; BrowserWindow.c:#include &quot;cmakeconfig.h&quot;
&gt; main.c:#include &quot;cmakeconfig.h&quot;

I&apos;m rewriting this patch to use the ENABLE macro. I files that don&apos;t include the WTF Platform.h file, this will give an error signalling that the cmakeconfig.h file isn&apos;t included. There are few places that do include cmakeconfig.h and not the WTF Platform.h file, so they can just use ENABLE_DEVELOPER_MODE.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093185</commentid>
    <comment_count>28</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2015-05-08 08:29:37 -0700</bug_when>
    <thetext>(In reply to comment #27)
&gt; (In reply to comment #26)
&gt; &gt; (In reply to comment #23)
&gt; &gt; 
&gt; &gt; &gt; Also I don&apos;t see why we need to rename it. For me a development build is
&gt; &gt; &gt; just another thing done by the developer mode, but the developer mode is
&gt; &gt; &gt; more than that, it also enables tests and minibrowser, for example.
&gt; &gt; 
&gt; &gt; This is also inaccurate:
&gt; &gt; 
&gt; &gt; martin@dillardmcburdle:~/WebKit/Tools/MiniBrowser/gtk$ git grep cmakeconfig.h
&gt; &gt; BrowserDownloadsBar.c:#include &quot;cmakeconfig.h&quot;
&gt; &gt; BrowserSearchBar.c:#include &quot;cmakeconfig.h&quot;
&gt; &gt; BrowserWindow.c:#include &quot;cmakeconfig.h&quot;
&gt; &gt; main.c:#include &quot;cmakeconfig.h&quot;
&gt; 
&gt; I&apos;m rewriting this patch to use the ENABLE macro. I files that don&apos;t include
&gt; the WTF Platform.h file, this will give an error signalling that the
&gt; cmakeconfig.h file isn&apos;t included. There are few places that do include
&gt; cmakeconfig.h and not the WTF Platform.h file, so they can just use
&gt; ENABLE_DEVELOPER_MODE.

Building and testing this now, so please everyone hang tight. We can solve this issue somehow.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093186</commentid>
    <comment_count>29</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2015-05-08 08:35:40 -0700</bug_when>
    <thetext>(In reply to comment #26)
&gt; (In reply to comment #23)
&gt; 
&gt; &gt; Also I don&apos;t see why we need to rename it. For me a development build is
&gt; &gt; just another thing done by the developer mode, but the developer mode is
&gt; &gt; more than that, it also enables tests and minibrowser, for example.

Sorry, I misread your statement. It isn&apos;t inaccurate. This is a philosophical point to be sure. I added DEVELOPER_MODE, but I never considered the two to be separate things. If it&apos;s okay with you, I think we can just continue down this path. I prefer that the code files reflect the option that is passed to the build system to avoid confusion.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093188</commentid>
    <comment_count>30</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2015-05-08 08:58:27 -0700</bug_when>
    <thetext>(In reply to comment #29)
&gt; (In reply to comment #26)
&gt; &gt; (In reply to comment #23)
&gt; &gt; 
&gt; &gt; &gt; Also I don&apos;t see why we need to rename it. For me a development build is
&gt; &gt; &gt; just another thing done by the developer mode, but the developer mode is
&gt; &gt; &gt; more than that, it also enables tests and minibrowser, for example.
&gt; 
&gt; Sorry, I misread your statement. It isn&apos;t inaccurate. This is a
&gt; philosophical point to be sure. I added DEVELOPER_MODE, but I never
&gt; considered the two to be separate things. If it&apos;s okay with you, I think we
&gt; can just continue down this path. I prefer that the code files reflect the
&gt; option that is passed to the build system to avoid confusion.

I&apos;ve always considered developer mode as a build-webkit feature rather than a build option. I&apos;m fine with using ENABLE(DEVELOPER_MODE) in any case. I don&apos;t see a reason to r- my patch, though, it&apos;s perfectly valid and fixes a regression.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093208</commentid>
    <comment_count>31</comment_count>
      <attachid>252724</attachid>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2015-05-08 09:45:42 -0700</bug_when>
    <thetext>Created attachment 252724
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093209</commentid>
    <comment_count>32</comment_count>
      <attachid>252724</attachid>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2015-05-08 09:54:44 -0700</bug_when>
    <thetext>Comment on attachment 252724
Patch

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

&gt; Source/cmake/OptionsGTK.cmake:79
&gt; -# FIXME: There is no reason these should be different.
&gt; -SET_AND_EXPOSE_TO_BUILD(DEVELOPMENT_BUILD ${DEVELOPER_MODE})
&gt; +SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})

Maybe renaming this to SET_AND_EXPOSE_TO_CONFIG would be less confusing, unless we enforce somehow that all files include cmakeconfig.h

&gt; Tools/MiniBrowser/gtk/main.c:259
&gt; -#if defined(DEVELOPMENT_BUILD)
&gt; +#if ENABLE_DEVELOPER_MODE

Hopefully MB is the only exception, I guess the build will fail anyway if you try to use ENABLE(FOO) in a file not including Platform.h no? What happens in a file doesn&apos;t include cmakeconfig.h? wasn&apos;t there a way to include config.h from the build system?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093214</commentid>
    <comment_count>33</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2015-05-08 09:59:52 -0700</bug_when>
    <thetext>(In reply to comment #32)
&gt; Comment on attachment 252724 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=252724&amp;action=review
&gt; 
&gt; &gt; Source/cmake/OptionsGTK.cmake:79
&gt; &gt; -# FIXME: There is no reason these should be different.
&gt; &gt; -SET_AND_EXPOSE_TO_BUILD(DEVELOPMENT_BUILD ${DEVELOPER_MODE})
&gt; &gt; +SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
&gt; 
&gt; Maybe renaming this to SET_AND_EXPOSE_TO_CONFIG would be less confusing,
&gt; unless we enforce somehow that all files include cmakeconfig.h

How about SET_AND_ADD_TO_CONFIG_HEADER?

&gt; &gt; Tools/MiniBrowser/gtk/main.c:259
&gt; &gt; -#if defined(DEVELOPMENT_BUILD)
&gt; &gt; +#if ENABLE_DEVELOPER_MODE
&gt; 
&gt; Hopefully MB is the only exception, I guess the build will fail anyway if
&gt; you try to use ENABLE(FOO) in a file not including Platform.h no? What
&gt; happens in a file doesn&apos;t include cmakeconfig.h? wasn&apos;t there a way to
&gt; include config.h from the build system?

That&apos;s a great idea actually. We should make cmakeconfig.h a global compiler header. I think that should be possible.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093234</commentid>
    <comment_count>34</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-05-08 11:07:12 -0700</bug_when>
    <thetext>(In reply to comment #33)
&gt; How about SET_AND_ADD_TO_CONFIG_HEADER?

Sounds good to me.

&gt; That&apos;s a great idea actually. We should make cmakeconfig.h a global compiler
&gt; header. I think that should be possible.

See http://stackoverflow.com/questions/3387453/include-header-files-from-command-line-gcc</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093284</commentid>
    <comment_count>35</comment_count>
      <attachid>252724</attachid>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2015-05-08 13:31:07 -0700</bug_when>
    <thetext>Comment on attachment 252724
Patch

Clearing flags on attachment: 252724

Committed r184010: &lt;http://trac.webkit.org/changeset/184010&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1093285</commentid>
    <comment_count>36</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2015-05-08 13:31:13 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>252595</attachid>
            <date>2015-05-07 09:43:28 -0700</date>
            <delta_ts>2015-05-07 09:47:14 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-144746-20150507114210.patch</filename>
            <type>text/plain</type>
            <size>7551</size>
            <attacher name="Michael Catanzaro">mcatanzaro</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzOTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMThjZWQ4YjYyNDI3NmI2
N2U2MmNkM2M0MjM5NjU1MzAyYzljMjgzYS4uMzg4YzZmZWMzMzE0ZWM1ODdhZmE4YTkxYjg0ZDli
NDFlMmI0NGQ3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE1LTA1LTA3ICBNaWNo
YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBD
aGVja3MgZm9yIERFVkVMT1BNRU5UX0JVSUxEIGFyZSBhbGwgd3JvbmcKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDc0NgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBFTkFCTEUoREVWRUxPUEVSX01P
REUpIHJhdGhlciB0aGFuIGNoZWNraW5nIGlmIERFVkVMT1BNRU5UX0JVSUxEIGlzIGRlZmluZWQu
CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNwcDoKKyAgICAgICAgKiBw
bGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmg6CisgICAgICAgICogcGxhdGZvcm0vdGV4dC9ndGsv
SHlwaGVuYXRpb25MaWJIeXBoZW4uY3BwOgorCiAyMDE1LTA1LTA3ICBFcmljIENhcmxzb24gIDxl
cmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIFBsYXliYWNrIHRhcmdldCBp
c24ndCBzZXQgb24gbmV3IGVsZW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAxNzBhNzc0NjZhOWVhYzM2ZjYx
ZjJmYWRlMzJkZjA5YzNkNGM0Y2FhLi5kNzQwZDZjODg1NTJjMmI4NzYxYTA4NmRmYjFjNGVmMGNh
OGRlNDg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNl
L1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTUtMDUtMDcgIE1pY2hhZWwg
Q2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIENoZWNr
cyBmb3IgREVWRUxPUE1FTlRfQlVJTEQgYXJlIGFsbCB3cm9uZworICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0NzQ2CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIEVOQUJMRShERVZFTE9QRVJfTU9ERSkg
cmF0aGVyIHRoYW4gY2hlY2tpbmcgaWYgREVWRUxPUE1FTlRfQlVJTEQgaXMgZGVmaW5lZC4KKwor
ICAgICAgICAqIFNoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNwcDoKKyAgICAg
ICAgKFdlYktpdDo6ZmluZFdlYktpdFByb2Nlc3MpOgorCiAyMDE1LTA1LTA3ICBDYXJsb3MgR2Fy
Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBV
cGRhdGUgT3B0aW9uc0dUSy5jbWFrZSBhbmQgTkVXUyBmb3IgMi45LjEgcmVsZWFzZS4KZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuY3BwIGIvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5jcHAKaW5kZXggMGM2YTMyYzg2
MzIwMDljMGNmZDVlZjYzNDQ0MjVjZjIxODJhYzI2Yy4uYWNkYWY0ZWQ2YjJkODQ1YWU0ZGZlMGU3
NWU4YTJhNTc4ZDI5NGUzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr
L0d0a1V0aWxpdGllcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0
aWxpdGllcy5jcHAKQEAgLTU0LDcgKzU0LDcgQEAgYm9vbCB3aWRnZXRJc09uc2NyZWVuVG9wbGV2
ZWxXaW5kb3coR3RrV2lkZ2V0KiB3aWRnZXQpCiAgICAgcmV0dXJuIGd0a193aWRnZXRfaXNfdG9w
bGV2ZWwod2lkZ2V0KSAmJiBHVEtfSVNfV0lORE9XKHdpZGdldCkgJiYgIUdUS19JU19PRkZTQ1JF
RU5fV0lORE9XKHdpZGdldCk7CiB9CiAKLSNpZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JVSUxEKQor
I2lmIEVOQUJMRShERVZFTE9QRVJfTU9ERSkKIHN0YXRpYyBDU3RyaW5nIHRvcExldmVsUGF0aCgp
CiB7CiAgICAgaWYgKGNvbnN0IGNoYXIqIHRvcExldmVsRGlyZWN0b3J5ID0gZ19nZXRlbnYoIldF
QktJVF9UT1BfTEVWRUwiKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0
ay9HdGtVdGlsaXRpZXMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRp
ZXMuaAppbmRleCBjMmE0Mzg1YWUzM2Q2ODQwNzE1ODhlOWU0N2NjOGMzODIwZTFhZWJjLi4wMzJk
ZmQzMWE4ODcyNDAxODk5N2RmYjYxNWVjODYzMGU1NzU0ZWY5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5oCkBAIC0yOCw3ICsyOCw3IEBAIGNsYXNzIEludFBv
aW50OwogSW50UG9pbnQgY29udmVydFdpZGdldFBvaW50VG9TY3JlZW5Qb2ludChHdGtXaWRnZXQq
LCBjb25zdCBJbnRQb2ludCYpOwogYm9vbCB3aWRnZXRJc09uc2NyZWVuVG9wbGV2ZWxXaW5kb3co
R3RrV2lkZ2V0Kik7CiAKLSNpZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JVSUxEKQorI2lmIEVOQUJM
RShERVZFTE9QRVJfTU9ERSkKIENTdHJpbmcgd2Via2l0QnVpbGREaXJlY3RvcnkoKTsKICNlbmRp
ZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L2d0ay9IeXBoZW5h
dGlvbkxpYkh5cGhlbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L2d0ay9IeXBo
ZW5hdGlvbkxpYkh5cGhlbi5jcHAKaW5kZXggNmYwNmY2MWY0YTNiNTUwZjEwZTQ4ZDQyOTBjYTRj
Yjk1NTkyMjc2OC4uMWY0OTBhODJhZmYyZTM0YTFlMmYwODk1YWU1YmU1OGJkOWI1MDYxMCAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9ndGsvSHlwaGVuYXRpb25MaWJI
eXBoZW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvZ3RrL0h5cGhlbmF0
aW9uTGliSHlwaGVuLmNwcApAQCAtNjMsNyArNjMsNyBAQCBzdGF0aWMgdm9pZCBzY2FuRGlyZWN0
b3J5Rm9yRGljaW9uYXJpZXMoY29uc3QgY2hhciogZGlyZWN0b3J5UGF0aCwgSGFzaE1hcDxBdG9t
aQogICAgICAgICBhdmFpbGFibGVMb2NhbGVzLnNldChBdG9taWNTdHJpbmcoZXh0cmFjdExvY2Fs
ZUZyb21EaWN0aW9uYXJ5RmlsZVBhdGgoZmlsZVBhdGgpKSwgZmlsZVBhdGgpOwogfQogCi0jaWYg
ZGVmaW5lZChERVZFTE9QTUVOVF9CVUlMRCkKKyNpZiBFTkFCTEUoREVWRUxPUEVSX01PREUpCiBz
dGF0aWMgdm9pZCBzY2FuVGVzdERpY3Rpb25hcmllc0RpcmVjdG9yeUlmTmVjZXNzYXJ5KEhhc2hN
YXA8QXRvbWljU3RyaW5nLCBTdHJpbmc+JiBhdmFpbGFibGVMb2NhbGVzKQogewogICAgIC8vIEl0
J3MgdW5mb3J0dW5hdGUgdGhhdCB3ZSBuZWVkIHRvIGxvb2sgZm9yIHRoZSBkaWN0aW9uYXJpZXMg
dGhpcyB3YXksIGJ1dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9Qcm9j
ZXNzRXhlY3V0YWJsZVBhdGhHdGsuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9Qcm9j
ZXNzRXhlY3V0YWJsZVBhdGhHdGsuY3BwCmluZGV4IDgxYmFjNDVhOWQxZjJhNDkzZWNkNWU1NTY2
ZWQ1Y2EzZGNlMWQyOTQuLjNmZTgwZjQ0YTM1OTRmYjRhMmRjOGI5YjI3NzViYTI5NzM0NTY1OTEg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQ
YXRoR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ3RrL1Byb2Nlc3NFeGVjdXRh
YmxlUGF0aEd0ay5jcHAKQEAgLTMwLDcgKzMwLDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0ZpbGVT
eXN0ZW0uaD4KICNpbmNsdWRlIDxnbGliLmg+CiAKLSNpZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JV
SUxEKQorI2lmIEVOQUJMRShERVZFTE9QRVJfTU9ERSkKICNpbmNsdWRlIDx3dGYvZ29iamVjdC9H
bGliVXRpbGl0aWVzLmg+CiAjZW5kaWYKIApAQCAtMzgsNyArMzgsNyBAQCB1c2luZyBuYW1lc3Bh
Y2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLSNpZiBkZWZpbmVkKERFVkVMT1BN
RU5UX0JVSUxEKQorI2lmIEVOQUJMRShERVZFTE9QRVJfTU9ERSkKIHN0YXRpYyBTdHJpbmcgZ2V0
RXhlY3V0YWJsZVBhdGgoKQogewogICAgIENTdHJpbmcgZXhlY3V0YWJsZVBhdGggPSBnZXRDdXJy
ZW50RXhlY3V0YWJsZVBhdGgoKTsKQEAgLTUwLDcgKzUwLDcgQEAgc3RhdGljIFN0cmluZyBnZXRF
eGVjdXRhYmxlUGF0aCgpCiAKIHN0YXRpYyBTdHJpbmcgZmluZFdlYktpdFByb2Nlc3MoY29uc3Qg
Y2hhciogcHJvY2Vzc05hbWUpCiB7Ci0jaWYgZGVmaW5lZChERVZFTE9QTUVOVF9CVUlMRCkKKyNp
ZiBFTkFCTEUoREVWRUxPUEVSX01PREUpCiAgICAgc3RhdGljIGNvbnN0IGNoYXIqIGV4ZWNEaXJl
Y3RvcnkgPSBnX2dldGVudigiV0VCS0lUX0VYRUNfUEFUSCIpOwogICAgIGlmIChleGVjRGlyZWN0
b3J5KSB7CiAgICAgICAgIFN0cmluZyBwcm9jZXNzUGF0aCA9IHBhdGhCeUFwcGVuZGluZ0NvbXBv
bmVudChmaWxlbmFtZVRvU3RyaW5nKGV4ZWNEaXJlY3RvcnkpLCBwcm9jZXNzTmFtZSk7CmRpZmYg
LS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRp
b25zR1RLLmNtYWtlCmluZGV4IGQxYjMzODEyMmMyOGNlMzVmODJjNjI1NmM3M2IxMjE4YjdlZTg0
ZDQuLjI1MDhmNjg3ZjRhNDc4OWJjZTc2YWJiZGI3Y2FhMDVjZTcyNDNhZWQgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25z
R1RLLmNtYWtlCkBAIC03Niw4ICs3Niw2IEBAIFdFQktJVF9PUFRJT05fREVQRU5EKFVTRV9HU1RS
RUFNRVJfR0wgRU5BQkxFX09QRU5HTCkKIFdFQktJVF9PUFRJT05fREVQRU5EKFVTRV9HU1RSRUFN
RVJfR0wgRU5BQkxFX1ZJREVPKQogV0VCS0lUX09QVElPTl9ERVBFTkQoVVNFX0dTVFJFQU1FUl9N
UEVHVFMgRU5BQkxFX1ZJREVPKQogCi0jIEZJWE1FOiBUaGVyZSBpcyBubyByZWFzb24gdGhlc2Ug
c2hvdWxkIGJlIGRpZmZlcmVudC4KLVNFVF9BTkRfRVhQT1NFX1RPX0JVSUxEKERFVkVMT1BNRU5U
X0JVSUxEICR7REVWRUxPUEVSX01PREV9KQogaWYgKERFVkVMT1BFUl9NT0RFKQogICAgIFdFQktJ
VF9PUFRJT05fREVGQVVMVF9QT1JUX1ZBTFVFKEVOQUJMRV9NSU5JQlJPV1NFUiBQVUJMSUMgT04p
CiAgICAgV0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX0FQSV9URVNUUyBQ
UklWQVRFIE9OKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n
CmluZGV4IDE5NTczOWVjNWYyZDY0YzU5YWYzYmZkNDQzYjhkMzIzMjZmODZkNDYuLjEyOTMxZmFk
ODY1Y2ZjNDhjODc2MGFlY2U4MWI3ZGJlZmYzOTliZTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n
ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxNS0wNS0wNyAg
TWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dU
S10gQ2hlY2tzIGZvciBERVZFTE9QTUVOVF9CVUlMRCBhcmUgYWxsIHdyb25nCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ3NDYKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgRU5BQkxFKERFVkVMT1BF
Ul9NT0RFKSByYXRoZXIgdGhhbiBjaGVja2luZyBpZiBERVZFTE9QTUVOVF9CVUlMRCBpcyBkZWZp
bmVkLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZ3RrL21haW4uYzoKKyAgICAgICAgKG1haW4p
OgorCisyMDE1LTA1LTA3ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNv
bT4KKworICAgICAgICBbR1RLXSAyLjkuMSBidWlsZCBicm9rZW4gd2l0aCBFTkFCTEVfTUlOSUJS
T1dTRVI9T04KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTE0NDc0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
ICogTWluaUJyb3dzZXIvZ3RrL21haW4uYzoKKyAgICAgICAgKG1haW4pOgorCiAyMDE1LTA1LTA2
ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIGlPUyBidWls
ZCBmaXggYXR0ZW1wdApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL21haW4uYyBi
L1Rvb2xzL01pbmlCcm93c2VyL2d0ay9tYWluLmMKaW5kZXggYmNjMDgyY2Y2YjFmMmY1ZDVjNzY0
YzQwMDEyNTcxOWZjM2ExYjkxNi4uOTBmMjFiZTU0Nzc2NmY1N2NkODlmNjFmNWI5Yzc2ZWU1NDll
MWFhYyAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL21haW4uYworKysgYi9Ub29s
cy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jCkBAIC0yNTYsNyArMjU2LDcgQEAgYWJvdXRVUklTY2hl
bWVSZXF1ZXN0Q2FsbGJhY2soV2ViS2l0VVJJU2NoZW1lUmVxdWVzdCAqcmVxdWVzdCwgZ3BvaW50
ZXIgdXNlckRhdGEKIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiB7CiAgICAgZ3Rr
X2luaXQoJmFyZ2MsICZhcmd2KTsKLSNpZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JVSUxEKQorI2lm
IEVOQUJMRShERVZFTE9QRVJfTU9ERSkKICAgICBnX3NldGVudigiV0VCS0lUX0lOSkVDVEVEX0JV
TkRMRV9QQVRIIiwgV0VCS0lUX0lOSkVDVEVEX0JVTkRMRV9QQVRILCBGQUxTRSk7CiAjZW5kaWYK
IApkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IDFiN2E1NDMwYjMxNWU1
NWQyMDAxMzQ0ZTFmMDI2OTk0OTA1YTRmYjMuLmIwNjBmYjMzZGE3M2YyMWMxZTBhZWY4NmNkY2Y0
MDBmYWFhMGYzNGUgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxNCBAQAorMjAxNS0wNS0wNyAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGln
YWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gQ2hlY2tzIGZvciBERVZFTE9QTUVOVF9CVUlMRCBh
cmUgYWxsIHdyb25nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0xNDQ3NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBEb24ndCBkZWZpbmUgREVWRUxPUE1FTlRfQlVJTEQgc2luY2UgaXQncyByZWR1bmRhbnQg
d2l0aCBERVZFTE9QRVJfTU9ERS4KKworICAgICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25zR1RL
LmNtYWtlOgorCiAyMDE1LTA1LTA3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdh
bGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBVcGRhdGUgT3B0aW9uc0dUSy5jbWFrZSBh
bmQgTkVXUyBmb3IgMi45LjEgcmVsZWFzZS4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>252596</attachid>
            <date>2015-05-07 09:47:19 -0700</date>
            <delta_ts>2015-05-07 10:10:31 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-144746-20150507114601.patch</filename>
            <type>text/plain</type>
            <size>7281</size>
            <attacher name="Michael Catanzaro">mcatanzaro</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzOTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMThjZWQ4YjYyNDI3NmI2
N2U2MmNkM2M0MjM5NjU1MzAyYzljMjgzYS4uMzg4YzZmZWMzMzE0ZWM1ODdhZmE4YTkxYjg0ZDli
NDFlMmI0NGQ3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE1LTA1LTA3ICBNaWNo
YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBD
aGVja3MgZm9yIERFVkVMT1BNRU5UX0JVSUxEIGFyZSBhbGwgd3JvbmcKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDc0NgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBFTkFCTEUoREVWRUxPUEVSX01P
REUpIHJhdGhlciB0aGFuIGNoZWNraW5nIGlmIERFVkVMT1BNRU5UX0JVSUxEIGlzIGRlZmluZWQu
CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNwcDoKKyAgICAgICAgKiBw
bGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmg6CisgICAgICAgICogcGxhdGZvcm0vdGV4dC9ndGsv
SHlwaGVuYXRpb25MaWJIeXBoZW4uY3BwOgorCiAyMDE1LTA1LTA3ICBFcmljIENhcmxzb24gIDxl
cmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIFBsYXliYWNrIHRhcmdldCBp
c24ndCBzZXQgb24gbmV3IGVsZW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAxNzBhNzc0NjZhOWVhYzM2ZjYx
ZjJmYWRlMzJkZjA5YzNkNGM0Y2FhLi5kNzQwZDZjODg1NTJjMmI4NzYxYTA4NmRmYjFjNGVmMGNh
OGRlNDg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNl
L1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTUtMDUtMDcgIE1pY2hhZWwg
Q2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIENoZWNr
cyBmb3IgREVWRUxPUE1FTlRfQlVJTEQgYXJlIGFsbCB3cm9uZworICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0NzQ2CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIEVOQUJMRShERVZFTE9QRVJfTU9ERSkg
cmF0aGVyIHRoYW4gY2hlY2tpbmcgaWYgREVWRUxPUE1FTlRfQlVJTEQgaXMgZGVmaW5lZC4KKwor
ICAgICAgICAqIFNoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNwcDoKKyAgICAg
ICAgKFdlYktpdDo6ZmluZFdlYktpdFByb2Nlc3MpOgorCiAyMDE1LTA1LTA3ICBDYXJsb3MgR2Fy
Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBV
cGRhdGUgT3B0aW9uc0dUSy5jbWFrZSBhbmQgTkVXUyBmb3IgMi45LjEgcmVsZWFzZS4KZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuY3BwIGIvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5jcHAKaW5kZXggMGM2YTMyYzg2
MzIwMDljMGNmZDVlZjYzNDQ0MjVjZjIxODJhYzI2Yy4uYWNkYWY0ZWQ2YjJkODQ1YWU0ZGZlMGU3
NWU4YTJhNTc4ZDI5NGUzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr
L0d0a1V0aWxpdGllcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0
aWxpdGllcy5jcHAKQEAgLTU0LDcgKzU0LDcgQEAgYm9vbCB3aWRnZXRJc09uc2NyZWVuVG9wbGV2
ZWxXaW5kb3coR3RrV2lkZ2V0KiB3aWRnZXQpCiAgICAgcmV0dXJuIGd0a193aWRnZXRfaXNfdG9w
bGV2ZWwod2lkZ2V0KSAmJiBHVEtfSVNfV0lORE9XKHdpZGdldCkgJiYgIUdUS19JU19PRkZTQ1JF
RU5fV0lORE9XKHdpZGdldCk7CiB9CiAKLSNpZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JVSUxEKQor
I2lmIEVOQUJMRShERVZFTE9QRVJfTU9ERSkKIHN0YXRpYyBDU3RyaW5nIHRvcExldmVsUGF0aCgp
CiB7CiAgICAgaWYgKGNvbnN0IGNoYXIqIHRvcExldmVsRGlyZWN0b3J5ID0gZ19nZXRlbnYoIldF
QktJVF9UT1BfTEVWRUwiKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0
ay9HdGtVdGlsaXRpZXMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRp
ZXMuaAppbmRleCBjMmE0Mzg1YWUzM2Q2ODQwNzE1ODhlOWU0N2NjOGMzODIwZTFhZWJjLi4wMzJk
ZmQzMWE4ODcyNDAxODk5N2RmYjYxNWVjODYzMGU1NzU0ZWY5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5oCkBAIC0yOCw3ICsyOCw3IEBAIGNsYXNzIEludFBv
aW50OwogSW50UG9pbnQgY29udmVydFdpZGdldFBvaW50VG9TY3JlZW5Qb2ludChHdGtXaWRnZXQq
LCBjb25zdCBJbnRQb2ludCYpOwogYm9vbCB3aWRnZXRJc09uc2NyZWVuVG9wbGV2ZWxXaW5kb3co
R3RrV2lkZ2V0Kik7CiAKLSNpZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JVSUxEKQorI2lmIEVOQUJM
RShERVZFTE9QRVJfTU9ERSkKIENTdHJpbmcgd2Via2l0QnVpbGREaXJlY3RvcnkoKTsKICNlbmRp
ZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L2d0ay9IeXBoZW5h
dGlvbkxpYkh5cGhlbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L2d0ay9IeXBo
ZW5hdGlvbkxpYkh5cGhlbi5jcHAKaW5kZXggNmYwNmY2MWY0YTNiNTUwZjEwZTQ4ZDQyOTBjYTRj
Yjk1NTkyMjc2OC4uMWY0OTBhODJhZmYyZTM0YTFlMmYwODk1YWU1YmU1OGJkOWI1MDYxMCAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9ndGsvSHlwaGVuYXRpb25MaWJI
eXBoZW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvZ3RrL0h5cGhlbmF0
aW9uTGliSHlwaGVuLmNwcApAQCAtNjMsNyArNjMsNyBAQCBzdGF0aWMgdm9pZCBzY2FuRGlyZWN0
b3J5Rm9yRGljaW9uYXJpZXMoY29uc3QgY2hhciogZGlyZWN0b3J5UGF0aCwgSGFzaE1hcDxBdG9t
aQogICAgICAgICBhdmFpbGFibGVMb2NhbGVzLnNldChBdG9taWNTdHJpbmcoZXh0cmFjdExvY2Fs
ZUZyb21EaWN0aW9uYXJ5RmlsZVBhdGgoZmlsZVBhdGgpKSwgZmlsZVBhdGgpOwogfQogCi0jaWYg
ZGVmaW5lZChERVZFTE9QTUVOVF9CVUlMRCkKKyNpZiBFTkFCTEUoREVWRUxPUEVSX01PREUpCiBz
dGF0aWMgdm9pZCBzY2FuVGVzdERpY3Rpb25hcmllc0RpcmVjdG9yeUlmTmVjZXNzYXJ5KEhhc2hN
YXA8QXRvbWljU3RyaW5nLCBTdHJpbmc+JiBhdmFpbGFibGVMb2NhbGVzKQogewogICAgIC8vIEl0
J3MgdW5mb3J0dW5hdGUgdGhhdCB3ZSBuZWVkIHRvIGxvb2sgZm9yIHRoZSBkaWN0aW9uYXJpZXMg
dGhpcyB3YXksIGJ1dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9Qcm9j
ZXNzRXhlY3V0YWJsZVBhdGhHdGsuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9Qcm9j
ZXNzRXhlY3V0YWJsZVBhdGhHdGsuY3BwCmluZGV4IDgxYmFjNDVhOWQxZjJhNDkzZWNkNWU1NTY2
ZWQ1Y2EzZGNlMWQyOTQuLjNmZTgwZjQ0YTM1OTRmYjRhMmRjOGI5YjI3NzViYTI5NzM0NTY1OTEg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQ
YXRoR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ3RrL1Byb2Nlc3NFeGVjdXRh
YmxlUGF0aEd0ay5jcHAKQEAgLTMwLDcgKzMwLDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0ZpbGVT
eXN0ZW0uaD4KICNpbmNsdWRlIDxnbGliLmg+CiAKLSNpZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JV
SUxEKQorI2lmIEVOQUJMRShERVZFTE9QRVJfTU9ERSkKICNpbmNsdWRlIDx3dGYvZ29iamVjdC9H
bGliVXRpbGl0aWVzLmg+CiAjZW5kaWYKIApAQCAtMzgsNyArMzgsNyBAQCB1c2luZyBuYW1lc3Bh
Y2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLSNpZiBkZWZpbmVkKERFVkVMT1BN
RU5UX0JVSUxEKQorI2lmIEVOQUJMRShERVZFTE9QRVJfTU9ERSkKIHN0YXRpYyBTdHJpbmcgZ2V0
RXhlY3V0YWJsZVBhdGgoKQogewogICAgIENTdHJpbmcgZXhlY3V0YWJsZVBhdGggPSBnZXRDdXJy
ZW50RXhlY3V0YWJsZVBhdGgoKTsKQEAgLTUwLDcgKzUwLDcgQEAgc3RhdGljIFN0cmluZyBnZXRF
eGVjdXRhYmxlUGF0aCgpCiAKIHN0YXRpYyBTdHJpbmcgZmluZFdlYktpdFByb2Nlc3MoY29uc3Qg
Y2hhciogcHJvY2Vzc05hbWUpCiB7Ci0jaWYgZGVmaW5lZChERVZFTE9QTUVOVF9CVUlMRCkKKyNp
ZiBFTkFCTEUoREVWRUxPUEVSX01PREUpCiAgICAgc3RhdGljIGNvbnN0IGNoYXIqIGV4ZWNEaXJl
Y3RvcnkgPSBnX2dldGVudigiV0VCS0lUX0VYRUNfUEFUSCIpOwogICAgIGlmIChleGVjRGlyZWN0
b3J5KSB7CiAgICAgICAgIFN0cmluZyBwcm9jZXNzUGF0aCA9IHBhdGhCeUFwcGVuZGluZ0NvbXBv
bmVudChmaWxlbmFtZVRvU3RyaW5nKGV4ZWNEaXJlY3RvcnkpLCBwcm9jZXNzTmFtZSk7CmRpZmYg
LS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRp
b25zR1RLLmNtYWtlCmluZGV4IGQxYjMzODEyMmMyOGNlMzVmODJjNjI1NmM3M2IxMjE4YjdlZTg0
ZDQuLjI1MDhmNjg3ZjRhNDc4OWJjZTc2YWJiZGI3Y2FhMDVjZTcyNDNhZWQgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25z
R1RLLmNtYWtlCkBAIC03Niw4ICs3Niw2IEBAIFdFQktJVF9PUFRJT05fREVQRU5EKFVTRV9HU1RS
RUFNRVJfR0wgRU5BQkxFX09QRU5HTCkKIFdFQktJVF9PUFRJT05fREVQRU5EKFVTRV9HU1RSRUFN
RVJfR0wgRU5BQkxFX1ZJREVPKQogV0VCS0lUX09QVElPTl9ERVBFTkQoVVNFX0dTVFJFQU1FUl9N
UEVHVFMgRU5BQkxFX1ZJREVPKQogCi0jIEZJWE1FOiBUaGVyZSBpcyBubyByZWFzb24gdGhlc2Ug
c2hvdWxkIGJlIGRpZmZlcmVudC4KLVNFVF9BTkRfRVhQT1NFX1RPX0JVSUxEKERFVkVMT1BNRU5U
X0JVSUxEICR7REVWRUxPUEVSX01PREV9KQogaWYgKERFVkVMT1BFUl9NT0RFKQogICAgIFdFQktJ
VF9PUFRJT05fREVGQVVMVF9QT1JUX1ZBTFVFKEVOQUJMRV9NSU5JQlJPV1NFUiBQVUJMSUMgT04p
CiAgICAgV0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX0FQSV9URVNUUyBQ
UklWQVRFIE9OKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n
CmluZGV4IDE5NTczOWVjNWYyZDY0YzU5YWYzYmZkNDQzYjhkMzIzMjZmODZkNDYuLjA5OTA3YmMw
ZjgwODc1ZmFlNjBmYWNiMWRkMWMwOTY3MmVkZTYyZmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n
ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNS0wNS0wNyAg
TWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dU
S10gQ2hlY2tzIGZvciBERVZFTE9QTUVOVF9CVUlMRCBhcmUgYWxsIHdyb25nCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ3NDYKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgRU5BQkxFKERFVkVMT1BF
Ul9NT0RFKSByYXRoZXIgdGhhbiBjaGVja2luZyBpZiBERVZFTE9QTUVOVF9CVUlMRCBpcyBkZWZp
bmVkLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZ3RrL21haW4uYzoKKyAgICAgICAgKG1haW4p
OgorCiAyMDE1LTA1LTA2ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAg
ICAgICAgIGlPUyBidWlsZCBmaXggYXR0ZW1wdApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dz
ZXIvZ3RrL21haW4uYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9tYWluLmMKaW5kZXggYmNjMDgy
Y2Y2YjFmMmY1ZDVjNzY0YzQwMDEyNTcxOWZjM2ExYjkxNi4uOTBmMjFiZTU0Nzc2NmY1N2NkODlm
NjFmNWI5Yzc2ZWU1NDllMWFhYyAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL21h
aW4uYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jCkBAIC0yNTYsNyArMjU2LDcg
QEAgYWJvdXRVUklTY2hlbWVSZXF1ZXN0Q2FsbGJhY2soV2ViS2l0VVJJU2NoZW1lUmVxdWVzdCAq
cmVxdWVzdCwgZ3BvaW50ZXIgdXNlckRhdGEKIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2
W10pCiB7CiAgICAgZ3RrX2luaXQoJmFyZ2MsICZhcmd2KTsKLSNpZiBkZWZpbmVkKERFVkVMT1BN
RU5UX0JVSUxEKQorI2lmIEVOQUJMRShERVZFTE9QRVJfTU9ERSkKICAgICBnX3NldGVudigiV0VC
S0lUX0lOSkVDVEVEX0JVTkRMRV9QQVRIIiwgV0VCS0lUX0lOSkVDVEVEX0JVTkRMRV9QQVRILCBG
QUxTRSk7CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4
IDFiN2E1NDMwYjMxNWU1NWQyMDAxMzQ0ZTFmMDI2OTk0OTA1YTRmYjMuLmIwNjBmYjMzZGE3M2Yy
MWMxZTBhZWY4NmNkY2Y0MDBmYWFhMGYzNGUgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9D
aGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxNS0wNS0wNyAgTWljaGFlbCBDYXRhbnphcm8g
IDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gQ2hlY2tzIGZvciBERVZF
TE9QTUVOVF9CVUlMRCBhcmUgYWxsIHdyb25nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ3NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBEb24ndCBkZWZpbmUgREVWRUxPUE1FTlRfQlVJTEQgc2luY2Ug
aXQncyByZWR1bmRhbnQgd2l0aCBERVZFTE9QRVJfTU9ERS4KKworICAgICAgICAqIFNvdXJjZS9j
bWFrZS9PcHRpb25zR1RLLmNtYWtlOgorCiAyMDE1LTA1LTA3ICBDYXJsb3MgR2FyY2lhIENhbXBv
cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBVcGRhdGUgT3B0
aW9uc0dUSy5jbWFrZSBhbmQgTkVXUyBmb3IgMi45LjEgcmVsZWFzZS4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>252598</attachid>
            <date>2015-05-07 10:10:34 -0700</date>
            <delta_ts>2015-05-07 13:18:30 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-144746-20150507120917.patch</filename>
            <type>text/plain</type>
            <size>7147</size>
            <attacher name="Michael Catanzaro">mcatanzaro</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzOTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMThjZWQ4YjYyNDI3NmI2
N2U2MmNkM2M0MjM5NjU1MzAyYzljMjgzYS4uYTFkYjNiNjZlNzU3MDI2YjY0ZTlkNWFhYTdhYTM2
MjRlYzgwNTQ4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE1LTA1LTA3ICBNaWNo
YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBD
aGVja3MgZm9yIERFVkVMT1BNRU5UX0JVSUxEIGFyZSBhbGwgd3JvbmcKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDc0NgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoZWNrIGZvciBERVZFTE9QRVJfTU9E
RSBub3QgREVWRUxPUE1FTlRfQlVJTEQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvR3RrVXRp
bGl0aWVzLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmg6CisgICAg
ICAgICogcGxhdGZvcm0vdGV4dC9ndGsvSHlwaGVuYXRpb25MaWJIeXBoZW4uY3BwOgorCiAyMDE1
LTA1LTA3ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAg
IFtNYWNdIFBsYXliYWNrIHRhcmdldCBpc24ndCBzZXQgb24gbmV3IGVsZW1lbnQKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpp
bmRleCAxNzBhNzc0NjZhOWVhYzM2ZjYxZjJmYWRlMzJkZjA5YzNkNGM0Y2FhLi40OGQ4OTU1YzA0
NDNiZTBjNDg2MWVjZTE4MjY3NDdiZTc5ZGE3OGY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0
Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg
QEAKKzIwMTUtMDUtMDcgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29t
PgorCisgICAgICAgIFtHVEtdIENoZWNrcyBmb3IgREVWRUxPUE1FTlRfQlVJTEQgYXJlIGFsbCB3
cm9uZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0
NzQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hl
Y2sgZm9yIERFVkVMT1BFUl9NT0RFIG5vdCBERVZFTE9QTUVOVF9CVUlMRC4KKworICAgICAgICAq
IFNoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNwcDoKKyAgICAgICAgKFdlYktp
dDo6ZmluZFdlYktpdFByb2Nlc3MpOgorCiAyMDE1LTA1LTA3ICBDYXJsb3MgR2FyY2lhIENhbXBv
cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBVcGRhdGUgT3B0
aW9uc0dUSy5jbWFrZSBhbmQgTkVXUyBmb3IgMi45LjEgcmVsZWFzZS4KZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuY3BwIGIvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5jcHAKaW5kZXggMGM2YTMyYzg2MzIwMDljMGNm
ZDVlZjYzNDQ0MjVjZjIxODJhYzI2Yy4uNjhiZDhiNWQzMDhhZTJjZjU3YTQ3NmE4NjczZjUxNGQ1
MDZhYTg4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxp
dGllcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5j
cHAKQEAgLTU0LDcgKzU0LDcgQEAgYm9vbCB3aWRnZXRJc09uc2NyZWVuVG9wbGV2ZWxXaW5kb3co
R3RrV2lkZ2V0KiB3aWRnZXQpCiAgICAgcmV0dXJuIGd0a193aWRnZXRfaXNfdG9wbGV2ZWwod2lk
Z2V0KSAmJiBHVEtfSVNfV0lORE9XKHdpZGdldCkgJiYgIUdUS19JU19PRkZTQ1JFRU5fV0lORE9X
KHdpZGdldCk7CiB9CiAKLSNpZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JVSUxEKQorI2lmZGVmIERF
VkVMT1BFUl9NT0RFCiBzdGF0aWMgQ1N0cmluZyB0b3BMZXZlbFBhdGgoKQogewogICAgIGlmIChj
b25zdCBjaGFyKiB0b3BMZXZlbERpcmVjdG9yeSA9IGdfZ2V0ZW52KCJXRUJLSVRfVE9QX0xFVkVM
IikpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVz
LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmgKaW5kZXggYzJh
NDM4NWFlMzNkNjg0MDcxNTg4ZTllNDdjYzhjMzgyMGUxYWViYy4uYjIyM2VhZTBlYzUwMTZmZWE3
NmQzNDhlMGY2Yzk4MjY4NWJiYzFkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vZ3RrL0d0a1V0aWxpdGllcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9H
dGtVdGlsaXRpZXMuaApAQCAtMjgsNyArMjgsNyBAQCBjbGFzcyBJbnRQb2ludDsKIEludFBvaW50
IGNvbnZlcnRXaWRnZXRQb2ludFRvU2NyZWVuUG9pbnQoR3RrV2lkZ2V0KiwgY29uc3QgSW50UG9p
bnQmKTsKIGJvb2wgd2lkZ2V0SXNPbnNjcmVlblRvcGxldmVsV2luZG93KEd0a1dpZGdldCopOwog
Ci0jaWYgZGVmaW5lZChERVZFTE9QTUVOVF9CVUlMRCkKKyNpZmRlZiBERVZFTE9QRVJfTU9ERQog
Q1N0cmluZyB3ZWJraXRCdWlsZERpcmVjdG9yeSgpOwogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvZ3RrL0h5cGhlbmF0aW9uTGliSHlwaGVuLmNwcCBi
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvZ3RrL0h5cGhlbmF0aW9uTGliSHlwaGVuLmNw
cAppbmRleCA2ZjA2ZjYxZjRhM2I1NTBmMTBlNDhkNDI5MGNhNGNiOTU1OTIyNzY4Li42Yjg1Yzgw
NjZhMWUxNzJkYjI2NWRmODk1ZGU2NDI5MTljNDZkOTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS90ZXh0L2d0ay9IeXBoZW5hdGlvbkxpYkh5cGhlbi5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9ndGsvSHlwaGVuYXRpb25MaWJIeXBoZW4uY3BwCkBA
IC02Myw3ICs2Myw3IEBAIHN0YXRpYyB2b2lkIHNjYW5EaXJlY3RvcnlGb3JEaWNpb25hcmllcyhj
b25zdCBjaGFyKiBkaXJlY3RvcnlQYXRoLCBIYXNoTWFwPEF0b21pCiAgICAgICAgIGF2YWlsYWJs
ZUxvY2FsZXMuc2V0KEF0b21pY1N0cmluZyhleHRyYWN0TG9jYWxlRnJvbURpY3Rpb25hcnlGaWxl
UGF0aChmaWxlUGF0aCkpLCBmaWxlUGF0aCk7CiB9CiAKLSNpZiBkZWZpbmVkKERFVkVMT1BNRU5U
X0JVSUxEKQorI2lmZGVmIERFVkVMT1BFUl9NT0RFCiBzdGF0aWMgdm9pZCBzY2FuVGVzdERpY3Rp
b25hcmllc0RpcmVjdG9yeUlmTmVjZXNzYXJ5KEhhc2hNYXA8QXRvbWljU3RyaW5nLCBTdHJpbmc+
JiBhdmFpbGFibGVMb2NhbGVzKQogewogICAgIC8vIEl0J3MgdW5mb3J0dW5hdGUgdGhhdCB3ZSBu
ZWVkIHRvIGxvb2sgZm9yIHRoZSBkaWN0aW9uYXJpZXMgdGhpcyB3YXksIGJ1dApkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9Qcm9jZXNzRXhlY3V0YWJsZVBhdGhHdGsuY3Bw
IGIvU291cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9Qcm9jZXNzRXhlY3V0YWJsZVBhdGhHdGsuY3Bw
CmluZGV4IDgxYmFjNDVhOWQxZjJhNDkzZWNkNWU1NTY2ZWQ1Y2EzZGNlMWQyOTQuLjMxMWM1NTgx
ZDQwZGZhNTY0YjkzOTQ3NTE5YjlkMzBiNTE4Njg3MzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQyL1NoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNwcAorKysgYi9Tb3VyY2Uv
V2ViS2l0Mi9TaGFyZWQvZ3RrL1Byb2Nlc3NFeGVjdXRhYmxlUGF0aEd0ay5jcHAKQEAgLTMwLDcg
KzMwLDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0ZpbGVTeXN0ZW0uaD4KICNpbmNsdWRlIDxnbGli
Lmg+CiAKLSNpZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JVSUxEKQorI2lmZGVmIERFVkVMT1BFUl9N
T0RFCiAjaW5jbHVkZSA8d3RmL2dvYmplY3QvR2xpYlV0aWxpdGllcy5oPgogI2VuZGlmCiAKQEAg
LTM4LDcgKzM4LDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJL
aXQgewogCi0jaWYgZGVmaW5lZChERVZFTE9QTUVOVF9CVUlMRCkKKyNpZmRlZiBERVZFTE9QRVJf
TU9ERQogc3RhdGljIFN0cmluZyBnZXRFeGVjdXRhYmxlUGF0aCgpCiB7CiAgICAgQ1N0cmluZyBl
eGVjdXRhYmxlUGF0aCA9IGdldEN1cnJlbnRFeGVjdXRhYmxlUGF0aCgpOwpAQCAtNTAsNyArNTAs
NyBAQCBzdGF0aWMgU3RyaW5nIGdldEV4ZWN1dGFibGVQYXRoKCkKIAogc3RhdGljIFN0cmluZyBm
aW5kV2ViS2l0UHJvY2Vzcyhjb25zdCBjaGFyKiBwcm9jZXNzTmFtZSkKIHsKLSNpZiBkZWZpbmVk
KERFVkVMT1BNRU5UX0JVSUxEKQorI2lmZGVmIERFVkVMT1BFUl9NT0RFCiAgICAgc3RhdGljIGNv
bnN0IGNoYXIqIGV4ZWNEaXJlY3RvcnkgPSBnX2dldGVudigiV0VCS0lUX0VYRUNfUEFUSCIpOwog
ICAgIGlmIChleGVjRGlyZWN0b3J5KSB7CiAgICAgICAgIFN0cmluZyBwcm9jZXNzUGF0aCA9IHBh
dGhCeUFwcGVuZGluZ0NvbXBvbmVudChmaWxlbmFtZVRvU3RyaW5nKGV4ZWNEaXJlY3RvcnkpLCBw
cm9jZXNzTmFtZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZSBi
L1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IGQxYjMzODEyMmMyOGNlMzVmODJj
NjI1NmM3M2IxMjE4YjdlZTg0ZDQuLjI1MDhmNjg3ZjRhNDc4OWJjZTc2YWJiZGI3Y2FhMDVjZTcy
NDNhZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCisrKyBiL1Nv
dXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCkBAIC03Niw4ICs3Niw2IEBAIFdFQktJVF9PUFRJ
T05fREVQRU5EKFVTRV9HU1RSRUFNRVJfR0wgRU5BQkxFX09QRU5HTCkKIFdFQktJVF9PUFRJT05f
REVQRU5EKFVTRV9HU1RSRUFNRVJfR0wgRU5BQkxFX1ZJREVPKQogV0VCS0lUX09QVElPTl9ERVBF
TkQoVVNFX0dTVFJFQU1FUl9NUEVHVFMgRU5BQkxFX1ZJREVPKQogCi0jIEZJWE1FOiBUaGVyZSBp
cyBubyByZWFzb24gdGhlc2Ugc2hvdWxkIGJlIGRpZmZlcmVudC4KLVNFVF9BTkRfRVhQT1NFX1RP
X0JVSUxEKERFVkVMT1BNRU5UX0JVSUxEICR7REVWRUxPUEVSX01PREV9KQogaWYgKERFVkVMT1BF
Ul9NT0RFKQogICAgIFdFQktJVF9PUFRJT05fREVGQVVMVF9QT1JUX1ZBTFVFKEVOQUJMRV9NSU5J
QlJPV1NFUiBQVUJMSUMgT04pCiAgICAgV0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUo
RU5BQkxFX0FQSV9URVNUUyBQUklWQVRFIE9OKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9n
IGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDE5NTczOWVjNWYyZDY0YzU5YWYzYmZkNDQzYjhkMzIz
MjZmODZkNDYuLmFkOTkyZDBlZTRkMDQ4MjNiMjJmNmJhOThhODEwMWEwNzMzYTU1OGYgMTAwNjQ0
Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NSBAQAorMjAxNS0wNS0wNyAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5j
b20+CisKKyAgICAgICAgW0dUS10gQ2hlY2tzIGZvciBERVZFTE9QTUVOVF9CVUlMRCBhcmUgYWxs
IHdyb25nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x
NDQ3NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBD
aGVjayBmb3IgREVWRUxPUEVSX01PREUgbm90IERFVkVMT1BNRU5UX0JVSUxELgorCisgICAgICAg
ICogTWluaUJyb3dzZXIvZ3RrL21haW4uYzoKKyAgICAgICAgKG1haW4pOgorCiAyMDE1LTA1LTA2
ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIGlPUyBidWls
ZCBmaXggYXR0ZW1wdApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL21haW4uYyBi
L1Rvb2xzL01pbmlCcm93c2VyL2d0ay9tYWluLmMKaW5kZXggYmNjMDgyY2Y2YjFmMmY1ZDVjNzY0
YzQwMDEyNTcxOWZjM2ExYjkxNi4uYWQ3NWM3MzhmNjAyNDk5N2EwYTAxNDQyNDg5MjM0NTliNjVl
YjY4ZiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL21haW4uYworKysgYi9Ub29s
cy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jCkBAIC0yNTYsNyArMjU2LDcgQEAgYWJvdXRVUklTY2hl
bWVSZXF1ZXN0Q2FsbGJhY2soV2ViS2l0VVJJU2NoZW1lUmVxdWVzdCAqcmVxdWVzdCwgZ3BvaW50
ZXIgdXNlckRhdGEKIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiB7CiAgICAgZ3Rr
X2luaXQoJmFyZ2MsICZhcmd2KTsKLSNpZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JVSUxEKQorI2lm
ZGVmIERFVkVMT1BFUl9NT0RFCiAgICAgZ19zZXRlbnYoIldFQktJVF9JTkpFQ1RFRF9CVU5ETEVf
UEFUSCIsIFdFQktJVF9JTkpFQ1RFRF9CVU5ETEVfUEFUSCwgRkFMU0UpOwogI2VuZGlmCiAKZGlm
ZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAxYjdhNTQzMGIzMTVlNTVkMjAw
MTM0NGUxZjAyNjk5NDkwNWE0ZmIzLi4xZjdkNjQ1NWRlZGJjNDQ2NmI0M2RhZDhlMzkwN2IwY2Yx
M2JiOGQyIDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs
MTQgQEAKKzIwMTUtMDUtMDcgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEu
Y29tPgorCisgICAgICAgIFtHVEtdIENoZWNrcyBmb3IgREVWRUxPUE1FTlRfQlVJTEQgYXJlIGFs
bCB3cm9uZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MTQ0NzQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
RG9uJ3QgZXhwb3J0IERFVkVMT1BNRU5UX0JVSUxEIHNpbmNlIGl0J3MgcmVkdW5kYW50IHdpdGgg
REVWRUxPUEVSX01PREUuCisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFr
ZToKKwogMjAxNS0wNS0wNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5j
b20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gVXBkYXRlIE9wdGlvbnNHVEsuY21ha2UgYW5kIE5F
V1MgZm9yIDIuOS4xIHJlbGVhc2UuCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>252608</attachid>
            <date>2015-05-07 13:18:35 -0700</date>
            <delta_ts>2015-05-08 01:13:51 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-144746-20150507151717.patch</filename>
            <type>text/plain</type>
            <size>9409</size>
            <attacher name="Michael Catanzaro">mcatanzaro</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzOTQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGIzNTY0OGU4MGUwMjgx
Y2Q3MGMyY2UxMThmZjc0MzYwZWY2MDRiZC4uMDIzNTI1NzYxODcwNDJhOWVjMjUxM2Y5YjlmODA3
YTc1NmQxZTdiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTA1LTA3ICBNaWNo
YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBD
aGVja3MgZm9yIERFVkVMT1BNRU5UX0JVSUxEIGFyZSBhbGwgd3JvbmcKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDc0NgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBERVZFTE9QRVJfTU9ERSByYXRo
ZXIgdGhhbiBERVZFTE9QTUVOVF9CVUlMRC4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtV
dGlsaXRpZXMuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuaDoKKyAg
ICAgICAgKiBwbGF0Zm9ybS90ZXh0L2d0ay9IeXBoZW5hdGlvbkxpYkh5cGhlbi5jcHA6CisgICAg
ICAgIChXZWJDb3JlOjphdmFpbGFibGVMb2NhbGVzKToKKwogMjAxNS0wNS0wNSAgTXlsZXMgQy4g
TWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmVydCAiSW50cm9k
dWNpbmcgdGhlIFBsYXRmb3JtIEFic3RyYWN0aW9uIExheWVyIChQQUwpIgpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4
IDQ3NTc0ZGY5Yzk1MmJlYjA4NGUyMmIxNTI5MDgwZGY2MzhlMjhkZmEuLmUzYjcwZDc5OWE4YmVm
ZGUzMjBlMzJkZjYyMjcyZTE1NzBjMDNiNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0No
YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAor
MjAxNS0wNS0wNyAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CisK
KyAgICAgICAgW0dUS10gQ2hlY2tzIGZvciBERVZFTE9QTUVOVF9CVUlMRCBhcmUgYWxsIHdyb25n
CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ3NDYK
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgREVW
RUxPUEVSX01PREUgcmF0aGVyIHRoYW4gREVWRUxPUE1FTlRfQlVJTEQuCisKKyAgICAgICAgKiBT
aGFyZWQvZ3RrL1Byb2Nlc3NFeGVjdXRhYmxlUGF0aEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6
OmZpbmRXZWJLaXRQcm9jZXNzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX
ZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKGluamVjdGVkQnVuZGxlRGlyZWN0b3J5KToKKyAgICAg
ICAgKiBVSVByb2Nlc3MvZ3RrL1RleHRDaGVja2VyR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6
ZW5jaGFudFRleHRDaGVja2VyKToKKwogMjAxNS0wNS0wNSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxt
bWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmVydCAiSW50cm9kdWNpbmcgdGhlIFBs
YXRmb3JtIEFic3RyYWN0aW9uIExheWVyIChQQUwpIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y
bS9ndGsvR3RrVXRpbGl0aWVzLmNwcAppbmRleCAwYzZhMzJjODYzMjAwOWMwY2ZkNWVmNjM0NDQy
NWNmMjE4MmFjMjZjLi4xNTMxZGU5M2Y3YTc4YWQyNmQ1NTRjOTM1ZjAyNzkzNmVmMmY4YzAzIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNwcAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNwcApAQCAtNTQs
NyArNTQsNyBAQCBib29sIHdpZGdldElzT25zY3JlZW5Ub3BsZXZlbFdpbmRvdyhHdGtXaWRnZXQq
IHdpZGdldCkKICAgICByZXR1cm4gZ3RrX3dpZGdldF9pc190b3BsZXZlbCh3aWRnZXQpICYmIEdU
S19JU19XSU5ET1cod2lkZ2V0KSAmJiAhR1RLX0lTX09GRlNDUkVFTl9XSU5ET1cod2lkZ2V0KTsK
IH0KIAotI2lmIGRlZmluZWQoREVWRUxPUE1FTlRfQlVJTEQpCisjaWYgZGVmaW5lZChERVZFTE9Q
RVJfTU9ERSkKIHN0YXRpYyBDU3RyaW5nIHRvcExldmVsUGF0aCgpCiB7CiAgICAgaWYgKGNvbnN0
IGNoYXIqIHRvcExldmVsRGlyZWN0b3J5ID0gZ19nZXRlbnYoIldFQktJVF9UT1BfTEVWRUwiKSkK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuaCBi
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuaAppbmRleCBjMmE0Mzg1
YWUzM2Q2ODQwNzE1ODhlOWU0N2NjOGMzODIwZTFhZWJjLi5hNjNjYmM5ZmNlNGMxODFlZTZiM2Zh
ZGQ3ZjFmZGVlYTZhZWU5ZDY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n
dGsvR3RrVXRpbGl0aWVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0
aWxpdGllcy5oCkBAIC0yOCw3ICsyOCw3IEBAIGNsYXNzIEludFBvaW50OwogSW50UG9pbnQgY29u
dmVydFdpZGdldFBvaW50VG9TY3JlZW5Qb2ludChHdGtXaWRnZXQqLCBjb25zdCBJbnRQb2ludCYp
OwogYm9vbCB3aWRnZXRJc09uc2NyZWVuVG9wbGV2ZWxXaW5kb3coR3RrV2lkZ2V0Kik7CiAKLSNp
ZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JVSUxEKQorI2lmIGRlZmluZWQoREVWRUxPUEVSX01PREUp
CiBDU3RyaW5nIHdlYmtpdEJ1aWxkRGlyZWN0b3J5KCk7CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9ndGsvSHlwaGVuYXRpb25MaWJIeXBoZW4uY3Bw
IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9ndGsvSHlwaGVuYXRpb25MaWJIeXBoZW4u
Y3BwCmluZGV4IDZmMDZmNjFmNGEzYjU1MGYxMGU0OGQ0MjkwY2E0Y2I5NTU5MjI3NjguLmU2ZmZl
NDg0YjM3YTExMDc2MTk5NDNlY2UzNjY0NWY2MmRkNjhjZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL3RleHQvZ3RrL0h5cGhlbmF0aW9uTGliSHlwaGVuLmNwcAorKysgYi9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L2d0ay9IeXBoZW5hdGlvbkxpYkh5cGhlbi5jcHAK
QEAgLTYzLDcgKzYzLDcgQEAgc3RhdGljIHZvaWQgc2NhbkRpcmVjdG9yeUZvckRpY2lvbmFyaWVz
KGNvbnN0IGNoYXIqIGRpcmVjdG9yeVBhdGgsIEhhc2hNYXA8QXRvbWkKICAgICAgICAgYXZhaWxh
YmxlTG9jYWxlcy5zZXQoQXRvbWljU3RyaW5nKGV4dHJhY3RMb2NhbGVGcm9tRGljdGlvbmFyeUZp
bGVQYXRoKGZpbGVQYXRoKSksIGZpbGVQYXRoKTsKIH0KIAotI2lmIGRlZmluZWQoREVWRUxPUE1F
TlRfQlVJTEQpCisjaWYgZGVmaW5lZChERVZFTE9QRVJfTU9ERSkKIHN0YXRpYyB2b2lkIHNjYW5U
ZXN0RGljdGlvbmFyaWVzRGlyZWN0b3J5SWZOZWNlc3NhcnkoSGFzaE1hcDxBdG9taWNTdHJpbmcs
IFN0cmluZz4mIGF2YWlsYWJsZUxvY2FsZXMpCiB7CiAgICAgLy8gSXQncyB1bmZvcnR1bmF0ZSB0
aGF0IHdlIG5lZWQgdG8gbG9vayBmb3IgdGhlIGRpY3Rpb25hcmllcyB0aGlzIHdheSwgYnV0CkBA
IC05MSw3ICs5MSw3IEBAIHN0YXRpYyBIYXNoTWFwPEF0b21pY1N0cmluZywgU3RyaW5nPiYgYXZh
aWxhYmxlTG9jYWxlcygpCiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgV1RGX0FSUkFZ
X0xFTkdUSChnRGljdGlvbmFyeURpcmVjdG9yaWVzKTsgaSsrKQogICAgICAgICAgICAgc2NhbkRp
cmVjdG9yeUZvckRpY2lvbmFyaWVzKGdEaWN0aW9uYXJ5RGlyZWN0b3JpZXNbaV0sIGF2YWlsYWJs
ZUxvY2FsZXMpOwogCi0jaWYgZGVmaW5lZChERVZFTE9QTUVOVF9CVUlMRCkKKyNpZiBkZWZpbmVk
KERFVkVMT1BFUl9NT0RFKQogICAgICAgICBzY2FuVGVzdERpY3Rpb25hcmllc0RpcmVjdG9yeUlm
TmVjZXNzYXJ5KGF2YWlsYWJsZUxvY2FsZXMpOwogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQyL1NoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNwcCBiL1NvdXJj
ZS9XZWJLaXQyL1NoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNwcAppbmRleCA4
MWJhYzQ1YTlkMWYyYTQ5M2VjZDVlNTU2NmVkNWNhM2RjZTFkMjk0Li4wY2Y5MDFhZTliNTU4MjAy
ZWVlOWU1ZTFkYmZmMTk3ODk0ZTYxMGFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy
ZWQvZ3RrL1Byb2Nlc3NFeGVjdXRhYmxlUGF0aEd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv
U2hhcmVkL2d0ay9Qcm9jZXNzRXhlY3V0YWJsZVBhdGhHdGsuY3BwCkBAIC0zMCw3ICszMCw3IEBA
CiAjaW5jbHVkZSA8V2ViQ29yZS9GaWxlU3lzdGVtLmg+CiAjaW5jbHVkZSA8Z2xpYi5oPgogCi0j
aWYgZGVmaW5lZChERVZFTE9QTUVOVF9CVUlMRCkKKyNpZiBkZWZpbmVkKERFVkVMT1BFUl9NT0RF
KQogI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dsaWJVdGlsaXRpZXMuaD4KICNlbmRpZgogCkBAIC0z
OCw3ICszOCw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0
IHsKIAotI2lmIGRlZmluZWQoREVWRUxPUE1FTlRfQlVJTEQpCisjaWYgZGVmaW5lZChERVZFTE9Q
RVJfTU9ERSkKIHN0YXRpYyBTdHJpbmcgZ2V0RXhlY3V0YWJsZVBhdGgoKQogewogICAgIENTdHJp
bmcgZXhlY3V0YWJsZVBhdGggPSBnZXRDdXJyZW50RXhlY3V0YWJsZVBhdGgoKTsKQEAgLTUwLDcg
KzUwLDcgQEAgc3RhdGljIFN0cmluZyBnZXRFeGVjdXRhYmxlUGF0aCgpCiAKIHN0YXRpYyBTdHJp
bmcgZmluZFdlYktpdFByb2Nlc3MoY29uc3QgY2hhciogcHJvY2Vzc05hbWUpCiB7Ci0jaWYgZGVm
aW5lZChERVZFTE9QTUVOVF9CVUlMRCkKKyNpZiBkZWZpbmVkKERFVkVMT1BFUl9NT0RFKQogICAg
IHN0YXRpYyBjb25zdCBjaGFyKiBleGVjRGlyZWN0b3J5ID0gZ19nZXRlbnYoIldFQktJVF9FWEVD
X1BBVEgiKTsKICAgICBpZiAoZXhlY0RpcmVjdG9yeSkgewogICAgICAgICBTdHJpbmcgcHJvY2Vz
c1BhdGggPSBwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoZmlsZW5hbWVUb1N0cmluZyhleGVjRGly
ZWN0b3J5KSwgcHJvY2Vzc05hbWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j
ZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl
c3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcAppbmRleCBlNDRjMTczNjJmZTI1NzYxMDgw
ODQwNmJjOWYxNmNjNmEyMWE5OWJkLi40YjBlN2JjZWE5ZWNlYzJiNGY4MTFhNTkwZjA1MzJkODFh
MmVmOGE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL
aXRXZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X
ZWJLaXRXZWJDb250ZXh0LmNwcApAQCAtMjE2LDcgKzIxNiw3IEBAIHN0YXRpYyBpbmxpbmUgV2Vi
S2l0UHJvY2Vzc01vZGVsIHRvV2ViS2l0UHJvY2Vzc01vZGVsKFdlYktpdDo6UHJvY2Vzc01vZGVs
IHByb2NlCiAKIHN0YXRpYyBjb25zdCBjaGFyKiBpbmplY3RlZEJ1bmRsZURpcmVjdG9yeSgpCiB7
Ci0jaWYgZGVmaW5lZChERVZFTE9QTUVOVF9CVUlMRCkKKyNpZiBkZWZpbmVkKERFVkVMT1BFUl9N
T0RFKQogICAgIGNvbnN0IGNoYXIqIGJ1bmRsZURpcmVjdG9yeSA9IGdfZ2V0ZW52KCJXRUJLSVRf
SU5KRUNURURfQlVORExFX1BBVEgiKTsKICAgICBpZiAoYnVuZGxlRGlyZWN0b3J5ICYmIGdfZmls
ZV90ZXN0KGJ1bmRsZURpcmVjdG9yeSwgR19GSUxFX1RFU1RfSVNfRElSKSkKICAgICAgICAgcmV0
dXJuIGJ1bmRsZURpcmVjdG9yeTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz
cy9ndGsvVGV4dENoZWNrZXJHdGsuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9U
ZXh0Q2hlY2tlckd0ay5jcHAKaW5kZXggZWQxMmQ4M2NkNzhlYjEwNTUzMDIxZmYwOTc4ZmFmZWQ1
YzhhZGYyMi4uOWE5NDgwZmZjOGRhYjlmODg4ZjE0NDAzZTRjZmM2ZTdlOTUzMzFiYyAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9UZXh0Q2hlY2tlckd0ay5jcHAKKysr
IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9UZXh0Q2hlY2tlckd0ay5jcHAKQEAgLTQ0
LDcgKzQ0LDcgQEAgc3RhdGljIFdlYkNvcmU6OlRleHRDaGVja2VyRW5jaGFudCYgZW5jaGFudFRl
eHRDaGVja2VyKCkKIHsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8V2ViQ29yZTo6VGV4dENo
ZWNrZXJFbmNoYW50PiBjaGVja2VyOwogCi0jaWYgZGVmaW5lZChERVZFTE9QTUVOVF9CVUlMRCkK
KyNpZiBkZWZpbmVkKERFVkVMT1BFUl9NT0RFKQogICAgIC8vIFRoaXMgaXMgYSBiaXQgb2YgYSBo
YWNrLCBidXQgZW5zdXJlcyB0aGF0IGZvciB0ZXN0aW5nIHB1cnBvc2VzLAogICAgIC8vIHNwZWxs
IGNoZWNraW5nIGlzIHByb3Blcmx5IGluaXRpYWxpemVkIGluIFdlYktpdFRlc3RSdW5uZXIgd2hp
bGUKICAgICAvLyBydW5uaW5nIGxheW91dCB0ZXN0cy4gV2Ugc2hvdWxkIGNvbnNpZGVyIHJlcGxh
Y2luZyB0aGlzIHdpdGggc29tZQpkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNHVEsu
Y21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQppbmRleCBkMWIzMzgxMjJjMjhj
ZTM1ZjgyYzYyNTZjNzNiMTIxOGI3ZWU4NGQ0Li4yNTA4ZjY4N2Y0YTQ3ODliY2U3NmFiYmRiN2Nh
YTA1Y2U3MjQzYWVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQor
KysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQpAQCAtNzYsOCArNzYsNiBAQCBXRUJL
SVRfT1BUSU9OX0RFUEVORChVU0VfR1NUUkVBTUVSX0dMIEVOQUJMRV9PUEVOR0wpCiBXRUJLSVRf
T1BUSU9OX0RFUEVORChVU0VfR1NUUkVBTUVSX0dMIEVOQUJMRV9WSURFTykKIFdFQktJVF9PUFRJ
T05fREVQRU5EKFVTRV9HU1RSRUFNRVJfTVBFR1RTIEVOQUJMRV9WSURFTykKIAotIyBGSVhNRTog
VGhlcmUgaXMgbm8gcmVhc29uIHRoZXNlIHNob3VsZCBiZSBkaWZmZXJlbnQuCi1TRVRfQU5EX0VY
UE9TRV9UT19CVUlMRChERVZFTE9QTUVOVF9CVUlMRCAke0RFVkVMT1BFUl9NT0RFfSkKIGlmIChE
RVZFTE9QRVJfTU9ERSkKICAgICBXRUJLSVRfT1BUSU9OX0RFRkFVTFRfUE9SVF9WQUxVRShFTkFC
TEVfTUlOSUJST1dTRVIgUFVCTElDIE9OKQogICAgIFdFQktJVF9PUFRJT05fREVGQVVMVF9QT1JU
X1ZBTFVFKEVOQUJMRV9BUElfVEVTVFMgUFJJVkFURSBPTikKZGlmZiAtLWdpdCBhL1Rvb2xzL0No
YW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0OWVkODJhNDlhZDEzNjIwZGI3YmM5M2Ji
ZDFkZmJmZDI3NzkxODk1Li5hZGRlMjUwZWJkMzhmMGIzZGM0NzNhNTU5OGQ0OThlMjAxZDllMWY0
IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0x
LDMgKzEsMTUgQEAKKzIwMTUtMDUtMDcgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0Bp
Z2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIENoZWNrcyBmb3IgREVWRUxPUE1FTlRfQlVJTEQg
YXJlIGFsbCB3cm9uZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MTQ0NzQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgVXNlIERFVkVMT1BFUl9NT0RFIHJhdGhlciB0aGFuIERFVkVMT1BNRU5UX0JVSUxELgor
CisgICAgICAgICogTWluaUJyb3dzZXIvZ3RrL21haW4uYzoKKyAgICAgICAgKG1haW4pOgorCiAy
MDE1LTA1LTA1ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAg
ICAgICAgUmV2ZXJ0ICJJbnRyb2R1Y2luZyB0aGUgUGxhdGZvcm0gQWJzdHJhY3Rpb24gTGF5ZXIg
KFBBTCkiCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jIGIvVG9vbHMv
TWluaUJyb3dzZXIvZ3RrL21haW4uYwppbmRleCBiY2MwODJjZjZiMWYyZjVkNWM3NjRjNDAwMTI1
NzE5ZmMzYTFiOTE2Li5jNjA4NGVmMTg2ZWZhZTE4MzFjNTdjMjgyZGUxM2YzMzhjZmZiYzNlIDEw
MDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jCisrKyBiL1Rvb2xzL01pbmlC
cm93c2VyL2d0ay9tYWluLmMKQEAgLTI1Niw3ICsyNTYsNyBAQCBhYm91dFVSSVNjaGVtZVJlcXVl
c3RDYWxsYmFjayhXZWJLaXRVUklTY2hlbWVSZXF1ZXN0ICpyZXF1ZXN0LCBncG9pbnRlciB1c2Vy
RGF0YQogaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIHsKICAgICBndGtfaW5pdCgm
YXJnYywgJmFyZ3YpOwotI2lmIGRlZmluZWQoREVWRUxPUE1FTlRfQlVJTEQpCisjaWYgZGVmaW5l
ZChERVZFTE9QRVJfTU9ERSkKICAgICBnX3NldGVudigiV0VCS0lUX0lOSkVDVEVEX0JVTkRMRV9Q
QVRIIiwgV0VCS0lUX0lOSkVDVEVEX0JVTkRMRV9QQVRILCBGQUxTRSk7CiAjZW5kaWYKIApkaWZm
IC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IGVlZDA1YTljNWQ1MmQ3MTI5Mzc3
NTE2MWRmNzEyMTFmZmFjMmM5NTEuLjY3MGNmYjk5YjZiNDAyMmNkZmE5Mjk0MTU3YzBkNjM3MDMz
NTBmYTIgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NSBAQAorMjAxNS0wNS0wNyAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5j
b20+CisKKyAgICAgICAgW0dUS10gQ2hlY2tzIGZvciBERVZFTE9QTUVOVF9CVUlMRCBhcmUgYWxs
IHdyb25nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x
NDQ3NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBE
b24ndCBzZXQgREVWRUxPUE1FTlRfQlVJTEQuIFdlIGNoZWNrIHdoZXRoZXIgaXQgaXMgZGVmaW5l
ZCBmb3IgY29uZGl0aW9uYWwgY29tcGlsYXRpb24sIG5vdAorICAgICAgICB3aGF0IGl0IGlzIGRl
ZmluZWQgdG8sIHNvIGRlZmluaW5nIGl0IHRvIDAgZWZmZWN0aXZlbHkgdHVybmVkIGl0IG9uIGFs
d2F5cy4KKworICAgICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlOgorCiAyMDE1
LTA1LTA1ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAg
ICAgUmV2ZXJ0ICJJbnRyb2R1Y2luZyB0aGUgUGxhdGZvcm0gQWJzdHJhY3Rpb24gTGF5ZXIgKFBB
TCkiCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>252699</attachid>
            <date>2015-05-08 01:13:51 -0700</date>
            <delta_ts>2015-05-08 09:45:38 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>wk-development-build.diff</filename>
            <type>text/plain</type>
            <size>1547</size>
            <attacher name="Carlos Garcia Campos">cgarcia</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBmZGVhMGY5Li5kYWNhMGUx
IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK
KzIwMTUtMDUtMDggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor
CisgICAgICAgIFJFR1JFU1NJT04ocjE4MzQxNik6IFtHVEtdIENoZWNrcyBmb3IgREVWRUxPUE1F
TlRfQlVJTEQgYXJlIGFsbCB3cm9uZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z
aG93X2J1Zy5jZ2k/aWQ9MTQ0NzQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgQnJpbmcgYmFjayBERVZFTE9QTUVOVF9CVUlMRCBkZWZpbml0aW9uIHJl
bW92ZWQgaW4gcjE4MzQxNi4KKworICAgICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNt
YWtlOgorCiAyMDE1LTA1LTA4ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9y
Zz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTgzOTQ1LgpkaWZmIC0tZ2l0
IGEvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dU
Sy5jbWFrZQppbmRleCBkMWIzMzgxLi44YjFjNTJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2Uv
T3B0aW9uc0dUSy5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQpAQCAt
NzYsOCArNzYsNiBAQCBXRUJLSVRfT1BUSU9OX0RFUEVORChVU0VfR1NUUkVBTUVSX0dMIEVOQUJM
RV9PUEVOR0wpCiBXRUJLSVRfT1BUSU9OX0RFUEVORChVU0VfR1NUUkVBTUVSX0dMIEVOQUJMRV9W
SURFTykKIFdFQktJVF9PUFRJT05fREVQRU5EKFVTRV9HU1RSRUFNRVJfTVBFR1RTIEVOQUJMRV9W
SURFTykKIAotIyBGSVhNRTogVGhlcmUgaXMgbm8gcmVhc29uIHRoZXNlIHNob3VsZCBiZSBkaWZm
ZXJlbnQuCi1TRVRfQU5EX0VYUE9TRV9UT19CVUlMRChERVZFTE9QTUVOVF9CVUlMRCAke0RFVkVM
T1BFUl9NT0RFfSkKIGlmIChERVZFTE9QRVJfTU9ERSkKICAgICBXRUJLSVRfT1BUSU9OX0RFRkFV
TFRfUE9SVF9WQUxVRShFTkFCTEVfTUlOSUJST1dTRVIgUFVCTElDIE9OKQogICAgIFdFQktJVF9P
UFRJT05fREVGQVVMVF9QT1JUX1ZBTFVFKEVOQUJMRV9BUElfVEVTVFMgUFJJVkFURSBPTikKQEAg
LTIwNiw2ICsyMDQsMTAgQEAgYWRkX2RlZmluaXRpb25zKC1EVVNFUl9BR0VOVF9HVEtfTUFKT1Jf
VkVSU0lPTj02MDEpCiBhZGRfZGVmaW5pdGlvbnMoLURVU0VSX0FHRU5UX0dUS19NSU5PUl9WRVJT
SU9OPTEpCiBhZGRfZGVmaW5pdGlvbnMoLURXRUJLSVRHVEtfQVBJX1ZFUlNJT05fU1RSSU5HPSIk
e1dFQktJVEdUS19BUElfVkVSU0lPTn0iKQogCitpZiAoREVWRUxPUEVSX01PREUpCisgIGFkZF9k
ZWZpbml0aW9ucygtRERFVkVMT1BNRU5UX0JVSUxEPTEpCitlbmRpZiAoKQorCiBpZiAoRU5BQkxF
X1dBWUxBTkRfVEFSR0VUKQogICAgIHNldChHVEszX1JFUVVJUkVEX1ZFUlNJT04gMy4xMi4wKQog
ZWxzZSAoKQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>252724</attachid>
            <date>2015-05-08 09:45:42 -0700</date>
            <delta_ts>2015-05-08 13:31:07 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-144746-20150508094424.patch</filename>
            <type>text/plain</type>
            <size>9837</size>
            <attacher name="Martin Robinson">mrobinson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzOTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODNhNmQyZTkyZTZkMDJm
MDZiYTY3MzgwMWU3MGVkYjUwMzY2OGQ2Mi4uZjYwNjQyZjdjNDQyMTZlMjlmZmUzNzJiMzMzYjM0
ODIzNDI1ZTI5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTA1LTA4ICBNaWNo
YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4sIE1hcnRpbiBSb2JpbnNvbiA8
bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gQ2hlY2tzIGZvciBERVZFTE9Q
TUVOVF9CVUlMRCBhcmUgYWxsIHdyb25nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0xNDQ3NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBVc2UgRU5BQkxFKERFVkVMT1BFUl9NT0RFKSByYXRoZXIgdGhhbiBE
RVZFTE9QTUVOVF9CVUlMRC4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMu
Y3BwOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuaDoKKyAgICAgICAgKiBw
bGF0Zm9ybS90ZXh0L2d0ay9IeXBoZW5hdGlvbkxpYkh5cGhlbi5jcHA6CisgICAgICAgIChXZWJD
b3JlOjphdmFpbGFibGVMb2NhbGVzKToKKwogMjAxNS0wNS0wOCAgWGFiaWVyIFJvZHJpZ3VleiBD
YWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPiBhbmQgWW91ZW5uIEZhYmxldCA8eW91ZW5uLmZh
YmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgW1N0cmVhbXMgQVBJXSBSZWFkYWJsZVN0cmVh
bSBjb25zdHJ1Y3RvciBzdGFydCBmdW5jdGlvbiBzaG91bGQgYmUgYWJsZSB0byBlcnJvciB0aGUg
c3RyZWFtCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi
S2l0Mi9DaGFuZ2VMb2cKaW5kZXggZWRhN2QwMzI3YjE0NzlkNzhiZjlkOWVlYjQwMDM4MWNiMTE5
N2ZkYy4uZjhiOTU1Y2E4MWI4YjQ3MmY1MWNkYjIwNzQwNDFjODFmYWQ3NmRiYSAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA1LTA4ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRh
bnphcm9AaWdhbGlhLmNvbT4sIE1hcnRpbiBSb2JpbnNvbiA8bXJvYmluc29uQGlnYWxpYS5jb20+
CisKKyAgICAgICAgW0dUS10gQ2hlY2tzIGZvciBERVZFTE9QTUVOVF9CVUlMRCBhcmUgYWxsIHdy
b25nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ3
NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2Ug
RU5BQkxFKERFVkVMT1BFUl9NT0RFKSByYXRoZXIgdGhhbiBERVZFTE9QTUVOVF9CVUlMRC4KKwor
ICAgICAgICAqIFNoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNwcDoKKyAgICAg
ICAgKFdlYktpdDo6ZmluZFdlYktpdFByb2Nlc3MpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv
Z3RrL1dlYktpdFdlYkNvbnRleHQuY3BwOgorICAgICAgICAoaW5qZWN0ZWRCdW5kbGVEaXJlY3Rv
cnkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvVGV4dENoZWNrZXJHdGsuY3BwOgorICAgICAg
ICAoV2ViS2l0OjplbmNoYW50VGV4dENoZWNrZXIpOgorCiAyMDE1LTA1LTA4ICBDYXJsb3MgR2Fy
Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBFeHBvc2Ug
YWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzIHNldHRpbmcgdG8gV2ViS2l0MiBHVEsrIEFQSQpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNwcAppbmRleCAwYzZh
MzJjODYzMjAwOWMwY2ZkNWVmNjM0NDQyNWNmMjE4MmFjMjZjLi5hY2RhZjRlZDZiMmQ4NDVhZTRk
ZmUwZTc1ZThhMmE1NzhkMjk0ZTM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y
bS9ndGsvR3RrVXRpbGl0aWVzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv
R3RrVXRpbGl0aWVzLmNwcApAQCAtNTQsNyArNTQsNyBAQCBib29sIHdpZGdldElzT25zY3JlZW5U
b3BsZXZlbFdpbmRvdyhHdGtXaWRnZXQqIHdpZGdldCkKICAgICByZXR1cm4gZ3RrX3dpZGdldF9p
c190b3BsZXZlbCh3aWRnZXQpICYmIEdUS19JU19XSU5ET1cod2lkZ2V0KSAmJiAhR1RLX0lTX09G
RlNDUkVFTl9XSU5ET1cod2lkZ2V0KTsKIH0KIAotI2lmIGRlZmluZWQoREVWRUxPUE1FTlRfQlVJ
TEQpCisjaWYgRU5BQkxFKERFVkVMT1BFUl9NT0RFKQogc3RhdGljIENTdHJpbmcgdG9wTGV2ZWxQ
YXRoKCkKIHsKICAgICBpZiAoY29uc3QgY2hhciogdG9wTGV2ZWxEaXJlY3RvcnkgPSBnX2dldGVu
digiV0VCS0lUX1RPUF9MRVZFTCIpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vZ3RrL0d0a1V0aWxpdGllcy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0
aWxpdGllcy5oCmluZGV4IGMyYTQzODVhZTMzZDY4NDA3MTU4OGU5ZTQ3Y2M4YzM4MjBlMWFlYmMu
LjAzMmRmZDMxYTg4NzI0MDE4OTk3ZGZiNjE1ZWM4NjMwZTU3NTRlZjkgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuaAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmgKQEAgLTI4LDcgKzI4LDcgQEAgY2xhc3Mg
SW50UG9pbnQ7CiBJbnRQb2ludCBjb252ZXJ0V2lkZ2V0UG9pbnRUb1NjcmVlblBvaW50KEd0a1dp
ZGdldCosIGNvbnN0IEludFBvaW50Jik7CiBib29sIHdpZGdldElzT25zY3JlZW5Ub3BsZXZlbFdp
bmRvdyhHdGtXaWRnZXQqKTsKIAotI2lmIGRlZmluZWQoREVWRUxPUE1FTlRfQlVJTEQpCisjaWYg
RU5BQkxFKERFVkVMT1BFUl9NT0RFKQogQ1N0cmluZyB3ZWJraXRCdWlsZERpcmVjdG9yeSgpOwog
I2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvZ3RrL0h5
cGhlbmF0aW9uTGliSHlwaGVuLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvZ3Rr
L0h5cGhlbmF0aW9uTGliSHlwaGVuLmNwcAppbmRleCA2ZjA2ZjYxZjRhM2I1NTBmMTBlNDhkNDI5
MGNhNGNiOTU1OTIyNzY4Li4wMjM0MjkxN2I1ODQ0MjBjOWY3OTYxMDkwNjdiYWRmYTJiNjdkN2Qy
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L2d0ay9IeXBoZW5hdGlv
bkxpYkh5cGhlbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9ndGsvSHlw
aGVuYXRpb25MaWJIeXBoZW4uY3BwCkBAIC02Myw3ICs2Myw3IEBAIHN0YXRpYyB2b2lkIHNjYW5E
aXJlY3RvcnlGb3JEaWNpb25hcmllcyhjb25zdCBjaGFyKiBkaXJlY3RvcnlQYXRoLCBIYXNoTWFw
PEF0b21pCiAgICAgICAgIGF2YWlsYWJsZUxvY2FsZXMuc2V0KEF0b21pY1N0cmluZyhleHRyYWN0
TG9jYWxlRnJvbURpY3Rpb25hcnlGaWxlUGF0aChmaWxlUGF0aCkpLCBmaWxlUGF0aCk7CiB9CiAK
LSNpZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JVSUxEKQorI2lmIEVOQUJMRShERVZFTE9QRVJfTU9E
RSkKIHN0YXRpYyB2b2lkIHNjYW5UZXN0RGljdGlvbmFyaWVzRGlyZWN0b3J5SWZOZWNlc3Nhcnko
SGFzaE1hcDxBdG9taWNTdHJpbmcsIFN0cmluZz4mIGF2YWlsYWJsZUxvY2FsZXMpCiB7CiAgICAg
Ly8gSXQncyB1bmZvcnR1bmF0ZSB0aGF0IHdlIG5lZWQgdG8gbG9vayBmb3IgdGhlIGRpY3Rpb25h
cmllcyB0aGlzIHdheSwgYnV0CkBAIC05MSw3ICs5MSw3IEBAIHN0YXRpYyBIYXNoTWFwPEF0b21p
Y1N0cmluZywgU3RyaW5nPiYgYXZhaWxhYmxlTG9jYWxlcygpCiAgICAgICAgIGZvciAoc2l6ZV90
IGkgPSAwOyBpIDwgV1RGX0FSUkFZX0xFTkdUSChnRGljdGlvbmFyeURpcmVjdG9yaWVzKTsgaSsr
KQogICAgICAgICAgICAgc2NhbkRpcmVjdG9yeUZvckRpY2lvbmFyaWVzKGdEaWN0aW9uYXJ5RGly
ZWN0b3JpZXNbaV0sIGF2YWlsYWJsZUxvY2FsZXMpOwogCi0jaWYgZGVmaW5lZChERVZFTE9QTUVO
VF9CVUlMRCkKKyNpZiBFTkFCTEUoREVWRUxPUEVSX01PREUpCiAgICAgICAgIHNjYW5UZXN0RGlj
dGlvbmFyaWVzRGlyZWN0b3J5SWZOZWNlc3NhcnkoYXZhaWxhYmxlTG9jYWxlcyk7CiAjZW5kaWYK
IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9Qcm9jZXNzRXhlY3V0YWJs
ZVBhdGhHdGsuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9Qcm9jZXNzRXhlY3V0YWJs
ZVBhdGhHdGsuY3BwCmluZGV4IDgxYmFjNDVhOWQxZjJhNDkzZWNkNWU1NTY2ZWQ1Y2EzZGNlMWQy
OTQuLjNmZTgwZjQ0YTM1OTRmYjRhMmRjOGI5YjI3NzViYTI5NzM0NTY1OTEgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNwcAor
KysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ3RrL1Byb2Nlc3NFeGVjdXRhYmxlUGF0aEd0ay5j
cHAKQEAgLTMwLDcgKzMwLDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0ZpbGVTeXN0ZW0uaD4KICNp
bmNsdWRlIDxnbGliLmg+CiAKLSNpZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JVSUxEKQorI2lmIEVO
QUJMRShERVZFTE9QRVJfTU9ERSkKICNpbmNsdWRlIDx3dGYvZ29iamVjdC9HbGliVXRpbGl0aWVz
Lmg+CiAjZW5kaWYKIApAQCAtMzgsNyArMzgsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsK
IAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLSNpZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JVSUxEKQor
I2lmIEVOQUJMRShERVZFTE9QRVJfTU9ERSkKIHN0YXRpYyBTdHJpbmcgZ2V0RXhlY3V0YWJsZVBh
dGgoKQogewogICAgIENTdHJpbmcgZXhlY3V0YWJsZVBhdGggPSBnZXRDdXJyZW50RXhlY3V0YWJs
ZVBhdGgoKTsKQEAgLTUwLDcgKzUwLDcgQEAgc3RhdGljIFN0cmluZyBnZXRFeGVjdXRhYmxlUGF0
aCgpCiAKIHN0YXRpYyBTdHJpbmcgZmluZFdlYktpdFByb2Nlc3MoY29uc3QgY2hhciogcHJvY2Vz
c05hbWUpCiB7Ci0jaWYgZGVmaW5lZChERVZFTE9QTUVOVF9CVUlMRCkKKyNpZiBFTkFCTEUoREVW
RUxPUEVSX01PREUpCiAgICAgc3RhdGljIGNvbnN0IGNoYXIqIGV4ZWNEaXJlY3RvcnkgPSBnX2dl
dGVudigiV0VCS0lUX0VYRUNfUEFUSCIpOwogICAgIGlmIChleGVjRGlyZWN0b3J5KSB7CiAgICAg
ICAgIFN0cmluZyBwcm9jZXNzUGF0aCA9IHBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChmaWxlbmFt
ZVRvU3RyaW5nKGV4ZWNEaXJlY3RvcnkpLCBwcm9jZXNzTmFtZSk7CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcCBiL1NvdXJj
ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCmluZGV4IGU0
NGMxNzM2MmZlMjU3NjEwODA4NDA2YmM5ZjE2Y2M2YTIxYTk5YmQuLjBjZDYwMGQ5YzM5MDcxZThk
MmIxNjYwOThlMTI3YWViOWExMTk4YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv
Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ
UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCkBAIC0yMTYsNyArMjE2LDcgQEAg
c3RhdGljIGlubGluZSBXZWJLaXRQcm9jZXNzTW9kZWwgdG9XZWJLaXRQcm9jZXNzTW9kZWwoV2Vi
S2l0OjpQcm9jZXNzTW9kZWwgcHJvY2UKIAogc3RhdGljIGNvbnN0IGNoYXIqIGluamVjdGVkQnVu
ZGxlRGlyZWN0b3J5KCkKIHsKLSNpZiBkZWZpbmVkKERFVkVMT1BNRU5UX0JVSUxEKQorI2lmIEVO
QUJMRShERVZFTE9QRVJfTU9ERSkKICAgICBjb25zdCBjaGFyKiBidW5kbGVEaXJlY3RvcnkgPSBn
X2dldGVudigiV0VCS0lUX0lOSkVDVEVEX0JVTkRMRV9QQVRIIik7CiAgICAgaWYgKGJ1bmRsZURp
cmVjdG9yeSAmJiBnX2ZpbGVfdGVzdChidW5kbGVEaXJlY3RvcnksIEdfRklMRV9URVNUX0lTX0RJ
UikpCiAgICAgICAgIHJldHVybiBidW5kbGVEaXJlY3Rvcnk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1RleHRDaGVja2VyR3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQy
L1VJUHJvY2Vzcy9ndGsvVGV4dENoZWNrZXJHdGsuY3BwCmluZGV4IGJmNDVlNWI3MTU2OTIzZjI4
NzlhZTgzMWZlODIzNTJkZjdhYTJjNjkuLjI5MmQyNTNmNThhMWE3OWVlMzY2ZTdlNDA1MjZlM2Vi
OTAzMDkyODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvVGV4dENo
ZWNrZXJHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvVGV4dENoZWNr
ZXJHdGsuY3BwCkBAIC00NCw3ICs0NCw3IEBAIHN0YXRpYyBXZWJDb3JlOjpUZXh0Q2hlY2tlckVu
Y2hhbnQmIGVuY2hhbnRUZXh0Q2hlY2tlcigpCiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVk
PFdlYkNvcmU6OlRleHRDaGVja2VyRW5jaGFudD4gY2hlY2tlcjsKIAotI2lmIGRlZmluZWQoREVW
RUxPUE1FTlRfQlVJTEQpCisjaWYgRU5BQkxFKERFVkVMT1BFUl9NT0RFKQogICAgIC8vIFRoaXMg
aXMgYSBiaXQgb2YgYSBoYWNrLCBidXQgZW5zdXJlcyB0aGF0IGZvciB0ZXN0aW5nIHB1cnBvc2Vz
LAogICAgIC8vIHNwZWxsIGNoZWNraW5nIGlzIHByb3Blcmx5IGluaXRpYWxpemVkIGluIFdlYktp
dFRlc3RSdW5uZXIgd2hpbGUKICAgICAvLyBydW5uaW5nIGxheW91dCB0ZXN0cy4gV2Ugc2hvdWxk
IGNvbnNpZGVyIHJlcGxhY2luZyB0aGlzIHdpdGggc29tZQpkaWZmIC0tZ2l0IGEvU291cmNlL2Nt
YWtlL09wdGlvbnNHVEsuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQppbmRl
eCBkMWIzMzgxMjJjMjhjZTM1ZjgyYzYyNTZjNzNiMTIxOGI3ZWU4NGQ0Li4yY2YwMjg0ZGVlMmFm
OTRlNzg0YTBlMzUxOTdhZDgyNDYwZmFiNmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvT3B0
aW9uc0dUSy5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQpAQCAtNzYs
OCArNzYsNyBAQCBXRUJLSVRfT1BUSU9OX0RFUEVORChVU0VfR1NUUkVBTUVSX0dMIEVOQUJMRV9P
UEVOR0wpCiBXRUJLSVRfT1BUSU9OX0RFUEVORChVU0VfR1NUUkVBTUVSX0dMIEVOQUJMRV9WSURF
TykKIFdFQktJVF9PUFRJT05fREVQRU5EKFVTRV9HU1RSRUFNRVJfTVBFR1RTIEVOQUJMRV9WSURF
TykKIAotIyBGSVhNRTogVGhlcmUgaXMgbm8gcmVhc29uIHRoZXNlIHNob3VsZCBiZSBkaWZmZXJl
bnQuCi1TRVRfQU5EX0VYUE9TRV9UT19CVUlMRChERVZFTE9QTUVOVF9CVUlMRCAke0RFVkVMT1BF
Ul9NT0RFfSkKK1NFVF9BTkRfRVhQT1NFX1RPX0JVSUxEKEVOQUJMRV9ERVZFTE9QRVJfTU9ERSAk
e0RFVkVMT1BFUl9NT0RFfSkKIGlmIChERVZFTE9QRVJfTU9ERSkKICAgICBXRUJLSVRfT1BUSU9O
X0RFRkFVTFRfUE9SVF9WQUxVRShFTkFCTEVfTUlOSUJST1dTRVIgUFVCTElDIE9OKQogICAgIFdF
QktJVF9PUFRJT05fREVGQVVMVF9QT1JUX1ZBTFVFKEVOQUJMRV9BUElfVEVTVFMgUFJJVkFURSBP
TikKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBj
NDdjMjRlMTBmYTc4N2MyZDljMGZiNTcyODdhMjJmNDQyNDlmNjM4Li4xNjYyMTVkMDVmNWIwZDM2
MjBlM2NlNGFlMmQyOTBhMzU4ZDAxMDk1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr
IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzAxNS0wNS0wOCAgTWljaGFlbCBD
YXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+LCBNYXJ0aW4gUm9iaW5zb24gPG1yb2Jp
bnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIENoZWNrcyBmb3IgREVWRUxPUE1FTlRf
QlVJTEQgYXJlIGFsbCB3cm9uZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MTQ0NzQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgVXNlIEVOQUJMRV9ERVZFTE9QRVJfTU9ERSByYXRoZXIgdGhhbiBERVZFTE9Q
TUVOVF9CVUlMRC4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9tYWluLmM6CisgICAgICAg
IChtYWluKToKKwogMjAxNS0wNS0wOCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln
YWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRXhwb3NlIGFsbG93RmlsZUFjY2Vzc0Zyb21GaWxl
VVJMcyBzZXR0aW5nIHRvIFdlYktpdDIgR1RLKyBBUEkKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlC
cm93c2VyL2d0ay9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jCmluZGV4IGJj
YzA4MmNmNmIxZjJmNWQ1Yzc2NGM0MDAxMjU3MTlmYzNhMWI5MTYuLmE0NTZhYzZkYjJlZTI1Yjk1
NjNjMGY4ZjYzOTZiNzFiMjI0ZGFiZDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2d0
ay9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL21haW4uYwpAQCAtMjU2LDcgKzI1
Niw3IEBAIGFib3V0VVJJU2NoZW1lUmVxdWVzdENhbGxiYWNrKFdlYktpdFVSSVNjaGVtZVJlcXVl
c3QgKnJlcXVlc3QsIGdwb2ludGVyIHVzZXJEYXRhCiBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAq
YXJndltdKQogewogICAgIGd0a19pbml0KCZhcmdjLCAmYXJndik7Ci0jaWYgZGVmaW5lZChERVZF
TE9QTUVOVF9CVUlMRCkKKyNpZiBFTkFCTEVfREVWRUxPUEVSX01PREUKICAgICBnX3NldGVudigi
V0VCS0lUX0lOSkVDVEVEX0JVTkRMRV9QQVRIIiwgV0VCS0lUX0lOSkVDVEVEX0JVTkRMRV9QQVRI
LCBGQUxTRSk7CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmlu
ZGV4IGZkZWEwZjkyNWZjYmMyYTRiZDE3NzhkYWM1ZTQwMDliNDhkMmZiZGEuLjRlODU5NTAwODcx
ZGRkOTZiYmZmZGViMDQxYjZkYTgxZDA3N2NhYjcgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysg
Yi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMDE1LTA1LTA4ICBNaWNoYWVsIENhdGFuemFy
byAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4sIE1hcnRpbiBSb2JpbnNvbiA8bXJvYmluc29uQGln
YWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gQ2hlY2tzIGZvciBERVZFTE9QTUVOVF9CVUlMRCBh
cmUgYWxsIHdyb25nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0xNDQ3NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBEb24ndCBzZXQgREVWRUxPUE1FTlRfQlVJTEQuIFdlIGNoZWNrIHdoZXRoZXIgaXQgaXMg
ZGVmaW5lZCBmb3IgY29uZGl0aW9uYWwgY29tcGlsYXRpb24sIG5vdAorICAgICAgICB3aGF0IGl0
IGlzIGRlZmluZWQgdG8sIHNvIGRlZmluaW5nIGl0IHRvIDAgZWZmZWN0aXZlbHkgdHVybmVkIGl0
IG9uIGFsd2F5cy4gSW5zdGVhZCBzZXQKKyAgICAgICAgRU5BQkxFX0RFVkVMT1BFUl9NT0RFIHNv
IHRoYXQgd2UgY2FuIHVzZSB0aGUgRU5BQkxFIG1hY3JvIGluc2lkZSBXZWJLaXQgc291cmNlIGNv
ZGUuCisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZToKKwogMjAxNS0w
NS0wOCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAg
VW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE4Mzk0NS4K
</data>

          </attachment>
      

    </bug>

</bugzilla>