php-pear-OLE-git.patch

   1 diff -urN OLE-1.0.0RC2.org/OLE/ChainedBlockStream.php OLE-1.0.0RC2/OLE/ChainedBlockStream.php
   2 --- OLE-1.0.0RC2.org/OLE/ChainedBlockStream.php 2012-01-26 02:28:26.000000000 +0100
   3 +++ OLE-1.0.0RC2/OLE/ChainedBlockStream.php     2014-06-18 11:44:19.000000000 +0200
   4 @@ -17,7 +17,7 @@
   5   * @package    OLE
   6   * @author     Christian Schmidt <schmidt@php.net>
   7   * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
   8 - * @version    CVS: $Id: ChainedBlockStream.php 322771 2012-01-26 01:24:20Z clockwerx $
   9 + * @version    CVS: $Id$
  10   * @link       http://pear.php.net/package/OLE
  11   * @since      File available since Release 0.6.0
  12   */
  13 diff -urN OLE-1.0.0RC2.org/OLE/PPS/File.php OLE-1.0.0RC2/OLE/PPS/File.php
  14 --- OLE-1.0.0RC2.org/OLE/PPS/File.php   2012-01-26 02:28:26.000000000 +0100
  15 +++ OLE-1.0.0RC2/OLE/PPS/File.php       2014-06-18 11:44:19.000000000 +0200
  16 @@ -17,7 +17,7 @@
  17  // | Based on OLE::Storage_Lite by Kawai, Takanori                        |
  18  // +----------------------------------------------------------------------+
  19  //
  20 -// $Id: File.php 252097 2008-02-02 21:00:37Z schmidt $
  21 +// $Id$
  22
  23
  24  require_once 'OLE/PPS.php';
  25 @@ -47,7 +47,8 @@
  26      */
  27      function OLE_PPS_File($name)
  28      {
  29 -        $this->_tmp_dir = System::tmpdir();
  30 +        $system = new System();
  31 +        $this->_tmp_dir = $system->tmpdir();
  32          $this->OLE_PPS(
  33              null,
  34              $name,
  35 diff -urN OLE-1.0.0RC2.org/OLE/PPS/Root.php OLE-1.0.0RC2/OLE/PPS/Root.php
  36 --- OLE-1.0.0RC2.org/OLE/PPS/Root.php   2012-01-26 02:28:26.000000000 +0100
  37 +++ OLE-1.0.0RC2/OLE/PPS/Root.php       2014-06-18 11:44:19.000000000 +0200
  38 @@ -17,7 +17,7 @@
  39  // | Based on OLE::Storage_Lite by Kawai, Takanori                        |
  40  // +----------------------------------------------------------------------+
  41  //
  42 -// $Id: Root.php 322720 2012-01-25 12:56:57Z clockwerx $
  43 +// $Id$
  44
  45
  46  require_once 'OLE/PPS.php';
  47 @@ -53,7 +53,8 @@
  48      */
  49      function OLE_PPS_Root($time_1st, $time_2nd, $raChild)
  50      {
  51 -        $this->_tmp_dir = System::tmpdir();
  52 +        $system = new System();
  53 +        $this->_tmp_dir = $system->tmpdir();
  54          $this->OLE_PPS(
  55             null,
  56             OLE::Asc2Ucs('Root Entry'),
  57 @@ -620,7 +621,7 @@
  58        else
  59          fwrite($FILE, pack("V", -2));
  60
  61 -      fwrite($FILE, pack("V", 1));
  62 +      fwrite($FILE, pack("V", $num_sb_blocks));
  63
  64        // Extra BDList Start, Count
  65        if($bbd_info["blockchain_list_entries"] < $bbd_info["header_blockchain_list_entries"])
  66 diff -urN OLE-1.0.0RC2.org/OLE/PPS.php OLE-1.0.0RC2/OLE/PPS.php
  67 --- OLE-1.0.0RC2.org/OLE/PPS.php        2012-01-26 02:28:26.000000000 +0100
  68 +++ OLE-1.0.0RC2/OLE/PPS.php    2014-06-18 11:44:19.000000000 +0200
  69 @@ -17,7 +17,7 @@
  70  // | Based on OLE::Storage_Lite by Kawai, Takanori                        |
  71  // +----------------------------------------------------------------------+
  72  //
  73 -// $Id: PPS.php 322771 2012-01-26 01:24:20Z clockwerx $
  74 +// $Id$
  75
  76
  77  require_once 'PEAR.php';
  78 diff -urN OLE-1.0.0RC2.org/OLE.php OLE-1.0.0RC2/OLE.php
  79 --- OLE-1.0.0RC2.org/OLE.php    2012-01-26 02:28:26.000000000 +0100
  80 +++ OLE-1.0.0RC2/OLE.php        2014-06-18 11:44:19.000000000 +0200
  81 @@ -17,7 +17,7 @@
  82  // | Based on OLE::Storage_Lite by Kawai, Takanori                        |
  83  // +----------------------------------------------------------------------+
  84  //
  85 -// $Id: OLE.php 260165 2008-05-23 16:33:58Z schmidt $
  86 +// $Id$
  87
  88
  89  /**
  90 @@ -475,7 +475,7 @@
  91      * @param string $ascii The ASCII string to transform
  92      * @return string The string in Unicode
  93      */
  94 -    function Asc2Ucs($ascii)
  95 +    static function Asc2Ucs($ascii)
  96      {
  97          $rawname = '';
  98          for ($i = 0; $i < strlen($ascii); $i++) {
  99 @@ -493,7 +493,7 @@
 100      * @param integer $date A timestamp
 101      * @return string The string for the OLE container
 102      */
 103 -    function LocalDate2OLE($date = null)
 104 +    static function LocalDate2OLE($date = null)
 105      {
 106          if (!isset($date)) {
 107              return "\x00\x00\x00\x00\x00\x00\x00\x00";
 108 @@ -538,7 +538,7 @@
 109      * @access public
 110      * @static
 111      */
 112 -    function OLE2LocalDate($string)
 113 +    static function OLE2LocalDate($string)
 114      {
 115          if (strlen($string) != 8) {
 116              return new PEAR_Error("Expecting 8 byte string");