Date: Fri, 30 Oct 2015 11:28:05 +0100 From: Franco Fichtner <franco@lastsummer.de> To: "Herbert J. Skuhra" <herbert@oslo.ath.cx> Cc: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no>, freebsd-security@freebsd.org Subject: Re: Compilation problem since SA-15:25 for FreeBSD 10.2-RELEASE Message-ID: <2B49DF34-2500-48FA-83F8-0D81EB5A0A84@lastsummer.de> In-Reply-To: <20151030101811.GA27206@oslo.ath.cx> 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> <AA734831-0FE8-4E8B-BEED-64B9D020C201@iaelu.net> <86wpu4bw7w.fsf@desk.des.no> <20151030101811.GA27206@oslo.ath.cx>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <herbert@oslo.ath.cx> = wrote: >=20 > On Fri, Oct 30, 2015 at 09:24:03AM +0100, Dag-Erling Sm=C3=B8rgrav = wrote: >> Guillaume Bibaut <freebsd-security@iaelu.net> writes: >>> Herbert J. Skuhra <herbert@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=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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2B49DF34-2500-48FA-83F8-0D81EB5A0A84>