From 6de2c936259a5e18aa8a335646d3928ab70c754b Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@FreeBSD.org>
Date: Sun, 3 Nov 2013 13:00:12 +0000
Subject: 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)
---
 etc/Makefile                                    |  1 -
 etc/keys/Makefile                               |  5 -----
 etc/keys/pkg/Makefile                           |  5 -----
 etc/keys/pkg/trusted/Makefile                   | 10 ----------
 etc/keys/pkg/trusted/pkg.freebsd.org.2013102301 |  5 -----
 etc/mtree/BSD.root.dist                         |  8 --------
 etc/mtree/BSD.usr.dist                          |  8 ++++++++
 etc/pkg/FreeBSD.conf                            |  2 +-
 8 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 etc/keys/Makefile
 delete mode 100644 etc/keys/pkg/Makefile
 delete mode 100644 etc/keys/pkg/trusted/Makefile
 delete mode 100644 etc/keys/pkg/trusted/pkg.freebsd.org.2013102301

(limited to 'etc')

diff --git a/etc/Makefile b/etc/Makefile
index 75ebc88..0370b99 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -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
diff --git a/etc/keys/Makefile b/etc/keys/Makefile
deleted file mode 100644
index d685b06..0000000
--- a/etc/keys/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= pkg
-
-.include <bsd.subdir.mk>
diff --git a/etc/keys/pkg/Makefile b/etc/keys/pkg/Makefile
deleted file mode 100644
index 1d83caf..0000000
--- a/etc/keys/pkg/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	trusted
-
-.include <bsd.subdir.mk>
diff --git a/etc/keys/pkg/trusted/Makefile b/etc/keys/pkg/trusted/Makefile
deleted file mode 100644
index fba8de7..0000000
--- a/etc/keys/pkg/trusted/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-NO_OBJ=
-
-FILES=	pkg.freebsd.org.2013102301
-
-FILESDIR=	/etc/keys/pkg/trusted
-FILESMODE=	644
-
-.include <bsd.prog.mk>
diff --git a/etc/keys/pkg/trusted/pkg.freebsd.org.2013102301 b/etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
deleted file mode 100644
index 587f5dd..0000000
--- a/etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-# This key is for testing purposes only and will be revoked before 10.0-RELEASE
-
-function: "sha256"
-fingerprint: "b0170035af3acc5f3f3ae1859dc717101b4e6c1d0a794ad554928ca0cbb2f438"
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index cc6334b..86b93e1 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 1a8f439..c5ff1e08 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -488,6 +488,14 @@
         ..
         info
         ..
+        keys
+            pkg
+                revoked
+                ..
+                trusted
+                ..
+            ..
+        ..
         locale
             UTF-8
             ..
diff --git a/etc/pkg/FreeBSD.conf b/etc/pkg/FreeBSD.conf
index 435bcba..47dbd1a 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"
 }
-- 
cgit v1.1