[boinc] 04/04: dropped several patches (buffer increases)
Guo Yixuan
yixuan-guest at moszumanska.debian.org
Tue Jun 24 03:12:08 UTC 2014
This is an automated email from the git hooks/post-receive script.
yixuan-guest pushed a commit to branch master
in repository boinc.
commit 86e1f19ba27acb7e78339f736b1d73c47b6c4942
Author: Guo Yixuan <culu.gyx at gmail.com>
Date: Mon Jun 23 23:09:58 2014 -0400
dropped several patches (buffer increases)
These are neither applied currently, nor accepted by upstream:
add_init_to_client_state_constructor.patch
app_ipc_uninitialised_B_buffer.patch
client_path_char_array_length.patch
cwd_handling.patch
---
.../add_init_to_client_state_constructor.patch | 25 ---
.../patches/app_ipc_uninitialised_B_buffer.patch | 56 -------
debian/patches/client_path_char_array_length.patch | 177 ---------------------
debian/patches/cwd_handling.patch | 92 -----------
debian/patches/series | 4 -
5 files changed, 354 deletions(-)
diff --git a/debian/patches/add_init_to_client_state_constructor.patch b/debian/patches/add_init_to_client_state_constructor.patch
deleted file mode 100644
index e78664d..0000000
--- a/debian/patches/add_init_to_client_state_constructor.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: Steffen Moeller <moeller at debian.org>
-Description: Increase of buffers describing client state.
-
-Index: boinc/client/client_state.cpp
-===================================================================
---- boinc.orig/client/client_state.cpp 2012-05-03 13:53:07.275804022 +0200
-+++ boinc/client/client_state.cpp 2012-05-03 13:53:25.599553075 +0200
-@@ -293,7 +293,7 @@
- int CLIENT_STATE::init() {
- int retval;
- unsigned int i;
-- char buf[256];
-+ char buf[2048];
- PROJECT* p;
-
- srand((unsigned int)time(0));
-@@ -1059,7 +1059,7 @@
- }
-
- if (!strcmp(file_ref.open_name, GRAPHICS_APP_FILENAME)) {
-- char relpath[512], path[512];
-+ char relpath[1024], path[2048];
- get_pathname(fip, relpath, sizeof(relpath));
- relative_to_absolute(relpath, path);
- strlcpy(avp->graphics_exec_path, path, sizeof(avp->graphics_exec_path));
diff --git a/debian/patches/app_ipc_uninitialised_B_buffer.patch b/debian/patches/app_ipc_uninitialised_B_buffer.patch
deleted file mode 100644
index 4b92689..0000000
--- a/debian/patches/app_ipc_uninitialised_B_buffer.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Author: Steffen Moeller <moeller at debian.org>
-Description: Improving initalisation of app_init_data
-
-Index: boinc/lib/app_ipc.cpp
-===================================================================
---- boinc.orig/lib/app_ipc.cpp 2012-05-06 14:00:20.000000000 +0200
-+++ boinc/lib/app_ipc.cpp 2012-05-06 14:04:04.956192691 +0200
-@@ -137,7 +137,7 @@
- }
-
- int write_init_data_file(FILE* f, APP_INIT_DATA& ai) {
-- char buf[2048];
-+ char buf[9192];
- fprintf(f,
- "<app_init_data>\n"
- "<major_version>%d</major_version>\n"
-@@ -469,7 +469,7 @@
- const char *virtual_name, char *physical_name, int len
- ) {
- FILE *fp;
-- char buf[512], *p;
-+ char buf[4096], *p;
-
- if (!virtual_name) return ERR_NULL;
- strlcpy(physical_name, virtual_name, len);
-@@ -502,7 +502,7 @@
- // same, std::string version
- //
- int boinc_resolve_filename_s(const char *virtual_name, string& physical_name) {
-- char buf[512], *p;
-+ char buf[4096], *p;
- if (!virtual_name) return ERR_NULL;
- physical_name = virtual_name;
- #ifndef _WIN32
-@@ -520,7 +520,7 @@
- }
-
- void url_to_project_dir(char* url, char* dir) {
-- char buf[256];
-+ char buf[4096];
- escape_project_url(url, buf);
- sprintf(dir, "%s/%s", PROJECT_DIR, buf);
- }
-Index: boinc/lib/app_ipc.h
-===================================================================
---- boinc.orig/lib/app_ipc.h 2012-05-03 17:05:19.000000000 +0200
-+++ boinc/lib/app_ipc.h 2012-05-06 14:04:04.960192637 +0200
-@@ -193,7 +193,7 @@
-
- // info for GPU apps
- //
-- char gpu_type[64];
-+ char gpu_type[512];
- int gpu_device_num;
- int gpu_opencl_dev_index;
-
diff --git a/debian/patches/client_path_char_array_length.patch b/debian/patches/client_path_char_array_length.patch
deleted file mode 100644
index 00a431b..0000000
--- a/debian/patches/client_path_char_array_length.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-Author: Steffen Moeller <moeller at debian.org>
-Description: Extension of path lengths
-
-Index: boinc/client/acct_mgr.h
-===================================================================
---- boinc.orig/client/acct_mgr.h 2012-03-27 14:02:21.716769660 +0200
-+++ boinc/client/acct_mgr.h 2012-03-30 18:31:27.906016323 +0200
-@@ -49,7 +49,7 @@
- // use of cookies are required during initial signup
- // NOTE: This bool gets dropped after the client has
- // successfully attached to an account manager
-- char cookie_failure_url[256];
-+ char cookie_failure_url[1024];
- // if the cookies could not be detected, provide a
- // link to a website to go to so the user can find
- // what login name and password they have been assigned
-@@ -120,7 +120,7 @@
- std::vector<AM_ACCOUNT> accounts;
- double repeat_sec;
- char* global_prefs_xml;
-- char host_venue[256];
-+ char host_venue[1024];
- bool got_rss_feeds;
- std::vector<RSS_FEED>rss_feeds;
-
-Index: boinc/client/app.h
-===================================================================
---- boinc.orig/client/app.h 2012-03-27 14:02:21.728769496 +0200
-+++ boinc/client/app.h 2012-03-30 18:30:24.810879369 +0200
-@@ -110,9 +110,9 @@
- double bytes_sent;
- // reported by the app if it does network I/O
- double bytes_received;
-- char slot_dir[256];
-+ char slot_dir[1024];
- // directory where process runs (relative)
-- char slot_path[512];
-+ char slot_path[1024];
- // same, absolute
- // This is used only to run graphics apps
- // (that way don't have to worry about top-level dirs
-@@ -151,8 +151,8 @@
- // but not descendants of the main process
- // (e.g. VMs created by vboxwrapper)
- // These are communicated via the app_status message channel
-- char web_graphics_url[256];
-- char remote_desktop_addr[256];
-+ char web_graphics_url[1024];
-+ char remote_desktop_addr[1024];
- ASYNC_COPY* async_copy;
-
- void set_task_state(int, const char*);
-Index: boinc/client/client_state.h
-===================================================================
---- boinc.orig/client/client_state.h 2012-03-27 14:02:21.764769005 +0200
-+++ boinc/client/client_state.h 2012-03-30 18:27:02.037653176 +0200
-@@ -125,16 +125,16 @@
- bool in_abort_sequence;
- // Determine when it is safe to leave the quit_client() handler
- // and to finish cleaning up.
-- char detach_project_url[256];
-+ char detach_project_url[1024];
- // stores URL for -detach_project option
-- char reset_project_url[256];
-+ char reset_project_url[1024];
- // stores URL for -reset_project option
-- char update_prefs_url[256];
-+ char update_prefs_url[1024];
- // stores URL for -update_prefs option
-- char main_host_venue[256];
-+ char main_host_venue[1024];
- // venue from project or AMS that gave us general prefs
-- char attach_project_url[256];
-- char attach_project_auth[256];
-+ char attach_project_url[1024];
-+ char attach_project_auth[1024];
- bool exit_before_upload;
- // exit when about to upload a file
- #ifndef _WIN32
-Index: boinc/client/cs_notice.h
-===================================================================
---- boinc.orig/client/cs_notice.h 2012-03-27 14:02:21.800768513 +0200
-+++ boinc/client/cs_notice.h 2012-03-30 18:27:51.556975760 +0200
-@@ -86,9 +86,9 @@
- extern NOTICES notices;
-
- struct RSS_FEED {
-- char url[256];
-- char url_base[256];
-- char project_name[256];
-+ char url[1024];
-+ char url_base[1024];
-+ char project_name[1024];
- double poll_interval;
- double next_poll_time;
- bool found;
-Index: boinc/client/file_xfer.h
-===================================================================
---- boinc.orig/client/file_xfer.h 2012-03-27 14:02:21.840767966 +0200
-+++ boinc/client/file_xfer.h 2012-03-30 18:25:44.078719674 +0200
-@@ -33,8 +33,8 @@
- class FILE_XFER : public HTTP_OP {
- public:
- FILE_INFO* fip;
-- char pathname[256];
-- char header[4096];
-+ char pathname[2048];
-+ char header[8192];
- bool file_size_query;
- bool is_upload;
- double starting_size;
-Index: boinc/client/http_curl.h
-===================================================================
---- boinc.orig/client/http_curl.h 2012-03-27 14:02:21.868767583 +0200
-+++ boinc/client/http_curl.h 2012-03-30 18:23:36.392465752 +0200
-@@ -57,15 +57,15 @@
- PROXY_INFO pi;
- PROJECT* project; // associated project, if any
-
-- char m_url[256];
-- char m_curl_ca_bundle_location[256];
-+ char m_url[1024];
-+ char m_curl_ca_bundle_location[1024];
- // string needed for ssl support
-- char m_curl_user_credentials[128];
-+ char m_curl_user_credentials[1024];
- // string needed for proxy username/password
-
- int content_length;
- unsigned int trace_id;
-- char request_header[4096];
-+ char request_header[8192];
-
- FILE* fileIn;
- FILE* fileOut;
-@@ -85,7 +85,7 @@
- //
- char* req1;
- // if not NULL, send this string first
-- char infile[256];
-+ char infile[1024];
- // then (is nonempty) this file
- double file_offset;
- // starting at this offset
-@@ -93,7 +93,7 @@
- // reply message stuff
- //
- // reply is always written to a file
-- char outfile[256];
-+ char outfile[1024];
- // if specified, it's written to this file w/ optional offset
- // otherwise it's written to a temp file
- // if type POST2, copy output to req1 buffer
-@@ -102,7 +102,7 @@
-
- long lSeek;
- // offset within the file or memory buffer we're reading,
-- char error_msg[256];
-+ char error_msg[1024];
- // put Curl error message here
- bool bTempOutfile;
- // CMC -- flag that outfile is really a tempfile we should delete
-Index: boinc/client/scheduler_op.h
-===================================================================
---- boinc.orig/client/scheduler_op.h 2012-03-27 14:02:21.924766818 +0200
-+++ boinc/client/scheduler_op.h 2012-03-30 18:19:03.480197856 +0200
-@@ -104,8 +104,8 @@
- char* project_prefs_xml;
- // not including <project_preferences> tags
- // may include <venue> elements
-- char master_url[256];
-- char host_venue[256];
-+ char master_url[1024];
-+ char host_venue[1024];
- unsigned int user_create_time;
- std::vector<APP> apps;
- std::vector<FILE_INFO> file_infos;
diff --git a/debian/patches/cwd_handling.patch b/debian/patches/cwd_handling.patch
deleted file mode 100644
index 34065df..0000000
--- a/debian/patches/cwd_handling.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Author: Steffen Moeller <moeller at debian.org>
-Description: Path length beyond 256.
-
-Index: boinc/client/app_start.cpp
-===================================================================
---- boinc.orig/client/app_start.cpp 2012-05-03 13:38:04.268172206 +0200
-+++ boinc/client/app_start.cpp 2012-05-03 13:42:12.008777476 +0200
-@@ -123,7 +123,7 @@
- static void coproc_cmdline(
- int rsc_type, RESULT* rp, double ninstances, char* cmdline
- ) {
-- char buf[256];
-+ char buf[1024];
- COPROC* coproc = &coprocs.coprocs[rsc_type];
- for (int j=0; j<ninstances; j++) {
- int k = rp->coproc_indices[j];
-@@ -160,7 +160,7 @@
- if (!shm_handle) return ERR_SHMGET;
- sprintf(shmem_seg_name, "boinc_%d", i);
- #else
-- char init_data_path[256];
-+ char init_data_path[1024];
- #ifndef __EMX__
- // shmem_seg_name is not used with mmap() shared memory
- if (app_version->api_major_version() >= 6) {
-@@ -195,7 +195,7 @@
- }
-
- void ACTIVE_TASK::init_app_init_data(APP_INIT_DATA& aid) {
-- char project_dir[256], project_path[256];
-+ char project_dir[1024], project_path[1024];
-
- aid.major_version = BOINC_MAJOR_VERSION;
- aid.minor_version = BOINC_MINOR_VERSION;
-@@ -279,7 +279,7 @@
- //
- int ACTIVE_TASK::write_app_init_file(APP_INIT_DATA& aid) {
- FILE *f;
-- char init_data_path[256];
-+ char init_data_path[1024];
-
- sprintf(init_data_path, "%s/%s", slot_dir, INIT_DATA_FILE);
-
-@@ -353,7 +353,7 @@
- int ACTIVE_TASK::setup_file(
- FILE_INFO* fip, FILE_REF& fref, char* file_path, bool input, bool is_io_file
- ) {
-- char link_path[256], rel_file_path[256], open_name[256];
-+ char link_path[1024], rel_file_path[1024], open_name[256];
- int retval;
- PROJECT* project = result->project;
-
-@@ -439,7 +439,7 @@
- }
-
- int ACTIVE_TASK::copy_output_files() {
-- char slotfile[256], projfile[256], open_name[256];
-+ char slotfile[1024], projfile[1024], open_name[1024];
- unsigned int i;
- for (i=0; i<result->output_files.size(); i++) {
- FILE_REF& fref = result->output_files[i];
-@@ -481,7 +481,7 @@
- // ACTIVE_TASK::task_state is PROCESS_EXECUTING
- //
- int ACTIVE_TASK::start() {
-- char exec_name[256], file_path[256], buf[256], exec_path[256];
-+ char exec_name[1024], file_path[1024], buf[1024], exec_path[1024];
- char cmdline[80000]; // 64KB plus some extra
- unsigned int i;
- FILE_REF fref;
-@@ -628,7 +628,7 @@
- PROCESS_INFORMATION process_info;
- STARTUPINFO startup_info;
- LPVOID environment_block = NULL;
-- char slotdirpath[256];
-+ char slotdirpath[1024];
- char error_msg[1024];
- char error_msg2[1024];
-
-Index: boinc/client/auto_update.cpp
-===================================================================
---- boinc.orig/client/auto_update.cpp 2012-05-03 13:28:56.075686520 +0200
-+++ boinc/client/auto_update.cpp 2012-05-03 13:42:12.012777421 +0200
-@@ -179,7 +179,7 @@
- unsigned int i;
- FILE_INFO* fip=0;
- char version_dir[1024];
-- char cwd[256];
-+ char cwd[1024];
- char *argv[10];
- int retval, argc;
- #ifdef _WIN32
diff --git a/debian/patches/series b/debian/patches/series
index 1d246ae..d604c38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,15 +10,11 @@ upstream_sztaki_configureEval.patch
generate_less.patch
possible_size_type_error.patch
debian_debian_AdjustBoincTopdirPython.patch
-#convinceDavid#cwd_handling.patch
# --- A
#convinceDavid# bug672328 MoreInformativeAppStartFailure.patch
#send to David#
#SETIprobCandidate#app_ipc_uninitialised_A_reorder.patch
-#SETIprobCandidate#app_ipc_uninitialised_B_buffer.patch
# --- B
-#tmpA# add_init_to_client_state_constructor.patch
-#convinceDavid# client_path_char_array_length.patch
some_extra_clang_warnings.patch
cppcheck_realloc.patch
MainDocumentWarnings.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list