Date: Tue, 27 Oct 2015 16:21:16 +0100 From: Guillaume Bibaut <freebsd-security@iaelu.net> To: "Herbert J. Skuhra" <herbert@oslo.ath.cx> Cc: freebsd-security@freebsd.org Subject: Re: Compilation problem since SA-15:25 for FreeBSD 10.2-RELEASE Message-ID: <AA734831-0FE8-4E8B-BEED-64B9D020C201@iaelu.net> In-Reply-To: <20151027150144.GD7848@oslo.ath.cx> References: <4D69BAFF-7447-4A1F-ABB8-686CA34090F3@iaelu.net> <20151027114642.GA7848@oslo.ath.cx> <4043BA45-F5A5-4218-93F2-C320DE65EB6D@iaelu.net> <20151027125913.GB7848@oslo.ath.cx> <20151027150144.GD7848@oslo.ath.cx>
next in thread | previous in thread | raw e-mail | index | archive | help
Ok thank you for that. As far as I know, the SA does not mention 'patch -p0'. Shouldn’t this be mentioned? Or does it mean every SA or EN have to be applied this way ? I’m just wondering so that I can do it right next time. -- Guillaume > Le 27 oct. 2015 à 16:01, Herbert J. Skuhra <herbert@oslo.ath.cx> a écrit : > > On Tue, Oct 27, 2015 at 01:59:13PM +0100, Herbert J. Skuhra wrote: >> 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 > > OK, with 'patch -p0 < /path/to/ntp-102.patch' I get only > > ./usr.sbin/ntp/doc/ntp.conf.5.rej > ./usr.sbin/ntp/doc/sntp.8.rej > ./usr.sbin/ntp/doc/ntpd.8.rej > ./usr.sbin/ntp/doc/ntpq.8.rej > ./usr.sbin/ntp/doc/ntpdc.8.rej > ./usr.sbin/ntp/doc/ntp-keygen.8.rej > ./usr.sbin/ntp/doc/ntp.keys.5.rej > > and buildworld completes. > > -- > Herbert > _______________________________________________ > freebsd-security@freebsd.org <mailto:freebsd-security@freebsd.org> mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-security <https://lists.freebsd.org/mailman/listinfo/freebsd-security>; > To unsubscribe, send any mail to "freebsd-security-unsubscribe@freebsd.org <mailto:freebsd-security-unsubscribe@freebsd.org>"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AA734831-0FE8-4E8B-BEED-64B9D020C201>