Module Name: src
Committed By: riastradh
Date: Tue Aug 30 13:40:37 UTC 2022
Modified Files:
src/crypto/external/bsd/openssh/bin: Makefile
src/etc/bluetooth: Makefile
src/etc/iscsi: Makefile
src/external/ibm-public/postfix/etc: Makefile
src/usr.bin/mail: Makefile
Log Message:
etc: Fix permissions of various editable configuration files.
This way they match the mtree and make sense and don't cause editors
to ask to override read-only files when editing them.
Exception: Not sure /etc/bluetooth/protocols makes as much sense to
edit, but the mtree says 644, so if you want to change it, make sure
to change it in both places -- Makefile and mtree.
XXX pullup-8
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/bin/Makefile
cvs rdiff -u -r1.5 -r1.6 src/etc/bluetooth/Makefile
cvs rdiff -u -r1.3 -r1.4 src/etc/iscsi/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/ibm-public/postfix/etc/Makefile
cvs rdiff -u -r1.40 -r1.41 src/usr.bin/mail/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/bin/Makefile
diff -u src/crypto/external/bsd/openssh/bin/Makefile:1.4 src/crypto/external/bsd/openssh/bin/Makefile:1.5
--- src/crypto/external/bsd/openssh/bin/Makefile:1.4 Sat Jun 1 13:21:27 2019
+++ src/crypto/external/bsd/openssh/bin/Makefile Tue Aug 30 13:40:37 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/06/01 13:21:27 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2022/08/30 13:40:37 riastradh Exp $
.include <bsd.own.mk>
@@ -11,7 +11,9 @@ SUBDIR= ssh sshd ssh-add ssh-copy-id ssh
.MADE: moduli
CONFIGFILES= ssh_config sshd_config moduli
FILESDIR= /etc/ssh
+FILESMODE= 644
FILESDIR_moduli=/etc
+FILESMODE_moduli=444
.include <bsd.files.mk>
.include <bsd.subdir.mk>
Index: src/etc/bluetooth/Makefile
diff -u src/etc/bluetooth/Makefile:1.5 src/etc/bluetooth/Makefile:1.6
--- src/etc/bluetooth/Makefile:1.5 Tue Apr 15 11:17:47 2008
+++ src/etc/bluetooth/Makefile Tue Aug 30 13:40:37 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2008/04/15 11:17:47 plunky Exp $
+# $NetBSD: Makefile,v 1.6 2022/08/30 13:40:37 riastradh Exp $
CONFIGFILES= btattach.conf btdevctl.conf hosts protocols
FILESDIR= /etc/bluetooth
+FILESMODE= 644
.include <bsd.prog.mk>
Index: src/etc/iscsi/Makefile
diff -u src/etc/iscsi/Makefile:1.3 src/etc/iscsi/Makefile:1.4
--- src/etc/iscsi/Makefile:1.3 Sat Jun 24 05:14:01 2006
+++ src/etc/iscsi/Makefile Tue Aug 30 13:40:37 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/24 05:14:01 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2022/08/30 13:40:37 riastradh Exp $
.include <bsd.own.mk>
@@ -7,6 +7,7 @@
CONFIGFILES= auths targets
FILESDIR= /etc/iscsi
FILESMODE_auths= 0600
+FILESMODE_targets= 0644
.endif
Index: src/external/ibm-public/postfix/etc/Makefile
diff -u src/external/ibm-public/postfix/etc/Makefile:1.1 src/external/ibm-public/postfix/etc/Makefile:1.2
--- src/external/ibm-public/postfix/etc/Makefile:1.1 Thu Jun 25 18:21:51 2009
+++ src/external/ibm-public/postfix/etc/Makefile Tue Aug 30 13:40:37 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/25 18:21:51 tron Exp $
+# $NetBSD: Makefile,v 1.2 2022/08/30 13:40:37 riastradh Exp $
.include <bsd.own.mk>
@@ -14,5 +14,7 @@ FILESDIR= ${PFIX_ETCDIR}
# needed by default.
#
CONFIGFILES= main.cf master.cf README
+FILESMODE= 644
+FILESMODE_README=444
.include <bsd.prog.mk>
Index: src/usr.bin/mail/Makefile
diff -u src/usr.bin/mail/Makefile:1.40 src/usr.bin/mail/Makefile:1.41
--- src/usr.bin/mail/Makefile:1.40 Tue Dec 17 19:12:50 2019
+++ src/usr.bin/mail/Makefile Tue Aug 30 13:40:37 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2019/12/17 19:12:50 christos Exp $
+# $NetBSD: Makefile,v 1.41 2022/08/30 13:40:37 riastradh Exp $
# @(#)Makefile 8.3 (Berkeley) 4/20/95
.include <bsd.own.mk>
@@ -75,6 +75,7 @@ SUBDIR.roff+= USD.doc
CONFIGFILES= mail.rc
FILESDIR_mail.rc= /etc
+FILESMODE_mail.rc= 644
COPTS.format.c+= -Wno-format-nonliteral
COPTS.fio.c+= ${GCC_NO_FORMAT_TRUNCATION}
