aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorĐoàn Trần Công Danh <congdanhqx@gmail.com>2021-07-16 16:41:15 +0000
committerĐoàn Trần Công Danh <sgn.danh@gmail.com>2021-07-22 14:39:04 +0000
commite18333cb8f65b8ef7c438098e1d4b2165d5fffd2 (patch)
tree79c8ca1751b4c8df9e739afb9fffb478caba1f32
parent49592dc2aaca933b0df2c957a63283f876fde66a (diff)
downloadvoid-packages-e18333cb8f65b8ef7c438098e1d4b2165d5fffd2.tar
void-packages-e18333cb8f65b8ef7c438098e1d4b2165d5fffd2.tar.gz
void-packages-e18333cb8f65b8ef7c438098e1d4b2165d5fffd2.tar.bz2
void-packages-e18333cb8f65b8ef7c438098e1d4b2165d5fffd2.tar.lz
void-packages-e18333cb8f65b8ef7c438098e1d4b2165d5fffd2.tar.xz
void-packages-e18333cb8f65b8ef7c438098e1d4b2165d5fffd2.tar.zst
void-packages-e18333cb8f65b8ef7c438098e1d4b2165d5fffd2.zip
ca-certificates: update to 20210119+3.68
-rw-r--r--srcpkgs/ca-certificates/patches/drop-python-dependency.patch17
-rw-r--r--srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch4
-rw-r--r--srcpkgs/ca-certificates/template37
3 files changed, 39 insertions, 19 deletions
diff --git a/srcpkgs/ca-certificates/patches/drop-python-dependency.patch b/srcpkgs/ca-certificates/patches/drop-python-dependency.patch
new file mode 100644
index 00000000000..4d9140384ba
--- /dev/null
+++ b/srcpkgs/ca-certificates/patches/drop-python-dependency.patch
@@ -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
diff --git a/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch b/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch
index 34008701e30..831708b769f 100644
--- a/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch
+++ b/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch
@@ -1,5 +1,5 @@
---- a/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
+--- a/work/sbin/update-ca-certificates 2015-05-29 11:09:43.922158838 +0200
++++ b/work/sbin/update-ca-certificates 2015-05-29 11:10:06.842632933 +0200
@@ -24,12 +24,12 @@
verbose=0
fresh=0
diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 854e76a613c..6d0c2523882 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,26 +1,28 @@
# Template file for 'ca-certificates'
pkgname=ca-certificates
-version=20210119
-revision=2
+version=20210119+3.68
+revision=1
+_nss_version=${version#*+}
bootstrap=yes
conf_files="/etc/ca-certificates.conf"
-wrksrc="work"
+create_wrksrc=yes
+build_wrksrc="work"
hostmakedepends="openssl"
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>"
license="GPL-2.0-or-later, MPL-2.0"
-homepage="https://tracker.debian.org/pkg/ca-certificates"
-distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version}.tar.xz"
-checksum=daa3afae563711c30a0586ddae4336e8e3974c2b627faaca404c4e0141b64665
+homepage="https://wiki.mozilla.org/NSS:Root_certs"
+distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version%+*}.tar.xz
+ ${MOZILLA_SITE}/security/nss/releases/NSS_${_nss_version//\./_}_RTM/src/nss-${_nss_version}.tar.gz"
+checksum="daa3afae563711c30a0586ddae4336e8e3974c2b627faaca404c4e0141b64665
+ c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b"
post_extract() {
- $BUILD_CC $BUILD_CFLAGS ${FILESDIR}/certdata2pem.c -o ${wrksrc}/mozilla/certdata2pem
- cp ${FILESDIR}/remove-expired-certs.sh ${wrksrc}/mozilla
- vsed -i ${wrksrc}/mozilla/Makefile \
- -e 's,python3 certdata2pem.py,./certdata2pem,g'
- vsed -i ${wrksrc}/mozilla/Makefile \
- -e "s;\(.*\)\(certdata2pem.*\);\1\2\n\1./remove-expired-certs.sh;"
+ cp ${FILESDIR}/* $build_wrksrc/mozilla
+ cp nss-${_nss_version}/nss/lib/ckfw/builtins/certdata.txt \
+ nss-${_nss_version}/nss/lib/ckfw/builtins/nssckbi.h \
+ $build_wrksrc/mozilla
}
do_build() {
@@ -28,15 +30,16 @@ do_build() {
}
do_install() {
+ # Cleanup previous run failure
+ rm -f ${DESTDIR}/usr/sbin
vmkdir usr/share/${pkgname}
vmkdir usr/bin
- vmkdir usr/sbin
+ ln -s bin ${DESTDIR}/usr/sbin
vmkdir etc/ssl/certs
make install DESTDIR=${DESTDIR}
- install -Dm644 sbin/update-ca-certificates.8 \
- ${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
+ rm -f ${DESTDIR}/usr/sbin
+ vman sbin/update-ca-certificates.8
cd ${DESTDIR}/usr/share/ca-certificates
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
}