[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-424-g3f1714e

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 3f1714e68d142720dad912e8727aeab7ecb208b6
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/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