Software Package:       
	patch

Release/Version:
	2.1

Retrieved from:
	ftp.gnu.ai.mit.edu

Bug reports:
	This software package is maintained by the software contributor,
	not BSDI.  Please send any bug reports to support@BSDI.COM,
	bug-gnu-utils@prep.ai.mit.edu, and lwall@netlabs.com.

Comments:

=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Modifications to this version made by BSDI:

The following diff's are to GNU patch, version 2.1.  There are
two changes.  The first one was to add a "none" method to the
-V/--version-control option, which causes patch to never attempt
to create a backup file.  This is an extension to the 2.1
program.  The second one was to make checking a file out from
RCS/SCCS, if it didn't exist or wasn't readable, dependent on
a new option, -C/--checkout; if -C/--checkout is set, RCS/SCCS
files are ignored.

Keith Bostic 07/19/95

===================================================================
RCS file: /master/contrib/patch/backupfile.c,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 backupfile.c
325c325
<   "never", "simple", "nil", "existing", "t", "numbered", 0
---
>   "never", "simple", "nil", "existing", "t", "numbered", "none", 0
330c330
<   simple, simple, numbered_existing, numbered_existing, numbered, numbered
---
>   simple, simple, numbered_existing, numbered_existing, numbered, numbered, none
===================================================================
RCS file: /master/contrib/patch/common.h,v
retrieving revision 1.2
diff -r1.2 common.h
143a144
> EXT bool checkout INIT(TRUE);
===================================================================
RCS file: /master/contrib/patch/inp.c,v
retrieving revision 1.2
diff -r1.2 inp.c
99c99
<     if (statfailed
---
>     if (checkout && (statfailed
105c105
< 		    && filestat.st_uid != myuid)))) {
---
> 		    && filestat.st_uid != myuid))))) {
===================================================================
RCS file: /master/contrib/patch/patch.1,v
retrieving revision 1.2
diff -r1.2 patch.1
264a265,269
> .B "\-C, \-\-checkout"
> stops
> .I patch
> from attempting to get or check out the file using SCCS or RCS.
> .TP 5
447c452
< .B "\-V method, \-\-version\-\-control=method"
---
> .B "\-V method, \-\-version\-control=method"
477a483,485
> .TP
> `none'
> Never make backups.
===================================================================
RCS file: /master/contrib/patch/patch.c,v
retrieving revision 1.2
diff -r1.2 patch.c
439c439
< static char *shortopts = "-b:B:cd:D:eEfF:lnNo:p::r:RsStuvV:x:";
---
> static char *shortopts = "-b:B:Ccd:D:eEfF:lnNo:p::r:RsStuvV:x:";
444a445
>   {"checkout", 0, NULL, 'C'},
499a501,503
> 	    case 'C':
> 		checkout = FALSE;
> 		break;
582c586
<        [-r rej-name] [-V {numbered,existing,simple}] [--context]\n\
---
>        [-r rej-name] [-V {none,numbered,existing,simple}] [--context]\n\
589c593
<        [--version-control={numbered,existing,simple}]\n");
---
>        [--version-control={none,numbered,existing,simple}]\n");
===================================================================
RCS file: /master/contrib/patch/util.c,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 util.c
55c55
<     } else {
---
>     } else if (backup_type != none) {
68c68,69
<     if (stat(to, &filestat) == 0) {	/* output file exists */
---
>     if (backup_type != none &&
>         stat(to, &filestat) == 0) {		/* output file exists */
404c405
<     if (stat(name, &filestat) && !assume_exists) {
---
>     if (checkout && stat(name, &filestat) && !assume_exists) {
