From owner-svn-src-head@FreeBSD.ORG Tue Oct 29 15:07:56 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7A36A500; Tue, 29 Oct 2013 15:07:56 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 651A32D34; Tue, 29 Oct 2013 15:07:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9TF7uSl010845; Tue, 29 Oct 2013 15:07:56 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9TF7s06010835; Tue, 29 Oct 2013 15:07:54 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201310291507.r9TF7s06010835@svn.freebsd.org> From: Bryan Drewery Date: Tue, 29 Oct 2013 15:07:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257344 - in head: etc etc/keys etc/mtree etc/pkg share share/keys share/keys/pkg/trusted share/man/man7 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Oct 2013 15:07:56 -0000 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 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