HardenedBSD/ports f7c8e94devel/build2 Makefile

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+1-4devel/build2/Makefile
+1-41 files

HardenedBSD/ports 150d96ebiology/ugene pkg-plist, editors/vscode pkg-plist

Merge remote-tracking branch 'internal/freebsd/main' into hardenedbsd/main

Conflicts:
        devel/build2/Makefile (unresolved)
DeltaFile
+5,640-23,265misc/openclaw/pkg-plist
+17,904-2editors/vscode/pkg-plist
+1,175-709misc/openclaw/files/package-lock.json
+18-1,190biology/ugene/pkg-plist
+1,000-0misc/clawhub/pkg-plist
+812-135lang/v/pkg-plist
+26,549-25,3011,367 files not shown
+35,485-32,2011,373 files

HardenedBSD/src 5a251dcsys/contrib/openzfs/module/os/linux/spl spl-zone.c, sys/contrib/openzfs/module/os/linux/zfs zpl_super.c zfs_vfsops.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+499-10sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c
+343-80sys/contrib/openzfs/module/zfs/vdev_draid.c
+385-28sys/contrib/openzfs/module/os/linux/spl/spl-zone.c
+307-11sys/contrib/openzfs/module/zfs/zfs_ioctl.c
+24-216sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c
+237-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/zoned_uid/zoned_uid_common.kshlib
+1,795-345170 files not shown
+9,632-855176 files

HardenedBSD/src e26cb00sys/contrib/openzfs/module/os/linux/spl spl-zone.c, sys/contrib/openzfs/module/os/linux/zfs zpl_super.c zfs_vfsops.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+499-10sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c
+343-80sys/contrib/openzfs/module/zfs/vdev_draid.c
+385-28sys/contrib/openzfs/module/os/linux/spl/spl-zone.c
+307-11sys/contrib/openzfs/module/zfs/zfs_ioctl.c
+24-216sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c
+237-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/zoned_uid/zoned_uid_common.kshlib
+1,795-345170 files not shown
+9,632-855176 files

HardenedBSD/src c095e0dsys/dev/ixgbe if_ix.c ixgbe_sriov.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-2sys/dev/ixgbe/if_ix.c
+1-1sys/dev/ixgbe/ixgbe_sriov.h
+1-1sys/dev/ixgbe/if_sriov.c
+4-43 files

HardenedBSD/ports 61b2ffctextproc/markdown-mode.el distinfo Makefile

textproc/markdown-mode.el: Update to 2.8
DeltaFile
+3-3textproc/markdown-mode.el/distinfo
+1-2textproc/markdown-mode.el/Makefile
+4-52 files

HardenedBSD/ports eccf5aedevel/pyenv pkg-plist distinfo

devel/pyenv: Update to 2.6.27
DeltaFile
+23-4devel/pyenv/pkg-plist
+3-3devel/pyenv/distinfo
+1-1devel/pyenv/Makefile
+27-83 files

HardenedBSD/ports 737fc9bdatabases/tredis distinfo Makefile

databases/tredis: Update to 1.2.0
DeltaFile
+67-69databases/tredis/distinfo
+33-35databases/tredis/Makefile
+100-1042 files

HardenedBSD/ports 8ab54eenet/natscli distinfo Makefile

net/natscli: Update to 0.3.2
DeltaFile
+5-5net/natscli/distinfo
+1-2net/natscli/Makefile
+6-72 files

HardenedBSD/ports bf18000net/nats-top distinfo Makefile

net/nats-top: Update to 0.6.4
DeltaFile
+5-5net/nats-top/distinfo
+1-2net/nats-top/Makefile
+6-72 files

HardenedBSD/ports a83c19bnet/nats-surveyor distinfo Makefile

net/nats-surveyor: Update to 0.9.9
DeltaFile
+7-7net/nats-surveyor/distinfo
+1-2net/nats-surveyor/Makefile
+8-92 files

