[SCM] BOINC packaging branch, SZTAKI, updated. debian/6.10.17+dfsg-3-329-g489f040

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit 208d090141dfb92428961712768fd97196d8f3a2
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jun 13 21:08:05 2011 +0200

    backend_lib.cpp was already mostly accepted upstream

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index a09dd7b..c944983 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -540,79 +540,6 @@ def builddir(*dirs):
  
  dir_hier_move_SOURCES = dir_hier_move.cpp
 -dir_hier_move_LDADD = $(SERVERLIBS)
---- boinc-server-6.11.0+r18946.orig/tools/backend_lib.cpp
-+++ boinc-server-6.11.0+r18946/tools/backend_lib.cpp
-@@ -187,9 +187,9 @@
- ) {
-     char* p;
-     char buf[BLOB_SIZE], md5[33], path[256], url[256], top_download_path[256];
--    string out, cmdline;
-+    string out, cmdline, md5str, urlstr;
-     int retval, file_number;
--    double nbytes;
-+    double nbytes, nbytesdef;
-     char open_name[256];
-     bool found=false;
-     int nfiles_parsed = 0;
-@@ -198,7 +198,8 @@
-     for (p=strtok(tmplate, "\n"); p; p=strtok(0, "\n")) {
-         if (match_tag(p, "<file_info>")) {
-             bool generated_locally = false;
--            file_number = -1;
-+            file_number = nbytesdef = -1;
-+            md5str = urlstr = "";
-             out += "<file_info>\n";
-             while (1) {
-                 p = strtok(0, "\n");
-@@ -207,7 +208,20 @@
-                     continue;
-                 } else if (parse_bool(p, "generated_locally", generated_locally)) {
-                     continue;
-+                } else if (parse_str(p, "<url>", urlstr)) {
-+                    continue;
-+                } else if (parse_str(p, "<md5_cksum>", md5str)) {
-+                    continue;
-+                } else if (parse_double(p, "<nbytes>", nbytesdef)) {
-+                    continue;
-                 } else if (match_tag(p, "</file_info>")) {
-+                   if (nbytesdef != -1 || md5str != "" || urlstr != "") {
-+                        if (nbytesdef == -1 || md5str == "" || urlstr == "") {
-+                            fprintf(stderr, "All file properties must be defined "
-+                                "if at least one defined (url, md5_cksum, nbytes)!\n");
-+                            return ERR_XML_PARSE;
-+                        }
-+                    }
-                     if (file_number < 0) {
-                         fprintf(stderr, "No file number found\n");
-                         return ERR_XML_PARSE;
-@@ -227,7 +241,7 @@
-                             "</file_info>\n",
-                             infiles[file_number]
-                         );
--                    } else {
-+                    } else if (nbytesdef == -1) {
-                         dir_hier_path(
-                             infiles[file_number], config_loc.download_dir,
-                             config_loc.uldl_dir_fanout, path, true
-@@ -270,6 +284,18 @@
-                             md5,
-                             nbytes
-                         );
-+                    } else {
-+                        sprintf(buf,
-+                            "    <name>%s</name>\n"
-+                            "    <url>%s</url>\n"
-+                            "    <md5_cksum>%s</md5_cksum>\n"
-+                            "    <nbytes>%.0f</nbytes>\n"
-+                            "</file_info>\n",
-+                            infiles[file_number],
-+                            urlstr.c_str(),
-+                            md5str.c_str(),
-+                            nbytesdef
-+                        );
-                     }
-                     out += buf;
-                     break;
 --- boinc-server-6.11.0+r18946.orig/tools/make_project
 +++ boinc-server-6.11.0+r18946/tools/make_project
 @@ -119,7 +117,6 @@
diff --git a/debian/patches/local_sztaki_backendlib.patch b/debian/patches/local_sztaki_backendlib.patch
new file mode 100644
index 0000000..c171347
--- /dev/null
+++ b/debian/patches/local_sztaki_backendlib.patch
@@ -0,0 +1,24 @@
+Disclaimer: All other changes were already accepted by upstream
+Index: boinc/tools/backend_lib.cpp
+===================================================================
+--- boinc.orig/tools/backend_lib.cpp	2011-06-13 21:01:02.000000000 +0200
++++ boinc/tools/backend_lib.cpp	2011-06-13 21:01:37.000000000 +0200
+@@ -296,6 +296,18 @@
+                             md5str.c_str(),
+                             nbytesdef
+                         );
++                    } else {
++                        sprintf(buf,
++                            "    <name>%s</name>\n"
++                            "    <url>%s</url>\n"
++                            "    <md5_cksum>%s</md5_cksum>\n"
++                            "    <nbytes>%.0f</nbytes>\n"
++                            "</file_info>\n",
++                            infiles[file_number],
++                            urlstr.c_str(),
++                            md5str.c_str(),
++                            nbytesdef
++                        );
+                     }
+                     out += buf;
+                     break;
diff --git a/debian/patches/series b/debian/patches/series
index af98fcc..2c3d7f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 local_sztaki_workOnTransitioner.patch
+local_sztaki_backendlib.patch
 debian_sztaki_httpdUserIsWwwData.patch
 upstream_sztaki_improveSchedStart.patch
 local_sztaki_toolsUpgradeSimplification.patch

-- 
BOINC packaging