CVS commit: pkgsrc/security/ca-certificates

["Kimmo Suominen" <kim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kim
Date:           Wed Jul  5 17:30:24 UTC 2023

Modified Files:
        pkgsrc/security/ca-certificates: INSTALL Makefile distinfo
        pkgsrc/security/ca-certificates/patches:
            patch-sbin_update-ca-certificates

Log Message:
ca-certificates: Be more relocatable


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/ca-certificates/INSTALL
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/ca-certificates/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/ca-certificates/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/security/ca-certificates/patches/patch-sbin_update-ca-certificates

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/ca-certificates/INSTALL
diff -u pkgsrc/security/ca-certificates/INSTALL:1.1 pkgsrc/security/ca-certificates/INSTALL:1.2
--- pkgsrc/security/ca-certificates/INSTALL:1.1 Sun May 31 15:53:44 2020
+++ pkgsrc/security/ca-certificates/INSTALL     Wed Jul  5 17:30:23 2023
@@ -1,7 +1,10 @@
-# $NetBSD: INSTALL,v 1.1 2020/05/31 15:53:44 kim Exp $
+# $NetBSD: INSTALL,v 1.2 2023/07/05 17:30:23 kim Exp $
+
+# Refresh certificates on existing installations.
+# Output instructions on new installations.
 
 case ${STAGE} in
 POST-INSTALL)
-       @PREFIX@/sbin/update-ca-certificates
+       "${PKG_PREFIX}"/sbin/update-ca-certificates
        ;;
 esac

Index: pkgsrc/security/ca-certificates/Makefile
diff -u pkgsrc/security/ca-certificates/Makefile:1.11 pkgsrc/security/ca-certificates/Makefile:1.12
--- pkgsrc/security/ca-certificates/Makefile:1.11       Sun May 21 16:33:50 2023
+++ pkgsrc/security/ca-certificates/Makefile    Wed Jul  5 17:30:23 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2023/05/21 16:33:50 kim Exp $
+# $NetBSD: Makefile,v 1.12 2023/07/05 17:30:23 kim Exp $
 
 PKGNAME=       ca-certificates-20230311
 DISTNAME=      ${PKGNAME_NOREV:C/-([^-]*)$/_\1/}
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  http://deb.debian.org/debian/pool/main/c/ca-certificates/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/security/ca-certificates/distinfo
diff -u pkgsrc/security/ca-certificates/distinfo:1.9 pkgsrc/security/ca-certificates/distinfo:1.10
--- pkgsrc/security/ca-certificates/distinfo:1.9        Sun May 21 16:33:50 2023
+++ pkgsrc/security/ca-certificates/distinfo    Wed Jul  5 17:30:23 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2023/05/21 16:33:50 kim Exp $
+$NetBSD: distinfo,v 1.10 2023/07/05 17:30:23 kim Exp $
 
 BLAKE2s (ca-certificates_20230311.tar.xz) = 41fb59d81073ce3a758c2fd38f4af420d54b32d367a616198d98a1cad1ec7549
 SHA512 (ca-certificates_20230311.tar.xz) = 00571bdc87897813fd7dbe024f3a186cfc9f0d4f55e92545a90888c9e5282f99cb8d75b5932c034731b911bf27a9b38fd7d062dd511eb1152acf8b2811490fa7
 Size (ca-certificates_20230311.tar.xz) = 257772 bytes
-SHA1 (patch-sbin_update-ca-certificates) = 036c25d5e048451917685e62dfddb81004453146
+SHA1 (patch-sbin_update-ca-certificates) = 0f8e96ac9be00a581eac5138329a087235466d65

Index: pkgsrc/security/ca-certificates/patches/patch-sbin_update-ca-certificates
diff -u pkgsrc/security/ca-certificates/patches/patch-sbin_update-ca-certificates:1.3 pkgsrc/security/ca-certificates/patches/patch-sbin_update-ca-certificates:1.4
--- pkgsrc/security/ca-certificates/patches/patch-sbin_update-ca-certificates:1.3       Sun May 21 16:33:50 2023
+++ pkgsrc/security/ca-certificates/patches/patch-sbin_update-ca-certificates   Wed Jul  5 17:30:24 2023
@@ -1,12 +1,17 @@
-$NetBSD: patch-sbin_update-ca-certificates,v 1.3 2023/05/21 16:33:50 kim Exp $
+$NetBSD: patch-sbin_update-ca-certificates,v 1.4 2023/07/05 17:30:24 kim Exp $
 
 Add a configuration file for enabling CA certificate management in
 a system directory (such as /etc/openssl on NetBSD).
 
 --- sbin/update-ca-certificates.orig   2021-12-15 18:51:05.000000000 +0000
-+++ sbin/update-ca-certificates        2023-05-21 15:58:00.334161148 +0000
-@@ -28,9 +28,23 @@
- CERTSDIR=/usr/share/ca-certificates
++++ sbin/update-ca-certificates        2023-07-05 16:50:18.405110442 +0000
+@@ -25,12 +25,27 @@
+ fresh=0
+ default=0
+ CERTSCONF=/etc/ca-certificates.conf
+-CERTSDIR=/usr/share/ca-certificates
++PROGDIR="$(dirname "${0%/*}")"
++CERTSDIR="${PROGDIR}/../share/ca-certificates"
  LOCALCERTSDIR=/usr/local/share/ca-certificates
  CERTBUNDLE=ca-certificates.crt
 -ETCCERTSDIR=/etc/ssl/certs
@@ -30,24 +35,17 @@ a system directory (such as /etc/openssl
  while [ $# -gt 0 ];
  do
    case $1 in
-@@ -66,6 +80,27 @@
+@@ -66,6 +81,20 @@
    shift
  done
  
 +case "$ETCCERTSDIR" in
-+disabled)
-+  cat <<-EOF
-+      Please enable update-ca-certificates by editing
-+        $ETCCERTSDIRCONF
-+      and then run it again.
-+      EOF
-+  exit 1
-+  ;;
 +/*)
 +  ;;
 +*)
 +  cat <<-EOF
-+      Please set ETCCERTSDIR to an absolute path in
++      Please enable update-ca-certificates by setting ETCCERTSDIR
++      to an absolute path (e.g. /etc/ssl/certs) in
 +        $ETCCERTSDIRCONF
 +      and then run update-ca-certificates again.
 +      EOF