svn commit: r257572 - in stable/10: . etc etc/keys etc/mtree etc/pkg share share/keys share/man/man7

[Bryan Drewery]

Author: bdrewery (ports committer)
Date: Sun Nov  3 13:00:12 2013
New Revision: 257572
URL: http://svnweb.freebsd.org/changeset/base/257572

Log:
  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)

Added:
  stable/10/share/keys/
     - copied from r257344, head/share/keys/
Deleted:
  stable/10/etc/keys/
Modified:
  stable/10/ObsoleteFiles.inc   (contents, props changed)
  stable/10/etc/Makefile
  stable/10/etc/mtree/BSD.root.dist
  stable/10/etc/mtree/BSD.usr.dist
  stable/10/etc/pkg/FreeBSD.conf
  stable/10/share/Makefile
  stable/10/share/man/man7/hier.7
Directory Properties:
  stable/10/etc/   (props changed)
  stable/10/share/   (props changed)
  stable/10/share/man/man7/   (props changed)

Modified: stable/10/ObsoleteFiles.inc
==============================================================================
--- stable/10/ObsoleteFiles.inc	Sun Nov  3 12:58:14 2013	(r257571)
+++ stable/10/ObsoleteFiles.inc	Sun Nov  3 13:00:12 2013	(r257572)
@@ -38,6 +38,12 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20131030: /etc/keys moved to /usr/share/keys
+OLD_DIRS+=etc/keys
+OLD_DIRS+=etc/keys/pkg
+OLD_DIRS+=etc/keys/pkg/revoked
+OLD_DIRS+=etc/keys/pkg/trusted
+OLD_FILES+=etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
 # 20131014: libbsdyml becomes private
 OLD_FILES+=usr/lib/libbsdyml.a
 OLD_FILES+=usr/lib/libbsdyml.so

Modified: stable/10/etc/Makefile
==============================================================================
--- stable/10/etc/Makefile	Sun Nov  3 12:58:14 2013	(r257571)
+++ stable/10/etc/Makefile	Sun Nov  3 13:00:12 2013	(r257572)
@@ -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

Modified: stable/10/etc/mtree/BSD.root.dist
==============================================================================
--- stable/10/etc/mtree/BSD.root.dist	Sun Nov  3 12:58:14 2013	(r257571)
+++ stable/10/etc/mtree/BSD.root.dist	Sun Nov  3 13:00:12 2013	(r257572)
@@ -34,14 +34,6 @@
         ..
         gss
         ..
-        keys
-            pkg
-                revoked
-                ..
-                trusted
-                ..
-            ..
-        ..
         mail
         ..
         mtree

Modified: stable/10/etc/mtree/BSD.usr.dist
==============================================================================
--- stable/10/etc/mtree/BSD.usr.dist	Sun Nov  3 12:58:14 2013	(r257571)
+++ stable/10/etc/mtree/BSD.usr.dist	Sun Nov  3 13:00:12 2013	(r257572)
@@ -488,6 +488,14 @@
         ..
         info
         ..
+        keys
+            pkg
+                revoked
+                ..
+                trusted
+                ..
+            ..
+        ..
         locale
             UTF-8
             ..

Modified: stable/10/etc/pkg/FreeBSD.conf
==============================================================================
--- stable/10/etc/pkg/FreeBSD.conf	Sun Nov  3 12:58:14 2013	(r257571)
+++ stable/10/etc/pkg/FreeBSD.conf	Sun Nov  3 13:00:12 2013	(r257572)
@@ -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: stable/10/share/Makefile
==============================================================================
--- stable/10/share/Makefile	Sun Nov  3 12:58:14 2013	(r257571)
+++ stable/10/share/Makefile	Sun Nov  3 13:00:12 2013	(r257572)
@@ -11,6 +11,7 @@ SUBDIR=	${_colldef} \
 	dtrace \
 	${_examples} \
 	${_i18n} \
+	keys \
 	${_man} \
 	${_me} \
 	misc \

Modified: stable/10/share/man/man7/hier.7
==============================================================================
--- stable/10/share/man/man7/hier.7	Sun Nov  3 12:58:14 2013	(r257571)
+++ stable/10/share/man/man7/hier.7	Sun Nov  3 13:00:12 2013	(r257572)
@@ -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