diff --git a/.github/workflows/linux-glibc.yml b/.github/workflows/linux-glibc.yml index 28e9b59f78..bffa5be457 100644 --- a/.github/workflows/linux-glibc.yml +++ b/.github/workflows/linux-glibc.yml @@ -102,8 +102,8 @@ jobs: php prepare.php --with-libavif sudo apt update - bash ./sapi/scripts/install-deps-on-ubuntu.sh - bash ./ext/swoole/scripts/install-deps-on-ubuntu.sh + sudo bash ./sapi/scripts/install-deps-on-ubuntu.sh + sudo bash ./ext/swoole/scripts/install-deps-on-ubuntu.sh bash ./sapi/scripts/build-swoole-cli-with-linux-gcc.sh ./bin/swoole-cli -v diff --git a/sapi/SWOOLE-VERSION.conf b/sapi/SWOOLE-VERSION.conf index b2c63a1c1b..2dc8e03bce 100644 --- a/sapi/SWOOLE-VERSION.conf +++ b/sapi/SWOOLE-VERSION.conf @@ -1 +1 @@ -v6.1.3 +v6.2.0 diff --git a/sapi/quickstart/windows/cygwin-build/install-cygwin.bat b/sapi/quickstart/windows/cygwin-build/install-cygwin.bat index 5c6117564c..d167279a35 100644 --- a/sapi/quickstart/windows/cygwin-build/install-cygwin.bat +++ b/sapi/quickstart/windows/cygwin-build/install-cygwin.bat @@ -56,6 +56,8 @@ set "PACKAGES=%PACKAGES%,libwrap-devel" set "PACKAGES=%PACKAGES%,libedit-devel" set "PACKAGES=%PACKAGES%,liblzma-devel" set "PACKAGES=%PACKAGES%,gettext-devel" +set "PACKAGES=%PACKAGES%,libssh2-devel" + set "OPTIONS=%OPTIONS% --packages %PACKAGES%" diff --git a/sapi/scripts/cygwin/cygwin-config.sh b/sapi/scripts/cygwin/cygwin-config.sh index 9471aebc19..ffe9cb94c3 100755 --- a/sapi/scripts/cygwin/cygwin-config.sh +++ b/sapi/scripts/cygwin/cygwin-config.sh @@ -58,6 +58,8 @@ test -f Makefile && make clean --enable-brotli \ --enable-zstd \ --enable-swoole-stdext \ + --with-swoole-ssh2 \ + --enable-swoole-ftp \ --enable-redis \ --with-imagick \ --with-yaml \ diff --git a/sapi/scripts/msys2/config.sh b/sapi/scripts/msys2/config.sh index 39bdeda756..cc5ee86cf4 100644 --- a/sapi/scripts/msys2/config.sh +++ b/sapi/scripts/msys2/config.sh @@ -84,6 +84,8 @@ test -f Makefile && make clean --enable-brotli \ --enable-zstd \ --enable-swoole-stdext \ + --with-swoole-ssh2 \ + --enable-swoole-ftp \ --enable-redis \ --enable-opcache \ --disable-opcache-jit \ diff --git a/sapi/src/builder/extension/swoole.php b/sapi/src/builder/extension/swoole.php index 6213b213f4..63240fb1f1 100644 --- a/sapi/src/builder/extension/swoole.php +++ b/sapi/src/builder/extension/swoole.php @@ -6,7 +6,8 @@ return function (Preprocessor $p) { $libiconv_prefix = ICONV_PREFIX; - $dependentLibraries = ['curl', 'openssl', 'cares', 'zlib', 'brotli', 'nghttp2', 'sqlite3', 'unix_odbc', 'pgsql', 'libzstd']; + $libssh2_prefix = LIBSSH2_PREFIX; + $dependentLibraries = ['curl', 'openssl', 'cares', 'zlib', 'brotli', 'nghttp2', 'sqlite3', 'unix_odbc', 'pgsql', 'libzstd', 'libssh2']; $dependentExtensions = ['curl', 'openssl', 'sockets', 'mysqlnd', 'pdo']; $options[] = '--enable-swoole'; @@ -23,6 +24,8 @@ $options[] = '--enable-brotli'; $options[] = '--enable-zstd'; $options[] = '--enable-swoole-stdext'; + $options[] = '--with-swoole-ssh2=' . $libssh2_prefix; + $options[] = '--enable-swoole-ftp'; if ($p->isLinux() && $p->getInputOption('with-iouring')) { $options[] = '--enable-iouring'; diff --git a/sapi/src/builder/library/liburing.php b/sapi/src/builder/library/liburing.php index b04207fb50..7cf0db211b 100644 --- a/sapi/src/builder/library/liburing.php +++ b/sapi/src/builder/library/liburing.php @@ -10,7 +10,7 @@ ->withHomePage('https://github.com/axboe/liburing.git') ->withLicense('https://github.com/axboe/liburing/blob/master/COPYING', Library::LICENSE_LGPL) ->withManual('hhttps://github.com/axboe/liburing') - ->withUrl('https://github.com/axboe/liburing/archive/refs/tags/liburing-2.6.tar.gz') + ->withUrl('https://github.com/axboe/liburing/archive/refs/tags/liburing-2.14.tar.gz') ->withPrefix($liburing_prefix) ->withConfigure( <<${APP_RUNTIME_DIR}/php.ini <