up to 5.4.8

diff --git a/php.spec b/php.spec
index d952e43b7ed33839fa56e2100e1b66674f35ef0b..a54b4ae45c8f02b3a12e6c73e4bd7432e45613ed 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -134,13 +134,13 @@ Summary(pt_BR.UTF-8):     A linguagem de script PHP
 Summary(ru.UTF-8):     PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):     PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
-Version:       5.4.7
+Version:       5.4.8
 Release:       %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:         4
 License:       PHP
 Group:         Libraries
 Source0:       http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
-# Source0-md5: 9cd421f1cc8fa8e7f215e44a1b06199f
+# Source0-md5: bb8c816a9299be8995255ef70c63b800
 Source2:       %{orgname}-mod_%{orgname}.conf
 Source3:       %{orgname}-cgi-fcgi.ini
 Source4:       %{orgname}-apache.ini

diff --git a/skip-tests.sh b/skip-tests.sh
index 9beae50fc41e71be3f675e2f4b4b1328e606434e..8d76b128dcebffd83639f14bc3dbc6edfa5a339c 100644 (file)
--- a/skip-tests.sh
+++ b/skip-tests.sh
@@ -164,8 +164,6 @@ mv ext/snmp/tests/bug60749.phpt{,.skip}
 mv ext/snmp/tests/wrong_hostname.phpt{,.skip}
 # ext/sockets - socket_bind - basic test
 mv ext/sockets/tests/socket_bind.phpt{,.skip}
-# gethostbyname() function - basic invalid parameter test
-mv ext/standard/tests/network/gethostbyname_basic002.phpt{,.skip}
 # gethostbyname() function - basic return valid ip address test
 mv ext/standard/tests/network/gethostbyname_error004.phpt{,.skip}
 # getmxrr() test

diff --git a/suhosin.patch b/suhosin.patch
index 80b86454ce7424302500dec99385ce67b713f2d7..345212011af4151f23ef94cfbe5d4ed080d80947 100644 (file)
--- a/suhosin.patch
+++ b/suhosin.patch
@@ -9,7 +9,7 @@ the following modifications have been made:
  * removed changes to ./configure & ./main/php_config.h.in since those
    files are autogenerated
  * "quilt refresh" has been run to clean up the offsets, etc
- * chunk adjust ed for PLD Logo patch
+ * chunk adjusted for PLD Logo patch
 --- a/Zend/Makefile.am
 +++ b/Zend/Makefile.am
 @@ -17,7 +17,8 @@ libZend_la_SOURCES=\
@@ -5615,23 +5615,23 @@ the following modifications have been made:
                                        PHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__,
  #if ZEND_DEBUG && defined(HAVE_GCOV)
                                        "(DEBUG GCOV)",
---- php-5.4.6/sapi/litespeed/lsapi_main.c~     2012-08-15 07:26:05.000000000 +0300
-+++ php-5.4.6/sapi/litespeed/lsapi_main.c      2012-08-23 12:09:38.475590330 +0300
+--- php-5.4.8/sapi/litespeed/lsapi_main.c~     2012-10-16 13:05:41.000000000 +0300
++++ php-5.4.8/sapi/litespeed/lsapi_main.c      2012-11-09 09:30:54.304162453 +0200
 @@ -718,11 +718,19 @@
                  break;
              case 'v':
                  if (php_request_startup(TSRMLS_C) != FAILURE) {
 +#if SUHOSIN_PATCH
 +#if ZEND_DEBUG
-+                                      php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++                                      php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
 +#else
-+                                      php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++                                      php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
 +#endif
 +#else
  #if ZEND_DEBUG
-                     php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+                     php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
  #else
-                     php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+                     php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
  #endif
 +#endif
  #ifdef PHP_OUTPUT_NEWAPI