[SCM] BOINC packaging branch, master, updated. upstream/7.0.27+dfsg-429-g9014d8d
Steffen Moeller
steffen_moeller at gmx.de
Sun May 6 17:19:06 UTC 2012
The following commit has been merged in the master branch:
commit 9014d8dc9acd67514182a5ebe8185e29d642b829
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date: Sun May 6 14:07:17 2012 +0200
Preparing for upload of 7.0.27 to Debian
diff --git a/debian/changelog b/debian/changelog
index 3251b26..58da372 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
boinc (7.0.27+dfsg-2) unstable; urgency=low
- * Removed a couple of patches to help locating bug in scientific app
+ * Removed a couple of patches to help preventing crash in some
+ scientific apps
- -- Steffen Moeller <moeller at debian.org> Thu, 03 May 2012 17:07:31 +0200
+ -- Steffen Moeller <moeller at debian.org> Sun, 06 May 2012 14:06:18 +0200
boinc (7.0.27+dfsg-1) unstable; urgency=low
diff --git a/debian/patches/app_ipc_uninitialised.patch b/debian/patches/app_ipc_uninitialised_A_reorder.patch
similarity index 78%
rename from debian/patches/app_ipc_uninitialised.patch
rename to debian/patches/app_ipc_uninitialised_A_reorder.patch
index 35de293..4f02369 100644
--- a/debian/patches/app_ipc_uninitialised.patch
+++ b/debian/patches/app_ipc_uninitialised_A_reorder.patch
@@ -3,8 +3,8 @@ Description: Improving initalisation of app_init_data
Index: boinc/lib/app_ipc.cpp
===================================================================
---- boinc.orig/lib/app_ipc.cpp 2012-03-27 16:54:40.940116654 +0200
-+++ boinc/lib/app_ipc.cpp 2012-03-27 18:18:24.763761557 +0200
+--- boinc.orig/lib/app_ipc.cpp 2012-05-03 17:05:19.971488035 +0200
++++ boinc/lib/app_ipc.cpp 2012-05-06 14:00:20.023220210 +0200
@@ -56,12 +56,14 @@
}
@@ -47,7 +47,7 @@ Index: boinc/lib/app_ipc.cpp
strcpy(gpu_type, a.gpu_type);
// use assignment for the rest, especially the classes
-@@ -122,15 +134,10 @@
+@@ -122,11 +134,6 @@
ncpus = a.ncpus;
checkpoint_period = a.checkpoint_period;
wu_cpu_time = a.wu_cpu_time;
@@ -59,11 +59,6 @@ Index: boinc/lib/app_ipc.cpp
}
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"
@@ -202,16 +209,7 @@
"<resource_share_fraction>%f</resource_share_fraction>\n"
"<checkpoint_period>%f</checkpoint_period>\n"
@@ -166,25 +161,7 @@ Index: boinc/lib/app_ipc.cpp
wu_cpu_time = 0;
}
-@@ -447,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);
-@@ -480,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
-@@ -491,14 +513,14 @@
+@@ -491,7 +513,7 @@
FILE *fp = boinc_fopen(virtual_name, "r");
if (!fp) return 0;
buf[0] = 0;
@@ -193,24 +170,3 @@ Index: boinc/lib/app_ipc.cpp
fclose(fp);
if (p) parse_str(buf, "<soft_link>", physical_name);
return 0;
- }
-
- 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-03-27 16:49:03.004705896 +0200
-+++ boinc/lib/app_ipc.h 2012-03-27 16:54:40.980116111 +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/app_ipc_uninitialised_B_buffer.patch b/debian/patches/app_ipc_uninitialised_B_buffer.patch
new file mode 100644
index 0000000..4b92689
--- /dev/null
+++ b/debian/patches/app_ipc_uninitialised_B_buffer.patch
@@ -0,0 +1,56 @@
+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/series b/debian/patches/series
index 0204abc..a3cf54d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,10 +28,11 @@ client_stream_realloc.patch
# --- A
#convinceDavid# MoreInformativeAppStartFailure.patch
stream_memory_leak_fix.patch
-#tmpA# app_ipc_uninitialised.patch
+#SETIprobCandidate#app_ipc_uninitialised_A_reorder.patch
+#SETIprobCandidate#app_ipc_uninitialised_B_buffer.patch
uninitialised_client_states.patch
#convinceDavid# MainDocumentConst.patch
-#MainDocumentWarnings.patch
+MainDocumentWarnings.patch
# --- B
#tmpA# add_init_to_client_state_constructor.patch
#convinceDavid# client_path_char_array_length.patch
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list