Wed Jul 5 18:13:22 2023 UTC ()
ca-certificates: Fix previously improved relocatability


(kim)
diff -r1.12 -r1.13 pkgsrc/security/ca-certificates/Makefile
diff -r1.10 -r1.11 pkgsrc/security/ca-certificates/distinfo
diff -r1.4 -r1.5 pkgsrc/security/ca-certificates/patches/patch-sbin_update-ca-certificates
cvs diff -r1.12 -r1.13 pkgsrc/security/ca-certificates/Makefile (expand / switch to unified diff)

--- pkgsrc/security/ca-certificates/Makefile 2023/07/05 17:30:23 1.12
+++ pkgsrc/security/ca-certificates/Makefile 2023/07/05 18:13:22 1.13
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.12 2023/07/05 17:30:23 kim Exp $ 1# $NetBSD: Makefile,v 1.13 2023/07/05 18:13:22 kim Exp $
2 2
3PKGNAME= ca-certificates-20230311 3PKGNAME= ca-certificates-20230311
4DISTNAME= ${PKGNAME_NOREV:C/-([^-]*)$/_\1/} 4DISTNAME= ${PKGNAME_NOREV:C/-([^-]*)$/_\1/}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= security 6CATEGORIES= security
7MASTER_SITES= http://deb.debian.org/debian/pool/main/c/ca-certificates/ 7MASTER_SITES= http://deb.debian.org/debian/pool/main/c/ca-certificates/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://packages.debian.org/source/sid/ca-certificates 11HOMEPAGE= https://packages.debian.org/source/sid/ca-certificates
12COMMENT= Root CA certificates from the Mozilla Project 12COMMENT= Root CA certificates from the Mozilla Project
13LICENSE= gnu-gpl-v2 AND mpl-2.0 13LICENSE= gnu-gpl-v2 AND mpl-2.0
14 14
15NO_CONFIGURE= yes 15NO_CONFIGURE= yes
16PYTHON_FOR_BUILD_ONLY= tool 16PYTHON_FOR_BUILD_ONLY= tool
17PYTHON_VERSIONS_INCOMPATIBLE= 27 17PYTHON_VERSIONS_INCOMPATIBLE= 27
18 18
cvs diff -r1.10 -r1.11 pkgsrc/security/ca-certificates/distinfo (expand / switch to unified diff)

--- pkgsrc/security/ca-certificates/distinfo 2023/07/05 17:30:23 1.10
+++ pkgsrc/security/ca-certificates/distinfo 2023/07/05 18:13:22 1.11
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.10 2023/07/05 17:30:23 kim Exp $ 1$NetBSD: distinfo,v 1.11 2023/07/05 18:13:22 kim Exp $
2 2
3BLAKE2s (ca-certificates_20230311.tar.xz) = 41fb59d81073ce3a758c2fd38f4af420d54b32d367a616198d98a1cad1ec7549 3BLAKE2s (ca-certificates_20230311.tar.xz) = 41fb59d81073ce3a758c2fd38f4af420d54b32d367a616198d98a1cad1ec7549
4SHA512 (ca-certificates_20230311.tar.xz) = 00571bdc87897813fd7dbe024f3a186cfc9f0d4f55e92545a90888c9e5282f99cb8d75b5932c034731b911bf27a9b38fd7d062dd511eb1152acf8b2811490fa7 4SHA512 (ca-certificates_20230311.tar.xz) = 00571bdc87897813fd7dbe024f3a186cfc9f0d4f55e92545a90888c9e5282f99cb8d75b5932c034731b911bf27a9b38fd7d062dd511eb1152acf8b2811490fa7
5Size (ca-certificates_20230311.tar.xz) = 257772 bytes 5Size (ca-certificates_20230311.tar.xz) = 257772 bytes
6SHA1 (patch-sbin_update-ca-certificates) = 0f8e96ac9be00a581eac5138329a087235466d65 6SHA1 (patch-sbin_update-ca-certificates) = 0d52bd83bd69ade5cd32766a2f43fbfc59ef12ab
cvs diff -r1.4 -r1.5 pkgsrc/security/ca-certificates/patches/patch-sbin_update-ca-certificates (expand / switch to unified diff)

--- pkgsrc/security/ca-certificates/patches/patch-sbin_update-ca-certificates 2023/07/05 17:30:24 1.4
+++ pkgsrc/security/ca-certificates/patches/patch-sbin_update-ca-certificates 2023/07/05 18:13:22 1.5
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-sbin_update-ca-certificates,v 1.4 2023/07/05 17:30:24 kim Exp $ 1$NetBSD: patch-sbin_update-ca-certificates,v 1.5 2023/07/05 18:13:22 kim Exp $
2 2
3Add a configuration file for enabling CA certificate management in 3Add a configuration file for enabling CA certificate management in
4a system directory (such as /etc/openssl on NetBSD). 4a system directory (such as /etc/openssl on NetBSD).
5 5
6--- sbin/update-ca-certificates.orig 2021-12-15 18:51:05.000000000 +0000 6--- sbin/update-ca-certificates.orig 2021-12-15 18:51:05.000000000 +0000
7+++ sbin/update-ca-certificates 2023-07-05 16:50:18.405110442 +0000 7+++ sbin/update-ca-certificates 2023-07-05 18:10:26.326602441 +0000
8@@ -25,12 +25,27 @@ 8@@ -25,12 +25,27 @@
9 fresh=0 9 fresh=0
10 default=0 10 default=0
11 CERTSCONF=/etc/ca-certificates.conf 11 CERTSCONF=/etc/ca-certificates.conf
12-CERTSDIR=/usr/share/ca-certificates 12-CERTSDIR=/usr/share/ca-certificates
13+PROGDIR="$(dirname "${0%/*}")" 13+PROGDIR="$(dirname "${0}")"
14+CERTSDIR="${PROGDIR}/../share/ca-certificates" 14+CERTSDIR="${PROGDIR}/../share/ca-certificates"
15 LOCALCERTSDIR=/usr/local/share/ca-certificates 15 LOCALCERTSDIR=/usr/local/share/ca-certificates
16 CERTBUNDLE=ca-certificates.crt 16 CERTBUNDLE=ca-certificates.crt
17-ETCCERTSDIR=/etc/ssl/certs 17-ETCCERTSDIR=/etc/ssl/certs
18+ETCCERTSDIR=disabled 18+ETCCERTSDIR=disabled
19+ETCCERTSDIRCONF=/etc/ca-certificates-dir.conf 19+ETCCERTSDIRCONF=/etc/ca-certificates-dir.conf
20 HOOKSDIR=/etc/ca-certificates/update.d 20 HOOKSDIR=/etc/ca-certificates/update.d
21  21
22+if [ -s "$ETCCERTSDIRCONF" ] 22+if [ -s "$ETCCERTSDIRCONF" ]
23+then 23+then
24+ _ETCCERTSDIR="$(sed -n -e ' 24+ _ETCCERTSDIR="$(sed -n -e '
25+ /^ETCCERTSDIR=/ { 25+ /^ETCCERTSDIR=/ {
26+ s///; 26+ s///;