[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:45 UTC 2012
The following commit has been merged in the master branch:
commit eec4d18c67c3da554970c7e5f33764af2ee9e5bf
Author: Steffen Moeller <moeller at debian.org>
Date: Mon Mar 12 00:49:06 2012 +0100
increasing various internal buffers
diff --git a/debian/patches/MainDocumentWarnings.patch b/debian/patches/MainDocumentWarnings.patch
new file mode 100644
index 0000000..b5f48af
--- /dev/null
+++ b/debian/patches/MainDocumentWarnings.patch
@@ -0,0 +1,29 @@
+Index: boinc/clientgui/MainDocument.cpp
+===================================================================
+--- boinc.orig/clientgui/MainDocument.cpp 2012-03-03 01:12:22.000000000 +0100
++++ boinc/clientgui/MainDocument.cpp 2012-03-12 01:23:00.000000000 +0100
+@@ -1631,20 +1631,16 @@
+ }
+ #else
+ void CMainDocument::KillGraphicsApp(int pid) {
+- char* argv[6];
++ char* argv[6] = {
++ "switcher","/bin/kill","kill","-KILL","12345678901234567890",0
++ };
+ char currentDir[1024];
+ char thePIDbuf[10];
+ int id, iRetVal;
+
+
+ if (g_use_sandbox) {
+- snprintf(thePIDbuf, sizeof(thePIDbuf), "%d", pid);
+- argv[0] = "switcher";
+- argv[1] = "/bin/kill";
+- argv[2] = "kill";
+- argv[3] = "-KILL";
+- argv[4] = thePIDbuf;
+- argv[5] = 0;
++ snprintf(argv[4], 20, "%d", pid);
+
+ iRetVal = run_program(
+ getcwd(currentDir, sizeof(currentDir)),
diff --git a/debian/patches/MoreInformativeAppStartFailure.patch b/debian/patches/MoreInformativeAppStartFailure.patch
index 1ea2407..e326ba9 100644
--- a/debian/patches/MoreInformativeAppStartFailure.patch
+++ b/debian/patches/MoreInformativeAppStartFailure.patch
@@ -1,7 +1,7 @@
Index: boinc/client/app_start.cpp
===================================================================
---- boinc.orig/client/app_start.cpp 2012-03-11 13:38:50.000000000 +0100
-+++ boinc/client/app_start.cpp 2012-03-11 13:52:26.000000000 +0100
+--- boinc.orig/client/app_start.cpp 2012-03-12 00:04:53.000000000 +0100
++++ boinc/client/app_start.cpp 2012-03-12 00:04:54.000000000 +0100
@@ -320,7 +320,10 @@
strcat(dir_path, "/");
strcat(dir_path, p);
@@ -56,3 +56,262 @@ Index: boinc/client/app_start.cpp
fflush(NULL);
_exit(errno);
}
+Index: boinc/client/client_state.cpp
+===================================================================
+--- boinc.orig/client/client_state.cpp 2012-03-09 14:16:16.000000000 +0100
++++ boinc/client/client_state.cpp 2012-03-12 00:18:56.000000000 +0100
+@@ -143,7 +143,7 @@
+ }
+
+ void CLIENT_STATE::show_host_info() {
+- char buf[256], buf2[256];
++ char buf[2048], buf2[2048];
+
+ nbytes_to_string(host_info.m_cache, 0, buf, sizeof(buf));
+ msg_printf(NULL, MSG_INFO,
+@@ -291,7 +291,7 @@
+ int CLIENT_STATE::init() {
+ int retval;
+ unsigned int i;
+- char buf[256];
++ char buf[2048];
+ PROJECT* p;
+
+ srand((unsigned int)time(0));
+@@ -808,7 +808,7 @@
+ check_suspend_network();
+ if (network_suspend_reason) {
+ if (!old_network_suspend_reason) {
+- char buf[256];
++ char buf[1024];
+ if (network_suspended) {
+ sprintf(buf,
+ "Suspending network activity - %s",
+@@ -1057,7 +1057,7 @@
+ }
+
+ if (!strcmp(file_ref.open_name, GRAPHICS_APP_FILENAME)) {
+- char relpath[512], path[512];
++ char relpath[1024], path[1024];
+ get_pathname(fip, relpath, sizeof(relpath));
+ relative_to_absolute(relpath, path);
+ strlcpy(avp->graphics_exec_path, path, sizeof(avp->graphics_exec_path));
+@@ -1627,7 +1627,7 @@
+ // so that we don't try to run it again.
+ //
+ int CLIENT_STATE::report_result_error(RESULT& res, const char* format, ...) {
+- char buf[4096], err_msg[4096];
++ char buf[8192], err_msg[8192];
+ // The above store 1-line messages and short XML snippets.
+ // Shouldn't exceed a few hundred bytes.
+ unsigned int i;
+@@ -1829,7 +1829,7 @@
+ vector<FILE_INFO*>::iterator fi_iter;
+ FILE_INFO* fip;
+ PROJECT* p;
+- char path[256];
++ char path[2048];
+ int retval;
+
+ reset_project(project, true);
+@@ -1999,7 +1999,7 @@
+ }
+
+ void CLIENT_STATE::log_show_projects() {
+- char buf[256];
++ char buf[1024];
+ for (unsigned int i=0; i<projects.size(); i++) {
+ PROJECT* p = projects[i];
+ if (p->hostid) {
+Index: boinc/client/client_types.h
+===================================================================
+--- boinc.orig/client/client_types.h 2012-03-03 01:12:22.000000000 +0100
++++ boinc/client/client_types.h 2012-03-12 00:38:42.000000000 +0100
+@@ -813,12 +813,12 @@
+
+ int coproc_indices[MAX_COPROCS_PER_JOB];
+ // keep track of coprocessor reservations
+- char resources[256];
++ char resources[1024];
+ // textual description of resources used
+ double schedule_backoff;
+ // don't try to schedule until this time
+ // (wait for free GPU RAM)
+- char schedule_backoff_reason[256];
++ char schedule_backoff_reason[1024];
+ };
+
+ // represents an always/auto/never value, possibly temporarily overridden
+Index: boinc/client/hostinfo_unix.cpp
+===================================================================
+--- boinc.orig/client/hostinfo_unix.cpp 2012-03-03 01:12:22.000000000 +0100
++++ boinc/client/hostinfo_unix.cpp 2012-03-12 00:34:31.000000000 +0100
+@@ -214,7 +214,7 @@
+ SysClass,
+ NoBattery
+ } method = Detect;
+- static char path[64] = "";
++ static char path[2048] = "";
+
+ if (Detect == method) {
+ // try APM in ProcFS
+@@ -254,7 +254,7 @@
+ }
+ if (Detect == method) {
+ // try SysFS
+- char buf[256];
++ char buf[1024];
+ string ps_name;
+ FILE* fsys;
+
+@@ -318,7 +318,7 @@
+ FILE *facpi = fopen(path, "r");
+ if (!facpi) return false;
+
+- char buf[128];
++ char buf[1024];
+ (void) fgets(buf, sizeof(buf), facpi);
+
+ fclose(facpi);
+@@ -386,13 +386,13 @@
+ // See http://people.nl.linux.org/~hch/cpuinfo/ for some examples.
+ //
+ static void parse_cpuinfo_linux(HOST_INFO& host) {
+- char buf[1024], features[1024], model_buf[1024];
++ char buf[4096], features[4096], model_buf[4096];
+ bool vendor_found=false, model_found=false;
+ bool cache_found=false, features_found=false;
+ bool model_hack=false, vendor_hack=false;
+ int n;
+ int family=-1, model=-1, stepping=-1;
+- char buf2[256];
++ char buf2[2048];
+
+ FILE* f = fopen("/proc/cpuinfo", "r");
+ if (!f) {
+@@ -420,7 +420,7 @@
+
+ host.m_cache=-1;
+ strcpy(features, "");
+- while (fgets(buf, 1024, f)) {
++ while (fgets(buf, sizeof(buf), f)) {
+ strip_whitespace(buf);
+ if (
+ /* there might be conflicts if we dont #ifdef */
+@@ -579,7 +579,7 @@
+ void use_cpuid(HOST_INFO& host) {
+ u_int p[4];
+ int hasMMX, hasSSE, hasSSE2, hasSSE3, has3DNow, has3DNowExt = 0;
+- char capabilities[256];
++ char capabilities[1024];
+
+ do_cpuid(0x0, p);
+
+@@ -609,7 +609,7 @@
+ if (has3DNowExt) strncat(capabilities, "3dnowext ", 9);
+ if (hasMMX) strncat(capabilities, "mmx ", 4);
+ strip_whitespace(capabilities);
+- char buf[1024];
++ char buf[2048];
+ snprintf(buf, sizeof(buf), "%s [] [%s]",
+ host.p_model, capabilities
+ );
+@@ -623,7 +623,7 @@
+ int p_model_size = sizeof(host.p_model);
+ size_t len;
+ #if defined(__i386__) || defined(__x86_64__)
+- char brand_string[256];
++ char brand_string[1024];
+ int family, stepping, model;
+
+ len = sizeof(host.p_vendor);
+@@ -650,7 +650,7 @@
+ brand_string, family, model, stepping
+ );
+ #else // PowerPC
+- char model[256];
++ char model[1024];
+ int response = 0;
+ int retval;
+ len = sizeof(response);
+@@ -692,7 +692,7 @@
+ int32 maxStandardFunction;
+ int32 maxExtendedFunction = 0;
+
+- char brand_string[256];
++ char brand_string[1024];
+
+ if (get_system_info(&sys_info) != B_OK) {
+ msg_printf(NULL, MSG_INTERNAL_ERROR, "Error getting Haiku system information!\n");
+@@ -721,7 +721,7 @@
+ maxExtendedFunction = cpuInfo.eax_0.max_eax & 0xff;
+
+ if (maxExtendedFunction >=4 ) {
+- char buffer[49];
++ char buffer[49+20];
+ char *name = buffer;
+ int32 i;
+
+@@ -788,7 +788,7 @@
+
+ int32 found = 0;
+ int32 i;
+- char buf[12];
++ char buf[12+20];
+
+ for (i = 0; i < 32; i++) {
+ if ((cpuInfo.eax_1.features & (1UL << i)) && kFeatures[i] != NULL) {
+@@ -1696,10 +1696,10 @@
+ #if LINUX_LIKE_SYSTEM
+ bool interrupts_idle(time_t t) {
+ static FILE *ifp = NULL;
+- static long irq_count[256];
++ static long irq_count[1024];
+ static time_t last_irq = time(NULL);
+
+- char line[256];
++ char line[1024];
+ int i = 0;
+ long ccount = 0;
+
+Index: boinc/lib/hostinfo.cpp
+===================================================================
+--- boinc.orig/lib/hostinfo.cpp 2012-02-03 21:33:50.000000000 +0100
++++ boinc/lib/hostinfo.cpp 2012-03-12 00:42:51.000000000 +0100
+@@ -131,7 +131,7 @@
+ int HOST_INFO::write(
+ MIOFILE& out, bool include_net_info, bool include_coprocs
+ ) {
+- char pv[265], pm[256], pf[1024], osn[256], osv[256];
++ char pv[512], pm[512], pf[2048], osn[512], osv[512];
+ out.printf(
+ "<host_info>\n"
+ " <timezone>%d</timezone>\n",
+@@ -208,11 +208,11 @@
+ // The following functions read and write this file.
+ //
+ int HOST_INFO::parse_cpu_benchmarks(FILE* in) {
+- char buf[256];
++ char buf[1024];
+
+- char* p = fgets(buf, 256, in);
++ char* p = fgets(buf, sizeof(buf), in);
+ if (!p) return 0; // Fixes compiler warning
+- while (fgets(buf, 256, in)) {
++ while (fgets(buf, sizeof(buf), in)) {
+ if (match_tag(buf, "<cpu_benchmarks>"));
+ else if (match_tag(buf, "</cpu_benchmarks>")) return 0;
+ else if (parse_double(buf, "<p_fpops>", p_fpops)) continue;
+Index: boinc/lib/hostinfo.h
+===================================================================
+--- boinc.orig/lib/hostinfo.h 2012-03-03 01:12:22.000000000 +0100
++++ boinc/lib/hostinfo.h 2012-03-12 00:40:24.000000000 +0100
+@@ -44,7 +44,7 @@
+ int p_ncpus;
+ char p_vendor[256];
+ char p_model[256];
+- char p_features[1024];
++ char p_features[2048];
+ double p_fpops;
+ double p_iops;
+ double p_membw;
diff --git a/debian/patches/series b/debian/patches/series
index e6e1664..0384abe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,27 +1,28 @@
-# improve_opendir_warning.patch
-# termios_is_everywhere.patch
-# mac_addresses_cores_in_kfreebsd.patch
+improve_opendir_warning.patch
+termios_is_everywhere.patch
+mac_addresses_cores_in_kfreebsd.patch
stripchart_debian.patch
-# upstream_sztaki_configureEval.patch
-# generate_less.patch
+upstream_sztaki_configureEval.patch
+generate_less.patch
texfont_removal.patch
-# #Makefile_subdirs.patch
-# csh2tcsh.patch
-# file_upload_handler_permission.patch
-# possible_size_type_error.patch
-# upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
-# debian_debian_AdjustBoincTopdirPython.patch
+#Makefile_subdirs.patch
+csh2tcsh.patch
+file_upload_handler_permission.patch
+possible_size_type_error.patch
+upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
+debian_debian_AdjustBoincTopdirPython.patch
libnotify-0.7.patch
-# stripchart_security.patch
-# #AddSomeConstToMakeClearMemoryIsNotAllocated.patch
-# #AddingMoreConst.patch
-# #evenMoreConst03.patch
-# #andYetMorePatches04.patch
-# #erase_while_1.patch
-# redundant_i.patch
-# cppcheck_realloc.patch
-# cwd_handling.patch
-# sched_vda_strncpy.patch
-# parse_issues.patch
-# client_stream_realloc.patch
+stripchart_security.patch
+#AddSomeConstToMakeClearMemoryIsNotAllocated.patch
+#AddingMoreConst.patch
+#evenMoreConst03.patch
+#andYetMorePatches04.patch
+#erase_while_1.patch
+redundant_i.patch
+cppcheck_realloc.patch
+cwd_handling.patch
+sched_vda_strncpy.patch
+parse_issues.patch
+client_stream_realloc.patch
MoreInformativeAppStartFailure.patch
+MainDocumentWarnings.patch
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list