[SCM] BOINC packaging branch, master, updated. upstream/7.0.65+dfsg-694-g47213a3
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Tue Apr 23 12:17:55 UTC 2013
The following commit has been merged in the master branch:
commit 47213a35249a074bef779bc3c536f62b650a5012
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Tue Apr 23 14:17:35 2013 +0200
Bumped compat version and enabled hardening flags
diff --git a/debian/changelog b/debian/changelog
index e631f59..cdb168a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ boinc (7.0.65+dfsg-1) UNRELEASED; urgency=low
- python (>= 2.3) (version 2.6.6 in stable)
- Breaks: udev (<< 136-1) (version 164 in stable)
- removed boinc-app-seti from boinc-client Suggests field
+ debian/compat
+ - Bumped to version 8
-- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Wed, 17 Apr 2013 09:06:54 +0200
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/patches/add_hardening_flags_FTBFS.patch b/debian/patches/add_hardening_flags_FTBFS.patch
new file mode 100644
index 0000000..f7c8769
--- /dev/null
+++ b/debian/patches/add_hardening_flags_FTBFS.patch
@@ -0,0 +1,100 @@
+--- boinc-7.0.65+dfsg.orig/client/cs_account.cpp
++++ boinc-7.0.65+dfsg/client/cs_account.cpp
+@@ -79,7 +79,7 @@ int PROJECT::write_account_file() {
+ 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);
+--- boinc-7.0.65+dfsg.orig/client/cs_benchmark.cpp
++++ boinc-7.0.65+dfsg/client/cs_benchmark.cpp
+@@ -365,7 +365,7 @@ bool CLIENT_STATE::cpu_benchmarks_poll()
+
+ // 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 @@ bool CLIENT_STATE::cpu_benchmarks_poll()
+ }
+ 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;
+ }
+ }
+--- boinc-7.0.65+dfsg.orig/client/main.cpp
++++ boinc-7.0.65+dfsg/client/main.cpp
+@@ -80,7 +80,7 @@ void log_message_startup(const char* msg
+ 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 @@ void log_message_startup(const char* msg
+ #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
+ }
+ }
+@@ -121,7 +121,7 @@ void log_message_error(const char* msg)
+ #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
+ }
+ }
+@@ -143,7 +143,7 @@ void log_message_error(const char* msg,
+ #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
+ }
+ }
+--- boinc-7.0.65+dfsg.orig/client/main.cpp
++++ boinc-7.0.65+dfsg/client/main.cpp
+@@ -112,7 +112,7 @@ void log_message_error(const char* msg)
+ );
+ #endif
+ if (!gstate.executing_as_daemon) {
+- fprintf(stderr, evt_msg);
++ fprintf(stderr, "%s", evt_msg);
+ } else {
+ #ifdef _WIN32
+ LogEventErrorMessage(evt_msg);
+@@ -134,7 +134,7 @@ void log_message_error(const char* msg,
+ msg, error_code
+ );
+ if (!gstate.executing_as_daemon) {
+- fprintf(stderr, evt_msg);
++ fprintf(stderr, "%s", evt_msg);
+ } else {
+ #ifdef _WIN32
+ LogEventErrorMessage(evt_msg);
+--- boinc-7.0.65+dfsg.orig/client/work_fetch.cpp
++++ boinc-7.0.65+dfsg/client/work_fetch.cpp
+@@ -784,7 +784,7 @@ void WORK_FETCH::write_request(FILE* f,
+ 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/series b/debian/patches/series
index 388a761..d00c9b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -63,3 +63,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
diff --git a/debian/rules b/debian/rules
index 44b1733..3a81261 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,8 @@
# Set default flags with dpkg-buildflags
# -Wformat -Werror=format-security will need many fixes to avoid ftbfs,
# so it's disabled for now
-export DEB_BUILD_MAINT_OPTIONS = hardening=-format,+bindnow
+#export DEB_BUILD_MAINT_OPTIONS = hardening=-format,+bindnow
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
@@ -260,6 +261,9 @@ BINARIES += samples/worker/worker samples/wrapper/wrapper samples/sleeper/sleepe
samples/nvcuda/cuda samples/example_app/example_app samples/vm_wrapper/vm_wrapper \
samples/atiopencl/atiopencl
+#override_dh_shlibdeps:
+# dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+
override_dh_auto_clean:
dh_auto_clean
$(MAKE) -C samples/sleeper distclean
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list