From b29e541d3e94d02aa46912d406ad0fddfef2e4e6 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 22 Aug 2023 12:32:07 +0100 Subject: [PATCH 1/5] Update dependencies --- compile.sh | 6 +++--- windows-compile-vs.bat | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compile.sh b/compile.sh index 34abf46f..6edc463d 100755 --- a/compile.sh +++ b/compile.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash [ -z "$PHP_VERSION" ] && PHP_VERSION="8.1.22" -ZLIB_VERSION="1.2.13" +ZLIB_VERSION="1.3" GMP_VERSION="6.3.0" -CURL_VERSION="curl-8_2_0" +CURL_VERSION="curl-8_2_1" YAML_VERSION="0.2.5" LEVELDB_VERSION="1c7564468b41610da4f498430e795ca4de0931ff" LIBXML_VERSION="2.10.1" #2.10.2 requires automake 1.16.3, which isn't easily available on Ubuntu 20.04 @@ -15,7 +15,7 @@ SQLITE3_VERSION="3420000" #3.42.0 LIBDEFLATE_VERSION="495fee110ebb48a5eb63b75fd67e42b2955871e2" #1.18 EXT_PTHREADS_VERSION="4.2.2" -EXT_PMMPTHREAD_VERSION="6.0.8" +EXT_PMMPTHREAD_VERSION="6.0.9" EXT_YAML_VERSION="2.2.3" EXT_LEVELDB_VERSION="317fdcd8415e1566fc2835ce2bdb8e19b890f9f3" EXT_CHUNKUTILS2_VERSION="0.3.5" diff --git a/windows-compile-vs.bat b/windows-compile-vs.bat index 9355952a..75b4b9f3 100644 --- a/windows-compile-vs.bat +++ b/windows-compile-vs.bat @@ -25,7 +25,7 @@ set LEVELDB_MCPE_VER=1c7564468b41610da4f498430e795ca4de0931ff set LIBDEFLATE_VER=495fee110ebb48a5eb63b75fd67e42b2955871e2 set PHP_PTHREADS_VER=4.2.2 -set PHP_PMMPTHREAD_VER=6.0.8 +set PHP_PMMPTHREAD_VER=6.0.9 set PHP_YAML_VER=2.2.3 set PHP_CHUNKUTILS2_VER=0.3.5 set PHP_IGBINARY_VER=3.2.14 From ec9c9feec01b8e4b8e890e0f70a53fdd344af57d Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 22 Aug 2023 12:53:22 +0100 Subject: [PATCH 2/5] compile.sh: rollback libzip to 1.9.2 to fix static builds closes #176 --- compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile.sh b/compile.sh index 6edc463d..865cec34 100755 --- a/compile.sh +++ b/compile.sh @@ -10,7 +10,7 @@ LIBXML_VERSION="2.10.1" #2.10.2 requires automake 1.16.3, which isn't easily ava LIBPNG_VERSION="1.6.40" LIBJPEG_VERSION="9e" OPENSSL_VERSION="3.1.2" -LIBZIP_VERSION="1.10.0" +LIBZIP_VERSION="1.9.2" #1.10.0 breaks on static builds (https://github.com/nih-at/libzip/issues/399) SQLITE3_VERSION="3420000" #3.42.0 LIBDEFLATE_VERSION="495fee110ebb48a5eb63b75fd67e42b2955871e2" #1.18 From 69f8852bbb7263d3f7121444734f50ce66b51723 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 23 Aug 2023 11:07:37 +0100 Subject: [PATCH 3/5] Fixed libzip in static builds closes #176 --- compile.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compile.sh b/compile.sh index 865cec34..5b3900e7 100755 --- a/compile.sh +++ b/compile.sh @@ -10,7 +10,7 @@ LIBXML_VERSION="2.10.1" #2.10.2 requires automake 1.16.3, which isn't easily ava LIBPNG_VERSION="1.6.40" LIBJPEG_VERSION="9e" OPENSSL_VERSION="3.1.2" -LIBZIP_VERSION="1.9.2" #1.10.0 breaks on static builds (https://github.com/nih-at/libzip/issues/399) +LIBZIP_VERSION="b9cb7e263936f7c112377626c1247a78aa3ace6b" #git head as of 2023-08-23 - 1.10.0 breaks on static builds (https://github.com/nih-at/libzip/issues/399) SQLITE3_VERSION="3420000" #3.42.0 LIBDEFLATE_VERSION="495fee110ebb48a5eb63b75fd67e42b2955871e2" #1.18 @@ -873,7 +873,7 @@ function build_libzip { if cant_use_cache "$libzip_dir"; then rm -rf "$libzip_dir" write_download - download_from_mirror "libzip-$LIBZIP_VERSION.tar.gz" "libzip" | tar -zx >> "$DIR/install.log" 2>&1 + download_github_src "nih-at/libzip" "$LIBZIP_VERSION" "libzip" | tar -zx >> "$DIR/install.log" 2>&1 write_configure cd "$libzip_dir" From f6d9184188d56ba0749b43e66b687f5e344d48a0 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 23 Aug 2023 11:08:00 +0100 Subject: [PATCH 4/5] Fix OpenSSL in static mode --- compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile.sh b/compile.sh index 5b3900e7..dfc738a9 100755 --- a/compile.sh +++ b/compile.sh @@ -582,7 +582,7 @@ function build_openssl { local OPENSSL_CMD="./Configure $OPENSSL_TARGET" fi if [ "$DO_STATIC" == "yes" ]; then - local EXTRA_FLAGS="no-shared" + local EXTRA_FLAGS="no-shared -static" else local EXTRA_FLAGS="shared" fi From 899535bf2a41f32a211448ae37f9ba39e8f2d683 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 23 Aug 2023 11:39:48 +0100 Subject: [PATCH 5/5] PHP 8.2.9 --- compile.sh | 2 +- windows-compile-vs.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compile.sh b/compile.sh index a235ee76..cdea871a 100755 --- a/compile.sh +++ b/compile.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -[ -z "$PHP_VERSION" ] && PHP_VERSION="8.2.8" +[ -z "$PHP_VERSION" ] && PHP_VERSION="8.2.9" ZLIB_VERSION="1.3" GMP_VERSION="6.3.0" diff --git a/windows-compile-vs.bat b/windows-compile-vs.bat index 4257bbf0..8cb304a3 100644 --- a/windows-compile-vs.bat +++ b/windows-compile-vs.bat @@ -3,7 +3,7 @@ REM For future users: This file MUST have CRLF line endings. If it doesn't, lots of inexplicable undesirable strange behaviour will result. REM Also: Don't modify this version with sed, or it will screw up your line endings. set PHP_MAJOR_VER=8.2 -set PHP_VER=%PHP_MAJOR_VER%.8 +set PHP_VER=%PHP_MAJOR_VER%.9 set PHP_GIT_REV=php-%PHP_VER% set PHP_DISPLAY_VER=%PHP_VER% set PHP_SDK_VER=2.2.0