Author: oden
Date: Wed Feb 7 22:19:16 2007
New Revision: 117335
Added:
packages/cooker/php/current/SOURCES/php-5.2.1.tar.bz2 (contents, props
changed)
packages/cooker/php/current/SOURCES/php-extraimapcheck.diff
packages/cooker/php/current/SOURCES/php-umask.diff
packages/cooker/php/current/SOURCES/suhosin-patch-5.2.1-0.9.6.2.patch.gz
(contents, props changed)
packages/cooker/php/current/SOURCES/suhosin-patch-5.2.1-0.9.6.2.patch.gz.sig
(contents, props changed)
Removed:
packages/cooker/php/current/SOURCES/php-4.3.6-umask.patch
packages/cooker/php/current/SOURCES/php-5.1.4-extraimapcheck.diff
packages/cooker/php/current/SOURCES/php-5.2.0-curl-7.16.0.diff
packages/cooker/php/current/SOURCES/php-5.2.0.tar.bz2
packages/cooker/php/current/SOURCES/suhosin-patch-5.2.0-0.9.6.2.patch.gz
packages/cooker/php/current/SOURCES/suhosin-patch-5.2.0-0.9.6.2.patch.gz.sig
Modified:
packages/cooker/php/current/SPECS/php.spec
Log:
- 5.2.1
- suhosin-patch-5.2.1-0.9.6.2
- rediffed and dropped upstream patches
Added: packages/cooker/php/current/SOURCES/php-5.2.1.tar.bz2
==============================================================================
Binary file. No diff available.
Added: packages/cooker/php/current/SOURCES/php-extraimapcheck.diff
==============================================================================
--- (empty file)
+++ packages/cooker/php/current/SOURCES/php-extraimapcheck.diff Wed Feb 7
22:19:16 2007
@@ -0,0 +1,12 @@
+--- ext/imap/php_imap.c 2007-02-07 21:59:59.000000000 +0100
++++ ext/imap/php_imap.c.oden 2007-02-07 22:03:23.000000000 +0100
+@@ -787,6 +787,9 @@
+ convert_to_string_ex(mailbox);
+ convert_to_string_ex(user);
+ convert_to_string_ex(passwd);
++ if ((PG(open_basedir) && *PG(open_basedir) || PG(safe_mode)) &&
++ (!php_checkuid(mailbox, NULL, CHECKUID_CHECK_FILE_AND_DIR)))
++ RETURN_FALSE;
+ if (myargc >= 4) {
+ convert_to_long_ex(options);
+ flags = Z_LVAL_PP(options);
Added: packages/cooker/php/current/SOURCES/php-umask.diff
==============================================================================
--- (empty file)
+++ packages/cooker/php/current/SOURCES/php-umask.diff Wed Feb 7 22:19:16 2007
@@ -0,0 +1,72 @@
+--- sapi/apache2handler/sapi_apache2.c 2007-01-01 10:36:12.000000000 +0100
++++ sapi/apache2handler/sapi_apache2.c.oden 2007-02-07 21:18:47.000000000
+0100
+@@ -419,20 +419,33 @@
+ return OK;
+ }
+
+ static apr_status_t php_server_context_cleanup(void *data_)
+ {
+ void **data = data_;
+ *data = NULL;
+ return APR_SUCCESS;
+ }
+
++static int saved_umask;
++
++static void php_save_umask(void)
++{
++ saved_umask = umask(0777);
++ umask(saved_umask);
++}
++
++static void php_restore_umask(void)
++{
++ umask(saved_umask);
++}
++
+ static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
+ {
+ char *content_length;
+ const char *auth;
+
+ SG(sapi_headers).http_response_code = !r->status ? HTTP_OK : r->status;
+ SG(request_info).content_type = apr_table_get(r->headers_in,
"Content-Type");
+ SG(request_info).query_string = apr_pstrdup(r->pool, r->args);
+ SG(request_info).request_method = r->method;
+ SG(request_info).proto_num = r->proto_num;
+@@ -607,31 +620,35 @@
+ }
+
+ /* Determine if we need to parse the file or show the source */
+ if (strncmp(r->handler, PHP_SOURCE_MAGIC_TYPE,
sizeof(PHP_SOURCE_MAGIC_TYPE) - 1) == 0) {
+ zend_syntax_highlighter_ini syntax_highlighter_ini;
+ php_get_highlight_struct(&syntax_highlighter_ini);
+ highlight_file((char *)r->filename, &syntax_highlighter_ini
TSRMLS_CC);
+ } else {
+ zend_file_handle zfd;
+
++ php_save_umask();
++
+ zfd.type = ZEND_HANDLE_FILENAME;
+ zfd.filename = (char *) r->filename;
+ zfd.free_filename = 0;
+ zfd.opened_path = NULL;
+
+ if (!parent_req) {
+ php_execute_script(&zfd TSRMLS_CC);
+ } else {
+ zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, NULL, 1,
&zfd);
+ }
+
++ php_restore_umask();
++
+ apr_table_set(r->notes, "mod_php_memory_usage",
+ apr_psprintf(ctx->r->pool, "%u",
zend_memory_peak_usage(1 TSRMLS_CC)));
+ }
+
+ } zend_end_try();
+
+ if (!parent_req) {
+ php_apache_request_dtor(r TSRMLS_CC);
+ ctx->request_processed = 1;
+ bucket = apr_bucket_eos_create(r->connection->bucket_alloc);
Added: packages/cooker/php/current/SOURCES/suhosin-patch-5.2.1-0.9.6.2.patch.gz
==============================================================================
Binary file. No diff available.
Added:
packages/cooker/php/current/SOURCES/suhosin-patch-5.2.1-0.9.6.2.patch.gz.sig
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/php/current/SPECS/php.spec
==============================================================================
--- packages/cooker/php/current/SPECS/php.spec (original)
+++ packages/cooker/php/current/SPECS/php.spec Wed Feb 7 22:19:16 2007
@@ -8,8 +8,8 @@
Summary: The PHP5 scripting language
Name: php
-Version: 5.2.0
-Release: %mkrel 15
+Version: 5.2.1
+Release: %mkrel 0
Group: Development/PHP
License: PHP License
URL: http://www.php.net
@@ -53,7 +53,7 @@
Patch101: php-5.1.0b1-cxx.diff
Patch102: php-4.3.3-install.patch
Patch103: php-5.0.4-norpath.patch
-Patch105: php-4.3.6-umask.patch
+Patch105: php-umask.diff
# Fixes for extension modules
Patch111: php-4.3.1-odbc.patch
Patch112: php-4.3.11-shutdown.patch
@@ -68,8 +68,7 @@
# http://bugs.php.net/bug.php?id=29119
Patch201: php-5.0.4-bug29119.diff
Patch202: php-5.1.0RC6-CVE-2005-3388.diff
-Patch208: php-5.1.4-extraimapcheck.diff
-Patch209: php-5.2.0-curl-7.16.0.diff
+Patch208: php-extraimapcheck.diff
Patch210: php-CVE-2007-0455.diff
# http://www.suhosin.org/
Patch300: suhosin-patch-%{version}-%{suhosin_version}.patch.gz
@@ -467,7 +466,7 @@
%patch101 -p0 -b .cxx.droplet
%patch102 -p1 -b .install.droplet
%patch103 -p1 -b .norpath.droplet
-%patch105 -p1 -b .umask.droplet
+%patch105 -p0 -b .umask.droplet
%patch111 -p1 -b .odbc.droplet
%patch112 -p1 -b .shutdown.droplet
%patch113 -p0 -b .libc-client-php.droplet
@@ -484,7 +483,6 @@
%patch202 -p0 -b .CVE-2005-3388.droplet
%patch208 -p0 -b .open_basedir_and_safe_mode_checks.droplet
-%patch209 -p0 -b .curl-7.16.0.droplet
%patch210 -p0 -b .php-CVE-2007-0455.droplet
%patch300 -p1 -b .suhosin.droplet
