<?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>135613</bug_id>
          
          <creation_ts>2014-08-05 10:47:12 -0700</creation_ts>
          <short_desc>[Win] Build error when OFFICIAL_BUILD != 1.</short_desc>
          <delta_ts>2014-08-06 11:49:17 -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>Web Template Framework</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter>peavo</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>achristensen</cc>
    
    <cc>bfulgham</cc>
    
    <cc>commit-queue</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1026880</commentid>
    <comment_count>0</comment_count>
    <who name="">peavo</who>
    <bug_when>2014-08-05 10:47:12 -0700</bug_when>
    <thetext>When OFFICIAL_BUILD != 1 the WinCairo build fails to build WTFGenerated, because the make file tries to run a python script directly, but this fails, because it needs to be started with a shell (bash -c ...).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1026885</commentid>
    <comment_count>1</comment_count>
      <attachid>236034</attachid>
    <who name="">peavo</who>
    <bug_when>2014-08-05 10:58:54 -0700</bug_when>
    <thetext>Created attachment 236034
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1026891</commentid>
    <comment_count>2</comment_count>
      <attachid>236034</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2014-08-05 11:18:59 -0700</bug_when>
    <thetext>Comment on attachment 236034
Patch

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

&gt; Source/WTF/ChangeLog:8
&gt; +        This is solved by rewriting the python script to perl.

I don&apos;t understand this. Why can&apos;t you use the Python implementation?

I&apos;m trying to reduce the use of bash-based build steps, so changing this to call python directly might be the cause of the problem. I have ActiveState Python installed, which may be why it works for me.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1026892</commentid>
    <comment_count>3</comment_count>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2014-08-05 11:19:37 -0700</bug_when>
    <thetext>I don&apos;t think this is the right approach; I would like to use the existing script. Instead, we need to figure out why the Python script cannot be used.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1026900</commentid>
    <comment_count>4</comment_count>
    <who name="">peavo</who>
    <bug_when>2014-08-05 11:36:48 -0700</bug_when>
    <thetext>(In reply to comment #2)
&gt; (From update of attachment 236034 [details])
&gt; View in context: https://bugs.webkit.org/attachment.cgi?id=236034&amp;action=review

Thanks for reviewing :)

&gt; 
&gt; &gt; Source/WTF/ChangeLog:8
&gt; &gt; +        This is solved by rewriting the python script to perl.
&gt; 
&gt; I don&apos;t understand this. Why can&apos;t you use the Python implementation?
&gt; 
&gt; I&apos;m trying to reduce the use of bash-based build steps, so changing this to call python directly might be the cause of the problem. I have ActiveState Python installed, which may be why it works for me.

