rpms/php/F-11 php-5.2.12-gnusrc.patch, NONE, 1.1 .cvsignore, 1.37, 1.38 php.spec, 1.179, 1.180 sources, 1.41, 1.42 php-5.2.11-gnusrc.patch, 1.1, NONE php-5.2.11-mysqli-segfault.patch, 1.1, NONE php-5.3.0-libedit.patch, 1.1, NONE

[Tim Jackson]

Author: timj

Update of /cvs/pkgs/rpms/php/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18877

Modified Files:
	.cvsignore php.spec sources 
Added Files:
	php-5.2.12-gnusrc.patch 
Removed Files:
	php-5.2.11-gnusrc.patch php-5.2.11-mysqli-segfault.patch 
	php-5.3.0-libedit.patch 
Log Message:
Update to PHP 5.2.12


php-5.2.12-gnusrc.patch:
 Zend/zend_language_parser.c        |    2 ++
 configure.in                       |    2 ++
 ext/interbase/interbase.c          |    1 -
 ext/pdo_firebird/firebird_driver.c |    1 -
 ext/standard/file.c                |    1 -
 ext/zlib/zlib_fopen_wrapper.c      |    2 --
 main/php.h                         |    1 +
 main/streams/cast.c                |    1 -
 main/streams/memory.c              |    1 -
 main/streams/streams.c             |    1 -
 10 files changed, 5 insertions(+), 8 deletions(-)

--- NEW FILE php-5.2.12-gnusrc.patch ---
diff -ur php-5.2.12.orig/configure.in php-5.2.12/configure.in
--- php-5.2.12.orig/configure.in	2009-12-16 12:45:18.000000000 +0000
+++ php-5.2.12/configure.in	2010-01-10 12:11:43.174983327 +0000
@@ -58,6 +58,8 @@
 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 -ur php-5.2.12.orig/ext/interbase/interbase.c php-5.2.12/ext/interbase/interbase.c
--- php-5.2.12.orig/ext/interbase/interbase.c	2009-07-16 00:50:59.000000000 +0100
+++ php-5.2.12/ext/interbase/interbase.c	2010-01-10 12:11:43.176109071 +0000
@@ -24,7 +24,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 
diff -ur php-5.2.12.orig/ext/pdo_firebird/firebird_driver.c php-5.2.12/ext/pdo_firebird/firebird_driver.c
--- php-5.2.12.orig/ext/pdo_firebird/firebird_driver.c	2009-04-18 19:56:58.000000000 +0100
+++ php-5.2.12/ext/pdo_firebird/firebird_driver.c	2010-01-10 12:11:43.177109181 +0000
@@ -22,7 +22,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #ifdef ZEND_ENGINE_2
diff -ur php-5.2.12.orig/ext/standard/file.c php-5.2.12/ext/standard/file.c
--- php-5.2.12.orig/ext/standard/file.c	2009-11-03 18:56:47.000000000 +0000
+++ php-5.2.12/ext/standard/file.c	2010-01-10 12:11:43.178108877 +0000
@@ -108,7 +108,6 @@
 
 #ifdef HAVE_FNMATCH
 #ifndef _GNU_SOURCE
-#define _GNU_SOURCE
 #endif
 #include <fnmatch.h>
 #endif
diff -ur php-5.2.12.orig/ext/zlib/zlib_fopen_wrapper.c php-5.2.12/ext/zlib/zlib_fopen_wrapper.c
--- php-5.2.12.orig/ext/zlib/zlib_fopen_wrapper.c	2009-01-20 15:43:06.000000000 +0000
+++ php-5.2.12/ext/zlib/zlib_fopen_wrapper.c	2010-01-10 12:11:43.180109009 +0000
@@ -19,8 +19,6 @@
 
 /* $Id: zlib_fopen_wrapper.c 274035 2009-01-20 15:43:06Z felipe $ */
 
-#define _GNU_SOURCE
-
 #include "php.h"
 #include "php_zlib.h"
 #include "fopen_wrappers.h"
