rpms/php
7
0
Fork 0
Code Issues Pull Requests Releases Activity

update to 5.3.4

Browse Source
This commit is contained in:
remi 2010-12-11 18:14:46 +01:00
parent 9581d4415c
commit ad1c041018
6 changed files with 90 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
php-5.3.3.tar.bz2
/php-5.3.4.tar.bz2

20
php-5.3.3-aconf26x.patch → php-5.3.4-aconf26x.patch
View File

@ -1,8 +1,8 @@
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
diff -up php-5.3.4/configure.in.aconf26x php-5.3.4/configure.in
--- php-5.3.4/configure.in.aconf26x 2010-12-11 11:02:33.634975461 +0100
+++ php-5.3.4/configure.in 2010-12-11 11:03:30.336094172 +0100
@@ -1,7 +1,7 @@
## $Id: configure.in 301439 2010-07-21 10:50:07Z johannes $ -*- autoconf -*-
## $Id: configure.in 306090 2010-12-08 21:38:51Z johannes $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
-divert(1)
@ -46,9 +46,9 @@ diff -up php-5.3.3/configure.in.aconf26x php-5.3.3/configure.in
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
diff -up php-5.3.4/ext/standard/config.m4.aconf26x php-5.3.4/ext/standard/config.m4
--- php-5.3.4/ext/standard/config.m4.aconf26x 2010-06-17 12:22:03.000000000 +0200
+++ php-5.3.4/ext/standard/config.m4 2010-12-11 11:02:33.643973734 +0100
@@ -1,6 +1,6 @@
dnl $Id: config.m4 300511 2010-06-17 10:22:03Z pajoye $ -*- autoconf -*-
@ -66,9 +66,9 @@ diff -up php-5.3.3/ext/standard/config.m4.aconf26x php-5.3.3/ext/standard/config
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
diff -up php-5.3.4/scripts/phpize.m4.aconf26x php-5.3.4/scripts/phpize.m4
--- php-5.3.4/scripts/phpize.m4.aconf26x 2010-11-02 10:58:08.000000000 +0100
+++ php-5.3.4/scripts/phpize.m4 2010-12-11 11:02:33.643973734 +0100
@@ -1,6 +1,6 @@
dnl This file becomes configure.in for self-contained extensions.

52
php-5.3.3-gnusrc.patch → php-5.3.4-gnusrc.patch
View File

@ -45,18 +45,6 @@ diff -up php5.3-201004081030/ext/standard/file.c.gnusrc php5.3-201004081030/ext/
# 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
@ -68,17 +56,6 @@ diff -up php5.3-201004081030/main/php.h.gnusrc php5.3-201004081030/main/php.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
@ -102,11 +79,32 @@ diff -up php5.3-201004081030/Zend/zend_language_parser.c.gnusrc php5.3-201004081
#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 @@
--- php5.3-201009271630/ext/zlib/zlib_fopen_wrapper.c.gnusrc 2010-09-27 00:34:59.000000000 +0200
+++ php5.3-201009271630/ext/zlib/zlib_fopen_wrapper.c 2010-09-27 19:30:28.542859456 +0200
@@ -19,8 +19,6 @@
/* $Id: streams.c 299466 2010-05-18 19:39:39Z pajoye $ */
/* $Id: zlib_fopen_wrapper.c 303772 2010-09-26 20:46:54Z pajoye $ */
-#define _GNU_SOURCE
-
#include "php.h"
#include "php_zlib.h"
#include "fopen_wrappers.h"
--- php5.3-201011110530/main/streams/cast.c.gnusrc 2010-11-05 20:36:08.000000000 +0100
+++ php5.3-201011110530/main/streams/cast.c 2010-11-11 07:52:00.335566018 +0100
@@ -18,7 +18,6 @@
/* $Id: cast.c 305108 2010-11-05 18:53:48Z cataphract $ */
-#define _GNU_SOURCE
#include "php.h"
#include "php_globals.h"
#include "php_network.h"
--- php5.3-201011270530/main/streams/streams.c.gnusrc 2010-11-15 20:35:42.000000000 +0100
+++ php5.3-201011270530/main/streams/streams.c 2010-11-27 08:26:48.836691759 +0100
@@ -21,7 +21,6 @@
/* $Id: streams.c 305379 2010-11-15 18:22:52Z cataphract $ */
-#define _GNU_SOURCE
#include "php.h"

34
php-5.3.4-phpize.patch Normal file
View File

