- up to 5.4.0RC3

Changed files:
    php-config-file-scan-dir.patch -> 1.4.2.1
    php-ini.patch -> 1.42.4.2
    php-sapi-ini-file.patch -> 1.13.4.2
    php.spec -> 1.945.2.8

diff --git a/php-config-file-scan-dir.patch b/php-config-file-scan-dir.patch
index 12d15aa59ef70d7aa1a2ebd9001f4992b39dcb4d..a01906e88f05b399b7f3a581a22a5e452ad6afe2 100644 (file)
--- a/php-config-file-scan-dir.patch
+++ b/php-config-file-scan-dir.patch
@@ -1,19 +1,17 @@
---- php-src/main/php_ini.c     2009/05/18 21:28:42     1.173
-+++ php-src/main/php_ini.c     2009/06/27 15:22:06     1.174
-@@ -349,7 +349,8 @@
+--- php-5.4.0RC3/main/php_ini.c~       2011-12-10 03:26:15.000000000 +0200
++++ php-5.4.0RC3/main/php_ini.c        2011-12-10 03:26:54.901295707 +0200
+@@ -376,6 +376,7 @@
        char *open_basedir;
        int free_ini_search_path = 0;
        zend_file_handle fh;
--
 +      static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 };
-+      
+ 
        if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t) config_zval_dtor, 1) == FAILURE) {
                return FAILURE;
-       }
-@@ -372,7 +373,6 @@
+@@ -398,7 +399,6 @@
+               int search_path_size;
                char *default_location;
                char *env_location;
-               char *binary_location;
 -              static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 };
  #ifdef PHP_WIN32
                char *reg_location;
@@ -66,7 +64,7 @@
 -                                                              zend_llist_add_element(&scanned_ini_list, &p);
 +              /* List of found ini files */
 +              zend_llist_init(&scanned_ini_list, sizeof(char *), (llist_dtor_func_t) free_estring, 1);
-+              
++
 +              /* Split by paths_separator and load ini-files from all paths */
 +              path_copy = estrdup(php_ini_scanned_path);
 +              ini_path  = php_strtok_r(path_copy, paths_separator, &last);
