[SCM] BOINC packaging branch, master, updated. debian/7.0.65+dfsg-3-29-g6b6fdf5

Gianfranco Costamagna costamagnagianfranco at yahoo.it
Fri Jun 7 06:43:24 UTC 2013 

The following commit has been merged in the master branch:
commit 6b6fdf5367bcf8df9088a444f79a5fb968d7254a
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Jun 7 08:37:12 2013 +0200

    New upstream release is out, patch refresh

diff --git a/debian/boinc-client.init b/debian/boinc-client.init
index 586cd91..c9e80cb 100644
--- a/debian/boinc-client.init
+++ b/debian/boinc-client.init
@@ -100,6 +100,7 @@ is_running()
 
 start()
 {
+  sleep 10
   log_begin_msg "Starting $DESC: $NAME"
   if is_running; then
     log_progress_msg "already running"
diff --git a/debian/changelog b/debian/changelog
index d8bde6e..21edf32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+boinc (7.1.10+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Readding sleep (10 seconds) to workaround GPU bug (lp: #1177433)
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 07 Jun 2013 08:34:03 +0200
+
 boinc (7.1.7+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index 83534fd..ad93d78 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -6,14 +6,14 @@
  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 = -lm -lstdc++
+ libboinc_la_LIBADD =
  
  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 = -lm -lstdc++
+ libboinc_crypt_la_LIBADD =
  
  
 @@ -222,7 +222,7 @@
diff --git a/debian/patches/cmath_missing.patch b/debian/patches/cmath_missing.patch
deleted file mode 100644
index 902e6ac..0000000
--- a/debian/patches/cmath_missing.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/lib/boinc_win.h
-+++ b/lib/boinc_win.h
-@@ -197,7 +197,7 @@
- #include <assert.h>
- #include <ctype.h>
- #include <errno.h>
--#include <math.h>
-+#include <cmath>
- #include <setjmp.h>
- #include <signal.h>
- #include <stdarg.h>
---- a/lib/md5.c
-+++ b/lib/md5.c
-@@ -88,7 +88,7 @@
-  * For reference, here is the program that computed the T values.
-  */
- #if 0
--#include <math.h>
-+#include <cmath>
- main()
- {
-     int i;
diff --git a/debian/patches/investigate_boinc_api.patch b/debian/patches/investigate_boinc_api.patch
index d721a2d..e26e22b 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
-@@ -330,7 +330,7 @@
+@@ -354,7 +354,7 @@
  
      if (standalone) return true;
  
@@ -9,16 +9,7 @@
          "<current_cpu_time>%e</current_cpu_time>\n"
          "<checkpoint_cpu_time>%e</checkpoint_cpu_time>\n",
          cpu_t, cp_cpu_t
-@@ -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);
--        strlcat(msg_buf, buf, MSG_CHANNEL_SIZE);
-+        strlcat(msg_buf, buf, sizeof(msg_buf));
-     }
-     if (bytes_sent) {
-         sprintf(buf, "<bytes_sent>%f</bytes_sent>\n", bytes_sent);
-@@ -607,6 +607,10 @@
+@@ -633,6 +633,10 @@
  }
  
  int boinc_get_status(BOINC_STATUS *s) {
@@ -29,7 +20,7 @@
      s->no_heartbeat = boinc_status.no_heartbeat;
      s->suspended = boinc_status.suspended;
      s->quit_request = boinc_status.quit_request;
-@@ -783,7 +787,7 @@
+@@ -809,7 +813,7 @@
  int boinc_parse_init_data_file() {
      FILE* f;
      int retval;
@@ -38,7 +29,7 @@
  
      if (aid.project_preferences) {
          free(aid.project_preferences);
-@@ -833,15 +837,15 @@
+@@ -859,15 +863,15 @@
      );
      if (other_pid) {
          sprintf(buf, "<other_pid>%d</other_pid>\n", other_pid);
@@ -57,7 +48,7 @@
      }
      if (app_client_shm->shm->app_status.send_msg(msg_buf)) {
          return 0;
-@@ -912,7 +916,7 @@
+@@ -950,7 +954,7 @@
  }
  
  static void handle_upload_file_status() {
@@ -66,7 +57,7 @@
      std::string filename;
      int status;
  
-@@ -1259,7 +1263,7 @@
+@@ -1282,7 +1286,7 @@
      // send graphics-related messages
      //
      if (send_web_graphics_url && !app_client_shm->shm->graphics_reply.has_msg()) {
@@ -75,7 +66,7 @@
              "<web_graphics_url>%s</web_graphics_url>",
              web_graphics_url
          );
-@@ -1267,7 +1271,7 @@
+@@ -1290,7 +1294,7 @@
          send_web_graphics_url = false;
      }
      if (send_remote_desktop_addr && !app_client_shm->shm->graphics_reply.has_msg()) {
@@ -84,7 +75,7 @@
              "<remote_desktop_addr>%s</remote_desktop_addr>",
              remote_desktop_addr
          );
-@@ -1461,7 +1465,7 @@
+@@ -1506,7 +1510,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 c5c1a64..e6603cf 100644
--- a/debian/patches/more_clang_warnings.patch
+++ b/debian/patches/more_clang_warnings.patch
@@ -1,6 +1,6 @@
 --- a/client/app_control.cpp
 +++ b/client/app_control.cpp
-@@ -589,8 +589,8 @@
+@@ -590,8 +590,8 @@
      } else {
          x = y;
      }
@@ -11,7 +11,7 @@
      strip_whitespace(buf);
      fclose(f);
      return true;
-@@ -1421,13 +1421,13 @@
+@@ -1422,13 +1422,13 @@
      FILE* f = fopen(path, "r");
      if (!f) return;
      buf[0] = 0;
@@ -72,7 +72,7 @@
  }
 --- a/lib/diagnostics.cpp
 +++ b/lib/diagnostics.cpp
-@@ -607,7 +607,7 @@
+@@ -608,7 +608,7 @@
      size = backtrace (array, 64);
  //  Anything that calls malloc here (i.e *printf()) will probably fail
  //  so we'll do it the hard way.
@@ -81,7 +81,7 @@
      char mbuf[10];
      char *p=mbuf+9;
      int i=size;
-@@ -616,10 +616,10 @@
+@@ -617,10 +617,10 @@
        *(p--)=i%10+'0';
        i/=10;
      }
@@ -173,7 +173,7 @@
                  final_retval = retval;
 --- a/client/log_flags.cpp
 +++ b/client/log_flags.cpp
-@@ -509,7 +509,10 @@
+@@ -510,7 +510,10 @@
  #ifdef _WIN32
              _chdir(config.data_dir);
  #else
@@ -187,7 +187,7 @@
      } else {
 --- a/client/switcher.cpp
 +++ b/client/switcher.cpp
-@@ -46,6 +46,8 @@
+@@ -47,6 +47,8 @@
      char            newlibs[256];
      char            *projectDirName;
  
@@ -196,7 +196,7 @@
      strcpy(user_name, "boinc_project");
      strcpy(group_name, "boinc_project");
  
-@@ -73,12 +75,16 @@
+@@ -74,12 +76,16 @@
      // We are running setuid root, so setgid() sets real group ID,
      // effective group ID and saved set_group-ID for this process
      grp = getgrnam(group_name);
@@ -215,7 +215,7 @@
  
      // For unknown reasons, the LD_LIBRARY_PATH and DYLD_LIBRARY_PATH
      // environment variables are not passed in to switcher, though all
-@@ -125,7 +131,8 @@
+@@ -126,7 +132,8 @@
  
      execv(argv[1], argv+2);
  
diff --git a/debian/patches/opendir_error_messages.patch b/debian/patches/opendir_error_messages.patch
index 2a3b85b..da7ffe5 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
-@@ -305,7 +305,7 @@
+@@ -306,7 +306,7 @@
  
      // Store various pieces of inforation for future use.
      if (flags & BOINC_DIAG_BOINCAPPLICATION) {
diff --git a/debian/patches/possible_size_type_error.patch b/debian/patches/possible_size_type_error.patch
index 6b9d097..b8bfeb5 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
-@@ -137,13 +137,13 @@
+@@ -138,13 +138,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)
-@@ -209,7 +209,7 @@
+@@ -210,7 +210,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 dc07f86..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
-@@ -52,9 +52,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 815424f..d1645f6 100644
--- a/debian/patches/sched_driver_f_free.patch
+++ b/debian/patches/sched_driver_f_free.patch
@@ -2,7 +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
-@@ -62,7 +62,7 @@
+@@ -63,7 +63,7 @@
  double max_time = 1;
  
  void read_hosts() {
diff --git a/debian/patches/series b/debian/patches/series
index 640a764..6a50620 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,7 +42,6 @@ opendir_error_messages.patch
 sched_driver_char_buffers.patch
 csh2tcsh.patch
 #socklenBuildFixByDavid.patch
-#cmath_missing.patch #trying to disable it
 investigate_boinc_api.patch
 slot_dir_source_trace.patch
 opendir_errno.patch

-- 
BOINC packaging

More information about the pkg-boinc-commits mailing list