MFH

diff --git a/pear/Archive/Tar.php b/pear/Archive/Tar.php
index c244aafed84c791f4750ee31dfd43169144ff17e..9176083750d189b09c5099c45355359f333d62f9 100644 (file)
--- a/pear/Archive/Tar.php
+++ b/pear/Archive/Tar.php
@@ -60,10 +60,13 @@ class Archive_Tar extends PEAR
     * declare a new Archive_Tar object, identifying it by the name of the
     * tar file.
     * If the compress argument is set the tar will be read or created as a
-    * gzip compressed TAR file.
+    * gzip or bz2 compressed TAR file.
     *
     * @param    string  $p_tarname  The name of the tar archive to create
-    * @param    boolean $p_compress if true, the archive will be gezip(ped)
+    * @param    string  $p_compress can be null, 'gz' or 'bz2'. This
+    *                   parameter indicates if gzip or bz2 compression
+    *                   is required.  For compatibility reason the
+    *                   boolean value 'true' means 'gz'.
     * @access public
     */
     function Archive_Tar($p_tarname, $p_compress = null)
@@ -99,7 +102,7 @@ class Archive_Tar extends PEAR
                 }
             }
         } else {
-            if ($p_compress == 'gz') {
+            if (($p_compress == true) || ($p_compress == 'gz')) {
                 $this->_compress = true;
                 $this->_compress_type = 'gz';
             } else if ($p_compress == 'bz2') {

diff --git a/pear/PEAR/Config.php b/pear/PEAR/Config.php
index 0358d7c8a2ef594168985de05fc0ce72e165f303..82c36fad4a1d26217ff1217727a88d008909cb22 100644 (file)
--- a/pear/PEAR/Config.php
+++ b/pear/PEAR/Config.php
@@ -73,7 +73,15 @@ if (getenv('PHP_PEAR_INSTALL_DIR')) {
 if (getenv('PHP_PEAR_EXTENSION_DIR')) {
     define('PEAR_CONFIG_DEFAULT_EXT_DIR', getenv('PHP_PEAR_EXTENSION_DIR'));
 } else {
-    define('PEAR_CONFIG_DEFAULT_EXT_DIR', ini_get('extension_dir'));
+    if (!ini_get('extension_dir')) {
+        define('PEAR_CONFIG_DEFAULT_EXT_DIR', ini_get('extension_dir'));
+    } elseif (defined('PEAR_EXTENSION_DIR') && @is_dir(PEAR_EXTENSION_DIR)) {
+        define('PEAR_CONFIG_DEFAULT_EXT_DIR', PEAR_EXTENSION_DIR);
+    } elseif (defined('PHP_EXTENSION_DIR')) {
+        define('PEAR_CONFIG_DEFAULT_EXT_DIR', PHP_EXTENSION_DIR);
+    } else {
+        define('PEAR_CONFIG_DEFAULT_EXT_DIR', '.');
+    }
 }
 
 // Default for doc_dir

diff --git a/pear/package-PEAR.xml b/pear/package-PEAR.xml
index a9ec21d377305712d4d845cb3a310c637ba37fb2..f76e9d2d5cc9bc1e1ddfeae7142a7add1c3a1e9c 100644 (file)
--- a/pear/package-PEAR.xml
+++ b/pear/package-PEAR.xml
@@ -37,32 +37,18 @@
     </maintainer>
   </maintainers>
   <release>
-    <version>1.1</version>
+    <version>1.2</version>
     <state>stable</state>
     <date>2003-01-10</date>
     <notes>
-PEAR BASE CLASS:
-
-* PEAR_Error now supports exceptions when using Zend Engine 2.  Set the
-  error mode to PEAR_ERROR_EXCEPTION to make PEAR_Error throw itself
-  as an exception (invoke PEAR errors with raiseError() or throwError()
-  just like before).
-
-PEAR INSTALLER:
-
-* Packaging and validation now parses PHP source code (unless
-  ext/tokenizer is disabled) and does some coding standard conformance
-  checks.  Specifically, the names of classes and functions are
-  checked to ensure that they are prefixed with the package name.  If
-  your package has symbols that should be without this prefix, you can
-  override this warning by explicitly adding a "provides" entry in
-  your package.xml file.  See the package.xml file for this release
-  for an example (OS_Guess, System and md5_file).
-
-  All classes and non-private (not underscore-prefixed) methods and
-  functions are now registered during "pear package".
-
-</notes>
+* Changed license from PHP 2.02 to 3.0
+* Added support for optional dependencies
+* pear makerpm, now works and generates a better system independant spec file
+* pear install|build &lt;pecl-package&gt;, now exposes the compilation progress
+* Added new pear bundle command, which downloads and uncompress a &lt;pecl-package&gt;.
+The main purpouse of this command is for easily adding extensions to the PHP sources
+before compiling it.
+    </notes>
     <provides type="class" name="OS_Guess" />
     <provides type="class" name="System" />
     <provides type="function" name="md5_file" />
@@ -107,9 +93,9 @@ PEAR INSTALLER:
           <replace from="@include_path@" to="php_dir" type="pear-config"/>
         </file>
         <file role="script" platform="windows" install-as="pear.bat" name="pear.bat">
-         <replace from="@bin_dir@" to="bin_dir" type="pear-config"/>
-         <replace from="@php_bin@" to="php_bin" type="pear-config"/>
-         <replace from="@include_path@" to="php_dir" type="pear-config"/>
+        <replace from="@bin_dir@" to="bin_dir" type="pear-config"/>
+        <replace from="@php_bin@" to="php_bin" type="pear-config"/>
+        <replace from="@include_path@" to="php_dir" type="pear-config"/>
         </file>
         <file role="php" install-as="pearcmd.php" name="pearcmd.php">
           <replace from="@php_bin@" to="php_bin" type="pear-config"/>
@@ -126,6 +112,33 @@ PEAR INSTALLER:
     </deps>
   </release>
   <changelog>
+    <release>
+        <version>1.1</version>
+        <state>stable</state>
+        <date>2003-01-10</date>
+        <notes>
+PEAR BASE CLASS:
+
+* PEAR_Error now supports exceptions when using Zend Engine 2.  Set the
+  error mode to PEAR_ERROR_EXCEPTION to make PEAR_Error throw itself
+  as an exception (invoke PEAR errors with raiseError() or throwError()
+  just like before).
+
+PEAR INSTALLER:
+
+* Packaging and validation now parses PHP source code (unless
+  ext/tokenizer is disabled) and does some coding standard conformance
+  checks.  Specifically, the names of classes and functions are
+  checked to ensure that they are prefixed with the package name.  If
+  your package has symbols that should be without this prefix, you can
+  override this warning by explicitly adding a "provides" entry in
+  your package.xml file.  See the package.xml file for this release
+  for an example (OS_Guess, System and md5_file).
+
+  All classes and non-private (not underscore-prefixed) methods and
+  functions are now registered during "pear package".
+        </notes>
+    </release>
    <release>
      <version>1.0.1</version>
      <state>stable</state>
@@ -134,15 +147,15 @@ PEAR INSTALLER:
  * PEAR_Error class has call backtrace available by
    calling getBacktrace().  Available if used with
    PHP 4.3 or newer.
- 
+
  * PEAR_Config class uses getenv() rather than $_ENV
    to read environment variables.
- 
+
  * System::which() Windows fix, now looks for
    exe/bat/cmd/com suffixes rather than just exe
- 
+
  * Added "pear cvsdiff" command
- 
+
  * Windows output buffering bugfix for "pear" command
 
  * Multiple drives installation now works on windows