Attachment #211275 for bug #243795

Lines 1-8 Link Here

(-)b/multimedia/zoneminder/Makefile (-9 / +12 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= zoneminder	3	PORTNAME= zoneminder
4	PORTVERSION= 1.32.3	4	PORTVERSION= 1.34.1
5	PORTREVISION= 5
6	CATEGORIES= multimedia	5	CATEGORIES= multimedia
7		6
8	MAINTAINER= bsd@abinet.ru	7	MAINTAINER= bsd@abinet.ru
Lines 10-16 COMMENT= Complete security camera solution, fully web based with image analysis Link Here
10		9
11	LICENSE= GPLv2	10	LICENSE= GPLv2
12		11
13	ONLY_FOR_ARCHS= amd64 i386	12	ONLY_FOR_ARCHS= amd64 i386 aarch64
14		13
15	ZM_DEPENDS= p5-DBI>=0:databases/p5-DBI \	14	ZM_DEPENDS= p5-DBI>=0:databases/p5-DBI \
16	p5-DBD-mysql>=0:databases/p5-DBD-mysql \	15	p5-DBD-mysql>=0:databases/p5-DBD-mysql \
Lines 34-39 LIB_DEPENDS= libx264.so:multimedia/libx264 \ Link Here
34	RUN_DEPENDS= ${ZM_DEPENDS} \	33	RUN_DEPENDS= ${ZM_DEPENDS} \
35	sudo:security/sudo \	34	sudo:security/sudo \
36	p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \	35	p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \
		36	p5-Crypt-Eksblowfish>=0:security/p5-Crypt-Eksblowfish \
		37	p5-Data-Entropy>=0:security/p5-Data-Entropy \
37	zip:archivers/zip	38	zip:archivers/zip
38		39
39	USES= cmake:insource,noninja jpeg mysql perl5 php shebangfix ssl	40	USES= cmake:insource,noninja jpeg mysql perl5 php shebangfix ssl
Lines 42-50 GH_PROJECT= zoneminder Link Here
42	GH_TUPLE= zoneminder:crud:0bd63fb:crud \	43	GH_TUPLE= zoneminder:crud:0bd63fb:crud \
43	zoneminder:CakePHP-Enum-Behavior:ea90c0c:crud_plugin	44	zoneminder:CakePHP-Enum-Behavior:ea90c0c:crud_plugin
44	USE_RC_SUBR= zoneminder	45	USE_RC_SUBR= zoneminder
45	USE_PHP= json pdo_mysql session gd sockets ctype opcache	46	USE_PHP= json pdo_mysql session gd sockets ctype opcache openssl hash
46
47	CONFLICTS_INSTALL= zoneminder-h264
48		47
49	OPTIONS_DEFINE= NLS V4L DOCS	48	OPTIONS_DEFINE= NLS V4L DOCS
50	OPTIONS_SUB= yes	49	OPTIONS_SUB= yes
Lines 69-77 SHEBANG_FILES= scripts/zmaudit.pl.in \ Link Here
69	scripts/zmvideo.pl.in \	68	scripts/zmvideo.pl.in \
70	scripts/zmwatch.pl.in \	69	scripts/zmwatch.pl.in \
71	scripts/zmx10.pl.in \	70	scripts/zmx10.pl.in \
72	scripts/zmonvif-probe.pl.in	71	scripts/zmonvif-probe.pl.in \
		72	scripts/zmrecover.pl.in
73		73
74	PORTDOCS= AUTHORS BUGS ChangeLog INSTALL NEWS README.FreeBSD TODO	74	PORTDOCS= README.FreeBSD
75		75
76	CMAKE_ARGS+= -DZM_PERL_MM_PARMS=INSTALLDIRS=site \	76	CMAKE_ARGS+= -DZM_PERL_MM_PARMS=INSTALLDIRS=site \
77	-DZM_CONFIG_DIR=${PREFIX}/etc \	77	-DZM_CONFIG_DIR=${PREFIX}/etc \
Lines 90-95 CMAKE_ARGS+= -DZM_PERL_MM_PARMS=INSTALLDIRS=site \ Link Here
90		90
91	.include <bsd.port.pre.mk>	91	.include <bsd.port.pre.mk>
92		92
		93	.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1200000
		94	EXTRA_PATCHES= ${PATCHDIR}/extra-patch-CMakeLists.txt
		95	.endif
		96
93	RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR}	97	RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR}
94		98
95	PKGMESSAGE= ${WRKDIR}/pkg-message	99	PKGMESSAGE= ${WRKDIR}/pkg-message
Lines 100-106 post-extract: Link Here
100	${CP} ${FILESDIR}/README.FreeBSD ${WRKSRC}	104	${CP} ${FILESDIR}/README.FreeBSD ${WRKSRC}
101	${CP} ${FILESDIR}/README.FreeBSD ${PKGMESSAGE}	105	${CP} ${FILESDIR}/README.FreeBSD ${PKGMESSAGE}
102	${REINPLACE_CMD} -e 's\|/dev/shm\|/tmp\|g' ${WRKSRC}/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in	106	${REINPLACE_CMD} -e 's\|/dev/shm\|/tmp\|g' ${WRKSRC}/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
103	# ${REINPLACE_CMD} -e 's\|E_ALL\|E_ALL^E_NOTICE\|g' ${WRKSRC}/web/index.php
104		107
105	post-patch:	108	post-patch:
106	# Avoid conflict with C++20 <version> by adding .txt suffix	109	# Avoid conflict with C++20 <version> by adding .txt suffix

Lines 1-6 Link Here

(-)b/multimedia/zoneminder/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1544308211	1	TIMESTAMP = 1580233018
2	SHA256 (zoneminder-zoneminder-1.32.3_GH0.tar.gz) = 9a7e61c529a6269ff0344403369b160b8c8da48615c4172377c465da0b0074b1	2	SHA256 (zoneminder-zoneminder-1.34.1_GH0.tar.gz) = 3e0f80c0c48e9868bf0aea545482809de89cd498a27abf662e5ae0a246ed731b
3	SIZE (zoneminder-zoneminder-1.32.3_GH0.tar.gz) = 10656921	3	SIZE (zoneminder-zoneminder-1.34.1_GH0.tar.gz) = 10382279
4	SHA256 (zoneminder-crud-0bd63fb_GH0.tar.gz) = d4c82d714ea74606726d11be973b17d3f9b57ad6c6559e1a29affa60c6f3a579	4	SHA256 (zoneminder-crud-0bd63fb_GH0.tar.gz) = d4c82d714ea74606726d11be973b17d3f9b57ad6c6559e1a29affa60c6f3a579
5	SIZE (zoneminder-crud-0bd63fb_GH0.tar.gz) = 73129	5	SIZE (zoneminder-crud-0bd63fb_GH0.tar.gz) = 73129
6	SHA256 (zoneminder-CakePHP-Enum-Behavior-ea90c0c_GH0.tar.gz) = 3a9006c7c59f2b864ce628df4725b241fc23cfd9abc56e746acbd22d850f5ab1	6	SHA256 (zoneminder-CakePHP-Enum-Behavior-ea90c0c_GH0.tar.gz) = 3a9006c7c59f2b864ce628df4725b241fc23cfd9abc56e746acbd22d850f5ab1




3. Start ZoneMinder
	service zoneminder start

Upgrading from www/zoneminder 1.32.x
=====================================================

Before proceeding to upgrade sequence listed above,

1. Connect to mysql server with root and issue
	set global log_bin_trust_function_creators=1;

2. Add write access to www user to /usr/local/etc/zoneminder/zmcustom.conf

