[boinc] 03/03: Update with new upstream release

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Wed Apr 8 12:04:16 UTC 2015 

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch experimental
in repository boinc.

commit 2c9d63aaa46a103a3f4dfcc12e4834d9608da941
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Apr 8 13:05:56 2015 +0200

    Update with new upstream release
---
 debian/changelog                                   |  8 +-
 debian/patches/boinclib_shared.patch               | 14 ++--
 debian/patches/coproc.patch                        | 88 ----------------------
 debian/patches/cppcheck_realloc.patch              |  2 +-
 debian/patches/disable_new_version_check.patch     |  2 +-
 .../file_upload_handler_in_sched_linking.patch     |  4 +-
 debian/patches/fix-typo.patch                      | 23 ------
 .../make_project_overcomes_Apache24_security.patch |  4 +-
 debian/patches/more_maxpathlen.patch               |  4 +-
 debian/patches/rrsim_iterator_cppcheck.patch       |  4 +-
 debian/patches/series                              |  3 -
 debian/patches/server_status_php.patch             | 17 -----
 12 files changed, 24 insertions(+), 149 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72a4ab4..591958d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-boinc (7.4.42+dfsg-1exp1) experimental; urgency=medium
+boinc (7.5.0+dfsg-1exp1) experimental; urgency=medium
 
   [ Gianfranco Costamagna ]
   * New upstream release, patch refresh.
@@ -7,13 +7,17 @@ boinc (7.4.42+dfsg-1exp1) experimental; urgency=medium
     is enough to provide libstdc++.a.
   * d/patches/coproc.patch, fix build failure.
   * Make boinc Multi-Arch: same
+  * Drop patches now that 7.5 is a tag from master
+    - debian/patches/coproc.patch
+    - debian/patches/fix-typo.patch
+    - debian/patches/server_status_php.patch
   [ Vincent Danjean ]
   * fix gpu stuff (Closes: #763655)
   [ Michael Tautschnig ]
   * d/p/envargs.patch, fix inconsistencies spot with research compiler.
     (Closes: #747964)
 
- -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 10 Dec 2014 14:00:28 +0100
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 08 Apr 2015 12:43:01 +0200
 
 boinc (7.4.23+dfsg-2exp1) experimental; urgency=medium
 
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index 4976555..b0d551b 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -3,7 +3,7 @@ Description: this patch makes the build system create a dynamic shared library.
  significative debian delta.
 --- a/lib/Makefile.am
 +++ b/lib/Makefile.am
-@@ -175,13 +175,13 @@
+@@ -172,7 +172,7 @@ lib_LTLIBRARIES = libboinc.la
  libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
  libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
  libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
@@ -11,20 +11,22 @@ Description: this patch makes the build system create a dynamic shared library.
 +libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
  libboinc_la_LIBADD =
  
+ if ENABLE_BOINCCRYPT
+@@ -180,7 +180,7 @@ lib_LTLIBRARIES += libboinc_crypt.la
  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) $(SSL_LIBS)
++libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
  libboinc_crypt_la_LIBADD =
+ endif
  
- 
-@@ -250,7 +250,7 @@
+@@ -252,7 +252,7 @@ msg_test_CXXFLAGS = $(PTHREAD_CFLAGS)
  msg_test_LDADD = $(LIBBOINC)
  crypt_prog_SOURCES = crypt_prog.cpp 
- crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS)
+ crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
 -crypt_prog_LDADD = $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC) $(SSL_LIBS) 
-+crypt_prog_LDADD = -L../lib/.libs $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC) $(SSL_LIBS)
++crypt_prog_LDADD = -L../lib/.libs $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC) $(SSL_LIBS) 
  parse_test_SOURCES = parse_test.cpp 
  parse_test_CXXFLAGS = $(PTHREAD_CFLAGS)
  parse_test_LDADD = $(LIBBOINC)
