Date: Sat, 27 Jul 2013 19:57:21 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r253717 - in vendor/patch/dist: . m4 Message-ID: <201307271957.r6RJvL3r007685@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Sat Jul 27 19:57:20 2013 New Revision: 253717 URL: http://svnweb.freebsd.org/changeset/base/253717 Log: Virgin import of patch-2.5.9, the last official GPLv2 release. As in previous imports we dropped the mkinstall and pc directories as they are of no use to us. Differently from previous imports, patch.1 was not renamed and is maintained with its original name (patch.man). If we ever merge this into the main tree, care must be taken to rename it back. Added: vendor/patch/dist/AUTHORS vendor/patch/dist/aclocal.m4 vendor/patch/dist/configure.ac - copied, changed from r253716, vendor/patch/dist/configure.in vendor/patch/dist/dirname.c (contents, props changed) vendor/patch/dist/dirname.h (contents, props changed) vendor/patch/dist/error.c (contents, props changed) vendor/patch/dist/error.h (contents, props changed) vendor/patch/dist/gettext.h (contents, props changed) vendor/patch/dist/m4/ vendor/patch/dist/m4/backupfile.m4 vendor/patch/dist/m4/d-ino.m4 vendor/patch/dist/m4/dirname.m4 vendor/patch/dist/m4/dos.m4 vendor/patch/dist/m4/error.m4 vendor/patch/dist/m4/getopt.m4 vendor/patch/dist/m4/malloc.m4 vendor/patch/dist/m4/mbrtowc.m4 vendor/patch/dist/m4/mbstate_t.m4 vendor/patch/dist/m4/memchr.m4 vendor/patch/dist/m4/mkdir.m4 vendor/patch/dist/m4/onceonly.m4 vendor/patch/dist/m4/quote.m4 vendor/patch/dist/m4/quotearg.m4 vendor/patch/dist/m4/realloc.m4 vendor/patch/dist/m4/rmdir.m4 vendor/patch/dist/m4/setmode.m4 vendor/patch/dist/m4/stdbool.m4 vendor/patch/dist/m4/unlocked-io.m4 vendor/patch/dist/m4/utimbuf.m4 vendor/patch/dist/m4/xalloc.m4 vendor/patch/dist/malloc.c (contents, props changed) vendor/patch/dist/mkdir.c (contents, props changed) vendor/patch/dist/patch.man - copied, changed from r253716, vendor/patch/dist/patch.1 vendor/patch/dist/quote.c (contents, props changed) vendor/patch/dist/quote.h (contents, props changed) vendor/patch/dist/quotesys.c (contents, props changed) vendor/patch/dist/quotesys.h (contents, props changed) vendor/patch/dist/realloc.c (contents, props changed) vendor/patch/dist/rmdir.c (contents, props changed) vendor/patch/dist/stdbool.h.in (contents, props changed) vendor/patch/dist/strcasecmp.c (contents, props changed) vendor/patch/dist/strncasecmp.c (contents, props changed) vendor/patch/dist/unlocked-io.h (contents, props changed) vendor/patch/dist/xalloc.h (contents, props changed) vendor/patch/dist/xmalloc.c (contents, props changed) Deleted: vendor/patch/dist/acconfig.h vendor/patch/dist/configure.in vendor/patch/dist/patch.1 vendor/patch/dist/rename.c Modified: vendor/patch/dist/COPYING (contents, props changed) vendor/patch/dist/ChangeLog vendor/patch/dist/INSTALL (contents, props changed) vendor/patch/dist/Makefile.in vendor/patch/dist/NEWS (contents, props changed) vendor/patch/dist/README (contents, props changed) vendor/patch/dist/addext.c (contents, props changed) vendor/patch/dist/argmatch.c (contents, props changed) vendor/patch/dist/argmatch.h (contents, props changed) vendor/patch/dist/backupfile.c (contents, props changed) vendor/patch/dist/backupfile.h (contents, props changed) vendor/patch/dist/basename.c (contents, props changed) vendor/patch/dist/common.h (contents, props changed) vendor/patch/dist/config.hin vendor/patch/dist/configure vendor/patch/dist/getopt.c (contents, props changed) vendor/patch/dist/getopt.h (contents, props changed) vendor/patch/dist/getopt1.c (contents, props changed) vendor/patch/dist/inp.c (contents, props changed) vendor/patch/dist/inp.h (contents, props changed) vendor/patch/dist/install-sh vendor/patch/dist/maketime.c (contents, props changed) vendor/patch/dist/maketime.h (contents, props changed) vendor/patch/dist/memchr.c (contents, props changed) vendor/patch/dist/partime.c (contents, props changed) vendor/patch/dist/partime.h (contents, props changed) vendor/patch/dist/patch.c (contents, props changed) vendor/patch/dist/pch.c (contents, props changed) vendor/patch/dist/pch.h (contents, props changed) vendor/patch/dist/quotearg.c (contents, props changed) vendor/patch/dist/quotearg.h (contents, props changed) vendor/patch/dist/util.c (contents, props changed) vendor/patch/dist/util.h (contents, props changed) vendor/patch/dist/version.c (contents, props changed) vendor/patch/dist/version.h (contents, props changed) Added: vendor/patch/dist/AUTHORS ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/patch/dist/AUTHORS Sat Jul 27 19:57:20 2013 (r253717) @@ -0,0 +1,9 @@ +Larry Wall wrote the original version of `patch'. + +Paul Eggert removed arbitrary limits; added support for binary +files, setting file times, and deleting files; and made it conform +better to POSIX. + +Wayne Davison added unidiff support. + +David MacKenzie added configuration and backup support. Modified: vendor/patch/dist/COPYING ============================================================================== --- vendor/patch/dist/COPYING Sat Jul 27 18:42:46 2013 (r253716) +++ vendor/patch/dist/COPYING Sat Jul 27 19:57:20 2013 (r253717) @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 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. @@ -291,7 +291,7 @@ convey the exclusion of warranty; and ea 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> + Copyright (C) <year> <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 @@ -313,7 +313,7 @@ Also add information on how to contact y 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 version 69, Copyright (C) year 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. Modified: vendor/patch/dist/ChangeLog ============================================================================== --- vendor/patch/dist/ChangeLog Sat Jul 27 18:42:46 2013 (r253716) +++ vendor/patch/dist/ChangeLog Sat Jul 27 19:57:20 2013 (r253717) @@ -1,3 +1,573 @@ +2003-05-20 Paul Eggert <eggert@twinsun.com> + + * NEWS, configure.ac (AC_INIT): Version 2.5.9 released. + + * Makefile.in (HDRS): Add gettext.h. + + Use bool, not int, for booleans. + + * pch.c (pch_says_nonexistent): Returns int, not bool. + + * configure.ac: Add AM_STDBOOL_H. + + * Makefile.in (MISC): Add stdbool.h.in. + (stdbool.h): New rule. + (ACINCLUDE_INPUTS): Add stdbool.m4. + (mostlyclean): Remove stdbool.h. + (COMMON): New macro; use it instead of common.h for dependencies. + + * common.h: Include <stdbool.h>. + Remove TRUE, FALSE, bool. All uses changed to standard names. + + * common.h (reverse, set_time, set_utc): + Use bool, not int, for booleans. + * pch.c (p_strip_trailing_cr, p_pass_comments_through, + prefix_components, pget_line, re_patch, + there_is_another_patch, intuit_diff_type, scan_linenum, + another_hunk, pget_line, pch_timestamp): Likewise. + * inp.h (ifetch): Likewise. + * util.c (move_file, version_controller, version_get, ok_to_reverse, + set_signals): Likewise. + * inp.c (report_revision, get_input_file, plan_a, plan_b, ifetch): + Likewise. + * util.h (ok_to_reverse, version_controller, version_get, + move_file, set_signals): Likewise. + * pch.h (another_hunk, pch_says_nonexistent, pch_timestamp): + Likewise. + * patch.c (struct outstate, numeric_string, make_backups, + backup_if_mismatch, remove_empty_files, + reverse_flag_specified, main, reinitialize_almost_everything, + get_some_switches, apply_hunk, init_output, copy_till): + Likewise. + +2003-05-18 Paul Eggert <eggert@twinsun.com> + + * pch.c (p_pass_comments_through): New var. + (pget_line): Accept new arg for pass_comments_through. + All callers changed. + (there_is_another_patch): Do not suggest -p for ed diffs. + (intuit_diff_type): Check ed command for correct syntax. + Do not set p_strip_trailing_cr merely because a -p line contains a CR. + (get_ed_command_letter): New function. + (do_ed_script): Use it. Do not treat '#' data lines as comments in ed + scripts. + + * util.c (move_file): + Don't assume that when 'rename(A,B)' succeeds then A no + longer exists. This is not true of POSIX 1003.1-2001 rename when A + and B are links to the same file. + (fetchname): Fix test for file names with internal spaces. + + * version.c: Don't include patchlevel.h. + (version): Use PACKAGE_NAME and PACKAGE_VERSION instead of obsolete + PROGRAM_NAME and PATCH_VERSION. + (copyright_string): Bump to 2003. + + * common.h (FILESYSTEM_PREFIX_LEN, ISSLASH): + Remove; now done by 'configure'. + (PROGRAM_NAME): Remove; now done by 'configure' as PACKAGE_NAME. + + * patch.c: Do not include <exitfail.h>. + (main): Set xalloc_exit_failure, not exit_failure. + Add "&& !skip_rest_of_patch" when deciding to continue ed scripts. + (option_help): Use PACKAGE_BUGREPORT rather than hardcoding. + + * configure.ac (AC_PREREQ): Bump to 2.57. + (AC_GNU_SOURCE): Add, early on. + (gl_BACKUPFILE, gl_DIRNAME, gl_ERROR, gl_FUNC_MEMCHR, gl_FUNC_RMDIR, + gl_GETOPT, gl_PREREQ_XMALLOC, gl_QUOTE, gl_QUOTEARG): Add. + (jm_PREREQ_ADDEXT): Add, with definition. + (jm_PREREQ_DIRNAME, jm_PREREQ_ERROR, jm_PREREQ_MEMCHR, + jm_PREREQ_QUOTEARG): Remove. + (AC_REPLACE_FUNCS): Remove memchr, rename, rmdir). + (jm_FUNC_GLIBC_UNLOCKED_IO, jm_AC_DOS): Add. + (jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Do not call directly. + (AC_OUTPUT): Use new style, with AC_CONFIG_FILES. + + Update to current CVS gnulib. + + * exitfail.c, exitfail.h, patchlevel.h, rename.c, m4/c-bs-a.m4, + m4/jm-glibc-io.m4, m4/prereq.m4: Remove. + * m4/backupfile.m4, m4/dirname.m4, m4/dos.m4, m4/getopt.m4, + m4/memchr.m4, m4/onceonly.m4, m4/quote.m4, m4/quotearg.m4, + m4/rmdir.m4, m4/unlocked-io.m4, m4/xalloc.m4: New files. + * Makefile.in (LIBSRCS): Move error.c here from SRCS. + Remove rename.c. + (OBJS): Remove error.$(OBJEXT). + (HDRS): Remove exitfail.h, patchlevel.h. + (ACINCLUDE_INPUTS): Remove c-bs-a.m4, jm-glibc-io.m4, prereq.m4. + Add backupfile.m4, dirname.m4, dos.m4, getopt.m4, memchr.m4, + onceonly.m4, quote.m4, quotearg.m4, rmdir.m4, unlocked-io.m4, + xalloc.m4. + (patchlevel.h): Remove. All uses removed. + (argmatch.$(OBJEXT), error.$(OBJEXT), quotesys.$(OBJEXT)), + xmalloc.$(OBJEXT)): Depend on gettext.h. + (dirname.$(OBJEXT), quote.$(OBJEXT), strncasecmp.$(OBJEXT)): New rules. + (patch.$(OBJEXT), xmalloc.$(OBJEXT)): Remove exitfail.h. + (rename.$(OBJEXT)): Remove. + (version.$(OBJEXT)): Remove util.h. + (xmalloc.$(OBJEXT)): Add error.h. + +2002-11-23 Paul Eggert <eggert@twinsun.com> + + * patch.c (main): Don't check for zero-sized file after 'ed' + when skipping patch. From Michael Fedrowitz. + +2002-06-03 Paul Eggert <eggert@twinsun.com> + + * configure.ac (AC_OUTPUT): Use new form, with AC_CONFIG_FILES, + instead of obsolescent form. Patch from Art Haas. + + * pch.c (intuit_diff_type): Do not warn about trailing white space + after Prereq: word. Bug reported by Mike Castle. + +2002-06-02 Paul Eggert <eggert@twinsun.com> + + * NEWS, configure.ac (AC_INIT): Version 2.5.8 released. + + * README: POSIX.2 -> POSIX. + * inp.c (report_revision): Don't modify 'revision', since + it gets freed later. Bug reported by Mike Castle. + +2002-05-30 Paul Eggert <eggert@twinsun.com> + + * NEWS, configure.ac (AC_INIT): Version 2.5.7 released. + + * Makefile.in (MISC): Remove README-alpha. + (patchlevel.h): Depend on configure, not configure.ac. + + * INSTALL: Upgrade to Autoconf 2.53 version. + +2002-05-28 Paul Eggert <eggert@twinsun.com> + + * patch.c (end_defined, apply_hunk): Output #endif without + the comment, as POSIX 1003.1-2001 requires. + + * pch.c (there_is_another_patch): Flush stderr after perror. + + * NEWS, configure.ac (AC_INIT): Version 2.5.6 released. + + * strcasecmp.c, strncasecmp.c: New files, taken from fileutils. + * config.guess, config.sub: Remove. + * Makefile.in (LIBSRCS): Add strcasecmp.c, strncasecmp.c. + (MISC): Remove config.guess, config.sub. + + The code already assumes C89 or better, so remove K&R stuff. + * common.h (volatile): Remove. + (GENERIC_OBJECT): Remove; all uses changed to 'void'. + (PARAMS): Remove; all uses changed to prototypes. + * configure.ac (AC_PROG_CC_STDC): Add. + * util.c (vararg_start): Remove. All uses changed to va_start. + Always include <stdarg.h>. + + * configure.ac (AC_CANONICAL_HOST): Remove. + (AC_REPLACE_FUNCS): Add strncasecmp. + (AC_CHECK_DECLS): Add mktemp. + + * patch.c (main): Remove useless prototype decl. + (mktemp): Don't declare if HAVE_DECL_MKTEMP || defined mktemp. + (make_temp): Now accepts char, not int. + +2002-05-26 Paul Eggert <eggert@twinsun.com> + + * patch.c (not_defined): Prepend newline. All uses changed. + (apply_hunk): Fix bug: -D was outputting #ifdef when it should + have been outputting #ifndef. Bug report and partial fix by + Jason Short. + + * pch.c (intuit_diff_type): When reading an ed diff, don't use + indent and trailing-CR-ness of "." line; instead, use that of the + command. Bug reported by Anthony Towns; partial fix by Michael + Fedrowitz. + (intuit_diff_type): If the index line exists, don't report a + missing header. Fix by Chip Salzenberg. + +2002-05-26 Alessandro Rubini <rubini@gnu.org> + + * patch.c (locate_hunk): Fixed updating of last_offset. + +2002-05-25 Paul Eggert <eggert@twinsun.com> + + * NEWS, README: Diffutils doc is up to date now. + Bug reporting address is now <bug-patch@gnu.org>. + * README: Describe '--disable-largefile'. + + * NEWS-alpha, dirname.c, dirname.h, exitfail.c, exitfail.h, + quote.c, quote.h, unlocked-io.h: New files, taken from diffutils + and fileutils. + + * argmatch.c: [STDC_HEADERS]: Include stdlib.h, for 'exit'. + + * addext.c, argmatch.c, argmatch.h, backupfile.c, basename.c: + Update from diffutils and fileutils. + + * ansi2knr.1, ansi2knr.c: Remove. + + * common.h: HAVE_SETMODE && O_BINARY -> HAVE_SETMODE_DOS. + * patch.c (usage): Likewise. + * pch.c (open_patch_file): Likewise. + + * configure.ac: Renamed from configure.in. Add copyright notice. + (AC_PREREQ): Bump to 2.53. + (AC_INIT): Use 2.5x style. + (AC_CONFIG_SRCDIR): Add. + (PACKAGE, VERSION): Remove. + (AC_C_PROTOTYPES): Use this instead of AM_C_PROTOTYPES. + (jm_CHECK_TYPE_STRUCT_UTIMBUF): Use this instead of jm_STRUCT_UTIMBUF. + (jm_PREREQ_ADDEXT, jm_PREREQ_DIRNAME, jm_PREREQ_ERROR, + jm_PREREQ_MEMCHR, jm_PREREQ_QUOTEARG): Add. + (AC_CHECK_DECLS): Add free, getenv, malloc. + (AC_CHECK_FUNCS): Remove setmode. + (AC_FUNC_SETMODE_DOS): Add. + (jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Use this instead of + jm_STRUCT_DIRENT_D_INO. + + * Makefile.in (OBJEXT): New var. + (PACKAGE_NAME): Renamed from PACKAGE. All uses changed. + (PACKAGE_VERSION): Renamed from VERSION. All uses changed. + (U): Remove. All uses of "$U.o" changed to ".$(OBJEXT)". + (LIBSRCS): REmove getopt.c getopt1.c. Add mkdir.c, rmdir.c. + (SRCS): Add dirname.c, exitfail.c, getopt.c, getopt1.c, quote.c. + Remove mkdir.c. + (OBJS): Keep in sync with SRCS. + (HDRS): Remove basename.h. + Add dirname.h, exitfail.h, quote.h, unlocked-io.h. + (MISC, configure, config.hin, patchlevel.h): + configure.ac renamed from configure.in. + (MISC): Add README-alpha. Remove ansi2knr.1, ansi2knr.c. + (.c.$(OBJEXT)): Renamed from .c.o. + (ACINCLUDE_INPUTS): Add c-bs-a.m4, error.m4, jm-glibc-io.m4, + mbstate_t.m4, mkdir.m4, mbrtowc.m4, prereq.m4, setmode.m4. + Remove ccstdc.m4, inttypes_h.m4, largefile.m4, protos.m4. + (mostlyclean): Don't clean ansi2knr. + (ansi2knr.o, ansi2knr): Remove. + Redo dependencies. + + * patch.c: Include <exitfail.h>. + (main): Initialize exit_failure. + + * patch.man: Update copyright notice. + + * pch.c, util.c: Include <dirname.h>, not <basename.h>. + + * version.c (copyright_string): Update copyright notice. + +2002-02-17 Paul Eggert <eggert@twinsun.com> + + * partime.c (parse_pattern_letter): Don't overrun buffer if it + contains only alphanumerics. Bug reported by Winni + <Winni470@gmx.net>. + +2001-07-28 Paul Eggert <eggert@sic.twinsun.com> + + * util.c (fetchname), NEWS: + Allow file names with internal spaces, so long as they + don't contain tabs. + + * pch.c (intuit_diff_type): Do not allow Prereq with multiple words. + + * configure.in (AC_PREREQ): Bump to 2.50. + (AC_CHECK_FUNCS): Remove fseeko. + (AC_FUNC_FSEEKO): Add. + * Makefile.in (ACINCLUDE_INPUTS): + Remove largefile.m4; no longer needed with Autoconf 2.50. + +2001-02-07 "Tony E. Bennett" <tbennett@nvidia.com> + + * util.c (PERFORCE_CO): New var. + (version_controller): Support Perforce. + * patch.man: Document this. + +2000-06-30 Paul Eggert <eggert@sic.twinsun.com> + + * patch.man: Ignore comment lines. + + * NEWS, pch.c: Ignore lines beginning with "#". + +1999-10-24 Paul Eggert <eggert@twinsun.com> + + * pch.c (another_hunk): Report a fatal error if a regular + context hunk's pattern has a different number of unchanged + lines than the replacement. + +1999-10-18 Paul Eggert <eggert@twinsun.com> + + * patch.c (main): If we skipped an ed patch, exit with nonzero status. + +1999-10-17 Paul Eggert <eggert@twinsun.com> + + * patch.c (main): Apply do_ed_script even if dry_run, because + we need to make progress on the patch file. + * pch.c (do_ed_script): If skip_rest_of_patch is nonzero, + gobble up the patch without any other side effect. + +1999-10-12 Paul Eggert <eggert@twinsun.com> + + * NEWS, README: New bug reporting address. + * NEWS: Report change in 2.5.4 that we forgot to document. + * README: Document `configure --disable-largefile'. + + * basename.c, COPYING, getopt.c, getopt.h, getopt1.c, m4/largefile.m4: + Update to latest version. + * Makefile.in (basename$U.o): Depend on basename.h. + (config.hin): Depend on $(srcdir)/aclocal.m4. + + * ansi2knr.c, maketime.c, mkinstalldirs, partime.c: Fix $Id. + + FreeBSD has an unrelated setmode function; work around this. + * common.h (binary_transput): Don't declare unless O_BINARY. + * patch.c (option_help, get_some_switches): + Don't use setmode unless O_BINARY. + * pch.c (open_patch_file): Don't invoke setmode unless O_BINARY. + + Fix incompatiblities with error.c. + * common.h (program_name): Now XTERN char *, for compatibility + with error.c. All uses changed. + (PROGRAM_NAME): New macro. + (PARAMS): Use ANSI C version only if defined PROTOTYPES + || (defined __STDC__ && __STDC__), for compatibilty with error.c. + * util.c (vararg_start): Likewise. + * patch.c (program_name): Remove. + (main): Initialize program_name. + * version.c (version): Print PROGRAM_NAME, not program_name. + + Accommodate mingw32 port, which has one-argument mkdir (yuck!) + and no geteuid. + * m4/mkdir.m4: New file. + * Makefile.in (ACINCLUDE_INPUTS): Add $(M4DIR)/mkdir.m4. + * configure.in (AC_CHECK_FUNCS): Add geteuid, getuid. + (PATCH_FUNC_MKDIR_TAKES_ONE_ARG): Add. + * common.h (mkdir): Define if mkdir takes one arg. + (geteuid): New macro, if not already defined. + +1999-10-11 Christopher R. Gabriel <cgabriel@tin.it> + + * patch.c (option_help): Updated bug report address + * configure.in (VERSION): Version 2.5.5 released. + +1999-09-01 Paul Eggert <eggert@twinsun.com> + + * patch.c (main): Default simple_backup_suffix to ".orig". + +1999-10-08 Paul Eggert <eggert@twinsun.com> + + * patch.man: Make it clear that `patch -o F' should not be + used if F is one of the files to be patched. + +1999-08-30 Paul Eggert <eggert@twinsun.com> + + Version 2.5.4 fixes a few minor bugs, converts C sources to + ANSI prototypes, and modernizes auxiliary sources and autoconf + scripts. + + * configure.in (VERSION): Version 2.5.4 released. + (AC_CANONICAL_HOST): Add. + (AC_SYS_LARGEFILE): Add, replacing inline code. + (AC_EXEEXT): Add. + (jm_AC_HEADER_INTTYPES_H): Add, replacing inline code. + (AC_TYPE_PID_T): Add. + (jm_STRUCT_UTIMBUF): Add, replacing inline code. + (HAVE_MEMCHR): Remove obsolescent test; nobody uses NetBSD 1.0 now. + (getopt_long): Append $U to object file basenames. + (AC_CHECK_FUNCS): Add fseeko, setmode. Remove mkdir. + (AC_REPLACE_FUNCS): Add mkdir, rmdir. + (jm_STRUCT_DIRENT_D_INO): Add, replacing inline code. + + * Makefile.in (EXEEXT): New macro. + (mandir): New macro. + (man1dir): Define in terms of mandir. + (SRCS): Add mkdir.c, rmdir.c. + (OBJS): Change .o to $U.o for addext, argmatch, backupfile, basename, + error, inp, patch ,,pch, quotearg, util, version, xmalloc. + (HDRS): Add basename.h, patchlevel.h. + (MISC): Add ansi2knr.1, config.guess, config.sub. + (MISC, config.hin): Remove acconfig.h; no longer needed. + (DISTFILES_M4): New macro. + (all): patch -> patch$(EXEEXT). + (patch$(EXEEXT)): Renamed from patch. All uses changed. + (uninstall): Remove manual page. + (configure): Depend on aclocal.m4. + (M4DIR, ACINCLUDE_INPUTS): New macros. + ($(srcdir)/aclocal.m4): New rule. + (patchlevel.h): Depend on configure.in, not Makefile, + since we now distribute it. + (distclean): Don't remove patchlevel.h. + (dist): Distribute $(DISTFILES_M4). + (addext_.c argmatch_.c backupfile_.c basename_.c error_.c + getopt_.c getopt1_.c inp_.c malloc_.c mkdir_.c patch_.c pch_.c + rename_.c util_.c version_.c xmalloc_.c): Depend on ansi2knr. + Update dependencies to match sources. + + * common.h (_LARGEFILE_SOURCE): Remove; now autoconfigured. + (file_offset): Depend on HAVE_FSEEKO, not _LFS_LARGEFILE. + + * patch.c (version_control_context): New variable. + Convert to ANSI prototypes. + Adjust to new argmatch calling convention. + Similarly for get_version. + Complain about creating an existing file only if + pch_says_nonexistent returns 2 (not merely nonzero). + Similarly for time mismatch check. + (get_some_switches): Adjust to new get_version calling convention. + Similarly for argmatch. + + * pch.c (<basename.h>): Include. + (intuit_diff_type): Improve quality of test for empty file. + (another_hunk): Don't assume off_t is no longer than long. + + * util.h (backup_type): New decl. + * util.c (<basename.h>): Include. + (move_file): Adjust to new find_backup_file_name convention. + (doprogram, mkdir, rmdir): Remove; now in separate files. + (fetchame): Match "/dev/null", not NULL_DEVICE. + Ignore names that don't have enough slashes to strip off. + + * version.c: Update copyright notice. + +1998-03-20 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.5.3. + * quotearg.h (quotearg_quoting_options): + Remove; it ran afoul of the Borland C compiler. + Its address is now represented by the null pointer. + * quotearg.c (default_quoting_options): + Renamed from quotearg_quoting_options, + and now static instead of extern. + (clone_quoting_options, get_quoting_style, set_quoting_style, + set_char_quoting, quotearg_buffer): + Use default_quoting_options when passed a null pointer. + * patch.c (main, get_some_switches): + Pass a null pointer instead of address of quotearg_quoting_options. + +1998-03-17 Paul Eggert <eggert@twinsun.com> + + * patch.c (option_help): Update bug reporting address to gnu.org. + * patch.man: Fix copyright and bug reporting address. + +1998-03-16 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.5.2. + (AC_CHECK_FUNCS): Add strerror. + (jm_FUNC_MALLOC, jm_FUNC_REALLOC): Add. + (AM_C_PROTOTYPES): Add. + + * NEWS, patch.c (longopts, get_some_switches), patch.man: + Add --quoting-style, --posix options. + + * Makefile.in (LIBSRCS): Add malloc.c, realloc.c. + (SRCS): Add error.c, quotesys.c, xmalloc.c. + (OBJS): Likewise. + (HDRS): Add error.h, quotesys.h, xalloc.h. + (MISC): Add AUTHORS, aclocal.m4, ansi2knr.c. + (clean): Use mostlyclean rule. + (argmatch.o, inp.o, patch.o, pch.o): Now also depends on quotearg.h. + (inp.o, patch.o, util.o): Now also depends on xalloc.h. + (error.o, quotearg.o, quotesys.o, xmalloc.o, + ansi2knr.o, ansi2knr, quotearg_.c, .c_.c): New rules. + (U): New macro. + (OBJS, quotearg$U.o): Rename quotearg.o to quotearg$U.o. + (mostlyclean): Remove ansi2knr, *_.c. + (.SUFFIXES): Add _.c. + + * acconfig.h (PROTOTYPES): New undef. + + * acconfig.h, configure.in (HAVE_INTTYPES_H, malloc, realloc): + New macros. + + * aclocal.m4, error.c, error.h, malloc.c, + quotearg.h, quotearg.c, realloc.c, xalloc.h, xmalloc.c: New files. + + * argmatch.c: Include <sys/types.h> before <argmatch.h>. + Include <quotearg.h>. + + * argmatch.c (invalid_arg), + inp.c (scan_input, report_revision, too_many_lines, get_input_file, + plan_a), + patch.c (main, get_some_switches, numeric_string), + pch.c (open_patch_file, intuit_diff_type, do_ed_script): + util.c (move_file, create_file, copy_file, version_get, removedirs): + Quote output operands properly. + + * common.h: Include <inttypes.h> if available. + (CHAR_BIT, TYPE_SIGNED, TYPE_MINIMUM, TYPE_MAXIMUM, + CHAR_MAX, INT_MAX, LONG_MIN, SIZE_MAX, O_EXCL): New macros. + (TMPINNAME_needs_removal, TMPOUTNAME_needs_removal, + TMPPATNAME_needs_removal): New variables. + (xmalloc): Remove decl; now in xalloc.h. + + * inp.c: Include <quotearg.h>, <xalloc.h>. + + * inp.c (get_input_file), + pch.c (intuit_diff_type), + util.c (version_controller): + Don't do diff operation if diffbuf is null; used by ClearCase support. + + * inp.c (plan_b), + patch.c (init_reject), + pch.c (open_patch_file, do_ed_script): + Create temporary file with O_EXCL to avoid races. + + * patch.c: Include <quotearg.h>, <xalloc.h>. + (create_output_file, init_output): New open_flags arg. + All callers changed. + (init_reject): No longer takes filename arg. All callers changed. + (remove_if_needed): New function. + (cleanup): Use it to remove temporary files only if needed. + (TMPREJNAME_needs_removal): New var. + (main): Set xalloc_fail_func to memory_fatal; needed for xalloc. + Initialize quoting style from QUOTING_STYLE. + (longopts, get_some_switches): Offset longarg options by CHAR_MAX, + not 128; this is needed for EBCDIC ports. + + * patch.c (main, locate_hunk, abort_hunk, spew_output), + pch.c (there_is_another_patch, intuit_diff_type, malformed, + another_hunk): + The LINENUM type now might be longer than long, + so print and read line numbers more carefully. + + * patch.c (main), + pch.c (there_is_another_patch): + util.c (fetchname): + strippath now defaults to -1, so that we can distinguish unset + value from largest possible. + + * patch.man: Clarify how file name is chosen from candidates. + + * pch.c: Include <quotearg.h>. + (p_strip_trailing_cr): New variable. + (scan_linenum): New function. + (pget_line, re_patch, there_is_another_patch, intuit_diff_type, + get_line): Strip trailing CRs from context diffs that need this. + (best_name): Use SIZE_MAX instead of (size_t) -1 for max size_t. + + * quotesys.c, quotearg.h: Renamed from quotearg.c and quotearg.h. + All uses changed. + * quotesys.h (__QUOTESYS_P): Renamed from __QUOTEARG_P. + + * util.c: Include <quotearg.h>, <xalloc.h>. + (raise): Don't define if already defined. + (move_file): New arg from_needs_removal. All callers changed. + (copy_file): New arg to_flags. All callers changed. + (CLEARTOOL_CO): New constant. + (version_controller): Add ClearCase support. + (format_linenum): New function. + (fetchname): Allow any POSIX.1 time zone spec, which means + any local time offset in the range -25:00 < offset < +26:00. + Ignore the name if it doesn't have enough slashes to strip off. + (xmalloc): Remove; now in xmalloc.c. + + * util.h (LINENUM_LENGTH_BOUND): New macro. + (format_linenum): New decl. + + * version.c (copyright_string): Update years of copyrights. + +1997-09-03 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.5.1. + * inp.c (re_input): Don't free buffers twice when input is garbled. + * patch.c (main): If skipping patch and Plan A fails, don't + bother trying Plan B. + 1997-08-31 Paul Eggert <eggert@twinsun.com> * configure.in (VERSION): Version 2.5 released. @@ -1696,9 +2266,26 @@ Sun Dec 17 17:29:48 1989 Jim Kingdon ( 1984-11-09 Larry Wall <sdcrdcf!lwall> * patch.c: Initial revision - -Local Variables: -mode: indented-text -left-margin: 8 -version-control: never -end: + + +Copyright (C) 1984, 1985, 1986, 1987, 1988 Larry Wall. + +Copyright (C) 1989, 1990, 1991, 1992, 1993, 1997, 1998, 1999, 2000, 2001, +2002 Free Software Foundation, Inc. + +This file is part of GNU Patch. + +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, or (at your option) +any later version. + +This program is distributed in the hope that they 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; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. Modified: vendor/patch/dist/INSTALL ============================================================================== --- vendor/patch/dist/INSTALL Sat Jul 27 18:42:46 2013 (r253716) +++ vendor/patch/dist/INSTALL Sat Jul 27 19:57:20 2013 (r253717) @@ -1,3 +1,9 @@ +Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software +Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + Basic Installation ================== @@ -8,20 +14,27 @@ various system-dependent variables used those values to create a `Makefile' in each directory of the package. It may also create one or more `.h' files containing system-dependent definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' -contains results you don't want to keep, you may remove or edit it. - - The file `configure.in' is used to create `configure' by a program -called `autoconf'. You only need `configure.in' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. The simplest way to compile this package is: @@ -55,14 +68,15 @@ Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' -initial values for variables by setting them in the environment. Using -a Bourne-compatible shell, you can do that on the command line like -this: - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for variables by setting +them in the environment. You can do that on the command line like this: -Or on systems that have the `env' program, you can do it like this: - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + + *Note Defining Variables::, for more details. Compiling For Multiple Architectures ==================================== @@ -75,11 +89,11 @@ directory where you want the object file the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. Installation Names ================== @@ -122,22 +136,32 @@ you can use the `configure' options `--x Specifying the System Type ========================== - There may be some features `configure' can not figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + CPU-COMPANY-SYSTEM -See the file `config.sub' for the possible values of each field. If +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't -need to know the host type. +need to know the machine type. - If you are building compiler tools for cross-compiling, you can also + If you are _building_ compiler tools for cross-compiling, you should use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of -system on which you are compiling the package. +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. Sharing Defaults ================ @@ -150,20 +174,44 @@ default values for variables like `CC', `CONFIG_SITE' environment variable to the location of the site script. A warning: not all `configure' scripts look for a site script. -Operation Controls +Defining Variables ================== + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +will cause the specified gcc to be used as the C compiler (unless it is +overridden in the site shell script). + +`configure' Invocation +====================== + `configure' recognizes the following options to control how it operates. -`--cache-file=FILE' - Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. - `--help' +`-h' Print a summary of the options to `configure', and exit. +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + `--quiet' `--silent' `-q' @@ -175,9 +223,6 @@ operates. Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. -`--version' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`configure' also accepts some other, not widely useful, options. +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. Modified: vendor/patch/dist/Makefile.in ============================================================================== --- vendor/patch/dist/Makefile.in Sat Jul 27 18:42:46 2013 (r253716) +++ vendor/patch/dist/Makefile.in Sat Jul 27 19:57:20 2013 (r253717) @@ -1,5 +1,7 @@ # Makefile for GNU patch. -# Copyright 1993, 1997 Free Software Foundation, Inc. + +# Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003 Free Software +# Foundation, Inc. # 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 @@ -33,11 +35,13 @@ transform = @program_transform_name@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DEFS = @DEFS@ +EXEEXT = @EXEEXT@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ +OBJEXT = @OBJEXT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -45,7 +49,8 @@ exec_prefix = @exec_prefix@ bindir = $(exec_prefix)/bin # Where to put the manual pages. -man1dir = $(prefix)/man/man1 +mandir = @mandir@ +man1dir = $(mandir)/man1 # Extension (including `.') for the manual page filenames. man1ext = .1 @@ -56,24 +61,42 @@ CONFIG_STATUS = config.status SHELL = /bin/sh -LIBSRCS = getopt.c getopt1.c memchr.c rename.c -SRCS = addext.c argmatch.c backupfile.c basename.c inp.c maketime.c \ - partime.c patch.c pch.c quotearg.c util.c version.c $(LIBSRCS) -OBJS = addext.o argmatch.o backupfile.o basename.o inp.o maketime.o \ - partime.o patch.o pch.o quotearg.o util.o version.o $(LIBOBJS) -HDRS = argmatch.h backupfile.h common.h getopt.h \ - inp.h maketime.h partime.h pch.h quotearg.h util.h version.h -MISC = COPYING ChangeLog INSTALL Makefile.in NEWS README \ - acconfig.h config.hin configure configure.in \ - install-sh mkinstalldirs patch.man +LIBSRCS = error.c malloc.c memchr.c mkdir.c \ + realloc.c rmdir.c strcasecmp.c strncasecmp.c +SRCS = $(LIBSRCS) \ + addext.c argmatch.c backupfile.c \ + basename.c dirname.c \ + getopt.c getopt1.c inp.c \ + maketime.c partime.c \ + patch.c pch.c \ + quote.c quotearg.c quotesys.c \ + util.c version.c xmalloc.c +OBJS = $(LIBOBJS) \ + addext.$(OBJEXT) argmatch.$(OBJEXT) backupfile.$(OBJEXT) \ + basename.$(OBJEXT) dirname.$(OBJEXT) \ + getopt.$(OBJEXT) getopt1.$(OBJEXT) inp.$(OBJEXT) \ + maketime.$(OBJEXT) partime.$(OBJEXT) \ + patch.$(OBJEXT) pch.$(OBJEXT) \ + quote.$(OBJEXT) quotearg.$(OBJEXT) quotesys.$(OBJEXT) \ + util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT) +HDRS = argmatch.h backupfile.h common.h dirname.h \ + error.h getopt.h gettext.h \ + inp.h maketime.h partime.h pch.h \ + quote.h quotearg.h quotesys.h \ + unlocked-io.h util.h version.h xalloc.h +MISC = AUTHORS COPYING ChangeLog INSTALL Makefile.in NEWS README \ + aclocal.m4 \ + config.hin configure configure.ac \ + install-sh mkinstalldirs patch.man stdbool.h.in DISTFILES = $(MISC) $(SRCS) $(HDRS) +DISTFILES_M4 = $(ACINCLUDE_INPUTS) DISTFILES_PC = pc/chdirsaf.c DISTFILES_PC_DJGPP = pc/djgpp/README pc/djgpp/config.sed \ pc/djgpp/configure.bat pc/djgpp/configure.sed patch_name = `echo patch | sed '$(transform)'` -all:: patch +all:: patch$(EXEEXT) info:: check:: @@ -82,14 +105,14 @@ installcheck:: COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) -Ded_PROGRAM=\"$(ed_PROGRAM)\" \ -I. -I$(srcdir) $(CFLAGS) -.c.o: +.c.$(OBJEXT): $(COMPILE) $< -patch: $(OBJS) +patch$(EXEEXT): $(OBJS) $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) install:: all installdirs - $(INSTALL_PROGRAM) patch $(bindir)/$(patch_name) + $(INSTALL_PROGRAM) patch$(EXEEXT) $(bindir)/$(patch_name)$(EXEEXT) -$(INSTALL_DATA) $(srcdir)/patch.man $(man1dir)/$(patch_name)$(man1ext) installdirs:: @@ -99,31 +122,59 @@ install-strip:: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install uninstall:: - rm -f $(bindir)/$(patch_name) $(man1dir)/$(patch_name)$(man1ext) + rm -f $(bindir)/$(patch_name)$(EXEEXT) + rm -f $(man1dir)/$(patch_name)$(man1ext) Makefile: Makefile.in $(CONFIG_STATUS) $(SHELL) $(CONFIG_STATUS) config.status: configure $(SHELL) $(CONFIG_STATUS) --recheck -configure: configure.in +configure: configure.ac $(srcdir)/aclocal.m4 cd $(srcdir) && autoconf -config.hin: configure.in acconfig.h +config.hin: configure.ac $(srcdir)/aclocal.m4 cd $(srcdir) && rm -f config.hin && autoheader +stdbool.h: stdbool.h.in + sed -e 's/@''HAVE__BOOL''@/@HAVE__BOOL@/g' \ + <$(srcdir)/stdbool.h.in >stdbool.h + +M4DIR = $(srcdir)/m4 +ACINCLUDE_INPUTS = \ + $(M4DIR)/backupfile.m4 \ + $(M4DIR)/d-ino.m4 \ + $(M4DIR)/dirname.m4 \ + $(M4DIR)/dos.m4 \ + $(M4DIR)/error.m4 \ + $(M4DIR)/getopt.m4 \ + $(M4DIR)/malloc.m4 \ + $(M4DIR)/mbrtowc.m4 \ + $(M4DIR)/mbstate_t.m4 \ + $(M4DIR)/memchr.m4 \ + $(M4DIR)/mkdir.m4 \ + $(M4DIR)/onceonly.m4 \ + $(M4DIR)/quote.m4 \ + $(M4DIR)/quotearg.m4 \ + $(M4DIR)/realloc.m4 \ + $(M4DIR)/rmdir.m4 \ + $(M4DIR)/setmode.m4 \ + $(M4DIR)/stdbool.m4 \ + $(M4DIR)/unlocked-io.m4 \ + $(M4DIR)/utimbuf.m4 \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307271957.r6RJvL3r007685>