Merge branch 'default' into libonig

Author: BanzaiMan

.travis.yml

@@ -86,8 +86,13 @@ install:
 - git pull
 - popd
 - if [[ $RELEASE != precise ]]; then unset ICU_RELEASE; fi # disable ICU installation for Trusty; see https://github.com/travis-ci/travis-ci/issues/3616#issuecomment-286302387
-- export PKG_CONFIG_PATH=$PWD:$PKG_CONFIG_PATH # older distros may not have necessary pkg-config files
+- | # older distros don't ship a libjpeg.pc, add our own to pkg-config path
+  if ! pkg-config --exists libjpeg; then
+    export PKG_CONFIG_PATH=$PWD:$PKG_CONFIG_PATH
+  fi
 - ./bin/install-icu
+- export PKG_CONFIG_PATH=$ICU_INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
+- touch custom_configure_options
 - ./bin/install-libzip
 - ./bin/install-libsodium
 - ./bin/install-password-argon2
@@ -97,6 +102,7 @@ install:
   else
     cp default_configure_options.$RELEASE $HOME/.php-build/share/php-build/default_configure_options
   fi
+- cat custom_configure_options >> $HOME/.php-build/share/php-build/default_configure_options
 - | # disable xdebug on master
   if [[ $VERSION = master && $RELEASE != xenial ]]; then
     sed -i -e '/install_xdebug_master/d' $HOME/.php-build/share/php-build/definitions/$VERSION

bin/compile

@@ -1,19 +1,5 @@
 #!/usr/bin/env bash
 
