svn commit: r253716 - in vendor/patch: 2.4 2.4/contrib 2.5 2.5/contrib dist dist/contrib
Pedro F. Giffuni
pfg at FreeBSD.org
Sat Jul 27 18:42:47 UTC 2013
Author: pfg
Date: Sat Jul 27 18:42:46 2013
New Revision: 253716
URL: http://svnweb.freebsd.org/changeset/base/253716
Log:
Flatten gnu-patch vendor tree.
- Revert r128777:
We have a new permissively licensed version of patch(1) and the older
partially GPL'd version is about to be abandoned so having this back
shouldn't be the cause of any confusion.
- Flatten the tags too.
- Disable keyword expansion as suggested in the committers guide.
This doesn't mean that any of this will be imported.
Added:
vendor/patch/2.4/COPYING
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/COPYING
vendor/patch/2.4/ChangeLog
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/ChangeLog
vendor/patch/2.4/NEWS
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/NEWS
vendor/patch/2.4/README
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/README
vendor/patch/2.4/acconfig.h
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/acconfig.h
vendor/patch/2.4/addext.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/addext.c
vendor/patch/2.4/argmatch.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/argmatch.c
vendor/patch/2.4/argmatch.h
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/argmatch.h
vendor/patch/2.4/backupfile.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/backupfile.c
vendor/patch/2.4/backupfile.h
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/backupfile.h
vendor/patch/2.4/basename.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/basename.c
vendor/patch/2.4/common.h
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/common.h
vendor/patch/2.4/getopt.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/getopt.c
vendor/patch/2.4/getopt.h
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/getopt.h
vendor/patch/2.4/getopt1.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/getopt1.c
vendor/patch/2.4/inp.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/inp.c
vendor/patch/2.4/inp.h
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/inp.h
vendor/patch/2.4/maketime.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/maketime.c
vendor/patch/2.4/maketime.h
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/maketime.h
vendor/patch/2.4/memchr.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/memchr.c
vendor/patch/2.4/partime.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/partime.c
vendor/patch/2.4/partime.h
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/partime.h
vendor/patch/2.4/patch.1
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/patch.1
vendor/patch/2.4/patch.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/patch.c
vendor/patch/2.4/pch.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/pch.c
vendor/patch/2.4/pch.h
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/pch.h
vendor/patch/2.4/quotearg.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/quotearg.c
vendor/patch/2.4/quotearg.h
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/quotearg.h
vendor/patch/2.4/rename.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/rename.c
vendor/patch/2.4/util.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/util.c
vendor/patch/2.4/util.h
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/util.h
vendor/patch/2.4/version.c
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/version.c
vendor/patch/2.4/version.h
- copied unchanged from r253715, vendor/patch/2.4/contrib/patch/version.h
vendor/patch/2.5/COPYING
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/COPYING
vendor/patch/2.5/ChangeLog
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/ChangeLog
vendor/patch/2.5/INSTALL
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/INSTALL
vendor/patch/2.5/Makefile.in
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/Makefile.in
vendor/patch/2.5/NEWS
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/NEWS
vendor/patch/2.5/README
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/README
vendor/patch/2.5/acconfig.h
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/acconfig.h
vendor/patch/2.5/addext.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/addext.c
vendor/patch/2.5/argmatch.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/argmatch.c
vendor/patch/2.5/argmatch.h
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/argmatch.h
vendor/patch/2.5/backupfile.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/backupfile.c
vendor/patch/2.5/backupfile.h
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/backupfile.h
vendor/patch/2.5/basename.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/basename.c
vendor/patch/2.5/common.h
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/common.h
vendor/patch/2.5/config.hin
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/config.hin
vendor/patch/2.5/configure
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/configure
vendor/patch/2.5/configure.in
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/configure.in
vendor/patch/2.5/getopt.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/getopt.c
vendor/patch/2.5/getopt.h
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/getopt.h
vendor/patch/2.5/getopt1.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/getopt1.c
vendor/patch/2.5/inp.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/inp.c
vendor/patch/2.5/inp.h
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/inp.h
vendor/patch/2.5/install-sh
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/install-sh
vendor/patch/2.5/maketime.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/maketime.c
vendor/patch/2.5/maketime.h
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/maketime.h
vendor/patch/2.5/memchr.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/memchr.c
vendor/patch/2.5/partime.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/partime.c
vendor/patch/2.5/partime.h
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/partime.h
vendor/patch/2.5/patch.1
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/patch.1
vendor/patch/2.5/patch.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/patch.c
vendor/patch/2.5/pch.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/pch.c
vendor/patch/2.5/pch.h
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/pch.h
vendor/patch/2.5/quotearg.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/quotearg.c
vendor/patch/2.5/quotearg.h
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/quotearg.h
vendor/patch/2.5/rename.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/rename.c
vendor/patch/2.5/util.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/util.c
vendor/patch/2.5/util.h
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/util.h
vendor/patch/2.5/version.c
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/version.c
vendor/patch/2.5/version.h
- copied unchanged from r253715, vendor/patch/2.5/contrib/patch/version.h
vendor/patch/dist/
- copied from r128776, vendor/patch/dist/
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/COPYING
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/ChangeLog
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/INSTALL
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/Makefile.in
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/NEWS
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/README
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/acconfig.h
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/addext.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/argmatch.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/argmatch.h
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/backupfile.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/backupfile.h
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/basename.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/common.h
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/config.hin
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/configure
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/configure.in
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/getopt.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/getopt.h
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/getopt1.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/inp.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/inp.h
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/install-sh
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/maketime.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/maketime.h
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/memchr.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/partime.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/partime.h
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/patch.1
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/patch.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/pch.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/pch.h
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/quotearg.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/quotearg.h
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/rename.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/util.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/util.h
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/version.c
- copied unchanged from r128776, vendor/patch/dist/contrib/patch/version.h
Directory Properties:
vendor/patch/dist/COPYING (props changed)
vendor/patch/dist/ChangeLog (props changed)
vendor/patch/dist/INSTALL (props changed)
vendor/patch/dist/Makefile.in (props changed)
vendor/patch/dist/NEWS (props changed)
vendor/patch/dist/README (props changed)
vendor/patch/dist/acconfig.h (props changed)
vendor/patch/dist/addext.c (props changed)
vendor/patch/dist/argmatch.c (props changed)
vendor/patch/dist/argmatch.h (props changed)
vendor/patch/dist/backupfile.c (props changed)
vendor/patch/dist/backupfile.h (props changed)
vendor/patch/dist/basename.c (props changed)
vendor/patch/dist/common.h (props changed)
vendor/patch/dist/config.hin (props changed)
vendor/patch/dist/configure (props changed)
vendor/patch/dist/configure.in (props changed)
vendor/patch/dist/getopt.c (props changed)
vendor/patch/dist/getopt.h (props changed)
vendor/patch/dist/getopt1.c (props changed)
vendor/patch/dist/inp.c (props changed)
vendor/patch/dist/inp.h (props changed)
vendor/patch/dist/install-sh (props changed)
vendor/patch/dist/maketime.c (props changed)
vendor/patch/dist/maketime.h (props changed)
vendor/patch/dist/memchr.c (props changed)
vendor/patch/dist/partime.c (props changed)
vendor/patch/dist/partime.h (props changed)
vendor/patch/dist/patch.1 (props changed)
vendor/patch/dist/patch.c (props changed)
vendor/patch/dist/pch.c (props changed)
vendor/patch/dist/pch.h (props changed)
vendor/patch/dist/quotearg.c (props changed)
vendor/patch/dist/quotearg.h (props changed)
vendor/patch/dist/rename.c (props changed)
vendor/patch/dist/util.c (props changed)
vendor/patch/dist/util.h (props changed)
vendor/patch/dist/version.c (props changed)
vendor/patch/dist/version.h (props changed)
Deleted:
vendor/patch/2.4/contrib/
vendor/patch/2.5/contrib/
vendor/patch/dist/contrib/
Modified:
Directory Properties:
vendor/patch/ (props changed)
Copied: vendor/patch/2.4/COPYING (from r253715, vendor/patch/2.4/contrib/patch/COPYING)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor/patch/2.4/COPYING Sat Jul 27 18:42:46 2013 (r253716, copy of r253715, vendor/patch/2.4/contrib/patch/COPYING)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Copied: vendor/patch/2.4/ChangeLog (from r253715, vendor/patch/2.4/contrib/patch/ChangeLog)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor/patch/2.4/ChangeLog Sat Jul 27 18:42:46 2013 (r253716, copy of r253715, vendor/patch/2.4/contrib/patch/ChangeLog)
@@ -0,0 +1,1627 @@
+1997-06-19 Paul Eggert <eggert at pogo.gnu.ai.mit.edu>
+
+ * configure.in (VERSION): Version 2.4 released.
+ * NEWS: Patch is now verbose when patches do not match exactly.
+
+1997-06-17 Paul Eggert <eggert at twinsun.com>
+
+ * pc/djgpp/configure.sed (config.h): Remove redundant $(srcdir).
+
+ * configure.in (VERSION): Bump to 2.3.9.
+ * patch.c (main): By default, warn about hunks that succeed
+ with nonzero offset.
+ * patch.man: Add LC_ALL=C advice for making patches.
+ * pc/djgpp/configure.sed (config.h): Fix paths to dependent files.
+
+1997-06-17 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Bump to 2.3.8.
+
+ * pch.c (open_patch_file): Test stdin for fseekability.
+ (intuit_diff_type): Missing context diff headers are now warnings,
+ not errors; some people use patches with them (e.g. when retrying
+ rejects).
+
+ * patch.c (struct outstate):
+ New type, collecting together some output state vars.
+ (apply_hunk, copy_till, spew_output, init_output): Use it.
+ Keep track of whether some output has been generated.
+ (backup_if_mismatch): New var.
+ (ofp): Remove, in favor of local struct outstate vars.
+ (main): Use struct outstate. Initialize backup_if_mismatch to
+ be the inverse of posixly_correct. Keep track of whether mismatches
+ occur, and use this to implement backup_if_mismatch.
+ Report files that are not empty after patching, but should be.
+ (longopts, option_help, get_some_switches): New options
+ --backup-if-mismatch, --no-backup-if-mismatch.
+ (get_some_switches): -B, -Y, -z no longer set backup_type.
+ * backupfile.c (find_backup_file_name):
+ Treat backup_type == none like simple.
+
+ * Makefile.in (CONFIG_HDRS):
+ Remove var; no longer needed by djgpp port.
+ (DISTFILES_PC_DJGPP): Rename pc/djgpp/config.sed to
+ pc/djgpp/configure.sed; remove pc/djgpp/config.h in favor of
+ new file that edits it, called pc/djgpp/config.sed.
+ * pc/djgpp/configure.bat: Rename config.sed to configure.sed.
+ * pc/djgpp/configure.sed (CONFIG_HDRS): Remove.
+ (config.h): Add rule to build this from config.hin and
+ pc/djgpp/config.sed.
+ * pc/djgpp/config.sed:
+ Convert from .h file to .sed script that generates .h file.
+
+ * NEWS: Describe --backup-if-mismatch, --no-backup-if-mismatch.
+ * patch.man:
+ Describe new options --backup-if-mismatch, --no-backup-if-mismatch
+ and their ramifications. Use unreadable backup to represent
+ nonexistent file.
+
+1997-06-12 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Bump to 2.3.7.
+ (AC_CHECK_FUNCS): Add `raise'.
+
+ * Makefile.in (inp.o): No longer depends on quotearg.h.
+
+ * common.h (outfile): New decl (was private var named `output').
+ (invc): New decl.
+ (GENERIC_OBJECT): Renamed from VOID.
+ (NULL_DEVICE, TTY_DEVICE): New macros.
+
+ * patch.c (output): Remove; renamed to `outfile' and moved to common.h.
+ (main): `failed' is count, not boolean.
+ Say "Skipping patch." when deciding to skip patch.
+ (get_some_switches): Set invc when setting inname.
+
+ * inp.c: Do not include <quotearg.h>.
+ (SCCSPREFIX, GET, GET_LOCKED, SCCSDIFF1, SCCSDIFF2, SCCSDIFF3,
+ RCSSUFFIX, CHECKOUT, CHECKOUT_LOCKED, RCSDIFF1, RCSDIFF2):
+ Move to util.c.
+ (get_input_file): Invoke new functions version_controller and
+ version_get to simplify this code.
+ (plan_b): "/dev/tty" -> NULL_DEVICE
+
+ * pch.h (pch_timestamp): New decl.
+ * pch.c (p_timestamp): New var; takes over from global timestamp array.
+ (pch_timestamp): New function to export p_timestamp.
+ (there_is_another_patch): Use blander wording when you can't intuit
+ the file name.
+ Say "Skipping patch." when deciding to skip patch.
+ (intuit_diff_type): Look for version-controlled but nonexistent files
+ when intuiting file names; set invc accordingly.
+ Ignore Index: line if either old or new line is present, and if
+ POSIXLY_CORRECT is not set.
+ (do_ed_script): Flush stdout before invoking popen, since it may
+ send output to stdout.
+
+ * util.h (version_controller, version_get): New decls.
+ * util.c: Include <quotearg.h> earlier.
+ (raise): New macro, if ! HAVE_RAISE.
+ (move_file): Create empty unreadable file when backing up a nonexistent
+ file.
+ (DEV_NULL): New constant.
+ (SCCSPREFIX, GET. GET_LOCKED, SCCSDIFF1, SCCSDIFF2,
+ RCSSUFFIX, CHECKOUT, CHECKOUT_LOCKED, RCSDIFF1): Moved here from inp.c.
+ (version_controller, version_get): New functions.
+ (ask): Look only at /dev/tty for answers; and when standard output is
+ not a terminal and ! posixly_correct, don't even look there.
+ Remove unnecessary fflushes of stdout.
+ (ok_to_reverse): Say "Skipping patch." when deciding to skip patch..
+ (sigs): SIGPIPE might not be defined.
+ (exit_with_signal): Use `raise' instead of `kill'.
+ (systemic): fflush stdout before invoking subsidiary command.
+
+ * patch.man: Document recent changes.
+ Add "COMPATIBILITY ISSUES" section.
+
+ * NEWS: New COMPATIBILITY ISSUES for man page.
+ Changed verbosity when fuzz is found.
+ File name intuition is changed, again.
+ Backups are made unreadable when the file did not exist.
+
+ * pc/djgpp/config.h (HAVE_STRUCT_UTIMBUF): Define.
+ (HAVE_RAISE): New macro.
+ (HAVE_UTIME_H): Define.
+ (TZ_is_unset): Do not define; it's not a serious problem with `patch'
+ to have TZ be unset in DOS.
+
+1997-06-08 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Bump to 2.3.6.
+ (AC_CHECK_HEADERS): Add utime.h.
+ * acconfig.h, configure.in, pc/djgpp/config.h (HAVE_STRUCT_UTIMBUF):
+ New macro.
+ * pc/djgpp/config.h (HAVE_UTIME_H, TZ_is_unset): New macros.
+
+ * NEWS, patch.man: Describe new -Z, -T options, new numeric
+ option for -G, retired -G, and more verbose default behavior
+ with fuzz.
+
+ * pch.c (intuit_diff_type): Record times reported for files in headers.
+ Remove head_says_nonexistent[x], since it's now equivalent to
+ !timestamp[x].
+ * util.h (fetchname): Change argument head_says_nonexistent to
+ timestamp.
+ * util.c: #include <partime.h> for TM_LOCAL_ZONE.
+ Don't include <time.h> since common.h now includes it.
+ (ok_to_reverse): noreverse and batch cases now output regardless of
+ verbosity.
+ (fetchname): Change argument head_says_nonexistent to pstamp, and
+ store header timestamp into *pstamp.
+ If -T or -Z option is given, match time stamps more precisely.
+ (ask): Remove unnecessary close of ttyfd.
+ When there is no terminal at all, output a newline to make the
+ output look nicer. After reporting EOF, flush stdout;
+ when an input error, report the error type.
+
+ * inp.c (get_input_file):
+ Ask user whether to get file if patch_get is negative.
+
+ * Makefile.in (clean): Don't clean */*.o; clean core* and *core.
+
+1997-06-04 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Bump to 2.3.5.
+
+ * util.c (ok_to_reverse):
+ Be less chatty if verbosity is SILENT and we don't
+ have to ask the user. If force is nonzero, apply the patch anyway.
+
+ * pch.c (there_is_another_patch):
+ Before skipping rest of patch, skip to
+ the patch start, so that another_hunk can skip it properly.
+ (intuit_diff_type): Slight wording change for missing headers, to
+ regularize with other diagnostics. Fix off-by-one error when setting
+ p_input_line when scanning the first hunk to check for deleted files.
+
+1997-06-03 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Bump to 2.3.4.
+
+ * NEWS: Now matches more generously against nonexistent or empty files.
+
+ * pch.c (there_is_another_patch): Move warning about not being
+ able to intuit file names here from skip_to.
+ (intuit_diff_type): Fatal error if we find a headless unified
+ or context diff.
+
+ * util.c (ask): Null-terminate buffer properly even if it grew.
+ (fetchname): No need to test for null first argument.
+
+1997-06-02 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Bump to 2.3.3.
+ * pch.c (p_says_nonexistent, pch_says_nonexistent): Is now 1 for empty,
+ 2 for nonexistent.
+ (intuit_diff_type): Set p_says_nonexistent according to new meaning.
+ Treat empty files like nonexistent files when reversing.
+ (skip_to): Output better diagnostic when we can't intuit a file name.
+ * patch.c (main):
+ Count bytes, not lines, when testing whether a file is empty,
+ since it may contain only non-newline chars.
+ pch_says_nonexistent now returns 2 for nonexistent files.
+
+1997-06-01 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Bump to 2.3.2.
+ * pch.c (open_patch_file):
+ Fix bug when computing size of patch read from a pipe.
+
+1997-05-30 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Bump to 2.3.1.
+
+ * Makefile.in (transform, patch_name): New vars,
+ for proper implementation of AC_ARG_PROGRAM.
+ (install, uninstall): Use them.
+ (install-strip): New rule.
+ * pc/djgpp/config.sed (program_transform_name): Set to empty.
+
+1997-05-30 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION), NEWS: Version 2.3 released.
+ * patch.man: Fix two font typos.
+ * util.c (doprogram): Fix misspelled decl.
+
+1997-05-26 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Bump to 2.2.93.
+
+ * pch.c (open_patch_file):
+ Fatal error if binary_transput and stdin is a tty.
+
+ * pc/djgpp/config.sed (chdirsaf.c):
+ Use sed instead of cp, since cp might not be installed.
+ * pc/djgpp/configure.bat:
+ Prepend %srcdir% to pathname of config.sed, for crosscompiles.
+
+1997-05-25 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Bump to 2.2.92.
+ (D_INO_IN_DIRENT): New macro.
+ * pc/djgpp/config.h, acconfig.h (D_INO_IN_DIRENT): New macro.
+ * backupfile.c (REAL_DIR_ENTRY):
+ Depend on D_INO_IN_DIRENT, not _POSIX_VERSION.
+
+ * addext.c (addext): Adjust slen when adjusting s for DOS 8.3 limit.
+ Do not use xxx.h -> xxxh~ hack.
+
+ * util.c: (move_file): Avoid makedirs test when possible even
+ if FILESYSTEM_PREFIX_LEN (p) is nonzero. Don't play
+ case-changing tricks to come up with backup file name; it's
+ not portable to case-insensitive file systems.
+ * common.h (ISLOWER): Remove.
+
+ * inp.c (scan_input): Don't use Plan A if (debug & 16).
+
+ * patch.c (shortopts): Add -g, -G.
+ (longopts): --help now maps to 132, not 'h', to avoid confusion.
+ (get_some_switches): Likewise.
+ Don't invoke setmode on input if --binary; wait until needed.
+ Don't ever invoke setmode on stdout.
+ * pch.c (open_patch_file): Setmode stdin to binary if binary_transput.
+
+ * patch.man: Fix documentation of backup file name to match behavior.
+ Add advice for ordering of patches of derived files.
+ Add /dev/tty to list of files used.
+ * README: Adjust instructions for building on DOS.
+ * pc/djgpp/README: Remove tentative wording.
+ * NEWS: The DOS port is now tested.
+ Backup file names are no longer computed by switching case.
+
+ * pc/chdirsaf.c (ERANGE): Include <errno.h> to define it.
+ (restore_wd): chdir unconditionally.
+ (chdir_safer): Invoke atexit successfully at most once.
+ * pc/djgpp/config.sed: Use chdirsaf.o, not pc/chdirsaf.o.
+ Replace CONFIG_HDRS, don't append.
+ Use $(srcdir) in CONFIG_STATUS.
+ Don't apply $(SHELL) to $(CONFIG_STATUS).
+ Append rules for chdirsaf.o, chdirsaf.c; clean chdirsaf.c at the end.
+ * pc/djgpp/configure.bat: Append CR to each line; DOS needs this.
+ Don't use | as sed s delimiter; DOS can't handle it.
+
+1997-05-21 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Bump to 2.2.91.
+
+ * pch.c (another_hunk):
+ Fix bug with computing size of prefix and suffix context
+ with ordinary context diffs. Report malformed patch if a unified diff
+ has nothing but context.
+
+ * inp.c (get_input_file):
+ Use patch_get, not backup_type, to decide whether to
+ get from RCS or SCCS. Use the word `get' in diagnostics.
+ * patch.c (main): Initialize patch_get from PATCH_GET.
+ Omit DEFAULT_VERSION_CONTROL hook; it just leads to nonstandarization.
+ (longopts, option_help, get_some_switches): Add support for -g, -G.
+ (option_help): Add bug report address.
+ * common.h (patch_get): New decl.
+ * patch.man: Add -g and -G options; use `get' instead of `check out'.
+ Add PATCH_GET. Recommend -Naur instead of -raNU2 for diff.
+ * NEWS: Describe -g, -G, PATCH_GET.
+
+ * version.c (copyright_string): Use only most recent copyright year,
+ as per GNU standards.
+
+ * Makefile.in (DISTFILES_PC): Remove pc/quotearg.c.
+ * pc/djgpp/config.sed: Remove unnecessary hooks for quotearg and SHELL.
+
+1997-05-18 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Increase to 2.2.9.
+ (AC_TYPE_MODE_T): Add.
+
+ * pch.h (another_hunk): New parameter REV.
+ * pch.c (hunkmax): Now of type LINENUM.
+ (malformed): Add decl.
+ (there_is_another_patch): Skip inname-detection if skip_rest_of_patch.
+ (intuit_diff_type): To determine whether file appears to have been
+ deleted, look at replacement, not pattern.
+ If there is a mismatch between existence of file and whether the
+ patch claims to change whether the file exists, ask whether to
+ reverse the patch.
+ (another_hunk): New parameter REV specifying whether to reverse the
+ hunk. All callers changed.
+ (do_ed_script): Add assertion to ensure input file exists.
+
+ * util.h (create_file): New function.
+ (copy_file): Now takes mode, not struct stat.
+ (makedirs): No longer exported.
+ (move_file): Now takes mode, not struct stat.
+ * util.c (makedirs): No longer exported.
+ (move_file): Accept mode of destination, not struct stat.
+ All callers changed.
+ Quote file names in diagnostics.
+ Create parent dir of destination if necessary.
+ Don't use ENOTDIR.
+ Don't unlink source; it will be unlinked later.
+ Unlink destination if FROM is zero.
+ (create_file): New function.
+ (copy_file): Accept mode of destination, not struct stat.
+ All callers changed.
+ Use create_file to create file.
+ (ok_to_reverse): Moved here from patch.c. Now accepts format and args;
+ all callers changed.
+ (mkdir): 2nd arg is now mode_t, for better compatibility.
+ (replace_slashes): Ignore slashes at the end of the filename.
+
+ * common.h (noreverse): New decl.
+ (ok_to_reverse): Remove decl.
+
+ * patch.c (noreverse): Now extern.
+ (main): New environment var PATCH_VERSION_CONTROL overrides VERSION_CONTROL.
+ Don't assert(hunk) if we're skipping the patch; we may not have any hunks.
+ When removing a file, back it up if backups are desired.
+ Don't chmod output file if input file did not exist.
+ chmod rej file to input file's mode minus executable bits.
+ (locate_hunk): Go back to old way of a single fuzz parameter, but
+ handle it more precisely: context diffs with partial contexts
+ can only match file ends, since the partial context can occur
+ only at the start or end of file.
+ All callers changed.
+ (create_output_file): Use create_file to create files.
+ (ok_to_reverse): Move to util.c.
+
+ * inp.c (scan_input, get_input_file): Quote file names in diagnostics.
+ (get_input_file): Set inerrno if it's not already set.
+ Don't create file; it's now the caller's responsibility.
+ (plan_b): Use /dev/null if input size is zero, since it might not exist.
+ Use create_file to create temporary file.
+
+ * NEWS: Add PATCH_VERSION_CONTROL; DOS port is untested.
+
+ * pc/djgpp/config.h: Add comment for mode_t.
+
+ * pc/djgpp/README: Note that it's not tested.
+
+ * patch.man: PATCH_VERSION_CONTROL overrides VERSION_CONTROL.
+
+1997-05-15 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in: Add AC_PREREQ(2.12).
+ (VERSION): Bump to 2.2.8.
+ (ed_PROGRAM): Rename from ED_PROGRAM.
+
+ * pch.c (prefix_components): Support DOS file names better.
+ Fix typo that caused fn to almost always yield 0.
+
+ * util.c (<time.h>, <maketime.h>): Include.
+ (move_file, copy_file): Add support for DOS filenames.
+ Preserve mode of input files when creating temp files.
+ Add binary file support.
+ (doprogram, rmdir): New functions.
+ (mkdir): Use doprogram.
+ (replace_slashes): Add support for DOS filenames.
+ (removedirs): New function.
+ (init_time)): New function.
+ (initial_time): New var.
+ (fetchname): Add support for deleted files, DOS filenames.
+
+ * basename.c (FILESYSTEM_PREFIX_LEN, ISSLASH):
+ New macros, for DOS port.
+ (base_name): Use them.
+
+ * addext.c (HAVE_DOS_FILE_NAMES): New macro.
+ <limits.h>: Include if HAVE_LIMITS_H.
+ (addext): Handle hosts with DOS file name limits.
+
+ * common.h (LONG_MIN): New macro.
+ (FILESYSTEM_PREFIX_LEN, ISSLASH): New macros, for DOS port.
+ (ok_to_create_file): Remove.
+ (reverse): Now int.
+ (ok_to_reverse): New function decl.
+ (O_WRONLY, _O_BINARY, O_BINARY, O_CREAT, O_TRUNC): New macros.
+ (binary_transput): New var decl.
+
+ * Makefile.in (ed_PROGRAM): Renamed from ED_PROGRAM.
+ (CONFIG_HDRS, CONFIG_STATUS): New vars.
+ (SRCS): Add maketime.c, partime.c.
+ (OBJS): Likewise.
+ (HDRS): Add maketime.h, partime.h.
+ (DISTFILES_PC, DISTFILES_PC_DJGPP): New vars.
+ (Makefile, config.status): Use CONFIG_STATUS, not config.status.
+ (clean): Remove */*.o.
+ (dist): Add pc and pc/djgpp subdirectories.
+ ($(OBJS)): Depend on $(CONFIG_HDRS) instead of config.h.
+ (maketime.o, partime.o): New rules.
+ (util.o): Depend on maketime.h.
+
+ * patch.c (main):
+ Call init_time. Add DEFAULT_VERSION_CONTROL hook for people who
+ prefer the old ways. Build temp file names before we might invoke cleanup.
+ Add support for deleted files and clean up the patch-swapping code a bit.
+ Delete empty ancestors of deleted files.
+ When creating temporaries, use file modes of original files.
+ (longopts, get_some_switches): New option --binary.
+ (get_some_switches): Report non-errno errors with `fatal', not `pfatal'.
+ (create_output_file): New function, which preserves modes of original files
+ and supports binary transput.
+ (init_output, init_reject): Use it.
+ (ok_to_reverse): New function.
+ (TMPDIR): New macro.
+ (make_temp): Use $TMPDIR, $TMP, $TEMP, or TMPDIR, whichever comes first.
+
+ * pch.c (p_says_nonexistent): New var.
+ (open_patch_file): Add binary transput support.
+ Apply stat to file names retrieved from user.
+ Reject them if they don't exist.
+ (intuit_diff_type): Add support for deleting files.
+ Don't treat trivial directories any differently.
+ Avoid stating the same file twice in common case of context diffs.
+ (prefix_components): Don't treat trivial directories any differently.
+ Add support for DOS filenames.
+ (pch_says_nonexistent): New function.
+ (do_ed_script): Preserve mode of input files when creating temp files.
+ Add support for binary transput.
+
+ * pch.h (pch_says_nonexistent): New decl.
+
+ * util.h (replace_slashes): No longer exported.
+ (fetchname): Add support for deleted files.
+ (copy_file, move_file): Add support for preserving file modes.
+ (init_time, removedirs): New functions.
+
+ * argmatch.c: Converge with fileutils.
+
+ * backupfile.c: Converge with fileutils.
+ (find_backup_file_name): Treat .~N~ suffix just like any other suffix
+ when handling file names that are too long.
+
+ * inp.c:
+ In messages, put quotes around file names and spaces around "--".
+ (get_input_file): Allow files to be deleted. Do the expense of
+ makedirs only if we can't create the file.
+ (plan_a, plan_b): Add support for binary transput.
+
+ * pc/chdirsaf.c, pc/djgpp/README, pc/djgpp/config.h, pc/djgpp/config.sed, pc/djgpp/configure.bat, pc/quotearg.c:
+ New file.
+
+ * NEWS:
+ New methods for removing files; adjust file name intuition again.
+ Add description of MS-DOS and MS-Windows ports.
+
+ * patch.man:
+ Simplify file name intuition slightly (no distinction for trivial dirs).
+ Add --binary. Describe how files and directories are deleted.
+ Suggest diff -a. Include caveats about what context diffs cannot represent.
+
+1997-05-06 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Now 2.2.7.
+ (CPPFLAGS, LDFLAGS, LIBS): If the user has not set any of these vars,
+ prefer support for large files if available.
+
+ * common.h (_LARGEFILE_SOURCE): Define.
+ (file_offset): New typedef.
+ (file_seek, file_tell): New macros.
+
+ * patch.c (main):
+ Remove empty files by default unless POSIXLY_CORRECT is set.
+
+ * util.c, util.h (Fseek):
+ Use file_offset instead of long, for portability to large-file hosts.
+
+ * pch.c: (p_base, p_start, next_intuit_at, skip_to, open_patch_file,
+ intuit_diff_type, another_hunk, incomplete_line, do_ed_script):
+ Use file_offset instead of long, for portability to large-file hosts.
+ (prefix_components): Renamed from path_name_components; count only
+ nontrivial prefix components, and take a 2nd EXISTING arg.
+ (existing_prefix_components): Remove; subsumed by prefix_components.
+ (intuit_diff_type): When creating files, try for the creation of the
+ fewest directories.
+
+ * configure.in (VERSION): Now 2.2.6.
+
+ * pch.c (existing_prefix_components): New function.
+ (intuit_diff_type): When creating a file, use a name whose existing
+ directory prefix contains the most nontrivial path name components.
+ (best_name): Don't check for null 2nd arg.
+
+ * util.h (replace_slashes): New decl.
+
+ * util.c (replace_slashes): Now external.
+ (fetchname): Don't assume chars are nonnegative.
+
+ * patch.man:
+ When creating a file, use a name whose existing directory prefix
+ contains the most nontrivial path name components.
+ Add advice for creating patches and applying them.
+
+1997-05-06 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Now 2.2.6.
+
+ * pch.c (existing_prefix_components): New function.
+ (intuit_diff_type): When creating a file, use a name whose existing
+ directory prefix contains the most nontrivial path name components.
+ (best_name): Don't check for null 2nd arg.
+
+ * util.h (replace_slashes): New decl.
+ * util.c (replace_slashes): Now external.
+ (fetchname): Don't assume chars are nonnegative.
+
+ * patch.man: Describe above change to pch.c.
+ Add advice for creating patches and applying them.
+
+1997-05-05 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Update to 2.2.5.
+
+ * quotearg.h, quotearg.c: New files.
+ * Makefile.in (SRCS, OBJS, HDRS): Mention new files.
+ (inp.o, util.o): Now depends on quotearg.h.
+ (quotearg.o): New makefile rule.
+
+ * common.h (posixly_correct): New var.
+ * patch.c (main): Initialize it.
+ If ! posixly_correct, default backup type is now `existing'.
+ SIMPLE_BACKUP_SUFFIX no longer affects backup type.
+ (backup): Remove var.
+
+ * util.h: (countdirs): Remove.
+ (systemic): New decl.
+ * util.c (move_file): Try making the parent directory of TO
+ if backup prefix or suffix contain a slash.
+ (ask): Remove arbitrary limit on size of result.
+ (systemic): New function.
+ (mkdir): Work even if arg contains shell metacharacters.
+ (replace_slashes): Return 0 if none were replaced.
+ Don't replace slash after . or .. since it's redundant.
+ (countdirs): Remove.
+ (makedirs): Ignore mkdir failures.
+
+ * NEWS, patch.man: More POSIXLY_CORRECT adjustments.
+ Describe new rules for how file names are intuited.
+
+1997-04-17 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Version 2.2 released.
+
+ * Makefile.in (config.hin):
+ Remove before building; we always want the timestamp updated.
+
+ * inp.c (get_input_file):
+ Look for RCS files only if backup_type == numbered_existing.
+
+ * NEWS, patch.man:
+ Remove mention of never-implemented -V rcs and -V sccs options.
+ * patch.man: `pathname' -> `file name'
+ Correct the description of how file names are found in diff headers.
+ Clarify the distinction between ordinary and unified context diffs.
+
+1997-04-13 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Update to 2.1.7.
+
+ * patch.c (numeric_optarg): New function.
+ (get_some_switches): Use it.
+
+ * pch.c (intuit_diff_type): When creating a file, prefer a name whose
+ existing dir prefix is the longest.
+
+ * util.h (countdirs): New function.
+ * util.c (replace_slashes, countdirs): New functions.
+ (makedirs): Use replace_slashes, to be more like countdirs.
+
+ * patch.man: Explain -pN vs -p N. Recommend --new-file.
+ Explain possible incompatibility with strip count.
+
+1997-04-10 Paul Eggert <eggert at twinsun.com>
+
+ * configure.in (VERSION): Bump to 2.1.6.
+ (AC_CHECK_HEADERS): Remove stdlib.h (i.e. remove HAVE_STDLIB_H).
+
+ * Makefile.in: (HDRS, patchlevel.h, TAGS, distclean, maintainer-clean):
+ Don't distribute patchlevel.h; let the user do it.
+ This works around some obscure (possibly nonexistent?) `make' bugs.
+
+ * common.h (program_name): extern, not XTERN.
+ (<stdlib.h>): Include if STDC_HEADERS, not if HAVE_STDLIB_H.
+ (atol, getenv, malloc, realloc): Don't worry whether they're #defined.
+
+ * patch.c (get_some_switches):
+ Add special hack for backwards compatibility with CVS 1.9.
+ (-B, -Y, -z): Now set backup_type = simple.
+
+ * NEWS: Fix misspellings; minor reformatting.
+ * README: Report POSIX.2 compliance.
+
+1997-04-06 Paul Eggert <eggert at twinsun.com>
+
+ Move all old RCS $Log entries into ChangeLog.
+ #include all files with < >, not " ".
+
+ * addext.c, argmatch.c, argmatch.h, memchr.c, install-sh:
+ New files.
+ * EXTERN.h, INTERN.h: Removed.
+ * config.hin: Renamed from config.h.in.
+
+ * acconfig.h (NODIR): Remove.
+ (HAVE_MEMCHR): Add.
+
+ * configure.in (AC_ARG_PROGRAM, AC_PROG_MAKE_SET, HAVE_MEMCHR): Add.
+ (AC_CHECK_HEADERS): Replaces obsolescent AC_HAVE_HEADERS.
+ Add stdlib.h, string.h, unistd.h, varargs.h.
+ Delete obsolete call to AC_UNISTD_H.
+ (AC_CONFIG_HEADER): Rename config.h.in to config.hin.
+ (AC_C_CONST): Replaces obsolescent AC_CONST.
+ (AC_CHECK_FUNC): Check for getopt_long; define LIBOBJS and substitute
+ for it accordingly.
+ (AC_CHECK_FUNCS): Replaces obsolescent AC_HAVE_FUNCS.
+ Add _doprintf, isascii, mktemp, sigaction, sigprocmask, sigsetmask.
+ Remove strerror.
+ (AC_FUNC_CLOSEDIR_VOID, AC_FUNC_VPRINTF): Add.
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list