Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

10 files changed, 11 insertions, 99 deletions

diff --git a/sysutils/nginx-ui/Makefile b/sysutils/nginx-ui/Makefile
index 06299629b75b..5c7ef15779ea 100644
--- a/sysutils/nginx-ui/Makefile
+++ b/sysutils/nginx-ui/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	nginx-ui
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1.17
-PORTREVISION=	2
+DISTVERSION=	2.2.1
 CATEGORIES=	sysutils
 MASTER_SITES=	LOCAL/dtxdf/${PORTNAME}/
 DISTFILES=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}.frontend${EXTRACT_SUFX} \
@@ -37,13 +36,14 @@ BUILD_DATE=	$$(date -u +%s)
 
 # Run 'git checkout ${DISTVERSIONPREFIX}${DISTVERSION} && git rev-parse HEAD'
 # in the NGINX UI repository to get the value of GITID.
-GITID=		876213ad12449216d82520b3808b59cdaf0e1276
+GITID=		fdea3940d86459661166ef2c7a00204544ed9b9b
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/vendor
 	@cd ${WRKDIR}/${PORTNAME}-vendor && ${COPYTREE_SHARE} . ${WRKSRC}/vendor
 	@${MKDIR} ${WRKSRC}/app/dist
 	@cd ${WRKDIR}/${PORTNAME}-frontend && ${COPYTREE_SHARE} . ${WRKSRC}/app/dist
+	@${MV} ${WRKSRC}/app/dist/dist.tar.xz ${WRKSRC}/app/dist.tar.xz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/newLineSymbol/"\\n"/g' \
diff --git a/sysutils/nginx-ui/distinfo b/sysutils/nginx-ui/distinfo
index 0bc2e4f53e63..4b263650b579 100644
--- a/sysutils/nginx-ui/distinfo
+++ b/sysutils/nginx-ui/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1756360261
-SHA256 (nginx-ui-v2.1.17.frontend.tar.gz) = 8f93d1d2e69600ce2a0ef56c78f1913914806cc3bf524ca81e1641905ccfb23b
-SIZE (nginx-ui-v2.1.17.frontend.tar.gz) = 1694681
-SHA256 (nginx-ui-v2.1.17.vendor.tar.gz) = d5da0ff0503fc8ab7468e48b9c8e5a3cfcdbd248b590bb55e934d8ef319e593b
-SIZE (nginx-ui-v2.1.17.vendor.tar.gz) = 24145528
-SHA256 (2758ffc346a65bc99084e20ff3c2dee4b8ce7b58.patch) = a9d512710c21126504a2fc524bbe1f1865255c52faa84b55da4c03e2a510de84
-SIZE (2758ffc346a65bc99084e20ff3c2dee4b8ce7b58.patch) = 21707
-SHA256 (0xJacky-nginx-ui-v2.1.17_GH0.tar.gz) = da00d80d0e8b13b742597021fdb13b260662a87fdbd5b2d71fc37cac75fd3e82
-SIZE (0xJacky-nginx-ui-v2.1.17_GH0.tar.gz) = 12110923
+TIMESTAMP = 1764262168
+SHA256 (nginx-ui-v2.2.1.frontend.tar.gz) = 71652a78c9ffd148b189d7b24d7fefdb2cafc411c78c7871c510523b25bd1828
+SIZE (nginx-ui-v2.2.1.frontend.tar.gz) = 4201738
+SHA256 (nginx-ui-v2.2.1.vendor.tar.gz) = 8c25373e17802e5185532357ea45d90b212b7b708892a83df52f0f1f3bfc0509
+SIZE (nginx-ui-v2.2.1.vendor.tar.gz) = 27341098
+SHA256 (0xJacky-nginx-ui-v2.2.1_GH0.tar.gz) = 9eaa81bc1c4186f559ec7da506697009e8eb01a0624e163486e938b191de4c59
+SIZE (0xJacky-nginx-ui-v2.2.1_GH0.tar.gz) = 13058695
diff --git a/sysutils/nginx-ui/files/nginx-ui.in b/sysutils/nginx-ui/files/nginx-ui.in
index 25ab52c8bd44..d5e04d9137af 100644
--- a/sysutils/nginx-ui/files/nginx-ui.in
+++ b/sysutils/nginx-ui/files/nginx-ui.in
@@ -32,5 +32,6 @@ command_args="-o ${nginx_ui_log} -u ${nginx_ui_runas} -p ${pidfile} -t \"${desc}
 # the error "connect: connection refused" will be displayed, so the best thing to
 # do is to delete it before starting NGINX UI.
 start_precmd="rm -f /var/db/nginx-ui/nginx-ui.sock"
+sig_stop="SIGQUIT"
 
 run_rc_command "$1"
