[php/f16] update to 5.3.14
Remi Collet
remi at fedoraproject.org
Thu Jun 21 16:06:30 UTC 2012
commit 5c6124d897891abd34e72439d7cb68e2a45b0725
Author: remi <fedora at famillecollet.com>
Date: Thu Jun 21 18:06:23 2012 +0200
update to 5.3.14
.gitignore | 1 +
....11-aconf259.patch => php-5.3.14-aconf259.patch | 38 ++++++++++----------
php.spec | 12 +++++-
sources | 2 +-
4 files changed, 31 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a8dfaff..7ea8a45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ php.spec~
/php-5.3.11.tar.bz2
/php-5.3.12.tar.bz2
/php-5.3.13.tar.bz2
+/php-5.3.14.tar.bz2
diff --git a/php-5.3.11-aconf259.patch b/php-5.3.14-aconf259.patch
similarity index 82%
rename from php-5.3.11-aconf259.patch
rename to php-5.3.14-aconf259.patch
index ed1e079..759feaa 100644
--- a/php-5.3.11-aconf259.patch
+++ b/php-5.3.14-aconf259.patch
@@ -1,6 +1,6 @@
-diff -up php-5.3.11/build/buildcheck.sh.aconf259 php-5.3.11/build/buildcheck.sh
---- php-5.3.11/build/buildcheck.sh.aconf259 2012-04-25 00:13:15.000000000 +0200
-+++ php-5.3.11/build/buildcheck.sh 2012-04-27 16:21:52.254080726 +0200
+diff -up php-5.3.14/build/buildcheck.sh.aconf259 php-5.3.14/build/buildcheck.sh
+--- php-5.3.14/build/buildcheck.sh.aconf259 2012-06-13 10:18:44.000000000 +0200
++++ php-5.3.14/build/buildcheck.sh 2012-06-14 21:19:03.618973116 +0200
@@ -28,33 +28,23 @@ if test -z "$PHP_AUTOCONF"; then
PHP_AUTOCONF='autoconf'
fi
@@ -40,9 +40,9 @@ diff -up php-5.3.11/build/buildcheck.sh.aconf259 php-5.3.11/build/buildcheck.sh
if test "$1" = "2" -a "$2" -ge "50"; then
./vcsclean
-diff -up php-5.3.11/configure.in.aconf259 php-5.3.11/configure.in
---- php-5.3.11/configure.in.aconf259 2012-04-27 16:21:52.247080726 +0200
-+++ php-5.3.11/configure.in 2012-04-27 16:21:52.255080726 +0200
+diff -up php-5.3.14/configure.in.aconf259 php-5.3.14/configure.in
+--- php-5.3.14/configure.in.aconf259 2012-06-14 21:19:03.612973101 +0200
++++ php-5.3.14/configure.in 2012-06-14 21:20:02.414113749 +0200
@@ -1,28 +1,6 @@
## $Id$ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
@@ -78,7 +78,7 @@ diff -up php-5.3.11/configure.in.aconf259 php-5.3.11/configure.in
-AC_PREREQ(2.13)
+AC_PREREQ(2.59)
- AC_INIT(README.SVN-RULES)
+ AC_INIT(README.GIT-RULES)
+ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
PHP_CONFIG_NICE(config.nice)
@@ -135,9 +135,9 @@ diff -up php-5.3.11/configure.in.aconf259 php-5.3.11/configure.in
dnl Extension configuration.
dnl -------------------------------------------------------------------------
-diff -up php-5.3.11/ext/standard/config.m4.aconf259 php-5.3.11/ext/standard/config.m4
---- php-5.3.11/ext/standard/config.m4.aconf259 2012-04-27 16:23:51.491083579 +0200
-+++ php-5.3.11/ext/standard/config.m4 2012-04-27 16:23:55.204083670 +0200
+diff -up php-5.3.14/ext/standard/config.m4.aconf259 php-5.3.14/ext/standard/config.m4
+--- php-5.3.14/ext/standard/config.m4.aconf259 2012-06-13 10:18:44.000000000 +0200
++++ php-5.3.14/ext/standard/config.m4 2012-06-14 21:19:03.621973122 +0200
@@ -1,7 +1,5 @@
dnl $Id$ -*- autoconf -*-
@@ -155,9 +155,9 @@ diff -up php-5.3.11/ext/standard/config.m4.aconf259 php-5.3.11/ext/standard/conf
dnl
dnl Check if there is a support means of creating a new process
dnl and defining which handles it receives
-diff -up php-5.3.11/scripts/php-config.in.aconf259 php-5.3.11/scripts/php-config.in
---- php-5.3.11/scripts/php-config.in.aconf259 2012-04-25 00:13:15.000000000 +0200
-+++ php-5.3.11/scripts/php-config.in 2012-04-27 16:21:52.257080726 +0200
+diff -up php-5.3.14/scripts/php-config.in.aconf259 php-5.3.14/scripts/php-config.in
+--- php-5.3.14/scripts/php-config.in.aconf259 2012-06-13 10:18:44.000000000 +0200
++++ php-5.3.14/scripts/php-config.in 2012-06-14 21:19:03.621973122 +0200
@@ -2,6 +2,7 @@
SED="@SED@"
@@ -166,9 +166,9 @@ diff -up php-5.3.11/scripts/php-config.in.aconf259 php-5.3.11/scripts/php-config
exec_prefix="@exec_prefix@"
version="@PHP_VERSION@"
vernum="@PHP_VERSION_ID@"
-diff -up php-5.3.11/scripts/phpize.in.aconf259 php-5.3.11/scripts/phpize.in
---- php-5.3.11/scripts/phpize.in.aconf259 2012-04-25 00:13:15.000000000 +0200
-+++ php-5.3.11/scripts/phpize.in 2012-04-27 16:21:52.257080726 +0200
+diff -up php-5.3.14/scripts/phpize.in.aconf259 php-5.3.14/scripts/phpize.in
+--- php-5.3.14/scripts/phpize.in.aconf259 2012-06-13 10:18:44.000000000 +0200
++++ php-5.3.14/scripts/phpize.in 2012-06-14 21:19:03.622973124 +0200
@@ -2,6 +2,7 @@
# Variable declaration
@@ -177,9 +177,9 @@ diff -up php-5.3.11/scripts/phpize.in.aconf259 php-5.3.11/scripts/phpize.in
exec_prefix="`eval echo @exec_prefix@`"
phpdir="`eval echo @libdir@`/build"
includedir="`eval echo @includedir@`/php"
-diff -up php-5.3.11/scripts/phpize.m4.aconf259 php-5.3.11/scripts/phpize.m4
---- php-5.3.11/scripts/phpize.m4.aconf259 2012-04-25 00:13:15.000000000 +0200
-+++ php-5.3.11/scripts/phpize.m4 2012-04-27 16:21:52.258080726 +0200
+diff -up php-5.3.14/scripts/phpize.m4.aconf259 php-5.3.14/scripts/phpize.m4
+--- php-5.3.14/scripts/phpize.m4.aconf259 2012-06-13 10:18:44.000000000 +0200
++++ php-5.3.14/scripts/phpize.m4 2012-06-14 21:19:03.623973127 +0200
@@ -1,9 +1,8 @@
dnl This file becomes configure.in for self-contained extensions.
diff --git a/php.spec b/php.spec
index c521237..9e178ad 100644
--- a/php.spec
+++ b/php.spec
@@ -37,7 +37,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
-Version: 5.3.13
+Version: 5.3.14
Release: 1%{?dist}
License: PHP
Group: Development/Languages
@@ -62,7 +62,7 @@ Patch6: php-5.2.4-embed.patch
Patch7: php-5.3.0-recode.patch
# from http://svn.php.net/viewvc?view=revision&revision=311042
# and http://svn.php.net/viewvc?view=revision&revision=311908
-Patch8: php-5.3.11-aconf259.patch
+Patch8: php-5.3.14-aconf259.patch
# fix harcoded mysql.sock path
Patch9: php-5.3.9-mysqlnd.patch
@@ -159,11 +159,14 @@ Provides: php(api) = %{apiver}%{isasuffix}, php(zend-abi) = %{zendver}%{isasuffi
# Provides for all builtin/shared modules:
Provides: php-bz2, php-bz2%{?_isa}
Provides: php-calendar, php-calendar%{?_isa}
+Provides: php-core = %{version}, php-core%{?_isa} = %{version}
Provides: php-ctype, php-ctype%{?_isa}
Provides: php-curl, php-curl%{?_isa}
Provides: php-date, php-date%{?_isa}
+Provides: php-ereg, php-ereg%{?_isa}
Provides: php-exif, php-exif%{?_isa}
Provides: php-fileinfo, php-fileinfo%{?_isa}
+Provides: php-filter, php-filter%{?_isa}
Provides: php-pecl-Fileinfo = %{fileinfover}, php-pecl-Fileinfo%{?_isa} = %{fileinfover}
Provides: php-pecl(Fileinfo) = %{fileinfover}, php-pecl(Fileinfo)%{?_isa} = %{fileinfover}
Provides: php-ftp, php-ftp%{?_isa}
@@ -185,6 +188,7 @@ Provides: php-session, php-session%{?_isa}
Provides: php-shmop, php-shmop%{?_isa}
Provides: php-simplexml, php-simplexml%{?_isa}
Provides: php-sockets, php-sockets%{?_isa}
+Provides: php-standard = %{version}, php-standard%{?_isa} = %{version}
Provides: php-spl, php-spl%{?_isa}
Provides: php-tokenizer, php-tokenizer%{?_isa}
%if %{with_zip}
@@ -1108,6 +1112,10 @@ fi
%changelog
+* Thu Jun 21 2012 Remi Collet <remi at fedoraproject.org> 5.3.14-1
+- update to 5.3.14 (CVE-2012-2143, CVE-2012-2386)
+- add missing provides (core, ereg, filter, standard)
+
* Wed May 09 2012 Remi Collet <remi at fedoraproject.org> 5.3.13-1
- update to 5.3.13 (CVE-2012-2311)
diff --git a/sources b/sources
index aa59fac..8602428 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-370be99c5cdc2e756c82c44d774933c8 php-5.3.13.tar.bz2
+7caac4f71e2f21426c11ac153e538392 php-5.3.14.tar.bz2
More information about the scm-commits
mailing list