[SCM] BOINC packaging branch, master, updated. upstream/7.0.65+dfsg-699-ga14e157

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit a14e157f7fc99d3d4dc3a29b7862875947b87ca5
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Apr 24 09:45:20 2013 +0200

    Patch refresh

diff --git a/debian/patches/add_hardening_flags_FTBFS.patch b/debian/patches/add_hardening_flags_FTBFS.patch
index f7c8769..811794a 100644
--- a/debian/patches/add_hardening_flags_FTBFS.patch
+++ b/debian/patches/add_hardening_flags_FTBFS.patch
@@ -1,6 +1,6 @@
---- 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() {
+--- 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()
      );
@@ -9,9 +9,9 @@
      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()
+--- 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
      //
@@ -20,7 +20,7 @@
          msg_printf(NULL, MSG_INTERNAL_ERROR,
              "Failed to stop applications; aborting CPU benchmarks"
          );
-@@ -462,7 +462,7 @@ bool CLIENT_STATE::cpu_benchmarks_poll()
+@@ -462,7 +462,7 @@
              }
              ndone++;
              if (benchmark_descs[i].error) {
@@ -29,9 +29,9 @@
                  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
+--- a/client/main.cpp
++++ b/client/main.cpp
+@@ -80,7 +80,7 @@
          msg
      );
      if (!gstate.executing_as_daemon) {
@@ -40,7 +40,7 @@
      } else {
  #ifdef _WIN32
          LogEventInfoMessage(evt_msg);
-@@ -89,7 +89,7 @@ void log_message_startup(const char* msg
+@@ -89,7 +89,7 @@
  #elif defined (ANDROID)
          __android_log_print(ANDROID_LOG_INFO, "BOINC", evt_msg);
  #else
@@ -49,16 +49,16 @@
  #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);
+@@ -112,7 +112,7 @@
+     );
  #endif
-     }
- }
-@@ -143,7 +143,7 @@ void log_message_error(const char* msg,
+     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
@@ -67,18 +67,7 @@
  #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,
+@@ -134,7 +134,7 @@
          msg, error_code
      );
      if (!gstate.executing_as_daemon) {
@@ -87,9 +76,18 @@
      } 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,
+@@ -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);

-- 
BOINC packaging