diff --git a/.circleci/config.yml b/.circleci/config.yml index a315f3342da..16ae9ac39b5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,8 +53,6 @@ jobs: libsqlite3-dev \ libwebp-dev \ libonig-dev \ - libkrb5-dev \ - libgssapi-krb5-2 \ libcurl4-openssl-dev \ libxml2-dev \ libxslt1-dev \ @@ -128,7 +126,6 @@ jobs: --enable-calendar \ --enable-ftp \ --with-enchant=/usr \ - --with-kerberos \ --enable-sysvmsg \ --with-ffi \ --enable-zend-test \ diff --git a/.cirrus.yml b/.cirrus.yml index d1ad298c888..7db6ce1a911 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -11,10 +11,10 @@ freebsd_task: #- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf #- pkg upgrade -y - kldload accf_http - - pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 krb5 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif + - pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif script: - ./buildconf -f - - ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-kerberos --with-ffi --enable-zend-test --enable-dl-test=shared --enable-intl --with-mhash --with-sodium --enable-werror --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d + - ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-ffi --enable-zend-test --enable-dl-test=shared --enable-intl --with-mhash --with-sodium --enable-werror --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d - gmake -j2 - mkdir /etc/php.d - gmake install diff --git a/.github/actions/apt-x32/action.yml b/.github/actions/apt-x32/action.yml index dbb50d425ef..0638881d1e4 100644 --- a/.github/actions/apt-x32/action.yml +++ b/.github/actions/apt-x32/action.yml @@ -23,10 +23,8 @@ runs: libffi-dev:i386 \ libfreetype6-dev:i386 \ libgmp-dev:i386 \ - libgssapi-krb5-2:i386 \ libicu-dev:i386 \ libjpeg-dev:i386 \ - libkrb5-dev:i386 \ libonig-dev:i386 \ libpng-dev:i386 \ libpq-dev:i386 \ diff --git a/.github/actions/apt-x64/action.yml b/.github/actions/apt-x64/action.yml index 05e17918f01..469e1a5df82 100644 --- a/.github/actions/apt-x64/action.yml +++ b/.github/actions/apt-x64/action.yml @@ -40,8 +40,6 @@ runs: libsqlite3-mod-spatialite \ libwebp-dev \ libonig-dev \ - libkrb5-dev \ - libgssapi-krb5-2 \ libcurl4-openssl-dev \ libxml2-dev \ libxslt1-dev \ diff --git a/.github/actions/brew/action.yml b/.github/actions/brew/action.yml index a6869db137d..4975acfd30e 100644 --- a/.github/actions/brew/action.yml +++ b/.github/actions/brew/action.yml @@ -19,7 +19,6 @@ runs: brew install \ openssl@1.1 \ curl \ - krb5 \ bzip2 \ enchant \ libffi \ diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index cda8e7fbac8..ab92dfb2d78 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -13,7 +13,6 @@ runs: export PATH="$BREW_OPT/bison/bin:$PATH" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/openssl@1.1/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/curl/lib/pkgconfig" - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/krb5/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libffi/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxml2/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxslt/lib/pkgconfig" @@ -58,7 +57,6 @@ runs: --enable-bcmath \ --enable-calendar \ --enable-ftp \ - --with-kerberos \ --enable-sysvmsg \ --with-ffi \ --enable-zend-test \ diff --git a/.github/actions/configure-x32/action.yml b/.github/actions/configure-x32/action.yml index 0d4cd30e669..c07c49bb2c4 100644 --- a/.github/actions/configure-x32/action.yml +++ b/.github/actions/configure-x32/action.yml @@ -54,7 +54,6 @@ runs: --enable-bcmath \ --enable-calendar \ --enable-ftp \ - --with-kerberos \ --enable-sysvmsg \ --with-ffi \ --enable-zend-test \ diff --git a/.github/actions/configure-x64/action.yml b/.github/actions/configure-x64/action.yml index 95cf656fa70..38dce5ef8fa 100644 --- a/.github/actions/configure-x64/action.yml +++ b/.github/actions/configure-x64/action.yml @@ -53,7 +53,6 @@ runs: --enable-calendar \ --enable-ftp \ ${{ inputs.skipSlow == 'false' && '--with-enchant=/usr' || '' }} \ - --with-kerberos \ --enable-sysvmsg \ --with-ffi \ --enable-zend-test \ diff --git a/.travis.yml b/.travis.yml index a94afb4e9ef..fd18307662a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ addons: - libgmp-dev - libicu-dev - libjpeg-dev - - libkrb5-dev - libonig-dev - libpng-dev - libpq-dev diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 47e35283f3a..f6585f4b60f 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -97,6 +97,7 @@ PHP 8.4 INTERNALS UPGRADE NOTES - The configure option --with-imap-ssl has been removed. - The configure option --with-oci8 has been removed. - The configure option --with-zlib-dir has been removed. + - The configure option --with-kerberos has been removed. - COOKIE_IO_FUNCTIONS_T symbol has been removed (use cookie_io_functions_t). - HAVE_SOCKADDR_UN_SUN_LEN symbol renamed to HAVE_STRUCT_SOCKADDR_UN_SUN_LEN. - HAVE_UTSNAME_DOMAINNAME symbol renamed to HAVE_STRUCT_UTSNAME_DOMAINNAME. diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4 index f449a19d55c..1861a09ca54 100644 --- a/ext/openssl/config0.m4 +++ b/ext/openssl/config0.m4 @@ -3,13 +3,6 @@ PHP_ARG_WITH([openssl], [AS_HELP_STRING([--with-openssl], [Include OpenSSL support (requires OpenSSL >= 1.1.1)])]) -PHP_ARG_WITH([kerberos], - [for Kerberos support], - [AS_HELP_STRING([--with-kerberos], - [OPENSSL: Include Kerberos support])], - [no], - [no]) - PHP_ARG_WITH([system-ciphers], [whether to use system default cipher list instead of hardcoded value], [AS_HELP_STRING([--with-system-ciphers], @@ -20,14 +13,6 @@ PHP_ARG_WITH([system-ciphers], if test "$PHP_OPENSSL" != "no"; then PHP_NEW_EXTENSION(openssl, openssl.c xp_ssl.c, $ext_shared) PHP_SUBST(OPENSSL_SHARED_LIBADD) - - if test "$PHP_KERBEROS" != "no"; then - PKG_CHECK_MODULES([KERBEROS], [krb5-gssapi krb5]) - - PHP_EVAL_INCLINE($KERBEROS_CFLAGS) - PHP_EVAL_LIBLINE($KERBEROS_LIBS, OPENSSL_SHARED_LIBADD) - fi - PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD, [ AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ]) diff --git a/travis/compile.sh b/travis/compile.sh index be1483f1521..bab44d30ad1 100755 --- a/travis/compile.sh +++ b/travis/compile.sh @@ -61,7 +61,6 @@ $S390X_CONFIG \ --enable-calendar \ --enable-ftp \ --with-enchant=/usr \ ---with-kerberos \ --enable-sysvmsg \ --with-ffi \ --with-sodium \