[SCM] BOINC packaging branch, master, updated. upstream/7.0.45+dfsg-628-gaf86e42
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Thu Jan 24 23:02:52 UTC 2013
The following commit has been merged in the master branch:
commit af86e42997c89786d1f6ea9cb3cc69c055b112e9
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Fri Jan 25 00:01:45 2013 +0100
Preparing for new upstream release 7.0.45, patch refresh
diff --git a/debian/changelog b/debian/changelog
index 706041f..70374f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
+boinc (7.0.45+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Fri, 25 Jan 2013 00:01:24 +0100
+
boinc (7.0.44+dfsg-1) UNRELEASED; urgency=low
[ Gianfranco Costamagna ]
* New upstream release
- * General patch refresh
* Added libxext-dev and libxcb-dpms0-dev in order to address a long time
bug. (lp: #179849)
diff --git a/debian/patches/Missing_libSched.patch b/debian/patches/Missing_libSched.patch
index 7043c37..036b124 100644
--- a/debian/patches/Missing_libSched.patch
+++ b/debian/patches/Missing_libSched.patch
@@ -18,7 +18,7 @@
-AM_LDFLAGS += -static
+AM_LDFLAGS += -static -L../lib/.libs -L../sched
- vda_SOURCES = vda.cpp vda_policy.cpp
+ vda_SOURCES = vda.cpp vda_lib.cpp vda_lib2.cpp vda_policy.cpp stats.cpp
vda_LDADD = $(SERVERLIBS)
--- a/sched/Makefile.am
+++ b/sched/Makefile.am
diff --git a/debian/patches/add_hardening_flags.patch b/debian/patches/add_hardening_flags.patch
index e3d5e3c..8d60824 100644
--- a/debian/patches/add_hardening_flags.patch
+++ b/debian/patches/add_hardening_flags.patch
@@ -21,16 +21,16 @@ Description: Add standard flags to custom Makefiles
+ g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
--- a/samples/example_app/Makefile
+++ b/samples/example_app/Makefile
-@@ -4,7 +4,7 @@
- BOINC_API_DIR = $(BOINC_DIR)/api
- BOINC_LIB_DIR = $(BOINC_DIR)/lib
+@@ -6,7 +6,7 @@
+ BOINC_ZIP_DIR = $(BOINC_DIR)/zip
+ FREETYPE_DIR = /usr/include/freetype2
-CXXFLAGS = -g \
+CXXFLAGS += -g \
-Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \
-DAPP_GRAPHICS \
-I$(BOINC_DIR) \
-@@ -47,12 +47,12 @@
+@@ -62,12 +62,12 @@
# because otherwise you might get a version in /usr/lib etc.
uc2: uc2.o libstdc++.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
@@ -39,9 +39,9 @@ Description: Add standard flags to custom Makefiles
$(BOINC_API_DIR)/libboinc_api.a \
$(BOINC_LIB_DIR)/libboinc.a
- uc2_graphics: uc2_graphics.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_graphics2.a
-- $(CXX) $(CXXFLAGS) -o uc2_graphics uc2_graphics.o libstdc++.a -pthread \
-+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o uc2_graphics uc2_graphics.o libstdc++.a -pthread \
+ uc2_graphics: uc2_graphics.o ttfont.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_graphics2.a
+- $(CXX) $(CXXFLAGS) -o uc2_graphics uc2_graphics.o ttfont.o libstdc++.a -pthread \
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o uc2_graphics uc2_graphics.o ttfont.o libstdc++.a -pthread \
$(BOINC_API_DIR)/libboinc_graphics2.a \
$(BOINC_API_DIR)/libboinc_api.a \
$(BOINC_LIB_DIR)/libboinc.a \
@@ -61,18 +61,18 @@ Description: Add standard flags to custom Makefiles
+ g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o worker worker.o
--- a/samples/wrapper/Makefile
+++ b/samples/wrapper/Makefile
-@@ -5,7 +5,7 @@
- BOINC_API_DIR = $(BOINC_DIR)/api
+@@ -6,7 +6,7 @@
BOINC_LIB_DIR = $(BOINC_DIR)/lib
+ BOINC_ZIP_DIR = $(BOINC_DIR)/zip
-CXXFLAGS = -g \
+CXXFLAGS += -g \
-Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \
-I$(BOINC_DIR) \
-I$(BOINC_LIB_DIR) \
-@@ -28,4 +28,4 @@
- /bin/rm -f $(PROGS) *.o libstdc++.a
+@@ -38,4 +38,4 @@
+ regexp_report.o
- wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
-- g++ $(CXXFLAGS) -o wrapper wrapper.o libstdc++.a -pthread -lboinc_api -lboinc
-+ g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o libstdc++.a -pthread -lboinc_api -lboinc
+ wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS)
+- g++ $(CXXFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a -pthread -lboinc_api -lboinc -lboinc_zip
++ g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a -pthread -lboinc_api -lboinc -lboinc_zip
diff --git a/debian/patches/api_NULL_not_defined.patch b/debian/patches/api_NULL_not_defined.patch
index f35798c..af18795 100644
--- a/debian/patches/api_NULL_not_defined.patch
+++ b/debian/patches/api_NULL_not_defined.patch
@@ -1,9 +1,9 @@
Description: Picked from http://boinc.berkeley.edu/svn/trunk/boinc@25877
--- a/api/boinc_api.h
+++ b/api/boinc_api.h
-@@ -18,6 +18,8 @@
- #ifndef _BOINC_API_
- #define _BOINC_API_
+@@ -20,6 +20,8 @@
+
+ #include <stddef.h> // for NULL
+#include <stddef.h> // for NULL
+
diff --git a/debian/patches/better_makefiles.patch b/debian/patches/better_makefiles.patch
index f714108..dca99ec 100644
--- a/debian/patches/better_makefiles.patch
+++ b/debian/patches/better_makefiles.patch
@@ -35,7 +35,7 @@ Description: Better clean target for several Makefiles
g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o worker worker.o
--- a/samples/wrapper/Makefile
+++ b/samples/wrapper/Makefile
-@@ -21,11 +21,10 @@
+@@ -24,11 +24,10 @@
libstdc++.a:
ln -s `g++ -print-file-name=libstdc++.a`
@@ -47,5 +47,5 @@ Description: Better clean target for several Makefiles
- /bin/rm -f $(PROGS) *.o libstdc++.a
+ rm -f $(PROGS) *.o libstdc++.a
- wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
- g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o libstdc++.a -pthread -lboinc_api -lboinc
+ REGEXP_OBJS = \
+ regexp.o \
diff --git a/debian/patches/cmath_missing.patch b/debian/patches/cmath_missing.patch
index 105d0f6..6e91a49 100644
--- a/debian/patches/cmath_missing.patch
+++ b/debian/patches/cmath_missing.patch
@@ -41,7 +41,7 @@
+#include <cmath>
#include "error_numbers.h"
- #include "str_util.h"
+ #include "filesys.h"
--- a/client/whetstone.cpp
+++ b/client/whetstone.cpp
@@ -29,7 +29,7 @@
@@ -121,7 +121,7 @@
#include <ctype.h>
--- a/lib/util.cpp
+++ b/lib/util.cpp
-@@ -44,7 +44,7 @@
+@@ -50,7 +50,7 @@
#include <errno.h>
#include <string>
#include <cstring>
@@ -209,12 +209,12 @@
#endif
--- a/vda/vda_lib.cpp
+++ b/vda/vda_lib.cpp
-@@ -23,7 +23,7 @@
- #include <vector>
- #include <set>
+@@ -19,7 +19,7 @@
+
#include <algorithm>
+ #include <limits.h>
-#include <math.h>
+#include <cmath>
- #include <limits.h>
-
- using std::vector;
+ #include <set>
+ #include <stdio.h>
+ #include <vector>
diff --git a/debian/patches/cppcheck_avoid_redundant_check.patch b/debian/patches/cppcheck_avoid_redundant_check.patch
deleted file mode 100644
index 4b281e4..0000000
--- a/debian/patches/cppcheck_avoid_redundant_check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/api/make_app_icon_h.cpp
-+++ b/api/make_app_icon_h.cpp
-@@ -39,7 +39,7 @@
- }
-
- outFile = fopen(argv[2], "w");
-- if (inFile == NULL) {
-+ if (outFile == NULL) {
- printf ("Couldn't create output file %s\n", argv[2]);
- fclose(inFile);
- return 0;
diff --git a/debian/patches/dTotalGlobalMem.patch b/debian/patches/dTotalGlobalMem.patch
deleted file mode 100644
index b6a7091..0000000
--- a/debian/patches/dTotalGlobalMem.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sched/sched_send.cpp
-+++ b/sched/sched_send.cpp
-@@ -1432,7 +1432,7 @@
-
- if (g_request->coprocs.nvidia.count && ssp->have_cuda_apps) {
- send_gpu_property_messages(cuda_requirements,
-- g_request->coprocs.nvidia.prop.dtotalGlobalMem,
-+ g_request->coprocs.nvidia.prop.totalGlobalMem,
- g_request->coprocs.nvidia.display_driver_version,
- "NVIDIA GPU"
- );
diff --git a/debian/patches/dynamic_libboinc.patch b/debian/patches/dynamic_libboinc.patch
index d6497c7..b0619ad 100644
--- a/debian/patches/dynamic_libboinc.patch
+++ b/debian/patches/dynamic_libboinc.patch
@@ -1,6 +1,6 @@
--- a/Makefile.incl
+++ b/Makefile.incl
-@@ -37,22 +37,22 @@
+@@ -38,22 +38,22 @@
# dependencies to make sure libs gets compiled before
# programs linking to them:
@@ -29,7 +29,7 @@
$(LIBAPI):
cd $(top_builddir)/api; ${MAKE} libboinc_api.la
-@@ -60,3 +60,4 @@
+@@ -61,3 +61,4 @@
SERVERLIBS_FCGI = $(LIBSCHED_FCGI) $(LIBBOINC_CRYPT) $(LIBBOINC_FCGI) -lfcgi $(MYSQL_LIBS) $(PTHREAD_LIBS) $(RSA_LIBS) $(SSL_LIBS)
APPLIBS = $(LIBAPI) $(LIBBOINC)
diff --git a/debian/patches/ignored_return_value.patch b/debian/patches/ignored_return_value.patch
deleted file mode 100644
index 27b17dd..0000000
--- a/debian/patches/ignored_return_value.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/api/gutil.cpp
-+++ b/api/gutil.cpp
-@@ -544,32 +544,62 @@
- //
- int read_ppm_file(const char* name, int& w, int& h, unsigned char** arrayp) {
- FILE* f;
-- char buf[256];
-+ char buf[512];
- char img_type;
- unsigned char* array;
- int i;
-+ char *s=NULL;
-
- f = boinc_fopen(name, "rb");
- if (!f) return -1;
-- do {fgets(buf, 256, f);} while (buf[0] == '#');
-- if (buf[0] != 'P') {
-+ while(NULL != (s=fgets(buf, sizeof(buf), f)) && buf[0] == '#') ;
-+ if (NULL == s || buf[0] != 'P') {
-+ fclose(f);
- return -1;
- }
- img_type = buf[1];
-- do {fgets(buf, 256, f);} while (buf[0] == '#');
-- sscanf(buf, "%d %d", &w, &h);
-- do {fgets(buf, 256, f);} while (buf[0] == '#');
-+ do {s=fgets(buf, sizeof(buf), f);} while (NULL != s && buf[0] == '#');
-+ if (NULL == s) {
-+ fclose(f);
-+ return -1;
-+ }
-+ int bs = sscanf(buf, "%d %d", &w, &h);
-+ if (bs < 2) {
-+ fclose(f);
-+ fprintf(stderr,"E read_ppm_file: read only %d of w and h in %s",bs,name);
-+ return -1;
-+ }
-+ if (w<0 || h<0) {
-+ fclose(f);
-+ fprintf(stderr,"E read_ppm_file: w=%d<0 or h=%d<0\n",w,h);
-+ return -1;
-+ }
-+ do {s=fgets(buf, sizeof(buf), f);} while (NULL != s && buf[0] == '#');
-+ if (NULL == s) {
-+ fclose(f);
-+ return -1;
-+ }
- array = (unsigned char*)malloc(w*h*3);
- if (!array) return -1;
- switch(img_type) { // TODO: pad image dimension to power of 2
- case '3':
- for (i=0; i<w*h*3; i++) {
- int x;
-- fscanf(f, "%d", &x);
-+ int fs=fscanf(f, "%d", &x);
-+ if (1 != fs) {
-+ fclose(f);
-+ fprintf(stderr,"E: expected scanf of 1 object, but read %d of file '%s'.\n", fs, name);
-+ return -1;
-+ }
- array[i] = x;
- }
- case '6':
-- fread(array, 3, w*h, f);
-+ size_t fr=fread(array, 3, w*h, f);
-+ if (fr < abs(w*h)) {
-+ fclose(f);
-+ fprintf(stderr,"E: read %ld items in file '%s' but expected %d*%d=%d.\n", fr, name, w, h, w*h);
-+ return -1;
-+ }
- break;
- }
-
diff --git a/debian/patches/investigate_boinc_api.patch b/debian/patches/investigate_boinc_api.patch
index 8f5f557..af876d5 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
-@@ -322,7 +322,7 @@
+@@ -331,7 +331,7 @@
if (standalone) return true;
@@ -9,36 +9,16 @@
"<current_cpu_time>%e</current_cpu_time>\n"
"<checkpoint_cpu_time>%e</checkpoint_cpu_time>\n",
cpu_t, cp_cpu_t
-@@ -334,23 +334,23 @@
+@@ -343,7 +343,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);
- strlcat(msg_buf, buf, MSG_CHANNEL_SIZE);
+ strlcat(msg_buf, buf, sizeof(msg_buf));
}
- if (fpops_per_cpu_sec) {
- sprintf(buf, "<fpops_per_cpu_sec>%e</fpops_per_cpu_sec>\n", fpops_per_cpu_sec);
-- strlcat(msg_buf, buf, MSG_CHANNEL_SIZE);
-+ strlcat(msg_buf, buf, sizeof(msg_buf));
- }
- if (fpops_cumulative) {
- sprintf(buf, "<fpops_cumulative>%e</fpops_cumulative>\n", fpops_cumulative);
-- strlcat(msg_buf, buf, MSG_CHANNEL_SIZE);
-+ strlcat(msg_buf, buf, sizeof(msg_buf));
- }
- if (intops_per_cpu_sec) {
- sprintf(buf, "<intops_per_cpu_sec>%e</intops_per_cpu_sec>\n", intops_per_cpu_sec);
-- strlcat(msg_buf, buf, MSG_CHANNEL_SIZE);
-+ strlcat(msg_buf, buf, sizeof(msg_buf));
- }
- if (intops_cumulative) {
- sprintf(buf, "<intops_cumulative>%e</intops_cumulative>\n", intops_cumulative);
-- strlcat(msg_buf, buf, MSG_CHANNEL_SIZE);
-+ strlcat(msg_buf, buf, sizeof(msg_buf));
- }
- return app_client_shm->shm->app_status.send_msg(msg_buf);
- }
-@@ -549,6 +549,10 @@
+ if (bytes_sent) {
+ sprintf(buf, "<bytes_sent>%f</bytes_sent>\n", bytes_sent);
+@@ -608,6 +608,10 @@
}
int boinc_get_status(BOINC_STATUS *s) {
@@ -49,7 +29,7 @@
s->no_heartbeat = boinc_status.no_heartbeat;
s->suspended = boinc_status.suspended;
s->quit_request = boinc_status.quit_request;
-@@ -720,7 +724,7 @@
+@@ -784,7 +788,7 @@
int boinc_parse_init_data_file() {
FILE* f;
int retval;
@@ -58,26 +38,26 @@
if (aid.project_preferences) {
free(aid.project_preferences);
-@@ -770,15 +774,15 @@
+@@ -834,15 +838,15 @@
);
if (other_pid) {
sprintf(buf, "<other_pid>%d</other_pid>\n", other_pid);
- strcat(msg_buf, buf);
+ strncat(msg_buf, buf, sizeof(msg_buf));
}
- if (bytes_sent) {
- sprintf(buf, "<bytes_sent>%f</bytes_sent>\n", bytes_sent);
+ if (_bytes_sent) {
+ sprintf(buf, "<bytes_sent>%f</bytes_sent>\n", _bytes_sent);
- strcat(msg_buf, buf);
+ strncat(msg_buf, buf, sizeof(msg_buf));
}
- if (bytes_received) {
- sprintf(buf, "<bytes_received>%f</bytes_received>\n", bytes_received);
+ if (_bytes_received) {
+ sprintf(buf, "<bytes_received>%f</bytes_received>\n", _bytes_received);
- strcat(msg_buf, buf);
+ strncat(msg_buf, buf, sizeof(msg_buf));
}
if (app_client_shm->shm->app_status.send_msg(msg_buf)) {
return 0;
-@@ -849,16 +853,16 @@
+@@ -913,16 +917,16 @@
}
static void handle_upload_file_status() {
@@ -97,7 +77,7 @@
FILE* f = boinc_fopen(filename.c_str(), "r");
if (!f) {
fprintf(stderr,
-@@ -867,7 +871,7 @@
+@@ -931,7 +935,7 @@
);
continue;
}
@@ -106,7 +86,7 @@
fclose(f);
if (p && parse_int(buf, "<status>", status)) {
UPLOAD_FILE_STATUS uf;
-@@ -1004,7 +1008,7 @@
+@@ -1072,7 +1076,7 @@
#ifdef _WIN32
GetFullPathName(path, MAXPATHLEN, abspath, NULL);
#else
@@ -115,25 +95,7 @@
#endif
argv[0] = const_cast<char*>(GRAPHICS_APP_FILENAME);
if (fullscreen) {
-@@ -1103,7 +1107,7 @@
- // timer handler; runs in the timer thread
- //
- static void timer_handler() {
-- char buf[256];
-+ char buf[256*2];
- if (g_sleep) return;
- interrupt_count++;
- if (!boinc_status.suspended) {
-@@ -1156,7 +1160,7 @@
- if (in_critical_section==0 && options.check_heartbeat) {
- if (heartbeat_giveup_time < interrupt_count) {
- boinc_msg_prefix(buf, sizeof(buf));
-- buf[255] = 0; // paranoia
-+ buf[sizeof(buf)-1] = 0; // paranoia
- fputs(buf, stderr);
- fputs(" No heartbeat from core client for 30 sec - exiting\n", stderr);
- if (options.direct_process_action) {
-@@ -1196,7 +1200,7 @@
+@@ -1260,7 +1264,7 @@
// send graphics-related messages
//
if (send_web_graphics_url && !app_client_shm->shm->graphics_reply.has_msg()) {
@@ -142,7 +104,7 @@
"<web_graphics_url>%s</web_graphics_url>",
web_graphics_url
);
-@@ -1204,7 +1208,7 @@
+@@ -1268,7 +1272,7 @@
send_web_graphics_url = false;
}
if (send_remote_desktop_addr && !app_client_shm->shm->graphics_reply.has_msg()) {
diff --git a/debian/patches/libnotify-0.7.patch b/debian/patches/libnotify-0.7.patch
index e0d3d77..edf4400 100644
--- a/debian/patches/libnotify-0.7.patch
+++ b/debian/patches/libnotify-0.7.patch
@@ -23,7 +23,7 @@ Disclaimer: For backports, this patch needs to be disabled.
grep '#define.*BOINC.*VERSION' $^ > $@
--- a/configure.ac
+++ b/configure.ac
-@@ -729,14 +729,12 @@
+@@ -743,14 +743,12 @@
dnl ---------- libNotify --------------------------------------------------
if test "${enable_manager}" = yes ; then
@@ -43,7 +43,7 @@ Disclaimer: For backports, this patch needs to be disabled.
fi
dnl ---------- Sqlite3 ----------------------------------------------------
-@@ -883,7 +881,7 @@
+@@ -900,7 +898,7 @@
],
[enable_wx_debug="no"])
diff --git a/debian/patches/link_with_gold.patch b/debian/patches/link_with_gold.patch
deleted file mode 100644
index 17c49dd..0000000
--- a/debian/patches/link_with_gold.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: boinc/configure.ac
-===================================================================
---- boinc.orig/configure.ac
-+++ boinc/configure.ac
-@@ -851,6 +851,9 @@
- SAH_CHECK_LIB([Xss],[XScreenSaverAllocInfo],[
- AC_DEFINE([HAVE_XSS],[1],[Define to 1 if you have xss library])
- CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
-+ SAH_CHECK_LIB([X11],[XOpenDisplay],[
-+ AC_DEFINE([HAVE_X11],[1],[Define to 1 if you have X11 library])
-+ CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
- echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
- fi
-
diff --git a/debian/patches/missing_libs_wrapper.patch b/debian/patches/missing_libs_wrapper.patch
deleted file mode 100644
index 8c28d50..0000000
--- a/debian/patches/missing_libs_wrapper.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Include some headers file, to fix a problem with getrusage and setpriority functions with the new ubuntu raring ringtail development release
-Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
-Forwarded: <yes>
-Fixed in upstream revision 9223fd2 and 2d0150c
-http://boinc.berkeley.edu/trac/changeset/9223fd22e3b6b848cc9e5e151d958542da8fd49d/boinc
-http://boinc.berkeley.edu/trac/changeset/2d0150c6872bd3f0489a90a71e2728c3a8e792fb/boinc
-
---- a/samples/wrapper/wrapper.cpp
-+++ b/samples/wrapper/wrapper.cpp
-@@ -28,6 +28,9 @@
- // See http://boinc.berkeley.edu/trac/wiki/WrapperApp for details
- // Contributor: Andrew J. Younge (ajy4490 at umiacs.umd.edu)
-
-+#ifndef _WIN32
-+#include "config.h"
-+#endif
- #include <stdio.h>
- #include <vector>
- #include <string>
-@@ -35,9 +38,17 @@
- #include "boinc_win.h"
- #include "win_util.h"
- #else
-+#ifdef HAVE_SYS_WAIT_H
- #include <sys/wait.h>
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
-+#ifdef HAVE_SYS_RESOURCE_H
-+#include <sys/resource.h>
-+#endif
- #include <unistd.h>
- #endif
-
diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index 82e0386..93ac735 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -51,7 +51,7 @@
strcpy(oldpath, newpath);
--- a/lib/network.cpp
+++ b/lib/network.cpp
-@@ -70,7 +70,7 @@
+@@ -71,7 +71,7 @@
case WSAENOTSOCK:
return "not a socket";
}
@@ -60,7 +60,7 @@
return buf;
#else
switch (h_errno) {
-@@ -84,11 +84,11 @@
+@@ -85,11 +85,11 @@
return "host not found or server failure";
#ifdef NETDB_INTERNAL
case NETDB_INTERNAL:
@@ -74,12 +74,12 @@
return buf;
#endif
}
-@@ -108,7 +108,7 @@
- {
+@@ -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 d5eb0d5..7554d83 100644
--- a/debian/patches/opendir_errno.patch
+++ b/debian/patches/opendir_errno.patch
@@ -50,7 +50,7 @@
#include "error_numbers.h"
#include "filesys.h"
#include "str_util.h"
-@@ -180,9 +181,17 @@
+@@ -178,9 +179,17 @@
int i;
for (i=0; i < nlibdirs; i++) {
struct dirent *entry;
diff --git a/debian/patches/opendir_error_messages.patch b/debian/patches/opendir_error_messages.patch
index eddc472..6f40b12 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
-@@ -75,14 +75,14 @@
+@@ -74,14 +74,14 @@
static int diagnostics_initialized = false;
static int flags;
@@ -36,7 +36,7 @@
static int boinc_proxy_enabled;
static char boinc_proxy[256];
static char symstore[256];
-@@ -306,7 +306,7 @@
+@@ -305,7 +305,7 @@
// Store various pieces of inforation for future use.
if (flags & BOINC_DIAG_BOINCAPPLICATION) {
@@ -45,7 +45,7 @@
char proxy_address[256];
int proxy_port;
MIOFILE mf;
-@@ -331,13 +331,13 @@
+@@ -330,13 +330,13 @@
mf.init_file(p);
while(mf.fgets(buf, sizeof(buf))) {
if (match_tag(buf, "</app_init_data>")) break;
diff --git a/debian/patches/parse_issues.patch b/debian/patches/parse_issues.patch
index 187ed97..325aa8c 100644
--- a/debian/patches/parse_issues.patch
+++ b/debian/patches/parse_issues.patch
@@ -3,7 +3,7 @@ Description: Improved memory handling.
--- a/lib/parse.cpp
+++ b/lib/parse.cpp
-@@ -179,7 +179,12 @@
+@@ -178,7 +178,12 @@
int n = (int)strlen(line);
if (nused + n >= bufsize) {
bufsize *= 2;
@@ -19,7 +19,7 @@ Description: Improved memory handling.
nused += n;
--- a/lib/procinfo_win.cpp
+++ b/lib/procinfo_win.cpp
-@@ -24,6 +24,9 @@
+@@ -25,6 +25,9 @@
tNTQSI pNTQSI = (tNTQSI)GetProcAddress(hNTDllLib, "NtQuerySystemInformation");
ULONG cbBuffer = 0;
@@ -29,7 +29,7 @@ Description: Improved memory handling.
while (1) {
// Store the buffer size since it appears that somebody is monkeying around
// with the return values on some systems.
-@@ -54,9 +57,9 @@
+@@ -55,9 +58,9 @@
} else if (!NT_SUCCESS(Status)) {
HeapFree(hHeap, NULL, *ppBuffer);
return ERR_GETRUSAGE;
diff --git a/debian/patches/possible_size_type_error.patch b/debian/patches/possible_size_type_error.patch
index d3e075d..caaca34 100644
--- a/debian/patches/possible_size_type_error.patch
+++ b/debian/patches/possible_size_type_error.patch
@@ -3,10 +3,10 @@ Description: int may not be enough (theoretically) for large files.
--- a/sched/file_upload_handler.cpp
+++ b/sched/file_upload_handler.cpp
-@@ -173,17 +173,17 @@
+@@ -123,13 +123,13 @@
+ bytes_left = nbytes - offset;
while (bytes_left > 0) {
-
- int n, m, to_write;
+ int m;
@@ -17,6 +17,10 @@ Description: int may not be enough (theoretically) for large files.
- n = fread(buf, 1, m, in);
+ size_t n = fread(buf, 1, m, in);
+ // delay opening the file until we've done the first socket read
+ // to avoid filesystem lockups (WCG, possible paranoia)
+@@ -195,7 +195,7 @@
+
// try to write n bytes to file
//
- to_write=n;
@@ -24,12 +28,3 @@ Description: int may not be enough (theoretically) for large files.
while (to_write > 0) {
ssize_t ret = write(fd, buf+n-to_write, to_write);
if (ret < 0) {
-@@ -237,7 +237,7 @@
- unsigned char buf[BLOCK_SIZE];
-
- while (1) {
-- int n = fread(buf, 1, BLOCK_SIZE, in);
-+ size_t n = fread(buf, 1, BLOCK_SIZE, in);
- if (n <= 0) return;
- }
- }
diff --git a/debian/patches/sched_driver_char_buffers.patch b/debian/patches/sched_driver_char_buffers.patch
index ef566e6..8a0f85c 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
-@@ -50,9 +50,9 @@
+@@ -53,9 +53,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 1e5eda7..bce5e53 100644
--- a/debian/patches/sched_driver_f_free.patch
+++ b/debian/patches/sched_driver_f_free.patch
@@ -2,8 +2,8 @@ Author: Steffen Moeller <moeller at debian.org>
Description: Increased buffers and eliminated memory sink.
--- a/sched/sched_driver.cpp
+++ b/sched/sched_driver.cpp
-@@ -44,6 +44,8 @@
- #include <vector>
+@@ -47,6 +47,8 @@
+
#include "util.h"
#include "svn_version.h"
+#include "str_replace.h" // strlcpy
@@ -11,7 +11,7 @@ Description: Increased buffers and eliminated memory sink.
using std::vector;
-@@ -58,7 +60,7 @@
+@@ -61,7 +63,7 @@
double max_time = 1;
void read_hosts() {
@@ -20,7 +20,7 @@ Description: Increased buffers and eliminated memory sink.
host_descs.clear();
FILE* f = fopen("host_descs.txt", "r");
if (!f) {
-@@ -69,17 +71,18 @@
+@@ -72,15 +74,15 @@
HOST_DESC hd;
strcpy(buf2, buf);
char* p1 = strtok(buf2, "\t\n");
@@ -38,7 +38,4 @@ Description: Increased buffers and eliminated memory sink.
+ safe_strcpy(hd.p_model, p3);
host_descs.push_back(hd);
}
-+ free(f);
- }
-
- inline double req_time() {
+ fclose(f);
diff --git a/debian/patches/series b/debian/patches/series
index 03b9b32..4dd3730 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,12 +36,9 @@ clang_incompatibilities.patch
some_extra_clang_warnings.patch
#tmpA# nvidia_direct_invocation.patch
#tmpA# nvidia_direct_invocation_2.patch
-dTotalGlobalMem.patch
nvidia_mem_display_simplification.patch
api_NULL_not_defined.patch
-unlink_undefined.patch
cppcheck_realloc.patch
-cppcheck_avoid_redundant_check.patch
MainDocumentWarnings.patch
more_maxpathlen.patch
opendir_error_messages.patch
@@ -52,7 +49,6 @@ add_hardening_flags.patch
cmath_missing.patch
investigate_boinc_api.patch
slot_dir_source_trace.patch
-ignored_return_value.patch
opendir_errno.patch
ticket_1168_verifycerts.patch
better_makefiles.patch
@@ -62,6 +58,4 @@ client_app_maxpathlen.patch
boinclib_shared.patch
dynamic_libboinc.patch
Missing_libSched.patch
-missing_libs_wrapper.patch
-link_with_gold.patch
fix-add-exclusive-app.patch
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index 9120e60..480d09c 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -1,6 +1,6 @@
--- a/client/app.cpp
+++ b/client/app.cpp
-@@ -421,8 +421,8 @@
+@@ -424,8 +424,8 @@
int retval;
get_project_dir(result->project, project_dir, sizeof(project_dir));
@@ -11,7 +11,7 @@
"%s/trickle_up_%s_%d.xml",
project_dir, result->name, (int)time(0)
);
-@@ -457,7 +457,7 @@
+@@ -460,7 +460,7 @@
return 0;
}
@@ -20,7 +20,7 @@
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
if (active_tasks[i]->slot == slot) {
-@@ -467,7 +467,7 @@
+@@ -470,7 +470,7 @@
return false;
}
@@ -29,7 +29,7 @@
char path[MAXPATHLEN];
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
-@@ -508,7 +508,7 @@
+@@ -511,7 +511,7 @@
#endif
}
@@ -38,7 +38,7 @@
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
if (active_tasks[i]->slot == slot) return true;
-@@ -620,7 +620,7 @@
+@@ -623,7 +623,7 @@
#endif
int ACTIVE_TASK::parse(XML_PARSER& xp) {
@@ -47,7 +47,7 @@
int n, dummy;
unsigned int i;
PROJECT* project=0;
-@@ -895,7 +895,7 @@
+@@ -898,7 +898,7 @@
DirScanner dirscan(slot_dir);
while (dirscan.scan(filename)) {
@@ -66,7 +66,7 @@
// The stderr output of an application is truncated to this length
// before sending to server,
// to protect against apps that write unbounded amounts.
-@@ -110,7 +111,7 @@
+@@ -111,7 +112,7 @@
double bytes_sent;
// reported by the app if it does network I/O
double bytes_received;
@@ -75,7 +75,7 @@
// directory where process runs (relative)
char slot_path[MAXPATHLEN];
// same, absolute
-@@ -151,8 +152,8 @@
+@@ -152,8 +153,8 @@
// but not descendants of the main process
// (e.g. VMs created by vboxwrapper)
// These are communicated via the app_status message channel
@@ -86,7 +86,7 @@
ASYNC_COPY* async_copy;
double finish_file_time;
// time when we saw finish file in slot dir.
-@@ -288,8 +289,8 @@
+@@ -289,8 +290,8 @@
bool check_app_exited();
bool check_rsc_limits_exceeded();
bool check_quit_timeout_exceeded();
@@ -97,7 +97,7 @@
void send_heartbeats();
void send_trickle_downs();
void report_overdue();
-@@ -298,7 +299,7 @@
+@@ -299,7 +300,7 @@
bool want_network(); // does any task want network?
void network_available(); // notify tasks that network is available
void free_mem();
@@ -331,7 +331,7 @@
--- a/lib/filesys.h
+++ b/lib/filesys.h
-@@ -42,30 +42,30 @@
+@@ -43,30 +43,30 @@
#ifdef __cplusplus
extern "C" {
#endif
@@ -380,7 +380,7 @@
#ifdef __cplusplus
}
-@@ -74,10 +74,10 @@
+@@ -75,10 +75,10 @@
/* C++ specific prototypes/defines follow here */
#ifdef __cplusplus
@@ -395,7 +395,7 @@
// TODO TODO TODO
// remove this code - the DirScanner class does the same thing.
-@@ -99,7 +99,7 @@
+@@ -100,7 +100,7 @@
extern int dir_scan(std::string&, DIRREF);
extern void dir_close(DIRREF);
diff --git a/debian/patches/some_extra_clang_warnings.patch b/debian/patches/some_extra_clang_warnings.patch
index c279709..6c3e070 100644
--- a/debian/patches/some_extra_clang_warnings.patch
+++ b/debian/patches/some_extra_clang_warnings.patch
@@ -11,7 +11,7 @@
--- a/tools/dir_hier_move.cpp
+++ b/tools/dir_hier_move.cpp
-@@ -42,14 +42,14 @@
+@@ -43,14 +43,14 @@
int retval;
if ( (argc == 1) || !strcmp(argv[1], "-h") || !strcmp(argv[1],"--help") || (argc != 4) ) {
diff --git a/debian/patches/unlink_undefined.patch b/debian/patches/unlink_undefined.patch
deleted file mode 100644
index a1ddb3c..0000000
--- a/debian/patches/unlink_undefined.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/tools/process_input_template.cpp
-+++ b/tools/process_input_template.cpp
-@@ -17,6 +17,7 @@
-
- #include <stdio.h>
- #include <string>
-+#include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-
---- a/sched/single_job_assimilator.cpp
-+++ b/sched/single_job_assimilator.cpp
-@@ -24,6 +24,7 @@
- #include <string>
- #include <cstdlib>
- #include <cstring>
-+#include <unistd.h>
-
- #include "boinc_db.h"
- #include "error_numbers.h"
---- a/tools/create_work.cpp
-+++ b/tools/create_work.cpp
-@@ -27,6 +27,7 @@
- #include <cstring>
- #include <ctime>
- #include <string>
-+#include <unistd.h>
-
- #include "backend_lib.h"
- #include "boinc_db.h"
---- a/vda/vda.cpp
-+++ b/vda/vda.cpp
-@@ -21,6 +21,7 @@
- // vda add path add a file
-
- #include <stdio.h>
-+#include <unistd.h>
-
- #include "boinc_db.h"
- #include "filesys.h"
---- a/vda/vdad.cpp
-+++ b/vda/vdad.cpp
-@@ -27,6 +27,7 @@
- #include <sys/types.h>
- #include <vector>
- #include <set>
-+#include <unistd.h>
-
- using std::vector;
- using std::set;
diff --git a/debian/patches/upstream_sztaki_configureEval.patch b/debian/patches/upstream_sztaki_configureEval.patch
index d297fc1..5a2de47 100644
--- a/debian/patches/upstream_sztaki_configureEval.patch
+++ b/debian/patches/upstream_sztaki_configureEval.patch
@@ -1,7 +1,7 @@
Author: Unknown
--- a/configure.ac
+++ b/configure.ac
-@@ -288,6 +288,20 @@
+@@ -289,6 +289,20 @@
AC_SUBST([TOP_BUILD_DIR], [`pwd`])
@@ -29,4 +29,4 @@ Author: Unknown
+#!/usr/bin/php
<?php
-
+ // This file is part of BOINC.
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list