@@ -91,13 +89,13 @@
 +                                              snprintf(ini_file, MAXPATHLEN, "%s%s", ini_path, namelist[i]->d_name);
 +                                      } else {
 +                                              snprintf(ini_file, MAXPATHLEN, "%s%c%s", ini_path, DEFAULT_SLASH, namelist[i]->d_name);
-+                                      }                       
++                                      }
 +                                      if (VCWD_STAT(ini_file, &sb) == 0) {
 +                                              if (S_ISREG(sb.st_mode)) {
 +                                                      if ((fh2.handle.fp = VCWD_FOPEN(ini_file, "r"))) {
 +                                                              fh2.filename = ini_file;
 +                                                              fh2.type = ZEND_HANDLE_FP;
-+                                                              
++
 +                                                              /* Reset active ini section */
 +                                                              RESET_ACTIVE_INI_HASH();
 +
@@ -133,7 +131,7 @@
 -                                      strlcat(php_ini_scanned_files, element->next ? ",\n" : "\n", total_l);
 +                      ini_path = php_strtok_r(NULL, paths_separator, &last);
 +              }
-+                      
++
 +              if (total_l) {
 +                      int php_ini_scanned_files_len = (php_ini_scanned_files) ? strlen(php_ini_scanned_files) + 1 : 0;
 +                      php_ini_scanned_files = (char *) realloc(php_ini_scanned_files, php_ini_scanned_files_len + total_l + 1);

diff --git a/php-ini.patch b/php-ini.patch
index b503725179250d5519a6f8b6712668e9ef951772..7d6be8e0f7f0b3a5c39fa0622e4531afd0cfada8 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-5.4.0alpha3/php.ini~   2011-08-08 00:06:52.000000000 +0300
-+++ php-5.4.0alpha3/php.ini    2011-08-08 00:09:15.835275555 +0300
+--- php-5.4.0RC3/php.ini~      2011-12-10 03:28:54.000000000 +0200
++++ php-5.4.0RC3/php.ini       2011-12-10 03:29:47.322573066 +0200
 @@ -223,7 +223,7 @@
  ; Development Value: Off
  ; Production Value: Off
@@ -83,7 +83,7 @@
  
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
-@@ -795,52 +795,8 @@
+@@ -805,52 +805,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -108,7 +108,7 @@
 -;extension=php_mysql.dll
 -;extension=php_mysqli.dll
 -;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
--;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
+-;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
 -;extension=php_openssl.dll
 -;extension=php_pdo_firebird.dll
 -;extension=php_pdo_mysql.dll

diff --git a/php-sapi-ini-file.patch b/php-sapi-ini-file.patch
index dc2b1e13660de9120d31ff28e6ef0f7879713989..7ceb984e8d3874d22d2822564162237e2cc20360 100644 (file)
--- a/php-sapi-ini-file.patch
+++ b/php-sapi-ini-file.patch
@@ -1,5 +1,5 @@
---- php-5.3.0/main/php_ini.c   2009-07-06 17:36:45.529879052 +0200
-+++ php-5.3.2/main/php_ini.c   2010-03-17 17:55:16.800313459 +0200
+--- php-5.4.0RC3/main/php_ini.c~       2011-12-10 03:35:27.000000000 +0200
++++ php-5.4.0RC3/main/php_ini.c        2011-12-10 03:36:08.930154336 +0200
 @@ -358,6 +358,11 @@
  }
  /* }}} */
@@ -52,7 +52,7 @@
        }
  
        if (free_ini_search_path) {
-@@ -610,12 +625,14 @@
+@@ -627,12 +627,14 @@
                zend_llist scanned_ini_list;
                zend_llist_element *element;
                int l, total_l = 0;
@@ -60,7 +60,7 @@
  
                /* List of found ini files */
                zend_llist_init(&scanned_ini_list, sizeof(char *), (llist_dtor_func_t) free_estring, 1);
-               
+ 
                /* Split by paths_separator and load ini-files from all paths */
 -              path_copy = estrdup(php_ini_scanned_path);
 +              path_copy = emalloc(strlen(php_ini_scanned_path) + strlen(fmt) + strlen(sapi_module.name));

diff --git a/php.spec b/php.spec
index 4de075cd6d866925de561d6e7df0fc80b683984e..3447b59df0c1d0fddf7f7fe912d2aa207c0a110c 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -122,7 +122,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_filter
 %endif
 
-%define                rel     0.5
+%define                rel     0.6
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -136,8 +136,8 @@ Epoch:              4
 License:       PHP
 Group:         Libraries
 #Source0:      http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-Source0:       http://downloads.php.net/stas/%{name}-%{version}RC2.tar.bz2
-# Source0-md5: 7e5ad382db17a81f0cd3c092399cb4af
+Source0:       http://downloads.php.net/stas/%{name}-%{version}RC3.tar.bz2
+# Source0-md5: 798e06ac342b0b44580324071fd2bd4c
 Source2:       %{name}-mod_%{name}.conf
 Source3:       %{name}-cgi-fcgi.ini
 Source4:       %{name}-apache.ini
@@ -1854,7 +1854,7 @@ compression support to PHP.
 Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
-%setup -q -n %{name}-%{version}RC2
+%setup -q -n %{name}-%{version}RC3
 # prep for suhosin patch
 %undos Zend/Zend.dsp Zend/ZendTS.dsp
 %patch0 -p1
@@ -1963,7 +1963,7 @@ mv sapi/cli/tests/022.phpt{,.broken}
 # probably pointless.
 %{__rm} ext/standard/tests/file/disk_free_space_basic.phpt
 
-sh -xe %{_sourcedir}/skip-tests.sh
+#sh -xe %{_sourcedir}/skip-tests.sh
 
 %build
 API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h)