git: 3849408b31f5 - 2026Q4 - multimedia/zoneminder: Update 1.38.3 => 1.38.6

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Mon, 12 Oct 2026 00:46:29 UTC
The branch 2026Q4 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3849408b31f5020554a8b500930140fb7f1ab26a

commit 3849408b31f5020554a8b500930140fb7f1ab26a
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-10-12 00:42:05 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-10-12 00:46:24 +0000

    multimedia/zoneminder: Update 1.38.3 => 1.38.6
    
    Changelogs:
    https://github.com/ZoneMinder/zoneminder/releases/tag/1.38.4
    https://github.com/ZoneMinder/zoneminder/releases/tag/1.38.5
    https://github.com/ZoneMinder/zoneminder/releases/tag/1.38.6
    
    - Requires "zmupdate.pl -f" for upgrade.
    
    PR:             299164
    Approved by:    Ivan <bsd@abinet.ru> (maintainer)
    Security:       GHSA-vvx7-ghpv-jq98
    Security:       GHSA-rpp4-xmqm-84ff
    Security:       GHSA-xp4c-29hh-2w4j
    Security:       GHSA-pfph-4j9j-7cv7
    Security:       GHSA-pxq8-5c8j-xf3r
    Security:       GHSA-p8h3-4x5c-cv7p
    Security:       GHSA-wmcc-x64g-jr84
    Security:       GHSA-m77q-66v7-j3fq
    Security:       GHSA-72rf-54rm-798c
    Security:       GHSA-vvw3-j4p4-4rgx
    Security:       GHSA-34x2-mw89-c52f
    Security:       GHSA-993c-fc6p-hpxg
    Security:       GHSA-f8h6-62c9-x6qr
    Security:       GHSA-4r2m-68p2-phf7
    Security:       GHSA-m896-3fc6-2jf5
    Security:       GHSA-r44j-mvj8-cg9w
    Security:       GHSA-wqmm-rmvc-pc7r
    Security:       GHSA-626g-6988-pv4p
    Security:       GHSA-v2qc-p8cq-g4pc
    Sponsored by:   UNIS Labs (vvd)
    MFH:            2026Q4
    
    (cherry picked from commit abb6f898c035663f5b647809d02305d9b266416b)
---
 multimedia/zoneminder/Makefile                     | 12 +++++------
 multimedia/zoneminder/distinfo                     |  6 +++---
 ...tch-scripts_ZoneMinder_lib_ZoneMinder_Server.pm | 14 ++++++-------
 multimedia/zoneminder/pkg-plist                    | 23 +++++-----------------
 4 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile
index 479c32674248..66e68f6ccd25 100644
--- a/multimedia/zoneminder/Makefile
+++ b/multimedia/zoneminder/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	zoneminder
-DISTVERSION=	1.38.3
+DISTVERSION=	1.38.6
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
@@ -9,8 +9,8 @@ WWW=		https://www.zoneminder.com/
 
 LICENSE=	GPLv2
 
-ZM_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
-		${DBD_MYSQL} \
+BUILD_RUN_DEPENDS=	${DBD_MYSQL} \
+		p5-DBI>=0:databases/p5-DBI \
 		p5-Date-Manip>=0:devel/p5-Date-Manip \
 		p5-Test-LWP-UserAgent>=0:www/p5-Test-LWP-UserAgent \
 		p5-Sys-Mmap>=0:devel/p5-Sys-Mmap \
@@ -23,15 +23,13 @@ ZM_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
 		p5-IO-Socket-Multicast>=0:net/p5-IO-Socket-Multicast \
 		p5-Number-Bytes-Human>=0:devel/p5-Number-Bytes-Human \
 		p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS
