summaryrefslogtreecommitdiff
path: root/security/ca-certificates
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2022-07-17 02:58:32 +0000
committertnn <tnn@pkgsrc.org>2022-07-17 02:58:32 +0000
commit73d30a9b2468a9d1b023b98bdb444bc6bcfa0d9b (patch)
tree3e8a60080cb24e5a4f84f895539589e8bd0d4ed8 /security/ca-certificates
parent133f24262b00f82b84aa7dc671d4aba05710f610 (diff)
downloadpkgsrc-73d30a9b2468a9d1b023b98bdb444bc6bcfa0d9b.tar.gz
ca-certificates: try to mend py-cryptography fallout
Diffstat (limited to 'security/ca-certificates')
-rw-r--r--security/ca-certificates/Makefile4
-rw-r--r--security/ca-certificates/distinfo3
-rw-r--r--security/ca-certificates/patches/patch-mozilla_certdata2pem.py16
3 files changed, 20 insertions, 3 deletions
diff --git a/security/ca-certificates/Makefile b/security/ca-certificates/Makefile
index 17412c6186b..392866e93a3 100644
--- a/security/ca-certificates/Makefile
+++ b/security/ca-certificates/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2022/07/09 09:38:57 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/07/17 02:58:32 tnn Exp $
PKGNAME= ca-certificates-20211016
-PKGREVISION= 3
+PKGREVISION= 4
DISTNAME= ${PKGNAME_NOREV:C/-([^-]*)$/_\1/}
CATEGORIES= security
MASTER_SITES= http://deb.debian.org/debian/pool/main/c/ca-certificates/
diff --git a/security/ca-certificates/distinfo b/security/ca-certificates/distinfo
index e398661e93c..b48f87db545 100644
--- a/security/ca-certificates/distinfo
+++ b/security/ca-certificates/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2022/06/12 07:05:30 kim Exp $
+$NetBSD: distinfo,v 1.8 2022/07/17 02:58:32 tnn Exp $
BLAKE2s (ca-certificates_20211016.tar.xz) = ee1b82472068aef176dbc9dab2099848e299dbcc92ac309ba5a906a98414731d
SHA512 (ca-certificates_20211016.tar.xz) = bedf072c8aa1b05b249ea272f5cecfe16bdcd762c02c712323f12ac7a278e8814453f5f3caad86a2581e451788b292ed3a76a6a81620926459bb890133cffde1
Size (ca-certificates_20211016.tar.xz) = 239608 bytes
+SHA1 (patch-mozilla_certdata2pem.py) = e0752892bf93113bb4a6414f1bef98261a5b832a
SHA1 (patch-sbin_update-ca-certificates) = e57e4c0ec2be335f6d901c865a7b0a33405fd7f2
diff --git a/security/ca-certificates/patches/patch-mozilla_certdata2pem.py b/security/ca-certificates/patches/patch-mozilla_certdata2pem.py
new file mode 100644
index 00000000000..9a2caf3c13d
--- /dev/null
+++ b/security/ca-certificates/patches/patch-mozilla_certdata2pem.py
@@ -0,0 +1,16 @@
+$NetBSD: patch-mozilla_certdata2pem.py,v 1.1 2022/07/17 02:58:32 tnn Exp $
+
+py-cryptography fallout:
+TypeError: argument 'data': 'bytearray' object cannot be converted to 'PyBytes'
+
+--- mozilla/certdata2pem.py.orig 2021-10-16 16:09:43.000000000 +0000
++++ mozilla/certdata2pem.py
+@@ -122,7 +122,7 @@ for obj in objects:
+ if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]:
+ continue
+
+- cert = x509.load_der_x509_certificate(obj['CKA_VALUE'])
++ cert = x509.load_der_x509_certificate(bytes(obj['CKA_VALUE']))
+ if cert.not_valid_after < datetime.datetime.now():
+ print('!'*74)
+ print('Trusted but expired certificate found: %s' % obj['CKA_LABEL'])