From owner-freebsd-current@FreeBSD.ORG Tue Jan 29 18:42:33 2013 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DAADD951 for ; Tue, 29 Jan 2013 18:42:33 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm38-vm7.bullet.mail.bf1.yahoo.com (nm38-vm7.bullet.mail.bf1.yahoo.com [72.30.239.23]) by mx1.freebsd.org (Postfix) with ESMTP id A915FF44 for ; Tue, 29 Jan 2013 18:42:32 +0000 (UTC) Received: from [98.139.214.32] by nm38.bullet.mail.bf1.yahoo.com with NNFMP; 29 Jan 2013 18:42:31 -0000 Received: from [98.139.213.4] by tm15.bullet.mail.bf1.yahoo.com with NNFMP; 29 Jan 2013 18:42:31 -0000 Received: from [127.0.0.1] by smtp104.mail.bf1.yahoo.com with NNFMP; 29 Jan 2013 18:42:31 -0000 X-Yahoo-Newman-Id: 410131.83413.bm@smtp104.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: OxeNg.gVM1lW72Cv92OMgv0OekU8f5rG1a0oaQSU.oI4ipZ C_B6sFz7.3lzHwplcnvmMt7HvvXYPFkdtSNwGEr1Xj.zOfqVBNvNPgHqkPVi kLcF8YONL1g4_XD9vTzkorULYvTluqT351sCAySK4dySmkVDgGXyeLjuVX8j 87bdP46RCe0bU0y5S6edQstoiuS76aXN5aFr24rDv.KbBkBgkL_fJv6h_cTJ rNpDGpc7LTOyR0llr5QUrzNPKSFokKJV0PJG_AIlZHYf.E7fLa3TU4y5MkC7 dwUlk54ABVz3aAvvjpj1NXjvLAUhK4sM8fvHabF7BYDUXVQqotpIl2uAnhdQ PKBH1B.A3J6_DfIhfKG6UJ1NdOfD5p9v4GfkuBDGdG_yfBQmrwBuGUksOYy5 9TRcx3TisYPtzOtKfdcuy6kL4S90KZ0qTWloY7MRvofDQ2ABw2OIY6vlA7pz XfeEROY2oLsuC9pUGTKSwGWbQ0QBpXhNSs8j0B2f0Iug1GiYXaFBWv3C1LEo pzxHgIpz.uHSyhNIxLXgFfplcDjRP6EoFoYMUujCtNXV7yhzNgxhZCrkBgm3 NQ3TB5yXUjrCfK1Udkg-- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Received: from [192.168.10.102] (pfg@200.118.157.7 with plain) by smtp104.mail.bf1.yahoo.com with SMTP; 29 Jan 2013 10:42:31 -0800 PST Message-ID: <5108181D.9090805@FreeBSD.org> Date: Tue, 29 Jan 2013 13:42:37 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: freebsd-current@FreeBSD.org Subject: [CFT] WITH_BSD_PATCH References: <201301291703.r0TH3JaO078248@svn.freebsd.org> In-Reply-To: <201301291703.r0TH3JaO078248@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2013 18:42:33 -0000 (Not sure the first announcement made it - Sorry if you get this twice) Fellow FreeBSD developers; As many of you may have noticed as of r246074 we have a new version of patch(1) in the tree! The brief history is this: - Larry Wall developed the first patch(1) implementation which was taken by the FSF and greatly enhanced into what today is GNU patch. - FreeBSD has been using an early version of GNU patch (2.1) and made some relatively small enhancements on it. Two of the files in FreeBSD are under the GPL. -OpenBSD took a very old version of patch (2.0) and started from there. The GPL'd files were replaced with PD or otherwise unrestricted versions. - The OpenBSD version was ported to DragonFly BSD and after further enhancements the DF version was also adopted by NetBSD. I took the DragonFly version and back-ported some of the changes that we had in the FreeBSD version. As a result the new "BSD patch" that is available as an option in the tree covers most of the functionality of the patch in FreeBSD with two exceptions: -I and -S. Both options seem to be obsolete and don't seem to be used in ports. Furthermore GNU and BSD patch already uses -I to ignore white spaces. The new version is expected to be a complete replacement for our previous GNU patch but has only been lightly tested. Please test extensively, report bugs, and submit patches. We would love to use the new patch by default in 10.0 but only testing will let us know when it's ready. Special thanks to: Christoph Mallon - for porting the perforce diff support. Gabor Kovesdan - for doing the import since he has experience bringing these jewels into tree :). Enjoy! Pedro. On 01/29/2013 12:03, Gabor Kovesdan wrote: > Author: gabor > Date: Tue Jan 29 17:03:18 2013 > New Revision: 246074 > URL: http://svnweb.freebsd.org/changeset/base/246074 > > Log: > - Add a BSD-licensed patch, ported by Pedro F. Giffuni (pfg) from > DragonflyBSD and install it as bsdpatch. WITH_BSD_PATCH makes it > default and installs GNU patch as gnupatch. > > Submitted by: pfg > Obtained from: The DragonflyBSD Project > > Added: > head/tools/build/options/WITH_BSD_PATCH (contents, props changed) > head/usr.bin/patch/ > head/usr.bin/patch/Makefile (contents, props changed) > head/usr.bin/patch/backupfile.c (contents, props changed) > head/usr.bin/patch/backupfile.h (contents, props changed) > head/usr.bin/patch/common.h (contents, props changed) > head/usr.bin/patch/inp.c (contents, props changed) > head/usr.bin/patch/inp.h (contents, props changed) > head/usr.bin/patch/mkpath.c (contents, props changed) > head/usr.bin/patch/patch.1 (contents, props changed) > head/usr.bin/patch/patch.c (contents, props changed) > head/usr.bin/patch/pathnames.h (contents, props changed) > head/usr.bin/patch/pch.c (contents, props changed) > head/usr.bin/patch/pch.h (contents, props changed) > head/usr.bin/patch/util.c (contents, props changed) > head/usr.bin/patch/util.h (contents, props changed) > Modified: > head/UPDATING > head/gnu/usr.bin/patch/Makefile > head/share/mk/bsd.own.mk > head/usr.bin/Makefile >