- add patch for bug #48880 random errors with open_basedir(); will be fixed

  in 5.3.1
- rel up .3 -> .4

Changed files:
    php-bug-48880.patch -> 1.1
    php.spec -> 1.813

diff --git a/php-bug-48880.patch b/php-bug-48880.patch
new file mode 100644 (file)
index 0000000..d860154
--- /dev/null
+++ b/php-bug-48880.patch
@@ -0,0 +1,12 @@
+diff -urN php-5.3.0/main/fopen_wrappers.c mod/main/fopen_wrappers.c
+--- php-5.3.0/main/fopen_wrappers.c    2009-06-18 08:38:30.000000000 +0200
++++ mod/main/fopen_wrappers.c  2009-08-18 18:56:55.647272948 +0200
+@@ -93,7 +93,7 @@
+ 
+       p = (char **) (base + (size_t) mh_arg1);
+ 
+-      if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN) {
++      if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN || stage == PHP_INI_STAGE_ACTIVATE || stage == PHP_INI_STAGE_DEACTIVATE) {
+               /* We're in a PHP_INI_SYSTEM context, no restrictions */
+               *p = new_value;
+               return SUCCESS;

diff --git a/php.spec b/php.spec
index 0566fa5f9374a26411ce8876538a1b8d5fcef214..93ce8e24e4465f78f327d9884435da014f3d9c2f 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -76,7 +76,7 @@
 ERROR: You need to select at least one Apache SAPI to build shared modules.
 %endif
 
-%define                rel             0.3
+%define                rel             0.4
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -124,6 +124,7 @@ Patch31:    %{name}-fcgi-graceful.patch
 Patch32:       %{name}-m4-divert.patch
 Patch38:       %{name}-tds.patch
 Patch43:       %{name}-use-prog_sendmail.patch
+Patch44:       %{name}-bug-48880.patch
 %if %{with type_hints}
 Patch50:       http://ilia.ws/patch/type_hint_53_v2.txt
 %endif
@@ -1588,6 +1589,8 @@ Moduł PHP umożliwiający używanie kompresji zlib.
 %patch50 -p0
 %endif
 
+%patch44 -p1
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1