| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
The old (2.1) GNU patch has outlived its days. The major
local changes have been moved into the less restrictedly
licensed patch(1) we adopted in usr.bin/ .
A much newer version of GNU patch is available in the
ports tree (devel/patch).
Disconnect from the build and remove.
|
|
|
|
|
|
|
|
| |
As promised, drop the option to make the older GNU patch
the default.
GNU patch is still being built but something drastic may
happen to it to it before Release.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The BSD-licensed patch(1) command has matured and it's behaviour
can be considered equivalent to the older version of GNU patch
in the tree.
The switch has been extensively tested [1] and only two ports
presented regressions, which have since been fixed.
For convenience a new WITH_GNU_PATCH option is available,
but it will likely be removed in the near future.
PR: 176313
Approved by: portmgr
|
|
|
|
|
|
|
| |
accurately fills the read buffer.
Callers of pgets() still mis-process the buffer contents if the read line
contains NUL characters, but this at least makes pgets() accurate.
|
|
|
|
|
|
|
| |
The former makes a copy of stdin, but was not accurately putting the
content of stdin into a temp file. This lead to the undercounting
the number of lines in hunks containing NUL characters when reading
from stdin. Thus resulting in "unexpected end of file in patch" errors.
|
|
|
|
|
|
|
|
| |
DragonflyBSD and install it as bsdpatch. WITH_BSD_PATCH makes it
default and installs GNU patch as gnupatch.
Submitted by: pfg
Obtained from: The DragonflyBSD Project
|
|
|
|
|
|
|
| |
terminated. Make sure that it is before using it.
Reviewed by: marck@
MFC after: 3 days
|
|
|
|
|
| |
It basically picks the filenames from the "====" line and strips off the
# revision number.
|
|
|
|
|
|
|
|
| |
to a dynamically allocated one in order to support input lines of
arbitrary length.
Approved by: kan (mentor)
MFC after: 1 month
|
|
|
|
|
|
| |
PR: 64081
Submitted by: Chris Pepper <pepper@reppep.com>
MFC after: 1 day
|
| |
|
|
|
|
| |
some more. Make this compile cleanly.
|
|
|
|
|
|
| |
Submitted by: blc@bsdwins.com
Approved by: gad
MFC after: 1 week
|
|
|
|
|
|
|
| |
buffer-safe string functions. The rest of the code is still probably
unsafe.
MFC after: 1 week
|
|
|
|
|
|
|
|
|
|
| |
changing indentation and some comments. Main goal is not perfect style,
but just to reduce differences with NetBSD. The object code is exactly
the same after this change as before it (except for assert() statements
which have moved).
Reviewed by: /sbin/md5 on i386
Obtained from: NetBSD
|
|
|
|
|
|
|
|
|
| |
our patch to look a little more like NetBSD's, and has the nice characteristic
that the object code is exactly the same after the change as before it (even in
patch.c and pch.c, which have pesky 'assert' statements in them).
Reviewed by: /sbin/md5 on i386, alpha, sparc64
MFC after: 3 days
|
|
|
|
| |
MFC after: 3 days
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
\ No newline at end of file
line that some versions of diff print out if the last line of the two files
are different, and one of the two files does not have a newline character
on that last line.
This change is still somewhat under discussion in -arch and -standards, but I
want to commit it to -current today so I'd have the chance to MFC it to -stable
before the code freeze for 4.6-release (which would be May 1st).
Note: the related change to 'diff' (so it might *generate* that line) is NOT
expected to be included in 4.6-release. We can debate that change later.
Obtained from: NetBSD (1.13 of basesrc/usr.bin/patch/pch.c, by kristerw)
MFC after: 4 days
|
|
|
|
|
|
|
| |
patch file on command line instead of stdin.
Submitted by: Joseph Mallett <jmallett@xMach.org>
MFC after: 1 month
|
| |
|
| |
|
|
|
|
| |
Use _PATH_* where where possible.
|
|
|
|
|
|
| |
a patch, returning -f/--force and -t/--batch to their previous semantics.
Pointed out by: asami
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously, using -S/--skip, -f/--force, or -t/--batch to skip a patch in
a patchset still registers a failure which causes patch to return a
non-zero exit code. This is particularly undesirable with regards to
ports as there is no way to ignore the non-zero code. (Luckily, we don't
currently have any ports that make use of any of these options.)
The PR (yes, my own) is slightly incorrect: It states that -f does indeed
properly skip patches. It does, but it still sets the failure flag causing
patch to return non-zero.
PR: 19638
Submitted by: kbyanc@posi.net
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
as it was in hacked FreeBSD version
|
| |
|
| |
|
|
|
|
|
|
|
| |
It maybe right, if patch was FreeBSD-own program, but it break compatibility
with pre-existent patches in other systems.
The example is big ncurses patch which don't apply on FreeBSD
due to "fixed" precedence.
|
| |
|
|
|
|
|
|
|
|
| |
also remove -Wall that I acidentally committed last time I was here...
Submitted-by: Philippe Charnier
Closes PR#2998
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
controlling terminal is closed. Now the function ask() will return 1 when th
input is known to come from a file or terminal, or it will return 0 when ther
was a read error.
Modified the question "Skip patch?" so that on an error from ask it will skip
the patch instead of looping.
Closes PR#777
2.2 candidate
|
|
|
|
| |
was fouling up a comment in the checked-out code.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
with valid names, the ***/---names were taken first.
this broke eg:
Index: foo/Makefile
==========
RCS <blah>
Retrieving <blah>
diff <blah>
*** Makefile <blah>
--- Makefile <blah>
By trying to patch the Makefile in the _curent_ directory, rather than
the one in the foo/ directory.
|
|
|
|
|
| |
now takes precedence over a context diff header for determining
the name of the file to patch.
|
|
|
|
|
|
|
| |
in the diff. This makes it so that diffs containing files in different
subdirectories that have the same name not patch the same file. For example
a diff with patches to Makefile, des/Makefile, usr.bin/Makefile would attempt
to patch Makefile three times.
|
| |
|
|
|
|
| |
Reviewed by: phk
|
| |
|
|
|
|
| |
ports, until I saw the the commit messages, that is! :-) All changed backed out.
|
|
|
|
| |
a patch before actually applying it.
|
|
|
|
| |
otherwise causes the XFree86 1.3 patch set to fail.
|
|
|