Permalink
Browse files

MFC r257344,r257403:

  Move /etc/keys to /usr/share/keys where users are less likely to modify them.

Approved by:	bapt
Approved by:	re (gjb)
  • Loading branch information...
1 parent eb6fbdd commit 6de2c936259a5e18aa8a335646d3928ab70c754b @bdrewery bdrewery committed Nov 3, 2013
View
@@ -38,6 +38,12 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20131030: /etc/keys moved to /usr/share/keys
+OLD_DIRS+=etc/keys
+OLD_DIRS+=etc/keys/pkg
+OLD_DIRS+=etc/keys/pkg/revoked
+OLD_DIRS+=etc/keys/pkg/trusted
+OLD_FILES+=etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
# 20131014: libbsdyml becomes private
OLD_FILES+=usr/lib/libbsdyml.a
OLD_FILES+=usr/lib/libbsdyml.so
View
@@ -221,7 +221,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
@@ -34,14 +34,6 @@
..
gss
..
- keys
- pkg
- revoked
- ..
- trusted
- ..
- ..
- ..
mail
..
mtree
@@ -488,6 +488,14 @@
..
info
..
+ keys
+ pkg
+ revoked
+ ..
+ trusted
+ ..
+ ..
+ ..
locale
UTF-8
..
@@ -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"
}
View
@@ -11,6 +11,7 @@ SUBDIR= ${_colldef} \
dtrace \
${_examples} \
${_i18n} \
+ keys \
${_man} \
${_me} \
misc \
File renamed without changes.
File renamed without changes.
@@ -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>
View
@@ -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

0 comments on commit 6de2c93

Please sign in to comment.