rpms/php/F-9 php-5.2.8-install.patch, NONE, 1.1 php-5.2.8-phpize64.patch, NONE, 1.1 php-5.2.9-gnusrc.patch, NONE, 1.1 php.spec, 1.158, 1.159 sources, 1.37, 1.38 php-4.3.3-install.patch, 1.1, NONE php-5.0.2-phpize64.patch, 1.2, NONE php-5.2.6-gnusrc.patch, 1.1, NONE

Remi Collet remi at fedoraproject.org
Thu Apr 16 16:59:33 UTC 2009 

Author: remi

Update of /cvs/extras/rpms/php/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2170

Modified Files:
	php.spec sources 
Added Files:
	php-5.2.8-install.patch php-5.2.8-phpize64.patch 
	php-5.2.9-gnusrc.patch 
Removed Files:
	php-4.3.3-install.patch php-5.0.2-phpize64.patch 
	php-5.2.6-gnusrc.patch 
Log Message:
update to 5.2.9

php-5.2.8-install.patch:

--- NEW FILE php-5.2.8-install.patch ---
--- php-5.2.8/sapi/apache2handler/config.m4.install
+++ php-5.2.8/sapi/apache2handler/config.m4
@@ -68,7 +68,7 @@ if test "$PHP_APXS2" != "no"; then
   fi
 
   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-  if test -z `$APXS -q SYSCONFDIR`; then
+  if true; then
     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                        -i -n php5"

php-5.2.8-phpize64.patch:

--- NEW FILE php-5.2.8-phpize64.patch ---
--- php-5.2.8/scripts/Makefile.frag.phpize64
+++ php-5.2.8/scripts/Makefile.frag
@@ -4,7 +4,7 @@
 #
 
 phpincludedir = $(includedir)/php
-phpbuilddir = $(libdir)/build
+phpbuilddir = $(libdir)/php/build
 
 BUILD_FILES = \
 	scripts/phpize.m4 \
--- php-5.2.8/scripts/phpize.in.phpize64
+++ php-5.2.8/scripts/phpize.in
@@ -3,7 +3,7 @@
 # Variable declaration
 prefix='@prefix@'
 exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/build"
+phpdir="@libdir@/php/build"
 includedir="`eval echo @includedir@`/php"
 builddir="`pwd`"
 SED="@SED@"

php-5.2.9-gnusrc.patch:

--- NEW FILE php-5.2.9-gnusrc.patch ---
diff -up php-5.2.9/configure.in.gnusrc php-5.2.9/configure.in
--- php-5.2.9/configure.in.gnusrc	2009-02-25 15:56:50.000000000 +0100
+++ php-5.2.9/configure.in	2009-02-27 19:33:40.000000000 +0100
@@ -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.2.9/ext/interbase/interbase.c.gnusrc php-5.2.9/ext/interbase/interbase.c
--- php-5.2.9/ext/interbase/interbase.c.gnusrc	2008-12-31 12:17:38.000000000 +0100
+++ php-5.2.9/ext/interbase/interbase.c	2009-02-27 19:33:40.000000000 +0100
@@ -24,7 +24,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 
diff -up php-5.2.9/ext/pdo_firebird/firebird_driver.c.gnusrc php-5.2.9/ext/pdo_firebird/firebird_driver.c
--- php-5.2.9/ext/pdo_firebird/firebird_driver.c.gnusrc	2008-12-31 12:17:41.000000000 +0100
+++ php-5.2.9/ext/pdo_firebird/firebird_driver.c	2009-02-27 19:33:40.000000000 +0100
@@ -22,7 +22,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #include "php_ini.h"
diff -up php-5.2.9/ext/standard/file.c.gnusrc php-5.2.9/ext/standard/file.c
--- php-5.2.9/ext/standard/file.c.gnusrc	2008-12-31 12:17:44.000000000 +0100
+++ php-5.2.9/ext/standard/file.c	2009-02-27 19:33:40.000000000 +0100
@@ -118,7 +118,6 @@ php_file_globals file_globals;
 
 #ifdef HAVE_FNMATCH
 #ifndef _GNU_SOURCE
-#define _GNU_SOURCE
 #endif
 #include <fnmatch.h>
 #endif
