<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4d8880b577bdf0ad1a40a941769fc3553c931d11">https://github.com/macports/macports-ports/commit/4d8880b577bdf0ad1a40a941769fc3553c931d11</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4d8880b curl: Update curl-ca-bundle to 20191017 (98e9a37)
</span>4d8880b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4d8880b577bdf0ad1a40a941769fc3553c931d11
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Nov 19 13:23:06 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> curl: Update curl-ca-bundle to 20191017 (98e9a37)
</span>---
net/curl/Portfile | 50 ++++++++++++++++++++++++++++----------------------
1 file changed, 28 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/Portfile b/net/curl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9653a30..b2b9a05 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,7 +206,7 @@ if {${name} eq ${subport}} {
</span> }
subport curl-ca-bundle {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> categories net
license {MPL-2 LGPL-2.1+}
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -219,23 +219,30 @@ subport curl-ca-bundle {
</span> (CA certs) which curl (when linked with OpenSSL) uses to \
verify the authenticity of secure web and FTP servers.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_extract-append bin:bzip2:bzip2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract-append bin:unzip:unzip
</span>
depends_build path:bin/perl:perl5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The approximate time (in seconds since the epoch) when the port maintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # updated the certdata.txt file in this port. (The output of "date +%s".)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set certdata_updated 1574190310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The upstream commit in which certdata.txt was last updated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set certdata_commit 98e9a37281b04dd410b4c41f63ec33a3b35a6172
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The date (in YYYYMMDD format) that commit was pushed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set certdata_date 20191017
</span> set certdata_file certdata.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # The output of the Tcl command "clock seconds" (you can run it in tclsh) when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the certdata.txt file in the port was last updated.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set certdata_updated 1559870717
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set certdata_version 3709f100f264
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set certdata_extract_cmd bzip2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set certdata_extract_suffix .tar.bz2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set certdata_distfile certdata-${certdata_version}${certdata_extract_suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Using tar.bz2 would be preferable because it's smaller but upstream has
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # disabled the creation of all but zip archives:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1596135
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set certdata_extract_suffix .zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set certdata_distfile certdata-${certdata_date}-${certdata_commit}${certdata_extract_suffix}
</span> set certdata_path security/nss/lib/ckfw/builtins/${certdata_file}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Only try to fetch from the master site shortly after the port is updated, to guard against stealth updates.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[clock seconds] - ${certdata_updated} < 604800} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites-append https://hg.mozilla.org/mozilla-central/archive/${certdata_version}${certdata_extract_suffix}/${certdata_path}?dummy=:certdata
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Only try to fetch from upstream shortly after the port is updated,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to reduce load on their server:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1596135
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[clock seconds] - ${certdata_updated} < 86400} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites-append https://hg.mozilla.org/mozilla-central/archive/${certdata_commit}${certdata_extract_suffix}/${certdata_path}?dummy=:certdata
</span> } else {
master_sites-append macports_distfiles::certdata
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -243,18 +250,17 @@ subport curl-ca-bundle {
</span> distfiles-append ${certdata_distfile}:certdata
checksums-append ${certdata_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4f198d012501659d460f8fca9e17fabfd3b80a1c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9126c48a0b071abf105cabc1a20984b8b6480b4e9a6a719dd88c933b0c03542c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 195136
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ce836d9f5be9a320f2ac5baa5e97e818fc4a83b0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8711d4d81de6568b2aa984b23af73aaebcaa4ae3c8fa309f48681f4814764069 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 255408
</span>
extract.only ${curl_distfile}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set curl_mk_ca_bundle_files "${worksrcdir}/Makefile ${worksrcdir}/lib/mk-ca-bundle.pl"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.post_args-append {*}${curl_mk_ca_bundle_files}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.post_args-append ${worksrcdir}/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcdir}/lib/mk-ca-bundle.pl
</span>
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.post_args-delete {*}${curl_mk_ca_bundle_files}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath} "${certdata_extract_cmd} ${extract.pre_args} '${distpath}/${certdata_distfile}' ${extract.post_args}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${workpath}/mozilla-central-${certdata_version}/${certdata_path} ${worksrcpath}/${certdata_file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} "unzip -q -a '${distpath}/${certdata_distfile}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${workpath}/mozilla-central-${certdata_commit}/${certdata_path} ${worksrcpath}/${certdata_file}
</span> }
patchfiles patch-no-autodownload.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -272,7 +278,7 @@ subport curl-ca-bundle {
</span> }
livecheck.type regexm
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url https://hg.mozilla.org/mozilla-central/log/tip/${certdata_path}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.version ${certdata_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url https://hg.mozilla.org/mozilla-central/log/default/${certdata_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.version ${certdata_commit}
</span> livecheck.regex {/rev/([0-9a-f]+)"}
}
</pre><pre style='margin:0'>
</pre>