rpms/php/devel php-5.3.3-aconf26x.patch, NONE, 1.1 php-5.3.3-gnusrc.patch, NONE, 1.1 php-5.3.3-macropen.patch, NONE, 1.1 .cvsignore, 1.40, 1.41 php.spec, 1.190, 1.191 sources, 1.43, 1.44 php-5.2.3-macropen.patch, 1.1, NONE php-5.3.2-aconf26x.patch, 1.1, NONE php-5.3.2-gc.patch, 1.1, NONE php-5.3.2-gnusrc.patch, 1.1, NONE php-5.3.2-phar.patch, 1.1, NONE
Remi Collet
remi at fedoraproject.org
Thu Jul 22 15:28:54 UTC 2010
Author: remi
Update of /cvs/pkgs/rpms/php/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10104
Modified Files:
.cvsignore php.spec sources
Added Files:
php-5.3.3-aconf26x.patch php-5.3.3-gnusrc.patch
php-5.3.3-macropen.patch
Removed Files:
php-5.2.3-macropen.patch php-5.3.2-aconf26x.patch
php-5.3.2-gc.patch php-5.3.2-gnusrc.patch php-5.3.2-phar.patch
Log Message:
update to php 5.3.3 (Bug + Security fixes)
php-5.3.3-aconf26x.patch:
configure.in | 10 +++++-----
ext/standard/config.m4 | 4 ++--
scripts/phpize.m4 | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE php-5.3.3-aconf26x.patch ---
diff -up php-5.3.3/configure.in.aconf26x php-5.3.3/configure.in
--- php-5.3.3/configure.in.aconf26x 2010-07-22 15:24:35.376051049 +0200
+++ php-5.3.3/configure.in 2010-07-22 15:25:19.922175093 +0200
@@ -1,7 +1,7 @@
## $Id: configure.in 301439 2010-07-21 10:50:07Z johannes $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
-divert(1)
+divert(1001)
dnl ## Diversion 1 is the autoconf + automake setup phase. We also
dnl ## set the PHP version, deal with platform-specific compile
@@ -292,7 +292,7 @@ sinclude(TSRM/threads.m4)
sinclude(TSRM/tsrm.m4)
-divert(2)
+divert(1002)
dnl ## Diversion 2 is where we set PHP-specific options and come up
dnl ## with reasonable default values for them. We check for pthreads here
@@ -331,7 +331,7 @@ if test "$enable_maintainer_zts" = "yes"
PTHREADS_FLAGS
fi
-divert(3)
+divert(1003)
dnl ## In diversion 3 we check for compile-time options to the PHP
dnl ## core and how to deal with different system dependencies.
@@ -677,7 +677,7 @@ if test "x$php_crypt_r" = "x1"; then
PHP_CRYPT_R_STYLE
fi
-divert(4)
+divert(1004)
dnl ## In diversion 4 we check user-configurable general settings.
@@ -918,7 +918,7 @@ else
AC_MSG_RESULT([using system default])
fi
-divert(5)
+divert(1005)
dnl ## In diversion 5 we check which extensions should be compiled.
dnl ## All of these are normally in the extension directories.
diff -up php-5.3.3/ext/standard/config.m4.aconf26x php-5.3.3/ext/standard/config.m4
--- php-5.3.3/ext/standard/config.m4.aconf26x 2010-06-17 12:22:03.000000000 +0200
+++ php-5.3.3/ext/standard/config.m4 2010-07-22 15:24:35.382051000 +0200
@@ -1,6 +1,6 @@
dnl $Id: config.m4 300511 2010-06-17 10:22:03Z pajoye $ -*- autoconf -*-
-divert(3)dnl
+divert(1003)dnl
dnl
dnl Check if flush should be called explicitly after buffered io
@@ -342,7 +342,7 @@ dnl
AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy)
AC_FUNC_FNMATCH
-divert(5)dnl
+divert(1005)dnl
dnl
dnl Check if there is a support means of creating a new process
diff -up php-5.3.3/scripts/phpize.m4.aconf26x php-5.3.3/scripts/phpize.m4
--- php-5.3.3/scripts/phpize.m4.aconf26x 2009-12-02 18:42:58.000000000 +0100
+++ php-5.3.3/scripts/phpize.m4 2010-07-22 15:24:35.382051000 +0200
@@ -1,6 +1,6 @@
dnl This file becomes configure.in for self-contained extensions.
-divert(1)
+divert(1001)
AC_PREREQ(2.13)
AC_INIT(config.m4)
php-5.3.3-gnusrc.patch:
php5.3-201004081030/Zend/zend_language_parser.c | 2 ++
php5.3-201004081030/configure.in | 2 ++
php5.3-201004081030/ext/interbase/interbase.c | 1 -
php5.3-201004081030/ext/pdo_firebird/firebird_driver.c | 1 -
php5.3-201004081030/ext/standard/file.c | 3 ---
php5.3-201004081030/ext/zlib/zlib_fopen_wrapper.c | 2 --
php5.3-201004081030/main/php.h | 1 +
php5.3-201004081030/main/streams/cast.c | 1 -
php5.3-201004081030/main/streams/memory.c | 1 -
php5.3-201005241430/main/streams/streams.c | 1 -
10 files changed, 5 insertions(+), 10 deletions(-)
--- NEW FILE php-5.3.3-gnusrc.patch ---
diff -up php5.3-201004081030/configure.in.gnusrc php5.3-201004081030/configure.in
--- php5.3-201004081030/configure.in.gnusrc 2010-03-19 00:36:53.000000000 +0100
+++ php5.3-201004081030/configure.in 2010-04-08 14:32:20.000000000 +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 php5.3-201004081030/ext/interbase/interbase.c.gnusrc php5.3-201004081030/ext/interbase/interbase.c
--- php5.3-201004081030/ext/interbase/interbase.c.gnusrc 2010-01-03 10:36:55.000000000 +0100
+++ php5.3-201004081030/ext/interbase/interbase.c 2010-04-08 14:32:20.000000000 +0200
@@ -24,7 +24,6 @@
#include "config.h"
#endif
-#define _GNU_SOURCE
#include "php.h"
diff -up php5.3-201004081030/ext/pdo_firebird/firebird_driver.c.gnusrc php5.3-201004081030/ext/pdo_firebird/firebird_driver.c
--- php5.3-201004081030/ext/pdo_firebird/firebird_driver.c.gnusrc 2010-01-12 14:36:12.000000000 +0100
+++ php5.3-201004081030/ext/pdo_firebird/firebird_driver.c 2010-04-08 14:32:20.000000000 +0200
@@ -22,7 +22,6 @@
#include "config.h"
#endif
-#define _GNU_SOURCE
#include "php.h"
#ifdef ZEND_ENGINE_2
diff -up php5.3-201004081030/ext/standard/file.c.gnusrc php5.3-201004081030/ext/standard/file.c
--- php5.3-201004081030/ext/standard/file.c.gnusrc 2010-03-19 00:36:53.000000000 +0100
+++ php5.3-201004081030/ext/standard/file.c 2010-04-08 14:32:20.000000000 +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 php5.3-201004081030/ext/zlib/zlib_fopen_wrapper.c.gnusrc php5.3-201004081030/ext/zlib/zlib_fopen_wrapper.c
--- php5.3-201004081030/ext/zlib/zlib_fopen_wrapper.c.gnusrc 2010-03-12 12:36:27.000000000 +0100
+++ php5.3-201004081030/ext/zlib/zlib_fopen_wrapper.c 2010-04-08 14:33:46.000000000 +0200
@@ -19,8 +19,6 @@
/* $Id: zlib_fopen_wrapper.c 296107 2010-03-12 10:28:59Z jani $ */
-#define _GNU_SOURCE
-
#include "php.h"
#include "php_zlib.h"
#include "fopen_wrappers.h"
diff -up php5.3-201004081030/main/php.h.gnusrc php5.3-201004081030/main/php.h
--- php5.3-201004081030/main/php.h.gnusrc 2010-03-12 12:36:33.000000000 +0100
+++ php5.3-201004081030/main/php.h 2010-04-08 14:32:20.000000000 +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 php5.3-201004081030/main/streams/cast.c.gnusrc php5.3-201004081030/main/streams/cast.c
--- php5.3-201004081030/main/streams/cast.c.gnusrc 2010-01-19 16:36:23.000000000 +0100
+++ php5.3-201004081030/main/streams/cast.c 2010-04-08 14:33:15.000000000 +0200
@@ -18,7 +18,6 @@
/* $Id: cast.c 293732 2010-01-19 13:44:08Z jani $ */
-#define _GNU_SOURCE
#include "php.h"
#include "php_globals.h"
#include "php_network.h"
diff -up php5.3-201004081030/main/streams/memory.c.gnusrc php5.3-201004081030/main/streams/memory.c
--- php5.3-201004081030/main/streams/memory.c.gnusrc 2010-01-03 10:36:58.000000000 +0100
+++ php5.3-201004081030/main/streams/memory.c 2010-04-08 14:32:20.000000000 +0200
@@ -18,7 +18,6 @@
/* $Id: memory.c 293036 2010-01-03 09:23:27Z sebastian $ */
-#define _GNU_SOURCE
#include "php.h"
PHPAPI int php_url_decode(char *str, int len);
diff -up php5.3-201004081030/Zend/zend_language_parser.c.gnusrc php5.3-201004081030/Zend/zend_language_parser.c
--- php5.3-201004081030/Zend/zend_language_parser.c.gnusrc 2010-04-08 12:41:33.000000000 +0200
+++ php5.3-201004081030/Zend/zend_language_parser.c 2010-04-08 14:32:20.000000000 +0200
@@ -366,6 +366,8 @@
#include "zend_API.h"
#include "zend_constants.h"
+#include <string.h>
+
#define YYERROR_VERBOSE
#define YYSTYPE znode
--- php5.3-201005241430/main/streams/streams.c.gnusrc 2010-05-18 22:35:37.000000000 +0200
+++ php5.3-201005241430/main/streams/streams.c 2010-05-24 17:02:08.900419954 +0200
@@ -21,7 +21,6 @@
/* $Id: streams.c 299466 2010-05-18 19:39:39Z pajoye $ */
-#define _GNU_SOURCE
#include "php.h"
#include "php_globals.h"
#include "php_network.h"
php-5.3.3-macropen.patch:
dba.c | 2 +-
dba_db3.c | 2 +-
dba_db4.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE php-5.3.3-macropen.patch ---
diff -up php5.3-201006130830/ext/dba/dba.c.macropen php5.3-201006130830/ext/dba/dba.c
--- php5.3-201006130830/ext/dba/dba.c.macropen 2010-03-03 02:35:57.000000000 +0100
+++ php5.3-201006130830/ext/dba/dba.c 2010-06-13 11:07:54.501185871 +0200
@@ -912,7 +912,7 @@ static void php_dba_open(INTERNAL_FUNCTI
}
}
- if (error || hptr->open(info, &error TSRMLS_CC) != SUCCESS) {
+ if (error || (hptr->open)(info, &error TSRMLS_CC) != SUCCESS) {
dba_close(info TSRMLS_CC);
php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]), Z_STRVAL_PP(args[1]), E_WARNING, "Driver initialization failed for handler: %s%s%s", hptr->name, error?": ":"", error?error:"");
FREENOW;
diff -up php5.3-201006130830/ext/dba/dba_db3.c.macropen php5.3-201006130830/ext/dba/dba_db3.c
--- php5.3-201006130830/ext/dba/dba_db3.c.macropen 2010-01-03 10:36:52.000000000 +0100
+++ php5.3-201006130830/ext/dba/dba_db3.c 2010-06-13 11:07:54.501185871 +0200
@@ -91,7 +91,7 @@ DBA_OPEN_FUNC(db3)
if ((err=db_create(&dbp, NULL, 0)) == 0) {
dbp->set_errcall(dbp, php_dba_db3_errcall_fcn);
- if ((err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
+ if ((err=(dbp->open)(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
dba_db3_data *data;
data = pemalloc(sizeof(*data), info->flags&DBA_PERSISTENT);
diff -up php5.3-201006130830/ext/dba/dba_db4.c.macropen php5.3-201006130830/ext/dba/dba_db4.c
--- php5.3-201006130830/ext/dba/dba_db4.c.macropen 2010-06-03 10:35:55.000000000 +0200
+++ php5.3-201006130830/ext/dba/dba_db4.c 2010-06-13 11:12:11.841435434 +0200
@@ -125,9 +125,9 @@ DBA_OPEN_FUNC(db4)
dbp->set_errcall(dbp, php_dba_db4_errcall_fcn);
if (
#if (DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))
- (err=dbp->open(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) {
+ (err=(dbp->open)(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) {
#else
- (err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
+ (err=(dbp->open)(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
#endif
dba_db4_data *data;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore 6 Mar 2010 07:35:33 -0000 1.40
+++ .cvsignore 22 Jul 2010 15:28:52 -0000 1.41
@@ -1 +1 @@
-php-5.3.2.tar.bz2
+php-5.3.3.tar.bz2
Index: php.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php/devel/php.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- php.spec 30 Apr 2010 05:10:45 -0000 1.190
+++ php.spec 22 Jul 2010 15:28:53 -0000 1.191
@@ -16,8 +16,8 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
-Version: 5.3.2
-Release: 3%{?dist}
+Version: 5.3.3
+Release: 1%{?dist}
License: PHP
Group: Development/Languages
URL: http://www.php.net/
@@ -28,21 +28,18 @@ Source2: php.ini
Source3: macros.php
# Build fixes
-Patch1: php-5.3.2-gnusrc.patch
+Patch1: php-5.3.3-gnusrc.patch
Patch2: php-5.3.0-install.patch
Patch3: php-5.2.4-norpath.patch
Patch4: php-5.3.0-phpize64.patch
Patch5: php-5.2.0-includedir.patch
Patch6: php-5.2.4-embed.patch
Patch7: php-5.3.0-recode.patch
-Patch8: php-5.3.2-aconf26x.patch
-# http://bugs.php.net/50578
-Patch9: php-5.3.2-phar.patch
-Patch10: php-5.3.2-gc.patch
+Patch8: php-5.3.3-aconf26x.patch
# Fixes for extension modules
Patch20: php-4.3.11-shutdown.patch
-Patch21: php-5.2.3-macropen.patch
+Patch21: php-5.3.3-macropen.patch
# Functional changes
Patch40: php-5.0.4-dlopen.patch
@@ -436,8 +433,6 @@ support for using the enchant library to
%patch6 -p1 -b .embed
%patch7 -p1 -b .recode
%patch8 -p1 -b .aconf26x
-%patch9 -p1 -b .shebang
-%patch10 -p4 -b .gc
%patch20 -p1 -b .shutdown
%patch21 -p1 -b .macropen
@@ -460,6 +455,8 @@ mkdir build-cgi build-apache build-embed
# Remove bogus test; position of read position after fopen(, "a+")
# is not defined by C standard, so don't presume anything.
rm -f ext/standard/tests/file/bug21131.phpt
+# php_egg_logo_guid() removed by patch41
+rm -f tests/basic/php_egg_logo_guid.phpt
# Tests that fail.
rm -f ext/standard/tests/file/bug22414.phpt \
@@ -870,6 +867,9 @@ rm files.* macros.php
%files enchant -f files.enchant
%changelog
+* Thu Jul 22 2010 Remi Collet <Fedora at famillecollet.com> 5.3.3-1
+- PHP 5.3.3 released
+
* Fri Apr 30 2010 Remi Collet <Fedora at famillecollet.com> 5.3.2-3
- garbage collector upstream patches (#580236)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources 6 Mar 2010 07:35:34 -0000 1.43
+++ sources 22 Jul 2010 15:28:53 -0000 1.44
@@ -1 +1 @@
-46f500816125202c48a458d0133254a4 php-5.3.2.tar.bz2
+21ceeeb232813c10283a5ca1b4c87b48 php-5.3.3.tar.bz2
--- php-5.2.3-macropen.patch DELETED ---
--- php-5.3.2-aconf26x.patch DELETED ---
--- php-5.3.2-gc.patch DELETED ---
--- php-5.3.2-gnusrc.patch DELETED ---
--- php-5.3.2-phar.patch DELETED ---
More information about the scm-commits
mailing list