[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 018f62a83627249b76adb81d4589fbdc6b7a128e
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jun 12 23:46:15 2011 +0200

    Collecting patches that fail separately.

diff --git a/sztaki_failed_patches/opt_index.patch b/sztaki_failed_patches/opt_index.patch
new file mode 100644
index 0000000..327f880
--- /dev/null
+++ b/sztaki_failed_patches/opt_index.patch
@@ -0,0 +1,84 @@
+--- boinc-server-6.11.0+r18946.orig/html/ops/index.php
++++ boinc-server-6.11.0+r18946/html/ops/index.php
+@@ -19,11 +19,10 @@
+ require_once("../inc/db_ops.inc");
+ require_once("../inc/util_ops.inc");
+ require_once("../inc/uotd.inc");
+-require_once("../project/project.inc");
++require_once(html_path("project/project.inc"));
+ 
+ $config = get_config();
+ $cgi_url = parse_config($config, "<cgi_url>");
+-$stripchart_cgi_url = parse_config($config, "<stripchart_cgi_url>");
+ 
+ db_init();
+ 
+@@ -33,56 +32,6 @@
+ // Notification area
+ echo "<ul>\n";
+ 
+-echo "<li>";
+-if (file_exists("../../local.revision")) {
+-    $local_rev = file_get_contents("../../local.revision");
+-}
+-if ($local_rev) {
+-    echo "Currently used SVN revision: ".$local_rev."; ";
+-}
+-
+-if (file_exists("../cache/remote.revision")
+-    && (time() < filemtime("../cache/remote.revision")+(24*60*60))
+-) {
+-    $remote_rev = file_get_contents("../cache/remote.revision");
+-} else {
+-    // Get latest revision
+-    if (isset($project_http_proxy)) {
+-        $context = stream_context_create(
+-            array(
+-                'http' => array(
+-                    'request_fulluri' => true,
+-                    'proxy' => $project_http_proxy
+-                )
+-            )
+-        );
+-        $handle = fopen("http://boinc.berkeley.edu/svn/", "r", false, $context);
+-    } else {
+-        $handle = fopen("http://boinc.berkeley.edu/svn/", "r");
+-    }
+-    if ($handle) {
+-        $remote = fread($handle, 255);
+-        fclose($handle);
+-        preg_match("/Revision (\d+)/", $remote, $remote_rev);
+-        $remote_rev = $remote_rev[1];
+-
+-        $handle = fopen("../cache/remote.revision", "w");
+-        fwrite($handle, $remote_rev);
+-        fclose($handle);
+-    } else {
+-        echo "Can't get latest SVN revision";
+-    }
+-}
+-
+-if ($remote_rev) {
+-    echo "Latest SVN revision: ".$remote_rev."</li>\n";
+-}
+-
+-if (!file_exists(".htaccess")) {
+-    echo "<li><span style=\"color: #ff0000\">The Project Management directory is not
+-        protected from public access by a .htaccess file.</span></li>\n";
+-}
+-
+ if (!defined("SYS_ADMIN_EMAIL")) {
+     echo "<li><span style=\"color: #ff0000\">The defined constant SYS_ADMIN_EMAIL
+         has not been set. Please edit <tt>project/project.inc</tt> and set this
+@@ -218,9 +167,9 @@
+ // Stripcharts, logs, etc
+ 
+ echo "<div>
+-    <a href=\"$stripchart_cgi_url/stripchart.cgi\">Stripcharts</a>
+-    | <a href=\"show_log.php\">Show/Grep all logs</a>
++    <a href=\"show_log.php\">Show/Grep all logs</a>
+     | <a href=\"show_log.php?f=mysql*.log&l=-20\">Tail MySQL logs</a>
++    | <a href=\"hostinfo.php\">Per-host statistics</a>
+     </div>
+ ";
+ 

-- 
BOINC packaging