diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-03-11 14:48:44 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-03-11 14:48:44 +0000 |
| commit | ada9e40da5ddc7cd53fbefd2e1fbea007d93f737 (patch) | |
| tree | 0294f02a66665dea52b0e7fec24e85d51de66b92 | |
| parent | ffc18151c662ae8248d38ed44ed92923df1acbfb (diff) | |
MFC: r257145,r257147,r257150,r257159,r257164,r257168,r257344,r257667,r257668,
r258227,r260605
Add default configuration for FreeBSD official pkg(8) repositories
Add fingerprint for the trusted keys
Notes
svn path=/stable/9/; revision=263023
| -rw-r--r-- | etc/Makefile | 3 | ||||
| -rw-r--r-- | etc/mtree/BSD.root.dist | 2 | ||||
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 8 | ||||
| -rw-r--r-- | etc/pkg/FreeBSD.conf | 8 | ||||
| -rw-r--r-- | etc/pkg/Makefile | 10 | ||||
| -rw-r--r-- | share/Makefile | 1 | ||||
| -rw-r--r-- | share/keys/Makefile | 5 | ||||
| -rw-r--r-- | share/keys/pkg/Makefile | 5 | ||||
| -rw-r--r-- | share/keys/pkg/trusted/Makefile | 10 | ||||
| -rw-r--r-- | share/keys/pkg/trusted/pkg.freebsd.org.2013102301 | 4 | ||||
| -rw-r--r-- | share/man/man7/hier.7 | 12 |
11 files changed, 67 insertions, 1 deletions
diff --git a/etc/Makefile b/etc/Makefile index 9c6b73ca600e..a80ab9150870 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -224,6 +224,9 @@ distribution: ${_+_}cd ${.CURDIR}/devd; ${MAKE} install ${_+_}cd ${.CURDIR}/gss; ${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/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index a6cba2474491..86b93e137140 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -52,6 +52,8 @@ weekly .. .. + pkg + .. ppp .. rc.d diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 9964a6d2017e..ae3567d36dea 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -484,6 +484,14 @@ .. info .. + keys + pkg + revoked + .. + trusted + .. + .. + .. locale UTF-8 .. diff --git a/etc/pkg/FreeBSD.conf b/etc/pkg/FreeBSD.conf new file mode 100644 index 000000000000..7e56f3c130d3 --- /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: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: yes +} diff --git a/etc/pkg/Makefile b/etc/pkg/Makefile new file mode 100644 index 000000000000..abc8c64ca5cb --- /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> diff --git a/share/Makefile b/share/Makefile index e39da7f2792e..3e613d68cafe 100644 --- a/share/Makefile +++ b/share/Makefile @@ -11,6 +11,7 @@ SUBDIR= ${_colldef} \ dtrace \ ${_examples} \ ${_i18n} \ + keys \ ${_man} \ ${_me} \ misc \ diff --git a/share/keys/Makefile b/share/keys/Makefile new file mode 100644 index 000000000000..d685b064ccd3 --- /dev/null +++ b/share/keys/Makefile @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR= pkg + +.include <bsd.subdir.mk> diff --git a/share/keys/pkg/Makefile b/share/keys/pkg/Makefile new file mode 100644 index 000000000000..1d83caf9bfe8 --- /dev/null +++ b/share/keys/pkg/Makefile @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR= trusted + +.include <bsd.subdir.mk> diff --git a/share/keys/pkg/trusted/Makefile b/share/keys/pkg/trusted/Makefile new file mode 100644 index 000000000000..ee0d4c9224cd --- /dev/null +++ b/share/keys/pkg/trusted/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +NO_OBJ= + +FILES= pkg.freebsd.org.2013102301 + +FILESDIR= /usr/share/keys/pkg/trusted +FILESMODE= 644 + +.include <bsd.prog.mk> diff --git a/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 b/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 new file mode 100644 index 000000000000..3a144a338f29 --- /dev/null +++ b/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 @@ -0,0 +1,4 @@ +# $FreeBSD$ + +function: "sha256" +fingerprint: "b0170035af3acc5f3f3ae1859dc717101b4e6c1d0a794ad554928ca0cbb2f438" diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 9e980febc98a..03f258a48fe6 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -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 @@ -546,6 +546,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 |