Date: Tue, 29 Oct 2013 10:36:38 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r257344 - in head: etc etc/keys etc/mtree etc/pkg share share/keys share/keys/pkg/trusted share/man/man7 Message-ID: <526FD606.3040301@FreeBSD.org> In-Reply-To: <201310291507.r9TF7s06010835@svn.freebsd.org> References: <201310291507.r9TF7s06010835@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ngPFApEJBd3mMSGglbWBxIcqUOR953iNO Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 10/29/2013 10:07 AM, Bryan Drewery wrote: > Author: bdrewery (ports committer) > Date: Tue Oct 29 15:07:54 2013 > New Revision: 257344 > URL: http://svnweb.freebsd.org/changeset/base/257344 >=20 > Log: > Move /etc/keys to /usr/share/keys where users are less likely to modi= fy them. > =20 > Requested by: secteam (cperciva, des) > Approved by: bapt I plan to MFC after 2 days. >=20 > Added: > head/share/keys/ > - copied from r257343, head/etc/keys/ > Deleted: > head/etc/keys/ > Modified: > head/etc/Makefile > head/etc/mtree/BSD.root.dist > head/etc/mtree/BSD.usr.dist > head/etc/pkg/FreeBSD.conf > head/share/Makefile > head/share/keys/pkg/trusted/Makefile > head/share/man/man7/hier.7 >=20 > Modified: head/etc/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/etc/Makefile Tue Oct 29 14:44:36 2013 (r257343) > +++ head/etc/Makefile Tue Oct 29 15:07:54 2013 (r257344) > @@ -224,7 +224,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} !=3D "no" > ${_+_}cd ${.CURDIR}/pkg; ${MAKE} install >=20 > Modified: head/etc/mtree/BSD.root.dist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/etc/mtree/BSD.root.dist Tue Oct 29 14:44:36 2013 (r257343) > +++ head/etc/mtree/BSD.root.dist Tue Oct 29 15:07:54 2013 (r257344) > @@ -34,14 +34,6 @@ > .. > gss > .. > - keys > - pkg > - revoked > - .. > - trusted > - .. > - .. > - .. > mail > .. > mtree >=20 > Modified: head/etc/mtree/BSD.usr.dist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/etc/mtree/BSD.usr.dist Tue Oct 29 14:44:36 2013 (r257343) > +++ head/etc/mtree/BSD.usr.dist Tue Oct 29 15:07:54 2013 (r257344) > @@ -478,6 +478,14 @@ > .. > info > .. > + keys > + pkg > + revoked > + .. > + trusted > + .. > + .. > + .. > locale > UTF-8 > .. >=20 > Modified: head/etc/pkg/FreeBSD.conf > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/etc/pkg/FreeBSD.conf Tue Oct 29 14:44:36 2013 (r257343) > +++ head/etc/pkg/FreeBSD.conf Tue Oct 29 15:07:54 2013 (r257344) > @@ -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" > } >=20 > Modified: head/share/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/share/Makefile Tue Oct 29 14:44:36 2013 (r257343) > +++ head/share/Makefile Tue Oct 29 15:07:54 2013 (r257344) > @@ -11,6 +11,7 @@ SUBDIR=3D ${_colldef} \ > dtrace \ > ${_examples} \ > ${_i18n} \ > + keys \ > ${_man} \ > ${_me} \ > misc \ >=20 > Modified: head/share/keys/pkg/trusted/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/etc/keys/pkg/trusted/Makefile Tue Oct 29 14:44:36 2013 (r25734= 3) > +++ head/share/keys/pkg/trusted/Makefile Tue Oct 29 15:07:54 2013 (r257= 344) > @@ -4,7 +4,7 @@ NO_OBJ=3D > =20 > FILES=3D pkg.freebsd.org.2013102301 > =20 > -FILESDIR=3D /etc/keys/pkg/trusted > +FILESDIR=3D /usr/share/keys/pkg/trusted > FILESMODE=3D 644 > =20 > .include <bsd.prog.mk> >=20 > Modified: head/share/man/man7/hier.7 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/share/man/man7/hier.7 Tue Oct 29 14:44:36 2013 (r257343) > +++ head/share/man/man7/hier.7 Tue Oct 29 15:07:54 2013 (r257344) > @@ -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 > _______________________________________________ > svn-src-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" >=20 --=20 Regards, Bryan Drewery --ngPFApEJBd3mMSGglbWBxIcqUOR953iNO Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSb9YGAAoJEG54KsA8mwz5BnAQAJF+kP+r0ySy2ZrDXoJU3Kx7 T0fWkxYHn2W+EVSjHuFhPMxPzn3nElLdlogcC76HuaTI1WBDz7gKNo6oHLkiYP31 aG71MU+csBmD5DwIf4qa1iZcXDXjbp5UZmbifwcg5gzqHAhUHbCQp2VUOWdhhhZF /4gskLSlbVnesGPR5NAfSuHSeK77p3sN98hWX49ctbXGNTrv2R24dJsmXQnbMMT3 dtVTN0SiJqdxh/fWces0U6WOPW84YeWZFuyzmmCTOPFIOjn1VXJE8FSX9Mh6Jx0j DWPUPu6oDxjXXWIoI9wK+XBU9AArlzVMEQhYqocMX/oOjWGAVUrowRhn1+CMSeY2 qYrit/KOHtLbOADxlQCsqIJFE+oWl8fABzo+hTVA8x4eu7Kf8KCcZGgMiQVB1vGn Wj/3gIELRAg71BvHEuYO6M1bl5eZ5IWDxKr0I09ydgpg3JRLq9bmKf61GErz7RaG EeVwfbAD0zqyEcIq1VvRdE1wbtb0vYj+Su0qEOWVzvARVTSUyA8eqVYXIHPhWfSc XYxUsjLvGdFQI9QONfo1kodyo/qIbYwh5D5NUzDitDkQjdQKQcp19G4zLZqINQNX 47/jrp1RDbLnUEQ8yzamN0nl20qviIKfogbfh1QWnAVQK6lXQXuUvoVW0Un92tu0 5dQgcIdr347VcziAV38g =cvbC -----END PGP SIGNATURE----- --ngPFApEJBd3mMSGglbWBxIcqUOR953iNO--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?526FD606.3040301>