commit 00938eace2ea9b309225e79de241f014bf3991a0
Author: Elan Ruusamäe <[email protected]>
Date: Wed Jul 15 15:14:21 2015 +0300
up to 7.0.0beta1, builds without phpdbg, mssql and opcache
php-fcgi-graceful.patch | 31 ++++++++++++++++---------------
php-fpm-shared.patch | 20 ++++++++++----------
php-ini.patch | 17 +++--------------
php-sapi-ini-file.patch | 10 +++++-----
php-shared.patch | 18 +++++++++---------
php.spec | 17 +++++++++--------
6 files changed, 52 insertions(+), 61 deletions(-)
---
diff --git a/php.spec b/php.spec
index 04ce7ab..44c1c60 100644
--- a/php.spec
+++ b/php.spec
@@ -48,7 +48,7 @@
%bcond_without webp # Without WebP support in GD extension
(imagecreatefromwebp)
%bcond_with zts # Zend Thread Safety
# - SAPI
-%bcond_without apache1 # disable building Apache 1.3.x SAPI
+%bcond_with apache1 # disable building Apache 1.3.x SAPI (sapi
removed)
%bcond_without apache2 # disable building Apache 2.x SAPI
%bcond_without cgi # disable CGI/FCGI SAPI
%bcond_without fpm # disable FPM SAPI
@@ -66,7 +66,7 @@
%bcond_without ldap # without LDAP extension module
%bcond_without mhash # without mhash extension (supported by hash
extension)
%bcond_without mssql # without MS SQL extension module
-%bcond_without mysql # without ext/mysql support
+%bcond_with mysql # without ext/mysql support (ext removed)
%bcond_without mysqli # without mysqli support (Requires mysql > 4.1)
%bcond_without mysqlnd # without mysqlnd support in mysql related
extensions
%bcond_with oci # with Oracle oci8 extension module (BR:
proprietary libs)
@@ -83,7 +83,7 @@
%bcond_without snmp # without SNMP extension module
%bcond_without sqlite2 # without SQLite extension module
%bcond_without sqlite3 # without SQLite3 extension module
-%bcond_without sybase_ct # without Sybase-CT extension module
+%bcond_with sybase_ct # without Sybase-CT extension module (ext
removed in 7.0.0)
%bcond_without tidy # without Tidy extension module
%bcond_without wddx # without WDDX extension module
%bcond_without xmlrpc # without XML-RPC extension module
@@ -130,7 +130,8 @@ ERROR: You need to select at least one Apache SAPI to build
shared modules.
%undefine with_filter
%endif
-%define rel 0.1
+%define rel 0.2
+%define subver beta1
%define orgname php
%define ver_suffix 7.0
%define php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -142,7 +143,7 @@ Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирова
Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів,
виконувана на сервері
Name: %{orgname}%{php_suffix}
Version: 7.0.0
-Release: %{rel}
+Release: %{rel}.%{subver}
Epoch: 4
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -150,8 +151,8 @@ Epoch: 4
License: PHP 3.01 and Zend and BSD
Group: Libraries
#Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-Source0:
https://github.com/php/php-src/archive/master/%{orgname}-%{version}.tar.gz
-# Source0-md5: a50ad24a755dd225d0f1ee674c3dbe1f
+Source0: https://downloads.php.net/~ab/php-%{version}%{subver}.tar.xz
+# Source0-md5: e18aaad357f7bb8e416c300d64625fb8
Source2: %{orgname}-mod_%{orgname}.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
@@ -1989,7 +1990,7 @@ compression support to PHP.
Moduł PHP umożliwiający używanie kompresji zlib.
%prep
-%if 0
+%if 1
%setup -q -n %{orgname}-%{version}%{?subver}
%else
%setup -qc -n %{orgname}-%{version}
diff --git a/php-fcgi-graceful.patch b/php-fcgi-graceful.patch
index 26f86f3..505462f 100644
--- a/php-fcgi-graceful.patch
+++ b/php-fcgi-graceful.patch
@@ -18,8 +18,8 @@ while ($i < 35) {
echo "end!<br>\n";
?>
---- php-5.4.0alpha2/sapi/cgi/cgi_main.c~ 2011-08-05 13:26:14.000000000
+0300
-+++ php-5.4.0alpha2/sapi/cgi/cgi_main.c 2011-08-05 13:57:17.564708456
+0300
+--- php-7.0.0beta1/sapi/cgi/cgi_main.c~ 2015-07-13 16:14:53.000000000
+0300
++++ php-7.0.0beta1/sapi/cgi/cgi_main.c 2015-07-15 13:51:32.072326529 +0300
@@ -101,6 +101,9 @@
*/
static int parent = 1;
@@ -60,18 +60,19 @@ echo "end!<br>\n";
fcgi_request *request = NULL;
int repeats = 1;
int benchmark = 0;
-@@ -1579,9 +1596,13 @@
- parent = 0;
+@@ -2050,10 +2050,13 @@
+ */
+ parent = 0;
- /* don't catch our signals */
-- sigaction(SIGTERM, &old_term, 0);
- sigaction(SIGQUIT, &old_quit, 0);
- sigaction(SIGINT, &old_int, 0);
+- /* don't catch our signals */
+- sigaction(SIGTERM, &old_term,
0);
+ sigaction(SIGQUIT, &old_quit,
0);
+ sigaction(SIGINT, &old_int,
0);
+
-+ /* call graceful shutdown handler for
SIGTERM */
-+ act.sa_flags = 0;
-+ act.sa_handler =
fastcgi_graceful_shutdown;
-+ sigaction(SIGTERM, &act, &old_term);
- break;
- case -1:
- perror("php (pre-forking)");
++ /* call graceful shutdown
handler for SIGTERM */
++ act.sa_flags = 0;
++ act.sa_handler =
fastcgi_graceful_shutdown;
++ sigaction(SIGTERM, &act,
&old_term);
+ break;
+ case -1:
+ perror("php (pre-forking)");
diff --git a/php-fpm-shared.patch b/php-fpm-shared.patch
index d137526..7899094 100644
--- a/php-fpm-shared.patch
+++ b/php-fpm-shared.patch
@@ -1,21 +1,21 @@
---- php-5.4.0alpha2/sapi/fpm/config.m4~ 2011-06-26 18:48:11.000000000
+0300
-+++ php-5.4.0alpha2/sapi/fpm/config.m4 2011-08-07 11:46:26.970876686 +0300
-@@ -458,7 +458,7 @@
- BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS)
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS)
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o)
\$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o
\$(SAPI_FPM_PATH)"
+--- php-7.0.0beta1/sapi/fpm/config.m4~ 2015-07-10 15:11:43.000000000 +0300
++++ php-7.0.0beta1/sapi/fpm/config.m4 2015-07-15 13:55:23.427687256 +0300
+@@ -718,7 +718,7 @@
+ BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS)
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS)
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o)
\$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS)
\$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
;;
*)
-- BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS)
\$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS)
\$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
-+ BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS)
\$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS)
\$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+- BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS)
\$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS)
\$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o
\$(SAPI_FPM_PATH)"
++ BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS)
\$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS)
\$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o
\$(SAPI_FPM_PATH)"
;;
esac
---- php-5.4.0alpha2/sapi/fpm/Makefile.frag~ 2011-07-02 19:10:18.000000000
+0300
-+++ php-5.4.0alpha2/sapi/fpm/Makefile.frag 2011-08-07 11:47:41.737422848
+0300
+--- php-7.0.0beta1/sapi/fpm/Makefile.frag~ 2015-07-15 13:54:11.000000000
+0300
++++ php-7.0.0beta1/sapi/fpm/Makefile.frag 2015-07-15 13:56:12.116885111
+0300
@@ -1,6 +1,6 @@
fpm: $(SAPI_FPM_PATH)
--$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FPM_OBJS)
-+$(SAPI_FPM_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FPM_OBJS)
$(SAPI_EXTRA_DEPS)
+-$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS)
$(PHP_FPM_OBJS)
++$(SAPI_FPM_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS)
$(PHP_FPM_OBJS) $(SAPI_EXTRA_DEPS)
$(BUILD_FPM)
install-fpm: $(SAPI_FPM_PATH)
diff --git a/php-ini.patch b/php-ini.patch
index 92cf571..8931ab4 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-7.0/php.ini~ 2015-05-21 23:06:55.000000000 +0300
-+++ php-7.0/php.ini 2015-05-21 23:08:25.125742768 +0300
+--- php-7.0.0beta1/php.ini~ 2015-07-13 16:12:28.000000000 +0300
++++ php-7.0.0beta1/php.ini 2015-07-13 16:13:25.566494326 +0300
@@ -82,6 +82,20 @@
; much more verbose when it comes to errors. We recommending using the
; development version only in development environments as errors shown to
@@ -111,7 +111,7 @@
;;;;;;;;;;;;;;;;
; File Uploads ;
;;;;;;;;;;;;;;;;
-@@ -825,48 +825,8 @@
+@@ -825,47 +825,8 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
@@ -133,7 +133,6 @@
-;extension=php_ldap.dll
-;extension=php_mbstring.dll
-;extension=php_exif.dll ; Must be after mbstring as it depends on it
--;extension=php_mysql.dll
-;extension=php_mysqli.dll
-;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client
-;extension=php_openssl.dll
@@ -185,16 +184,6 @@
[intl]
;intl.default_locale =
-@@ -1152,6 +1062,9 @@
- ; http://php.net/mysql.connect-timeout
- mysql.connect_timeout = 60
-
-+; The name of the character set to use as the default character set.
-+;mysql.connect_charset=utf8
-+
- ; Trace mode. When trace_mode is active (=On), warnings for table/index scans
and
- ; SQL-Errors will be displayed.
- ; http://php.net/mysql.trace-mode
@@ -1191,6 +1104,9 @@
; http://php.net/mysqli.default-socket
mysqli.default_socket =
diff --git a/php-sapi-ini-file.patch b/php-sapi-ini-file.patch
index 9579ef8..3d0250e 100644
--- a/php-sapi-ini-file.patch
+++ b/php-sapi-ini-file.patch
@@ -1,5 +1,5 @@
---- php-7.0/main/php_ini.c~ 2015-05-21 22:56:59.000000000 +0300
-+++ php-7.0/main/php_ini.c 2015-05-21 23:01:21.580419532 +0300
+--- php-7.0.0beta1/main/php_ini.c~ 2015-07-13 16:04:48.000000000 +0300
++++ php-7.0.0beta1/main/php_ini.c 2015-07-13 16:10:07.496198519 +0300
@@ -379,12 +379,19 @@
}
/* }}} */
@@ -51,9 +51,9 @@
if (!fh.handle.fp) {
const char *fmt = "php-%s.ini";
char *ini_fname;
-@@ -594,15 +601,12 @@
+@@ -597,15 +597,12 @@
if (fh.handle.fp) {
- fh.filename = opened_path->val;
+ fh.filename = ZSTR_VAL(opened_path);
}
- }
@@ -61,7 +61,7 @@
- if (!fh.handle.fp) {
- fh.handle.fp = php_fopen_with_path("php.ini", "r",
php_ini_search_path, &opened_path);
- if (fh.handle.fp) {
-- fh.filename = opened_path->val;
+- fh.filename = ZSTR_VAL(opened_path);
- }
- }
+ // restore previous value, so php_ini_loaded_file()
works as expected
diff --git a/php-shared.patch b/php-shared.patch
index 2aaa1d5..db49e1b 100644
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -29,24 +29,24 @@
break; \
fi; \
done; \
---- php-5.4.0alpha2/sapi/cgi/config9.m4~ 2010-11-14 01:13:07.000000000
+0200
-+++ php-5.4.0alpha2/sapi/cgi/config9.m4 2011-08-01 10:28:47.495056372
+0300
+--- php-7.0.0beta1/sapi/cgi/config9.m4~ 2015-07-10 15:11:43.000000000
+0300
++++ php-7.0.0beta1/sapi/cgi/config9.m4 2015-07-13 16:03:06.900955209 +0300
@@ -64,7 +64,7 @@
- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS)
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS)
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o)
\$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS)
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS)
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o)
\$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
*)
-- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS)
\$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
-+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS)
\$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS)
\$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS)
\$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
++ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS)
\$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS)
\$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
esac
---- php-5.4.0alpha2/sapi/cgi/Makefile.frag~ 2010-11-14 01:13:07.000000000
+0200
-+++ php-5.4.0alpha2/sapi/cgi/Makefile.frag 2011-08-01 12:21:29.155180914
+0300
+--- php-7.0.0beta1/sapi/cgi/Makefile.frag~ 2015-07-10 15:11:43.000000000
+0300
++++ php-7.0.0beta1/sapi/cgi/Makefile.frag 2015-07-13 16:03:56.810212555
+0300
@@ -1,6 +1,6 @@
cgi: $(SAPI_CGI_PATH)
--$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS)
-+$(SAPI_CGI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS)
+-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS)
$(PHP_CGI_OBJS)
++$(SAPI_CGI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS)
$(PHP_CGI_OBJS)
$(BUILD_CGI)
install-cgi: $(SAPI_CGI_PATH)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/00938eace2ea9b309225e79de241f014bf3991a0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