HardenedBSD/ports cd9f1danet/nats-server distinfo Makefile

net/nats-server: Update to 2.12.7
DeltaFile
+5-5net/nats-server/distinfo
+1-2net/nats-server/Makefile
+1-0net/nats-server/pkg-plist
+7-73 files

HardenedBSD/ports e26fe2fnet/nats-nsc distinfo Makefile

net/nats-nsc: Update to 2.12.2
DeltaFile
+5-5net/nats-nsc/distinfo
+1-2net/nats-nsc/Makefile
+6-72 files

HardenedBSD/ports 6180a64net/nats-nkeys distinfo Makefile

net/nats-nkeys: Update to 0.4.15
DeltaFile
+5-5net/nats-nkeys/distinfo
+1-2net/nats-nkeys/Makefile
+6-72 files

HardenedBSD/ports 6951133sysutils/containerd distinfo Makefile

sysutils/containerd: Update to 2.2.3
DeltaFile
+3-3sysutils/containerd/distinfo
+1-2sysutils/containerd/Makefile
+4-52 files

HardenedBSD/ports 0742759mail/imap-tools distinfo Makefile.crates

mail/imap-tools: update to 1.10.0
DeltaFile
+111-61mail/imap-tools/distinfo
+54-29mail/imap-tools/Makefile.crates
+2-2mail/imap-tools/Makefile
+167-923 files

HardenedBSD/src 554f5aausr.sbin/service service.sh

service(8): Replace indentation in usage()

The -d option was indented with spaces instead of tabs, and this broke
formatting.

Before:

-d                Enable debugging of rc.d scripts
-j              Perform actions within the named jail

After:

-d              Enable debugging of rc.d scripts
-j              Perform actions within the named jail

MFC after:      1 week
DeltaFile
+1-1usr.sbin/service/service.sh
+1-11 files

HardenedBSD/src fa3958csys/dev/ixgbe if_ix.c ixgbe_sriov.h

ixgbe: Fix MRQC register value.

Focus on the MRQE field of the MRQC register, which is 4 bits wide,
and we use these 3 types of values.

  - IXGBE_MRQC_RSSEN 0x1  (non VF mode)
  - IXGBE_MRQC_VMDQRSS32EN 0xA (less than 33 VFs)
  - IXGBE_MRQC_VMDQRSS64EN 0xB (less than 65 VFs)

If we always take a bitwise OR with IXGBE_MRQC_RSSEN,
IXGBE_MRQC_VMDQRSS32EN will never be chosen.
Select these 3 types of values for the proper case.

Signed-off-by: Yuichiro NAITO <naito.yuichiro at gmail.com>

Pull Request:   https://github.com/freebsd/freebsd-src/pull/2132

(cherry picked from commit 938c076b9b0bc458a3877b52535527d37199fc09)
DeltaFile
+2-2sys/dev/ixgbe/if_ix.c
+1-1sys/dev/ixgbe/ixgbe_sriov.h
+1-1sys/dev/ixgbe/if_sriov.c
+4-43 files

HardenedBSD/ports 8a71acemisc Makefile, misc/goplaces Makefile pkg-descr

misc/goplaces: New port: Modern Google Places CLI in Go
DeltaFile
+20-0misc/goplaces/Makefile
+16-0misc/goplaces/pkg-descr
+5-0misc/goplaces/distinfo
+1-0misc/Makefile
+42-04 files

HardenedBSD/ports a4ad185deskutils/joplin-desktop Makefile, net-im/deltachat-desktop Makefile

