mirror of
https://github.com/php/php-src.git
synced 2024-09-21 01:47:25 +00:00
ext/openssl: Remove kerberos support
Co-authored-by: Peter Kokot <peterkokot@gmail.com>
This commit is contained in:
parent
3de3e137bf
commit
a4534fafac
@ -53,8 +53,6 @@ jobs:
|
|||||||
libsqlite3-dev \
|
libsqlite3-dev \
|
||||||
libwebp-dev \
|
libwebp-dev \
|
||||||
libonig-dev \
|
libonig-dev \
|
||||||
libkrb5-dev \
|
|
||||||
libgssapi-krb5-2 \
|
|
||||||
libcurl4-openssl-dev \
|
libcurl4-openssl-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
libxslt1-dev \
|
libxslt1-dev \
|
||||||
@ -128,7 +126,6 @@ jobs:
|
|||||||
--enable-calendar \
|
--enable-calendar \
|
||||||
--enable-ftp \
|
--enable-ftp \
|
||||||
--with-enchant=/usr \
|
--with-enchant=/usr \
|
||||||
--with-kerberos \
|
|
||||||
--enable-sysvmsg \
|
--enable-sysvmsg \
|
||||||
--with-ffi \
|
--with-ffi \
|
||||||
--enable-zend-test \
|
--enable-zend-test \
|
||||||
|
@ -11,10 +11,10 @@ freebsd_task:
|
|||||||
#- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf
|
#- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf
|
||||||
#- pkg upgrade -y
|
#- pkg upgrade -y
|
||||||
- kldload accf_http
|
- 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:
|
script:
|
||||||
- ./buildconf -f
|
- ./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
|
- gmake -j2
|
||||||
- mkdir /etc/php.d
|
- mkdir /etc/php.d
|
||||||
- gmake install
|
- gmake install
|
||||||
|
2
.github/actions/apt-x32/action.yml
vendored
2
.github/actions/apt-x32/action.yml
vendored
@ -23,10 +23,8 @@ runs:
|
|||||||
libffi-dev:i386 \
|
libffi-dev:i386 \
|
||||||
libfreetype6-dev:i386 \
|
libfreetype6-dev:i386 \
|
||||||
libgmp-dev:i386 \
|
libgmp-dev:i386 \
|
||||||
libgssapi-krb5-2:i386 \
|
|
||||||
libicu-dev:i386 \
|
libicu-dev:i386 \
|
||||||
libjpeg-dev:i386 \
|
libjpeg-dev:i386 \
|
||||||
libkrb5-dev:i386 \
|
|
||||||
libonig-dev:i386 \
|
libonig-dev:i386 \
|
||||||
libpng-dev:i386 \
|
libpng-dev:i386 \
|
||||||
libpq-dev:i386 \
|
libpq-dev:i386 \
|
||||||
|
2
.github/actions/apt-x64/action.yml
vendored
2
.github/actions/apt-x64/action.yml
vendored
@ -40,8 +40,6 @@ runs:
|
|||||||
libsqlite3-mod-spatialite \
|
libsqlite3-mod-spatialite \
|
||||||
libwebp-dev \
|
libwebp-dev \
|
||||||
libonig-dev \
|
libonig-dev \
|
||||||
libkrb5-dev \
|
|
||||||
libgssapi-krb5-2 \
|
|
||||||
libcurl4-openssl-dev \
|
libcurl4-openssl-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
libxslt1-dev \
|
libxslt1-dev \
|
||||||
|
1
.github/actions/brew/action.yml
vendored
1
.github/actions/brew/action.yml
vendored
@ -19,7 +19,6 @@ runs:
|
|||||||
brew install \
|
brew install \
|
||||||
openssl@1.1 \
|
openssl@1.1 \
|
||||||
curl \
|
curl \
|
||||||
krb5 \
|
|
||||||
bzip2 \
|
bzip2 \
|
||||||
enchant \
|
enchant \
|
||||||
libffi \
|
libffi \
|
||||||
|
2
.github/actions/configure-macos/action.yml
vendored
2
.github/actions/configure-macos/action.yml
vendored
@ -13,7 +13,6 @@ runs:
|
|||||||
export PATH="$BREW_OPT/bison/bin:$PATH"
|
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/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/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/libffi/lib/pkgconfig"
|
||||||
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxml2/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"
|
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxslt/lib/pkgconfig"
|
||||||
@ -58,7 +57,6 @@ runs:
|
|||||||
--enable-bcmath \
|
--enable-bcmath \
|
||||||
--enable-calendar \
|
--enable-calendar \
|
||||||
--enable-ftp \
|
--enable-ftp \
|
||||||
--with-kerberos \
|
|
||||||
--enable-sysvmsg \
|
--enable-sysvmsg \
|
||||||
--with-ffi \
|
--with-ffi \
|
||||||
--enable-zend-test \
|
--enable-zend-test \
|
||||||
|
1
.github/actions/configure-x32/action.yml
vendored
1
.github/actions/configure-x32/action.yml
vendored
@ -54,7 +54,6 @@ runs:
|
|||||||
--enable-bcmath \
|
--enable-bcmath \
|
||||||
--enable-calendar \
|
--enable-calendar \
|
||||||
--enable-ftp \
|
--enable-ftp \
|
||||||
--with-kerberos \
|
|
||||||
--enable-sysvmsg \
|
--enable-sysvmsg \
|
||||||
--with-ffi \
|
--with-ffi \
|
||||||
--enable-zend-test \
|
--enable-zend-test \
|
||||||
|
1
.github/actions/configure-x64/action.yml
vendored
1
.github/actions/configure-x64/action.yml
vendored
@ -53,7 +53,6 @@ runs:
|
|||||||
--enable-calendar \
|
--enable-calendar \
|
||||||
--enable-ftp \
|
--enable-ftp \
|
||||||
${{ inputs.skipSlow == 'false' && '--with-enchant=/usr' || '' }} \
|
${{ inputs.skipSlow == 'false' && '--with-enchant=/usr' || '' }} \
|
||||||
--with-kerberos \
|
|
||||||
--enable-sysvmsg \
|
--enable-sysvmsg \
|
||||||
--with-ffi \
|
--with-ffi \
|
||||||
--enable-zend-test \
|
--enable-zend-test \
|
||||||
|
@ -19,7 +19,6 @@ addons:
|
|||||||
- libgmp-dev
|
- libgmp-dev
|
||||||
- libicu-dev
|
- libicu-dev
|
||||||
- libjpeg-dev
|
- libjpeg-dev
|
||||||
- libkrb5-dev
|
|
||||||
- libonig-dev
|
- libonig-dev
|
||||||
- libpng-dev
|
- libpng-dev
|
||||||
- libpq-dev
|
- libpq-dev
|
||||||
|
@ -97,6 +97,7 @@ PHP 8.4 INTERNALS UPGRADE NOTES
|
|||||||
- The configure option --with-imap-ssl has been removed.
|
- The configure option --with-imap-ssl has been removed.
|
||||||
- The configure option --with-oci8 has been removed.
|
- The configure option --with-oci8 has been removed.
|
||||||
- The configure option --with-zlib-dir 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).
|
- 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_SOCKADDR_UN_SUN_LEN symbol renamed to HAVE_STRUCT_SOCKADDR_UN_SUN_LEN.
|
||||||
- HAVE_UTSNAME_DOMAINNAME symbol renamed to HAVE_STRUCT_UTSNAME_DOMAINNAME.
|
- HAVE_UTSNAME_DOMAINNAME symbol renamed to HAVE_STRUCT_UTSNAME_DOMAINNAME.
|
||||||
|
@ -3,13 +3,6 @@ PHP_ARG_WITH([openssl],
|
|||||||
[AS_HELP_STRING([--with-openssl],
|
[AS_HELP_STRING([--with-openssl],
|
||||||
[Include OpenSSL support (requires OpenSSL >= 1.1.1)])])
|
[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],
|
PHP_ARG_WITH([system-ciphers],
|
||||||
[whether to use system default cipher list instead of hardcoded value],
|
[whether to use system default cipher list instead of hardcoded value],
|
||||||
[AS_HELP_STRING([--with-system-ciphers],
|
[AS_HELP_STRING([--with-system-ciphers],
|
||||||
@ -20,14 +13,6 @@ PHP_ARG_WITH([system-ciphers],
|
|||||||
if test "$PHP_OPENSSL" != "no"; then
|
if test "$PHP_OPENSSL" != "no"; then
|
||||||
PHP_NEW_EXTENSION(openssl, openssl.c xp_ssl.c, $ext_shared)
|
PHP_NEW_EXTENSION(openssl, openssl.c xp_ssl.c, $ext_shared)
|
||||||
PHP_SUBST(OPENSSL_SHARED_LIBADD)
|
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,
|
PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD,
|
||||||
[
|
[
|
||||||
AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
|
AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
|
||||||
|
@ -61,7 +61,6 @@ $S390X_CONFIG \
|
|||||||
--enable-calendar \
|
--enable-calendar \
|
||||||
--enable-ftp \
|
--enable-ftp \
|
||||||
--with-enchant=/usr \
|
--with-enchant=/usr \
|
||||||
--with-kerberos \
|
|
||||||
--enable-sysvmsg \
|
--enable-sysvmsg \
|
||||||
--with-ffi \
|
--with-ffi \
|
||||||
--with-sodium \
|
--with-sodium \
|
||||||
|
Loading…
Reference in New Issue
Block a user