Up to [cvs.NetBSD.org] / pkgsrc / devel / patch
Request diff between arbitrary revisions
Keyword substitution: kv
Default branch: MAIN
Pullup ticket #7340 - requested by taca
devel/patch: Security fix
Revisions pulled up:
- devel/patch/Makefile 1.48
- devel/patch/distinfo 1.16
- devel/patch/patches/patch-src_pch.c deleted
- devel/patch/patches/patch-tests_Makefile.in deleted
- devel/patch/patches/patch-tests_ed-style deleted
---
Module Name: pkgsrc
Committed By: wiz
Date: Mon Oct 26 16:47:06 UTC 2026
Modified Files:
pkgsrc/devel/patch: Makefile distinfo
Removed Files:
pkgsrc/devel/patch/patches: patch-src_pch.c patch-tests_Makefile.in
patch-tests_ed-style
Log Message:
patch: update to 2.8.1.
Changes in version 2.8.1:
* Prevent creation of out-of-tree files (CVE-2026-115207).
Changes in version 2.8:
* The --follow-symlinks option now applies to output files as well as input.
* 'patch' now supports file timestamps after 2038 even on traditional
GNU/Linux platforms where time_t defaults to 32 bits.
* 'patch' no longer creates files with names containing newlines,
as encouraged by POSIX.1-2024.
* Patches can no longer contain NUL ('\0') bytes in diff directive lines.
These bytes would otherwise cause unpredictable behavior.
* Patches can now contain sequences of spaces and tabs around line numbers
and in other places where POSIX requires support for these sequences.
* --enable-gcc-warnings no longer uses expensive static checking.
Use --enable-gcc-warnings=expensive if you still want it.
* Fix undefined or ill-defined behavior in unusual cases, such as very
large sizes, possible stack overflow, I/O errors, memory exhaustion,
races with other processes, and signals arriving at inopportune moments.
* Remove old "Plan B" code, designed for machines with 16-bit pointers.
* Assume C99 or later; previously it assumed C89 or later.
* Port to current GCC, Autoconf, Gnulib, etc.
patch: update to 2.8.1.
Changes in version 2.8.1:
* Prevent creation of out-of-tree files (CVE-2026-115207).
Changes in version 2.8:
* The --follow-symlinks option now applies to output files as well as input.
* 'patch' now supports file timestamps after 2038 even on traditional
GNU/Linux platforms where time_t defaults to 32 bits.
* 'patch' no longer creates files with names containing newlines,
as encouraged by POSIX.1-2024.
* Patches can no longer contain NUL ('\0') bytes in diff directive lines.
These bytes would otherwise cause unpredictable behavior.
* Patches can now contain sequences of spaces and tabs around line numbers
and in other places where POSIX requires support for these sequences.
* --enable-gcc-warnings no longer uses expensive static checking.
Use --enable-gcc-warnings=expensive if you still want it.
* Fix undefined or ill-defined behavior in unusual cases, such as very
large sizes, possible stack overflow, I/O errors, memory exhaustion,
races with other processes, and signals arriving at inopportune moments.
* Remove old "Plan B" code, designed for machines with 16-bit pointers.
* Assume C99 or later; previously it assumed C89 or later.
* Port to current GCC, Autoconf, Gnulib, etc.
patch: remove Interix support
all: migrate several HOMEPAGEs to https pkglint --only "https instead of http" -r -F With manual adjustments afterwards since pkglint 19.4.4 fixed a few indentations in unrelated lines. This mainly affects projects hosted at SourceForce, as well as freedesktop.org, CTAN and GNU.
Pullup ticket #5847 - requested by bsiegert
devel/patch: security patches
Revisions pulled up:
- devel/patch/Makefile 1.45
- devel/patch/distinfo 1.13
- devel/patch/patches/patch-src_pch.c 1.1
- devel/patch/patches/patch-tests_Makefile.in 1.1
- devel/patch/patches/patch-tests_ed-style 1.1
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: leot
Date: Thu Oct 18 19:26:16 UTC 2018
Modified Files:
pkgsrc/devel/patch: Makefile distinfo
Added Files:
pkgsrc/devel/patch/patches: patch-src_pch.c patch-tests_Makefile.in
patch-tests_ed-style
Log Message:
patch: Backport patches for several security fixes
pkgsrc changes:
- Remove custom and no longer needed do-patch target, it was fixed upstream
- Minor cosmetic improvements pointed out by pkglint
Changes:
- Backport patches for CVE-2018-6951, CVE-2018-6952 and CVE-2018-1000156
Patch provided by Attila Fülöp via NetBSD/pkgsrc#33, thanks!
Bump PKGREVISION
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/patch/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/patch/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/patch/patches/patch-src_pch.c \
pkgsrc/devel/patch/patches/patch-tests_Makefile.in \
pkgsrc/devel/patch/patches/patch-tests_ed-style
patch: Backport patches for several security fixes pkgsrc changes: - Remove custom and no longer needed do-patch target, it was fixed upstream - Minor cosmetic improvements pointed out by pkglint Changes: - Backport patches for CVE-2018-6951, CVE-2018-6952 and CVE-2018-1000156 Patch provided by Attila Fülöp via NetBSD/pkgsrc#33, thanks! Bump PKGREVISION
Updated devel/patch to 2.7.6 Changes in version 2.7.6: * Files specififed on the command line are no longer verified to be inside the current working directory, so commands like "patch -i foo.diff ../foo" will work again. * Various fixes.
Update to 2.7.5: Changes in version 2.7.5: * There are users which expect patch to follow symbolic links in the working directory, so patch now again follows symbolic links as long as they do not leave the working directory.
Pullup ticket #4626 - requested by tnn devel/patch: build fix Revisions pulled up: - devel/patch/Makefile 1.42 --- Module Name: pkgsrc Committed By: tnn Date: Fri Feb 20 07:09:19 UTC 2015 Modified Files: pkgsrc/devel/patch: Makefile Log Message: PR pkg/49672: OSX build fix (already reported and fixed upstream) While here simplify Interix fix by overriding autoconf test instead of manually patching the sources.
PR pkg/49672: OSX build fix (already reported and fixed upstream) While here simplify Interix fix by overriding autoconf test instead of manually patching the sources.
Pullup ticket #4616 - requested by sevan
devel/patch: security update
Revisions pulled up:
- devel/patch/Makefile 1.41
- devel/patch/distinfo 1.9
---
Module Name: pkgsrc
Committed By: mef
Date: Sun Feb 8 09:29:43 UTC 2015
Modified Files:
pkgsrc/devel/patch: Makefile distinfo
Log Message:
Update 2.7.1 to 2.7.4
---------------------
Changes until version 2.7.4:
* When a file isn't being deleted because the file contents don't match the
patch, the resulting message is now "Not deleting file ... as content
differs from patch" instead of "File ... is not empty after patch; not
deleting".
* Function names in hunks (from diff -p) are now preserved in reject files.
* Patch no longer follows symbolic links to input and output files. This
ensures that symbolic links created by git-style patches cannot cause
patch to write outside the working directory (CVE-2015-1196).
* Various fixes.
Update 2.7.1 to 2.7.4 --------------------- Changes until version 2.7.4: * When a file isn't being deleted because the file contents don't match the patch, the resulting message is now "Not deleting file ... as content differs from patch" instead of "File ... is not empty after patch; not deleting". * Function names in hunks (from diff -p) are now preserved in reject files. * Patch no longer follows symbolic links to input and output files. This ensures that symbolic links created by git-style patches cannot cause patch to write outside the working directory (CVE-2015-1196). * Various fixes.
Remove pkgviews: don't set PKG_INSTALLATION_TYPES in Makefiles.
Switch to xz version from upstream and remove outdated comment about dependency cycles.
Update to 2.7.1
Changelog:
Changes in version 2.7.1:
* Two critical bug fixes in the "diff --git" format support.
* Clarify the message printed when a patch is expected to empty out and delete
a file, but the file does not become empty.
* Various improvements to messages when applying a patch to a file of different
type (regular file vs. symlink), when there are line ending differences (LF
vs. CRLF), and when in --dry-run mode.
* When in the root directory, allow file names that are absolute or that
contain a component of "..".
* New --follow-symlinks option to allow to treat symlinks as files: this was
patch's behavior before version 2.7.
* Ignore when extended attributes cannot be preserved because they are
unsupported or because permission to set them is denied.
* License clarifications in NEWS and README.
* Portability bug fixes.
Changes in version 2.7:
* Patch no longer gets a failed assertion for certain mangled patches.
* Ignore destination file names that are absolute or that contain a component
of "..". This addresses CVE-2010-4651.
* Support for most features of the "diff --git" format, including renames and
copies, permission changes, and symlink diffs. Binary diffs are not
supported yet; patch will complain and skip them.
* Support for double-quoted filenames: when a filename starts with a double
quote, it is interpreted as a C string literal. The escape sequences \\, \",
\a, \b, \f, \n, \r, \t, \v, and \ooo (a three-digit octal number between 0
and 255) are recognized.
* Refuse to apply a normal patch to a symlink. (Previous versions of patch
were replacing the symlink with a regular file.)
* When trying to modify a read-only file, warn about the potential problem
by default. The --read-only command line option allows to change this
behavior.
* Files to be deleted are deleted once the entire input has been processed, not
immediately. This fixes a bug with numbered backup files.
* When a timestamp specifies a time zone, honor that instead of assuming the
local time zone (--set-date) or Universal Coordinated Time (--set-utc).
* Support for nanosecond precision timestamps.
* Many portability and bug fixes.
Changes in version 2.6.1:
* Support for diff3(1) style merges which show the old, original, and new lines
of a conflict has been added (--merge=diff3). The default still is the
merge(1) format (--merge or --merge=merge).
* Bug and portability fixes.
Changes in version 2.6:
* A regression test suite has been added ("make check").
* A --merge option has been added which will merge a patch file into
the original files similar to merge(1). See the patch(1) manual page for
documentation.
* Unless a filename has been specified on the command line, look only
for filenames in the patch until one has been found. This prevents
patch from tripping over garbage that isn't a patch. When conforming
to POSIX, this behavior is turned off and patch will ask for a
filename if none is found.
* All reject files have file name headers, which allows them to be used as
regular patches.
* When a patch file modifies the same file more than once, patch makes
sure it backs up the original version of the file rather than any
intermediary versions.
* In the above situation, if there are rejects in more than one of those
patches, they all go into the same reject file.
* When the file to be patched is specified on the command line, all patches
are applied to that file. (Previously, the first patch was applied to the
file specified on the command line, and the names of additional files to
patch were taken from header lines in the patch file.)
* The -r option now works correctly even if there are rejects in more than
one file. Use the - argument to discard rejects.
* Rejected hunks come out in unified diff format if the input patch was of
that format, otherwise in ordinary context diff form. Use the
--reject-format option to enforce either "context" or "unified" format.
Timestamps and the "diff -p" (--show-c-function) output are preserved.
Changed lines in context format reject files are correctly indicated
with '!' markers as the format defines. Added and removed lines are
still marked with '+' and '-', respectively.
* The file permissions of reject files are no longer set to match the files
they modify. Instead, they retain the default permissions. This is
consistent with reject files produced with the -r option.
* The --binary option disables the heuristic for stripping CRs from
line endings in patches. This allows to preserve CRs even in mangled
patches, or in patches generated on non-POSIX systems and without the
--binary option.
* Backup files for nonexisting files are now created with default
permissions rather than with mode 0: backup files with mode 0 were
causing problems with applications which do not expect unreadable
files.
* The -B, -Y, and -z options (--prefix, --basename-prefix, --suffix) now
imply the simple version control mode, and can be combined.
* Patch rejects more malformed normal format commands and checks for trailing
garbage. It now recognizes ed commands without addresses.
* Change the default value of PATCH_GET to 0. (Previously, the default was 0
under POSIXLY_CORRECT and negative otherwise; this is causing problems
particularly with Perforce.)
* Handle missing timestamps better.
* Various bug fixes.
* Switch to GNU General Public License version 3.
Use ${PKGGNUDIR} and ${PKGMANDIR} in INSTALLATION_DIRS.
Add PKGGNUDIR support.
Drop superfluous PKG_DESTDIR_SUPPORT, "user-destdir" is default these days.
Add gnu/man/man1/patch.1 ++pkgrevision
Remove GNU_PROGRAM_PREFIX variable (discussed in pkgsrc-users@).
All utilities are installed with a prefix 'g'. Symlinks with original
names are created in ${PREFIX}/gnu/bin.
++pkgrevision
Update "patch" package to version 2.5.9. Changes since version 2.5.4: - patch -D now outputs preprocessor lines without comments, as required by POSIX 1003.1-2001. - File names in context patches may now contain spaces, so long as the context patch headers use a tab to separate the file name from the time stamp. - Perforce is now supported. - Patch lines beginning with "#" are comments and are ignored. - The bug reporting address is now <bug-patch@gnu.org>. - bug fixes
LICENSE is gnu-gpl-v2
Add DESTDIR support.
Convert to use PLIST_VARS instead of manually passing "@comment " through PLIST_SUBST to the plist module.
Fixed pkglint warnings.
Point MAINTAINER to pkgsrc-users@NetBSD.org in the case where no developer is officially maintaining the package. The rationale for changing this from "tech-pkg" to "pkgsrc-users" is that it implies that any user can try to maintain the package (by submitting patches to the mailing list). Since the folks most likely to care about the package are the folks that want to use it or are already using it, this would leverage the energy of users who aren't developers.
Ran "pkglint --autofix", which corrected some of the quoting issues in CONFIGURE_ARGS.
Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in
http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
Remove the old tools framework and references to _USE_NEW_TOOLS.
Use an uncompressed tar archive of the sources from ${MASTER_SITE_LOCAL}.
This ensures that we won't need gzcat to extract the sources, which
could potentially cause a circular dependency on archivers/gzip-base.
We only need the evil hack with the old tools framework.
Follow Grant's advice: use _OPSYS_GPATCH_REQD to influence _NEED_PATCH and let tools.mk take care of the rest.
We have a variable _OPSYS_GPATCH_REQD, but it doesn't do anything. Change that: if it's set to YES, require devel/patch. If building devel/patch, set _OPSYS_GPATCH_REQD to NO, as otherwise we have a circular dependency.
Enable pkgviews installation.
Make compile on Interix. It doesn't #define BSD, but it also needs the "avoid MS-DOS setmode()" treatment.
s/netbsd.org/NetBSD.org/
Use tech-pkg@ in favor of packages@ as MAINTAINER for orphaned packages. Should anybody feel like they could be the maintainer for any of thewe packages, please adjust.
Use ${LN} -sf to create symlinks.
Closes PR 21263 by Jeremy C. Reed.
Really install the symlink.
always install bin/gpatch (thanks wiz). bump PKGREVISION.
Correctly honour GNU_PROGRAM_PREFIX on non-NetBSD platforms for consistency (hi wiz!) bump PKGREVISION.
Also add GNU_PROGRAM_PREFIX to BUILD_DEFS.
Use GNU_PROGRAM_PREFIX, patch by Jeremy C. Reed.
Use AWK instead of SED to do the patching, now it works on Solaris. While here put the patching in target do-patch an remove NO_PATCH. This should fix PR 16035.
Allow this package to be compiled and installed on any platform: - prefix program and manpage by `g' if platform is NetBSD - "manual" patch for BSD systems (setmode() conflict)
Recontruct bootstrap hack obviously required for strange experiments performed by the dark side of the force.
Remove hack required for boot strapping Zoularis before "tar" was included.
Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT.
Resolve chicken & egg problem when bootstrapping: chicken == archivers/gtar-base (wants to apply patches) egg == devel/patch (wants gtar to unpack) Break out by using /usr/bin/tar if $GTAR is not installed. Might be better in bsd.pkg.mk ...
Update IGNORE-messages for recent changes: add ${PKGNAME} where
appropriate.
Unfortunately /usr/bin/patch is not what we want on Solaris.
The patch utility.
Initial revision