wok-6.x rev 19310

Up cacerts (20160512)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Jul 11 21:34:51 2016 +0300 (2016-07-11)
parents 71a4fbe8c666
children 8aad009a4685
files cacerts/receipt cacerts/stuff/make-ca.sh
line diff
     1.1 --- a/cacerts/receipt	Sun Jul 10 21:39:08 2016 +0300
     1.2 +++ b/cacerts/receipt	Mon Jul 11 21:34:51 2016 +0300
     1.3 @@ -1,26 +1,25 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="cacerts"
     1.7 -VERSION="20150429"
     1.8 +VERSION="20160512"
     1.9  CATEGORY="security"
    1.10  SHORT_DESC="Certificate Authority Certificates"
    1.11  MAINTAINER="al.bobylev@gmail.com"
    1.12  LICENSE="MPL2"
    1.13  WEB_SITE="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/cacerts.html"
    1.14  TARBALL="$PACKAGE-$VERSION.txt"
    1.15 -#WGET_URL="http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1"
    1.16 -WGET_URL="http://anduin.linuxfromscratch.org/sources/other/certdata.txt"
    1.17 +#WGET_URL="https://hg.mozilla.org/releases/mozilla-release/file/default/security/nss/lib/ckfw/builtins/certdata.txt"
    1.18 +WGET_URL="http://anduin.linuxfromscratch.org/BLFS/other/certdata.txt"
    1.19  HOST_ARCH="any"
    1.20  
    1.21  DEPENDS="openssl"
    1.22 -BUILD_DEPENDS="openssl"
    1.23 +BUILD_DEPENDS="openssl locale-en"
    1.24  
    1.25  # Rules to configure and make the package.
    1.26  compile_rules()
    1.27  {
    1.28 -	mv -f *.txt certdata.txt &&
    1.29 -	patch -p1 < $stuff/remove_cnnic.patch &&
    1.30 -	cp -a $stuff/* $src &&
    1.31 +	mv -f *.txt certdata.txt
    1.32 +	cp -a $stuff/* $src
    1.33  	./make-ca.sh &&
    1.34  	./remove-expired-certs.sh $src/certs
    1.35  }
    1.36 @@ -31,19 +30,27 @@
    1.37  	mkdir -p $fs/etc/ssl/certs
    1.38  	cp -a $src/certs/*.pem $fs/etc/ssl/certs
    1.39  	cp -a $src/ca-bundle.crt $fs/etc/ssl
    1.40 +	ln -s ../ca-bundle.crt $fs/etc/ssl/certs/ca-certificates.crt
    1.41  }
    1.42  
    1.43  post_install()
    1.44  {
    1.45  	case "$1" in
    1.46 -	/cross*) return
    1.47 +		/cross*) return
    1.48  	esac
    1.49  
    1.50 -	echo "Rehash certificates:"
    1.51 +	# Keep silence, for example, when installed on cook as build dependency
    1.52 +	if [ -z "$quiet" ]; then
    1.53 +		echo "Rehash certificates:"
    1.54 +		out='&1'
    1.55 +	else
    1.56 +		out='/dev/null'
    1.57 +	fi
    1.58 +
    1.59  	if [ -d "$1/$INSTALLED/perl" ]; then
    1.60 -		chroot "$1/" c_rehash
    1.61 +		chroot "$1/" c_rehash >$out
    1.62  	else
    1.63  		tazpkg -gi microperl --root="${1:-/}"
    1.64 -		chroot "$1/" microperl /usr/bin/c_rehash
    1.65 +		chroot "$1/" microperl /usr/bin/c_rehash >$out
    1.66  	fi
    1.67  }
     2.1 --- a/cacerts/stuff/make-ca.sh	Sun Jul 10 21:39:08 2016 +0300
     2.2 +++ b/cacerts/stuff/make-ca.sh	Mon Jul 11 21:34:51 2016 +0300
     2.3 @@ -10,6 +10,9 @@
     2.4  #
     2.5  # Version 20120211
     2.6  
     2.7 +# Some data in the certs have UTF-8 characters
     2.8 +export LANG=en_US.utf8
     2.9 +
    2.10  certdata="certdata.txt"
    2.11  
    2.12  if [ ! -r $certdata ]; then