HardenedBSD/src cf14103sbin/mount mount.8, sys/arm/freescale/imx imx6_ssi.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+7-2sbin/mount/mount.8
+1-5sys/arm/freescale/imx/imx6_ssi.c
+1-5sys/arm/freescale/vybrid/vf_sai.c
+9-123 files

HardenedBSD/src 221605asbin/mount mount.8, sys/arm/freescale/imx imx6_ssi.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+7-2sbin/mount/mount.8
+1-5sys/arm/freescale/vybrid/vf_sai.c
+1-5sys/arm/freescale/imx/imx6_ssi.c
+9-123 files

HardenedBSD/src d11f174sys/dev/sound/pci/hda hdaa_patches.c hdac.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-1sys/dev/sound/pci/hda/hdaa_patches.c
+1-0sys/dev/sound/pci/hda/hdac.h
+3-12 files

HardenedBSD/src 4991bb6sys/dev/sound/pci/hda hdaa_patches.c hdac.h

snd_hda: Patch Lenovo V15

PR:             290496
Tested by:      adrian
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit 5f624d923db0f2fb33990948cffdc24da44deaa8)
DeltaFile
+2-1sys/dev/sound/pci/hda/hdaa_patches.c
+1-0sys/dev/sound/pci/hda/hdac.h
+3-12 files

HardenedBSD/src 120f8a4sys/arm/freescale/imx imx6_ssi.c, sys/arm/freescale/vybrid vf_sai.c

arm: Add missing argument in mtx_init() calls

Fixes:          9d18115ca0ab ("sound: Retire snd_mtx* wrappers")
Reported by:    CI
Sponsored by:   The FreeBSD Foundation
MFC after:      4 days
DeltaFile
+1-5sys/arm/freescale/imx/imx6_ssi.c
+1-5sys/arm/freescale/vybrid/vf_sai.c
+2-102 files

HardenedBSD/src a067eb5sbin/mount mount.8

mount.8: document nosymfollow option

Document the nosymfollow mount option in more details.
Forgotten in 5ddc8ded1dbe650b7d83240a1f86a1eb6e2b9b5a
DeltaFile
+7-2sbin/mount/mount.8
+7-21 files

HardenedBSD/src 8217d4e. ObsoleteFiles.inc, contrib/pam-krb5/docs pam_krb5.pod

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1,268-937lib/libpam/modules/pam_krb5/pam-krb5.8
+9-6contrib/pam-krb5/docs/pam_krb5.pod
+10-2lib/libpam/modules/pam_krb5/Makefile
+7-4ObsoleteFiles.inc
+6-0contrib/pam-krb5/module/auth.c
+3-0contrib/pam-krb5/module/internal.h
+1,303-9491 files not shown
+1,306-9497 files

HardenedBSD/src f3d25cf. ObsoleteFiles.inc, contrib/pam-krb5/docs pam_krb5.pod

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1,268-937lib/libpam/modules/pam_krb5/pam-krb5.8
+9-6contrib/pam-krb5/docs/pam_krb5.pod
+10-2lib/libpam/modules/pam_krb5/Makefile
+7-4ObsoleteFiles.inc
+6-0contrib/pam-krb5/module/auth.c
+3-0contrib/pam-krb5/module/options.c
+1,303-9491 files not shown
+1,306-9497 files

HardenedBSD/src 8e55bbacontrib/ntp/ntpd ntp_io.c, lib/libc/db/mpool mpool.c

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+1-1contrib/ntp/ntpd/ntp_io.c
+1-1lib/libc/db/mpool/mpool.c
+1-1share/man/man4/isp.4
+1-1usr.sbin/lpr/lpr/lpr.1
+1-1usr.sbin/ypldap/ldapclient.c
+5-55 files

HardenedBSD/src 43e336d. ObsoleteFiles.inc, contrib/pam-krb5/docs pam_krb5.pod

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+1,268-937lib/libpam/modules/pam_krb5/pam-krb5.8
+9-6contrib/pam-krb5/docs/pam_krb5.pod
+10-2lib/libpam/modules/pam_krb5/Makefile
+5-2ObsoleteFiles.inc
+6-0contrib/pam-krb5/module/auth.c
+3-0contrib/pam-krb5/module/internal.h
+1,301-9478 files not shown
+1,311-95414 files

HardenedBSD/src 815f085release/scripts pkg-stage.sh

release: Ship DVD with only emacs at nox flavour

Contrary to the claim made in a previous commit, removing KDE and
adding all of vim and emacs results in an image which does not fit
into 4.7 GB; to be specific, it lands at 4.722 GB rather than the
claimed 4.689 GB.  (This descrepancy resulted from doing test DVD
image builds using an out-of-date tree, and became visible when the
15.0-RC3 images were built.)

Limit the emacs packages shipped on the DVD to the "nox" flavor;
this brings the disk image down to 4.407 GB, aka under the 4.7 GB
limit for standard DVDs.

