[boinc] 01/02: removed nvidia_detect_buffers.patch

Guo Yixuan yixuan-guest at moszumanska.debian.org
Tue May 27 14:49:17 UTC 2014


This is an automated email from the git hooks/post-receive script.

yixuan-guest pushed a commit to branch master
in repository boinc.

commit f78175e734bf7d330e0d913b4436e9a821fc56ed
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Tue May 27 10:39:53 2014 -0400

    removed nvidia_detect_buffers.patch
    
    client/coproc_detect.cpp has been removed in 7.0.30+dfsg.
    The changes in client/scheduler_op.cpp are only buffer
    increases.
---
 debian/patches/nvidia_detect_buffers.patch | 74 ------------------------------
 debian/patches/series                      |  1 -
 2 files changed, 75 deletions(-)

diff --git a/debian/patches/nvidia_detect_buffers.patch b/debian/patches/nvidia_detect_buffers.patch
deleted file mode 100644
index 97dbecf..0000000
--- a/debian/patches/nvidia_detect_buffers.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Author: Steffen Moeller
-Description: Increased buffers.
-
-Index: boinc/client/coproc_detect.cpp
-===================================================================
---- boinc.orig/client/coproc_detect.cpp	2012-05-03 13:38:04.292171877 +0200
-+++ boinc/client/coproc_detect.cpp	2012-05-03 13:53:32.499458579 +0200
-@@ -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 {
-@@ -865,7 +865,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-05-03 13:38:04.376170725 +0200
-+++ boinc/client/scheduler_op.cpp	2012-05-03 13:53:32.503458525 +0200
-@@ -228,7 +228,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));
-@@ -241,7 +241,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,
-@@ -323,7 +323,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;
-@@ -336,7 +336,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)
-@@ -579,7 +579,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/series b/debian/patches/series
index dd748a4..889f5b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,7 +22,6 @@ debian_debian_AdjustBoincTopdirPython.patch
 # --- Z --- Currently not applicable
 #Z#no_std_string.patch
 #either these 3
-#convinceDavid# nvidia_detect_buffers.patch
 #convinceDavid# nvidia_detect_bugs.patch
 #convinceDavid# nvidia_detect_optinal.patch
 #or this one

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git



More information about the pkg-boinc-commits mailing list