BSD Commit Log Search

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        Makefile.inc1 (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        targets/pseudo/bootstrap-tools/Makefile (unresolved)
        tools/build/options/WITH_OFED_EXTRA (deleted)

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit

Merge branch 'freebsd/current/main' into hardened/current/newmaster

Conflicts:
        gnu/usr.bin/grep/Makefile (deleted)
        share/mk/src.opts.mk (unresolved)
        sys/amd64/amd64/pmap.c (unresolved)
        sys/arm64/arm64/pmap.c (unresolved)
        usr.bin/grep/Makefile (unresolved)

gnu: remove gnugrep and libgnuregex

Differential Revision:  https://reviews.freebsd.org/D27732

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/unstable

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/segvguard-ng

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/log

Merge branch 'freebsd/current/master' into hardened/current/master

Back out non-collating [a-z] ranges.
Instead of changing the whole course to another POSIX-permitted way
for consistency and uniformity I decide to completely ignore missing
regex fucntionality and focus on fixing bugs in what we have now,
too many small obstacles we have choicing other way, counting ports.
Corresponding libc changes are backed out in r302824.

Back out non-collating [a-z] ranges.
Instead of changing the whole course to another POSIX-permitted way
for consistency and uniformity I decide to completely ignore missing
regex fucntionality and focus on fixing bugs in what we have now,
too many small obstacles we have choicing other way, counting ports.
Corresponding libc changes are backed out in r302824.

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/unstable

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/segvguard-ng

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/log

Merge branch 'freebsd/current/master' into hardened/current/master

After removing collation for [a-z] ranges in r302512, do it here too.

Instead of trying to expand whole range at regcomp() stage as we do,
GNU regex allocates separate ranges [start,end] set each character
is checked against, so collation is possible and turned on for ranges here.

When something like that will be implemented or our obsoleted regex code
will be replaced to something like TRE, and in case we decide to use
collation in [a-z] ranges, all changes related to r302512 can be backed out,
but now we need consistency.

After removing collation for [a-z] ranges in r302512, do it here too.

Instead of trying to expand whole range at regcomp() stage as we do,
GNU regex allocates separate ranges [start,end] set each character
is checked against, so collation is possible and turned on for ranges here.

When something like that will be implemented or our obsoleted regex code
will be replaced to something like TRE, and in case we decide to use
collation in [a-z] ranges, all changes related to r302512 can be backed out,
but now we need consistency.

Create branch for bhyve graphics import.

Move ^/user/gjb/hacking/release-embedded up one directory, and remove
^/user/gjb/hacking since this is likely to be merged to head/ soon.

Sponsored by:   The FreeBSD Foundation

Copy head at r259933 -> user/gjb/hacking/release-embedded for initial
inclusion of (at least) arm builds with the release.

Sponsored by:   The FreeBSD Foundation

Merge from head

Merge from head

IFC @ r254014

IFC @ r254014

MFC @r219886.

IFC @253398

Merge fresh head.

MFC     r250823:

grep: change some int types.

Change several int variables to size_t, ssize_t, or ptrdiff_t.
This should fix the bug described in CVE-2012-5667 when an input
line is so long that its length cannot be stored in an int
variable.

Obtained from:  NetBSD

grep: change some int types.

Change several int variables to size_t, ssize_t, or ptrdiff_t.
This should fix the bug described in CVE-2012-5667 when an input
line is so long that its length cannot be stored in an int
variable.

This is based on NetBSD's revision which says:

This change to NetBSD's version of GNU grep 2.5.1 (licenced under
GPLv2) was made without direct reference to any code licenced
under GPLv3.

Obtained from:  NetBSD
MFC after:      3 days

grep: change some int types.

Change several int variables to size_t, ssize_t, or ptrdiff_t.
This should fix the bug described in CVE-2012-5667 when an input
line is so long that its length cannot be stored in an int
variable.

This is based on NetBSD's revision which says:

This change to NetBSD's version of GNU grep 2.5.1 (licenced under
GPLv2) was made without direct reference to any code licenced
under GPLv3.

Obtained from:  NetBSD
MFC after:      3 days

Revert r250821 - This was not meant to be a direct commit.
(wrong tree)

Pointy hat:     me