commit 1b0fa114d6f54a44237c529b9d5894a51cfa5ac3
Author: Elan Ruusamäe <[email protected]>
Date: Sun Jul 14 23:30:27 2019 +0300
up to 7.4.0alpha3
php-nohttpd.patch | 15 ++++++---------
php.spec | 4 ++--
2 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/php.spec b/php.spec
index 4ab658a..4e05cdd 100644
--- a/php.spec
+++ b/php.spec
@@ -147,7 +147,7 @@
%undefine with_pdo_sqlite
%endif
-%define subver alpha2
+%define subver alpha3
%define rel 1
%define orgname php
%define ver_suffix 74
@@ -169,7 +169,7 @@ License: PHP 3.01 and Zend and BSD
Group: Libraries
#Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz
Source0: https://downloads.php.net/~derick/php-%{version}%{subver}.tar.xz
-# Source0-md5: b02bc5b54209274c22ba36d2679939c3
+# Source0-md5: 4981b9441688a53ea78a0e14c60bb8cc
Source1: opcache.ini
Source2: %{orgname}-mod_php.conf
Source3: %{orgname}-cgi-fcgi.ini
diff --git a/php-nohttpd.patch b/php-nohttpd.patch
index 8a68bc7..8c5b05b 100644
--- a/php-nohttpd.patch
+++ b/php-nohttpd.patch
@@ -1,14 +1,11 @@
---- php-5.5.2/sapi/apache2handler/config.m4~ 2013-08-15 23:42:04.000000000
+0300
-+++ php-5.5.2/sapi/apache2handler/config.m4 2013-08-18 15:13:02.728903161
+0300
-@@ -60,9 +60,9 @@
+--- php-7.4.0alpha3/sapi/apache2handler/config.m4~ 2019-07-09
10:39:56.000000000 +0300
++++ php-7.4.0alpha3/sapi/apache2handler/config.m4 2019-07-14
23:54:57.845267916 +0300
+@@ -59,7 +59,7 @@
- # Test that we're trying to configure with apache 2.x
+ dnl Test that we're trying to configure with apache 2.x
PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
-- if test "$APACHE_VERSION" -le 2000000; then
-+ if test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -le 2000000; then
- AC_MSG_ERROR([You have enabled Apache 2 support while your server is
Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)])
-- elif test "$APACHE_VERSION" -lt 2000044; then
-+ elif test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -lt 2000044; then
+- if test "$APACHE_VERSION" -lt 2000044; then
++ if test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -lt 2000044; then
AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/1b0fa114d6f54a44237c529b9d5894a51cfa5ac3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