diff -up php-5.2.9/ext/zlib/zlib_fopen_wrapper.c.gnusrc php-5.2.9/ext/zlib/zlib_fopen_wrapper.c
--- php-5.2.9/ext/zlib/zlib_fopen_wrapper.c.gnusrc	2009-01-20 16:43:05.000000000 +0100
+++ php-5.2.9/ext/zlib/zlib_fopen_wrapper.c	2009-02-27 19:35:38.000000000 +0100
@@ -19,8 +19,6 @@
 
 /* $Id: zlib_fopen_wrapper.c,v 1.46.2.1.2.7 2009/01/20 15:43:05 felipe Exp $ */
 
-#define _GNU_SOURCE
-
 #include "php.h"
 #include "php_zlib.h"
 #include "fopen_wrappers.h"
diff -up php-5.2.9/main/php.h.gnusrc php-5.2.9/main/php.h
--- php-5.2.9/main/php.h.gnusrc	2008-12-31 12:17:47.000000000 +0100
+++ php-5.2.9/main/php.h	2009-02-27 19:33:40.000000000 +0100
@@ -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.2.9/main/streams/cast.c.gnusrc php-5.2.9/main/streams/cast.c
--- php-5.2.9/main/streams/cast.c.gnusrc	2008-12-31 12:17:48.000000000 +0100
+++ php-5.2.9/main/streams/cast.c	2009-02-27 19:36:07.000000000 +0100
@@ -18,7 +18,6 @@
 
 /* $Id: cast.c,v 1.12.2.1.2.3 2008/12/31 11:17:48 sebastian Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
diff -up php-5.2.9/main/streams/memory.c.gnusrc php-5.2.9/main/streams/memory.c
--- php-5.2.9/main/streams/memory.c.gnusrc	2008-12-31 12:17:48.000000000 +0100
+++ php-5.2.9/main/streams/memory.c	2009-02-27 19:36:40.000000000 +0100
@@ -18,7 +18,6 @@
 
 /* $Id: memory.c,v 1.8.2.6.2.20 2008/12/31 11:17:48 sebastian Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 
 PHPAPI int php_url_decode(char *str, int len);
diff -up php-5.2.9/main/streams/streams.c.gnusrc php-5.2.9/main/streams/streams.c
--- php-5.2.9/main/streams/streams.c.gnusrc	2009-01-08 20:21:25.000000000 +0100
+++ php-5.2.9/main/streams/streams.c	2009-02-27 19:37:04.000000000 +0100
@@ -21,7 +21,6 @@
 
 /* $Id: streams.c,v 1.82.2.6.2.33 2009/01/08 19:21:25 felipe Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
diff -up php-5.2.9/Zend/zend_language_parser.c.gnusrc php-5.2.9/Zend/zend_language_parser.c
--- php-5.2.9/Zend/zend_language_parser.c.gnusrc	2009-02-25 16:39:52.000000000 +0100
+++ php-5.2.9/Zend/zend_language_parser.c	2009-02-27 19:33:40.000000000 +0100
@@ -356,6 +356,8 @@
 #include "zend_API.h"
 #include "zend_constants.h"
 
+#include <string.h>
+
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/F-9/php.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- php.spec	3 Jan 2009 11:05:57 -0000	1.158
+++ php.spec	16 Apr 2009 16:59:02 -0000	1.159
@@ -2,12 +2,11 @@
 %define apiver 20041225
 %define zendver 20060613
 %define pdover 20060511
-
-%define _default_patch_fuzz 2
+%define httpd_mmn %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.2.8
+Version: 5.2.9
 Release: 1%{?dist}
 License: PHP
 Group: Development/Languages
@@ -18,38 +17,36 @@
 Source2: php.ini
 Source3: macros.php
 
-Patch1: php-5.2.6-gnusrc.patch
-Patch2: php-4.3.3-install.patch
+# Build fixes
+Patch1: php-5.2.9-gnusrc.patch
+Patch2: php-5.2.8-install.patch
 Patch3: php-5.2.4-norpath.patch
-Patch5: php-5.0.2-phpize64.patch
-Patch8: php-5.2.0-includedir.patch
-Patch9: php-5.2.4-embed.patch
+Patch4: php-5.2.8-phpize64.patch
+Patch5: php-5.2.0-includedir.patch
+Patch6: php-5.2.4-embed.patch
 
 # Fixes for extension modules
-Patch21: php-5.2.4-odbc.patch
-Patch22: php-4.3.11-shutdown.patch
-Patch24: php-5.2.3-macropen.patch
+Patch20: php-4.3.11-shutdown.patch
+Patch21: php-5.2.3-macropen.patch
 
 # Functional changes
-Patch30: php-5.0.4-dlopen.patch
-Patch31: php-5.2.4-easter.patch
-Patch32: php-5.2.6-systzdata.patch
+Patch40: php-5.0.4-dlopen.patch
+Patch41: php-5.2.4-easter.patch
+Patch42: php-5.2.6-systzdata.patch
 
 # Fixes for tests
-Patch50: php-5.2.7-tests-dashn.patch
-Patch51: php-5.0.4-tests-wddx.patch
+Patch60: php-5.2.7-tests-dashn.patch
+Patch61: php-5.0.4-tests-wddx.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel
-BuildRequires: gmp-devel
+BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, gmp-devel
 BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
 BuildRequires: libstdc++-devel, openssl-devel, sqlite-devel >= 3.0.0
 BuildRequires: zlib-devel, pcre-devel >= 6.6, smtpdaemon, readline-devel
 BuildRequires: bzip2, perl, libtool >= 1.4.3, gcc-c++
 Obsoletes: php-dbg, php3, phpfi, stronghold-php
-# Enforce Apache module ABI compatibility
-Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
+Requires: httpd-mmn = %{httpd_mmn}
 Provides: mod_php = %{version}-%{release}
 Requires: php-common = %{version}-%{release}
 # For backwards-compatibility, require php-cli for the time being:
@@ -87,10 +84,12 @@
 # Provides for all builtin modules:
 Provides: php-bz2, php-calendar, php-ctype, php-curl, php-date, php-exif
 Provides: php-ftp, php-gettext, php-gmp, php-hash, php-iconv, php-libxml
-Provides: php-openssl, php-pcre, php-posix
 Provides: php-reflection, php-session, php-shmop, php-simplexml, php-sockets
-Provides: php-spl, php-sysvsem, php-sysvshm, php-sysvmsg, php-tokenizer
-Provides: php-wddx, php-zlib, php-json, php-zip, php-dbase
+Provides: php-spl, php-tokenizer, php-openssl, php-pcre
+Provides: php-zlib, php-json, php-zip, php-dbase
+# To be split in php-process 
+Provides: php-posix, php-sysvsem, php-sysvshm, php-sysvmsg
+
 Obsoletes: php-openssl, php-pecl-zip, php-json, php-dbase
 
 %description common
@@ -228,7 +227,7 @@
 Group: Development/Languages
 Requires: php-common = %{version}-%{release}
 Obsoletes: php-domxml, php-dom
-Provides: php-dom, php-xsl, php-domxml
+Provides: php-dom, php-xsl, php-domxml, php-wddx
 BuildRequires: libxslt-devel >= 1.0.18-1, libxml2-devel >= 2.4.14-1
 
 %description xml
@@ -240,7 +239,6 @@
 Summary: A module for PHP applications which use the XML-RPC protocol
 Group: Development/Languages
 Requires: php-common = %{version}-%{release}
-BuildRequires: expat-devel
 
 %description xmlrpc
 The php-xmlrpc package contains a dynamic shared object that will add
@@ -362,20 +360,19 @@
 %patch1 -p1 -b .gnusrc
 %patch2 -p1 -b .install
 %patch3 -p1 -b .norpath
-%patch5 -p1 -b .phpize64
-%patch8 -p1 -b .includedir
-%patch9 -p1 -b .embed
-
-%patch21 -p1 -b .odbc
-%patch22 -p1 -b .shutdown
-%patch24 -p1 -b .macropen
-
-%patch30 -p1 -b .dlopen
-%patch31 -p1 -b .easter
-%patch32 -p1 -b .systzdata
+%patch4 -p1 -b .phpize64
+%patch5 -p1 -b .includedir
+%patch6 -p1 -b .embed
+
+%patch20 -p1 -b .shutdown
+%patch21 -p1 -b .macropen
+
+%patch40 -p1 -b .dlopen
+%patch41 -p1 -b .easter
+%patch42 -p1 -b .systzdata
 
-%patch50 -p1 -b .tests-dashn
-%patch51 -p1 -b .tests-wddx
+%patch60 -p1 -b .tests-dashn
+%patch61 -p1 -b .tests-wddx
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -465,8 +462,6 @@
 	--with-iconv \
 	--with-jpeg-dir=%{_prefix} \
 	--with-openssl \
-	--with-png \
-	--with-expat-dir=%{_prefix} \
         --with-pcre-regex=%{_prefix} \
 	--with-zlib \
 	--with-layout=GNU \
@@ -475,22 +470,15 @@
 	--enable-magic-quotes \
 	--enable-sockets \
 	--enable-sysvsem --enable-sysvshm --enable-sysvmsg \
-	--enable-track-vars \
-	--enable-trans-sid \
-	--enable-yp \
 	--enable-wddx \
 	--with-kerberos \
 	--enable-ucd-snmp-hack \
-	--with-unixODBC=shared,%{_prefix} \
-	--enable-memory-limit \
 	--enable-shmop \
 	--enable-calendar \
-	--enable-dbx \
-	--enable-dio \
         --without-mime-magic \
         --without-sqlite \
         --with-libxml-dir=%{_prefix} \
-	--with-xml \
+	--enable-xml \
         --with-system-tzdata \
 	$* 
 if test $? != 0; then 
@@ -507,7 +495,7 @@
 build --enable-force-cgi-redirect \
       --enable-pcntl \
       --with-imap=shared --with-imap-ssl \
-      --enable-mbstring=shared --enable-mbstr-enc-trans \
+      --enable-mbstring=shared \
       --enable-mbregex \
       --with-ncurses=shared \
       --with-gd=shared \
@@ -518,7 +506,6 @@
       --with-mysql=shared,%{_prefix} \
       --with-mysqli=shared,%{_bindir}/mysql_config \
       --enable-dom=shared \
-      --with-dom-xslt=%{_prefix} --with-dom-exslt=%{_prefix} \
       --with-pgsql=shared \
       --with-snmp=shared,%{_prefix} \
       --enable-soap=shared \
@@ -539,11 +526,12 @@
       --with-mcrypt=shared,%{_prefix} \
       --with-mhash=shared,%{_prefix} \
       --with-tidy=shared,%{_prefix} \
-      --with-mssql=shared,%{_prefix}
+      --with-mssql=shared,%{_prefix} \
+      --with-unixODBC=shared,%{_prefix}
 popd
 
 without_shared="--without-mysql --without-gd \
-      --without-odbc --disable-dom \
+      --without-unixODBC --disable-dom \
       --disable-dba --without-unixODBC \
       --disable-pdo --disable-xmlreader --disable-xmlwriter \
       --disable-json --without-pspell"
@@ -731,6 +719,11 @@
 %files pspell -f files.pspell
 
 %changelog
+* Thu Apr 16 2009 Remi Collet <Fedora at FamilleCollet.com> - 5.2.9-1
+- update to 5.2.9
+- merge with some rawhide improvments (fix patch fuzz, renumber
+  patches, drop obsolete configure args, drop -odbc patch)
+
 * Sat Jan 03 2009 Remi Collet <Fedora at FamilleCollet.com> 5.2.8-1
 - update to 5.2.8
 - add missing php_embed.h (#457777)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php/F-9/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	3 Jan 2009 11:05:57 -0000	1.37
+++ sources	16 Apr 2009 16:59:02 -0000	1.38
@@ -1 +1 @@
-8760a833cf10433d3e72271ab0d0eccf  php-5.2.8.tar.bz2
+280d6cda7f72a4fc6de42fda21ac2db7  php-5.2.9.tar.bz2


--- php-4.3.3-install.patch DELETED ---


--- php-5.0.2-phpize64.patch DELETED ---


--- php-5.2.6-gnusrc.patch DELETED ---

More information about the fedora-extras-commits mailing list