diff -ur php-5.2.12.orig/main/php.h php-5.2.12/main/php.h
--- php-5.2.12.orig/main/php.h	2008-12-31 11:17:49.000000000 +0000
+++ php-5.2.12/main/php.h	2010-01-10 12:11:43.180109009 +0000
@@ -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 -ur php-5.2.12.orig/main/streams/cast.c php-5.2.12/main/streams/cast.c
--- php-5.2.12.orig/main/streams/cast.c	2009-06-03 09:59:19.000000000 +0100
+++ php-5.2.12/main/streams/cast.c	2010-01-10 12:11:43.181109389 +0000
@@ -18,7 +18,6 @@
 
 /* $Id: cast.c 281581 2009-06-03 08:59:19Z kalle $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
diff -ur php-5.2.12.orig/main/streams/memory.c php-5.2.12/main/streams/memory.c
--- php-5.2.12.orig/main/streams/memory.c	2009-09-17 03:45:25.000000000 +0100
+++ php-5.2.12/main/streams/memory.c	2010-01-10 12:11:43.182109190 +0000
@@ -18,7 +18,6 @@
 
 /* $Id: memory.c 288393 2009-09-17 02:45:25Z srinatar $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 
 PHPAPI int php_url_decode(char *str, int len);
diff -ur php-5.2.12.orig/main/streams/streams.c php-5.2.12/main/streams/streams.c
--- php-5.2.12.orig/main/streams/streams.c	2009-05-17 15:59:24.000000000 +0100
+++ php-5.2.12/main/streams/streams.c	2010-01-10 12:11:43.184108025 +0000
@@ -21,7 +21,6 @@
 
 /* $Id: streams.c 280679 2009-05-17 14:59:24Z lbarnaud $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
diff -ur php-5.2.12.orig/Zend/zend_language_parser.c php-5.2.12/Zend/zend_language_parser.c
--- php-5.2.12.orig/Zend/zend_language_parser.c	2009-12-16 12:48:14.000000000 +0000
+++ php-5.2.12/Zend/zend_language_parser.c	2010-01-10 12:11:43.187108409 +0000
@@ -356,6 +356,8 @@
 #include "zend_API.h"
 #include "zend_constants.h"
 
+#include <string.h>
+
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php/F-11/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	25 Jun 2009 16:32:20 -0000	1.37
+++ .cvsignore	10 Jan 2010 14:17:55 -0000	1.38
@@ -1,2 +1 @@
-*.tar.bz2
-*.src.rpm
+php-5.2.12.tar.bz2


Index: php.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php/F-11/php.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- php.spec	17 Nov 2009 22:19:16 -0000	1.179
+++ php.spec	10 Jan 2010 14:17:55 -0000	1.180
@@ -6,8 +6,8 @@
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.2.11
-Release: 2%{?dist}
+Version: 5.2.12
+Release: 1%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -18,19 +18,17 @@ Source2: php.ini
 Source3: macros.php
 
 # Build fixes
-Patch1: php-5.2.11-gnusrc.patch
+Patch1: php-5.2.12-gnusrc.patch
 Patch2: php-5.2.8-install.patch
 Patch3: php-5.2.4-norpath.patch
 Patch4: php-5.2.8-phpize64.patch
 Patch5: php-5.2.0-includedir.patch
 Patch6: php-5.2.4-embed.patch
 Patch7: php-5.2.8-recode.patch
-Patch8: php-5.3.0-libedit.patch
 
 # Fixes for extension modules
 Patch20: php-4.3.11-shutdown.patch
 Patch21: php-5.2.3-macropen.patch
-Patch22: php-5.2.11-mysqli-segfault.patch
 
 # Functional changes
 Patch40: php-5.0.4-dlopen.patch
@@ -415,11 +413,9 @@ support for using the recode library to 
 %patch5 -p1 -b .includedir
 %patch6 -p1 -b .embed
 %patch7 -p1 -b .recode
-%patch8 -p1 -b .libedit
 
 %patch20 -p1 -b .shutdown
 %patch21 -p1 -b .macropen
-%patch22 -p1 -b .mysqli-segfault
 
 %patch40 -p1 -b .dlopen
 %patch41 -p1 -b .easter
@@ -728,6 +724,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/php/mod
 # Remove irrelevant docs
 rm -f README.{Zeus,QNX,CVS-RULES}
 
+# Fix encoding of docs
+iconv -f iso-8859-1 -t utf-8 < EXTENSIONS > EXTENSIONS.utf8
+mv EXTENSIONS.utf8 EXTENSIONS
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 rm files.* macros.php
@@ -806,6 +806,11 @@ rm files.* macros.php
 %files interbase -f files.interbase
 
 %changelog
+* Sun Jan 10 2010 Tim Jackson <rpm at timj.co.uk> 5.2.12-1
+- update to 5.2.12
+- remove libedit patch (fixed upstream)
+- fix encoding of EXTENSIONS file
+
 * Tue Nov 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> 5.2.11-2
 - link to libedit rather than readline to avoid licensing issues
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php/F-11/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	13 Nov 2009 13:28:39 -0000	1.41
+++ sources	10 Jan 2010 14:17:55 -0000	1.42
@@ -1 +1 @@
-286bf34630f5643c25ebcedfec5e0a09  php-5.2.11.tar.bz2
+5b7077e366c7eeab34da31dd860a1923  php-5.2.12.tar.bz2


--- php-5.2.11-gnusrc.patch DELETED ---


--- php-5.2.11-mysqli-segfault.patch DELETED ---


--- php-5.3.0-libedit.patch DELETED ---