From nobody Tue Jan 04 07:59:14 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A215D192CE58; Tue, 4 Jan 2022 07:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JSlPZ2lX2z3Ggg; Tue, 4 Jan 2022 07:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3E01F152E1; Tue, 4 Jan 2022 07:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2047xEFv009885; Tue, 4 Jan 2022 07:59:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2047xEOv009884; Tue, 4 Jan 2022 07:59:14 GMT (envelope-from git) Date: Tue, 4 Jan 2022 07:59:14 GMT Message-Id: <202201040759.2047xEOv009884@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: e61e7590fc02 - main - multimedia/zoneminder: Update to 1.36.12 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e61e7590fc02030bfe4184a7f0f8bd922087fe3c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641283154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hjNFFEo8o3xrY7UnE7zElXghLR+0jjOzIpRndITiYJM=; b=gJV+0npuTzoCyUu1PBPTne6M2RvW5v+D8lrcivLYEbjDRE5PwZhwYiXuXLllWhkMdH+p+3 7KZIDIIo6nM+v75yuAVHV6TgZY97bk3E/UqBE5Bk4CnXibYnqUPbiiSTEw7HOiryctNfVy JoKxX/5NwEG7cL6922L1RldJqQtv1OupLTmnItuqufbvaotdBQwuobN5oNGXdYYXWi39yu s5hmpOWrp7pN3b6BVvRqB57ChlzGxY/7kLEUx3x3MXiBHwKcr1vt9xRxxSx9oRRvfk1P7u jMPk3kTXeirCgxhUnb/Nf00SrTeOpSCU7Iqt4Pu60dwtvRuvQGwAGRMNmEX8UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641283154; a=rsa-sha256; cv=none; b=avPb560n4r5x3gS7zBPZI3h2f0xnWi/pHUcjprETyGwhVZJkIO4DptS+PBHy5IUkysttCo Q4pxiZGn1768nVgc9JPTcVXAJl3ynP336bNSHak0Ylj8fhQ9pgY9/irawaXghEmT5Hf6id vNrRpnQCmo/bwR4M1J4PIGSTYbA6fLCWtQttq4NX9mYixC28xge0/AAml/VxQGYTJjJVWz 7Hfvqb/VsvVJoOJVMkjq91ZIcA3Et/6Q0HWT6nBO5jiQoZSTkD7EKwYsNfoLHmpIMdGwOl e7I0FvMHX9Lz1aw/fcZbiYDkn5+AgbMr/t/3T1NHW1iapyVmPU2OpC2pxt1cTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=e61e7590fc02030bfe4184a7f0f8bd922087fe3c commit e61e7590fc02030bfe4184a7f0f8bd922087fe3c Author: Ivan AuthorDate: 2022-01-03 08:14:36 +0000 Commit: Fernando Apesteguía CommitDate: 2022-01-04 07:57:48 +0000 multimedia/zoneminder: Update to 1.36.12 ChangeLog: https://github.com/ZoneMinder/zoneminder/releases PR: 260869 Reported by: bsd@abinet.ru (maintainer) --- multimedia/zoneminder/Makefile | 4 ++-- multimedia/zoneminder/distinfo | 10 +++++----- .../zoneminder/files/patch-src_zm__local__camera.cpp | 12 ------------ multimedia/zoneminder/files/patch-src_zm__utils.cpp | 14 -------------- multimedia/zoneminder/files/pkg-message.in | 18 +++++++++--------- multimedia/zoneminder/pkg-plist | 4 ++++ 6 files changed, 20 insertions(+), 42 deletions(-) diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile index ae0b59fd1c46..620591761308 100644 --- a/multimedia/zoneminder/Makefile +++ b/multimedia/zoneminder/Makefile @@ -1,5 +1,5 @@ PORTNAME= zoneminder -DISTVERSION= 1.36.5 +DISTVERSION= 1.36.12 CATEGORIES= multimedia MAINTAINER= bsd@abinet.ru @@ -35,7 +35,7 @@ RUN_DEPENDS= ${ZM_DEPENDS} \ USES= cmake:insource,noninja cpe jpeg mysql perl5 php shebangfix ssl USE_GITHUB= yes -GH_TUPLE= FriendsOfCake:crud:0bd63fb:crud/web/api/app/Plugin/Crud \ +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 USE_RC_SUBR= zoneminder diff --git a/multimedia/zoneminder/distinfo b/multimedia/zoneminder/distinfo index 37613e2db517..3bde15a93e04 100644 --- a/multimedia/zoneminder/distinfo +++ b/multimedia/zoneminder/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1629145711 -SHA256 (zoneminder-zoneminder-1.36.5_GH0.tar.gz) = c618a0aaf23739ed31ce529245dee9dc7219f3abbcbdbb4c227872545b1bf6f1 -SIZE (zoneminder-zoneminder-1.36.5_GH0.tar.gz) = 11347787 -SHA256 (FriendsOfCake-crud-0bd63fb_GH0.tar.gz) = d4c82d714ea74606726d11be973b17d3f9b57ad6c6559e1a29affa60c6f3a579 -SIZE (FriendsOfCake-crud-0bd63fb_GH0.tar.gz) = 73129 +TIMESTAMP = 1641049619 +SHA256 (zoneminder-zoneminder-1.36.12_GH0.tar.gz) = 8f2772c9aa891e3e3de6b73e4ce95189af4d5faa886ac13d7ce20972d11c31dd +SIZE (zoneminder-zoneminder-1.36.12_GH0.tar.gz) = 11350267 +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 diff --git a/multimedia/zoneminder/files/patch-src_zm__local__camera.cpp b/multimedia/zoneminder/files/patch-src_zm__local__camera.cpp deleted file mode 100644 index 6148f7585ee2..000000000000 --- a/multimedia/zoneminder/files/patch-src_zm__local__camera.cpp +++ /dev/null @@ -1,12 +0,0 @@ -- workaround for https://github.com/ZoneMinder/zoneminder/issues/3330 - ---- src/zm_local_camera.cpp.orig 2021-08-16 21:01:02 UTC -+++ src/zm_local_camera.cpp -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #if ZM_HAS_V4L - diff --git a/multimedia/zoneminder/files/patch-src_zm__utils.cpp b/multimedia/zoneminder/files/patch-src_zm__utils.cpp deleted file mode 100644 index 90527e79b228..000000000000 --- a/multimedia/zoneminder/files/patch-src_zm__utils.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- src/zm_utils.cpp.orig 2021-11-28 23:56:36 UTC -+++ src/zm_utils.cpp -@@ -224,8 +224,9 @@ void HwCapsDetect() { - #elif defined(__arm__) - // ARM processor in 32bit mode - // To see if it supports NEON, we need to get that information from the kernel -- unsigned long auxval = getauxval(AT_HWCAP); -- if (auxval & HWCAP_ARM_NEON) { -+ unsigned long auxval = 0; -+ elf_aux_info(AT_HWCAP, &auxval, sizeof(auxval)); -+ if (auxval & HWCAP_NEON) { - Debug(1,"Detected ARM (AArch32) processor with Neon"); - neonversion = 1; - } else { diff --git a/multimedia/zoneminder/files/pkg-message.in b/multimedia/zoneminder/files/pkg-message.in index 1f945bbf466c..6599d214cc40 100644 --- a/multimedia/zoneminder/files/pkg-message.in +++ b/multimedia/zoneminder/files/pkg-message.in @@ -119,24 +119,19 @@ the same server. sysrc php_fpm_enable="YES" service php-fpm start -1.5 ZoneMinder constantly keeps the last N frames from its cameras to - preserve them when alarm occurs. This can be a performance hog if - placed on spindle drive. The best practice is put it on tmpfs. - See https://www.freebsd.org/cgi/man.cgi?query=tmpfs for more +1.5 ZoneMinder keeps the last 1-3 frames from monitors as cache when broadcasting + stream through zms. This can be a performance hog if + placed on spindle drive or add wear to SSD. The best practice is put it on + tmpfs. See https://www.freebsd.org/cgi/man.cgi?query=tmpfs for more information. ZoneMinder will use /tmp for default. If you plan to change it, see ZM_PATH_MAP setting. - Mapping /tmp to tmpfs is actually a recommended step under FreeBSD. Edit /etc/fstab and add the following: tmpfs /tmp tmpfs rw,nosuid,mode=01777 0 0 - The size of temporary files depends on your number of cameras - number and frames you plan to keep. My 12 3Mbit cameras with 25 - last frames consumes 6 GB. - 2. ZoneMinder installation Connect to MySQL under root and create zm user and populate database. @@ -176,6 +171,11 @@ If you see error ERROR 1419 (HY000) during database update, set 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; + +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 +guide). EOM } ] diff --git a/multimedia/zoneminder/pkg-plist b/multimedia/zoneminder/pkg-plist index ce271f06be7c..f0ddda92cd79 100644 --- a/multimedia/zoneminder/pkg-plist +++ b/multimedia/zoneminder/pkg-plist @@ -3083,6 +3083,7 @@ etc/zm.conf %%SITE_PERL%%/ZoneMinder/Control/onvif.pm %%SITE_PERL%%/ZoneMinder/Database.pm %%SITE_PERL%%/ZoneMinder/Event.pm +%%SITE_PERL%%/ZoneMinder/Event_Summary.pm %%SITE_PERL%%/ZoneMinder/Filter.pm %%SITE_PERL%%/ZoneMinder/Frame.pm %%SITE_PERL%%/ZoneMinder/General.pm @@ -6151,6 +6152,7 @@ etc/zm.conf %%PERL5_MAN3%%/ZoneMinder::Control::mjpgStreamer.3.gz %%PERL5_MAN3%%/ZoneMinder::Database.3.gz %%PERL5_MAN3%%/ZoneMinder::Event.3.gz +%%PERL5_MAN3%%/ZoneMinder::Event_Summary.3.gz %%PERL5_MAN3%%/ZoneMinder::Filter.3.gz %%PERL5_MAN3%%/ZoneMinder::Frame.3.gz %%PERL5_MAN3%%/ZoneMinder::General.3.gz @@ -6368,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.6.sql +%%DATADIR%%/db/zm_update-1.36.9.sql %%DATADIR%%/fonts/default.zmfnt %%DATADIR%%/icons/16x16/icon.xpm %%WWWDIR%%/ajax/add_monitors.php