From owner-freebsd-security@freebsd.org Fri Oct 30 10:28:09 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 E7CC9A20AD4 for ; Fri, 30 Oct 2015 10:28:09 +0000 (UTC) (envelope-from franco@lastsummer.de) Received: from host64.kissl.de (host64.kissl.de [213.239.241.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "*.shmhost.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A74CD1DBD for ; Fri, 30 Oct 2015 10:28:09 +0000 (UTC) (envelope-from franco@lastsummer.de) Received: from localhost (localhost.localdomain [127.0.0.1]) by host64.kissl.de (Postfix) with ESMTP id B86D5B07E85; Fri, 30 Oct 2015 11:28:06 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at host64.kissl.de Received: from host64.kissl.de ([127.0.0.1]) by localhost (host64.kissl.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id InKtjcKB_7Hu; Fri, 30 Oct 2015 11:28:06 +0100 (CET) Received: from [10.0.100.2] (ip5f5ad30f.dynamic.kabel-deutschland.de [95.90.211.15]) (Authenticated sender: web104p1) by host64.kissl.de (Postfix) with ESMTPSA id 94150B07E84; Fri, 30 Oct 2015 11:28:06 +0100 (CET) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Subject: Re: Compilation problem since SA-15:25 for FreeBSD 10.2-RELEASE From: Franco Fichtner In-Reply-To: <20151030101811.GA27206@oslo.ath.cx> Date: Fri, 30 Oct 2015 11:28:05 +0100 Cc: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= , freebsd-security@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <2B49DF34-2500-48FA-83F8-0D81EB5A0A84@lastsummer.de> 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> To: "Herbert J. Skuhra" X-Mailer: Apple Mail (2.2104) 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:28:10 -0000 I had a similar issue with git-format-patch and git-am (on 10.1) where the generated patch output was mangled or could not be imported = correctly. I ended up omitting the actual text patch extraction by going directly = to the git objects with git-cherry-pick. No idea how to fix this though, sorry. > On 30 Oct 2015, at 11:18 am, Herbert J. Skuhra = wrote: >=20 > On Fri, Oct 30, 2015 at 09:24:03AM +0100, Dag-Erling Sm=C3=B8rgrav = wrote: >> Guillaume Bibaut writes: >>> Herbert J. Skuhra 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=E2=80=99= t this >>> be mentioned? >>=20 >> 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. >=20 > 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. >=20 > % 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 >=20 > Apply the patches from the other SAs (doesn't make any difference). = They > apply cleanly. >=20 > % patch < ../../ntp-102.patch >=20 > A lot of *.c, *.h and *.orig files are created in the wrong place! >=20 > So can anyone confirm that the ntp patches in the SA are correct and = we > are just too stupid to use patch? >=20 > Thanks. >=20 > --=20 > Herbert > _______________________________________________ > freebsd-security@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-security > To unsubscribe, send any mail to = "freebsd-security-unsubscribe@freebsd.org"