<?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>145697</bug_id>
          
          <creation_ts>2015-06-05 09:46:01 -0700</creation_ts>
          <short_desc>&apos;jhbuild build&apos; should fail immediately when building any module fails</short_desc>
          <delta_ts>2015-12-07 10:54:55 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>PC</rep_platform>
          <op_sys>Linux</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=145696</see_also>
    
    <see_also>https://bugzilla.gnome.org/show_bug.cgi?id=752218</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="Michael Catanzaro">mcatanzaro</reporter>
          <assigned_to name="Michael Catanzaro">mcatanzaro</assigned_to>
          <cc>cgarcia</cc>
    
    <cc>clopez</cc>
    
    <cc>commit-queue</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>mcatanzaro</cc>
    
    <cc>mrobinson</cc>
    
    <cc>ossy</cc>
    
    <cc>tpopela</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1099827</commentid>
    <comment_count>0</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-06-05 09:46:01 -0700</bug_when>
    <thetext>update-webkitgtk-libs currently passes --no-interact to jhbuild. It&apos;s really hard to understate how frustrating this it -- it makes jhbuild continue to build even after something has failed, and it&apos;s very difficult to discover why things fail to build, since the error is always long past normal terminal scrollback limits. Instead, I expect to immediately get a build error with the nice menu that allows me to decide how to fix the problem.

If the bots need the --no-interact behavior, we&apos;ll need to add a flag to update-webkitgtk-libs for that.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1108190</commentid>
    <comment_count>1</comment_count>
    <who name="Carlos Alberto Lopez Perez">clopez</who>
    <bug_when>2015-07-09 06:44:48 -0700</bug_when>
    <thetext>(In reply to comment #0)
&gt; update-webkitgtk-libs currently passes --no-interact to jhbuild. It&apos;s really
&gt; hard to understate how frustrating this it -- it makes jhbuild continue to
&gt; build even after something has failed, and it&apos;s very difficult to discover
&gt; why things fail to build, since the error is always long past normal
&gt; terminal scrollback limits. Instead, I expect to immediately get a build
&gt; error with the nice menu that allows me to decide how to fix the problem.
&gt; 
&gt; If the bots need the --no-interact behavior, we&apos;ll need to add a flag to
&gt; update-webkitgtk-libs for that.

JHBuild should not ask any question, so no-interact make a lot of sense.

What don&apos;t makes sense is that it continues building even when no-interact is enabled.

I have tested this patch and it fixes the problem:

--- a/jhbuild/frontends/terminal.py
+++ b/jhbuild/frontends/terminal.py
@@ -304,7 +304,7 @@ class TerminalBuildScript(buildscript.BuildScript):
         self.triedcheckout = None
 
         if not self.config.interact:
-            return &apos;fail&apos;
+            sys.exit(1)
         while True:
             print
             uprint(&apos;  [1] %s&apos; % _(&apos;Rerun phase %s&apos;) % phase)




I see two options:

a) We fork jhbuild (on github for example) and we apply this patch and then we use it as source on the script Tools/jhbuild/jhbuild-wrapper instead of using upstream git://git.gnome.org/jhbuild&apos;

b) We add an extra step on Tools/gtk/jhbuild.modules after cloning the repo to apply a serie of patches.


Which option is preferred? If is the b. I already have it more or less ready, I can upload a patch for review.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1108193</commentid>
    <comment_count>2</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2015-07-09 07:44:40 -0700</bug_when>
    <thetext>Option B sounds fine to me.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1109205</commentid>
    <comment_count>3</comment_count>
    <who name="Carlos Alberto Lopez Perez">clopez</who>
    <bug_when>2015-07-13 13:56:43 -0700</bug_when>
    <thetext>Michael: thanks for reporting this upstream.

I have one doubt... if upstream merges the patch, instead of applying a patch as I suggested previously. I think we can directly raise the version of jhbuild to the one merging that patch, can&apos;t we?

Anybody seems any problem raising the version of jhbuild?

