<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[135276] trunk/dports/net/curl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/135276">135276</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-04-21 15:07:52 -0700 (Tue, 21 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>curl-ca-bundle: update to aa275ad846f1 / 2015-04-20 (#38972)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetcurlPortfile">trunk/dports/net/curl/Portfile</a></li>
<li><a href="#trunkdportsnetcurlfilespatchnoautodownloaddiff">trunk/dports/net/curl/files/patch-no-autodownload.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetcurlPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/curl/Portfile (135275 => 135276)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport curl-ca-bundle {
</span><del>- revision 0
</del><ins>+ revision 1
</ins><span class="cx"> categories net
</span><span class="cx"> license {MPL-2 LGPL-2.1+}
</span><span class="cx"> supported_archs noarch
</span><span class="lines">@@ -193,37 +193,24 @@
</span><span class="cx"> depends_build path:bin/perl:perl5
</span><span class="cx">
</span><span class="cx"> set certdata_file certdata.txt
</span><del>- set certdata_version 1.87
- set certdata_date 2012-12-29
- set certdata_distfile certdata-${certdata_version}.txt
</del><ins>+ set certdata_version aa275ad846f1
+ set certdata_distfile certdata-${certdata_version}${extract.suffix}
</ins><span class="cx"> set certdata_path security/nss/lib/ckfw/builtins/${certdata_file}
</span><ins>+ set curl_distfile ${distfiles}
</ins><span class="cx">
</span><del>- # Set this to the UTC date when an update to certdata.txt is committed.
- set commit_date_utc 2013-01-11
</del><ins>+ master_sites-append http://hg.mozilla.org/mozilla-central/archive/${certdata_version}${extract.suffix}/${certdata_path}?dummy=:certdata
</ins><span class="cx">
</span><del>- # 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
-
</del><span class="cx"> distfiles-append ${certdata_distfile}:certdata
</span><span class="cx">
</span><span class="cx"> checksums-append ${certdata_distfile} \
</span><del>- rmd160 bc21321abe4cf27418880c4ce8e6ebd329df82a1 \
- sha256 5b28c27582f302c4bf34ddb114266e143d6d685a688357651be9c9db000d822d
</del><ins>+ rmd160 f31c4981fcf494e85f5c20b9ad974bcd7a0f9ecd \
+ sha256 becbc5a523c782610822375f81d533108a8f2957792bbebab52b36c655505231
</ins><span class="cx">
</span><ins>+ extract.only ${certdata_distfile}
+
</ins><span class="cx"> post-extract {
</span><del>- xinstall ${distpath}/${certdata_distfile} ${worksrcpath}/${certdata_file}
</del><ins>+ 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}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> patchfiles patch-no-autodownload.diff
</span><span class="lines">@@ -240,8 +227,8 @@
</span><span class="cx"> ln -s ${ca_bundle_dir}/curl-ca-bundle.crt ${destroot}${openssl_dir}/cert.pem
</span><span class="cx"> }
</span><span class="cx">
</span><del>- livecheck.type regex
- livecheck.url http://bonsai.mozilla.org/cvsquery.cgi?file=mozilla/${certdata_path}&date=explicit&mindate=${certdata_date}
</del><ins>+ livecheck.type regexm
+ livecheck.url http://hg.mozilla.org/mozilla-central/log/tip/${certdata_path}
</ins><span class="cx"> livecheck.version ${certdata_version}
</span><del>- livecheck.regex '${certdata_file}','(\[0-9.\]+)'
</del><ins>+ livecheck.regex {/rev/([0-9a-f]+)"}
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsnetcurlfilespatchnoautodownloaddiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/curl/files/patch-no-autodownload.diff (135275 => 135276)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- Makefile.orig 2011-11-15 13:32:34.000000000 -0600
-+++ Makefile 2011-11-16 21:45:51.000000000 -0600
-@@ -288,7 +288,7 @@
</del><ins>+--- Makefile.orig 2015-02-25 01:37:20.000000000 -0600
++++ Makefile 2015-04-21 17:00:14.000000000 -0500
+@@ -568,7 +568,7 @@
</ins><span class="cx">
</span><span class="cx"> ca-bundle: lib/mk-ca-bundle.pl
</span><span class="cx"> @echo "generate a fresh ca-bundle.crt"
</span><span class="lines">@@ -9,13 +9,13 @@
</span><span class="cx">
</span><span class="cx"> ca-firefox: lib/firefox-db2pem.sh
</span><span class="cx"> @echo "generate a fresh ca-bundle.crt"
</span><del>---- 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
</del><ins>+--- 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
</ins><span class="cx"> @@ -32,7 +32,6 @@
</span><span class="cx"> #
</span><span class="cx"> use Getopt::Std;
</span><span class="cx"> use MIME::Base64;
</span><span class="cx"> -use LWP::UserAgent;
</span><span class="cx"> use strict;
</span><del>- use vars qw($opt_b $opt_h $opt_i $opt_l $opt_n $opt_q $opt_t $opt_u $opt_v);
-
</del><ins>+ 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;
</ins></span></pre>
</div>
</div>
</body>
</html>