-BUILD_DEPENDS=	${ZM_DEPENDS} \
-		soapcpp2:devel/gsoap \
+BUILD_DEPENDS=	soapcpp2:devel/gsoap \
 		${LOCALBASE}/include/jwt-cpp/jwt.h:devel/jwt-cpp \
 		${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libcurl.so:ftp/curl \
 		libunwind.so:devel/libunwind
-RUN_DEPENDS=	${ZM_DEPENDS} \
-		p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \
+RUN_DEPENDS=	p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \
 		p5-Crypt-Eksblowfish>=0:security/p5-Crypt-Eksblowfish \
 		p5-Bytes-Random-Secure>=0:security/p5-Bytes-Random-Secure \
 		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
diff --git a/multimedia/zoneminder/distinfo b/multimedia/zoneminder/distinfo
index d94709b7f937..df0092aebe49 100644
--- a/multimedia/zoneminder/distinfo
+++ b/multimedia/zoneminder/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1785004066
-SHA256 (zoneminder-zoneminder-1.38.3_GH0.tar.gz) = 59ed8bcaa2376593873b613149ea299b9055443e6d925689b2bf69c56f2deb79
-SIZE (zoneminder-zoneminder-1.38.3_GH0.tar.gz) = 25321086
+TIMESTAMP = 1791242424
+SHA256 (zoneminder-zoneminder-1.38.6_GH0.tar.gz) = 1e536ce736d030cd415bbb7a09d39d58d8d7f6064bf87e5e14015b37bd3bec59
+SIZE (zoneminder-zoneminder-1.38.6_GH0.tar.gz) = 20658550
 SHA256 (FriendsOfCake-crud-1429237_GH0.tar.gz) = 4dc57f344623d3c0e735b53ed583e5382aa9e43012215f641cbd8ebad381aadc
 SIZE (FriendsOfCake-crud-1429237_GH0.tar.gz) = 73018
 SHA256 (ZoneMinder-CakePHP-Enum-Behavior-ea90c0c_GH0.tar.gz) = 3a9006c7c59f2b864ce628df4725b241fc23cfd9abc56e746acbd22d850f5ab1
diff --git a/multimedia/zoneminder/files/patch-scripts_ZoneMinder_lib_ZoneMinder_Server.pm b/multimedia/zoneminder/files/patch-scripts_ZoneMinder_lib_ZoneMinder_Server.pm
index 175dc3f87629..57fc845eae5b 100644
--- a/multimedia/zoneminder/files/patch-scripts_ZoneMinder_lib_ZoneMinder_Server.pm
+++ b/multimedia/zoneminder/files/patch-scripts_ZoneMinder_lib_ZoneMinder_Server.pm
@@ -1,11 +1,11 @@
---- scripts/ZoneMinder/lib/ZoneMinder/Server.pm.orig	2026-05-28 12:42:49 UTC
+--- scripts/ZoneMinder/lib/ZoneMinder/Server.pm.orig	2026-10-05 23:07:17 UTC
 +++ scripts/ZoneMinder/lib/ZoneMinder/Server.pm
-@@ -132,7 +132,7 @@ sub CpuUsage {
+@@ -146,7 +146,7 @@ sub CpuUsage {
      chomp($uname_output);
-     ## FreeBSD
-     if ($uname_output eq "freebsd") {
--      $top_output = `top -b -n 1 | grep "^CPU" | sed 's/%//g' | awk '{print \$2, \$6, \$4, \$10}'`;
-+      $top_output = `top -b -d 2 -s 0.2 0 | grep -i "^CPU" | tail -n1 | tr -d '%' | awk '{print \$2, \$6, \$4, \$10}'`;
+     my $top_cmd = '';
+     if ($uname_output eq 'freebsd') {
+-      $top_cmd = q`top -b -n 1 | grep "^CPU" | sed 's/%//g' | awk '{print $2, $6, $4, $10}'`;
++      $top_cmd = q`top -b -d 2 -s 0.2 0 | grep "^CPU" | tail -n1 | tr -d '%' | awk '{print $2, $6, $4, $10}'`;
      } else {
-       $top_output = `top -b -n 1 | grep -i "^%Cpu(s)" | awk '{print \$2, \$4, \$6, \$8}'`;
+       $top_cmd = q`top -b -n 1 | grep -i "^%Cpu(s)" | awk '{print $2, $4, $6, $8}'`;
      }
diff --git a/multimedia/zoneminder/pkg-plist b/multimedia/zoneminder/pkg-plist
index 2779994f160b..e70bc3e70acf 100644
--- a/multimedia/zoneminder/pkg-plist
+++ b/multimedia/zoneminder/pkg-plist
@@ -3090,7 +3090,6 @@ etc/zm.conf
 %%SITE_PERL%%/ZoneMinder/Control/Wanscam.pm
 %%SITE_PERL%%/ZoneMinder/Control/WanscamHW0025.pm
 %%SITE_PERL%%/ZoneMinder/Control/mjpgStreamer.pm
-%%SITE_PERL%%/ZoneMinder/Control/onvif.pm
 %%SITE_PERL%%/ZoneMinder/Database.pm
 %%SITE_PERL%%/ZoneMinder/Event.pm
 %%SITE_PERL%%/ZoneMinder/Event_Summary.pm
@@ -6487,6 +6486,8 @@ share/man/man8/zmx10.pl.8.gz
 %%DATADIR%%/db/zm_update-1.37.80.sql
 %%DATADIR%%/db/zm_update-1.37.9.sql
 %%DATADIR%%/db/zm_update-1.38.1.sql
+%%DATADIR%%/db/zm_update-1.38.4.sql
+%%DATADIR%%/db/zm_update-1.38.5.sql
 %%DATADIR%%/fonts/default.zmfnt
 %%DATADIR%%/icons/16x16/icon.xpm
 %%WWWDIR%%/ajax/add_monitors.php
@@ -7919,11 +7920,13 @@ share/man/man8/zmx10.pl.8.gz
 %%WWWDIR%%/includes/Group.php
 %%WWWDIR%%/includes/Group_Monitor.php
 %%WWWDIR%%/includes/Group_Permission.php
+%%WWWDIR%%/includes/HttpRange.php
 %%WWWDIR%%/includes/Manufacturer.php
 %%WWWDIR%%/includes/Model.php
 %%WWWDIR%%/includes/Monitor.php
 %%WWWDIR%%/includes/Monitor_Permission.php
 %%WWWDIR%%/includes/MontageLayout.php
+%%WWWDIR%%/includes/Network.php
 %%WWWDIR%%/includes/Object.php
 %%WWWDIR%%/includes/Report.php
 %%WWWDIR%%/includes/Role_Group_Permission.php
@@ -7995,25 +7998,8 @@ share/man/man8/zmx10.pl.8.gz
 %%WWWDIR%%/js/dms.js
 %%WWWDIR%%/js/dms.js.URL
 %%WWWDIR%%/js/fontfaceobserver.standalone.js
-%%WWWDIR%%/js/hls-1.6.13/hls-demo.js
-%%WWWDIR%%/js/hls-1.6.13/hls-demo.js.map
-%%WWWDIR%%/js/hls-1.6.13/hls.d.mts
-%%WWWDIR%%/js/hls-1.6.13/hls.d.ts
-%%WWWDIR%%/js/hls-1.6.13/hls.js
-%%WWWDIR%%/js/hls-1.6.13/hls.js.d.ts
-%%WWWDIR%%/js/hls-1.6.13/hls.js.map
-%%WWWDIR%%/js/hls-1.6.13/hls.light.js
-%%WWWDIR%%/js/hls-1.6.13/hls.light.js.map
-%%WWWDIR%%/js/hls-1.6.13/hls.light.min.js
-%%WWWDIR%%/js/hls-1.6.13/hls.light.min.js.map
-%%WWWDIR%%/js/hls-1.6.13/hls.light.mjs
-%%WWWDIR%%/js/hls-1.6.13/hls.light.mjs.map
 %%WWWDIR%%/js/hls-1.6.13/hls.min.js
 %%WWWDIR%%/js/hls-1.6.13/hls.min.js.map
-%%WWWDIR%%/js/hls-1.6.13/hls.mjs
-%%WWWDIR%%/js/hls-1.6.13/hls.mjs.map
-%%WWWDIR%%/js/hls-1.6.13/hls.worker.js
-%%WWWDIR%%/js/hls-1.6.13/hls.worker.js.map
 %%WWWDIR%%/js/logger.js
 %%WWWDIR%%/js/noUiSlider-15.8.1/README.md
 %%WWWDIR%%/js/noUiSlider-15.8.1/dist/nouislider.css
@@ -8624,6 +8610,7 @@ share/man/man8/zmx10.pl.8.gz
 %%WWWDIR%%/skins/classic/views/js/console.js
 %%WWWDIR%%/skins/classic/views/js/console.js.php
 %%WWWDIR%%/skins/classic/views/js/control.js
+%%WWWDIR%%/skins/classic/views/js/control.js.php
 %%WWWDIR%%/skins/classic/views/js/controlcap.js
 %%WWWDIR%%/skins/classic/views/js/controlcaps.js
 %%WWWDIR%%/skins/classic/views/js/cycle.js