Fixes:  6cc6beb4c889 ("release: Remove KDE from dvd1.iso")
MFC after:      1 day (for 15.0-RC4)

(cherry picked from commit c8cf5a99f82bc52849960e689442421ad5a6d412)
DeltaFile
+1-1release/scripts/pkg-stage.sh
+1-11 files

HardenedBSD/src e9a7a3eshare/man/man4 isp.4

isp.4: Fix a typo in the manual page

- s/Chanel/Channel/

(cherry picked from commit 8158b813d90f01368b2045709feee1980a323198)
DeltaFile
+1-1share/man/man4/isp.4
+1-11 files

HardenedBSD/src 37432fausr.sbin/lpr/lpr lpr.1

lpr(1): Fix a typo in a debug message

- s/unexpect/unexpected/

(cherry picked from commit 66d4a37bc389bf19ebf2210b0fff762baa659c32)
DeltaFile
+1-1usr.sbin/lpr/lpr/lpr.1
+1-11 files

HardenedBSD/src ad81800lib/libc/db/mpool mpool.c

mpool(3): Fix a typo in statistical message

- s/cacheing/caching/

(cherry picked from commit d76ea20f99965e8f3b9dbfcb41ca148711d528bb)
DeltaFile
+1-1lib/libc/db/mpool/mpool.c
+1-11 files

HardenedBSD/src 1780b0dusr.sbin/ypldap ldapclient.c

ypldap(8): Fix a typo in a debug message

- s/unexpect/unexpected/

(cherry picked from commit 843a4ad5814fe4344b245819880d423343b2d5ab)
DeltaFile
+1-1usr.sbin/ypldap/ldapclient.c
+1-11 files

HardenedBSD/src 7f0bb97share/man/man4 snd_dummy.4

snd_dummy.4: Fix a typo in the manual page

- s/devic/device/

(cherry picked from commit bb3bfc7ca87ef9b2309bfac38aa0083727b27dc6)
DeltaFile
+1-1share/man/man4/snd_dummy.4
+1-11 files

HardenedBSD/src e44d079share/man/man4 isp.4

isp.4: Fix a typo in the manual page

- s/Chanel/Channel/

(cherry picked from commit 8158b813d90f01368b2045709feee1980a323198)
DeltaFile
+1-1share/man/man4/isp.4
+1-11 files

HardenedBSD/src 29edde7usr.sbin/lpr/lpr lpr.1

lpr(1): Fix a typo in a debug message

- s/unexpect/unexpected/

(cherry picked from commit 66d4a37bc389bf19ebf2210b0fff762baa659c32)
DeltaFile
+1-1usr.sbin/lpr/lpr/lpr.1
+1-11 files

HardenedBSD/src ccbd07clib/libc/db/mpool mpool.c

mpool(3): Fix a typo in statistical message

- s/cacheing/caching/

(cherry picked from commit d76ea20f99965e8f3b9dbfcb41ca148711d528bb)
DeltaFile
+1-1lib/libc/db/mpool/mpool.c
+1-11 files

HardenedBSD/src 605c437usr.sbin/ypldap ldapclient.c

ypldap(8): Fix a typo in a debug message

- s/unexpect/unexpected/

(cherry picked from commit 843a4ad5814fe4344b245819880d423343b2d5ab)
DeltaFile
+1-1usr.sbin/ypldap/ldapclient.c
+1-11 files

HardenedBSD/src 25587b3contrib/ntp/ntpd ntp_io.c

ntpd: Fix segfault when same IP on multiple interfaces

Use the protype socket to obtain the IP address for an error message.
Using the resultant socket address, a NULL because create_interface()
had failed, results in SIGSEGV.

To reproduce this bug,

ifconfig bridge100 create
ifconfig bridge100 10.10.10.10/24
ifconfig bridge101 create
ifconfig bridge101 10.10.10.10/24
ntpd -n

PR:             291119

(cherry picked from commit ac1f48b4a7be104d222dea60f1da946fcb345fb1)
DeltaFile
+1-1contrib/ntp/ntpd/ntp_io.c
+1-11 files

HardenedBSD/src 383ad19contrib/ntp/ntpd ntp_io.c

ntpd: Fix segfault when same IP on multiple interfaces

Use the protype socket to obtain the IP address for an error message.
Using the resultant socket address, a NULL because create_interface()
had failed, results in SIGSEGV.

To reproduce this bug,

ifconfig bridge100 create
ifconfig bridge100 10.10.10.10/24
ifconfig bridge101 create
ifconfig bridge101 10.10.10.10/24
ntpd -n

PR:             291119
MFC after:      3 days

(cherry picked from commit ac1f48b4a7be104d222dea60f1da946fcb345fb1)
DeltaFile
+1-1contrib/ntp/ntpd/ntp_io.c
+1-11 files

HardenedBSD/src 1773d3d. ObsoleteFiles.inc

ObsoleteFiles: Fix typo in recent entry