Ok, I see, I don&apos;t have ActiveState installed, just the cygwin environment.
Is it a requirement to have ActiveState installed? In that case I think this bug is invalid ...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1026919</commentid>
    <comment_count>5</comment_count>
    <who name="">peavo</who>
    <bug_when>2014-08-05 12:13:29 -0700</bug_when>
    <thetext>(In reply to comment #3)
&gt; I don&apos;t think this is the right approach; I would like to use the existing script. Instead, we need to figure out why the Python script cannot be used.

I think it fails for me because python is not in the PATH environment variable.

I guess we also could go back to &apos;bash -c python ...&apos;, but that&apos;s sort of counter-productive to your attempt at reducing the use of bash...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1026932</commentid>
    <comment_count>6</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2014-08-05 13:07:58 -0700</bug_when>
    <thetext>(In reply to comment #5)
&gt; I think it fails for me because python is not in the PATH environment variable.
Does putting python in the PATH fix it?  If so, this should be closed as invalid.

Heads up -- I&apos;m starting to get things working with CMake, which will require separate installation of things like bison, flex, gperf, grep etc.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1026934</commentid>
    <comment_count>7</comment_count>
    <who name="">peavo</who>
    <bug_when>2014-08-05 13:40:32 -0700</bug_when>
    <thetext>(In reply to comment #6)
&gt; (In reply to comment #5)
&gt; &gt; I think it fails for me because python is not in the PATH environment variable.
&gt; Does putting python in the PATH fix it?  If so, this should be closed as invalid.
&gt; 
&gt; Heads up -- I&apos;m starting to get things working with CMake, which will require separate installation of things like bison, flex, gperf, grep etc.

I see now that WTFPreBuild.cmd adds c:\cygwin\bin to PATH, and there is both a perl and python executable there, but the python executable has the name python2.6.exe, which explains why python.exe is not found ...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1026936</commentid>
    <comment_count>8</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2014-08-05 13:51:37 -0700</bug_when>
    <thetext>I installed python from python.org and manually put it into my PATH variable.  Same with ActivePerl.  We should really update http://www.webkit.org/building/tools.html.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1027114</commentid>
    <comment_count>9</comment_count>
    <who name="">peavo</who>
    <bug_when>2014-08-06 03:36:51 -0700</bug_when>
    <thetext>(In reply to comment #7)
&gt; (In reply to comment #6)
&gt; &gt; (In reply to comment #5)
&gt; &gt; &gt; I think it fails for me because python is not in the PATH environment variable.
&gt; &gt; Does putting python in the PATH fix it?  If so, this should be closed as invalid.
&gt; &gt; 
&gt; &gt; Heads up -- I&apos;m starting to get things working with CMake, which will require separate installation of things like bison, flex, gperf, grep etc.
&gt; 
&gt; I see now that WTFPreBuild.cmd adds c:\cygwin\bin to PATH, and there is both a perl and python executable there, but the python executable has the name python2.6.exe, which explains why python.exe is not found ...

There is actually a python symlink in c:\cygwin\bin which points to python2.6.exe, but it&apos;s not a native symlink, and will only work with bash, I believe.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1027139</commentid>
    <comment_count>10</comment_count>
      <attachid>236095</attachid>
    <who name="">peavo</who>
    <bug_when>2014-08-06 06:29:38 -0700</bug_when>
    <thetext>Created attachment 236095
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1027140</commentid>
    <comment_count>11</comment_count>
    <who name="">peavo</who>
    <bug_when>2014-08-06 06:31:14 -0700</bug_when>
    <thetext>(In reply to comment #10)
&gt; Created an attachment (id=236095) [details]
&gt; Patch

I suggest we temporarily go back to execute the python script from the bash shell until http://www.webkit.org/building/tools.html is updated.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1027184</commentid>
    <comment_count>12</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2014-08-06 09:51:24 -0700</bug_when>
    <thetext>(In reply to comment #11)
&gt; I suggest we temporarily go back to execute the python script from the bash shell until http://www.webkit.org/building/tools.html is updated.
I think this would be a step against the direction the Windows build systems are going.  Websites/webkit.org/building/tools.html should be changed instead of this.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1027228</commentid>
    <comment_count>13</comment_count>
      <attachid>236119</attachid>
    <who name="">peavo</who>
    <bug_when>2014-08-06 11:14:18 -0700</bug_when>
    <thetext>Created attachment 236119
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1027229</commentid>
    <comment_count>14</comment_count>
    <who name="">peavo</who>
    <bug_when>2014-08-06 11:15:20 -0700</bug_when>
    <thetext>(In reply to comment #12)
&gt; (In reply to comment #11)
&gt; &gt; I suggest we temporarily go back to execute the python script from the bash shell until http://www.webkit.org/building/tools.html is updated.
&gt; I think this would be a step against the direction the Windows build systems are going.  Websites/webkit.org/building/tools.html should be changed instead of this.

Ok, thanks :) Updated patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1027230</commentid>
    <comment_count>15</comment_count>
      <attachid>236119</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2014-08-06 11:15:25 -0700</bug_when>
    <thetext>Comment on attachment 236119
Patch

In the near future we&apos;ll have to add more things like this (bison, flex, gperf, etc.) once my CMake work takes over</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1027231</commentid>
    <comment_count>16</comment_count>
    <who name="">peavo</who>
    <bug_when>2014-08-06 11:18:03 -0700</bug_when>
    <thetext>(In reply to comment #15)
&gt; (From update of attachment 236119 [details])
&gt; In the near future we&apos;ll have to add more things like this (bison, flex, gperf, etc.) once my CMake work takes over

Sounds good, thanks for reviewing :)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1027247</commentid>
    <comment_count>17</comment_count>
      <attachid>236119</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2014-08-06 11:49:13 -0700</bug_when>
    <thetext>Comment on attachment 236119
Patch

Clearing flags on attachment: 236119

Committed r172163: &lt;http://trac.webkit.org/changeset/172163&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1027248</commentid>
    <comment_count>18</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2014-08-06 11:49:17 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>236034</attachid>
            <date>2014-08-05 10:58:54 -0700</date>
            <delta_ts>2014-08-06 06:29:29 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-135613-20140805195836.patch</filename>
            <type>text/plain</type>
            <size>5242</size>
            <attacher>peavo</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh
bmdlTG9nCShyZXZpc2lvbiAxNzIwMzQpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA4LTA1ICBwZWF2b0BvdXRsb29rLmNvbSAg
PHBlYXZvQG91dGxvb2suY29tPgorCisgICAgICAgIFtXaW5dIEJ1aWxkIGVycm9yIHdoZW4gT0ZG
SUNJQUxfQlVJTEQgIT0gMS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTEzNTYxMworCisgICAgICAgIFRoZSBXVEZHZW5lcmF0ZWQgbWFrZSBmaWxlIHRy
aWVzIHRvIHJ1biBhIHB5dGhvbiBzY3JpcHQgZGlyZWN0bHksCisgICAgICAgIGJ1dCBmYWlscywg
c2luY2UgaXQgbmVlZHMgdG8gYmUgc3RhcnRlZCB3aXRoIGEgc2hlbGwuCisgICAgICAgIFRoaXMg
aXMgc29sdmVkIGJ5IHJld3JpdGluZyB0aGUgcHl0aG9uIHNjcmlwdCB0byBwZXJsLgorCisgICAg
ICAgICogV1RGLnZjeHByb2ovV1RGR2VuZXJhdGVkLm1ha2U6IENhbGwgbmV3IHBlcmwgc2NyaXB0
LgorICAgICAgICAqIFdURi52Y3hwcm9qL3dvcmstYXJvdW5kLXZzLWRlcGVuZGVuY3ktdHJhY2tp
bmctYnVncy5wbDogQWRkZWQuCisgICAgICAgIChtYWluKToKKyAgICAgICAgKHJlYWN0X3RvX3Zz
cHJvcHNfY2hhbmdlcyk6CisgICAgICAgIChyZWFjdF90b193ZWJraXQxX2ludGVyZmFjZV9jaGFu
Z2VzKToKKyAgICAgICAgKG10aW1lX29mX25ld2VzdF9maWxlX21hdGNoaW5nX2dsb2IpOgorICAg
ICAgICAoZGVsZXRlX2lmX29sZGVyX3RoYW4pOgorICAgICAgICAodG91Y2hfaWZfb2xkZXJfdGhh
bik6CisKIDIwMTQtMDgtMDQgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0
Lm9yZz4KIAogICAgICAgICBQcm9ncmVzcyB0b3dhcmRzIENNYWtlIG9uIE1hYy4KSW5kZXg6IFNv
dXJjZS9XVEYvV1RGLnZjeHByb2ovV1RGR2VuZXJhdGVkLm1ha2UKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291
cmNlL1dURi9XVEYudmN4cHJvai9XVEZHZW5lcmF0ZWQubWFrZQkocmV2aXNpb24gMTcyMDM0KQor
KysgU291cmNlL1dURi9XVEYudmN4cHJvai9XVEZHZW5lcmF0ZWQubWFrZQkod29ya2luZyBjb3B5
KQpAQCAtMiw3ICsyLDcgQEAgYWxsOiBXVEZIZWFkZXJEZXRlY3Rpb24uaAogICAgIHRvdWNoICIl
Q29uZmlndXJhdGlvbkJ1aWxkRGlyJVxidWlsZGZhaWxlZCIKICAgICBwZXJsIGJ1aWxkLWdlbmVy
YXRlZC1maWxlcy5wbCAiJUNvbmZpZ3VyYXRpb25CdWlsZERpciUiICIkKFdFQktJVF9MSUJSQVJJ
RVMpIiAiJChERUJVR1NVRkZJWCkiICIlUGxhdGZvcm1BcmNoaXRlY3R1cmUlIgogIUlGICIkKE9G
RklDSUFMX0JVSUxEKSIhPSIxIgotICAgIHB5dGhvbiB3b3JrLWFyb3VuZC12cy1kZXBlbmRlbmN5
LXRyYWNraW5nLWJ1Z3MucHkKKyAgICBwZXJsIHdvcmstYXJvdW5kLXZzLWRlcGVuZGVuY3ktdHJh
Y2tpbmctYnVncy5wbAogIUVORElGCiAgICAgY29weS1maWxlcy5jbWQKIApJbmRleDogU291cmNl
L1dURi9XVEYudmN4cHJvai93b3JrLWFyb3VuZC12cy1kZXBlbmRlbmN5LXRyYWNraW5nLWJ1Z3Mu
cGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi9XVEYudmN4cHJvai93b3JrLWFyb3VuZC12cy1k
ZXBlbmRlbmN5LXRyYWNraW5nLWJ1Z3MucGwJKHJldmlzaW9uIDApCisrKyBTb3VyY2UvV1RGL1dU
Ri52Y3hwcm9qL3dvcmstYXJvdW5kLXZzLWRlcGVuZGVuY3ktdHJhY2tpbmctYnVncy5wbAkod29y
a2luZyBjb3B5KQpAQCAtMCwwICsxLDEwMSBAQAorIyEvdXNyL2Jpbi9lbnYgcGVybCAtdworCitt
eSAkVE9QX0xFVkVMX0RJUkVDVE9SWSA9ICRFTlZ7V0VCS0lUX1NPVVJDRX07CitteSAkV0VCS0lU
X0xJQlJBUklFUyA9ICRFTlZ7V0VCS0lUX0xJQlJBUklFU307CisKK3N1YiBtYWluCit7CisgICAg
cmVhY3RfdG9fdnNwcm9wc19jaGFuZ2VzKCk7CisgICAgcmVhY3RfdG9fd2Via2l0MV9pbnRlcmZh
Y2VfY2hhbmdlcygpOworfQorCitzdWIgcmVhY3RfdG9fdnNwcm9wc19jaGFuZ2VzCit7CisgICAg
bXkgJHZzcHJvcHNfZGlyZWN0b3J5ID0gJFdFQktJVF9MSUJSQVJJRVMgLiAiL3Rvb2xzL3ZzcHJv
cHMvIjsKKyAgICBteSAkbmV3ZXN0X3ZzcHJvcHNfdGltZSA9IG10aW1lX29mX25ld2VzdF9maWxl
X21hdGNoaW5nX2dsb2IoJHZzcHJvcHNfZGlyZWN0b3J5IC4gIioucHJvcHMiKTsKKworICAgIGlm
ICghZGVmaW5lZCAkRU5We0NPTkZJR1VSQVRJT05CVUlMRERJUn0pIHsKKyAgICAgICAgcmV0dXJu
OworICAgIH0KKyAgICBteSAkb2JqX2RpcmVjdG9yeSA9ICRFTlZ7Q09ORklHVVJBVElPTkJVSUxE
RElSfSAuICIvb2JqMzIvIjsKKworICAgICMgUmVwbGFjZSBiYWNrc2xhc2ggd2l0aCBmb3J3YXJk
IHNsYXNoOgorICAgICRvYmpfZGlyZWN0b3J5ID1+IHMvXFwvXC8vZzsKKworICAgICMgVmlzdWFs
IFN0dWRpbyBpc24ndCBzbWFydCBlbm91Z2ggdG8gZmlndXJlIG91dCBpdCBuZWVkcyB0byByZWJ1
aWxkIHRoZXNlIGZpbGUgdHlwZXMgd2hlbgorICAgICMgLnZzcHJvcHMgZmlsZXMgY2hhbmdlIChl
dmVuIGlmIHdlIHRvdWNoIHd0Zi9QbGF0Zm9ybS5oIGJlbG93KSwgc28gd2UgZGVsZXRlIHRoZW0g
dG8gZm9yY2UgdGhlbQorICAgICMgdG8gYmUgcmVidWlsdC4KKyAgICBAZmlsZXMgPSA8JHtvYmpf
ZGlyZWN0b3J5fSoue2RlcCxtYW5pZmVzdCxwY2gscmVzfT47CisgICAgZm9yZWFjaCAkZmlsZXBh
dGggKEBmaWxlcykgeworICAgICAgICBwcmludCAkZmlsZXBhdGgsICAiXG4iOworICAgICAgICBk
ZWxldGVfaWZfb2xkZXJfdGhhbigkZmlsZXBhdGgsICRuZXdlc3RfdnNwcm9wc190aW1lKTsKKyAg
ICB9CisKKyAgICAjIFRvdWNoIHd0Zi9QbGF0Zm9ybS5oIHNvIGFsbCBmaWxlcyB3aWxsIGJlIHJl
Y29tcGlsZWQuIFRoaXMgaXMgbmVjZXNzYXJ5CisgICAgIyB0byBwaWNrIHVwIGNoYW5nZXMgdG8g
cHJlcHJvY2Vzc29yIG1hY3JvcyAoZS5nLiwgRU5BQkxFXyopLgorICAgIG15ICR3dGZfcGxhdGZv
cm1faCA9ICRUT1BfTEVWRUxfRElSRUNUT1JZIC4gIi9XVEYvd3RmL1BsYXRmb3JtLmgiOworICAg
IHRvdWNoX2lmX29sZGVyX3RoYW4oJHd0Zl9wbGF0Zm9ybV9oLCAkbmV3ZXN0X3ZzcHJvcHNfdGlt
ZSk7Cit9CisKK3N1YiByZWFjdF90b193ZWJraXQxX2ludGVyZmFjZV9jaGFuZ2VzCit7CisgICAg
bXkgJGludGVyZmFjZXNfZGlyZWN0b3J5ID0gJFRPUF9MRVZFTF9ESVJFQ1RPUlkgLiAiL1dlYktp
dC93aW4vSW50ZXJmYWNlcy8iOworICAgIG15ICRuZXdlc3RfaWRsX3RpbWUgPSBtdGltZV9vZl9u
ZXdlc3RfZmlsZV9tYXRjaGluZ19nbG9iKCRpbnRlcmZhY2VzX2RpcmVjdG9yeSAuICIqLmlkbCIp
OworICAgICMgV2ViS2l0LmlkbCBpbmNsdWRlcyBhbGwgdGhlIG90aGVyIElETCBmaWxlcywgc28g
bmVlZHMgdG8gYmUgcmVidWlsdCBpZiBhbnkgSURMIGZpbGUgY2hhbmdlcy4KKyAgICAjIEJ1dCBW
aXN1YWwgU3R1ZGlvIGlzbid0IHNtYXJ0IGVub3VnaCB0byBmaWd1cmUgdGhpcyBvdXQsIHNvIHdl
IHRvdWNoIFdlYktpdC5pZGwgdG8gZW5zdXJlIHRoYXQKKyAgICAjIGl0IGdldHMgcmVidWlsdC4K
KyAgICB0b3VjaF9pZl9vbGRlcl90aGFuKCRpbnRlcmZhY2VzX2RpcmVjdG9yeSAuICJXZWJLaXQu
aWRsIiwgJG5ld2VzdF9pZGxfdGltZSk7Cit9CisKK3N1YiBtdGltZV9vZl9uZXdlc3RfZmlsZV9t
YXRjaGluZ19nbG9iCit7CisgICAgbXkgKCRnbG9iX3BhdHRlcm4pID0gQF87CisgICAgIyBSZXBs
YWNlIGJhY2tzbGFzaCB3aXRoIGZvcndhcmQgc2xhc2g6CisgICAgJGdsb2JfcGF0dGVybiA9fiBz
L1xcL1wvL2c7CisgICAgcHJpbnQgIlNlYXJjaCBwYXR0ZXJuOiAiLCAkZ2xvYl9wYXR0ZXJuLCAi
XG4iOworICAgIEBmaWxlcyA9IDwke2dsb2JfcGF0dGVybn0+OworICAgIGlmIChzY2FsYXIgQGZp
bGVzID09IDApIHsKKyAgICAgICAgcHJpbnQgIkNvdWxkbid0IGZpbmQgYW55IGZpbGVzIG1hdGNo
aW5nIGdsb2IgIiwgJGdsb2JfcGF0dGVybjsKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQorCisg
ICAgbXkgJG10aW1lX29mX25ld2VzdF9maWxlID0gMDsKKyAgICBmb3JlYWNoICRmaWxlcGF0aCAo
QGZpbGVzKSB7CisgICAgICAgIHByaW50ICRmaWxlcGF0aCAuICJcbiI7CisgICAgICAgIG15ICRs
YXN0X21vZF90aW1lID0gKHN0YXQoJGZpbGVwYXRoKSlbOV07CisgICAgICAgIGlmICgkbXRpbWVf
b2ZfbmV3ZXN0X2ZpbGUgPCAkbGFzdF9tb2RfdGltZSkgeworICAgICAgICAgICAgJG10aW1lX29m
X25ld2VzdF9maWxlID0gJGxhc3RfbW9kX3RpbWU7CisgICAgICAgIH0KKyAgICB9CisgICAgcHJp
bnQgIk1vZGlmaWNhdGlvbiB0aW1lIG9mIG5ld2VzdCBmaWxlOiAiLCAkbXRpbWVfb2ZfbmV3ZXN0
X2ZpbGUsICJcbiI7CisgICAgcmV0dXJuICRtdGltZV9vZl9uZXdlc3RfZmlsZTsKK30KKworc3Vi
IGRlbGV0ZV9pZl9vbGRlcl90aGFuCit7CisgICAgbXkgKCRwYXRoLCAkcmVmZXJlbmNlX3RpbWUp
ID0gQF87CisgICAgbXkgJGxhc3RfbW9kX3RpbWUgPSAoc3RhdCgkcGF0aCkpWzldOworICAgIGlm
ICghZGVmaW5lZCAkbGFzdF9tb2RfdGltZSkgeworICAgICAgICByZXR1cm47CisgICAgfQorICAg
IGlmICgkbGFzdF9tb2RfdGltZSA8ICRyZWZlcmVuY2VfdGltZSkgeworICAgICAgICBwcmludCAi
RGVsZXRpbmcgIiwgJHBhdGgsICJcbiI7CisgICAgICAgIHVubGluayAkcGF0aDsKKyAgICB9Cit9
CisKK3N1YiB0b3VjaF9pZl9vbGRlcl90aGFuCit7CisgICAgbXkgKCRwYXRoLCAkcmVmZXJlbmNl
X3RpbWUpID0gQF87CisgICAgbXkgJGxhc3RfbW9kX3RpbWUgPSAoc3RhdCgkcGF0aCkpWzldOwor
ICAgIGlmICghZGVmaW5lZCAkbGFzdF9tb2RfdGltZSkgeworICAgICAgICByZXR1cm47CisgICAg
fQorICAgIGlmICgkbGFzdF9tb2RfdGltZSA8ICRyZWZlcmVuY2VfdGltZSkgeworICAgICAgICBw
cmludCAiVG91Y2hpbmcgIiwgJHBhdGgsICJcbiI7CisgICAgICAgIG15ICRub3cgPSB0aW1lOwor
ICAgICAgICB1dGltZSgkbm93LCAkbm93LCAkcGF0aCk7CisgICAgfQorfQorCittYWluKCk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>236095</attachid>
            <date>2014-08-06 06:29:38 -0700</date>
            <delta_ts>2014-08-06 11:14:09 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-135613-20140806152917.patch</filename>
            <type>text/plain</type>
            <size>1391</size>
            <attacher>peavo</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh
bmdlTG9nCShyZXZpc2lvbiAxNzIxNDEpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA4LTA2ICBwZWF2b0BvdXRsb29rLmNvbSAg
PHBlYXZvQG91dGxvb2suY29tPgorCisgICAgICAgIFtXaW5dIEJ1aWxkIGVycm9yIHdoZW4gT0ZG
SUNJQUxfQlVJTEQgIT0gMS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTEzNTYxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor
CisgICAgICAgIFdpdGggb25seSB0aGUgQ3lnd2luIGVudmlyb25tZW50IGluc3RhbGxlZCwgcHl0
aG9uIHNjcmlwdHMgbmVlZHMgdG8gYmUgZXhlY3V0ZWQKKyAgICAgICAgZnJvbSB0aGUgYmFzaCBz
aGVsbCwgb3RoZXJ3aXNlIHRoZSBweXRob24gZXhlY3V0YWJsZSB3b24ndCBiZSBmb3VuZC4KKwor
ICAgICAgICAqIFdURi52Y3hwcm9qL1dURkdlbmVyYXRlZC5tYWtlOiBSdW4gcHl0aG9uIHNjcmlw
dCBmcm9tIGJhc2ggc2hlbGwuCisKIDIwMTQtMDgtMDQgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hy
aXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBQcm9ncmVzcyB0b3dhcmRzIENNYWtlIG9u
IE1hYy4KSW5kZXg6IFNvdXJjZS9XVEYvV1RGLnZjeHByb2ovV1RGR2VuZXJhdGVkLm1ha2UKPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQotLS0gU291cmNlL1dURi9XVEYudmN4cHJvai9XVEZHZW5lcmF0ZWQubWFrZQkocmV2
aXNpb24gMTcyMDM0KQorKysgU291cmNlL1dURi9XVEYudmN4cHJvai9XVEZHZW5lcmF0ZWQubWFr
ZQkod29ya2luZyBjb3B5KQpAQCAtMiw3ICsyLDcgQEAgYWxsOiBXVEZIZWFkZXJEZXRlY3Rpb24u
aAogICAgIHRvdWNoICIlQ29uZmlndXJhdGlvbkJ1aWxkRGlyJVxidWlsZGZhaWxlZCIKICAgICBw
ZXJsIGJ1aWxkLWdlbmVyYXRlZC1maWxlcy5wbCAiJUNvbmZpZ3VyYXRpb25CdWlsZERpciUiICIk
KFdFQktJVF9MSUJSQVJJRVMpIiAiJChERUJVR1NVRkZJWCkiICIlUGxhdGZvcm1BcmNoaXRlY3R1
cmUlIgogIUlGICIkKE9GRklDSUFMX0JVSUxEKSIhPSIxIgotICAgIHB5dGhvbiB3b3JrLWFyb3Vu
ZC12cy1kZXBlbmRlbmN5LXRyYWNraW5nLWJ1Z3MucHkKKyAgICBiYXNoIC1jICIvdXNyL2Jpbi9w
eXRob24gd29yay1hcm91bmQtdnMtZGVwZW5kZW5jeS10cmFja2luZy1idWdzLnB5IgogIUVORElG
CiAgICAgY29weS1maWxlcy5jbWQKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>236119</attachid>
            <date>2014-08-06 11:14:18 -0700</date>
            <delta_ts>2014-08-06 11:49:13 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-135613-20140806201356.patch</filename>
            <type>text/plain</type>
            <size>1655</size>
            <attacher>peavo</attacher>
            
              <data encoding="base64">SW5kZXg6IFdlYnNpdGVzL3dlYmtpdC5vcmcvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNp
dGVzL3dlYmtpdC5vcmcvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNzIxNTUpCisrKyBXZWJzaXRlcy93
ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE0
LTA4LTA2ICBwZWF2b0BvdXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgorCisgICAgICAg
IFtXaW5dIEJ1aWxkIGVycm9yIHdoZW4gT0ZGSUNJQUxfQlVJTEQgIT0gMS4KKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTYxMworCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIHB5dGhvbiBpbnN0YWxs
YXRpb24gYXMgYSByZXF1aXJlZCBzdGVwIGJlZm9yZSBidWlsZGluZyBvbiBXaW5kb3dzLgorCisg
ICAgICAgICogYnVpbGRpbmcvdG9vbHMuaHRtbDoKKwogMjAxNC0wNy0yNCAgQmVtIEpvbmVzLUJl
eSAgPGJqb25lc2JlQGFkb2JlLmNvbT4KIAogICAgICAgICBDb21taXR0ZXJzIHNob3VsZCBtYWls
IHdlYmtpdC1jb21taXR0ZXJzIG5vdCB3ZWJraXQtcmV2aWV3ZXJzIGZvciByZWFjdGl2YXRpb24K
SW5kZXg6IFdlYnNpdGVzL3dlYmtpdC5vcmcvYnVpbGRpbmcvdG9vbHMuaHRtbAo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBXZWJzaXRlcy93ZWJraXQub3JnL2J1aWxkaW5nL3Rvb2xzLmh0bWwJKHJldmlzaW9uIDE3
MjE0OSkKKysrIFdlYnNpdGVzL3dlYmtpdC5vcmcvYnVpbGRpbmcvdG9vbHMuaHRtbAkod29ya2lu
ZyBjb3B5KQpAQCAtNjEsNiArNjEsOCBAQCBUaG9zZSBsaW5lcyB3b3VsZCBwcmV2ZW50IHBpY2tp
bmcgdXAgdGhlCiA8bGk+RWRpdCB0aGUgZmlsZSBtZW50aW9uZWQgYWJvdmUgYW5kIGZvbGxvdyB0
aGUgaW5zdHJ1Y3Rpb25zIGluIHRoZSBmaWxlIHRvIHNldCB1cCB5b3VyIHByb3h5IHNldHRpbmdz
LjwvbGk+PC91bD48L3A+CiA8bGk+PHA+SW5zdGFsbCBEaXJlY3RYIFNESzwvcD4KIDxwPkRvd25s
b2FkIHRoZSA8YSBocmVmPSJodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vZW4tdXMvZG93bmxvYWQv
ZGV0YWlscy5hc3B4P2lkPTY4MTIiPkp1bmUgMjAxMCBEaXJlY3RYIFNESzwvYT4gIFRoaXMgaXMg
bmVlZGVkIGZvciBhY2NlbGVyYXRlZCBjb21wb3NpdGluZy48L3A+PC9saT4KKzxsaT48cD5JbnN0
YWxsIFB5dGhvbjwvcD4KKzxwPkRvd25sb2FkIFB5dGhvbiAyLjcuOCBmcm9tIDxhIGhyZWY9Imh0
dHA6Ly93d3cucHl0aG9uLm9yZyI+d3d3LnB5dGhvbi5vcmc8L2E+LiBXaGVuIGRvbmUgaW5zdGFs
bGluZywgcmVtZW1iZXIgdG8gYWRkIHRoZSBmb2xkZXIgb2YgdGhlIHB5dGhvbiBleGVjdXRhYmxl
IHRvIHlvdXIgUEFUSCBlbnZpcm9ubWVudCB2YXJpYWJsZS48L3A+PC9saT4KIDxsaT48cD5JbnN0
YWxsIHBocCwgd2UgdXNlIHRoZSBmb2xsb3dpbmcgc3RlcHMgKHlvdSBuZWVkIHRoaXMgdG8gcnVu
IGh0dHAgbGF5b3V0IHRlc3RzKTo8L3A+CiA8b2w+CiA8bGk+Y2QgL3Vzci9sb2NhbC9iaW48L2xp
Pgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>