PHP_TEST_SHARED_EXTENSIONS = ` \
if test "x$(PHP_MODULES)" != "x"; then \
for i in $(PHP_MODULES)""; do \
---- php-5.3.2/Makefile.gcov 2010-03-16 16:31:36.972576955 +0200
-+++ php-5.3.2/Makefile.gcov 2010-03-16 16:31:36.972576955 +0200
-@@ -376,11 +376,25 @@
- @echo "Running test suite"
- @find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f
- -@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
-+ INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
-+ if test "$$INI_FILE"; then \
-+ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
-+ else \
-+ echo > $(top_builddir)/tmp-php.ini; \
-+ fi; \
-+ INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
-+ if test "$$INI_SCANNED_PATH"; then \
-+ INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \
-+ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
-+ fi; \
- NO_INTERACTION=1 \
- TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
- TEST_PHP_SRCDIR=$(top_srcdir) \
- CC="$(CC)" \
-- $(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
-+ $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
-+ -d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \
-+ $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
-+ -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \
- elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
- NO_INTERACTION=1 \
- TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
---- php-5.3.1/sapi/fpm/conf/php-fpm.conf.in 2009-11-26 23:49:50.761930204 +0200
-+++ php-5.3.1/sapi/fpm/conf/php-fpm.conf.in 2009-11-27 00:01:38.545190815 +0200
-@@ -38,7 +38,7 @@
-
- Address to accept fastcgi requests on.
- Valid syntax is 'ip.ad.re.ss:port' or just 'port' or '/path/to/unix/socket'
-- <value name="listen_address">127.0.0.1:@php_fpm_port@</value>
-+ <value name="listen_address">/var/run/php/fpm.sock</value>
-
- <value name="listen_options">
-
-@@ -110,7 +110,7 @@
- <value name="request_slowlog_timeout">0s</value>
-
- The log file for slow requests
-- <value name="slowlog">@php_fpm_log_path@.slow</value>
-+ <value name="slowlog">/var/log/fpm-slow.log</value>
-
- Set open file desc rlimit
- <value name="rlimit_files">1024</value>
-@@ -129,7 +129,7 @@
- Useful to work around memory leaks in 3rd party libraries.
- For endless request processing please specify 0
- Equivalent to PHP_FCGI_MAX_REQUESTS
-- <value name="max_requests">500</value>
-+ <value name="max_requests">100000</value>
-
- Comma separated list of ipv4 addresses of FastCGI clients that allowed to connect.
- Equivalent to FCGI_WEB_SERVER_ADDRS environment in original php.fcgi (5.2.2+)
-@@ -139,14 +139,7 @@
- Pass environment variables like LD_LIBRARY_PATH
- All $VARIABLEs are taken from current environment
- <value name="environment">
-- <value name="HOSTNAME">$HOSTNAME</value>
-- <value name="PATH">/usr/local/bin:/usr/bin:/bin</value>
-- <value name="TMP">/tmp</value>
-- <value name="TMPDIR">/tmp</value>
-- <value name="TEMP">/tmp</value>
-- <value name="OSTYPE">$OSTYPE</value>
-- <value name="MACHTYPE">$MACHTYPE</value>
-- <value name="MALLOC_CHECK_">2</value>
-+ <value name="PATH">$PATH</value>
- </value>
-
- </section>
+--- php-5.3.3/sapi/fpm/php-fpm.conf.in~ 2010-05-29 13:39:35.000000000 +0300
++++ php-5.3.3/sapi/fpm/php-fpm.conf.in 2010-07-24 22:29:56.752470466 +0300
+@@ -245,7 +245,7 @@
+ ; the current environment.
+ ; Default Value: clean env
+ ;env[HOSTNAME] = $HOSTNAME
+-;env[PATH] = /usr/local/bin:/usr/bin:/bin
++env[PATH] = $PATH
+ ;env[TMP] = /tmp
+ ;env[TMPDIR] = /tmp
+ ;env[TEMP] = /tmp
---- php-5.3.1/sapi/fpm/ac/fpm_build.m4~ 2009-11-26 18:12:06.000000000 +0200
-+++ php-5.3.1/sapi/fpm/ac/fpm_build.m4 2009-11-26 21:57:28.003071130 +0200
-@@ -36,7 +36,7 @@
+--- php-5.3.3/sapi/fpm/config.m4~ 2010-06-16 11:58:42.000000000 +0300
++++ php-5.3.3/sapi/fpm/config.m4 2010-07-24 22:32:25.642457281 +0300
+@@ -600,7 +600,7 @@
BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(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_SAPI_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) libphp_common.la \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
;;
- esac
+ esac
+--- php-5.3.3/sapi/fpm/Makefile.frag~ 2010-05-30 01:00:43.000000000 +0300
++++ php-5.3.3/sapi/fpm/Makefile.frag 2010-07-24 22:33:51.945781258 +0300
+@@ -3,7 +3,7 @@
+ $(builddir)/fpm:
+ @mkdir -p $(builddir)/fpm
+
+-$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
++$(SAPI_FPM_PATH): $(builddir)/fpm libphp_common.la $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
+ $(BUILD_FPM)
+
+ $(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h
if (mysqlnd_connect(H->server, host, dbh->username, dbh->password, password_len, dbname, dbname_len,
port, unix_socket, connect_opts, PDO_MYSQL_G(mysqlnd_thd_zval_cache) TSRMLS_CC) == NULL) {
#else
---- php-5.3.2RC3/ext/pdo_mysql/pdo_mysql.c~ 2010-02-04 11:37:38.000000000 +0200
-+++ php-5.3.2RC3/ext/pdo_mysql/pdo_mysql.c 2010-02-26 19:09:36.784902389 +0200
+--- php-5.3.3/ext/pdo_mysql/pdo_mysql.c~ 2010-07-24 19:23:14.000000000 +0300
++++ php-5.3.3/ext/pdo_mysql/pdo_mysql.c 2010-07-24 19:24:48.363581841 +0300
@@ -56,6 +56,7 @@
#if PDO_DBG_ENABLED
STD_PHP_INI_ENTRY("pdo_mysql.debug", NULL, PHP_INI_SYSTEM, OnUpdateString, debug, zend_pdo_mysql_globals, pdo_mysql_globals)
}
/* }}} */
-@@ -154,10 +151,13 @@
- /* }}} */
-
-
-+#endif /* PDO_USE_MYSQLND */
-+
- /* {{{ PHP_GINIT_FUNCTION
- */
- static PHP_GINIT_FUNCTION(pdo_mysql)
- {
-+#ifdef PDO_USE_MYSQLND
- #ifndef PHP_WIN32
- pdo_mysql_globals->default_socket = NULL;
- #endif
-@@ -165,10 +165,10 @@
+@@ -161,6 +161,7 @@
pdo_mysql_globals->debug = NULL; /* The actual string */
pdo_mysql_globals->dbg = NULL; /* The DBG object*/
#endif
-+#endif /* PDO_USE_MYSQLND */
+ pdo_mysql_globals->connect_charset = NULL;
}
/* }}} */
--#endif
--
-
- /* {{{ pdo_mysql_functions[] */
- const zend_function_entry pdo_mysql_functions[] = {
-@@ -205,15 +205,11 @@
- #endif
- PHP_MINFO(pdo_mysql),
- "1.0.2",
--#if PDO_USE_MYSQLND
- PHP_MODULE_GLOBALS(pdo_mysql),
- PHP_GINIT(pdo_mysql),
- NULL,
- NULL,
- STANDARD_MODULE_PROPERTIES_EX
--#else
-- STANDARD_MODULE_PROPERTIES
--#endif
- };
- /* }}} */
--- php-5.3.2RC3/ext/pdo_mysql/php_pdo_mysql_int.h~ 2010-02-04 11:37:38.000000000 +0200
+++ php-5.3.2RC3/ext/pdo_mysql/php_pdo_mysql_int.h 2010-02-26 19:11:47.484055898 +0200
---- php/ext/sybase_ct/config.m4~ 2007-07-03 19:25:35.000000000 +0200
-+++ php/ext/sybase_ct/config.m4 2008-06-16 10:42:20.463792334 +0200
+--- php-5.3.3/ext/sybase_ct/config.m4~ 2010-07-07 13:15:24.000000000 +0300
++++ php-5.3.3/ext/sybase_ct/config.m4 2010-07-24 19:21:13.897144810 +0300
@@ -31,7 +31,7 @@
fi
PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
-- if test -f $SYBASE_CT_INCDIR/tds.h; then
-+ if test -f $SYBASE_CT_INCDIR/sybdb.h; then
+- if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then
++ if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h || test -f $SYBASE_CT_INCDIR/sybdb.h; then
PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
- else
+ elif test -f $SYBASE_CT_INCDIR/libsybct64; then
%bcond_without apache2 # disable building Apache 2.x SAPI
%bcond_without zts # disable Zend Thread Safety
%bcond_without cgi # disable CGI/FCGI SAPI
-%bcond_without fpm # fpm patches from http://www.php-fpm.org/
+%bcond_without fpm # disable FPM
%bcond_without suhosin # with suhosin patch
%bcond_with tests # default off; test process very often hangs on builders, approx run time 45m; perform "make test"
%bcond_with gcov # Enable Code coverage reporting
%undefine with_filter
%endif
-%define rel 5
+%define rel 0.1
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
Name: php
-Version: 5.3.2
+Version: 5.3.3
Release: %{rel}%{?with_type_hints:th}
Epoch: 4
License: PHP
Group: Libraries
Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5: 46f500816125202c48a458d0133254a4
+# Source0-md5: 21ceeeb232813c10283a5ca1b4c87b48
Source2: %{name}-mod_%{name}.conf
Source3: %{name}-cgi-fcgi.ini
Source4: %{name}-apache.ini
Patch37: %{name}-mysqli-charsetphpini.patch
Patch38: %{name}-pdo_mysql-charsetphpini.patch
Patch39: %{name}-use-prog_sendmail.patch
-Patch40: %{name}-fpm.patch
Patch41: %{name}-fpm-config.patch
Patch42: %{name}-fpm-shared.patch
Patch43: %{name}-silent-session-cleanup.patch
%patch38 -p1
%patch39 -p1
%if %{with fpm}
-%patch40 -p1
%patch41 -p1
%patch42 -p1
%endif
projects / packages / php.git / commitdiff