[135276] trunk/dports/net/curl

[ryandesign at macports.org]

Revision: 135276
          https://trac.macports.org/changeset/135276
Author:   ryandesign at macports.org
Date:     2015-04-21 15:07:52 -0700 (Tue, 21 Apr 2015)
Log Message:
-----------
curl-ca-bundle: update to aa275ad846f1 / 2015-04-20 (#38972)

Modified Paths:
--------------
    trunk/dports/net/curl/Portfile
    trunk/dports/net/curl/files/patch-no-autodownload.diff

Modified: trunk/dports/net/curl/Portfile
===================================================================
--- trunk/dports/net/curl/Portfile	2015-04-21 20:36:40 UTC (rev 135275)
+++ trunk/dports/net/curl/Portfile	2015-04-21 22:07:52 UTC (rev 135276)
@@ -177,7 +177,7 @@
 }
 
 subport curl-ca-bundle {
-    revision                    0
+    revision                    1
     categories                  net
     license                     {MPL-2 LGPL-2.1+}
     supported_archs             noarch
@@ -193,37 +193,24 @@
     depends_build               path:bin/perl:perl5
 
     set certdata_file           certdata.txt
-    set certdata_version        1.87
-    set certdata_date           2012-12-29
-    set certdata_distfile       certdata-${certdata_version}.txt
+    set certdata_version        aa275ad846f1
+    set certdata_distfile       certdata-${certdata_version}${extract.suffix}
     set certdata_path           security/nss/lib/ckfw/builtins/${certdata_file}
+    set curl_distfile           ${distfiles}
 
-    # Set this to the UTC date when an update to certdata.txt is committed.
-    set commit_date_utc         2013-01-11
+    master_sites-append         http://hg.mozilla.org/mozilla-central/archive/${certdata_version}${extract.suffix}/${certdata_path}?dummy=:certdata
 
-    # Avoid most of the checksum errors that inevitably occur whenever upstream
-    # updates certdata.txt by only using the upstream site on the day the latest
-    # update is committed. After that time, use only our mirrors, which should
-    # have copied the file by then. The success of this strategy relies on
-    # upstream not updating the file again on that day.
-    set days_since_commit [expr {[expr {[clock seconds] - [clock format [clock scan ${commit_date_utc} -gmt yes] -format %s]}] / 86400}]
-    if {${days_since_commit} > 0} {
-        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
-    }
-
-    extract.only                ${distfiles}
-    extract.post_args-append    ${worksrcdir}/Makefile ${worksrcdir}/lib/mk-ca-bundle.pl
-
     distfiles-append            ${certdata_distfile}:certdata
 
     checksums-append            ${certdata_distfile} \
-                                rmd160  bc21321abe4cf27418880c4ce8e6ebd329df82a1 \
-                                sha256  5b28c27582f302c4bf34ddb114266e143d6d685a688357651be9c9db000d822d
+                                rmd160  f31c4981fcf494e85f5c20b9ad974bcd7a0f9ecd \
+                                sha256  becbc5a523c782610822375f81d533108a8f2957792bbebab52b36c655505231
 
+    extract.only                ${certdata_distfile}
+
     post-extract {
-        xinstall ${distpath}/${certdata_distfile} ${worksrcpath}/${certdata_file}
+        system -W ${workpath} "${extract.cmd} ${extract.pre_args} '${distpath}/${curl_distfile}' ${extract.post_args} ${worksrcdir}/Makefile ${worksrcdir}/lib/mk-ca-bundle.pl"
+        move ${workpath}/mozilla-central-${certdata_version}/${certdata_path} ${worksrcpath}/${certdata_file}
     }
 
     patchfiles                  patch-no-autodownload.diff
@@ -240,8 +227,8 @@
         ln -s ${ca_bundle_dir}/curl-ca-bundle.crt ${destroot}${openssl_dir}/cert.pem
     }
 
-    livecheck.type              regex
-    livecheck.url               http://bonsai.mozilla.org/cvsquery.cgi?file=mozilla/${certdata_path}&date=explicit&mindate=${certdata_date}
+    livecheck.type              regexm
+    livecheck.url               http://hg.mozilla.org/mozilla-central/log/tip/${certdata_path}
     livecheck.version           ${certdata_version}
-    livecheck.regex             '${certdata_file}','(\[0-9.\]+)'
+    livecheck.regex             {/rev/([0-9a-f]+)"}
 }

Modified: trunk/dports/net/curl/files/patch-no-autodownload.diff
===================================================================
--- trunk/dports/net/curl/files/patch-no-autodownload.diff	2015-04-21 20:36:40 UTC (rev 135275)
+++ trunk/dports/net/curl/files/patch-no-autodownload.diff	2015-04-21 22:07:52 UTC (rev 135276)
@@ -1,6 +1,6 @@
---- Makefile.orig	2011-11-15 13:32:34.000000000 -0600
-+++ Makefile	2011-11-16 21:45:51.000000000 -0600
-@@ -288,7 +288,7 @@
+--- Makefile.orig	2015-02-25 01:37:20.000000000 -0600
++++ Makefile	2015-04-21 17:00:14.000000000 -0500
+@@ -568,7 +568,7 @@
  
  ca-bundle: lib/mk-ca-bundle.pl
  	@echo "generate a fresh ca-bundle.crt"
@@ -9,13 +9,13 @@
  
  ca-firefox: lib/firefox-db2pem.sh
  	@echo "generate a fresh ca-bundle.crt"
---- lib/mk-ca-bundle.pl.orig	2012-04-23 13:52:44.000000000 -0500
-+++ lib/mk-ca-bundle.pl	2012-05-28 15:50:42.000000000 -0500
+--- lib/mk-ca-bundle.pl.orig	2015-02-03 03:51:41.000000000 -0600
++++ lib/mk-ca-bundle.pl	2015-04-21 17:00:14.000000000 -0500
 @@ -32,7 +32,6 @@
  #
  use Getopt::Std;
  use MIME::Base64;
 -use LWP::UserAgent;
  use strict;
- use vars qw($opt_b $opt_h $opt_i $opt_l $opt_n $opt_q $opt_t $opt_u $opt_v);
- 
+ use vars qw($opt_b $opt_d $opt_f $opt_h $opt_i $opt_l $opt_n $opt_p $opt_q $opt_s $opt_t $opt_u $opt_v $opt_w);
+ use List::Util;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150421/42aab34d/attachment.html>