Revision: 90121 http://trac.macports.org/changeset/90121 Author: ryandesign@macports.org Date: 2012-02-22 07:24:52 -0800 (Wed, 22 Feb 2012) Log Message: ----------- curl-ca-bundle: update certdata.txt to 1.82 and also install a symlink for openssl (#19247) Modified Paths: -------------- trunk/dports/net/curl-ca-bundle/Portfile Modified: trunk/dports/net/curl-ca-bundle/Portfile =================================================================== --- trunk/dports/net/curl-ca-bundle/Portfile 2012-02-22 14:20:36 UTC (rev 90120) +++ trunk/dports/net/curl-ca-bundle/Portfile 2012-02-22 15:24:52 UTC (rev 90121) @@ -6,6 +6,7 @@ name curl-ca-bundle # keep the version in sync with the curl port version 7.24.0 +revision 1 set curl_name curl categories net license {MPL-1.1 LGPL-2.1+ GPL-2+} @@ -21,8 +22,8 @@ dist_subdir ${curl_name} set curl_source ${distname}${extract.suffix} set certdata_file certdata.txt -set certdata_version 1.81 -set certdata_date 2012-01-17 +set certdata_version 1.82 +set certdata_date 2012-02-18 set certdata_distfile certdata-${certdata_version}.txt set certdata_path security/nss/lib/ckfw/builtins/${certdata_file} build.target ca-bundle @@ -50,7 +51,7 @@ # 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} > 3} { +if {${days_since_update} > 4} { 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 @@ -64,8 +65,8 @@ rmd160 b2b3116318813478b4683ae479cb889c4fc05cea \ sha256 ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01812c16 \ ${certdata_distfile} \ - rmd160 621f297487026817d56e2685c9494470ea4c8808 \ - sha256 92a98d43ad4f2f98747de5f195cc2790c710458d629524f2b46174d65c96d17f + rmd160 b3bc4bdb6ac212165dfb7616de33015c368a92c9 \ + sha256 9467dceae5024931062b0caa0e71275cb20e806168d1b690c7fef054aa2844ec depends_build \ path:bin/perl:perl5 @@ -78,9 +79,11 @@ } destroot { - set ca_bundle_dir ${destroot}${prefix}/share/curl - xinstall -d ${ca_bundle_dir} - xinstall -m 644 ${worksrcpath}/lib/ca-bundle.crt ${ca_bundle_dir}/curl-ca-bundle.crt + set ca_bundle_dir ${prefix}/share/curl + set openssl_dir ${prefix}/etc/openssl + xinstall -d ${destroot}${ca_bundle_dir} ${destroot}${openssl_dir} + xinstall -m 644 ${worksrcpath}/lib/ca-bundle.crt ${destroot}${ca_bundle_dir}/curl-ca-bundle.crt + ln -s ${ca_bundle_dir}/curl-ca-bundle.crt ${destroot}${openssl_dir}/cert.pem } livecheck.type regex