3. Take notice, that default monitor files are not under ${WWWDIR} anymore.
	Old setup will work, but as security concideration it is recommended to
	move them to /var/db/zoneminder (default) or to any place not under www root.




--- CMakeLists.txt.orig	2020-01-28 17:16:34.156808000 +0000
+++ CMakeLists.txt
@@ -104,6 +104,9 @@
     ENDIF(ZM_SYSTEM_PROC MATCHES "^arm")
 ENDIF (CMAKE_SYSTEM_NAME MATCHES "Linux")
 
+# FreeBSD 12 contains own bcrypt implementation
+add_definitions(-D__SKIP_GNU)
+
 # Modules that we need:
 include (GNUInstallDirs)
 include (CheckIncludeFile)




--- CMakeLists.txt.orig	2018-10-13 18:36:15 UTC
+++ CMakeLists.txt
@@ -127,7 +127,8 @@ mark_as_advanced( 
     ZM_PATH_ARP 
     ZM_CONFIG_DIR
     ZM_CONFIG_SUBDIR
-    ZM_SYSTEMD)
+    ZM_SYSTEMD
+    ZM_MANPAGE_DEST_PREFIX)
 
 set(ZM_RUNDIR "/var/run/zm" CACHE PATH 
     "Location of transient process files, default: /var/run/zm")
@@ -210,6 +211,10 @@ set(ZM_TARGET_DISTRO "" CACHE STRING 
     "Build ZoneMinder for a specific distribution.  Currently, valid names are: fc27, fc26, el7, OS13, FreeBSD")
 set(ZM_SYSTEMD "OFF" CACHE BOOL 
     "Set to ON to force building ZM with systemd support. default: OFF")
+set(ZM_MANPAGE_DEST_PREFIX "share/man" CACHE PATH 
+	"Relative path used to install ZoneMinder's Man pages into a
+         non-standard folder. Most Linux users will not need to change this.
+         BSD users may need to set this.")
 
 # Reassign some variables if a target distro has been specified
 if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))




--- cmake/Modules/Pod2Man.cmake.orig	2018-10-13 18:36:15 UTC
+++ cmake/Modules/Pod2Man.cmake
@@ -21,7 +21,7 @@
 # To use it, include this file in CMakeLists.txt and
 # invoke POD2MAN(<podfile> <manfile> <section>)
 
-MACRO(POD2MAN PODFILE MANFILE SECTION)
+MACRO(POD2MAN PODFILE MANFILE SECTION MANPAGE_DEST_PREFIX)
 	FIND_PROGRAM(POD2MAN pod2man)
 	FIND_PROGRAM(GZIP gzip)
 
@@ -58,7 +58,7 @@ MACRO(POD2MAN PODFILE MANFILE SECTION)
 
 	INSTALL(
 		FILES ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
-		DESTINATION share/man/man${SECTION}
+		DESTINATION ${MANPAGE_DEST_PREFIX}/man${SECTION}
     	)
 ENDMACRO(POD2MAN PODFILE MANFILE SECTION)
 

Removed Link Here

