freebsd security - Oct 2015 - Compilation problem since SA-15:25 for FreeBSD 10.2-RELEASE

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 at 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 at
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 at freebsd.org mailing list
>>>> https://lists.freebsd.org/mailman/listinfo/freebsd-security
>>>> To unsubscribe, send any mail to
"freebsd-security-unsubscribe at 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 at freebsd.org <mailto:freebsd-security at
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 at
freebsd.org <mailto:freebsd-security-unsubscribe at freebsd.org>"

Guillaume Bibaut <freebsd-security at iaelu.net>
writes:
> Herbert J. Skuhra <herbert at oslo.ath.cx> writes:
> > OK, with 'patch -p0 < /path/to/ntp-102.patch' I get only
[...]
> As far as I know, the SA does not mention 'patch -p0'. Shouldn?t
this
> be mentioned?
BSD patch(1) assumes -p0.  GNU patch(1) does not.  I assume Herbert is
used to GNU patch(1) and used -p0 out of habit.  It is harmless, but not
necessary.

DES
-- 
Dag-Erling Sm?rgrav - des at des.no