MFC: r256770,r257142,r257145,r257146,r257147,r257148,

     r257149,r257150,r257158,r257159,r257164,r257168,
     r257193

  - Support checking signature for pkg bootstrap from remote
    and for 'pkg add ./pkg.txz'

  - Be verbose on where pkg is being bootstrapped from.

  - Add support for reading configuration files from /etc/pkg.
    For now only /etc/pkg/FreeBSD.conf is supported.

  - Add test package signing key fingerprint into /etc/keys/pkg/trusted.

  - Disable fingerprint checking by default for now as the official
    packages are not yet signed.

Approved by:	bapt
Approved by:	re (glebius)

8 files changed, 57 insertions, 0 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 130b168..75ebc88 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -221,7 +221,11 @@ 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
+.endif
 	${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
 	${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall
 	${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
diff --git a/etc/keys/Makefile b/etc/keys/Makefile
new file mode 100644
index 0000000..d685b06
--- /dev/null
+++ b/etc/keys/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR= pkg
+
+.include <bsd.subdir.mk>
diff --git a/etc/keys/pkg/Makefile b/etc/keys/pkg/Makefile
new file mode 100644
index 0000000..1d83caf
--- /dev/null
+++ b/etc/keys/pkg/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=	trusted
+
+.include <bsd.subdir.mk>
diff --git a/etc/keys/pkg/trusted/Makefile b/etc/keys/pkg/trusted/Makefile
new file mode 100644
index 0000000..fba8de7
--- /dev/null
+++ b/etc/keys/pkg/trusted/Makefile
@@ -0,0 +1,10 @@
+# $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
new file mode 100644
index 0000000..587f5dd
--- /dev/null
+++ b/etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
@@ -0,0 +1,5 @@
+# $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 a6cba24..cc6334b 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -34,6 +34,14 @@
         ..
         gss
         ..
+        keys
+            pkg
+                revoked
+                ..
+                trusted
+                ..
+            ..
+        ..
         mail
         ..
         mtree
@@ -52,6 +60,8 @@
             weekly
             ..
         ..
+        pkg
+        ..
         ppp
         ..
         rc.d
diff --git a/etc/pkg/FreeBSD.conf b/etc/pkg/FreeBSD.conf
new file mode 100644
index 0000000..435bcba
--- /dev/null
+++ b/etc/pkg/FreeBSD.conf
@@ -0,0 +1,8 @@
+# $FreeBSD$
+FreeBSD: {
+  url: "pkg+http://pkg.freebsd.org/${ABI}/latest",
+  mirror_type: "srv",
+  signature_type: "none",
+  fingerprints: "/etc/keys/pkg",
+  enabled: "yes"
+}
diff --git a/etc/pkg/Makefile b/etc/pkg/Makefile
new file mode 100644
index 0000000..abc8c64
--- /dev/null
+++ b/etc/pkg/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+FILES=	FreeBSD.conf
+
+FILESDIR=	/etc/pkg
+FILESMODE=	644
+
+.include <bsd.prog.mk>