The version we are using now seems to be 3.10+, was updated for last time on bug 124966.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1109206</commentid>
    <comment_count>4</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2015-07-13 13:57:35 -0700</bug_when>
    <thetext>(In reply to comment #3)

&gt; Anybody seems any problem raising the version of jhbuild?

I don&apos;t see any issues with updating it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1109242</commentid>
    <comment_count>5</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-07-13 15:14:00 -0700</bug_when>
    <thetext>I don&apos;t either</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1109373</commentid>
    <comment_count>6</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-07-14 09:17:07 -0700</bug_when>
    <thetext>OK, upstream jhbuild now has an --exit-on-error option. It can be used like this:

jhbuild --exit-on-error build whatever

Or you can add to jhbuildrc:

exit_on_error = True</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1109386</commentid>
    <comment_count>7</comment_count>
      <attachid>256776</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-07-14 10:26:04 -0700</bug_when>
    <thetext>Created attachment 256776
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1109402</commentid>
    <comment_count>8</comment_count>
    <who name="Carlos Alberto Lopez Perez">clopez</who>
    <bug_when>2015-07-14 11:23:48 -0700</bug_when>
    <thetext>The EFL EWS failed with:

Traceback (most recent call last):
  File &quot;/home/gyuyoung/eflews/WebKit/WebKitBuild/DependenciesEFL/Source/jhbuild/jhbuild/config.py&quot;, line 197, in load
    execfile(filename, config)
  File &quot;/home/gyuyoung/eflews/WebKit/Tools/jhbuild/../../Tools/efl/jhbuildrc&quot;, line 35, in &lt;module&gt;
    _libeail_path = os.path.join(os.environ[&apos;CMAKE_LIBRARY_PATH&apos;], &apos;libeail.so&apos;)
  File &quot;/usr/lib/python2.7/UserDict.py&quot;, line 23, in __getitem__
    raise KeyError(key)
KeyError: &apos;CMAKE_LIBRARY_PATH&apos;


Seems this key is used also by Tools/efl/jhbuildrc</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1109408</commentid>
    <comment_count>9</comment_count>
      <attachid>256782</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-07-14 11:51:59 -0700</bug_when>
    <thetext>Created attachment 256782
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1109409</commentid>
    <comment_count>10</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-07-14 11:55:15 -0700</bug_when>
    <thetext>I added a speculative fix for EFL; let&apos;s see if it works.

Note that after this patch, you will almost surely need to rm -rf WebKitBuild before the next time you run update-webkitgtk-libs. As long as you don&apos;t try to use jhbuild, I expect your current build directory should continue to work fine.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1109410</commentid>
    <comment_count>11</comment_count>
      <attachid>256783</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-07-14 12:05:14 -0700</bug_when>
    <thetext>Created attachment 256783
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1109418</commentid>
    <comment_count>12</comment_count>
      <attachid>256786</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-07-14 12:56:11 -0700</bug_when>
    <thetext>Created attachment 256786
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1109430</commentid>
    <comment_count>13</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-07-14 13:22:27 -0700</bug_when>
    <thetext>GTK+ EWS just needs a clean build.

Not sure about Mac; it&apos;s massively broken, but surely they don&apos;t use jhbuild?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1109437</commentid>
    <comment_count>14</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-07-14 13:37:11 -0700</bug_when>
    <thetext>OK, Mac is broken without this patch, so I think this patch is good.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1109516</commentid>
    <comment_count>15</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-07-14 16:50:20 -0700</bug_when>
    <thetext>Well it should not be a problem for the bots, but my local build failed:

[5445/5718] Generating ../docs-build-no-html.stamp
FAILED: cd /home/mcatanzaro/WebKit/WebKitBuild/Release &amp;&amp; CC=/usr/lib64/ccache/cc CFLAGS= /home/mcatanzaro/WebKit/Tools/gtk/generate-gtkdoc --skip-html &amp;&amp; touch docs-build-no-html.stamp
Copying template files to output directory...
Running gtkdoc-scan
Running gtkdoc-scangobj
/usr/lib64/libpangoft2-1.0.so.0: undefined reference to `FcWeightToOpenType&apos;
/usr/lib64/libpangoft2-1.0.so.0: undefined reference to `FcWeightFromOpenType&apos;
collect2: error: ld returned 1 exit status
Linking of scanner failed:

Question is, why is it using the system pango? libpangoft2-1.0.so.0 exists in my jhbuild prefix....</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1109544</commentid>
    <comment_count>16</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-07-14 19:09:02 -0700</bug_when>
    <thetext>Also, it looks like libffi is broken, improperly installing itself to DependenciesGTK/Root/lib64. It must ignore the libdir set by jhbuild. That&apos;s pretty weird, since it uses autotools. Strange that doesn&apos;t seem to hurt anything.

A python2.7 folder also gets improperly created for me under DependenciesGTK/Root/lib64, but I&apos;m pretty sure that is a Fedora bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1146851</commentid>
    <comment_count>17</comment_count>
      <attachid>256786</attachid>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2015-12-07 08:28:10 -0800</bug_when>
    <thetext>Comment on attachment 256786
Patch

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

&gt; Tools/gtk/jhbuildrc:36
&gt; +os.environ[&apos;LLVMPIPE_LIBGL_PATH&apos;] = os.path.abspath(os.path.join(checkoutroot, &apos;Mesa&apos;, &apos;lib&apos;, &apos;gallium&apos;))

Note that this has changed, we use buildroot now instead of checkoutroot</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1146854</commentid>
    <comment_count>18</comment_count>
      <attachid>266775</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-12-07 08:33:34 -0800</bug_when>
    <thetext>Created attachment 266775
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1146906</commentid>
    <comment_count>19</comment_count>
      <attachid>266775</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2015-12-07 10:54:52 -0800</bug_when>
    <thetext>Comment on attachment 266775
Patch

Clearing flags on attachment: 266775

Committed r193639: &lt;http://trac.webkit.org/changeset/193639&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1146907</commentid>
    <comment_count>20</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2015-12-07 10:54:55 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>256776</attachid>
            <date>2015-07-14 10:26:04 -0700</date>
            <delta_ts>2015-07-14 11:51:55 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-145697-20150714122457.patch</filename>
            <type>text/plain</type>
            <size>3902</size>
            <attacher name="Michael Catanzaro">mcatanzaro</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2ODAxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmE2NmY0OTg2ZGZmYTIzOWZlYjQ3OTEwODA5MjczNjM5
YzFhNWFiOS4uNjMxZGZmMTJiYzQ1YTdlZDNkNzc0NGMyYTBiMjA1ZmJhNzdkMGVhMCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4
IEBACisyMDE1LTA3LTE0ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNv
bT4KKworICAgICAgICAnamhidWlsZCBidWlsZCcgc2hvdWxkIGZhaWwgaW1tZWRpYXRlbHkgd2hl
biBidWlsZGluZyBhbnkgbW9kdWxlIGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICAqIGd0ay9qaGJ1aWxkcmM6IFVwZGF0ZSBqaGJ1aWxkcmMgdG8g
YWNjb3VudCBmb3IgdGhlIHJlbW92YWwgb2YgdGhlIHVzZV9saWI2NCBvcHRpb24uCisgICAgICAg
IEV2ZXJ5dGhpbmcgaXMgcGxhY2VkIHVuZGVyIGxpYiBpbnN0ZWFkIG9mIGxpYjY0IG5vdy4KKyAg
ICAgICAgKiBqaGJ1aWxkL2poYnVpbGQtd3JhcHBlcjogVXBkYXRlIGpoYnVpbGQgdG8gdGhlIGxh
dGVzdCB1cHN0cmVhbSBjb21taXQsIGFuZCBwYXNzCisgICAgICAgIC0tZXhpdC1vbi1lcnJvciB3
aGVuIHJ1bm5pbmcgJ2poYnVpbGQgYnVpbGQnLgorICAgICAgICAqIGpoYnVpbGQvamhidWlsZHJj
X2NvbW1vbi5weToKKyAgICAgICAgKGluaXQpOiBEb24ndCBvdmVycmlkZSBQS0dfQ09ORklHX1BB
VEgsIENNQUtFX1BSRUZJWF9QQVRILCBvciBDTUFLRV9MSUJSQVJZX1BBVEguIE1vZGVybgorICAg
ICAgICBqaGJ1aWxkIHNob3VsZCBiZSBhYmxlIHRvIGhhbmRsZSB0aGVzZSBmb3IgdXMgd2l0aG91
dCBicmVha2luZyB0aGluZ3MuLi4uCisKIDIwMTUtMDctMTQgIENhcmxvcyBBbGJlcnRvIExvcGV6
IFBlcmV6ICA8Y2xvcGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gW1dheWxhbmRdIEJ1
aWxkIGJ5IGRlZmF1bHQgdGhlIFgxMSBhbmQgV2F5bGFuZCB0YXJnZXRzLgpkaWZmIC0tZ2l0IGEv
VG9vbHMvZ3RrL2poYnVpbGRyYyBiL1Rvb2xzL2d0ay9qaGJ1aWxkcmMKaW5kZXggNzI3N2RhZWRi
MzgzMjMxMmEzZGQ4NDU4MjU5NTRkYzBjMjYxOGUwNi4uMDNjOGFkOGEwM2RjYWNiMGUwN2I1MzQw
ZjNkNGJiYjQwMzdmNjRkMCAxMDA2NDQKLS0tIGEvVG9vbHMvZ3RrL2poYnVpbGRyYworKysgYi9U
b29scy9ndGsvamhidWlsZHJjCkBAIC0zMyw3ICszMyw0IEBAIG1vZHVsZV9tYWtlYXJnc1snZ3Rr
KyddID0gJ0xERkxBR1M9Ii1sbSIgJyArIG1ha2VhcmdzCiAjIGFubm90YXRpb25zIHNvb25lciBy
YXRoZXIgdGhhbiBsYXRlci4KIGF1dG9nZW5hcmdzPSctLWVuYWJsZS1pbnRyb3NwZWN0aW9uJwog
Ci1pZiB1c2VfbGliNjQ6Ci0gICAgb3MuZW52aXJvblsnTExWTVBJUEVfTElCR0xfUEFUSCddID0g
b3MucGF0aC5hYnNwYXRoKG9zLnBhdGguam9pbihjaGVja291dHJvb3QsICdNZXNhJywgJ2xpYjY0
JywgJ2dhbGxpdW0nKSkKLWVsc2U6Ci0gICAgb3MuZW52aXJvblsnTExWTVBJUEVfTElCR0xfUEFU
SCddID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguam9pbihjaGVja291dHJvb3QsICdNZXNhJywg
J2xpYicsICdnYWxsaXVtJykpCitvcy5lbnZpcm9uWydMTFZNUElQRV9MSUJHTF9QQVRIJ10gPSBv
cy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKGNoZWNrb3V0cm9vdCwgJ01lc2EnLCAnbGliJywg
J2dhbGxpdW0nKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL2poYnVpbGQvamhidWlsZC13cmFwcGVyIGIv
VG9vbHMvamhidWlsZC9qaGJ1aWxkLXdyYXBwZXIKaW5kZXggMGZmNjg1YjNlNzJkMjFkNzRmN2U1
NmU0YWUzNmI5ZmU2ZTUyZDMwYS4uZjQ0MWE5OWZjZmQyMzZjYmVjOGYyNTI4N2E2YzBhYzkyZTk5
NTIxOCAxMDA3NTUKLS0tIGEvVG9vbHMvamhidWlsZC9qaGJ1aWxkLXdyYXBwZXIKKysrIGIvVG9v
bHMvamhidWlsZC9qaGJ1aWxkLXdyYXBwZXIKQEAgLTI0LDcgKzI0LDcgQEAgaW1wb3J0IHNobGV4
CiBpbXBvcnQgc3VicHJvY2VzcwogaW1wb3J0IHN5cwogCi1qaGJ1aWxkX3JldmlzaW9uID0gJ2Mw
Y2I0NjE3N2Q3OTE4OWZmZTBmNzYwNzAzYzczMmYxYzdlYThiMjknCitqaGJ1aWxkX3JldmlzaW9u
ID0gJ2Y1MjRmYmUxMjBlYmI0YjdkMjA5Y2UwZDAzNWNkM2QyZTRhNjZiZDQnCiAKIGRlZiBkZXRl
cm1pbmVfcGxhdGZvcm0oKToKICAgICBpZiAnLS1lZmwnIGluIHN5cy5hcmd2OgpAQCAtMTIyLDQg
KzEyMiw0IEBAIGlmIG9zLmVudmlyb24uaGFzX2tleSgnVU5ERVJfSkhCVUlMRCcpIGFuZCBvcy5l
bnZpcm9uLmhhc19rZXkoJ0FDTE9DQUxfRkxBR1MnKToKIAogZW5zdXJlX2poYnVpbGQocGxhdGZv
cm0pCiAKLW9zLmV4ZWN2ZShqaGJ1aWxkX3BhdGgsIFtqaGJ1aWxkX3BhdGgsICctLW5vLWludGVy
YWN0JywgJy1mJywgamhidWlsZHV0aWxzLmdldF9jb25maWdfZmlsZV9mb3JfcGxhdGZvcm0ocGxh
dGZvcm0pXSArIHN5cy5hcmd2WzI6XSwgb3MuZW52aXJvbikKK29zLmV4ZWN2ZShqaGJ1aWxkX3Bh
dGgsIFtqaGJ1aWxkX3BhdGgsICctLWV4aXQtb24tZXJyb3InLCAnLS1uby1pbnRlcmFjdCcsICct
ZicsIGpoYnVpbGR1dGlscy5nZXRfY29uZmlnX2ZpbGVfZm9yX3BsYXRmb3JtKHBsYXRmb3JtKV0g
KyBzeXMuYXJndlsyOl0sIG9zLmVudmlyb24pCmRpZmYgLS1naXQgYS9Ub29scy9qaGJ1aWxkL2po
YnVpbGRyY19jb21tb24ucHkgYi9Ub29scy9qaGJ1aWxkL2poYnVpbGRyY19jb21tb24ucHkKaW5k
ZXggY2Y3OGNlZTE5OTMyM2MyYjQ5NmIxMTQ0NzUwZDk3OGViM2E3YjljNy4uMjQ2ZDcwYmNhODg0
ZDE4OGFiMjA5NzczZWMzMjc4MzI4ODZhYmQ4YiAxMDA2NDQKLS0tIGEvVG9vbHMvamhidWlsZC9q
aGJ1aWxkcmNfY29tbW9uLnB5CisrKyBiL1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2NvbW1vbi5w
eQpAQCAtNzAsMTkgKzcwLDYgQEAgZGVmIGluaXQoamhidWlsZHJjX2dsb2JhbHMsIHBsYXRmb3Jt
KToKICAgICAjIHRvIHVzZSBvbmx5IHRoZSBwbHVnaW5zIHdlIGJ1aWxkIGluIEpIQnVpbGQuCiAg
ICAgb3MuZW52aXJvblsnR1NUX1BMVUdJTl9TWVNURU1fUEFUSCddID0gJycKIAotICAgICMgVXNl
IHN5c3RlbSBsaWJyYXJpZXMgd2hpbGUgYnVpbGRpbmcuCi0gICAgaWYgamhidWlsZHJjX2dsb2Jh
bHNbJ3VzZV9saWI2NCddOgotICAgICAgICBfbGlicmFyeV9kaXIgPSAnbGliNjQnCi0gICAgZWxz
ZToKLSAgICAgICAgX2xpYnJhcnlfZGlyID0gJ2xpYicKLSAgICBhZGRwYXRoID0gamhidWlsZHJj
X2dsb2JhbHNbJ2FkZHBhdGgnXQotICAgIGFkZHBhdGgoJ1BLR19DT05GSUdfUEFUSCcsIG9zLnBh
dGguam9pbihvcy5zZXAsICd1c3InLCBfbGlicmFyeV9kaXIsICdwa2djb25maWcnKSkKLSAgICBh
ZGRwYXRoKCdQS0dfQ09ORklHX1BBVEgnLCBvcy5wYXRoLmpvaW4ob3Muc2VwLCAndXNyJywgJ3No
YXJlJywgJ3BrZ2NvbmZpZycpKQotCi0gICAgcHJlZml4ID0gamhidWlsZHJjX2dsb2JhbHNbJ3By
ZWZpeCddCi0gICAgYWRkcGF0aCgnQ01BS0VfUFJFRklYX1BBVEgnLCBwcmVmaXgpCi0gICAgYWRk
cGF0aCgnQ01BS0VfTElCUkFSWV9QQVRIJywgb3MucGF0aC5qb2luKHByZWZpeCwgX2xpYnJhcnlf
ZGlyKSkKLQogICAgIGlmICdKSEJVSUxEX01JUlJPUicgaW4gb3MuZW52aXJvbjoKICAgICAgICAg
amhidWlsZHJjX2dsb2JhbHNbJ2R2Y3NfbWlycm9yX2RpciddID0gb3MuZW52aXJvblsnSkhCVUlM
RF9NSVJST1InXQogICAgICAgICBqaGJ1aWxkcmNfZ2xvYmFsc1sndGFyYmFsbGRpciddID0gb3Mu
ZW52aXJvblsnSkhCVUlMRF9NSVJST1InXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>256782</attachid>
            <date>2015-07-14 11:51:59 -0700</date>
            <delta_ts>2015-07-14 12:05:10 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-145697-20150714135053.patch</filename>
            <type>text/plain</type>
            <size>4966</size>
            <attacher name="Michael Catanzaro">mcatanzaro</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2ODAxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmE2NmY0OTg2ZGZmYTIzOWZlYjQ3OTEwODA5MjczNjM5
YzFhNWFiOS4uYWRiNmEzZmM5ZGVkZjE0NzJjN2U1MmQ2NjQ2MmEyYjdiZmM1MDA2ZSAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5
IEBACisyMDE1LTA3LTE0ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNv
bT4KKworICAgICAgICAnamhidWlsZCBidWlsZCcgc2hvdWxkIGZhaWwgaW1tZWRpYXRlbHkgd2hl
biBidWlsZGluZyBhbnkgbW9kdWxlIGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICAqIGVmbC9qaGJ1aWxkcmM6IFVwZGF0ZSBqaGJ1aWxkcmMgdG8g
YWNjb3VudCBmb3IgdGhlIHJlbW92YWwgb2YgdGhlIHVzZV9saWI2NCBvcHRpb24uCisgICAgICAg
ICogZ3RrL2poYnVpbGRyYzogVXBkYXRlIGpoYnVpbGRyYyB0byBhY2NvdW50IGZvciB0aGUgcmVt
b3ZhbCBvZiB0aGUgdXNlX2xpYjY0IG9wdGlvbi4KKyAgICAgICAgRXZlcnl0aGluZyBpcyBwbGFj
ZWQgdW5kZXIgbGliIGluc3RlYWQgb2YgbGliNjQgbm93LgorICAgICAgICAqIGpoYnVpbGQvamhi
dWlsZC13cmFwcGVyOiBVcGRhdGUgamhidWlsZCB0byB0aGUgbGF0ZXN0IHVwc3RyZWFtIGNvbW1p
dCwgYW5kIHBhc3MKKyAgICAgICAgLS1leGl0LW9uLWVycm9yIHdoZW4gcnVubmluZyAnamhidWls
ZCBidWlsZCcuCisgICAgICAgICogamhidWlsZC9qaGJ1aWxkcmNfY29tbW9uLnB5OgorICAgICAg
ICAoaW5pdCk6IERvbid0IG92ZXJyaWRlIFBLR19DT05GSUdfUEFUSCwgQ01BS0VfUFJFRklYX1BB
VEgsIG9yIENNQUtFX0xJQlJBUllfUEFUSC4gTW9kZXJuCisgICAgICAgIGpoYnVpbGQgc2hvdWxk
IGJlIGFibGUgdG8gaGFuZGxlIHRoZXNlIGZvciB1cyB3aXRob3V0IGJyZWFraW5nIHRoaW5ncy4u
Li4KKwogMjAxNS0wNy0xNCAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXogIDxjbG9wZXpAaWdh
bGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBbV2F5bGFuZF0gQnVpbGQgYnkgZGVmYXVsdCB0aGUg
WDExIGFuZCBXYXlsYW5kIHRhcmdldHMuCmRpZmYgLS1naXQgYS9Ub29scy9lZmwvamhidWlsZHJj
IGIvVG9vbHMvZWZsL2poYnVpbGRyYwppbmRleCAyZjQ5NmM4ZjI1NGNmMzA3M2NjNzBhMGQyMDgw
MmNiYzUyY2I2Njc0Li40YzRlZjcwMDAzNTUxMTEzMTdmOWY0MjE4ZmNlNTgzOGZkMGM5NDE4IDEw
MDY0NAotLS0gYS9Ub29scy9lZmwvamhidWlsZHJjCisrKyBiL1Rvb2xzL2VmbC9qaGJ1aWxkcmMK
QEAgLTIyLDE3ICsyMiwxMyBAQCBpbXBvcnQgcGxhdGZvcm0KIHN5cy5wYXRoLmluc2VydCgwLCBv
cy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSwgIi4uL2poYnVpbGQiKSApCiBp
bXBvcnQgamhidWlsZHJjX2NvbW1vbgogCi0jIFNldHRpbmcgdXNlX2xpYjY0IHRvIEZhbHNlIGlz
IG5lY2Vzc2FyeSwgb3RoZXJ3aXNlIENNYWtlIHdpbGwgbm90IGZpbmQKLSMgdGhlIGxpYjY0L2Nt
YWtlLzxuYW1lPiBmb2xkZXIgdGhhdCBjb250YWlucyB0aGUgPE5hbWU+Q29uZmlnLmNtYWtlIGZp
bGVzLgotdXNlX2xpYjY0ID0gRmFsc2UKLQogamhidWlsZHJjX2NvbW1vbi5pbml0KGdsb2JhbHMo
KSwgImVmbCIpIAogCiBhZGRwYXRoKCdYREdfREFUQV9ESVJTJywgJy91c3Ivc2hhcmUnKQogYWRk
cGF0aCgnWERHX0NPTkZJR19ESVJTJywgJy9ldGMveGRnJykKIAogaWYgbm90ICdBQ0NFU1NJQklM
SVRZX0VBSUxfTElCUkFSWV9QQVRIJyBpbiBvcy5lbnZpcm9uOgotICAgIF9saWJlYWlsX3BhdGgg
PSBvcy5wYXRoLmpvaW4ob3MuZW52aXJvblsnQ01BS0VfTElCUkFSWV9QQVRIJ10sICdsaWJlYWls
LnNvJykKKyAgICBfbGliZWFpbF9wYXRoID0gb3MucGF0aC5qb2luKG9zLmVudmlyb25bJ0pIQlVJ
TERfTElCRElSJ10sICdsaWJlYWlsLnNvJykKICAgICBpZiBvcy5wYXRoLmlzZmlsZShfbGliZWFp
bF9wYXRoKToKICAgICAgICAgb3MuZW52aXJvblsnQUNDRVNTSUJJTElUWV9FQUlMX0xJQlJBUllf
UEFUSCddID0gX2xpYmVhaWxfcGF0aAogCmRpZmYgLS1naXQgYS9Ub29scy9ndGsvamhidWlsZHJj
IGIvVG9vbHMvZ3RrL2poYnVpbGRyYwppbmRleCA3Mjc3ZGFlZGIzODMyMzEyYTNkZDg0NTgyNTk1
NGRjMGMyNjE4ZTA2Li4wM2M4YWQ4YTAzZGNhY2IwZTA3YjUzNDBmM2Q0YmJiNDAzN2Y2NGQwIDEw
MDY0NAotLS0gYS9Ub29scy9ndGsvamhidWlsZHJjCisrKyBiL1Rvb2xzL2d0ay9qaGJ1aWxkcmMK
QEAgLTMzLDcgKzMzLDQgQEAgbW9kdWxlX21ha2VhcmdzWydndGsrJ10gPSAnTERGTEFHUz0iLWxt
IiAnICsgbWFrZWFyZ3MKICMgYW5ub3RhdGlvbnMgc29vbmVyIHJhdGhlciB0aGFuIGxhdGVyLgog
YXV0b2dlbmFyZ3M9Jy0tZW5hYmxlLWludHJvc3BlY3Rpb24nCiAKLWlmIHVzZV9saWI2NDoKLSAg
ICBvcy5lbnZpcm9uWydMTFZNUElQRV9MSUJHTF9QQVRIJ10gPSBvcy5wYXRoLmFic3BhdGgob3Mu
cGF0aC5qb2luKGNoZWNrb3V0cm9vdCwgJ01lc2EnLCAnbGliNjQnLCAnZ2FsbGl1bScpKQotZWxz
ZToKLSAgICBvcy5lbnZpcm9uWydMTFZNUElQRV9MSUJHTF9QQVRIJ10gPSBvcy5wYXRoLmFic3Bh
dGgob3MucGF0aC5qb2luKGNoZWNrb3V0cm9vdCwgJ01lc2EnLCAnbGliJywgJ2dhbGxpdW0nKSkK
K29zLmVudmlyb25bJ0xMVk1QSVBFX0xJQkdMX1BBVEgnXSA9IG9zLnBhdGguYWJzcGF0aChvcy5w
YXRoLmpvaW4oY2hlY2tvdXRyb290LCAnTWVzYScsICdsaWInLCAnZ2FsbGl1bScpKQpkaWZmIC0t
Z2l0IGEvVG9vbHMvamhidWlsZC9qaGJ1aWxkLXdyYXBwZXIgYi9Ub29scy9qaGJ1aWxkL2poYnVp
bGQtd3JhcHBlcgppbmRleCAwZmY2ODViM2U3MmQyMWQ3NGY3ZTU2ZTRhZTM2YjlmZTZlNTJkMzBh
Li5mNDQxYTk5ZmNmZDIzNmNiZWM4ZjI1Mjg3YTZjMGFjOTJlOTk1MjE4IDEwMDc1NQotLS0gYS9U
b29scy9qaGJ1aWxkL2poYnVpbGQtd3JhcHBlcgorKysgYi9Ub29scy9qaGJ1aWxkL2poYnVpbGQt
d3JhcHBlcgpAQCAtMjQsNyArMjQsNyBAQCBpbXBvcnQgc2hsZXgKIGltcG9ydCBzdWJwcm9jZXNz
CiBpbXBvcnQgc3lzCiAKLWpoYnVpbGRfcmV2aXNpb24gPSAnYzBjYjQ2MTc3ZDc5MTg5ZmZlMGY3
NjA3MDNjNzMyZjFjN2VhOGIyOScKK2poYnVpbGRfcmV2aXNpb24gPSAnZjUyNGZiZTEyMGViYjRi
N2QyMDljZTBkMDM1Y2QzZDJlNGE2NmJkNCcKIAogZGVmIGRldGVybWluZV9wbGF0Zm9ybSgpOgog
ICAgIGlmICctLWVmbCcgaW4gc3lzLmFyZ3Y6CkBAIC0xMjIsNCArMTIyLDQgQEAgaWYgb3MuZW52
aXJvbi5oYXNfa2V5KCdVTkRFUl9KSEJVSUxEJykgYW5kIG9zLmVudmlyb24uaGFzX2tleSgnQUNM
T0NBTF9GTEFHUycpOgogCiBlbnN1cmVfamhidWlsZChwbGF0Zm9ybSkKIAotb3MuZXhlY3ZlKGpo
YnVpbGRfcGF0aCwgW2poYnVpbGRfcGF0aCwgJy0tbm8taW50ZXJhY3QnLCAnLWYnLCBqaGJ1aWxk
dXRpbHMuZ2V0X2NvbmZpZ19maWxlX2Zvcl9wbGF0Zm9ybShwbGF0Zm9ybSldICsgc3lzLmFyZ3Zb
MjpdLCBvcy5lbnZpcm9uKQorb3MuZXhlY3ZlKGpoYnVpbGRfcGF0aCwgW2poYnVpbGRfcGF0aCwg
Jy0tZXhpdC1vbi1lcnJvcicsICctLW5vLWludGVyYWN0JywgJy1mJywgamhidWlsZHV0aWxzLmdl
dF9jb25maWdfZmlsZV9mb3JfcGxhdGZvcm0ocGxhdGZvcm0pXSArIHN5cy5hcmd2WzI6XSwgb3Mu
ZW52aXJvbikKZGlmZiAtLWdpdCBhL1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weSBi
L1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weQppbmRleCBjZjc4Y2VlMTk5MzIzYzJi
NDk2YjExNDQ3NTBkOTc4ZWIzYTdiOWM3Li4yNDZkNzBiY2E4ODRkMTg4YWIyMDk3NzNlYzMyNzgz
Mjg4NmFiZDhiIDEwMDY0NAotLS0gYS9Ub29scy9qaGJ1aWxkL2poYnVpbGRyY19jb21tb24ucHkK
KysrIGIvVG9vbHMvamhidWlsZC9qaGJ1aWxkcmNfY29tbW9uLnB5CkBAIC03MCwxOSArNzAsNiBA
QCBkZWYgaW5pdChqaGJ1aWxkcmNfZ2xvYmFscywgcGxhdGZvcm0pOgogICAgICMgdG8gdXNlIG9u
bHkgdGhlIHBsdWdpbnMgd2UgYnVpbGQgaW4gSkhCdWlsZC4KICAgICBvcy5lbnZpcm9uWydHU1Rf
UExVR0lOX1NZU1RFTV9QQVRIJ10gPSAnJwogCi0gICAgIyBVc2Ugc3lzdGVtIGxpYnJhcmllcyB3
aGlsZSBidWlsZGluZy4KLSAgICBpZiBqaGJ1aWxkcmNfZ2xvYmFsc1sndXNlX2xpYjY0J106Ci0g
ICAgICAgIF9saWJyYXJ5X2RpciA9ICdsaWI2NCcKLSAgICBlbHNlOgotICAgICAgICBfbGlicmFy
eV9kaXIgPSAnbGliJwotICAgIGFkZHBhdGggPSBqaGJ1aWxkcmNfZ2xvYmFsc1snYWRkcGF0aCdd
Ci0gICAgYWRkcGF0aCgnUEtHX0NPTkZJR19QQVRIJywgb3MucGF0aC5qb2luKG9zLnNlcCwgJ3Vz
cicsIF9saWJyYXJ5X2RpciwgJ3BrZ2NvbmZpZycpKQotICAgIGFkZHBhdGgoJ1BLR19DT05GSUdf
UEFUSCcsIG9zLnBhdGguam9pbihvcy5zZXAsICd1c3InLCAnc2hhcmUnLCAncGtnY29uZmlnJykp
Ci0KLSAgICBwcmVmaXggPSBqaGJ1aWxkcmNfZ2xvYmFsc1sncHJlZml4J10KLSAgICBhZGRwYXRo
KCdDTUFLRV9QUkVGSVhfUEFUSCcsIHByZWZpeCkKLSAgICBhZGRwYXRoKCdDTUFLRV9MSUJSQVJZ
X1BBVEgnLCBvcy5wYXRoLmpvaW4ocHJlZml4LCBfbGlicmFyeV9kaXIpKQotCiAgICAgaWYgJ0pI
QlVJTERfTUlSUk9SJyBpbiBvcy5lbnZpcm9uOgogICAgICAgICBqaGJ1aWxkcmNfZ2xvYmFsc1sn
ZHZjc19taXJyb3JfZGlyJ10gPSBvcy5lbnZpcm9uWydKSEJVSUxEX01JUlJPUiddCiAgICAgICAg
IGpoYnVpbGRyY19nbG9iYWxzWyd0YXJiYWxsZGlyJ10gPSBvcy5lbnZpcm9uWydKSEJVSUxEX01J
UlJPUiddCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>256783</attachid>
            <date>2015-07-14 12:05:14 -0700</date>
            <delta_ts>2015-07-14 12:56:07 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-145697-20150714140407.patch</filename>
            <type>text/plain</type>
            <size>5143</size>
            <attacher name="Michael Catanzaro">mcatanzaro</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2ODAxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmE2NmY0OTg2ZGZmYTIzOWZlYjQ3OTEwODA5MjczNjM5
YzFhNWFiOS4uYWRiNmEzZmM5ZGVkZjE0NzJjN2U1MmQ2NjQ2MmEyYjdiZmM1MDA2ZSAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5
IEBACisyMDE1LTA3LTE0ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNv
bT4KKworICAgICAgICAnamhidWlsZCBidWlsZCcgc2hvdWxkIGZhaWwgaW1tZWRpYXRlbHkgd2hl
biBidWlsZGluZyBhbnkgbW9kdWxlIGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICAqIGVmbC9qaGJ1aWxkcmM6IFVwZGF0ZSBqaGJ1aWxkcmMgdG8g
YWNjb3VudCBmb3IgdGhlIHJlbW92YWwgb2YgdGhlIHVzZV9saWI2NCBvcHRpb24uCisgICAgICAg
ICogZ3RrL2poYnVpbGRyYzogVXBkYXRlIGpoYnVpbGRyYyB0byBhY2NvdW50IGZvciB0aGUgcmVt
b3ZhbCBvZiB0aGUgdXNlX2xpYjY0IG9wdGlvbi4KKyAgICAgICAgRXZlcnl0aGluZyBpcyBwbGFj
ZWQgdW5kZXIgbGliIGluc3RlYWQgb2YgbGliNjQgbm93LgorICAgICAgICAqIGpoYnVpbGQvamhi
dWlsZC13cmFwcGVyOiBVcGRhdGUgamhidWlsZCB0byB0aGUgbGF0ZXN0IHVwc3RyZWFtIGNvbW1p
dCwgYW5kIHBhc3MKKyAgICAgICAgLS1leGl0LW9uLWVycm9yIHdoZW4gcnVubmluZyAnamhidWls
ZCBidWlsZCcuCisgICAgICAgICogamhidWlsZC9qaGJ1aWxkcmNfY29tbW9uLnB5OgorICAgICAg
ICAoaW5pdCk6IERvbid0IG92ZXJyaWRlIFBLR19DT05GSUdfUEFUSCwgQ01BS0VfUFJFRklYX1BB
VEgsIG9yIENNQUtFX0xJQlJBUllfUEFUSC4gTW9kZXJuCisgICAgICAgIGpoYnVpbGQgc2hvdWxk
IGJlIGFibGUgdG8gaGFuZGxlIHRoZXNlIGZvciB1cyB3aXRob3V0IGJyZWFraW5nIHRoaW5ncy4u
Li4KKwogMjAxNS0wNy0xNCAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXogIDxjbG9wZXpAaWdh
bGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBbV2F5bGFuZF0gQnVpbGQgYnkgZGVmYXVsdCB0aGUg
WDExIGFuZCBXYXlsYW5kIHRhcmdldHMuCmRpZmYgLS1naXQgYS9Ub29scy9lZmwvamhidWlsZHJj
IGIvVG9vbHMvZWZsL2poYnVpbGRyYwppbmRleCAyZjQ5NmM4ZjI1NGNmMzA3M2NjNzBhMGQyMDgw
MmNiYzUyY2I2Njc0Li4xYjA2MWVmYjhiYWFhMmJjZDBmNTVkZmMyZjM3YjYzMjliZTk0NjI3IDEw
MDY0NAotLS0gYS9Ub29scy9lZmwvamhidWlsZHJjCisrKyBiL1Rvb2xzL2VmbC9qaGJ1aWxkcmMK
QEAgLTIyLDE4ICsyMiwxNiBAQCBpbXBvcnQgcGxhdGZvcm0KIHN5cy5wYXRoLmluc2VydCgwLCBv
cy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSwgIi4uL2poYnVpbGQiKSApCiBp
bXBvcnQgamhidWlsZHJjX2NvbW1vbgogCi0jIFNldHRpbmcgdXNlX2xpYjY0IHRvIEZhbHNlIGlz
IG5lY2Vzc2FyeSwgb3RoZXJ3aXNlIENNYWtlIHdpbGwgbm90IGZpbmQKLSMgdGhlIGxpYjY0L2Nt
YWtlLzxuYW1lPiBmb2xkZXIgdGhhdCBjb250YWlucyB0aGUgPE5hbWU+Q29uZmlnLmNtYWtlIGZp
bGVzLgotdXNlX2xpYjY0ID0gRmFsc2UKLQogamhidWlsZHJjX2NvbW1vbi5pbml0KGdsb2JhbHMo
KSwgImVmbCIpIAogCiBhZGRwYXRoKCdYREdfREFUQV9ESVJTJywgJy91c3Ivc2hhcmUnKQogYWRk
cGF0aCgnWERHX0NPTkZJR19ESVJTJywgJy9ldGMveGRnJykKIAogaWYgbm90ICdBQ0NFU1NJQklM
SVRZX0VBSUxfTElCUkFSWV9QQVRIJyBpbiBvcy5lbnZpcm9uOgotICAgIF9saWJlYWlsX3BhdGgg
PSBvcy5wYXRoLmpvaW4ob3MuZW52aXJvblsnQ01BS0VfTElCUkFSWV9QQVRIJ10sICdsaWJlYWls
LnNvJykKLSAgICBpZiBvcy5wYXRoLmlzZmlsZShfbGliZWFpbF9wYXRoKToKLSAgICAgICAgb3Mu
ZW52aXJvblsnQUNDRVNTSUJJTElUWV9FQUlMX0xJQlJBUllfUEFUSCddID0gX2xpYmVhaWxfcGF0
aAorICAgIGZvciBsaWJkaXIgaW4gc3lzdGVtX2xpYmRpcnM6CisgICAgICAgIF9saWJlYWlsX3Bh
dGggPSBvcy5wYXRoLmpvaW4obGliZGlyLCAnbGliZWFpbC5zbycpCisgICAgICAgIGlmIG9zLnBh
dGguaXNmaWxlKF9saWJlYWlsX3BhdGgpOgorICAgICAgICAgICAgb3MuZW52aXJvblsnQUNDRVNT
SUJJTElUWV9FQUlMX0xJQlJBUllfUEFUSCddID0gX2xpYmVhaWxfcGF0aAorICAgICAgICAgICAg
YnJlYWsKIAogcGFydGlhbF9idWlsZCA9IEZhbHNlCmRpZmYgLS1naXQgYS9Ub29scy9ndGsvamhi
dWlsZHJjIGIvVG9vbHMvZ3RrL2poYnVpbGRyYwppbmRleCA3Mjc3ZGFlZGIzODMyMzEyYTNkZDg0
NTgyNTk1NGRjMGMyNjE4ZTA2Li4wM2M4YWQ4YTAzZGNhY2IwZTA3YjUzNDBmM2Q0YmJiNDAzN2Y2
NGQwIDEwMDY0NAotLS0gYS9Ub29scy9ndGsvamhidWlsZHJjCisrKyBiL1Rvb2xzL2d0ay9qaGJ1
aWxkcmMKQEAgLTMzLDcgKzMzLDQgQEAgbW9kdWxlX21ha2VhcmdzWydndGsrJ10gPSAnTERGTEFH
Uz0iLWxtIiAnICsgbWFrZWFyZ3MKICMgYW5ub3RhdGlvbnMgc29vbmVyIHJhdGhlciB0aGFuIGxh
dGVyLgogYXV0b2dlbmFyZ3M9Jy0tZW5hYmxlLWludHJvc3BlY3Rpb24nCiAKLWlmIHVzZV9saWI2
NDoKLSAgICBvcy5lbnZpcm9uWydMTFZNUElQRV9MSUJHTF9QQVRIJ10gPSBvcy5wYXRoLmFic3Bh
dGgob3MucGF0aC5qb2luKGNoZWNrb3V0cm9vdCwgJ01lc2EnLCAnbGliNjQnLCAnZ2FsbGl1bScp
KQotZWxzZToKLSAgICBvcy5lbnZpcm9uWydMTFZNUElQRV9MSUJHTF9QQVRIJ10gPSBvcy5wYXRo
LmFic3BhdGgob3MucGF0aC5qb2luKGNoZWNrb3V0cm9vdCwgJ01lc2EnLCAnbGliJywgJ2dhbGxp
dW0nKSkKK29zLmVudmlyb25bJ0xMVk1QSVBFX0xJQkdMX1BBVEgnXSA9IG9zLnBhdGguYWJzcGF0
aChvcy5wYXRoLmpvaW4oY2hlY2tvdXRyb290LCAnTWVzYScsICdsaWInLCAnZ2FsbGl1bScpKQpk
aWZmIC0tZ2l0IGEvVG9vbHMvamhidWlsZC9qaGJ1aWxkLXdyYXBwZXIgYi9Ub29scy9qaGJ1aWxk
L2poYnVpbGQtd3JhcHBlcgppbmRleCAwZmY2ODViM2U3MmQyMWQ3NGY3ZTU2ZTRhZTM2YjlmZTZl
NTJkMzBhLi5mNDQxYTk5ZmNmZDIzNmNiZWM4ZjI1Mjg3YTZjMGFjOTJlOTk1MjE4IDEwMDc1NQot
LS0gYS9Ub29scy9qaGJ1aWxkL2poYnVpbGQtd3JhcHBlcgorKysgYi9Ub29scy9qaGJ1aWxkL2po
YnVpbGQtd3JhcHBlcgpAQCAtMjQsNyArMjQsNyBAQCBpbXBvcnQgc2hsZXgKIGltcG9ydCBzdWJw
cm9jZXNzCiBpbXBvcnQgc3lzCiAKLWpoYnVpbGRfcmV2aXNpb24gPSAnYzBjYjQ2MTc3ZDc5MTg5
ZmZlMGY3NjA3MDNjNzMyZjFjN2VhOGIyOScKK2poYnVpbGRfcmV2aXNpb24gPSAnZjUyNGZiZTEy
MGViYjRiN2QyMDljZTBkMDM1Y2QzZDJlNGE2NmJkNCcKIAogZGVmIGRldGVybWluZV9wbGF0Zm9y
bSgpOgogICAgIGlmICctLWVmbCcgaW4gc3lzLmFyZ3Y6CkBAIC0xMjIsNCArMTIyLDQgQEAgaWYg
b3MuZW52aXJvbi5oYXNfa2V5KCdVTkRFUl9KSEJVSUxEJykgYW5kIG9zLmVudmlyb24uaGFzX2tl
eSgnQUNMT0NBTF9GTEFHUycpOgogCiBlbnN1cmVfamhidWlsZChwbGF0Zm9ybSkKIAotb3MuZXhl
Y3ZlKGpoYnVpbGRfcGF0aCwgW2poYnVpbGRfcGF0aCwgJy0tbm8taW50ZXJhY3QnLCAnLWYnLCBq
aGJ1aWxkdXRpbHMuZ2V0X2NvbmZpZ19maWxlX2Zvcl9wbGF0Zm9ybShwbGF0Zm9ybSldICsgc3lz
LmFyZ3ZbMjpdLCBvcy5lbnZpcm9uKQorb3MuZXhlY3ZlKGpoYnVpbGRfcGF0aCwgW2poYnVpbGRf
cGF0aCwgJy0tZXhpdC1vbi1lcnJvcicsICctLW5vLWludGVyYWN0JywgJy1mJywgamhidWlsZHV0
aWxzLmdldF9jb25maWdfZmlsZV9mb3JfcGxhdGZvcm0ocGxhdGZvcm0pXSArIHN5cy5hcmd2WzI6
XSwgb3MuZW52aXJvbikKZGlmZiAtLWdpdCBhL1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2NvbW1v
bi5weSBiL1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weQppbmRleCBjZjc4Y2VlMTk5
MzIzYzJiNDk2YjExNDQ3NTBkOTc4ZWIzYTdiOWM3Li4yNDZkNzBiY2E4ODRkMTg4YWIyMDk3NzNl
YzMyNzgzMjg4NmFiZDhiIDEwMDY0NAotLS0gYS9Ub29scy9qaGJ1aWxkL2poYnVpbGRyY19jb21t
b24ucHkKKysrIGIvVG9vbHMvamhidWlsZC9qaGJ1aWxkcmNfY29tbW9uLnB5CkBAIC03MCwxOSAr
NzAsNiBAQCBkZWYgaW5pdChqaGJ1aWxkcmNfZ2xvYmFscywgcGxhdGZvcm0pOgogICAgICMgdG8g
dXNlIG9ubHkgdGhlIHBsdWdpbnMgd2UgYnVpbGQgaW4gSkhCdWlsZC4KICAgICBvcy5lbnZpcm9u
WydHU1RfUExVR0lOX1NZU1RFTV9QQVRIJ10gPSAnJwogCi0gICAgIyBVc2Ugc3lzdGVtIGxpYnJh
cmllcyB3aGlsZSBidWlsZGluZy4KLSAgICBpZiBqaGJ1aWxkcmNfZ2xvYmFsc1sndXNlX2xpYjY0
J106Ci0gICAgICAgIF9saWJyYXJ5X2RpciA9ICdsaWI2NCcKLSAgICBlbHNlOgotICAgICAgICBf
bGlicmFyeV9kaXIgPSAnbGliJwotICAgIGFkZHBhdGggPSBqaGJ1aWxkcmNfZ2xvYmFsc1snYWRk
cGF0aCddCi0gICAgYWRkcGF0aCgnUEtHX0NPTkZJR19QQVRIJywgb3MucGF0aC5qb2luKG9zLnNl
cCwgJ3VzcicsIF9saWJyYXJ5X2RpciwgJ3BrZ2NvbmZpZycpKQotICAgIGFkZHBhdGgoJ1BLR19D
T05GSUdfUEFUSCcsIG9zLnBhdGguam9pbihvcy5zZXAsICd1c3InLCAnc2hhcmUnLCAncGtnY29u
ZmlnJykpCi0KLSAgICBwcmVmaXggPSBqaGJ1aWxkcmNfZ2xvYmFsc1sncHJlZml4J10KLSAgICBh
ZGRwYXRoKCdDTUFLRV9QUkVGSVhfUEFUSCcsIHByZWZpeCkKLSAgICBhZGRwYXRoKCdDTUFLRV9M
SUJSQVJZX1BBVEgnLCBvcy5wYXRoLmpvaW4ocHJlZml4LCBfbGlicmFyeV9kaXIpKQotCiAgICAg
aWYgJ0pIQlVJTERfTUlSUk9SJyBpbiBvcy5lbnZpcm9uOgogICAgICAgICBqaGJ1aWxkcmNfZ2xv
YmFsc1snZHZjc19taXJyb3JfZGlyJ10gPSBvcy5lbnZpcm9uWydKSEJVSUxEX01JUlJPUiddCiAg
ICAgICAgIGpoYnVpbGRyY19nbG9iYWxzWyd0YXJiYWxsZGlyJ10gPSBvcy5lbnZpcm9uWydKSEJV
SUxEX01JUlJPUiddCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>256786</attachid>
            <date>2015-07-14 12:56:11 -0700</date>
            <delta_ts>2015-12-07 08:33:28 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-145697-20150714145505.patch</filename>
            <type>text/plain</type>
            <size>4699</size>
            <attacher name="Michael Catanzaro">mcatanzaro</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2ODA4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmE2NmY0OTg2ZGZmYTIzOWZlYjQ3OTEwODA5MjczNjM5
YzFhNWFiOS4uYWRiNmEzZmM5ZGVkZjE0NzJjN2U1MmQ2NjQ2MmEyYjdiZmM1MDA2ZSAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5
IEBACisyMDE1LTA3LTE0ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNv
bT4KKworICAgICAgICAnamhidWlsZCBidWlsZCcgc2hvdWxkIGZhaWwgaW1tZWRpYXRlbHkgd2hl
biBidWlsZGluZyBhbnkgbW9kdWxlIGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICAqIGVmbC9qaGJ1aWxkcmM6IFVwZGF0ZSBqaGJ1aWxkcmMgdG8g
YWNjb3VudCBmb3IgdGhlIHJlbW92YWwgb2YgdGhlIHVzZV9saWI2NCBvcHRpb24uCisgICAgICAg
ICogZ3RrL2poYnVpbGRyYzogVXBkYXRlIGpoYnVpbGRyYyB0byBhY2NvdW50IGZvciB0aGUgcmVt
b3ZhbCBvZiB0aGUgdXNlX2xpYjY0IG9wdGlvbi4KKyAgICAgICAgRXZlcnl0aGluZyBpcyBwbGFj
ZWQgdW5kZXIgbGliIGluc3RlYWQgb2YgbGliNjQgbm93LgorICAgICAgICAqIGpoYnVpbGQvamhi
dWlsZC13cmFwcGVyOiBVcGRhdGUgamhidWlsZCB0byB0aGUgbGF0ZXN0IHVwc3RyZWFtIGNvbW1p
dCwgYW5kIHBhc3MKKyAgICAgICAgLS1leGl0LW9uLWVycm9yIHdoZW4gcnVubmluZyAnamhidWls
ZCBidWlsZCcuCisgICAgICAgICogamhidWlsZC9qaGJ1aWxkcmNfY29tbW9uLnB5OgorICAgICAg
ICAoaW5pdCk6IERvbid0IG92ZXJyaWRlIFBLR19DT05GSUdfUEFUSCwgQ01BS0VfUFJFRklYX1BB
VEgsIG9yIENNQUtFX0xJQlJBUllfUEFUSC4gTW9kZXJuCisgICAgICAgIGpoYnVpbGQgc2hvdWxk
IGJlIGFibGUgdG8gaGFuZGxlIHRoZXNlIGZvciB1cyB3aXRob3V0IGJyZWFraW5nIHRoaW5ncy4u
Li4KKwogMjAxNS0wNy0xNCAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXogIDxjbG9wZXpAaWdh
bGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBbV2F5bGFuZF0gQnVpbGQgYnkgZGVmYXVsdCB0aGUg
WDExIGFuZCBXYXlsYW5kIHRhcmdldHMuCmRpZmYgLS1naXQgYS9Ub29scy9lZmwvamhidWlsZHJj
IGIvVG9vbHMvZWZsL2poYnVpbGRyYwppbmRleCAyZjQ5NmM4ZjI1NGNmMzA3M2NjNzBhMGQyMDgw
MmNiYzUyY2I2Njc0Li5kMGMzYWZhODU5Mzc3ZDYyNWUzZGZmZWYzZDVhOWIwNTg0NTAzOTE1IDEw
MDY0NAotLS0gYS9Ub29scy9lZmwvamhidWlsZHJjCisrKyBiL1Rvb2xzL2VmbC9qaGJ1aWxkcmMK
QEAgLTIyLDEwICsyMiw2IEBAIGltcG9ydCBwbGF0Zm9ybQogc3lzLnBhdGguaW5zZXJ0KDAsIG9z
LnBhdGguam9pbihvcy5wYXRoLmRpcm5hbWUoX19maWxlX18pLCAiLi4vamhidWlsZCIpICkKIGlt
cG9ydCBqaGJ1aWxkcmNfY29tbW9uCiAKLSMgU2V0dGluZyB1c2VfbGliNjQgdG8gRmFsc2UgaXMg
bmVjZXNzYXJ5LCBvdGhlcndpc2UgQ01ha2Ugd2lsbCBub3QgZmluZAotIyB0aGUgbGliNjQvY21h
a2UvPG5hbWU+IGZvbGRlciB0aGF0IGNvbnRhaW5zIHRoZSA8TmFtZT5Db25maWcuY21ha2UgZmls
ZXMuCi11c2VfbGliNjQgPSBGYWxzZQotCiBqaGJ1aWxkcmNfY29tbW9uLmluaXQoZ2xvYmFscygp
LCAiZWZsIikgCiAKIGFkZHBhdGgoJ1hER19EQVRBX0RJUlMnLCAnL3Vzci9zaGFyZScpCmRpZmYg
LS1naXQgYS9Ub29scy9ndGsvamhidWlsZHJjIGIvVG9vbHMvZ3RrL2poYnVpbGRyYwppbmRleCA3
Mjc3ZGFlZGIzODMyMzEyYTNkZDg0NTgyNTk1NGRjMGMyNjE4ZTA2Li4wM2M4YWQ4YTAzZGNhY2Iw
ZTA3YjUzNDBmM2Q0YmJiNDAzN2Y2NGQwIDEwMDY0NAotLS0gYS9Ub29scy9ndGsvamhidWlsZHJj
CisrKyBiL1Rvb2xzL2d0ay9qaGJ1aWxkcmMKQEAgLTMzLDcgKzMzLDQgQEAgbW9kdWxlX21ha2Vh
cmdzWydndGsrJ10gPSAnTERGTEFHUz0iLWxtIiAnICsgbWFrZWFyZ3MKICMgYW5ub3RhdGlvbnMg
c29vbmVyIHJhdGhlciB0aGFuIGxhdGVyLgogYXV0b2dlbmFyZ3M9Jy0tZW5hYmxlLWludHJvc3Bl
Y3Rpb24nCiAKLWlmIHVzZV9saWI2NDoKLSAgICBvcy5lbnZpcm9uWydMTFZNUElQRV9MSUJHTF9Q
QVRIJ10gPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKGNoZWNrb3V0cm9vdCwgJ01lc2En
LCAnbGliNjQnLCAnZ2FsbGl1bScpKQotZWxzZToKLSAgICBvcy5lbnZpcm9uWydMTFZNUElQRV9M
SUJHTF9QQVRIJ10gPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKGNoZWNrb3V0cm9vdCwg
J01lc2EnLCAnbGliJywgJ2dhbGxpdW0nKSkKK29zLmVudmlyb25bJ0xMVk1QSVBFX0xJQkdMX1BB
VEgnXSA9IG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4oY2hlY2tvdXRyb290LCAnTWVzYScs
ICdsaWInLCAnZ2FsbGl1bScpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvamhidWlsZC9qaGJ1aWxkLXdy
YXBwZXIgYi9Ub29scy9qaGJ1aWxkL2poYnVpbGQtd3JhcHBlcgppbmRleCAwZmY2ODViM2U3MmQy
MWQ3NGY3ZTU2ZTRhZTM2YjlmZTZlNTJkMzBhLi5mNDQxYTk5ZmNmZDIzNmNiZWM4ZjI1Mjg3YTZj
MGFjOTJlOTk1MjE4IDEwMDc1NQotLS0gYS9Ub29scy9qaGJ1aWxkL2poYnVpbGQtd3JhcHBlcgor
KysgYi9Ub29scy9qaGJ1aWxkL2poYnVpbGQtd3JhcHBlcgpAQCAtMjQsNyArMjQsNyBAQCBpbXBv
cnQgc2hsZXgKIGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCiAKLWpoYnVpbGRfcmV2aXNp
b24gPSAnYzBjYjQ2MTc3ZDc5MTg5ZmZlMGY3NjA3MDNjNzMyZjFjN2VhOGIyOScKK2poYnVpbGRf
cmV2aXNpb24gPSAnZjUyNGZiZTEyMGViYjRiN2QyMDljZTBkMDM1Y2QzZDJlNGE2NmJkNCcKIAog
ZGVmIGRldGVybWluZV9wbGF0Zm9ybSgpOgogICAgIGlmICctLWVmbCcgaW4gc3lzLmFyZ3Y6CkBA
IC0xMjIsNCArMTIyLDQgQEAgaWYgb3MuZW52aXJvbi5oYXNfa2V5KCdVTkRFUl9KSEJVSUxEJykg
YW5kIG9zLmVudmlyb24uaGFzX2tleSgnQUNMT0NBTF9GTEFHUycpOgogCiBlbnN1cmVfamhidWls
ZChwbGF0Zm9ybSkKIAotb3MuZXhlY3ZlKGpoYnVpbGRfcGF0aCwgW2poYnVpbGRfcGF0aCwgJy0t
bm8taW50ZXJhY3QnLCAnLWYnLCBqaGJ1aWxkdXRpbHMuZ2V0X2NvbmZpZ19maWxlX2Zvcl9wbGF0
Zm9ybShwbGF0Zm9ybSldICsgc3lzLmFyZ3ZbMjpdLCBvcy5lbnZpcm9uKQorb3MuZXhlY3ZlKGpo
YnVpbGRfcGF0aCwgW2poYnVpbGRfcGF0aCwgJy0tZXhpdC1vbi1lcnJvcicsICctLW5vLWludGVy
YWN0JywgJy1mJywgamhidWlsZHV0aWxzLmdldF9jb25maWdfZmlsZV9mb3JfcGxhdGZvcm0ocGxh
dGZvcm0pXSArIHN5cy5hcmd2WzI6XSwgb3MuZW52aXJvbikKZGlmZiAtLWdpdCBhL1Rvb2xzL2po
YnVpbGQvamhidWlsZHJjX2NvbW1vbi5weSBiL1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2NvbW1v
bi5weQppbmRleCBjZjc4Y2VlMTk5MzIzYzJiNDk2YjExNDQ3NTBkOTc4ZWIzYTdiOWM3Li42NGZl
OGJmYjVmYzZiNWY4ODFkYjZhNzA5OTBhMWZkZTE4YmJmODQ3IDEwMDY0NAotLS0gYS9Ub29scy9q
aGJ1aWxkL2poYnVpbGRyY19jb21tb24ucHkKKysrIGIvVG9vbHMvamhidWlsZC9qaGJ1aWxkcmNf
Y29tbW9uLnB5CkBAIC03MSwxNyArNzEsMTUgQEAgZGVmIGluaXQoamhidWlsZHJjX2dsb2JhbHMs
IHBsYXRmb3JtKToKICAgICBvcy5lbnZpcm9uWydHU1RfUExVR0lOX1NZU1RFTV9QQVRIJ10gPSAn
JwogCiAgICAgIyBVc2Ugc3lzdGVtIGxpYnJhcmllcyB3aGlsZSBidWlsZGluZy4KLSAgICBpZiBq
aGJ1aWxkcmNfZ2xvYmFsc1sndXNlX2xpYjY0J106Ci0gICAgICAgIF9saWJyYXJ5X2RpciA9ICds
aWI2NCcKLSAgICBlbHNlOgotICAgICAgICBfbGlicmFyeV9kaXIgPSAnbGliJwogICAgIGFkZHBh
dGggPSBqaGJ1aWxkcmNfZ2xvYmFsc1snYWRkcGF0aCddCi0gICAgYWRkcGF0aCgnUEtHX0NPTkZJ
R19QQVRIJywgb3MucGF0aC5qb2luKG9zLnNlcCwgJ3VzcicsIF9saWJyYXJ5X2RpciwgJ3BrZ2Nv
bmZpZycpKQorICAgIHN5c3RlbV9saWJkaXJzID0gamhidWlsZHJjX2dsb2JhbHNbJ3N5c3RlbV9s
aWJkaXJzJ10KKyAgICBmb3IgbGliZGlyIGluIHN5c3RlbV9saWJkaXJzOgorICAgICAgICBhZGRw
YXRoKCdQS0dfQ09ORklHX1BBVEgnLCBvcy5wYXRoLmpvaW4obGliZGlyLCAncGtnY29uZmlnJykp
CiAgICAgYWRkcGF0aCgnUEtHX0NPTkZJR19QQVRIJywgb3MucGF0aC5qb2luKG9zLnNlcCwgJ3Vz
cicsICdzaGFyZScsICdwa2djb25maWcnKSkKIAogICAgIHByZWZpeCA9IGpoYnVpbGRyY19nbG9i
YWxzWydwcmVmaXgnXQogICAgIGFkZHBhdGgoJ0NNQUtFX1BSRUZJWF9QQVRIJywgcHJlZml4KQot
ICAgIGFkZHBhdGgoJ0NNQUtFX0xJQlJBUllfUEFUSCcsIG9zLnBhdGguam9pbihwcmVmaXgsIF9s
aWJyYXJ5X2RpcikpCisgICAgYWRkcGF0aCgnQ01BS0VfTElCUkFSWV9QQVRIJywgb3MucGF0aC5q
b2luKHByZWZpeCwgJ2xpYicpKQogCiAgICAgaWYgJ0pIQlVJTERfTUlSUk9SJyBpbiBvcy5lbnZp
cm9uOgogICAgICAgICBqaGJ1aWxkcmNfZ2xvYmFsc1snZHZjc19taXJyb3JfZGlyJ10gPSBvcy5l
bnZpcm9uWydKSEJVSUxEX01JUlJPUiddCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>266775</attachid>
            <date>2015-12-07 08:33:34 -0800</date>
            <delta_ts>2015-12-07 10:54:52 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-145697-20151207173305.patch</filename>
            <type>text/plain</type>
            <size>4813</size>
            <attacher name="Michael Catanzaro">mcatanzaro</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTkzNjI2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTk5M2JmOGIzMDFjZmJhMDhjODZlMDU3MzgxMjUxZTky
YmRkZTIxMi4uOGYxZTYxMjU5ODZmOTI5ZWE0YjMxMTY4ZWYwMmY1MzA2Y2FiZGFiYyAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5
IEBACisyMDE1LTEyLTA3ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNv
bT4KKworICAgICAgICAnamhidWlsZCBidWlsZCcgc2hvdWxkIGZhaWwgaW1tZWRpYXRlbHkgd2hl
biBidWlsZGluZyBhbnkgbW9kdWxlIGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2OTcKKworICAgICAgICBSZXZpZXdlZCBieSBDYXJsb3Mg
R2FyY2lhIENhbXBvcy4KKworICAgICAgICAqIGVmbC9qaGJ1aWxkcmM6IFVwZGF0ZSBqaGJ1aWxk
cmMgdG8gYWNjb3VudCBmb3IgdGhlIHJlbW92YWwgb2YgdGhlIHVzZV9saWI2NCBvcHRpb24uCisg
ICAgICAgICogZ3RrL2poYnVpbGRyYzogVXBkYXRlIGpoYnVpbGRyYyB0byBhY2NvdW50IGZvciB0
aGUgcmVtb3ZhbCBvZiB0aGUgdXNlX2xpYjY0IG9wdGlvbi4KKyAgICAgICAgRXZlcnl0aGluZyBp
cyBwbGFjZWQgdW5kZXIgbGliIGluc3RlYWQgb2YgbGliNjQgbm93LgorICAgICAgICAqIGpoYnVp
bGQvamhidWlsZC13cmFwcGVyOiBVcGRhdGUgamhidWlsZCB0byB0aGUgbGF0ZXN0IHVwc3RyZWFt
IGNvbW1pdCwgYW5kIHBhc3MKKyAgICAgICAgLS1leGl0LW9uLWVycm9yIHdoZW4gcnVubmluZyAn
amhidWlsZCBidWlsZCcuCisgICAgICAgICogamhidWlsZC9qaGJ1aWxkcmNfY29tbW9uLnB5Ogor
ICAgICAgICAoaW5pdCk6IERvbid0IG92ZXJyaWRlIFBLR19DT05GSUdfUEFUSCwgQ01BS0VfUFJF
RklYX1BBVEgsIG9yIENNQUtFX0xJQlJBUllfUEFUSC4gTW9kZXJuCisgICAgICAgIGpoYnVpbGQg
c2hvdWxkIGJlIGFibGUgdG8gaGFuZGxlIHRoZXNlIGZvciB1cyB3aXRob3V0IGJyZWFraW5nIHRo
aW5ncy4uLi4KKwogMjAxNS0xMi0wNyAgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJp
c0BpZ2FsaWEuY29tPgogCiAgICAgICAgIE1vY2sgVGVzdFJlcG9zaXRvcmllcyBpbiBXM0MgaW1w
b3J0ZXIgdGVzdHMKZGlmZiAtLWdpdCBhL1Rvb2xzL2VmbC9qaGJ1aWxkcmMgYi9Ub29scy9lZmwv
amhidWlsZHJjCmluZGV4IDJmNDk2YzhmMjU0Y2YzMDczY2M3MGEwZDIwODAyY2JjNTJjYjY2NzQu
LmQwYzNhZmE4NTkzNzdkNjI1ZTNkZmZlZjNkNWE5YjA1ODQ1MDM5MTUgMTAwNjQ0Ci0tLSBhL1Rv
b2xzL2VmbC9qaGJ1aWxkcmMKKysrIGIvVG9vbHMvZWZsL2poYnVpbGRyYwpAQCAtMjIsMTAgKzIy
LDYgQEAgaW1wb3J0IHBsYXRmb3JtCiBzeXMucGF0aC5pbnNlcnQoMCwgb3MucGF0aC5qb2luKG9z
LnBhdGguZGlybmFtZShfX2ZpbGVfXyksICIuLi9qaGJ1aWxkIikgKQogaW1wb3J0IGpoYnVpbGRy
Y19jb21tb24KIAotIyBTZXR0aW5nIHVzZV9saWI2NCB0byBGYWxzZSBpcyBuZWNlc3NhcnksIG90
aGVyd2lzZSBDTWFrZSB3aWxsIG5vdCBmaW5kCi0jIHRoZSBsaWI2NC9jbWFrZS88bmFtZT4gZm9s
ZGVyIHRoYXQgY29udGFpbnMgdGhlIDxOYW1lPkNvbmZpZy5jbWFrZSBmaWxlcy4KLXVzZV9saWI2
NCA9IEZhbHNlCi0KIGpoYnVpbGRyY19jb21tb24uaW5pdChnbG9iYWxzKCksICJlZmwiKSAKIAog
YWRkcGF0aCgnWERHX0RBVEFfRElSUycsICcvdXNyL3NoYXJlJykKZGlmZiAtLWdpdCBhL1Rvb2xz
L2d0ay9qaGJ1aWxkcmMgYi9Ub29scy9ndGsvamhidWlsZHJjCmluZGV4IDA0OTIxMzkxZWViNzg0
MDJkZTJmMTU3YzE2MmE2YjVmMWI1MmUxMGEuLmJmZTVjZTlkYmQwODM2YzkxNTczNDA2ODZmMjRm
ZWJhZmFkOGU0MmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2d0ay9qaGJ1aWxkcmMKKysrIGIvVG9vbHMv
Z3RrL2poYnVpbGRyYwpAQCAtMzcsNyArMzcsNCBAQCBhdXRvZ2VuYXJncz0nLS1lbmFibGUtaW50
cm9zcGVjdGlvbicKICMgZm9yIGEgbW9kdWxlLCBzbyB3ZSBkbyBpdCBoZXJlIGdsb2JhbGx5IHNp
bmNlIGl0J3MgYSBnb29kIGlkZWEgZm9yIGFsbCBvdGhlciBtb2R1bGVzIGFzIHdlbGwuCiBidWls
ZHJvb3QgPSBvcy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1lKGNoZWNrb3V0cm9vdCksICJCdWls
ZCIpCiAKLWlmIHVzZV9saWI2NDoKLSAgICBvcy5lbnZpcm9uWydMTFZNUElQRV9MSUJHTF9QQVRI
J10gPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKGJ1aWxkcm9vdCwgJ01lc2EnLCAnbGli
NjQnLCAnZ2FsbGl1bScpKQotZWxzZToKLSAgICBvcy5lbnZpcm9uWydMTFZNUElQRV9MSUJHTF9Q
QVRIJ10gPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKGJ1aWxkcm9vdCwgJ01lc2EnLCAn
bGliJywgJ2dhbGxpdW0nKSkKK29zLmVudmlyb25bJ0xMVk1QSVBFX0xJQkdMX1BBVEgnXSA9IG9z
LnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4oYnVpbGRyb290LCAnTWVzYScsICdsaWInLCAnZ2Fs
bGl1bScpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvamhidWlsZC9qaGJ1aWxkLXdyYXBwZXIgYi9Ub29s
cy9qaGJ1aWxkL2poYnVpbGQtd3JhcHBlcgppbmRleCAyYzA1MzdlOWJhZGYwMzM4ZGYxNWUwZDI4
YjUwMDNlNzAzYTkzMzg1Li44NmUxZWIyOTVhMzBmZDIzNzJmYmE0YjM3Njg3NTVjMzBlNzIxZDk5
IDEwMDc1NQotLS0gYS9Ub29scy9qaGJ1aWxkL2poYnVpbGQtd3JhcHBlcgorKysgYi9Ub29scy9q
aGJ1aWxkL2poYnVpbGQtd3JhcHBlcgpAQCAtMjQsOCArMjQsOCBAQCBpbXBvcnQgc2hsZXgKIGlt
cG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCiAKLSMgMy4xMi4wCi1qaGJ1aWxkX3JldmlzaW9u
ID0gJzVmNDJlOTFiMDVmNTViY2YxMzQ2ODk5ZmEzOWZlZTRlM2JlY2NhNmYnCisjIEZpcnN0IHJl
bGVhc2UgdG8gc3VwcG9ydCAtLWV4aXQtb24tZXJyb3Igb3B0aW9uCitqaGJ1aWxkX3JldmlzaW9u
ID0gJ2Y1MjRmYmUxMjBlYmI0YjdkMjA5Y2UwZDAzNWNkM2QyZTRhNjZiZDQnCiAKIGRlZiBkZXRl
cm1pbmVfcGxhdGZvcm0oKToKICAgICBpZiAnLS1lZmwnIGluIHN5cy5hcmd2OgpAQCAtMTIzLDQg
KzEyMyw0IEBAIGlmIG9zLmVudmlyb24uaGFzX2tleSgnVU5ERVJfSkhCVUlMRCcpIGFuZCBvcy5l
bnZpcm9uLmhhc19rZXkoJ0FDTE9DQUxfRkxBR1MnKToKIAogZW5zdXJlX2poYnVpbGQocGxhdGZv
cm0pCiAKLW9zLmV4ZWN2ZShqaGJ1aWxkX3BhdGgsIFtqaGJ1aWxkX3BhdGgsICctLW5vLWludGVy
YWN0JywgJy1mJywgamhidWlsZHV0aWxzLmdldF9jb25maWdfZmlsZV9mb3JfcGxhdGZvcm0ocGxh
dGZvcm0pXSArIHN5cy5hcmd2WzI6XSwgb3MuZW52aXJvbikKK29zLmV4ZWN2ZShqaGJ1aWxkX3Bh
dGgsIFtqaGJ1aWxkX3BhdGgsICctLWV4aXQtb24tZXJyb3InLCAnLS1uby1pbnRlcmFjdCcsICct
ZicsIGpoYnVpbGR1dGlscy5nZXRfY29uZmlnX2ZpbGVfZm9yX3BsYXRmb3JtKHBsYXRmb3JtKV0g
KyBzeXMuYXJndlsyOl0sIG9zLmVudmlyb24pCmRpZmYgLS1naXQgYS9Ub29scy9qaGJ1aWxkL2po
YnVpbGRyY19jb21tb24ucHkgYi9Ub29scy9qaGJ1aWxkL2poYnVpbGRyY19jb21tb24ucHkKaW5k
ZXggYThhMTBhMTE2MzFiYTNkYWVlODEyODY5NGNkMDZmYWY0MDEyNjUwYy4uNjFkZmE3ZWM0OGU3
M2RkNTc5YjQzYzljMjY5N2I4ZjgyODU5NGI1MSAxMDA2NDQKLS0tIGEvVG9vbHMvamhidWlsZC9q
aGJ1aWxkcmNfY29tbW9uLnB5CisrKyBiL1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2NvbW1vbi5w
eQpAQCAtNzIsMTcgKzcyLDE1IEBAIGRlZiBpbml0KGpoYnVpbGRyY19nbG9iYWxzLCBqaGJ1aWxk
X3BsYXRmb3JtKToKICAgICBvcy5lbnZpcm9uWydHU1RfUExVR0lOX1NZU1RFTV9QQVRIJ10gPSAn
JwogCiAgICAgIyBVc2Ugc3lzdGVtIGxpYnJhcmllcyB3aGlsZSBidWlsZGluZy4KLSAgICBpZiBq
aGJ1aWxkcmNfZ2xvYmFsc1sndXNlX2xpYjY0J106Ci0gICAgICAgIF9saWJyYXJ5X2RpciA9ICds
aWI2NCcKLSAgICBlbHNlOgotICAgICAgICBfbGlicmFyeV9kaXIgPSAnbGliJwogICAgIGFkZHBh
dGggPSBqaGJ1aWxkcmNfZ2xvYmFsc1snYWRkcGF0aCddCi0gICAgYWRkcGF0aCgnUEtHX0NPTkZJ
R19QQVRIJywgb3MucGF0aC5qb2luKG9zLnNlcCwgJ3VzcicsIF9saWJyYXJ5X2RpciwgJ3BrZ2Nv
bmZpZycpKQorICAgIHN5c3RlbV9saWJkaXJzID0gamhidWlsZHJjX2dsb2JhbHNbJ3N5c3RlbV9s
aWJkaXJzJ10KKyAgICBmb3IgbGliZGlyIGluIHN5c3RlbV9saWJkaXJzOgorICAgICAgICBhZGRw
YXRoKCdQS0dfQ09ORklHX1BBVEgnLCBvcy5wYXRoLmpvaW4obGliZGlyLCAncGtnY29uZmlnJykp
CiAgICAgYWRkcGF0aCgnUEtHX0NPTkZJR19QQVRIJywgb3MucGF0aC5qb2luKG9zLnNlcCwgJ3Vz
cicsICdzaGFyZScsICdwa2djb25maWcnKSkKIAogICAgIHByZWZpeCA9IGpoYnVpbGRyY19nbG9i
YWxzWydwcmVmaXgnXQogICAgIGFkZHBhdGgoJ0NNQUtFX1BSRUZJWF9QQVRIJywgcHJlZml4KQot
ICAgIGFkZHBhdGgoJ0NNQUtFX0xJQlJBUllfUEFUSCcsIG9zLnBhdGguam9pbihwcmVmaXgsIF9s
aWJyYXJ5X2RpcikpCisgICAgYWRkcGF0aCgnQ01BS0VfTElCUkFSWV9QQVRIJywgb3MucGF0aC5q
b2luKHByZWZpeCwgJ2xpYicpKQogCiAgICAgaWYgJ0pIQlVJTERfTUlSUk9SJyBpbiBvcy5lbnZp
cm9uOgogICAgICAgICBqaGJ1aWxkcmNfZ2xvYmFsc1snZHZjc19taXJyb3JfZGlyJ10gPSBvcy5l
bnZpcm9uWydKSEJVSUxEX01JUlJPUiddCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>