git: 71909fff64eb - main - multimedia/zoneminder: update 1.36.12 -> 1.36.33, add php 8.1 compat

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Kurt Jaeger <pi_at_FreeBSD.org>
Date: Sun, 09 Apr 2023 16:37:56 UTC
The branch main has been updated by pi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=71909fff64eb4a3abd28ba6a2a77441c1acad7e9

commit 71909fff64eb4a3abd28ba6a2a77441c1acad7e9
Author:     Ivan <bsd@abinet.ru>
AuthorDate: 2023-04-09 16:33:08 +0000
Commit:     Kurt Jaeger <pi@FreeBSD.org>
CommitDate: 2023-04-09 16:37:29 +0000

    multimedia/zoneminder: update 1.36.12 -> 1.36.33, add php 8.1 compat
    
    - package installation now creates /var/log/zm
    - fixes some locale names
    
    PR:             267304
    Changes:        https://github.com/ZoneMinder/zoneminder/releases
    Tested-by:      VVD <vvd@unislabs.com>
---
 multimedia/zoneminder/Makefile             | 11 +++---
 multimedia/zoneminder/distinfo             | 10 ++---
 multimedia/zoneminder/files/pkg-message.in |  5 +++
 multimedia/zoneminder/pkg-plist            | 61 +++++++++++++++---------------
 4 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile
index 4fbc0beb9a22..92fa530ce642 100644
--- a/multimedia/zoneminder/Makefile
+++ b/multimedia/zoneminder/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	zoneminder
-DISTVERSION=	1.36.12
-PORTREVISION=	1
+DISTVERSION=	1.36.33
 CATEGORIES=	multimedia
 
 MAINTAINER=	bsd@abinet.ru
@@ -39,9 +38,9 @@ USES=		cmake:insource,noninja cpe jpeg mysql perl5 php shebangfix ssl
 USE_GITHUB=	yes
 GH_TUPLE=	FriendsOfCake:crud:1429237:crud/web/api/app/Plugin/Crud \
 		ZoneMinder:CakePHP-Enum-Behavior:ea90c0c:crud_plugin/web/api/app/Plugin/CakePHP-Enum-Behavior \
-		ZoneMinder:RtspServer:cd7fd49:rtsp_server/dep/RtspServer
+		ZoneMinder:RtspServer:eab3285:rtsp_server/dep/RtspServer
 USE_RC_SUBR=	zoneminder
-USE_PHP=	json pdo_mysql session gd sockets ctype opcache openssl hash
+USE_PHP=	ctype gd hash intl json opcache openssl pdo_mysql session sockets sysvsem
 
 OPTIONS_DEFINE=	NLS V4L
 OPTIONS_SUB=	yes
@@ -105,11 +104,11 @@ pre-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/temp
 	${MKDIR} ${STAGEDIR}${WWWDIR}/api/app/tmp
 	${MKDIR} ${STAGEDIR}/var/cache/zoneminder
-	${MKDIR} ${STAGEDIR}/var/cache/zoneminder/events
-	${MKDIR} ${STAGEDIR}/var/cache/zoneminder/images
 	${MKDIR} ${STAGEDIR}/var/db/zoneminder
+	${MKDIR} ${STAGEDIR}/var/db/zoneminder/events
 	${MKDIR} ${STAGEDIR}/var/run/zm
 	${MKDIR} ${STAGEDIR}/var/tmp/zm
+	${MKDIR} ${STAGEDIR}/var/log/zm
 
 post-install: # zmsystemctl.pl is only for systend-based systems
 	@cd ${STAGEDIR}${PREFIX} && \
diff --git a/multimedia/zoneminder/distinfo b/multimedia/zoneminder/distinfo
index 820a8dd29abf..44f06f0f9537 100644
--- a/multimedia/zoneminder/distinfo
+++ b/multimedia/zoneminder/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1654708449
-SHA256 (zoneminder-zoneminder-1.36.12_GH0.tar.gz) = 8f2772c9aa891e3e3de6b73e4ce95189af4d5faa886ac13d7ce20972d11c31dd
-SIZE (zoneminder-zoneminder-1.36.12_GH0.tar.gz) = 11350267
+TIMESTAMP = 1677226523
+SHA256 (zoneminder-zoneminder-1.36.33_GH0.tar.gz) = cd0f44c7238bcfd10579d665b271f6af81b61f5cbd8cbbc2ff5d7839232e267e
+SIZE (zoneminder-zoneminder-1.36.33_GH0.tar.gz) = 11501221
 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
 SIZE (ZoneMinder-CakePHP-Enum-Behavior-ea90c0c_GH0.tar.gz) = 3500
