[SCM] BOINC packaging branch, master, updated. debian/7.1.10+dfsg-1-8-g800603c
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Wed Jun 19 17:12:04 UTC 2013
The following commit has been merged in the master branch:
commit 7a5365f1c4560d2217349e3ddcc2174af89530f9
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Wed Jun 19 18:40:50 2013 +0200
Patch refresh
diff --git a/debian/patches/investigate_boinc_api.patch b/debian/patches/investigate_boinc_api.patch
index e26e22b..f866898 100644
--- a/debian/patches/investigate_boinc_api.patch
+++ b/debian/patches/investigate_boinc_api.patch
@@ -1,6 +1,6 @@
--- a/api/boinc_api.cpp
+++ b/api/boinc_api.cpp
-@@ -354,7 +354,7 @@
+@@ -353,7 +353,7 @@
if (standalone) return true;
@@ -9,7 +9,7 @@
"<current_cpu_time>%e</current_cpu_time>\n"
"<checkpoint_cpu_time>%e</checkpoint_cpu_time>\n",
cpu_t, cp_cpu_t
-@@ -633,6 +633,10 @@
+@@ -632,6 +632,10 @@
}
int boinc_get_status(BOINC_STATUS *s) {
@@ -20,7 +20,7 @@
s->no_heartbeat = boinc_status.no_heartbeat;
s->suspended = boinc_status.suspended;
s->quit_request = boinc_status.quit_request;
-@@ -809,7 +813,7 @@
+@@ -808,7 +812,7 @@
int boinc_parse_init_data_file() {
FILE* f;
int retval;
@@ -29,7 +29,7 @@
if (aid.project_preferences) {
free(aid.project_preferences);
-@@ -859,15 +863,15 @@
+@@ -858,15 +862,15 @@
);
if (other_pid) {
sprintf(buf, "<other_pid>%d</other_pid>\n", other_pid);
@@ -48,7 +48,7 @@
}
if (app_client_shm->shm->app_status.send_msg(msg_buf)) {
return 0;
-@@ -950,7 +954,7 @@
+@@ -949,7 +953,7 @@
}
static void handle_upload_file_status() {
@@ -57,7 +57,7 @@
std::string filename;
int status;
-@@ -1282,7 +1286,7 @@
+@@ -1281,7 +1285,7 @@
// send graphics-related messages
//
if (send_web_graphics_url && !app_client_shm->shm->graphics_reply.has_msg()) {
@@ -66,7 +66,7 @@
"<web_graphics_url>%s</web_graphics_url>",
web_graphics_url
);
-@@ -1290,7 +1294,7 @@
+@@ -1289,7 +1293,7 @@
send_web_graphics_url = false;
}
if (send_remote_desktop_addr && !app_client_shm->shm->graphics_reply.has_msg()) {
@@ -75,7 +75,7 @@
"<remote_desktop_addr>%s</remote_desktop_addr>",
remote_desktop_addr
);
-@@ -1506,7 +1510,7 @@
+@@ -1505,7 +1509,7 @@
DirScanner dirscan(path);
while (dirscan.scan(filename)) {
if (strstr(filename.c_str(), "trickle_down")) {
diff --git a/debian/patches/more_clang_warnings.patch b/debian/patches/more_clang_warnings.patch
index 737b392..c5c1a64 100644
--- a/debian/patches/more_clang_warnings.patch
+++ b/debian/patches/more_clang_warnings.patch
@@ -1,7 +1,5 @@
-Index: boinc_debian/client/app_control.cpp
-===================================================================
---- boinc_debian.orig/client/app_control.cpp
-+++ boinc_debian/client/app_control.cpp
+--- a/client/app_control.cpp
++++ b/client/app_control.cpp
@@ -589,8 +589,8 @@
} else {
x = y;
@@ -29,10 +27,8 @@ Index: boinc_debian/client/app_control.cpp
msg_printf(wup->project, MSG_INTERNAL_ERROR,
"no project URL in task state file"
);
-Index: boinc_debian/client/cs_platforms.cpp
-===================================================================
---- boinc_debian.orig/client/cs_platforms.cpp
-+++ boinc_debian/client/cs_platforms.cpp
+--- a/client/cs_platforms.cpp
++++ b/client/cs_platforms.cpp
@@ -143,7 +143,7 @@
strlcat(cmdline," -m",256);
if ((f=popen(cmdline,"r"))) {
@@ -51,10 +47,8 @@ Index: boinc_debian/client/cs_platforms.cpp
// If the library is 32-bit ELF, then we're
// golden.
if (strstr(cmdline, "ELF") && strstr(cmdline, "32-bit")) support32=1;
-Index: boinc_debian/lib/crypt.cpp
-===================================================================
---- boinc_debian.orig/lib/crypt.cpp
-+++ boinc_debian/lib/crypt.cpp
+--- a/lib/crypt.cpp
++++ b/lib/crypt.cpp
@@ -208,14 +208,17 @@
}
if (j != len) return ERR_NULL;
@@ -76,10 +70,8 @@ Index: boinc_debian/lib/crypt.cpp
#endif
return 0;
}
-Index: boinc_debian/lib/diagnostics.cpp
-===================================================================
---- boinc_debian.orig/lib/diagnostics.cpp
-+++ boinc_debian/lib/diagnostics.cpp
+--- a/lib/diagnostics.cpp
++++ b/lib/diagnostics.cpp
@@ -607,7 +607,7 @@
size = backtrace (array, 64);
// Anything that calls malloc here (i.e *printf()) will probably fail
@@ -103,10 +95,8 @@ Index: boinc_debian/lib/diagnostics.cpp
backtrace_symbols_fd(array, size, fileno(stderr));
#endif
-Index: boinc_debian/client/hostinfo_unix.cpp
-===================================================================
---- boinc_debian.orig/client/hostinfo_unix.cpp
-+++ boinc_debian/client/hostinfo_unix.cpp
+--- a/client/hostinfo_unix.cpp
++++ b/client/hostinfo_unix.cpp
@@ -1236,11 +1236,12 @@
#endif
fd = popen(cmd, "r");
@@ -125,10 +115,8 @@ Index: boinc_debian/client/hostinfo_unix.cpp
pclose(fd);
}
}
-Index: boinc_debian/client/app_start.cpp
-===================================================================
---- boinc_debian.orig/client/app_start.cpp
-+++ boinc_debian/client/app_start.cpp
+--- a/client/app_start.cpp
++++ b/client/app_start.cpp
@@ -850,7 +850,10 @@
char* argv[100];
char current_dir[1024];
@@ -154,10 +142,8 @@ Index: boinc_debian/client/app_start.cpp
if (!config.no_priority_change) {
#if HAVE_SETPRIORITY
-Index: boinc_debian/api/graphics2_unix.cpp
-===================================================================
---- boinc_debian.orig/api/graphics2_unix.cpp
-+++ boinc_debian/api/graphics2_unix.cpp
+--- a/api/graphics2_unix.cpp
++++ b/api/graphics2_unix.cpp
@@ -191,7 +191,9 @@
FILE *f = boinc_fopen("gfx_info", "r");
if (f) {
@@ -169,10 +155,8 @@ Index: boinc_debian/api/graphics2_unix.cpp
fclose(f);
}
-Index: boinc_debian/lib/procinfo_unix.cpp
-===================================================================
---- boinc_debian.orig/lib/procinfo_unix.cpp
-+++ boinc_debian/lib/procinfo_unix.cpp
+--- a/lib/procinfo_unix.cpp
++++ b/lib/procinfo_unix.cpp
@@ -219,9 +219,11 @@
sprintf(pidpath, "/proc/%s/stat", piddir->d_name);
fd = fopen(pidpath, "r");
@@ -187,10 +171,8 @@ Index: boinc_debian/lib/procinfo_unix.cpp
if (retval) {
final_retval = retval;
-Index: boinc_debian/client/log_flags.cpp
-===================================================================
---- boinc_debian.orig/client/log_flags.cpp
-+++ boinc_debian/client/log_flags.cpp
+--- a/client/log_flags.cpp
++++ b/client/log_flags.cpp
@@ -509,7 +509,10 @@
#ifdef _WIN32
_chdir(config.data_dir);
@@ -203,10 +185,8 @@ Index: boinc_debian/client/log_flags.cpp
#endif
}
} else {
-Index: boinc_debian/client/switcher.cpp
-===================================================================
---- boinc_debian.orig/client/switcher.cpp
-+++ boinc_debian/client/switcher.cpp
+--- a/client/switcher.cpp
++++ b/client/switcher.cpp
@@ -46,6 +46,8 @@
char newlibs[256];
char *projectDirName;
@@ -246,10 +226,8 @@ Index: boinc_debian/client/switcher.cpp
+ if (errno) fprintf(stderr, "Process creation (%s) failed: errno=%d\n", argv[1], errno);
+ return(errno);
}
-Index: boinc_debian/lib/shmem.cpp
-===================================================================
---- boinc_debian.orig/lib/shmem.cpp
-+++ boinc_debian/lib/shmem.cpp
+--- a/lib/shmem.cpp
++++ b/lib/shmem.cpp
@@ -337,7 +337,10 @@
// area to all zeros because they write beyond the old EOF.
// See the lseek man page for details.
diff --git a/debian/patches/opendir_error_messages.patch b/debian/patches/opendir_error_messages.patch
index da7ffe5..2a3b85b 100644
--- a/debian/patches/opendir_error_messages.patch
+++ b/debian/patches/opendir_error_messages.patch
@@ -15,7 +15,7 @@
}
--- a/lib/diagnostics.cpp
+++ b/lib/diagnostics.cpp
-@@ -306,7 +306,7 @@
+@@ -305,7 +305,7 @@
// Store various pieces of inforation for future use.
if (flags & BOINC_DIAG_BOINCAPPLICATION) {
diff --git a/debian/patches/possible_size_type_error.patch b/debian/patches/possible_size_type_error.patch
index b8bfeb5..6b9d097 100644
--- a/debian/patches/possible_size_type_error.patch
+++ b/debian/patches/possible_size_type_error.patch
@@ -3,7 +3,7 @@ Description: int may not be enough (theoretically) for large files.
--- a/sched/file_upload_handler.cpp
+++ b/sched/file_upload_handler.cpp
-@@ -138,13 +138,13 @@
+@@ -137,13 +137,13 @@
bytes_left = nbytes - offset;
while (bytes_left > 0) {
@@ -19,7 +19,7 @@ Description: int may not be enough (theoretically) for large files.
// delay opening the file until we've done the first socket read
// to avoid filesystem lockups (WCG, possible paranoia)
-@@ -210,7 +210,7 @@
+@@ -209,7 +209,7 @@
// try to write n bytes to file
//
diff --git a/debian/patches/sched_driver_char_buffers.patch b/debian/patches/sched_driver_char_buffers.patch
index 8a0f85c..dc07f86 100644
--- a/debian/patches/sched_driver_char_buffers.patch
+++ b/debian/patches/sched_driver_char_buffers.patch
@@ -2,7 +2,7 @@ Author: Steffen Moeller
Description: Allowing descriptions of hosts, vendor or model that are larger than a SMS.
--- a/sched/sched_driver.cpp
+++ b/sched/sched_driver.cpp
-@@ -53,9 +53,9 @@
+@@ -52,9 +52,9 @@
using std::vector;
struct HOST_DESC{
diff --git a/debian/patches/sched_driver_f_free.patch b/debian/patches/sched_driver_f_free.patch
index d1645f6..815424f 100644
--- a/debian/patches/sched_driver_f_free.patch
+++ b/debian/patches/sched_driver_f_free.patch
@@ -2,7 +2,7 @@ Author: Steffen Moeller <moeller at debian.org>
Description: Increased buffers and eliminated memory sink.
--- a/sched/sched_driver.cpp
+++ b/sched/sched_driver.cpp
-@@ -63,7 +63,7 @@
+@@ -62,7 +62,7 @@
double max_time = 1;
void read_hosts() {
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list