[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-426-g1df756c
Steffen Moeller
moeller at debian.org
Wed Mar 28 21:00:48 UTC 2012
The following commit has been merged in the master branch:
commit 12303fa78d3949fcd17b0e7d4ce9d8118086a9c1
Author: Steffen Moeller <moeller at debian.org>
Date: Sun Mar 25 13:50:21 2012 +0200
Maintenance. Added some extra buffer patches.
diff --git a/debian/changelog b/debian/changelog
index 27a4560..52d10d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
boinc (7.0.23+dfsg-1) unstable; urgency=low
* New upstream version.
+ * Moving towards inclusion of glib.h instead of glib/*.h
+ (Closes: #665512).
-- Steffen Moeller <moeller at debian.org> Sat, 24 Mar 2012 16:05:42 +0100
diff --git a/debian/patches/glib_includes_glib.h_only.patch b/debian/patches/glib_includes_glib.h_only.patch
new file mode 100644
index 0000000..c70f4a7
--- /dev/null
+++ b/debian/patches/glib_includes_glib.h_only.patch
@@ -0,0 +1,59 @@
+Index: boinc/clientgui/gtk/taskbarex.cpp
+===================================================================
+--- boinc.orig/clientgui/gtk/taskbarex.cpp 2011-10-30 00:27:06.000000000 +0200
++++ boinc/clientgui/gtk/taskbarex.cpp 2012-03-25 13:41:46.000000000 +0200
+@@ -20,8 +20,7 @@
+ #include "stdwx.h"
+
+ #include <libnotify/notify.h>
+-#include <glib/gtypes.h>
+-#include <glib-object.h>
++#include <glib.h>
+ #include <dlfcn.h>
+
+ #include "BOINCGUIApp.h"
+@@ -216,6 +215,23 @@
+ return true;
+ }
+
++static const char* SetBalloon__returnIcon(const unsigned int iconballoon) {
++ switch(iconballoon)
++ {
++ case BALLOONTYPE_INFO:
++ return(GTK_STOCK_DIALOG_INFO);
++ break;
++ case BALLOONTYPE_WARNING:
++ return(GTK_STOCK_DIALOG_WARNING);
++ break;
++ case BALLOONTYPE_ERROR:
++ default:
++ return(GTK_STOCK_DIALOG_ERROR);
++ break;
++ }
++ return(NULL);
++}
++
+ bool wxTaskBarIconEx::SetBalloon(const wxIcon& icon, const wxString title, const wxString message, unsigned int iconballoon)
+ {
+ wxLogTrace(wxT("Function Start/End"), wxT("wxTaskBarIconEx::SetBalloon - Function Begin"));
+@@ -232,19 +248,7 @@
+ if (!SetIcon(icon, wxEmptyString))
+ return false;
+
+- gchar* desired_icon = NULL;
+- switch(iconballoon)
+- {
+- case BALLOONTYPE_INFO:
+- desired_icon = GTK_STOCK_DIALOG_INFO;
+- break;
+- case BALLOONTYPE_WARNING:
+- desired_icon = GTK_STOCK_DIALOG_WARNING;
+- break;
+- case BALLOONTYPE_ERROR:
+- desired_icon = GTK_STOCK_DIALOG_ERROR;
+- break;
+- }
++ const char* desired_icon = SetBalloon__returnIcon(iconballoon);
+
+ if (!g_pNotification)
+ {
diff --git a/debian/patches/nvidia_detect_buffers.patch b/debian/patches/nvidia_detect_buffers.patch
new file mode 100644
index 0000000..30b9c7f
--- /dev/null
+++ b/debian/patches/nvidia_detect_buffers.patch
@@ -0,0 +1,71 @@
+Index: boinc/client/coproc_detect.cpp
+===================================================================
+--- boinc.orig/client/coproc_detect.cpp 2012-03-18 13:50:53.000000000 +0100
++++ boinc/client/coproc_detect.cpp 2012-03-24 17:01:05.000000000 +0100
+@@ -77,7 +77,7 @@
+ vector<int>& ignore_ati_dev
+ ) {
+ unsigned int i;
+- char buf[256], buf2[256];
++ char buf[1024], buf2[1024];
+
+ #ifdef _WIN32
+ try {
+@@ -855,7 +855,7 @@
+ vector<int>& ignore_devs
+ ) {
+ int cuda_ndevs, retval;
+- char buf[256];
++ char buf[1024];
+
+ #ifdef _WIN32
+ HMODULE cudalib = LoadLibrary("nvcuda.dll");
+Index: boinc/client/scheduler_op.cpp
+===================================================================
+--- boinc.orig/client/scheduler_op.cpp 2012-03-24 17:18:49.000000000 +0100
++++ boinc/client/scheduler_op.cpp 2012-03-24 17:19:13.000000000 +0100
+@@ -226,7 +226,7 @@
+ //
+ int SCHEDULER_OP::start_rpc(PROJECT* p) {
+ int retval;
+- char request_file[1024], reply_file[1024], buf[256];
++ char request_file[1024], reply_file[1024], buf[2048];
+ const char *trickle_up_msg;
+
+ safe_strcpy(scheduler_url, p->get_scheduler_url(url_index, url_random));
+@@ -239,7 +239,7 @@
+ } else {
+ trickle_up_msg = "";
+ }
+- request_string(buf);
++ request_string(buf); // no size check of buf in request_string
+ if (strlen(buf)) {
+ if (p->nresults_returned) {
+ msg_printf(p, MSG_INFO,
+@@ -321,7 +321,7 @@
+ // parse a master file.
+ //
+ int SCHEDULER_OP::parse_master_file(PROJECT* p, vector<std::string> &urls) {
+- char buf[256], buf2[256];
++ char buf[1024], buf2[1024];
+ char master_filename[256];
+ std::string str;
+ FILE* f;
+@@ -334,7 +334,7 @@
+ return ERR_FOPEN;
+ }
+ p->scheduler_urls.clear();
+- while (fgets(buf, 256, f)) {
++ while (fgets(buf, sizeof(buf), f)) {
+
+ // allow for the possibility of > 1 tag per line here
+ // (UMTS may collapse lines)
+@@ -573,7 +573,7 @@
+ // Others are copied straight to the PROJECT
+ //
+ int SCHEDULER_REPLY::parse(FILE* in, PROJECT* project) {
+- char buf[256], msg_buf[1024], pri_buf[256], attr_buf[256];
++ char buf[2048], msg_buf[4096], pri_buf[2048], attr_buf[2048];
+ int retval;
+ MIOFILE mf;
+ XML_PARSER xp(&mf);
diff --git a/debian/patches/sched_driver_char_buffers.patch b/debian/patches/sched_driver_char_buffers.patch
new file mode 100644
index 0000000..4d70595
--- /dev/null
+++ b/debian/patches/sched_driver_char_buffers.patch
@@ -0,0 +1,26 @@
+Index: boinc/sched/sched_driver.cpp
+===================================================================
+--- boinc.orig/sched/sched_driver.cpp 2012-03-24 16:31:19.000000000 +0100
++++ boinc/sched/sched_driver.cpp 2012-03-24 16:33:58.000000000 +0100
+@@ -49,9 +49,9 @@
+ using std::vector;
+
+ struct HOST_DESC{
+- char os_name[128];
+- char p_vendor[128];
+- char p_model[128];
++ char os_name[512];
++ char p_vendor[512];
++ char p_model[512];
+ };
+
+ vector<HOST_DESC> host_descs;
+@@ -59,7 +59,7 @@
+ double max_time = 1;
+
+ void read_hosts() {
+- char buf[256], buf2[256];
++ char buf[1024], buf2[1024];
+ host_descs.clear();
+ FILE* f = fopen("host_descs.txt", "r");
+ if (!f) {
diff --git a/debian/patches/sched_driver_f_free.patch b/debian/patches/sched_driver_f_free.patch
new file mode 100644
index 0000000..799fe57
--- /dev/null
+++ b/debian/patches/sched_driver_f_free.patch
@@ -0,0 +1,34 @@
+Index: boinc/sched/sched_driver.cpp
+===================================================================
+--- boinc.orig/sched/sched_driver.cpp 2011-03-17 18:51:04.000000000 +0100
++++ boinc/sched/sched_driver.cpp 2012-03-24 16:31:19.000000000 +0100
+@@ -44,6 +44,7 @@
+ #include <vector>
+ #include "util.h"
+ #include "svn_version.h"
++#include "str_util.h" // safe_strcpy
+
+ using std::vector;
+
+@@ -69,17 +70,18 @@
+ HOST_DESC hd;
+ strcpy(buf2, buf);
+ char* p1 = strtok(buf2, "\t\n");
+- strcpy(hd.os_name, p1);
++ safe_strcpy(hd.os_name, p1);
+ char* p2 = strtok(0, "\t\n");
+- strcpy(hd.p_vendor, p2);
++ safe_strcpy(hd.p_vendor, p2);
+ char* p3 = strtok(0, "\t\n");
+ if (!p3) {
+ fprintf(stderr, "bad line: %s\n", buf);
+ exit(1);
+ }
+- strcpy(hd.p_model, p3);
++ safe_strcpy(hd.p_model, p3);
+ host_descs.push_back(hd);
+ }
++ free(f);
+ }
+
+ inline double req_time() {
diff --git a/debian/patches/series b/debian/patches/series
index dc2bacc..929e065 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
+sched_driver_f_free.patch
+sched_driver_char_buffers.patch
improve_opendir_warning.patch
termios_is_everywhere.patch
mac_addresses_cores_in_kfreebsd.patch
@@ -26,3 +28,5 @@ client_stream_realloc.patch
MoreInformativeAppStartFailure.patch
MainDocumentWarnings.patch
stream_memory_leak_fix.patch
+nvidia_detect_buffers.patch
+glib_includes_glib.h_only.patch
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list