use https for fetching the pear installer

diff --git a/makedist b/makedist
index 39cf5a42c5553e66f26ed5b4d2d9410af2b1351d..ad9e083aab60c6500d9cf6bd230dd7bbe0df6edf 100755 (executable)
--- 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 1ef3cf2864598b309324afd8dd4172d2d7f0d8c7..d5ad7b407b4e39a8a2b77ab93a32ee57f899e1fa 100644 (file)
--- 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