pear 1.10 was released and the go-pear and install pear phars are now php7 compatible

diff --git a/makedist b/makedist
index 50cb49ed3a2608f0a466d20535a23adfe0773fc8..5b28dd88d4245bcdeb5997d00700102721bdfbfe 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -118,7 +118,7 @@ sed -i 's,^#ifndef YYTOKENTYPE,#include "zend.h"\n#ifndef YYTOKENTYPE,g' $MY_OLD
 # download pear 
 $ECHO_N "makedist: Attempting to download PEAR's phar archive"
 if test ! -x wget; then
-       wget https://pear.php.net/~cweiske/1.10.0dev2/install-pear-nozlib.phar -nd -P pear/
+       wget https://pear.php.net/install-pear-nozlib.phar -nd -P pear/
 else
        $ECHO_N "Missing wget binary needed for pear download";
        exit 7

diff --git a/pear/Makefile.frag b/pear/Makefile.frag
index 4cb7bc9d116af2cd6316989b06cb51d36dd17d3d..bbe8ec351356cec60e4634150ef904e161ea2fce 100644 (file)
--- a/pear/Makefile.frag
+++ b/pear/Makefile.frag
@@ -9,7 +9,7 @@ WGET = `which wget 2>/dev/null`
 FETCH = `which fetch 2>/dev/null`
 PEAR_PREFIX = -dp a${program_prefix}
 PEAR_SUFFIX = -ds a$(program_suffix)
-PEAR_INSTALLER_URL = https://pear.php.net/~cweiske/1.10.0dev2/install-pear-nozlib.phar
+PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
 
 install-pear-installer: $(SAPI_CLI_PATH)
        @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}

diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
index c37939896c9f5aebcca8acd9baa1fdcff9b0e87f..ca99b0dba9cadea8004d4c3195690c2a808d8f6d 100644 (file)
--- a/win32/build/mkdist.php
+++ b/win32/build/mkdist.php
@@ -498,7 +498,7 @@ if (!$use_pear_template) {
 
        /* grab the bootstrap script */
        echo "Downloading go-pear\n";
-       copy("https://pear.php.net/~cweiske/1.10.0dev2/go-pear.phar", "$dist_dir/PEAR/go-pear.php");
+       copy("https://pear.php.net/go-pear.phar", "$dist_dir/PEAR/go-pear.php");
 
        /* import the package list -- sets $packages variable */
        include "pear/go-pear-list.php";