From owner-svn-src-all@FreeBSD.ORG Sat Oct 26 03:53:26 2013 Return-Path: Delivered-To: svn-src-all@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 5A4FD6AE; Sat, 26 Oct 2013 03:53:26 +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 46F8124CC; Sat, 26 Oct 2013 03:53:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9Q3rQqq084617; Sat, 26 Oct 2013 03:53:26 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9Q3rOgL084606; Sat, 26 Oct 2013 03:53:24 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201310260353.r9Q3rOgL084606@svn.freebsd.org> From: Bryan Drewery Date: Sat, 26 Oct 2013 03:53:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257150 - in head: etc etc/keys etc/keys/pkg etc/keys/pkg/trusted etc/mtree 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-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Oct 2013 03:53:26 -0000 Author: bdrewery (ports committer) Date: Sat Oct 26 03:53:24 2013 New Revision: 257150 URL: http://svnweb.freebsd.org/changeset/base/257150 Log: Add infrastructure for installing pkg(8) keys into /etc/keys/pkg and add the current test key that packages will be signed with until 10.0-RELEASE. Approved by: bapt Discussed by: bapt with des MFC after: 2 days Added: head/etc/keys/ head/etc/keys/Makefile (contents, props changed) head/etc/keys/pkg/ head/etc/keys/pkg/Makefile (contents, props changed) head/etc/keys/pkg/trusted/ head/etc/keys/pkg/trusted/Makefile (contents, props changed) head/etc/keys/pkg/trusted/pkg.freebsd.org.2013102301 (contents, props changed) Modified: head/etc/Makefile head/etc/mtree/BSD.root.dist head/share/man/man7/hier.7 Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Sat Oct 26 03:47:49 2013 (r257149) +++ head/etc/Makefile Sat Oct 26 03:53:24 2013 (r257150) @@ -224,6 +224,7 @@ 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 Added: head/etc/keys/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/etc/keys/Makefile Sat Oct 26 03:53:24 2013 (r257150) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR= pkg + +.include Added: head/etc/keys/pkg/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/etc/keys/pkg/Makefile Sat Oct 26 03:53:24 2013 (r257150) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR= trusted + +.include Added: head/etc/keys/pkg/trusted/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/etc/keys/pkg/trusted/Makefile Sat Oct 26 03:53:24 2013 (r257150) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +NO_OBJ= + +FILES= pkg.freebsd.org.2013102301 + +FILESDIR= /etc/keys/pkg/trusted +FILESMODE= 644 + +.include Added: head/etc/keys/pkg/trusted/pkg.freebsd.org.2013102301 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/etc/keys/pkg/trusted/pkg.freebsd.org.2013102301 Sat Oct 26 03:53:24 2013 (r257150) @@ -0,0 +1,5 @@ +# $FreeBSD$ +# This key is for testing purposes only and will be revoked before 10.0-RELEASE + +function: "sha256" +fingerprint: "b0170035af3acc5f3f3ae1859dc717101b4e6c1d0a794ad554928ca0cbb2f438" Modified: head/etc/mtree/BSD.root.dist ============================================================================== --- head/etc/mtree/BSD.root.dist Sat Oct 26 03:47:49 2013 (r257149) +++ head/etc/mtree/BSD.root.dist Sat Oct 26 03:53:24 2013 (r257150) @@ -34,6 +34,14 @@ .. gss .. + keys + pkg + revoked + .. + trusted + .. + .. + .. mail .. mtree Modified: head/share/man/man7/hier.7 ============================================================================== --- head/share/man/man7/hier.7 Sat Oct 26 03:47:49 2013 (r257149) +++ head/share/man/man7/hier.7 Sat Oct 26 03:53:24 2013 (r257150) @@ -32,7 +32,7 @@ .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd October 19, 2013 +.Dd October 23, 2013 .Dt HIER 7 .Os .Sh NAME @@ -94,6 +94,15 @@ 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