commit eadfe6ca81e68ed53304422eff6c8b5a4aea1b9e Author: Elan Ruusamäe <g...@pld-linux.org> Date: Fri Oct 9 18:58:44 2020 +0300
Update php-use-prog_sendmail.patch php-use-prog_sendmail.patch | 12 ++++++------ php.spec | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) --- diff --git a/php.spec b/php.spec index fe35950..6c062e5 100644 --- a/php.spec +++ b/php.spec @@ -1874,7 +1874,7 @@ cp -p php.ini-production php.ini %patch27 -p1 %patch29 -p1 %patch31 -p1 -#%patch39 -p1 -b .use-prog_sendmail +%patch39 -p1 -b .use-prog_sendmail %patch41 -p1 %patch43 -p1 %patch44 -p1 diff --git a/php-use-prog_sendmail.patch b/php-use-prog_sendmail.patch index 161e446..dafbcd5 100644 --- a/php-use-prog_sendmail.patch +++ b/php-use-prog_sendmail.patch @@ -1,14 +1,14 @@ ---- php-5.2.6/build/php.m4~ 2008-10-15 13:44:25.000000000 +0300 -+++ php-5.2.6/build/php.m4 2008-10-15 13:55:05.359850285 +0300 -@@ -2037,8 +2037,10 @@ - dnl Search for the sendmail binary +--- php-8.0.0rc1/build/php.m4~ 2020-10-09 18:56:11.000000000 +0300 ++++ php-8.0.0rc1/build/php.m4 2020-10-09 18:58:11.039360902 +0300 +@@ -1710,8 +1710,10 @@ + dnl Search for the sendmail binary. dnl AC_DEFUN([PHP_PROG_SENDMAIL], [ - PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib -- AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH) +- AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$PHP_ALT_PATH) + if test -z "$PROG_SENDMAIL"; then + PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib -+ AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH) ++ AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$PHP_ALT_PATH) + fi PHP_SUBST(PROG_SENDMAIL) ]) ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/3812f95c6f6decd7a3a7cabca74d1adbe4dcae19 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit