]> git.pld-linux.org Git - packages/php.git/commitdiff
Update php-use-prog_sendmail.patch
authorElan Ruusamäe <glen@pld-linux.org>
Fri, 9 Oct 2020 15:58:44 +0000 (18:58 +0300)
committerElan Ruusamäe <glen@pld-linux.org>
Fri, 9 Oct 2020 16:02:53 +0000 (19:02 +0300)
php-use-prog_sendmail.patch
php.spec

index 161e4460d79ad5c0a08b2b714fd4b2d668c33dcb..dafbcd51613e5ffdabc070f0d17bf590567a0f62 100644 (file)
@@ -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)
  ])
index fe359502b20050ca119d16f54f2b80dd0ee327a8..6c062e54ba68352962a5482a458edc755470f3f3 100644 (file)
--- 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
This page took 1.776318 seconds and 4 git commands to generate.