svn commit: r257150 - in head: etc etc/keys etc/keys/pkg etc/keys/pkg/trusted etc/mtree share/man/man7

[Bryan Drewery]

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 <bsd.subdir.mk>

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 <bsd.subdir.mk>

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 <bsd.prog.mk>

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