diff --git a/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_disk_disk__freebsd.go b/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_disk_disk__freebsd.go
deleted file mode 100644
index bfbd8adfc816..000000000000
--- a/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_disk_disk__freebsd.go
+++ /dev/null
@@ -1,13 +0,0 @@
---- vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd.go.orig	2025-08-28 06:12:56 UTC
-+++ vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd.go
-@@ -154,9 +154,7 @@ func parsedevstat(buf []byte) (devstat, error) {
- func parsedevstat(buf []byte) (devstat, error) {
- 	var ds devstat
- 	br := bytes.NewReader(buf)
--	//	err := binary.Read(br, binary.LittleEndian, &ds)
--	err := common.Read(br, binary.LittleEndian, &ds)
--	if err != nil {
-+	if err := binary.Read(br, binary.LittleEndian, &ds); err != nil {
- 		return ds, err
- 	}
- 
diff --git a/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_disk_disk__freebsd__386.go b/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_disk_disk__freebsd__386.go
deleted file mode 100644
index 93c140610bef..000000000000
--- a/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_disk_disk__freebsd__386.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_386.go.orig	2025-08-28 06:14:45 UTC
-+++ vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_386.go
-@@ -50,7 +50,7 @@ type devstat struct {
- 	Flags         uint32
- 	Device_type   uint32
- 	Priority      uint32
--	Id            *byte
-+	Id            [sizeofPtr]byte
- 	Sequence1     uint32
- }
- 
diff --git a/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_disk_disk__freebsd__amd64.go b/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_disk_disk__freebsd__amd64.go
deleted file mode 100644
index d5881f0968f3..000000000000
--- a/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_disk_disk__freebsd__amd64.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_amd64.go.orig	2025-08-28 06:15:24 UTC
-+++ vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_amd64.go
-@@ -52,7 +52,7 @@ type devstat struct {
- 	Device_type   uint32
- 	Priority      uint32
- 	Pad_cgo_1     [4]byte
--	ID            *byte
-+	ID            [sizeofPtr]byte
- 	Sequence1     uint32
- 	Pad_cgo_2     [4]byte
- }
diff --git a/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_disk_disk__freebsd__arm.go b/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_disk_disk__freebsd__arm.go
deleted file mode 100644
index c749c6d093d0..000000000000
--- a/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_disk_disk__freebsd__arm.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_arm.go.orig	2025-08-28 06:15:52 UTC
-+++ vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_arm.go
-@@ -50,7 +50,7 @@ type devstat struct {
- 	Flags         uint32
- 	Device_type   uint32
- 	Priority      uint32
--	Id            *byte
-+	Id            [sizeofPtr]byte
- 	Sequence1     uint32
- }
- 
diff --git a/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_disk_disk__freebsd__arm64.go b/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_disk_disk__freebsd__arm64.go
deleted file mode 100644
index a6d7e0a49541..000000000000
--- a/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_disk_disk__freebsd__arm64.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_arm64.go.orig	2025-08-28 06:16:23 UTC
-+++ vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_arm64.go
-@@ -52,7 +52,7 @@ type devstat struct {
- 	Flags         uint32
- 	Device_type   uint32
- 	Priority      uint32
--	Id            *byte
-+	Id            [sizeofPtr]byte
- 	Sequence1     uint32
- 	Pad_cgo_0     [4]byte
- }
diff --git a/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_process_process__bsd.go b/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_process_process__bsd.go
deleted file mode 100644
index a43bd97cd52c..000000000000
--- a/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_process_process__bsd.go
+++ /dev/null
@@ -1,10 +0,0 @@
---- vendor/github.com/shirou/gopsutil/v4/process/process_bsd.go.orig	2025-08-28 06:18:32 UTC
-+++ vendor/github.com/shirou/gopsutil/v4/process/process_bsd.go
-@@ -71,6 +71,6 @@ func parseKinfoProc(buf []byte) (KinfoProc, error) {
- func parseKinfoProc(buf []byte) (KinfoProc, error) {
- 	var k KinfoProc
- 	br := bytes.NewReader(buf)
--	err := common.Read(br, binary.LittleEndian, &k)
-+	err := binary.Read(br, binary.LittleEndian, &k)
- 	return k, err
- }
diff --git a/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_process_process__freebsd.go b/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_process_process__freebsd.go
deleted file mode 100644
index 0d8403972089..000000000000
--- a/sysutils/nginx-ui/files/patch-vendor_github.com_shirou_gopsutil_v4_process_process__freebsd.go
+++ /dev/null
@@ -1,20 +0,0 @@
---- vendor/github.com/shirou/gopsutil/v4/process/process_freebsd.go.orig	2025-08-28 06:19:32 UTC
-+++ vendor/github.com/shirou/gopsutil/v4/process/process_freebsd.go
-@@ -79,7 +79,7 @@ func (p *Process) CwdWithContext(_ context.Context) (s
- 
- 	var k kinfoFile
- 	br := bytes.NewReader(buf)
--	if err := common.Read(br, binary.LittleEndian, &k); err != nil {
-+	if err := binary.Read(br, binary.LittleEndian, &k); err != nil {
- 		return "", err
- 	}
- 	cwd := common.IntToString(k.Path[:])
-@@ -279,7 +279,7 @@ func (p *Process) MemoryInfoWithContext(_ context.Cont
- 	if err != nil {
- 		return nil, err
- 	}
--	pageSize := common.LittleEndian.Uint16([]byte(v))
-+	pageSize := binary.LittleEndian.Uint16([]byte(v))
- 
- 	return &MemoryInfoStat{
- 		RSS: uint64(k.Rssize) * uint64(pageSize),