rpms/php/F-7 php-5.2.4-easter.patch, NONE, 1.1 php-5.2.4-gnusrc.patch, NONE, 1.1 php-5.2.4-norpath.patch, NONE, 1.1 php-5.2.4-odbc.patch, NONE, 1.1 php-5.2.4-tests-dashn.patch, NONE, 1.1 .cvsignore, 1.30, 1.31 php.spec, 1.140, 1.141 sources, 1.33, 1.34 php-4.3.1-odbc.patch, 1.1, NONE php-5.0.0-easter.patch, 1.4, NONE php-5.0.4-norpath.patch, 1.1, NONE php-5.0.4-tests-dashn.patch, 1.6, NONE php-5.1.4-gnusrc.patch, 1.3, NONE
Joe Orton (jorton)
fedora-extras-commits at redhat.com
Tue Sep 18 12:38:52 UTC 2007
Author: jorton
Update of /cvs/extras/rpms/php/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25031
Modified Files:
.cvsignore php.spec sources
Added Files:
php-5.2.4-easter.patch php-5.2.4-gnusrc.patch
php-5.2.4-norpath.patch php-5.2.4-odbc.patch
php-5.2.4-tests-dashn.patch
Removed Files:
php-4.3.1-odbc.patch php-5.0.0-easter.patch
php-5.0.4-norpath.patch php-5.0.4-tests-dashn.patch
php-5.1.4-gnusrc.patch
Log Message:
* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 5.2.4
- update to 5.2.4
php-5.2.4-easter.patch:
--- NEW FILE php-5.2.4-easter.patch ---
--- php-5.2.4/main/logos.h.easter
+++ php-5.2.4/main/logos.h
@@ -491,386 +491,3 @@ static const unsigned char php_logo[] =
102, 63, 251, 220, 139, 16, 65, 26, 16, 112,
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,
- 247, 0, 0, 0, 255, 0, 107, 114, 178, 0,
- 0, 0, 31, 31, 31, 255, 255, 255, 106, 113,
- 176, 63, 63, 63, 127, 127, 127, 106, 112, 174,
- 191, 191, 191, 105, 111, 171, 223, 223, 223, 239,
- 239, 239, 144, 149, 197, 106, 111, 173, 245, 246,
- 250, 105, 110, 170, 218, 219, 235, 47, 47, 47,
- 162, 166, 206, 35, 36, 40, 153, 158, 202, 95,
- 95, 95, 175, 175, 175, 88, 93, 141, 159, 159,
- 159, 116, 122, 182, 125, 131, 187, 143, 143, 143,
- 38, 38, 41, 104, 108, 167, 171, 175, 211, 105,
- 109, 168, 102, 102, 153, 104, 108, 165, 45, 46,
- 58, 181, 184, 216, 111, 111, 111, 134, 140, 192,
- 102, 108, 168, 79, 79, 79, 199, 202, 226, 40,
- 41, 49, 92, 98, 150, 53, 53, 63, 236, 237,
- 245, 130, 130, 171, 122, 122, 160, 104, 107, 163,
- 50, 51, 67, 45, 45, 52, 207, 207, 207, 69,
- 72, 104, 15, 15, 15, 61, 61, 74, 227, 228,
- 240, 59, 62, 86, 103, 106, 162, 107, 107, 139,
- 73, 77, 113, 102, 103, 156, 54, 56, 76, 97,
- 103, 159, 137, 137, 182, 35, 35, 38, 190, 193,
- 221, 145, 145, 193, 103, 105, 159, 78, 82, 122,
- 76, 76, 95, 147, 148, 200, 92, 92, 117, 105,
- 105, 156, 103, 105, 160, 150, 150, 202, 64, 67,
- 95, 114, 114, 149, 108, 108, 159, 143, 143, 194,
- 84, 84, 106, 140, 140, 191, 102, 104, 157, 48,
- 48, 61, 27, 29, 42, 114, 114, 165, 83, 88,
- 132, 153, 153, 204, 121, 126, 186, 127, 127, 178,
- 208, 210, 230, 149, 149, 200, 146, 146, 197, 141,
- 143, 197, 55, 55, 67, 144, 145, 199, 133, 133,
- 184, 124, 124, 175, 110, 115, 171, 130, 133, 191,
- 88, 91, 137, 86, 92, 144, 154, 156, 172, 87,
- 92, 139, 85, 86, 125, 118, 123, 184, 121, 122,
- 172, 124, 128, 187, 82, 86, 130, 39, 39, 46,
- 99, 99, 128, 69, 69, 85, 97, 101, 153, 75,
- 75, 107, 115, 121, 182, 135, 138, 194, 101, 107,
- 165, 82, 84, 101, 102, 102, 140, 53, 57, 89,
- 69, 71, 101, 137, 137, 188, 109, 116, 179, 130,
- 130, 182, 57, 57, 76, 93, 99, 155, 117, 117,
- 168, 62, 63, 86, 84, 84, 122, 79, 79, 114,
- 112, 117, 177, 58, 58, 71, 127, 131, 189, 106,
- 106, 150, 76, 76, 101, 134, 135, 187, 20, 20,
- 31, 66, 71, 111, 125, 129, 182, 172, 173, 180,
- 86, 88, 131, 229, 230, 234, 108, 112, 171, 100,
- 105, 161, 161, 165, 203, 53, 53, 70, 95, 97,
- 146, 58, 60, 81, 217, 219, 234, 195, 196, 208,
- 82, 85, 125, 112, 118, 181, 82, 82, 106, 114,
- 117, 175, 154, 157, 195, 134, 134, 179, 111, 111,
- 162, 6, 7, 11, 110, 111, 146, 93, 93, 138,
- 77, 79, 116, 115, 119, 179, 103, 108, 161, 60,
- 64, 100, 98, 98, 145, 40, 40, 47, 51, 51,
- 63, 69, 69, 95, 73, 78, 122, 197, 198, 202,
- 54, 54, 58, 13, 14, 22, 108, 114, 174, 149,
- 152, 184, 101, 108, 167, 88, 88, 130, 106, 108,
- 162, 86, 91, 141, 84, 84, 116, 86, 86, 90,
- 129, 131, 186, 132, 135, 181, 160, 163, 183, 211,
- 212, 224, 91, 91, 123, 109, 109, 117, 104, 104,
- 135, 86, 86, 115, 90, 92, 108, 81, 83, 122,
- 103, 106, 130, 70, 70, 99, 121, 126, 170, 139,
- 139, 186, 73, 74, 94, 109, 109, 148, 139, 140,
- 189, 135, 138, 162, 176, 179, 199, 115, 115, 115,
- 106, 106, 144, 59, 63, 98, 67, 69, 96, 241,
- 241, 241, 102, 105, 149, 120, 120, 162, 68, 68,
- 90, 89, 89, 115, 51, 52, 79, 113, 113, 152,
- 33, 35, 55, 189, 190, 215, 79, 79, 104, 213,
- 214, 218, 94, 95, 142, 163, 164, 176, 86, 89,
- 133, 112, 112, 156, 80, 81, 118, 63, 65, 90,
- 102, 103, 124, 126, 129, 157, 72, 72, 98, 150,
- 150, 154, 72, 74, 100, 112, 112, 151, 138, 139,
- 192, 122, 125, 180, 49, 50, 64, 78, 78, 110,
- 119, 119, 157, 125, 126, 174, 77, 81, 119, 125,
- 126, 180, 56, 56, 72, 118, 120, 173, 46, 49,
- 77, 92, 96, 132, 188, 189, 197, 65, 65, 81,
- 165, 168, 200, 49, 51, 66, 143, 147, 194, 80,
- 82, 111, 192, 195, 215, 235, 235, 242, 105, 111,
- 170, 74, 77, 107, 183, 186, 210, 109, 111, 165,
- 117, 120, 152, 65, 66, 90, 182, 182, 186, 104,
- 104, 137, 123, 127, 163, 170, 171, 187, 110, 113,
- 163, 33, 249, 4, 1, 0, 0, 0, 0, 44,
- 0, 0, 0, 0, 120, 0, 67, 0, 0, 8,
- 255, 0, 1, 8, 28, 72, 176, 160, 193, 131,
- 8, 19, 42, 92, 200, 176, 161, 195, 135, 16,
- 35, 74, 156, 72, 177, 162, 197, 139, 24, 51,
- 106, 220, 200, 209, 162, 145, 43, 104, 188, 116,
- 28, 73, 210, 160, 23, 145, 8, 141, 24, 84,
- 50, 40, 128, 75, 17, 122, 228, 112, 65, 200,
- 69, 140, 146, 146, 56, 83, 170, 9, 144, 6,
- 192, 11, 38, 69, 190, 209, 88, 82, 196, 134,
- 141, 1, 44, 6, 40, 29, 64, 65, 30, 19,
- 29, 71, 138, 250, 137, 129, 163, 202, 157, 107,
- 99, 48, 96, 128, 246, 67, 200, 139, 23, 66,
- 62, 186, 212, 224, 36, 103, 206, 31, 58, 92,
- 56, 75, 214, 35, 198, 210, 183, 112, 153, 142,
- 88, 58, 231, 207, 11, 67, 113, 86, 172, 56,
- 65, 68, 91, 219, 185, 61, 226, 142, 160, 65,
- 163, 199, 167, 81, 102, 71, 2, 69, 26, 119,
- 169, 10, 28, 59, 180, 210, 216, 17, 137, 138,
- 152, 60, 1, 180, 250, 72, 194, 3, 148, 75,
- 151, 5, 16, 124, 254, 188, 98, 7, 156, 127,
- 24, 118, 196, 24, 209, 67, 138, 10, 32, 54,
- 92, 0, 224, 162, 50, 241, 68, 175, 79, 58,
- 188, 165, 16, 99, 201, 142, 49, 145, 68, 143,
- 254, 12, 1, 134, 112, 151, 30, 120, 136, 24,
- 206, 252, 115, 1, 15, 10, 70, 43, 200, 17,
- 125, 133, 190, 14, 29, 112, 84, 194, 99, 251,
- 161, 144, 35, 50, 88, 232, 255, 30, 32, 136,
- 70, 21, 31, 159, 65, 68, 111, 94, 64, 196,
- 122, 151, 8, 134, 228, 56, 222, 124, 180, 3,
- 8, 163, 219, 131, 24, 45, 26, 3, 133, 1,
- 108, 0, 211, 29, 67, 58, 188, 213, 193, 17,
- 226, 96, 246, 25, 2, 248, 213, 167, 64, 131,
- 38, 144, 16, 128, 7, 73, 68, 247, 203, 61,
- 100, 212, 7, 154, 2, 5, 72, 231, 65, 135,
- 205, 33, 176, 199, 0, 50, 44, 51, 224, 65,
- 46, 28, 17, 204, 82, 29, 20, 1, 134, 37,
- 195, 21, 0, 34, 115, 5, 56, 0, 98, 5,
- 4, 16, 176, 205, 51, 235, 76, 33, 64, 2,
- 11, 112, 163, 161, 141, 252, 121, 64, 223, 112,
- 34, 240, 160, 128, 15, 49, 168, 224, 206, 15,
- 39, 10, 132, 214, 120, 20, 220, 81, 135, 17,
- 104, 104, 200, 222, 140, 1, 68, 144, 163, 4,
- 40, 24, 80, 2, 7, 12, 92, 96, 71, 125,
- 92, 6, 160, 128, 3, 67, 14, 225, 193, 104,
- 107, 12, 208, 129, 14, 39, 230, 166, 20, 5,
- 75, 180, 194, 67, 35, 90, 246, 233, 146, 3,
- 4, 160, 34, 64, 6, 18, 28, 48, 64, 13,
- 7, 28, 128, 136, 159, 8, 176, 137, 38, 12,
- 57, 164, 169, 192, 24, 50, 12, 96, 195, 11,
- 98, 92, 129, 210, 72, 66, 60, 241, 22, 14,
- 39, 40, 32, 66, 154, 126, 50, 7, 65, 38,
- 4, 36, 32, 192, 170, 172, 94, 96, 64, 134,
- 26, 202, 255, 72, 234, 103, 211, 57, 202, 220,
- 42, 216, 28, 161, 212, 8, 24, 4, 242, 197,
- 108, 55, 105, 228, 66, 82, 187, 98, 160, 230,
- 145, 165, 14, 135, 64, 116, 94, 30, 192, 42,
- 171, 51, 164, 146, 44, 123, 48, 52, 88, 159,
- 8, 81, 160, 225, 131, 106, 20, 0, 81, 138,
- 61, 43, 88, 178, 5, 70, 46, 216, 57, 0,
- 17, 206, 185, 52, 65, 5, 13, 76, 240, 129,
- 75, 13, 108, 80, 170, 140, 1, 108, 240, 229,
- 179, 171, 18, 48, 197, 180, 46, 201, 27, 64,
- 60, 31, 126, 166, 193, 6, 241, 194, 151, 196,
- 126, 11, 230, 64, 68, 96, 3, 224, 64, 142,
- 38, 22, 233, 48, 94, 195, 39, 12, 23, 68,
- 142, 24, 63, 144, 241, 3, 17, 100, 65, 194,
- 186, 239, 54, 215, 64, 170, 248, 10, 32, 193,
- 12, 103, 38, 107, 130, 151, 26, 19, 112, 67,
- 203, 45, 231, 248, 64, 11, 244, 68, 160, 193,
- 103, 30, 32, 28, 128, 15, 107, 248, 81, 41,
- 11, 109, 12, 163, 6, 26, 181, 49, 36, 68,
- 17, 75, 45, 81, 49, 115, 24, 99, 60, 131,
- 53, 138, 36, 144, 128, 151, 77, 19, 208, 194,
- 4, 19, 220, 252, 153, 151, 18, 148, 92, 194,
- 12, 167, 36, 187, 65, 204, 78, 75, 157, 192,
- 62, 101, 164, 173, 8, 3, 26, 183, 240, 64,
- 10, 180, 164, 25, 5, 18, 122, 180, 161, 27,
- 5, 59, 4, 16, 70, 89, 11, 13, 255, 187,
- 20, 186, 245, 229, 24, 230, 0, 37, 11, 112,
- 200, 20, 116, 224, 114, 0, 153, 24, 167, 208,
- 64, 0, 56, 102, 80, 248, 0, 12, 80, 18,
- 1, 49, 249, 188, 67, 66, 10, 17, 180, 144,
- 227, 13, 89, 76, 0, 57, 1, 12, 36, 144,
- 193, 1, 6, 212, 80, 248, 179, 6, 44, 128,
- 113, 11, 143, 127, 38, 2, 22, 86, 200, 81,
- 15, 13, 74, 173, 17, 69, 31, 125, 143, 183,
- 3, 224, 34, 19, 176, 192, 234, 171, 215, 144,
- 193, 2, 174, 63, 80, 193, 4, 4, 200, 178,
- 186, 1, 82, 51, 48, 67, 244, 57, 74, 125,
- 64, 2, 86, 147, 64, 128, 179, 196, 175, 110,
- 193, 1, 12, 48, 208, 130, 115, 81, 224, 19,
- 199, 103, 59, 12, 160, 130, 35, 220, 37, 36,
- 68, 165, 20, 24, 171, 37, 243, 220, 119, 63,
- 57, 10, 4, 4, 113, 177, 5, 246, 219, 127,
- 64, 142, 11, 80, 93, 255, 188, 71, 0, 151,
- 64, 32, 10, 58, 251, 12, 96, 54, 161, 16,
- 55, 168, 111, 105, 90, 202, 130, 170, 6, 184,
- 186, 11, 20, 227, 3, 4, 48, 0, 5, 137,
- 231, 58, 13, 110, 176, 100, 23, 56, 0, 44,
- 146, 48, 170, 230, 156, 64, 5, 3, 0, 68,
- 66, 152, 160, 148, 188, 245, 201, 94, 245, 251,
- 224, 170, 36, 80, 2, 1, 148, 129, 0, 116,
- 144, 33, 190, 106, 224, 58, 29, 226, 235, 0,
- 22, 56, 4, 178, 255, 136, 195, 11, 10, 140,
- 32, 33, 149, 194, 65, 169, 82, 176, 189, 146,
- 89, 32, 71, 28, 176, 31, 13, 19, 69, 128,
- 93, 248, 144, 85, 6, 200, 209, 234, 74, 144,
- 168, 68, 89, 64, 2, 252, 43, 220, 12, 4,
- 176, 40, 230, 32, 0, 58, 39, 8, 204, 49,
- 14, 210, 137, 7, 150, 170, 2, 15, 136, 161,
- 0, 6, 208, 180, 4, 132, 201, 2, 9, 224,
- 64, 6, 8, 199, 42, 227, 93, 0, 135, 221,
- 59, 64, 6, 164, 70, 168, 194, 145, 169, 112,
- 25, 168, 26, 198, 22, 144, 0, 62, 178, 202,
- 2, 6, 80, 133, 169, 172, 181, 130, 1, 72,
- 161, 32, 74, 80, 131, 91, 98, 0, 154, 62,
- 153, 32, 142, 37, 91, 64, 4, 194, 64, 53,
- 140, 205, 131, 17, 12, 112, 164, 0, 178, 168,
- 175, 213, 161, 192, 117, 110, 187, 1, 1, 46,
- 80, 50, 202, 209, 50, 148, 4, 200, 68, 5,
- 150, 87, 129, 15, 76, 128, 21, 11, 136, 226,
- 179, 6, 160, 42, 62, 56, 135, 67, 206, 201,
- 193, 0, 186, 64, 16, 35, 196, 161, 10, 74,
- 89, 129, 3, 134, 56, 28, 38, 170, 50, 95,
- 65, 8, 128, 6, 76, 128, 181, 130, 137, 130,
- 3, 194, 100, 85, 15, 87, 103, 181, 10, 184,
- 4, 71, 97, 124, 22, 7, 8, 208, 181, 80,
- 222, 160, 57, 124, 64, 193, 45, 159, 149, 1,
- 3, 172, 225, 79, 244, 81, 64, 8, 66, 208,
- 255, 133, 1, 64, 73, 32, 87, 8, 64, 96,
- 128, 0, 130, 89, 13, 7, 71, 99, 220, 33,
- 1, 98, 215, 28, 78, 44, 64, 149, 210, 91,
- 157, 4, 8, 16, 178, 0, 92, 236, 154, 2,
- 32, 29, 57, 179, 201, 28, 100, 160, 32, 156,
- 172, 170, 167, 29, 232, 21, 163, 38, 64, 193,
- 5, 3, 160, 147, 64, 90, 178, 201, 100, 121,
- 169, 134, 248, 202, 162, 9, 234, 195, 135, 31,
- 61, 11, 127, 146, 43, 92, 9, 22, 250, 153,
- 27, 48, 160, 112, 36, 171, 37, 1, 180, 198,
- 31, 81, 212, 96, 158, 226, 148, 0, 172, 154,
- 19, 130, 45, 164, 161, 20, 69, 32, 136, 58,
- 148, 178, 4, 246, 12, 199, 94, 236, 44, 89,
- 13, 120, 122, 213, 6, 244, 194, 0, 72, 237,
- 96, 5, 9, 48, 83, 151, 4, 149, 117, 194,
- 43, 92, 22, 253, 37, 176, 10, 212, 194, 2,
- 72, 21, 128, 5, 102, 16, 141, 250, 196, 103,
- 8, 129, 56, 129, 250, 248, 6, 0, 77, 40,
- 165, 10, 195, 153, 38, 115, 48, 56, 188, 146,
- 101, 81, 66, 7, 157, 101, 9, 60, 40, 0,
- 252, 77, 176, 112, 12, 40, 224, 103, 64, 25,
- 83, 45, 150, 108, 162, 12, 29, 139, 240, 12,
- 208, 206, 86, 149, 96, 169, 163, 241, 0, 2,
- 93, 162, 215, 1, 80, 97, 32, 47, 80, 138,
- 25, 62, 115, 159, 52, 117, 72, 150, 32, 197,
- 34, 1, 204, 57, 154, 13, 255, 120, 41, 174,
- 255, 235, 172, 66, 37, 235, 146, 7, 164, 83,
- 182, 4, 80, 235, 108, 135, 35, 203, 194, 226,
- 139, 1, 251, 82, 22, 9, 103, 84, 0, 165,
- 212, 1, 181, 74, 169, 134, 140, 220, 147, 31,
- 71, 105, 224, 94, 134, 165, 104, 53, 9, 224,
- 141, 146, 97, 143, 120, 89, 140, 192, 104, 50,
- 232, 53, 203, 86, 150, 182, 218, 212, 94, 59,
- 10, 247, 63, 118, 12, 199, 3, 243, 25, 13,
- 4, 66, 160, 20, 38, 64, 119, 0, 80, 248,
- 2, 12, 152, 171, 128, 227, 140, 236, 167, 133,
- 123, 98, 10, 76, 240, 1, 13, 84, 64, 150,
- 182, 224, 4, 190, 240, 23, 220, 45, 18, 64,
- 188, 240, 106, 48, 190, 254, 104, 220, 103, 253,
- 239, 3, 38, 104, 64, 3, 60, 247, 0, 31,
- 225, 139, 114, 148, 200, 15, 117, 237, 51, 132,
- 38, 116, 129, 5, 4, 73, 237, 0, 172, 32,
- 6, 249, 38, 48, 0, 218, 203, 169, 119, 101,
- 214, 52, 70, 232, 118, 85, 137, 148, 240, 140,
- 57, 26, 128, 145, 1, 117, 150, 144, 205, 145,
- 231, 114, 196, 0, 198, 222, 148, 1, 161, 160,
- 149, 181, 98, 244, 5, 22, 216, 128, 32, 186,
- 90, 113, 64, 213, 100, 28, 230, 104, 79, 142,
- 143, 44, 93, 6, 46, 144, 72, 6, 220, 120,
- 85, 216, 211, 49, 190, 114, 84, 81, 31, 87,
- 182, 137, 184, 4, 18, 7, 92, 247, 91, 122,
- 166, 0, 255, 52, 68, 178, 171, 47, 6, 240,
- 4, 40, 15, 192, 13, 86, 80, 66, 24, 96,
- 240, 166, 230, 104, 175, 205, 196, 147, 128, 0,
- 241, 181, 211, 28, 97, 116, 149, 57, 42, 107,
- 0, 152, 87, 178, 117, 146, 183, 150, 95, 22,
- 174, 232, 72, 234, 32, 30, 176, 97, 0, 71,
- 32, 72, 27, 148, 226, 2, 43, 204, 194, 160,
- 48, 126, 244, 21, 89, 41, 56, 246, 90, 109,
- 52, 102, 126, 150, 235, 196, 172, 67, 215, 17,
- 245, 81, 33, 128, 131, 82, 84, 42, 16, 21,
- 243, 99, 202, 26, 194, 145, 145, 101, 72, 185,
- 252, 229, 8, 203, 63, 34, 0, 98, 63, 35,
- 102, 58, 158, 213, 135, 59, 125, 179, 150, 20,
- 192, 131, 16, 128, 33, 23, 36, 42, 200, 15,
- 148, 2, 60, 13, 141, 108, 215, 3, 52, 192,
- 245, 8, 240, 128, 172, 253, 250, 199, 108, 53,
- 235, 153, 129, 77, 193, 137, 62, 32, 220, 102,
- 228, 1, 18, 78, 90, 41, 55, 96, 82, 41,
- 52, 232, 100, 125, 236, 133, 109, 11, 112, 160,
- 139, 248, 30, 228, 235, 10, 108, 86, 2, 0,
- 58, 139, 239, 28, 141, 9, 26, 60, 0, 49,
- 133, 25, 5, 37, 67, 193, 1, 34, 221, 199,
- 255, 221, 224, 213, 14, 130, 130, 21, 142, 50,
- 0, 217, 16, 36, 20, 74, 193, 1, 2, 168,
- 169, 174, 172, 170, 83, 145, 85, 123, 155, 162,
- 251, 205, 129, 107, 174, 179, 162, 17, 255, 6,
- 185, 199, 89, 85, 104, 225, 113, 96, 112, 171,
- 50, 128, 5, 50, 16, 89, 101, 251, 9, 2,
- 77, 120, 129, 110, 80, 92, 144, 60, 40, 133,
- 20, 160, 118, 137, 151, 74, 150, 163, 126, 132,
- 97, 166, 19, 120, 68, 34, 208, 61, 156, 166,
- 205, 224, 229, 6, 104, 29, 111, 71, 67, 130,
- 8, 164, 128, 4, 13, 208, 192, 134, 1, 252,
- 172, 200, 222, 192, 31, 212, 80, 57, 183, 179,
- 86, 42, 16, 132, 160, 9, 72, 43, 130, 16,
- 12, 194, 5, 72, 68, 179, 79, 17, 120, 236,
- 170, 182, 202, 85, 6, 5, 221, 37, 4, 214,
- 192, 7, 200, 38, 236, 100, 61, 64, 238, 249,
- 226, 170, 134, 179, 16, 129, 32, 124, 128, 4,
- 31, 168, 0, 196, 53, 4, 131, 16, 108, 2,
- 28, 74, 249, 167, 65, 152, 145, 241, 252, 28,
- 105, 18, 128, 103, 165, 9, 10, 160, 30, 126,
- 225, 253, 6, 17, 32, 48, 122, 251, 52, 50,
- 152, 62, 43, 71, 139, 247, 188, 75, 134, 224,
- 108, 38, 36, 229, 201, 9, 241, 212, 185, 2,
- 80, 35, 46, 41, 0, 6, 152, 175, 108, 11,
- 64, 208, 103, 213, 251, 62, 0, 214, 36, 122,
- 22, 126, 207, 28, 71, 196, 130, 88, 44, 88,
- 123, 66, 92, 80, 169, 1, 220, 97, 14, 252,
- 201, 1, 126, 254, 94, 89, 105, 216, 138, 248,
- 252, 178, 151, 140, 79, 111, 115, 236, 175, 96,
- 46, 74, 177, 129, 255, 242, 21, 242, 131, 241,
- 196, 96, 7, 39, 40, 0, 12, 246, 171, 77,
- 32, 163, 85, 116, 67, 194, 126, 125, 152, 136,
- 237, 140, 14, 219, 247, 39, 160, 1, 5, 254,
- 35, 167, 54, 60, 228, 12, 252, 199, 20, 158,
- 176, 28, 17, 102, 122, 49, 71, 0, 76, 247,
- 39, 215, 39, 127, 163, 17, 1, 92, 119, 83,
- 4, 0, 127, 190, 167, 127, 75, 193, 2, 76,
- 32, 121, 12, 225, 5, 59, 3, 126, 74, 161,
- 2, 61, 96, 44, 21, 144, 74, 171, 50, 0,
- 112, 21, 89, 35, 7, 31, 16, 192, 37, 148,
- 38, 127, 204, 179, 0, 23, 176, 0, 211, 115,
- 58, 216, 147, 128, 125, 178, 2, 40, 180, 20,
- 50, 64, 107, 16, 161, 6, 10, 240, 6, 128,
- 32, 5, 112, 161, 2, 15, 48, 3, 139, 51,
- 3, 220, 22, 1, 133, 23, 35, 157, 231, 28,
- 113, 22, 34, 170, 215, 46, 136, 87, 1, 143,
- 192, 57, 17, 32, 129, 201, 98, 131, 75, 1,
- 4, 133, 208, 9, 22, 65, 5, 72, 128, 5,
- 90, 240, 2, 196, 162, 20, 198, 160, 12, 4,
- 16, 58, 52, 232, 1, 189, 231, 18, 107, 162,
- 33, 141, 130, 125, 10, 240, 30, 158, 151, 127,
- 55, 8, 4, 166, 96, 14, 35, 225, 2, 151,
- 64, 10, 111, 49, 24, 85, 96, 6, 24, 176,
- 2, 180, 82, 101, 74, 230, 134, 200, 244, 123,
- 8, 32, 2, 11, 56, 45, 62, 0, 126, 64,
- 255, 0, 8, 96, 160, 5, 56, 145, 6, 127,
- 80, 8, 19, 3, 23, 49, 240, 9, 139, 160,
- 21, 198, 114, 70, 139, 8, 26, 75, 104, 87,
- 28, 215, 30, 107, 56, 47, 13, 178, 2, 252,
- 183, 7, 132, 48, 46, 182, 225, 2, 20, 215,
- 24, 187, 225, 7, 130, 216, 28, 188, 167, 37,
- 111, 168, 33, 32, 144, 4, 159, 168, 37, 32,
- 192, 3, 67, 112, 2, 56, 192, 127, 205, 0,
- 5, 81, 2, 0, 104, 81, 4, 93, 32, 5,
- 50, 176, 7, 240, 0, 139, 31, 40, 29, 57,
- 176, 139, 180, 215, 134, 14, 50, 4, 4, 56,
- 45, 10, 192, 122, 174, 0, 9, 252, 151, 14,
- 194, 80, 140, 5, 177, 5, 84, 208, 7, 80,
- 32, 7, 1, 240, 6, 103, 144, 13, 56, 192,
- 129, 3, 48, 2, 68, 48, 7, 124, 166, 37,
- 16, 240, 98, 249, 145, 3, 81, 112, 125, 43,
- 48, 6, 39, 128, 30, 39, 96, 6, 128, 40,
- 63, 5, 144, 3, 163, 0, 7, 151, 166, 20,
- 82, 64, 8, 146, 8, 142, 9, 129, 5, 33,
- 128, 4, 232, 64, 90, 68, 192, 129, 64, 32,
- 9, 26, 114, 123, 28, 39, 2, 33, 144, 4,
- 46, 65, 4, 85, 16, 140, 76, 225, 22, 176,
- 40, 3, 64, 240, 22, 130, 112, 9, 124, 165,
- 144, 9, 193, 138, 225, 160, 51, 139, 80, 144,
- 187, 178, 4, 242, 227, 3, 8, 80, 45, 204,
- 33, 63, 16, 208, 108, 103, 190, 48, 14, 20,
- 160, 2, 32, 9, 139, 62, 249, 4, 24, 136,
- 146, 14, 97, 8, 129, 0, 1, 67, 192, 3,
- 5, 128, 59, 65, 200, 20, 75, 176, 4, 52,
- 192, 142, 112, 1, 4, 205, 23, 132, 43, 80,
- 9, 158, 16, 2, 124, 114, 142, 103, 240, 7,
- 221, 160, 3, 58, 192, 4, 47, 32, 148, 21,
- 225, 4, 72, 128, 4, 152, 224, 18, 62, 32,
- 9, 1, 232, 147, 62, 217, 1, 70, 49, 13,
- 186, 80, 14, 137, 160, 0, 73, 112, 118, 95,
- 160, 4, 152, 144, 3, 13, 137, 5, 98, 201,
- 17, 70, 0, 10, 55, 25, 2, 8, 224, 3,
- 231, 32, 5, 82, 208, 5, 50, 208, 1, 196,
- 2, 4, 130, 96, 3, 71, 224, 6, 183, 80,
- 7, 47, 96, 113, 7, 1, 6, 84, 0, 134,
- 2, 225, 4, 125, 144, 6, 9, 217, 151, 27,
- 225, 4, 77, 208, 4, 119, 249, 10, 13, 169,
- 7, 4, 129, 5, 84, 208, 62, 158, 185, 154,
- 8, 177, 5, 80, 208, 153, 172, 25, 155, 178,
- 57, 155, 180, 41, 148, 1, 1, 0, 59, 0 };
--- php-5.2.4/main/php_logos.c.easter
+++ php-5.2.4/main/php_logos.c
@@ -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;
--- php-5.2.4/ext/standard/info.c.easter
+++ php-5.2.4/ext/standard/info.c
@@ -1058,21 +1058,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);
}
/* }}} */
@@ -1103,18 +1089,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_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.2.4/ext/standard/info.h.easter
+++ php-5.2.4/ext/standard/info.h
@@ -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);
--- php-5.2.4/ext/standard/basic_functions.c.easter
+++ php-5.2.4/ext/standard/basic_functions.c
@@ -1753,10 +1753,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_php_real_log
ZEND_END_ARG_INFO()
static
-ZEND_BEGIN_ARG_INFO(arginfo_php_egg_logo_guid, 0)
-ZEND_END_ARG_INFO()
-
-static
ZEND_BEGIN_ARG_INFO(arginfo_zend_logo_guid, 0)
ZEND_END_ARG_INFO()
@@ -3135,7 +3131,6 @@ zend_function_entry basic_functions[] =
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)
php-5.2.4-gnusrc.patch:
--- NEW FILE php-5.2.4-gnusrc.patch ---
--- php-5.2.4/Zend/zend_language_parser.c.gnusrc
+++ php-5.2.4/Zend/zend_language_parser.c
@@ -356,6 +356,8 @@
#include "zend_API.h"
#include "zend_constants.h"
+#include <string.h>
+
#define YYERROR_VERBOSE
#define YYSTYPE znode
--- php-5.2.4/main/streams/streams.c.gnusrc
+++ php-5.2.4/main/streams/streams.c
@@ -21,7 +21,6 @@
/* $Id: streams.c,v 1.82.2.6.2.18 2007/08/08 07:01:49 jani Exp $ */
-#define _GNU_SOURCE
#include "php.h"
#include "php_globals.h"
#include "php_network.h"
--- php-5.2.4/main/streams/cast.c.gnusrc
+++ php-5.2.4/main/streams/cast.c
@@ -18,7 +18,6 @@
/* $Id: cast.c,v 1.12.2.1.2.1 2007/01/01 09:36:11 sebastian Exp $ */
-#define _GNU_SOURCE
#include "php.h"
#include "php_globals.h"
#include "php_network.h"
--- php-5.2.4/main/streams/memory.c.gnusrc
+++ php-5.2.4/main/streams/memory.c
@@ -18,7 +18,6 @@
/* $Id: memory.c,v 1.8.2.6.2.17 2007/02/22 23:26:03 helly Exp $ */
-#define _GNU_SOURCE
#include "php.h"
PHPAPI int php_url_decode(char *str, int len);
--- php-5.2.4/main/php.h.gnusrc
+++ php-5.2.4/main/php.h
@@ -30,6 +30,7 @@
#define PHP_HAVE_STREAMS
#define YYDEBUG 0
+#include "php_config.h"
#include "php_version.h"
#include "zend.h"
#include "zend_qsort.h"
--- php-5.2.4/ext/standard/file.c.gnusrc
+++ php-5.2.4/ext/standard/file.c
@@ -118,7 +118,6 @@ php_file_globals file_globals;
#ifdef HAVE_FNMATCH
#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
#endif
#include <fnmatch.h>
#endif
--- php-5.2.4/ext/pdo_firebird/firebird_driver.c.gnusrc
+++ php-5.2.4/ext/pdo_firebird/firebird_driver.c
@@ -22,7 +22,6 @@
#include "config.h"
#endif
-#define _GNU_SOURCE
#include "php.h"
#include "php_ini.h"
--- php-5.2.4/ext/zlib/zlib_fopen_wrapper.c.gnusrc
+++ php-5.2.4/ext/zlib/zlib_fopen_wrapper.c
@@ -19,7 +19,6 @@
/* $Id: zlib_fopen_wrapper.c,v 1.46.2.1.2.4 2007/05/08 12:08:17 dmitry Exp $ */
-#define _GNU_SOURCE
#include "php.h"
#include "php_zlib.h"
--- php-5.2.4/ext/interbase/interbase.c.gnusrc
+++ php-5.2.4/ext/interbase/interbase.c
@@ -24,7 +24,6 @@
#include "config.h"
#endif
-#define _GNU_SOURCE
#include "php.h"
--- php-5.2.4/configure.in.gnusrc
+++ php-5.2.4/configure.in
@@ -58,6 +58,8 @@ AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
+AC_DEFINE([_GNU_SOURCE], 1, [Define to enable GNU C Library extensions])
+
dnl Setting up the PHP version based on the information above.
dnl -------------------------------------------------------------------------
php-5.2.4-norpath.patch:
--- NEW FILE php-5.2.4-norpath.patch ---
--- php-5.2.4/acinclude.m4.norpath
+++ php-5.2.4/acinclude.m4
@@ -432,6 +432,7 @@ AC_DEFUN([PHP_EVAL_INCLINE],[
dnl internal, don't use
AC_DEFUN([_PHP_ADD_LIBPATH_GLOBAL],[
PHP_RUN_ONCE(LIBPATH, $1, [
+ test "x$PHP_RPATH" != "xno" &&
test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$1"
LDFLAGS="$LDFLAGS -L$1"
PHP_RPATHS="$PHP_RPATHS $1"
@@ -451,6 +452,7 @@ AC_DEFUN([PHP_ADD_LIBPATH],[
],[
if test "$ext_shared" = "yes"; then
$2="-L$ai_p [$]$2"
+ test "x$PHP_RPATH" != "xno" && \
test -n "$ld_runpath_switch" && $2="$ld_runpath_switch$ai_p [$]$2"
else
_PHP_ADD_LIBPATH_GLOBAL([$ai_p])
php-5.2.4-odbc.patch:
--- NEW FILE php-5.2.4-odbc.patch ---
--- php-5.2.4/ext/odbc/config.m4.odbc
+++ php-5.2.4/ext/odbc/config.m4
@@ -423,6 +423,8 @@ PHP_ARG_WITH(unixODBC,,
PHP_ODBC_CHECK_HEADER(sqlext.h)
AC_DEFINE(HAVE_UNIXODBC,1,[ ])
AC_MSG_RESULT([$ext_output])
+ ODBC_SHARED_LIBADD="-lodbc -lodbcpsql"
+ PHP_SUBST(ODBC_SHARED_LIBADD)
fi
fi
php-5.2.4-tests-dashn.patch:
--- NEW FILE php-5.2.4-tests-dashn.patch ---
--- php-5.2.4/ext/standard/tests/file/bug26615.phpt.tests-dashn
+++ php-5.2.4/ext/standard/tests/file/bug26615.phpt
@@ -7,9 +7,9 @@ variables_order=E
$out = array();
$status = -1;
if (substr(PHP_OS, 0, 3) != 'WIN') {
- exec($_ENV['TEST_PHP_EXECUTABLE'].' -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
+ exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
} else {
- exec($_ENV['TEST_PHP_EXECUTABLE'].' -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status);
+ exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status);
}
print_r($out);
?>
--- php-5.2.4/ext/standard/tests/file/proc_open01.phpt.tests-dashn
+++ php-5.2.4/ext/standard/tests/file/proc_open01.phpt
@@ -9,7 +9,7 @@ if ($php === false) {
die("no php executable defined");
}
$proc = proc_open(
- $php,
+ $php . " -n",
array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')),
$pipes
);
--- php-5.2.4/ext/standard/tests/file/bug26938.phpt.tests-dashn
+++ php-5.2.4/ext/standard/tests/file/bug26938.phpt
@@ -6,14 +6,14 @@ $out = array();
$status = -1;
$php = getenv('TEST_PHP_EXECUTABLE');
if (substr(PHP_OS, 0, 3) != 'WIN') {
- exec($php . ' -r \''
+ exec($php . ' -n -r \''
. '$lengths = array(10,20000,10000,5,10000,3);'
. 'foreach($lengths as $length) {'
. ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
. ' print "\n";'
. '}\'', $out, $status);
} else {
- exec($php . ' -r "'
+ exec($php . ' -n -r "'
. '$lengths = array(10,20000,10000,5,10000,3);'
. 'foreach($lengths as $length) {'
. ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
--- php-5.2.4/Makefile.global.tests-dashn
+++ php-5.2.4/Makefile.global
@@ -63,7 +63,7 @@ install-headers:
done; \
fi
-PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
+PHP_TEST_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
PHP_TEST_SHARED_EXTENSIONS = ` \
if test "x$(PHP_MODULES)" != "x"; then \
for i in $(PHP_MODULES)""; do \
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php/F-7/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore 8 May 2007 12:06:37 -0000 1.30
+++ .cvsignore 18 Sep 2007 12:38:19 -0000 1.31
@@ -5,5 +5,5 @@
XML_RPC-1.4.4.tgz
XML_Parser-1.2.7.tgz
Mail-1.1.9.tgz
-php-5.2.2
-php-5.2.2.tar.gz
+php-5.2.4
+php-5.2.4.tar.gz
Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/F-7/php.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- php.spec 10 Jul 2007 16:31:27 -0000 1.140
+++ php.spec 18 Sep 2007 12:38:19 -0000 1.141
@@ -5,7 +5,7 @@
Summary: The PHP HTML-embedded scripting language
Name: php
-Version: 5.2.3
+Version: 5.2.4
Release: 1%{?dist}
License: The PHP License v3.01
Group: Development/Languages
@@ -16,23 +16,23 @@
Source2: php.ini
Source3: macros.php
-Patch1: php-5.1.4-gnusrc.patch
+Patch1: php-5.2.4-gnusrc.patch
Patch2: php-4.3.3-install.patch
-Patch3: php-5.0.4-norpath.patch
+Patch3: php-5.2.4-norpath.patch
Patch5: php-5.0.2-phpize64.patch
Patch8: php-5.2.0-includedir.patch
# Fixes for extension modules
-Patch21: php-4.3.1-odbc.patch
+Patch21: php-5.2.4-odbc.patch
Patch22: php-4.3.11-shutdown.patch
Patch23: php-5.2.2-pdosym.patch
# Functional changes
Patch30: php-5.0.4-dlopen.patch
-Patch31: php-5.0.0-easter.patch
+Patch31: php-5.2.4-easter.patch
# Fixes for tests
-Patch50: php-5.0.4-tests-dashn.patch
+Patch50: php-5.2.4-tests-dashn.patch
Patch51: php-5.0.4-tests-wddx.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -678,6 +678,9 @@
%files mssql -f files.mssql
%changelog
+* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 5.2.4
+- update to 5.2.4
+
* Mon Jul 2 2007 Joe Orton <jorton at redhat.com> 5.2.3-1.fc7
- obsolete php-dbase
- add mcrypt, mhash, tidy, mssql subpackages (Dmitry Butskoy)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php/F-7/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources 10 Jul 2007 16:31:27 -0000 1.33
+++ sources 18 Sep 2007 12:38:19 -0000 1.34
@@ -1 +1 @@
-df79b04d63fc4c1ccb6d8ea58a9cf3ac php-5.2.3.tar.gz
+0826e231c3148b29fd039d7a8c893ad3 php-5.2.4.tar.gz
--- php-4.3.1-odbc.patch DELETED ---
--- php-5.0.0-easter.patch DELETED ---
--- php-5.0.4-norpath.patch DELETED ---
--- php-5.0.4-tests-dashn.patch DELETED ---
--- php-5.1.4-gnusrc.patch DELETED ---
More information about the fedora-extras-commits
mailing list