src/usr.bin/patch, branch releng/14.2FreeBSD source treehttps://cgit-dev.freebsd.org/src/atom?h=releng%2F14.22024-02-24T12:12:49Zpatch: Support long context lines.2024-02-24T12:12:49ZDag-Erling Smørgravdes@FreeBSD.org2024-02-12T18:26:13Zurn:sha1:4ffc5ab03f8370dcffb1d0bb968e2152348cc709
MFC after: 1 week
Sponsored by: Klara, Inc.
Reviewed by: allanjude
Differential Revision: https://reviews.freebsd.org/D43850
(cherry picked from commit 851a9da38f070675c42a6d69c41c47a5d29ee3d0)
Remove $FreeBSD$: one-line nroff pattern2023-08-16T17:55:15ZWarner Loshimp@FreeBSD.org2023-08-16T17:55:15Zurn:sha1:b2c76c41be32f904179efed29c0ca04d53f3996c
Remove /^\.\\"\s*\$FreeBSD\$$\n/
Remove $FreeBSD$: one-line sh pattern2023-08-16T17:55:03ZWarner Loshimp@FreeBSD.org2023-08-16T17:55:03Zurn:sha1:d0b2dbfa0ecf2bbc9709efc5e20baf8e4b44bbbf
Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
Remove $FreeBSD$: one-line .h pattern2023-08-16T17:54:23ZWarner Loshimp@FreeBSD.org2023-08-16T17:54:23Zurn:sha1:42b388439bd3795e09258c57a74ce9eec3651c7b
Remove /^\s*\*+\s*\$FreeBSD\$.*$\n/
patch: don't run off the end of path if it ends in '/'.2023-08-07T03:27:27ZPedro F. Giffunipfg@FreeBSD.org2023-08-07T03:27:27Zurn:sha1:9610cbc09e72c370369b5cc0e165542a2c5fdca7
Found by fuzzing (afl) in OpenBSD.
Obtained from: OpenBSD (CVS 1.65)
spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD2023-05-12T16:44:03ZWarner Loshimp@FreeBSD.org2023-05-10T15:40:58Zurn:sha1:4d846d260e2b9a3d4d0a701462568268cbfe7a5b
The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch
up to that fact and revert to their recommended match of BSD-2-Clause.
Discussed with: pfg
MFC After: 3 days
Sponsored by: Netflix
Update/fix Makefile.depend for userland2023-04-19T00:14:23ZSimon J. Gerratysjg@FreeBSD.org2023-04-19T00:14:23Zurn:sha1:d9a42747950146bf03cda7f6e25d219253f8a57apatch: omit filename if the prompt was ignored2023-02-13T06:15:08ZKyle Evanskevans@FreeBSD.org2023-01-24T16:46:01Zurn:sha1:7e688ed493482c5346d969e7667856d8ced8d87a
When a file is missing, patch(1) will prompt for a filename to try and
patch it. If we're doing a dry-run, we'll output that the patch to the
source file was either ignored/failed. If you ignore the prompt in a
dry-run (i.e. just hit enter), we'll output:
X out of X hunks ignored while patching (null)
Let's improve the aesthetics a bit and just omit the last part if the
prompt was ignored:
X out of X hunks ignored
Unfortunately we can't really test this without expect(1) because both
force and batch mode will use the first best guess, which is wiped out
by the "File to patch:" prompt. We could record the initially derived
bestguess there and use *that*, but given that this is only possible in
an interactive session I think it's fine to just omit the filename
rather than adding a fair amount of complexity (which could also break
other scenarios I haven't considered yet)..
Reviewed by: des
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D38179
patch: cleanup variable initialization a bit.2021-07-22T19:23:22ZPedro F. Giffunipfg@FreeBSD.org2021-07-22T19:09:17Zurn:sha1:c384a27805a630ae45ca3d97614a07ebfce5515d
musl libc fgetln is a bit more pickier.
Hinted by: chimera-linux (git 31491e1de2e1241885984cd9e4b978965f14eda4)
usr.bin/patch: remove unneeded header.2021-05-02T16:27:32ZXin LIdelphij@FreeBSD.org2021-05-02T16:27:32Zurn:sha1:9769f6f808210ddc304bc9e3c55121e6ce4d9075
MFC after: 2 weeks