[SCM] BOINC packaging branch, master, updated. debian/7.0.65+dfsg-3-24-g7d8fc8f
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Wed Jun 5 09:53:33 UTC 2013
The following commit has been merged in the master branch:
commit 7d8fc8f1ec3006ca927f7abcf6dc8a1c6eae32d0
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Wed Jun 5 11:52:57 2013 +0200
New upstream release, upstream has accepted many of our patches
diff --git a/debian/changelog b/debian/changelog
index fc36423..6046dfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+boinc (7.1.7+dfsg-2) UNRELEASED; urgency=low
+
+ [ Gianfranco Costamagna ]
+ * New upstream release.
+ Many patches have been accepted upstream.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Wed, 05 Jun 2013 11:47:49 +0200
+
boinc (7.1.1+dfsg-2) UNRELEASED; urgency=low
* compiled with clang
diff --git a/debian/patches/MainDocumentWarnings.patch b/debian/patches/MainDocumentWarnings.patch
index 492f808..83d9558 100644
--- a/debian/patches/MainDocumentWarnings.patch
+++ b/debian/patches/MainDocumentWarnings.patch
@@ -2,16 +2,15 @@ Author: Steffen Moeller <moeller at debian.org>
Description: Nothing in this patch should be functionally relevant, only compile time warnings as by the ambiguity of the result parameter are resolved.
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
-@@ -1643,20 +1643,20 @@
+@@ -1643,7 +1643,6 @@
}
#else
void CMainDocument::KillGraphicsApp(int pid) {
- char* argv[6];
char currentDir[1024];
-- char thePIDbuf[10];
-+ char thePIDbuf[20];
+ char thePIDbuf[20];
int id, iRetVal;
-
+@@ -1651,12 +1650,13 @@
if (g_use_sandbox) {
snprintf(thePIDbuf, sizeof(thePIDbuf), "%d", pid);
@@ -22,7 +21,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
- argv[4] = thePIDbuf;
- argv[5] = 0;
+ char* const argv[6] = {
-+ strdup("switcher"),
++ strdup("switcher"),
+ strdup("/bin/kill"),
+ strdup("kill"),
+ strdup("-KILL"),
diff --git a/debian/patches/Missing_libSched.patch b/debian/patches/Missing_libSched.patch
index 036b124..970778c 100644
--- a/debian/patches/Missing_libSched.patch
+++ b/debian/patches/Missing_libSched.patch
@@ -1,7 +1,7 @@
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
-@@ -24,7 +24,7 @@
- run_in_ops
+@@ -35,7 +35,7 @@
+ project.xml
AM_CXXFLAGS += $(MYSQL_CFLAGS)
-AM_LDFLAGS += -static
@@ -11,8 +11,8 @@
cancel_jobs_LDADD = $(SERVERLIBS)
--- a/vda/Makefile.am
+++ b/vda/Makefile.am
-@@ -3,7 +3,7 @@
- bin_PROGRAMS = vda vdad ssim
+@@ -4,7 +4,7 @@
+ vda_PROGRAMS = vda vdad ssim
AM_CXXFLAGS += $(MYSQL_CFLAGS)
-AM_LDFLAGS += -static
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index 50b3971..83534fd 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -1,22 +1,22 @@
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
-@@ -146,13 +146,13 @@
+@@ -147,13 +147,13 @@
libboinc_la_SOURCES = $(generic_sources) $(mac_sources)
libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
-libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
+libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
- libboinc_la_LIBADD =
+ libboinc_la_LIBADD = -lm -lstdc++
libboinc_crypt_la_SOURCES = crypt.cpp
libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS)
libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
-libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
+libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
- libboinc_crypt_la_LIBADD =
+ libboinc_crypt_la_LIBADD = -lm -lstdc++
-@@ -221,7 +221,7 @@
+@@ -222,7 +222,7 @@
msg_test_LDADD = $(LIBBOINC)
crypt_prog_SOURCES = crypt_prog.cpp
crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS)
diff --git a/debian/patches/client_app_maxpathlen.patch b/debian/patches/client_app_maxpathlen.patch
index 75c46f8..3b8a1dd 100644
--- a/debian/patches/client_app_maxpathlen.patch
+++ b/debian/patches/client_app_maxpathlen.patch
@@ -15,7 +15,7 @@
//
void get_pathname(FILE_INFO* fip, char* path, int len) {
PROJECT* p = fip->project;
-- char buf[1024];
+- char buf[MAXPATHLEN];
+ char buf[std::max(len,MAXPATHLEN)];
// for testing purposes, it's handy to allow a FILE_INFO without
@@ -53,15 +53,6 @@
escape_project_url(project.master_url, url);
snprintf(buf, len, "%s%s.txt", JOB_LOG_BASE, url);
-@@ -176,7 +176,7 @@
- // Create the slot directory for the specified slot #
- //
- int make_slot_dir(int slot) {
-- char buf[1024];
-+ char buf[MAXPATHLEN];
-
- if (slot<0) {
- msg_printf(NULL, MSG_INTERNAL_ERROR, "Bad slot number %d", slot);
@@ -220,7 +220,7 @@
// delete unused stuff in the slots/ directory
//
diff --git a/debian/patches/cmath_missing.patch b/debian/patches/cmath_missing.patch
index 408d0a8..902e6ac 100644
--- a/debian/patches/cmath_missing.patch
+++ b/debian/patches/cmath_missing.patch
@@ -1,80 +1,3 @@
---- a/api/gutil.cpp
-+++ b/api/gutil.cpp
-@@ -24,7 +24,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <math.h>
-+#include <cmath>
- #include <setjmp.h>
-
- #ifdef _WIN32
---- a/api/gutil_text.cpp
-+++ b/api/gutil_text.cpp
-@@ -26,7 +26,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <math.h>
-+#include <cmath>
- #include <setjmp.h>
-
- #ifdef _WIN32
---- a/client/client_state.cpp
-+++ b/client/client_state.cpp
-@@ -26,7 +26,7 @@
- #include <ctime>
- #include <cstdarg>
- #include <cstring>
--#include <math.h>
-+#include <cmath>
- #if HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
---- a/client/sim_util.cpp
-+++ b/client/sim_util.cpp
-@@ -35,7 +35,7 @@
- #define finite _finite
- #endif
-
--#include <math.h>
-+#include <cmath>
-
- #include "error_numbers.h"
- #include "filesys.h"
---- a/client/whetstone.cpp
-+++ b/client/whetstone.cpp
-@@ -29,7 +29,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
--#include <math.h>
-+#include <cmath>
- #include <time.h>
- #endif
-
---- a/clientscr/ss_app.cpp
-+++ b/clientscr/ss_app.cpp
-@@ -22,7 +22,7 @@
- #ifdef _WIN32
- #include "boinc_win.h"
- #else
--#include <math.h>
-+#include <cmath>
- #endif
- #include <string>
- #include <vector>
---- a/db/boinc_db.cpp
-+++ b/db/boinc_db.cpp
-@@ -22,7 +22,7 @@
- #include <ctime>
- #include <unistd.h>
- #include <cmath>
--#include <math.h>
-+#include <cmath>
-
- // For machines with finite() defined in ieeefp.h
- #if HAVE_IEEEFP_H
--- a/lib/boinc_win.h
+++ b/lib/boinc_win.h
@@ -197,7 +197,7 @@
@@ -97,102 +20,3 @@
main()
{
int i;
---- a/lib/parse.cpp
-+++ b/lib/parse.cpp
-@@ -31,7 +31,7 @@
- #include <cstring>
- #include <cstdlib>
- #include <string>
--#include <math.h>
-+#include <cmath>
- #include <ctype.h>
- #include <errno.h>
- #if HAVE_IEEEFP_H
---- a/lib/str_util.cpp
-+++ b/lib/str_util.cpp
-@@ -27,7 +27,7 @@
- #ifndef _WIN32
- #include "config.h"
- #include <string>
--#include <math.h>
-+#include <cmath>
- #include <string.h>
- #include <stdlib.h>
- #include <ctype.h>
---- a/lib/util.cpp
-+++ b/lib/util.cpp
-@@ -50,7 +50,7 @@
- #include <errno.h>
- #include <string>
- #include <cstring>
--#include <math.h>
-+#include <cmath>
- #if HAVE_IEEEFP_H
- #include <ieeefp.h>
- extern "C" {
---- a/samples/example_app/uc2_graphics.cpp
-+++ b/samples/example_app/uc2_graphics.cpp
-@@ -33,7 +33,7 @@
- #ifdef _WIN32
- #include "boinc_win.h"
- #else
--#include <math.h>
-+#include <cmath>
- #endif
-
- #include "parse.h"
---- a/samples/nvcuda/cuda_kernel.cu
-+++ b/samples/nvcuda/cuda_kernel.cu
-@@ -25,7 +25,7 @@
- // identity matrix and the product A * incerse(A). For debugging...
- //#define VERIFY 1
- #include <stdio.h>
--#include <math.h>
-+#include <cmath>
- #include <time.h>
- #include "cuda_config.h"
-
---- a/samples/vboxwrapper/vboxwrapper.cpp
-+++ b/samples/vboxwrapper/vboxwrapper.cpp
-@@ -56,7 +56,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <stdio.h>
--#include <math.h>
-+#include <cmath>
- #include <string>
- #include <unistd.h>
- #endif
---- a/samples/wrappture/fermi.cpp
-+++ b/samples/wrappture/fermi.cpp
-@@ -2,7 +2,7 @@
-
- #include <stdlib.h>
- #include <stdio.h>
--#include <math.h>
-+#include <cmath>
- #include <unistd.h>
-
- int main(int argc, char * argv[]) {
---- a/samples/wrappture/wrappture_example.cpp
-+++ b/samples/wrappture/wrappture_example.cpp
-@@ -15,7 +15,7 @@
-
- #include <stdlib.h>
- #include <stdio.h>
--#include <math.h>
-+#include <cmath>
- #ifndef _WIN32
- #include <unistd.h>
- #endif
---- a/vda/vda_lib.cpp
-+++ b/vda/vda_lib.cpp
-@@ -19,7 +19,7 @@
-
- #include <algorithm>
- #include <limits.h>
--#include <math.h>
-+#include <cmath>
- #include <set>
- #include <stdio.h>
- #include <vector>
diff --git a/debian/patches/disable_new_version_check.patch b/debian/patches/disable_new_version_check.patch
index db438e3..925d852 100644
--- a/debian/patches/disable_new_version_check.patch
+++ b/debian/patches/disable_new_version_check.patch
@@ -12,7 +12,7 @@ Last-Update: <2013-03-07>
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
-@@ -463,7 +463,7 @@
+@@ -450,7 +450,7 @@
// inform the user if there's a newer version of client
//
diff --git a/debian/patches/fopen_closing.patch b/debian/patches/fopen_closing.patch
index 45af6ac..a939679 100644
--- a/debian/patches/fopen_closing.patch
+++ b/debian/patches/fopen_closing.patch
@@ -125,7 +125,7 @@
if (!buf) {
--- a/lib/parse_test.cpp
+++ b/lib/parse_test.cpp
-@@ -52,6 +52,7 @@
+@@ -57,6 +57,7 @@
exit(1);
}
parse(f);
diff --git a/debian/patches/hurd-ftbfs.patch b/debian/patches/hurd-ftbfs.patch
deleted file mode 100644
index ff28554..0000000
--- a/debian/patches/hurd-ftbfs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Guo Yixuan <culu.gyx at gmail.com>
-Description: Hurd ftbts: missing definition for MAXPATHLEN
- Hurd kernel doesn't limit path length.
---- a/lib/procinfo_unix.cpp
-+++ b/lib/procinfo_unix.cpp
-@@ -51,6 +51,7 @@
- #include "str_replace.h"
-
- #include "procinfo.h"
-+#include "filesys.h"
-
- using std::vector;
-
diff --git a/debian/patches/investigate_boinc_api.patch b/debian/patches/investigate_boinc_api.patch
index b3bb650..d721a2d 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
-@@ -331,7 +331,7 @@
+@@ -330,7 +330,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
-@@ -343,7 +343,7 @@
+@@ -342,7 +342,7 @@
double range = aid.fraction_done_end - aid.fraction_done_start;
double fdone = aid.fraction_done_start + fraction_done*range;
sprintf(buf, "<fraction_done>%e</fraction_done>\n", fdone);
@@ -18,7 +18,7 @@
}
if (bytes_sent) {
sprintf(buf, "<bytes_sent>%f</bytes_sent>\n", bytes_sent);
-@@ -608,6 +608,10 @@
+@@ -607,6 +607,10 @@
}
int boinc_get_status(BOINC_STATUS *s) {
@@ -29,7 +29,7 @@
s->no_heartbeat = boinc_status.no_heartbeat;
s->suspended = boinc_status.suspended;
s->quit_request = boinc_status.quit_request;
-@@ -784,7 +788,7 @@
+@@ -783,7 +787,7 @@
int boinc_parse_init_data_file() {
FILE* f;
int retval;
@@ -38,7 +38,7 @@
if (aid.project_preferences) {
free(aid.project_preferences);
-@@ -834,15 +838,15 @@
+@@ -833,15 +837,15 @@
);
if (other_pid) {
sprintf(buf, "<other_pid>%d</other_pid>\n", other_pid);
@@ -57,7 +57,7 @@
}
if (app_client_shm->shm->app_status.send_msg(msg_buf)) {
return 0;
-@@ -913,16 +917,16 @@
+@@ -912,7 +916,7 @@
}
static void handle_upload_file_status() {
@@ -66,36 +66,7 @@
std::string filename;
int status;
- relative_to_absolute("", path);
- DirScanner dirscan(path);
- while (dirscan.scan(filename)) {
-- strcpy(buf, filename.c_str());
-+ strlcpy(buf, filename.c_str(), sizeof(buf));
- if (strstr(buf, UPLOAD_FILE_STATUS_PREFIX) != buf) continue;
-- strcpy(log_name, buf+strlen(UPLOAD_FILE_STATUS_PREFIX));
-+ strlcpy(log_name, buf+strlen(UPLOAD_FILE_STATUS_PREFIX), sizeof(log_name));
- FILE* f = boinc_fopen(filename.c_str(), "r");
- if (!f) {
- fprintf(stderr,
-@@ -931,7 +935,7 @@
- );
- continue;
- }
-- p = fgets(buf, 256, f);
-+ p = fgets(buf, sizeof(buf), f);
- fclose(f);
- if (p && parse_int(buf, "<status>", status)) {
- UPLOAD_FILE_STATUS uf;
-@@ -1072,7 +1076,7 @@
- #ifdef _WIN32
- GetFullPathName(path, MAXPATHLEN, abspath, NULL);
- #else
-- strcpy(abspath, path);
-+ strlcpy(abspath, path, sizeof(abspath));
- #endif
- argv[0] = const_cast<char*>(GRAPHICS_APP_FILENAME);
- if (fullscreen) {
-@@ -1260,7 +1264,7 @@
+@@ -1259,7 +1263,7 @@
// send graphics-related messages
//
if (send_web_graphics_url && !app_client_shm->shm->graphics_reply.has_msg()) {
@@ -104,7 +75,7 @@
"<web_graphics_url>%s</web_graphics_url>",
web_graphics_url
);
-@@ -1268,7 +1272,7 @@
+@@ -1267,7 +1271,7 @@
send_web_graphics_url = false;
}
if (send_remote_desktop_addr && !app_client_shm->shm->graphics_reply.has_msg()) {
@@ -113,7 +84,7 @@
"<remote_desktop_addr>%s</remote_desktop_addr>",
remote_desktop_addr
);
-@@ -1462,7 +1466,7 @@
+@@ -1461,7 +1465,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 582f970..c5c1a64 100644
--- a/debian/patches/more_clang_warnings.patch
+++ b/debian/patches/more_clang_warnings.patch
@@ -97,7 +97,7 @@
--- a/client/hostinfo_unix.cpp
+++ b/client/hostinfo_unix.cpp
-@@ -1345,11 +1345,12 @@
+@@ -1236,11 +1236,12 @@
#endif
fd = popen(cmd, "r");
if (fd) {
@@ -117,7 +117,7 @@
}
--- a/client/app_start.cpp
+++ b/client/app_start.cpp
-@@ -846,7 +846,10 @@
+@@ -850,7 +850,10 @@
char* argv[100];
char current_dir[1024];
@@ -129,7 +129,7 @@
sprintf(cmdline, "%s %s",
wup->command_line.c_str(), app_version->cmdline
-@@ -989,7 +992,11 @@
+@@ -993,7 +996,11 @@
// hook up stderr to a specially-named file
//
@@ -144,7 +144,7 @@
#if HAVE_SETPRIORITY
--- a/api/graphics2_unix.cpp
+++ b/api/graphics2_unix.cpp
-@@ -190,7 +190,9 @@
+@@ -191,7 +191,9 @@
FILE *f = boinc_fopen("gfx_info", "r");
if (f) {
// ToDo: change this to XML parsing
@@ -173,7 +173,7 @@
final_retval = retval;
--- a/client/log_flags.cpp
+++ b/client/log_flags.cpp
-@@ -526,7 +526,10 @@
+@@ -509,7 +509,10 @@
#ifdef _WIN32
_chdir(config.data_dir);
#else
diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index 93ac735..b9a1d90 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -48,7 +48,7 @@
+ snprintf(newpath, sizeof(newpath), "%s/%s", oldpath, q);
retval = boinc_mkdir(newpath);
if (retval) return retval;
- strcpy(oldpath, newpath);
+ safe_strcpy(oldpath, newpath);
--- a/lib/network.cpp
+++ b/lib/network.cpp
@@ -71,7 +71,7 @@
@@ -74,12 +74,3 @@
return buf;
#endif
}
-@@ -107,7 +107,7 @@
- case AF_INET6: {
- sockaddr_in6* sin = (sockaddr_in6*)&s;
- char buf[256];
-- inet_ntop(AF_INET6, (void*)(&sin->sin6_addr), buf, 256);
-+ inet_ntop(AF_INET6, (void*)(&sin->sin6_addr), buf, sizeof(buf));
- return (strcmp(buf, "::1") == 0);
- break;
- }
diff --git a/debian/patches/opendir_errno.patch b/debian/patches/opendir_errno.patch
index fe2bbed..19b37a0 100644
--- a/debian/patches/opendir_errno.patch
+++ b/debian/patches/opendir_errno.patch
@@ -7,24 +7,24 @@
- char * basepath, int depth,
+ const char * const basepath, int depth,
int use_sandbox, int isManager,
-- char * path_to_error
-+ const char * const path_to_error
+- char * path_to_error,
++ const char * const path_to_error,
+ int len
);
- #if (! defined(__WXMAC__) && ! defined(_MAC_INSTALLER))
-@@ -503,9 +503,9 @@
- }
+@@ -505,9 +505,9 @@
--static int CheckNestedDirectories(char * basepath, int depth,
-+static int CheckNestedDirectories(const char * const basepath, int depth,
- int use_sandbox, int isManager,
-- char * path_to_error
-+ const char * const path_to_error
- ) {
+ static int CheckNestedDirectories(
+- char * basepath, int depth,
++ const char * const basepath, int depth,
+ int use_sandbox, int isManager,
+- char * path_to_error, int len
++ const char * const path_to_error, int len
+ ) {
int isDirectory;
char full_path[MAXPATHLEN];
-@@ -515,6 +515,7 @@
+@@ -517,6 +517,7 @@
dirent *dp;
static int errShown = 0;
@@ -32,7 +32,7 @@
dirp = opendir(basepath);
if (dirp == NULL) {
// Ideally, all project-created subdirectories under project or slot
-@@ -524,6 +525,7 @@
+@@ -526,6 +527,7 @@
// the subdirectory to check them.
strlcpy(full_path, basepath, sizeof(full_path));
if ((depth > 1) && (errno == EACCES)) {
@@ -56,7 +56,7 @@
struct dirent *entry;
+ errno=0;
DIR *a = opendir(libdir[i]);
-- // if dir doesn't exist, do to the next one
+- // if dir doesn't exist, do the next one
- if (a == 0) continue;
+ if (a == 0) {
+ if (ENOENT==errno) {
diff --git a/debian/patches/opendir_error_messages.patch b/debian/patches/opendir_error_messages.patch
index 6f40b12..2a3b85b 100644
--- a/debian/patches/opendir_error_messages.patch
+++ b/debian/patches/opendir_error_messages.patch
@@ -15,27 +15,6 @@
}
--- a/lib/diagnostics.cpp
+++ b/lib/diagnostics.cpp
-@@ -74,14 +74,14 @@
-
- static int diagnostics_initialized = false;
- static int flags;
--static char stdout_log[256];
--static char stdout_archive[256];
-+static char stdout_log[MAXPATHLEN];
-+static char stdout_archive[MAXPATHLEN];
- static FILE* stdout_file;
--static char stderr_log[256];
--static char stderr_archive[256];
-+static char stderr_log[MAXPATHLEN];
-+static char stderr_archive[MAXPATHLEN];
- static FILE* stderr_file;
--static char boinc_dir[256];
--static char boinc_install_dir[256];
-+static char boinc_dir[MAXPATHLEN];
-+static char boinc_install_dir[MAXPATHLEN];
- static int boinc_proxy_enabled;
- static char boinc_proxy[256];
- static char symstore[256];
@@ -305,7 +305,7 @@
// Store various pieces of inforation for future use.
@@ -45,23 +24,6 @@
char proxy_address[256];
int proxy_port;
MIOFILE mf;
-@@ -330,13 +330,13 @@
- mf.init_file(p);
- while(mf.fgets(buf, sizeof(buf))) {
- if (match_tag(buf, "</app_init_data>")) break;
-- else if (parse_str(buf, "<boinc_dir>", boinc_dir, 256)) continue;
-- else if (parse_str(buf, "<symstore>", symstore, 256)) continue;
-+ else if (parse_str(buf, "<boinc_dir>", boinc_dir, sizeof(boinc_dir))) continue;
-+ else if (parse_str(buf, "<symstore>", symstore, sizeof(symstore))) continue;
- else if (match_tag(buf, "<use_http_proxy/>")) {
- boinc_proxy_enabled = true;
- continue;
- }
-- else if (parse_str(buf, "<http_server_name>", proxy_address, 256)) continue;
-+ else if (parse_str(buf, "<http_server_name>", proxy_address, sizeof(proxy_address))) continue;
- else if (parse_int(buf, "<http_server_port>", proxy_port)) continue;
- }
- fclose(p);
--- a/client/sandbox.cpp
+++ b/client/sandbox.cpp
@@ -207,7 +207,7 @@
diff --git a/debian/patches/parse_issues.patch b/debian/patches/parse_issues.patch
index f48d3a3..4a191d7 100644
--- a/debian/patches/parse_issues.patch
+++ b/debian/patches/parse_issues.patch
@@ -1,22 +1,6 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Improved memory handling.
---- a/lib/parse.cpp
-+++ b/lib/parse.cpp
-@@ -178,7 +178,12 @@
- int n = (int)strlen(line);
- if (nused + n >= bufsize) {
- bufsize *= 2;
-- buf = (char*)realloc(buf, bufsize);
-+ char *b = buf;
-+ buf = (char*)realloc(b, bufsize);
-+ if (!buf) {
-+ free(b); // b was buf and was allocated in this fun
-+ return ERR_XML_PARSE;
-+ }
- }
- strcpy(buf+nused, line);
- nused += n;
--- a/lib/procinfo_win.cpp
+++ b/lib/procinfo_win.cpp
@@ -25,6 +25,9 @@
diff --git a/debian/patches/possible_size_type_error.patch b/debian/patches/possible_size_type_error.patch
index caaca34..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
-@@ -123,13 +123,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)
-@@ -195,7 +195,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 bce5e53..815424f 100644
--- a/debian/patches/sched_driver_f_free.patch
+++ b/debian/patches/sched_driver_f_free.patch
@@ -2,16 +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
-@@ -47,6 +47,8 @@
-
- #include "util.h"
- #include "svn_version.h"
-+#include "str_replace.h" // strlcpy
-+#include "str_util.h" // safe_strcpy
-
- using std::vector;
-
-@@ -61,7 +63,7 @@
+@@ -62,7 +62,7 @@
double max_time = 1;
void read_hosts() {
@@ -20,22 +11,3 @@ Description: Increased buffers and eliminated memory sink.
host_descs.clear();
FILE* f = fopen("host_descs.txt", "r");
if (!f) {
-@@ -72,15 +74,15 @@
- 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);
- }
- fclose(f);
diff --git a/debian/patches/series b/debian/patches/series
index 49c755e..640a764 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@ upstream_sztaki_configureEval.patch
generate_less.patch
possible_size_type_error.patch
debian_debian_AdjustBoincTopdirPython.patch
-stripchart_security.patch
#AddSomeConstToMakeClearMemoryIsNotAllocated.patch
#AddingMoreConst.patch
#evenMoreConst03.patch
@@ -43,7 +42,7 @@ opendir_error_messages.patch
sched_driver_char_buffers.patch
csh2tcsh.patch
#socklenBuildFixByDavid.patch
-cmath_missing.patch
+#cmath_missing.patch #trying to disable it
investigate_boinc_api.patch
slot_dir_source_trace.patch
opendir_errno.patch
@@ -55,11 +54,8 @@ boinclib_shared.patch
dynamic_libboinc.patch
Missing_libSched.patch
fix-add-exclusive-app.patch
-zip_only_built_with_server.patch
#fix-for-debian-bug-646583.patch
-hurd-ftbfs.patch
disable_new_version_check.patch
-server_installs_itself.patch
lib_cppcheck.patch
fopen_closing.patch
rrsim_iterator_cppcheck.patch
diff --git a/debian/patches/server_installs_itself.patch b/debian/patches/server_installs_itself.patch
deleted file mode 100644
index 74ae3f5..0000000
--- a/debian/patches/server_installs_itself.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-Author: Steffen Moeller <moeller at debian.org>
-Forwarded: yes (PM to David)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -16,7 +16,7 @@
- endif
-
- if ENABLE_SERVER
-- SERVER_SUBDIRS = db test py sched apps tools vda
-+ SERVER_SUBDIRS = db test py sched apps tools vda html
- ## once contained samples/example_app which breaks out-of-source-tree builds
- endif
-
---- /dev/null
-+++ b/html/Makefile.am
-@@ -0,0 +1,5 @@
-+
-+htmldir=$(DESTDIR)/$(prefix)/share/boinc-server-maker/html
-+install-data-local:
-+ mkdir -p $(htmldir)
-+ cp -r bt drupal inc languages ops project.sample queue user $(htmldir)
---- a/sched/Makefile.am
-+++ b/sched/Makefile.am
-@@ -87,11 +87,12 @@
-
- if ENABLE_SERVER
-
--cgidir = $(libexecdir)/cgi-bin
--scheddir = $(libexecdir)/sched
-+schedcgidir = $(prefix)/lib/boinc-server-maker/sched
-+schedsharedir = $(prefix)/lib/boinc-server-maker/sched
-+schedbindir = $(prefix)/lib/boinc-server-maker/sched
-
--bin_PROGRAMS = \
-- adjust_user_priority \
-+schedbin_PROGRAMS = \
-+ adjust_user_priority \
- delete_file \
- get_file \
- make_work \
-@@ -100,9 +101,9 @@
- show_shmem \
- wu_check
-
--sched_PROGRAMS = \
-+schedshare_PROGRAMS = \
- census \
-- credit_test \
-+ credit_test \
- db_dump \
- db_purge \
- feeder \
-@@ -121,12 +122,18 @@
- trickle_echo \
- update_stats
-
--cgi_PROGRAMS= \
-+schedcgi_PROGRAMS= \
- cgi \
- file_upload_handler
-
-+schedshare_DATA = \
-+ db_dump_spec.xml \
-+ assimilator.py \
-+ pymw_assimilator.py \
-+ transitioner_catchup.php
-+
- # scripts that 'make install' should put in bindir
--bin_SCRIPTS = start stop status
-+schedshare_SCRIPTS = start stop status
-
- noinst_HEADERS = \
- assimilate_handler.h \
-@@ -281,8 +288,7 @@
-
- if ENABLE_FCGI
-
--cgi_PROGRAMS += fcgi \
-- fcgi_file_upload_handler
-+schedcgi_PROGRAMS += fcgi fcgi_file_upload_handler
-
- fcgi_SOURCES = $(cgi_sources)
- fcgi_CPPFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
---- a/configure.ac
-+++ b/configure.ac
-@@ -975,6 +975,7 @@
- db/Makefile
- doc/Makefile
- doc/manpages/Makefile
-+ html/Makefile
- lib/Makefile
- locale/Makefile
- Makefile
---- a/db/Makefile.am
-+++ b/db/Makefile.am
-@@ -9,4 +9,5 @@
- endif
-
- ## other stuff to go into the distribution
--EXTRA_DIST = constraints.sql schema.sql init_db
-+extradir = $(prefix)/share/boinc-server-maker/db
-+dist_extra_DATA = constraints.sql schema.sql init_db
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -1,11 +1,13 @@
- ## -*- mode: makefile; tab-width: 4 -*-
- include $(top_srcdir)/Makefile.incl
-
--scheddir = $(libexecdir)/sched
-+scheddir = $(prefix)/lib/boinc-server-maker/sched
-+toolsdir = $(prefix)/lib/boinc-server-maker/tools
-+toolbindir = $(prefix)/lib/boinc-server-maker/tools
-
--bin_PROGRAMS = create_work sign_executable dir_hier_path dir_hier_move cancel_jobs
-+toolbin_PROGRAMS = create_work sign_executable dir_hier_path dir_hier_move cancel_jobs
-
--dist_bin_SCRIPTS = \
-+dist_toolbin_SCRIPTS = \
- boinc_submit \
- dbcheck_files_exist \
- demo_submit \
-@@ -23,6 +25,15 @@
- makelog.sh \
- run_in_ops
-
-+dist_tools_SCRIPTS = \
-+ appmgr \
-+ db_query \
-+ manage_privileges \
-+ run_in_ops \
-+ stage_file \
-+ watch_tcp \
-+ project.xml
-+
- AM_CXXFLAGS += $(MYSQL_CFLAGS)
- AM_LDFLAGS += -static -L../sched -L../lib/.libs
-
---- a/vda/Makefile.am
-+++ b/vda/Makefile.am
-@@ -1,6 +1,7 @@
- include $(top_srcdir)/Makefile.incl
-
--bin_PROGRAMS = vda vdad ssim
-+vdadir=$(prefix)/lib/boinc-server-maker/vda
-+vda_PROGRAMS = vda vdad ssim
-
- AM_CXXFLAGS += $(MYSQL_CFLAGS)
- AM_LDFLAGS += -static -L../lib/.libs -L../sched
---- a/apps/Makefile.am
-+++ b/apps/Makefile.am
-@@ -3,7 +3,7 @@
-
- include $(top_srcdir)/Makefile.incl
-
--exampledir = $(libexecdir)/examples
-+exampledir = $(prefix)/lib/boinc-apps-examples
- example_PROGRAMS = upper_case concat 1sec
-
- upper_case_SOURCES = upper_case.cpp
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -8,7 +8,8 @@
- # Stuff needed for server builds goes here.
- if ENABLE_SERVER
-
--bin_PROGRAMS += crypt_prog parse_test
-+serverbindir = $(prefix)/lib/boinc-server-maker/lib
-+serverbin_PROGRAMS = crypt_prog parse_test
-
- endif
- # end of "if ENABLE_SERVER"
---- a/py/Makefile.am
-+++ b/py/Makefile.am
-@@ -19,6 +19,10 @@
- Boinc/tools.py \
- Boinc/util.py
-
-+pydir=$(prefix)/usr/share/boinc-server-maker/py/Boinc
-+py_SCRIPTS=$(EXTRA_DIST)
-+
-+
- $(srcdir)/Boinc/boinc_db.py: $(top_srcdir)/db/boinc_db.h $(top_srcdir)/lib/common_defs.h
- cat $^ | $(top_srcdir)/py/db_def_to_py > $@
-
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index b0d22d5..566ca5d 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -47,15 +47,6 @@
int n, dummy;
unsigned int i;
PROJECT* project=0;
-@@ -897,7 +897,7 @@
-
- DirScanner dirscan(slot_dir);
- while (dirscan.scan(filename)) {
-- strcpy(buf, filename.c_str());
-+ strncpy(buf, filename.c_str(), sizeof(buf));
- if (strstr(buf, UPLOAD_FILE_REQ_PREFIX) == buf) {
- char* p = buf+strlen(UPLOAD_FILE_REQ_PREFIX);
- FILE_INFO* fip = result->lookup_file_logical(p);
--- a/client/app.h
+++ b/client/app.h
@@ -47,6 +47,7 @@
diff --git a/debian/patches/some_extra_clang_warnings.patch b/debian/patches/some_extra_clang_warnings.patch
index 34502cd..ddc480d 100644
--- a/debian/patches/some_extra_clang_warnings.patch
+++ b/debian/patches/some_extra_clang_warnings.patch
@@ -1,33 +1,3 @@
---- a/tools/dir_hier_path.cpp
-+++ b/tools/dir_hier_path.cpp
-@@ -42,7 +42,7 @@
- int retval;
-
- if ( (argc == 1) || !strcmp(argv[1], "-h") || !strcmp(argv[1],"--help") || (argc != 2) ) {
-- fprintf(stderr, usage);
-+ fprintf(stderr,"%s", usage);
- exit(1);
- }
-
---- a/tools/dir_hier_move.cpp
-+++ b/tools/dir_hier_move.cpp
-@@ -43,14 +43,14 @@
- int retval;
-
- if ( (argc == 1) || !strcmp(argv[1], "-h") || !strcmp(argv[1],"--help") || (argc != 4) ) {
-- fprintf(stderr, usage);
-+ fprintf(stderr,"%s", usage);
- exit(1);
- }
- src_dir = argv[1];
- dst_dir = argv[2];
- fanout = atoi(argv[3]);
- if (!fanout) {
-- fprintf(stderr, usage);
-+ fprintf(stderr,"%s", usage);
- exit(1);
- }
-
--- a/clientgui/sg_ProjectPanel.cpp
+++ b/clientgui/sg_ProjectPanel.cpp
@@ -414,8 +414,7 @@
diff --git a/debian/patches/stripchart_debian.patch b/debian/patches/stripchart_debian.patch
index bd6a025..e5c999d 100644
--- a/debian/patches/stripchart_debian.patch
+++ b/debian/patches/stripchart_debian.patch
@@ -3,16 +3,16 @@ Description: Adjusting paths.
Disclaimer: This is mostly dead code in upstream.
--- a/stripchart/stripchart.cnf
+++ b/stripchart/stripchart.cnf
-@@ -8,7 +8,7 @@
+@@ -4,7 +4,7 @@
+ $majorversion = 2; $minorversion = 1;
+
# Directory where gnuplot is
- # $gnuplot = "/usr/local/gnuplot-3.7";
- #$gnuplot = "/disks/asimov/a/users/hiramc/local/src/gnuplot-3.7";
-$gnuplot = "/usr/local/bin"
+$gnuplot = "/usr/bin"
# Temporary files
$suffix = rand(10000);
-@@ -42,7 +42,7 @@
+@@ -38,7 +38,7 @@
$tzdiff = timegm($sec,$min,$hour,$mday,$mon,$year) - timelocal($sec,$min,$hour,$mday,$mon,$year);
# Where is the stripchart executable located?
@@ -21,7 +21,7 @@ Disclaimer: This is mostly dead code in upstream.
# What is the default number of stripcharts?
$defaultnumcharts = 1;
-@@ -52,11 +52,11 @@
+@@ -48,11 +48,11 @@
# Where is the list of datafiles for stripchart.cgi?
# Note: there is a sample copy in the samples directory:
diff --git a/debian/patches/stripchart_security.patch b/debian/patches/stripchart_security.patch
deleted file mode 100644
index d7cf568..0000000
--- a/debian/patches/stripchart_security.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Author: Steffen Moeller <moeller at debian.org>
-Description: Adjusting paths
-Disclaimer: This is mostly dead code of upstream.
-
-#Index: boinc/stripchart/samples/get_load
-#===================================================================
-#--- boinc.orig/stripchart/samples/get_load 2012-01-15 01:31:59.000000000 +0100
-#+++ boinc/stripchart/samples/get_load 2012-01-15 02:02:05.000000000 +0100
-#@@ -1,11 +1,11 @@
-#-#! /bin/csh
-#+#!/bin/sh
-#
-#-set UPTIME = `/usr/bin/uptime | awk '{print $10}' | sed s/,//`
-#-if ($UPTIME == "average:") then
-#- set UPTIME = `/usr/bin/uptime | awk '{print $11}' | sed s/,//`
-#-endif
-#+UPTIME=`uptime | awk '{print $10}' | sed s/,//`
-#+if [ "$UPTIME" = "average:"]; then
-#+ UPTIME=`uptime | awk '{print $11}' | sed s/,//`
-#+fi
-#
-#-set CIVDATE = `/bin/date "+%Y:%m:%d:%H:%M"`
-#-set UNIXDATE = `/usr/local/bin/perl -e 'print time()'`
-#+CIVDATE=`date "+%Y:%m:%d:%H:%M"`
-#+UNIXDATE=`perl -e 'print time()'`
-#
-# echo $CIVDATE $UNIXDATE $UPTIME
-#Index: boinc/stripchart/samples/parse_config
-#===================================================================
-#--- boinc.orig/stripchart/samples/parse_config 2012-01-15 01:31:59.000000000 +0100
-#+++ boinc/stripchart/samples/parse_config 2012-01-15 02:02:05.000000000 +0100
-#@@ -1,4 +1,4 @@
-#-#!/usr/bin/env python
-#+#!/usr/bin/python
-#
-# # -*- mode: python; python-indent: 4; -*-
-#
-#Index: boinc/stripchart/samples/dir_size
-#===================================================================
-#--- boinc.orig/stripchart/samples/dir_size 2012-01-15 01:31:59.000000000 +0100
-#+++ boinc/stripchart/samples/dir_size 2012-01-15 02:02:05.000000000 +0100
-#@@ -1,8 +1,8 @@
-#-#! /bin/csh
-#+#!/bin/sh
-#
-#-set SIZE = `du -sk $1 | awk '{print $1*1024}'`
-#+SIZE=`du -sk $1 | awk '{print $1*1024}'`
-#
-#-set CIVDATE = `/bin/date "+%Y:%m:%d:%H:%M"`
-#-set UNIXDATE = `/usr/local/bin/perl -e 'print time()'`
-#+CIVDATE=`date "+%Y:%m:%d:%H:%M"`
-#+UNIXDATE=`perl -e 'print time()'`
-#
-# echo $CIVDATE $UNIXDATE $SIZE
---- a/stripchart/stripchart.cnf
-+++ b/stripchart/stripchart.cnf
-@@ -1,4 +1,5 @@
--#! /usr/bin/env perl
-+
-+# This should not be executed, but merely be included
-
- use Time::Local;
-
-@@ -6,8 +7,6 @@
- $majorversion = 2; $minorversion = 1;
-
- # Directory where gnuplot is
--# $gnuplot = "/usr/local/gnuplot-3.7";
--#$gnuplot = "/disks/asimov/a/users/hiramc/local/src/gnuplot-3.7";
- $gnuplot = "/usr/bin"
-
- # Temporary files
diff --git a/debian/patches/zip_only_built_with_server.patch b/debian/patches/zip_only_built_with_server.patch
deleted file mode 100644
index 0cda03c..0000000
--- a/debian/patches/zip_only_built_with_server.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -9,7 +9,10 @@
- ACLOCAL_AMFLAGS = -I m4
-
- if ENABLE_LIBRARIES
-- API_SUBDIRS = api lib zip
-+ API_SUBDIRS = api lib
-+if ENABLE_SERVER
-+ API_SUBDIRS += zip
-+endif
- endif
-
- if ENABLE_SERVER
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list