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

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit f9acab62f4463bc64ea1bef17835e0729c1921f9
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jun 12 23:50:01 2011 +0200

    Target of patch has moved.

diff --git a/sztaki_failed_patches/server_status.patch b/sztaki_failed_patches/server_status.patch
new file mode 100644
index 0000000..35c5c82
--- /dev/null
+++ b/sztaki_failed_patches/server_status.patch
@@ -0,0 +1,70 @@
+--- boinc-server-6.11.0+r18946.orig/html/ops/sample_server_status.php
++++ boinc-server-6.11.0+r18946/html/ops/sample_server_status.php
+@@ -85,7 +85,7 @@
+ //
+ function daemon_status($host, $pidname, $progname, $disabled) {
+     global $ssh_exe, $ps_exe, $project_host;
+-    $path = "../../pid_$host/$pidname.pid";
++    $path = project_path("pid_$host/$pidname.pid");
+     $running = 0;
+     if (is_file($path)) {
+         $pid = file_get_contents($path);
+@@ -171,7 +171,7 @@
+ }
+ $uldl_pid = parse_element($config_vars,"<uldl_pid>");
+ if ($uldl_pid == "") {
+-    $uldl_pid = "/etc/httpd/run/httpd.pid";
++    $uldl_pid = "/var/run/apache2.pid";
+ }
+ $uldl_host = parse_element($config_vars,"<uldl_host>");
+ if ($uldl_host == "") {
+@@ -186,18 +186,11 @@
+     $ps_exe = "/bin/ps";
+ }
+ 
+-$version = null;
+-if (file_exists("../../local.revision")) {
+-    $version = trim(file_get_contents("../../local.revision"));
+-}
+ $now = time();
+ 
+ $xmlstring = "<server_status>
+   <update_time>$now</update_time>
+ ";
+-if ($version) {
+-    $xmlstring .= "<software_version>$version</software_version>\n";
+-}
+ $xmlstring .= "  <daemon_status>\n";
+ if ($xml) {
+     xml_header();
+@@ -207,9 +200,6 @@
+         fwrite($xmloutfile,$xmlstring);
+     }
+     page_head("Server status page");
+-    if ($version) {
+-        echo "Server software version: $version<p>\n";
+-    }
+     echo time_str(time()), "
+         <table width=100%>
+         <tr>
+@@ -225,9 +215,7 @@
+ // otherwise it will be already set to 1 for "enabled."
+ // Set $www_host to the name of server hosting WWW site.
+ //
+-$web_running = !file_exists("../../stop_web");
+-if ($web_running == 0) $web_running = -1;
+-show_status($www_host, "data-driven web pages", $web_running);
++show_status($www_host, "data-driven web pages", !web_stopped());
+ 
+ // Check for httpd.pid file of upload/download server.
+ //
+@@ -235,8 +223,7 @@
+ if ($uldl_running == 0) $uldl_running = -1;
+ show_status($uldl_host, "upload/download server", $uldl_running);
+ 
+-$sched_running = !file_exists("../../stop_sched");
+-show_status($sched_host, "scheduler", $sched_running);
++show_status($sched_host, "scheduler", !sched_stopped());
+ 
+ // parse through config.xml to get all daemons running
+ //

-- 
BOINC packaging