[php/f13/master] update to 5.3.5 (security)

Remi Collet remi at fedoraproject.org
Fri Jan 7 18:40:00 UTC 2011


commit e849aa17b8bff3cd9757f15a053b941165bdc440
Author: remi <fedora at famillecollet.com>
Date:   Fri Jan 7 19:39:46 2011 +0100

    update to 5.3.5 (security)

 .gitignore                                         |    1 +
 ....3.4-aconf26x.patch => php-5.3.5-aconf26x.patch |   20 +++++++-------
 php.spec                                           |   29 ++++++++++++++-----
 sources                                            |    2 +-
 4 files changed, 33 insertions(+), 19 deletions(-)
---
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.5-aconf26x.patch
similarity index 73%
rename from php-5.3.4-aconf26x.patch
rename to php-5.3.5-aconf26x.patch
index fbd8639..4eaa177 100644
--- a/php-5.3.4-aconf26x.patch
+++ b/php-5.3.5-aconf26x.patch
@@ -1,8 +1,8 @@
-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
+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 306090 2010-12-08 21:38:51Z johannes $ -*- autoconf -*-
+ ## $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)
@@ -46,9 +46,9 @@ diff -up php-5.3.4/configure.in.aconf26x php-5.3.4/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.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
+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 -*-
  
@@ -66,9 +66,9 @@ diff -up php-5.3.4/ext/standard/config.m4.aconf26x php-5.3.4/ext/standard/config
  
  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
+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.
  
diff --git a/php.spec b/php.spec
index cc0cd9f..7eccfd1 100644
--- a/php.spec
+++ b/php.spec
@@ -14,10 +14,14 @@
 # Regression tests take a long time, you can skip 'em with this
 %{!?runselftest: %{expand: %%global runselftest 1}}
 
+# Use the arch-specific mysql_config binary to avoid mismatch with the
+# arch detection heuristic used by bindir/mysql_config.
+%define mysql_config %{_libdir}/mysql/mysql_config
+
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.3.4
-Release: 1%{?dist}.1
+Version: 5.3.5
+Release: 1%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -35,7 +39,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
@@ -521,6 +525,9 @@ if test "$ver" != "%{jsonver}"; then
    exit 1
 fi
 
+# Fix some bogus permissions
+find . -name \*.[ch] -exec chmod 644 {} \;
+chmod 644 README.*
 
 %build
 # aclocal workaround - to be improved
@@ -579,7 +586,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 \
@@ -611,7 +617,7 @@ build --enable-force-cgi-redirect \
       --with-xmlrpc=shared \
       --with-ldap=shared --with-ldap-sasl \
       --with-mysql=shared,%{_prefix} \
-      --with-mysqli=shared,%{_bindir}/mysql_config \
+      --with-mysqli=shared,%{mysql_config} \
       --with-interbase=shared,%{_libdir}/firebird \
       --with-pdo-firebird=shared,%{_libdir}/firebird \
       --enable-dom=shared \
@@ -625,7 +631,7 @@ build --enable-force-cgi-redirect \
       --enable-fastcgi \
       --enable-pdo=shared \
       --with-pdo-odbc=shared,unixODBC,%{_prefix} \
-      --with-pdo-mysql=shared,%{_prefix} \
+      --with-pdo-mysql=shared,%{mysql_config} \
       --with-pdo-pgsql=shared,%{_prefix} \
       --with-pdo-sqlite=shared,%{_prefix} \
       --with-pdo-dblib=shared,%{_prefix} \
@@ -726,7 +732,7 @@ install -m 755 build-zts/libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules
 
 # Apache config fragment
 install -m 755 -d $RPM_BUILD_ROOT/etc/httpd/conf.d
-install -m 644 $RPM_SOURCE_DIR/php.conf $RPM_BUILD_ROOT/etc/httpd/conf.d
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d
 
 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d
 #install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d
@@ -780,7 +786,7 @@ cat files.json files.zip files.curl files.phar files.fileinfo > files.common
 # Install the macros file:
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm
 sed -e "s/@PHP_APIVER@/%{apiver}/;s/@PHP_ZENDVER@/%{zendver}/;s/@PHP_PDOVER@/%{pdover}/" \
-    < $RPM_SOURCE_DIR/macros.php > macros.php
+    < %{SOURCE3} > macros.php
 install -m 644 -c macros.php \
            $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.php
 
@@ -878,6 +884,13 @@ rm files.* macros.php
 %files enchant -f files.enchant
 
 %changelog
+* Fri Jan 07 2011 Remi Collet <Fedora at famillecollet.com> 5.3.5-1
+- update to 5.3.5
+  http://www.php.net/ChangeLog-5.php#5.3.5
+- clean duplicate configure options
+- remove all RPM_SOURCE_DIR
+- use mysql_config in libdir directly to avoid biarch build failures
+
 * Sun Dec 12 2010 Remi Collet <rpms at famillecollet.com> 5.3.4-1.1
 - security patch from upstream for #660517
 
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


More information about the scm-commits mailing list