diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-10-26 03:53:24 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-10-26 03:53:24 +0000 |
| commit | 24a221290630597c5f8493878db09fe1c9276c93 (patch) | |
| tree | 2896a8b395e5007cc46a00d2af9b55ece80f1d73 /etc | |
| parent | 52cb76fe60a75d14dd5aef983a2740c251d07e5d (diff) | |
| download | src-24a221290630597c5f8493878db09fe1c9276c93.tar.gz src-24a221290630597c5f8493878db09fe1c9276c93.zip | |
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
Notes
Notes:
svn path=/head/; revision=257150
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 1 | ||||
| -rw-r--r-- | etc/keys/Makefile | 5 | ||||
| -rw-r--r-- | etc/keys/pkg/Makefile | 5 | ||||
| -rw-r--r-- | etc/keys/pkg/trusted/Makefile | 10 | ||||
| -rw-r--r-- | etc/keys/pkg/trusted/pkg.freebsd.org.2013102301 | 5 | ||||
| -rw-r--r-- | etc/mtree/BSD.root.dist | 8 |
6 files changed, 34 insertions, 0 deletions
diff --git a/etc/Makefile b/etc/Makefile index d763df6d44e9..09c28141d833 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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 diff --git a/etc/keys/Makefile b/etc/keys/Makefile new file mode 100644 index 000000000000..d685b064ccd3 --- /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 000000000000..1d83caf9bfe8 --- /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 000000000000..fba8de73597b --- /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 000000000000..587f5dd87b34 --- /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 a6cba2474491..f182817ed8fd 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -34,6 +34,14 @@ .. gss .. + keys + pkg + revoked + .. + trusted + .. + .. + .. mail .. mtree |