- update to 5.5.0beta1 http://fedoraproject.org/wiki/Features/Php55
- new Zend OPcache extension in php-opccache new sub-package - don't display XFAIL tests in report - use xz compressed tarball - build simplexml and xml extensions shared (moved in php-xml) - build bz2, calendar, ctype, exif, ftp, gettext, iconv sockets and tokenizer extensions shared (in php-common) - build gmp extension shared (in php-gmp new sub-package) - build shmop extension shared (moved in php-process) - drop some old compatibility provides (php-api, php-zend-abi, php-pecl-*)
This commit is contained in:
parent
b03f126b7e
commit
77d120e92b
1
.gitignore
vendored
1
.gitignore
vendored
@ -16,3 +16,4 @@ php-5.3*.bz2
|
|||||||
/php-5.4.12.tar.bz2
|
/php-5.4.12.tar.bz2
|
||||||
/php-5.4.13RC1.tar.bz2
|
/php-5.4.13RC1.tar.bz2
|
||||||
/php-5.4.13.tar.bz2
|
/php-5.4.13.tar.bz2
|
||||||
|
/php-5.5.0beta1.tar.xz
|
||||||
|
95
opcache.ini
Normal file
95
opcache.ini
Normal file
@ -0,0 +1,95 @@
|
|||||||
|
; Enable Zend OPcache extension module
|
||||||
|
zend_extension=@EXTPATH@/opcache.so
|
||||||
|
|
||||||
|
; Determines if Zend OPCache is enabled
|
||||||
|
opcache.enable=1
|
||||||
|
|
||||||
|
; The OPcache shared memory storage size.
|
||||||
|
opcache.memory_consumption=128
|
||||||
|
|
||||||
|
; The amount of memory for interned strings in Mbytes.
|
||||||
|
opcache.interned_strings_buffer=8
|
||||||
|
|
||||||
|
; The maximum number of keys (scripts) in the OPcache hash table.
|
||||||
|
; Only numbers between 200 and 100000 are allowed.
|
||||||
|
opcache.max_accelerated_files=4000
|
||||||
|
|
||||||
|
; The maximum percentage of "wasted" memory until a restart is scheduled.
|
||||||
|
;opcache.max_wasted_percentage=5
|
||||||
|
|
||||||
|
; When this directive is enabled, the OPcache appends the current working
|
||||||
|
; directory to the script key, thus eliminating possible collisions between
|
||||||
|
; files with the same name (basename). Disabling the directive improves
|
||||||
|
; performance, but may break existing applications.
|
||||||
|
;opcache.use_cwd=1
|
||||||
|
|
||||||
|
; When disabled, you must reset the OPcache manually or restart the
|
||||||
|
; webserver for changes to the filesystem to take effect.
|
||||||
|
;opcache.validate_timestamps=1
|
||||||
|
|
||||||
|
; How often (in seconds) to check file timestamps for changes to the shared
|
||||||
|
; memory storage allocation. ("1" means validate once per second, but only
|
||||||
|
; once per request. "0" means always validate)
|
||||||
|
;opcache.revalidate_freq=2
|
||||||
|
|
||||||
|
; Enables or disables file search in include_path optimization
|
||||||
|
;opcache.revalidate_path=0
|
||||||
|
|
||||||
|
; If disabled, all PHPDoc comments are dropped from the code to reduce the
|
||||||
|
;size of the optimized code.
|
||||||
|
;opcache.save_comments=1
|
||||||
|
|
||||||
|
; If disabled, PHPDoc comments are not loaded from SHM, so "Doc Comments"
|
||||||
|
; may be always stored (save_comments=1), but not loaded by applications
|
||||||
|
; that don't need them anyway.
|
||||||
|
;opcache.load_comments=1
|
||||||
|
|
||||||
|
; If enabled, a fast shutdown sequence is used for the accelerated code
|
||||||
|
opcache.fast_shutdown=1
|
||||||
|
|
||||||
|
; Allow file existence override (file_exists, etc.) performance feature.
|
||||||
|
;opcache.enable_file_override=0
|
||||||
|
|
||||||
|
; A bitmask, where each bit enables or disables the appropriate OPcache
|
||||||
|
; passes
|
||||||
|
;opcache.optimization_level=0xffffffff
|
||||||
|
|
||||||
|
;opcache.inherited_hack=1
|
||||||
|
;opcache.dups_fix=0
|
||||||
|
|
||||||
|
; The location of the OPcache blacklist file.
|
||||||
|
; The OPcache blacklist file is a text file that holds the names of files
|
||||||
|
; that should not be accelerated. The file format is to add each filename
|
||||||
|
; to a new line. The filename may be a full path or just a file prefix
|
||||||
|
; (i.e., /var/www/x blacklists all the files and directories in /var/www
|
||||||
|
; that start with 'x').
|
||||||
|
;opcache.blacklist_filename=
|
||||||
|
|
||||||
|
; Allows exclusion of large files from being cached. By default all files
|
||||||
|
; are cached.
|
||||||
|
;opcache.max_file_size=0
|
||||||
|
|
||||||
|
; Check the cache checksum each N requests.
|
||||||
|
; The default value of "0" means that the checks are disabled.
|
||||||
|
;opcache.consistency_checks=0
|
||||||
|
|
||||||
|
; How long to wait (in seconds) for a scheduled restart to begin if the cache
|
||||||
|
; is not being accessed.
|
||||||
|
;opcache.force_restart_timeout=180
|
||||||
|
|
||||||
|
; OPcache error_log file name. Empty string assumes "stderr".
|
||||||
|
;opcache.error_log=
|
||||||
|
|
||||||
|
; All OPcache errors go to the Web server log.
|
||||||
|
; By default, only fatal errors (level 0) or errors (level 1) are logged.
|
||||||
|
; You can also enable warnings (level 2), info messages (level 3) or
|
||||||
|
; debug messages (level 4).
|
||||||
|
;opcache.log_verbosity_level=1
|
||||||
|
|
||||||
|
; Preferred Shared Memory back-end. Leave empty and let the system decide.
|
||||||
|
;opcache.preferred_memory_model=
|
||||||
|
|
||||||
|
; Protect the shared memory from unexpected writing during script execution.
|
||||||
|
; Useful for internal debugging only.
|
||||||
|
;opcache.protect_memory=0
|
||||||
|
|
@ -1,689 +0,0 @@
|
|||||||
diff -up php-5.4.0RC5/ext/standard/basic_functions.c.easter php-5.4.0RC5/ext/standard/basic_functions.c
|
|
||||||
--- php-5.4.0RC5/ext/standard/basic_functions.c.easter 2012-01-18 17:17:54.016033939 +0100
|
|
||||||
+++ php-5.4.0RC5/ext/standard/basic_functions.c 2012-01-18 17:18:54.022036314 +0100
|
|
||||||
@@ -1554,9 +1554,6 @@ ZEND_END_ARG_INFO()
|
|
||||||
ZEND_BEGIN_ARG_INFO(arginfo_php_real_logo_guid, 0)
|
|
||||||
ZEND_END_ARG_INFO()
|
|
||||||
|
|
||||||
-ZEND_BEGIN_ARG_INFO(arginfo_php_egg_logo_guid, 0)
|
|
||||||
-ZEND_END_ARG_INFO()
|
|
||||||
-
|
|
||||||
ZEND_BEGIN_ARG_INFO(arginfo_zend_logo_guid, 0)
|
|
||||||
ZEND_END_ARG_INFO()
|
|
||||||
|
|
||||||
@@ -2719,7 +2716,6 @@ const zend_function_entry basic_function
|
|
||||||
PHP_FE(phpcredits, arginfo_phpcredits)
|
|
||||||
PHP_FE(php_logo_guid, arginfo_php_logo_guid)
|
|
||||||
PHP_FE(php_real_logo_guid, arginfo_php_real_logo_guid)
|
|
||||||
- PHP_FE(php_egg_logo_guid, arginfo_php_egg_logo_guid)
|
|
||||||
PHP_FE(zend_logo_guid, arginfo_zend_logo_guid)
|
|
||||||
PHP_FE(php_sapi_name, arginfo_php_sapi_name)
|
|
||||||
PHP_FE(php_uname, arginfo_php_uname)
|
|
||||||
diff -up php-5.4.0RC5/ext/standard/info.c.easter php-5.4.0RC5/ext/standard/info.c
|
|
||||||
--- php-5.4.0RC5/ext/standard/info.c.easter 2012-01-18 17:17:44.712033203 +0100
|
|
||||||
+++ php-5.4.0RC5/ext/standard/info.c 2012-01-18 17:19:58.097039189 +0100
|
|
||||||
@@ -1195,21 +1195,7 @@ PHP_FUNCTION(phpcredits)
|
|
||||||
*/
|
|
||||||
PHPAPI char *php_logo_guid(void)
|
|
||||||
{
|
|
||||||
- char *logo_guid;
|
|
||||||
-
|
|
||||||
- time_t the_time;
|
|
||||||
- struct tm *ta, tmbuf;
|
|
||||||
-
|
|
||||||
- the_time = time(NULL);
|
|
||||||
- ta = php_localtime_r(&the_time, &tmbuf);
|
|
||||||
-
|
|
||||||
- if (ta && (ta->tm_mon==3) && (ta->tm_mday==1)) {
|
|
||||||
- logo_guid = PHP_EGG_LOGO_GUID;
|
|
||||||
- } else {
|
|
||||||
- logo_guid = PHP_LOGO_GUID;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- return estrdup(logo_guid);
|
|
||||||
+ return estrdup(PHP_LOGO_GUID);
|
|
||||||
|
|
||||||
}
|
|
||||||
/* }}} */
|
|
||||||
@@ -1238,18 +1224,6 @@ PHP_FUNCTION(php_real_logo_guid)
|
|
||||||
}
|
|
||||||
/* }}} */
|
|
||||||
|
|
||||||
-/* {{{ proto string php_egg_logo_guid(void)
|
|
||||||
- Return the special ID used to request the PHP logo in phpinfo screens*/
|
|
||||||
-PHP_FUNCTION(php_egg_logo_guid)
|
|
||||||
-{
|
|
||||||
- if (zend_parse_parameters_none() == FAILURE) {
|
|
||||||
- return;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- RETURN_STRINGL(PHP_EGG_LOGO_GUID, sizeof(PHP_EGG_LOGO_GUID)-1, 1);
|
|
||||||
-}
|
|
||||||
-/* }}} */
|
|
||||||
-
|
|
||||||
/* {{{ proto string zend_logo_guid(void)
|
|
||||||
Return the special ID used to request the Zend logo in phpinfo screens*/
|
|
||||||
PHP_FUNCTION(zend_logo_guid)
|
|
||||||
diff -up php-5.4.0RC5/ext/standard/info.h.easter php-5.4.0RC5/ext/standard/info.h
|
|
||||||
--- php-5.4.0RC5/ext/standard/info.h.easter 2012-01-18 17:17:37.245032832 +0100
|
|
||||||
+++ php-5.4.0RC5/ext/standard/info.h 2012-01-18 17:20:17.160040044 +0100
|
|
||||||
@@ -51,7 +51,6 @@
|
|
||||||
#endif /* HAVE_CREDITS_DEFS */
|
|
||||||
|
|
||||||
#define PHP_LOGO_GUID "PHPE9568F34-D428-11d2-A769-00AA001ACF42"
|
|
||||||
-#define PHP_EGG_LOGO_GUID "PHPE9568F36-D428-11d2-A769-00AA001ACF42"
|
|
||||||
#define ZEND_LOGO_GUID "PHPE9568F35-D428-11d2-A769-00AA001ACF42"
|
|
||||||
#define PHP_CREDITS_GUID "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000"
|
|
||||||
|
|
||||||
@@ -62,7 +61,6 @@ PHP_FUNCTION(phpcredits);
|
|
||||||
PHP_FUNCTION(php_logo_guid);
|
|
||||||
PHP_FUNCTION(php_real_logo_guid);
|
|
||||||
PHP_FUNCTION(zend_logo_guid);
|
|
||||||
-PHP_FUNCTION(php_egg_logo_guid);
|
|
||||||
PHP_FUNCTION(php_sapi_name);
|
|
||||||
PHP_FUNCTION(php_uname);
|
|
||||||
PHP_FUNCTION(php_ini_scanned_files);
|
|
||||||
diff -up php-5.4.0RC5/main/logos.h.easter php-5.4.0RC5/main/logos.h
|
|
||||||
--- php-5.4.0RC5/main/logos.h.easter 2012-01-18 17:17:27.975032470 +0100
|
|
||||||
+++ php-5.4.0RC5/main/logos.h 2012-01-18 17:21:27.036043180 +0100
|
|
||||||
@@ -492,589 +492,3 @@ static const unsigned char php_logo[] =
|
|
||||||
21, 116, 187, 251, 221, 240, 142, 119, 188, 3,
|
|
||||||
1, 0, 59, 0 };
|
|
||||||
|
|
||||||
-static const unsigned char php_egg_logo[] = {
|
|
||||||
- 71, 73, 70, 56, 57, 97, 120, 0, 67, 0,
|
|
||||||
- 231, 255, 0, 18, 25, 33, 32, 30, 34, 28,
|
|
||||||
- 33, 44, 15, 35, 71, 6, 37, 85, 37, 40,
|
|
||||||
- 47, 34, 41, 53, 41, 40, 43, 9, 47, 109,
|
|
||||||
- 30, 45, 68, 21, 48, 84, 51, 46, 55, 43,
|
|
||||||
- 49, 59, 31, 59, 98, 15, 61, 128, 58, 55,
|
|
||||||
- 69, 50, 57, 74, 0, 66, 144, 56, 58, 60,
|
|
||||||
- 54, 59, 71, 32, 66, 113, 60, 65, 67, 63,
|
|
||||||
- 65, 84, 63, 68, 79, 28, 79, 145, 15, 82,
|
|
||||||
- 162, 75, 72, 98, 68, 78, 86, 74, 77, 88,
|
|
||||||
- 50, 82, 122, 41, 85, 134, 76, 78, 108, 70,
|
|
||||||
- 83, 101, 5, 94, 190, 0, 95, 197, 86, 80,
|
|
||||||
- 101, 28, 92, 159, 80, 84, 96, 83, 83, 115,
|
|
||||||
- 81, 87, 89, 22, 97, 183, 86, 88, 85, 0,
|
|
||||||
- 102, 210, 8, 101, 204, 24, 100, 177, 85, 90,
|
|
||||||
- 127, 35, 101, 169, 42, 100, 159, 88, 92, 103,
|
|
||||||
- 0, 107, 216, 69, 95, 132, 0, 108, 210, 84,
|
|
||||||
- 93, 112, 94, 90, 117, 18, 105, 201, 96, 92,
|
|
||||||
- 105, 89, 96, 98, 94, 93, 135, 94, 94, 126,
|
|
||||||
- 30, 106, 210, 7, 112, 222, 33, 108, 198, 16,
|
|
||||||
- 114, 217, 27, 113, 198, 24, 113, 209, 59, 108,
|
|
||||||
- 159, 96, 100, 138, 0, 120, 229, 44, 112, 180,
|
|
||||||
- 49, 112, 171, 71, 108, 148, 99, 104, 115, 90,
|
|
||||||
- 106, 125, 27, 115, 232, 100, 102, 147, 42, 115,
|
|
||||||
- 192, 86, 110, 137, 9, 123, 239, 106, 108, 105,
|
|
||||||
- 105, 105, 138, 33, 118, 228, 12, 125, 227, 48,
|
|
||||||
- 117, 208, 16, 126, 222, 37, 120, 224, 20, 125,
|
|
||||||
- 235, 35, 123, 213, 50, 121, 190, 43, 123, 206,
|
|
||||||
- 40, 123, 220, 105, 110, 160, 59, 122, 182, 78,
|
|
||||||
- 119, 158, 44, 122, 233, 3, 134, 250, 112, 112,
|
|
||||||
- 151, 73, 123, 175, 113, 118, 114, 51, 128, 205,
|
|
||||||
- 34, 129, 246, 11, 136, 245, 34, 130, 240, 113,
|
|
||||||
- 117, 149, 111, 116, 166, 111, 119, 141, 48, 130,
|
|
||||||
- 221, 38, 132, 235, 53, 130, 215, 97, 124, 146,
|
|
||||||
- 116, 122, 124, 117, 121, 131, 54, 130, 229, 41,
|
|
||||||
- 135, 232, 68, 130, 223, 46, 135, 246, 65, 134,
|
|
||||||
- 202, 42, 137, 241, 75, 131, 205, 124, 121, 161,
|
|
||||||
- 101, 125, 191, 86, 128, 210, 121, 122, 169, 105,
|
|
||||||
- 128, 157, 121, 122, 180, 114, 124, 181, 94, 128,
|
|
||||||
- 201, 81, 134, 185, 46, 138, 252, 76, 135, 195,
|
|
||||||
- 34, 142, 252, 62, 137, 229, 63, 138, 217, 33,
|
|
||||||
- 144, 247, 58, 139, 223, 56, 141, 246, 54, 143,
|
|
||||||
- 234, 57, 143, 241, 102, 135, 193, 129, 130, 176,
|
|
||||||
- 122, 136, 144, 46, 148, 252, 45, 149, 246, 118,
|
|
||||||
- 133, 191, 65, 146, 231, 73, 146, 216, 129, 133,
|
|
||||||
- 185, 135, 135, 156, 69, 148, 226, 44, 153, 255,
|
|
||||||
- 94, 143, 216, 132, 136, 175, 88, 146, 207, 137,
|
|
||||||
- 139, 136, 93, 146, 197, 95, 147, 188, 137, 139,
|
|
||||||
- 150, 104, 146, 178, 122, 143, 172, 135, 139, 191,
|
|
||||||
- 57, 156, 254, 67, 154, 245, 70, 154, 239, 134,
|
|
||||||
- 141, 180, 117, 145, 201, 120, 146, 190, 79, 154,
|
|
||||||
- 233, 140, 141, 188, 129, 144, 194, 142, 142, 176,
|
|
||||||
- 137, 147, 156, 88, 155, 222, 82, 157, 230, 93,
|
|
||||||
- 157, 218, 66, 162, 253, 100, 157, 210, 77, 161,
|
|
||||||
- 247, 55, 168, 255, 81, 162, 241, 148, 148, 195,
|
|
||||||
- 145, 149, 202, 127, 156, 204, 77, 166, 255, 142,
|
|
||||||
- 155, 177, 141, 153, 200, 123, 160, 193, 73, 171,
|
|
||||||
- 255, 93, 167, 240, 96, 167, 234, 152, 158, 160,
|
|
||||||
- 101, 167, 228, 119, 164, 206, 155, 158, 171, 110,
|
|
||||||
- 167, 219, 156, 155, 203, 89, 172, 252, 128, 164,
|
|
||||||
- 219, 151, 163, 174, 81, 178, 255, 158, 162, 202,
|
|
||||||
- 102, 175, 249, 93, 178, 251, 108, 175, 237, 103,
|
|
||||||
- 177, 244, 166, 168, 165, 97, 182, 255, 87, 185,
|
|
||||||
- 255, 149, 174, 216, 125, 181, 235, 110, 185, 252,
|
|
||||||
- 117, 183, 254, 171, 172, 209, 166, 175, 197, 103,
|
|
||||||
- 190, 255, 174, 176, 189, 140, 183, 221, 128, 184,
|
|
||||||
- 248, 120, 187, 249, 179, 180, 184, 115, 193, 253,
|
|
||||||
- 170, 183, 193, 174, 181, 215, 107, 197, 255, 135,
|
|
||||||
- 191, 246, 151, 192, 219, 187, 183, 213, 128, 197,
|
|
||||||
- 253, 121, 202, 255, 147, 198, 239, 188, 191, 219,
|
|
||||||
- 148, 200, 252, 192, 193, 197, 134, 205, 254, 171,
|
|
||||||
- 199, 236, 183, 199, 218, 163, 207, 251, 142, 213,
|
|
||||||
- 255, 158, 211, 253, 195, 205, 217, 166, 211, 245,
|
|
||||||
- 205, 204, 228, 153, 218, 255, 190, 210, 236, 186,
|
|
||||||
- 212, 231, 177, 213, 248, 162, 224, 255, 188, 221,
|
|
||||||
- 250, 214, 219, 221, 214, 219, 233, 174, 229, 254,
|
|
||||||
- 198, 225, 247, 209, 226, 248, 186, 233, 251, 227,
|
|
||||||
- 230, 239, 225, 241, 252, 253, 255, 252, 255, 255,
|
|
||||||
- 255, 33, 249, 4, 1, 10, 0, 255, 0, 44,
|
|
||||||
- 0, 0, 0, 0, 120, 0, 67, 0, 0, 8,
|
|
||||||
- 254, 0, 255, 9, 28, 72, 176, 160, 193, 131,
|
|
||||||
- 8, 19, 42, 92, 200, 176, 161, 195, 135, 16,
|
|
||||||
- 35, 74, 156, 72, 177, 162, 197, 139, 22, 131,
|
|
||||||
- 105, 12, 134, 177, 163, 199, 143, 193, 164, 73,
|
|
||||||
- 227, 38, 141, 28, 56, 112, 228, 76, 146, 20,
|
|
||||||
- 41, 205, 152, 75, 99, 183, 100, 201, 50, 101,
|
|
||||||
- 202, 147, 77, 79, 166, 102, 205, 250, 200, 19,
|
|
||||||
- 100, 73, 114, 239, 238, 221, 123, 71, 148, 104,
|
|
||||||
- 202, 163, 224, 86, 138, 124, 25, 115, 166, 205,
|
|
||||||
- 72, 145, 246, 72, 221, 195, 39, 207, 30, 69,
|
|
||||||
- 158, 118, 246, 220, 202, 208, 24, 184, 160, 252,
|
|
||||||
- 248, 9, 29, 59, 212, 100, 75, 99, 53, 159,
|
|
||||||
- 66, 93, 203, 182, 109, 84, 169, 124, 248, 156,
|
|
||||||
- 57, 163, 165, 174, 150, 60, 138, 76, 113, 221,
|
|
||||||
- 251, 207, 24, 183, 119, 97, 3, 135, 125, 71,
|
|
||||||
- 78, 90, 76, 62, 142, 70, 141, 18, 53, 109,
|
|
||||||
- 170, 227, 199, 144, 35, 75, 157, 91, 87, 137,
|
|
||||||
- 229, 28, 74, 190, 228, 229, 139, 209, 43, 96,
|
|
||||||
- 193, 247, 10, 203, 114, 212, 167, 82, 47, 93,
|
|
||||||
- 197, 138, 81, 163, 166, 173, 19, 47, 201, 176,
|
|
||||||
- 99, 59, 166, 171, 36, 135, 237, 22, 45, 114,
|
|
||||||
- 216, 209, 203, 25, 98, 176, 191, 66, 195, 134,
|
|
||||||
- 54, 230, 233, 150, 179, 100, 197, 106, 181, 90,
|
|
||||||
- 158, 171, 57, 179, 110, 231, 124, 185, 145, 77,
|
|
||||||
- 157, 186, 150, 218, 45, 76, 104, 111, 145, 71,
|
|
||||||
- 86, 239, 133, 198, 200, 254, 145, 189, 199, 205,
|
|
||||||
- 212, 212, 115, 244, 232, 157, 107, 86, 172, 185,
|
|
||||||
- 234, 92, 197, 154, 137, 11, 231, 11, 77, 245,
|
|
||||||
- 251, 178, 207, 40, 201, 254, 225, 131, 134, 39,
|
|
||||||
- 138, 124, 103, 80, 73, 68, 13, 37, 141, 39,
|
|
||||||
- 144, 213, 115, 14, 60, 235, 116, 211, 12, 123,
|
|
||||||
- 197, 136, 67, 141, 106, 226, 156, 51, 78, 16,
|
|
||||||
- 92, 208, 194, 7, 126, 28, 70, 166, 159, 9,
|
|
||||||
- 26, 132, 104, 130, 29, 2, 254, 67, 32, 81,
|
|
||||||
- 224, 200, 18, 91, 56, 240, 208, 35, 78, 51,
|
|
||||||
- 238, 49, 40, 223, 58, 240, 88, 99, 132, 31,
|
|
||||||
- 207, 168, 131, 14, 55, 206, 56, 115, 203, 41,
|
|
||||||
- 167, 172, 229, 73, 36, 158, 196, 133, 216, 83,
|
|
||||||
- 29, 58, 166, 69, 11, 26, 88, 96, 129, 6,
|
|
||||||
- 95, 112, 230, 213, 81, 210, 188, 21, 27, 59,
|
|
||||||
- 208, 208, 179, 14, 123, 205, 81, 227, 96, 55,
|
|
||||||
- 235, 208, 227, 14, 23, 126, 244, 162, 204, 49,
|
|
||||||
- 200, 64, 3, 13, 51, 194, 232, 162, 139, 50,
|
|
||||||
- 105, 106, 131, 13, 54, 225, 132, 227, 205, 157,
|
|
||||||
- 207, 96, 243, 204, 48, 195, 244, 72, 28, 126,
|
|
||||||
- 103, 48, 233, 164, 6, 36, 246, 20, 210, 81,
|
|
||||||
- 198, 224, 87, 143, 48, 12, 78, 8, 75, 43,
|
|
||||||
- 242, 21, 3, 38, 60, 227, 116, 224, 2, 22,
|
|
||||||
- 135, 32, 162, 41, 33, 112, 208, 129, 72, 35,
|
|
||||||
- 135, 8, 242, 72, 40, 163, 150, 82, 202, 42,
|
|
||||||
- 186, 172, 178, 203, 46, 169, 170, 154, 76, 50,
|
|
||||||
- 254, 123, 158, 194, 97, 14, 22, 60, 240, 192,
|
|
||||||
- 7, 188, 117, 228, 23, 74, 198, 88, 41, 219,
|
|
||||||
- 56, 189, 36, 19, 203, 57, 235, 80, 147, 11,
|
|
||||||
- 44, 176, 20, 211, 96, 51, 240, 192, 195, 14,
|
|
||||||
- 5, 36, 88, 129, 8, 33, 116, 200, 81, 198,
|
|
||||||
- 181, 101, 208, 1, 199, 27, 220, 110, 59, 69,
|
|
||||||
- 22, 130, 20, 82, 200, 35, 165, 76, 34, 110,
|
|
||||||
- 33, 147, 64, 162, 174, 42, 192, 200, 122, 223,
|
|
||||||
- 25, 38, 216, 186, 192, 19, 24, 133, 52, 82,
|
|
||||||
- 149, 247, 161, 179, 203, 35, 136, 8, 243, 72,
|
|
||||||
- 57, 244, 80, 179, 220, 39, 185, 192, 163, 77,
|
|
||||||
- 55, 244, 236, 227, 14, 5, 17, 0, 65, 7,
|
|
||||||
- 25, 101, 120, 81, 197, 196, 216, 82, 97, 49,
|
|
||||||
- 21, 81, 68, 145, 69, 22, 105, 116, 236, 113,
|
|
||||||
- 26, 161, 148, 59, 136, 24, 98, 64, 210, 203,
|
|
||||||
- 40, 28, 106, 161, 193, 2, 11, 88, 144, 171,
|
|
||||||
- 68, 246, 74, 163, 226, 125, 207, 156, 105, 8,
|
|
||||||
- 25, 212, 54, 218, 202, 39, 4, 227, 115, 142,
|
|
||||||
- 54, 233, 177, 211, 65, 4, 51, 84, 113, 109,
|
|
||||||
- 21, 77, 52, 1, 69, 23, 19, 15, 1, 197,
|
|
||||||
- 16, 84, 12, 17, 197, 182, 112, 8, 146, 198,
|
|
||||||
- 20, 86, 147, 139, 204, 49, 169, 78, 50, 200,
|
|
||||||
- 32, 144, 56, 210, 97, 14, 15, 176, 28, 37,
|
|
||||||
- 204, 198, 180, 228, 107, 108, 158, 60, 19, 202,
|
|
||||||
- 43, 159, 200, 225, 133, 28, 175, 224, 3, 15,
|
|
||||||
- 50, 176, 80, 2, 75, 254, 51, 94, 34, 140,
|
|
||||||
- 143, 208, 68, 119, 129, 45, 210, 93, 48, 13,
|
|
||||||
- 197, 210, 60, 240, 0, 133, 15, 111, 104, 138,
|
|
||||||
- 8, 28, 27, 79, 1, 199, 35, 163, 234, 18,
|
|
||||||
- 139, 155, 233, 206, 177, 97, 202, 22, 28, 112,
|
|
||||||
- 128, 14, 17, 5, 227, 210, 204, 213, 69, 178,
|
|
||||||
- 11, 40, 160, 16, 194, 8, 33, 134, 52, 17,
|
|
||||||
- 142, 122, 197, 236, 156, 11, 51, 185, 52, 3,
|
|
||||||
- 244, 62, 128, 207, 16, 49, 182, 93, 36, 125,
|
|
||||||
- 120, 23, 135, 67, 193, 131, 15, 112, 148, 147,
|
|
||||||
- 143, 58, 216, 8, 3, 249, 198, 89, 192, 1,
|
|
||||||
- 199, 33, 143, 196, 18, 203, 42, 144, 104, 222,
|
|
||||||
- 33, 31, 26, 120, 62, 194, 67, 162, 255, 121,
|
|
||||||
- 159, 35, 149, 104, 58, 135, 21, 100, 64, 92,
|
|
||||||
- 69, 139, 198, 238, 156, 236, 222, 226, 208, 131,
|
|
||||||
- 207, 56, 13, 56, 80, 116, 19, 215, 54, 81,
|
|
||||||
- 197, 24, 73, 23, 126, 248, 16, 62, 248, 144,
|
|
||||||
- 133, 62, 110, 112, 194, 50, 202, 113, 8, 231,
|
|
||||||
- 101, 193, 7, 64, 152, 220, 184, 30, 129, 42,
|
|
||||||
- 93, 168, 66, 108, 29, 50, 129, 231, 52, 208,
|
|
||||||
- 16, 89, 220, 162, 87, 248, 137, 68, 29, 178,
|
|
||||||
- 160, 6, 53, 188, 225, 5, 85, 176, 86, 21,
|
|
||||||
- 232, 1, 15, 113, 228, 98, 57, 173, 104, 143,
|
|
||||||
- 151, 224, 241, 190, 248, 249, 160, 126, 114, 136,
|
|
||||||
- 161, 181, 202, 16, 53, 167, 13, 97, 120, 105,
|
|
||||||
- 184, 7, 7, 12, 224, 4, 111, 192, 65, 114,
|
|
||||||
- 254, 144, 3, 66, 26, 14, 145, 6, 43, 88,
|
|
||||||
- 1, 11, 107, 128, 196, 42, 86, 1, 65, 14,
|
|
||||||
- 181, 224, 0, 1, 160, 160, 66, 100, 114, 139,
|
|
||||||
- 181, 197, 230, 22, 117, 152, 194, 20, 162, 160,
|
|
||||||
- 134, 42, 144, 64, 10, 248, 163, 67, 122, 214,
|
|
||||||
- 17, 187, 79, 232, 45, 23, 226, 16, 7, 62,
|
|
||||||
- 240, 97, 13, 5, 16, 109, 12, 215, 98, 4,
|
|
||||||
- 207, 64, 193, 51, 77, 53, 66, 83, 84, 240,
|
|
||||||
- 65, 26, 218, 113, 1, 3, 180, 1, 27, 144,
|
|
||||||
- 19, 196, 183, 128, 128, 196, 66, 132, 98, 13,
|
|
||||||
- 63, 72, 228, 15, 176, 32, 134, 68, 52, 241,
|
|
||||||
- 62, 45, 8, 64, 0, 106, 144, 144, 89, 152,
|
|
||||||
- 66, 22, 8, 186, 207, 40, 214, 32, 8, 107,
|
|
||||||
- 216, 194, 5, 67, 144, 218, 15, 134, 208, 5,
|
|
||||||
- 68, 184, 15, 30, 205, 120, 148, 25, 97, 1,
|
|
||||||
- 157, 125, 208, 227, 25, 3, 136, 64, 12, 232,
|
|
||||||
- 215, 136, 121, 200, 35, 31, 249, 168, 71, 61,
|
|
||||||
- 242, 33, 143, 118, 108, 67, 30, 208, 128, 195,
|
|
||||||
- 32, 218, 49, 1, 1, 180, 1, 121, 199, 120,
|
|
||||||
- 197, 35, 136, 184, 134, 102, 146, 11, 137, 88,
|
|
||||||
- 80, 228, 37, 104, 145, 36, 13, 72, 178, 80,
|
|
||||||
- 5, 153, 5, 78, 50, 73, 157, 72, 92, 98,
|
|
||||||
- 13, 135, 208, 135, 63, 252, 129, 132, 40, 116,
|
|
||||||
- 193, 105, 192, 11, 5, 62, 92, 217, 140, 157,
|
|
||||||
- 49, 162, 21, 104, 60, 199, 62, 224, 225, 10,
|
|
||||||
- 2, 68, 128, 10, 114, 254, 32, 196, 49, 178,
|
|
||||||
- 113, 129, 11, 112, 224, 159, 37, 224, 192, 6,
|
|
||||||
- 46, 176, 129, 108, 148, 99, 21, 213, 40, 230,
|
|
||||||
- 1, 78, 128, 3, 55, 240, 34, 29, 216, 8,
|
|
||||||
- 197, 36, 122, 81, 10, 114, 61, 2, 93, 107,
|
|
||||||
- 136, 230, 28, 230, 96, 13, 43, 202, 230, 1,
|
|
||||||
- 1, 56, 128, 119, 10, 146, 150, 251, 240, 65,
|
|
||||||
- 21, 88, 200, 194, 60, 198, 233, 143, 84, 164,
|
|
||||||
- 193, 104, 72, 43, 195, 49, 214, 8, 143, 216,
|
|
||||||
- 49, 226, 157, 197, 208, 70, 251, 216, 193, 5,
|
|
||||||
- 2, 100, 160, 10, 129, 64, 4, 54, 54, 81,
|
|
||||||
- 2, 24, 148, 128, 6, 48, 160, 193, 81, 3,
|
|
||||||
- 202, 0, 115, 120, 99, 19, 19, 40, 128, 1,
|
|
||||||
- 74, 208, 79, 6, 20, 32, 12, 222, 8, 133,
|
|
||||||
- 45, 136, 241, 141, 103, 232, 194, 84, 143, 72,
|
|
||||||
- 195, 15, 196, 112, 9, 87, 248, 226, 22, 28,
|
|
||||||
- 58, 3, 20, 183, 71, 144, 89, 16, 201, 163,
|
|
||||||
- 145, 185, 68, 74, 7, 145, 130, 106, 140, 83,
|
|
||||||
- 15, 136, 40, 131, 181, 154, 48, 6, 111, 140,
|
|
||||||
- 145, 61, 173, 72, 214, 131, 210, 83, 41, 2,
|
|
||||||
- 160, 128, 12, 140, 104, 68, 57, 220, 80, 212,
|
|
||||||
- 106, 224, 50, 151, 250, 248, 69, 9, 24, 208,
|
|
||||||
- 6, 126, 28, 225, 2, 1, 32, 70, 53, 126,
|
|
||||||
- 193, 88, 1, 0, 96, 17, 165, 96, 2, 65,
|
|
||||||
- 113, 16, 6, 76, 96, 98, 27, 202, 16, 43,
|
|
||||||
- 89, 51, 193, 10, 82, 108, 174, 58, 38, 144,
|
|
||||||
- 254, 228, 203, 134, 4, 87, 200, 220, 1, 11,
|
|
||||||
- 64, 160, 66, 16, 12, 80, 128, 118, 216, 195,
|
|
||||||
- 5, 141, 40, 31, 182, 216, 145, 30, 23, 181,
|
|
||||||
- 135, 149, 212, 8, 19, 60, 188, 145, 0, 4,
|
|
||||||
- 100, 225, 19, 59, 155, 7, 13, 78, 80, 130,
|
|
||||||
- 109, 60, 67, 24, 141, 128, 67, 33, 204, 81,
|
|
||||||
- 130, 2, 84, 224, 30, 37, 152, 128, 4, 242,
|
|
||||||
- 113, 167, 121, 216, 162, 152, 39, 120, 6, 8,
|
|
||||||
- 4, 192, 128, 13, 112, 160, 159, 6, 192, 68,
|
|
||||||
- 41, 122, 240, 131, 65, 0, 2, 16, 115, 48,
|
|
||||||
- 171, 51, 238, 3, 69, 41, 254, 195, 173, 181,
|
|
||||||
- 125, 12, 31, 122, 0, 132, 25, 248, 192, 3,
|
|
||||||
- 211, 56, 0, 13, 54, 145, 5, 50, 236, 149,
|
|
||||||
- 126, 236, 104, 17, 60, 186, 113, 44, 73, 73,
|
|
||||||
- 120, 29, 174, 136, 37, 28, 102, 215, 10, 121,
|
|
||||||
- 208, 192, 13, 71, 72, 135, 50, 38, 22, 133,
|
|
||||||
- 66, 164, 163, 187, 12, 216, 6, 7, 24, 112,
|
|
||||||
- 132, 114, 192, 33, 13, 144, 248, 69, 1, 0,
|
|
||||||
- 112, 2, 98, 126, 54, 30, 211, 32, 6, 26,
|
|
||||||
- 120, 11, 12, 32, 244, 64, 12, 115, 240, 195,
|
|
||||||
- 18, 174, 0, 8, 87, 144, 226, 20, 164, 147,
|
|
||||||
- 76, 36, 3, 48, 82, 243, 4, 120, 42, 3,
|
|
||||||
- 182, 193, 10, 86, 48, 3, 18, 20, 32, 0,
|
|
||||||
- 2, 32, 129, 26, 200, 80, 133, 194, 53, 129,
|
|
||||||
- 12, 236, 160, 17, 60, 210, 7, 11, 113, 172,
|
|
||||||
- 227, 204, 225, 144, 129, 254, 97, 65, 33, 12,
|
|
||||||
- 129, 165, 131, 3, 55, 112, 131, 45, 142, 81,
|
|
||||||
- 5, 42, 188, 225, 17, 237, 88, 241, 2, 36,
|
|
||||||
- 107, 128, 69, 196, 66, 13, 130, 120, 6, 26,
|
|
||||||
- 60, 187, 136, 106, 120, 22, 23, 186, 224, 90,
|
|
||||||
- 60, 12, 0, 0, 78, 76, 161, 7, 88, 152,
|
|
||||||
- 67, 16, 92, 176, 4, 34, 92, 97, 11, 91,
|
|
||||||
- 200, 132, 53, 204, 35, 153, 51, 72, 146, 94,
|
|
||||||
- 255, 120, 242, 84, 60, 177, 4, 41, 171, 64,
|
|
||||||
- 5, 59, 0, 2, 5, 18, 128, 1, 56, 220,
|
|
||||||
- 236, 90, 189, 83, 3, 59, 206, 97, 230, 102,
|
|
||||||
- 64, 55, 23, 201, 61, 179, 55, 26, 128, 128,
|
|
||||||
- 52, 188, 162, 24, 204, 128, 196, 52, 56, 0,
|
|
||||||
- 131, 77, 88, 67, 24, 132, 64, 196, 33, 212,
|
|
||||||
- 241, 139, 11, 20, 224, 8, 104, 184, 128, 0,
|
|
||||||
- 170, 129, 8, 53, 100, 193, 25, 16, 0, 0,
|
|
||||||
- 0, 182, 49, 104, 6, 36, 67, 153, 143, 184,
|
|
||||||
- 68, 2, 0, 192, 133, 52, 160, 0, 11, 87,
|
|
||||||
- 120, 129, 11, 88, 192, 110, 18, 144, 128, 8,
|
|
||||||
- 153, 118, 70, 162, 34, 99, 129, 40, 10, 196,
|
|
||||||
- 164, 128, 232, 193, 10, 98, 16, 131, 29, 248,
|
|
||||||
- 27, 8, 133, 224, 32, 33, 132, 123, 173, 70,
|
|
||||||
- 172, 35, 141, 235, 64, 6, 116, 97, 65, 172,
|
|
||||||
- 51, 103, 98, 0, 25, 120, 133, 48, 218, 163,
|
|
||||||
- 138, 84, 252, 51, 27, 232, 160, 6, 51, 160,
|
|
||||||
- 193, 142, 108, 28, 97, 2, 12, 176, 7, 18,
|
|
||||||
- 254, 250, 136, 142, 14, 102, 161, 19, 140, 102,
|
|
||||||
- 64, 59, 178, 189, 1, 109, 188, 34, 20, 133,
|
|
||||||
- 240, 131, 103, 57, 113, 136, 31, 44, 97, 14,
|
|
||||||
- 91, 32, 1, 187, 89, 224, 110, 23, 144, 160,
|
|
||||||
- 8, 96, 240, 3, 46, 146, 44, 149, 15, 4,
|
|
||||||
- 96, 1, 247, 174, 206, 41, 176, 96, 131, 29,
|
|
||||||
- 240, 32, 6, 42, 224, 247, 14, 124, 16, 5,
|
|
||||||
- 58, 88, 221, 193, 85, 240, 2, 51, 194, 113,
|
|
||||||
- 142, 110, 72, 40, 23, 202, 233, 70, 179, 202,
|
|
||||||
- 209, 1, 2, 212, 129, 25, 108, 202, 133, 55,
|
|
||||||
- 208, 192, 129, 18, 152, 227, 30, 230, 216, 6,
|
|
||||||
- 49, 156, 64, 108, 8, 164, 226, 30, 48, 152,
|
|
||||||
- 192, 6, 158, 65, 7, 53, 88, 1, 9, 158,
|
|
||||||
- 61, 194, 52, 102, 76, 12, 109, 8, 35, 22,
|
|
||||||
- 144, 232, 196, 161, 225, 32, 134, 43, 92, 161,
|
|
||||||
- 8, 47, 120, 1, 17, 212, 237, 110, 12, 252,
|
|
||||||
- 28, 211, 156, 128, 140, 18, 36, 41, 144, 215,
|
|
||||||
- 194, 198, 19, 115, 0, 194, 10, 84, 192, 131,
|
|
||||||
- 33, 240, 187, 223, 62, 160, 66, 178, 7, 14,
|
|
||||||
- 49, 50, 208, 233, 96, 231, 152, 16, 123, 230,
|
|
||||||
- 83, 142, 12, 59, 32, 22, 26, 103, 70, 43,
|
|
||||||
- 230, 1, 130, 182, 95, 128, 6, 19, 184, 64,
|
|
||||||
- 240, 139, 234, 134, 120, 84, 99, 197, 109, 240,
|
|
||||||
- 134, 26, 232, 80, 7, 11, 104, 123, 27, 72,
|
|
||||||
- 0, 192, 6, 228, 49, 14, 61, 165, 131, 6,
|
|
||||||
- 0, 144, 0, 43, 4, 254, 49, 136, 43, 16,
|
|
||||||
- 33, 8, 30, 136, 60, 188, 225, 237, 238, 23,
|
|
||||||
- 20, 97, 11, 153, 127, 204, 230, 3, 240, 223,
|
|
||||||
- 234, 140, 2, 11, 83, 142, 58, 15, 202, 80,
|
|
||||||
- 133, 167, 199, 96, 8, 141, 128, 155, 33, 62,
|
|
||||||
- 65, 6, 67, 112, 29, 26, 21, 114, 14, 204,
|
|
||||||
- 144, 83, 212, 112, 14, 222, 80, 118, 98, 128,
|
|
||||||
- 12, 180, 35, 12, 185, 32, 15, 16, 0, 103,
|
|
||||||
- 71, 0, 98, 71, 0, 3, 48, 224, 6, 219,
|
|
||||||
- 48, 15, 143, 32, 9, 28, 48, 1, 188, 80,
|
|
||||||
- 14, 84, 160, 6, 137, 192, 104, 23, 144, 14,
|
|
||||||
- 217, 38, 1, 188, 112, 130, 188, 0, 3, 152,
|
|
||||||
- 149, 10, 230, 50, 8, 150, 22, 4, 50, 0,
|
|
||||||
- 6, 91, 64, 4, 46, 224, 2, 145, 7, 126,
|
|
||||||
- 65, 16, 4, 91, 128, 11, 234, 199, 121, 255,
|
|
||||||
- 16, 23, 178, 81, 7, 82, 32, 2, 168, 22,
|
|
||||||
- 3, 62, 48, 4, 100, 160, 6, 79, 23, 5,
|
|
||||||
- 135, 240, 10, 173, 48, 45, 251, 7, 13, 231,
|
|
||||||
- 160, 38, 102, 118, 14, 117, 82, 39, 126, 0,
|
|
||||||
- 113, 186, 128, 12, 12, 88, 11, 185, 176, 13,
|
|
||||||
- 19, 112, 3, 37, 192, 15, 185, 84, 15, 243,
|
|
||||||
- 16, 15, 234, 112, 12, 136, 80, 10, 237, 64,
|
|
||||||
- 12, 196, 112, 15, 215, 64, 5, 112, 128, 11,
|
|
||||||
- 22, 208, 103, 182, 32, 1, 0, 192, 0, 239,
|
|
||||||
- 5, 80, 23, 208, 6, 207, 80, 8, 96, 3,
|
|
||||||
- 111, 70, 128, 6, 118, 192, 4, 96, 0, 121,
|
|
||||||
- 254, 36, 240, 2, 96, 176, 33, 150, 192, 5,
|
|
||||||
- 92, 224, 43, 235, 39, 16, 103, 224, 121, 144,
|
|
||||||
- 49, 10, 63, 48, 3, 163, 23, 3, 195, 243,
|
|
||||||
- 129, 101, 160, 6, 169, 247, 10, 200, 0, 10,
|
|
||||||
- 204, 209, 10, 194, 16, 14, 201, 195, 34, 7,
|
|
||||||
- 151, 12, 225, 0, 12, 10, 224, 0, 147, 160,
|
|
||||||
- 13, 180, 227, 133, 208, 240, 11, 196, 230, 6,
|
|
||||||
- 253, 112, 12, 159, 208, 119, 86, 103, 8, 214,
|
|
||||||
- 246, 10, 209, 80, 14, 209, 0, 10, 67, 0,
|
|
||||||
- 7, 227, 16, 15, 247, 192, 15, 72, 192, 91,
|
|
||||||
- 246, 176, 13, 169, 176, 8, 110, 144, 10, 214,
|
|
||||||
- 5, 61, 35, 227, 2, 91, 32, 3, 86, 33,
|
|
||||||
- 21, 92, 0, 6, 47, 224, 1, 50, 32, 10,
|
|
||||||
- 176, 17, 137, 63, 72, 137, 142, 113, 10, 98,
|
|
||||||
- 208, 116, 81, 199, 111, 60, 64, 5, 143, 83,
|
|
||||||
- 6, 67, 160, 6, 177, 16, 14, 208, 160, 13,
|
|
||||||
- 106, 194, 12, 200, 160, 12, 218, 112, 12, 82,
|
|
||||||
- 152, 12, 187, 160, 10, 151, 64, 1, 8, 240,
|
|
||||||
- 3, 10, 184, 51, 148, 208, 10, 139, 85, 2,
|
|
||||||
- 37, 176, 9, 253, 32, 12, 134, 80, 6, 251,
|
|
||||||
- 83, 62, 84, 144, 45, 141, 64, 8, 84, 192,
|
|
||||||
- 3, 158, 8, 4, 86, 64, 10, 28, 32, 0,
|
|
||||||
- 56, 224, 13, 194, 176, 11, 222, 80, 14, 202,
|
|
||||||
- 16, 10, 135, 32, 46, 141, 7, 111, 45, 224,
|
|
||||||
- 24, 145, 144, 9, 91, 0, 6, 70, 0, 6,
|
|
||||||
- 112, 101, 116, 72, 247, 254, 15, 123, 112, 6,
|
|
||||||
- 176, 65, 11, 63, 176, 111, 59, 208, 111, 154,
|
|
||||||
- 216, 142, 135, 0, 10, 136, 16, 10, 194, 160,
|
|
||||||
- 13, 201, 160, 13, 117, 34, 14, 208, 128, 12,
|
|
||||||
- 186, 208, 11, 187, 112, 9, 128, 224, 1, 20,
|
|
||||||
- 64, 0, 8, 96, 3, 203, 1, 11, 159, 112,
|
|
||||||
- 83, 175, 80, 15, 52, 208, 118, 196, 144, 15,
|
|
||||||
- 185, 32, 66, 67, 80, 5, 100, 64, 7, 81,
|
|
||||||
- 83, 56, 85, 48, 3, 20, 233, 3, 54, 208,
|
|
||||||
- 3, 157, 192, 0, 0, 64, 12, 208, 0, 10,
|
|
||||||
- 63, 4, 7, 202, 54, 146, 133, 48, 7, 151,
|
|
||||||
- 64, 4, 96, 112, 146, 144, 225, 7, 96, 192,
|
|
||||||
- 5, 226, 40, 21, 245, 38, 69, 158, 48, 23,
|
|
||||||
- 145, 97, 10, 115, 96, 3, 34, 48, 122, 231,
|
|
||||||
- 88, 122, 112, 160, 6, 165, 16, 11, 161, 112,
|
|
||||||
- 12, 202, 112, 9, 151, 16, 14, 226, 32, 143,
|
|
||||||
- 244, 40, 6, 24, 224, 0, 8, 128, 0, 17,
|
|
||||||
- 128, 2, 135, 128, 66, 173, 64, 9, 140, 64,
|
|
||||||
- 9, 185, 208, 15, 196, 144, 10, 191, 192, 15,
|
|
||||||
- 236, 0, 10, 114, 96, 56, 93, 32, 7, 73,
|
|
||||||
- 120, 67, 80, 64, 5, 59, 128, 132, 84, 0,
|
|
||||||
- 4, 107, 48, 104, 5, 240, 13, 194, 0, 10,
|
|
||||||
- 111, 0, 4, 64, 32, 57, 105, 128, 46, 171,
|
|
||||||
- 48, 7, 223, 39, 4, 145, 1, 132, 157, 246,
|
|
||||||
- 105, 2, 49, 11, 115, 33, 142, 167, 240, 3,
|
|
||||||
- 54, 224, 3, 153, 152, 56, 80, 243, 6, 112,
|
|
||||||
- 254, 0, 138, 177, 32, 12, 208, 160, 10, 106,
|
|
||||||
- 130, 13, 0, 24, 14, 197, 128, 148, 107, 208,
|
|
||||||
- 3, 86, 32, 138, 202, 193, 51, 85, 121, 83,
|
|
||||||
- 173, 112, 14, 229, 192, 14, 234, 80, 14, 173,
|
|
||||||
- 160, 87, 101, 0, 60, 33, 148, 132, 112, 32,
|
|
||||||
- 60, 60, 48, 3, 184, 233, 3, 170, 224, 75,
|
|
||||||
- 237, 128, 13, 79, 72, 5, 84, 246, 45, 83,
|
|
||||||
- 0, 136, 221, 71, 4, 50, 64, 147, 29, 178,
|
|
||||||
- 100, 35, 37, 147, 132, 249, 24, 137, 128, 152,
|
|
||||||
- 43, 224, 111, 57, 121, 132, 92, 4, 7, 161,
|
|
||||||
- 160, 12, 111, 162, 11, 115, 32, 153, 199, 176,
|
|
||||||
- 117, 63, 83, 158, 244, 8, 10, 148, 48, 144,
|
|
||||||
- 237, 25, 8, 44, 26, 8, 114, 16, 8, 169,
|
|
||||||
- 193, 8, 11, 41, 56, 133, 195, 3, 244, 99,
|
|
||||||
- 117, 84, 80, 5, 80, 192, 111, 244, 195, 63,
|
|
||||||
- 64, 16, 10, 186, 32, 12, 5, 234, 3, 49,
|
|
||||||
- 48, 3, 195, 153, 6, 88, 48, 50, 240, 246,
|
|
||||||
- 1, 73, 178, 7, 253, 213, 86, 90, 224, 160,
|
|
||||||
- 142, 33, 6, 33, 48, 101, 254, 118, 67, 169,
|
|
||||||
- 39, 8, 175, 208, 132, 210, 179, 11, 189, 176,
|
|
||||||
- 5, 202, 160, 12, 107, 194, 117, 83, 216, 10,
|
|
||||||
- 180, 83, 149, 44, 234, 5, 99, 224, 5, 127,
|
|
||||||
- 224, 5, 110, 58, 6, 178, 89, 6, 74, 51,
|
|
||||||
- 49, 80, 192, 144, 246, 83, 6, 159, 210, 119,
|
|
||||||
- 166, 55, 75, 12, 57, 3, 213, 201, 132, 160,
|
|
||||||
- 160, 6, 81, 48, 4, 254, 51, 48, 3, 89,
|
|
||||||
- 96, 68, 73, 234, 125, 65, 96, 2, 73, 18,
|
|
||||||
- 91, 1, 240, 50, 255, 160, 8, 81, 234, 24,
|
|
||||||
- 142, 176, 4, 33, 32, 2, 137, 57, 3, 84,
|
|
||||||
- 0, 5, 29, 84, 53, 64, 154, 42, 170, 144,
|
|
||||||
- 9, 92, 112, 9, 165, 16, 143, 196, 98, 133,
|
|
||||||
- 12, 184, 51, 104, 170, 166, 99, 176, 166, 115,
|
|
||||||
- 227, 162, 173, 154, 52, 247, 217, 101, 89, 87,
|
|
||||||
- 6, 132, 208, 8, 62, 89, 5, 67, 144, 147,
|
|
||||||
- 19, 195, 3, 43, 96, 3, 81, 240, 10, 141,
|
|
||||||
- 160, 6, 95, 217, 159, 126, 106, 3, 71, 36,
|
|
||||||
- 6, 68, 80, 4, 50, 144, 36, 106, 21, 0,
|
|
||||||
- 108, 5, 165, 147, 42, 21, 166, 96, 169, 83,
|
|
||||||
- 214, 111, 137, 83, 5, 206, 3, 10, 161, 48,
|
|
||||||
- 61, 170, 224, 7, 32, 0, 1, 50, 0, 9,
|
|
||||||
- 186, 64, 39, 86, 104, 120, 202, 161, 170, 140,
|
|
||||||
- 224, 166, 106, 250, 7, 109, 234, 166, 49, 228,
|
|
||||||
- 5, 134, 224, 5, 73, 67, 63, 114, 80, 5,
|
|
||||||
- 183, 154, 58, 55, 164, 2, 177, 73, 6, 80,
|
|
||||||
- 96, 164, 108, 214, 10, 92, 198, 63, 51, 16,
|
|
||||||
- 2, 6, 75, 95, 138, 42, 165, 248, 1, 82,
|
|
||||||
- 34, 117, 16, 166, 80, 23, 155, 115, 11, 87,
|
|
||||||
- 96, 161, 51, 192, 111, 156, 170, 108, 160, 32,
|
|
||||||
- 61, 171, 192, 10, 32, 16, 124, 48, 208, 9,
|
|
||||||
- 189, 128, 148, 208, 16, 14, 176, 72, 59, 55,
|
|
||||||
- 69, 154, 129, 192, 166, 127, 176, 166, 114, 163,
|
|
||||||
- 254, 166, 94, 0, 49, 77, 192, 3, 73, 208,
|
|
||||||
- 4, 115, 67, 6, 160, 128, 171, 132, 160, 6,
|
|
||||||
- 60, 10, 49, 60, 96, 3, 112, 112, 179, 100,
|
|
||||||
- 16, 8, 236, 8, 4, 54, 96, 176, 33, 128,
|
|
||||||
- 2, 40, 192, 2, 68, 160, 4, 213, 116, 77,
|
|
||||||
- 9, 33, 169, 90, 48, 21, 115, 160, 111, 153,
|
|
||||||
- 184, 3, 114, 136, 58, 135, 208, 173, 171, 224,
|
|
||||||
- 10, 253, 132, 6, 81, 113, 10, 172, 240, 38,
|
|
||||||
- 216, 160, 13, 242, 40, 164, 104, 250, 7, 129,
|
|
||||||
- 224, 174, 129, 192, 8, 114, 208, 166, 134, 128,
|
|
||||||
- 63, 17, 147, 56, 77, 32, 155, 132, 32, 138,
|
|
||||||
- 136, 80, 5, 58, 11, 5, 47, 219, 5, 253,
|
|
||||||
- 9, 7, 46, 74, 8, 236, 232, 3, 244, 133,
|
|
||||||
- 2, 71, 139, 180, 44, 16, 4, 73, 178, 100,
|
|
||||||
- 148, 164, 16, 121, 80, 23, 82, 225, 10, 55,
|
|
||||||
- 153, 137, 70, 168, 6, 136, 32, 8, 47, 86,
|
|
||||||
- 8, 165, 160, 9, 19, 96, 6, 142, 193, 7,
|
|
||||||
- 163, 176, 11, 202, 192, 117, 242, 232, 78, 108,
|
|
||||||
- 235, 174, 238, 58, 6, 104, 203, 170, 73, 227,
|
|
||||||
- 5, 73, 48, 179, 65, 139, 171, 175, 80, 109,
|
|
||||||
- 84, 80, 52, 178, 217, 4, 187, 58, 4, 217,
|
|
||||||
- 82, 5, 83, 99, 5, 61, 128, 180, 190, 203,
|
|
||||||
- 2, 46, 192, 180, 78, 36, 73, 254, 197, 184,
|
|
||||||
- 117, 145, 7, 180, 192, 116, 138, 201, 111, 133,
|
|
||||||
- 74, 117, 89, 112, 8, 186, 160, 9, 23, 16,
|
|
||||||
- 25, 159, 171, 83, 240, 254, 120, 66, 104, 58,
|
|
||||||
- 6, 129, 176, 166, 174, 10, 167, 100, 80, 175,
|
|
||||||
- 245, 138, 51, 160, 144, 11, 112, 153, 71, 47,
|
|
||||||
- 84, 62, 49, 91, 122, 116, 0, 60, 81, 0,
|
|
||||||
- 4, 152, 122, 180, 75, 144, 1, 25, 112, 184,
|
|
||||||
- 17, 68, 188, 15, 209, 184, 90, 80, 173, 54,
|
|
||||||
- 80, 168, 167, 39, 60, 22, 243, 6, 208, 43,
|
|
||||||
- 189, 146, 49, 10, 218, 112, 174, 19, 119, 44,
|
|
||||||
- 60, 67, 186, 45, 234, 162, 114, 80, 175, 93,
|
|
||||||
- 86, 6, 159, 0, 10, 177, 11, 7, 81, 112,
|
|
||||||
- 132, 47, 75, 175, 78, 99, 52, 60, 160, 2,
|
|
||||||
- 86, 90, 168, 54, 176, 4, 46, 144, 1, 87,
|
|
||||||
- 112, 141, 213, 113, 6, 245, 102, 111, 16, 33,
|
|
||||||
- 169, 138, 48, 177, 152, 184, 147, 19, 153, 122,
|
|
||||||
- 28, 154, 12, 156, 48, 189, 146, 241, 12, 87,
|
|
||||||
- 8, 13, 26, 215, 30, 237, 89, 11, 200, 128,
|
|
||||||
- 12, 178, 3, 93, 235, 234, 5, 101, 144, 132,
|
|
||||||
- 208, 149, 41, 21, 252, 144, 220, 27, 60, 117,
|
|
||||||
- 250, 116, 161, 228, 163, 132, 116, 5, 46, 144,
|
|
||||||
- 8, 248, 161, 4, 11, 32, 73, 139, 27, 17,
|
|
||||||
- 166, 240, 5, 144, 208, 3, 251, 187, 111, 165,
|
|
||||||
- 39, 135, 136, 240, 10, 146, 41, 192, 146, 113,
|
|
||||||
- 10, 231, 96, 133, 212, 32, 12, 112, 195, 162,
|
|
||||||
- 104, 27, 8, 173, 0, 55, 183, 214, 10, 55,
|
|
||||||
- 85, 149, 79, 200, 173, 144, 99, 96, 170, 35,
|
|
||||||
- 92, 192, 51, 4, 116, 64, 127, 161, 244, 129,
|
|
||||||
- 254, 83, 80, 156, 147, 16, 100, 222, 8, 91,
|
|
||||||
- 80, 116, 0, 103, 51, 17, 193, 192, 10, 145,
|
|
||||||
- 123, 161, 6, 118, 181, 175, 240, 38, 153, 64,
|
|
||||||
- 195, 53, 76, 178, 218, 128, 12, 185, 80, 149,
|
|
||||||
- 109, 251, 7, 132, 32, 7, 134, 240, 7, 49,
|
|
||||||
- 180, 182, 107, 11, 187, 91, 122, 8, 82, 96,
|
|
||||||
- 3, 89, 128, 8, 173, 208, 8, 154, 92, 6,
|
|
||||||
- 141, 208, 8, 129, 96, 8, 3, 103, 117, 207,
|
|
||||||
- 35, 81, 27, 203, 131, 212, 161, 4, 32, 21,
|
|
||||||
- 0, 18, 0, 169, 18, 49, 14, 107, 128, 137,
|
|
||||||
- 251, 150, 122, 87, 43, 12, 245, 8, 12, 27,
|
|
||||||
- 240, 151, 82, 241, 12, 218, 64, 13, 56, 44,
|
|
||||||
- 12, 181, 192, 8, 105, 123, 83, 210, 44, 55,
|
|
||||||
- 160, 204, 162, 148, 64, 48, 185, 16, 10, 161,
|
|
||||||
- 80, 68, 105, 48, 190, 114, 76, 205, 55, 149,
|
|
||||||
- 79, 172, 71, 45, 112, 208, 8, 163, 178, 10,
|
|
||||||
- 201, 128, 203, 176, 161, 5, 39, 60, 73, 30,
|
|
||||||
- 49, 8, 82, 230, 197, 95, 169, 202, 109, 162,
|
|
||||||
- 12, 192, 64, 3, 150, 0, 27, 201, 35, 12,
|
|
||||||
- 108, 34, 12, 210, 220, 162, 55, 229, 162, 110,
|
|
||||||
- 26, 203, 238, 249, 198, 177, 160, 12, 144, 48,
|
|
||||||
- 8, 177, 112, 12, 194, 0, 148, 205, 1, 55,
|
|
||||||
- 210, 44, 205, 229, 67, 7, 201, 6, 42, 12,
|
|
||||||
- 148, 12, 190, 0, 27, 124, 240, 1, 80, 20,
|
|
||||||
- 0, 46, 243, 17, 170, 96, 5, 133, 122, 155,
|
|
||||||
- 31, 168, 202, 14, 141, 254, 12, 189, 128, 4,
|
|
||||||
- 146, 32, 25, 124, 160, 13, 171, 44, 144, 45,
|
|
||||||
- 106, 8, 134, 240, 162, 11, 188, 182, 208, 149,
|
|
||||||
- 66, 229, 169, 13, 151, 160, 10, 247, 88, 10,
|
|
||||||
- 68, 89, 182, 85, 233, 96, 194, 101, 209, 81,
|
|
||||||
- 160, 108, 151, 211, 11, 192, 240, 24, 168, 192,
|
|
||||||
- 7, 42, 243, 209, 11, 144, 200, 30, 145, 12,
|
|
||||||
- 105, 80, 168, 205, 171, 6, 231, 252, 10, 151,
|
|
||||||
- 179, 11, 156, 112, 4, 252, 188, 198, 100, 112,
|
|
||||||
- 205, 46, 26, 208, 114, 243, 162, 238, 233, 133,
|
|
||||||
- 104, 87, 143, 47, 192, 10, 202, 80, 10, 200,
|
|
||||||
- 64, 148, 225, 160, 198, 104, 26, 8, 179, 137,
|
|
||||||
- 183, 114, 120, 8, 166, 162, 212, 190, 66, 43,
|
|
||||||
- 158, 115, 0, 243, 194, 21, 127, 232, 167, 51,
|
|
||||||
- 224, 111, 84, 87, 203, 165, 176, 11, 154, 0,
|
|
||||||
- 3, 220, 244, 24, 189, 16, 206, 14, 214, 182,
|
|
||||||
- 11, 108, 8, 105, 107, 211, 239, 36, 12, 150,
|
|
||||||
- 29, 39, 30, 176, 5, 172, 208, 11, 14, 205,
|
|
||||||
- 12, 218, 80, 11, 235, 73, 9, 44, 42, 155,
|
|
||||||
- 134, 128, 49, 181, 60, 9, 170, 48, 10, 230,
|
|
||||||
- 161, 5, 31, 240, 0, 125, 253, 0, 160, 182,
|
|
||||||
- 23, 147, 64, 180, 23, 58, 117, 84, 23, 5,
|
|
||||||
- 130, 112, 42, 174, 0, 3, 150, 240, 151, 171,
|
|
||||||
- 144, 58, 1, 205, 174, 114, 80, 205, 160, 108,
|
|
||||||
- 214, 3, 25, 209, 185, 160, 13, 202, 208, 0,
|
|
||||||
- 3, 224, 1, 151, 32, 166, 152, 57, 48, 134,
|
|
||||||
- 254, 112, 83, 16, 115, 45, 114, 184, 6, 125,
|
|
||||||
- 112, 7, 123, 160, 5, 241, 178, 0, 125, 61,
|
|
||||||
- 2, 216, 196, 23, 144, 80, 96, 21, 91, 177,
|
|
||||||
- 253, 19, 5, 83, 112, 216, 192, 80, 2, 95,
|
|
||||||
- 96, 23, 82, 234, 9, 165, 128, 8, 65, 27,
|
|
||||||
- 180, 110, 74, 8, 163, 221, 182, 54, 157, 205,
|
|
||||||
- 181, 192, 128, 185, 240, 10, 208, 160, 11, 13,
|
|
||||||
- 160, 0, 24, 0, 6, 208, 32, 158, 208, 208,
|
|
||||||
- 30, 234, 42, 223, 85, 144, 5, 216, 45, 23,
|
|
||||||
- 57, 208, 218, 44, 227, 221, 22, 240, 4, 90,
|
|
||||||
- 241, 29, 170, 64, 157, 215, 170, 147, 196, 147,
|
|
||||||
- 208, 201, 128, 4, 102, 96, 25, 32, 94, 23,
|
|
||||||
- 147, 120, 7, 125, 176, 6, 113, 160, 6, 214,
|
|
||||||
- 60, 55, 106, 122, 223, 114, 4, 79, 39, 148,
|
|
||||||
- 11, 255, 77, 1, 20, 112, 5, 170, 48, 182,
|
|
||||||
- 205, 12, 205, 159, 64, 57, 120, 144, 221, 219,
|
|
||||||
- 157, 3, 38, 80, 43, 101, 195, 50, 19, 238,
|
|
||||||
- 203, 189, 1, 185, 243, 188, 188, 62, 48, 5,
|
|
||||||
- 202, 128, 13, 201, 192, 6, 110, 224, 86, 121,
|
|
||||||
- 0, 226, 82, 174, 4, 34, 126, 6, 36, 222,
|
|
||||||
- 7, 120, 96, 226, 220, 226, 56, 17, 44, 154,
|
|
||||||
- 151, 227, 148, 118, 201, 10, 124, 50, 10, 142,
|
|
||||||
- 176, 33, 215, 225, 227, 77, 2, 228, 182, 242,
|
|
||||||
- 0, 53, 240, 5, 68, 94, 34, 229, 120, 169,
|
|
||||||
- 137, 169, 2, 6, 150, 5, 229, 186, 206, 48,
|
|
||||||
- 64, 16, 166, 160, 8, 192, 81, 62, 229, 32,
|
|
||||||
- 142, 25, 84, 238, 222, 115, 49, 232, 132, 110,
|
|
||||||
- 23, 215, 113, 25, 218, 17, 34, 78, 178, 232,
|
|
||||||
- 181, 98, 1, 109, 30, 32, 37, 162, 16, 151,
|
|
||||||
- 64, 184, 152, 26, 127, 73, 94, 10, 73, 9,
|
|
||||||
- 12, 56, 128, 16, 218, 148, 7, 121, 240, 5,
|
|
||||||
- 182, 17, 234, 162, 158, 3, 184, 129, 27, 218,
|
|
||||||
- 113, 234, 218, 209, 31, 253, 17, 34, 172, 206,
|
|
||||||
- 232, 38, 160, 3, 0, 82, 225, 145, 206, 16,
|
|
||||||
- 148, 142, 169, 116, 126, 164, 186, 144, 12, 187,
|
|
||||||
- 237, 16, 150, 20, 9, 118, 96, 7, 95, 240,
|
|
||||||
- 5, 216, 145, 29, 168, 158, 234, 170, 174, 1,
|
|
||||||
- 31, 160, 3, 184, 17, 236, 120, 33, 235, 179,
|
|
||||||
- 254, 16, 144, 75, 184, 136, 153, 106, 22, 185,
|
|
||||||
- 6, 147, 192, 10, 174, 176, 1, 60, 65, 19,
|
|
||||||
- 145, 240, 230, 207, 222, 17, 128, 64, 184, 33,
|
|
||||||
- 96, 164, 86, 144, 6, 225, 226, 165, 154, 32,
|
|
||||||
- 1, 223, 190, 238, 21, 225, 10, 75, 128, 2,
|
|
||||||
- 54, 240, 3, 66, 148, 6, 228, 178, 11, 192,
|
|
||||||
- 192, 4, 236, 158, 239, 2, 17, 16, 0, 59};
|
|
||||||
-
|
|
||||||
diff -up php-5.4.0RC5/main/php_logos.c.easter php-5.4.0RC5/main/php_logos.c
|
|
||||||
--- php-5.4.0RC5/main/php_logos.c.easter 2012-01-18 17:17:17.895031787 +0100
|
|
||||||
+++ php-5.4.0RC5/main/php_logos.c 2012-01-18 17:21:46.877044070 +0100
|
|
||||||
@@ -56,7 +56,6 @@ int php_init_info_logos(void)
|
|
||||||
return FAILURE;
|
|
||||||
|
|
||||||
php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo));
|
|
||||||
- php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
|
|
||||||
php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo));
|
|
||||||
|
|
||||||
return SUCCESS;
|
|
@ -60,3 +60,27 @@
|
|||||||
fi
|
fi
|
||||||
PHP_DBA_STD_RESULT(db4,Berkeley DB4)
|
PHP_DBA_STD_RESULT(db4,Berkeley DB4)
|
||||||
|
|
||||||
|
--- php-5.4.7/ext/dba/dba.c.old 2012-09-19 14:55:23.868456900 +0200
|
||||||
|
+++ php-5.4.7/ext/dba/dba.c 2012-09-19 15:02:42.796009320 +0200
|
||||||
|
@@ -52,6 +52,10 @@
|
||||||
|
#include "php_qdbm.h"
|
||||||
|
#include "php_tcadb.h"
|
||||||
|
|
||||||
|
+#ifdef DB4_INCLUDE_FILE
|
||||||
|
+#include DB4_INCLUDE_FILE
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
/* {{{ arginfo */
|
||||||
|
ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
|
||||||
|
ZEND_ARG_INFO(0, path)
|
||||||
|
@@ -522,6 +526,10 @@
|
||||||
|
|
||||||
|
php_info_print_table_start();
|
||||||
|
php_info_print_table_row(2, "DBA support", "enabled");
|
||||||
|
+#ifdef DB_VERSION_STRING
|
||||||
|
+ php_info_print_table_row(2, "libdb header version", DB_VERSION_STRING);
|
||||||
|
+ php_info_print_table_row(2, "libdb library version", db_version(NULL, NULL, NULL));
|
||||||
|
+#endif
|
||||||
|
if (handlers.c) {
|
||||||
|
smart_str_0(&handlers);
|
||||||
|
php_info_print_table_row(2, "Supported handlers", handlers.c);
|
||||||
|
2579
php-5.5.0-build.patch
Normal file
2579
php-5.5.0-build.patch
Normal file
File diff suppressed because it is too large
Load Diff
244
php.spec
244
php.spec
@ -1,18 +1,15 @@
|
|||||||
# API/ABI check
|
# API/ABI check
|
||||||
%global apiver 20100412
|
%global apiver 20121113
|
||||||
%global zendver 20100525
|
%global zendver 20121212
|
||||||
%global pdover 20080721
|
%global pdover 20080721
|
||||||
# Extension version
|
# Extension version
|
||||||
%global fileinfover 1.0.5
|
%global opcachever 7.0.1-dev
|
||||||
%global pharver 2.0.1
|
|
||||||
%global zipver 1.11.0
|
|
||||||
%global jsonver 1.2.1
|
|
||||||
|
|
||||||
# Adds -z now to the linker flags
|
# Adds -z now to the linker flags
|
||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
|
|
||||||
# version used for php embedded library soname
|
# version used for php embedded library soname
|
||||||
%global embed_version 5.4
|
%global embed_version 5.5
|
||||||
|
|
||||||
%global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)
|
%global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)
|
||||||
|
|
||||||
@ -31,8 +28,8 @@
|
|||||||
# Build ZTS extension or only NTS
|
# Build ZTS extension or only NTS
|
||||||
%global with_zts 1
|
%global with_zts 1
|
||||||
|
|
||||||
%if 0%{?__isa:1}
|
%if 0%{?__isa_bits:1}
|
||||||
%global isasuffix -%{__isa}
|
%global isasuffix -%{__isa_bits}
|
||||||
%else
|
%else
|
||||||
%global isasuffix %nil
|
%global isasuffix %nil
|
||||||
%endif
|
%endif
|
||||||
@ -46,6 +43,8 @@
|
|||||||
%{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}}
|
%{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}}
|
||||||
%{!?_httpd_contentdir: %{expand: %%global _httpd_contentdir /var/www}}
|
%{!?_httpd_contentdir: %{expand: %%global _httpd_contentdir /var/www}}
|
||||||
|
|
||||||
|
%global with_dtrace 1
|
||||||
|
|
||||||
%if 0%{?fedora} < 17 && 0%{?rhel} < 7
|
%if 0%{?fedora} < 17 && 0%{?rhel} < 7
|
||||||
%global with_zip 0
|
%global with_zip 0
|
||||||
%global with_libzip 0
|
%global with_libzip 0
|
||||||
@ -62,12 +61,12 @@
|
|||||||
%global db_devel libdb-devel
|
%global db_devel libdb-devel
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
#global rcver RC1
|
%global rcver beta1
|
||||||
|
|
||||||
Summary: PHP scripting language for creating dynamic web sites
|
Summary: PHP scripting language for creating dynamic web sites
|
||||||
Name: php
|
Name: php
|
||||||
Version: 5.4.13
|
Version: 5.5.0
|
||||||
Release: 1%{?dist}
|
Release: 0.1.%{rcver}%{?dist}
|
||||||
# All files licensed under PHP version 3.01, except
|
# All files licensed under PHP version 3.01, except
|
||||||
# Zend is licensed under Zend
|
# Zend is licensed under Zend
|
||||||
# TSRM is licensed under BSD
|
# TSRM is licensed under BSD
|
||||||
@ -75,7 +74,7 @@ License: PHP and Zend and BSD
|
|||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
URL: http://www.php.net/
|
URL: http://www.php.net/
|
||||||
|
|
||||||
Source0: http://www.php.net/distributions/php-%{version}%{?rcver}.tar.bz2
|
Source0: http://www.php.net/distributions/php-%{version}%{?rcver}.tar.xz
|
||||||
Source1: php.conf
|
Source1: php.conf
|
||||||
Source2: php.ini
|
Source2: php.ini
|
||||||
Source3: macros.php
|
Source3: macros.php
|
||||||
@ -86,12 +85,16 @@ Source7: php-fpm.logrotate
|
|||||||
Source8: php-fpm.sysconfig
|
Source8: php-fpm.sysconfig
|
||||||
Source9: php.modconf
|
Source9: php.modconf
|
||||||
Source10: php.ztsmodconf
|
Source10: php.ztsmodconf
|
||||||
|
# Configuration files for some extensions
|
||||||
|
Source50: opcache.ini
|
||||||
|
|
||||||
# Build fixes
|
# Build fixes
|
||||||
Patch5: php-5.2.0-includedir.patch
|
Patch5: php-5.2.0-includedir.patch
|
||||||
Patch6: php-5.2.4-embed.patch
|
Patch6: php-5.2.4-embed.patch
|
||||||
Patch7: php-5.3.0-recode.patch
|
Patch7: php-5.3.0-recode.patch
|
||||||
Patch8: php-5.4.7-libdb.patch
|
Patch8: php-5.4.7-libdb.patch
|
||||||
|
# revert to bison 2.4 generated parser
|
||||||
|
Patch9: php-5.5.0-build.patch
|
||||||
|
|
||||||
# Fixes for extension modules
|
# Fixes for extension modules
|
||||||
# https://bugs.php.net/63171 no odbc call during timeout
|
# https://bugs.php.net/63171 no odbc call during timeout
|
||||||
@ -99,7 +102,6 @@ Patch21: php-5.4.7-odbctimer.patch
|
|||||||
|
|
||||||
# Functional changes
|
# Functional changes
|
||||||
Patch40: php-5.4.0-dlopen.patch
|
Patch40: php-5.4.0-dlopen.patch
|
||||||
Patch41: php-5.4.0-easter.patch
|
|
||||||
Patch42: php-5.3.1-systzdata-v10.patch
|
Patch42: php-5.3.1-systzdata-v10.patch
|
||||||
# See http://bugs.php.net/53436
|
# See http://bugs.php.net/53436
|
||||||
Patch43: php-5.4.0-phpize.patch
|
Patch43: php-5.4.0-phpize.patch
|
||||||
@ -116,7 +118,7 @@ Patch47: php-5.4.9-phpinfo.patch
|
|||||||
# Fixes for tests
|
# Fixes for tests
|
||||||
|
|
||||||
|
|
||||||
BuildRequires: bzip2-devel, curl-devel >= 7.9, gmp-devel
|
BuildRequires: bzip2-devel, curl-devel >= 7.9
|
||||||
BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
|
BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
|
||||||
BuildRequires: libstdc++-devel, openssl-devel
|
BuildRequires: libstdc++-devel, openssl-devel
|
||||||
BuildRequires: sqlite-devel >= 3.6.0
|
BuildRequires: sqlite-devel >= 3.6.0
|
||||||
@ -127,6 +129,9 @@ BuildRequires: libtool-ltdl-devel
|
|||||||
%if %{with_libzip}
|
%if %{with_libzip}
|
||||||
BuildRequires: libzip-devel >= 0.10
|
BuildRequires: libzip-devel >= 0.10
|
||||||
%endif
|
%endif
|
||||||
|
%if %{with_dtrace}
|
||||||
|
BuildRequires: systemtap-sdt-devel
|
||||||
|
%endif
|
||||||
|
|
||||||
Obsoletes: php-dbg, php3, phpfi, stronghold-php
|
Obsoletes: php-dbg, php3, phpfi, stronghold-php
|
||||||
%if %{with_zts}
|
%if %{with_zts}
|
||||||
@ -184,9 +189,9 @@ Summary: PHP FastCGI Process Manager
|
|||||||
# TSRM and fpm are licensed under BSD
|
# TSRM and fpm are licensed under BSD
|
||||||
License: PHP and Zend and BSD
|
License: PHP and Zend and BSD
|
||||||
Requires: php-common%{?_isa} = %{version}-%{release}
|
Requires: php-common%{?_isa} = %{version}-%{release}
|
||||||
|
Requires(pre): /usr/sbin/useradd
|
||||||
BuildRequires: systemd-units
|
BuildRequires: systemd-units
|
||||||
Requires: systemd-units
|
Requires: systemd-units
|
||||||
Requires(pre): /usr/sbin/useradd
|
|
||||||
Requires(post): systemd-units
|
Requires(post): systemd-units
|
||||||
Requires(preun): systemd-units
|
Requires(preun): systemd-units
|
||||||
Requires(postun): systemd-units
|
Requires(postun): systemd-units
|
||||||
@ -209,8 +214,8 @@ Summary: Common files for PHP
|
|||||||
# regex, libmagic are licensed under BSD
|
# regex, libmagic are licensed under BSD
|
||||||
License: PHP and BSD
|
License: PHP and BSD
|
||||||
# ABI/API check - Arch specific
|
# ABI/API check - Arch specific
|
||||||
Provides: php-api = %{apiver}%{isasuffix}, php-zend-abi = %{zendver}%{isasuffix}
|
Provides: php(api) = %{apiver}%{isasuffix}
|
||||||
Provides: php(api) = %{apiver}%{isasuffix}, php(zend-abi) = %{zendver}%{isasuffix}
|
Provides: php(zend-abi) = %{zendver}%{isasuffix}
|
||||||
Provides: php(language) = %{version}, php(language)%{?_isa} = %{version}
|
Provides: php(language) = %{version}, php(language)%{?_isa} = %{version}
|
||||||
# Provides for all builtin/shared modules:
|
# Provides for all builtin/shared modules:
|
||||||
Provides: php-bz2, php-bz2%{?_isa}
|
Provides: php-bz2, php-bz2%{?_isa}
|
||||||
@ -222,36 +227,25 @@ Provides: php-date, php-date%{?_isa}
|
|||||||
Provides: php-ereg, php-ereg%{?_isa}
|
Provides: php-ereg, php-ereg%{?_isa}
|
||||||
Provides: php-exif, php-exif%{?_isa}
|
Provides: php-exif, php-exif%{?_isa}
|
||||||
Provides: php-fileinfo, php-fileinfo%{?_isa}
|
Provides: php-fileinfo, php-fileinfo%{?_isa}
|
||||||
Provides: php-pecl-Fileinfo = %{fileinfover}, php-pecl-Fileinfo%{?_isa} = %{fileinfover}
|
|
||||||
Provides: php-pecl(Fileinfo) = %{fileinfover}, php-pecl(Fileinfo)%{?_isa} = %{fileinfover}
|
|
||||||
Provides: php-filter, php-filter%{?_isa}
|
Provides: php-filter, php-filter%{?_isa}
|
||||||
Provides: php-ftp, php-ftp%{?_isa}
|
Provides: php-ftp, php-ftp%{?_isa}
|
||||||
Provides: php-gettext, php-gettext%{?_isa}
|
Provides: php-gettext, php-gettext%{?_isa}
|
||||||
Provides: php-gmp, php-gmp%{?_isa}
|
|
||||||
Provides: php-hash, php-hash%{?_isa}
|
Provides: php-hash, php-hash%{?_isa}
|
||||||
Provides: php-mhash = %{version}, php-mhash%{?_isa} = %{version}
|
Provides: php-mhash = %{version}, php-mhash%{?_isa} = %{version}
|
||||||
Provides: php-iconv, php-iconv%{?_isa}
|
Provides: php-iconv, php-iconv%{?_isa}
|
||||||
Provides: php-json, php-json%{?_isa}
|
Provides: php-json, php-json%{?_isa}
|
||||||
Provides: php-pecl-json = %{jsonver}, php-pecl-json%{?_isa} = %{jsonver}
|
|
||||||
Provides: php-pecl(json) = %{jsonver}, php-pecl(json)%{?_isa} = %{jsonver}
|
|
||||||
Provides: php-libxml, php-libxml%{?_isa}
|
Provides: php-libxml, php-libxml%{?_isa}
|
||||||
Provides: php-openssl, php-openssl%{?_isa}
|
Provides: php-openssl, php-openssl%{?_isa}
|
||||||
Provides: php-pecl-phar = %{pharver}, php-pecl-phar%{?_isa} = %{pharver}
|
|
||||||
Provides: php-pecl(phar) = %{pharver}, php-pecl(phar)%{?_isa} = %{pharver}
|
|
||||||
Provides: php-phar, php-phar%{?_isa}
|
Provides: php-phar, php-phar%{?_isa}
|
||||||
Provides: php-pcre, php-pcre%{?_isa}
|
Provides: php-pcre, php-pcre%{?_isa}
|
||||||
Provides: php-reflection, php-reflection%{?_isa}
|
Provides: php-reflection, php-reflection%{?_isa}
|
||||||
Provides: php-session, php-session%{?_isa}
|
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-sockets, php-sockets%{?_isa}
|
||||||
Provides: php-spl, php-spl%{?_isa}
|
Provides: php-spl, php-spl%{?_isa}
|
||||||
Provides: php-standard = %{version}, php-standard%{?_isa} = %{version}
|
Provides: php-standard = %{version}, php-standard%{?_isa} = %{version}
|
||||||
Provides: php-tokenizer, php-tokenizer%{?_isa}
|
Provides: php-tokenizer, php-tokenizer%{?_isa}
|
||||||
%if %{with_zip}
|
%if %{with_zip}
|
||||||
Provides: php-zip, php-zip%{?_isa}
|
Provides: php-zip, php-zip%{?_isa}
|
||||||
Provides: php-pecl-zip = %{zipver}, php-pecl-zip%{?_isa} = %{zipver}
|
|
||||||
Provides: php-pecl(zip) = %{zipver}, php-pecl(zip)%{?_isa} = %{zipver}
|
|
||||||
Obsoletes: php-pecl-zip
|
Obsoletes: php-pecl-zip
|
||||||
%endif
|
%endif
|
||||||
Provides: php-zlib, php-zlib%{?_isa}
|
Provides: php-zlib, php-zlib%{?_isa}
|
||||||
@ -278,6 +272,28 @@ The php-devel package contains the files needed for building PHP
|
|||||||
extensions. If you need to compile your own PHP extensions, you will
|
extensions. If you need to compile your own PHP extensions, you will
|
||||||
need to install this package.
|
need to install this package.
|
||||||
|
|
||||||
|
%package opcache
|
||||||
|
Summary: The Zend Optimizer+
|
||||||
|
Group: Development/Languages
|
||||||
|
License: PHP
|
||||||
|
Requires: php-common%{?_isa} = %{version}-%{release}
|
||||||
|
Obsoletes: php-pecl-zendoptimizerplus
|
||||||
|
Provides: php-pecl-zendoptimizerplus = %{opcachever}
|
||||||
|
Provides: php-pecl-zendoptimizerplus%{?_isa} = %{opcachever}
|
||||||
|
Provides: php-pecl(opcache) = %{opcachever}
|
||||||
|
Provides: php-pecl(opcache)%{?_isa} = %{opcachever}
|
||||||
|
# Only one opcode cache could be enabled
|
||||||
|
Conflicts: php-xcache
|
||||||
|
# APC 3.1.15 offer an option to disable opcache
|
||||||
|
Conflicts: php-pecl-apc < 3.1.15
|
||||||
|
|
||||||
|
%description opcache
|
||||||
|
The Zend Optimizer+ provides faster PHP execution through opcode caching and
|
||||||
|
optimization. It improves PHP performance by storing precompiled script
|
||||||
|
bytecode in the shared memory. This eliminates the stages of reading code from
|
||||||
|
the disk and compiling it on future access. In addition, it applies a few
|
||||||
|
bytecode optimization patterns that make code execution faster.
|
||||||
|
|
||||||
%package imap
|
%package imap
|
||||||
Summary: A module for PHP applications that use IMAP
|
Summary: A module for PHP applications that use IMAP
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
@ -406,6 +422,7 @@ Group: Development/Languages
|
|||||||
License: PHP
|
License: PHP
|
||||||
Requires: php-common%{?_isa} = %{version}-%{release}
|
Requires: php-common%{?_isa} = %{version}-%{release}
|
||||||
Provides: php-posix, php-posix%{?_isa}
|
Provides: php-posix, php-posix%{?_isa}
|
||||||
|
Provides: php-shmop, php-shmop%{?_isa}
|
||||||
Provides: php-sysvsem, php-sysvsem%{?_isa}
|
Provides: php-sysvsem, php-sysvsem%{?_isa}
|
||||||
Provides: php-sysvshm, php-sysvshm%{?_isa}
|
Provides: php-sysvshm, php-sysvshm%{?_isa}
|
||||||
Provides: php-sysvmsg, php-sysvmsg%{?_isa}
|
Provides: php-sysvmsg, php-sysvmsg%{?_isa}
|
||||||
@ -494,11 +511,12 @@ License: PHP
|
|||||||
Requires: php-common%{?_isa} = %{version}-%{release}
|
Requires: php-common%{?_isa} = %{version}-%{release}
|
||||||
Obsoletes: php-domxml, php-dom
|
Obsoletes: php-domxml, php-dom
|
||||||
Provides: php-dom, php-dom%{?_isa}
|
Provides: php-dom, php-dom%{?_isa}
|
||||||
Provides: php-xsl, php-xsl%{?_isa}
|
|
||||||
Provides: php-domxml, php-domxml%{?_isa}
|
Provides: php-domxml, php-domxml%{?_isa}
|
||||||
|
Provides: php-simplexml, php-simplexml%{?_isa}
|
||||||
Provides: php-wddx, php-wddx%{?_isa}
|
Provides: php-wddx, php-wddx%{?_isa}
|
||||||
Provides: php-xmlreader, php-xmlreader%{?_isa}
|
Provides: php-xmlreader, php-xmlreader%{?_isa}
|
||||||
Provides: php-xmlwriter, php-xmlwriter%{?_isa}
|
Provides: php-xmlwriter, php-xmlwriter%{?_isa}
|
||||||
|
Provides: php-xsl, php-xsl%{?_isa}
|
||||||
BuildRequires: libxslt-devel >= 1.0.18-1, libxml2-devel >= 2.4.14-1
|
BuildRequires: libxslt-devel >= 1.0.18-1, libxml2-devel >= 2.4.14-1
|
||||||
|
|
||||||
%description xml
|
%description xml
|
||||||
@ -559,6 +577,18 @@ Requires: php-common%{?_isa} = %{version}-%{release}
|
|||||||
The php-bcmath package contains a dynamic shared object that will add
|
The php-bcmath package contains a dynamic shared object that will add
|
||||||
support for using the bcmath library to PHP.
|
support for using the bcmath library to PHP.
|
||||||
|
|
||||||
|
%package gmp
|
||||||
|
Summary: A module for PHP applications for using the GNU MP library
|
||||||
|
Group: Development/Languages
|
||||||
|
# All files licensed under PHP version 3.01
|
||||||
|
License: PHP
|
||||||
|
BuildRequires: gmp-devel
|
||||||
|
Requires: php-common%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
|
%description gmp
|
||||||
|
These functions allow you to work with arbitrary-length integers
|
||||||
|
using the GNU MP library.
|
||||||
|
|
||||||
%package dba
|
%package dba
|
||||||
Summary: A database abstraction layer module for PHP applications
|
Summary: A database abstraction layer module for PHP applications
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
@ -652,7 +682,7 @@ Group: System Environment/Libraries
|
|||||||
# All files licensed under PHP version 3.01
|
# All files licensed under PHP version 3.01
|
||||||
License: PHP
|
License: PHP
|
||||||
Requires: php-common%{?_isa} = %{version}-%{release}
|
Requires: php-common%{?_isa} = %{version}-%{release}
|
||||||
BuildRequires: libicu-devel >= 3.6
|
BuildRequires: libicu-devel >= 4.0
|
||||||
|
|
||||||
%description intl
|
%description intl
|
||||||
The php-intl package contains a dynamic shared object that will add
|
The php-intl package contains a dynamic shared object that will add
|
||||||
@ -678,11 +708,11 @@ support for using the enchant library to PHP.
|
|||||||
%patch6 -p1 -b .embed
|
%patch6 -p1 -b .embed
|
||||||
%patch7 -p1 -b .recode
|
%patch7 -p1 -b .recode
|
||||||
%patch8 -p1 -b .libdb
|
%patch8 -p1 -b .libdb
|
||||||
|
%patch9 -p1 -b .build
|
||||||
|
|
||||||
%patch21 -p1 -b .odbctimer
|
%patch21 -p1 -b .odbctimer
|
||||||
|
|
||||||
%patch40 -p1 -b .dlopen
|
%patch40 -p1 -b .dlopen
|
||||||
%patch41 -p1 -b .easter
|
|
||||||
%patch42 -p1 -b .systzdata
|
%patch42 -p1 -b .systzdata
|
||||||
%patch43 -p1 -b .headers
|
%patch43 -p1 -b .headers
|
||||||
%if %{with_libzip}
|
%if %{with_libzip}
|
||||||
@ -718,8 +748,6 @@ mkdir build-cgi build-apache build-embedded \
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
# ----- Manage known as failed test -------
|
# ----- Manage known as failed test -------
|
||||||
# php_egg_logo_guid() removed by patch41
|
|
||||||
rm -f tests/basic/php_egg_logo_guid.phpt
|
|
||||||
# affected by systzdata patch
|
# affected by systzdata patch
|
||||||
rm -f ext/date/tests/timezone_location_get.phpt
|
rm -f ext/date/tests/timezone_location_get.phpt
|
||||||
# fails sometime
|
# fails sometime
|
||||||
@ -756,28 +784,10 @@ if test "x${vpdo}" != "x%{pdover}"; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Check for some extension version
|
# Check for some extension version
|
||||||
ver=$(sed -n '/#define PHP_FILEINFO_VERSION /{s/.* "//;s/".*$//;p}' ext/fileinfo/php_fileinfo.h)
|
ver=$(sed -n '/#define ACCELERATOR_VERSION /{s/.* "//;s/".*$//;p}' ext/opcache/ZendAccelerator.h)
|
||||||
if test "$ver" != "%{fileinfover}"; then
|
if test "$ver" != "%{opcachever}"; then
|
||||||
: Error: Upstream FILEINFO version is now ${ver}, expecting %{fileinfover}.
|
: Error: Upstream PHAR version is now ${ver}, expecting %{opcachever}.
|
||||||
: Update the fileinfover macro and rebuild.
|
: Update the opcachever macro and rebuild.
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
ver=$(sed -n '/#define PHP_PHAR_VERSION /{s/.* "//;s/".*$//;p}' ext/phar/php_phar.h)
|
|
||||||
if test "$ver" != "%{pharver}"; then
|
|
||||||
: Error: Upstream PHAR version is now ${ver}, expecting %{pharver}.
|
|
||||||
: Update the pharver macro and rebuild.
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
ver=$(sed -n '/#define PHP_ZIP_VERSION_STRING /{s/.* "//;s/".*$//;p}' ext/zip/php_zip.h)
|
|
||||||
if test "$ver" != "%{zipver}"; then
|
|
||||||
: Error: Upstream ZIP version is now ${ver}, expecting %{zipver}.
|
|
||||||
: Update the zipver macro and rebuild.
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
ver=$(sed -n '/#define PHP_JSON_VERSION /{s/.* "//;s/".*$//;p}' ext/json/php_json.h)
|
|
||||||
if test "$ver" != "%{jsonver}"; then
|
|
||||||
: Error: Upstream JSON version is now ${ver}, expecting %{jsonver}.
|
|
||||||
: Update the jsonver macro and rebuild.
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -799,6 +809,9 @@ chmod 644 README.*
|
|||||||
# php-fpm configuration files for tmpfiles.d
|
# php-fpm configuration files for tmpfiles.d
|
||||||
echo "d /run/php-fpm 755 root root" >php-fpm.tmpfiles
|
echo "d /run/php-fpm 755 root root" >php-fpm.tmpfiles
|
||||||
|
|
||||||
|
# Some extensions have their own configuration file
|
||||||
|
cp %{SOURCE50} .
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# aclocal workaround - to be improved
|
# aclocal workaround - to be improved
|
||||||
@ -828,6 +841,17 @@ build() {
|
|||||||
# Old/recent bison version seems to produce a broken parser;
|
# Old/recent bison version seems to produce a broken parser;
|
||||||
# upstream uses GNU Bison 2.3. Workaround:
|
# upstream uses GNU Bison 2.3. Workaround:
|
||||||
mkdir Zend && cp ../Zend/zend_{language,ini}_{parser,scanner}.[ch] Zend
|
mkdir Zend && cp ../Zend/zend_{language,ini}_{parser,scanner}.[ch] Zend
|
||||||
|
|
||||||
|
# Always static:
|
||||||
|
# date, filter, libxml, reflection, spl: not supported
|
||||||
|
# ereg: build options vary per SAPI
|
||||||
|
# hash: for PHAR_SIG_SHA256 and PHAR_SIG_SHA512
|
||||||
|
# session: dep on hash, used by soap and wddx
|
||||||
|
# pcre: used by filter, zip
|
||||||
|
# pcntl, readline: only used by CLI sapi
|
||||||
|
# openssl: for PHAR_SIG_OPENSSL
|
||||||
|
# zlib: used by image
|
||||||
|
|
||||||
ln -sf ../configure
|
ln -sf ../configure
|
||||||
%configure \
|
%configure \
|
||||||
--cache-file=../config.cache \
|
--cache-file=../config.cache \
|
||||||
@ -838,7 +862,6 @@ ln -sf ../configure
|
|||||||
--with-pic \
|
--with-pic \
|
||||||
--disable-rpath \
|
--disable-rpath \
|
||||||
--without-pear \
|
--without-pear \
|
||||||
--with-bz2 \
|
|
||||||
--with-exec-dir=%{_bindir} \
|
--with-exec-dir=%{_bindir} \
|
||||||
--with-freetype-dir=%{_prefix} \
|
--with-freetype-dir=%{_prefix} \
|
||||||
--with-png-dir=%{_prefix} \
|
--with-png-dir=%{_prefix} \
|
||||||
@ -846,26 +869,20 @@ ln -sf ../configure
|
|||||||
--enable-gd-native-ttf \
|
--enable-gd-native-ttf \
|
||||||
--with-t1lib=%{_prefix} \
|
--with-t1lib=%{_prefix} \
|
||||||
--without-gdbm \
|
--without-gdbm \
|
||||||
--with-gettext \
|
|
||||||
--with-gmp \
|
|
||||||
--with-iconv \
|
|
||||||
--with-jpeg-dir=%{_prefix} \
|
--with-jpeg-dir=%{_prefix} \
|
||||||
--with-openssl \
|
--with-openssl \
|
||||||
--with-pcre-regex=%{_prefix} \
|
--with-pcre-regex=%{_prefix} \
|
||||||
--with-zlib \
|
--with-zlib \
|
||||||
--with-layout=GNU \
|
--with-layout=GNU \
|
||||||
--enable-exif \
|
|
||||||
--enable-ftp \
|
|
||||||
--enable-magic-quotes \
|
--enable-magic-quotes \
|
||||||
--enable-sockets \
|
|
||||||
--with-kerberos \
|
--with-kerberos \
|
||||||
--enable-ucd-snmp-hack \
|
--enable-ucd-snmp-hack \
|
||||||
--enable-shmop \
|
|
||||||
--enable-calendar \
|
|
||||||
--with-libxml-dir=%{_prefix} \
|
--with-libxml-dir=%{_prefix} \
|
||||||
--enable-xml \
|
|
||||||
--with-system-tzdata \
|
--with-system-tzdata \
|
||||||
--with-mhash \
|
--with-mhash \
|
||||||
|
%if %{with_dtrace}
|
||||||
|
--enable-dtrace \
|
||||||
|
%endif
|
||||||
$*
|
$*
|
||||||
if test $? != 0; then
|
if test $? != 0; then
|
||||||
tail -500 config.log
|
tail -500 config.log
|
||||||
@ -882,13 +899,24 @@ pushd build-cgi
|
|||||||
build --enable-force-cgi-redirect \
|
build --enable-force-cgi-redirect \
|
||||||
--libdir=%{_libdir}/php \
|
--libdir=%{_libdir}/php \
|
||||||
--enable-pcntl \
|
--enable-pcntl \
|
||||||
|
--enable-opcache \
|
||||||
--with-imap=shared --with-imap-ssl \
|
--with-imap=shared --with-imap-ssl \
|
||||||
--enable-mbstring=shared \
|
--enable-mbstring=shared \
|
||||||
--enable-mbregex \
|
--enable-mbregex \
|
||||||
--with-gd=shared \
|
--with-gd=shared \
|
||||||
|
--with-gmp=shared \
|
||||||
|
--enable-calendar=shared \
|
||||||
--enable-bcmath=shared \
|
--enable-bcmath=shared \
|
||||||
|
--with-bz2=shared \
|
||||||
|
--enable-ctype=shared \
|
||||||
--enable-dba=shared --with-db4=%{_prefix} \
|
--enable-dba=shared --with-db4=%{_prefix} \
|
||||||
--with-tcadb=%{_prefix} \
|
--with-tcadb=%{_prefix} \
|
||||||
|
--enable-exif=shared \
|
||||||
|
--enable-ftp=shared \
|
||||||
|
--with-gettext=shared \
|
||||||
|
--with-iconv=shared \
|
||||||
|
--enable-sockets=shared \
|
||||||
|
--enable-tokenizer=shared \
|
||||||
--with-xmlrpc=shared \
|
--with-xmlrpc=shared \
|
||||||
--with-ldap=shared --with-ldap-sasl \
|
--with-ldap=shared --with-ldap-sasl \
|
||||||
--enable-mysqlnd=shared \
|
--enable-mysqlnd=shared \
|
||||||
@ -899,6 +927,8 @@ build --enable-force-cgi-redirect \
|
|||||||
--with-pdo-firebird=shared,%{_libdir}/firebird \
|
--with-pdo-firebird=shared,%{_libdir}/firebird \
|
||||||
--enable-dom=shared \
|
--enable-dom=shared \
|
||||||
--with-pgsql=shared \
|
--with-pgsql=shared \
|
||||||
|
--enable-simplexml=shared \
|
||||||
|
--enable-xml=shared \
|
||||||
--enable-wddx=shared \
|
--enable-wddx=shared \
|
||||||
--with-snmp=shared,%{_prefix} \
|
--with-snmp=shared,%{_prefix} \
|
||||||
--enable-soap=shared \
|
--enable-soap=shared \
|
||||||
@ -928,6 +958,7 @@ build --enable-force-cgi-redirect \
|
|||||||
--with-tidy=shared,%{_prefix} \
|
--with-tidy=shared,%{_prefix} \
|
||||||
--with-mssql=shared,%{_prefix} \
|
--with-mssql=shared,%{_prefix} \
|
||||||
--enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \
|
--enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \
|
||||||
|
--enable-shmop=shared \
|
||||||
--enable-posix=shared \
|
--enable-posix=shared \
|
||||||
--with-unixODBC=shared,%{_prefix} \
|
--with-unixODBC=shared,%{_prefix} \
|
||||||
--enable-fileinfo=shared \
|
--enable-fileinfo=shared \
|
||||||
@ -939,10 +970,14 @@ popd
|
|||||||
|
|
||||||
without_shared="--without-gd \
|
without_shared="--without-gd \
|
||||||
--disable-dom --disable-dba --without-unixODBC \
|
--disable-dom --disable-dba --without-unixODBC \
|
||||||
|
--disable-opcache \
|
||||||
--disable-xmlreader --disable-xmlwriter \
|
--disable-xmlreader --disable-xmlwriter \
|
||||||
--without-sqlite3 --disable-phar --disable-fileinfo \
|
--without-sqlite3 --disable-phar --disable-fileinfo \
|
||||||
--disable-json --without-pspell --disable-wddx \
|
--disable-json --without-pspell --disable-wddx \
|
||||||
--without-curl --disable-posix \
|
--without-curl --disable-posix --disable-xml \
|
||||||
|
--disable-simplexml --disable-exif --without-gettext \
|
||||||
|
--without-iconv --disable-ftp --without-bz2 --disable-ctype \
|
||||||
|
--disable-shmop --disable-sockets --disable-tokenizer \
|
||||||
--disable-sysvmsg --disable-sysvshm --disable-sysvsem"
|
--disable-sysvmsg --disable-sysvshm --disable-sysvsem"
|
||||||
|
|
||||||
# Build Apache module, and the CLI SAPI, /usr/bin/php
|
# Build Apache module, and the CLI SAPI, /usr/bin/php
|
||||||
@ -992,13 +1027,24 @@ build --enable-force-cgi-redirect \
|
|||||||
--enable-maintainer-zts \
|
--enable-maintainer-zts \
|
||||||
--with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \
|
--with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \
|
||||||
--enable-pcntl \
|
--enable-pcntl \
|
||||||
|
--enable-opcache \
|
||||||
--with-imap=shared --with-imap-ssl \
|
--with-imap=shared --with-imap-ssl \
|
||||||
--enable-mbstring=shared \
|
--enable-mbstring=shared \
|
||||||
--enable-mbregex \
|
--enable-mbregex \
|
||||||
--with-gd=shared \
|
--with-gd=shared \
|
||||||
|
--with-gmp=shared \
|
||||||
|
--enable-calendar=shared \
|
||||||
--enable-bcmath=shared \
|
--enable-bcmath=shared \
|
||||||
|
--with-bz2=shared \
|
||||||
|
--enable-ctype=shared \
|
||||||
--enable-dba=shared --with-db4=%{_prefix} \
|
--enable-dba=shared --with-db4=%{_prefix} \
|
||||||
--with-tcadb=%{_prefix} \
|
--with-tcadb=%{_prefix} \
|
||||||
|
--with-gettext=shared \
|
||||||
|
--with-iconv=shared \
|
||||||
|
--enable-sockets=shared \
|
||||||
|
--enable-tokenizer=shared \
|
||||||
|
--enable-exif=shared \
|
||||||
|
--enable-ftp=shared \
|
||||||
--with-xmlrpc=shared \
|
--with-xmlrpc=shared \
|
||||||
--with-ldap=shared --with-ldap-sasl \
|
--with-ldap=shared --with-ldap-sasl \
|
||||||
--enable-mysqlnd=shared \
|
--enable-mysqlnd=shared \
|
||||||
@ -1010,6 +1056,8 @@ build --enable-force-cgi-redirect \
|
|||||||
--with-pdo-firebird=shared,%{_libdir}/firebird \
|
--with-pdo-firebird=shared,%{_libdir}/firebird \
|
||||||
--enable-dom=shared \
|
--enable-dom=shared \
|
||||||
--with-pgsql=shared \
|
--with-pgsql=shared \
|
||||||
|
--enable-simplexml=shared \
|
||||||
|
--enable-xml=shared \
|
||||||
--enable-wddx=shared \
|
--enable-wddx=shared \
|
||||||
--with-snmp=shared,%{_prefix} \
|
--with-snmp=shared,%{_prefix} \
|
||||||
--enable-soap=shared \
|
--enable-soap=shared \
|
||||||
@ -1039,6 +1087,7 @@ build --enable-force-cgi-redirect \
|
|||||||
--with-tidy=shared,%{_prefix} \
|
--with-tidy=shared,%{_prefix} \
|
||||||
--with-mssql=shared,%{_prefix} \
|
--with-mssql=shared,%{_prefix} \
|
||||||
--enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \
|
--enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \
|
||||||
|
--enable-shmop=shared \
|
||||||
--enable-posix=shared \
|
--enable-posix=shared \
|
||||||
--with-unixODBC=shared,%{_prefix} \
|
--with-unixODBC=shared,%{_prefix} \
|
||||||
--enable-fileinfo=shared \
|
--enable-fileinfo=shared \
|
||||||
@ -1075,6 +1124,10 @@ popd
|
|||||||
|
|
||||||
%check
|
%check
|
||||||
%if %runselftest
|
%if %runselftest
|
||||||
|
|
||||||
|
# Double stack size (required by bug54268.phpt)
|
||||||
|
ulimit -s 16384
|
||||||
|
|
||||||
cd build-apache
|
cd build-apache
|
||||||
# Run tests, using the CLI SAPI
|
# Run tests, using the CLI SAPI
|
||||||
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
|
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
|
||||||
@ -1082,10 +1135,13 @@ export SKIP_ONLINE_TESTS=1
|
|||||||
unset TZ LANG LC_ALL
|
unset TZ LANG LC_ALL
|
||||||
if ! make test; then
|
if ! make test; then
|
||||||
set +x
|
set +x
|
||||||
for f in `find .. -name \*.diff -type f -print`; do
|
for f in $(find .. -name \*.diff -type f -print); do
|
||||||
|
if ! grep -q XFAIL "${f/.diff/.phpt}"
|
||||||
|
then
|
||||||
echo "TEST FAILURE: $f --"
|
echo "TEST FAILURE: $f --"
|
||||||
cat "$f"
|
cat "$f"
|
||||||
echo "-- $f result ends."
|
echo -e "\n-- $f result ends."
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
set -x
|
set -x
|
||||||
#exit 1
|
#exit 1
|
||||||
@ -1220,37 +1276,53 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm
|
|||||||
for mod in pgsql odbc ldap snmp xmlrpc imap \
|
for mod in pgsql odbc ldap snmp xmlrpc imap \
|
||||||
mysqlnd mysqlnd_mysql mysqlnd_mysqli pdo_mysqlnd \
|
mysqlnd mysqlnd_mysql mysqlnd_mysqli pdo_mysqlnd \
|
||||||
mbstring gd dom xsl soap bcmath dba xmlreader xmlwriter \
|
mbstring gd dom xsl soap bcmath dba xmlreader xmlwriter \
|
||||||
|
simplexml bz2 calendar ctype exif ftp gettext gmp iconv \
|
||||||
|
sockets tokenizer opcache \
|
||||||
pdo pdo_pgsql pdo_odbc pdo_sqlite json %{zipmod} \
|
pdo pdo_pgsql pdo_odbc pdo_sqlite json %{zipmod} \
|
||||||
sqlite3 interbase pdo_firebird \
|
sqlite3 interbase pdo_firebird \
|
||||||
enchant phar fileinfo intl \
|
enchant phar fileinfo intl \
|
||||||
mcrypt tidy pdo_dblib mssql pspell curl wddx \
|
mcrypt tidy pdo_dblib mssql pspell curl wddx \
|
||||||
posix sysvshm sysvsem sysvmsg recode \
|
posix shmop sysvshm sysvsem sysvmsg recode xml \
|
||||||
%if %{with_libmysql}
|
%if %{with_libmysql}
|
||||||
mysql mysqli pdo_mysql \
|
mysql mysqli pdo_mysql \
|
||||||
%endif
|
%endif
|
||||||
; do
|
; do
|
||||||
cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF
|
# for extension load order
|
||||||
|
if [ "$mod" = "wddx" ]
|
||||||
|
then ini=xml_${mod}.ini
|
||||||
|
else ini=${mod}.ini
|
||||||
|
fi
|
||||||
|
# some extensions have their own config file
|
||||||
|
if [ -f ${ini} ]; then
|
||||||
|
sed -e 's:@EXTPATH@:%{_libdir}/php/modules:' \
|
||||||
|
${ini} >$RPM_BUILD_ROOT%{_sysconfdir}/php.d/${ini}
|
||||||
|
sed -e 's:@EXTPATH@:%{_libdir}/php-zts/modules:' \
|
||||||
|
${ini} >$RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/${ini}
|
||||||
|
else
|
||||||
|
cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${ini} <<EOF
|
||||||
; Enable ${mod} extension module
|
; Enable ${mod} extension module
|
||||||
extension=${mod}.so
|
extension=${mod}.so
|
||||||
EOF
|
EOF
|
||||||
%if %{with_zts}
|
%if %{with_zts}
|
||||||
cat > $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/${mod}.ini <<EOF
|
cat > $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/${ini} <<EOF
|
||||||
; Enable ${mod} extension module
|
; Enable ${mod} extension module
|
||||||
extension=${mod}.so
|
extension=${mod}.so
|
||||||
EOF
|
EOF
|
||||||
%endif
|
%endif
|
||||||
|
fi
|
||||||
cat > files.${mod} <<EOF
|
cat > files.${mod} <<EOF
|
||||||
%attr(755,root,root) %{_libdir}/php/modules/${mod}.so
|
%attr(755,root,root) %{_libdir}/php/modules/${mod}.so
|
||||||
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/php.d/${mod}.ini
|
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/php.d/${ini}
|
||||||
%if %{with_zts}
|
%if %{with_zts}
|
||||||
%attr(755,root,root) %{_libdir}/php-zts/modules/${mod}.so
|
%attr(755,root,root) %{_libdir}/php-zts/modules/${mod}.so
|
||||||
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/php-zts.d/${mod}.ini
|
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/php-zts.d/${ini}
|
||||||
%endif
|
%endif
|
||||||
EOF
|
EOF
|
||||||
done
|
done
|
||||||
|
|
||||||
# The dom, xsl and xml* modules are all packaged in php-xml
|
# The dom, xsl and xml* modules are all packaged in php-xml
|
||||||
cat files.dom files.xsl files.xml{reader,writer} files.wddx > files.xml
|
cat files.dom files.xsl files.xml{reader,writer} files.wddx \
|
||||||
|
files.simplexml >> files.xml
|
||||||
|
|
||||||
# The mysql and mysqli modules are both packaged in php-mysql
|
# The mysql and mysqli modules are both packaged in php-mysql
|
||||||
%if %{with_libmysql}
|
%if %{with_libmysql}
|
||||||
@ -1271,7 +1343,7 @@ cat files.pdo_odbc >> files.odbc
|
|||||||
cat files.pdo_firebird >> files.interbase
|
cat files.pdo_firebird >> files.interbase
|
||||||
|
|
||||||
# sysv* and posix in packaged in php-process
|
# sysv* and posix in packaged in php-process
|
||||||
cat files.sysv* files.posix > files.process
|
cat files.shmop files.sysv* files.posix > files.process
|
||||||
|
|
||||||
# Package sqlite3 and pdo_sqlite with pdo; isolating the sqlite dependency
|
# Package sqlite3 and pdo_sqlite with pdo; isolating the sqlite dependency
|
||||||
# isn't useful at this time since rpm itself requires sqlite.
|
# isn't useful at this time since rpm itself requires sqlite.
|
||||||
@ -1279,7 +1351,10 @@ cat files.pdo_sqlite >> files.pdo
|
|||||||
cat files.sqlite3 >> files.pdo
|
cat files.sqlite3 >> files.pdo
|
||||||
|
|
||||||
# Package json, zip, curl, phar and fileinfo in -common.
|
# Package json, zip, curl, phar and fileinfo in -common.
|
||||||
cat files.json files.curl files.phar files.fileinfo > files.common
|
cat files.json files.curl files.phar files.fileinfo \
|
||||||
|
files.exif files.gettext files.iconv files.calendar \
|
||||||
|
files.ftp files.bz2 files.ctype files.sockets \
|
||||||
|
files.tokenizer > files.common
|
||||||
%if %{with_zip}
|
%if %{with_zip}
|
||||||
cat files.zip >> files.common
|
cat files.zip >> files.common
|
||||||
%endif
|
%endif
|
||||||
@ -1468,6 +1543,7 @@ fi
|
|||||||
%files soap -f files.soap
|
%files soap -f files.soap
|
||||||
%files bcmath -f files.bcmath
|
%files bcmath -f files.bcmath
|
||||||
%doc libbcmath_COPYING
|
%doc libbcmath_COPYING
|
||||||
|
%files gmp -f files.gmp
|
||||||
%files dba -f files.dba
|
%files dba -f files.dba
|
||||||
%files pdo -f files.pdo
|
%files pdo -f files.pdo
|
||||||
%files mcrypt -f files.mcrypt
|
%files mcrypt -f files.mcrypt
|
||||||
@ -1480,9 +1556,23 @@ fi
|
|||||||
%files interbase -f files.interbase
|
%files interbase -f files.interbase
|
||||||
%files enchant -f files.enchant
|
%files enchant -f files.enchant
|
||||||
%files mysqlnd -f files.mysqlnd
|
%files mysqlnd -f files.mysqlnd
|
||||||
|
%files opcache -f files.opcache
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 22 2013 Remi Collet <rcollet@redhat.com> 5.5.0-0.1.beta1
|
||||||
|
- update to 5.5.0beta1
|
||||||
|
http://fedoraproject.org/wiki/Features/Php55
|
||||||
|
- new Zend OPcache extension in php-opccache new sub-package
|
||||||
|
- don't display XFAIL tests in report
|
||||||
|
- use xz compressed tarball
|
||||||
|
- build simplexml and xml extensions shared (moved in php-xml)
|
||||||
|
- build bz2, calendar, ctype, exif, ftp, gettext, iconv
|
||||||
|
sockets and tokenizer extensions shared (in php-common)
|
||||||
|
- build gmp extension shared (in php-gmp new sub-package)
|
||||||
|
- build shmop extension shared (moved in php-process)
|
||||||
|
- drop some old compatibility provides (php-api, php-zend-abi, php-pecl-*)
|
||||||
|
|
||||||
* Thu Mar 14 2013 Remi Collet <rcollet@redhat.com> 5.4.13-1
|
* Thu Mar 14 2013 Remi Collet <rcollet@redhat.com> 5.4.13-1
|
||||||
- update to 5.4.13
|
- update to 5.4.13
|
||||||
- security fix for CVE-2013-1643
|
- security fix for CVE-2013-1643
|
||||||
|
Loading…
Reference in New Issue
Block a user