[SCM] BOINC packaging branch, master, updated. debian/7.1.21+dfsg-2_exp1-14-g067100c
Steffen Moeller
steffen_moeller at gmx.de
Mon Jul 15 23:45:54 UTC 2013
The following commit has been merged in the master branch:
commit 067100c34cf6d74610b333a0463678577a7c1f69
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date: Tue Jul 16 01:43:58 2013 +0200
Prepared for 7.2.4
diff --git a/debian/changelog b/debian/changelog
index ea4d18b..3c2ba20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+boinc (7.2.4+dfsg-1exp1) experimental; urgency=low
+
+ * New upstream version.
+ - reduced clang warnings patches
+
+ -- Steffen Moeller <moeller at debian.org> Tue, 16 Jul 2013 00:40:29 +0200
+
boinc (7.1.21+dfsg-1exp2) experimental; urgency=low
* php5-gd only recommended for boinc-server-maker
diff --git a/debian/patches/cppcheck_realloc.patch b/debian/patches/cppcheck_realloc.patch
index ef71752..91291a1 100644
--- a/debian/patches/cppcheck_realloc.patch
+++ b/debian/patches/cppcheck_realloc.patch
@@ -1,9 +1,11 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Initialisation.
---- a/lib/crypt.cpp
-+++ b/lib/crypt.cpp
-@@ -339,6 +339,7 @@
+Index: boinc_debian_new/lib/crypt.cpp
+===================================================================
+--- boinc_debian_new.orig/lib/crypt.cpp
++++ boinc_debian_new/lib/crypt.cpp
+@@ -342,6 +342,7 @@
char clear_buf[MD5_LEN];
int n, retval;
DATA_BLOCK clear_signature;
diff --git a/debian/patches/disable_new_version_check.patch b/debian/patches/disable_new_version_check.patch
index 925d852..aeec3b1 100644
--- a/debian/patches/disable_new_version_check.patch
+++ b/debian/patches/disable_new_version_check.patch
@@ -10,9 +10,11 @@ Forwarded: not-needed
Reviewed-By: costamagnagianfranco at yahoo.it
Last-Update: <2013-03-07>
---- a/client/client_state.cpp
-+++ b/client/client_state.cpp
-@@ -450,7 +450,7 @@
+Index: boinc_debian_new/client/client_state.cpp
+===================================================================
+--- boinc_debian_new.orig/client/client_state.cpp
++++ boinc_debian_new/client/client_state.cpp
+@@ -451,7 +451,7 @@
// inform the user if there's a newer version of client
//
@@ -21,8 +23,10 @@ Last-Update: <2013-03-07>
// parse account files again,
// now that we know the host's venue on each project
---- a/client/scheduler_op.cpp
-+++ b/client/scheduler_op.cpp
+Index: boinc_debian_new/client/scheduler_op.cpp
+===================================================================
+--- boinc_debian_new.orig/client/scheduler_op.cpp
++++ boinc_debian_new/client/scheduler_op.cpp
@@ -129,7 +129,7 @@
// and project list
//
diff --git a/debian/patches/investigate_boinc_api.patch b/debian/patches/investigate_boinc_api.patch
index e26e22b..fa11fd4 100644
--- a/debian/patches/investigate_boinc_api.patch
+++ b/debian/patches/investigate_boinc_api.patch
@@ -1,6 +1,8 @@
---- a/api/boinc_api.cpp
-+++ b/api/boinc_api.cpp
-@@ -354,7 +354,7 @@
+Index: boinc_debian_new/api/boinc_api.cpp
+===================================================================
+--- boinc_debian_new.orig/api/boinc_api.cpp
++++ boinc_debian_new/api/boinc_api.cpp
+@@ -356,7 +356,7 @@
if (standalone) return true;
@@ -9,7 +11,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 @@
+@@ -629,6 +629,10 @@
}
int boinc_get_status(BOINC_STATUS *s) {
@@ -20,7 +22,7 @@
s->no_heartbeat = boinc_status.no_heartbeat;
s->suspended = boinc_status.suspended;
s->quit_request = boinc_status.quit_request;
-@@ -809,7 +813,7 @@
+@@ -804,7 +808,7 @@
int boinc_parse_init_data_file() {
FILE* f;
int retval;
@@ -29,7 +31,7 @@
if (aid.project_preferences) {
free(aid.project_preferences);
-@@ -859,15 +863,15 @@
+@@ -854,15 +858,15 @@
);
if (other_pid) {
sprintf(buf, "<other_pid>%d</other_pid>\n", other_pid);
@@ -48,7 +50,7 @@
}
if (app_client_shm->shm->app_status.send_msg(msg_buf)) {
return 0;
-@@ -950,7 +954,7 @@
+@@ -957,7 +961,7 @@
}
static void handle_upload_file_status() {
@@ -57,7 +59,7 @@
std::string filename;
int status;
-@@ -1282,7 +1286,7 @@
+@@ -1170,7 +1174,7 @@
// send graphics-related messages
//
if (send_web_graphics_url && !app_client_shm->shm->graphics_reply.has_msg()) {
@@ -66,7 +68,7 @@
"<web_graphics_url>%s</web_graphics_url>",
web_graphics_url
);
-@@ -1290,7 +1294,7 @@
+@@ -1178,7 +1182,7 @@
send_web_graphics_url = false;
}
if (send_remote_desktop_addr && !app_client_shm->shm->graphics_reply.has_msg()) {
@@ -75,7 +77,7 @@
"<remote_desktop_addr>%s</remote_desktop_addr>",
remote_desktop_addr
);
-@@ -1506,7 +1510,7 @@
+@@ -1410,7 +1414,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 4d8780d..e5396c3 100644
--- a/debian/patches/more_clang_warnings.patch
+++ b/debian/patches/more_clang_warnings.patch
@@ -1,231 +1,3 @@
---- a/client/app_control.cpp
-+++ b/client/app_control.cpp
-@@ -590,8 +590,8 @@
- } else {
- x = y;
- }
-- fgets(buf, 256, f); // read the \n
-- fgets(buf, 256, f);
-+ (void) fgets(buf, 256, f); // read the \n
-+ (void) fgets(buf, 256, f);
- strip_whitespace(buf);
- fclose(f);
- return true;
-@@ -1440,13 +1440,13 @@
- FILE* f = fopen(path, "r");
- if (!f) return;
- buf[0] = 0;
-- fread(buf, 1, 4096, f);
-+ size_t fr = fread(buf, 1, 4096, f);
- fclose(f);
- buf[4095] = 0;
- double x;
- // sanity checks - project and result name must match
- //
-- if (!parse_str(buf, "<project_master_url>", s, sizeof(s))) {
-+ if (4096 != fr || !parse_str(buf, "<project_master_url>", s, sizeof(s))) {
- msg_printf(wup->project, MSG_INTERNAL_ERROR,
- "no project URL in task state file"
- );
---- a/client/cs_platforms.cpp
-+++ b/client/cs_platforms.cpp
-@@ -143,7 +143,7 @@
- strlcat(cmdline," -m",256);
- if ((f=popen(cmdline,"r"))) {
- while (!std::feof(f)) {
-- fgets(cmdline,256,f);
-+ if (!fgets(cmdline,256,f)) break;
- if (strstr(cmdline,"x86_64")) support64=1;
- }
- pclose(f);
-@@ -200,7 +200,7 @@
- f = popen(cmdline, "r");
- if (f) {
- while (!std::feof(f)) {
-- fgets(cmdline,256,f);
-+ if (!fgets(cmdline,256,f)) break;
- // If the library is 32-bit ELF, then we're
- // golden.
- if (strstr(cmdline, "ELF") && strstr(cmdline, "32-bit")) support32=1;
---- a/lib/crypt.cpp
-+++ b/lib/crypt.cpp
-@@ -208,14 +208,17 @@
- }
- if (j != len) return ERR_NULL;
- #else
-- fscanf(f, "%d", &num_bits);
-+ int fs = fscanf(f, "%d", &num_bits);
-+ if (1 != fs) return ERR_NULL;
- key->bits = num_bits;
- len = size - sizeof(key->bits);
- for (i=0; i<len; i++) {
-- fscanf(f, "%2x", &n);
-+ fs = fscanf(f, "%2x", &n);
-+ if (1 != fs) return ERR_NULL;
- key->data[i] = n;
- }
-- fscanf(f, ".");
-+ fs = fscanf(f, ".");
-+ if (0 != fs) return ERR_NULL;
- #endif
- return 0;
- }
---- a/lib/diagnostics.cpp
-+++ b/lib/diagnostics.cpp
-@@ -608,7 +608,7 @@
- size = backtrace (array, 64);
- // Anything that calls malloc here (i.e *printf()) will probably fail
- // so we'll do it the hard way.
-- write(fileno(stderr),"Stack trace (",strlen("Stack trace ("));
-+ (void) write(fileno(stderr),"Stack trace (",strlen("Stack trace ("));
- char mbuf[10];
- char *p=mbuf+9;
- int i=size;
-@@ -617,10 +617,10 @@
- *(p--)=i%10+'0';
- i/=10;
- }
-- write(fileno(stderr),p+1,strlen(p+1));
-- write(fileno(stderr)," frames):",strlen(" frames):"));
-+ (void) write(fileno(stderr),p+1,strlen(p+1));
-+ (void) write(fileno(stderr)," frames):",strlen(" frames):"));
- mbuf[0]=10;
-- write(fileno(stderr),mbuf,1);
-+ (void) write(fileno(stderr),mbuf,1);
- backtrace_symbols_fd(array, size, fileno(stderr));
- #endif
-
---- a/client/hostinfo_unix.cpp
-+++ b/client/hostinfo_unix.cpp
-@@ -1244,11 +1244,12 @@
- #endif
- fd = popen(cmd, "r");
- if (fd) {
-- fgets(virtualbox_version, sizeof(virtualbox_version), fd);
-- newlinePtr = strchr(virtualbox_version, '\n');
-- if (newlinePtr) *newlinePtr = '\0';
-- newlinePtr = strchr(virtualbox_version, '\r');
-- if (newlinePtr) *newlinePtr = '\0';
-+ if (fgets(virtualbox_version, sizeof(virtualbox_version), fd)) {
-+ newlinePtr = strchr(virtualbox_version, '\n');
-+ if (newlinePtr) *newlinePtr = '\0';
-+ newlinePtr = strchr(virtualbox_version, '\r');
-+ if (newlinePtr) *newlinePtr = '\0';
-+ }
- pclose(fd);
- }
- }
---- a/client/app_start.cpp
-+++ b/client/app_start.cpp
-@@ -850,7 +850,10 @@
- char* argv[100];
- char current_dir[1024];
-
-- getcwd(current_dir, sizeof(current_dir));
-+ if (NULL == getcwd(current_dir, sizeof(current_dir))) {
-+ sprintf(buf, "Can't get cwd");
-+ goto error;
-+ }
-
- sprintf(cmdline, "%s %s",
- wup->command_line.c_str(), app_version->cmdline
-@@ -997,7 +1000,11 @@
-
- // hook up stderr to a specially-named file
- //
-- freopen(STDERR_FILE, "a", stderr);
-+ if (NULL == freopen(STDERR_FILE, "a", stderr)) {
-+ perror("freopen stderr");
-+ fflush(NULL);
-+ _exit(errno);
-+ }
-
- if (!config.no_priority_change) {
- #if HAVE_SETPRIORITY
---- a/api/graphics2_unix.cpp
-+++ b/api/graphics2_unix.cpp
-@@ -191,7 +191,9 @@
- FILE *f = boinc_fopen("gfx_info", "r");
- if (f) {
- // ToDo: change this to XML parsing
-- fscanf(f, "%d %d %d %d\n", &xpos, &ypos, &width, &height);
-+ if (4 != fscanf(f, "%d %d %d %d\n", &xpos, &ypos, &width, &height)) {
-+ fprintf(stderr,"Coud not parse parameters for xpos, ypos, width, height from glx_info file.\n");
-+ }
- fclose(f);
- }
-
---- 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");
- if (fd) {
-- fgets(buf, sizeof(buf), fd);
-- retval = ps.parse(buf);
-+ if (!fgets(buf, sizeof(buf), fd)) {
-+ buf[0]=0;
-+ }
- fclose(fd);
-+ retval = ps.parse(buf);
-
- if (retval) {
- final_retval = retval;
---- a/client/log_flags.cpp
-+++ b/client/log_flags.cpp
-@@ -519,7 +519,10 @@
- #ifdef _WIN32
- _chdir(config.data_dir);
- #else
-- chdir(config.data_dir);
-+ if (chdir(config.data_dir)) {
-+ msg_printf(NULL, MSG_INFO, "Could not change to config.data_dir");
-+ return ERR_OPENDIR;
-+ }
- #endif
- }
- } else {
---- a/client/switcher.cpp
-+++ b/client/switcher.cpp
-@@ -47,6 +47,8 @@
- char newlibs[256];
- char *projectDirName;
-
-+ errno=0;
-+
- strcpy(user_name, "boinc_project");
- strcpy(group_name, "boinc_project");
-
-@@ -74,12 +76,16 @@
- // We are running setuid root, so setgid() sets real group ID,
- // effective group ID and saved set_group-ID for this process
- grp = getgrnam(group_name);
-- if (grp) setgid(grp->gr_gid);
-+ if (grp) {
-+ if (setgid(grp->gr_gid)) goto error;
-+ }
-
- // We are running setuid root, so setuid() sets real user ID,
- // effective user ID and saved set_user-ID for this process
- pw = getpwnam(user_name);
-- if (pw) setuid(pw->pw_uid);
-+ if (pw) {
-+ if (setuid(pw->pw_uid)) goto error;
-+ }
-
- // For unknown reasons, the LD_LIBRARY_PATH and DYLD_LIBRARY_PATH
- // environment variables are not passed in to switcher, though all
-@@ -126,7 +132,8 @@
-
- execv(argv[1], argv+2);
-
-+error:
- // If we got here execv failed
-- fprintf(stderr, "Process creation (%s) failed: errno=%d\n", argv[1], errno);
--
-+ if (errno) fprintf(stderr, "Process creation (%s) failed: errno=%d\n", argv[1], errno);
-+ return(errno);
- }
--- a/lib/shmem.cpp
+++ b/lib/shmem.cpp
@@ -337,7 +337,10 @@
diff --git a/debian/patches/nvidia_mem_display_simplification.patch b/debian/patches/nvidia_mem_display_simplification.patch
index c05de93..5750d42 100644
--- a/debian/patches/nvidia_mem_display_simplification.patch
+++ b/debian/patches/nvidia_mem_display_simplification.patch
@@ -1,6 +1,8 @@
---- a/lib/coproc.cpp
-+++ b/lib/coproc.cpp
-@@ -563,7 +563,7 @@
+Index: boinc_debian_new/lib/coproc.cpp
+===================================================================
+--- boinc_debian_new.orig/lib/coproc.cpp
++++ boinc_debian_new/lib/coproc.cpp
+@@ -584,7 +584,7 @@
cuda_version = 0;
display_driver_version = 0;
strcpy(prop.name, "");
@@ -9,7 +11,7 @@
prop.sharedMemPerBlock = 0;
prop.regsPerBlock = 0;
prop.warpSize = 0;
-@@ -593,7 +593,7 @@
+@@ -614,7 +614,7 @@
while (!xp.get_tag()) {
if (xp.match_tag("/coproc_cuda")) {
if (!peak_flops) {
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list