From 57e7932e320e6e6bebd802411ac010dc826af5b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 9 Nov 2020 14:36:46 +0200 Subject: [PATCH] Up to 7.4.12 --- php-use-prog_sendmail.patch | 12 ++++++------ php.spec | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/php-use-prog_sendmail.patch b/php-use-prog_sendmail.patch index 161e446..b14da33 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-7.4.12/build/php.m4~ 2020-11-09 14:38:20.000000000 +0200 ++++ php-7.4.12/build/php.m4 2020-11-09 14:39:53.522036584 +0200 +@@ -1731,8 +1731,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) ]) diff --git a/php.spec b/php.spec index a6f98a2..444a5c6 100644 --- a/php.spec +++ b/php.spec @@ -149,8 +149,8 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 7.4.6 -Release: 3 +Version: 7.4.12 +Release: 1 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -158,7 +158,7 @@ Epoch: 4 License: PHP 3.01 and Zend and BSD Group: Libraries Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz -# Source0-md5: 523b7d61e5fa8ea15375f6d1f7e2876a +# Source0-md5: adc8be777dff588732b18319dbad2593 Source1: opcache.ini Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini -- 2.44.0