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

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
> 
> 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

On Tue, Oct 27, 2015 at 01:59:13PM +0100, Herbert J. Skuhra
wrote:
> 
>> 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.
Sorry, I am wrong. ENs are also included in releng.

-- 
Herbert

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