diff options
| -rw-r--r-- | etc/Makefile | 1 | ||||
| -rw-r--r-- | etc/mtree/BSD.root.dist | 8 | ||||
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 8 | ||||
| -rw-r--r-- | etc/pkg/FreeBSD.conf | 2 | ||||
| -rw-r--r-- | share/Makefile | 1 | ||||
| -rw-r--r-- | share/keys/Makefile (renamed from etc/keys/Makefile) | 0 | ||||
| -rw-r--r-- | share/keys/pkg/Makefile (renamed from etc/keys/pkg/Makefile) | 0 | ||||
| -rw-r--r-- | share/keys/pkg/trusted/Makefile (renamed from etc/keys/pkg/trusted/Makefile) | 2 | ||||
| -rw-r--r-- | share/keys/pkg/trusted/pkg.freebsd.org.2013102301 (renamed from etc/keys/pkg/trusted/pkg.freebsd.org.2013102301) | 0 | ||||
| -rw-r--r-- | share/man/man7/hier.7 | 21 |
10 files changed, 22 insertions, 21 deletions
diff --git a/etc/Makefile b/etc/Makefile index 09c28141d833..d763df6d44e9 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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 diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index cc6334bdb215..86b93e137140 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -34,14 +34,6 @@ .. gss .. - keys - pkg - revoked - .. - trusted - .. - .. - .. mail .. mtree diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 9b36acc01ede..f6c0306500e6 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -478,6 +478,14 @@ .. info .. + keys + pkg + revoked + .. + trusted + .. + .. + .. locale UTF-8 .. diff --git a/etc/pkg/FreeBSD.conf b/etc/pkg/FreeBSD.conf index 435bcba62fb6..47dbd1afdac5 100644 --- a/etc/pkg/FreeBSD.conf +++ b/etc/pkg/FreeBSD.conf @@ -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" } diff --git a/share/Makefile b/share/Makefile index e39da7f2792e..3e613d68cafe 100644 --- a/share/Makefile +++ b/share/Makefile @@ -11,6 +11,7 @@ SUBDIR= ${_colldef} \ dtrace \ ${_examples} \ ${_i18n} \ + keys \ ${_man} \ ${_me} \ misc \ diff --git a/etc/keys/Makefile b/share/keys/Makefile index d685b064ccd3..d685b064ccd3 100644 --- a/etc/keys/Makefile +++ b/share/keys/Makefile diff --git a/etc/keys/pkg/Makefile b/share/keys/pkg/Makefile index 1d83caf9bfe8..1d83caf9bfe8 100644 --- a/etc/keys/pkg/Makefile +++ b/share/keys/pkg/Makefile diff --git a/etc/keys/pkg/trusted/Makefile b/share/keys/pkg/trusted/Makefile index fba8de73597b..ee0d4c9224cd 100644 --- a/etc/keys/pkg/trusted/Makefile +++ b/share/keys/pkg/trusted/Makefile @@ -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> diff --git a/etc/keys/pkg/trusted/pkg.freebsd.org.2013102301 b/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 index 587f5dd87b34..587f5dd87b34 100644 --- a/etc/keys/pkg/trusted/pkg.freebsd.org.2013102301 +++ b/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index ba4bf839fab2..b11378773312 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -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 |