com php-src: pear 1.10.0dev2: makedist pear/Makefile.frag win32/build/mkdist.php

Commit: 35b61e4f4da82f1aedd8adc0f20513188ccd19ac Author: Ferenc Kovacs <tyrael@php.net> Fri, 31 Jul 2015 10:19:51 +0200 Parents: ac87657d4219111ecc52f2b6f27f5a739f0379a3 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=35b61e4f4da82f1aedd8adc0f20513188ccd19ac Log: pear 1.10.0dev2 Changed paths: M makedist M pear/Makefile.frag M win32/build/mkdist.php Diff: diff --git a/makedist b/makedist index ad9e083..3edeb2c 100755 --- a/makedist +++ b/makedist @@ -113,7 +113,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.0dev1/install-pear-nozlib.phar -nd -P pear/ + wget https://pear.php.net/~cweiske/1.10.0dev2/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 d5ad7b4..4cb7bc9 100644 --- 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.0dev1/install-pear-nozlib.phar +PEAR_INSTALLER_URL = https://pear.php.net/~cweiske/1.10.0dev2/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 7b4c057..c379398 100644 --- 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("http://pear.php.net/go-pear", "$dist_dir/PEAR/go-pear.php"); + copy("https://pear.php.net/~cweiske/1.10.0dev2/go-pear.phar", "$dist_dir/PEAR/go-pear.php"); /* import the package list -- sets $packages variable */ include "pear/go-pear-list.php";