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

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

On Fri, Oct 30, 2015 at 09:24:03AM +0100, Dag-Erling Sm?rgrav
wrote:
> 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.
I simply tried '-p0' because the instructions in the SA didn't work
at
all! With '-p0' I end up with a src tree that builds at least (only a
few man pages failed to patch). Tested on stable/10 and head.

% fetch ftp.freebsd.org/pub/FreeBSD/releases/amd64/amd64/10.2-RELEASE/src.txz
% fetch https://security.FreeBSD.org/patches/SA-15:25/ntp-102.patch.bz2
% tar xfJ src.txz
% bunzip2 ntp-102.patch.bz2
% cd usr/src

Apply the patches from the other SAs (doesn't make any difference). They
apply cleanly.

% patch < ../../ntp-102.patch

A lot of *.c, *.h and *.orig files are created in the wrong place!

So can anyone confirm that the ntp patches in the SA are correct and we
are just too stupid to use patch?

Thanks.

-- 
Herbert