-SHA256 (ZoneMinder-RtspServer-cd7fd49_GH0.tar.gz) = 0a397ca5810ecff1c66955348b65903114c5da8f390e3af137a4d0fa33672762
-SIZE (ZoneMinder-RtspServer-cd7fd49_GH0.tar.gz) = 1395694
+SHA256 (ZoneMinder-RtspServer-eab3285_GH0.tar.gz) = 8e37a14b4895e2e1d76e323875ae515f4ac4018b50d579842848718de804c142
+SIZE (ZoneMinder-RtspServer-eab3285_GH0.tar.gz) = 1396598
diff --git a/multimedia/zoneminder/files/pkg-message.in b/multimedia/zoneminder/files/pkg-message.in
index 6599d214cc40..4a0f166a25f1 100644
--- a/multimedia/zoneminder/files/pkg-message.in
+++ b/multimedia/zoneminder/files/pkg-message.in
@@ -172,6 +172,11 @@ log_bin_trust_function_creators = 1 in runtime or in mysql server config;
 
 For example, login as root and issue SET GLOBAL log_bin_trust_function_creators = 1;
 
+If ZM interface complains about absent configuration parameters, zmupdate.pl script
+contains --freshen option to add them.
+
+You can execute it with sudo -u www zmupdate.pl --freshen
+
 Starting from version 1.36, ZM doesn't need too much tmpfs space. zmc process now
 allocates memory as needed. tmpfs backed /tmp is still needed by zms to store 
 1-3 images, so you shrink your tmpfs /tmp drasticallyi (if you followed installation
diff --git a/multimedia/zoneminder/pkg-plist b/multimedia/zoneminder/pkg-plist
index 6fa183570e71..832128e0ee49 100644
--- a/multimedia/zoneminder/pkg-plist
+++ b/multimedia/zoneminder/pkg-plist
@@ -6175,6 +6175,7 @@ etc/zm.conf
 %%PERL5_MAN3%%/ZoneMinder::Trigger::Connection::Example.3.gz
 %%PERL5_MAN3%%/ZoneMinder::User.3.gz
 %%PERL5_MAN3%%/ZoneMinder::Zone.3.gz
+share/applications/zoneminder.desktop
 share/man/man8/zmaudit.pl.8.gz
 share/man/man8/zmc.8.gz
 share/man/man8/zmcamtool.pl.8.gz
@@ -6194,7 +6195,6 @@ share/man/man8/zmupdate.pl.8.gz
 share/man/man8/zmvideo.pl.8.gz
 share/man/man8/zmwatch.pl.8.gz
 share/man/man8/zmx10.pl.8.gz
-share/applications/zoneminder.desktop
 %%DATADIR%%/db/triggers.sql
 %%DATADIR%%/db/zm_create.sql
 %%DATADIR%%/db/zm_update-0.0.1.sql
@@ -6370,6 +6370,8 @@ share/applications/zoneminder.desktop
 %%DATADIR%%/db/zm_update-1.35.7.sql
 %%DATADIR%%/db/zm_update-1.35.8.sql
 %%DATADIR%%/db/zm_update-1.35.9.sql
+%%DATADIR%%/db/zm_update-1.36.16.sql
+%%DATADIR%%/db/zm_update-1.36.18.sql
 %%DATADIR%%/db/zm_update-1.36.6.sql
 %%DATADIR%%/db/zm_update-1.36.9.sql
 %%DATADIR%%/fonts/default.zmfnt
@@ -7711,10 +7713,6 @@ share/applications/zoneminder.desktop
 %%WWWDIR%%/css/font-awesome.min.css
 %%WWWDIR%%/css/reset.css
 %%WWWDIR%%/css/spinner.css
-%%WWWDIR%%/fonts/MaterialIcons-Regular.eot
-%%WWWDIR%%/fonts/MaterialIcons-Regular.ttf
-%%WWWDIR%%/fonts/MaterialIcons-Regular.woff
-%%WWWDIR%%/fonts/MaterialIcons-Regular.woff2
 %%WWWDIR%%/fonts/fontawesome-webfont.eot
 %%WWWDIR%%/fonts/fontawesome-webfont.svg
 %%WWWDIR%%/fonts/fontawesome-webfont.ttf
@@ -7726,6 +7724,8 @@ share/applications/zoneminder.desktop
 %%WWWDIR%%/fonts/glyphicons-halflings-regular.woff
 %%WWWDIR%%/fonts/glyphicons-halflings-regular.woff2
 %%WWWDIR%%/fonts/license.md
+%%WWWDIR%%/fonts/material-icons.woff
+%%WWWDIR%%/fonts/material-icons.woff2
 %%WWWDIR%%/graphics/favicon.ico
 %%WWWDIR%%/graphics/spinner.png
 %%WWWDIR%%/graphics/transparent.png
@@ -7767,12 +7767,12 @@ share/applications/zoneminder.desktop
 %%WWWDIR%%/includes/actions/options.php
 %%WWWDIR%%/includes/actions/privacy.php
 %%WWWDIR%%/includes/actions/server.php
-%%WWWDIR%%/includes/actions/settings.php
 %%WWWDIR%%/includes/actions/snapshot.php
 %%WWWDIR%%/includes/actions/state.php
 %%WWWDIR%%/includes/actions/storage.php
 %%WWWDIR%%/includes/actions/user.php
 %%WWWDIR%%/includes/actions/version.php
+%%WWWDIR%%/includes/actions/watch.php
 %%WWWDIR%%/includes/actions/zone.php
 %%WWWDIR%%/includes/actions/zones.php
 %%WWWDIR%%/includes/auth.php
@@ -7791,6 +7791,7 @@ share/applications/zoneminder.desktop
 %%WWWDIR%%/index.php
 %%WWWDIR%%/js/MonitorStream.js
 %%WWWDIR%%/js/Server.js
+%%WWWDIR%%/js/ajaxQueue.js
 %%WWWDIR%%/js/logger.js
 %%WWWDIR%%/js/videojs.zoomrotate.js
 %%WWWDIR%%/lang/ba_ba.php
@@ -7848,6 +7849,7 @@ share/applications/zoneminder.desktop
 %%WWWDIR%%/skins/classic/css/base/views/options.css
 %%WWWDIR%%/skins/classic/css/base/views/plugin.css
 %%WWWDIR%%/skins/classic/css/base/views/privacy.css
+%%WWWDIR%%/skins/classic/css/base/views/report_event_audit.css
 %%WWWDIR%%/skins/classic/css/base/views/server.css
 %%WWWDIR%%/skins/classic/css/base/views/settings.css
 %%WWWDIR%%/skins/classic/css/base/views/snapshot.css
@@ -7981,28 +7983,27 @@ share/applications/zoneminder.desktop
 %%WWWDIR%%/skins/classic/js/font/vjs.eot
 %%WWWDIR%%/skins/classic/js/font/vjs.ttf
 %%WWWDIR%%/skins/classic/js/font/vjs.woff
-%%WWWDIR%%/skins/classic/js/jquery-3.5.1.min.js
-%%WWWDIR%%/skins/classic/js/jquery-3.5.1.min.map
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/AUTHORS.txt
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/LICENSE.txt
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/images/ui-icons_444444_256x240.png
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/images/ui-icons_555555_256x240.png
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/images/ui-icons_777620_256x240.png
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/images/ui-icons_777777_256x240.png
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/images/ui-icons_cc0000_256x240.png
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/images/ui-icons_ffffff_256x240.png
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/index.html
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.css
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.js
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.min.css
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.min.js
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.structure.css
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.structure.min.css
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.theme.css
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.theme.min.css
-%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/package.json
-%%WWWDIR%%/skins/classic/js/jquery-ui-structure.css
-%%WWWDIR%%/skins/classic/js/jquery-ui.js
+%%WWWDIR%%/skins/classic/js/jquery-3.6.1.min.js
+%%WWWDIR%%/skins/classic/js/jquery-3.6.1.min.map
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/AUTHORS.txt
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/LICENSE.txt
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/external/jquery/jquery.js
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/images/ui-icons_444444_256x240.png
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/images/ui-icons_555555_256x240.png
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/images/ui-icons_777620_256x240.png
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/images/ui-icons_777777_256x240.png
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/images/ui-icons_cc0000_256x240.png
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/images/ui-icons_ffffff_256x240.png
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/index.html
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/jquery-ui.css
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/jquery-ui.js
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/jquery-ui.min.css
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/jquery-ui.min.js
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/jquery-ui.structure.css
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/jquery-ui.structure.min.css
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/jquery-ui.theme.css
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/jquery-ui.theme.min.css
+%%WWWDIR%%/skins/classic/js/jquery-ui-1.13.2/package.json
 %%WWWDIR%%/skins/classic/js/jquery.min.js
 %%WWWDIR%%/skins/classic/js/jquery.min.js.URL
 %%WWWDIR%%/skins/classic/js/moment.js
@@ -8149,8 +8150,8 @@ share/applications/zoneminder.desktop
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/api/app/tmp
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/temp
 @dir(%%WWWOWN%%,%%WWWGRP%%,) /var/cache/zoneminder
-@dir(%%WWWOWN%%,%%WWWGRP%%,) /var/cache/zoneminder/events
-@dir(%%WWWOWN%%,%%WWWGRP%%,) /var/cache/zoneminder/images
 @dir(%%WWWOWN%%,%%WWWGRP%%,) /var/db/zoneminder
+@dir(%%WWWOWN%%,%%WWWGRP%%,) /var/db/zoneminder/events
+@dir(%%WWWOWN%%,%%WWWGRP%%,) /var/log/zm
 @dir(%%WWWOWN%%,%%WWWGRP%%,) /var/run/zm
 @dir(%%WWWOWN%%,%%WWWGRP%%,) /var/tmp/zm