cellog                                   Thu, 23 Jul 2009 15:40:10 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=284651

Log:
fix PHP bug #48740: PHAR install fails when INSTALL_ROOT is not the final 
install location

Bug: http://bugs.php.net/48740 (unknown) 
      
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:16:08 UTC (rev 284650)
+++ pecl/phar/trunk/Makefile.frag       2009-07-23 15:40:10 UTC (rev 284651)
@@ -43,4 +43,4 @@
 install-pharcmd: pharcmd
        -...@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
        $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
-       $(LN_S) -f $(INSTALL_ROOT)$(bindir)/phar.phar 
$(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:16:08 UTC (rev 284650)
+++ pecl/phar/trunk/package.php 2009-07-23 15:40:10 UTC (rev 284651)
@@ -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 #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)
 Changes since 2.0.0RC1:

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2009-07-23 15:16:08 UTC (rev 284650)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-07-23 15:40:10 UTC (rev 284651)
@@ -33,6 +33,8 @@
 - Fixed bug #48763 (ZipArchive produces corrupt archive). (dani dot church at
   gmail dot com, Pierre)
 - Fixed bug #48757 (ReflectionFunction::invoke() parameter issues). (Kalle)
+- Fixed bug #48740 (PHAR install fails when INSTALL_ROOT is not the final 
install
+  location). (james dot cohen at digitalwindow dot com, Greg)
 - Fixed bug #48733 (CURLOPT_WRITEHEADER|CURLOPT_FILE|CURLOPT_STDERR warns on
   files that have been opened with r+). (Ilia)
 - Fixed bug #48718 (FILTER_VALIDATE_EMAIL does not allow numbers in domain

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:16:08 UTC 
(rev 284650)
+++ php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag 2009-07-23 15:40:10 UTC 
(rev 284651)
@@ -43,4 +43,4 @@
 install-pharcmd: pharcmd
        -...@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
        $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
-       $(LN_S) -f $(INSTALL_ROOT)$(bindir)/phar.phar 
$(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:16:08 UTC (rev 
284650)
+++ php/php-src/trunk/ext/phar/Makefile.frag    2009-07-23 15:40:10 UTC (rev 
284651)
@@ -43,4 +43,4 @@
 install-pharcmd: pharcmd
        -...@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
        $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
-       $(LN_S) -f $(INSTALL_ROOT)$(bindir)/phar.phar 
$(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

Reply via email to