(-)a/multimedia/zoneminder/files/patch-scripts_CMakeLists.txt (-11 lines)
1	--- scripts/CMakeLists.txt.orig 2018-10-13 18:36:15 UTC
2	+++ scripts/CMakeLists.txt
3	@@ -31,7 +31,7 @@ configure_file(zm.in "${CMAKE_CURRENT_BINARY_DIR}/zm"
4	file(GLOB perlscripts "*.pl")
5	FOREACH(PERLSCRIPT ${perlscripts})
6	get_filename_component(PERLSCRIPTNAME ${PERLSCRIPT} NAME)
7	- POD2MAN(${PERLSCRIPT} zoneminder-${PERLSCRIPTNAME} 8)
8	+ POD2MAN(${PERLSCRIPT} zoneminder-${PERLSCRIPTNAME} 8 ${ZM_MANPAGE_DEST_PREFIX})
9	ENDFOREACH(PERLSCRIPT ${perlscripts})
10
11	# Install the perl scripts

Removed Link Here

(-)a/multimedia/zoneminder/files/patch-src_CMakeLists.txt (-11 lines)
1	--- src/CMakeLists.txt.orig 2018-10-13 18:36:15 UTC
2	+++ src/CMakeLists.txt
3	@@ -21,7 +21,7 @@ target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN
4
5	# Generate man files for the binaries destined for the bin folder
6	FOREACH(CBINARY zma zmc zmu)
7	- POD2MAN(${CMAKE_CURRENT_SOURCE_DIR}/${CBINARY}.cpp zoneminder-${CBINARY} 8)
8	+ POD2MAN(${CMAKE_CURRENT_SOURCE_DIR}/${CBINARY}.cpp zoneminder-${CBINARY} 8 ${ZM_MANPAGE_DEST_PREFIX})
9	ENDFOREACH(CBINARY zma zmc zmu)
10
11	install(TARGETS zmc zma zmu RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)




--- src/zm_video.cpp.orig	2018-12-08 14:22:36 UTC
+++ src/zm_video.cpp
@@ -455,11 +455,12 @@ int X264MP4Writer::x264encodeloop(bool bFlush) {
 
       /* Write the sample */
       if ( !buffer.empty() ) {
+        unsigned int bufSize = buffer.size();
         if ( !MP4WriteSample(
               mp4h,
               mp4vtid,
-              buffer.extract(buffer.size()),
-              buffer.size(),
+              buffer.extract(bufSize),
+              bufSize,
               duration,
               offset,
               prevKeyframe) ) {




bin/zmfilter.pl
bin/zmonvif-probe.pl
bin/zmpkg.pl
bin/zmrecover.pl
bin/zmstats.pl
bin/zmtelemetry.pl
bin/zmtrack.pl

%%SITE_PERL%%/ZoneMinder/ConfigData.pm.in.bak
%%SITE_PERL%%/ZoneMinder/Control.pm
%%SITE_PERL%%/ZoneMinder/Control/3S.pm
%%SITE_PERL%%/ZoneMinder/Control/Amcrest_HTTP.pm
%%SITE_PERL%%/ZoneMinder/Control/AxisV2.pm
%%SITE_PERL%%/ZoneMinder/Control/DCS3415.pm
%%SITE_PERL%%/ZoneMinder/Control/Dahua.pm

%%SITE_PERL%%/ZoneMinder/Control/FI8918W.pm
%%SITE_PERL%%/ZoneMinder/Control/FI9821W_Y2k.pm
%%SITE_PERL%%/ZoneMinder/Control/FI9831W.pm
%%SITE_PERL%%/ZoneMinder/Control/FOSCAMR2C.pm
%%SITE_PERL%%/ZoneMinder/Control/Floureon.pm
%%SITE_PERL%%/ZoneMinder/Control/HikVision.pm
%%SITE_PERL%%/ZoneMinder/Control/IPCAMIOS.pm

%%SITE_PERL%%/ZoneMinder/Control/Reolink.pm
%%SITE_PERL%%/ZoneMinder/Control/SPP1802SWPTZ.pm
%%SITE_PERL%%/ZoneMinder/Control/SkyIPCam7xx.pm
%%SITE_PERL%%/ZoneMinder/Control/Sony.pm
%%SITE_PERL%%/ZoneMinder/Control/Toshiba_IK_WB11A.pm
%%SITE_PERL%%/ZoneMinder/Control/Trendnet.pm
%%SITE_PERL%%/ZoneMinder/Control/Visca.pm

%%SITE_PERL%%/ZoneMinder/Database.pm
%%SITE_PERL%%/ZoneMinder/Event.pm
%%SITE_PERL%%/ZoneMinder/Filter.pm
%%SITE_PERL%%/ZoneMinder/Frame.pm
%%SITE_PERL%%/ZoneMinder/General.pm
%%SITE_PERL%%/ZoneMinder/Logger.pm
%%SITE_PERL%%/ZoneMinder/Memory.pm

%%PERL5_MAN3%%/ZoneMinder::ConfigData.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::3S.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::Amcrest_HTTP.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::AxisV2.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::DCS3415.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::Dahua.3.gz

%%PERL5_MAN3%%/ZoneMinder::Control::FI8918W.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::FI9821W_Y2k.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::FI9831W.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::FOSCAMR2C.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::Floureon.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::IPCC7210W.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::M8640.3.gz

%%PERL5_MAN3%%/ZoneMinder::Control::PelcoP.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::SPP1802SWPTZ.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::SkyIPCam7xx.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::Sony.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::Toshiba_IK_WB11A.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::Trendnet.3.gz
%%PERL5_MAN3%%/ZoneMinder::Control::Visca.3.gz

%%PERL5_MAN3%%/ZoneMinder::Database.3.gz
%%PERL5_MAN3%%/ZoneMinder::Event.3.gz
%%PERL5_MAN3%%/ZoneMinder::Filter.3.gz
%%PERL5_MAN3%%/ZoneMinder::Frame.3.gz
%%PERL5_MAN3%%/ZoneMinder::General.3.gz
%%PERL5_MAN3%%/ZoneMinder::Logger.3.gz
%%PERL5_MAN3%%/ZoneMinder::Memory.3.gz

%%PERL5_MAN3%%/ZoneMinder::Trigger::Channel::Unix.3.gz
%%PERL5_MAN3%%/ZoneMinder::Trigger::Connection.3.gz
%%PERL5_MAN3%%/ZoneMinder::Trigger::Connection::Example.3.gz
share/applications/zoneminder.desktop
man/man8/zoneminder-zma.8.gz
man/man8/zoneminder-zmaudit.pl.8.gz
man/man8/zoneminder-zmc.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-zmvideo.pl.8.gz
man/man8/zoneminder-zmwatch.pl.8.gz
man/man8/zoneminder-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

%%DATADIR%%/db/zm_update-1.32.1.sql
%%DATADIR%%/db/zm_update-1.32.2.sql
%%DATADIR%%/db/zm_update-1.32.3.sql
%%DATADIR%%/db/zm_update-1.33.0.sql
%%DATADIR%%/db/zm_update-1.33.1.sql
%%DATADIR%%/db/zm_update-1.33.10.sql
%%DATADIR%%/db/zm_update-1.33.11.sql
%%DATADIR%%/db/zm_update-1.33.12.sql
%%DATADIR%%/db/zm_update-1.33.13.sql
%%DATADIR%%/db/zm_update-1.33.14.sql
%%DATADIR%%/db/zm_update-1.33.15.sql
%%DATADIR%%/db/zm_update-1.33.16.sql
%%DATADIR%%/db/zm_update-1.33.2.sql
%%DATADIR%%/db/zm_update-1.33.3.sql
%%DATADIR%%/db/zm_update-1.33.4.sql
%%DATADIR%%/db/zm_update-1.33.5.sql
%%DATADIR%%/db/zm_update-1.33.6.sql
%%DATADIR%%/db/zm_update-1.33.7.sql
%%DATADIR%%/db/zm_update-1.33.8.sql
%%DATADIR%%/db/zm_update-1.33.9.sql
%%DATADIR%%/db/zm_update-1.34.0.sql
%%DATADIR%%/db/zm_update-1.34.1.sql
%%DATADIR%%/icons/16x16/icon.xpm
%%WWWDIR%%/ajax/add_monitors.php
%%WWWDIR%%/ajax/alarm.php

%%WWWDIR%%/api/app/View/Logs/json/index.ctp
%%WWWDIR%%/api/app/View/Logs/view.ctp
%%WWWDIR%%/api/app/View/Monitors/json/add.ctp
%%WWWDIR%%/api/app/View/Monitors/json/daemon_control.ctp
%%WWWDIR%%/api/app/View/Monitors/json/edit.ctp
%%WWWDIR%%/api/app/View/Monitors/json/index.ctp
%%WWWDIR%%/api/app/View/Monitors/json/view.ctp
%%WWWDIR%%/api/app/View/Monitors/xml/add.ctp
%%WWWDIR%%/api/app/View/Monitors/xml/daemon_control.ctp
%%WWWDIR%%/api/app/View/Monitors/xml/edit.ctp
%%WWWDIR%%/api/app/View/Monitors/xml/index.ctp
%%WWWDIR%%/api/app/View/Monitors/xml/view.ctp

%%WWWDIR%%/includes/Group.php
%%WWWDIR%%/includes/Monitor.php
%%WWWDIR%%/includes/MontageLayout.php
%%WWWDIR%%/includes/Object.php
%%WWWDIR%%/includes/Server.php
%%WWWDIR%%/includes/Storage.php
%%WWWDIR%%/includes/actions/bandwidth.php
%%WWWDIR%%/includes/actions/console.php
%%WWWDIR%%/includes/actions/control.php
%%WWWDIR%%/includes/actions/controlcap.php
%%WWWDIR%%/includes/actions/controlcaps.php
%%WWWDIR%%/includes/actions/device.php
%%WWWDIR%%/includes/actions/devices.php
%%WWWDIR%%/includes/actions/donate.php
%%WWWDIR%%/includes/actions/event.php
%%WWWDIR%%/includes/actions/eventdetail.php
%%WWWDIR%%/includes/actions/events.php
%%WWWDIR%%/includes/actions/filter.php
%%WWWDIR%%/includes/actions/function.php
%%WWWDIR%%/includes/actions/group.php
%%WWWDIR%%/includes/actions/groups.php
%%WWWDIR%%/includes/actions/login.php
%%WWWDIR%%/includes/actions/logout.php
%%WWWDIR%%/includes/actions/monitor.php
%%WWWDIR%%/includes/actions/monitors.php
%%WWWDIR%%/includes/actions/montage.php
%%WWWDIR%%/includes/actions/options.php
%%WWWDIR%%/includes/actions/privacy.php
%%WWWDIR%%/includes/actions/server.php
%%WWWDIR%%/includes/actions/settings.php
%%WWWDIR%%/includes/actions/shutdown.php
%%WWWDIR%%/includes/actions/state.php
%%WWWDIR%%/includes/actions/storage.php
%%WWWDIR%%/includes/actions/user.php
%%WWWDIR%%/includes/actions/version.php
%%WWWDIR%%/includes/actions/zone.php
%%WWWDIR%%/includes/actions/zones.php
%%WWWDIR%%/includes/auth.php
%%WWWDIR%%/includes/config.php
%%WWWDIR%%/includes/control_functions.php

%%WWWDIR%%/includes/functions.php
%%WWWDIR%%/includes/lang.php
%%WWWDIR%%/includes/logger.php
%%WWWDIR%%/includes/session.php
%%WWWDIR%%/index.php
%%WWWDIR%%/js/Server.js
%%WWWDIR%%/js/logger.js
%%WWWDIR%%/js/mootools.ext.js
%%WWWDIR%%/js/overlay.js
%%WWWDIR%%/js/videojs.zoomrotate.js
%%WWWDIR%%/lang/big5_big5.php
%%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%%/skins/classic/css/base/skin.css
%%WWWDIR%%/skins/classic/css/base/views/console.css
%%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/devices.css
%%WWWDIR%%/skins/classic/css/base/views/download.css

%%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-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/views/function.php
%%WWWDIR%%/skins/classic/views/group.php
%%WWWDIR%%/skins/classic/views/groups.php
%%WWWDIR%%/skins/classic/views/image-ffmpeg.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/options.js.php
%%WWWDIR%%/skins/classic/views/js/plugin.js
%%WWWDIR%%/skins/classic/views/js/postlogin.js.php
%%WWWDIR%%/skins/classic/views/js/privacy.js
%%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/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/stats.php
%%WWWDIR%%/skins/classic/views/status.php

%%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
%%WWWDIR%%/vendor/composer/autoload_classmap.php
%%WWWDIR%%/vendor/composer/autoload_files.php
%%WWWDIR%%/vendor/composer/autoload_namespaces.php
%%WWWDIR%%/vendor/composer/autoload_psr4.php
%%WWWDIR%%/vendor/composer/autoload_real.php
%%WWWDIR%%/vendor/composer/autoload_static.php
%%WWWDIR%%/vendor/composer/installed.json
%%WWWDIR%%/vendor/firebase/php-jwt/LICENSE
%%WWWDIR%%/vendor/firebase/php-jwt/README.md
%%WWWDIR%%/vendor/firebase/php-jwt/composer.json
%%WWWDIR%%/vendor/firebase/php-jwt/src/BeforeValidException.php
%%WWWDIR%%/vendor/firebase/php-jwt/src/ExpiredException.php
%%WWWDIR%%/vendor/firebase/php-jwt/src/JWT.php
%%WWWDIR%%/vendor/firebase/php-jwt/src/SignatureInvalidException.php
%%WWWDIR%%/vendor/ircmaxell/password-compat/LICENSE.md
%%WWWDIR%%/vendor/ircmaxell/password-compat/composer.json
%%WWWDIR%%/vendor/ircmaxell/password-compat/lib/password.php
%%WWWDIR%%/vendor/ircmaxell/password-compat/version-test.php
%%WWWDIR%%/views/archive.php
%%WWWDIR%%/views/image.php
%%WWWDIR%%/views/view_video.php

Return to bug 243795

Lines 175-190 Upgrades Link Here

(-)b/multimedia/zoneminder/files/README.FreeBSD (-7 / +1 lines)
175	3. Start ZoneMinder	175	3. Start ZoneMinder
176	service zoneminder start	176	service zoneminder start
177		177
178	Upgrading from www/zoneminder 1.30.x or www/zoneminder-h264	178	Upgrading from www/zoneminder 1.32.x
179	=====================================================	179	=====================================================
180		180
181	Before proceeding to upgrade sequence listed above,	181	Before proceeding to upgrade sequence listed above,
182		182
183	1. Connect to mysql server with root and issue	183	1. Connect to mysql server with root and issue
184	set global log_bin_trust_function_creators=1;	184	set global log_bin_trust_function_creators=1;
185
186	2. Add write access to www user to /usr/local/etc/zoneminder/zmcustom.conf
187
188	3. Take notice, that default monitor files are not under ${WWWDIR} anymore.
189	Old setup will work, but as security concideration it is recommended to
190	move them to /var/db/zoneminder (default) or to any place not under www root.

Added Link Here

(-)b/multimedia/zoneminder/files/extra-patch-CMakeLists.txt (+12 lines)
1	--- CMakeLists.txt.orig 2020-01-28 17:16:34.156808000 +0000
2	+++ CMakeLists.txt
3	@@ -104,6 +104,9 @@
4	ENDIF(ZM_SYSTEM_PROC MATCHES "^arm")
5	ENDIF (CMAKE_SYSTEM_NAME MATCHES "Linux")
6
7	+# FreeBSD 12 contains own bcrypt implementation
8	+add_definitions(-D__SKIP_GNU)
9	+
10	# Modules that we need:
11	include (GNUInstallDirs)
12	include (CheckIncludeFile)

Removed Link Here

(-)a/multimedia/zoneminder/files/patch-CMakeLists.txt (-23 lines)
1	--- CMakeLists.txt.orig 2018-10-13 18:36:15 UTC
2	+++ CMakeLists.txt
3	@@ -127,7 +127,8 @@ mark_as_advanced(
4	ZM_PATH_ARP
5	ZM_CONFIG_DIR
6	ZM_CONFIG_SUBDIR
7	- ZM_SYSTEMD)
8	+ ZM_SYSTEMD
9	+ ZM_MANPAGE_DEST_PREFIX)
10
11	set(ZM_RUNDIR "/var/run/zm" CACHE PATH
12	"Location of transient process files, default: /var/run/zm")
13	@@ -210,6 +211,10 @@ set(ZM_TARGET_DISTRO "" CACHE STRING
14	"Build ZoneMinder for a specific distribution. Currently, valid names are: fc27, fc26, el7, OS13, FreeBSD")
15	set(ZM_SYSTEMD "OFF" CACHE BOOL
16	"Set to ON to force building ZM with systemd support. default: OFF")
17	+set(ZM_MANPAGE_DEST_PREFIX "share/man" CACHE PATH
18	+ "Relative path used to install ZoneMinder's Man pages into a
19	+ non-standard folder. Most Linux users will not need to change this.
20	+ BSD users may need to set this.")
21
22	# Reassign some variables if a target distro has been specified
23	if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))

Removed Link Here

(-)a/multimedia/zoneminder/files/patch-cmake_Modules_Pod2Man.cmake (-20 lines)
1	--- cmake/Modules/Pod2Man.cmake.orig 2018-10-13 18:36:15 UTC
2	+++ cmake/Modules/Pod2Man.cmake
3	@@ -21,7 +21,7 @@
4	# To use it, include this file in CMakeLists.txt and
5	# invoke POD2MAN(<podfile> <manfile> <section>)
6
7	-MACRO(POD2MAN PODFILE MANFILE SECTION)
8	+MACRO(POD2MAN PODFILE MANFILE SECTION MANPAGE_DEST_PREFIX)
9	FIND_PROGRAM(POD2MAN pod2man)
10	FIND_PROGRAM(GZIP gzip)
11
12	@@ -58,7 +58,7 @@ MACRO(POD2MAN PODFILE MANFILE SECTION)
13
14	INSTALL(
15	FILES ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
16	- DESTINATION share/man/man${SECTION}
17	+ DESTINATION ${MANPAGE_DEST_PREFIX}/man${SECTION}
18	)
19	ENDMACRO(POD2MAN PODFILE MANFILE SECTION)
20

Removed Link Here

(-)a/multimedia/zoneminder/files/patch-src_zm__video.cpp (-17 lines)
1	--- src/zm_video.cpp.orig 2018-12-08 14:22:36 UTC
2	+++ src/zm_video.cpp
3	@@ -455,11 +455,12 @@ int X264MP4Writer::x264encodeloop(bool bFlush) {
4
5	/* Write the sample */
6	if ( !buffer.empty() ) {
7	+ unsigned int bufSize = buffer.size();
8	if ( !MP4WriteSample(
9	mp4h,
10	mp4vtid,
11	- buffer.extract(buffer.size()),
12	- buffer.size(),
13	+ buffer.extract(bufSize),
14	+ bufSize,
15	duration,
16	offset,
17	prevKeyframe) ) {

Lines 7-12 bin/zmdc.pl Link Here

(-)b/multimedia/zoneminder/pkg-plist (-6 / +90 lines)
7	bin/zmfilter.pl	7	bin/zmfilter.pl
8	bin/zmonvif-probe.pl	8	bin/zmonvif-probe.pl
9	bin/zmpkg.pl	9	bin/zmpkg.pl
		10	bin/zmrecover.pl
10	bin/zmstats.pl	11	bin/zmstats.pl
11	bin/zmtelemetry.pl	12	bin/zmtelemetry.pl
12	bin/zmtrack.pl	13	bin/zmtrack.pl
Lines 2980-2985 etc/zm.conf Link Here
2980	%%SITE_PERL%%/ZoneMinder/ConfigData.pm.in.bak	2981	%%SITE_PERL%%/ZoneMinder/ConfigData.pm.in.bak
2981	%%SITE_PERL%%/ZoneMinder/Control.pm	2982	%%SITE_PERL%%/ZoneMinder/Control.pm
2982	%%SITE_PERL%%/ZoneMinder/Control/3S.pm	2983	%%SITE_PERL%%/ZoneMinder/Control/3S.pm
		2984	%%SITE_PERL%%/ZoneMinder/Control/Amcrest_HTTP.pm
2983	%%SITE_PERL%%/ZoneMinder/Control/AxisV2.pm	2985	%%SITE_PERL%%/ZoneMinder/Control/AxisV2.pm
2984	%%SITE_PERL%%/ZoneMinder/Control/DCS3415.pm	2986	%%SITE_PERL%%/ZoneMinder/Control/DCS3415.pm
2985	%%SITE_PERL%%/ZoneMinder/Control/Dahua.pm	2987	%%SITE_PERL%%/ZoneMinder/Control/Dahua.pm
Lines 2990-2995 etc/zm.conf Link Here
2990	%%SITE_PERL%%/ZoneMinder/Control/FI8918W.pm	2992	%%SITE_PERL%%/ZoneMinder/Control/FI8918W.pm
2991	%%SITE_PERL%%/ZoneMinder/Control/FI9821W_Y2k.pm	2993	%%SITE_PERL%%/ZoneMinder/Control/FI9821W_Y2k.pm
2992	%%SITE_PERL%%/ZoneMinder/Control/FI9831W.pm	2994	%%SITE_PERL%%/ZoneMinder/Control/FI9831W.pm
		2995	%%SITE_PERL%%/ZoneMinder/Control/FOSCAMR2C.pm
2993	%%SITE_PERL%%/ZoneMinder/Control/Floureon.pm	2996	%%SITE_PERL%%/ZoneMinder/Control/Floureon.pm
2994	%%SITE_PERL%%/ZoneMinder/Control/HikVision.pm	2997	%%SITE_PERL%%/ZoneMinder/Control/HikVision.pm
2995	%%SITE_PERL%%/ZoneMinder/Control/IPCAMIOS.pm	2998	%%SITE_PERL%%/ZoneMinder/Control/IPCAMIOS.pm
Lines 3007-3012 etc/zm.conf Link Here
3007	%%SITE_PERL%%/ZoneMinder/Control/Reolink.pm	3010	%%SITE_PERL%%/ZoneMinder/Control/Reolink.pm
3008	%%SITE_PERL%%/ZoneMinder/Control/SPP1802SWPTZ.pm	3011	%%SITE_PERL%%/ZoneMinder/Control/SPP1802SWPTZ.pm
3009	%%SITE_PERL%%/ZoneMinder/Control/SkyIPCam7xx.pm	3012	%%SITE_PERL%%/ZoneMinder/Control/SkyIPCam7xx.pm
		3013	%%SITE_PERL%%/ZoneMinder/Control/Sony.pm
3010	%%SITE_PERL%%/ZoneMinder/Control/Toshiba_IK_WB11A.pm	3014	%%SITE_PERL%%/ZoneMinder/Control/Toshiba_IK_WB11A.pm
3011	%%SITE_PERL%%/ZoneMinder/Control/Trendnet.pm	3015	%%SITE_PERL%%/ZoneMinder/Control/Trendnet.pm
3012	%%SITE_PERL%%/ZoneMinder/Control/Visca.pm	3016	%%SITE_PERL%%/ZoneMinder/Control/Visca.pm
Lines 3018-3023 etc/zm.conf Link Here
3018	%%SITE_PERL%%/ZoneMinder/Database.pm	3022	%%SITE_PERL%%/ZoneMinder/Database.pm
3019	%%SITE_PERL%%/ZoneMinder/Event.pm	3023	%%SITE_PERL%%/ZoneMinder/Event.pm
3020	%%SITE_PERL%%/ZoneMinder/Filter.pm	3024	%%SITE_PERL%%/ZoneMinder/Filter.pm
		3025	%%SITE_PERL%%/ZoneMinder/Frame.pm
3021	%%SITE_PERL%%/ZoneMinder/General.pm	3026	%%SITE_PERL%%/ZoneMinder/General.pm
3022	%%SITE_PERL%%/ZoneMinder/Logger.pm	3027	%%SITE_PERL%%/ZoneMinder/Logger.pm
3023	%%SITE_PERL%%/ZoneMinder/Memory.pm	3028	%%SITE_PERL%%/ZoneMinder/Memory.pm
Lines 5988-5993 etc/zm.conf Link Here
5988	%%PERL5_MAN3%%/ZoneMinder::ConfigData.3.gz	5993	%%PERL5_MAN3%%/ZoneMinder::ConfigData.3.gz
5989	%%PERL5_MAN3%%/ZoneMinder::Control.3.gz	5994	%%PERL5_MAN3%%/ZoneMinder::Control.3.gz
5990	%%PERL5_MAN3%%/ZoneMinder::Control::3S.3.gz	5995	%%PERL5_MAN3%%/ZoneMinder::Control::3S.3.gz
		5996	%%PERL5_MAN3%%/ZoneMinder::Control::Amcrest_HTTP.3.gz
5991	%%PERL5_MAN3%%/ZoneMinder::Control::AxisV2.3.gz	5997	%%PERL5_MAN3%%/ZoneMinder::Control::AxisV2.3.gz
5992	%%PERL5_MAN3%%/ZoneMinder::Control::DCS3415.3.gz	5998	%%PERL5_MAN3%%/ZoneMinder::Control::DCS3415.3.gz
5993	%%PERL5_MAN3%%/ZoneMinder::Control::Dahua.3.gz	5999	%%PERL5_MAN3%%/ZoneMinder::Control::Dahua.3.gz
Lines 5997-6002 etc/zm.conf Link Here
5997	%%PERL5_MAN3%%/ZoneMinder::Control::FI8918W.3.gz	6003	%%PERL5_MAN3%%/ZoneMinder::Control::FI8918W.3.gz
5998	%%PERL5_MAN3%%/ZoneMinder::Control::FI9821W_Y2k.3.gz	6004	%%PERL5_MAN3%%/ZoneMinder::Control::FI9821W_Y2k.3.gz
5999	%%PERL5_MAN3%%/ZoneMinder::Control::FI9831W.3.gz	6005	%%PERL5_MAN3%%/ZoneMinder::Control::FI9831W.3.gz
		6006	%%PERL5_MAN3%%/ZoneMinder::Control::FOSCAMR2C.3.gz
6000	%%PERL5_MAN3%%/ZoneMinder::Control::Floureon.3.gz	6007	%%PERL5_MAN3%%/ZoneMinder::Control::Floureon.3.gz
6001	%%PERL5_MAN3%%/ZoneMinder::Control::IPCC7210W.3.gz	6008	%%PERL5_MAN3%%/ZoneMinder::Control::IPCC7210W.3.gz
6002	%%PERL5_MAN3%%/ZoneMinder::Control::M8640.3.gz	6009	%%PERL5_MAN3%%/ZoneMinder::Control::M8640.3.gz
Lines 6008-6013 etc/zm.conf Link Here
6008	%%PERL5_MAN3%%/ZoneMinder::Control::PelcoP.3.gz	6015	%%PERL5_MAN3%%/ZoneMinder::Control::PelcoP.3.gz
6009	%%PERL5_MAN3%%/ZoneMinder::Control::SPP1802SWPTZ.3.gz	6016	%%PERL5_MAN3%%/ZoneMinder::Control::SPP1802SWPTZ.3.gz
6010	%%PERL5_MAN3%%/ZoneMinder::Control::SkyIPCam7xx.3.gz	6017	%%PERL5_MAN3%%/ZoneMinder::Control::SkyIPCam7xx.3.gz
		6018	%%PERL5_MAN3%%/ZoneMinder::Control::Sony.3.gz
6011	%%PERL5_MAN3%%/ZoneMinder::Control::Toshiba_IK_WB11A.3.gz	6019	%%PERL5_MAN3%%/ZoneMinder::Control::Toshiba_IK_WB11A.3.gz
6012	%%PERL5_MAN3%%/ZoneMinder::Control::Trendnet.3.gz	6020	%%PERL5_MAN3%%/ZoneMinder::Control::Trendnet.3.gz
6013	%%PERL5_MAN3%%/ZoneMinder::Control::Visca.3.gz	6021	%%PERL5_MAN3%%/ZoneMinder::Control::Visca.3.gz
Lines 6018-6023 etc/zm.conf Link Here
6018	%%PERL5_MAN3%%/ZoneMinder::Database.3.gz	6026	%%PERL5_MAN3%%/ZoneMinder::Database.3.gz
6019	%%PERL5_MAN3%%/ZoneMinder::Event.3.gz	6027	%%PERL5_MAN3%%/ZoneMinder::Event.3.gz
6020	%%PERL5_MAN3%%/ZoneMinder::Filter.3.gz	6028	%%PERL5_MAN3%%/ZoneMinder::Filter.3.gz
		6029	%%PERL5_MAN3%%/ZoneMinder::Frame.3.gz
6021	%%PERL5_MAN3%%/ZoneMinder::General.3.gz	6030	%%PERL5_MAN3%%/ZoneMinder::General.3.gz
6022	%%PERL5_MAN3%%/ZoneMinder::Logger.3.gz	6031	%%PERL5_MAN3%%/ZoneMinder::Logger.3.gz
6023	%%PERL5_MAN3%%/ZoneMinder::Memory.3.gz	6032	%%PERL5_MAN3%%/ZoneMinder::Memory.3.gz
Lines 6035-6041 etc/zm.conf Link Here
6035	%%PERL5_MAN3%%/ZoneMinder::Trigger::Channel::Unix.3.gz	6044	%%PERL5_MAN3%%/ZoneMinder::Trigger::Channel::Unix.3.gz
6036	%%PERL5_MAN3%%/ZoneMinder::Trigger::Connection.3.gz	6045	%%PERL5_MAN3%%/ZoneMinder::Trigger::Connection.3.gz
6037	%%PERL5_MAN3%%/ZoneMinder::Trigger::Connection::Example.3.gz	6046	%%PERL5_MAN3%%/ZoneMinder::Trigger::Connection::Example.3.gz
6038	share/applications/zoneminder.desktop
6039	man/man8/zoneminder-zma.8.gz	6047	man/man8/zoneminder-zma.8.gz
6040	man/man8/zoneminder-zmaudit.pl.8.gz	6048	man/man8/zoneminder-zmaudit.pl.8.gz
6041	man/man8/zoneminder-zmc.8.gz	6049	man/man8/zoneminder-zmc.8.gz
Lines 6045-6050 man/man8/zoneminder-zmdc.pl.8.gz Link Here
6045	man/man8/zoneminder-zmfilter.pl.8.gz	6053	man/man8/zoneminder-zmfilter.pl.8.gz
6046	man/man8/zoneminder-zmonvif-probe.pl.8.gz	6054	man/man8/zoneminder-zmonvif-probe.pl.8.gz
6047	man/man8/zoneminder-zmpkg.pl.8.gz	6055	man/man8/zoneminder-zmpkg.pl.8.gz
		6056	man/man8/zoneminder-zmrecover.pl.8.gz
6048	man/man8/zoneminder-zmstats.pl.8.gz	6057	man/man8/zoneminder-zmstats.pl.8.gz
6049	man/man8/zoneminder-zmsystemctl.pl.8.gz	6058	man/man8/zoneminder-zmsystemctl.pl.8.gz
6050	man/man8/zoneminder-zmtelemetry.pl.8.gz	6059	man/man8/zoneminder-zmtelemetry.pl.8.gz
Lines 6055-6060 man/man8/zoneminder-zmupdate.pl.8.gz Link Here
6055	man/man8/zoneminder-zmvideo.pl.8.gz	6064	man/man8/zoneminder-zmvideo.pl.8.gz
6056	man/man8/zoneminder-zmwatch.pl.8.gz	6065	man/man8/zoneminder-zmwatch.pl.8.gz
6057	man/man8/zoneminder-zmx10.pl.8.gz	6066	man/man8/zoneminder-zmx10.pl.8.gz
		6067	share/applications/zoneminder.desktop
6058	%%DATADIR%%/db/triggers.sql	6068	%%DATADIR%%/db/triggers.sql
6059	%%DATADIR%%/db/zm_create.sql	6069	%%DATADIR%%/db/zm_create.sql
6060	%%DATADIR%%/db/zm_update-0.0.1.sql	6070	%%DATADIR%%/db/zm_update-0.0.1.sql
Lines 6176-6181 man/man8/zoneminder-zmx10.pl.8.gz Link Here
6176	%%DATADIR%%/db/zm_update-1.32.1.sql	6186	%%DATADIR%%/db/zm_update-1.32.1.sql
6177	%%DATADIR%%/db/zm_update-1.32.2.sql	6187	%%DATADIR%%/db/zm_update-1.32.2.sql
6178	%%DATADIR%%/db/zm_update-1.32.3.sql	6188	%%DATADIR%%/db/zm_update-1.32.3.sql
		6189	%%DATADIR%%/db/zm_update-1.33.0.sql
		6190	%%DATADIR%%/db/zm_update-1.33.1.sql
		6191	%%DATADIR%%/db/zm_update-1.33.10.sql
		6192	%%DATADIR%%/db/zm_update-1.33.11.sql
		6193	%%DATADIR%%/db/zm_update-1.33.12.sql
		6194	%%DATADIR%%/db/zm_update-1.33.13.sql
		6195	%%DATADIR%%/db/zm_update-1.33.14.sql
		6196	%%DATADIR%%/db/zm_update-1.33.15.sql
		6197	%%DATADIR%%/db/zm_update-1.33.16.sql
		6198	%%DATADIR%%/db/zm_update-1.33.2.sql
		6199	%%DATADIR%%/db/zm_update-1.33.3.sql
		6200	%%DATADIR%%/db/zm_update-1.33.4.sql
		6201	%%DATADIR%%/db/zm_update-1.33.5.sql
		6202	%%DATADIR%%/db/zm_update-1.33.6.sql
		6203	%%DATADIR%%/db/zm_update-1.33.7.sql
		6204	%%DATADIR%%/db/zm_update-1.33.8.sql
		6205	%%DATADIR%%/db/zm_update-1.33.9.sql
		6206	%%DATADIR%%/db/zm_update-1.34.0.sql
		6207	%%DATADIR%%/db/zm_update-1.34.1.sql
6179	%%DATADIR%%/icons/16x16/icon.xpm	6208	%%DATADIR%%/icons/16x16/icon.xpm
6180	%%WWWDIR%%/ajax/add_monitors.php	6209	%%WWWDIR%%/ajax/add_monitors.php
6181	%%WWWDIR%%/ajax/alarm.php	6210	%%WWWDIR%%/ajax/alarm.php
Lines 6344-6353 man/man8/zoneminder-zmx10.pl.8.gz Link Here
6344	%%WWWDIR%%/api/app/View/Logs/json/index.ctp	6373	%%WWWDIR%%/api/app/View/Logs/json/index.ctp
6345	%%WWWDIR%%/api/app/View/Logs/view.ctp	6374	%%WWWDIR%%/api/app/View/Logs/view.ctp
6346	%%WWWDIR%%/api/app/View/Monitors/json/add.ctp	6375	%%WWWDIR%%/api/app/View/Monitors/json/add.ctp
		6376	%%WWWDIR%%/api/app/View/Monitors/json/daemon_control.ctp
6347	%%WWWDIR%%/api/app/View/Monitors/json/edit.ctp	6377	%%WWWDIR%%/api/app/View/Monitors/json/edit.ctp
6348	%%WWWDIR%%/api/app/View/Monitors/json/index.ctp	6378	%%WWWDIR%%/api/app/View/Monitors/json/index.ctp
6349	%%WWWDIR%%/api/app/View/Monitors/json/view.ctp	6379	%%WWWDIR%%/api/app/View/Monitors/json/view.ctp
6350	%%WWWDIR%%/api/app/View/Monitors/xml/add.ctp	6380	%%WWWDIR%%/api/app/View/Monitors/xml/add.ctp
		6381	%%WWWDIR%%/api/app/View/Monitors/xml/daemon_control.ctp
6351	%%WWWDIR%%/api/app/View/Monitors/xml/edit.ctp	6382	%%WWWDIR%%/api/app/View/Monitors/xml/edit.ctp
6352	%%WWWDIR%%/api/app/View/Monitors/xml/index.ctp	6383	%%WWWDIR%%/api/app/View/Monitors/xml/index.ctp
6353	%%WWWDIR%%/api/app/View/Monitors/xml/view.ctp	6384	%%WWWDIR%%/api/app/View/Monitors/xml/view.ctp
Lines 7518-7526 man/man8/zoneminder-zmx10.pl.8.gz Link Here
7518	%%WWWDIR%%/includes/Group.php	7549	%%WWWDIR%%/includes/Group.php
7519	%%WWWDIR%%/includes/Monitor.php	7550	%%WWWDIR%%/includes/Monitor.php
7520	%%WWWDIR%%/includes/MontageLayout.php	7551	%%WWWDIR%%/includes/MontageLayout.php
		7552	%%WWWDIR%%/includes/Object.php
7521	%%WWWDIR%%/includes/Server.php	7553	%%WWWDIR%%/includes/Server.php
7522	%%WWWDIR%%/includes/Storage.php	7554	%%WWWDIR%%/includes/Storage.php
7523	%%WWWDIR%%/includes/actions.php	7555	%%WWWDIR%%/includes/actions/bandwidth.php
		7556	%%WWWDIR%%/includes/actions/console.php
		7557	%%WWWDIR%%/includes/actions/control.php
		7558	%%WWWDIR%%/includes/actions/controlcap.php
		7559	%%WWWDIR%%/includes/actions/controlcaps.php
		7560	%%WWWDIR%%/includes/actions/device.php
		7561	%%WWWDIR%%/includes/actions/devices.php
		7562	%%WWWDIR%%/includes/actions/donate.php
		7563	%%WWWDIR%%/includes/actions/event.php
		7564	%%WWWDIR%%/includes/actions/eventdetail.php
		7565	%%WWWDIR%%/includes/actions/events.php
		7566	%%WWWDIR%%/includes/actions/filter.php
		7567	%%WWWDIR%%/includes/actions/function.php
		7568	%%WWWDIR%%/includes/actions/group.php
		7569	%%WWWDIR%%/includes/actions/groups.php
		7570	%%WWWDIR%%/includes/actions/login.php
		7571	%%WWWDIR%%/includes/actions/logout.php
		7572	%%WWWDIR%%/includes/actions/monitor.php
		7573	%%WWWDIR%%/includes/actions/monitors.php
		7574	%%WWWDIR%%/includes/actions/montage.php
		7575	%%WWWDIR%%/includes/actions/options.php
		7576	%%WWWDIR%%/includes/actions/privacy.php
		7577	%%WWWDIR%%/includes/actions/server.php
		7578	%%WWWDIR%%/includes/actions/settings.php
		7579	%%WWWDIR%%/includes/actions/shutdown.php
		7580	%%WWWDIR%%/includes/actions/state.php
		7581	%%WWWDIR%%/includes/actions/storage.php
		7582	%%WWWDIR%%/includes/actions/user.php
		7583	%%WWWDIR%%/includes/actions/version.php
		7584	%%WWWDIR%%/includes/actions/zone.php
		7585	%%WWWDIR%%/includes/actions/zones.php
7524	%%WWWDIR%%/includes/auth.php	7586	%%WWWDIR%%/includes/auth.php
7525	%%WWWDIR%%/includes/config.php	7587	%%WWWDIR%%/includes/config.php
7526	%%WWWDIR%%/includes/control_functions.php	7588	%%WWWDIR%%/includes/control_functions.php
Lines 7533-7546 man/man8/zoneminder-zmx10.pl.8.gz Link Here
7533	%%WWWDIR%%/includes/functions.php	7595	%%WWWDIR%%/includes/functions.php
7534	%%WWWDIR%%/includes/lang.php	7596	%%WWWDIR%%/includes/lang.php
7535	%%WWWDIR%%/includes/logger.php	7597	%%WWWDIR%%/includes/logger.php
		7598	%%WWWDIR%%/includes/session.php
7536	%%WWWDIR%%/index.php	7599	%%WWWDIR%%/index.php
7537	%%WWWDIR%%/js/Server.js	7600	%%WWWDIR%%/js/Server.js
7538	%%WWWDIR%%/js/logger.js	7601	%%WWWDIR%%/js/logger.js
7539	%%WWWDIR%%/js/mootools.ext.js	7602	%%WWWDIR%%/js/mootools.ext.js
7540	%%WWWDIR%%/js/overlay.js	7603	%%WWWDIR%%/js/overlay.js
7541	%%WWWDIR%%/js/videojs.zoomrotate.js	7604	%%WWWDIR%%/js/videojs.zoomrotate.js
7542	%%WWWDIR%%/lang/big5_big5.php
7543	%%WWWDIR%%/lang/ba_ba.php	7605	%%WWWDIR%%/lang/ba_ba.php
		7606	%%WWWDIR%%/lang/big5_big5.php
7544	%%WWWDIR%%/lang/cn_zh.php	7607	%%WWWDIR%%/lang/cn_zh.php
7545	%%WWWDIR%%/lang/cs_cz.php	7608	%%WWWDIR%%/lang/cs_cz.php
7546	%%WWWDIR%%/lang/de_de.php	7609	%%WWWDIR%%/lang/de_de.php
Lines 7568-7573 man/man8/zoneminder-zmx10.pl.8.gz Link Here
7568	%%WWWDIR%%/skins/classic/css/base/skin.css	7631	%%WWWDIR%%/skins/classic/css/base/skin.css
7569	%%WWWDIR%%/skins/classic/css/base/views/console.css	7632	%%WWWDIR%%/skins/classic/css/base/views/console.css
7570	%%WWWDIR%%/skins/classic/css/base/views/control.css	7633	%%WWWDIR%%/skins/classic/css/base/views/control.css
		7634	%%WWWDIR%%/skins/classic/css/base/views/controlcap.css
7571	%%WWWDIR%%/skins/classic/css/base/views/controlcaps.css	7635	%%WWWDIR%%/skins/classic/css/base/views/controlcaps.css
7572	%%WWWDIR%%/skins/classic/css/base/views/devices.css	7636	%%WWWDIR%%/skins/classic/css/base/views/devices.css
7573	%%WWWDIR%%/skins/classic/css/base/views/download.css	7637	%%WWWDIR%%/skins/classic/css/base/views/download.css
Lines 7713-7719 man/man8/zoneminder-zmx10.pl.8.gz Link Here
7713	%%WWWDIR%%/skins/classic/js/font/vjs.eot	7777	%%WWWDIR%%/skins/classic/js/font/vjs.eot
7714	%%WWWDIR%%/skins/classic/js/font/vjs.ttf	7778	%%WWWDIR%%/skins/classic/js/font/vjs.ttf
7715	%%WWWDIR%%/skins/classic/js/font/vjs.woff	7779	%%WWWDIR%%/skins/classic/js/font/vjs.woff
7716	%%WWWDIR%%/skins/classic/js/jquery-1.11.3.js	7780	%%WWWDIR%%/skins/classic/js/jquery-2.2.4.js
7717	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/AUTHORS.txt	7781	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/AUTHORS.txt
7718	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/LICENSE.txt	7782	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/LICENSE.txt
7719	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/images/ui-icons_444444_256x240.png	7783	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/images/ui-icons_444444_256x240.png
Lines 7774-7780 man/man8/zoneminder-zmx10.pl.8.gz Link Here
7774	%%WWWDIR%%/skins/classic/views/function.php	7838	%%WWWDIR%%/skins/classic/views/function.php
7775	%%WWWDIR%%/skins/classic/views/group.php	7839	%%WWWDIR%%/skins/classic/views/group.php
7776	%%WWWDIR%%/skins/classic/views/groups.php	7840	%%WWWDIR%%/skins/classic/views/groups.php
7777	%%WWWDIR%%/skins/classic/views/image-ffmpeg.php
7778	%%WWWDIR%%/skins/classic/views/js/add_monitors.js	7841	%%WWWDIR%%/skins/classic/views/js/add_monitors.js
7779	%%WWWDIR%%/skins/classic/views/js/console.js	7842	%%WWWDIR%%/skins/classic/views/js/console.js
7780	%%WWWDIR%%/skins/classic/views/js/console.js.php	7843	%%WWWDIR%%/skins/classic/views/js/console.js.php
Lines 7816-7822 man/man8/zoneminder-zmx10.pl.8.gz Link Here
7816	%%WWWDIR%%/skins/classic/views/js/options.js.php	7879	%%WWWDIR%%/skins/classic/views/js/options.js.php
7817	%%WWWDIR%%/skins/classic/views/js/plugin.js	7880	%%WWWDIR%%/skins/classic/views/js/plugin.js
7818	%%WWWDIR%%/skins/classic/views/js/postlogin.js.php	7881	%%WWWDIR%%/skins/classic/views/js/postlogin.js.php
7819	%%WWWDIR%%/skins/classic/views/js/privacy.js
7820	%%WWWDIR%%/skins/classic/views/js/report_event_audit.js	7882	%%WWWDIR%%/skins/classic/views/js/report_event_audit.js
7821	%%WWWDIR%%/skins/classic/views/js/server.js	7883	%%WWWDIR%%/skins/classic/views/js/server.js
7822	%%WWWDIR%%/skins/classic/views/js/state.js	7884	%%WWWDIR%%/skins/classic/views/js/state.js
Lines 7854-7859 man/man8/zoneminder-zmx10.pl.8.gz Link Here
7854	%%WWWDIR%%/skins/classic/views/report_event_audit.php	7916	%%WWWDIR%%/skins/classic/views/report_event_audit.php
7855	%%WWWDIR%%/skins/classic/views/server.php	7917	%%WWWDIR%%/skins/classic/views/server.php
7856	%%WWWDIR%%/skins/classic/views/settings.php	7918	%%WWWDIR%%/skins/classic/views/settings.php
		7919	%%WWWDIR%%/skins/classic/views/shutdown.php
7857	%%WWWDIR%%/skins/classic/views/state.php	7920	%%WWWDIR%%/skins/classic/views/state.php
7858	%%WWWDIR%%/skins/classic/views/stats.php	7921	%%WWWDIR%%/skins/classic/views/stats.php
7859	%%WWWDIR%%/skins/classic/views/status.php	7922	%%WWWDIR%%/skins/classic/views/status.php
Lines 7870-7875 man/man8/zoneminder-zmx10.pl.8.gz Link Here
7870	%%WWWDIR%%/tools/mootools/mootools-core.js	7933	%%WWWDIR%%/tools/mootools/mootools-core.js
7871	%%WWWDIR%%/tools/mootools/mootools-more-1.6.0.js	7934	%%WWWDIR%%/tools/mootools/mootools-more-1.6.0.js
7872	%%WWWDIR%%/tools/mootools/mootools-more.js	7935	%%WWWDIR%%/tools/mootools/mootools-more.js
		7936	%%WWWDIR%%/vendor/autoload.php
		7937	%%WWWDIR%%/vendor/composer/ClassLoader.php
		7938	%%WWWDIR%%/vendor/composer/LICENSE
		7939	%%WWWDIR%%/vendor/composer/autoload_classmap.php
		7940	%%WWWDIR%%/vendor/composer/autoload_files.php
		7941	%%WWWDIR%%/vendor/composer/autoload_namespaces.php
		7942	%%WWWDIR%%/vendor/composer/autoload_psr4.php
		7943	%%WWWDIR%%/vendor/composer/autoload_real.php
		7944	%%WWWDIR%%/vendor/composer/autoload_static.php
		7945	%%WWWDIR%%/vendor/composer/installed.json
		7946	%%WWWDIR%%/vendor/firebase/php-jwt/LICENSE
		7947	%%WWWDIR%%/vendor/firebase/php-jwt/README.md
		7948	%%WWWDIR%%/vendor/firebase/php-jwt/composer.json
		7949	%%WWWDIR%%/vendor/firebase/php-jwt/src/BeforeValidException.php
		7950	%%WWWDIR%%/vendor/firebase/php-jwt/src/ExpiredException.php
		7951	%%WWWDIR%%/vendor/firebase/php-jwt/src/JWT.php
		7952	%%WWWDIR%%/vendor/firebase/php-jwt/src/SignatureInvalidException.php
		7953	%%WWWDIR%%/vendor/ircmaxell/password-compat/LICENSE.md
		7954	%%WWWDIR%%/vendor/ircmaxell/password-compat/composer.json
		7955	%%WWWDIR%%/vendor/ircmaxell/password-compat/lib/password.php
		7956	%%WWWDIR%%/vendor/ircmaxell/password-compat/version-test.php
7873	%%WWWDIR%%/views/archive.php	7957	%%WWWDIR%%/views/archive.php
7874	%%WWWDIR%%/views/image.php	7958	%%WWWDIR%%/views/image.php
7875	%%WWWDIR%%/views/view_video.php	7959	%%WWWDIR%%/views/view_video.php