diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile index 53bc45a28972..df10c4b30480 100644 --- a/multimedia/zoneminder/Makefile +++ b/multimedia/zoneminder/Makefile @@ -1,6 +1,5 @@ PORTNAME= zoneminder -PORTVERSION= 1.34.21 -PORTREVISION= 2 +DISTVERSION= 1.36.5 CATEGORIES= multimedia MAINTAINER= bsd@abinet.ru @@ -39,8 +38,9 @@ RUN_DEPENDS= ${ZM_DEPENDS} \ USES= cmake:insource,noninja jpeg mysql perl5 php shebangfix ssl USE_GITHUB= yes GH_PROJECT= zoneminder -GH_TUPLE= zoneminder:crud:0bd63fb:crud \ - zoneminder:CakePHP-Enum-Behavior:ea90c0c:crud_plugin +GH_TUPLE= FriendsOfCake:crud:0bd63fb: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 USE_PHP= json pdo_mysql session gd sockets ctype opcache openssl hash @@ -96,11 +96,6 @@ RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FL PKGMESSAGE= ${WRKDIR}/pkg-message -post-extract: - ${CP} -R ${WRKSRC_crud}/* ${WRKSRC}/web/api/app/Plugin/Crud - ${CP} -R ${WRKSRC_crud_plugin}/* ${WRKSRC}/web/api/app/Plugin/CakePHP-Enum-Behavior - ${REINPLACE_CMD} -e 's|/dev/shm|/tmp|g' ${WRKSRC}/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in - post-patch: # Avoid conflict with C++20 by adding .txt suffix @${MV} ${WRKSRC}/version ${WRKSRC}/version.txt @@ -117,4 +112,10 @@ pre-install: ${MKDIR} ${STAGEDIR}/var/run/zm ${MKDIR} ${STAGEDIR}/var/tmp/zm +post-install: # zmsystemctl.pl is only for systend-based systems + @cd ${STAGEDIR}${PREFIX} && \ + ${RM} \ + bin/zmsystemctl.pl \ + man/man8/zmsystemctl.pl.8.gz + .include diff --git a/multimedia/zoneminder/distinfo b/multimedia/zoneminder/distinfo index 6ce050711ff2..37613e2db517 100644 --- a/multimedia/zoneminder/distinfo +++ b/multimedia/zoneminder/distinfo @@ -1,7 +1,9 @@ -TIMESTAMP = 1602237427 -SHA256 (zoneminder-zoneminder-1.34.21_GH0.tar.gz) = 3abb0b92ffd4bf109f6a8f60e2e7196f304e8b7caf8e24c3fe4d2041696c5310 -SIZE (zoneminder-zoneminder-1.34.21_GH0.tar.gz) = 10406006 -SHA256 (zoneminder-crud-0bd63fb_GH0.tar.gz) = d4c82d714ea74606726d11be973b17d3f9b57ad6c6559e1a29affa60c6f3a579 -SIZE (zoneminder-crud-0bd63fb_GH0.tar.gz) = 73129 -SHA256 (zoneminder-CakePHP-Enum-Behavior-ea90c0c_GH0.tar.gz) = 3a9006c7c59f2b864ce628df4725b241fc23cfd9abc56e746acbd22d850f5ab1 -SIZE (zoneminder-CakePHP-Enum-Behavior-ea90c0c_GH0.tar.gz) = 3500 +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 +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 diff --git a/multimedia/zoneminder/pkg-plist b/multimedia/zoneminder/pkg-plist index 01516eaaacba..9231958f10da 100644 --- a/multimedia/zoneminder/pkg-plist +++ b/multimedia/zoneminder/pkg-plist @@ -1,4 +1,4 @@ -bin/zma +bin/zm_rtsp_server bin/zmaudit.pl bin/zmc bin/zmcamtool.pl @@ -6,6 +6,7 @@ bin/zmcontrol.pl bin/zmdc.pl bin/zmfilter.pl bin/zmonvif-probe.pl +bin/zmonvif-trigger.pl bin/zmpkg.pl bin/zmrecover.pl bin/zmstats.pl @@ -2841,6 +2842,66 @@ etc/zm.conf %%SITE_PERL%%/WSDiscovery10/Types/ServiceNameType.pm %%SITE_PERL%%/WSDiscovery10/Types/SigType.pm %%SITE_PERL%%/WSDiscovery10/Types/UriListType.pm +%%SITE_PERL%%/WSDiscovery11/Attributes/Id.pm +%%SITE_PERL%%/WSDiscovery11/Attributes/IsReferenceParameter.pm +%%SITE_PERL%%/WSDiscovery11/Elements/Action.pm +%%SITE_PERL%%/WSDiscovery11/Elements/AppSequence.pm +%%SITE_PERL%%/WSDiscovery11/Elements/Bye.pm +%%SITE_PERL%%/WSDiscovery11/Elements/EndpointReference.pm +%%SITE_PERL%%/WSDiscovery11/Elements/FaultTo.pm +%%SITE_PERL%%/WSDiscovery11/Elements/From.pm +%%SITE_PERL%%/WSDiscovery11/Elements/Hello.pm +%%SITE_PERL%%/WSDiscovery11/Elements/MessageID.pm +%%SITE_PERL%%/WSDiscovery11/Elements/Metadata.pm +%%SITE_PERL%%/WSDiscovery11/Elements/MetadataVersion.pm +%%SITE_PERL%%/WSDiscovery11/Elements/Probe.pm +%%SITE_PERL%%/WSDiscovery11/Elements/ProbeMatches.pm +%%SITE_PERL%%/WSDiscovery11/Elements/ProblemAction.pm +%%SITE_PERL%%/WSDiscovery11/Elements/ProblemHeaderQName.pm +%%SITE_PERL%%/WSDiscovery11/Elements/ProblemIRI.pm +%%SITE_PERL%%/WSDiscovery11/Elements/ReferenceParameters.pm +%%SITE_PERL%%/WSDiscovery11/Elements/RelatesTo.pm +%%SITE_PERL%%/WSDiscovery11/Elements/ReplyTo.pm +%%SITE_PERL%%/WSDiscovery11/Elements/Resolve.pm +%%SITE_PERL%%/WSDiscovery11/Elements/ResolveMatches.pm +%%SITE_PERL%%/WSDiscovery11/Elements/RetryAfter.pm +%%SITE_PERL%%/WSDiscovery11/Elements/Scopes.pm +%%SITE_PERL%%/WSDiscovery11/Elements/Security.pm +%%SITE_PERL%%/WSDiscovery11/Elements/Sig.pm +%%SITE_PERL%%/WSDiscovery11/Elements/SupportedMatchingRules.pm +%%SITE_PERL%%/WSDiscovery11/Elements/To.pm +%%SITE_PERL%%/WSDiscovery11/Elements/Types.pm +%%SITE_PERL%%/WSDiscovery11/Elements/XAddrs.pm +%%SITE_PERL%%/WSDiscovery11/Interfaces/WSDiscovery/WSDiscoveryPort.pm +%%SITE_PERL%%/WSDiscovery11/Typemaps/WSDiscovery.pm +%%SITE_PERL%%/WSDiscovery11/Types/AppSequenceType.pm +%%SITE_PERL%%/WSDiscovery11/Types/AttributedQNameType.pm +%%SITE_PERL%%/WSDiscovery11/Types/AttributedURIType.pm +%%SITE_PERL%%/WSDiscovery11/Types/AttributedUnsignedLongType.pm +%%SITE_PERL%%/WSDiscovery11/Types/ByeType.pm +%%SITE_PERL%%/WSDiscovery11/Types/EndpointReferenceType.pm +%%SITE_PERL%%/WSDiscovery11/Types/FaultCodeOpenType.pm +%%SITE_PERL%%/WSDiscovery11/Types/FaultCodeType.pm +%%SITE_PERL%%/WSDiscovery11/Types/FaultCodesOpenEnumType.pm +%%SITE_PERL%%/WSDiscovery11/Types/FaultCodesType.pm +%%SITE_PERL%%/WSDiscovery11/Types/HelloType.pm +%%SITE_PERL%%/WSDiscovery11/Types/MetadataType.pm +%%SITE_PERL%%/WSDiscovery11/Types/ProbeMatchType.pm +%%SITE_PERL%%/WSDiscovery11/Types/ProbeMatchesType.pm +%%SITE_PERL%%/WSDiscovery11/Types/ProbeType.pm +%%SITE_PERL%%/WSDiscovery11/Types/ProblemActionType.pm +%%SITE_PERL%%/WSDiscovery11/Types/QNameListType.pm +%%SITE_PERL%%/WSDiscovery11/Types/ReferenceParametersType.pm +%%SITE_PERL%%/WSDiscovery11/Types/RelatesToType.pm +%%SITE_PERL%%/WSDiscovery11/Types/RelationshipType.pm +%%SITE_PERL%%/WSDiscovery11/Types/RelationshipTypeOpenEnum.pm +%%SITE_PERL%%/WSDiscovery11/Types/ResolveMatchType.pm +%%SITE_PERL%%/WSDiscovery11/Types/ResolveMatchesType.pm +%%SITE_PERL%%/WSDiscovery11/Types/ResolveType.pm +%%SITE_PERL%%/WSDiscovery11/Types/ScopesType.pm +%%SITE_PERL%%/WSDiscovery11/Types/SecurityType.pm +%%SITE_PERL%%/WSDiscovery11/Types/SigType.pm +%%SITE_PERL%%/WSDiscovery11/Types/UriListType.pm %%SITE_PERL%%/WSNotification/Attributes/IsReferenceParameter.pm %%SITE_PERL%%/WSNotification/Attributes/base.pm %%SITE_PERL%%/WSNotification/Attributes/id.pm @@ -2995,6 +3056,7 @@ etc/zm.conf %%SITE_PERL%%/ZoneMinder/Control/FI9831W.pm %%SITE_PERL%%/ZoneMinder/Control/FOSCAMR2C.pm %%SITE_PERL%%/ZoneMinder/Control/Floureon.pm +%%SITE_PERL%%/ZoneMinder/Control/FoscamCGI.pm %%SITE_PERL%%/ZoneMinder/Control/HikVision.pm %%SITE_PERL%%/ZoneMinder/Control/IPCAMIOS.pm %%SITE_PERL%%/ZoneMinder/Control/IPCC7210W.pm @@ -3030,6 +3092,7 @@ etc/zm.conf %%SITE_PERL%%/ZoneMinder/Memory/Mapped.pm %%SITE_PERL%%/ZoneMinder/Memory/Shared.pm %%SITE_PERL%%/ZoneMinder/Monitor.pm +%%SITE_PERL%%/ZoneMinder/Monitor_Status.pm %%SITE_PERL%%/ZoneMinder/ONVIF.pm %%SITE_PERL%%/ZoneMinder/Object.pm %%SITE_PERL%%/ZoneMinder/Server.pm @@ -3043,6 +3106,8 @@ etc/zm.conf %%SITE_PERL%%/ZoneMinder/Trigger/Channel/Unix.pm %%SITE_PERL%%/ZoneMinder/Trigger/Connection.pm %%SITE_PERL%%/ZoneMinder/Trigger/Connection/Example.pm +%%SITE_PERL%%/ZoneMinder/User.pm +%%SITE_PERL%%/ZoneMinder/Zone.pm %%PERL5_MAN3%%/ONVIF::Analytics::Attributes::actor.3.gz %%PERL5_MAN3%%/ONVIF::Analytics::Attributes::contentType.3.gz %%PERL5_MAN3%%/ONVIF::Analytics::Attributes::encodingStyle.3.gz @@ -5856,6 +5921,66 @@ etc/zm.conf %%PERL5_MAN3%%/WSDiscovery10::Types::ServiceNameType.3.gz %%PERL5_MAN3%%/WSDiscovery10::Types::SigType.3.gz %%PERL5_MAN3%%/WSDiscovery10::Types::UriListType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Attributes::Id.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Attributes::IsReferenceParameter.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::Action.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::AppSequence.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::Bye.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::EndpointReference.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::FaultTo.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::From.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::Hello.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::MessageID.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::Metadata.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::MetadataVersion.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::Probe.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::ProbeMatches.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::ProblemAction.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::ProblemHeaderQName.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::ProblemIRI.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::ReferenceParameters.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::RelatesTo.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::ReplyTo.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::Resolve.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::ResolveMatches.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::RetryAfter.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::Scopes.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::Security.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::Sig.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::SupportedMatchingRules.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::To.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::Types.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Elements::XAddrs.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Interfaces::WSDiscovery::WSDiscoveryPort.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Typemaps::WSDiscovery.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::AppSequenceType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::AttributedQNameType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::AttributedURIType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::AttributedUnsignedLongType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::ByeType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::EndpointReferenceType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::FaultCodeOpenType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::FaultCodeType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::FaultCodesOpenEnumType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::FaultCodesType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::HelloType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::MetadataType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::ProbeMatchType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::ProbeMatchesType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::ProbeType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::ProblemActionType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::QNameListType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::ReferenceParametersType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::RelatesToType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::RelationshipType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::RelationshipTypeOpenEnum.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::ResolveMatchType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::ResolveMatchesType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::ResolveType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::ScopesType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::SecurityType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::SigType.3.gz +%%PERL5_MAN3%%/WSDiscovery11::Types::UriListType.3.gz %%PERL5_MAN3%%/WSNotification::Attributes::IsReferenceParameter.3.gz %%PERL5_MAN3%%/WSNotification::Attributes::base.3.gz %%PERL5_MAN3%%/WSNotification::Attributes::id.3.gz @@ -6033,6 +6158,7 @@ etc/zm.conf %%PERL5_MAN3%%/ZoneMinder::Logger.3.gz %%PERL5_MAN3%%/ZoneMinder::Memory.3.gz %%PERL5_MAN3%%/ZoneMinder::Monitor.3.gz +%%PERL5_MAN3%%/ZoneMinder::Monitor_Status.3.gz %%PERL5_MAN3%%/ZoneMinder::ONVIF.3.gz %%PERL5_MAN3%%/ZoneMinder::Object.3.gz %%PERL5_MAN3%%/ZoneMinder::Server.3.gz @@ -6046,27 +6172,30 @@ etc/zm.conf %%PERL5_MAN3%%/ZoneMinder::Trigger::Channel::Unix.3.gz %%PERL5_MAN3%%/ZoneMinder::Trigger::Connection.3.gz %%PERL5_MAN3%%/ZoneMinder::Trigger::Connection::Example.3.gz -man/man8/zoneminder-zma.8.gz -man/man8/zoneminder-zmaudit.pl.8.gz -man/man8/zoneminder-zmc.8.gz -man/man8/zoneminder-zmcamtool.pl.8.gz -man/man8/zoneminder-zmcontrol.pl.8.gz -man/man8/zoneminder-zmdc.pl.8.gz -man/man8/zoneminder-zmfilter.pl.8.gz -man/man8/zoneminder-zmonvif-probe.pl.8.gz -man/man8/zoneminder-zmpkg.pl.8.gz -man/man8/zoneminder-zmrecover.pl.8.gz -man/man8/zoneminder-zmstats.pl.8.gz -man/man8/zoneminder-zmsystemctl.pl.8.gz -man/man8/zoneminder-zmtelemetry.pl.8.gz -man/man8/zoneminder-zmtrack.pl.8.gz -man/man8/zoneminder-zmtrigger.pl.8.gz -man/man8/zoneminder-zmu.8.gz -man/man8/zoneminder-zmupdate.pl.8.gz -man/man8/zoneminder-zmvideo.pl.8.gz -man/man8/zoneminder-zmwatch.pl.8.gz -man/man8/zoneminder-zmx10.pl.8.gz +%%PERL5_MAN3%%/ZoneMinder::User.3.gz +%%PERL5_MAN3%%/ZoneMinder::Zone.3.gz +man/man8/zmaudit.pl.8.gz +man/man8/zmc.8.gz +man/man8/zmcamtool.pl.8.gz +man/man8/zmcontrol.pl.8.gz +man/man8/zmdc.pl.8.gz +man/man8/zmfilter.pl.8.gz +man/man8/zmonvif-probe.pl.8.gz +man/man8/zmonvif-trigger.pl.8.gz +man/man8/zmpkg.pl.8.gz +man/man8/zmrecover.pl.8.gz +man/man8/zmstats.pl.8.gz +man/man8/zmtelemetry.pl.8.gz +man/man8/zmtrack.pl.8.gz +man/man8/zmtrigger.pl.8.gz +man/man8/zmu.8.gz +man/man8/zmupdate.pl.8.gz +man/man8/zmvideo.pl.8.gz +man/man8/zmwatch.pl.8.gz +man/man8/zmx10.pl.8.gz share/applications/zoneminder.desktop +share/polkit-1/actions/com.zoneminder.systemctl.policy +share/polkit-1/rules.d/com.zoneminder.systemctl.rules %%DATADIR%%/db/triggers.sql %%DATADIR%%/db/zm_create.sql %%DATADIR%%/db/zm_update-0.0.1.sql @@ -6115,7 +6244,6 @@ share/applications/zoneminder.desktop %%DATADIR%%/db/zm_update-1.26.3.sql %%DATADIR%%/db/zm_update-1.26.5.sql %%DATADIR%%/db/zm_update-1.27.0.sql -%%DATADIR%%/db/zm_update-1.27.99.0.sql %%DATADIR%%/db/zm_update-1.28.0.sql %%DATADIR%%/db/zm_update-1.28.1.sql %%DATADIR%%/db/zm_update-1.28.100.sql @@ -6214,15 +6342,75 @@ share/applications/zoneminder.desktop %%DATADIR%%/db/zm_update-1.34.5.sql %%DATADIR%%/db/zm_update-1.34.6.sql %%DATADIR%%/db/zm_update-1.34.7.sql +%%DATADIR%%/db/zm_update-1.35.0.sql +%%DATADIR%%/db/zm_update-1.35.1.sql +%%DATADIR%%/db/zm_update-1.35.10.sql +%%DATADIR%%/db/zm_update-1.35.11.sql +%%DATADIR%%/db/zm_update-1.35.12.sql +%%DATADIR%%/db/zm_update-1.35.13.sql +%%DATADIR%%/db/zm_update-1.35.14.sql +%%DATADIR%%/db/zm_update-1.35.15.sql +%%DATADIR%%/db/zm_update-1.35.16.sql +%%DATADIR%%/db/zm_update-1.35.17.sql +%%DATADIR%%/db/zm_update-1.35.18.sql +%%DATADIR%%/db/zm_update-1.35.19.sql +%%DATADIR%%/db/zm_update-1.35.2.sql +%%DATADIR%%/db/zm_update-1.35.20.sql +%%DATADIR%%/db/zm_update-1.35.21.sql +%%DATADIR%%/db/zm_update-1.35.22.sql +%%DATADIR%%/db/zm_update-1.35.23.sql +%%DATADIR%%/db/zm_update-1.35.24.sql +%%DATADIR%%/db/zm_update-1.35.25.sql +%%DATADIR%%/db/zm_update-1.35.26.sql +%%DATADIR%%/db/zm_update-1.35.27.sql +%%DATADIR%%/db/zm_update-1.35.28.sql +%%DATADIR%%/db/zm_update-1.35.3.sql +%%DATADIR%%/db/zm_update-1.35.4.sql +%%DATADIR%%/db/zm_update-1.35.5.sql +%%DATADIR%%/db/zm_update-1.35.6.sql +%%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%%/fonts/default.zmfnt %%DATADIR%%/icons/16x16/icon.xpm %%WWWDIR%%/ajax/add_monitors.php %%WWWDIR%%/ajax/alarm.php %%WWWDIR%%/ajax/console.php %%WWWDIR%%/ajax/control.php +%%WWWDIR%%/ajax/controlcaps.php +%%WWWDIR%%/ajax/device.php +%%WWWDIR%%/ajax/devices.php %%WWWDIR%%/ajax/event.php +%%WWWDIR%%/ajax/events.php +%%WWWDIR%%/ajax/frames.php %%WWWDIR%%/ajax/log.php +%%WWWDIR%%/ajax/modal.php +%%WWWDIR%%/ajax/modals/controlpreset.php +%%WWWDIR%%/ajax/modals/delconfirm.php +%%WWWDIR%%/ajax/modals/device.php +%%WWWDIR%%/ajax/modals/donate.php +%%WWWDIR%%/ajax/modals/download.php +%%WWWDIR%%/ajax/modals/enoperm.php +%%WWWDIR%%/ajax/modals/eventdetail.php +%%WWWDIR%%/ajax/modals/eventrename.php +%%WWWDIR%%/ajax/modals/filterdebug.php +%%WWWDIR%%/ajax/modals/function.php +%%WWWDIR%%/ajax/modals/group.php +%%WWWDIR%%/ajax/modals/log_export.php +%%WWWDIR%%/ajax/modals/logout.php +%%WWWDIR%%/ajax/modals/objdetect.php +%%WWWDIR%%/ajax/modals/optionhelp.php +%%WWWDIR%%/ajax/modals/server.php +%%WWWDIR%%/ajax/modals/settings.php +%%WWWDIR%%/ajax/modals/shutdown.php +%%WWWDIR%%/ajax/modals/state.php +%%WWWDIR%%/ajax/modals/storage.php +%%WWWDIR%%/ajax/shutdown.php +%%WWWDIR%%/ajax/snapshots.php +%%WWWDIR%%/ajax/stats.php %%WWWDIR%%/ajax/status.php %%WWWDIR%%/ajax/stream.php +%%WWWDIR%%/ajax/watch.php %%WWWDIR%%/ajax/zone.php %%WWWDIR%%/api/.editorconfig %%WWWDIR%%/api/CONTRIBUTING.md @@ -6270,6 +6458,7 @@ share/applications/zoneminder.desktop %%WWWDIR%%/api/app/Model/Config.php %%WWWDIR%%/api/app/Model/Control.php %%WWWDIR%%/api/app/Model/Event.php +%%WWWDIR%%/api/app/Model/Event_Summary.php %%WWWDIR%%/api/app/Model/Frame.php %%WWWDIR%%/api/app/Model/Group.php %%WWWDIR%%/api/app/Model/Host.php @@ -6285,6 +6474,9 @@ share/applications/zoneminder.desktop %%WWWDIR%%/api/app/Plugin/CakePHP-Enum-Behavior/Model/Behavior/EnumBehavior.php %%WWWDIR%%/api/app/Plugin/CakePHP-Enum-Behavior/composer.json %%WWWDIR%%/api/app/Plugin/CakePHP-Enum-Behavior/readme.md +%%WWWDIR%%/api/app/Plugin/Crud/.editorconfig +%%WWWDIR%%/api/app/Plugin/Crud/.semver +%%WWWDIR%%/api/app/Plugin/Crud/.travis.yml %%WWWDIR%%/api/app/Plugin/Crud/CONTRIBUTING.md %%WWWDIR%%/api/app/Plugin/Crud/Console/Command/TranslationsShell.php %%WWWDIR%%/api/app/Plugin/Crud/Controller/Component/CrudComponent.php @@ -6398,43 +6590,14 @@ share/applications/zoneminder.desktop %%WWWDIR%%/api/app/View/Servers/xml/edit.ctp %%WWWDIR%%/api/app/View/Servers/xml/index.ctp %%WWWDIR%%/api/app/View/Servers/xml/view.ctp -%%WWWDIR%%/api/app/View/Users/add.ctp +%%WWWDIR%%/api/app/View/Users/json/add.ctp +%%WWWDIR%%/api/app/View/Users/json/edit.ctp %%WWWDIR%%/api/app/View/Users/json/index.ctp %%WWWDIR%%/api/app/View/Users/json/view.ctp -%%WWWDIR%%/api/app/View/Users/login.ctp +%%WWWDIR%%/api/app/View/Users/xml/add.ctp +%%WWWDIR%%/api/app/View/Users/xml/edit.ctp %%WWWDIR%%/api/app/View/Users/xml/index.ctp %%WWWDIR%%/api/app/View/Users/xml/view.ctp -%%WWWDIR%%/api/app/View/View/Configs/json/edit.ctp -%%WWWDIR%%/api/app/View/View/Configs/json/index.ctp -%%WWWDIR%%/api/app/View/View/Configs/json/view.ctp -%%WWWDIR%%/api/app/View/View/Configs/xml/index.ctp -%%WWWDIR%%/api/app/View/View/Configs/xml/view.ctp -%%WWWDIR%%/api/app/View/View/Emails/html/default.ctp -%%WWWDIR%%/api/app/View/View/Emails/text/default.ctp -%%WWWDIR%%/api/app/View/View/Errors/error400.ctp -%%WWWDIR%%/api/app/View/View/Errors/error500.ctp -%%WWWDIR%%/api/app/View/View/Events/json/index.ctp -%%WWWDIR%%/api/app/View/View/Events/json/view.ctp -%%WWWDIR%%/api/app/View/View/Events/xml/index.ctp -%%WWWDIR%%/api/app/View/View/Events/xml/view.ctp -%%WWWDIR%%/api/app/View/View/Helper/AppHelper.php -%%WWWDIR%%/api/app/View/View/Layouts/Emails/html/default.ctp -%%WWWDIR%%/api/app/View/View/Layouts/Emails/text/default.ctp -%%WWWDIR%%/api/app/View/View/Layouts/ajax.ctp -%%WWWDIR%%/api/app/View/View/Layouts/default.ctp -%%WWWDIR%%/api/app/View/View/Layouts/error.ctp -%%WWWDIR%%/api/app/View/View/Layouts/flash.ctp -%%WWWDIR%%/api/app/View/View/Layouts/js/default.ctp -%%WWWDIR%%/api/app/View/View/Layouts/rss/default.ctp -%%WWWDIR%%/api/app/View/View/Layouts/xml/default.ctp -%%WWWDIR%%/api/app/View/View/Logs/json/index.ctp -%%WWWDIR%%/api/app/View/View/Monitors/json/edit.ctp -%%WWWDIR%%/api/app/View/View/Monitors/json/index.ctp -%%WWWDIR%%/api/app/View/View/Monitors/json/view.ctp -%%WWWDIR%%/api/app/View/View/Monitors/xml/edit.ctp -%%WWWDIR%%/api/app/View/View/Monitors/xml/index.ctp -%%WWWDIR%%/api/app/View/View/Monitors/xml/view.ctp -%%WWWDIR%%/api/app/View/View/Pages/home.ctp %%WWWDIR%%/api/app/View/Zones/json/add.ctp %%WWWDIR%%/api/app/View/Zones/json/edit.ctp %%WWWDIR%%/api/app/View/Zones/json/index.ctp @@ -6620,6 +6783,7 @@ share/applications/zoneminder.desktop %%WWWDIR%%/api/lib/Cake/Console/Templates/default/views/form.ctp %%WWWDIR%%/api/lib/Cake/Console/Templates/default/views/index.ctp %%WWWDIR%%/api/lib/Cake/Console/Templates/default/views/view.ctp +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/.htaccess %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.sql %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/Schema/i18n.php @@ -6678,6 +6842,7 @@ share/applications/zoneminder.desktop %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/tmp/logs/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/tmp/sessions/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/tmp/tests/empty +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/.htaccess %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/favicon.ico %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/files/empty @@ -6722,6 +6887,7 @@ share/applications/zoneminder.desktop %%WWWDIR%%/api/lib/Cake/Controller/Component/SessionComponent.php %%WWWDIR%%/api/lib/Cake/Controller/ComponentCollection.php %%WWWDIR%%/api/lib/Cake/Controller/Controller.php +%%WWWDIR%%/api/lib/Cake/Controller/RequestHandlerComponent.php %%WWWDIR%%/api/lib/Cake/Controller/Scaffold.php %%WWWDIR%%/api/lib/Cake/Core/App.php %%WWWDIR%%/api/lib/Cake/Core/CakeObject.php @@ -6856,6 +7022,7 @@ share/applications/zoneminder.desktop %%WWWDIR%%/api/lib/Cake/Test/Case/Console/ShellDispatcherTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Console/ShellTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Console/TaskCollectionTest.php +%%WWWDIR%%/api/lib/Cake/Test/Case/Controller/ApplicationControllerTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Controller/Component/Acl/IniAclTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Controller/Component/Acl/PhpAclTest.php @@ -7537,15 +7704,21 @@ share/applications/zoneminder.desktop %%WWWDIR%%/api/lib/Cake/bootstrap.php %%WWWDIR%%/cgi-bin/nph-zms %%WWWDIR%%/cgi-bin/zms +%%WWWDIR%%/css/bootstrap-table-page-jump-to.min.css +%%WWWDIR%%/css/bootstrap-table.min.css %%WWWDIR%%/css/bootstrap.min.css -%%WWWDIR%%/css/bootstrap.min.css.map -%%WWWDIR%%/css/overlay.css +%%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 +%%WWWDIR%%/fonts/fontawesome-webfont.woff +%%WWWDIR%%/fonts/fontawesome-webfont.woff2 %%WWWDIR%%/fonts/glyphicons-halflings-regular.eot %%WWWDIR%%/fonts/glyphicons-halflings-regular.svg %%WWWDIR%%/fonts/glyphicons-halflings-regular.ttf @@ -7558,13 +7731,17 @@ share/applications/zoneminder.desktop %%WWWDIR%%/includes/Control.php %%WWWDIR%%/includes/Event.php %%WWWDIR%%/includes/Filter.php +%%WWWDIR%%/includes/FilterTerm.php %%WWWDIR%%/includes/Frame.php %%WWWDIR%%/includes/Group.php +%%WWWDIR%%/includes/Group_Monitor.php %%WWWDIR%%/includes/Monitor.php %%WWWDIR%%/includes/MontageLayout.php %%WWWDIR%%/includes/Object.php %%WWWDIR%%/includes/Server.php +%%WWWDIR%%/includes/Snapshot.php %%WWWDIR%%/includes/Storage.php +%%WWWDIR%%/includes/User.php %%WWWDIR%%/includes/Zone.php %%WWWDIR%%/includes/actions/bandwidth.php %%WWWDIR%%/includes/actions/console.php @@ -7590,7 +7767,7 @@ share/applications/zoneminder.desktop %%WWWDIR%%/includes/actions/privacy.php %%WWWDIR%%/includes/actions/server.php %%WWWDIR%%/includes/actions/settings.php -%%WWWDIR%%/includes/actions/shutdown.php +%%WWWDIR%%/includes/actions/snapshot.php %%WWWDIR%%/includes/actions/state.php %%WWWDIR%%/includes/actions/storage.php %%WWWDIR%%/includes/actions/user.php @@ -7611,14 +7788,12 @@ share/applications/zoneminder.desktop %%WWWDIR%%/includes/logger.php %%WWWDIR%%/includes/session.php %%WWWDIR%%/index.php +%%WWWDIR%%/js/MonitorStream.js %%WWWDIR%%/js/Server.js %%WWWDIR%%/js/logger.js -%%WWWDIR%%/js/mootools.ext.js -%%WWWDIR%%/js/overlay.js %%WWWDIR%%/js/videojs.zoomrotate.js %%WWWDIR%%/lang/ba_ba.php %%WWWDIR%%/lang/big5_big5.php -%%WWWDIR%%/lang/cn_zh.php %%WWWDIR%%/lang/cs_cz.php %%WWWDIR%%/lang/de_de.php %%WWWDIR%%/lang/default.php @@ -7640,6 +7815,8 @@ share/applications/zoneminder.desktop %%WWWDIR%%/lang/ru_ru.php %%WWWDIR%%/lang/se_se.php %%WWWDIR%%/lang/updateLangs.php +%%WWWDIR%%/lang/zh_cn.php +%%WWWDIR%%/lang/zh_tw.php %%WWWDIR%%/robots.txt %%WWWDIR%%/skins/classic/css/base/export.css %%WWWDIR%%/skins/classic/css/base/skin.css @@ -7647,6 +7824,7 @@ share/applications/zoneminder.desktop %%WWWDIR%%/skins/classic/css/base/views/control.css %%WWWDIR%%/skins/classic/css/base/views/controlcap.css %%WWWDIR%%/skins/classic/css/base/views/controlcaps.css +%%WWWDIR%%/skins/classic/css/base/views/cycle.css %%WWWDIR%%/skins/classic/css/base/views/devices.css %%WWWDIR%%/skins/classic/css/base/views/download.css %%WWWDIR%%/skins/classic/css/base/views/event.css @@ -7670,10 +7848,14 @@ share/applications/zoneminder.desktop %%WWWDIR%%/skins/classic/css/base/views/plugin.css %%WWWDIR%%/skins/classic/css/base/views/privacy.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 +%%WWWDIR%%/skins/classic/css/base/views/snapshots.css %%WWWDIR%%/skins/classic/css/base/views/stats.css %%WWWDIR%%/skins/classic/css/base/views/storage.css %%WWWDIR%%/skins/classic/css/base/views/timeline.css %%WWWDIR%%/skins/classic/css/base/views/timeline.css.php +%%WWWDIR%%/skins/classic/css/base/views/user.css %%WWWDIR%%/skins/classic/css/base/views/video.css %%WWWDIR%%/skins/classic/css/base/views/watch.css %%WWWDIR%%/skins/classic/css/base/views/zone.css @@ -7775,7 +7957,15 @@ share/applications/zoneminder.desktop %%WWWDIR%%/skins/classic/includes/export_functions.php %%WWWDIR%%/skins/classic/includes/functions.php %%WWWDIR%%/skins/classic/includes/timeline_functions.php -%%WWWDIR%%/skins/classic/js/base.js +%%WWWDIR%%/skins/classic/js/bootstrap-table-auto-refresh.min.js +%%WWWDIR%%/skins/classic/js/bootstrap-table-cookie.min.js +%%WWWDIR%%/skins/classic/js/bootstrap-table-export.min.js +%%WWWDIR%%/skins/classic/js/bootstrap-table-locale-all.min.js +%%WWWDIR%%/skins/classic/js/bootstrap-table-page-jump-to.min.js +%%WWWDIR%%/skins/classic/js/bootstrap-table-toolbar.min.js +%%WWWDIR%%/skins/classic/js/bootstrap-table.min.js +%%WWWDIR%%/skins/classic/js/bootstrap.bundle.js.map +%%WWWDIR%%/skins/classic/js/bootstrap.bundle.min.js %%WWWDIR%%/skins/classic/js/bootstrap.js %%WWWDIR%%/skins/classic/js/bootstrap.js.URL %%WWWDIR%%/skins/classic/js/bootstrap.min.js @@ -7785,13 +7975,13 @@ share/applications/zoneminder.desktop %%WWWDIR%%/skins/classic/js/chosen/chosen.jquery.js %%WWWDIR%%/skins/classic/js/chosen/chosen.jquery.min.js %%WWWDIR%%/skins/classic/js/chosen/chosen.min.css -%%WWWDIR%%/skins/classic/js/classic.js %%WWWDIR%%/skins/classic/js/dateTimePicker/jquery-ui-timepicker-addon.css %%WWWDIR%%/skins/classic/js/dateTimePicker/jquery-ui-timepicker-addon.js %%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-2.2.4.js +%%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 @@ -7812,13 +8002,14 @@ share/applications/zoneminder.desktop %%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.js -%%WWWDIR%%/skins/classic/js/jquery.js.URL +%%WWWDIR%%/skins/classic/js/jquery.min.js +%%WWWDIR%%/skins/classic/js/jquery.min.js.URL %%WWWDIR%%/skins/classic/js/moment.js %%WWWDIR%%/skins/classic/js/moment.js.URL %%WWWDIR%%/skins/classic/js/moment.min.js %%WWWDIR%%/skins/classic/js/skin.js %%WWWDIR%%/skins/classic/js/skin.js.php +%%WWWDIR%%/skins/classic/js/tableExport.min.js %%WWWDIR%%/skins/classic/js/video-js-skin.css %%WWWDIR%%/skins/classic/js/video-js.css %%WWWDIR%%/skins/classic/js/video-js.css.URL @@ -7835,37 +8026,25 @@ share/applications/zoneminder.desktop %%WWWDIR%%/skins/classic/views/control.php %%WWWDIR%%/skins/classic/views/controlcap.php %%WWWDIR%%/skins/classic/views/controlcaps.php -%%WWWDIR%%/skins/classic/views/controlpreset.php %%WWWDIR%%/skins/classic/views/cycle.php -%%WWWDIR%%/skins/classic/views/device.php %%WWWDIR%%/skins/classic/views/devices.php -%%WWWDIR%%/skins/classic/views/donate.php -%%WWWDIR%%/skins/classic/views/download.php %%WWWDIR%%/skins/classic/views/error.php %%WWWDIR%%/skins/classic/views/event.php -%%WWWDIR%%/skins/classic/views/eventdetail.php %%WWWDIR%%/skins/classic/views/events.php %%WWWDIR%%/skins/classic/views/export.php %%WWWDIR%%/skins/classic/views/filter.php %%WWWDIR%%/skins/classic/views/frame.php %%WWWDIR%%/skins/classic/views/frames.php -%%WWWDIR%%/skins/classic/views/function.php -%%WWWDIR%%/skins/classic/views/group.php %%WWWDIR%%/skins/classic/views/groups.php %%WWWDIR%%/skins/classic/views/js/add_monitors.js %%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/controlcap.js -%%WWWDIR%%/skins/classic/views/js/controlpreset.js -%%WWWDIR%%/skins/classic/views/js/controlpreset.js.php +%%WWWDIR%%/skins/classic/views/js/controlcaps.js %%WWWDIR%%/skins/classic/views/js/cycle.js %%WWWDIR%%/skins/classic/views/js/cycle.js.php %%WWWDIR%%/skins/classic/views/js/devices.js -%%WWWDIR%%/skins/classic/views/js/donate.js -%%WWWDIR%%/skins/classic/views/js/donate.js.php -%%WWWDIR%%/skins/classic/views/js/download.js -%%WWWDIR%%/skins/classic/views/js/download.js.php %%WWWDIR%%/skins/classic/views/js/event.js %%WWWDIR%%/skins/classic/views/js/event.js.php %%WWWDIR%%/skins/classic/views/js/events.js @@ -7876,7 +8055,8 @@ share/applications/zoneminder.desktop %%WWWDIR%%/skins/classic/views/js/filter.js.php %%WWWDIR%%/skins/classic/views/js/frame.js %%WWWDIR%%/skins/classic/views/js/frame.js.php -%%WWWDIR%%/skins/classic/views/js/group.js +%%WWWDIR%%/skins/classic/views/js/frames.js +%%WWWDIR%%/skins/classic/views/js/frames.js.php %%WWWDIR%%/skins/classic/views/js/groups.js %%WWWDIR%%/skins/classic/views/js/log.js %%WWWDIR%%/skins/classic/views/js/login.js @@ -7890,19 +8070,22 @@ share/applications/zoneminder.desktop %%WWWDIR%%/skins/classic/views/js/montagereview.js %%WWWDIR%%/skins/classic/views/js/montagereview.js.php %%WWWDIR%%/skins/classic/views/js/onvifprobe.js +%%WWWDIR%%/skins/classic/views/js/options.js %%WWWDIR%%/skins/classic/views/js/options.js.php %%WWWDIR%%/skins/classic/views/js/plugin.js +%%WWWDIR%%/skins/classic/views/js/postlogin.js %%WWWDIR%%/skins/classic/views/js/postlogin.js.php %%WWWDIR%%/skins/classic/views/js/report_event_audit.js %%WWWDIR%%/skins/classic/views/js/server.js -%%WWWDIR%%/skins/classic/views/js/state.js -%%WWWDIR%%/skins/classic/views/js/state.js.php +%%WWWDIR%%/skins/classic/views/js/snapshot.js +%%WWWDIR%%/skins/classic/views/js/snapshot.js.php +%%WWWDIR%%/skins/classic/views/js/snapshots.js +%%WWWDIR%%/skins/classic/views/js/snapshots.js.php +%%WWWDIR%%/skins/classic/views/js/stats.js %%WWWDIR%%/skins/classic/views/js/storage.js %%WWWDIR%%/skins/classic/views/js/timeline.js %%WWWDIR%%/skins/classic/views/js/timeline.js.php %%WWWDIR%%/skins/classic/views/js/user.js -%%WWWDIR%%/skins/classic/views/js/version.js -%%WWWDIR%%/skins/classic/views/js/version.js.php %%WWWDIR%%/skins/classic/views/js/video.js %%WWWDIR%%/skins/classic/views/js/video.js.php %%WWWDIR%%/skins/classic/views/js/watch.js @@ -7913,7 +8096,6 @@ share/applications/zoneminder.desktop %%WWWDIR%%/skins/classic/views/js/zones.js.php %%WWWDIR%%/skins/classic/views/log.php %%WWWDIR%%/skins/classic/views/login.php -%%WWWDIR%%/skins/classic/views/logout.php %%WWWDIR%%/skins/classic/views/monitor.php %%WWWDIR%%/skins/classic/views/monitorpreset.php %%WWWDIR%%/skins/classic/views/monitorprobe.php @@ -7928,25 +8110,16 @@ share/applications/zoneminder.desktop %%WWWDIR%%/skins/classic/views/postlogin.php %%WWWDIR%%/skins/classic/views/privacy.php %%WWWDIR%%/skins/classic/views/report_event_audit.php -%%WWWDIR%%/skins/classic/views/server.php -%%WWWDIR%%/skins/classic/views/settings.php -%%WWWDIR%%/skins/classic/views/shutdown.php -%%WWWDIR%%/skins/classic/views/state.php +%%WWWDIR%%/skins/classic/views/snapshot.php +%%WWWDIR%%/skins/classic/views/snapshots.php %%WWWDIR%%/skins/classic/views/stats.php %%WWWDIR%%/skins/classic/views/status.php -%%WWWDIR%%/skins/classic/views/storage.php %%WWWDIR%%/skins/classic/views/timeline.php %%WWWDIR%%/skins/classic/views/user.php -%%WWWDIR%%/skins/classic/views/version.php %%WWWDIR%%/skins/classic/views/video.php %%WWWDIR%%/skins/classic/views/watch.php %%WWWDIR%%/skins/classic/views/zone.php %%WWWDIR%%/skins/classic/views/zones.php -%%WWWDIR%%/tools/mootools/mootools-core-1.6.0-compat.js -%%WWWDIR%%/tools/mootools/mootools-core-compat.js.URL -%%WWWDIR%%/tools/mootools/mootools-core.js -%%WWWDIR%%/tools/mootools/mootools-more-1.6.0.js -%%WWWDIR%%/tools/mootools/mootools-more.js %%WWWDIR%%/vendor/autoload.php %%WWWDIR%%/vendor/composer/ClassLoader.php %%WWWDIR%%/vendor/composer/LICENSE @@ -7970,6 +8143,7 @@ share/applications/zoneminder.desktop %%WWWDIR%%/vendor/ircmaxell/password-compat/version-test.php %%WWWDIR%%/views/archive.php %%WWWDIR%%/views/image.php +%%WWWDIR%%/views/no_database_connection.php %%WWWDIR%%/views/view_video.php @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/api/app/tmp @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/temp diff --git a/multimedia/zoneminder/files/patch-src_zm__local__camera.cpp b/multimedia/zoneminder/files/patch-src_zm__local__camera.cpp new file mode 100644 index 000000000000..6148f7585ee2 --- /dev/null +++ b/multimedia/zoneminder/files/patch-src_zm__local__camera.cpp @@ -0,0 +1,12 @@ +- 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 +