diff --git a/debian/patches/coproc.patch b/debian/patches/coproc.patch
deleted file mode 100644
index 3d83b4f..0000000
--- a/debian/patches/coproc.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/sched/sched_check.cpp b/sched/sched_check.cpp
-index bf0af60..75614f0 100644
---- a/sched/sched_check.cpp
-+++ b/sched/sched_check.cpp
-@@ -140,7 +140,7 @@ static inline double get_estimated_delay(BEST_APP_VERSION& bav) {
-     if (pt == PROC_TYPE_CPU) {
-         return g_request->cpu_estimated_delay;
-     }
--    COPROC* cp = g_request->coprocs.type_to_coproc(pt);
-+    COPROC* cp = g_request->coprocs.proc_type_to_coproc(pt);
-     return cp->estimated_delay;
- }
- 
-diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp
-index bda585f..800b431 100644
---- a/sched/sched_send.cpp
-+++ b/sched/sched_send.cpp
-@@ -546,7 +546,7 @@ static inline void update_estimated_delay(BEST_APP_VERSION& bav, double dt) {
-     if (pt == PROC_TYPE_CPU) {
-         g_request->cpu_estimated_delay += dt*bav.host_usage.avg_ncpus/g_request->host.p_ncpus;
-     } else {
--        COPROC* cp = g_request->coprocs.type_to_coproc(pt);
-+        COPROC* cp = g_request->coprocs.proc_type_to_coproc(pt);
-         cp->estimated_delay += dt*bav.host_usage.gpu_usage/cp->count;
-     }
- }
-@@ -1168,7 +1168,7 @@ void send_gpu_messages() {
-     //
-     bool usable_gpu = false;
-     for (int i=1; i<NPROC_TYPES; i++) {
--        COPROC* cp = g_request->coprocs.type_to_coproc(i);
-+        COPROC* cp = g_request->coprocs.proc_type_to_coproc(i);
-         if (ssp->have_apps_for_proc_type[i] && cp->count) {
-             usable_gpu = true;
-             break;
-@@ -1423,7 +1423,7 @@ void send_work_setup() {
-     // do sanity checking on GPU scheduling parameters
-     //
-     for (i=1; i<NPROC_TYPES; i++) {
--        COPROC* cp = g_request->coprocs.type_to_coproc(i);
-+        COPROC* cp = g_request->coprocs.proc_type_to_coproc(i);
-         if (cp->count) {
-             g_wreq->req_secs[i] = clamp_req_sec(cp->req_secs);
-             g_wreq->req_instances[i] = cp->req_instances;
-@@ -1484,7 +1484,7 @@ void send_work_setup() {
-             g_request->cpu_estimated_delay
-         );
-         for (i=1; i<NPROC_TYPES; i++) {
--            COPROC* cp = g_request->coprocs.type_to_coproc(i);
-+            COPROC* cp = g_request->coprocs.proc_type_to_coproc(i);
-             if (cp->count) {
-                 log_messages.printf(MSG_NORMAL,
-                     "[send] %s: req %.2f sec, %.2f instances; est delay %.2f\n",
-diff --git a/sched/sched_types.cpp b/sched/sched_types.cpp
-index 2a8e64a..c07f863 100644
---- a/sched/sched_types.cpp
-+++ b/sched/sched_types.cpp
-@@ -71,7 +71,7 @@ int CLIENT_APP_VERSION::parse(XML_PARSER& xp) {
- 
-             double pf = host_usage.avg_ncpus * g_reply->host.p_fpops;
-             if (host_usage.proc_type != PROC_TYPE_CPU) {
--                COPROC* cp = g_request->coprocs.type_to_coproc(host_usage.proc_type);
-+                COPROC* cp = g_request->coprocs.proc_type_to_coproc(host_usage.proc_type);
-                 pf += host_usage.gpu_usage*cp->peak_flops;
-             }
-             host_usage.peak_flops = pf;
-@@ -619,7 +619,7 @@ static bool have_apps_for_client() {
-     for (int i=0; i<NPROC_TYPES; i++) {
-         if (ssp->have_apps_for_proc_type[i]) {
-             if (!i) return true;
--            COPROC* cp = g_request->coprocs.type_to_coproc(i);
-+            COPROC* cp = g_request->coprocs.proc_type_to_coproc(i);
-             if (cp->count) return true;
-         }
-     }
-diff --git a/sched/sched_version.cpp b/sched/sched_version.cpp
-index 2d7d4a0..fdd04bc 100644
---- a/sched/sched_version.cpp
-+++ b/sched/sched_version.cpp
-@@ -94,7 +94,7 @@ inline int scaled_max_jobs_per_day(DB_HOST_APP_VERSION& hav, HOST_USAGE& hu) {
-             n *= g_reply->host.p_ncpus;
-         }
-     } else {
--        COPROC* cp = g_request->coprocs.type_to_coproc(hu.proc_type);
-+        COPROC* cp = g_request->coprocs.proc_type_to_coproc(hu.proc_type);
-         if (cp->count) {
-             n *= cp->count;
-         }
diff --git a/debian/patches/cppcheck_realloc.patch b/debian/patches/cppcheck_realloc.patch
index 9f9d9a2..4ded9fb 100644
--- a/debian/patches/cppcheck_realloc.patch
+++ b/debian/patches/cppcheck_realloc.patch
@@ -3,7 +3,7 @@ Description: Initialisation.
 
 --- a/lib/crypt.cpp
 +++ b/lib/crypt.cpp
-@@ -346,6 +346,7 @@
+@@ -345,6 +345,7 @@
      char clear_buf[MD5_LEN];
      int n, retval;
      DATA_BLOCK clear_signature;
diff --git a/debian/patches/disable_new_version_check.patch b/debian/patches/disable_new_version_check.patch
index 86b49f0..fea31e2 100644
--- a/debian/patches/disable_new_version_check.patch
+++ b/debian/patches/disable_new_version_check.patch
@@ -12,7 +12,7 @@ Last-Update: <2013-03-07>
 
 --- a/client/client_state.cpp
 +++ b/client/client_state.cpp
-@@ -518,7 +518,7 @@
+@@ -522,7 +522,7 @@
  
      // inform the user if there's a newer version of client
      //
diff --git a/debian/patches/file_upload_handler_in_sched_linking.patch b/debian/patches/file_upload_handler_in_sched_linking.patch
index 2ca7694..0708fc8 100644
--- a/debian/patches/file_upload_handler_in_sched_linking.patch
+++ b/debian/patches/file_upload_handler_in_sched_linking.patch
@@ -1,7 +1,7 @@
 Description: Link LIBBOINC to some binary needing it.
 --- a/sched/Makefile.am
 +++ b/sched/Makefile.am
-@@ -268,7 +268,7 @@
+@@ -278,7 +278,7 @@
  update_stats_LDADD = $(SERVERLIBS)
  
  file_upload_handler_SOURCES = file_upload_handler.cpp sched_msgs.cpp sched_config.cpp sched_util_basic.cpp sched_limit.cpp
@@ -10,7 +10,7 @@ Description: Link LIBBOINC to some binary needing it.
  
  make_work_SOURCES = make_work.cpp
  make_work_LDADD = $(SERVERLIBS)
-@@ -310,7 +310,7 @@
+@@ -320,7 +320,7 @@
      sched_config.cpp \
      sched_msgs.cpp 
  fcgi_file_upload_handler_CPPFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
diff --git a/debian/patches/fix-typo.patch b/debian/patches/fix-typo.patch
deleted file mode 100644
index 1c9e050..0000000
--- a/debian/patches/fix-typo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: this should ensure that parallel builds work on debian (since the dependencies are changed with dynamic libraries)
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -209,7 +209,7 @@
- 
- 
- if BUILD_STATIC_LIBS
--all_local = $(LIBBOINC_STATIC) $(LIBBOINC_CRTYPT_STATIC)
-+all_local = $(LIBBOINC_STATIC) $(LIBBOINC_CRYPT_STATIC)
- if ENABLE_FCGI
- all_local += $(LIBBOINC_FCGI_STATIC) 
- endif
---- a/Makefile.incl
-+++ b/Makefile.incl
-@@ -52,7 +52,7 @@
- 	cd $(top_builddir)/lib; ${MAKE} libboinc.la
- LIBBOINC_CRYPT = $(top_builddir)/lib/libboinc_crypt.la
- $(LIBBOINC_CRYPT):
--	cd $(top_builddir)/lib; ${MAKE} libboinc.la
-+	cd $(top_builddir)/lib; ${MAKE} libboinc_crypt.la
- LIBBOINC_FCGI = $(top_builddir)/lib/libboinc_fcgi.la
- $(LIBBOINC_FCGI):
- 	cd $(top_builddir)/lib; ${MAKE} libboinc_fcgi.la
diff --git a/debian/patches/make_project_overcomes_Apache24_security.patch b/debian/patches/make_project_overcomes_Apache24_security.patch
index 9b9a17c..6dde082 100644
--- a/debian/patches/make_project_overcomes_Apache24_security.patch
+++ b/debian/patches/make_project_overcomes_Apache24_security.patch
@@ -3,7 +3,7 @@ Description: Installations outside /var/www are disabled by default
  http://dabase.com/blog/AH01630:_client_denied_by_server_configuration/
 --- a/tools/make_project
 +++ b/tools/make_project
-@@ -327,6 +327,7 @@
+@@ -330,6 +330,7 @@
      <Directory "%(proot)s/html">
          Options Indexes FollowSymlinks MultiViews
          AllowOverride AuthConfig
@@ -11,7 +11,7 @@ Description: Installations outside /var/www are disabled by default
          Order allow,deny
          Allow from all
      </Directory>
-@@ -334,6 +335,7 @@
+@@ -337,6 +338,7 @@
      <Directory "%(proot)s/cgi-bin">
          Options ExecCGI
          AllowOverride AuthConfig
diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index 5298672..cdd0337 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -1,7 +1,7 @@
 Description: use MAXPATHLEN and change sprintf to snprintf
 --- a/api/graphics2_util.cpp
 +++ b/api/graphics2_util.cpp
-@@ -37,7 +37,7 @@
+@@ -40,7 +40,7 @@
  static key_t get_shmem_name(const char* prog_name) {
      char cwd[MAXPATHLEN], path[MAXPATHLEN];
      boinc_getcwd(cwd);
@@ -10,7 +10,7 @@ Description: use MAXPATHLEN and change sprintf to snprintf
      return ftok(path, 2);
  }
  #else
-@@ -47,7 +47,7 @@
+@@ -50,7 +50,7 @@
      APP_INIT_DATA aid;
      int retval = boinc_get_init_data(aid);
      if (retval) aid.slot = 0;
diff --git a/debian/patches/rrsim_iterator_cppcheck.patch b/debian/patches/rrsim_iterator_cppcheck.patch
index d6adb16..07dbd10 100644
--- a/debian/patches/rrsim_iterator_cppcheck.patch
+++ b/debian/patches/rrsim_iterator_cppcheck.patch
@@ -21,7 +21,7 @@ Description: this patch avoid the iterator reuse, fixing cppcheck warnings
          //
          it = active.begin();
 @@ -301,7 +302,10 @@
-                 it++;
+                 ++it;
              }
          }
 +	}
@@ -32,7 +32,7 @@ Description: this patch avoid the iterator reuse, fixing cppcheck warnings
          //
          it = pbest->active.begin();
 @@ -313,6 +317,7 @@
-                 it++;
+                 ++it;
              }
          }
 +	}
diff --git a/debian/patches/series b/debian/patches/series
index aefc95f..8ecc99b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,9 +18,7 @@ more_clang_warnings.patch
 add-ldflags.patch
 addressing_additional_html_dirs.patch
 gui_urls_xml_added_to_Makefile.patch
-server_status_php.patch
 #db_interface_use.patch
-fix-typo.patch
 # patches to get Debian going
 make_project_overcomes_Apache24_security.patch
 #debian specific patches
@@ -32,5 +30,4 @@ disable_svn_version.patch
 AdjustBoincTopdirPython.patch
 file_upload_handler_in_sched_linking.patch
 disable_silent_rules.patch
-coproc.patch
 envargs.patch
diff --git a/debian/patches/server_status_php.patch b/debian/patches/server_status_php.patch
deleted file mode 100644
index f6d6d62..0000000
--- a/debian/patches/server_status_php.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Adjusting Apache PID file location
---- a/html/user/server_status.php
-+++ b/html/user/server_status.php
-@@ -192,7 +192,12 @@
- }
- $uldl_pid = parse_element($config_vars,"<uldl_pid>");
- if ($uldl_pid == "") {
--    $uldl_pid = "/etc/httpd/run/httpd.pid";
-+    foreach (array("/etc/httpd/run/httpd.pid","/var/run/apache2/apache2.pid") as $f) {
-+        if (file_exists($f)) {
-+          $uldl_pid = $f;
-+	  break;
-+	}
-+    }
- }
- $uldl_host = parse_element($config_vars,"<uldl_host>");
- if ($uldl_host == "") {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git

More information about the pkg-boinc-commits mailing list