# HG changeset patch # User Aleksej Bobylev # Date 1468262091 -10800 # Node ID cfa2c2f63692473fbce4f68c4842b5ae3dcad267 # Parent 71a4fbe8c66611d62dc00ca30eaeab124b416b24 Up cacerts (20160512) diff -r 71a4fbe8c666 -r cfa2c2f63692 cacerts/receipt --- a/cacerts/receipt Sun Jul 10 21:39:08 2016 +0300 +++ b/cacerts/receipt Mon Jul 11 21:34:51 2016 +0300 @@ -1,26 +1,25 @@ # SliTaz package receipt. PACKAGE="cacerts" -VERSION="20150429" +VERSION="20160512" CATEGORY="security" SHORT_DESC="Certificate Authority Certificates" MAINTAINER="al.bobylev@gmail.com" LICENSE="MPL2" WEB_SITE="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/cacerts.html" TARBALL="$PACKAGE-$VERSION.txt" -#WGET_URL="http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1" -WGET_URL="http://anduin.linuxfromscratch.org/sources/other/certdata.txt" +#WGET_URL="https://hg.mozilla.org/releases/mozilla-release/file/default/security/nss/lib/ckfw/builtins/certdata.txt" +WGET_URL="http://anduin.linuxfromscratch.org/BLFS/other/certdata.txt" HOST_ARCH="any" DEPENDS="openssl" -BUILD_DEPENDS="openssl" +BUILD_DEPENDS="openssl locale-en" # Rules to configure and make the package. compile_rules() { - mv -f *.txt certdata.txt && - patch -p1 < $stuff/remove_cnnic.patch && - cp -a $stuff/* $src && + mv -f *.txt certdata.txt + cp -a $stuff/* $src ./make-ca.sh && ./remove-expired-certs.sh $src/certs } @@ -31,19 +30,27 @@ mkdir -p $fs/etc/ssl/certs cp -a $src/certs/*.pem $fs/etc/ssl/certs cp -a $src/ca-bundle.crt $fs/etc/ssl + ln -s ../ca-bundle.crt $fs/etc/ssl/certs/ca-certificates.crt } post_install() { case "$1" in - /cross*) return + /cross*) return esac - echo "Rehash certificates:" + # Keep silence, for example, when installed on cook as build dependency + if [ -z "$quiet" ]; then + echo "Rehash certificates:" + out='&1' + else + out='/dev/null' + fi + if [ -d "$1/$INSTALLED/perl" ]; then - chroot "$1/" c_rehash + chroot "$1/" c_rehash >$out else tazpkg -gi microperl --root="${1:-/}" - chroot "$1/" microperl /usr/bin/c_rehash + chroot "$1/" microperl /usr/bin/c_rehash >$out fi } diff -r 71a4fbe8c666 -r cfa2c2f63692 cacerts/stuff/make-ca.sh --- a/cacerts/stuff/make-ca.sh Sun Jul 10 21:39:08 2016 +0300 +++ b/cacerts/stuff/make-ca.sh Mon Jul 11 21:34:51 2016 +0300 @@ -10,6 +10,9 @@ # # Version 20120211 +# Some data in the certs have UTF-8 characters +export LANG=en_US.utf8 + certdata="certdata.txt" if [ ! -r $certdata ]; then