67 lines
2.9 KiB
Diff
67 lines
2.9 KiB
Diff
From 9f98bc58c7bb7fdbb25614ca645bbd7a465fdfed Mon Sep 17 00:00:00 2001
|
|
From: Remi Collet <remi@remirepo.net>
|
|
Date: Fri, 15 Oct 2021 15:45:50 +0200
|
|
Subject: [PATCH] remove closing bracket in bad place
|
|
|
|
---
|
|
build/php.m4 | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/build/php.m4 b/build/php.m4
|
|
index 9746ba28f325..7fb9e3125d13 100644
|
|
--- a/build/php.m4
|
|
+++ b/build/php.m4
|
|
@@ -2219,7 +2219,6 @@ struct crypt_data buffer;
|
|
crypt_r("passwd", "hash", &buffer);
|
|
]])],[php_cv_crypt_r_style=struct_crypt_data_gnu_source],[])
|
|
fi
|
|
- ])
|
|
|
|
if test "$php_cv_crypt_r_style" = "none"; then
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
|
From fc4e31467c352032ee709ac55d3c67bc22abcd8d Mon Sep 17 00:00:00 2001
|
|
From: Remi Collet <remi@remirepo.net>
|
|
Date: Fri, 15 Oct 2021 17:11:12 +0200
|
|
Subject: [PATCH] add --with-external-libcrypt build option display an error
|
|
message if some algo not available in external libcrypt
|
|
|
|
---
|
|
ext/standard/config.m4 | 21 ++++++++++++++++-----
|
|
1 file changed, 16 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
|
|
index 58b9c5e658a4..3ec18be4d7df 100644
|
|
--- a/ext/standard/config.m4
|
|
+++ b/ext/standard/config.m4
|
|
@@ -267,14 +267,25 @@ int main() {
|
|
])])
|
|
|
|
|
|
+PHP_ARG_WITH([external-libcrypt],
|
|
+ [for external libcrypt or libxcrypt],
|
|
+ [AS_HELP_STRING([--with-external-libcrypt],
|
|
+ [Use external libcrypt or libxcrypt])],
|
|
+ [no],
|
|
+ [no])
|
|
+
|
|
dnl
|
|
dnl If one of them is missing, use our own implementation, portable code is then possible
|
|
dnl
|
|
-dnl TODO This is currently always enabled
|
|
-if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no" || test "$ac_cv_func_crypt_r" != "yes" || true; then
|
|
- AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 1, [Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5])
|
|
-
|
|
- PHP_ADD_SOURCES(PHP_EXT_DIR(standard), crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c)
|
|
+dnl This is currently enabled by default
|
|
+if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no" || test "$ac_cv_func_crypt_r" != "yes" || test "$PHP_EXTERNAL_LIBCRYPT" = "no"; then
|
|
+ if test "$PHP_EXTERNAL_LIBCRYPT" = "no"; then
|
|
+ AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 1, [Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5])
|
|
+
|
|
+ PHP_ADD_SOURCES(PHP_EXT_DIR(standard), crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c)
|
|
+ else
|
|
+ AC_MSG_ERROR([Cannot use external libcrypt as some algo are missing])
|
|
+ fi
|
|
else
|
|
AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 0, [Whether PHP has to use its own crypt_r for blowfish, des and ext des])
|
|
fi
|