From owner-freebsd-security@freebsd.org Fri Oct 30 10:29:10 2015 Return-Path: Delivered-To: freebsd-security@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C3B8A20B87 for ; Fri, 30 Oct 2015 10:29:10 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebius.int.ru", Issuer "cell.glebius.int.ru" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id A86EE1EBE for ; Fri, 30 Oct 2015 10:29:08 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.15.2/8.15.2) with ESMTPS id t9UAT4O9062419 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 30 Oct 2015 13:29:04 +0300 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.15.2/8.15.2/Submit) id t9UAT4Oh062418; Fri, 30 Oct 2015 13:29:04 +0300 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Fri, 30 Oct 2015 13:29:03 +0300 From: Gleb Smirnoff To: "Herbert J. Skuhra" Cc: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= , freebsd-security@freebsd.org Subject: Re: Compilation problem since SA-15:25 for FreeBSD 10.2-RELEASE Message-ID: <20151030102903.GT97830@glebius.int.ru> 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> <86wpu4bw7w.fsf@desk.des.no> <20151030101811.GA27206@oslo.ath.cx> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20151030101811.GA27206@oslo.ath.cx> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: freebsd-security@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security issues \[members-only posting\]" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Oct 2015 10:29:10 -0000 Herbert, On Fri, Oct 30, 2015 at 11:18:11AM +0100, Herbert J. Skuhra wrote: H> On Fri, Oct 30, 2015 at 09:24:03AM +0100, Dag-Erling Smørgrav wrote: H> > Guillaume Bibaut writes: H> > > Herbert J. Skuhra writes: H> > > > OK, with 'patch -p0 < /path/to/ntp-102.patch' I get only [...] H> > > As far as I know, the SA does not mention 'patch -p0'. Shouldn’t this H> > > be mentioned? H> > H> > BSD patch(1) assumes -p0. GNU patch(1) does not. I assume Herbert is H> > used to GNU patch(1) and used -p0 out of habit. It is harmless, but not H> > necessary. H> H> I simply tried '-p0' because the instructions in the SA didn't work at H> all! With '-p0' I end up with a src tree that builds at least (only a H> few man pages failed to patch). Tested on stable/10 and head. H> H> % fetch ftp.freebsd.org/pub/FreeBSD/releases/amd64/amd64/10.2-RELEASE/src.txz H> % fetch https://security.FreeBSD.org/patches/SA-15:25/ntp-102.patch.bz2 H> % tar xfJ src.txz H> % bunzip2 ntp-102.patch.bz2 H> % cd usr/src H> H> Apply the patches from the other SAs (doesn't make any difference). They H> apply cleanly. H> H> % patch < ../../ntp-102.patch H> H> A lot of *.c, *.h and *.orig files are created in the wrong place! H> H> So can anyone confirm that the ntp patches in the SA are correct and we H> are just too stupid to use patch? What does patch -v say for you? -- Totus tuus, Glebius.