From 884aec8fccf460e29849958e44b34c71ba405608 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Jul 2013 18:14:35 +0200 Subject: PHP 5.4.17 --- php-5.4.16-fpm.patch | 31 --- php-5.4.16-gc.patch | 83 ------ php-5.4.16-man.patch | 668 ---------------------------------------------- php-5.4.16-pdopgsql.patch | 33 --- php-5.4.16-pdotests.patch | 34 --- php-5.4.17-man.patch | 668 ++++++++++++++++++++++++++++++++++++++++++++++ php54.spec | 23 +- 7 files changed, 675 insertions(+), 865 deletions(-) delete mode 100644 php-5.4.16-fpm.patch delete mode 100644 php-5.4.16-gc.patch delete mode 100644 php-5.4.16-man.patch delete mode 100644 php-5.4.16-pdopgsql.patch delete mode 100644 php-5.4.16-pdotests.patch create mode 100644 php-5.4.17-man.patch diff --git a/php-5.4.16-fpm.patch b/php-5.4.16-fpm.patch deleted file mode 100644 index 4a32fcf..0000000 --- a/php-5.4.16-fpm.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9f6ca9bc6400fc9c8eaebf963f6eb048dde4b34f Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 24 May 2013 12:09:05 +0200 -Subject: [PATCH] Fixed Bug #64915 (error_log ignored when daemonize=0) - -Use configured error_log file when stderr is not a tty. -So only use tty during interactive debug run. ---- - NEWS | 3 +++ - sapi/fpm/fpm/fpm_stdio.c | 4 ++++ - 2 files changed, 7 insertions(+) - -diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c -index 10b867d..d81e101 100644 ---- a/sapi/fpm/fpm/fpm_stdio.c -+++ b/sapi/fpm/fpm/fpm_stdio.c -@@ -291,7 +291,11 @@ int fpm_stdio_open_error_log(int reopen) /* {{{ */ - fd = fpm_globals.error_log_fd; /* for FD_CLOSEXEC to work */ - } else { - fpm_globals.error_log_fd = fd; -+#if HAVE_UNISTD_H -+ if (fpm_global_config.daemonize || !isatty(STDERR_FILENO)) { -+#else - if (fpm_global_config.daemonize) { -+#endif - zlog_set_fd(fpm_globals.error_log_fd); - } - } --- -1.7.11.5 - diff --git a/php-5.4.16-gc.patch b/php-5.4.16-gc.patch deleted file mode 100644 index a1f4323..0000000 --- a/php-5.4.16-gc.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 3c87945c95c9c31986e690bb046c70e58c8d8896 Mon Sep 17 00:00:00 2001 -From: Xinchen Hui -Date: Wed, 5 Jun 2013 17:25:00 +0800 -Subject: [PATCH] Fixed bug #64960 (Segfault in gc_zval_possible_root) - ---- - NEWS | 2 ++ - Zend/tests/bug64960.phpt | 40 ++++++++++++++++++++++++++++++++++++++++ - Zend/zend_execute_API.c | 6 ++---- - 3 files changed, 44 insertions(+), 4 deletions(-) - create mode 100644 Zend/tests/bug64960.phpt - -diff --git a/Zend/tests/bug64960.phpt b/Zend/tests/bug64960.phpt -new file mode 100644 -index 0000000..b31cca3 ---- /dev/null -+++ b/Zend/tests/bug64960.phpt -@@ -0,0 +1,40 @@ -+--TEST-- -+Bug #64960 (Segfault in gc_zval_possible_root) -+--FILE-- -+_trace = debug_backtrace(); -+ -+ throw $e; -+}); -+ -+// trigger error handler -+$a['waa']; -+?> -+--EXPECTF-- -+Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush in %sbug64960.php on line 3 -+ -+Fatal error: Uncaught exception 'Exception' in %sbug64960.php:19 -+Stack trace: -+#0 [internal function]: {closure}(8, 'ob_end_clean():...', '%s', 9, Array) -+#1 %sbug64960.php(9): ob_end_clean() -+#2 [internal function]: ExceptionHandler->__invoke(Object(Exception)) -+#3 {main} -+ thrown in %sbug64960.php on line 19 -diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c -index 9781889..687520d 100644 ---- a/Zend/zend_execute_API.c -+++ b/Zend/zend_execute_API.c -@@ -263,15 +263,13 @@ void shutdown_executor(TSRMLS_D) /* {{{ */ - if (EG(user_error_handler)) { - zeh = EG(user_error_handler); - EG(user_error_handler) = NULL; -- zval_dtor(zeh); -- FREE_ZVAL(zeh); -+ zval_ptr_dtor(&zeh); - } - - if (EG(user_exception_handler)) { - zeh = EG(user_exception_handler); - EG(user_exception_handler) = NULL; -- zval_dtor(zeh); -- FREE_ZVAL(zeh); -+ zval_ptr_dtor(&zeh); - } - - zend_stack_destroy(&EG(user_error_handlers_error_reporting)); --- -1.7.11.5 - diff --git a/php-5.4.16-man.patch b/php-5.4.16-man.patch deleted file mode 100644 index d0c034a..0000000 --- a/php-5.4.16-man.patch +++ /dev/null @@ -1,668 +0,0 @@ ->From c940aab7895fa4cb109e7790ae14080090b04959 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Tue, 2 Jul 2013 10:42:47 +0200 -Subject: [PATCH] Fixed Bug #65143 Missing php-cgi man page - -Currently php-cgi man page is a simple redirect to -php (CLI) man page. - -Could be splited / improved in the future. ---- - sapi/cgi/Makefile.frag | 3 +++ - sapi/cgi/config9.m4 | 2 ++ - sapi/cgi/php-cgi.1.in | 1 + - sapi/cli/php.1.in | 2 ++ - 4 files changed, 8 insertions(+) - create mode 100644 sapi/cgi/php-cgi.1.in - -diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag -index 505119e..d54dd40 100644 ---- a/sapi/cgi/Makefile.frag -+++ b/sapi/cgi/Makefile.frag -@@ -6,4 +6,7 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS) - install-cgi: $(SAPI_CGI_PATH) - @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" - @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) -+ @echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/" -+ @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 -+ @$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1 - -diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4 -index 67251ae..49e61c8 100644 ---- a/sapi/cgi/config9.m4 -+++ b/sapi/cgi/config9.m4 -@@ -71,6 +71,8 @@ if test "$PHP_CGI" != "no"; then - dnl Expose to Makefile - PHP_SUBST(SAPI_CGI_PATH) - PHP_SUBST(BUILD_CGI) -+ -+ PHP_OUTPUT(sapi/cgi/php-cgi.1) - else - AC_MSG_RESULT(yes) - fi -diff --git a/sapi/cgi/php-cgi.1.in b/sapi/cgi/php-cgi.1.in -new file mode 100644 -index 0000000..340e6c5 ---- /dev/null -+++ b/sapi/cgi/php-cgi.1.in -@@ -0,0 +1 @@ -+.so man1/php.1 -diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in -index 0e9d07a..6f0266d 100644 ---- a/sapi/cli/php.1.in -+++ b/sapi/cli/php.1.in -@@ -1,6 +1,8 @@ - .TH PHP 1 "2013" "The PHP Group" "Scripting Language" - .SH NAME - php \- PHP Command Line Interface 'CLI' -+.P -+php-cgi \- PHP Command Gateway Interface 'CGI' - .SH SYNOPSIS - .B php - [options] [ --- -1.7.11.5 - ->From f4ce5e7fb65ce215ea5fd182a90aaa4d634f6023 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Tue, 2 Jul 2013 10:46:50 +0200 -Subject: [PATCH] Fixed Bug #65142 Missing phar man page - -Simple man page from phar help output. ---- - NEWS | 3 + - ext/phar/Makefile.frag | 4 + - ext/phar/config.m4 | 2 + - ext/phar/phar.1.in | 523 ++++++++++++++++++++++++++++++++++++++++++++++++ - ext/phar/phar.phar.1.in | 1 + - 5 files changed, 533 insertions(+) - create mode 100644 ext/phar/phar.1.in - create mode 100644 ext/phar/phar.phar.1.in - -diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag -index b1c820f..ed6de9f 100644 ---- a/ext/phar/Makefile.frag -+++ b/ext/phar/Makefile.frag -@@ -40,3 +40,7 @@ install-pharcmd: pharcmd - $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir) - -@rm -f $(INSTALL_ROOT)$(bindir)/phar - $(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar -+ @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 -+ @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1 -+ @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1 -+ -diff --git a/ext/phar/config.m4 b/ext/phar/config.m4 -index 2ac7f3d..d424060 100644 ---- a/ext/phar/config.m4 -+++ b/ext/phar/config.m4 -@@ -27,4 +27,6 @@ if test "$PHP_PHAR" != "no"; then - PHP_ADD_EXTENSION_DEP(phar, hash, true) - PHP_ADD_EXTENSION_DEP(phar, spl, true) - PHP_ADD_MAKEFILE_FRAGMENT -+ -+ PHP_OUTPUT(ext/phar/phar.1 ext/phar/phar.phar.1) - fi -diff --git a/ext/phar/phar.1.in b/ext/phar/phar.1.in -new file mode 100644 -index 0000000..259a2ba ---- /dev/null -+++ b/ext/phar/phar.1.in -@@ -0,0 +1,523 @@ -+.TH PHAR 1 "2013" "The PHP Group" "User Commands" -+.SH NAME -+phar, phar.phar \- PHAR (PHP archive) command line tool -+.SH SYNOPSIS -+.B phar -+ [options] ... -+.LP -+.SH DESCRIPTION -+The \fBPHAR\fP file format provides a way to put entire PHP applications into a single -+file called a "phar" (PHP Archive) for easy distribution and installation. -+.P -+With the \fBphar\fP command you can create, update or extract PHP archives. -+.P -+Commands: -+add compress delete extract help help-list info list meta-del -+meta-get meta-set pack sign stub-get stub-set tree version -+ -+.SH add command -+Add entries to a PHAR package. -+.P -+Required arguments: -+.TP 15 -+.PD -+.B -f \fIfile\fP -+Specifies the phar \fIfile\fP to work on. -+.TP -+.PD -+.B ... -+Any number of input files and directories. If -i is in -+use then ONLY files and matching the given regular -+expression are being packed. If -x is given then files -+matching that regular expression are NOT being packed. -+.P -+Optional arguments: -+.TP 15 -+.PD -+.B \-a \fIalias\fP -+Provide an \fIalias\fP name for the phar file. -+.TP -+.PD -+.B \-c \fIalgo\fP -+Compression algorithm (see -+.SM -+.B COMPRESSION -+) -+.TP -+.PD -+.B \-i \fIregex\fP -+Specifies a regular expression for input files. -+.TP -+.PD -+.B \-l \fIlevel\fP -+Number of preceding subdirectories to strip from file entries -+.TP -+.PD -+.B \-x \fIregex\fP -+Regular expression for input files to exclude. -+ -+.SH compress command -+Compress or uncompress all files or a selected entry. -+.P -+Required arguments: -+.TP 15 -+.PD -+.B \-c \fIalgo\fP -+Compression algorithm (see -+.SM -+.B COMPRESSION -+) -+.TP -+.PD -+.B -f \fIfile\fP -+Specifies the phar \fIfile\fP to work on. -+.P -+Optional arguments: -+.TP 15 -+.PD -+.B -e \fIentry\fP -+Name of \fIentry\fP to work on (must include PHAR internal -+directory name if any). -+ -+.SH delete command -+Delete entry from a PHAR archive -+.P -+Required arguments: -+.TP 15 -+.PD -+.B \-e \fIentry\fP -+Name of \fIentry\fP to work on (must include PHAR internal -+directory name if any). -+.TP -+.PD -+.B -f \fIfile\fP -+Specifies the phar \fIfile\fP to work on. -+ -+.SH extract command -+Extract a PHAR package to a directory. -+.P -+Required arguments: -+.TP 15 -+.PD -+.B -f \fIfile\fP -+Specifies the phar \fIfile\fP to work on. -+.P -+Optional arguments: -+.TP 15 -+.PD -+.B -i \fIregex\fP -+Specifies a regular expression for input files. -+.TP -+.PD -+.B -x \fIregex\fP -+Regular expression for input files to exclude. -+.TP -+.PD -+.B ... -+Directory to extract to (defaults to '.'). -+ -+ -+.SH help command -+This help or help for a selected command. -+.P -+Optional arguments: -+.TP 15 -+.PD -+.B ... -+Optional command to retrieve help for. -+ -+.SH help-list command -+Lists available commands. -+ -+.SH info command -+Get information about a PHAR package. -+.P -+By using -k it is possible to return a single value. -+.P -+Required arguments: -+.TP 15 -+.PD -+.B -f \fIfile\fP -+Specifies the phar \fIfile\fP to work on. -+.P -+Optional arguments: -+.TP 15 -+.PD -+.B -k \fIindex\fP -+Subscription \fIindex\fP to work on. -+ -+.SH list command -+List contents of a PHAR archive. -+.P -+Required arguments: -+.TP 15 -+.PD -+.B -f \fIfile\fP -+Specifies the phar \fIfile\fP to work on. -+.P -+Optional arguments: -+.TP 15 -+.PD -+.B -i \fIregex\fP -+Specifies a regular expression for input files. -+.TP -+.PD -+.B -x \fIregex\fP -+Regular expression for input files to exclude. -+ -+ -+.SH meta-del command -+Delete meta information of a PHAR entry or a PHAR package. -+.P -+If -k is given then the metadata is expected to be an array and the -+given index is being deleted. -+.P -+If something was deleted the return value is 0 otherwise it is 1. -+.P -+Required arguments: -+.TP 15 -+.PD -+.B -f \fIfile\fP -+Specifies the phar \fIfile\fP to work on. -+.P -+Optional arguments: -+.TP 15 -+.PD -+.B -e \fIentry\fP -+Name of \fIentry\fP to work on (must include PHAR internal -+directory name if any). -+.TP -+.PD -+.B -k \fIindex\fP -+Subscription \fIindex\fP to work on. -+ -+.SH meta-get command -+Get meta information of a PHAR entry or a PHAR package in serialized from. If -+no output file is specified for meta data then stdout is being used. -+You can also specify a particular index using -k. In that case the -+metadata is expected to be an array and the value of the given index -+is returned using echo rather than using serialize. If that index does -+not exist or no meta data is present then the return value is 1. -+.P -+Required arguments: -+.TP 15 -+.PD -+.B -f \fIfile\fP -+Specifies the phar \fIfile\fP to work on. -+.P -+Optional arguments: -+.TP 15 -+.PD -+.B -e \fIentry\fP -+Name of \fIentry\fP to work on (must include PHAR internal -+directory name if any). -+.TP -+.PD -+.B -k \fIindex\fP -+Subscription \fIindex\fP to work on. -+ -+.SH meta-set command -+Set meta data of a PHAR entry or a PHAR package using serialized input. If no -+input file is specified for meta data then stdin is being used. You can -+also specify a particular index using -k. In that case the metadata is -+expected to be an array and the value of the given index is being set. -+If the metadata is not present or empty a new array will be created. -+If the metadata is present and a flat value then the return value is -+1. Also using -k the input is been taken directly rather then being -+serialized. -+.P -+Required arguments: -+.TP 15 -+.PD -+.B -f \fIfile\fP -+Specifies the phar \fIfile\fP to work on. -+.TP -+.PD -+.B -m \fImeta\fP -+Meta data to store with entry (serialized php data). -+.P -+Optional arguments: -+.TP 15 -+.PD -+.B -e \fIentry\fP -+Name of \fIentry\fP to work on (must include PHAR internal -+directory name if any). -+.TP -+.PD -+.B -k \fIindex\fP -+Subscription \fIindex\fP to work on. -+ -+.SH pack command -+Pack files into a PHAR archive. -+.P -+When using -s , then the stub file is being excluded from the -+list of input files/dirs.To create an archive that contains PEAR class -+PHP_Archive then point -p argument to PHP/Archive.php. -+.P -+Required arguments: -+.TP 15 -+.PD -+.B -f \fIfile\fP -+Specifies the phar \fIfile\fP to work on. -+.TP -+.PD -+.B ... -+Any number of input files and directories. If -i is in -+use then ONLY files and matching the given regular -+expression are being packed. If -x is given then files -+matching that regular expression are NOT being packed. -+.P -+Optional arguments: -+.TP 15 -+.PD -+.B \-a \fIalias\fP -+Provide an \fIalias\fP name for the phar file. -+.TP -+.PD -+.B \-b \fIbang\fP -+Hash-bang line to start the archive (e.g. #!/usr/bin/php). -+The hash mark itself '#!' and the newline character are optional. -+.TP -+.PD -+.B \-c \fIalgo\fP -+Compression algorithm (see -+.SM -+.B COMPRESSION -+) -+.TP -+.PD -+.B \-h \fIhash\fP -+Selects the \fIhash\fP algorithm (see -+.SM -+.B HASH -+) -+.TP -+.PD -+.B \-i \fIregex\fP -+Specifies a regular expression for input files. -+.TP -+.PD -+.B \-l \fIlevel\fP -+Number of preceding subdirectories to strip from file entries -+.TP -+.PD -+.B \-p \fIloader\fP -+Location of PHP_Archive class file (pear list-files -+PHP_Archive).You can use '0' or '1' to locate it -+automatically using the mentioned pear command. When -+using '0' the command does not error out when the class -+file cannot be located. This switch also adds some code -+around the stub so that class PHP_Archive gets -+registered as phar:// stream wrapper if necessary. And -+finally this switch will add the file phar.inc from -+this package and load it to ensure class Phar is -+present. -+.TP -+.PD -+.B \-s \fIstub\fP -+Select the \fIstub\fP file. -+.TP -+.PD -+.B \-x \fIregex\fP -+Regular expression for input files to exclude. -+.TP -+.PD -+.B \-y \fIkey\fP -+Private \fIkey\fP for OpenSSL signing. -+ -+.SH sign command -+Set signature hash algorithm. -+.P -+Required arguments: -+.TP 15 -+.PD -+.B -f \fIfile\fP -+Specifies the phar \fIfile\fP to work on. -+.TP -+.PD -+.B \-h \fIhash\fP -+Selects the \fIhash\fP algorithm (see -+.SM -+.B HASH -+) -+.P -+Optional arguments: -+.TP 15 -+.PD -+.B \-y \fIkey\fP -+Private \fIkey\fP for OpenSSL signing. -+ -+.SH stub-get command -+Get the stub of a PHAR file. If no output file is specified as stub then stdout -+is being used. -+.P -+Required arguments: -+.TP 15 -+.PD -+.B -f \fIfile\fP -+Specifies the phar \fIfile\fP to work on. -+.P -+Optional arguments: -+.TP 15 -+.PD -+.B \-s \fIstub\fP -+Select the \fIstub\fP file. -+ -+.SH stub-set command -+Set the stub of a PHAR file. If no input file is specified as stub then stdin -+is being used. -+.P -+Required arguments: -+.TP 15 -+.PD -+.B -f \fIfile\fP -+Specifies the phar \fIfile\fP to work on. -+.P -+Optional arguments: -+.TP 15 -+.PD -+.B \-b \fIbang\fP -+Hash-bang line to start the archive (e.g. #!/usr/bin/php). -+The hash mark itself '#!' and the newline character are optional. -+.TP -+.PD -+.B \-p \fIloader\fP -+Location of PHP_Archive class file (pear list-files -+PHP_Archive).You can use '0' or '1' to locate it -+automatically using the mentioned pear command. When -+using '0' the command does not error out when the class -+file cannot be located. This switch also adds some code -+around the stub so that class PHP_Archive gets -+registered as phar:// stream wrapper if necessary. And -+finally this switch will add the file phar.inc from -+this package and load it to ensure class Phar is -+present. -+.TP -+.PD -+.B \-s \fIstub\fP -+Select the \fIstub\fP file. -+ -+ -+.SH tree command -+Get a directory tree for a PHAR archive. -+.P -+Required arguments: -+.TP 15 -+.PD -+.B -f \fIfile\fP -+Specifies the phar \fIfile\fP to work on. -+.P -+Optional arguments: -+.TP 15 -+.PD -+.B \-i \fIregex\fP -+Specifies a regular expression for input files. -+.TP -+.PD -+.B \-x \fIregex\fP -+Regular expression for input files to exclude. -+ -+.SH version command -+Get information about the PHAR environment and the tool version. -+ -+ -+.SH COMPRESSION -+Algorithms: -+.TP 15 -+.PD -+.B 0 -+No compression -+.TP -+.PD -+.B none -+No compression -+.TP -+.PD -+.B auto -+Automatically select compression algorithm -+.TP -+.PD -+.B gz -+GZip compression -+.TP -+.PD -+.B gzip -+GZip compression -+.TP -+.PD -+.B bz2 -+BZip2 compression -+.TP -+.PD -+.B bzip2 -+BZip2 compression -+ -+.SH HASH -+Algorithms: -+.TP 15 -+.PD -+.TP -+.PD -+.B md5 -+MD5 -+.TP -+.PD -+.B sha1 -+SHA1 -+.TP -+.PD -+.B sha256 -+SHA256 -+.TP -+.PD -+.B sha512 -+SHA512 -+.TP -+.PD -+.B openssl -+OpenSSL -+ -+.SH SEE ALSO -+For a more or less complete description of PHAR look here: -+.PD 0 -+.P -+.B http://php.net/phar -+.PD 1 -+.P -+.SH BUGS -+You can view the list of known bugs or report any new bug you -+found at: -+.PD 0 -+.P -+.B http://bugs.php.net -+.PD 1 -+.SH AUTHORS -+The PHP Group: Thies C. Arntzen, Stig Bakken, Andi Gutmans, Rasmus Lerdorf, Sam Ruby, Sascha Schumann, Zeev Suraski, Jim Winstead, Andrei Zmievski. -+.P -+Work for the PHP archive was done by Gregory Beaver, Marcus Boerger. -+.P -+A List of active developers can be found here: -+.PD 0 -+.P -+.B http://www.php.net/credits.php -+.PD 1 -+.P -+And last but not least PHP was developed with the help of a huge amount of -+contributors all around the world. -+.SH VERSION INFORMATION -+This manpage describes \fBphar\fP, version @PHP_VERSION@. -+.SH COPYRIGHT -+Copyright \(co 1997\-2013 The PHP Group -+.LP -+This source file is subject to version 3.01 of the PHP license, -+that is bundled with this package in the file LICENSE, and is -+available through the world-wide-web at the following url: -+.PD 0 -+.P -+.B http://www.php.net/license/3_01.txt -+.PD 1 -+.P -+If you did not receive a copy of the PHP license and are unable to -+obtain it through the world-wide-web, please send a note to -+.B license@php.net -+so we can mail you a copy immediately. -diff --git a/ext/phar/phar.phar.1.in b/ext/phar/phar.phar.1.in -new file mode 100644 -index 0000000..b5eecbf ---- /dev/null -+++ b/ext/phar/phar.phar.1.in -@@ -0,0 +1 @@ -+.so man1/phar.1 --- -1.7.11.5 - ->From 67817a199ca4c8bcff163cb005287c0087db6bf3 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Tue, 2 Jul 2013 12:19:09 +0200 -Subject: [PATCH] fix typo in php man page - ---- - sapi/cli/php.1.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in -index 6f0266d..749baa8 100644 ---- a/sapi/cli/php.1.in -+++ b/sapi/cli/php.1.in -@@ -2,7 +2,7 @@ - .SH NAME - php \- PHP Command Line Interface 'CLI' - .P --php-cgi \- PHP Command Gateway Interface 'CGI' -+php-cgi \- PHP Common Gateway Interface 'CGI' command - .SH SYNOPSIS - .B php - [options] [ --- -1.7.11.5 - diff --git a/php-5.4.16-pdopgsql.patch b/php-5.4.16-pdopgsql.patch deleted file mode 100644 index eff1edb..0000000 --- a/php-5.4.16-pdopgsql.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1c623e3b07128e78362911ff5754e7eee57fa8bb Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 31 May 2013 08:39:32 +0200 -Subject: [PATCH] Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error) - -There is a lot of call such as: - pdo_pgsql_error(dbh, PGRES_FATAL_ERROR, "Copy command failed"); -Where the 3rd paramater is a error message string where a sqlstate (5 chars) -is expected. This cause a segfault in copy_from.phpt and copy_to.phpt. - -This is only a sanity check to avoid buffer overflow, but obviously this -calls need to be fixed (using NULL or a correct sqlstate). ---- - NEWS | 3 +++ - ext/pdo_pgsql/pgsql_driver.c | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c -index 645fd36..55f4418 100644 ---- a/ext/pdo_pgsql/pgsql_driver.c -+++ b/ext/pdo_pgsql/pgsql_driver.c -@@ -76,7 +76,7 @@ int _pdo_pgsql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, int errcode, const char * - einfo->errmsg = NULL; - } - -- if (sqlstate == NULL) { -+ if (sqlstate == NULL || strlen(sqlstate) >= sizeof(pdo_error_type)) { - strcpy(*pdo_err, "HY000"); - } - else { --- -1.7.11.5 - diff --git a/php-5.4.16-pdotests.patch b/php-5.4.16-pdotests.patch deleted file mode 100644 index 7371798..0000000 --- a/php-5.4.16-pdotests.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c08e1d2be948d63f7a9309344a0ed4092ac8dace Mon Sep 17 00:00:00 2001 -From: Nikita Popov -Date: Sun, 24 Mar 2013 17:52:16 +0100 -Subject: [PATCH] Fix PDO::inTransaction() test for pgsql - -inTransaction() nowadays casts the in_transaction result to boolean. -I'm not sure whether the INERROR state should result in true or false. -For now I went with the result that we actually get. ---- - ext/pdo_pgsql/tests/is_in_transaction.phpt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/ext/pdo_pgsql/tests/is_in_transaction.phpt b/ext/pdo_pgsql/tests/is_in_transaction.phpt -index 99ff561..72da4f4 100644 ---- a/ext/pdo_pgsql/tests/is_in_transaction.phpt -+++ b/ext/pdo_pgsql/tests/is_in_transaction.phpt -@@ -57,10 +57,10 @@ var_dump($db->inTransaction()); - ?> - --EXPECT-- - Test PDO::PGSQL_TRANSACTION_INTRANS --int(2) -+bool(true) - Test PDO::PGSQL_TRANSACTION_IDLE --int(0) -+bool(false) - Test PDO::PGSQL_TRANSACTION_INERROR --int(3) -+bool(true) - Test PDO::PGSQL_TRANSACTION_IDLE --int(0) -+bool(false) --- -1.7.11.5 - diff --git a/php-5.4.17-man.patch b/php-5.4.17-man.patch new file mode 100644 index 0000000..d0c034a --- /dev/null +++ b/php-5.4.17-man.patch @@ -0,0 +1,668 @@ +>From c940aab7895fa4cb109e7790ae14080090b04959 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 2 Jul 2013 10:42:47 +0200 +Subject: [PATCH] Fixed Bug #65143 Missing php-cgi man page + +Currently php-cgi man page is a simple redirect to +php (CLI) man page. + +Could be splited / improved in the future. +--- + sapi/cgi/Makefile.frag | 3 +++ + sapi/cgi/config9.m4 | 2 ++ + sapi/cgi/php-cgi.1.in | 1 + + sapi/cli/php.1.in | 2 ++ + 4 files changed, 8 insertions(+) + create mode 100644 sapi/cgi/php-cgi.1.in + +diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag +index 505119e..d54dd40 100644 +--- a/sapi/cgi/Makefile.frag ++++ b/sapi/cgi/Makefile.frag +@@ -6,4 +6,7 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS) + install-cgi: $(SAPI_CGI_PATH) + @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" + @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) ++ @echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/" ++ @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 ++ @$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1 + +diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4 +index 67251ae..49e61c8 100644 +--- a/sapi/cgi/config9.m4 ++++ b/sapi/cgi/config9.m4 +@@ -71,6 +71,8 @@ if test "$PHP_CGI" != "no"; then + dnl Expose to Makefile + PHP_SUBST(SAPI_CGI_PATH) + PHP_SUBST(BUILD_CGI) ++ ++ PHP_OUTPUT(sapi/cgi/php-cgi.1) + else + AC_MSG_RESULT(yes) + fi +diff --git a/sapi/cgi/php-cgi.1.in b/sapi/cgi/php-cgi.1.in +new file mode 100644 +index 0000000..340e6c5 +--- /dev/null ++++ b/sapi/cgi/php-cgi.1.in +@@ -0,0 +1 @@ ++.so man1/php.1 +diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in +index 0e9d07a..6f0266d 100644 +--- a/sapi/cli/php.1.in ++++ b/sapi/cli/php.1.in +@@ -1,6 +1,8 @@ + .TH PHP 1 "2013" "The PHP Group" "Scripting Language" + .SH NAME + php \- PHP Command Line Interface 'CLI' ++.P ++php-cgi \- PHP Command Gateway Interface 'CGI' + .SH SYNOPSIS + .B php + [options] [ +-- +1.7.11.5 + +>From f4ce5e7fb65ce215ea5fd182a90aaa4d634f6023 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 2 Jul 2013 10:46:50 +0200 +Subject: [PATCH] Fixed Bug #65142 Missing phar man page + +Simple man page from phar help output. +--- + NEWS | 3 + + ext/phar/Makefile.frag | 4 + + ext/phar/config.m4 | 2 + + ext/phar/phar.1.in | 523 ++++++++++++++++++++++++++++++++++++++++++++++++ + ext/phar/phar.phar.1.in | 1 + + 5 files changed, 533 insertions(+) + create mode 100644 ext/phar/phar.1.in + create mode 100644 ext/phar/phar.phar.1.in + +diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag +index b1c820f..ed6de9f 100644 +--- a/ext/phar/Makefile.frag ++++ b/ext/phar/Makefile.frag +@@ -40,3 +40,7 @@ install-pharcmd: pharcmd + $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir) + -@rm -f $(INSTALL_ROOT)$(bindir)/phar + $(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar ++ @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 ++ @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1 ++ @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1 ++ +diff --git a/ext/phar/config.m4 b/ext/phar/config.m4 +index 2ac7f3d..d424060 100644 +--- a/ext/phar/config.m4 ++++ b/ext/phar/config.m4 +@@ -27,4 +27,6 @@ if test "$PHP_PHAR" != "no"; then + PHP_ADD_EXTENSION_DEP(phar, hash, true) + PHP_ADD_EXTENSION_DEP(phar, spl, true) + PHP_ADD_MAKEFILE_FRAGMENT ++ ++ PHP_OUTPUT(ext/phar/phar.1 ext/phar/phar.phar.1) + fi +diff --git a/ext/phar/phar.1.in b/ext/phar/phar.1.in +new file mode 100644 +index 0000000..259a2ba +--- /dev/null ++++ b/ext/phar/phar.1.in +@@ -0,0 +1,523 @@ ++.TH PHAR 1 "2013" "The PHP Group" "User Commands" ++.SH NAME ++phar, phar.phar \- PHAR (PHP archive) command line tool ++.SH SYNOPSIS ++.B phar ++ [options] ... ++.LP ++.SH DESCRIPTION ++The \fBPHAR\fP file format provides a way to put entire PHP applications into a single ++file called a "phar" (PHP Archive) for easy distribution and installation. ++.P ++With the \fBphar\fP command you can create, update or extract PHP archives. ++.P ++Commands: ++add compress delete extract help help-list info list meta-del ++meta-get meta-set pack sign stub-get stub-set tree version ++ ++.SH add command ++Add entries to a PHAR package. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.TP ++.PD ++.B ... ++Any number of input files and directories. If -i is in ++use then ONLY files and matching the given regular ++expression are being packed. If -x is given then files ++matching that regular expression are NOT being packed. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B \-a \fIalias\fP ++Provide an \fIalias\fP name for the phar file. ++.TP ++.PD ++.B \-c \fIalgo\fP ++Compression algorithm (see ++.SM ++.B COMPRESSION ++) ++.TP ++.PD ++.B \-i \fIregex\fP ++Specifies a regular expression for input files. ++.TP ++.PD ++.B \-l \fIlevel\fP ++Number of preceding subdirectories to strip from file entries ++.TP ++.PD ++.B \-x \fIregex\fP ++Regular expression for input files to exclude. ++ ++.SH compress command ++Compress or uncompress all files or a selected entry. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B \-c \fIalgo\fP ++Compression algorithm (see ++.SM ++.B COMPRESSION ++) ++.TP ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B -e \fIentry\fP ++Name of \fIentry\fP to work on (must include PHAR internal ++directory name if any). ++ ++.SH delete command ++Delete entry from a PHAR archive ++.P ++Required arguments: ++.TP 15 ++.PD ++.B \-e \fIentry\fP ++Name of \fIentry\fP to work on (must include PHAR internal ++directory name if any). ++.TP ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++ ++.SH extract command ++Extract a PHAR package to a directory. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B -i \fIregex\fP ++Specifies a regular expression for input files. ++.TP ++.PD ++.B -x \fIregex\fP ++Regular expression for input files to exclude. ++.TP ++.PD ++.B ... ++Directory to extract to (defaults to '.'). ++ ++ ++.SH help command ++This help or help for a selected command. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B ... ++Optional command to retrieve help for. ++ ++.SH help-list command ++Lists available commands. ++ ++.SH info command ++Get information about a PHAR package. ++.P ++By using -k it is possible to return a single value. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B -k \fIindex\fP ++Subscription \fIindex\fP to work on. ++ ++.SH list command ++List contents of a PHAR archive. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B -i \fIregex\fP ++Specifies a regular expression for input files. ++.TP ++.PD ++.B -x \fIregex\fP ++Regular expression for input files to exclude. ++ ++ ++.SH meta-del command ++Delete meta information of a PHAR entry or a PHAR package. ++.P ++If -k is given then the metadata is expected to be an array and the ++given index is being deleted. ++.P ++If something was deleted the return value is 0 otherwise it is 1. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B -e \fIentry\fP ++Name of \fIentry\fP to work on (must include PHAR internal ++directory name if any). ++.TP ++.PD ++.B -k \fIindex\fP ++Subscription \fIindex\fP to work on. ++ ++.SH meta-get command ++Get meta information of a PHAR entry or a PHAR package in serialized from. If ++no output file is specified for meta data then stdout is being used. ++You can also specify a particular index using -k. In that case the ++metadata is expected to be an array and the value of the given index ++is returned using echo rather than using serialize. If that index does ++not exist or no meta data is present then the return value is 1. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B -e \fIentry\fP ++Name of \fIentry\fP to work on (must include PHAR internal ++directory name if any). ++.TP ++.PD ++.B -k \fIindex\fP ++Subscription \fIindex\fP to work on. ++ ++.SH meta-set command ++Set meta data of a PHAR entry or a PHAR package using serialized input. If no ++input file is specified for meta data then stdin is being used. You can ++also specify a particular index using -k. In that case the metadata is ++expected to be an array and the value of the given index is being set. ++If the metadata is not present or empty a new array will be created. ++If the metadata is present and a flat value then the return value is ++1. Also using -k the input is been taken directly rather then being ++serialized. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.TP ++.PD ++.B -m \fImeta\fP ++Meta data to store with entry (serialized php data). ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B -e \fIentry\fP ++Name of \fIentry\fP to work on (must include PHAR internal ++directory name if any). ++.TP ++.PD ++.B -k \fIindex\fP ++Subscription \fIindex\fP to work on. ++ ++.SH pack command ++Pack files into a PHAR archive. ++.P ++When using -s , then the stub file is being excluded from the ++list of input files/dirs.To create an archive that contains PEAR class ++PHP_Archive then point -p argument to PHP/Archive.php. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.TP ++.PD ++.B ... ++Any number of input files and directories. If -i is in ++use then ONLY files and matching the given regular ++expression are being packed. If -x is given then files ++matching that regular expression are NOT being packed. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B \-a \fIalias\fP ++Provide an \fIalias\fP name for the phar file. ++.TP ++.PD ++.B \-b \fIbang\fP ++Hash-bang line to start the archive (e.g. #!/usr/bin/php). ++The hash mark itself '#!' and the newline character are optional. ++.TP ++.PD ++.B \-c \fIalgo\fP ++Compression algorithm (see ++.SM ++.B COMPRESSION ++) ++.TP ++.PD ++.B \-h \fIhash\fP ++Selects the \fIhash\fP algorithm (see ++.SM ++.B HASH ++) ++.TP ++.PD ++.B \-i \fIregex\fP ++Specifies a regular expression for input files. ++.TP ++.PD ++.B \-l \fIlevel\fP ++Number of preceding subdirectories to strip from file entries ++.TP ++.PD ++.B \-p \fIloader\fP ++Location of PHP_Archive class file (pear list-files ++PHP_Archive).You can use '0' or '1' to locate it ++automatically using the mentioned pear command. When ++using '0' the command does not error out when the class ++file cannot be located. This switch also adds some code ++around the stub so that class PHP_Archive gets ++registered as phar:// stream wrapper if necessary. And ++finally this switch will add the file phar.inc from ++this package and load it to ensure class Phar is ++present. ++.TP ++.PD ++.B \-s \fIstub\fP ++Select the \fIstub\fP file. ++.TP ++.PD ++.B \-x \fIregex\fP ++Regular expression for input files to exclude. ++.TP ++.PD ++.B \-y \fIkey\fP ++Private \fIkey\fP for OpenSSL signing. ++ ++.SH sign command ++Set signature hash algorithm. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.TP ++.PD ++.B \-h \fIhash\fP ++Selects the \fIhash\fP algorithm (see ++.SM ++.B HASH ++) ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B \-y \fIkey\fP ++Private \fIkey\fP for OpenSSL signing. ++ ++.SH stub-get command ++Get the stub of a PHAR file. If no output file is specified as stub then stdout ++is being used. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B \-s \fIstub\fP ++Select the \fIstub\fP file. ++ ++.SH stub-set command ++Set the stub of a PHAR file. If no input file is specified as stub then stdin ++is being used. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B \-b \fIbang\fP ++Hash-bang line to start the archive (e.g. #!/usr/bin/php). ++The hash mark itself '#!' and the newline character are optional. ++.TP ++.PD ++.B \-p \fIloader\fP ++Location of PHP_Archive class file (pear list-files ++PHP_Archive).You can use '0' or '1' to locate it ++automatically using the mentioned pear command. When ++using '0' the command does not error out when the class ++file cannot be located. This switch also adds some code ++around the stub so that class PHP_Archive gets ++registered as phar:// stream wrapper if necessary. And ++finally this switch will add the file phar.inc from ++this package and load it to ensure class Phar is ++present. ++.TP ++.PD ++.B \-s \fIstub\fP ++Select the \fIstub\fP file. ++ ++ ++.SH tree command ++Get a directory tree for a PHAR archive. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B \-i \fIregex\fP ++Specifies a regular expression for input files. ++.TP ++.PD ++.B \-x \fIregex\fP ++Regular expression for input files to exclude. ++ ++.SH version command ++Get information about the PHAR environment and the tool version. ++ ++ ++.SH COMPRESSION ++Algorithms: ++.TP 15 ++.PD ++.B 0 ++No compression ++.TP ++.PD ++.B none ++No compression ++.TP ++.PD ++.B auto ++Automatically select compression algorithm ++.TP ++.PD ++.B gz ++GZip compression ++.TP ++.PD ++.B gzip ++GZip compression ++.TP ++.PD ++.B bz2 ++BZip2 compression ++.TP ++.PD ++.B bzip2 ++BZip2 compression ++ ++.SH HASH ++Algorithms: ++.TP 15 ++.PD ++.TP ++.PD ++.B md5 ++MD5 ++.TP ++.PD ++.B sha1 ++SHA1 ++.TP ++.PD ++.B sha256 ++SHA256 ++.TP ++.PD ++.B sha512 ++SHA512 ++.TP ++.PD ++.B openssl ++OpenSSL ++ ++.SH SEE ALSO ++For a more or less complete description of PHAR look here: ++.PD 0 ++.P ++.B http://php.net/phar ++.PD 1 ++.P ++.SH BUGS ++You can view the list of known bugs or report any new bug you ++found at: ++.PD 0 ++.P ++.B http://bugs.php.net ++.PD 1 ++.SH AUTHORS ++The PHP Group: Thies C. Arntzen, Stig Bakken, Andi Gutmans, Rasmus Lerdorf, Sam Ruby, Sascha Schumann, Zeev Suraski, Jim Winstead, Andrei Zmievski. ++.P ++Work for the PHP archive was done by Gregory Beaver, Marcus Boerger. ++.P ++A List of active developers can be found here: ++.PD 0 ++.P ++.B http://www.php.net/credits.php ++.PD 1 ++.P ++And last but not least PHP was developed with the help of a huge amount of ++contributors all around the world. ++.SH VERSION INFORMATION ++This manpage describes \fBphar\fP, version @PHP_VERSION@. ++.SH COPYRIGHT ++Copyright \(co 1997\-2013 The PHP Group ++.LP ++This source file is subject to version 3.01 of the PHP license, ++that is bundled with this package in the file LICENSE, and is ++available through the world-wide-web at the following url: ++.PD 0 ++.P ++.B http://www.php.net/license/3_01.txt ++.PD 1 ++.P ++If you did not receive a copy of the PHP license and are unable to ++obtain it through the world-wide-web, please send a note to ++.B license@php.net ++so we can mail you a copy immediately. +diff --git a/ext/phar/phar.phar.1.in b/ext/phar/phar.phar.1.in +new file mode 100644 +index 0000000..b5eecbf +--- /dev/null ++++ b/ext/phar/phar.phar.1.in +@@ -0,0 +1 @@ ++.so man1/phar.1 +-- +1.7.11.5 + +>From 67817a199ca4c8bcff163cb005287c0087db6bf3 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 2 Jul 2013 12:19:09 +0200 +Subject: [PATCH] fix typo in php man page + +--- + sapi/cli/php.1.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in +index 6f0266d..749baa8 100644 +--- a/sapi/cli/php.1.in ++++ b/sapi/cli/php.1.in +@@ -2,7 +2,7 @@ + .SH NAME + php \- PHP Command Line Interface 'CLI' + .P +-php-cgi \- PHP Command Gateway Interface 'CGI' ++php-cgi \- PHP Common Gateway Interface 'CGI' command + .SH SYNOPSIS + .B php + [options] [ +-- +1.7.11.5 + diff --git a/php54.spec b/php54.spec index 99e58ac..b32d82f 100644 --- a/php54.spec +++ b/php54.spec @@ -75,11 +75,11 @@ Summary: PHP scripting language for creating dynamic web sites Name: php -Version: 5.4.16 +Version: 5.4.17 %if 0%{?snapdate:1}%{?rcver:1} Release: 0.5.%{?snapdate}%{?rcver}%{?dist} %else -Release: 2%{?dist} +Release: 1%{?dist} %endif # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -113,15 +113,9 @@ Patch8: php-5.4.7-libdb.patch # Fixes for extension modules # https://bugs.php.net/63171 no odbc call during timeout Patch21: php-5.4.7-odbctimer.patch -# Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error) -Patch22: php-5.4.16-pdopgsql.patch -# Fixed bug #64960 (Segfault in gc_zval_possible_root) -Patch23: php-5.4.16-gc.patch -# Fixed Bug #64915 (error_log ignored when daemonize=0) -Patch24: php-5.4.16-fpm.patch # https://bugs.php.net/65143 php-cgi man page # https://bugs.php.net/65142 phar man page -Patch25: php-5.4.16-man.patch +Patch22: php-5.4.17-man.patch # Functional changes Patch40: php-5.4.0-dlopen.patch @@ -139,7 +133,6 @@ Patch46: php-5.4.9-fixheader.patch Patch47: php-5.4.9-phpinfo.patch # Fixes for tests -Patch60: php-5.4.16-pdotests.patch # RC Patch Patch91: php-5.3.7-oci8conf.patch @@ -774,10 +767,7 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1 rm -f ext/json/utf8_to_utf16.* %patch21 -p1 -b .odbctimer -%patch22 -p1 -b .pdopgsql -%patch23 -p1 -b .gc -%patch24 -p1 -b .fpm -%patch25 -p1 -b .manpages +%patch22 -p1 -b .manpages %patch40 -p1 -b .dlopen %patch41 -p1 -b .easter @@ -794,8 +784,6 @@ rm -f ext/json/utf8_to_utf16.* %patch46 -p1 -b .fixheader %patch47 -p1 -b .phpinfo -%patch60 -p1 -b .pdotests - %patch91 -p1 -b .remi-oci8 @@ -1640,6 +1628,9 @@ fi %changelog +* Wed Jul 3 2013 Remi Collet 5.4.17-1 +- update to 5.4.17 + * Tue Jul 2 2013 Remi Collet 5.4.16-2 - add missing man pages (phar, php-cgi) -- cgit