From: Bartosz Świątek Date: Fri, 2 Aug 2013 12:24:04 +0000 (+0200) Subject: - it's TLD, not PLD X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=0462ff5f30fcb7f5ac2a199114e810041d9f643b;p=packages%2Fphp.git - it's TLD, not PLD - rel 2 --- diff --git a/php-pldlogo.patch b/php-pldlogo.patch deleted file mode 100644 index 2b67aac..0000000 --- a/php-pldlogo.patch +++ /dev/null @@ -1,176 +0,0 @@ ---- php-4.3.3RC3/ext/standard/info.c.orig 2003-06-19 18:43:41.000000000 +0200 -+++ php-4.3.3RC3/ext/standard/info.c 2003-08-16 21:37:18.705836072 +0200 -@@ -518,6 +518,21 @@ - PUTS(!sapi_module.phpinfo_as_text?"
":"\n"); - PUTS(zend_version); - php_info_print_box_end(); -+ /* PLD Linux */ -+ php_info_print_box_start(0); -+ if (expose_php && !sapi_module.phpinfo_as_text) { -+ PUTS("\"PLD\n"); -+ } -+ PUTS("This server is using PLD Linux."); -+ if (!sapi_module.phpinfo_as_text) -+ PUTS("
More information at http://www.pld-linux.org/.
\n"); -+ else -+ PUTS("\nMore information at http://www.pld-linux.org/.\n"); -+ php_info_print_box_end(); - efree(php_uname); - } - -diff -urN php-4.2.1RC2.org/ext/standard/info.h php-4.2.1RC2/ext/standard/info.h ---- php-4.2.1RC2.org/ext/standard/info.h Sat May 11 20:49:24 2002 -+++ php-4.2.1RC2/ext/standard/info.h Sat May 11 20:49:40 2002 -@@ -54,6 +54,7 @@ - #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" -+#define PLD_LOGO_GUID "PHPE9568F40-D428-11d2-A769-00AA001ACF42" - - PHP_FUNCTION(phpversion); - PHP_FUNCTION(phpinfo); ---- php-4.3.0.org/main/logos.h Sat May 11 20:49:24 2002 -+++ php-4.3.0/main/logos.h Sat May 11 20:50:32 2002 -@@ -1503,1 +1503,127 @@ - 249, 249, 207, 233, 5, 4, 0, 59 }; -+ -+ -+unsigned char pld_logo[] = { -+ 137, 80, 78, 71, 13, 10, 26, 10, 0, 0, -+ 0, 13, 73, 72, 68, 82, 0, 0, 0, 80, -+ 0, 0, 0, 50, 8, 3, 0, 0, 0, 252, -+ 243, 172, 206, 0, 0, 2, 46, 80, 76, 84, -+ 69, 192, 192, 192, 0, 0, 99, 0, 0, 97, -+ 0, 0, 96, 0, 0, 95, 0, 0, 94, 0, -+ 0, 93, 0, 0, 91, 2, 2, 98, 6, 6, -+ 102, 6, 6, 101, 11, 11, 101, 14, 14, 111, -+ 15, 15, 103, 16, 16, 107, 21, 21, 111, 26, -+ 26, 111, 27, 27, 112, 28, 28, 115, 27, 27, -+ 109, 29, 29, 114, 30, 30, 114, 31, 31, 115, -+ 34, 34, 119, 36, 36, 120, 35, 35, 117, 36, -+ 36, 119, 36, 36, 117, 38, 38, 120, 40, 40, -+ 121, 42, 42, 123, 42, 42, 122, 41, 41, 118, -+ 42, 42, 120, 44, 44, 125, 47, 47, 128, 46, -+ 46, 120, 49, 49, 124, 53, 53, 130, 55, 55, -+ 133, 59, 59, 133, 63, 63, 138, 61, 61, 134, -+ 60, 60, 131, 58, 58, 125, 64, 64, 137, 63, -+ 63, 135, 60, 60, 129, 61, 61, 129, 65, 65, -+ 135, 67, 67, 138, 64, 64, 131, 69, 69, 140, -+ 71, 71, 141, 70, 70, 139, 70, 70, 137, 70, -+ 70, 136, 71, 71, 137, 68, 68, 131, 76, 76, -+ 142, 79, 79, 146, 78, 78, 143, 79, 79, 144, -+ 79, 79, 143, 74, 74, 134, 74, 74, 133, 83, -+ 83, 147, 89, 89, 154, 82, 82, 141, 90, 90, -+ 154, 90, 90, 153, 88, 88, 150, 91, 91, 153, -+ 90, 90, 151, 93, 93, 152, 98, 98, 159, 96, -+ 96, 156, 91, 91, 148, 96, 96, 155, 94, 94, -+ 152, 88, 88, 142, 89, 89, 143, 100, 100, 160, -+ 93, 93, 147, 103, 103, 162, 101, 101, 159, 92, -+ 92, 144, 96, 96, 149, 106, 106, 164, 98, 98, -+ 152, 96, 96, 148, 108, 108, 165, 106, 106, 162, -+ 101, 101, 154, 102, 102, 155, 103, 103, 156, 111, -+ 111, 167, 103, 103, 155, 112, 112, 167, 104, 104, -+ 155, 112, 112, 164, 116, 116, 168, 109, 109, 156, -+ 118, 118, 168, 127, 127, 177, 125, 125, 174, 125, -+ 125, 173, 111, 111, 154, 127, 127, 175, 124, 124, -+ 171, 128, 128, 176, 137, 137, 184, 137, 137, 183, -+ 128, 128, 171, 125, 125, 166, 140, 140, 185, 126, -+ 126, 167, 137, 137, 180, 143, 143, 185, 141, 141, -+ 183, 146, 146, 188, 144, 144, 185, 148, 148, 189, -+ 138, 138, 175, 137, 137, 174, 148, 148, 187, 149, -+ 149, 185, 158, 158, 195, 157, 157, 193, 153, 153, -+ 187, 164, 164, 199, 166, 166, 201, 165, 165, 200, -+ 156, 156, 188, 155, 155, 187, 160, 160, 192, 171, -+ 171, 204, 169, 169, 202, 170, 170, 202, 177, 177, -+ 209, 158, 158, 187, 174, 174, 205, 166, 166, 195, -+ 173, 173, 203, 173, 173, 202, 169, 169, 197, 167, -+ 167, 194, 168, 168, 194, 184, 184, 212, 173, 173, -+ 198, 187, 187, 213, 185, 185, 210, 183, 183, 208, -+ 189, 189, 214, 194, 194, 218, 189, 189, 213, 184, -+ 184, 207, 183, 183, 206, 195, 195, 218, 199, 199, -+ 222, 200, 200, 222, 196, 196, 217, 198, 198, 218, -+ 194, 194, 214, 188, 188, 207, 204, 204, 224, 197, -+ 197, 215, 209, 209, 227, 208, 208, 226, 207, 207, -+ 225, 206, 206, 224, 205, 205, 223, 208, 208, 225, -+ 205, 205, 222, 196, 196, 212, 211, 211, 227, 206, -+ 206, 222, 213, 213, 229, 209, 209, 224, 216, 216, -+ 231, 212, 212, 227, 202, 202, 216, 219, 219, 233, -+ 217, 217, 231, 204, 204, 217, 226, 226, 235, 152, -+ 38, 201, 129, 0, 0, 0, 1, 116, 82, 78, -+ 83, 0, 64, 230, 216, 102, 0, 0, 0, 1, -+ 98, 75, 71, 68, 185, 58, 184, 22, 96, 0, -+ 0, 2, 57, 73, 68, 65, 84, 120, 218, 99, -+ 96, 24, 156, 32, 195, 207, 92, 180, 159, 138, -+ 230, 21, 123, 173, 101, 8, 148, 164, 158, 121, -+ 249, 210, 64, 98, 134, 10, 245, 12, 228, 9, -+ 3, 18, 157, 217, 212, 51, 16, 236, 217, 164, -+ 30, 170, 153, 167, 92, 2, 36, 58, 100, 168, -+ 102, 158, 115, 20, 136, 204, 76, 161, 150, 121, -+ 221, 198, 32, 114, 150, 236, 60, 106, 25, 40, -+ 54, 29, 68, 26, 53, 80, 203, 60, 241, 62, -+ 16, 25, 212, 70, 45, 243, 52, 107, 64, 100, -+ 179, 22, 181, 204, 155, 239, 2, 166, 148, 106, -+ 169, 101, 160, 4, 152, 76, 42, 164, 150, 121, -+ 222, 213, 96, 202, 140, 90, 230, 109, 115, 7, -+ 83, 174, 147, 168, 101, 96, 197, 22, 16, 57, -+ 197, 2, 72, 180, 80, 197, 192, 157, 96, 82, -+ 61, 145, 129, 97, 38, 187, 19, 181, 92, 201, -+ 16, 193, 217, 10, 36, 125, 217, 52, 168, 100, -+ 222, 10, 249, 180, 34, 16, 29, 206, 42, 69, -+ 29, 3, 155, 96, 229, 106, 48, 155, 53, 85, -+ 12, 12, 113, 128, 177, 84, 89, 230, 82, 195, -+ 192, 232, 0, 24, 107, 29, 179, 28, 53, 12, -+ 76, 48, 128, 51, 35, 89, 167, 82, 193, 192, -+ 82, 94, 4, 155, 195, 146, 10, 6, 78, 96, -+ 222, 1, 103, 219, 50, 81, 195, 207, 76, 241, -+ 112, 230, 68, 150, 201, 84, 48, 208, 159, 101, -+ 25, 156, 205, 149, 76, 13, 39, 10, 240, 65, -+ 25, 11, 54, 120, 10, 18, 171, 137, 17, 78, -+ 96, 130, 173, 220, 252, 43, 193, 140, 133, 113, -+ 237, 28, 32, 101, 64, 64, 145, 129, 12, 12, -+ 142, 58, 149, 27, 65, 180, 97, 163, 16, 84, -+ 25, 65, 19, 241, 27, 8, 4, 75, 64, 68, -+ 110, 172, 30, 220, 64, 176, 51, 17, 8, 76, -+ 65, 25, 112, 63, 48, 194, 20, 97, 49, 122, -+ 209, 108, 32, 177, 88, 209, 30, 102, 32, 212, -+ 84, 168, 129, 16, 2, 137, 135, 112, 33, 92, -+ 4, 13, 212, 167, 130, 72, 17, 109, 152, 189, -+ 48, 3, 161, 16, 46, 132, 144, 35, 96, 96, -+ 153, 9, 136, 180, 211, 71, 87, 11, 119, 24, -+ 3, 134, 57, 248, 13, 172, 50, 5, 145, 233, -+ 10, 240, 240, 96, 100, 100, 68, 210, 11, 115, -+ 24, 52, 104, 81, 194, 16, 123, 228, 116, 197, -+ 128, 200, 114, 97, 130, 233, 5, 103, 148, 163, -+ 129, 222, 80, 16, 57, 221, 138, 90, 230, 49, -+ 172, 206, 2, 83, 53, 100, 185, 16, 27, 88, -+ 227, 6, 166, 230, 64, 67, 134, 17, 150, 228, -+ 144, 248, 48, 247, 48, 34, 83, 56, 193, 52, -+ 31, 48, 181, 137, 1, 158, 118, 145, 12, 68, -+ 209, 79, 68, 190, 4, 129, 149, 57, 168, 78, -+ 64, 55, 16, 97, 14, 146, 11, 225, 110, 71, -+ 214, 2, 149, 223, 236, 65, 158, 129, 12, 8, -+ 67, 144, 19, 20, 3, 195, 246, 60, 178, 12, -+ 100, 192, 105, 224, 230, 2, 36, 3, 209, 35, -+ 133, 120, 3, 17, 202, 150, 235, 46, 69, 15, -+ 117, 202, 92, 184, 202, 6, 191, 129, 24, 177, -+ 140, 97, 32, 35, 170, 129, 12, 106, 29, 152, -+ 6, 50, 50, 162, 196, 37, 138, 48, 186, 79, -+ 81, 5, 25, 24, 214, 215, 17, 149, 186, 200, -+ 0, 0, 218, 35, 72, 230, 144, 1, 81, 42, -+ 0, 0, 0, 0, 73, 69, 78, 68, 174, 66, -+ 96, 130 }; -diff -urN php-4.2.1RC2.org/main/php_logos.c php-4.2.1RC2/main/php_logos.c ---- php-4.2.1RC2.org/main/php_logos.c Sat May 11 20:49:24 2002 -+++ php-4.2.1RC2/main/php_logos.c Sat May 11 20:51:05 2002 -@@ -56,6 +56,7 @@ - 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)); -+ php_register_info_logo(PLD_LOGO_GUID , "image/png", pld_logo , sizeof(pld_logo)); - - return SUCCESS; - } diff --git a/php-tld.patch b/php-tld.patch new file mode 100644 index 0000000..5c54bdb --- /dev/null +++ b/php-tld.patch @@ -0,0 +1,22 @@ +--- php-4.3.3RC3/ext/standard/info.c.orig 2003-06-19 18:43:41.000000000 +0200 ++++ php-4.3.3RC3/ext/standard/info.c 2003-08-16 21:37:18.705836072 +0200 +@@ -518,6 +518,20 @@ + PUTS(!sapi_module.phpinfo_as_text?"
":"\n"); + PUTS(zend_version); + php_info_print_box_end(); ++ /* TLD Linux */ ++ php_info_print_box_start(0); ++ if (expose_php && !sapi_module.phpinfo_as_text) { ++ PUTS(""); ++ if (SG(request_info).request_uri) { ++ PUTS(SG(request_info).request_uri); ++ } ++ } ++ PUTS("This server is using TLD Linux."); ++ if (!sapi_module.phpinfo_as_text) ++ PUTS("
More information at
http://www.tld-linux.org/.
\n"); ++ else ++ PUTS("\nMore information at http://www.tld-linux.org/.\n"); ++ php_info_print_box_end(); + efree(php_uname); + } diff --git a/php.spec b/php.spec index e22eeaa..dadf2d8 100644 --- a/php.spec +++ b/php.spec @@ -111,7 +111,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %undefine with_filter %endif -%define rel 1 +%define rel 2 %define orgname php %define ver_suffix 53 %define php_suffix %{!?with_default_php:%{ver_suffix}} @@ -143,7 +143,7 @@ Source14: skip-tests.sh Source15: http://litespeedtech.com/packages/lsapi/%{orgname}-litespeed-%{litespeed_version}.tgz # Source15-md5: 69cf9c68d37b5b0b041889294ab305fe Patch0: %{orgname}-shared.patch -Patch1: %{orgname}-pldlogo.patch +Patch1: %{orgname}-tld.patch Patch2: %{orgname}-mail.patch Patch3: %{orgname}-link-libs.patch Patch4: %{orgname}-libpq_fs_h_path.patch