From 6285969149c68f8d24c718fc216ac7dacc568550 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 13 Jul 2007 17:25:47 +0000 Subject: [PATCH] - client: if CA bundle file isn't in BOINC directory, don't tell Curl to look for it there. It might be in the default place where Curl looks. svn path=/trunk/boinc/; revision=13150 --- checkin_notes | 11 +++++++++++ client/file_names.h | 1 + client/http_curl.C | 8 +++++++- doc/boinc_news.php | 7 +++++++ doc/download.php | 18 ++++++++++++------ doc/download_all.php | 12 +----------- doc/linux.php | 23 ----------------------- doc/linuxx64.php | 29 ----------------------------- doc/versions.inc | 2 -- html/inc/stats_sites.inc | 2 +- 10 files changed, 40 insertions(+), 73 deletions(-) delete mode 100644 doc/linux.php delete mode 100644 doc/linuxx64.php diff --git a/checkin_notes b/checkin_notes index 1472d6d28d..1433db441b 100755 --- a/checkin_notes +++ b/checkin_notes @@ -7224,3 +7224,14 @@ David 12 July 2007 client/ sim.C,h + +David 13 July 2007 + - client: if CA bundle file isn't in BOINC directory, + don't tell Curl to look for it there. + It might be in the default place where Curl looks. + + client/ + file_names.h + http_curl.C + html/inc + stats_sites.inc diff --git a/client/file_names.h b/client/file_names.h index 1d97d0fa99..a746b96f53 100644 --- a/client/file_names.h +++ b/client/file_names.h @@ -88,5 +88,6 @@ extern void send_log_after(const char* filename, double t, MIOFILE& mf); #define SETPROJECTGRP_FILE_NAME "setprojectgrp" #define TIME_STATS_LOG "time_stats_log" #define JOB_LOG_BASE "job_log_" +#define CA_BUNDLE_FILENAME "ca-bundle.crt" #endif diff --git a/client/http_curl.C b/client/http_curl.C index bf8013eb88..4e272fd664 100644 --- a/client/http_curl.C +++ b/client/http_curl.C @@ -314,7 +314,13 @@ The checking this option controls is of the identity that the server claims. The curlErr = curl_easy_setopt(curlEasy, CURLOPT_SSL_VERIFYPEER, 1L); // if the above is nonzero, you need the following: - curlErr = curl_easy_setopt(curlEasy, CURLOPT_CAINFO, "ca-bundle.crt"); + // + if (boinc_file_exists(CA_BUNDLE_FILENAME)) { + // call this only if a local copy of ca-bundle.crt exists; + // otherwise, let's hope that it exists in the default place + // + curlErr = curl_easy_setopt(curlEasy, CURLOPT_CAINFO, CA_BUNDLE_FILENAME); + } // set the user agent as this boinc client & version curlErr = curl_easy_setopt(curlEasy, CURLOPT_USERAGENT, g_user_agent_string); diff --git a/doc/boinc_news.php b/doc/boinc_news.php index 5a6df74028..92909b84ce 100644 --- a/doc/boinc_news.php +++ b/doc/boinc_news.php @@ -1,6 +1,13 @@ Leiden Classical + is using BOINC for education - it provides a + + high-performance computing resource for + students of Theoretical Chemistry at Leiden University." +), array("July 10, 2007", " A growing number of 'skins' for the BOINC simple GUI are available diff --git a/doc/download.php b/doc/download.php index 7404e061c6..c9ed9d6a30 100755 --- a/doc/download.php +++ b/doc/download.php @@ -43,9 +43,15 @@ function download_link($pname) { echo "

Note: BOINC may be available as a package for - for your particular Linux distribution - (Gentoo, Fedora, Debian, Ubuntu); - check this first before downloading from this page. + for your particular Linux distribution. + Check this first before downloading from this page. + Example package names: +

"; } } @@ -112,9 +118,9 @@ function show_download($pname) { } echo "

- ".tr(DL_SYSTEMREQ)." - | ".tr(DL_RELNOTES)." - | ".tr(DL_TROUBLE)." + ".tr(DL_SYSTEMREQ)." + | ".tr(DL_RELNOTES)." + | ".tr(DL_TROUBLE)." "; if ($pname) { //echo " | ".tr(DL_OTHERSYS)." diff --git a/doc/download_all.php b/doc/download_all.php index 67a8b1e901..7a90876496 100755 --- a/doc/download_all.php +++ b/doc/download_all.php @@ -23,9 +23,7 @@ $type_name = $_GET["type"]; require_once("versions.inc"); -if ($dev) { - $url_base = "dl/"; -} +//$url_base = "dl/"; function dl_item($x, $y) { global $light_blue; @@ -198,14 +196,6 @@ if ($xml) { } else { page_head("Download BOINC client software"); echo " - We are now using mirrored download servers at partner institutions. - Your download will come from a randomly-chosen server. - Thanks to these partners for their help. - If you have trouble downloading a file, - please reload this page in your browser and try again. - This will link to a different download mirror and may - fix the problem. -

"; foreach($platforms as $short_name=>$p) { diff --git a/doc/linux.php b/doc/linux.php deleted file mode 100644 index 3d12e4f4ea..0000000000 --- a/doc/linux.php +++ /dev/null @@ -1,23 +0,0 @@ - -
  • Any Linux version 2.0 or greater with libc version 2.2 or greater. -(If BOINC produces the error message -
    -boinc_client: /lib/libc.so.6: version `GLIBC_2.2' not found (required by ./boinc_client)
-
    -then you need to install a newer version of libc.) - -
  • Any Intel x86-compatible processor. - -"; - -page_tail(); -?> diff --git a/doc/linuxx64.php b/doc/linuxx64.php deleted file mode 100644 index 6e57226787..0000000000 --- a/doc/linuxx64.php +++ /dev/null @@ -1,29 +0,0 @@ - -
  • Most x64 based distros. - - -

    -Note: 32-bit binaries don't just work on every 64-bit Linux. -

    -If for example you install a fresh Ubuntu 6.10 or 7.04, 32-bit binaries won't work. -They are not even recognized as valid executables. You first have to install the ia32 -package and dependent packages. -

    -Further, for programs that link with the graphic library, you will manually have to -copy a 32-bit libglut library to the usr/lib32 directory. If after this they still get -client errors, tell them to find your exe in the projects directory and run ldd to -see what libraries are missing. -

    -"; - -page_tail(); -?> diff --git a/doc/versions.inc b/doc/versions.inc index 1d2c66bcf9..58d3e024b8 100644 --- a/doc/versions.inc +++ b/doc/versions.inc @@ -686,7 +686,6 @@ $mac = array( $linux = array( "name"=>"Linux/x86", "dbname" => "i686-pc-linux-gnu", - "url"=>"linux.php", "versions"=>array( $l5108, $l5816, @@ -697,7 +696,6 @@ $linux = array( $linuxx64 = array( "name"=>"Linux/x64", "dbname" => "x86_64-pc-linux-gnu", - "url"=>"linuxx64.php", "versions"=>array( $l5108x64, ) diff --git a/html/inc/stats_sites.inc b/html/inc/stats_sites.inc index c30f8491e3..a9a34b2ca0 100644 --- a/html/inc/stats_sites.inc +++ b/html/inc/stats_sites.inc @@ -99,7 +99,7 @@ $team_stats_sites = array( $sig_sites = array( array( "http://brainsmashr.com/BOINC/", - "boincwapstats", + "BrainSmashR.com boincwapstats", "Boincwapstats retrieves real-time BOINC statistics data and creates signature pictures out of it. You can select the background, style, data, etc.