[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-372-ga2a0fc3
Steffen Moeller
moeller at debian.org
Sun Jan 22 12:39:36 UTC 2012
The following commit has been merged in the master branch:
commit 2c745abcb38ac2fd46168dc07e208250e13ccea6
Author: Steffen Moeller <moeller at debian.org>
Date: Sun Jan 15 00:59:44 2012 +0100
Preparing for 7.0.8, also adopting patch from trunk
diff --git a/debian/boinc-server-maker.dirs b/debian/boinc-server-maker.dirs
index 47e869f..c0a914c 100644
--- a/debian/boinc-server-maker.dirs
+++ b/debian/boinc-server-maker.dirs
@@ -1,5 +1,6 @@
usr/lib/boinc-server/bin
usr/lib/boinc-server/tools
+usr/lib/boinc-server/sched
usr/share/boinc-server/bin
usr/share/boinc-server/lib
usr/share/boinc-server/tools
diff --git a/debian/boinc-server-maker.install b/debian/boinc-server-maker.install
index d26b371..27cf581 100644
--- a/debian/boinc-server-maker.install
+++ b/debian/boinc-server-maker.install
@@ -12,7 +12,7 @@ sched/db_dump_spec.xml usr/share/boinc-server/sched
sched/transitioner_catchup.php usr/share/boinc-server/sched
#where is this?
#sched/request_file_list usr/share/boinc-server/sched
-sched/put_file usr/share/boinc-server/sched
+sched/put_file usr/lib/boinc-server/sched
#test/uc_result usr/share/boinc-server/test
#test/uc_wu_nodelete usr/share/boinc-server/test
@@ -29,7 +29,7 @@ tools/appmgr usr/lib/boinc-server/tools
tools/run_in_ops usr/lib/boinc-server/tools
tools/manage_privileges usr/share/boinc-server/tools
-tools/cancel_jobs usr/share/boinc-server/tools
+tools/cancel_jobs usr/lib/boinc-server/tools
tools/boinc_submit usr/share/boinc-server/tools
tools/demo_submit usr/share/boinc-server/tools
tools/demo_query usr/share/boinc-server/tools
diff --git a/debian/boinc-server-maker.links b/debian/boinc-server-maker.links
index c3e940e..c00cd67 100644
--- a/debian/boinc-server-maker.links
+++ b/debian/boinc-server-maker.links
@@ -21,14 +21,15 @@ usr/lib/boinc-server/bin/update_stats usr/share/boinc-server/sched/update_stats
usr/lib/boinc-server/bin/wu_check usr/share/boinc-server/sched/wu_check
usr/lib/boinc-server/bin/file_upload_handler usr/share/boinc-server/sched/file_upload_handler
usr/lib/boinc-server/bin/transitioner usr/share/boinc-server/sched/transitioner
-usr/lib/boinc-server/bin/sample_bitwise_validator usr/share/boinc-server/sched/sample_bitwise_validator
-usr/lib/boinc-server/bin/sample_trivial_validator usr/share/boinc-server/sched/sample_trivial_validator
-usr/lib/boinc-server/bin/sample_dummy_assimilator usr/share/boinc-server/sched/sample_dummy_assimilator
+usr/lib/boinc-server/bin/sample_bitwise_validator usr/share/boinc-server/sched/sample_bitwise_validator
+usr/lib/boinc-server/bin/sample_trivial_validator usr/share/boinc-server/sched/sample_trivial_validator
+usr/lib/boinc-server/bin/sample_dummy_assimilator usr/share/boinc-server/sched/sample_dummy_assimilator
usr/lib/boinc-server/bin/sample_assimilator usr/share/boinc-server/sched/sample_assimilator
usr/lib/boinc-server/bin/sample_work_generator usr/share/boinc-server/sched/sample_work_generator
usr/lib/boinc-server/bin/single_job_assimilator usr/share/boinc-server/sched/single_job_assimilator
usr/lib/boinc-server/bin/assimilator.py usr/share/boinc-server/sched/assimilator.py
usr/lib/boinc-server/bin/pymw_assimilator.py usr/share/boinc-server/sched/pymw_assimilator.py
+usr/lib/boinc-server/sched/put_file usr/share/boinc-server/sched/put_file
@@ -56,5 +57,5 @@ usr/lib/boinc-server/tools/makelog.sh usr/share/boinc-server/tools/make
usr/share/boinc-server/html/user/server_status.php usr/share/boinc-server/html/ops/sample_server_status.php
# annoying weakness of make_project
-# since we are shipping the apps diffrent, no need to use this.
+# we are shipping the apps separately, no need to use this.
#usr/share/boinc-server/apps/uc2 usr/share/boinc-server/samples/example_app/uc2
diff --git a/debian/patches/bad_tag.patch b/debian/patches/bad_tag.patch
new file mode 100644
index 0000000..0a32f56
--- /dev/null
+++ b/debian/patches/bad_tag.patch
@@ -0,0 +1,105 @@
+Index: boinc/lib/gui_rpc_client_ops.cpp
+===================================================================
+--- boinc.orig/lib/gui_rpc_client_ops.cpp 2012-01-14 23:16:05.000000000 +0100
++++ boinc/lib/gui_rpc_client_ops.cpp 2012-01-15 00:56:00.000000000 +0100
+@@ -1871,19 +1871,19 @@
+
+ retval = rpc.do_rpc(buf);
+ if (!retval) {
+- while (rpc.fin.fgets(buf, 256)) {
+- if (match_tag(buf, "</msgs>")) {
++ while (!rpc.xp.get_tag()) {
++ if (rpc.xp.match_tag("/msgs")) {
+ return 0;
+ }
+- if (match_tag(buf, "<msg>")) {
++ if (rpc.xp.match_tag("msg")) {
+ MESSAGE* message = new MESSAGE();
+ message->parse(rpc.xp);
+ msgs.messages.push_back(message);
+ continue;
+ }
+- if (match_tag(buf, "<boinc_gui_rpc_reply>")) continue;
+- if (match_tag(buf, "<msgs>")) continue;
+- fprintf(stderr, "bad tag %s\n", buf);
++ if (rpc.xp.match_tag("boinc_gui_rpc_reply")) continue;
++ if (rpc.xp.match_tag("msgs")) continue;
++ //fprintf(stderr, "bad tag '%s'\n", buf);
+ }
+ }
+ return retval;
+Index: boinc/lib/parse.cpp
+===================================================================
+--- boinc.orig/lib/parse.cpp 2012-01-14 23:16:05.000000000 +0100
++++ boinc/lib/parse.cpp 2012-01-15 00:51:23.000000000 +0100
+@@ -90,7 +90,6 @@
+ // Use "<tag", not "<tag>", if there might be attributes
+ //
+ bool parse_str(const char* buf, const char* tag, char* dest, int destlen) {
+- string str;
+ const char* p;
+ int len;
+
+Index: boinc/lib/str_util.cpp
+===================================================================
+--- boinc.orig/lib/str_util.cpp 2012-01-14 23:16:05.000000000 +0100
++++ boinc/lib/str_util.cpp 2012-01-15 00:51:23.000000000 +0100
+@@ -312,37 +312,40 @@
+ // remove whitespace from start and end of a string
+ //
+ void strip_whitespace(char *str) {
+- int n;
++
++ char *s=str;
+ while (1) {
+- if (!str[0]) break;
+- if (!isascii(str[0])) break;
+- if (!isspace(str[0])) break;
+- strcpy_overlap(str, str+1);
++ if (! *s) break;
++ if (!isascii(*s)) break;
++ if (!isspace(*s)) break;
++ s++;
+ }
+- while (1) {
+- n = (int)strlen(str);
+- if (n == 0) break;
+- if (!isascii(str[n-1])) break;
+- if (!isspace(str[n-1])) break;
+- str[n-1] = 0;
++ if (s != str) strcpy_overlap(str, s);
++
++ int n=strlen(str);
++ while(n>0) {
++ n--;
++ if (!isascii(str[n])) break;
++ if (!isspace(str[n])) break;
++ str[n] = 0;
+ }
+ }
+
+ void strip_whitespace(string& str) {
+- int n;
+ while (1) {
+ if (str.length() == 0) break;
+ if (!isascii(str[0])) break;
+ if (!isspace(str[0])) break;
+ str.erase(0, 1);
+ }
+- while (1) {
+- n = (int)str.length();
+- if (n == 0) break;
+- if (!isascii(str[n-1])) break;
+- if (!isspace(str[n-1])) break;
+- str.erase(n-1, 1);
++
++ int n = (int) str.length();
++ while (n>0) {
++ n--;
++ if (!isascii(str[n])) break;
++ if (!isspace(str[n])) break;
+ }
++ str.erase(n, str.length()-n);
+ }
+
+ char* time_to_string(double t) {
diff --git a/debian/patches/series b/debian/patches/series
index 20b8ef0..5f829ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+bad_tag.patch
stripchart_debian.patch
upstream_sztaki_configureEval.patch
generate_less.patch
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list