From 9c2fc6afe0bc4b8c1e7ddd3047b6fcc63aba45a7 Mon Sep 17 00:00:00 2001 From: remi Date: Jan 07 2011 17:52:17 +0000 Subject: update to 5.3.5 (security) --- diff --git a/.gitignore b/.gitignore index 5f036b5..3a91bfe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ php-5.3.3.tar.bz2 /php-5.3.4.tar.bz2 +/php-5.3.5.tar.bz2 diff --git a/php-5.3.4-aconf26x.patch b/php-5.3.4-aconf26x.patch deleted file mode 100644 index fbd8639..0000000 --- a/php-5.3.4-aconf26x.patch +++ /dev/null @@ -1,79 +0,0 @@ -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 306090 2010-12-08 21:38:51Z 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.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 -*- - --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.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. - --divert(1) -+divert(1001) - - AC_PREREQ(2.13) - AC_INIT(config.m4) diff --git a/php-5.3.5-aconf26x.patch b/php-5.3.5-aconf26x.patch new file mode 100644 index 0000000..4eaa177 --- /dev/null +++ b/php-5.3.5-aconf26x.patch @@ -0,0 +1,79 @@ +diff -up php-5.3.5/configure.in.aconf26x php-5.3.5/configure.in +--- php-5.3.5/configure.in.aconf26x 2011-01-07 18:10:08.377183393 +0100 ++++ php-5.3.5/configure.in 2011-01-07 18:10:14.204214101 +0100 +@@ -1,7 +1,7 @@ + ## $Id: configure.in 307133 2011-01-05 16:35:33Z 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.5/ext/standard/config.m4.aconf26x php-5.3.5/ext/standard/config.m4 +--- php-5.3.5/ext/standard/config.m4.aconf26x 2010-06-17 12:22:03.000000000 +0200 ++++ php-5.3.5/ext/standard/config.m4 2011-01-07 18:09:09.790922608 +0100 +@@ -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.5/scripts/phpize.m4.aconf26x php-5.3.5/scripts/phpize.m4 +--- php-5.3.5/scripts/phpize.m4.aconf26x 2010-11-02 10:58:08.000000000 +0100 ++++ php-5.3.5/scripts/phpize.m4 2011-01-07 18:09:09.791922611 +0100 +@@ -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) diff --git a/php.spec b/php.spec index abd5f19..4cf4afd 100644 --- a/php.spec +++ b/php.spec @@ -26,8 +26,8 @@ Summary: PHP scripting language for creating dynamic web sites Name: php -Version: 5.3.4 -Release: 2%{?dist} +Version: 5.3.5 +Release: 1%{?dist} License: PHP Group: Development/Languages URL: http://www.php.net/ @@ -49,7 +49,7 @@ 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.4-aconf26x.patch +Patch8: php-5.3.5-aconf26x.patch # Fixes for extension modules Patch20: php-4.3.11-shutdown.patch @@ -620,7 +620,6 @@ ln -sf ../configure --enable-ftp \ --enable-magic-quotes \ --enable-sockets \ - --enable-sysvsem --enable-sysvshm --enable-sysvmsg \ --with-kerberos \ --enable-ucd-snmp-hack \ --enable-shmop \ @@ -976,6 +975,11 @@ fi %files enchant -f files.enchant %changelog +* Fri Jan 07 2011 Remi Collet 5.3.5-1 +- update to 5.3.5 + http://www.php.net/ChangeLog-5.php#5.3.5 +- clean duplicate configure options + * Tue Dec 28 2010 Remi Collet 5.3.4-2 - rebuild against MySQL 5.5.8 - remove all RPM_SOURCE_DIR diff --git a/sources b/sources index eecd6a4..18fafc2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c069d8f690933e3bf6a8741ed818150 php-5.3.4.tar.bz2 +8aaf20c95e91f25c5b6a591e5d6d61b9 php-5.3.5.tar.bz2