*/*: Bump port revision after electron39 update (e2bee27e1d81)
DeltaFile
+1-1net-im/teams/Makefile
+1-1deskutils/joplin-desktop/Makefile
+1-1net-im/deltachat-desktop/Makefile
+1-1net-im/signal-desktop/Makefile
+1-1net-im/vesktop/Makefile
+1-1textproc/obsidian/Makefile
+6-61 files not shown
+7-67 files

HardenedBSD/ports ffd1907misc/py-openai-whisper Makefile

misc/py-openai-whisper: Update WWW
DeltaFile
+2-1misc/py-openai-whisper/Makefile
+2-11 files

HardenedBSD/ports b185564audio Makefile, audio/songsee Makefile pkg-descr

audio/songsee: New port: Audio visualizer: spectrograms, mel, chroma, and more
DeltaFile
+23-0audio/songsee/Makefile
+6-0audio/songsee/pkg-descr
+5-0audio/songsee/distinfo
+1-0audio/Makefile
+35-04 files

HardenedBSD/ports e2bee27devel/electron39 distinfo Makefile.version, devel/electron39/files patch-gpu_command__buffer_service_webgpu__decoder__impl.cc patch-electron_spec_chromium-spec.ts

devel/electron39: Update to 39.8.8

Changelog: https://github.com/electron/electron/releases/tag/v39.8.8

Reported by:    GitHub (watch releases)
DeltaFile
+5-5devel/electron39/distinfo
+3-3devel/electron39/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
+3-3devel/electron39/files/patch-electron_spec_chromium-spec.ts
+2-2devel/electron39/files/patch-electron_shell_app_node__main.cc
+2-2devel/electron39/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
+1-1devel/electron39/Makefile.version
+16-166 files

HardenedBSD/ports 367c3c3misc/py-openai-whisper Makefile distinfo

misc/py-openai-whisper: update 2024093020250625
DeltaFile
+4-3misc/py-openai-whisper/Makefile
+3-3misc/py-openai-whisper/distinfo
+7-62 files

HardenedBSD/ports 27b35dbgames/armagetronad Makefile distinfo, games/armagetronad/files patch-configure.ac

games/armagetronad: update 0.2.9.2.5 → 0.2.9.3.0

Reported by:    portscout
DeltaFile
+11-0games/armagetronad/files/patch-configure.ac
+6-3games/armagetronad/Makefile
+3-3games/armagetronad/distinfo
+20-63 files

HardenedBSD/ports 0b6a055devel/maven39 distinfo pkg-plist

devel/maven39: Update to 3.9.15

Changelog:      https://github.com/apache/maven/releases/tag/maven-3.9.15
DeltaFile
+3-3devel/maven39/distinfo
+2-2devel/maven39/pkg-plist
+1-2devel/maven39/Makefile
+6-73 files

HardenedBSD/ports 376c245www/librespeed distinfo Makefile

www/librespeed: update to 6.1.0

Changes:        https://github.com/librespeed/speedtest/releases/tag/v6.0.0
Changes:        https://github.com/librespeed/speedtest/releases/tag/v6.0.1
Changes:        https://github.com/librespeed/speedtest/releases/tag/v6.0.2
Changes:        https://github.com/librespeed/speedtest/releases/tag/v6.1.0
DeltaFile
+3-3www/librespeed/distinfo
+1-1www/librespeed/Makefile
+2-0www/librespeed/pkg-plist
+6-43 files

HardenedBSD/ports e53d22dwww/homer-web pkg-plist distinfo

www/homer-web: update to 26.4.2

Changes:        https://github.com/bastienwirtz/homer/releases/tag/v26.4.2
DeltaFile
+94-90www/homer-web/pkg-plist
+3-3www/homer-web/distinfo
+1-1www/homer-web/Makefile
+98-943 files

HardenedBSD/ports 9bfd311mail/nextcloud-mail distinfo Makefile

mail/nextcloud-mail: Update to 5.7.11
DeltaFile
+3-3mail/nextcloud-mail/distinfo
+1-1mail/nextcloud-mail/Makefile
+4-42 files

HardenedBSD/src 59dacd7lib/librpcsec_gss rpcsec_gss.c

librpcsec_gss: Fix a typo in a source code comment

- s/verfier/verifier/

MFC after:      3 days
DeltaFile
+1-1lib/librpcsec_gss/rpcsec_gss.c
+1-11 files