-function fetch_pear() {
-  if [ -n $GITHUB_TOKEN ]; then
-  	auth_flag="-H 'Authorization: token $GITHUB_TOKEN'"
-  fi
-
-  latest_tag=$(curl -sSfL --retry 20 "${auth_flag}" https://api.github.com/repos/pear/pearweb_phars/releases/latest | jq -r .tag_name)
-  curl -sSfL "${auth_flag}" --retry 20 -O https://raw.githubusercontent.com/pear/pearweb_phars/${latest_tag}/go-pear.phar
-
-  if [ ! -f go-pear.phar ]; then
-  	echo "Latest PEAR tarball not found"
-  	exit 1
-  fi
-}
-
 set -o errexit
 
 if [[ ! $VERSION ]] ; then
@@ -34,13 +20,23 @@ php-build -i development "${VERSION}" "${INSTALL_DEST}/${VERSION}"
 
 pushd "${INSTALL_DEST}/${VERSION}"
 
-# pear
-fetch_pear
 
-env TZ=UTC $TRAVIS_BUILD_DIR/bin/install-pear
-rm go-pear.phar
-"$INSTALL_DEST/$VERSION/bin/pear" config-set php_ini "$INSTALL_DEST/$VERSION/etc/php.ini" system
-"$INSTALL_DEST/$VERSION/bin/pear" config-set auto_discover 1
+# update default_cert_file
+wget -O /usr/local/ssl/cert.pem https://curl.haxx.se/ca/cacert.pem
+
+
+# don't install pear on master (issue with php 8.0)
+# this could be a temp issue though
+if [[ ! $VERSION =~ ^master$ ]]; then
+  curl -fsSL --retry 20 -O http://pear.php.net/go-pear.phar
+
+  env TZ=UTC $TRAVIS_BUILD_DIR/bin/install-pear
+  rm go-pear.phar
+  "$INSTALL_DEST/$VERSION/bin/pear" config-set php_ini "$INSTALL_DEST/$VERSION/etc/php.ini" system
+  "$INSTALL_DEST/$VERSION/bin/pear" config-set auto_discover 1
+
+  "$INSTALL_DEST/$VERSION/bin/pear" channel-update pear.php.net
+fi
 
 # php-fpm
 ln -sv $PWD/sbin/php-fpm $PWD/bin/php-fpm

bin/compile-extension-apcu

@@ -11,6 +11,8 @@ else
 	apcu=apcu
 fi
 
+pecl channel-update pecl.php.net
+
 echo | pecl_install $apcu
 
 travis_time_finish

bin/compile-extension-memcache

@@ -7,7 +7,7 @@ travis_time_start
 
 if [[ ! $VERSION =~ ^7 && ! $VERSION =~ ^master$ ]]; then
 	pecl download memcache-beta
-	tar zxvf memcache*.tgz && pushd memcache*
+	tar zxvf memcache*.tgz && pushd memcache*/
 	make clean || true
 	phpize
 	./configure && make && make install

bin/compile-extension-memcached

@@ -19,11 +19,11 @@ install_memcache
 
 if [[ $VERSION =~ ^7 || $VERSION =~ ^master$ ]]; then
 	pecl download memcached-3.1.2
-	tar zxvf memcached*.tgz && pushd memcached*
+	tar zxvf memcached*.tgz && pushd memcached*/
 	make clean || true
 else
 	pecl download memcached-2.2.0
-	tar zxvf memcached*.tgz && pushd memcached*
+	tar zxvf memcached*.tgz && pushd memcached*/
 	make clean || true
 fi
 phpize

bin/install-icu

@@ -20,4 +20,7 @@ rm -rf $ICU_INSTALL_DIR
 make install
 popd
 
-echo "--with-icu-dir=$ICU_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/default_configure_options.${RELEASE}
+# PHP >= 7.4 exclusively uses pkg-config for ICU
+if [[ $VERSION =~ ^5 || $VERSION =~ 7\.[0123] ]]; then
+    echo "--with-icu-dir=$ICU_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
+fi

bin/install-libsodium

@@ -20,5 +20,5 @@ make check
 make install
 popd
 
-# add the option in default_configure_options
-echo "--with-sodium=$LIBSODIUM_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/default_configure_options.${RELEASE}
+# add the option in custom_configure_options
+echo "--with-sodium=$LIBSODIUM_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options

bin/install-libzip

@@ -20,21 +20,22 @@ pushd cmake
 #install cmake specific to host architecture.
 if [[ $HOSTTYPE == "powerpc64le" ]]
 then
-        wget -O - https://cmake.org/files/v3.12/cmake-3.12.0.tar.gz | tar -xz --strip-components=1
+        wget -O - https://cmake.org/files/v3.14/cmake-3.14.0.tar.gz | tar -xz --strip-components=1
         #compile cmake
         ./configure > /dev/null 2>&1 && make > /dev/null 2>&1 && sudo make install > /dev/null 2>&1
 else
-	wget -O - https://cmake.org/files/v3.12/cmake-3.12.3-Linux-x86_64.tar.gz | tar -xz --strip-components=1
+        wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Linux-x86_64.sh
+        sudo sh cmake-3.14.0-Linux-x86_64.sh --prefix=/usr --skip-license
 fi
 popd
 
 # compile libzip
-git clone -b rel-1-5-1 https://github.com/nih-at/libzip.git
+git clone -b rel-1-5-2 https://github.com/nih-at/libzip.git
 pushd libzip
-../cmake/bin/cmake -DCMAKE_INSTALL_PREFIX=$LIBZIP_INSTALL_DIR .
+cmake -DCMAKE_INSTALL_PREFIX=$LIBZIP_INSTALL_DIR .
 make
 make install
 popd
 
-# add the option in default_configure_options
-echo "--with-libzip=$LIBZIP_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/default_configure_options.${RELEASE}
+# add the option in custom_configure_options
+echo "--with-libzip=$LIBZIP_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options

bin/install-password-argon2

@@ -19,5 +19,5 @@ make test
 make install PREFIX=$LIBARGON2_INSTALL_DIR
 popd
 
-# add the option in default_configure_options
-echo "--with-password-argon2=$LIBARGON2_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/default_configure_options.${RELEASE}
+# add the option in custom_configure_options
+echo "--with-password-argon2=$LIBARGON2_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options

bin/install-pear

@@ -10,7 +10,7 @@ sleep .1
 send -s -- "1\r"
 
 expect -re "Installation base (.*):"
-send -s -- "/home/travis/.phpenv/versions/$env(VERSION)\r"
+send -s -- "$env(HOME)/.phpenv/versions/$env(VERSION)\r"
 
 expect -re "1-\[0-9]+, 'all' or Enter to continue:"
 sleep .1