- Prepare for release

2 files changed, 163 insertions, 132 deletions

diff --git a/ext/phar/package.php b/ext/phar/package.php
index 8620b693d7..38931d381a 100644
--- a/ext/phar/package.php
+++ b/ext/phar/package.php
@@ -1,13 +1,8 @@
 <?php
 
 $notes = '
- * implement ability connect a phar file \'phar://whatever\' to a directory. That way all
-   access to that phar archive are directed to the extracted directory. This
-   allows to have the installed files and the archieve keep the same includes.
+ * Fix return value of unlink() and rename() when used for phar archievs.
    [Marcus]
- * implement SHA-2 (256, 512) support [Marcus]
- * implement setSignatureAlgorithm() and Phar::MD5 Phar::SHA1 Phar::SHA256 Phar::SHA512 Phar::PGP to
-   choose the kind of signature to use (PGP falls back to SHA1) [Greg]
 ';
 
 if (!class_exists("Phar") && !extension_loaded("Phar")) {
@@ -50,7 +45,6 @@ $package->setPearInstallerDep('1.4.3');
 $package->addPackageDepWithChannel('optional', 'bz2', 'pecl.php.net', false, false, false, false, 'bz2');
 // all this false business sets the <providesextension> tag that allows us to have hash built
 // in statically
-$package->addPackageDepWithChannel('optional', 'hash', 'pecl.php.net', false, false, false, false, 'hash');
 $package->addExtensionDep('optional', 'spl');
 $package->addExtensionDep('optional', 'zlib');
 $package->setPackageType('extsrc');
diff --git a/ext/phar/package.xml b/ext/phar/package.xml
index 18b4661792..e0aab1e13f 100644
--- a/ext/phar/package.xml
+++ b/ext/phar/package.xml
@@ -1,26 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-http://pear.php.net/dtd/tasks-1.0.xsd
-http://pear.php.net/dtd/package-2.0
-http://pear.php.net/dtd/package-2.0.xsd">
+<package packagerversion="1.4.11" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
  <name>phar</name>
  <channel>pecl.php.net</channel>
  <summary>allows running of complete applications out of .phar files (like Java .jar files)</summary>
- <description>
-This is the extension version of PEAR's PHP_Archive package. Support for
+ <description>This is the extension version of PEAR&apos;s PHP_Archive package. Support for
 zlib, bz2 and crc32 is achieved without any dependency other than the external
 zlib or bz2 extension.
 
 .phar files can be read using the phar stream, or with the Phar class.  If the SPL extension
-is available, a Phar object can be used as an array to iterate over a phar's contents
+is available, a Phar object can be used as an array to iterate over a phar&apos;s contents
 or to read files directly from the phar.
 
 Phar archives can be created using the streams API or with the Phar class, if
 the phar.readonly ini variable is set to false.
 
 Full support for MD5 and SHA1 signatures is possible. Signatures can be required 
-if the ini variable phar.require_hash is set to true.
- </description>
+if the ini variable phar.require_hash is set to true.</description>
  <lead>
   <name>Greg Beaver</name>
   <user>cellog</user>
@@ -33,129 +28,131 @@ if the ini variable phar.require_hash is set to true.
   <email>helly@php.net</email>
   <active>yes</active>
  </lead>
- <date>2007-03-22</date>
+ <date>2007-03-27</date>
+ <time>21:53:42</time>
  <version>
   <release>1.0.0</release>
   <api>1.0.0</api>
  </version>
  <stability>
-  <release>stable</release>
-  <api>stable</api>
+  <release>beta</release>
+  <api>beta</api>
  </stability>
  <license uri="http://www.php.net/license">PHP License</license>
  <notes>
-  *BACKWARDS COMPATIBILITY BREAK*
-  Rename Phar-&gt;begin/isFlushingToPhar/commit to startBuffering/isBuffering/stopBuffering
-  Note that isBuffering() returns the opposite value to isFlushingToPhar()
+
+ * Fix return value of unlink() and rename() when used for phar archievs.
+   [Marcus]
+
  </notes>
  <contents>
-  <dir name="/">
+  <dir baseinstalldir="/" name="/">
    <dir name="tests">
-    <file name="001.phpt" role="test"/>
-    <file name="002.phpt" role="test"/>
-    <file name="003.phpt" role="test"/>
-    <file name="003a.phpt" role="test"/>
-    <file name="004.phpt" role="test"/>
-    <file name="005.phpt" role="test"/>
-    <file name="006.phpt" role="test"/>
-    <file name="007.phpt" role="test"/>
-    <file name="008.phpt" role="test"/>
-    <file name="009.phpt" role="test"/>
-    <file name="010.phpt" role="test"/>
-    <file name="011.phpt" role="test"/>
-    <file name="012.phpt" role="test"/>
-    <file name="013.phpt" role="test"/>
-    <file name="014.phpt" role="test"/>
-    <file name="015.phpt" role="test"/>
-    <file name="015b.phpt" role="test"/>
-    <file name="016.phpt" role="test"/>
-    <file name="016b.phpt" role="test"/>
-    <file name="017.phpt" role="test"/>
-    <file name="018.phpt" role="test"/>
-    <file name="019.phpt" role="test"/>
-    <file name="019b.phpt" role="test"/>
-    <file name="019c.phpt" role="test"/>
-    <file name="020.phpt" role="test"/>
-    <file name="021.phpt" role="test"/>
-    <file name="022.phpt" role="test"/>
-    <file name="023.phpt" role="test"/>
-    <file name="024.phpt" role="test"/>
-    <file name="025.phpt" role="test"/>
-    <file name="026.phpt" role="test"/>
-    <file name="027.phpt" role="test"/>
-    <file name="028.phpt" role="test"/>
-    <file name="029.phpt" role="test"/>
-    <file name="030.phpt" role="test"/>
-    <file name="031.phpt" role="test"/>
-    <file name="032.phpt" role="test"/>
-    <file name="033.phpt" role="test"/>
-    <file name="033a.phpt" role="test"/>
-    <file name="create_new_and_modify.phpt" role="test"/>
-    <file name="create_new_phar.phpt" role="test"/>
-    <file name="create_new_phar_b.phpt" role="test"/>
-    <file name="create_new_phar_c.phpt" role="test"/>
-    <file name="create_path_error.phpt" role="test"/>
-    <file name="delete_in_phar.phpt" role="test"/>
-    <file name="delete_in_phar_b.phpt" role="test"/>
-    <file name="delete_in_phar_confirm.phpt" role="test"/>
-    <file name="ini_set.phpt" role="test"/>
-    <file name="ini_set_off.phpt" role="test"/>
-    <file name="metadata_read.phpt" role="test"/>
-    <file name="metadata_write.phpt" role="test"/>
-    <file name="open_for_write_existing.phpt" role="test"/>
-    <file name="open_for_write_existing_b.phpt" role="test"/>
-    <file name="open_for_write_existing_c.phpt" role="test"/>
-    <file name="open_for_write_newfile.phpt" role="test"/>
-    <file name="open_for_write_newfile_b.phpt" role="test"/>
-    <file name="open_for_write_newfile_c.phpt" role="test"/>
-    <file name="phar_begin_setstub_commit.phpt" role="test"/>
-    <file name="phar_commitwrite.phpt" role="test"/>
-    <file name="phar_create_in_cwd.phpt" role="test"/>
-    <file name="phar_ctx_001.phpt" role="test"/>
-    <file name="phar_metadata_read.phpt" role="test"/>
-    <file name="phar_metadata_write.phpt" role="test"/>
-    <file name="phar_oo_001.phpt" role="test"/>
-    <file name="phar_oo_002.phpt" role="test"/>
-    <file name="phar_oo_003.phpt" role="test"/>
-    <file name="phar_oo_004.phpt" role="test"/>
-    <file name="phar_oo_005.phpt" role="test"/>
-    <file name="phar_oo_006.phpt" role="test"/>
-    <file name="phar_oo_007.phpt" role="test"/>
-    <file name="phar_oo_008.phpt" role="test"/>
-    <file name="phar_oo_009.phpt" role="test"/>
-    <file name="phar_oo_010.phpt" role="test"/>
-    <file name="phar_oo_011.phpt" role="test"/>
-    <file name="phar_oo_011b.phpt" role="test"/>
-    <file name="phar_oo_012.phpt" role="test"/>
-    <file name="phar_oo_012b.phpt" role="test"/>
-    <file name="phar_oo_012_confirm.phpt" role="test"/>
-    <file name="phar_oo_compressallbz2.phpt" role="test"/>
-    <file name="phar_oo_compressallgz.phpt" role="test"/>
-    <file name="phar_oo_compressed_001.phpt" role="test"/>
-    <file name="phar_oo_compressed_001b.phpt" role="test"/>
-    <file name="phar_oo_compressed_002.phpt" role="test"/>
-    <file name="phar_oo_compressed_002b.phpt" role="test"/>
-    <file name="phar_oo_test.inc" role="test"/>
-    <file name="phar_oo_uncompressall.phpt" role="test"/>
-    <file name="phar_stub.phpt" role="test"/>
-    <file name="phar_stub_write.phpt" role="test"/>
-    <file name="phar_test.inc" role="test"/>
-    <file name="refcount1.phpt" role="test"/>
-    <file name="rename.phpt" role="test"/>
-   </dir> <!-- /tests -->
-   <file name="LICENSE" role="doc"/>
-   <file name="config.m4" role="src"/>
-   <file name="config.w32" role="src"/>
-   <file name="Makefile.frag" role="src"/>
-   <file name="CREDITS" role="doc"/>
-   <file name="TODO" role="doc"/>
-   <file name="EXPERIMENTAL" role="src"/>
-   <file name="phar.c" role="src"/>
-   <file name="phar_object.c" role="src"/>
-   <file name="php_phar.h" role="src"/>
-   <file name="phar_internal.h" role="src"/>
-   <file name="phar_path_check.c" role="src"/>
-   <file name="phar_path_check.re" role="src"/>
+    <file name="001.phpt" role="test" />
+    <file name="002.phpt" role="test" />
+    <file name="003.phpt" role="test" />
+    <file name="003a.phpt" role="test" />
+    <file name="004.phpt" role="test" />
+    <file name="005.phpt" role="test" />
+    <file name="006.phpt" role="test" />
+    <file name="007.phpt" role="test" />
+    <file name="008.phpt" role="test" />
+    <file name="009.phpt" role="test" />
+    <file name="010.phpt" role="test" />
+    <file name="011.phpt" role="test" />
+    <file name="012.phpt" role="test" />
+    <file name="013.phpt" role="test" />
+    <file name="014.phpt" role="test" />
+    <file name="015.phpt" role="test" />
+    <file name="015b.phpt" role="test" />
+    <file name="016.phpt" role="test" />
+    <file name="016b.phpt" role="test" />
+    <file name="017.phpt" role="test" />
+    <file name="018.phpt" role="test" />
+    <file name="019.phpt" role="test" />
+    <file name="019b.phpt" role="test" />
+    <file name="019c.phpt" role="test" />
+    <file name="020.phpt" role="test" />
+    <file name="021.phpt" role="test" />
+    <file name="022.phpt" role="test" />
+    <file name="023.phpt" role="test" />
+    <file name="024.phpt" role="test" />
+    <file name="025.phpt" role="test" />
+    <file name="026.phpt" role="test" />
+    <file name="027.phpt" role="test" />
+    <file name="028.phpt" role="test" />
+    <file name="029.phpt" role="test" />
+    <file name="030.phpt" role="test" />
+    <file name="031.phpt" role="test" />
+    <file name="032.phpt" role="test" />
+    <file name="033.phpt" role="test" />
+    <file name="033a.phpt" role="test" />
+    <file name="create_new_and_modify.phpt" role="test" />
+    <file name="create_new_phar.phpt" role="test" />
+    <file name="create_new_phar_b.phpt" role="test" />
+    <file name="create_new_phar_c.phpt" role="test" />
+    <file name="create_path_error.phpt" role="test" />
+    <file name="delete_in_phar.phpt" role="test" />
+    <file name="delete_in_phar_b.phpt" role="test" />
+    <file name="delete_in_phar_confirm.phpt" role="test" />
+    <file name="ini_set.phpt" role="test" />
+    <file name="ini_set_off.phpt" role="test" />
+    <file name="metadata_read.phpt" role="test" />
+    <file name="metadata_write.phpt" role="test" />
+    <file name="open_for_write_existing.phpt" role="test" />
+    <file name="open_for_write_existing_b.phpt" role="test" />
+    <file name="open_for_write_existing_c.phpt" role="test" />
+    <file name="open_for_write_newfile.phpt" role="test" />
+    <file name="open_for_write_newfile_b.phpt" role="test" />
+    <file name="open_for_write_newfile_c.phpt" role="test" />
+    <file name="phar_begin_setstub_commit.phpt" role="test" />
+    <file name="phar_commitwrite.phpt" role="test" />
+    <file name="phar_create_in_cwd.phpt" role="test" />
+    <file name="phar_ctx_001.phpt" role="test" />
+    <file name="phar_metadata_read.phpt" role="test" />
+    <file name="phar_metadata_write.phpt" role="test" />
+    <file name="phar_oo_001.phpt" role="test" />
+    <file name="phar_oo_002.phpt" role="test" />
+    <file name="phar_oo_003.phpt" role="test" />
+    <file name="phar_oo_004.phpt" role="test" />
+    <file name="phar_oo_005.phpt" role="test" />
+    <file name="phar_oo_006.phpt" role="test" />
+    <file name="phar_oo_007.phpt" role="test" />
+    <file name="phar_oo_008.phpt" role="test" />
+    <file name="phar_oo_009.phpt" role="test" />
+    <file name="phar_oo_010.phpt" role="test" />
+    <file name="phar_oo_011.phpt" role="test" />
+    <file name="phar_oo_011b.phpt" role="test" />
+    <file name="phar_oo_012.phpt" role="test" />
+    <file name="phar_oo_012b.phpt" role="test" />
+    <file name="phar_oo_012_confirm.phpt" role="test" />
+    <file name="phar_oo_compressallbz2.phpt" role="test" />
+    <file name="phar_oo_compressallgz.phpt" role="test" />
+    <file name="phar_oo_compressed_001.phpt" role="test" />
+    <file name="phar_oo_compressed_001b.phpt" role="test" />
+    <file name="phar_oo_compressed_002.phpt" role="test" />
+    <file name="phar_oo_compressed_002b.phpt" role="test" />
+    <file name="phar_oo_test.inc" role="test" />
+    <file name="phar_oo_uncompressall.phpt" role="test" />
+    <file name="phar_stub.phpt" role="test" />
+    <file name="phar_stub_write.phpt" role="test" />
+    <file name="phar_test.inc" role="test" />
+    <file name="refcount1.phpt" role="test" />
+    <file name="rename.phpt" role="test" />
+   </dir> <!-- //tests -->
+   <file name="config.m4" role="src" />
+   <file name="config.w32" role="src" />
+   <file name="CREDITS" role="doc" />
+   <file name="EXPERIMENTAL" role="doc" />
+   <file name="LICENSE" role="doc" />
+   <file name="Makefile.frag" role="src" />
+   <file name="phar.c" role="src" />
+   <file name="phar_internal.h" role="src" />
+   <file name="phar_object.c" role="src" />
+   <file name="phar_path_check.c" role="src" />
+   <file name="phar_path_check.re" role="src" />
+   <file name="php_phar.h" role="src" />
+   <file name="TODO" role="doc" />
   </dir> <!-- / -->
  </contents>
  <dependencies>
@@ -174,13 +171,53 @@ if the ini variable phar.require_hash is set to true.
     <providesextension>bz2</providesextension>
    </package>
    <extension>
-    <name>zlib</name>
+    <name>spl</name>
    </extension>
    <extension>
-    <name>spl</name>
+    <name>zlib</name>
    </extension>
   </optional>
  </dependencies>
  <providesextension>phar</providesextension>
- <extsrcrelease/>
-</package>
\ No newline at end of file
+ <extsrcrelease />
+ <changelog>
+  <release>
+   <version>
+    <release>1.1.0RC1</release>
+    <api>1.1.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2007-03-26</date>
+   <license uri="http://www.php.net/license">PHP License</license>
+   <notes>
+
+ * implement ability connect a phar file &apos;phar://whatever&apos; to a directory. That way all
+   access to that phar archive are directed to the extracted directory. This
+   allows to have the installed files and the archieve keep the same includes.
+   [Marcus]
+ * implement SHA-2 (256, 512) support [Marcus]
+ * implement setSignatureAlgorithm() and Phar::MD5 Phar::SHA1 Phar::SHA256 Phar::SHA512 Phar::PGP to
+   choose the kind of signature to use (PGP falls back to SHA1) [Greg]
+
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.0.0</release>
+    <api>1.0.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2007-03-26</date>
+   <license uri="http://www.php.net/license">PHP License</license>
+   <notes>*BACKWARDS COMPATIBILITY BREAK*
+Rename Phar-&gt;begin/isFlushingToPhar/commit to startBuffering/isBuffering/stopBuffering
+Note that isBuffering() returns the opposite value to isFlushingToPhar()</notes>
+  </release>
+ </changelog>
+</package>