* Wed Nov 10 2004 Joe Orton <jorton@redhat.com> 5.0.2-7

- truncate changelog at 4.3.1-1
- merge from 4.3.x package:
 - enable mime_magic extension and Require: file (#130276)
This commit is contained in:
jorton 2004-11-10 11:10:24 +00:00
parent cdd9e37ecc
commit 1826c14758
4 changed files with 857 additions and 289 deletions

690
php-5.0.0-easter.patch Normal file
View File

@ -0,0 +1,690 @@
Remove 7K of April's Fool.
--- php-5.0.0/ext/standard/info.c.easter 2004-05-02 08:23:30.000000000 -0500
+++ php-5.0.0/ext/standard/info.c 2004-08-09 11:34:57.249656512 -0500
@@ -984,11 +984,7 @@
the_time = time(NULL);
ta = php_localtime_r(&the_time, &tmbuf);
- if ((ta->tm_mon==3) && (ta->tm_mday==1)) {
- logo_guid = PHP_EGG_LOGO_GUID;
- } else {
- logo_guid = PHP_LOGO_GUID;
- }
+ logo_guid = PHP_LOGO_GUID;
return estrdup(logo_guid);
@@ -1021,18 +1017,6 @@
}
/* }}} */
-/* {{{ 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_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
- }
-
- 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)
--- php-5.0.0/ext/standard/info.h.easter 2004-01-08 11:32:51.000000000 -0600
+++ php-5.0.0/ext/standard/info.h 2004-08-09 11:32:25.711693784 -0500
@@ -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(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);
--- php-5.0.0/main/logos.h.easter 2004-01-08 11:33:04.000000000 -0600
+++ php-5.0.0/main/logos.h 2004-08-09 11:33:14.743239856 -0500
@@ -703,612 +703,3 @@
40, 132, 242, 41, 225, 246, 109, 216, 155, 189,
222, 22, 110, 41, 68, 110, 209, 187, 106, 1,
1, 1, 0, 59 };
-
-unsigned char php_egg_logo[] = {
- 71, 73, 70, 56, 57, 97, 120, 0, 67, 0,
- 247, 255, 0, 0, 0, 0, 177, 156, 157, 205,
- 169, 172, 148, 134, 135, 134, 109, 112, 169, 155,
- 157, 182, 169, 171, 165, 153, 155, 119, 79, 87,
- 167, 152, 155, 167, 157, 159, 195, 159, 167, 170,
- 156, 161, 160, 150, 154, 153, 129, 143, 118, 109,
- 115, 3, 1, 3, 74, 60, 74, 6, 5, 6,
- 183, 173, 184, 101, 93, 102, 148, 142, 150, 5,
- 3, 6, 9, 7, 10, 83, 74, 88, 168, 159,
- 174, 156, 150, 166, 222, 219, 229, 172, 166, 187,
- 215, 212, 225, 206, 203, 220, 123, 120, 139, 134,
- 132, 155, 195, 193, 216, 182, 181, 209, 187, 186,
- 214, 174, 173, 208, 1, 1, 3, 3, 3, 5,
- 11, 11, 16, 14, 14, 20, 7, 7, 10, 34,
- 34, 48, 22, 22, 31, 28, 28, 39, 85, 85,
- 115, 153, 153, 205, 153, 153, 203, 9, 9, 12,
- 156, 156, 205, 160, 160, 206, 170, 170, 206, 177,
- 177, 208, 142, 144, 195, 149, 150, 202, 150, 151,
- 199, 157, 158, 202, 161, 162, 201, 165, 166, 204,
- 80, 82, 122, 75, 77, 112, 112, 115, 165, 97,
- 99, 143, 91, 93, 134, 69, 71, 102, 105, 107,
- 154, 41, 42, 60, 127, 130, 185, 86, 88, 125,
- 51, 52, 74, 136, 139, 192, 133, 135, 184, 146,
- 148, 197, 153, 155, 199, 155, 157, 200, 119, 123,
- 178, 61, 63, 90, 16, 17, 24, 192, 192, 192,
- 132, 89, 62, 139, 94, 66, 143, 105, 82, 222,
- 180, 157, 132, 77, 50, 113, 74, 54, 115, 87,
- 73, 125, 66, 39, 126, 83, 64, 122, 82, 63,
- 102, 71, 57, 113, 85, 72, 197, 160, 142, 204,
- 168, 152, 89, 54, 39, 93, 57, 42, 82, 50,
- 37, 121, 75, 56, 95, 60, 45, 105, 68, 53,
- 89, 58, 45, 97, 67, 55, 113, 79, 65, 104,
- 73, 60, 99, 70, 58, 111, 81, 69, 118, 88,
- 75, 115, 85, 73, 115, 87, 75, 116, 90, 79,
- 181, 143, 127, 207, 174, 160, 94, 51, 35, 78,
- 45, 33, 105, 62, 47, 98, 62, 48, 100, 65,
- 52, 107, 71, 58, 108, 74, 62, 216, 182, 170,
- 210, 177, 165, 227, 193, 180, 219, 188, 177, 118,
- 60, 40, 106, 56, 39, 111, 62, 45, 68, 39,
- 29, 55, 34, 27, 83, 53, 43, 71, 45, 37,
- 94, 64, 54, 10, 7, 6, 93, 67, 59, 116,
- 85, 75, 149, 110, 97, 12, 9, 8, 111, 84,
- 75, 102, 66, 56, 101, 69, 60, 103, 71, 62,
- 93, 65, 57, 95, 67, 59, 99, 70, 62, 91,
- 65, 58, 117, 88, 80, 118, 93, 86, 183, 150,
- 140, 188, 158, 149, 236, 203, 194, 198, 171, 163,
- 190, 164, 157, 41, 26, 22, 91, 61, 53, 98,
- 66, 58, 95, 65, 57, 84, 59, 53, 114, 82,
- 74, 109, 81, 74, 102, 79, 73, 158, 127, 119,
- 123, 100, 94, 163, 133, 126, 194, 167, 160, 204,
- 179, 173, 171, 159, 156, 95, 65, 59, 71, 49,
- 44, 97, 67, 61, 93, 65, 59, 76, 54, 49,
- 126, 91, 83, 19, 14, 13, 112, 86, 80, 87,
- 69, 65, 133, 107, 101, 144, 119, 114, 137, 114,
- 109, 177, 150, 144, 164, 139, 134, 181, 155, 149,
- 209, 183, 177, 200, 176, 171, 223, 197, 191, 211,
- 187, 182, 167, 157, 155, 165, 155, 153, 32, 20,
- 18, 82, 55, 50, 90, 63, 58, 119, 83, 77,
- 94, 66, 61, 60, 43, 40, 95, 74, 70, 171,
- 145, 140, 247, 212, 206, 235, 209, 204, 167, 155,
- 153, 255, 244, 242, 86, 61, 57, 247, 220, 216,
- 155, 142, 140, 170, 157, 155, 149, 124, 121, 187,
- 160, 157, 172, 149, 146, 216, 192, 189, 147, 131,
- 129, 147, 138, 137, 91, 65, 63, 46, 33, 32,
- 155, 132, 130, 157, 137, 135, 181, 159, 157, 224,
- 202, 200, 132, 121, 120, 248, 228, 226, 165, 152,
- 151, 140, 130, 129, 156, 145, 144, 162, 151, 150,
- 151, 141, 140, 186, 176, 175, 103, 85, 84, 174,
- 156, 155, 163, 147, 146, 176, 151, 150, 166, 143,
- 142, 188, 165, 164, 194, 171, 170, 198, 177, 176,
- 210, 189, 188, 229, 207, 206, 236, 215, 214, 22,
- 17, 17, 176, 153, 153, 203, 181, 181, 174, 159,
- 159, 168, 153, 153, 169, 155, 155, 171, 157, 157,
- 191, 177, 177, 176, 163, 163, 169, 157, 157, 167,
- 155, 155, 165, 153, 153, 171, 159, 159, 158, 148,
- 148, 169, 159, 159, 165, 155, 155, 163, 153, 153,
- 161, 153, 153, 3, 3, 3, 1, 1, 1, 255,
- 255, 255, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 33, 249, 4, 1, 0, 0, 78, 0, 44,
- 0, 0, 0, 0, 120, 0, 67, 0, 64, 8,
- 255, 0, 157, 8, 28, 72, 176, 160, 193, 131,
- 8, 19, 42, 92, 200, 176, 161, 195, 135, 16,
- 9, 186, 112, 177, 164, 133, 144, 20, 48, 78,
- 160, 64, 209, 100, 197, 10, 22, 44, 84, 64,
- 243, 229, 171, 20, 170, 82, 38, 53, 53, 130,
- 180, 173, 94, 182, 1, 216, 176, 57, 203, 182,
- 141, 102, 180, 100, 174, 114, 186, 218, 118, 108,
- 219, 54, 103, 206, 154, 37, 147, 38, 205, 83,
- 178, 106, 213, 30, 40, 85, 234, 35, 72, 143,
- 37, 80, 163, 70, 29, 98, 4, 201, 68, 23,
- 17, 19, 78, 252, 193, 2, 128, 87, 0, 130,
- 114, 149, 68, 117, 9, 211, 25, 50, 166, 26,
- 169, 29, 116, 234, 212, 32, 76, 138, 234, 208,
- 17, 51, 71, 140, 24, 58, 117, 204, 32, 42,
- 3, 233, 27, 55, 122, 217, 142, 101, 203, 118,
- 11, 215, 60, 109, 223, 200, 217, 42, 103, 142,
- 153, 55, 109, 218, 188, 81, 35, 102, 141, 90,
- 57, 101, 201, 142, 221, 26, 134, 172, 29, 50,
- 119, 237, 66, 15, 19, 141, 203, 240, 129, 210,
- 134, 33, 107, 171, 183, 13, 91, 181, 15, 75,
- 140, 200, 150, 109, 21, 235, 65, 23, 71, 84,
- 124, 69, 87, 82, 211, 174, 94, 167, 122, 177,
- 117, 107, 74, 145, 153, 185, 115, 146, 7, 202,
- 132, 41, 19, 25, 51, 104, 228, 120, 153, 62,
- 134, 250, 152, 49, 156, 164, 113, 91, 39, 205,
- 85, 44, 74, 121, 236, 216, 255, 185, 227, 166,
- 252, 150, 72, 231, 183, 216, 169, 197, 158, 82,
- 44, 88, 162, 68, 77, 187, 229, 142, 158, 253,
- 251, 244, 220, 233, 119, 135, 172, 127, 231, 97,
- 240, 192, 3, 26, 59, 184, 92, 115, 13, 62,
- 249, 36, 168, 32, 100, 245, 56, 3, 194, 13,
- 72, 68, 248, 2, 86, 46, 148, 240, 149, 47,
- 168, 236, 210, 72, 34, 136, 32, 50, 7, 25,
- 129, 44, 34, 98, 38, 153, 244, 178, 200, 37,
- 151, 236, 130, 162, 138, 127, 124, 1, 7, 32,
- 128, 244, 97, 73, 46, 52, 230, 98, 137, 31,
- 125, 0, 114, 73, 35, 191, 60, 82, 8, 40,
- 177, 172, 195, 205, 59, 234, 148, 67, 141, 57,
- 212, 28, 73, 13, 37, 161, 76, 70, 12, 51,
- 145, 180, 17, 73, 37, 148, 208, 66, 78, 37,
- 110, 228, 33, 201, 43, 159, 180, 66, 64, 53,
- 205, 28, 115, 205, 48, 244, 172, 99, 102, 126,
- 241, 32, 168, 224, 154, 108, 174, 169, 77, 54,
- 57, 228, 128, 3, 14, 87, 229, 246, 85, 46,
- 168, 20, 179, 203, 41, 142, 56, 178, 139, 138,
- 41, 234, 185, 75, 159, 142, 160, 168, 137, 46,
- 46, 194, 161, 168, 162, 95, 52, 242, 9, 27,
- 99, 244, 225, 7, 32, 186, 112, 146, 204, 50,
- 202, 136, 35, 78, 56, 201, 180, 210, 202, 43,
- 159, 70, 3, 76, 44, 192, 68, 19, 77, 56,
- 227, 216, 66, 11, 45, 204, 48, 99, 11, 53,
- 181, 168, 255, 51, 142, 56, 202, 216, 145, 199,
- 29, 177, 180, 162, 198, 38, 155, 160, 225, 171,
- 175, 106, 4, 171, 134, 22, 196, 22, 107, 108,
- 21, 105, 176, 193, 6, 36, 173, 184, 146, 1,
- 13, 52, 144, 48, 67, 12, 19, 21, 116, 149,
- 11, 92, 73, 144, 130, 70, 43, 248, 162, 73,
- 32, 152, 32, 114, 87, 28, 111, 132, 241, 72,
- 42, 96, 232, 161, 238, 186, 234, 242, 225, 110,
- 24, 127, 232, 162, 231, 42, 175, 184, 18, 77,
- 58, 182, 24, 99, 141, 40, 146, 84, 178, 76,
- 52, 177, 132, 179, 204, 52, 227, 88, 41, 142,
- 58, 204, 144, 163, 169, 56, 149, 204, 210, 42,
- 123, 179, 132, 71, 137, 39, 88, 80, 97, 49,
- 21, 117, 148, 161, 49, 26, 85, 84, 97, 172,
- 177, 205, 76, 224, 193, 200, 30, 132, 48, 195,
- 181, 89, 9, 116, 109, 157, 62, 0, 81, 196,
- 203, 76, 196, 204, 4, 16, 52, 99, 16, 193,
- 51, 113, 88, 49, 133, 206, 86, 232, 241, 134,
- 28, 127, 168, 98, 73, 41, 159, 128, 2, 75,
- 191, 253, 82, 162, 76, 40, 149, 244, 27, 138,
- 40, 118, 48, 89, 229, 44, 179, 208, 66, 235,
- 52, 203, 120, 18, 5, 20, 133, 120, 2, 140,
- 1, 35, 144, 236, 65, 7, 100, 111, 176, 129,
- 7, 35, 232, 176, 114, 181, 41, 183, 205, 208,
- 218, 112, 199, 45, 247, 220, 107, 187, 109, 247,
- 221, 78, 92, 107, 68, 16, 68, 184, 255, 172,
- 194, 223, 66, 4, 254, 242, 224, 50, 199, 76,
- 51, 205, 60, 36, 206, 195, 14, 59, 16, 225,
- 248, 15, 144, 255, 224, 195, 228, 148, 55, 229,
- 212, 18, 84, 217, 128, 50, 222, 17, 77, 116,
- 4, 16, 77, 120, 181, 143, 62, 22, 92, 128,
- 142, 37, 36, 153, 164, 139, 38, 197, 44, 114,
- 70, 94, 89, 40, 66, 71, 25, 117, 100, 113,
- 198, 28, 89, 96, 17, 133, 43, 246, 208, 211,
- 83, 54, 165, 93, 131, 152, 58, 230, 156, 51,
- 139, 44, 223, 8, 47, 252, 52, 204, 192, 90,
- 139, 40, 210, 124, 51, 204, 60, 243, 224, 194,
- 206, 245, 6, 30, 184, 26, 77, 206, 184, 246,
- 90, 15, 67, 132, 47, 254, 17, 53, 104, 110,
- 91, 67, 91, 161, 240, 149, 33, 168, 163, 194,
- 250, 158, 167, 48, 146, 8, 236, 89, 32, 98,
- 134, 34, 152, 144, 66, 74, 38, 243, 203, 17,
- 134, 28, 0, 12, 131, 23, 252, 39, 135, 58,
- 188, 130, 27, 127, 105, 70, 43, 32, 209, 137,
- 95, 116, 131, 0, 201, 136, 6, 40, 218, 192,
- 5, 41, 72, 193, 13, 118, 192, 131, 6, 241,
- 240, 42, 106, 144, 3, 28, 236, 216, 207, 125,
- 244, 227, 159, 208, 20, 102, 24, 195, 144, 71,
- 1, 218, 177, 153, 234, 29, 96, 30, 248, 192,
- 135, 54, 26, 224, 146, 1, 124, 128, 124, 53,
- 200, 161, 249, 6, 226, 2, 30, 124, 69, 21,
- 24, 218, 5, 41, 255, 24, 209, 139, 33, 50,
- 130, 20, 110, 89, 4, 255, 200, 240, 63, 57,
- 4, 226, 137, 39, 186, 206, 24, 200, 224, 5,
- 69, 245, 161, 15, 46, 186, 226, 23, 90, 241,
- 141, 111, 28, 163, 27, 225, 96, 134, 40, 142,
- 100, 11, 74, 72, 34, 18, 89, 194, 195, 36,
- 172, 193, 70, 125, 25, 35, 26, 24, 8, 71,
- 45, 66, 65, 9, 46, 68, 2, 24, 253, 241,
- 76, 104, 218, 193, 142, 121, 92, 99, 30, 163,
- 185, 94, 59, 214, 65, 143, 118, 76, 47, 134,
- 106, 106, 83, 130, 86, 179, 13, 13, 36, 33,
- 9, 55, 152, 80, 15, 119, 83, 138, 214, 93,
- 226, 137, 80, 60, 17, 138, 46, 33, 34, 66,
- 237, 66, 19, 39, 241, 3, 52, 44, 1, 141,
- 43, 94, 145, 81, 95, 248, 2, 235, 52, 129,
- 134, 84, 184, 226, 27, 177, 0, 85, 50, 194,
- 17, 142, 128, 197, 34, 26, 210, 8, 71, 0,
- 188, 1, 143, 105, 80, 98, 18, 198, 8, 198,
- 36, 134, 57, 76, 246, 144, 131, 18, 179, 168,
- 132, 39, 30, 181, 138, 67, 112, 130, 19, 135,
- 88, 5, 36, 32, 161, 172, 106, 118, 233, 83,
- 174, 104, 134, 52, 234, 145, 15, 68, 186, 169,
- 30, 25, 208, 129, 56, 233, 164, 178, 244, 121,
- 165, 4, 64, 244, 205, 160, 254, 4, 63, 253,
- 97, 2, 19, 115, 8, 195, 30, 248, 176, 135,
- 55, 4, 34, 13, 105, 160, 103, 28, 246, 25,
- 255, 7, 39, 106, 226, 18, 157, 72, 198, 56,
- 200, 65, 14, 90, 0, 195, 40, 177, 144, 5,
- 40, 94, 129, 75, 105, 12, 12, 107, 211, 80,
- 135, 58, 86, 85, 14, 87, 169, 67, 28, 1,
- 80, 198, 29, 194, 195, 5, 46, 84, 194, 21,
- 179, 43, 131, 175, 54, 65, 172, 52, 120, 236,
- 99, 40, 45, 86, 43, 50, 16, 130, 17, 140,
- 64, 4, 106, 187, 138, 66, 86, 118, 132, 22,
- 168, 224, 35, 33, 81, 129, 16, 124, 241, 135,
- 61, 176, 235, 167, 244, 244, 169, 207, 190, 80,
- 10, 64, 148, 68, 23, 207, 40, 198, 47, 46,
- 129, 138, 222, 116, 130, 89, 205, 114, 5, 1,
- 90, 1, 48, 89, 60, 205, 22, 182, 112, 85,
- 86, 153, 81, 11, 102, 172, 138, 18, 176, 40,
- 196, 21, 192, 0, 134, 43, 60, 225, 172, 80,
- 184, 2, 22, 202, 80, 5, 72, 36, 195, 0,
- 30, 48, 155, 92, 59, 48, 2, 25, 172, 140,
- 115, 183, 153, 91, 13, 134, 208, 131, 32, 248,
- 32, 114, 147, 11, 130, 96, 123, 64, 216, 169,
- 136, 111, 54, 57, 172, 1, 18, 110, 112, 131,
- 36, 40, 1, 7, 113, 18, 231, 12, 102, 64,
- 2, 18, 208, 64, 4, 34, 120, 105, 180, 116,
- 64, 173, 185, 225, 245, 179, 90, 89, 153, 17,
- 150, 208, 215, 191, 18, 161, 5, 60, 56, 156,
- 106, 19, 215, 56, 34, 72, 206, 41, 79, 57,
- 66, 85, 234, 6, 218, 218, 255, 90, 107, 34,
- 70, 104, 153, 16, 154, 208, 17, 156, 254, 77,
- 167, 129, 19, 2, 225, 48, 64, 92, 226, 118,
- 131, 2, 200, 77, 110, 55, 126, 225, 192, 228,
- 38, 183, 5, 174, 13, 172, 96, 167, 75, 216,
- 234, 86, 23, 115, 70, 48, 223, 249, 108, 155,
- 215, 32, 20, 225, 2, 16, 48, 129, 182, 50,
- 130, 130, 21, 144, 114, 44, 154, 208, 196, 24,
- 22, 65, 134, 58, 212, 46, 17, 115, 16, 23,
- 21, 90, 113, 0, 120, 208, 100, 27, 218, 40,
- 208, 60, 190, 33, 11, 101, 208, 18, 24, 217,
- 80, 13, 100, 194, 1, 139, 101, 0, 163, 18,
- 178, 144, 134, 106, 190, 225, 18, 154, 192, 196,
- 53, 74, 249, 192, 83, 196, 71, 225, 217, 110,
- 215, 110, 184, 97, 130, 4, 190, 2, 0, 11,
- 160, 99, 36, 170, 43, 134, 35, 22, 193, 167,
- 224, 20, 199, 12, 102, 200, 66, 22, 240, 50,
- 23, 15, 209, 1, 10, 187, 235, 29, 77, 128,
- 231, 199, 121, 28, 163, 18, 141, 153, 133, 56,
- 178, 87, 15, 120, 152, 195, 26, 231, 48, 71,
- 45, 100, 17, 141, 107, 176, 3, 133, 9, 64,
- 161, 146, 135, 129, 26, 234, 169, 198, 37, 221,
- 123, 205, 7, 168, 34, 27, 217, 150, 143, 109,
- 111, 115, 65, 11, 82, 240, 21, 9, 136, 37,
- 37, 187, 144, 159, 123, 109, 151, 8, 69, 40,
- 194, 20, 192, 33, 69, 34, 204, 32, 23, 49,
- 200, 161, 255, 159, 97, 136, 51, 34, 32, 225,
- 10, 120, 24, 0, 30, 245, 104, 70, 53, 64,
- 245, 9, 2, 96, 35, 26, 234, 96, 15, 51,
- 40, 1, 142, 79, 124, 98, 25, 204, 56, 135,
- 49, 144, 36, 142, 8, 126, 102, 63, 252, 233,
- 207, 10, 219, 113, 0, 20, 150, 38, 201, 46,
- 44, 205, 97, 182, 231, 140, 215, 144, 111, 54,
- 181, 185, 13, 18, 138, 240, 21, 65, 180, 207,
- 55, 109, 73, 53, 35, 226, 146, 226, 44, 176,
- 217, 12, 137, 216, 223, 115, 162, 211, 196, 56,
- 199, 121, 12, 114, 64, 195, 91, 233, 113, 141,
- 106, 124, 162, 27, 171, 104, 69, 44, 36, 113,
- 30, 244, 108, 129, 11, 110, 232, 40, 23, 204,
- 8, 11, 101, 136, 2, 171, 228, 128, 71, 59,
- 234, 115, 166, 252, 236, 167, 132, 74, 38, 36,
- 50, 10, 32, 15, 234, 193, 16, 31, 13, 104,
- 64, 62, 86, 211, 32, 16, 40, 22, 9, 138,
- 101, 155, 11, 110, 160, 27, 175, 136, 37, 79,
- 142, 56, 133, 254, 136, 216, 22, 37, 134, 11,
- 17, 115, 113, 226, 19, 81, 36, 135, 249, 133,
- 33, 149, 169, 244, 66, 42, 199, 16, 6, 78,
- 28, 3, 30, 195, 24, 128, 43, 68, 49, 9,
- 97, 8, 163, 22, 228, 73, 246, 29, 236, 144,
- 165, 96, 0, 185, 22, 230, 48, 71, 124, 200,
- 1, 139, 54, 180, 33, 22, 200, 40, 147, 153,
- 206, 100, 38, 253, 216, 199, 29, 220, 255, 14,
- 144, 126, 228, 97, 24, 111, 182, 137, 145, 21,
- 96, 44, 99, 175, 210, 21, 175, 64, 163, 20,
- 154, 144, 31, 38, 200, 240, 78, 83, 152, 130,
- 45, 74, 236, 69, 32, 80, 20, 8, 21, 45,
- 34, 16, 99, 72, 37, 28, 146, 110, 69, 63,
- 56, 221, 18, 80, 167, 17, 52, 88, 241, 12,
- 175, 85, 98, 162, 161, 144, 69, 179, 199, 40,
- 12, 99, 212, 98, 22, 212, 176, 6, 63, 4,
- 64, 0, 165, 72, 34, 235, 176, 176, 195, 36,
- 66, 177, 140, 145, 187, 157, 29, 94, 140, 9,
- 54, 182, 49, 140, 2, 204, 67, 145, 120, 31,
- 119, 61, 42, 128, 3, 37, 40, 33, 9, 19,
- 169, 57, 0, 160, 145, 161, 76, 4, 34, 57,
- 115, 200, 228, 37, 73, 172, 34, 118, 166, 87,
- 19, 95, 144, 20, 41, 161, 126, 35, 28, 153,
- 242, 15, 43, 49, 244, 43, 248, 248, 13, 3,
- 188, 99, 26, 233, 16, 199, 52, 100, 65, 139,
- 139, 18, 204, 26, 196, 8, 134, 48, 55, 136,
- 135, 86, 205, 34, 20, 119, 184, 3, 40, 216,
- 128, 6, 78, 160, 65, 11, 107, 88, 22, 36,
- 62, 241, 10, 109, 74, 35, 26, 3, 104, 73,
- 55, 19, 153, 247, 25, 234, 32, 78, 116, 90,
- 119, 187, 1, 128, 167, 98, 112, 178, 147, 187,
- 208, 228, 37, 244, 228, 201, 98, 232, 226, 36,
- 49, 2, 196, 23, 152, 190, 168, 62, 252, 161,
- 19, 214, 239, 69, 255, 29, 90, 33, 141, 100,
- 36, 131, 0, 246, 74, 198, 43, 112, 98, 175,
- 88, 132, 94, 83, 179, 146, 69, 37, 242, 144,
- 7, 53, 178, 39, 73, 234, 144, 133, 40, 106,
- 33, 9, 79, 164, 226, 16, 107, 112, 8, 209,
- 36, 128, 2, 152, 82, 90, 48, 44, 90, 80,
- 5, 202, 178, 126, 216, 16, 38, 217, 0, 78,
- 210, 50, 3, 49, 149, 55, 46, 48, 106, 165,
- 6, 13, 190, 65, 40, 126, 34, 40, 131, 66,
- 98, 164, 48, 116, 213, 225, 5, 111, 80, 79,
- 93, 64, 6, 108, 176, 10, 97, 240, 6, 113,
- 32, 6, 152, 144, 34, 189, 64, 0, 239, 87,
- 48, 178, 224, 9, 174, 224, 9, 92, 146, 12,
- 224, 144, 14, 211, 224, 13, 58, 8, 127, 171,
- 242, 108, 18, 37, 81, 227, 176, 52, 226, 225,
- 6, 146, 208, 10, 104, 16, 44, 248, 164, 6,
- 29, 131, 79, 6, 248, 132, 4, 192, 1, 152,
- 37, 2, 39, 35, 83, 229, 52, 17, 91, 86,
- 2, 226, 165, 10, 24, 168, 39, 245, 198, 8,
- 247, 22, 7, 244, 84, 46, 132, 128, 46, 236,
- 226, 46, 251, 4, 47, 48, 242, 11, 4, 128,
- 42, 3, 197, 12, 93, 39, 12, 202, 16, 11,
- 160, 0, 48, 164, 50, 13, 4, 101, 37, 138,
- 193, 12, 229, 80, 14, 234, 160, 48, 226, 32,
- 10, 26, 20, 30, 110, 64, 9, 192, 160, 49,
- 136, 184, 49, 183, 247, 132, 32, 35, 2, 33,
- 255, 240, 136, 35, 80, 133, 88, 150, 87, 158,
- 3, 58, 28, 225, 17, 44, 192, 83, 95, 224,
- 5, 106, 96, 134, 63, 197, 46, 123, 48, 79,
- 124, 240, 6, 128, 80, 10, 108, 129, 18, 157,
- 208, 37, 16, 20, 13, 203, 240, 14, 192, 144,
- 19, 67, 17, 65, 225, 0, 14, 224, 48, 122,
- 176, 208, 48, 88, 213, 42, 92, 85, 11, 182,
- 64, 127, 238, 81, 8, 103, 165, 86, 88, 48,
- 140, 136, 136, 44, 198, 210, 10, 242, 48, 54,
- 100, 211, 1, 30, 32, 2, 118, 101, 133, 157,
- 179, 50, 61, 0, 4, 128, 35, 56, 47, 19,
- 1, 197, 32, 79, 235, 18, 138, 62, 101, 5,
- 86, 192, 7, 47, 226, 7, 55, 226, 11, 78,
- 119, 9, 175, 96, 20, 157, 178, 64, 244, 2,
- 48, 192, 0, 11, 148, 32, 53, 161, 64, 11,
- 207, 214, 42, 170, 34, 14, 76, 2, 12, 133,
- 0, 5, 83, 176, 143, 251, 8, 6, 84, 16,
- 5, 209, 96, 0, 29, 32, 87, 4, 25, 2,
- 36, 64, 91, 181, 21, 55, 53, 208, 3, 62,
- 192, 3, 51, 3, 4, 172, 213, 56, 144, 67,
- 57, 126, 229, 3, 15, 64, 1, 76, 80, 4,
- 66, 128, 1, 4, 112, 42, 177, 64, 42, 145,
- 32, 11, 253, 162, 12, 153, 34, 14, 6, 96,
- 0, 25, 144, 1, 28, 176, 146, 58, 96, 89,
- 151, 149, 89, 35, 240, 136, 143, 72, 50, 45,
- 69, 2, 207, 136, 144, 220, 255, 229, 16, 116,
- 179, 50, 232, 86, 101, 20, 22, 62, 178, 133,
- 88, 138, 197, 88, 143, 244, 88, 115, 130, 3,
- 49, 208, 89, 59, 57, 137, 57, 217, 148, 78,
- 249, 148, 80, 217, 54, 75, 57, 149, 208, 24,
- 149, 86, 73, 129, 19, 241, 2, 71, 208, 3,
- 63, 208, 2, 46, 99, 141, 48, 83, 56, 171,
- 165, 56, 140, 211, 90, 174, 21, 57, 63, 48,
- 88, 67, 64, 62, 119, 117, 149, 110, 115, 21,
- 72, 208, 3, 45, 192, 4, 55, 5, 18, 191,
- 21, 92, 194, 69, 56, 98, 121, 56, 100, 201,
- 56, 142, 115, 150, 19, 89, 57, 211, 53, 152,
- 176, 181, 4, 228, 163, 93, 110, 25, 90, 72,
- 16, 4, 212, 168, 17, 188, 133, 137, 57, 5,
- 92, 36, 49, 22, 172, 240, 0, 72, 177, 20,
- 72, 129, 20, 174, 65, 0, 211, 180, 10, 159,
- 144, 153, 151, 169, 20, 4, 64, 0, 199, 117,
- 145, 129, 101, 93, 215, 37, 21, 228, 35, 73,
- 110, 57, 17, 65, 192, 4, 43, 160, 45, 23,
- 112, 2, 142, 233, 17, 208, 48, 18, 48, 130,
- 10, 186, 112, 9, 100, 112, 73, 188, 153, 5,
- 104, 224, 10, 247, 0, 24, 206, 208, 18, 135,
- 129, 15, 199, 64, 42, 18, 20, 11, 10, 214,
- 69, 245, 80, 15, 176, 244, 145, 71, 35, 13,
- 62, 177, 13, 3, 0, 19, 161, 249, 0, 151,
- 35, 21, 83, 97, 97, 23, 134, 87, 19, 209,
- 3, 76, 255, 112, 1, 0, 16, 94, 22, 128,
- 17, 232, 144, 11, 35, 129, 94, 129, 112, 6,
- 103, 113, 6, 89, 64, 59, 41, 70, 6, 89,
- 64, 5, 79, 224, 10, 246, 49, 99, 213, 99,
- 32, 223, 64, 11, 126, 168, 12, 0, 38, 67,
- 252, 57, 13, 171, 50, 14, 148, 176, 12, 217,
- 224, 71, 217, 35, 60, 136, 225, 18, 63, 1,
- 97, 15, 32, 97, 63, 25, 62, 22, 198, 57,
- 91, 177, 124, 0, 80, 2, 166, 179, 158, 165,
- 176, 58, 130, 18, 63, 172, 166, 98, 179, 83,
- 7, 116, 33, 46, 79, 16, 5, 175, 160, 0,
- 240, 240, 59, 193, 131, 24, 228, 80, 60, 162,
- 128, 60, 6, 162, 13, 215, 160, 14, 194, 144,
- 113, 194, 64, 9, 209, 160, 13, 236, 96, 100,
- 76, 134, 26, 168, 97, 32, 50, 212, 96, 81,
- 246, 1, 83, 118, 4, 72, 74, 161, 53, 192,
- 148, 58, 233, 2, 65, 32, 4, 28, 182, 15,
- 66, 211, 27, 68, 135, 9, 62, 7, 28, 38,
- 22, 23, 42, 150, 5, 25, 67, 59, 30, 130,
- 6, 108, 16, 13, 132, 244, 156, 131, 81, 24,
- 6, 146, 13, 227, 208, 85, 230, 160, 14, 217,
- 243, 13, 234, 192, 70, 141, 1, 61, 210, 192,
- 14, 134, 20, 26, 157, 97, 72, 40, 36, 15,
- 167, 241, 66, 48, 244, 100, 52, 225, 26, 31,
- 0, 2, 179, 1, 106, 76, 138, 16, 88, 168,
- 62, 162, 243, 97, 71, 21, 102, 102, 255, 134,
- 8, 103, 80, 102, 141, 192, 8, 108, 33, 63,
- 178, 99, 23, 136, 39, 7, 115, 96, 6, 101,
- 176, 9, 159, 192, 14, 127, 193, 26, 63, 241,
- 19, 197, 121, 12, 228, 128, 48, 204, 160, 99,
- 205, 208, 12, 211, 16, 118, 196, 112, 14, 229,
- 32, 11, 174, 32, 13, 121, 164, 31, 5, 144,
- 71, 158, 65, 32, 184, 112, 11, 7, 192, 167,
- 243, 192, 167, 218, 195, 26, 216, 16, 168, 131,
- 90, 161, 161, 181, 101, 165, 134, 58, 29, 234,
- 133, 98, 246, 94, 177, 163, 8, 140, 112, 68,
- 204, 145, 5, 117, 33, 6, 112, 246, 63, 113,
- 102, 41, 239, 112, 103, 199, 144, 20, 144, 192,
- 9, 157, 208, 10, 213, 16, 13, 88, 130, 108,
- 110, 176, 5, 82, 34, 9, 121, 224, 112, 73,
- 50, 14, 209, 112, 12, 252, 1, 105, 145, 38,
- 105, 120, 154, 167, 120, 154, 0, 168, 17, 67,
- 228, 214, 26, 55, 148, 88, 233, 246, 157, 121,
- 211, 3, 130, 103, 8, 35, 225, 62, 131, 162,
- 106, 141, 128, 98, 42, 102, 63, 137, 144, 63,
- 96, 24, 159, 4, 100, 107, 182, 54, 7, 193,
- 121, 146, 237, 224, 107, 221, 192, 10, 191, 64,
- 103, 19, 20, 37, 91, 96, 65, 228, 42, 5,
- 244, 231, 48, 150, 49, 14, 157, 81, 31, 1,
- 178, 14, 240, 106, 66, 184, 192, 100, 183, 144,
- 31, 161, 113, 26, 212, 163, 61, 13, 192, 105,
- 251, 154, 88, 59, 255, 84, 78, 68, 240, 21,
- 16, 240, 110, 168, 54, 8, 195, 49, 8, 98,
- 102, 6, 201, 129, 8, 89, 144, 8, 11, 235,
- 28, 208, 33, 29, 183, 54, 29, 94, 64, 112,
- 157, 208, 12, 127, 113, 12, 10, 244, 10, 183,
- 24, 123, 201, 198, 5, 91, 144, 181, 89, 203,
- 5, 118, 48, 11, 134, 8, 10, 149, 176, 113,
- 210, 134, 31, 249, 97, 109, 36, 100, 171, 0,
- 178, 14, 119, 106, 24, 7, 2, 110, 226, 166,
- 119, 229, 22, 33, 232, 182, 67, 88, 120, 129,
- 201, 26, 111, 189, 32, 28, 109, 65, 10, 166,
- 192, 102, 114, 129, 120, 251, 22, 8, 100, 160,
- 8, 209, 225, 5, 93, 112, 184, 134, 251, 7,
- 4, 103, 112, 6, 224, 14, 199, 224, 10, 202,
- 48, 76, 120, 64, 136, 87, 219, 81, 89, 50,
- 9, 65, 38, 12, 212, 224, 85, 161, 32, 14,
- 109, 0, 12, 131, 52, 114, 35, 68, 66, 212,
- 134, 178, 237, 160, 114, 160, 113, 72, 196, 183,
- 32, 46, 81, 1, 139, 21, 33, 55, 112, 21,
- 65, 208, 101, 55, 167, 9, 142, 144, 183, 241,
- 195, 8, 169, 38, 34, 240, 21, 6, 128, 187,
- 28, 129, 240, 63, 207, 33, 112, 139, 2, 112,
- 93, 224, 5, 144, 192, 14, 240, 96, 15, 15,
- 144, 12, 173, 66, 13, 231, 0, 113, 87, 107,
- 43, 233, 138, 122, 15, 103, 12, 202, 144, 10,
- 148, 192, 127, 230, 234, 9, 223, 112, 11, 237,
- 255, 48, 15, 117, 186, 14, 240, 64, 72, 244,
- 176, 109, 5, 160, 31, 229, 11, 26, 187, 234,
- 114, 138, 180, 26, 174, 11, 73, 145, 52, 17,
- 164, 230, 110, 56, 151, 187, 207, 122, 165, 245,
- 134, 22, 193, 171, 111, 33, 178, 8, 99, 240,
- 7, 2, 124, 9, 93, 208, 125, 112, 32, 142,
- 52, 226, 11, 197, 128, 177, 189, 0, 14, 76,
- 226, 42, 180, 112, 70, 145, 112, 7, 195, 164,
- 104, 194, 112, 14, 98, 119, 14, 14, 240, 3,
- 20, 240, 142, 178, 64, 9, 120, 96, 7, 178,
- 48, 10, 110, 103, 109, 143, 54, 10, 222, 112,
- 61, 246, 209, 14, 215, 144, 119, 47, 183, 119,
- 127, 247, 72, 19, 113, 2, 95, 65, 120, 97,
- 150, 8, 100, 144, 195, 152, 176, 8, 67, 52,
- 8, 74, 100, 10, 39, 130, 73, 68, 215, 34,
- 138, 66, 196, 226, 8, 117, 78, 55, 41, 165,
- 88, 10, 204, 226, 9, 177, 16, 0, 228, 48,
- 43, 3, 85, 14, 139, 65, 13, 194, 224, 181,
- 181, 64, 12, 252, 176, 0, 169, 128, 0, 174,
- 64, 71, 162, 87, 9, 33, 12, 11, 201, 227,
- 69, 122, 6, 154, 153, 137, 13, 199, 160, 13,
- 171, 235, 194, 9, 178, 119, 114, 210, 119, 51,
- 124, 33, 25, 130, 9, 70, 155, 28, 32, 34,
- 34, 79, 148, 9, 167, 32, 125, 42, 146, 94,
- 45, 34, 41, 71, 76, 121, 78, 167, 69, 142,
- 144, 177, 169, 64, 126, 215, 255, 224, 121, 125,
- 88, 170, 125, 216, 60, 204, 160, 12, 148, 128,
- 122, 193, 244, 112, 183, 210, 181, 170, 18, 10,
- 118, 192, 5, 133, 112, 8, 93, 18, 65, 210,
- 16, 48, 223, 192, 14, 200, 176, 14, 163, 48,
- 10, 225, 27, 67, 110, 252, 77, 113, 18, 39,
- 244, 251, 21, 150, 80, 120, 152, 148, 120, 33,
- 50, 116, 151, 212, 199, 41, 242, 39, 135, 210,
- 84, 148, 55, 74, 78, 7, 8, 112, 224, 34,
- 49, 162, 11, 187, 192, 9, 188, 208, 10, 205,
- 240, 13, 55, 161, 75, 233, 64, 75, 181, 212,
- 95, 59, 56, 13, 12, 167, 122, 171, 167, 70,
- 147, 192, 139, 227, 224, 6, 119, 16, 9, 173,
- 64, 128, 0, 184, 10, 202, 210, 76, 186, 215,
- 37, 189, 151, 13, 223, 192, 198, 238, 203, 38,
- 245, 160, 1, 226, 36, 39, 174, 217, 101, 222,
- 178, 11, 153, 20, 125, 210, 71, 125, 125, 114,
- 10, 214, 23, 74, 133, 28, 35, 166, 100, 74,
- 95, 240, 11, 154, 96, 10, 169, 208, 123, 191,
- 199, 37, 0, 99, 126, 166, 130, 75, 225, 0,
- 15, 11, 227, 108, 181, 160, 65, 196, 52, 9,
- 248, 39, 14, 182, 48, 11, 192, 208, 10, 185,
- 167, 44, 222, 236, 205, 196, 226, 43, 196, 178,
- 44, 93, 146, 77, 45, 129, 206, 50, 212, 0,
- 28, 48, 89, 156, 117, 21, 45, 176, 62, 241,
- 76, 98, 139, 64, 40, 155, 196, 78, 236, 84,
- 12, 187, 255, 188, 40, 193, 28, 204, 169, 212,
- 5, 207, 164, 11, 57, 210, 161, 173, 80, 75,
- 191, 39, 20, 173, 240, 9, 58, 225, 80, 203,
- 0, 14, 71, 29, 122, 6, 106, 11, 181, 64,
- 127, 176, 194, 135, 228, 48, 13, 110, 128, 7,
- 148, 0, 10, 221, 124, 8, 104, 176, 9, 206,
- 100, 123, 9, 216, 49, 8, 248, 49, 195, 178,
- 6, 187, 23, 210, 209, 80, 15, 28, 80, 89,
- 51, 112, 147, 19, 145, 179, 94, 1, 1, 208,
- 32, 47, 158, 212, 39, 187, 192, 129, 169, 102,
- 203, 4, 220, 5, 111, 144, 215, 112, 240, 125,
- 144, 80, 7, 111, 240, 5, 127, 224, 27, 189,
- 112, 104, 211, 32, 14, 228, 32, 10, 224, 16,
- 13, 245, 226, 10, 205, 178, 12, 71, 93, 75,
- 224, 32, 14, 5, 19, 10, 161, 224, 122, 125,
- 40, 43, 211, 80, 9, 226, 177, 205, 173, 64,
- 8, 75, 168, 5, 139, 232, 132, 140, 88, 44,
- 29, 179, 44, 3, 128, 89, 208, 114, 147, 88,
- 9, 176, 63, 20, 207, 114, 45, 211, 125, 44,
- 111, 134, 231, 63, 94, 16, 138, 111, 208, 5,
- 104, 208, 215, 111, 224, 5, 98, 24, 7, 153,
- 64, 211, 191, 144, 12, 146, 173, 48, 164, 226,
- 9, 70, 241, 10, 175, 16, 11, 203, 16, 14,
- 58, 152, 14, 224, 160, 12, 227, 80, 14, 94,
- 235, 159, 229, 64, 80, 179, 2, 123, 20, 183,
- 5, 71, 88, 7, 192, 114, 128, 7, 255, 104,
- 82, 163, 253, 49, 43, 229, 82, 34, 96, 147,
- 208, 120, 45, 198, 170, 133, 233, 228, 133, 241,
- 182, 183, 153, 224, 33, 98, 56, 138, 111, 80,
- 7, 169, 128, 5, 235, 194, 7, 189, 29, 6,
- 171, 115, 10, 166, 208, 10, 80, 172, 14, 241,
- 161, 52, 89, 229, 9, 173, 32, 139, 225, 16,
- 81, 82, 44, 217, 70, 194, 12, 127, 56, 13,
- 1, 48, 127, 147, 171, 108, 160, 128, 136, 104,
- 32, 82, 30, 125, 82, 225, 253, 10, 28, 0,
- 137, 105, 179, 57, 18, 161, 210, 40, 32, 94,
- 179, 121, 115, 122, 178, 8, 239, 212, 33, 98,
- 32, 223, 244, 125, 5, 159, 168, 7, 104, 232,
- 5, 49, 162, 9, 135, 224, 86, 233, 16, 122,
- 112, 24, 12, 2, 112, 96, 176, 192, 156, 31,
- 25, 122, 214, 109, 36, 213, 253, 135, 12, 195,
- 42, 15, 77, 127, 81, 3, 10, 254, 104, 49,
- 238, 149, 49, 30, 205, 136, 159, 208, 0, 35,
- 35, 147, 146, 232, 175, 60, 36, 187, 69, 64,
- 94, 29, 113, 115, 114, 96, 23, 134, 75, 7,
- 144, 192, 226, 45, 174, 7, 161, 248, 46, 127,
- 64, 41, 157, 192, 9, 191, 176, 10, 177, 26,
- 0, 197, 195, 12, 227, 0, 11, 160, 96, 224,
- 71, 13, 221, 146, 173, 12, 178, 0, 14, 31,
- 204, 212, 236, 209, 85, 189, 120, 7, 253, 55,
- 140, 254, 152, 136, 34, 133, 44, 24, 78, 44,
- 175, 0, 15, 100, 255, 67, 50, 29, 238, 225,
- 51, 117, 45, 62, 80, 4, 143, 105, 151, 190,
- 240, 11, 101, 16, 230, 103, 40, 84, 127, 221,
- 161, 165, 128, 33, 191, 112, 230, 13, 228, 64,
- 29, 9, 139, 191, 23, 65, 31, 9, 14, 149,
- 32, 143, 21, 149, 139, 187, 72, 53, 179, 160,
- 12, 254, 247, 4, 80, 0, 235, 87, 48, 235,
- 107, 197, 86, 105, 96, 232, 5, 16, 87, 27,
- 176, 140, 6, 217, 150, 16, 177, 54, 211, 168,
- 2, 57, 21, 92, 69, 128, 10, 181, 253, 137,
- 99, 174, 46, 123, 208, 5, 146, 66, 18, 128,
- 112, 18, 190, 0, 80, 233, 197, 10, 172, 208,
- 13, 157, 160, 9, 159, 48, 77, 201, 45, 146,
- 241, 40, 10, 179, 128, 85, 91, 165, 42, 239,
- 216, 127, 81, 208, 143, 83, 64, 86, 96, 0,
- 232, 173, 80, 163, 4, 105, 54, 29, 96, 50,
- 56, 153, 50, 112, 35, 151, 26, 153, 151, 69,
- 32, 51, 17, 16, 1, 151, 80, 79, 35, 168,
- 7, 222, 184, 51, 111, 32, 35, 183, 105, 35,
- 154, 224, 10, 237, 40, 11, 178, 0, 12, 7,
- 207, 36, 90, 23, 182, 110, 64, 217, 242, 40,
- 10, 167, 74, 11, 67, 104, 231, 90, 3, 5,
- 177, 62, 5, 92, 19, 14, 34, 179, 140, 4,
- 249, 238, 7, 25, 239, 22, 186, 54, 55, 192,
- 149, 64, 176, 151, 17, 121, 90, 20, 208, 13,
- 155, 0, 6, 59, 51, 5, 124, 128, 192, 190,
- 139, 208, 10, 70, 35, 11, 145, 16, 9, 146,
- 144, 243, 103, 247, 142, 180, 64, 30, 76, 19,
- 143, 180, 160, 12, 142, 157, 0, 9, 208, 0,
- 12, 48, 1, 49, 41, 147, 98, 147, 232, 6,
- 169, 148, 140, 238, 148, 114, 131, 4, 67, 16,
- 4, 63, 176, 3, 139, 35, 145, 129, 73, 93,
- 133, 5, 21, 21, 38, 27, 57, 36, 183, 141,
- 245, 88, 145, 165, 3, 147, 229, 146, 152, 229,
- 82, 73, 223, 82, 52, 48, 45, 114, 147, 152,
- 6, 177, 148, 53, 112, 4, 164, 213, 87, 131,
- 181, 245, 152, 115, 88, 66, 9, 187, 142, 165,
- 4, 173, 44, 89, 147, 37, 129, 50, 224, 244,
- 109, 239, 246, 191, 78, 149, 134, 127, 248, 34,
- 79, 248, 35, 143, 248, 134, 239, 246, 1, 1,
- 0, 59 };
--- php-5.0.0/main/php_logos.c.easter 2004-01-08 02:17:54.000000000 -0600
+++ php-5.0.0/main/php_logos.c 2004-08-09 11:33:35.123141640 -0500
@@ -56,7 +56,6 @@
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;
--- php-5.0.0/ext/standard/basic_functions.c.easter 2004-08-09 11:54:25.021128264 -0500
+++ php-5.0.0/ext/standard/basic_functions.c 2004-08-09 11:54:30.555286944 -0500
@@ -209,7 +209,6 @@
PHP_FE(phpcredits, NULL)
PHP_FE(php_logo_guid, NULL)
PHP_FE(php_real_logo_guid, NULL)
- PHP_FE(php_egg_logo_guid, NULL)
PHP_FE(zend_logo_guid, NULL)
PHP_FE(php_sapi_name, NULL)
PHP_FE(php_uname, NULL)

25
php-5.0.2-phpize64.patch Normal file
View File

@ -0,0 +1,25 @@
Install phpize into libdir.
--- php-5.0.2/scripts/Makefile.frag.phpize64
+++ php-5.0.2/scripts/Makefile.frag
@@ -4,7 +4,7 @@
#
phpincludedir = $(includedir)/php
-phpbuilddir = $(prefix)/lib/php/build
+phpbuilddir = $(libdir)/php/build
BUILD_FILES = \
scripts/phpize.m4 \
--- php-5.0.2/scripts/phpize.in.phpize64
+++ php-5.0.2/scripts/phpize.in
@@ -2,7 +2,7 @@
# Variable declaration
prefix='@prefix@'
-phpdir="$prefix/lib/php/build"
+phpdir="@libdir@/php/build"
includedir="$prefix/include/php"
builddir="`pwd`"

View File

@ -3,13 +3,13 @@
# easy for developers to write dynamically generated webpages. # easy for developers to write dynamically generated webpages.
# #
LoadModule php4_module modules/libphp4.so LoadModule php5_module modules/libphp5.so
# #
# Cause the PHP interpreter to handle files with a .php extension. # Cause the PHP interpreter to handle files with a .php extension.
# #
AddType application/x-httpd-php .php AddHandler php5-script .php
# AddType application/x-httpd-php-source .phps AddType text/html .php
# #
# Add index.php to the list of files that will be served as directory # Add index.php to the list of files that will be served as directory

433
php.spec
View File

@ -2,11 +2,15 @@
%define with_oci8 %{?_with_oci8:1}%{!?_with_oci8:0} %define with_oci8 %{?_with_oci8:1}%{!?_with_oci8:0}
%define with_mssql %{?_with_mssql:1}%{!?_with_mssql:0} %define with_mssql %{?_with_mssql:1}%{!?_with_mssql:0}
%define with_mhash %{?_with_mhash:1}%{!?_with_mhash:0} %define with_mhash %{?_with_mhash:1}%{!?_with_mhash:0}
%define with_ibase %{?_with_ibase:1}%{!?_with_ibase:0}
### CHANGES STILL TO MERGE FOR 5.0:
# select/FD_SETSIZE workarounds before 5.0.3 release with Wez's fixes
Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
Name: php Name: php
Version: 4.3.9 Version: 5.0.2
Release: 4 Release: 7
License: The PHP License License: The PHP License
Group: Development/Languages Group: Development/Languages
URL: http://www.php.net/ URL: http://www.php.net/
@ -15,28 +19,27 @@ Source0: http://www.php.net/distributions/php-%{version}.tar.gz
Source50: php.conf Source50: php.conf
Patch2: php-4.3.4-config.patch Patch2: php-5.0.1-config.patch
Patch3: php-4.2.2-lib64.patch Patch3: php-5.0.2-lib64.patch
Patch4: php-4.2.2-cxx.patch Patch4: php-4.2.2-cxx.patch
Patch5: php-4.3.3-install.patch Patch5: php-4.3.3-install.patch
Patch6: php-4.3.1-tests.patch Patch6: php-4.3.1-tests.patch
Patch7: php-4.3.2-libtool15.patch Patch7: php-4.3.2-libtool15.patch
Patch8: php-4.3.3-miscfix.patch Patch8: php-4.3.3-miscfix.patch
Patch9: php-4.3.6-umask.patch Patch9: php-4.3.6-umask.patch
Patch11: php-4.3.7-select.patch Patch10: php-5.0.2-gdnspace.patch
Patch13: php-4.3.8-round.patch Patch11: php-4.3.8-round.patch
Patch14: php-4.3.8-dval2lval.patch Patch12: php-5.0.2-phpvar.patch
Patch15: php-4.3.9-phpvar.patch Patch13: php-5.0.2-phpize64.patch
# Fixes for extension modules # Fixes for extension modules
Patch21: php-4.3.1-odbc.patch Patch21: php-4.3.1-odbc.patch
Patch22: php-4.3.2-db4.patch Patch22: php-4.3.2-db4.patch
Patch24: php-4.3.8-gdnspace.patch Patch23: php-5.0.2-mysql3.patch
Patch25: php-4.3.9-mysql3.patch
# Functional changes # Functional changes
Patch30: php-4.3.1-dlopen.patch Patch30: php-4.3.1-dlopen.patch
Patch31: php-4.3.4-easter.patch Patch31: php-5.0.0-easter.patch
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
@ -118,7 +121,7 @@ Group: Development/Languages
Requires: php = %{version}-%{release} Requires: php = %{version}-%{release}
Provides: php_database Provides: php_database
Obsoletes: mod_php3-mysql, stronghold-php-mysql Obsoletes: mod_php3-mysql, stronghold-php-mysql
BuildRequires: mysqlclient10-devel BuildRequires: mysql-devel
%description mysql %description mysql
The php-mysql package contains a dynamic shared object that will add The php-mysql package contains a dynamic shared object that will add
@ -161,6 +164,22 @@ HTML-embeddable scripting language. If you need ODBC support for PHP
applications, you will need to install this package and the php applications, you will need to install this package and the php
package. package.
%if %{with_ibase}
%package interbase
Group: Development/Languages
Prereq: php = %{version}-%{release}, perl, grep
Summary: A module for PHP applications that use Interbase databases.
Provides: php_database
%description interbase
The php-interbase package contains a dynamic shared object that will add
database support through Interbase to PHP. Interbase is a commercial
database system made by the Interbase Corporation. PHP is an
HTML-embeddable scripting language. If you need Interbase support for
PHP applications, you will need to install this package and the php
package.
%endif
%if %{with_oci8} %if %{with_oci8}
%package oci8 %package oci8
Group: Development/Languages Group: Development/Languages
@ -202,8 +221,7 @@ Web server that adds Mhash support to PHP.
Summary: A module for PHP applications that query SNMP-managed devices. Summary: A module for PHP applications that query SNMP-managed devices.
Group: Development/Languages Group: Development/Languages
Requires: php = %{version}-%{release} Requires: php = %{version}-%{release}
BuildRequires: net-snmp-devel, elfutils-devel BuildRequires: net-snmp-devel
# elfutils-devel requirement workaround for #103982
%description snmp %description snmp
The php-snmp package contains a dynamic shared object that will add The php-snmp package contains a dynamic shared object that will add
@ -211,14 +229,15 @@ support for querying SNMP devices to PHP. PHP is an HTML-embeddable
scripting language. If you need SNMP support for PHP applications, you scripting language. If you need SNMP support for PHP applications, you
will need to install this package and the php package. will need to install this package and the php package.
%package domxml %package dom
Summary: A module for PHP applications which manipulate XML data Summary: A module for PHP applications which manipulate DOM trees
Group: Development/Languages Group: Development/Languages
Requires: php = %{version}-%{release} Requires: php = %{version}-%{release}
Obsoletes: php-domxml
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 domxml %description dom
The php-domxml package contains a dynamic shared object that will add The php-dom package contains a dynamic shared object that will add
support for manipulating XML data as a DOM tree to PHP. support for manipulating XML data as a DOM tree to PHP.
%package xmlrpc %package xmlrpc
@ -254,7 +273,7 @@ support for using the ncurses terminal output interfaces.
Summary: A module for PHP applications for using the gd graphics library Summary: A module for PHP applications for using the gd graphics library
Group: Development/Languages Group: Development/Languages
Requires: php = %{version}-%{release} Requires: php = %{version}-%{release}
BuildRequires: freetype-devel BuildRequires: gd-devel, freetype-devel
%description gd %description gd
The php-mbstring package contains a dynamic shared object that will add The php-mbstring package contains a dynamic shared object that will add
@ -268,17 +287,16 @@ support for using the gd graphics library to PHP.
%patch5 -p1 -b .install %patch5 -p1 -b .install
%patch6 -p1 -b .tests %patch6 -p1 -b .tests
%patch7 -p1 -b .libtool15 %patch7 -p1 -b .libtool15
%patch8 -p1 -b .miscfix ##patch8 -p1 -b .miscfix
%patch9 -p1 -b .umask %patch9 -p1 -b .umask
%patch11 -p1 -b .select %patch10 -p1 -b .gdnspace
%patch13 -p1 -b .round %patch11 -p1 -b .round
%patch14 -p1 -b .dval2lval %patch12 -p1 -b .phpvar
%patch15 -p1 -b .phpvar %patch13 -p1 -b .phpize64
%patch21 -p1 -b .odbc %patch21 -p1 -b .odbc
%patch22 -p1 -b .db4 %patch22 -p1 -b .db4
%patch24 -p1 -b .gdnspace %patch23 -p1 -b .mysql3
%patch25 -p1 -b .mysql3
%patch30 -p1 -b .dlopen %patch30 -p1 -b .dlopen
%patch31 -p1 -b .easter %patch31 -p1 -b .easter
@ -303,14 +321,14 @@ rm -f ext/standard/tests/file/bug21131.phpt
rm -f ext/standard/tests/file/bug22414.phpt \ rm -f ext/standard/tests/file/bug22414.phpt \
ext/iconv/tests/bug16069.phpt ext/iconv/tests/bug16069.phpt
: Build for oci8=%{with_oci8} mssql=%{with_mssql} mhash=%{with_mhash} : Build for oci8=%{with_oci8} mssql=%{with_mssql} mhash=%{with_mhash} ibase=%{with_ibase}
%build %build
CFLAGS="$RPM_OPT_FLAGS -Wall -fno-strict-aliasing"; export CFLAGS CFLAGS="$RPM_OPT_FLAGS -Wall -fno-strict-aliasing"; export CFLAGS
# Install extension modules in %{_libdir}/php4. # Install extension modules in %{_libdir}/php/modules.
EXTENSION_DIR=%{_libdir}/php4; export EXTENSION_DIR EXTENSION_DIR=%{_libdir}/php/modules; export EXTENSION_DIR
# pull latest ltmain.sh, AC_PROG_LIBTOOL # pull latest ltmain.sh, AC_PROG_LIBTOOL
libtoolize --force --copy libtoolize --force --copy
@ -327,6 +345,7 @@ mkdir Zend && cp ../Zend/zend_{language,ini}_{parser,scanner}.[ch] Zend
ln -sf ../configure ln -sf ../configure
%configure \ %configure \
--cache-file=../config.cache \ --cache-file=../config.cache \
--with-libdir=%{_lib} \
--with-config-file-path=%{_sysconfdir} \ --with-config-file-path=%{_sysconfdir} \
--with-config-file-scan-dir=%{_sysconfdir}/php.d \ --with-config-file-scan-dir=%{_sysconfdir}/php.d \
--enable-force-cgi-redirect \ --enable-force-cgi-redirect \
@ -340,11 +359,9 @@ ln -sf ../configure
--with-exec-dir=%{_bindir} \ --with-exec-dir=%{_bindir} \
--with-freetype-dir=%{_prefix} \ --with-freetype-dir=%{_prefix} \
--with-png-dir=%{_prefix} \ --with-png-dir=%{_prefix} \
--with-gd=shared \
--enable-gd-native-ttf \ --enable-gd-native-ttf \
--without-gdbm \ --without-gdbm \
--with-gettext \ --with-gettext \
--with-ncurses=shared \
--with-gmp \ --with-gmp \
--with-iconv \ --with-iconv \
--with-jpeg-dir=%{_prefix} \ --with-jpeg-dir=%{_prefix} \
@ -353,9 +370,6 @@ ln -sf ../configure
--with-pspell \ --with-pspell \
--with-xml \ --with-xml \
--with-expat-dir=%{_prefix} \ --with-expat-dir=%{_prefix} \
--with-dom=shared,%{_prefix} \
--with-dom-xslt=%{_prefix} --with-dom-exslt=%{_prefix} \
--with-xmlrpc=shared \
--with-pcre-regex=%{_prefix} \ --with-pcre-regex=%{_prefix} \
--with-zlib \ --with-zlib \
--with-layout=GNU \ --with-layout=GNU \
@ -372,16 +386,7 @@ ln -sf ../configure
--enable-yp \ --enable-yp \
--enable-wddx \ --enable-wddx \
--with-pear=/usr/share/pear \ --with-pear=/usr/share/pear \
--with-imap=shared --with-imap-ssl \
--with-kerberos \ --with-kerberos \
--with-ldap=shared \
--with-mysql=shared,%{_prefix} \
%{?_with_oci8:--with-oci8=shared} \
%{?_with_mssql:--with-mssql=shared} \
%{?_with_mhash:--with-mhash=shared} \
--with-pgsql=shared \
--with-snmp=shared,%{_prefix} \
--with-snmp=shared \
--enable-ucd-snmp-hack \ --enable-ucd-snmp-hack \
--with-unixODBC=shared,%{_prefix} \ --with-unixODBC=shared,%{_prefix} \
--enable-memory-limit \ --enable-memory-limit \
@ -389,27 +394,40 @@ ln -sf ../configure
--enable-calendar \ --enable-calendar \
--enable-dbx \ --enable-dbx \
--enable-dio \ --enable-dio \
--enable-mbstring=shared --enable-mbstr-enc-trans \
--enable-mbregex \
--with-mime-magic=%{_datadir}/file/magic.mime \ --with-mime-magic=%{_datadir}/file/magic.mime \
$* || tail -500 config.log --without-sqlite \
$*
if test $? != 0; then
tail -300 config.log
: configure failed
exit 1
fi
make %{?_smp_mflags} make %{?_smp_mflags}
} }
# Build standalone /usr/bin/php # Build standalone /usr/bin/php and shared extension modules that
# do not need to be built twice.
pushd build-cgi pushd build-cgi
build --enable-force-cgi-redirect build --enable-force-cgi-redirect \
popd --with-imap=shared --with-imap-ssl \
--enable-mbstring=shared --enable-mbstr-enc-trans \
--enable-mbregex \
--with-ncurses=shared \
--with-gd=shared \
--with-xmlrpc=shared \
--with-ldap=shared \
--with-mysql=shared,%{_prefix} \
%{?_with_oci8:--with-oci8=shared} \
%{?_with_mssql:--with-mssql=shared} \
%{?_with_mhash:--with-mhash=shared} \
%{?_with_ibase:--with-interbase=shared,/opt/interbase} \
--enable-dom=shared \
--with-dom-xslt=%{_prefix} --with-dom-exslt=%{_prefix} \
--with-pgsql=shared \
--with-snmp=shared,%{_prefix}
# Build Apache module
pushd build-apache
build --with-apxs2=%{_sbindir}/apxs
popd
%check
# Run tests # Run tests
cd build-cgi
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
unset TZ LANG LC_ALL unset TZ LANG LC_ALL
if ! make test; then if ! make test; then
@ -419,8 +437,17 @@ if ! make test; then
cat "$f" cat "$f"
echo "-- $f result ends." echo "-- $f result ends."
done done
exit 1 set -x
fi fi
unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_
popd
# Build Apache module
pushd build-apache
build --with-apxs2=%{_sbindir}/apxs \
--without-mysql --without-gd \
--without-odbc --disable-dom
popd
%install %install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@ -443,7 +470,7 @@ install -m 644 *.gif $RPM_BUILD_ROOT%{contentdir}/icons/
# install the DSO # install the DSO
install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/httpd/modules install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/httpd/modules
install -m 755 build-apache/libs/libphp4.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules install -m 755 build-apache/libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules
# Apache config fragment # Apache config fragment
install -m 755 -d $RPM_BUILD_ROOT/etc/httpd/conf.d install -m 755 -d $RPM_BUILD_ROOT/etc/httpd/conf.d
@ -454,15 +481,16 @@ install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php
install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/session install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/session
# Generate files lists and stub .ini files for each subpackage # Generate files lists and stub .ini files for each subpackage
for mod in pgsql mysql odbc ldap snmp domxml xmlrpc imap \ for mod in pgsql mysql odbc ldap snmp xmlrpc imap \
mbstring ncurses gd \ mbstring ncurses gd dom \
%{?_with_oci8:oci8} %{?_with_mssql:mssql} %{?_with_mhash:mhash}; do %{?_with_oci8:oci8} %{?_with_mssql:mssql} %{?_with_mhash:mhash} \
%{?_with_ibase:interbase}; do
cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF
; Enable ${mod} extension module ; Enable ${mod} extension module
extension=${mod}.so extension=${mod}.so
EOF EOF
cat > files.${mod} <<EOF cat > files.${mod} <<EOF
%attr(755,root,root) %{_libdir}/php4/${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/${mod}.ini
EOF EOF
done done
@ -471,7 +499,7 @@ done
rm -rf $RPM_BUILD_ROOT%{_datadir}/pear/tests rm -rf $RPM_BUILD_ROOT%{_datadir}/pear/tests
# Remove unpackaged files # Remove unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/php4/*.a \ rm -f $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \
$RPM_BUILD_ROOT%{_bindir}/{phptar,pearize} $RPM_BUILD_ROOT%{_bindir}/{phptar,pearize}
# Remove irrelevant docs # Remove irrelevant docs
@ -488,10 +516,11 @@ rm files.*
%config(noreplace) %{_sysconfdir}/php.ini %config(noreplace) %{_sysconfdir}/php.ini
%config %{_sysconfdir}/pear.conf %config %{_sysconfdir}/pear.conf
%{_bindir}/php %{_bindir}/php
%dir %{_libdir}/php4 %dir %{_libdir}/php
%dir %{_libdir}/php/modules
%dir %{_localstatedir}/lib/php %dir %{_localstatedir}/lib/php
%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/session %attr(0770,root,apache) %dir %{_localstatedir}/lib/php/session
%{_libdir}/httpd/modules/libphp4.so %{_libdir}/httpd/modules/libphp5.so
%config %{_sysconfdir}/httpd/conf.d/php.conf %config %{_sysconfdir}/httpd/conf.d/php.conf
%dir %{_sysconfdir}/php.d %dir %{_sysconfdir}/php.d
%{contentdir}/icons/php.gif %{contentdir}/icons/php.gif
@ -507,7 +536,7 @@ rm files.*
%{_bindir}/phpize %{_bindir}/phpize
%{_bindir}/phpextdist %{_bindir}/phpextdist
%{_includedir}/php %{_includedir}/php
%{_libdir}/php %{_libdir}/php/build
%files pgsql -f files.pgsql %files pgsql -f files.pgsql
%files mysql -f files.mysql %files mysql -f files.mysql
@ -515,7 +544,7 @@ rm files.*
%files imap -f files.imap %files imap -f files.imap
%files ldap -f files.ldap %files ldap -f files.ldap
%files snmp -f files.snmp %files snmp -f files.snmp
%files domxml -f files.domxml %files dom -f files.dom
%files xmlrpc -f files.xmlrpc %files xmlrpc -f files.xmlrpc
%files mbstring -f files.mbstring %files mbstring -f files.mbstring
%files ncurses -f files.ncurses %files ncurses -f files.ncurses
@ -524,56 +553,62 @@ rm files.*
%if %{with_oci8} %if %{with_oci8}
%files oci8 -f files.oci8 %files oci8 -f files.oci8
%endif %endif
%if %{with_mssql} %if %{with_mssql}
%files mssql -f files.mssql %files mssql -f files.mssql
%endif %endif
%if %{with_mhash} %if %{with_mhash}
%files mhash -f files.mhash %files mhash -f files.mhash
%endif %endif
%if %{with_ibase}
%files interbase -f files.interbase
%endif
%changelog %changelog
* Fri Oct 29 2004 Joe Orton <jorton@redhat.com> 4.3.9-4 * Wed Nov 10 2004 Joe Orton <jorton@redhat.com> 5.0.2-7
- rebuild aginst mysqlclient10-devel - truncate changelog at 4.3.1-1
- merge from 4.3.x package:
* Wed Oct 20 2004 Joe Orton <jorton@redhat.com> 4.3.9-3
- fix segfault introduced upstream in CAN-2004-0958 patch
* Mon Sep 27 2004 Joe Orton <jorton@redhat.com> 4.3.9-2
- update to 4.3.9 (#133467, Robert Scheck)
- use new RTLD_DEEPBIND to load extension modules
* Thu Sep 9 2004 Joe Orton <jorton@redhat.com> 4.3.8-11
- don't use --with-regex=system, it's ignored for apache* SAPIs
* Fri Aug 27 2004 Joe Orton <jorton@redhat.com> 4.3.8-10
- do apply the Zend double->long conversion fix
- run make test in %%check and fail build on test failure
* Fri Aug 27 2004 Joe Orton <jorton@redhat.com> 4.3.8-9
- require recent 'file' package (#131054, Robert Scheck)
- fix Zend double->long conversion
* Thu Aug 26 2004 Joe Orton <jorton@redhat.com> 4.3.8-8
- fix -select patch bug which broke stream_select on s390
- add an FD_SETSIZE check to php_sock_stream_wait_for_data
* Thu Aug 26 2004 Joe Orton <jorton@redhat.com> 4.3.8-7
- make openssl extension built-in again (#130953)
- disable bug16069 test
* Thu Aug 19 2004 Joe Orton <jorton@redhat.com> 4.3.8-6
- fix phpize for libdir=lib64
- "fix" round() fudging for recent gcc on x86
- drop unnecessary gd-devel build dependency again
- use RTLD_GLOBAL to load extensions again (#127518)
* Thu Aug 19 2004 Joe Orton <jorton@redhat.com> 4.3.8-5
- add fix for bundled libgd symbol conflicts (#124530)
- enable mime_magic extension and Require: file (#130276) - enable mime_magic extension and Require: file (#130276)
- disable bug22414 test again (#130317)
- fix gettimeofday tests on x86_64 * Mon Nov 8 2004 Joe Orton <jorton@redhat.com> 5.0.2-6
- fix dom/sqlite enable/without confusion
* Mon Nov 8 2004 Joe Orton <jorton@redhat.com> 5.0.2-5
- fix phpize installation for lib64 platforms
- add fix for segfault in variable parsing introduced in 5.0.2
* Mon Nov 8 2004 Joe Orton <jorton@redhat.com> 5.0.2-4
- update to 5.0.2 (#127980)
- build against mysqlclient10-devel
- use new RTLD_DEEPBIND to load extension modules
- drop explicit requirement for elfutils-devel
- use AddHandler in default conf.d/php.conf (#135664)
- "fix" round() fudging for recent gcc on x86
- disable sqlite pending audit of warnings and subpackage split
* Fri Sep 17 2004 Joe Orton <jorton@redhat.com> 5.0.1-4
- don't build dom extension into 2.0 SAPI
* Fri Sep 17 2004 Joe Orton <jorton@redhat.com> 5.0.1-3
- ExclusiveArch: x86 ppc x86_64 for the moment
* Fri Sep 17 2004 Joe Orton <jorton@redhat.com> 5.0.1-2
- fix default extension_dir and conf.d/php.conf
* Thu Sep 9 2004 Joe Orton <jorton@redhat.com> 5.0.1-1
- update to 5.0.1
- only build shared modules once
- put dom extension in php-dom subpackage again
- move extension modules into %%{_libdir}/php/modules
- don't use --with-regex=system, it's ignored for the apache* SAPIs
* Wed Aug 11 2004 Tom Callaway <tcallawa@redhat.com>
- Merge in some spec file changes from Jeff Stern (jastern@uci.edu)
* Mon Aug 09 2004 Tom Callaway <tcallawa@redhat.com>
- bump to 5.0.0
- add patch to prevent clobbering struct re_registers from regex.h
- remove domxml references, replaced with dom now built-in
- fix php.ini to refer to php5 not php4
* Wed Aug 04 2004 Florian La Roche <Florian.LaRoche@redhat.de> * Wed Aug 04 2004 Florian La Roche <Florian.LaRoche@redhat.de>
- rebuild - rebuild
@ -748,185 +783,3 @@ rm files.*
* Tue May 6 2003 Joe Orton <jorton@redhat.com> 4.3.1-1 * Tue May 6 2003 Joe Orton <jorton@redhat.com> 4.3.1-1
- update to 4.3.1; run test suite - update to 4.3.1; run test suite
- open extension modules with RTLD_NOW rather than _LAZY - open extension modules with RTLD_NOW rather than _LAZY
* Tue May 6 2003 Joe Orton <jorton@redhat.com> 4.2.2-19
- patch for gd 2.x API changes in gd extension
* Thu May 1 2003 Joe Orton <jorton@redhat.com> 4.2.2-18
- rebuild to use aspell (#89925)
- patch to work round conditional AC_PROG_CXX break in autoconf 2.57
- fix dba build against db >= 4.1
* Mon Feb 24 2003 Joe Orton <jorton@redhat.com> 4.2.2-17
- restrict SNMP patch to minimal changes, fixing segv on startup (#84607)
* Wed Feb 12 2003 Joe Orton <jorton@redhat.com> 4.2.2-16
- prevent startup if using httpd.worker to avoid thread-safety issues.
- fix parsing private keys in OpenSSL extension (#83994)
- fixes for SNMP extension (backport from 4.3) (#74761)
* Wed Jan 29 2003 Joe Orton <jorton@redhat.com> 4.2.2-15
- add security fixes for wordwrap() and mail()
* Mon Jan 13 2003 Joe Orton <jorton@redhat.com> 4.2.2-14
- drop explicit Requires in subpackages, rely on automatic deps.
- further fixes for libdir=lib64
* Tue Dec 17 2002 Joe Orton <jorton@redhat.com> 4.2.2-13
- drop prereq for perl, grep in subpackages
- rebuild and patch for OpenSSL 0.9.7
* Tue Dec 10 2002 Joe Orton <jorton@redhat.com> 4.2.2-12
- backport "ini dir scanning" patch from CVS HEAD; /etc/php.d/*.ini
are now loaded at startup; each subpackage places an ini file
in that directory rather than munging /etc/php.ini in post/postun.
- default config changes: enable short_open_tag; remove settings for
php-dbg extension
* Wed Dec 4 2002 Joe Orton <jorton@redhat.com> 4.2.2-11
- own the /usr/lib/php4 directory (#73894)
- reinstate dropped patch to unconditionally disable ZTS
* Mon Dec 2 2002 Joe Orton <jorton@redhat.com> 4.2.2-10
- remove ldconfig invocation in post/postun
- fixes for #73516 (partially), #78586, #75029, #75712, #75878
* Wed Nov 6 2002 Joe Orton <jorton@redhat.com> 4.2.2-9
- fixes for libdir=/usr/lib64, based on SuSE's patches.
- add build prereqs for zlib-devel, imap-devel, curl-devel (#74819)
- remove unpackaged files from install root
- libtoolize; use configure cache to speed up build
* Mon Sep 23 2002 Philip Copeland <bryce@redhat.com> 4.2.2-8.0.6
- PHP cannot determine which UID is being used, so safe
mode restrictions were always applied. Fixed. (#74396)
* Tue Sep 3 2002 Philip Copeland <bryce@redhat.com> 4.2.2-8.0.4
- zts support seems to crash out httpd on a *second* sighup
ie service httpd start;
apachectl restart ; (ok)
apachectl restart ; (httpd segv's and collapses)
removed --enable-experimental-zts which this seems related to.
- Small patch added because some places need to know that they
aren't using the ZTS API's (dumb)
* Mon Sep 2 2002 Philip Copeland <bryce@redhat.com> 4.2.2-8.0.3
- fixup /etc/httpd/conf.d/php.conf to limit largest amount
of data accepted (#73254) Limited to 512K (which seems a
little excessive but anyway,..)
Note: php.conf is part of the srpm sources not part of the
php codebase.
- ditched extrenious --enable-debugger (was for php-dbg)
- When upgrading we tend not to modify /etc/php.ini if it exists,
instead we create php.ini.rpmnew. Modified the post scripts to
edit php.ini.rpmnew if it exists, so that people can copy
over the php.ini.rpmnew as php.ini knowing that it will
be an edited version, consistant with what modules they
installed #72033
* Sun Sep 1 2002 Joe Orton <jorton@redhat.com> 4.2.2-8.0.2
- require httpd-mmn for module ABI compatibility
* Fri Aug 30 2002 Philip Copeland <bryce@redhat.com> 4.2.2-8.0.1
- URLS would drop the last arguments #72752
--enable-mbstring
--enable-mbstr-enc-trans
These were supposed to help provide multibyte language
support, however, they cause problems. Removed. Maybe in
a later errata when they work.
- added small patch to php_variables.c that allows
$_GET[<var>] to initialise properly when
--enable-mbstr-enc-trans is disabled.
- Be consistant with errata naming (8.0.x)
* Tue Aug 27 2002 Nalin Dahyabhai <nalin@redhat.com> 4.2.2-11
- rebuild
* Wed Aug 22 2002 Philip Copeland <bryce@redhat.com> 4.2.2-10
- Beat down the requirement list to something a little
more sane
* Wed Aug 14 2002 Bill Nottingham <notting@redhat.com> 4.2.2-9
- trim manual language lists
* Mon Aug 12 2002 Gary Benson <gbenson@redhat.com> 4.2.2-8
- rebuild against httpd-2.0.40
* Sat Aug 10 2002 Elliot Lee <sopwith@redhat.com> 4.2.2-7
- rebuilt with gcc-3.2 (we hope)
* Wed Aug 7 2002 Philip Copeland <bryce@redhat.com> 4.2.2-6
- Where multiple cookies are set, only the last one
was actually made. Fixes #67853
* Mon Aug 5 2002 Philip Copeland <bryce@redhat.com> 4.2.2-5
- Shuffled the php/php-devel package file manifest
with respect to PEAR (PHP Extension and Application
Repository) #70673
* Fri Aug 2 2002 Philip Copeland <bryce@redhat.com> 4.2.2-4
- #67815, search path doesn't include the pear directory
- pear not being installed correctly. Added --with-pear=
option.
* Tue Jul 23 2002 Tim Powers <timp@redhat.com> 4.2.2-2
- build using gcc-3.2-0.1
* Mon Jul 22 2002 Philip Copeland <bryce@redhat.com> 4.2.2-1
- Yippie 8/ another security vunerability (see
http://www.php.net/release_4_2_2.php for details)
* Wed Jul 17 2002 Philip Copeland <bryce@redhat.com> 4.2.1-9
- Reminder to self that mm was pushed out because it's
NOT thread safe.
- Updated the manuals (much to Bills horror)
* Tue Jul 16 2002 Philip Copeland <bryce@redhat.com> 4.2.1-8
- php.ini alteration to fit in with the install/uninstall
of various php rpm based installable modules
* Mon Jul 15 2002 Philip Copeland <bryce@redhat.com> 4.2.1-8
- php -v showing signs of deep unhappiness with the world
added --enable-experimental-zts to configure to make it
happy again (yes I know experimental sounds 'dangerous'
it's just a name for an option we need)
* Fri Jul 12 2002 Philip Copeland <bryce@redhat.com> 4.2.1-7
- #68715, Wrong name for Mysql Module in php.ini. Fixed.
* Fri Jun 28 2002 Philip Copeland <bryce@redhat.com> 4.2.1-6
- SNMP fixup
* Thu Jun 27 2002 Philip Copeland <bryce@redhat.com> 4.2.1-5
- Ah,.. seems httpd2 has been renamed to just plain
ol' httpd. Fixed spec file to suit.
- ucd-snmp changed to net-snmp overnight...
temporarily disabled snmp while I work out the
impact of this change and if it is safe
* Wed Jun 26 2002 Philip Copeland <bryce@redhat.com> 4.2.1-4
- openldap 2.1.x problem solved by Nalin. Sure the ldap
API didn't change,... <mutter>. Added TSRMLS_FETCH()
to ldap_rebind_proc().
- Removed the php-dbg package as thats going to be provided
elsewhere
* Fri Jun 21 2002 Tim Powers <timp@redhat.com> 4.2.1-3
- automated rebuild
* Mon Jun 10 2002 Philip Copeland <bryce@redhat.com> 4.2.1-2
- Actually mm is now a dead project. Removed permently.
* Tue May 28 2002 Gary Benson <gbenson@redhat.com> 4.2.1-2
- change paths for httpd-2.0
- add the config file
- disable mm temporarily
* Sun May 26 2002 Tim Powers <timp@redhat.com> 4.2.1-1
- automated rebuild
* Wed May 22 2002 Philip Copeland <bryce@redhat.com> 4.2.1-0
- Initial pristine build of php-4.2.1
- Minor patch to get around a 64 bitism
- Added in the dgb debugging hooks