com php-src: use https for fetching the pear installer: makedist pear/Makefile.frag

Commit: f3ad61126d3a2336bff4f8c80671f40be4aea2a4 Author: Ferenc Kovacs <tyrael@php.net> Tue, 28 Jul 2015 01:46:38 +0200 Parents: 9aa47d914c13089922e5001886ebcfad62b72090 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f3ad61126d3a2336bff4f8c80671f40be4aea2a4 Log: use https for fetching the pear installer Changed paths: M makedist M pear/Makefile.frag Diff: diff --git a/makedist b/makedist index 39cf5a4..ad9e083 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 http://pear.php.net/~cweiske/1.10.0dev1/install-pear-nozlib.phar -nd -P pear/ + wget https://pear.php.net/~cweiske/1.10.0dev1/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 1ef3cf2..d5ad7b4 100644 --- a/pear/Makefile.frag +++ b/pear/Makefile.frag @@ -9,6 +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 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} @@ -20,11 +21,11 @@ install-pear: cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \ else \ if test ! -z "$(WGET)" && test -x "$(WGET)"; then \ - "$(WGET)" http://pear.php.net/~cweiske/1.10.0dev1/install-pear-nozlib.phar -nd -P $(builddir)/; \ + "$(WGET)" "${PEAR_INSTALLER_URL}" -nd -P $(builddir)/; \ elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \ - "$(FETCH)" -o $(builddir)/ http://pear.php.net/~cweiske/1.10.0dev1/install-pear-nozlib.phar; \ + "$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \ else \ - $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php http://pear.php.net/~cweiske/1.10.0dev1/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \ + $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \ fi \ fi \ fi