Fixes:          feb8971db4b1 ("pcic.4: Remove stale manual")
DeltaFile
+2-2ObsoleteFiles.inc
+2-21 files

HardenedBSD/src 4166181. ObsoleteFiles.inc, lib/libpam/modules/pam_krb5 pam-krb5.8 Makefile

pam_krb5: Fix manual page in MIT case

* Always install the manual page as pam_krb5(8) regardless of which
  version we're using.
* Regenerate it using pod2mdoc instead of pod2man so it doesn't claim
  to be part of “User Contributed Perl Documentation”.
* Put the correct section number in the header and footer.
* Don't cross-reference non-existent pam(7) manual page.

Reviewed by:    cperciva
Differential Revision:  https://reviews.freebsd.org/D53885

(cherry picked from commit 961b934407f09d4241cfad76a9c8833baa2650e1)
DeltaFile
+1,268-937lib/libpam/modules/pam_krb5/pam-krb5.8
+10-2lib/libpam/modules/pam_krb5/Makefile
+3-0ObsoleteFiles.inc
+1,281-9393 files

HardenedBSD/src 5995c03. ObsoleteFiles.inc

ObsoleteFiles: Fix repeated typo in recent entries

Fixes:          685a78570b35 ("random: remove hifn(4)")
Fixes:          5b9fba1cb0d8 ("Retire pccard(4)")
Fixes:          3cf85a69ae7d ("hifn.4: Really remove")
Fixes:          8a8c58f71e80 ("pccard.4: Really remove")
Fixes:          6aaf184dc4e2 ("pcic.4: Really remove")
Fixes:          daa1f9b415f3 ("apm(8): Drop MLINK to apmconf(8)")
Fixes:          961b934407f0 ("pam_krb5: Fix manual page in MIT case")
DeltaFile
+5-5ObsoleteFiles.inc
+5-51 files

HardenedBSD/src 2eb030dcontrib/pam-krb5/docs pam_krb5.pod, contrib/pam-krb5/module auth.c internal.h

pam_krb5: Restore allow_kdc_spoof option

Not only does the new pam_krb5 module not have the same allow_kdc_spoof
option that the old one had, its behavior in this matter defaults to
insecure.  Reimplement allow_kdc_spoof and switch the default back.

Reviewed by:    cy
Differential Revision:  https://reviews.freebsd.org/D53884

(cherry picked from commit fe5c8baf25a5b40285c3ef85b69391d591e4a76c)
DeltaFile
+9-6contrib/pam-krb5/docs/pam_krb5.pod
+6-0contrib/pam-krb5/module/auth.c
+3-0contrib/pam-krb5/module/internal.h
+3-0contrib/pam-krb5/module/options.c
+21-64 files

HardenedBSD/src 961b934. ObsoleteFiles.inc, lib/libpam/modules/pam_krb5 pam-krb5.8 Makefile

pam_krb5: Fix manual page in MIT case

* Always install the manual page as pam_krb5(8) regardless of which
  version we're using.
* Regenerate it using pod2mdoc instead of pod2man so it doesn't claim
  to be part of “User Contributed Perl Documentation”.
* Put the correct section number in the header and footer.
* Don't cross-reference non-existent pam(7) manual page.

Reviewed by:    cperciva
Differential Revision:  https://reviews.freebsd.org/D53885
DeltaFile
+1,268-937lib/libpam/modules/pam_krb5/pam-krb5.8
+10-2lib/libpam/modules/pam_krb5/Makefile
+3-0ObsoleteFiles.inc
+1,281-9393 files

HardenedBSD/src fe5c8bacontrib/pam-krb5/docs pam_krb5.pod, contrib/pam-krb5/module auth.c internal.h

pam_krb5: Restore allow_kdc_spoof option

Not only does the new pam_krb5 module not have the same allow_kdc_spoof
option that the old one had, its behavior in this matter defaults to
insecure.  Reimplement allow_kdc_spoof and switch the default back.

Reviewed by:    cy
Differential Revision:  https://reviews.freebsd.org/D53884
DeltaFile
+9-6contrib/pam-krb5/docs/pam_krb5.pod
+6-0contrib/pam-krb5/module/auth.c
+3-0contrib/pam-krb5/module/internal.h
+3-0contrib/pam-krb5/module/options.c
+21-64 files

HardenedBSD/src ec6c9b9usr.sbin/freebsd-update freebsd-update.sh

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+8-8usr.sbin/freebsd-update/freebsd-update.sh
+8-81 files

HardenedBSD/src df3def8lib/libsys pathconf.2, sys/fs/nfs nfs_commonsubs.c nfs_var.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+22-9sys/fs/nfs/nfs_commonsubs.c
+12-6sys/fs/nfsserver/nfs_nfsdport.c
+7-2sys/fs/nfsserver/nfs_nfsdserv.c
+6-2sys/fs/nfsclient/nfs_clvnops.c
+6-2lib/libsys/pathconf.2
+2-2sys/fs/nfs/nfs_var.h
+55-234 files not shown
+63-2610 files