Date: Tue, 27 Oct 2015 13:59:13 +0100 From: "Herbert J. Skuhra" <herbert@oslo.ath.cx> To: Guillaume Bibaut <freebsd-security@iaelu.net> Cc: freebsd-security@freebsd.org Subject: Re: Compilation problem since SA-15:25 for FreeBSD 10.2-RELEASE Message-ID: <20151027125913.GB7848@oslo.ath.cx> In-Reply-To: <4043BA45-F5A5-4218-93F2-C320DE65EB6D@iaelu.net> References: <4D69BAFF-7447-4A1F-ABB8-686CA34090F3@iaelu.net> <20151027114642.GA7848@oslo.ath.cx> <4043BA45-F5A5-4218-93F2-C320DE65EB6D@iaelu.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Oct 27, 2015 at 01:35:56PM +0100, Guillaume Bibaut wrote: > > > Le 27 oct. 2015 à 12:46, Herbert J. Skuhra <herbert@oslo.ath.cx> a écrit : > > > > On Tue, Oct 27, 2015 at 11:48:24AM +0100, Guillaume Bibaut wrote: > >> Hello, > >> > >> I’ve been applying NTP patches successfully recently, but when I try > >> to compile once patches applied, the make fails badly on ntp folders. > >> I’ve tried to download FreeBSD 10.2-RELEASE sources, and to reapply > >> patches since that release to be up to date, but the compilation fails > >> in the same folder: > >> > >> # make -j 10 buildworld > >> […] > > > > Did the patch apply cleanly? Or do you have some *.rej files in the > > source tree? Somehow I don't manage to do this. > > > > Does the build complete if you do: > > > > # svnlite co https://svn.freebsd.org/base/releng/10.2/ src > > # cd src > > # make -j 10 buildworld > > > > -- > > Herbert > > _______________________________________________ > > freebsd-security@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/freebsd-security > > To unsubscribe, send any mail to "freebsd-security-unsubscribe@freebsd.org" > > > > Here is what I’ve done: > cd /usr > mv src src-bak > mkdir src > cd > # src.txz is the tarball for FreeBSD 10.2-RELEASE sources > tar —unlink -xvpJf src.txz -C / > cd /usr/src > # for all patches since 10.2-RELEASE (taking shortcuts here because I don’t want to spam) > patch </path/to/patches/since/10.2-RELEASE > patch </path/to/SA-15:25/ntp-102.patch > > For this last patch, I’m getting some question from the patch command about 2 files that are in some test folder, telling they are reversed or something like that, assumes yes per default. > After the patch, here is what looks like my /usr/src folder: > > # ls -al > total 1167 > [...] > > > So there are 2 files marked .rej, but I think it’s the ones from the reversed messages during the patch command, and there are also quite a few files that get into the /usr/src folder, I just do not understand why. > I’ve only applied patches just like it’s adviced in the security advisories. I had the same issue. > I guess that checking out releng/10.2 and compiling it would succeed, because it’s a clean pull, but I’m not sure that releng/10.2 and applying patches to 10.2-RELEASE is the same. Check https://www.freebsd.org/releng/ : releng/10.2 | Frozen | security-officer@ | FreeBSD 10.2 supported errata fix branch. So I would say it's the same: release + security fixes. -- Herbert
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20151027125913.GB7848>