Compilation problem since SA-15:25 for FreeBSD 10.2-RELEASE
Guillaume Bibaut
freebsd-security at iaelu.net
Tue Oct 27 12:36:01 UTC 2015
> 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
drwxr-xr-x 23 root wheel 94 Oct 27 11:09 .
drwxr-xr-x 21 root wheel 21 Oct 27 12:29 ..
-rw-r--r-- 1 root wheel 6197 Aug 12 16:21 COPYRIGHT
-rw-r--r-- 1 root wheel 741 Aug 12 16:21 LOCKS
-rw-r--r-- 1 root wheel 6329 Aug 12 16:21 MAINTAINERS
-rw-r--r-- 1 root wheel 19666 Oct 27 11:09 Makefile
-rw-r--r-- 1 root wheel 1761 Oct 27 11:09 Makefile.am
-rw-r--r-- 1 root wheel 1843 Oct 27 11:08 Makefile.am.orig
-rw------- 1 root wheel 1001 Oct 27 11:08 Makefile.am.rej
-rw-r--r-- 1 root wheel 41802 Oct 27 11:09 Makefile.in
-rw-r--r-- 1 root wheel 41661 Oct 27 11:09 Makefile.in.orig
-rw-r--r-- 1 root wheel 329 Oct 27 11:09 Makefile.in.rej
-rw-r--r-- 1 root wheel 3880 Oct 27 11:08 Makefile.in.rej.orig
-rw-r--r-- 1 root wheel 66380 Oct 27 11:05 Makefile.inc1
-rw-r--r-- 1 root wheel 66374 Aug 12 16:21 Makefile.inc1.orig
-rw-r--r-- 1 root wheel 19666 Oct 27 11:09 Makefile.orig
-rw-r--r-- 1 root wheel 119 Oct 27 11:09 Makefile.rej
-rw-r--r-- 1 root wheel 120 Oct 27 11:09 Makefile.rej.orig
-rw-r--r-- 1 root wheel 288001 Aug 12 16:21 ObsoleteFiles.inc
-rw-r--r-- 1 root wheel 3174 Aug 12 16:20 README
-rw-r--r-- 1 root wheel 91759 Aug 12 16:21 UPDATING
drwxr-xr-x 42 root wheel 44 Aug 12 16:21 bin
drwxr-xr-x 9 root wheel 11 Aug 12 16:21 cddl
drwxr-xr-x 85 root wheel 85 Aug 12 16:21 contrib
drwxr-xr-x 5 root wheel 6 Aug 12 16:22 crypto
drwxr-xr-x 25 root wheel 94 Aug 12 16:21 etc
-rw-r--r-- 1 root wheel 1272 Oct 27 11:08 fileHandlingTest.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 fileHandlingTest.c.orig
drwxr-xr-x 14 root wheel 16 Aug 12 16:20 games
drwxr-xr-x 5 root wheel 9 Aug 12 16:22 gnu
drwxr-xr-x 8 root wheel 105 Aug 12 16:22 include
drwxr-xr-x 9 root wheel 12 Aug 12 16:21 kerberos5
-rw-r--r-- 1 root wheel 36764 Oct 27 11:08 leapsec.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 leapsec.c.orig
-rw-r--r-- 1 root wheel 198 Oct 27 11:08 lfptest.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 lfptest.c.orig
drwxr-xr-x 101 root wheel 103 Aug 12 16:21 lib
drwxr-xr-x 34 root wheel 36 Aug 12 16:21 libexec
-rw-r--r-- 1 root wheel 6045 Oct 27 11:08 ntp_prio_q.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 ntp_prio_q.c.orig
-rw-r--r-- 1 root wheel 1683 Oct 27 11:08 ntp_problemtests.m4
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 ntp_problemtests.m4.orig
-rw-r--r-- 1 root wheel 5572 Oct 27 11:08 ntp_restrict.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 ntp_restrict.c.orig
-rw-r--r-- 1 root wheel 6580 Oct 27 11:08 parseOutput.rb
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 parseOutput.rb.orig
-rw-r--r-- 1 root wheel 978 Oct 27 11:08 rc_cmdlength.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 rc_cmdlength.c.orig
-rw-r--r-- 1 root wheel 83 Oct 27 11:08 rc_cmdlength.h
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 rc_cmdlength.h.orig
drwxr-xr-x 14 root wheel 25 Aug 12 16:22 release
drwxr-xr-x 4 root wheel 6 Aug 12 16:22 rescue
-rw-r--r-- 1 root wheel 3733 Oct 27 11:08 run-leapsec.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 run-leapsec.c.orig
-rw-r--r-- 1 root wheel 1608 Oct 27 11:08 run-ntp_prio_q.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 run-ntp_prio_q.c.orig
-rw-r--r-- 1 root wheel 1784 Oct 27 11:08 run-ntp_restrict.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 run-ntp_restrict.c.orig
-rw-r--r-- 1 root wheel 1132 Oct 27 11:08 run-rc_cmdlength.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 run-rc_cmdlength.c.orig
-rw-r--r-- 1 root wheel 1201 Oct 27 11:08 run-t-log.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 run-t-log.c.orig
-rw-r--r-- 1 root wheel 1783 Oct 27 11:08 run-t-ntp_scanner.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 run-t-ntp_scanner.c.orig
-rw-r--r-- 1 root wheel 1496 Oct 27 11:08 run-t-ntp_signd.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 run-t-ntp_signd.c.orig
-rw-r--r-- 1 root wheel 1019 Oct 27 11:08 run-t-ntpq.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 run-t-ntpq.c.orig
drwxr-xr-x 91 root wheel 100 Aug 12 16:20 sbin
drwxr-xr-x 7 root wheel 9 Aug 12 16:22 secure
drwxr-xr-x 29 root wheel 31 Aug 12 16:21 share
-rw-r--r-- 1 root wheel 505 Oct 27 11:08 sntptest.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 sntptest.c.orig
-rw-r--r-- 1 root wheel 1353 Oct 27 11:08 sockaddrtest.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 sockaddrtest.c.orig
drwxr-xr-x 57 root wheel 58 Aug 12 16:22 sys
-rw-r--r-- 1 root wheel 2183 Oct 27 11:08 t-log.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 t-log.c.orig
-rw-r--r-- 1 root wheel 3056 Oct 27 11:08 t-ntp_scanner.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 t-ntp_scanner.c.orig
-rw-r--r-- 1 root wheel 2303 Oct 27 11:08 t-ntp_signd.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 t-ntp_signd.c.orig
-rw-r--r-- 1 root wheel 481 Oct 27 11:08 t-ntpq.c
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 t-ntpq.c.orig
drwxr-xr-x 5 root wheel 8 Aug 12 16:21 tests
drwxr-xr-x 13 root wheel 17 Aug 12 16:20 tools
-rw-r--r-- 1 root wheel 212 Oct 27 11:08 type_sanitizer.rb
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 type_sanitizer.rb.orig
-rw-r--r-- 1 root wheel 189 Oct 27 11:08 unity_config.h
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 unity_config.h.orig
-rw-r--r-- 1 root wheel 5033 Oct 27 11:08 unity_test_summary.py
-rw-r--r-- 1 root wheel 0 Oct 27 11:08 unity_test_summary.py.orig
drwxr-xr-x 258 root wheel 266 Aug 12 16:22 usr.bin
drwxr-xr-x 218 root wheel 227 Aug 12 16:21 usr.sbin
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 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.
--
Guillaume
More information about the freebsd-security
mailing list