cellog Thu, 23 Jul 2009 15:48:04 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=284652
Log: fix php bug #48783: make install will fail saying phar file exists Bug: http://bugs.php.net/48783 (Open) make install will fail saying phar file exists Changed paths: U pecl/phar/trunk/Makefile.frag U pecl/phar/trunk/package.php U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag U php/php-src/trunk/ext/phar/Makefile.frag Modified: pecl/phar/trunk/Makefile.frag =================================================================== --- pecl/phar/trunk/Makefile.frag 2009-07-23 15:40:10 UTC (rev 284651) +++ pecl/phar/trunk/Makefile.frag 2009-07-23 15:48:04 UTC (rev 284652) @@ -43,4 +43,5 @@ install-pharcmd: pharcmd -...@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir) + -...@rm -f $(INSTALL_ROOT)$(bindir)/phar $(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar Modified: pecl/phar/trunk/package.php =================================================================== --- pecl/phar/trunk/package.php 2009-07-23 15:40:10 UTC (rev 284651) +++ pecl/phar/trunk/package.php 2009-07-23 15:48:04 UTC (rev 284652) @@ -48,6 +48,7 @@ getSignature() call fixed PHP Bug #49020: phar misinterprets ustar long filename standard fixed PHP Bug #49018: phar tar stores long filenames with prefix/name reversed + fixed PHP Bug #48783: make install will fail saying phar file exists fixed PHP Bug #48740: PHAR install fails when INSTALL_ROOT is not the final install location fixed PHP Bug #48681: openssl signature verification for tar archives broken fixed isset() on sub-directories (isset("blah") if file "blah/foo.php" exists) Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-07-23 15:40:10 UTC (rev 284651) +++ php/php-src/branches/PHP_5_3/NEWS 2009-07-23 15:48:04 UTC (rev 284652) @@ -28,6 +28,7 @@ - Fixed bug #48802 (printf() returns incorrect outputted length). (Jani) - Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked directories). (Ilia) +- Fixed bug #48783 (make install will fail saying phar file exists). (Greg) - Fixed bug #48771 (rename() between volumes fails and reports no error on Windows). (Pierre) - Fixed bug #48763 (ZipArchive produces corrupt archive). (dani dot church at Modified: php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag 2009-07-23 15:40:10 UTC (rev 284651) +++ php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag 2009-07-23 15:48:04 UTC (rev 284652) @@ -43,4 +43,5 @@ install-pharcmd: pharcmd -...@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir) + -...@rm -f $(INSTALL_ROOT)$(bindir)/phar $(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar Modified: php/php-src/trunk/ext/phar/Makefile.frag =================================================================== --- php/php-src/trunk/ext/phar/Makefile.frag 2009-07-23 15:40:10 UTC (rev 284651) +++ php/php-src/trunk/ext/phar/Makefile.frag 2009-07-23 15:48:04 UTC (rev 284652) @@ -43,4 +43,5 @@ install-pharcmd: pharcmd -...@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir) + -...@rm -f $(INSTALL_ROOT)$(bindir)/phar $(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
