Skip to content

Commit

Permalink
Merge branch 'dev' into audit-mbuf-setbounds
Browse files Browse the repository at this point in the history
  • Loading branch information
@qwattash
qwattash authored Feb 14, 2024
2 parents 5ae215e + 891fda2 commit e5ad7e3
Show file tree
Hide file tree
Showing 1,545 changed files with 22,260 additions and 14,749 deletions.
3 changes: 2 additions & 1 deletion .cirrus.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ task:
TOOLCHAIN: llvm15
TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
- name: amd64-llvm16 World and kernel build and boot smoke test
only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*'
env:
TARGET: amd64
TARGET_ARCH: amd64
Expand Down Expand Up @@ -63,7 +64,7 @@ task:
TOOLCHAIN_PKG: ${TOOLCHAIN}
EXTRA_MAKE_FLAGS: -s
- name: amd64-gcc12 World and kernel build and boot smoke test (FreeBSD repo)
only_if: $CIRRUS_REPO_FULL_NAME == 'freebsd/freebsd-src'
only_if: $CIRRUS_REPO_FULL_NAME == 'freebsd/freebsd-src' && $CIRRUS_BRANCH =~ 'pull/.*'
env:
TARGET: amd64
TARGET_ARCH: amd64
Expand Down
2 changes: 1 addition & 1 deletion .last_merge
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
freebsd-main-20230929
freebsd-main-20231013
7 changes: 7 additions & 0 deletions .mailmap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,10 @@ Mina Galić <[email protected]> <[email protected]>
Mina Galić <[email protected]> <[email protected]>
Mina Galić <[email protected]> <[email protected]>
<[email protected]> <weike.chen_dell.com>
Michal Meloun <[email protected]> <[email protected]>
Dmitriy Alexandrov <[email protected]> <[email protected]>
Alfonso Gregory <[email protected]> <[email protected]>
Alfonso Gregory <[email protected]> <[email protected]>
Jose Luis Duran <[email protected]> <[email protected]>
Val Packett <[email protected]> <[email protected]>
Piotr Paweł Stefaniak <[email protected]> <[email protected]>
1 change: 1 addition & 0 deletions Makefile.inc1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3469,6 +3469,7 @@ list-old-files: .PHONY
@cd ${.CURDIR}; \
${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
-V "OLD_FILES:ts\n" -V "OLD_FILES:Musr/share/*.gz:R:ts\n" \
-V "MOVED_LIBS:ts\n" \
${_ALL_libcompats:@v@-V "OLD_FILES:Mlib/*.so.*:S,^lib,usr/lib$v,:ts\n"@} \
${_ALL_libcompats:@v@-V "OLD_FILES:Musr/lib/*:S,^usr/lib,usr/lib$v,:ts\n"@} | \
sort
Expand Down
12 changes: 7 additions & 5 deletions ObsoleteFiles.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@
# xargs -n1 | sort | uniq -d;
# done

# 20231005: Remove man page link for now gone net80211 function.
OLD_FILES+=usr/share/man/man9/ieee80211_unref_node.9.gz

# 20231005: bsdconfig remove support for floppy and ftp
OLD_FILES+=usr/share/bsdconfig/media/floppy.subr
OLD_FILES+=usr/share/bsdconfig/media/ftp.subr

# 20230927: Man pages renamed to match the actual functions
OLD_FILES+=usr/share/man/man9/cr_seeothergids.9.gz
OLD_FILES+=usr/share/man/man9/cr_seeotheruids.9.gz
Expand Down Expand Up @@ -17673,11 +17680,6 @@ OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz
.if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
OLD_FILES+=usr/share/man/man8/boot_i386.8.gz
.endif
.if ${TARGET_ARCH:Maarch64} != "" && ${TARGET} != "arm" && \
${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "powerpc64" && \
${TARGET_ARCH} != "sparc64" && ${TARGET} != "mips"
OLD_FILES+=usr/share/man/man8/ofwdump.8.gz
.endif
OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz
OLD_FILES+=usr/share/man/man9/VFS_START.9.gz
OLD_FILES+=usr/share/man/man9/cpu_critical_exit.9.gz
Expand Down
3 changes: 3 additions & 0 deletions RELNOTES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ newline. Entries should be separated by a newline.

Changes to this file should not be MFCed.

ff01d71e48d4:
dialog(1) has been replaced by bsddialog(1)

41582f28ddf7:
FreeBSD 15.0 will not include support for 32-bit platforms.
However, 64-bit systems will still be able to run older 32-bit
Expand Down
11 changes: 11 additions & 0 deletions UPDATING
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW:
world, or to merely disable the most expensive debugging functionality
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)

20231010:
dialog(1) has been replaced in base by bsddialog(1), while most of the
time replacing a dialog(1) call by a bsddialog(1) call works out of the
box, bsddialog(1) is not considered as a drop-in replacement for
dialog(1).

If you do depend on dialog(1) functionality, please install cdialog
from ports:

pkg install cdialog

20230927:
The EARLY_AP_STARTUP kernel option is mandatory on x86. The option
has been added to DEFAULTS, so it should automatically be included in
Expand Down
7 changes: 6 additions & 1 deletion bin/ps/ps.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
.\"
.\" @(#)ps.1 8.3 (Berkeley) 4/18/94
.\"
.Dd August 24, 2023
.Dd October 6, 2023
.Dt PS 1
.Os
.Sh NAME
Expand Down Expand Up @@ -238,6 +238,11 @@ So the header texts for multiple keywords can be changed.
If all keywords have empty header texts, no header line is written.
.It Fl p
Display information about processes which match the specified process IDs.
It implies the use of
.Fl x .
When combined with
.Fl d ,
all descendent processes are included.
.It Fl r
Sort by current CPU usage, instead of the combination of controlling
terminal and process ID.
Expand Down
2 changes: 2 additions & 0 deletions bin/stty/modes.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ static const struct modes imodes[] = {
{ "-decctlq", IXANY, 0 },
{ "imaxbel", IMAXBEL, 0 },
{ "-imaxbel", 0, IMAXBEL },
{ "iutf8", IUTF8, 0 },
{ "-iutf8", 0, IUTF8 },
{ NULL, 0, 0 },
};

Expand Down
1 change: 1 addition & 0 deletions bin/stty/print.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ print(struct termios *tp, struct winsize *wp, int ldisc, enum FMT fmt)
put("-inpck", INPCK, 0);
put("-ignpar", IGNPAR, 0);
put("-parmrk", PARMRK, 0);
put("-iutf8", IUTF8, 1);

/* output flags */
tmp = tp->c_oflag;
Expand Down
3 changes: 3 additions & 0 deletions bin/stty/stty.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,9 @@ if
.Cm imaxbel
is unset and the input queue is full, the next input character causes
the entire input and output queues to be discarded.
.It Cm iutf8 Pq Fl iutf8
Assume that input characters are UTF-8 encoded. Setting this flag
causes backspace to properly delete multibyte characters in canonical mode.
.El
.Ss Output Modes:
This corresponds to the c_oflag of the termios structure.
Expand Down
1 change: 1 addition & 0 deletions bin/uuidgen/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

PACKAGE= runtime
PROG= uuidgen

.include <bsd.prog.mk>
2 changes: 0 additions & 2 deletions cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
.\" CDDL HEADER END
.\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved.
.\"
.\" $FreeBSD$
.\"
.Dd February 24, 2023
.Dt DTRACE 1
.Os
Expand Down
2 changes: 0 additions & 2 deletions cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
.\" CDDL HEADER END
.\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved.
.\"
.\" $FreeBSD$
.\"
.Dd February 25, 2020
.Dt LOCKSTAT 1
.Os
Expand Down
1 change: 0 additions & 1 deletion cddl/usr.sbin/dwatch/dwatch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1327,7 +1327,6 @@ PSARGS_ACTION=$( cat <&9 )
* SUCH DAMAGE.
*
* $TITLE dtrace(1) script to log process(es) triggering $PROBE $
* \$FreeBSD$
*/
$( echo "$DTRACE_PRAGMA" | awk '
Expand Down
2 changes: 2 additions & 0 deletions contrib/bsddialog/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ examples_library/calendar
examples_library/checklist
examples_library/datebox
examples_library/form
examples_library/gauge
examples_library/infobox
examples_library/menu
examples_library/mixedgauge
examples_library/mixedlist
examples_library/msgbox
examples_library/pause
Expand Down
Loading

0 comments on commit e5ad7e3

Please sign in to comment.