diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e9daa3..fbf2f0e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,7 @@ jobs: phpize$ver -v php$ver -m pecl -V + curl -V env: ver: ${{ matrix.php-versions }} release: diff --git a/php-5.3/deps/curl.so b/php-5.3/deps/curl.so new file mode 100644 index 0000000..faf56d2 Binary files /dev/null and b/php-5.3/deps/curl.so differ diff --git a/php-5.3/deps/libcurl.so.3 b/php-5.3/deps/libcurl.so.3 new file mode 100644 index 0000000..7b17f9a Binary files /dev/null and b/php-5.3/deps/libcurl.so.3 differ diff --git a/php-5.3/install.sh b/php-5.3/install.sh index 20db2a1..f8451eb 100644 --- a/php-5.3/install.sh +++ b/php-5.3/install.sh @@ -1,8 +1,6 @@ -apt_install="sudo DEBIAN_FRONTEND=noninteractive apt-get install -o Dpkg::Options::=--force-conflicts -y --allow-downgrades --no-upgrade" dpkg_install="sudo DEBIAN_FRONTEND=noninteractive dpkg -i --force-conflicts" sudo mkdir -p /var/run /run/php $dpkg_install ./deps/*.deb -$apt_install libcurl3 $dpkg_install ./*.deb for tool in php5 php5-cgi php-config5 phpize5; do if [ -f /usr/bin/"$tool" ]; then diff --git a/php-5.3/php5-curl_5.3.29-1~dotdeb.0_amd64.deb b/php-5.3/php5-curl_5.3.29-1~dotdeb.0_amd64.deb deleted file mode 100644 index 8c05911..0000000 Binary files a/php-5.3/php5-curl_5.3.29-1~dotdeb.0_amd64.deb and /dev/null differ diff --git a/php-5.3/post-install.sh b/php-5.3/post-install.sh index e1e8f3b..14745aa 100644 --- a/php-5.3/post-install.sh +++ b/php-5.3/post-install.sh @@ -1,4 +1,5 @@ v=5.3 +dotdeb=http://packages.dotdeb.org for tool in php$v php-cgi$v php-config$v phpize$v; do if [ -f /usr/bin/"$tool" ]; then tool_name=${tool/[0-9]*/} @@ -7,4 +8,10 @@ for tool in php$v php-cgi$v php-config$v phpize$v; do done ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g") sudo chmod 777 "$ini_file" -echo "date.timezone=UTC" >>"$ini_file" \ No newline at end of file +echo "date.timezone=UTC" >>"$ini_file" +sudo mv ./deps/libcurl.so.3 /usr/lib/libcurl.so.3 +sudo mv ./deps/curl.so "$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")"/curl.so +echo "extension=curl.so" >>"$ini_file" +echo "deb $dotdeb squeeze all" | sudo tee /etc/apt/sources.list.d/dotdeb-ubuntu-php-"$(lsb_release -s -c)".list +curl -sSLO https://www.dotdeb.org/dotdeb.gpg +sudo apt-key add dotdeb.gpg \ No newline at end of file diff --git a/php-5.4/deps/curl.so b/php-5.4/deps/curl.so new file mode 100644 index 0000000..d72bfdd Binary files /dev/null and b/php-5.4/deps/curl.so differ diff --git a/php-5.4/deps/libcurl.so.3 b/php-5.4/deps/libcurl.so.3 new file mode 100644 index 0000000..7b17f9a Binary files /dev/null and b/php-5.4/deps/libcurl.so.3 differ diff --git a/php-5.4/install.sh b/php-5.4/install.sh index 97c4e0c..0716756 100644 --- a/php-5.4/install.sh +++ b/php-5.4/install.sh @@ -1,8 +1,6 @@ -apt_install="sudo DEBIAN_FRONTEND=noninteractive apt-get install -o Dpkg::Options::=--force-conflicts -y --allow-downgrades --no-upgrade" dpkg_install="sudo DEBIAN_FRONTEND=noninteractive dpkg -i --force-conflicts" sudo mkdir -p /var/run /run/php $dpkg_install ./deps/*.deb -$apt_install libcurl3 $dpkg_install ./*.deb for tool in php5 php5-cgi php-config5 phpize5; do if [ -f /usr/bin/"$tool" ]; then diff --git a/php-5.4/php5-curl_5.4.45-1~dotdeb+7.1_amd64.deb b/php-5.4/php5-curl_5.4.45-1~dotdeb+7.1_amd64.deb deleted file mode 100644 index 9d3e923..0000000 Binary files a/php-5.4/php5-curl_5.4.45-1~dotdeb+7.1_amd64.deb and /dev/null differ diff --git a/php-5.4/post-install.sh b/php-5.4/post-install.sh index 58a92c3..878f599 100644 --- a/php-5.4/post-install.sh +++ b/php-5.4/post-install.sh @@ -1,4 +1,5 @@ v=5.4 +dotdeb=http://packages.dotdeb.org for tool in php$v php-cgi$v php-config$v phpize$v; do if [ -f /usr/bin/"$tool" ]; then tool_name=${tool/[0-9]*/} @@ -8,5 +9,11 @@ done ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g") sudo chmod 777 "$ini_file" echo "date.timezone=UTC" >>"$ini_file" +sudo mv ./deps/libcurl.so.3 /usr/lib/libcurl.so.3 +sudo mv ./deps/curl.so "$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")"/curl.so +echo "extension=curl.so" >>"$ini_file" sudo php5enmod redis sudo php5enmod xdebug +echo "deb $dotdeb wheezy all" | sudo tee /etc/apt/sources.list.d/dotdeb-ubuntu-php-"$(lsb_release -s -c)".list +curl -sSLO https://www.dotdeb.org/dotdeb.gpg +sudo apt-key add dotdeb.gpg diff --git a/php-5.5/deps/curl.so b/php-5.5/deps/curl.so new file mode 100644 index 0000000..f29bac0 Binary files /dev/null and b/php-5.5/deps/curl.so differ diff --git a/php-5.5/deps/libcurl.so.3 b/php-5.5/deps/libcurl.so.3 new file mode 100644 index 0000000..7b17f9a Binary files /dev/null and b/php-5.5/deps/libcurl.so.3 differ diff --git a/php-5.5/install.sh b/php-5.5/install.sh index c589e73..49e2933 100644 --- a/php-5.5/install.sh +++ b/php-5.5/install.sh @@ -1,10 +1,6 @@ -apt_install="sudo DEBIAN_FRONTEND=noninteractive apt-get install -o Dpkg::Options::=--force-conflicts -y --allow-downgrades" dpkg_install="sudo DEBIAN_FRONTEND=noninteractive dpkg -i --force-conflicts" sudo mkdir -p /var/run /run/php $dpkg_install ./deps/*.deb -if [ "$(lsb_release -s -r)" = "18.04" ]; then - $apt_install libcurl3 -fi $dpkg_install ./*.deb for tool in php5 php5-cgi php-config5 phpize5; do if [ -f /usr/bin/"$tool" ]; then diff --git a/php-5.5/php5-curl_5.5.38-1~dotdeb+7.1_amd64.deb b/php-5.5/php5-curl_5.5.38-1~dotdeb+7.1_amd64.deb deleted file mode 100644 index cf3c2e8..0000000 Binary files a/php-5.5/php5-curl_5.5.38-1~dotdeb+7.1_amd64.deb and /dev/null differ diff --git a/php-5.5/post-install.sh b/php-5.5/post-install.sh index b3491fe..8de6bcc 100644 --- a/php-5.5/post-install.sh +++ b/php-5.5/post-install.sh @@ -1,4 +1,5 @@ v=5.5 +dotdeb=http://packages.dotdeb.org for tool in php$v php-cgi$v php-config$v phpize$v; do if [ -f /usr/bin/"$tool" ]; then tool_name=${tool/[0-9]*/} @@ -8,5 +9,11 @@ done ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g") sudo chmod 777 "$ini_file" echo "date.timezone=UTC" >>"$ini_file" +sudo mv ./deps/libcurl.so.3 /usr/lib/libcurl.so.3 +sudo mv ./deps/curl.so "$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")"/curl.so +echo "extension=curl.so" >>"$ini_file" sudo php5enmod redis -sudo php5enmod xdebug \ No newline at end of file +sudo php5enmod xdebug +echo "deb $dotdeb wheezy-php55 all" | sudo tee /etc/apt/sources.list.d/dotdeb-ubuntu-php-"$(lsb_release -s -c)".list +curl -sSLO https://www.dotdeb.org/dotdeb.gpg +sudo apt-key add dotdeb.gpg \ No newline at end of file