ca-certificates: update to 20210119+3.68

This commit is contained in:
Đoàn Trần Công Danh 2021-07-16 23:41:15 +07:00 committed by Đoàn Trần Công Danh
parent 49592dc2aa
commit e18333cb8f
3 changed files with 39 additions and 19 deletions

View file

@ -0,0 +1,17 @@
--- ca-certificates-20210119+3.67.orig/work/mozilla/Makefile
+++ ca-certificates-20210119+3.67/work/mozilla/Makefile
@@ -2,8 +2,12 @@
# Makefile
#
-all:
- python3 certdata2pem.py
+certdata2pem: certdata2pem.c
+ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $^ -o $@
+
+all: certdata2pem
+ ./certdata2pem
+ ./remove-expired-certs.sh
clean:
-rm -f *.crt

View file

@ -1,5 +1,5 @@
--- a/sbin/update-ca-certificates 2015-05-29 11:09:43.922158838 +0200 --- a/work/sbin/update-ca-certificates 2015-05-29 11:09:43.922158838 +0200
+++ b/sbin/update-ca-certificates 2015-05-29 11:10:06.842632933 +0200 +++ b/work/sbin/update-ca-certificates 2015-05-29 11:10:06.842632933 +0200
@@ -24,12 +24,12 @@ @@ -24,12 +24,12 @@
verbose=0 verbose=0
fresh=0 fresh=0

View file

@ -1,26 +1,28 @@
# Template file for 'ca-certificates' # Template file for 'ca-certificates'
pkgname=ca-certificates pkgname=ca-certificates
version=20210119 version=20210119+3.68
revision=2 revision=1
_nss_version=${version#*+}
bootstrap=yes bootstrap=yes
conf_files="/etc/ca-certificates.conf" conf_files="/etc/ca-certificates.conf"
wrksrc="work" create_wrksrc=yes
build_wrksrc="work"
hostmakedepends="openssl" hostmakedepends="openssl"
depends="openssl<=2.0_1 run-parts" depends="openssl<=2.0_1 run-parts"
short_desc="Common CA certificates for SSL/TLS" short_desc="Common CA certificates for SSL/TLS from Mozilla"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, MPL-2.0" license="GPL-2.0-or-later, MPL-2.0"
homepage="https://tracker.debian.org/pkg/ca-certificates" homepage="https://wiki.mozilla.org/NSS:Root_certs"
distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version}.tar.xz" distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version%+*}.tar.xz
checksum=daa3afae563711c30a0586ddae4336e8e3974c2b627faaca404c4e0141b64665 ${MOZILLA_SITE}/security/nss/releases/NSS_${_nss_version//\./_}_RTM/src/nss-${_nss_version}.tar.gz"
checksum="daa3afae563711c30a0586ddae4336e8e3974c2b627faaca404c4e0141b64665
c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b"
post_extract() { post_extract() {
$BUILD_CC $BUILD_CFLAGS ${FILESDIR}/certdata2pem.c -o ${wrksrc}/mozilla/certdata2pem cp ${FILESDIR}/* $build_wrksrc/mozilla
cp ${FILESDIR}/remove-expired-certs.sh ${wrksrc}/mozilla cp nss-${_nss_version}/nss/lib/ckfw/builtins/certdata.txt \
vsed -i ${wrksrc}/mozilla/Makefile \ nss-${_nss_version}/nss/lib/ckfw/builtins/nssckbi.h \
-e 's,python3 certdata2pem.py,./certdata2pem,g' $build_wrksrc/mozilla
vsed -i ${wrksrc}/mozilla/Makefile \
-e "s;\(.*\)\(certdata2pem.*\);\1\2\n\1./remove-expired-certs.sh;"
} }
do_build() { do_build() {
@ -28,15 +30,16 @@ do_build() {
} }
do_install() { do_install() {
# Cleanup previous run failure
rm -f ${DESTDIR}/usr/sbin
vmkdir usr/share/${pkgname} vmkdir usr/share/${pkgname}
vmkdir usr/bin vmkdir usr/bin
vmkdir usr/sbin ln -s bin ${DESTDIR}/usr/sbin
vmkdir etc/ssl/certs vmkdir etc/ssl/certs
make install DESTDIR=${DESTDIR} make install DESTDIR=${DESTDIR}
install -Dm644 sbin/update-ca-certificates.8 \ rm -f ${DESTDIR}/usr/sbin
${DESTDIR}/usr/share/man/man8/update-ca-certificates.8 vman sbin/update-ca-certificates.8
cd ${DESTDIR}/usr/share/ca-certificates cd ${DESTDIR}/usr/share/ca-certificates
find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
} }