[SCM] BOINC packaging branch, master, updated. debian/7.0.65+dfsg-3-6-gcd9b21c
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Fri May 17 11:46:19 UTC 2013
The following commit has been merged in the master branch:
commit cd9b21c856cea82a1c13bf4d6a7d68010a4815af
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Fri May 17 13:45:44 2013 +0200
New upstream release, patch refresh, deleted some other patches accepted upstream, debian/rules simplified
diff --git a/debian/changelog b/debian/changelog
index 7431deb..44bee4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+boinc (7.1.1+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Tweaked debian/watch.
+ * Removed some patches accepted upstream.
+ * Simplified debian/rules.
+ * Patch refresh.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Thu, 16 May 2013 22:09:08 +0200
+
boinc (7.0.65+dfsg-3) unstable; urgency=low
[ Gianfranco Costamagna ]
diff --git a/debian/patches/MainDocumentWarnings.patch b/debian/patches/MainDocumentWarnings.patch
index b9cabb3..492f808 100644
--- a/debian/patches/MainDocumentWarnings.patch
+++ b/debian/patches/MainDocumentWarnings.patch
@@ -2,7 +2,7 @@ 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
-@@ -1640,20 +1640,20 @@
+@@ -1643,20 +1643,20 @@
}
#else
void CMainDocument::KillGraphicsApp(int pid) {
@@ -31,7 +31,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
iRetVal = run_program(
getcwd(currentDir, sizeof(currentDir)),
-@@ -1663,6 +1663,10 @@
+@@ -1666,6 +1666,10 @@
0,
id
);
diff --git a/debian/patches/add_hardening_flags.patch b/debian/patches/add_hardening_flags.patch
deleted file mode 100644
index f844dcf..0000000
--- a/debian/patches/add_hardening_flags.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Author: Guo Yixuan <culu.gyx at gmail.com>
-Description: Add standard flags to custom Makefiles
- There're several hand-written Makefiles among other Makefiles by automake, they don't take
- CXXFLAGS and CPPFLAGS from environment.
---- a/samples/sleeper/Makefile
-+++ b/samples/sleeper/Makefile
-@@ -4,7 +4,7 @@
- BOINC_API_DIR = $(BOINC_DIR)/api
- BOINC_LIB_DIR = $(BOINC_DIR)/lib
-
--CXXFLAGS = -g \
-+CXXFLAGS += -g \
- -I$(BOINC_DIR) \
- -I$(BOINC_LIB_DIR) \
- -I$(BOINC_API_DIR) \
-@@ -26,4 +26,4 @@
- /bin/rm -f $(PROGS) *.o libstdc++.a
-
- sleeper: sleeper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
-- g++ $(CXXFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
-+ g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
---- a/samples/example_app/Makefile
-+++ b/samples/example_app/Makefile
-@@ -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) \
-@@ -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
-- $(CXX) $(CXXFLAGS) -o uc2 uc2.o libstdc++.a -pthread \
-+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o uc2 uc2.o libstdc++.a -pthread \
- $(BOINC_API_DIR)/libboinc_api.a \
- $(BOINC_LIB_DIR)/libboinc.a
-
- 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 \
---- a/samples/worker/Makefile
-+++ b/samples/worker/Makefile
-@@ -1,4 +1,4 @@
--CXXFLAGS = -g
-+CXXFLAGS += -g
-
- PROGS = worker
-
-@@ -11,4 +11,4 @@
- rm $(PROGS)
-
- worker: worker.o
-- g++ $(CXXFLAGS) -o worker worker.o
-+ g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o worker worker.o
---- a/samples/wrapper/Makefile
-+++ b/samples/wrapper/Makefile
-@@ -6,7 +6,7 @@
- BOINC_LIB_DIR = $(BOINC_DIR)/lib
- BOINC_ZIP_DIR = $(BOINC_DIR)/zip
-
--CXXFLAGS = -g -O0 \
-+CXXFLAGS += -g -O0 \
- -Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \
- -I$(BOINC_DIR) \
- -I$(BOINC_LIB_DIR) \
-@@ -38,4 +38,4 @@
- regexp_report.o
-
- 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/add_hardening_flags_FTBFS.patch b/debian/patches/add_hardening_flags_FTBFS.patch
deleted file mode 100644
index 811794a..0000000
--- a/debian/patches/add_hardening_flags_FTBFS.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- a/client/cs_account.cpp
-+++ b/client/cs_account.cpp
-@@ -79,7 +79,7 @@
- fprintf(f, "<project_preferences>\n%s</project_preferences>\n",
- project_prefs.c_str()
- );
-- fprintf(f, gui_urls.c_str());
-+ fprintf(f, "%s" ,gui_urls.c_str());
- fprintf(f, "</account>\n");
- fclose(f);
- retval = boinc_rename(TEMP_ACCT_FILE_NAME, path);
---- a/client/cs_benchmark.cpp
-+++ b/client/cs_benchmark.cpp
-@@ -365,7 +365,7 @@
-
- // if active tasks don't quit after 10 sec, give up on benchmark
- //
-- if (gstate.clock_change || now >= (cpu_benchmarks_start + 10.0) && active_tasks.is_task_executing()) {
-+ if (gstate.clock_change || (now >= (cpu_benchmarks_start + 10.0) && active_tasks.is_task_executing())) {
- msg_printf(NULL, MSG_INTERNAL_ERROR,
- "Failed to stop applications; aborting CPU benchmarks"
- );
-@@ -462,7 +462,7 @@
- }
- ndone++;
- if (benchmark_descs[i].error) {
-- msg_printf(0, MSG_INFO, benchmark_descs[i].error_str);
-+ msg_printf(0, MSG_INFO, "%s", benchmark_descs[i].error_str);
- had_error = true;
- }
- }
---- a/client/main.cpp
-+++ b/client/main.cpp
-@@ -80,7 +80,7 @@
- msg
- );
- if (!gstate.executing_as_daemon) {
-- fprintf(stdout, evt_msg);
-+ fprintf(stdout, "%s", evt_msg);
- } else {
- #ifdef _WIN32
- LogEventInfoMessage(evt_msg);
-@@ -89,7 +89,7 @@
- #elif defined (ANDROID)
- __android_log_print(ANDROID_LOG_INFO, "BOINC", evt_msg);
- #else
-- syslog(LOG_DAEMON|LOG_INFO, evt_msg);
-+ syslog(LOG_DAEMON|LOG_INFO, "%s", evt_msg);
- #endif
- }
- }
-@@ -112,7 +112,7 @@
- );
- #endif
- if (!gstate.executing_as_daemon) {
-- fprintf(stderr, evt_msg);
-+ fprintf(stderr, "%s", evt_msg);
- } else {
- #ifdef _WIN32
- LogEventErrorMessage(evt_msg);
-@@ -121,7 +121,7 @@
- #elif defined (ANDROID)
- __android_log_print(ANDROID_LOG_ERROR, "BOINC", evt_msg);
- #else
-- syslog(LOG_DAEMON|LOG_ERR, evt_msg);
-+ syslog(LOG_DAEMON|LOG_ERR, "%s", evt_msg);
- #endif
- }
- }
-@@ -134,7 +134,7 @@
- msg, error_code
- );
- if (!gstate.executing_as_daemon) {
-- fprintf(stderr, evt_msg);
-+ fprintf(stderr, "%s", evt_msg);
- } else {
- #ifdef _WIN32
- LogEventErrorMessage(evt_msg);
-@@ -143,7 +143,7 @@
- #elif defined (ANDROID)
- __android_log_print(ANDROID_LOG_ERROR, "BOINC", evt_msg);
- #else
-- syslog(LOG_DAEMON|LOG_ERR, evt_msg);
-+ syslog(LOG_DAEMON|LOG_ERR, "%s", evt_msg);
- #endif
- }
- }
---- a/client/work_fetch.cpp
-+++ b/client/work_fetch.cpp
-@@ -784,7 +784,7 @@
- if (log_flags.work_fetch_debug) {
- char buf[256];
- request_string(buf);
-- msg_printf(p, MSG_INFO, buf);
-+ msg_printf(p, MSG_INFO, "%s", buf);
- }
- }
-
diff --git a/debian/patches/better_makefiles.patch b/debian/patches/better_makefiles.patch
deleted file mode 100644
index dca99ec..0000000
--- a/debian/patches/better_makefiles.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Author: Guo Yixuan <culu.gyx at gmail.com>
-Description: Better clean target for several Makefiles
- This would save some rm's in override_dh_auto_clean.
---- a/samples/sleeper/Makefile
-+++ b/samples/sleeper/Makefile
-@@ -19,11 +19,10 @@
- libstdc++.a:
- ln -s `g++ -print-file-name=libstdc++.a`
-
--clean:
-- rm $(PROGS)
-+clean: distclean
-
- distclean:
-- /bin/rm -f $(PROGS) *.o libstdc++.a
-+ rm -f $(PROGS) *.o libstdc++.a
-
- sleeper: sleeper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
- g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
---- a/samples/worker/Makefile
-+++ b/samples/worker/Makefile
-@@ -4,11 +4,10 @@
-
- all: $(PROGS)
-
--clean:
-- rm $(PROGS)
-+clean: distclean
-
- distclean:
-- rm $(PROGS)
-+ rm -f $(PROGS) *.o
-
- worker: worker.o
- g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o worker worker.o
---- a/samples/wrapper/Makefile
-+++ b/samples/wrapper/Makefile
-@@ -24,11 +24,10 @@
- libstdc++.a:
- ln -s `g++ -print-file-name=libstdc++.a`
-
--clean:
-- rm $(PROGS) *.o
-+clean: distclean
-
- distclean:
-- /bin/rm -f $(PROGS) *.o libstdc++.a
-+ rm -f $(PROGS) *.o libstdc++.a
-
- REGEXP_OBJS = \
- regexp.o \
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index fdffc7c..f8cb344 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -16,7 +16,7 @@
libboinc_crypt_la_LIBADD = -lm -lstdc++
-@@ -218,7 +218,7 @@
+@@ -221,7 +221,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 73834ea..75c46f8 100644
--- a/debian/patches/client_app_maxpathlen.patch
+++ b/debian/patches/client_app_maxpathlen.patch
@@ -11,16 +11,7 @@
// to protect against apps that write unbounded amounts.
--- a/client/file_names.cpp
+++ b/client/file_names.cpp
-@@ -66,7 +66,7 @@
- }
-
- void get_project_dir(PROJECT* p, char* path, int len) {
-- char buf[1024];
-+ char buf[std::max(len,MAXPATHLEN)];
- escape_project_url(p->master_url, buf);
- snprintf(path, len, "%s/%s", PROJECTS_DIR, buf);
- }
-@@ -75,7 +75,7 @@
+@@ -69,7 +69,7 @@
//
void get_pathname(FILE_INFO* fip, char* path, int len) {
PROJECT* p = fip->project;
@@ -29,7 +20,7 @@
// for testing purposes, it's handy to allow a FILE_INFO without
// an associated PROJECT.
-@@ -97,28 +97,28 @@
+@@ -91,28 +91,28 @@
}
void get_sched_request_filename(PROJECT& project, char* buf, int len) {
@@ -62,25 +53,7 @@
escape_project_url(project.master_url, url);
snprintf(buf, len, "%s%s.txt", JOB_LOG_BASE, url);
-@@ -133,7 +133,7 @@
- // Create the directory for the project p
- //
- int make_project_dir(PROJECT& p) {
-- char buf[1024];
-+ char buf[MAXPATHLEN];
- int retval;
-
- boinc_mkdir(PROJECTS_DIR);
-@@ -171,7 +171,7 @@
- }
-
- int remove_project_dir(PROJECT& p) {
-- char buf[1024];
-+ char buf[MAXPATHLEN];
- int retval;
-
- get_project_dir(&p, buf, sizeof(buf));
-@@ -186,7 +186,7 @@
+@@ -176,7 +176,7 @@
// Create the slot directory for the specified slot #
//
int make_slot_dir(int slot) {
@@ -89,7 +62,7 @@
if (slot<0) {
msg_printf(NULL, MSG_INTERNAL_ERROR, "Bad slot number %d", slot);
-@@ -230,7 +230,7 @@
+@@ -220,7 +220,7 @@
// delete unused stuff in the slots/ directory
//
void delete_old_slot_dirs() {
@@ -98,12 +71,3 @@
DIRREF dirp;
int retval;
-@@ -341,7 +341,7 @@
- }
-
- void boinc_version_dir(PROJECT& p, VERSION_INFO& vi, char* buf) {
-- char projdir[1024];
-+ char projdir[MAXPATHLEN];
- get_project_dir(&p, projdir, sizeof(projdir));
- sprintf(buf, "%s/boinc_version_%d_%d_%d", projdir, vi.major, vi.minor, vi.release);
- }
diff --git a/debian/patches/cmath_missing.patch b/debian/patches/cmath_missing.patch
index 6e91a49..408d0a8 100644
--- a/debian/patches/cmath_missing.patch
+++ b/debian/patches/cmath_missing.patch
@@ -130,17 +130,6 @@
#if HAVE_IEEEFP_H
#include <ieeefp.h>
extern "C" {
---- a/samples/atiopencl/atiopencl.hpp
-+++ b/samples/atiopencl/atiopencl.hpp
-@@ -28,7 +28,7 @@
- #endif
-
- #include <string.h>
--#include <math.h>
-+#include <cmath>
- #include <time.h>
- #include <cstdlib>
- #include <iostream>
--- a/samples/example_app/uc2_graphics.cpp
+++ b/samples/example_app/uc2_graphics.cpp
@@ -33,7 +33,7 @@
@@ -163,17 +152,6 @@
#include <time.h>
#include "cuda_config.h"
---- a/samples/nvopencl/nvopencl.hpp
-+++ b/samples/nvopencl/nvopencl.hpp
-@@ -24,7 +24,7 @@
- #include <CL/cl.h>
- #include <oclUtils.h>
- #include <string.h>
--#include <math.h>
-+#include <cmath>
- #include <time.h>
- #include <cstdlib>
- #include <iostream>
--- a/samples/vboxwrapper/vboxwrapper.cpp
+++ b/samples/vboxwrapper/vboxwrapper.cpp
@@ -56,7 +56,7 @@
diff --git a/debian/patches/fix-add-exclusive-app.patch b/debian/patches/fix-add-exclusive-app.patch
index 779ad8c..bebaa06 100644
--- a/debian/patches/fix-add-exclusive-app.patch
+++ b/debian/patches/fix-add-exclusive-app.patch
@@ -8,7 +8,7 @@ Returns true if a file with this name exists and if this process has execute per
--- a/clientgui/DlgAdvPreferences.cpp
+++ b/clientgui/DlgAdvPreferences.cpp
-@@ -819,7 +819,7 @@
+@@ -822,7 +822,7 @@
#endif
wxString directory = picker.GetDirectory();
wxFileName fn(directory, appNames[i]);
diff --git a/debian/patches/nvidia_mem_display_simplification.patch b/debian/patches/nvidia_mem_display_simplification.patch
index 13b2150..ff88529 100644
--- a/debian/patches/nvidia_mem_display_simplification.patch
+++ b/debian/patches/nvidia_mem_display_simplification.patch
@@ -1,6 +1,6 @@
--- a/lib/coproc.cpp
+++ b/lib/coproc.cpp
-@@ -502,7 +502,7 @@
+@@ -529,7 +529,7 @@
cuda_version = 0;
display_driver_version = 0;
strcpy(prop.name, "");
@@ -9,7 +9,7 @@
prop.sharedMemPerBlock = 0;
prop.regsPerBlock = 0;
prop.warpSize = 0;
-@@ -532,7 +532,7 @@
+@@ -559,7 +559,7 @@
while (!xp.get_tag()) {
if (xp.match_tag("/coproc_cuda")) {
if (!peak_flops) {
diff --git a/debian/patches/parse_issues.patch b/debian/patches/parse_issues.patch
index 325aa8c..f48d3a3 100644
--- a/debian/patches/parse_issues.patch
+++ b/debian/patches/parse_issues.patch
@@ -29,16 +29,3 @@ 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.
-@@ -55,9 +58,9 @@
- } else if (!NT_SUCCESS(Status)) {
- HeapFree(hHeap, NULL, *ppBuffer);
- return ERR_GETRUSAGE;
-- } else {
-- return 0;
-- }
-+ } else {
-+ return 0;
-+ }
- }
- return 0; // never reached
- }
diff --git a/debian/patches/series b/debian/patches/series
index 1ab1666..ed5c947 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -45,13 +45,11 @@ opendir_error_messages.patch
sched_driver_char_buffers.patch
csh2tcsh.patch
#socklenBuildFixByDavid.patch
-add_hardening_flags.patch
cmath_missing.patch
investigate_boinc_api.patch
slot_dir_source_trace.patch
opendir_errno.patch
ticket_1168_verifycerts.patch
-better_makefiles.patch
client_app_maxpathlen.patch
#debian specific patches
#boinclib_shared.patch #needed in order to make boinc build correctly otherwise it will FTBFS
@@ -63,5 +61,4 @@ zip_only_built_with_server.patch
#fix-for-debian-bug-646583.patch
hurd-ftbfs.patch
disable_new_version_check.patch
-add_hardening_flags_FTBFS.patch
server_installs_itself.patch
diff --git a/debian/patches/server_installs_itself.patch b/debian/patches/server_installs_itself.patch
index a3deb33..74ae3f5 100644
--- a/debian/patches/server_installs_itself.patch
+++ b/debian/patches/server_installs_itself.patch
@@ -51,7 +51,7 @@ Forwarded: yes (PM to David)
db_dump \
db_purge \
feeder \
-@@ -120,12 +121,18 @@
+@@ -121,12 +122,18 @@
trickle_echo \
update_stats
@@ -72,7 +72,7 @@ Forwarded: yes (PM to David)
noinst_HEADERS = \
assimilate_handler.h \
-@@ -276,8 +283,7 @@
+@@ -281,8 +288,7 @@
if ENABLE_FCGI
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index 93e7ce5..b0d22d5 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -1,17 +1,17 @@
--- a/client/app.cpp
+++ b/client/app.cpp
-@@ -424,8 +424,8 @@
+@@ -423,8 +423,8 @@
+ char new_path[MAXPATHLEN], old_path[MAXPATHLEN];
int retval;
- get_project_dir(result->project, project_dir, sizeof(project_dir));
- sprintf(old_path, "%s/trickle_up.xml", slot_dir);
- sprintf(new_path,
+ snprintf(old_path, sizeof(old_path), "%s/trickle_up.xml", slot_dir);
+ snprintf(new_path, sizeof(new_path),
"%s/trickle_up_%s_%d.xml",
- project_dir, result->name, (int)time(0)
+ result->project->project_dir(), result->name, (int)time(0)
);
-@@ -460,7 +460,7 @@
+@@ -459,7 +459,7 @@
return 0;
}
@@ -20,7 +20,7 @@
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
if (active_tasks[i]->slot == slot) {
-@@ -470,7 +470,7 @@
+@@ -469,7 +469,7 @@
return false;
}
@@ -29,7 +29,7 @@
char path[MAXPATHLEN];
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
-@@ -511,7 +511,7 @@
+@@ -510,7 +510,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;
-@@ -623,7 +623,7 @@
+@@ -622,7 +622,7 @@
#endif
int ACTIVE_TASK::parse(XML_PARSER& xp) {
@@ -47,7 +47,7 @@
int n, dummy;
unsigned int i;
PROJECT* project=0;
-@@ -898,7 +898,7 @@
+@@ -897,7 +897,7 @@
DirScanner dirscan(slot_dir);
while (dirscan.scan(filename)) {
diff --git a/debian/patches/some_extra_clang_warnings.patch b/debian/patches/some_extra_clang_warnings.patch
index 6c3e070..34502cd 100644
--- a/debian/patches/some_extra_clang_warnings.patch
+++ b/debian/patches/some_extra_clang_warnings.patch
@@ -30,7 +30,7 @@
--- a/clientgui/sg_ProjectPanel.cpp
+++ b/clientgui/sg_ProjectPanel.cpp
-@@ -390,8 +390,7 @@
+@@ -414,8 +414,7 @@
CMainDocument* pDoc = wxGetApp().GetDocument();
ProjectSelectionData* selData;
PROJECT* project;
@@ -40,7 +40,7 @@
if ( pDoc->IsConnected() ) {
int projCnt = pDoc->GetSimpleProjectCount();
-@@ -399,10 +398,11 @@
+@@ -423,10 +422,11 @@
oldProjectSelection = m_ProjectSelectionCtrl->GetSelection();
// If a new project has been added, figure out which one
@@ -54,7 +54,7 @@
ctrl_url = ((ProjectSelectionData*)m_ProjectSelectionCtrl->GetClientData(j))->project_url;
if (!strcmp(project->master_url, ctrl_url)) {
found = true;
-@@ -414,7 +414,7 @@
+@@ -438,7 +438,7 @@
if ( !found ) {
wxString projname(project->project_name.c_str(), wxConvUTF8);
#if SORTPROJECTLIST
@@ -63,7 +63,7 @@
for(j = 0; j < ctrlCount; ++j) {
alphaOrder = (m_ProjectSelectionCtrl->GetString(j)).CmpNoCase(projname);
if (alphaOrder > 0) {
-@@ -446,8 +446,8 @@
+@@ -470,8 +470,8 @@
if ( projCnt < ctrlCount ) {
project = NULL;
// Check items in descending order so deletion won't change indexes of items yet to be checked
@@ -74,7 +74,7 @@
project = pDoc->state.lookup_project(ctrl_url);
if ( project == NULL ) {
selData = (ProjectSelectionData*)m_ProjectSelectionCtrl->GetClientData(j);
-@@ -475,9 +475,9 @@
+@@ -499,9 +499,9 @@
// Check to see if we need to reload the project icon
ctrlCount = m_ProjectSelectionCtrl->GetCount();
diff --git a/debian/patches/ticket_1168_verifycerts.patch b/debian/patches/ticket_1168_verifycerts.patch
index 784ba7d..ba4aacd 100644
--- a/debian/patches/ticket_1168_verifycerts.patch
+++ b/debian/patches/ticket_1168_verifycerts.patch
@@ -9,5 +9,5 @@
+ //FIXME: a distinction is missing for the case that the .gz suffix goes beyond the MAXPATHLEN and is hence not found because
+ // one should then not reperform the download as intended below
if (boinc_file_exists(gzpath) ) {
- if (allow_async && nbytes > ASYNC_FILE_THRESHOLD) {
- ASYNC_VERIFY* avp = new ASYNC_VERIFY;
+ if (allow_async && nbytes > ASYNC_FILE_THRESHOLD) {
+ ASYNC_VERIFY* avp = new ASYNC_VERIFY;
diff --git a/debian/rules b/debian/rules
index 8432ed5..1e2ecb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -276,12 +276,10 @@ BINARIES += samples/worker/worker samples/wrapper/wrapper samples/sleeper/sleepe
override_dh_auto_clean:
dh_auto_clean
- [ -r samples/sleeper/Makefile ] && $(MAKE) -C samples/sleeper distclean
- # fail on unpatched source
- # $(MAKE) -C samples/worker distclean
- rm -rf samples/worker/worker samples/worker/worker.o
- [ -r samples/example_app/Makefile ] && $(MAKE) -C samples/example_app distclean || $(MAKE) -C samples/example_app clean
- [ -r samples/wrapper/Makefile ] && $(MAKE) -C samples/wrapper distclean || $(MAKE) -C samples/wrapper clean
+ [ -r samples/sleeper/Makefile ] && $(MAKE) -C samples/sleeper clean
+ [ -r samples/worker/Makefile ] && $(MAKE) -C samples/worker clean
+ [ -r samples/example_app/Makefile ] && $(MAKE) -C samples/example_app clean
+ [ -r samples/wrapper/Makefile ] && $(MAKE) -C samples/wrapper clean
find . -name Makefile.in -o -name "*.a" -o -name "*.o" | xargs -r rm
find . -name "Makefile" | grep -v samples | xargs -r rm
rm -f configure clientscr/boincscr
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list