From owner-freebsd-stable@FreeBSD.ORG Tue Mar 11 21:20:07 2014 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E926E23D for ; Tue, 11 Mar 2014 21:20:07 +0000 (UTC) Received: from mail-pa0-f45.google.com (mail-pa0-f45.google.com [209.85.220.45]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BA8052E5 for ; Tue, 11 Mar 2014 21:20:07 +0000 (UTC) Received: by mail-pa0-f45.google.com with SMTP id kl14so110616pab.18 for ; Tue, 11 Mar 2014 14:20:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:content-type:mime-version:subject:from :in-reply-to:date:cc:content-transfer-encoding:message-id:references :to; bh=eMszJH/B8WxkfPUOWd+gn6ocoVT+abXsh9x1fkWAL0M=; b=B2eBpXNHlmqCC21wDC2wJ3/58bXBcN5DzUnJlSwoR+otufkFkD7rUIsIyX40SLMNXz cWzeb+NMNDHnQIJXLgvEnjavHGRVNI/bT17nYKYKtfc8e8gvK+57ADpRkKdl17zAwv3u OOpgdhGjV8PDGXspYHjY1Tq21tIkG4+nKj2xG0yGgGN1ODIpBd+dqR+Qmp7lWVoVBYbk OIksyUcL87jgvElFbaiLW3qZdpsEpaa4BxBTHUhB9cPbsgN6IDnu2rjh1wbxk5ySPHz0 fVDSc5GeodZaFSxkmHQjmSdZMexS2m/l22U6V0QqWr4u5QkWaU5jfF76pmB7O7r/2Zxm jrCw== X-Gm-Message-State: ALoCoQlqkYIAE/Okil198SQQbZIJoapxYxPl/jPGmYEQxN3DTwcDGzq/nFLhQvuB3YNgkW1Bv7UA X-Received: by 10.68.136.133 with SMTP id qa5mr394142pbb.63.1394572801191; Tue, 11 Mar 2014 14:20:01 -0700 (PDT) Received: from [10.64.26.205] (dc1-prod.netflix.com. [69.53.236.251]) by mx.google.com with ESMTPSA id tu3sm1604277pab.1.2014.03.11.14.19.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Mar 2014 14:20:00 -0700 (PDT) Sender: Warner Losh Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 7.2 \(1874\)) Subject: Re: svn commit: r263023 - in stable/9: etc etc/mtree etc/pkg share share/keys share/keys/pkg/trusted share/man/man7 From: Warner Losh In-Reply-To: <531F78C6.9000908@sentex.net> Date: Tue, 11 Mar 2014 15:19:58 -0600 Content-Transfer-Encoding: quoted-printable Message-Id: <4E9C42B9-B30A-4522-8A73-FF6A056ED483@gmail.com> References: <201403111448.s2BEmiXG029888@svn.freebsd.org> <531F78C6.9000908@sentex.net> To: Mike Tancsa X-Mailer: Apple Mail (2.1874) Cc: Baptiste Daroussin , FreeBSD-STABLE Mailing List X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Mar 2014 21:20:08 -0000 Somebody forgot to add it to the share/mk/bsd.own.mk list of options. Warner On Mar 11, 2014, at 2:57 PM, Mike Tancsa wrote: > Hi, > For some reason, this has broken my build on RELENG_9. If I >=20 > svn update -r 263022 >=20 > all builds again. With svn update -r 263023, I get the failure below >=20 > Other than KERNCONF=3D, I have nothing in make.conf and src.conf on = this machine. >=20 > ---Mike >=20 > =3D=3D=3D> etc (obj) > "/usr/src/etc/Makefile", line 227: Malformed conditional = (${MK_PKGBOOTSTRAP} !=3D "no") > "/usr/src/etc/Makefile", line 229: if-less endif > make: fatal errors encountered -- cannot continue > *** [etc.obj__D] Error code 1 >=20 > Stop in /usr/src. > *** [_obj] Error code 1 >=20 > Stop in /usr/src. > *** [buildworld] Error code 1 >=20 > Stop in /usr/src. >=20 >=20 > ---Mike >=20 > On 3/11/2014 10:48 AM, Baptiste Daroussin wrote: >> Author: bapt >> Date: Tue Mar 11 14:48:44 2014 >> New Revision: 263023 >> URL: http://svnweb.freebsd.org/changeset/base/263023 >>=20 >> Log: >> MFC: = r257145,r257147,r257150,r257159,r257164,r257168,r257344,r257667,r257668, >> r258227,r260605 >>=20 >> Add default configuration for FreeBSD official pkg(8) repositories >> Add fingerprint for the trusted keys >>=20 >> Added: >> stable/9/etc/pkg/ >> - copied from r257145, head/etc/pkg/ >> stable/9/share/keys/ >> - copied from r257344, head/share/keys/ >> Modified: >> stable/9/etc/Makefile >> stable/9/etc/mtree/BSD.root.dist >> stable/9/etc/mtree/BSD.usr.dist >> stable/9/etc/pkg/FreeBSD.conf >> stable/9/share/Makefile >> stable/9/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 >> stable/9/share/man/man7/hier.7 >> Directory Properties: >> stable/9/etc/ (props changed) >> stable/9/etc/mtree/ (props changed) >> stable/9/share/ (props changed) >> stable/9/share/man/ (props changed) >> stable/9/share/man/man7/ (props changed) >>=20 >> Modified: stable/9/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 >> --- stable/9/etc/Makefile Tue Mar 11 14:33:42 2014 = (r263022) >> +++ stable/9/etc/Makefile Tue Mar 11 14:48:44 2014 = (r263023) >> @@ -224,6 +224,9 @@ distribution: >> ${_+_}cd ${.CURDIR}/devd; ${MAKE} install >> ${_+_}cd ${.CURDIR}/gss; ${MAKE} install >> ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install >> +.if ${MK_PKGBOOTSTRAP} !=3D "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 >>=20 >> Modified: stable/9/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 >> --- stable/9/etc/mtree/BSD.root.dist Tue Mar 11 14:33:42 2014 = (r263022) >> +++ stable/9/etc/mtree/BSD.root.dist Tue Mar 11 14:48:44 2014 = (r263023) >> @@ -52,6 +52,8 @@ >> weekly >> .. >> .. >> + pkg >> + .. >> ppp >> .. >> rc.d >>=20 >> Modified: stable/9/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 >> --- stable/9/etc/mtree/BSD.usr.dist Tue Mar 11 14:33:42 2014 = (r263022) >> +++ stable/9/etc/mtree/BSD.usr.dist Tue Mar 11 14:48:44 2014 = (r263023) >> @@ -484,6 +484,14 @@ >> .. >> info >> .. >> + keys >> + pkg >> + revoked >> + .. >> + trusted >> + .. >> + .. >> + .. >> locale >> UTF-8 >> .. >>=20 >> Modified: stable/9/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 Sat Oct 26 03:31:05 2013 = (r257145) >> +++ stable/9/etc/pkg/FreeBSD.conf Tue Mar 11 14:48:44 2014 = (r263023) >> @@ -1,6 +1,8 @@ >> # $FreeBSD$ >> FreeBSD: { >> - url: "pkg+http://pkg.freebsd.org/${ABI}/latest", >> + url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", >> mirror_type: "srv", >> - enabled: "yes" >> + signature_type: "fingerprints", >> + fingerprints: "/usr/share/keys/pkg", >> + enabled: yes >> } >>=20 >> Modified: stable/9/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 >> --- stable/9/share/Makefile Tue Mar 11 14:33:42 2014 = (r263022) >> +++ stable/9/share/Makefile Tue Mar 11 14:48:44 2014 = (r263023) >> @@ -11,6 +11,7 @@ SUBDIR=3D ${_colldef} \ >> dtrace \ >> ${_examples} \ >> ${_i18n} \ >> + keys \ >> ${_man} \ >> ${_me} \ >> misc \ >>=20 >> Modified: stable/9/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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/keys/pkg/trusted/pkg.freebsd.org.2013102301 Tue Oct = 29 15:07:54 2013 (r257344) >> +++ stable/9/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 = Tue Mar 11 14:48:44 2014 (r263023) >> @@ -1,5 +1,4 @@ >> # $FreeBSD$ >> -# This key is for testing purposes only and will be revoked before = 10.0-RELEASE >>=20 >> function: "sha256" >> fingerprint: = "b0170035af3acc5f3f3ae1859dc717101b4e6c1d0a794ad554928ca0cbb2f438" >>=20 >> Modified: stable/9/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 >> --- stable/9/share/man/man7/hier.7 Tue Mar 11 14:33:42 2014 = (r263022) >> +++ stable/9/share/man/man7/hier.7 Tue Mar 11 14:48:44 2014 = (r263023) >> @@ -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 >> _______________________________________________ >> svn-src-stable-9@freebsd.org mailing list >> http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9 >> To unsubscribe, send any mail to = "svn-src-stable-9-unsubscribe@freebsd.org" >>=20 >>=20 >=20 >=20 > --=20 > ------------------- > Mike Tancsa, tel +1 519 651 3400 > Sentex Communications, mike@sentex.net > Providing Internet services since 1994 www.sentex.net > Cambridge, Ontario Canada http://www.tancsa.com/ > _______________________________________________ > freebsd-stable@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to = "freebsd-stable-unsubscribe@freebsd.org"