[77448] trunk/dports/net

[ryandesign at macports.org]

Revision: 77448
          http://trac.macports.org/changeset/77448
Author:   ryandesign at macports.org
Date:     2011-03-30 22:01:34 -0700 (Wed, 30 Mar 2011)
Log Message:
-----------
curl, curl-ca-bundle: update to curl 7.21.4; remove dead master_sites

curl: fix livecheck

curl-ca-bundle: update to certdata.txt 1.71; attempt to avoid checksum errors due to future upstream updates by only fetching from upstream site within a few days of release

Modified Paths:
--------------
    trunk/dports/net/curl/Portfile
    trunk/dports/net/curl-ca-bundle/Portfile

Modified: trunk/dports/net/curl/Portfile
===================================================================
--- trunk/dports/net/curl/Portfile	2011-03-31 02:49:20 UTC (rev 77447)
+++ trunk/dports/net/curl/Portfile	2011-03-31 05:01:34 UTC (rev 77448)
@@ -7,8 +7,7 @@
 
 name                        curl
 # keep the version in sync with the curl-ca-bundle port
-version                     7.21.2
-revision                    2
+version                     7.21.4
 categories                  net www
 maintainers                 ryandesign
 license                     curl
@@ -27,12 +26,10 @@
 # keep the master_sites in sync with the curl-ca-bundle port
 master_sites                http://curl.haxx.se/download/ \
                             ftp://ftp.sunet.se/pub/www/utilities/curl/ \
-                            http://curl.sourceforge.net/download/ \
-                            http://cool.haxx.se/curl/ \
                             http://www.execve.net/curl/
 
-checksums                   sha1    f729552a905033dbd0d2cf56e40c7048f2d8331e \
-                            rmd160  fcb1302f79741bc3e488fcee1206284f4cb9e6ca
+checksums                   sha1    9cc59be07932b63e1f7d714c56ffaaa92af55373 \
+                            rmd160  c18710206d30a0f1078b2156df25ded30443f7cf
 
 patchfiles                  patch-curl.h.diff
 
@@ -161,5 +158,6 @@
     configure.args-replace  s|--without-libssh2|--with-libssh2|
 }
 
-livecheck.type              freshmeat
-livecheck.regex             (?i)<title>curl and libcurl (.*)</title>
+livecheck.type              regex
+livecheck.url               [lindex ${master_sites} 0]
+livecheck.regex             ${name}-(\[0-9.\]+)${extract.suffix}

Modified: trunk/dports/net/curl-ca-bundle/Portfile
===================================================================
--- trunk/dports/net/curl-ca-bundle/Portfile	2011-03-31 02:49:20 UTC (rev 77447)
+++ trunk/dports/net/curl-ca-bundle/Portfile	2011-03-31 05:01:34 UTC (rev 77448)
@@ -5,8 +5,7 @@
 
 name                    curl-ca-bundle
 # keep the version in sync with the curl port
-version                 7.21.2
-revision                4
+version                 7.21.4
 set curl_name           curl
 categories              net
 maintainers             ryandesign
@@ -20,8 +19,8 @@
 dist_subdir             ${curl_name}
 set curl_source         ${distname}${extract.suffix}
 set certdata_file       certdata.txt
-set certdata_version    1.70
-set certdata_date       2010-12-02
+set certdata_version    1.71
+set certdata_date       2011-03-23
 set certdata_distfile   certdata-${certdata_version}.txt
 set certdata_path       security/nss/lib/ckfw/builtins/${certdata_file}
 build.target            ca-bundle
@@ -40,23 +39,31 @@
 master_sites \
     http://curl.haxx.se/download/ \
     ftp://ftp.sunet.se/pub/www/utilities/curl/ \
-    http://curl.sourceforge.net/download/ \
-    http://cool.haxx.se/curl/ \
-    http://www.execve.net/curl/ \
-    http://distfiles.macports.org/curl/:certdata
-#    http://mxr.mozilla.org/mozilla/source/${certdata_path}?raw=1&dummy=:certdata
+    http://www.execve.net/curl/
 
+# Avoid most of the checksum errors that inevitably occur whenever upstream
+# updates certdata.txt by only using the upstream site if it's within a few
+# days of the latest update. After that time, use only our mirrors, which
+# should have copied the file by then. The success of this strategy relies
+# on me noticing new versions within that time and updating the port, and
+# on upstream not updating the file again within that time.
+set days_since_update [expr {[expr {[clock seconds] - [clock format [clock scan ${certdata_date}] -format %s]}] / 86400}]
+if {${days_since_update} > 9} {
+    master_sites-append http://distfiles.macports.org/curl/:certdata
+} else {
+    master_sites-append http://mxr.mozilla.org/mozilla/source/${certdata_path}?raw=1&dummy=:certdata
+}
+
 distfiles \
     ${curl_source} \
     ${certdata_distfile}:certdata
 
-checksums \
-    ${curl_source} \
-        sha1    f729552a905033dbd0d2cf56e40c7048f2d8331e \
-        rmd160  fcb1302f79741bc3e488fcee1206284f4cb9e6ca \
-    ${certdata_distfile} \
-        sha1    e0a196653087eb5079aab8d3e3359de928cc1ab1 \
-        rmd160  573076c84fe78eef5052fc08c99044428b83d9f8
+checksums                   ${curl_source} \
+                            sha1    9cc59be07932b63e1f7d714c56ffaaa92af55373 \
+                            rmd160  c18710206d30a0f1078b2156df25ded30443f7cf \
+                            ${certdata_distfile} \
+                            sha1    e0a196653087eb5079aab8d3e3359de928cc1ab1 \
+                            rmd160  573076c84fe78eef5052fc08c99044428b83d9f8
 
 depends_build \
     path:bin/perl:perl5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110330/8e104900/attachment.html>