[CalendarServer-changes] [5808] CalendarServer/trunk/support/build.sh

[source_changes at macosforge.org]

Revision: 5808
          http://trac.macosforge.org/projects/calendarserver/changeset/5808
Author:   wsanchez at apple.com
Date:     2010-06-24 13:17:02 -0700 (Thu, 24 Jun 2010)
Log Message:
-----------
Fix PyGreSQL URL.  Add coarse MD5 error checking.

Modified Paths:
--------------
    CalendarServer/trunk/support/build.sh

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2010-06-24 00:00:42 UTC (rev 5807)
+++ CalendarServer/trunk/support/build.sh	2010-06-24 20:17:02 UTC (rev 5808)
@@ -158,6 +158,16 @@
 www_get () {
   if ! "${do_get}"; then return 0; fi;
 
+  local md5="";
+
+  OPTIND=1;
+  while getopts "m:" option; do
+    case "${option}" in
+      'm') md5="${OPTARG}"; ;;
+    esac;
+  done;
+  shift $((${OPTIND} - 1));
+
   local name="$1"; shift;
   local path="$1"; shift;
   local  url="$1"; shift;
@@ -187,6 +197,15 @@
 	curl -L "${url}" -o "${cache_file}";
       fi;
 
+      if [ -n "${md5}" ]; then
+	echo "Checking MD5 sum for ${name}...";
+	local sum="$(md5 "${cache_file}" | perl -pe 's|^.*([0-9a-f]{32}).*$|\1|')";
+	if [ "${md5}" != "${sum}" ]; then
+	  echo "ERROR: MD5 sum for cache file ${cache_file} ${sum} != ${md5}. Corrupt file?";
+	  exit 1;
+	fi;
+      fi;
+
       echo "Unpacking ${name} from cache...";
       get () { cat "${cache_file}"; }
     else
@@ -334,9 +353,10 @@
   local revision="0";     # Revision (if svn)
   local get_type="www";   # Protocol to use
   local  version="";      # Minimum version required
+  local   f_hash="";      # Checksum
 
   OPTIND=1;
-  while getopts "ofier:v:" option; do
+  while getopts "ofier:v:m:" option; do
     case "${option}" in
       'o') optional="true"; ;;
       'f') override="true"; ;;
@@ -344,6 +364,7 @@
       'e') skip_egg="true"; ;;
       'r') get_type="svn"; revision="${OPTARG}"; ;;
       'v')  version="-v ${OPTARG}"; ;;
+      'm')   f_hash="-m ${OPTARG}"; ;;
     esac;
   done;
   shift $((${OPTIND} - 1));
@@ -360,7 +381,7 @@
     echo "";
   fi;
   if "${override}" || ! py_have_module ${version} "${module}"; then
-    "${get_type}_get" "${name}" "${srcdir}" "${get_uri}" "${revision}"
+    "${get_type}_get" ${f_hash} "${name}" "${srcdir}" "${get_uri}" "${revision}"
     if "${inplace}"; then
       if "${do_setup}" && "${override}" && ! "${skip_egg}"; then
         echo;
@@ -514,9 +535,9 @@
       "http://pypi.python.org/packages/source/s/select26/select26-0.1a3.tar.gz";
   fi;
 
-  py_dependency -v 4.0 \
+  py_dependency -v 4.0 -m 1aca50e59ff4cc56abe9452a9a49c5ff -o \
     "PyGreSQL" "pgdb" "PyGreSQL-4.0" \
-    "ftp://ftp.pygresql.org/pub/distrib/PyGreSQL.tgz";
+    "http://pypi.python.org/packages/source/P/PyGreSQL/PyGreSQL-4.0.tar.gz";
 
   py_dependency -v 10 -r 28657 \
     "Twisted" "twisted" "Twisted" \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100624/9daa33ae/attachment.html>