[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-414-geec4d18
Steffen Moeller
moeller at debian.org
Wed Mar 14 22:37:39 UTC 2012
The following commit has been merged in the master branch:
commit 47cb84d32ea2a181cd9fbae5cb2200fc7220aee7
Author: Steffen Moeller <moeller at debian.org>
Date: Sat Mar 3 00:48:48 2012 +0100
While seeking issues
It is not clear if those patches will survive the next release.
diff --git a/debian/patches/cppcheck_realloc.patch b/debian/patches/cppcheck_realloc.patch
index 7855acb..75c0610 100644
--- a/debian/patches/cppcheck_realloc.patch
+++ b/debian/patches/cppcheck_realloc.patch
@@ -1,7 +1,7 @@
Index: boinc/lib/parse.cpp
===================================================================
---- boinc.orig/lib/parse.cpp 2012-01-17 00:28:55.000000000 +0100
-+++ boinc/lib/parse.cpp 2012-02-10 22:21:13.000000000 +0100
+--- boinc.orig/lib/parse.cpp 2012-02-16 01:37:40.000000000 +0100
++++ boinc/lib/parse.cpp 2012-02-16 10:48:24.000000000 +0100
@@ -178,8 +178,21 @@
}
int n = (int)strlen(line);
@@ -28,8 +28,8 @@ Index: boinc/lib/parse.cpp
nused += n;
Index: boinc/lib/susp.cpp
===================================================================
---- boinc.orig/lib/susp.cpp 2011-03-17 18:51:04.000000000 +0100
-+++ boinc/lib/susp.cpp 2012-02-10 22:25:31.000000000 +0100
+--- boinc.orig/lib/susp.cpp 2012-02-16 01:37:40.000000000 +0100
++++ boinc/lib/susp.cpp 2012-02-16 10:48:24.000000000 +0100
@@ -185,12 +185,13 @@
if (i >= bottom) {
@@ -48,8 +48,8 @@ Index: boinc/lib/susp.cpp
Index: boinc/lib/crypt_prog.cpp
===================================================================
---- boinc.orig/lib/crypt_prog.cpp 2012-02-03 21:33:50.000000000 +0100
-+++ boinc/lib/crypt_prog.cpp 2012-02-11 11:45:38.000000000 +0100
+--- boinc.orig/lib/crypt_prog.cpp 2012-02-16 01:37:40.000000000 +0100
++++ boinc/lib/crypt_prog.cpp 2012-02-16 10:48:24.000000000 +0100
@@ -109,6 +109,7 @@
die("can't open /dev/random\n");
}
@@ -58,7 +58,7 @@ Index: boinc/lib/crypt_prog.cpp
#endif
return n;
}
-@@ -350,10 +351,10 @@
+@@ -357,10 +358,10 @@
} else {
// o2b
rsa_key_ = (RSA *)calloc(1, sizeof(RSA));
@@ -72,22 +72,49 @@ Index: boinc/lib/crypt_prog.cpp
rsa_key_ = PEM_read_RSAPrivateKey(fpriv, NULL, NULL, NULL);
Index: boinc/lib/diagnostics_win.cpp
===================================================================
---- boinc.orig/lib/diagnostics_win.cpp 2011-03-17 18:51:04.000000000 +0100
-+++ boinc/lib/diagnostics_win.cpp 2012-02-11 11:49:37.000000000 +0100
-@@ -331,6 +331,7 @@
+--- boinc.orig/lib/diagnostics_win.cpp 2012-02-16 01:37:40.000000000 +0100
++++ boinc/lib/diagnostics_win.cpp 2012-02-16 10:59:49.000000000 +0100
+@@ -329,8 +329,9 @@
+
+ do {
*ppBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, *pcbBuffer);
- if (ppBuffer == NULL) {
+- if (ppBuffer == NULL) {
++ if (*ppBuffer == NULL) {
retval = ERROR_NOT_ENOUGH_MEMORY;
+ return retval;
}
Status = pNTQSI(
-@@ -1638,6 +1639,8 @@
- case 1: // write attempt
- sprintf(substatus, "write attempt to address 0x%8.8X", pExPtrs->ExceptionRecord->ExceptionInformation[1]);
- break;
-+ default:// initialise substatus
-+ substatus[0]=0;
- }
- }
- fprintf(stderr, "Reason: %s (0x%x) at address 0x%p %s\n\n", status, exception_code, exception_address, substatus);
+@@ -1630,6 +1631,7 @@
+ break;
+ case EXCEPTION_ACCESS_VIOLATION:
+ strcpy(status, "Access Violation");
++ substatus[0]=0;
+ if (pExPtrs->ExceptionRecord->NumberParameters == 2) {
+ switch(pExPtrs->ExceptionRecord->ExceptionInformation[0]) {
+ case 0: // read attempt
+Index: boinc/lib/crypt.cpp
+===================================================================
+--- boinc.orig/lib/crypt.cpp 2012-02-15 22:04:05.000000000 +0100
++++ boinc/lib/crypt.cpp 2012-02-16 10:54:04.000000000 +0100
+@@ -339,6 +339,7 @@
+ char clear_buf[MD5_LEN];
+ int n, retval;
+ DATA_BLOCK clear_signature;
++ clear_buf[0]=0;
+
+ n = (int)strlen(md5_buf);
+ clear_signature.data = (unsigned char*)clear_buf;
+Index: boinc/lib/mac_address.cpp
+===================================================================
+--- boinc.orig/lib/mac_address.cpp 2012-02-16 10:48:24.000000000 +0100
++++ boinc/lib/mac_address.cpp 2012-02-16 11:01:27.000000000 +0100
+@@ -115,7 +115,7 @@
+
+ CFDataGetBytes(refData, CFRangeMake(0,CFDataGetLength(refData)), MACAddress);
+ sprintf(buffer, "%s%s%02x:%02x:%02x:%02x:%02x:%02x",
+- buffer, delimiter,
++ "" /* was race condition: buffer */, delimiter,
+ MACAddress[0], MACAddress[1], MACAddress[2], MACAddress[3], MACAddress[4], MACAddress[5]);
+ CFRelease(MACAddressAsCFData);
+ delimiter[0] = ':';
diff --git a/debian/patches/cwd_handling.patch b/debian/patches/cwd_handling.patch
new file mode 100644
index 0000000..f523451
--- /dev/null
+++ b/debian/patches/cwd_handling.patch
@@ -0,0 +1,89 @@
+Index: boinc/client/app_start.cpp
+===================================================================
+--- boinc.orig/client/app_start.cpp 2012-02-15 22:04:05.000000000 +0100
++++ boinc/client/app_start.cpp 2012-02-16 12:34:22.000000000 +0100
+@@ -122,7 +122,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];
+@@ -159,7 +159,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) {
+@@ -194,7 +194,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;
+@@ -278,7 +278,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);
+
+@@ -352,7 +352,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 2011-07-24 19:39:09.000000000 +0200
++++ boinc/client/auto_update.cpp 2012-02-16 12:17:38.000000000 +0100
+@@ -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/improve_opendir_warning.patch b/debian/patches/improve_opendir_warning.patch
new file mode 100644
index 0000000..91dd674
--- /dev/null
+++ b/debian/patches/improve_opendir_warning.patch
@@ -0,0 +1,16 @@
+Index: boinc/lib/filesys.cpp
+===================================================================
+--- boinc.orig/lib/filesys.cpp 2012-02-15 21:13:03.000000000 +0100
++++ boinc/lib/filesys.cpp 2012-02-17 11:41:14.000000000 +0100
+@@ -130,7 +130,10 @@
+ dirp->handle = INVALID_HANDLE_VALUE;
+ #else
+ dirp = opendir(p);
+- if (!dirp) return NULL;
++ if (!dirp) {
++ fprintf("dir_open: Could not open directory '%s'.\n",p);
++ return NULL;
++ }
+ #endif
+ return dirp;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 1708133..cb62211 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+improve_opendir_warning.patch
termios_is_everywhere.patch
mac_addresses_cores_in_kfreebsd.patch
stripchart_debian.patch
@@ -20,3 +21,4 @@ stripchart_security.patch
redundant_i.patch
cppcheck_more.patch
cppcheck_realloc.patch
+cwd_handling.patch
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list