Author: bdrewery (ports committer)
Date: Tue Oct 29 15:07:54 2013
New Revision: 257344
URL: http://svnweb.freebsd.org/changeset/base/257344
Log:
Move /etc/keys to /usr/share/keys where users are less likely to modify them.
Requested by: secteam (cperciva, des)
Approved by: bapt
Added:
head/share/keys/
- copied from r257343, head/etc/keys/
Deleted:
head/etc/keys/
Modified:
head/etc/Makefile
head/etc/mtree/BSD.root.dist
head/etc/mtree/BSD.usr.dist
head/etc/pkg/FreeBSD.conf
head/share/Makefile
head/share/keys/pkg/trusted/Makefile
head/share/man/man7/hier.7
Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile Tue Oct 29 14:44:36 2013 (r257343)
+++ head/etc/Makefile Tue Oct 29 15:07:54 2013 (r257344)
@@ -224,7 +224,6 @@ distribution:
${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
${_+_}cd ${.CURDIR}/devd; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
- ${_+_}cd ${.CURDIR}/keys; ${MAKE} install
${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
.if ${MK_PKGBOOTSTRAP} != "no"
${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
Modified: head/etc/mtree/BSD.root.dist
==============================================================================
--- head/etc/mtree/BSD.root.dist Tue Oct 29 14:44:36 2013
(r257343)
+++ head/etc/mtree/BSD.root.dist Tue Oct 29 15:07:54 2013
(r257344)
@@ -34,14 +34,6 @@
..
gss
..
- keys
- pkg
- revoked
- ..
- trusted
- ..
- ..
- ..
mail
..
mtree
Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist Tue Oct 29 14:44:36 2013 (r257343)
+++ head/etc/mtree/BSD.usr.dist Tue Oct 29 15:07:54 2013 (r257344)
@@ -478,6 +478,14 @@
..
info
..
+ keys
+ pkg
+ revoked
+ ..
+ trusted
+ ..
+ ..
+ ..
locale
UTF-8
..
Modified: head/etc/pkg/FreeBSD.conf
==============================================================================
--- head/etc/pkg/FreeBSD.conf Tue Oct 29 14:44:36 2013 (r257343)
+++ head/etc/pkg/FreeBSD.conf Tue Oct 29 15:07:54 2013 (r257344)
@@ -3,6 +3,6 @@ FreeBSD: {
url: "pkg+http://pkg.freebsd.org/${ABI}/latest";,
mirror_type: "srv",
signature_type: "none",
- fingerprints: "/etc/keys/pkg",
+ fingerprints: "/usr/share/keys/pkg",
enabled: "yes"
}
Modified: head/share/Makefile
==============================================================================
--- head/share/Makefile Tue Oct 29 14:44:36 2013 (r257343)
+++ head/share/Makefile Tue Oct 29 15:07:54 2013 (r257344)
@@ -11,6 +11,7 @@ SUBDIR= ${_colldef} \
dtrace \
${_examples} \
${_i18n} \
+ keys \
${_man} \
${_me} \
misc \
Modified: head/share/keys/pkg/trusted/Makefile
==============================================================================
--- head/etc/keys/pkg/trusted/Makefile Tue Oct 29 14:44:36 2013
(r257343)
+++ head/share/keys/pkg/trusted/Makefile Tue Oct 29 15:07:54 2013
(r257344)
@@ -4,7 +4,7 @@ NO_OBJ=
FILES= pkg.freebsd.org.2013102301
-FILESDIR= /etc/keys/pkg/trusted
+FILESDIR= /usr/share/keys/pkg/trusted
FILESMODE= 644
.include <bsd.prog.mk>
Modified: head/share/man/man7/hier.7
==============================================================================
--- head/share/man/man7/hier.7 Tue Oct 29 14:44:36 2013 (r257343)
+++ head/share/man/man7/hier.7 Tue Oct 29 15:07:54 2013 (r257344)
@@ -32,7 +32,7 @@
.\" @(#)hier.7 8.1 (Berkeley) 6/5/93
.\" $FreeBSD$
.\"
-.Dd October 23, 2013
+.Dd October 29, 2013
.Dt HIER 7
.Os
.Sh NAME
@@ -94,15 +94,6 @@ bluetooth configuration files
gnats configuration files;
see
.Xr send-pr 1
-.It Pa keys/
-known trusted and revoked keys.
-.Pp
-.Bl -tag -width ".Pa keys/pkg/" -compact
-.It Pa keys/pkg/
-fingerprints for
-.Xr pkg 8
-.El
-.Pp
.It Pa localtime
local timezone information;
see
@@ -556,6 +547,16 @@ ASCII text files used by various games
device description file for device name
.It Pa info/
GNU Info hypertext system
+.It Pa keys/
+known trusted and revoked keys.
+.Bl -tag -width ".Pa keys/pkg/" -compact
+.It Pa keys/pkg/
+fingerprints for
+.Xr pkg 7
+and
+.Xr pkg 8
+.El
+.Pp
.It Pa locale/
localization files;
see
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