@ -0,0 +1,34 @@
--- scripts/phpize.in.orig 2010-12-01 17:00:27.110013483 +0100
+++ scripts/phpize.in 2010-12-01 17:02:12.555757906 +0100
@@ -161,6 +161,15 @@
$PHP_AUTOHEADER || exit 1
}
+phpize_check_headers()
+{
+ if test ! -f $includedir/main/php.h; then
+ echo "Can't find PHP headers in $includedir"
+ echo "The php-devel package is required for use of this command."
+ exit 1
+ fi
+}
+
# Main script
case "$1" in
@@ -179,12 +188,15 @@
# Version
--version|-v)
+ phpize_check_headers
phpize_print_api_numbers
exit 0
;;
# Default
*)
+ phpize_check_headers
+
phpize_check_configm4 0
phpize_check_build_files

28
php.spec
View File

@ -26,8 +26,8 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: 5.3.3
Release: 5%{?dist}
Version: 5.3.4
Release: 1%{?dist}
License: PHP
Group: Development/Languages
URL: http://www.php.net/
@ -42,14 +42,14 @@ Source6: php-fpm.init
Source7: php-fpm.logrotate
# Build fixes
Patch1: php-5.3.3-gnusrc.patch
Patch1: php-5.3.4-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.3-aconf26x.patch
Patch8: php-5.3.4-aconf26x.patch
# Fixes for extension modules
Patch20: php-4.3.11-shutdown.patch
@ -59,6 +59,8 @@ Patch21: php-5.3.3-macropen.patch
Patch40: php-5.0.4-dlopen.patch
Patch41: php-5.3.0-easter.patch
Patch42: php-5.3.1-systzdata-v7.patch
# See http://bugs.php.net/53436
Patch43: php-5.3.4-phpize.patch
# Fixes for tests
Patch61: php-5.0.4-tests-wddx.patch
@ -89,7 +91,7 @@ Requires(pre): httpd
%description
PHP is an HTML-embedded scripting language. PHP attempts to make it
easy for developers to write dynamically generated webpages. PHP also
easy for developers to write dynamically generated web pages. PHP also
offers built-in database integration for several commercial and
non-commercial database management systems, so writing a
database-enabled webpage with PHP is fairly simple. The most common
@ -349,7 +351,8 @@ Summary: A module for PHP applications for using the gd graphics library
Group: Development/Languages
Requires: php-common = %{version}-%{release}
# Required to build the bundled GD library
BuildRequires: libXpm-devel, libjpeg-devel, libpng-devel, freetype-devel, t1lib-devel
BuildRequires: libjpeg-devel, libpng-devel, freetype-devel
BuildRequires: libXpm-devel, t1lib-devel
%description gd
The php-gd package contains a dynamic shared object that will add
@ -475,6 +478,7 @@ support for using the enchant library to PHP.
%patch40 -p1 -b .dlopen
%patch41 -p1 -b .easter
%patch42 -p1 -b .systzdata
%patch43 -p0 -b .headers
%patch61 -p1 -b .tests-wddx
@ -900,7 +904,10 @@ fi
%{_bindir}/php-cgi
%{_bindir}/phar.phar
%{_bindir}/phar
# provides phpize here (not in -devel) for pecl command
%{_bindir}/phpize
%{_mandir}/man1/php.1*
%{_mandir}/man1/phpize.1*
%doc sapi/cgi/README* sapi/cli/README
%files zts
@ -920,17 +927,15 @@ fi
# log owned by apache for log
%attr(770,apache,apache) %dir %{_localstatedir}/log/php-fpm
%ghost %dir %{_localstatedir}/run/php-fpm
%{_mandir}/man1/php-fpm.1*
%{_mandir}/man8/php-fpm.8*
%endif
%files devel
%defattr(-,root,root)
%{_bindir}/php-config
%{_bindir}/phpize
%{_includedir}/php
%{_libdir}/php/build
%{_mandir}/man1/php-config.1*
%{_mandir}/man1/phpize.1*
%config %{_sysconfdir}/rpm/macros.php
%files embedded
@ -965,6 +970,11 @@ fi
%files enchant -f files.enchant
%changelog
* Sat Dec 11 2010 Remi Collet <Fedora@famillecollet.com> 5.3.4-1
- update to 5.3.4
http://www.php.net/ChangeLog-5.php#5.3.4
- move phpize to php-cli (see #657812)
* Wed Dec 1 2010 Remi Collet <Fedora@famillecollet.com> 5.3.3-5
- ghost /var/run/php-fpm (see #656660)
- add filter_setup to not provides extensions as .so

2
sources
View File

@ -1 +1 @@
21ceeeb232813c10283a5ca1b4c87b48 php-5.3.3.tar.bz2
2c069d8f690933e3bf6a8741ed818150 php-5.3.4.tar.bz2