[php/f16] update to 5.3.11
Remi Collet
remi at fedoraproject.org
Fri Apr 27 14:43:58 UTC 2012
commit 7bef6f0b8537d37bf3046992506639c775a8a806
Author: remi <fedora at famillecollet.com>
Date: Fri Apr 27 16:42:34 2012 +0200
update to 5.3.11
.gitignore | 1 +
...3.9-aconf259.patch => php-5.3.11-aconf259.patch | 41 ++++----
php-5.3.11-gnusrc.patch | 115 ++++++++++++++++++++
php-5.3.9-gnusrc.patch | 115 --------------------
php-fpm-www.conf | 8 ++
php-fpm.sysconfig | 2 +
php.spec | 23 +++-
sources | 2 +-
8 files changed, 166 insertions(+), 141 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 393f6c1..c455422 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ php.spec~
/php-5.3.7.tar.bz2
/php-5.3.8.tar.bz2
/php-5.3.9.tar.bz2
+/php-5.3.11.tar.bz2
diff --git a/php-5.3.9-aconf259.patch b/php-5.3.11-aconf259.patch
similarity index 80%
rename from php-5.3.9-aconf259.patch
rename to php-5.3.11-aconf259.patch
index 3a40bd4..ed1e079 100644
--- a/php-5.3.9-aconf259.patch
+++ b/php-5.3.11-aconf259.patch
@@ -1,6 +1,6 @@
-diff -up php-5.3.9/build/buildcheck.sh.aconf259 php-5.3.9/build/buildcheck.sh
---- php-5.3.9/build/buildcheck.sh.aconf259 2011-05-18 21:55:34.000000000 +0200
-+++ php-5.3.9/build/buildcheck.sh 2012-01-10 19:05:11.754924053 +0100
+diff -up php-5.3.11/build/buildcheck.sh.aconf259 php-5.3.11/build/buildcheck.sh
+--- php-5.3.11/build/buildcheck.sh.aconf259 2012-04-25 00:13:15.000000000 +0200
++++ php-5.3.11/build/buildcheck.sh 2012-04-27 16:21:52.254080726 +0200
@@ -28,33 +28,23 @@ if test -z "$PHP_AUTOCONF"; then
PHP_AUTOCONF='autoconf'
fi
@@ -40,10 +40,11 @@ diff -up php-5.3.9/build/buildcheck.sh.aconf259 php-5.3.9/build/buildcheck.sh
if test "$1" = "2" -a "$2" -ge "50"; then
./vcsclean
-diff -up php-5.3.9/configure.in.aconf259 php-5.3.9/configure.in
---- php-5.3.9/configure.in.aconf259 2012-01-10 19:05:44.787924857 +0100
-+++ php-5.3.9/configure.in 2012-01-10 19:06:55.260926529 +0100
-@@ -2,27 +2,5 @@
+diff -up php-5.3.11/configure.in.aconf259 php-5.3.11/configure.in
+--- php-5.3.11/configure.in.aconf259 2012-04-27 16:21:52.247080726 +0200
++++ php-5.3.11/configure.in 2012-04-27 16:21:52.255080726 +0200
+@@ -1,28 +1,6 @@
+ ## $Id$ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
-divert(1)
@@ -134,11 +135,11 @@ diff -up php-5.3.9/configure.in.aconf259 php-5.3.9/configure.in
dnl Extension configuration.
dnl -------------------------------------------------------------------------
-diff -up php-5.3.9/ext/standard/config.m4.aconf259 php-5.3.9/ext/standard/config.m4
---- php-5.3.9/ext/standard/config.m4.aconf259 2012-01-10 19:09:03.896929612 +0100
-+++ php-5.3.9/ext/standard/config.m4 2012-01-10 19:09:54.290930815 +0100
+diff -up php-5.3.11/ext/standard/config.m4.aconf259 php-5.3.11/ext/standard/config.m4
+--- php-5.3.11/ext/standard/config.m4.aconf259 2012-04-27 16:23:51.491083579 +0200
++++ php-5.3.11/ext/standard/config.m4 2012-04-27 16:23:55.204083670 +0200
@@ -1,7 +1,5 @@
- dnl $Id: config.m4 300511 2010-06-17 10:22:03Z pajoye $ -*- autoconf -*-
+ dnl $Id$ -*- autoconf -*-
-divert(3)dnl
-
@@ -154,9 +155,9 @@ diff -up php-5.3.9/ext/standard/config.m4.aconf259 php-5.3.9/ext/standard/config
dnl
dnl Check if there is a support means of creating a new process
dnl and defining which handles it receives
-diff -up php-5.3.9/scripts/php-config.in.aconf259 php-5.3.9/scripts/php-config.in
---- php-5.3.9/scripts/php-config.in.aconf259 2011-04-18 13:13:37.000000000 +0200
-+++ php-5.3.9/scripts/php-config.in 2012-01-10 19:05:11.755924053 +0100
+diff -up php-5.3.11/scripts/php-config.in.aconf259 php-5.3.11/scripts/php-config.in
+--- php-5.3.11/scripts/php-config.in.aconf259 2012-04-25 00:13:15.000000000 +0200
++++ php-5.3.11/scripts/php-config.in 2012-04-27 16:21:52.257080726 +0200
@@ -2,6 +2,7 @@
SED="@SED@"
@@ -165,9 +166,9 @@ diff -up php-5.3.9/scripts/php-config.in.aconf259 php-5.3.9/scripts/php-config.i
exec_prefix="@exec_prefix@"
version="@PHP_VERSION@"
vernum="@PHP_VERSION_ID@"
-diff -up php-5.3.9/scripts/phpize.in.aconf259 php-5.3.9/scripts/phpize.in
---- php-5.3.9/scripts/phpize.in.aconf259 2009-06-24 09:42:33.000000000 +0200
-+++ php-5.3.9/scripts/phpize.in 2012-01-10 19:05:11.755924053 +0100
+diff -up php-5.3.11/scripts/phpize.in.aconf259 php-5.3.11/scripts/phpize.in
+--- php-5.3.11/scripts/phpize.in.aconf259 2012-04-25 00:13:15.000000000 +0200
++++ php-5.3.11/scripts/phpize.in 2012-04-27 16:21:52.257080726 +0200
@@ -2,6 +2,7 @@
# Variable declaration
@@ -176,9 +177,9 @@ diff -up php-5.3.9/scripts/phpize.in.aconf259 php-5.3.9/scripts/phpize.in
exec_prefix="`eval echo @exec_prefix@`"
phpdir="`eval echo @libdir@`/build"
includedir="`eval echo @includedir@`/php"
-diff -up php-5.3.9/scripts/phpize.m4.aconf259 php-5.3.9/scripts/phpize.m4
---- php-5.3.9/scripts/phpize.m4.aconf259 2010-11-02 10:58:08.000000000 +0100
-+++ php-5.3.9/scripts/phpize.m4 2012-01-10 19:05:11.755924053 +0100
+diff -up php-5.3.11/scripts/phpize.m4.aconf259 php-5.3.11/scripts/phpize.m4
+--- php-5.3.11/scripts/phpize.m4.aconf259 2012-04-25 00:13:15.000000000 +0200
++++ php-5.3.11/scripts/phpize.m4 2012-04-27 16:21:52.258080726 +0200
@@ -1,9 +1,8 @@
dnl This file becomes configure.in for self-contained extensions.
diff --git a/php-5.3.11-gnusrc.patch b/php-5.3.11-gnusrc.patch
new file mode 100644
index 0000000..13a4626
--- /dev/null
+++ b/php-5.3.11-gnusrc.patch
@@ -0,0 +1,115 @@
+diff -up php-5.3.11/configure.in.gnusrc php-5.3.11/configure.in
+--- php-5.3.11/configure.in.gnusrc 2012-04-25 00:13:15.000000000 +0200
++++ php-5.3.11/configure.in 2012-04-27 16:17:29.399074435 +0200
+@@ -58,6 +58,8 @@ AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
+ AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
+ AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
+
++AC_DEFINE([_GNU_SOURCE], 1, [Define to enable GNU C Library extensions])
++
+ dnl Setting up the PHP version based on the information above.
+ dnl -------------------------------------------------------------------------
+
+diff -up php-5.3.11/ext/interbase/interbase.c.gnusrc php-5.3.11/ext/interbase/interbase.c
+--- php-5.3.11/ext/interbase/interbase.c.gnusrc 2012-04-25 00:13:15.000000000 +0200
++++ php-5.3.11/ext/interbase/interbase.c 2012-04-27 16:17:29.399074435 +0200
+@@ -24,7 +24,6 @@
+ #include "config.h"
+ #endif
+
+-#define _GNU_SOURCE
+
+ #include "php.h"
+
+diff -up php-5.3.11/ext/pdo_firebird/firebird_driver.c.gnusrc php-5.3.11/ext/pdo_firebird/firebird_driver.c
+--- php-5.3.11/ext/pdo_firebird/firebird_driver.c.gnusrc 2012-04-25 00:13:15.000000000 +0200
++++ php-5.3.11/ext/pdo_firebird/firebird_driver.c 2012-04-27 16:17:29.400074435 +0200
+@@ -22,7 +22,6 @@
+ #include "config.h"
+ #endif
+
+-#define _GNU_SOURCE
+
+ #include "php.h"
+ #ifdef ZEND_ENGINE_2
+diff -up php-5.3.11/ext/standard/file.c.gnusrc php-5.3.11/ext/standard/file.c
+--- php-5.3.11/ext/standard/file.c.gnusrc 2012-04-25 00:13:15.000000000 +0200
++++ php-5.3.11/ext/standard/file.c 2012-04-27 16:17:29.401074435 +0200
+@@ -113,9 +113,6 @@ php_file_globals file_globals;
+ #endif
+
+ #if defined(HAVE_FNMATCH) && !defined(PHP_WIN32)
+-# ifndef _GNU_SOURCE
+-# define _GNU_SOURCE
+-# endif
+ # include <fnmatch.h>
+ #endif
+
+diff -up php-5.3.11/ext/zlib/zlib_fopen_wrapper.c.gnusrc php-5.3.11/ext/zlib/zlib_fopen_wrapper.c
+--- php-5.3.11/ext/zlib/zlib_fopen_wrapper.c.gnusrc 2012-04-25 00:13:15.000000000 +0200
++++ php-5.3.11/ext/zlib/zlib_fopen_wrapper.c 2012-04-27 16:18:10.230075414 +0200
+@@ -19,8 +19,6 @@
+
+ /* $Id$ */
+
+-#define _GNU_SOURCE
+-
+ #include "php.h"
+ #include "php_zlib.h"
+ #include "fopen_wrappers.h"
+diff -up php-5.3.11/main/php.h.gnusrc php-5.3.11/main/php.h
+--- php-5.3.11/main/php.h.gnusrc 2012-04-25 00:13:15.000000000 +0200
++++ php-5.3.11/main/php.h 2012-04-27 16:17:29.402074435 +0200
+@@ -30,6 +30,7 @@
+ #define PHP_HAVE_STREAMS
+ #define YYDEBUG 0
+
++#include "php_config.h"
+ #include "php_version.h"
+ #include "zend.h"
+ #include "zend_qsort.h"
+diff -up php-5.3.11/main/streams/cast.c.gnusrc php-5.3.11/main/streams/cast.c
+--- php-5.3.11/main/streams/cast.c.gnusrc 2012-04-25 00:13:15.000000000 +0200
++++ php-5.3.11/main/streams/cast.c 2012-04-27 16:18:39.614076117 +0200
+@@ -18,7 +18,6 @@
+
+ /* $Id$ */
+
+-#define _GNU_SOURCE
+ #include "php.h"
+ #include "php_globals.h"
+ #include "php_network.h"
+diff -up php-5.3.11/main/streams/memory.c.gnusrc php-5.3.11/main/streams/memory.c
+--- php-5.3.11/main/streams/memory.c.gnusrc 2012-04-25 00:13:15.000000000 +0200
++++ php-5.3.11/main/streams/memory.c 2012-04-27 16:19:10.417076852 +0200
+@@ -18,7 +18,6 @@
+
+ /* $Id$ */
+
+-#define _GNU_SOURCE
+ #include "php.h"
+
+ PHPAPI int php_url_decode(char *str, int len);
+diff -up php-5.3.11/main/streams/streams.c.gnusrc php-5.3.11/main/streams/streams.c
+--- php-5.3.11/main/streams/streams.c.gnusrc 2012-04-25 00:13:15.000000000 +0200
++++ php-5.3.11/main/streams/streams.c 2012-04-27 16:19:27.774077269 +0200
+@@ -21,7 +21,6 @@
+
+ /* $Id$ */
+
+-#define _GNU_SOURCE
+ #include "php.h"
+ #include "php_globals.h"
+ #include "php_network.h"
+diff -up php-5.3.11/Zend/zend_language_parser.c.gnusrc php-5.3.11/Zend/zend_language_parser.c
+--- php-5.3.11/Zend/zend_language_parser.c.gnusrc 2012-04-25 00:26:10.000000000 +0200
++++ php-5.3.11/Zend/zend_language_parser.c 2012-04-27 16:17:29.405074435 +0200
+@@ -112,6 +112,8 @@
+ #include "zend_API.h"
+ #include "zend_constants.h"
+
++#include <string.h>
++
+
+ #define YYERROR_VERBOSE
+ #define YYSTYPE znode
diff --git a/php-fpm-www.conf b/php-fpm-www.conf
index 81fca85..6715869 100644
--- a/php-fpm-www.conf
+++ b/php-fpm-www.conf
@@ -181,6 +181,14 @@ slowlog = /var/log/php-fpm/www-slow.log
; Default Value: no
;catch_workers_output = yes
+; Limits the extensions of the main script FPM will allow to parse. This can
+; prevent configuration mistakes on the web server side. You should only limit
+; FPM to .php extensions to prevent malicious users to use other extensions to
+; exectute php code.
+; Note: set an empty value to allow all extensions.
+; Default Value: .php
+;security.limit_extensions = .php .php3 .php4 .php5
+
; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
; the current environment.
; Default Value: clean env
diff --git a/php-fpm.sysconfig b/php-fpm.sysconfig
new file mode 100644
index 0000000..72096da
--- /dev/null
+++ b/php-fpm.sysconfig
@@ -0,0 +1,2 @@
+# Additional environment file for php-fpm
+
diff --git a/php.spec b/php.spec
index 205453a..d09414b 100644
--- a/php.spec
+++ b/php.spec
@@ -30,13 +30,14 @@
%global isasuffix %nil
%endif
+# Flip these to 0 and %nil% respectively to disable zip support
# Flip these to 1 and zip respectively to enable zip support again
-%global with_zip 0
-%global zipmod %nil
+%global with_zip 1
+%global zipmod zip
Summary: PHP scripting language for creating dynamic web sites
Name: php
-Version: 5.3.10
+Version: 5.3.11
Release: 1%{?dist}
License: PHP
Group: Development/Languages
@@ -50,9 +51,10 @@ Source4: php-fpm.conf
Source5: php-fpm-www.conf
Source6: php-fpm.init
Source7: php-fpm.logrotate
+Source8: php-fpm.sysconfig
# Build fixes
-Patch1: php-5.3.9-gnusrc.patch
+Patch1: php-5.3.11-gnusrc.patch
Patch2: php-5.3.0-install.patch
Patch3: php-5.2.4-norpath.patch
Patch5: php-5.2.0-includedir.patch
@@ -60,7 +62,7 @@ Patch6: php-5.2.4-embed.patch
Patch7: php-5.3.0-recode.patch
# from http://svn.php.net/viewvc?view=revision&revision=311042
# and http://svn.php.net/viewvc?view=revision&revision=311908
-Patch8: php-5.3.9-aconf259.patch
+Patch8: php-5.3.11-aconf259.patch
# fix harcoded mysql.sock path
Patch9: php-5.3.9-mysqlnd.patch
@@ -913,6 +915,9 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_initrddir}/php-fpm
# LogRotate
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/php-fpm
+# Environment file
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm
# tmpfiles.d
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
install -m 644 php-fpm.tmpfiles $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/php-fpm.conf
@@ -1049,6 +1054,7 @@ fi
%config(noreplace) %{_sysconfdir}/php-fpm.conf
%config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/php-fpm
+%config(noreplace) %{_sysconfdir}/sysconfig/php-fpm
%config(noreplace) %{_sysconfdir}/tmpfiles.d/php-fpm.conf
%{_sbindir}/php-fpm
%{_initrddir}/php-fpm
@@ -1102,6 +1108,13 @@ fi
%changelog
+* Fri Apr 27 2012 Remi Collet <remi at fedoraproject.org> 5.3.11-1
+- update to 5.3.11
+ http://www.php.net/ChangeLog-5.php#5.3.11
+- add /etc/sysconfig/php-fpm environment file (#784770)
+- php-fpm: add security.limit_extensions in provided conf
+- zip extension is back (unbundled in f17)
+
* Thu Feb 2 2012 Joe Orton <jorton at redhat.com> - 5.3.10-1
- update to 5.3.10
diff --git a/sources b/sources
index 1c7ddd6..88c5acf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-816259e5ca7d0a7e943e56a3bb32b17f php-5.3.10.tar.bz2
+94709f6e7c920cbe26e19fa991d9975d php-5.3.11.tar.bz2
More information about the scm-commits
mailing list