Module Name: src
Committed By: riastradh
Date: Sun Sep 3 18:31:02 UTC 2023
Modified Files:
src/distrib/sets/lists/base: mi
src/etc/mtree: NetBSD.dist.base
src/usr.sbin/certctl: Makefile
Log Message:
certctl(8): Install certs.conf in /usr/share/examples too.
This way postinstall(8) can refer to the default one when you've done
an upgrade without etcupdate or similar to pull in new config files
from etc.tgz.
Not great -- we should do this systematically for all config files in
/etc, but this one-off hack is less risky for 10.
To generate a diff of this commit:
cvs rdiff -u -r1.1328 -r1.1329 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.252 -r1.253 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/certctl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1328 src/distrib/sets/lists/base/mi:1.1329
--- src/distrib/sets/lists/base/mi:1.1328 Mon Aug 28 23:57:17 2023
+++ src/distrib/sets/lists/base/mi Sun Sep 3 18:31:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1328 2023/08/28 23:57:17 riastradh Exp $
+# $NetBSD: mi,v 1.1329 2023/09/03 18:31:01 riastradh Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -2453,6 +2453,8 @@
./usr/share/examples/blocklist base-sys-examples
./usr/share/examples/blocklist/blocklistd.conf base-sys-examples
./usr/share/examples/blocklist/npf.conf base-sys-examples
+./usr/share/examples/certctl base-sysutil-examples
+./usr/share/examples/certctl/certs.conf base-sysutil-examples
./usr/share/examples/dhcp base-dhcpd-examples
./usr/share/examples/dhcpcd base-dhcpcd-examples
./usr/share/examples/dhcpcd/hooks base-dhcpcd-examples
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.252 src/etc/mtree/NetBSD.dist.base:1.253
--- src/etc/mtree/NetBSD.dist.base:1.252 Sat Aug 26 05:58:49 2023
+++ src/etc/mtree/NetBSD.dist.base Sun Sep 3 18:31:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.252 2023/08/26 05:58:49 riastradh Exp $
+# $NetBSD: NetBSD.dist.base,v 1.253 2023/09/03 18:31:01 riastradh Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -478,6 +478,7 @@
./usr/share/examples/asm/hello
./usr/share/examples/atf
./usr/share/examples/blocklist
+./usr/share/examples/certctl
./usr/share/examples/dhcp
./usr/share/examples/dhcpcd
./usr/share/examples/dhcpcd/hooks
Index: src/usr.sbin/certctl/Makefile
diff -u src/usr.sbin/certctl/Makefile:1.2 src/usr.sbin/certctl/Makefile:1.3
--- src/usr.sbin/certctl/Makefile:1.2 Mon Aug 28 23:57:25 2023
+++ src/usr.sbin/certctl/Makefile Sun Sep 3 18:31:01 2023
@@ -1,11 +1,26 @@
-# $NetBSD: Makefile,v 1.2 2023/08/28 23:57:25 riastradh Exp $
+# $NetBSD: Makefile,v 1.3 2023/09/03 18:31:01 riastradh Exp $
#
MAN= certctl.8
SCRIPTS= certctl.sh
-FILESDIR= /etc/openssl
-FILESMODE= 644
-CONFIGFILES= certs.conf
+# XXX This is a hack to install certs.conf both in /etc/openssl (in the
+# etc set) and in /usr/share/examples/certctl (in the base set).
+# Really, all files in /etc should have /usr/share/examples versions;
+# once you arrange the build to do that, you can get rid of this hack.
+etc-certs.conf base-certs.conf: certs.conf
+ cat ${.ALLSRC} >${.TARGET}.tmp
+ ${MV} -f ${.TARGET}.tmp ${.TARGET}
+
+CONFIGFILES+= etc-certs.conf
+FILESBUILD_etc-certs.conf= yes
+FILESDIR_etc-certs.conf= /etc/openssl
+FILESNAME_etc-certs.conf= certs.conf
+FILESMODE_etc-certs.conf= 644
+
+FILES+= base-certs.conf
+FILESBUILD_base-certs.conf= yes
+FILESDIR_base-certs.conf= /usr/share/examples/certctl
+FILESNAME_base-certs.conf= certs.conf
.include <bsd.prog.mk>
