Attachment #199965 for bug #233289

Lines 1-8 Link Here

(-)Makefile (-12 / +20 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= zoneminder	3	PORTNAME= zoneminder
4	PORTVERSION= 1.30.4	4	PORTVERSION= 1.32.2
5	PORTREVISION= 6
6	CATEGORIES= multimedia	5	CATEGORIES= multimedia
7		6
8	MAINTAINER= bsd@abinet.ru	7	MAINTAINER= bsd@abinet.ru
Lines 24-31 Link Here
24	p5-SOAP-WSDL>=0:devel/p5-SOAP-WSDL \	23	p5-SOAP-WSDL>=0:devel/p5-SOAP-WSDL \
25	p5-Data-UUID>=0:devel/p5-Data-UUID \	24	p5-Data-UUID>=0:devel/p5-Data-UUID \
26	p5-IO-Socket-Multicast>=0:net/p5-IO-Socket-Multicast \	25	p5-IO-Socket-Multicast>=0:net/p5-IO-Socket-Multicast \
		26	p5-Number-Bytes-Human>=0:devel/p5-Number-Bytes-Human \
		27	p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
27	ffmpeg:multimedia/ffmpeg	28	ffmpeg:multimedia/ffmpeg
28	BUILD_DEPENDS= ${ZM_DEPENDS}	29	BUILD_DEPENDS= ${ZM_DEPENDS}
		30	LIB_DEPENDS= libx264.so:multimedia/libx264 \
		31	libmp4v2.so:multimedia/mp4v2
29	RUN_DEPENDS= ${ZM_DEPENDS} \	32	RUN_DEPENDS= ${ZM_DEPENDS} \
30	sudo:security/sudo \	33	sudo:security/sudo \
31	p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \	34	p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \
Lines 32-39 Link Here
32	zip:archivers/zip	35	zip:archivers/zip
33		36
34	USE_GITHUB= yes	37	USE_GITHUB= yes
35	GH_PROJECT= ZoneMinder	38	GH_PROJECT= zoneminder
36	GH_TUPLE= FriendsOfCake:crud:c3976f1:crud	39	GH_TUPLE= zoneminder:crud:0bd63fb:crud \
		40	zoneminder:CakePHP-Enum-Behavior:ea90c0c:crud_plugin
37		41
38	USES= cmake:noninja jpeg mysql perl5 php shebangfix ssl	42	USES= cmake:noninja jpeg mysql perl5 php shebangfix ssl
39	USE_RC_SUBR= zoneminder	43	USE_RC_SUBR= zoneminder
Lines 56-61 Link Here
56	scripts/zmdc.pl.in \	60	scripts/zmdc.pl.in \
57	scripts/zmfilter.pl.in \	61	scripts/zmfilter.pl.in \
58	scripts/zmpkg.pl.in \	62	scripts/zmpkg.pl.in \
		63	scripts/zmstats.pl.in \
59	scripts/zmtelemetry.pl.in \	64	scripts/zmtelemetry.pl.in \
60	scripts/zmtrack.pl.in \	65	scripts/zmtrack.pl.in \
61	scripts/zmtrigger.pl.in \	66	scripts/zmtrigger.pl.in \
Lines 63-81 Link Here
63	scripts/zmvideo.pl.in \	68	scripts/zmvideo.pl.in \
64	scripts/zmwatch.pl.in \	69	scripts/zmwatch.pl.in \
65	scripts/zmx10.pl.in \	70	scripts/zmx10.pl.in \
66	onvif/scripts/zmonvif-probe.pl	71	scripts/zmonvif-probe.pl.in
67		72
68	PORTDOCS= AUTHORS BUGS ChangeLog INSTALL NEWS README.FreeBSD TODO	73	PORTDOCS= AUTHORS BUGS ChangeLog INSTALL NEWS README.FreeBSD TODO
69		74
70	CMAKE_ARGS+= -DZM_PERL_MM_PARMS=INSTALLDIRS=site \	75	CMAKE_ARGS+= -DZM_PERL_MM_PARMS=INSTALLDIRS=site \
71	-DZM_CONFIG_DIR=${PREFIX}/etc \	76	-DZM_CONFIG_DIR=${PREFIX}/etc \
		77	-DZM_CONFIG_SUBDIR=${PREFIX}/etc/zoneminder \
72	-DZM_WEBDIR=${WWWDIR} \	78	-DZM_WEBDIR=${WWWDIR} \
73	-DZM_CGIDIR=${WWWDIR}/cgi-bin \	79	-DZM_CGIDIR=${WWWDIR}/cgi-bin \
74	-DZM_CONTENTDIR=${WWWDIR} \	80	-DZM_CONTENTDIR=/var/db/zoneminder \
		81	-DZM_MANPAGE_DEST_PREFIX=${PREFIX}/man \
75	-DHAVE_SENDFILE=0 \	82	-DHAVE_SENDFILE=0 \
76	-DZM_NO_CURL=ON \	83	-DZM_NO_CURL=ON \
77	-DZM_NO_LIBVLC=ON \	84	-DZM_NO_LIBVLC=ON \
78	-DPCRE_LIBRARIES=0 \	85	-DPCRE_LIBRARIES=0 \
		86	-DZM_PATH_MAP=/tmp \
79	-DGNUTLS_LIBRARIES=0 \	87	-DGNUTLS_LIBRARIES=0 \
80	-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"	88	-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
81		89
Lines 91-112 Link Here
91		99
92	post-extract:	100	post-extract:
93	${CP} -R ${WRKSRC_crud}/* ${WRKSRC}/web/api/app/Plugin/Crud	101	${CP} -R ${WRKSRC_crud}/* ${WRKSRC}/web/api/app/Plugin/Crud
		102	${CP} -R ${WRKSRC_crud_plugin}/* ${WRKSRC}/web/api/app/Plugin/CakePHP-Enum-Behavior
94	${CP} ${FILESDIR}/README.FreeBSD ${WRKSRC}	103	${CP} ${FILESDIR}/README.FreeBSD ${WRKSRC}
95	${CP} ${FILESDIR}/README.FreeBSD ${PKGMESSAGE}	104	${CP} ${FILESDIR}/README.FreeBSD ${PKGMESSAGE}
96	${REINPLACE_CMD} -e 's\|/dev/shm\|/tmp\|g' ${WRKSRC}/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in	105	${REINPLACE_CMD} -e 's\|/dev/shm\|/tmp\|g' ${WRKSRC}/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
97	${REINPLACE_CMD} -e 's\|E_ALL\|E_ALL^E_NOTICE\|g' ${WRKSRC}/web/index.php	106	# ${REINPLACE_CMD} -e 's\|E_ALL\|E_ALL^E_NOTICE\|g' ${WRKSRC}/web/index.php
98		107
99	pre-install:	108	pre-install:
100	${MKDIR} ${STAGEDIR}${WWWDIR}/images
101	${MKDIR} ${STAGEDIR}${WWWDIR}/events
102	${MKDIR} ${STAGEDIR}${WWWDIR}/temp	109	${MKDIR} ${STAGEDIR}${WWWDIR}/temp
103	${MKDIR} ${STAGEDIR}${WWWDIR}/api/app/tmp	110	${MKDIR} ${STAGEDIR}${WWWDIR}/api/app/tmp
		111	${MKDIR} ${STAGEDIR}/var/cache/zoneminder
		112	${MKDIR} ${STAGEDIR}/var/cache/zoneminder/events
		113	${MKDIR} ${STAGEDIR}/var/cache/zoneminder/images
		114	${MKDIR} ${STAGEDIR}/var/db/zoneminder
104	${MKDIR} ${STAGEDIR}/var/run/zm	115	${MKDIR} ${STAGEDIR}/var/run/zm
105	${MKDIR} ${STAGEDIR}/var/tmp/zm	116	${MKDIR} ${STAGEDIR}/var/tmp/zm
106		117
107	post-install:
108	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/zm.conf ${STAGEDIR}${PREFIX}/etc/zm.conf.sample
109
110	post-install-DOCS-on:	118	post-install-DOCS-on:
111	${MKDIR} ${STAGEDIR}${DOCSDIR}	119	${MKDIR} ${STAGEDIR}${DOCSDIR}
112	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}	120	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}

Lines 1-5 Link Here

(-)distinfo (-5 / +7 lines)
1	TIMESTAMP = 1496073899	1	TIMESTAMP = 1541609433
2	SHA256 (zoneminder-ZoneMinder-1.30.4_GH0.tar.gz) = 5461350caa9d8ec58deb1ef08e2e1641084e694f2a9f9e17b3b678b1a43203c7	2	SHA256 (zoneminder-zoneminder-1.32.2_GH0.tar.gz) = cf72cbd45d91ef0232c123dac5f908993f8941a62b9ae96975c4e6043bd4b9a9
3	SIZE (zoneminder-ZoneMinder-1.30.4_GH0.tar.gz) = 9937142	3	SIZE (zoneminder-zoneminder-1.32.2_GH0.tar.gz) = 10639207
4	SHA256 (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 7dfa29dd6dd95f05bca61bb05033f813828b7ab66f9d8793d306df0dd72471ce	4	SHA256 (zoneminder-crud-0bd63fb_GH0.tar.gz) = d4c82d714ea74606726d11be973b17d3f9b57ad6c6559e1a29affa60c6f3a579
5	SIZE (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 72961	5	SIZE (zoneminder-crud-0bd63fb_GH0.tar.gz) = 73129
		6	SHA256 (zoneminder-CakePHP-Enum-Behavior-ea90c0c_GH0.tar.gz) = 3a9006c7c59f2b864ce628df4725b241fc23cfd9abc56e746acbd22d850f5ab1
		7	SIZE (zoneminder-CakePHP-Enum-Behavior-ea90c0c_GH0.tar.gz) = 3500





1. Preliminary steps

1.1 Install databases/mysql57-server or newer
	You may choose your favourite method - ports or packages here. 
	FreeBSD default setting use STRICT_TRANS_TABLES sql_mode. It's mandatory to disable it. Edit your my.cnf accordingly

	The following SQL mode should be compatible with ZM:
		sql_mode= NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION

	ZoneMinder use very simple queries, however it tends to write to 
	the database quite a lot depending on your capture mode and number 
	of cameras. So tweak your MySQL instance accordantly

	We provide an example for an HTTP install, however, you should use 
	HTTPS if you plan to expose your installation to the public. There 
	are plenty guides how to do it and security/letsencrypt.sh is a 
	good way to get a valid SSL certificate. Probably, your installation
	will be behind reverse proxy, so this example should work for you.

	Please, notive the following issues with ZM:

	- web interface has several hardcoded /zm in url generation, so it is
		mandatory to serve your installtion from /zm subfolder
	- if behind reverse proxy, HTTP_X_FORWARDED_PROTO must be supplied or link
		generation will use http://

	Your server block should include the following:

	server {
		listen 80;
				try_files $uri $uri/ /index.php$is_args$args;
				index index.php;

		root /usr/local/www/zoneminder;
		index index.php
		gzip off;
						fastcgi_pass    unix:/var/run/fcgiwrap/fcgiwrap.sock;
				}

		location /cgi-bin/nph-zms {
						include fastcgi_params;
						fastcgi_param   SCRIPT_FILENAME  $document_root$fastcgi_script_name;
						fastcgi_pass    unix:/var/run/php-fpm.sock;
				}

			include fastcgi_params;
			fastcgi_param SCRIPT_FILENAME $request_filename;
			fastcgi_pass  unix:/var/run/fcgiwrap/fcgiwrap.sock;
		}

		location /zm/cache {
	auth over HTTPS if you don't need fine grain control to ZoneMinder components.

			alias /var/cache/zoneminder;
		}

		location /zm {

			alias	/usr/local/www/zoneminder;

			location ~ \.php$ {

				if (!-f $request_filename) { return 404; }
				include fastcgi_params;
				fastcgi_param SCRIPT_FILENAME $request_filename;
				fastcgi_index index.php;
				fastcgi_pass unix:/var/run/php-fpm.sock;
			}

			location ~ \.(jpg|jpeg|gif|png|ico)$ {
				access_log	off;
				expires	33d;
			}

			location /zm/api/ {
				alias	/usr/local/www/zoneminder;
				rewrite ^/zm/api(.+)$ /zm/api/app/webroot/index.php?p=$1 last;
			}
		}
	}

	Enable and start NGINX
		sysrc nginx_enable="YES"
		service nginx start

	
3. Start ZoneMinder
	service zoneminder start

Upgrading from www/zoneminder 1.30.x or www/zoneminder-h264
=====================================================

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	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)
 		include_directories("${MYSQLCLIENT_INCLUDE_DIR}")
 		set(CMAKE_REQUIRED_INCLUDES "${MYSQLCLIENT_INCLUDE_DIR}")
 	endif(MYSQLCLIENT_INCLUDE_DIR)
 	mark_as_advanced(FORCE MYSQLCLIENT_LIBRARIES MYSQLCLIENT_INCLUDE_DIR)
-	check_include_file("mysql/mysql.h" HAVE_MYSQL_H)
+	check_include_file("mysql.h" HAVE_MYSQL_H)
 	if(NOT HAVE_MYSQL_H)
 		message(FATAL_ERROR 
                     "ZoneMinder requires MySQL headers - check that MySQL development packages are installed")
@@ -658,13 +658,6 @@ endif(NOT ZM_WEB_GROUP)
 message(STATUS "Using web user: ${ZM_WEB_USER}")
 message(STATUS "Using web group: ${ZM_WEB_GROUP}")
 
 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)
 




Partially based on https://github.com/ZoneMinder/zoneminder/commit/e17bcb9178d0

--- src/zm_mpeg.cpp.orig	2017-05-09 14:54:48 UTC
+++ src/zm_mpeg.cpp
@@ -240,7 +240,11 @@ void VideoStream::SetupCodec( int colours, int subpixe
     {
       // Quality based bitrate control (VBR). Scale is 1..31 where 1 is best.
       // This gets rid of artifacts in the beginning of the movie; and well, even quality.
+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
+      c->flags |= AV_CODEC_FLAG_QSCALE;
+#else
       c->flags |= CODEC_FLAG_QSCALE;
+#endif
       c->global_quality = FF_QP2LAMBDA * (31 - (31 * (bitrate / 100.0)));
     }
     else
@@ -265,7 +269,11 @@ void VideoStream::SetupCodec( int colours, int subpixe
 
     // some formats want stream headers to be separate
     if ( of->flags & AVFMT_GLOBALHEADER )
+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
+      c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+#else
       c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+#endif
   }
   else
   {
@@ -425,7 +433,9 @@ void VideoStream::OpenStream( )
   }
 
   video_outbuf = NULL;
+#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0)
   if ( !(of->flags & AVFMT_RAWPICTURE) )
+#endif
   {
     /* allocate output buffer */
     /* XXX: API change will be done */
@@ -672,6 +682,7 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t
   AVPacket *pkt = packet_buffers[packet_index];
   av_init_packet( pkt );
   int got_packet = 0;
+#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0)
   if ( of->flags & AVFMT_RAWPICTURE )
   {
 #if LIBAVCODEC_VERSION_CHECK(52, 30, 2, 30, 2)
@@ -685,6 +696,7 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t
     got_packet = 1;
   }
   else
+#endif
   {
     opicture_ptr->pts = c->frame_number;
     opicture_ptr->quality = c->global_quality;
--- src/zm_sdp.cpp.orig	2017-05-09 14:54:48 UTC
+++ src/zm_sdp.cpp
@@ -483,7 +483,11 @@ AVFormatContext *SessionDescriptor::generateFormatCont
           uint8_t *dest = 
           (uint8_t *)av_malloc(packet_size + sizeof(start_sequence) +
                        stream->codec->extradata_size +
+#if LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
+                       AV_INPUT_BUFFER_PADDING_SIZE);
+#else
                        FF_INPUT_BUFFER_PADDING_SIZE);
+#endif
           if(dest) {
               if(stream->codec->extradata_size) {
                 // av_realloc?
@@ -494,7 +498,11 @@ AVFormatContext *SessionDescriptor::generateFormatCont
               memcpy(dest+stream->codec->extradata_size, start_sequence, sizeof(start_sequence));
               memcpy(dest+stream->codec->extradata_size+sizeof(start_sequence), decoded_packet, packet_size);
               memset(dest+stream->codec->extradata_size+sizeof(start_sequence)+
+#if LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
+                     packet_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+#else
                      packet_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+#endif
 
               stream->codec->extradata= dest;
               stream->codec->extradata_size+= sizeof(start_sequence)+packet_size;




--- misc/CMakeLists.txt.orig	2016-06-01 00:41:17 UTC
+++ misc/CMakeLists.txt
@@ -13,6 +13,7 @@ configure_file(zoneminder-tmpfiles.conf.
 #install(FILES "${CMAKE_CURRENT_BINARY_DIR}/apache.conf" "${CMAKE_CURRENT_BINARY_DIR}/logrotate.conf" "${CMAKE_CURRENT_BINARY_DIR}/syslog.conf" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/misc")
 
 # Install Policykit rules and actions into the proper folders
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.policy" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions")
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.rules" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/rules.d")
+# polkit is not required for FreeBSD
+#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.policy" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions")
+#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.rules" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/rules.d")
 




--- scripts/CMakeLists.txt.orig	2018-10-13 18:36:15 UTC
+++ scripts/CMakeLists.txt
@@ -31,7 +31,7 @@ configure_file(zm.in "${CMAKE_CURRENT_BINARY_DIR}/zm" 
 file(GLOB perlscripts "*.pl")
 FOREACH(PERLSCRIPT ${perlscripts})
     get_filename_component(PERLSCRIPTNAME ${PERLSCRIPT} NAME)
-    POD2MAN(${PERLSCRIPT} zoneminder-${PERLSCRIPTNAME} 8)
+    POD2MAN(${PERLSCRIPT} zoneminder-${PERLSCRIPTNAME} 8 ${ZM_MANPAGE_DEST_PREFIX})
 ENDFOREACH(PERLSCRIPT ${perlscripts})
 
 # Install the perl scripts
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmaudit.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcontrol.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmdc.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmfilter.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmpkg.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrack.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrigger.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmupdate.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtelemetry.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmaudit.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcontrol.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmdc.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmfilter.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmpkg.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrack.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrigger.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmupdate.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtelemetry.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 if(NOT ZM_NO_X10)
 	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 endif(NOT ZM_NO_X10)

Line 0 Link Here

(-)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_image.cpp.orig	2016-06-01 00:41:17 UTC
+++ src/zm_image.cpp
@@ -1619,12 +1619,9 @@ Image *Image::Highlight( unsigned int n_
       for ( unsigned int j = 0; j < n_images; j++ )
       {
         uint8_t *psrc = images[j]->buffer+c;
-
-#ifndef SOLARIS
-        if ( (unsigned)abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
-#else
-        if ( (unsigned)std::abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
-#endif
+       unsigned int diff = ((*psrc)-RGB_VAL(ref_colour,c)) > 0 ? (*psrc)-RGB_VAL(ref_colour,c) : RGB_VAL(ref_colour,c) - (*psrc);
+        
+       if (diff >= RGB_VAL(threshold,c))
         {
           count++;
         }




--- src/zm_logger.cpp	
+++ src/zm_logger.cpp	
@@ -504,7 +504,8 @@ 
     va_list     argPtr;
     struct timeval  timeVal;
 
-    const char * const file = basename(filepath);
+    char *filecopy = strdup(filepath);
+    const char * const file = basename(filecopy);
     
     if ( level < PANIC || level > DEBUG9 )
       Panic( "Invalid logger level %d", level );
@@ -624,6 +625,8 @@ 
         abort();
       exit( -1 );
     }
+
+    free(filecopy);
   }
 }




--- src/zm_monitor.cpp.orig	2018-10-13 18:36:15 UTC
+++ src/zm_monitor.cpp
@@ -2110,6 +2110,7 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zone
   Camera *camera = 0;
   if ( type == "Local" ) {
     mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
-    if ( mem_ptr < 0 )
+    if ( mem_ptr < (void *)0 )
     {
       Debug( 3, "Can't shmat link memory: %s", strerror(errno) );
       connected = false;
@@ -194,7 +194,7 @@ bool Monitor::MonitorLink::disconnect()
     connected = false;
 
+#if ZM_HAS_V4L
     int extras = (deinterlacing>>24)&0xff;
 
     camera = new LocalCamera(
@@ -2132,6 +2133,9 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zone
         record_audio,
         extras
         );
+#else
+    Fatal("ZoneMinder not built with Local Camera support");
+#endif
   } else if ( type == "Remote" ) {
     if ( protocol == "http" ) {
       camera = new RemoteCameraHttp(
     exit( -1 );




--- src/zm_signal.cpp.orig	2016-06-01 00:41:17 UTC
+++ src/zm_signal.cpp
@@ -63,17 +63,9 @@ RETSIGTYPE zm_die_handler(int signal)
 		ucontext_t *uc = (ucontext_t *) context;
 		cr2 = info->si_addr;
     #if defined(__x86_64__)
-	    #ifdef __FreeBSD_kernel__
 		ip = (void *)(uc->uc_mcontext.mc_rip);
-	    #else
-		ip = (void *)(uc->uc_mcontext.gregs[REG_RIP]);
-	    #endif
     #else
-	    #ifdef __FreeBSD_kernel__
 		ip = (void *)(uc->uc_mcontext.mc_eip);
-	    #else
-		ip = (void *)(uc->uc_mcontext.gregs[REG_EIP]);
-	    #endif
     #endif				// defined(__x86_64__)
 
 		// Print the signal address and instruction pointer if available




--- src/zm_stream.cpp.orig	2018-11-07 16:33:47 UTC
+++ src/zm_stream.cpp
@@ -325,7 +325,7 @@ void StreamBase::openComms() {
     strncpy(loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path));
     strncpy( loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path) );
     loc_addr.sun_family = AF_UNIX;
 		Debug(3, "Binding to %s", loc_sock_path);
-    if ( bind(sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1) < 0 ) {
+    if ( ::bind(sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1) < 0 ) {
       Fatal("Can't bind: %s", strerror(errno));
     }
 




--- src/zmf.cpp.orig	2017-05-09 14:54:48 UTC
+++ src/zmf.cpp
@@ -92,7 +92,7 @@ int OpenSocket( int monitor_id )
   strncpy( addr.sun_path, sock_path, sizeof(addr.sun_path) );
   addr.sun_family = AF_UNIX;
 
-  if ( bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
+  if ( ::bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
   {
     Error( "Can't bind: %s", strerror(errno) );
     exit( -1 );
@@ -331,7 +331,7 @@ int main( int argc, char *argv[] )
     Debug( 1, "Got image, writing to %s", path );
 
     FILE *fd = 0;
-    if ( (fd = fopen( path, "w" )) < 0 )
+    if ( (fd = fopen( path, "w" )) == NULL )
     {
       Error( "Can't fopen '%s': %s", path, strerror(errno) );
       exit( -1 );

Line 0 Link Here

(-)files/patch-web_lang_default.php (+7 lines)
	1	--- web/lang/default.php.orig 2018-10-13 18:36:15 UTC
	2	+++ web/lang/default.php
	3	@@ -41,4 +41,3 @@ $DLANG = array(
	4	);
	5
	6	?>
	7	-

Lines 4-13 Link Here

(-)pkg-plist (-93 / +323 lines)
4	bin/zmcamtool.pl	4	bin/zmcamtool.pl
5	bin/zmcontrol.pl	5	bin/zmcontrol.pl
6	bin/zmdc.pl	6	bin/zmdc.pl
7	bin/zmf
8	bin/zmfilter.pl	7	bin/zmfilter.pl
9	bin/zmonvif-probe.pl	8	bin/zmonvif-probe.pl
10	bin/zmpkg.pl	9	bin/zmpkg.pl
		10	bin/zmstats.pl
11	bin/zmtelemetry.pl	11	bin/zmtelemetry.pl
12	bin/zmtrack.pl	12	bin/zmtrack.pl
13	bin/zmtrigger.pl	13	bin/zmtrigger.pl
Lines 16-22 Link Here
16	bin/zmvideo.pl	16	bin/zmvideo.pl
17	bin/zmwatch.pl	17	bin/zmwatch.pl
18	bin/zmx10.pl	18	bin/zmx10.pl
19	@sample etc/zm.conf.sample	19	etc/zm.conf
		20	%%ETCDIR%%/01-system-paths.conf
		21	%%ETCDIR%%/02-multiserver.conf
		22	%%ETCDIR%%/README
20	%%SITE_PERL%%/ONVIF/Analytics/Attributes/actor.pm	23	%%SITE_PERL%%/ONVIF/Analytics/Attributes/actor.pm
21	%%SITE_PERL%%/ONVIF/Analytics/Attributes/contentType.pm	24	%%SITE_PERL%%/ONVIF/Analytics/Attributes/contentType.pm
22	%%SITE_PERL%%/ONVIF/Analytics/Attributes/encodingStyle.pm	25	%%SITE_PERL%%/ONVIF/Analytics/Attributes/encodingStyle.pm
Lines 2978-2983 Link Here
2978	%%SITE_PERL%%/ZoneMinder/Control.pm	2981	%%SITE_PERL%%/ZoneMinder/Control.pm
2979	%%SITE_PERL%%/ZoneMinder/Control/3S.pm	2982	%%SITE_PERL%%/ZoneMinder/Control/3S.pm
2980	%%SITE_PERL%%/ZoneMinder/Control/AxisV2.pm	2983	%%SITE_PERL%%/ZoneMinder/Control/AxisV2.pm
		2984	%%SITE_PERL%%/ZoneMinder/Control/DCS3415.pm
		2985	%%SITE_PERL%%/ZoneMinder/Control/Dahua.pm
		2986	%%SITE_PERL%%/ZoneMinder/Control/DericamP2.pm
2981	%%SITE_PERL%%/ZoneMinder/Control/FI8608W_Y2k.pm	2987	%%SITE_PERL%%/ZoneMinder/Control/FI8608W_Y2k.pm
2982	%%SITE_PERL%%/ZoneMinder/Control/FI8620_Y2k.pm	2988	%%SITE_PERL%%/ZoneMinder/Control/FI8620_Y2k.pm
2983	%%SITE_PERL%%/ZoneMinder/Control/FI8908W.pm	2989	%%SITE_PERL%%/ZoneMinder/Control/FI8908W.pm
Lines 2984-3003 Link Here
2984	%%SITE_PERL%%/ZoneMinder/Control/FI8918W.pm	2990	%%SITE_PERL%%/ZoneMinder/Control/FI8918W.pm
2985	%%SITE_PERL%%/ZoneMinder/Control/FI9821W_Y2k.pm	2991	%%SITE_PERL%%/ZoneMinder/Control/FI9821W_Y2k.pm
2986	%%SITE_PERL%%/ZoneMinder/Control/FI9831W.pm	2992	%%SITE_PERL%%/ZoneMinder/Control/FI9831W.pm
		2993	%%SITE_PERL%%/ZoneMinder/Control/Floureon.pm
2987	%%SITE_PERL%%/ZoneMinder/Control/HikVision.pm	2994	%%SITE_PERL%%/ZoneMinder/Control/HikVision.pm
		2995	%%SITE_PERL%%/ZoneMinder/Control/IPCAMIOS.pm
2988	%%SITE_PERL%%/ZoneMinder/Control/IPCC7210W.pm	2996	%%SITE_PERL%%/ZoneMinder/Control/IPCC7210W.pm
2989	%%SITE_PERL%%/ZoneMinder/Control/Keekoon.pm	2997	%%SITE_PERL%%/ZoneMinder/Control/Keekoon.pm
2990	%%SITE_PERL%%/ZoneMinder/Control/LoftekSentinel.pm	2998	%%SITE_PERL%%/ZoneMinder/Control/LoftekSentinel.pm
2991	%%SITE_PERL%%/ZoneMinder/Control/M8640.pm	2999	%%SITE_PERL%%/ZoneMinder/Control/M8640.pm
		3000	%%SITE_PERL%%/ZoneMinder/Control/MaginonIPC.pm
2992	%%SITE_PERL%%/ZoneMinder/Control/Ncs370.pm	3001	%%SITE_PERL%%/ZoneMinder/Control/Ncs370.pm
2993	%%SITE_PERL%%/ZoneMinder/Control/Netcat.pm	3002	%%SITE_PERL%%/ZoneMinder/Control/Netcat.pm
		3003	%%SITE_PERL%%/ZoneMinder/Control/PSIA.pm
2994	%%SITE_PERL%%/ZoneMinder/Control/PanasonicIP.pm	3004	%%SITE_PERL%%/ZoneMinder/Control/PanasonicIP.pm
2995	%%SITE_PERL%%/ZoneMinder/Control/PelcoD.pm	3005	%%SITE_PERL%%/ZoneMinder/Control/PelcoD.pm
2996	%%SITE_PERL%%/ZoneMinder/Control/PelcoP.pm	3006	%%SITE_PERL%%/ZoneMinder/Control/PelcoP.pm
		3007	%%SITE_PERL%%/ZoneMinder/Control/Reolink.pm
2997	%%SITE_PERL%%/ZoneMinder/Control/SPP1802SWPTZ.pm	3008	%%SITE_PERL%%/ZoneMinder/Control/SPP1802SWPTZ.pm
2998	%%SITE_PERL%%/ZoneMinder/Control/SkyIPCam7xx.pm	3009	%%SITE_PERL%%/ZoneMinder/Control/SkyIPCam7xx.pm
2999	%%SITE_PERL%%/ZoneMinder/Control/TVIP862.pm
3000	%%SITE_PERL%%/ZoneMinder/Control/Toshiba_IK_WB11A.pm	3010	%%SITE_PERL%%/ZoneMinder/Control/Toshiba_IK_WB11A.pm
		3011	%%SITE_PERL%%/ZoneMinder/Control/Trendnet.pm
3001	%%SITE_PERL%%/ZoneMinder/Control/Visca.pm	3012	%%SITE_PERL%%/ZoneMinder/Control/Visca.pm
3002	%%SITE_PERL%%/ZoneMinder/Control/Vivotek_ePTZ.pm	3013	%%SITE_PERL%%/ZoneMinder/Control/Vivotek_ePTZ.pm
3003	%%SITE_PERL%%/ZoneMinder/Control/Wanscam.pm	3014	%%SITE_PERL%%/ZoneMinder/Control/Wanscam.pm
Lines 3012-3018 Link Here
3012	%%SITE_PERL%%/ZoneMinder/Memory.pm	3023	%%SITE_PERL%%/ZoneMinder/Memory.pm
3013	%%SITE_PERL%%/ZoneMinder/Memory/Mapped.pm	3024	%%SITE_PERL%%/ZoneMinder/Memory/Mapped.pm
3014	%%SITE_PERL%%/ZoneMinder/Memory/Shared.pm	3025	%%SITE_PERL%%/ZoneMinder/Memory/Shared.pm
		3026	%%SITE_PERL%%/ZoneMinder/Monitor.pm
		3027	%%SITE_PERL%%/ZoneMinder/ONVIF.pm
		3028	%%SITE_PERL%%/ZoneMinder/Object.pm
3015	%%SITE_PERL%%/ZoneMinder/Server.pm	3029	%%SITE_PERL%%/ZoneMinder/Server.pm
		3030	%%SITE_PERL%%/ZoneMinder/Storage.pm
3016	%%SITE_PERL%%/ZoneMinder/Trigger/Channel.pm	3031	%%SITE_PERL%%/ZoneMinder/Trigger/Channel.pm
3017	%%SITE_PERL%%/ZoneMinder/Trigger/Channel/File.pm	3032	%%SITE_PERL%%/ZoneMinder/Trigger/Channel/File.pm
3018	%%SITE_PERL%%/ZoneMinder/Trigger/Channel/Handle.pm	3033	%%SITE_PERL%%/ZoneMinder/Trigger/Channel/Handle.pm
Lines 5974-5979 Link Here
5974	%%PERL5_MAN3%%/ZoneMinder::Control.3.gz	5989	%%PERL5_MAN3%%/ZoneMinder::Control.3.gz
5975	%%PERL5_MAN3%%/ZoneMinder::Control::3S.3.gz	5990	%%PERL5_MAN3%%/ZoneMinder::Control::3S.3.gz
5976	%%PERL5_MAN3%%/ZoneMinder::Control::AxisV2.3.gz	5991	%%PERL5_MAN3%%/ZoneMinder::Control::AxisV2.3.gz
		5992	%%PERL5_MAN3%%/ZoneMinder::Control::DCS3415.3.gz
		5993	%%PERL5_MAN3%%/ZoneMinder::Control::Dahua.3.gz
5977	%%PERL5_MAN3%%/ZoneMinder::Control::FI8608W_Y2k.3.gz	5994	%%PERL5_MAN3%%/ZoneMinder::Control::FI8608W_Y2k.3.gz
5978	%%PERL5_MAN3%%/ZoneMinder::Control::FI8620_Y2k.3.gz	5995	%%PERL5_MAN3%%/ZoneMinder::Control::FI8620_Y2k.3.gz
5979	%%PERL5_MAN3%%/ZoneMinder::Control::FI8908W.3.gz	5996	%%PERL5_MAN3%%/ZoneMinder::Control::FI8908W.3.gz
Lines 5980-5995 Link Here
5980	%%PERL5_MAN3%%/ZoneMinder::Control::FI8918W.3.gz	5997	%%PERL5_MAN3%%/ZoneMinder::Control::FI8918W.3.gz
5981	%%PERL5_MAN3%%/ZoneMinder::Control::FI9821W_Y2k.3.gz	5998	%%PERL5_MAN3%%/ZoneMinder::Control::FI9821W_Y2k.3.gz
5982	%%PERL5_MAN3%%/ZoneMinder::Control::FI9831W.3.gz	5999	%%PERL5_MAN3%%/ZoneMinder::Control::FI9831W.3.gz
		6000	%%PERL5_MAN3%%/ZoneMinder::Control::Floureon.3.gz
5983	%%PERL5_MAN3%%/ZoneMinder::Control::IPCC7210W.3.gz	6001	%%PERL5_MAN3%%/ZoneMinder::Control::IPCC7210W.3.gz
5984	%%PERL5_MAN3%%/ZoneMinder::Control::M8640.3.gz	6002	%%PERL5_MAN3%%/ZoneMinder::Control::M8640.3.gz
		6003	%%PERL5_MAN3%%/ZoneMinder::Control::MaginonIPC.3.gz
5985	%%PERL5_MAN3%%/ZoneMinder::Control::Ncs370.3.gz	6004	%%PERL5_MAN3%%/ZoneMinder::Control::Ncs370.3.gz
		6005	%%PERL5_MAN3%%/ZoneMinder::Control::PSIA.3.gz
5986	%%PERL5_MAN3%%/ZoneMinder::Control::PanasonicIP.3.gz	6006	%%PERL5_MAN3%%/ZoneMinder::Control::PanasonicIP.3.gz
5987	%%PERL5_MAN3%%/ZoneMinder::Control::PelcoD.3.gz	6007	%%PERL5_MAN3%%/ZoneMinder::Control::PelcoD.3.gz
5988	%%PERL5_MAN3%%/ZoneMinder::Control::PelcoP.3.gz	6008	%%PERL5_MAN3%%/ZoneMinder::Control::PelcoP.3.gz
5989	%%PERL5_MAN3%%/ZoneMinder::Control::SPP1802SWPTZ.3.gz	6009	%%PERL5_MAN3%%/ZoneMinder::Control::SPP1802SWPTZ.3.gz
5990	%%PERL5_MAN3%%/ZoneMinder::Control::SkyIPCam7xx.3.gz	6010	%%PERL5_MAN3%%/ZoneMinder::Control::SkyIPCam7xx.3.gz
5991	%%PERL5_MAN3%%/ZoneMinder::Control::TVIP862.3.gz
5992	%%PERL5_MAN3%%/ZoneMinder::Control::Toshiba_IK_WB11A.3.gz	6011	%%PERL5_MAN3%%/ZoneMinder::Control::Toshiba_IK_WB11A.3.gz
		6012	%%PERL5_MAN3%%/ZoneMinder::Control::Trendnet.3.gz
5993	%%PERL5_MAN3%%/ZoneMinder::Control::Visca.3.gz	6013	%%PERL5_MAN3%%/ZoneMinder::Control::Visca.3.gz
5994	%%PERL5_MAN3%%/ZoneMinder::Control::Vivotek_ePTZ.3.gz	6014	%%PERL5_MAN3%%/ZoneMinder::Control::Vivotek_ePTZ.3.gz
5995	%%PERL5_MAN3%%/ZoneMinder::Control::Wanscam.3.gz	6015	%%PERL5_MAN3%%/ZoneMinder::Control::Wanscam.3.gz
Lines 6001-6007 Link Here
6001	%%PERL5_MAN3%%/ZoneMinder::General.3.gz	6021	%%PERL5_MAN3%%/ZoneMinder::General.3.gz
6002	%%PERL5_MAN3%%/ZoneMinder::Logger.3.gz	6022	%%PERL5_MAN3%%/ZoneMinder::Logger.3.gz
6003	%%PERL5_MAN3%%/ZoneMinder::Memory.3.gz	6023	%%PERL5_MAN3%%/ZoneMinder::Memory.3.gz
		6024	%%PERL5_MAN3%%/ZoneMinder::Monitor.3.gz
		6025	%%PERL5_MAN3%%/ZoneMinder::ONVIF.3.gz
		6026	%%PERL5_MAN3%%/ZoneMinder::Object.3.gz
6004	%%PERL5_MAN3%%/ZoneMinder::Server.3.gz	6027	%%PERL5_MAN3%%/ZoneMinder::Server.3.gz
		6028	%%PERL5_MAN3%%/ZoneMinder::Storage.3.gz
6005	%%PERL5_MAN3%%/ZoneMinder::Trigger::Channel.3.gz	6029	%%PERL5_MAN3%%/ZoneMinder::Trigger::Channel.3.gz
6006	%%PERL5_MAN3%%/ZoneMinder::Trigger::Channel::File.3.gz	6030	%%PERL5_MAN3%%/ZoneMinder::Trigger::Channel::File.3.gz
6007	%%PERL5_MAN3%%/ZoneMinder::Trigger::Channel::Handle.3.gz	6031	%%PERL5_MAN3%%/ZoneMinder::Trigger::Channel::Handle.3.gz
Lines 6011-6034 Link Here
6011	%%PERL5_MAN3%%/ZoneMinder::Trigger::Channel::Unix.3.gz	6035	%%PERL5_MAN3%%/ZoneMinder::Trigger::Channel::Unix.3.gz
6012	%%PERL5_MAN3%%/ZoneMinder::Trigger::Connection.3.gz	6036	%%PERL5_MAN3%%/ZoneMinder::Trigger::Connection.3.gz
6013	%%PERL5_MAN3%%/ZoneMinder::Trigger::Connection::Example.3.gz	6037	%%PERL5_MAN3%%/ZoneMinder::Trigger::Connection::Example.3.gz
6014	share/man/man8/zoneminder-zma.8.gz	6038	share/applications/zoneminder.desktop
6015	share/man/man8/zoneminder-zmaudit.pl.8.gz	6039	man/man8/zoneminder-zma.8.gz
6016	share/man/man8/zoneminder-zmc.8.gz	6040	man/man8/zoneminder-zmaudit.pl.8.gz
6017	share/man/man8/zoneminder-zmcamtool.pl.8.gz	6041	man/man8/zoneminder-zmc.8.gz
6018	share/man/man8/zoneminder-zmcontrol.pl.8.gz	6042	man/man8/zoneminder-zmcamtool.pl.8.gz
6019	share/man/man8/zoneminder-zmdc.pl.8.gz	6043	man/man8/zoneminder-zmcontrol.pl.8.gz
6020	share/man/man8/zoneminder-zmf.8.gz	6044	man/man8/zoneminder-zmdc.pl.8.gz
6021	share/man/man8/zoneminder-zmfilter.pl.8.gz	6045	man/man8/zoneminder-zmfilter.pl.8.gz
6022	share/man/man8/zoneminder-zmpkg.pl.8.gz	6046	man/man8/zoneminder-zmonvif-probe.pl.8.gz
6023	share/man/man8/zoneminder-zmsystemctl.pl.8.gz	6047	man/man8/zoneminder-zmpkg.pl.8.gz
6024	share/man/man8/zoneminder-zmtelemetry.pl.8.gz	6048	man/man8/zoneminder-zmstats.pl.8.gz
6025	share/man/man8/zoneminder-zmtrack.pl.8.gz	6049	man/man8/zoneminder-zmsystemctl.pl.8.gz
6026	share/man/man8/zoneminder-zmtrigger.pl.8.gz	6050	man/man8/zoneminder-zmtelemetry.pl.8.gz
6027	share/man/man8/zoneminder-zmu.8.gz	6051	man/man8/zoneminder-zmtrack.pl.8.gz
6028	share/man/man8/zoneminder-zmupdate.pl.8.gz	6052	man/man8/zoneminder-zmtrigger.pl.8.gz
6029	share/man/man8/zoneminder-zmvideo.pl.8.gz	6053	man/man8/zoneminder-zmu.8.gz
6030	share/man/man8/zoneminder-zmwatch.pl.8.gz	6054	man/man8/zoneminder-zmupdate.pl.8.gz
6031	share/man/man8/zoneminder-zmx10.pl.8.gz	6055	man/man8/zoneminder-zmvideo.pl.8.gz
		6056	man/man8/zoneminder-zmwatch.pl.8.gz
		6057	man/man8/zoneminder-zmx10.pl.8.gz
		6058	%%DATADIR%%/db/triggers.sql
6032	%%DATADIR%%/db/zm_create.sql	6059	%%DATADIR%%/db/zm_create.sql
6033	%%DATADIR%%/db/zm_update-0.0.1.sql	6060	%%DATADIR%%/db/zm_update-0.0.1.sql
6034	%%DATADIR%%/db/zm_update-0.9.10.sql	6061	%%DATADIR%%/db/zm_update-0.9.10.sql
Lines 6092-6104 Link Here
6092	%%DATADIR%%/db/zm_update-1.28.110.sql	6119	%%DATADIR%%/db/zm_update-1.28.110.sql
6093	%%DATADIR%%/db/zm_update-1.28.99.sql	6120	%%DATADIR%%/db/zm_update-1.28.99.sql
6094	%%DATADIR%%/db/zm_update-1.29.0.sql	6121	%%DATADIR%%/db/zm_update-1.29.0.sql
6095	%%DATADIR%%/db/zm_update-1.29.1.sql
6096	%%DATADIR%%/db/zm_update-1.30.0.sql	6122	%%DATADIR%%/db/zm_update-1.30.0.sql
6097	%%DATADIR%%/db/zm_update-1.30.1.sql	6123	%%DATADIR%%/db/zm_update-1.30.1.sql
6098	%%DATADIR%%/db/zm_update-1.30.2.sql	6124	%%DATADIR%%/db/zm_update-1.30.2.sql
6099	%%DATADIR%%/db/zm_update-1.30.3.sql	6125	%%DATADIR%%/db/zm_update-1.30.3.sql
6100	%%DATADIR%%/db/zm_update-1.30.4.sql	6126	%%DATADIR%%/db/zm_update-1.30.4.sql
		6127	%%DATADIR%%/db/zm_update-1.31.0.sql
		6128	%%DATADIR%%/db/zm_update-1.31.1.sql
		6129	%%DATADIR%%/db/zm_update-1.31.10.sql
		6130	%%DATADIR%%/db/zm_update-1.31.11.sql
		6131	%%DATADIR%%/db/zm_update-1.31.12.sql
		6132	%%DATADIR%%/db/zm_update-1.31.13.sql
		6133	%%DATADIR%%/db/zm_update-1.31.14.sql
		6134	%%DATADIR%%/db/zm_update-1.31.15.sql
		6135	%%DATADIR%%/db/zm_update-1.31.16.sql
		6136	%%DATADIR%%/db/zm_update-1.31.17.sql
		6137	%%DATADIR%%/db/zm_update-1.31.18.sql
		6138	%%DATADIR%%/db/zm_update-1.31.19.sql
		6139	%%DATADIR%%/db/zm_update-1.31.2.sql
		6140	%%DATADIR%%/db/zm_update-1.31.20.sql
		6141	%%DATADIR%%/db/zm_update-1.31.21.sql
		6142	%%DATADIR%%/db/zm_update-1.31.22.sql
		6143	%%DATADIR%%/db/zm_update-1.31.23.sql
		6144	%%DATADIR%%/db/zm_update-1.31.24.sql
		6145	%%DATADIR%%/db/zm_update-1.31.25.sql
		6146	%%DATADIR%%/db/zm_update-1.31.26.sql
		6147	%%DATADIR%%/db/zm_update-1.31.27.sql
		6148	%%DATADIR%%/db/zm_update-1.31.28.sql
		6149	%%DATADIR%%/db/zm_update-1.31.29.sql
		6150	%%DATADIR%%/db/zm_update-1.31.3.sql
		6151	%%DATADIR%%/db/zm_update-1.31.30.sql
		6152	%%DATADIR%%/db/zm_update-1.31.31.sql
		6153	%%DATADIR%%/db/zm_update-1.31.32.sql
		6154	%%DATADIR%%/db/zm_update-1.31.33.sql
		6155	%%DATADIR%%/db/zm_update-1.31.34.sql
		6156	%%DATADIR%%/db/zm_update-1.31.35.sql
		6157	%%DATADIR%%/db/zm_update-1.31.36.sql
		6158	%%DATADIR%%/db/zm_update-1.31.37.sql
		6159	%%DATADIR%%/db/zm_update-1.31.38.sql
		6160	%%DATADIR%%/db/zm_update-1.31.39.sql
		6161	%%DATADIR%%/db/zm_update-1.31.4.sql
		6162	%%DATADIR%%/db/zm_update-1.31.40.sql
		6163	%%DATADIR%%/db/zm_update-1.31.41.sql
		6164	%%DATADIR%%/db/zm_update-1.31.42.sql
		6165	%%DATADIR%%/db/zm_update-1.31.43.sql
		6166	%%DATADIR%%/db/zm_update-1.31.44.sql
		6167	%%DATADIR%%/db/zm_update-1.31.45.sql
		6168	%%DATADIR%%/db/zm_update-1.31.46.sql
		6169	%%DATADIR%%/db/zm_update-1.31.47.sql
		6170	%%DATADIR%%/db/zm_update-1.31.5.sql
		6171	%%DATADIR%%/db/zm_update-1.31.6.sql
		6172	%%DATADIR%%/db/zm_update-1.31.7.sql
		6173	%%DATADIR%%/db/zm_update-1.31.8.sql
		6174	%%DATADIR%%/db/zm_update-1.31.9.sql
		6175	%%DATADIR%%/db/zm_update-1.32.0.sql
		6176	%%DATADIR%%/db/zm_update-1.32.1.sql
		6177	%%DATADIR%%/db/zm_update-1.32.2.sql
		6178	%%DATADIR%%/icons/16x16/icon.xpm
		6179	%%WWWDIR%%/ajax/add_monitors.php
6101	%%WWWDIR%%/ajax/alarm.php	6180	%%WWWDIR%%/ajax/alarm.php
		6181	%%WWWDIR%%/ajax/console.php
6102	%%WWWDIR%%/ajax/control.php	6182	%%WWWDIR%%/ajax/control.php
6103	%%WWWDIR%%/ajax/event.php	6183	%%WWWDIR%%/ajax/event.php
6104	%%WWWDIR%%/ajax/log.php	6184	%%WWWDIR%%/ajax/log.php
Lines 6106-6117 Link Here
6106	%%WWWDIR%%/ajax/stream.php	6186	%%WWWDIR%%/ajax/stream.php
6107	%%WWWDIR%%/ajax/zone.php	6187	%%WWWDIR%%/ajax/zone.php
6108	%%WWWDIR%%/api/.editorconfig	6188	%%WWWDIR%%/api/.editorconfig
6109	%%WWWDIR%%/api/.gitattributes
6110	%%WWWDIR%%/api/.gitignore
6111	%%WWWDIR%%/api/.htaccess
6112	%%WWWDIR%%/api/CONTRIBUTING.md	6189	%%WWWDIR%%/api/CONTRIBUTING.md
6113	%%WWWDIR%%/api/README.md	6190	%%WWWDIR%%/api/README.md
6114	%%WWWDIR%%/api/app/.htaccess
6115	%%WWWDIR%%/api/app/Config/Schema/db_acl.php	6191	%%WWWDIR%%/api/app/Config/Schema/db_acl.php
6116	%%WWWDIR%%/api/app/Config/Schema/db_acl.sql	6192	%%WWWDIR%%/api/app/Config/Schema/db_acl.sql
6117	%%WWWDIR%%/api/app/Config/Schema/i18n.php	6193	%%WWWDIR%%/api/app/Config/Schema/i18n.php
Lines 6140-6145 Link Here
6140	%%WWWDIR%%/api/app/Controller/ControlsController.php	6216	%%WWWDIR%%/api/app/Controller/ControlsController.php
6141	%%WWWDIR%%/api/app/Controller/EventsController.php	6217	%%WWWDIR%%/api/app/Controller/EventsController.php
6142	%%WWWDIR%%/api/app/Controller/FramesController.php	6218	%%WWWDIR%%/api/app/Controller/FramesController.php
		6219	%%WWWDIR%%/api/app/Controller/GroupsController.php
6143	%%WWWDIR%%/api/app/Controller/HostController.php	6220	%%WWWDIR%%/api/app/Controller/HostController.php
6144	%%WWWDIR%%/api/app/Controller/LogsController.php	6221	%%WWWDIR%%/api/app/Controller/LogsController.php
6145	%%WWWDIR%%/api/app/Controller/MonitorsController.php	6222	%%WWWDIR%%/api/app/Controller/MonitorsController.php
Lines 6146-6151 Link Here
6146	%%WWWDIR%%/api/app/Controller/PagesController.php	6223	%%WWWDIR%%/api/app/Controller/PagesController.php
6147	%%WWWDIR%%/api/app/Controller/ServersController.php	6224	%%WWWDIR%%/api/app/Controller/ServersController.php
6148	%%WWWDIR%%/api/app/Controller/StatesController.php	6225	%%WWWDIR%%/api/app/Controller/StatesController.php
		6226	%%WWWDIR%%/api/app/Controller/StorageController.php
		6227	%%WWWDIR%%/api/app/Controller/UsersController.php
6149	%%WWWDIR%%/api/app/Controller/ZonePresetsController.php	6228	%%WWWDIR%%/api/app/Controller/ZonePresetsController.php
6150	%%WWWDIR%%/api/app/Controller/ZonesController.php	6229	%%WWWDIR%%/api/app/Controller/ZonesController.php
6151	%%WWWDIR%%/api/app/Model/AppModel.php	6230	%%WWWDIR%%/api/app/Model/AppModel.php
Lines 6153-6166 Link Here
6153	%%WWWDIR%%/api/app/Model/Control.php	6232	%%WWWDIR%%/api/app/Model/Control.php
6154	%%WWWDIR%%/api/app/Model/Event.php	6233	%%WWWDIR%%/api/app/Model/Event.php
6155	%%WWWDIR%%/api/app/Model/Frame.php	6234	%%WWWDIR%%/api/app/Model/Frame.php
		6235	%%WWWDIR%%/api/app/Model/Group.php
6156	%%WWWDIR%%/api/app/Model/Host.php	6236	%%WWWDIR%%/api/app/Model/Host.php
6157	%%WWWDIR%%/api/app/Model/Log.php	6237	%%WWWDIR%%/api/app/Model/Log.php
6158	%%WWWDIR%%/api/app/Model/Monitor.php	6238	%%WWWDIR%%/api/app/Model/Monitor.php
6159	%%WWWDIR%%/api/app/Model/Server.php	6239	%%WWWDIR%%/api/app/Model/Server.php
6160	%%WWWDIR%%/api/app/Model/State.php	6240	%%WWWDIR%%/api/app/Model/State.php
		6241	%%WWWDIR%%/api/app/Model/Storage.php
6161	%%WWWDIR%%/api/app/Model/User.php	6242	%%WWWDIR%%/api/app/Model/User.php
6162	%%WWWDIR%%/api/app/Model/Zone.php	6243	%%WWWDIR%%/api/app/Model/Zone.php
6163	%%WWWDIR%%/api/app/Model/ZonePreset.php	6244	%%WWWDIR%%/api/app/Model/ZonePreset.php
		6245	%%WWWDIR%%/api/app/Plugin/CakePHP-Enum-Behavior/Model/Behavior/EnumBehavior.php
		6246	%%WWWDIR%%/api/app/Plugin/CakePHP-Enum-Behavior/composer.json
		6247	%%WWWDIR%%/api/app/Plugin/CakePHP-Enum-Behavior/readme.md
6164	%%WWWDIR%%/api/app/Plugin/Crud/CONTRIBUTING.md	6248	%%WWWDIR%%/api/app/Plugin/Crud/CONTRIBUTING.md
6165	%%WWWDIR%%/api/app/Plugin/Crud/Console/Command/TranslationsShell.php	6249	%%WWWDIR%%/api/app/Plugin/Crud/Console/Command/TranslationsShell.php
6166	%%WWWDIR%%/api/app/Plugin/Crud/Controller/Component/CrudComponent.php	6250	%%WWWDIR%%/api/app/Plugin/Crud/Controller/Component/CrudComponent.php
Lines 6236-6241 Link Here
6236	%%WWWDIR%%/api/app/View/Events/json/view.ctp	6320	%%WWWDIR%%/api/app/View/Events/json/view.ctp
6237	%%WWWDIR%%/api/app/View/Events/xml/index.ctp	6321	%%WWWDIR%%/api/app/View/Events/xml/index.ctp
6238	%%WWWDIR%%/api/app/View/Events/xml/view.ctp	6322	%%WWWDIR%%/api/app/View/Events/xml/view.ctp
		6323	%%WWWDIR%%/api/app/View/Groups/json/edit.ctp
		6324	%%WWWDIR%%/api/app/View/Groups/json/index.ctp
		6325	%%WWWDIR%%/api/app/View/Groups/json/view.ctp
		6326	%%WWWDIR%%/api/app/View/Groups/xml/edit.ctp
		6327	%%WWWDIR%%/api/app/View/Groups/xml/index.ctp
		6328	%%WWWDIR%%/api/app/View/Groups/xml/view.ctp
6239	%%WWWDIR%%/api/app/View/Helper/AppHelper.php	6329	%%WWWDIR%%/api/app/View/Helper/AppHelper.php
6240	%%WWWDIR%%/api/app/View/Layouts/Emails/html/default.ctp	6330	%%WWWDIR%%/api/app/View/Layouts/Emails/html/default.ctp
6241	%%WWWDIR%%/api/app/View/Layouts/Emails/text/default.ctp	6331	%%WWWDIR%%/api/app/View/Layouts/Emails/text/default.ctp
Lines 6251-6259 Link Here
6251	%%WWWDIR%%/api/app/View/Logs/index.ctp	6341	%%WWWDIR%%/api/app/View/Logs/index.ctp
6252	%%WWWDIR%%/api/app/View/Logs/json/index.ctp	6342	%%WWWDIR%%/api/app/View/Logs/json/index.ctp
6253	%%WWWDIR%%/api/app/View/Logs/view.ctp	6343	%%WWWDIR%%/api/app/View/Logs/view.ctp
		6344	%%WWWDIR%%/api/app/View/Monitors/json/add.ctp
6254	%%WWWDIR%%/api/app/View/Monitors/json/edit.ctp	6345	%%WWWDIR%%/api/app/View/Monitors/json/edit.ctp
6255	%%WWWDIR%%/api/app/View/Monitors/json/index.ctp	6346	%%WWWDIR%%/api/app/View/Monitors/json/index.ctp
6256	%%WWWDIR%%/api/app/View/Monitors/json/view.ctp	6347	%%WWWDIR%%/api/app/View/Monitors/json/view.ctp
		6348	%%WWWDIR%%/api/app/View/Monitors/xml/add.ctp
6257	%%WWWDIR%%/api/app/View/Monitors/xml/edit.ctp	6349	%%WWWDIR%%/api/app/View/Monitors/xml/edit.ctp
6258	%%WWWDIR%%/api/app/View/Monitors/xml/index.ctp	6350	%%WWWDIR%%/api/app/View/Monitors/xml/index.ctp
6259	%%WWWDIR%%/api/app/View/Monitors/xml/view.ctp	6351	%%WWWDIR%%/api/app/View/Monitors/xml/view.ctp
Lines 6264-6269 Link Here
6264	%%WWWDIR%%/api/app/View/Servers/xml/edit.ctp	6356	%%WWWDIR%%/api/app/View/Servers/xml/edit.ctp
6265	%%WWWDIR%%/api/app/View/Servers/xml/index.ctp	6357	%%WWWDIR%%/api/app/View/Servers/xml/index.ctp
6266	%%WWWDIR%%/api/app/View/Servers/xml/view.ctp	6358	%%WWWDIR%%/api/app/View/Servers/xml/view.ctp
		6359	%%WWWDIR%%/api/app/View/Users/add.ctp
		6360	%%WWWDIR%%/api/app/View/Users/json/index.ctp
		6361	%%WWWDIR%%/api/app/View/Users/json/view.ctp
		6362	%%WWWDIR%%/api/app/View/Users/login.ctp
		6363	%%WWWDIR%%/api/app/View/Users/xml/index.ctp
		6364	%%WWWDIR%%/api/app/View/Users/xml/view.ctp
6267	%%WWWDIR%%/api/app/View/View/Configs/json/edit.ctp	6365	%%WWWDIR%%/api/app/View/View/Configs/json/edit.ctp
6268	%%WWWDIR%%/api/app/View/View/Configs/json/index.ctp	6366	%%WWWDIR%%/api/app/View/View/Configs/json/index.ctp
6269	%%WWWDIR%%/api/app/View/View/Configs/json/view.ctp	6367	%%WWWDIR%%/api/app/View/View/Configs/json/view.ctp
Lines 6383-6389 Link Here
6383	%%WWWDIR%%/api/app/vendor/composer/installers/tests/Composer/Installers/Test/PiwikInstallerTest.php	6481	%%WWWDIR%%/api/app/vendor/composer/installers/tests/Composer/Installers/Test/PiwikInstallerTest.php
6384	%%WWWDIR%%/api/app/vendor/composer/installers/tests/Composer/Installers/Test/TestCase.php	6482	%%WWWDIR%%/api/app/vendor/composer/installers/tests/Composer/Installers/Test/TestCase.php
6385	%%WWWDIR%%/api/app/vendor/composer/installers/tests/bootstrap.php	6483	%%WWWDIR%%/api/app/vendor/composer/installers/tests/bootstrap.php
6386	%%WWWDIR%%/api/app/webroot/.htaccess
6387	%%WWWDIR%%/api/app/webroot/css/cake.generic.css	6484	%%WWWDIR%%/api/app/webroot/css/cake.generic.css
6388	%%WWWDIR%%/api/app/webroot/favicon.ico	6485	%%WWWDIR%%/api/app/webroot/favicon.ico
6389	%%WWWDIR%%/api/app/webroot/img/cake.icon.png	6486	%%WWWDIR%%/api/app/webroot/img/cake.icon.png
Lines 6477-6483 Link Here
6477	%%WWWDIR%%/api/lib/Cake/Console/Templates/default/views/form.ctp	6574	%%WWWDIR%%/api/lib/Cake/Console/Templates/default/views/form.ctp
6478	%%WWWDIR%%/api/lib/Cake/Console/Templates/default/views/index.ctp	6575	%%WWWDIR%%/api/lib/Cake/Console/Templates/default/views/index.ctp
6479	%%WWWDIR%%/api/lib/Cake/Console/Templates/default/views/view.ctp	6576	%%WWWDIR%%/api/lib/Cake/Console/Templates/default/views/view.ctp
6480	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/.htaccess
6481	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php	6577	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
6482	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.sql	6578	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.sql
6483	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/Schema/i18n.php	6579	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
Lines 6492-6504 Link Here
6492	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/email.php.default	6588	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/email.php.default
6493	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/routes.php	6589	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/routes.php
6494	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/Command/AppShell.php	6590	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
		6591	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/Command/Task/empty
		6592	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/Templates/empty
6495	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/cake	6593	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/cake
6496	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/cake.bat	6594	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/cake.bat
6497	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/cake.php	6595	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/cake.php
6498	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Controller/AppController.php	6596	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Controller/AppController.php
		6597	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Controller/Component/empty
6499	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Controller/PagesController.php	6598	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Controller/PagesController.php
		6599	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Lib/empty
		6600	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Locale/eng/LC_MESSAGES/empty
6500	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Model/AppModel.php	6601	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Model/AppModel.php
		6602	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Model/Behavior/empty
		6603	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Model/Datasource/empty
		6604	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Plugin/empty
6501	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Case/AllTestsTest.php	6605	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Case/AllTestsTest.php
		6606	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Case/Controller/Component/empty
		6607	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Case/Model/Behavior/empty
		6608	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Case/View/Helper/empty
		6609	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Fixture/empty
		6610	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Vendor/empty
6502	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Elements/Flash/default.ctp	6611	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Elements/Flash/default.ctp
6503	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Emails/html/default.ctp	6612	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Emails/html/default.ctp
6504	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Emails/text/default.ctp	6613	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Emails/text/default.ctp
Lines 6515-6524 Link Here
6515	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Layouts/rss/default.ctp	6624	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Layouts/rss/default.ctp
6516	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Layouts/xml/default.ctp	6625	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Layouts/xml/default.ctp
6517	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Pages/home.ctp	6626	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Pages/home.ctp
		6627	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Scaffolds/empty
6518	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/index.php	6628	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/index.php
6519	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/.htaccess	6629	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/tmp/cache/models/empty
		6630	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/tmp/cache/persistent/empty
		6631	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/tmp/cache/views/empty
		6632	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/tmp/logs/empty
		6633	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/tmp/sessions/empty
		6634	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/tmp/tests/empty
6520	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css	6635	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
6521	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/favicon.ico	6636	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/favicon.ico
		6637	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/files/empty
6522	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/cake.icon.png	6638	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/cake.icon.png
6523	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/cake.power.gif	6639	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/cake.power.gif
6524	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/test-error-icon.png	6640	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/test-error-icon.png
Lines 6526-6531 Link Here
6526	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/test-pass-icon.png	6642	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/test-pass-icon.png
6527	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/test-skip-icon.png	6643	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/test-skip-icon.png
6528	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/index.php	6644	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/index.php
		6645	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/js/empty
6529	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/test.php	6646	%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/test.php
6530	%%WWWDIR%%/api/lib/Cake/Console/cake	6647	%%WWWDIR%%/api/lib/Cake/Console/cake
6531	%%WWWDIR%%/api/lib/Cake/Console/cake.bat	6648	%%WWWDIR%%/api/lib/Cake/Console/cake.bat
Lines 6561-6566 Link Here
6561	%%WWWDIR%%/api/lib/Cake/Controller/Controller.php	6678	%%WWWDIR%%/api/lib/Cake/Controller/Controller.php
6562	%%WWWDIR%%/api/lib/Cake/Controller/Scaffold.php	6679	%%WWWDIR%%/api/lib/Cake/Controller/Scaffold.php
6563	%%WWWDIR%%/api/lib/Cake/Core/App.php	6680	%%WWWDIR%%/api/lib/Cake/Core/App.php
		6681	%%WWWDIR%%/api/lib/Cake/Core/CakeObject.php
6564	%%WWWDIR%%/api/lib/Cake/Core/CakePlugin.php	6682	%%WWWDIR%%/api/lib/Cake/Core/CakePlugin.php
6565	%%WWWDIR%%/api/lib/Cake/Core/Configure.php	6683	%%WWWDIR%%/api/lib/Cake/Core/Configure.php
6566	%%WWWDIR%%/api/lib/Cake/Core/Object.php	6684	%%WWWDIR%%/api/lib/Cake/Core/Object.php
Lines 6718-6726 Link Here
6718	%%WWWDIR%%/api/lib/Cake/Test/Case/Controller/PagesControllerTest.php	6836	%%WWWDIR%%/api/lib/Cake/Test/Case/Controller/PagesControllerTest.php
6719	%%WWWDIR%%/api/lib/Cake/Test/Case/Controller/ScaffoldTest.php	6837	%%WWWDIR%%/api/lib/Cake/Test/Case/Controller/ScaffoldTest.php
6720	%%WWWDIR%%/api/lib/Cake/Test/Case/Core/AppTest.php	6838	%%WWWDIR%%/api/lib/Cake/Test/Case/Core/AppTest.php
		6839	%%WWWDIR%%/api/lib/Cake/Test/Case/Core/CakeObjectTest.php
6721	%%WWWDIR%%/api/lib/Cake/Test/Case/Core/CakePluginTest.php	6840	%%WWWDIR%%/api/lib/Cake/Test/Case/Core/CakePluginTest.php
6722	%%WWWDIR%%/api/lib/Cake/Test/Case/Core/ConfigureTest.php	6841	%%WWWDIR%%/api/lib/Cake/Test/Case/Core/ConfigureTest.php
6723	%%WWWDIR%%/api/lib/Cake/Test/Case/Core/ObjectTest.php
6724	%%WWWDIR%%/api/lib/Cake/Test/Case/Error/ErrorHandlerTest.php	6842	%%WWWDIR%%/api/lib/Cake/Test/Case/Error/ErrorHandlerTest.php
6725	%%WWWDIR%%/api/lib/Cake/Test/Case/Error/ExceptionRendererTest.php	6843	%%WWWDIR%%/api/lib/Cake/Test/Case/Error/ExceptionRendererTest.php
6726	%%WWWDIR%%/api/lib/Cake/Test/Case/Event/CakeEventManagerTest.php	6844	%%WWWDIR%%/api/lib/Cake/Test/Case/Event/CakeEventManagerTest.php
Lines 6802-6808 Link Here
6802	%%WWWDIR%%/api/lib/Cake/Test/Case/Utility/SanitizeTest.php	6920	%%WWWDIR%%/api/lib/Cake/Test/Case/Utility/SanitizeTest.php
6803	%%WWWDIR%%/api/lib/Cake/Test/Case/Utility/SecurityTest.php	6921	%%WWWDIR%%/api/lib/Cake/Test/Case/Utility/SecurityTest.php
6804	%%WWWDIR%%/api/lib/Cake/Test/Case/Utility/SetTest.php	6922	%%WWWDIR%%/api/lib/Cake/Test/Case/Utility/SetTest.php
6805	%%WWWDIR%%/api/lib/Cake/Test/Case/Utility/StringTest.php
6806	%%WWWDIR%%/api/lib/Cake/Test/Case/Utility/ValidationTest.php	6923	%%WWWDIR%%/api/lib/Cake/Test/Case/Utility/ValidationTest.php
6807	%%WWWDIR%%/api/lib/Cake/Test/Case/Utility/XmlTest.php	6924	%%WWWDIR%%/api/lib/Cake/Test/Case/Utility/XmlTest.php
6808	%%WWWDIR%%/api/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php	6925	%%WWWDIR%%/api/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
Lines 6953-6963 Link Here
6953	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UnsignedFixture.php	7070	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UnsignedFixture.php
6954	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UserFixture.php	7071	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UserFixture.php
6955	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidFixture.php	7072	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidFixture.php
		7073	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidNativeFixture.php
		7074	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidNativeTagFixture.php
		7075	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidNativeTreeFixture.php
6956	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidTagFixture.php	7076	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidTagFixture.php
6957	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidTreeFixture.php	7077	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidTreeFixture.php
6958	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuiditemFixture.php	7078	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuiditemFixture.php
6959	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php	7079	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php
6960	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php	7080	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php
		7081	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidnativeitemFixture.php
		7082	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioFixture.php
		7083	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioNumericidFixture.php
		7084	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidnativeportfolioFixture.php
6961	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidportfolioFixture.php	7085	%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidportfolioFixture.php
6962	%%WWWDIR%%/api/lib/Cake/Test/Fixture/rss.xml	7086	%%WWWDIR%%/api/lib/Cake/Test/Fixture/rss.xml
6963	%%WWWDIR%%/api/lib/Cake/Test/Fixture/sample.xml	7087	%%WWWDIR%%/api/lib/Cake/Test/Fixture/sample.xml
Lines 6984-6992 Link Here
6984	%%WWWDIR%%/api/lib/Cake/Test/test_app/Config/var_test.php	7108	%%WWWDIR%%/api/lib/Cake/Test/test_app/Config/var_test.php
6985	%%WWWDIR%%/api/lib/Cake/Test/test_app/Config/var_test2.php	7109	%%WWWDIR%%/api/lib/Cake/Test/test_app/Config/var_test2.php
6986	%%WWWDIR%%/api/lib/Cake/Test/test_app/Console/Command/SampleShell.php	7110	%%WWWDIR%%/api/lib/Cake/Test/test_app/Console/Command/SampleShell.php
		7111	%%WWWDIR%%/api/lib/Cake/Test/test_app/Console/Command/Task/empty
6987	%%WWWDIR%%/api/lib/Cake/Test/test_app/Console/Templates/test/classes/test_object.ctp	7112	%%WWWDIR%%/api/lib/Cake/Test/test_app/Console/Templates/test/classes/test_object.ctp
6988	%%WWWDIR%%/api/lib/Cake/Test/test_app/Console/Templates/test/views/admin_edit.ctp	7113	%%WWWDIR%%/api/lib/Cake/Test/test_app/Console/Templates/test/views/admin_edit.ctp
6989	%%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/AppController.php	7114	%%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/AppController.php
		7115	%%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/Component/empty
6990	%%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/PagesController.php	7116	%%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/PagesController.php
6991	%%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/TestAppsErrorController.php	7117	%%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/TestAppsErrorController.php
6992	%%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/TestConfigsController.php	7118	%%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/TestConfigsController.php
Lines 7100-7108 Link Here
7100	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php	7226	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php
7101	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/OtherTaskTask.php	7227	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/OtherTaskTask.php
7102	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php	7228	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php
		7229	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Templates/empty
7103	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/OtherComponent.php	7230	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/OtherComponent.php
7104	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/PluginsComponent.php	7231	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/PluginsComponent.php
7105	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginComponent.php	7232	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginComponent.php
		7233	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginEmailComponent.php
7106	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginOtherComponent.php	7234	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginOtherComponent.php
7107	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginAppController.php	7235	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginAppController.php
7108	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginController.php	7236	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginController.php
Lines 7157-7163 Link Here
7157	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/root.js	7285	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/root.js
7158	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Config/bootstrap.php	7286	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Config/bootstrap.php
7159	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php	7287	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php
		7288	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/Task/empty
7160	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php	7289	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php
		7290	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Templates/empty
7161	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/View/Layouts/Emails/text/default.ctp	7291	%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/View/Layouts/Emails/text/default.ctp
7162	%%WWWDIR%%/api/lib/Cake/Test/test_app/Utility/TestAppEngine.php	7292	%%WWWDIR%%/api/lib/Cake/Test/test_app/Utility/TestAppEngine.php
7163	%%WWWDIR%%/api/lib/Cake/Test/test_app/Vendor/Test/MyTest.php	7293	%%WWWDIR%%/api/lib/Cake/Test/test_app/Vendor/Test/MyTest.php
Lines 7241-7246 Link Here
7241	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Posts/sequencial_nocache.ctp	7371	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Posts/sequencial_nocache.ctp
7242	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp	7372	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp
7243	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Posts/xml/index.ctp	7373	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Posts/xml/index.ctp
		7374	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Scaffolds/empty
7244	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/TestsApps/index.ctp	7375	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/TestsApps/index.ctp
7245	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/TestsApps/json/index.ctp	7376	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/TestsApps/json/index.ctp
7246	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/Elements/test_element.ctp	7377	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/Elements/test_element.ctp
Lines 7261-7266 Link Here
7261	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/js/theme.js	7392	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/js/theme.js
7262	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/pdfs/theme_test.pdf	7393	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/pdfs/theme_test.pdf
7263	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/space image.text	7394	%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/space image.text
		7395	%%WWWDIR%%/api/lib/Cake/Test/test_app/tmp/empty
7264	%%WWWDIR%%/api/lib/Cake/Test/test_app/webroot/img/cake.power.gif	7396	%%WWWDIR%%/api/lib/Cake/Test/test_app/webroot/img/cake.power.gif
7265	%%WWWDIR%%/api/lib/Cake/Test/test_app/webroot/theme/test_theme/css/theme_webroot.css	7397	%%WWWDIR%%/api/lib/Cake/Test/test_app/webroot/theme/test_theme/css/theme_webroot.css
7266	%%WWWDIR%%/api/lib/Cake/Test/test_app/webroot/theme/test_theme/css/webroot_test.css	7398	%%WWWDIR%%/api/lib/Cake/Test/test_app/webroot/theme/test_theme/css/webroot_test.css
Lines 7360-7382 Link Here
7360	%%WWWDIR%%/cgi-bin/nph-zms	7492	%%WWWDIR%%/cgi-bin/nph-zms
7361	%%WWWDIR%%/cgi-bin/zms	7493	%%WWWDIR%%/cgi-bin/zms
7362	%%WWWDIR%%/css/bootstrap.min.css	7494	%%WWWDIR%%/css/bootstrap.min.css
		7495	%%WWWDIR%%/css/bootstrap.min.css.map
7363	%%WWWDIR%%/css/overlay.css	7496	%%WWWDIR%%/css/overlay.css
7364	%%WWWDIR%%/css/reset.css	7497	%%WWWDIR%%/css/reset.css
7365	%%WWWDIR%%/css/spinner.css	7498	%%WWWDIR%%/css/spinner.css
		7499	%%WWWDIR%%/fonts/MaterialIcons-Regular.eot
		7500	%%WWWDIR%%/fonts/MaterialIcons-Regular.ttf
		7501	%%WWWDIR%%/fonts/MaterialIcons-Regular.woff
		7502	%%WWWDIR%%/fonts/MaterialIcons-Regular.woff2
7366	%%WWWDIR%%/fonts/glyphicons-halflings-regular.eot	7503	%%WWWDIR%%/fonts/glyphicons-halflings-regular.eot
7367	%%WWWDIR%%/fonts/glyphicons-halflings-regular.svg	7504	%%WWWDIR%%/fonts/glyphicons-halflings-regular.svg
7368	%%WWWDIR%%/fonts/glyphicons-halflings-regular.ttf	7505	%%WWWDIR%%/fonts/glyphicons-halflings-regular.ttf
7369	%%WWWDIR%%/fonts/glyphicons-halflings-regular.woff	7506	%%WWWDIR%%/fonts/glyphicons-halflings-regular.woff
7370	%%WWWDIR%%/fonts/glyphicons-halflings-regular.woff2	7507	%%WWWDIR%%/fonts/glyphicons-halflings-regular.woff2
		7508	%%WWWDIR%%/fonts/license.md
7371	%%WWWDIR%%/graphics/favicon.ico	7509	%%WWWDIR%%/graphics/favicon.ico
7372	%%WWWDIR%%/graphics/spinner.gif	7510	%%WWWDIR%%/graphics/spinner.png
7373	%%WWWDIR%%/graphics/transparent.gif	7511	%%WWWDIR%%/graphics/transparent.png
		7512	%%WWWDIR%%/includes/Control.php
7374	%%WWWDIR%%/includes/Event.php	7513	%%WWWDIR%%/includes/Event.php
		7514	%%WWWDIR%%/includes/Filter.php
7375	%%WWWDIR%%/includes/Frame.php	7515	%%WWWDIR%%/includes/Frame.php
		7516	%%WWWDIR%%/includes/Group.php
7376	%%WWWDIR%%/includes/Monitor.php	7517	%%WWWDIR%%/includes/Monitor.php
		7518	%%WWWDIR%%/includes/MontageLayout.php
7377	%%WWWDIR%%/includes/Server.php	7519	%%WWWDIR%%/includes/Server.php
7378	%%WWWDIR%%/includes/Storage.php	7520	%%WWWDIR%%/includes/Storage.php
7379	%%WWWDIR%%/includes/actions.php	7521	%%WWWDIR%%/includes/actions.php
		7522	%%WWWDIR%%/includes/auth.php
7380	%%WWWDIR%%/includes/config.php	7523	%%WWWDIR%%/includes/config.php
7381	%%WWWDIR%%/includes/control_functions.php	7524	%%WWWDIR%%/includes/control_functions.php
7382	%%WWWDIR%%/includes/csrf/LICENSE.txt	7525	%%WWWDIR%%/includes/csrf/LICENSE.txt
Lines 7392-7401 Link Here
7392	%%WWWDIR%%/js/logger.js	7535	%%WWWDIR%%/js/logger.js
7393	%%WWWDIR%%/js/mootools.ext.js	7536	%%WWWDIR%%/js/mootools.ext.js
7394	%%WWWDIR%%/js/overlay.js	7537	%%WWWDIR%%/js/overlay.js
		7538	%%WWWDIR%%/js/videojs.zoomrotate.js
7395	%%WWWDIR%%/lang/big5_big5.php	7539	%%WWWDIR%%/lang/big5_big5.php
7396	%%WWWDIR%%/lang/cn_zh.php	7540	%%WWWDIR%%/lang/cn_zh.php
7397	%%WWWDIR%%/lang/cs_cz.php	7541	%%WWWDIR%%/lang/cs_cz.php
7398	%%WWWDIR%%/lang/de_de.php	7542	%%WWWDIR%%/lang/de_de.php
		7543	%%WWWDIR%%/lang/default.php
7399	%%WWWDIR%%/lang/dk_dk.php	7544	%%WWWDIR%%/lang/dk_dk.php
7400	%%WWWDIR%%/lang/en_gb.php	7545	%%WWWDIR%%/lang/en_gb.php
7401	%%WWWDIR%%/lang/en_us.php	7546	%%WWWDIR%%/lang/en_us.php
Lines 7414-7426 Link Here
7414	%%WWWDIR%%/lang/ru_ru.php	7559	%%WWWDIR%%/lang/ru_ru.php
7415	%%WWWDIR%%/lang/se_se.php	7560	%%WWWDIR%%/lang/se_se.php
7416	%%WWWDIR%%/lang/updateLangs.php	7561	%%WWWDIR%%/lang/updateLangs.php
7417	%%WWWDIR%%/skins/classic/css/classic/control.css	7562	%%WWWDIR%%/robots.txt
		7563	%%WWWDIR%%/skins/classic/css/base/export.css
		7564	%%WWWDIR%%/skins/classic/css/base/jquery-ui-theme.css
		7565	%%WWWDIR%%/skins/classic/css/base/skin.css
		7566	%%WWWDIR%%/skins/classic/css/base/views/console.css
		7567	%%WWWDIR%%/skins/classic/css/base/views/control.css
		7568	%%WWWDIR%%/skins/classic/css/base/views/controlcaps.css
		7569	%%WWWDIR%%/skins/classic/css/base/views/devices.css
		7570	%%WWWDIR%%/skins/classic/css/base/views/download.css
		7571	%%WWWDIR%%/skins/classic/css/base/views/event.css
		7572	%%WWWDIR%%/skins/classic/css/base/views/events.css
		7573	%%WWWDIR%%/skins/classic/css/base/views/export.css
		7574	%%WWWDIR%%/skins/classic/css/base/views/filter.css
		7575	%%WWWDIR%%/skins/classic/css/base/views/frame.css
		7576	%%WWWDIR%%/skins/classic/css/base/views/frames.css
		7577	%%WWWDIR%%/skins/classic/css/base/views/groups.css
		7578	%%WWWDIR%%/skins/classic/css/base/views/log.css
		7579	%%WWWDIR%%/skins/classic/css/base/views/login.css
		7580	%%WWWDIR%%/skins/classic/css/base/views/monitor.css
		7581	%%WWWDIR%%/skins/classic/css/base/views/montage.css
		7582	%%WWWDIR%%/skins/classic/css/base/views/montage_2wide.css
		7583	%%WWWDIR%%/skins/classic/css/base/views/montage_3wide.css
		7584	%%WWWDIR%%/skins/classic/css/base/views/montage_3wide50enlarge.css
		7585	%%WWWDIR%%/skins/classic/css/base/views/montage_4wide.css
		7586	%%WWWDIR%%/skins/classic/css/base/views/montage_freeform.css
		7587	%%WWWDIR%%/skins/classic/css/base/views/montagereview.css
		7588	%%WWWDIR%%/skins/classic/css/base/views/options.css
		7589	%%WWWDIR%%/skins/classic/css/base/views/plugin.css
		7590	%%WWWDIR%%/skins/classic/css/base/views/privacy.css
		7591	%%WWWDIR%%/skins/classic/css/base/views/server.css
		7592	%%WWWDIR%%/skins/classic/css/base/views/stats.css
		7593	%%WWWDIR%%/skins/classic/css/base/views/storage.css
		7594	%%WWWDIR%%/skins/classic/css/base/views/timeline.css
		7595	%%WWWDIR%%/skins/classic/css/base/views/timeline.css.php
		7596	%%WWWDIR%%/skins/classic/css/base/views/video.css
		7597	%%WWWDIR%%/skins/classic/css/base/views/watch.css
		7598	%%WWWDIR%%/skins/classic/css/base/views/zone.css
		7599	%%WWWDIR%%/skins/classic/css/base/views/zones.css
7418	%%WWWDIR%%/skins/classic/css/classic/export.css	7600	%%WWWDIR%%/skins/classic/css/classic/export.css
		7601	%%WWWDIR%%/skins/classic/css/classic/jquery-ui-theme.css
7419	%%WWWDIR%%/skins/classic/css/classic/skin.css	7602	%%WWWDIR%%/skins/classic/css/classic/skin.css
7420	%%WWWDIR%%/skins/classic/css/classic/views/console.css	7603	%%WWWDIR%%/skins/classic/css/classic/views/console.css
7421	%%WWWDIR%%/skins/classic/css/classic/views/control.css	7604	%%WWWDIR%%/skins/classic/css/classic/views/control.css
7422	%%WWWDIR%%/skins/classic/css/classic/views/controlcaps.css	7605	%%WWWDIR%%/skins/classic/css/classic/views/controlcaps.css
7423	%%WWWDIR%%/skins/classic/css/classic/views/devices.css	7606	%%WWWDIR%%/skins/classic/css/classic/views/devices.css
		7607	%%WWWDIR%%/skins/classic/css/classic/views/download.css
7424	%%WWWDIR%%/skins/classic/css/classic/views/event.css	7608	%%WWWDIR%%/skins/classic/css/classic/views/event.css
7425	%%WWWDIR%%/skins/classic/css/classic/views/events.css	7609	%%WWWDIR%%/skins/classic/css/classic/views/events.css
7426	%%WWWDIR%%/skins/classic/css/classic/views/export.css	7610	%%WWWDIR%%/skins/classic/css/classic/views/export.css
Lines 7437-7445 Link Here
7437	%%WWWDIR%%/skins/classic/css/classic/views/montage_3wide50enlarge.css	7621	%%WWWDIR%%/skins/classic/css/classic/views/montage_3wide50enlarge.css
7438	%%WWWDIR%%/skins/classic/css/classic/views/montage_4wide.css	7622	%%WWWDIR%%/skins/classic/css/classic/views/montage_4wide.css
7439	%%WWWDIR%%/skins/classic/css/classic/views/montage_freeform.css	7623	%%WWWDIR%%/skins/classic/css/classic/views/montage_freeform.css
		7624	%%WWWDIR%%/skins/classic/css/classic/views/montagereview.css
7440	%%WWWDIR%%/skins/classic/css/classic/views/options.css	7625	%%WWWDIR%%/skins/classic/css/classic/views/options.css
7441	%%WWWDIR%%/skins/classic/css/classic/views/plugin.css	7626	%%WWWDIR%%/skins/classic/css/classic/views/plugin.css
7442	%%WWWDIR%%/skins/classic/css/classic/views/stats.css	7627	%%WWWDIR%%/skins/classic/css/classic/views/stats.css
		7628	%%WWWDIR%%/skins/classic/css/classic/views/storage.css
7443	%%WWWDIR%%/skins/classic/css/classic/views/timeline.css	7629	%%WWWDIR%%/skins/classic/css/classic/views/timeline.css
7444	%%WWWDIR%%/skins/classic/css/classic/views/timeline.css.php	7630	%%WWWDIR%%/skins/classic/css/classic/views/timeline.css.php
7445	%%WWWDIR%%/skins/classic/css/classic/views/video.css	7631	%%WWWDIR%%/skins/classic/css/classic/views/video.css
Lines 7446-7458 Link Here
7446	%%WWWDIR%%/skins/classic/css/classic/views/watch.css	7632	%%WWWDIR%%/skins/classic/css/classic/views/watch.css
7447	%%WWWDIR%%/skins/classic/css/classic/views/zone.css	7633	%%WWWDIR%%/skins/classic/css/classic/views/zone.css
7448	%%WWWDIR%%/skins/classic/css/classic/views/zones.css	7634	%%WWWDIR%%/skins/classic/css/classic/views/zones.css
7449	%%WWWDIR%%/skins/classic/css/dark/control.css
7450	%%WWWDIR%%/skins/classic/css/dark/export.css	7635	%%WWWDIR%%/skins/classic/css/dark/export.css
		7636	%%WWWDIR%%/skins/classic/css/dark/jquery-ui-theme.css
7451	%%WWWDIR%%/skins/classic/css/dark/skin.css	7637	%%WWWDIR%%/skins/classic/css/dark/skin.css
7452	%%WWWDIR%%/skins/classic/css/dark/views/console.css	7638	%%WWWDIR%%/skins/classic/css/dark/views/console.css
7453	%%WWWDIR%%/skins/classic/css/dark/views/control.css	7639	%%WWWDIR%%/skins/classic/css/dark/views/control.css
7454	%%WWWDIR%%/skins/classic/css/dark/views/controlcaps.css	7640	%%WWWDIR%%/skins/classic/css/dark/views/controlcaps.css
7455	%%WWWDIR%%/skins/classic/css/dark/views/devices.css	7641	%%WWWDIR%%/skins/classic/css/dark/views/devices.css
		7642	%%WWWDIR%%/skins/classic/css/dark/views/download.css
7456	%%WWWDIR%%/skins/classic/css/dark/views/event.css	7643	%%WWWDIR%%/skins/classic/css/dark/views/event.css
7457	%%WWWDIR%%/skins/classic/css/dark/views/events.css	7644	%%WWWDIR%%/skins/classic/css/dark/views/events.css
7458	%%WWWDIR%%/skins/classic/css/dark/views/export.css	7645	%%WWWDIR%%/skins/classic/css/dark/views/export.css
Lines 7461-7466 Link Here
7461	%%WWWDIR%%/skins/classic/css/dark/views/frames.css	7648	%%WWWDIR%%/skins/classic/css/dark/views/frames.css
7462	%%WWWDIR%%/skins/classic/css/dark/views/groups.css	7649	%%WWWDIR%%/skins/classic/css/dark/views/groups.css
7463	%%WWWDIR%%/skins/classic/css/dark/views/log.css	7650	%%WWWDIR%%/skins/classic/css/dark/views/log.css
		7651	%%WWWDIR%%/skins/classic/css/dark/views/login.css
7464	%%WWWDIR%%/skins/classic/css/dark/views/monitor.css	7652	%%WWWDIR%%/skins/classic/css/dark/views/monitor.css
7465	%%WWWDIR%%/skins/classic/css/dark/views/montage.css	7653	%%WWWDIR%%/skins/classic/css/dark/views/montage.css
7466	%%WWWDIR%%/skins/classic/css/dark/views/montage_2wide.css	7654	%%WWWDIR%%/skins/classic/css/dark/views/montage_2wide.css
Lines 7468-7476 Link Here
7468	%%WWWDIR%%/skins/classic/css/dark/views/montage_3wide50enlarge.css	7656	%%WWWDIR%%/skins/classic/css/dark/views/montage_3wide50enlarge.css
7469	%%WWWDIR%%/skins/classic/css/dark/views/montage_4wide.css	7657	%%WWWDIR%%/skins/classic/css/dark/views/montage_4wide.css
7470	%%WWWDIR%%/skins/classic/css/dark/views/montage_freeform.css	7658	%%WWWDIR%%/skins/classic/css/dark/views/montage_freeform.css
		7659	%%WWWDIR%%/skins/classic/css/dark/views/montagereview.css
7471	%%WWWDIR%%/skins/classic/css/dark/views/options.css	7660	%%WWWDIR%%/skins/classic/css/dark/views/options.css
7472	%%WWWDIR%%/skins/classic/css/dark/views/plugin.css	7661	%%WWWDIR%%/skins/classic/css/dark/views/plugin.css
7473	%%WWWDIR%%/skins/classic/css/dark/views/stats.css	7662	%%WWWDIR%%/skins/classic/css/dark/views/stats.css
		7663	%%WWWDIR%%/skins/classic/css/dark/views/storage.css
7474	%%WWWDIR%%/skins/classic/css/dark/views/timeline.css	7664	%%WWWDIR%%/skins/classic/css/dark/views/timeline.css
7475	%%WWWDIR%%/skins/classic/css/dark/views/timeline.css.php	7665	%%WWWDIR%%/skins/classic/css/dark/views/timeline.css.php
7476	%%WWWDIR%%/skins/classic/css/dark/views/video.css	7666	%%WWWDIR%%/skins/classic/css/dark/views/video.css
Lines 7477-7545 Link Here
7477	%%WWWDIR%%/skins/classic/css/dark/views/watch.css	7667	%%WWWDIR%%/skins/classic/css/dark/views/watch.css
7478	%%WWWDIR%%/skins/classic/css/dark/views/zone.css	7668	%%WWWDIR%%/skins/classic/css/dark/views/zone.css
7479	%%WWWDIR%%/skins/classic/css/dark/views/zones.css	7669	%%WWWDIR%%/skins/classic/css/dark/views/zones.css
7480	%%WWWDIR%%/skins/classic/css/flat/control.css	7670	%%WWWDIR%%/skins/classic/graphics/arrow-d.png
7481	%%WWWDIR%%/skins/classic/css/flat/export.css	7671	%%WWWDIR%%/skins/classic/graphics/arrow-dl.png
7482	%%WWWDIR%%/skins/classic/css/flat/skin.css	7672	%%WWWDIR%%/skins/classic/graphics/arrow-dr.png
7483	%%WWWDIR%%/skins/classic/css/flat/views/console.css	7673	%%WWWDIR%%/skins/classic/graphics/arrow-l-d.png
7484	%%WWWDIR%%/skins/classic/css/flat/views/control.css	7674	%%WWWDIR%%/skins/classic/graphics/arrow-l-u.png
7485	%%WWWDIR%%/skins/classic/css/flat/views/controlcaps.css	7675	%%WWWDIR%%/skins/classic/graphics/arrow-l.png
7486	%%WWWDIR%%/skins/classic/css/flat/views/devices.css	7676	%%WWWDIR%%/skins/classic/graphics/arrow-r.png
7487	%%WWWDIR%%/skins/classic/css/flat/views/event.css	7677	%%WWWDIR%%/skins/classic/graphics/arrow-s-d.png
7488	%%WWWDIR%%/skins/classic/css/flat/views/events.css	7678	%%WWWDIR%%/skins/classic/graphics/arrow-s-u.png
7489	%%WWWDIR%%/skins/classic/css/flat/views/export.css	7679	%%WWWDIR%%/skins/classic/graphics/arrow-u.png
7490	%%WWWDIR%%/skins/classic/css/flat/views/filter.css	7680	%%WWWDIR%%/skins/classic/graphics/arrow-ul.png
7491	%%WWWDIR%%/skins/classic/css/flat/views/frame.css	7681	%%WWWDIR%%/skins/classic/graphics/arrow-ur.png
7492	%%WWWDIR%%/skins/classic/css/flat/views/frames.css	7682	%%WWWDIR%%/skins/classic/graphics/center.png
7493	%%WWWDIR%%/skins/classic/css/flat/views/groups.css	7683	%%WWWDIR%%/skins/classic/graphics/point-g.png
7494	%%WWWDIR%%/skins/classic/css/flat/views/log.css	7684	%%WWWDIR%%/skins/classic/graphics/point-o.png
7495	%%WWWDIR%%/skins/classic/css/flat/views/monitor.css	7685	%%WWWDIR%%/skins/classic/graphics/point-r.png
7496	%%WWWDIR%%/skins/classic/css/flat/views/montage.css	7686	%%WWWDIR%%/skins/classic/graphics/seq-d.png
7497	%%WWWDIR%%/skins/classic/css/flat/views/montage_2wide.css	7687	%%WWWDIR%%/skins/classic/graphics/seq-u.png
7498	%%WWWDIR%%/skins/classic/css/flat/views/montage_3wide.css	7688	%%WWWDIR%%/skins/classic/graphics/ui-icons_444444_256x240.png
7499	%%WWWDIR%%/skins/classic/css/flat/views/montage_3wide50enlarge.css	7689	%%WWWDIR%%/skins/classic/graphics/ui-icons_555555_256x240.png
7500	%%WWWDIR%%/skins/classic/css/flat/views/montage_4wide.css	7690	%%WWWDIR%%/skins/classic/graphics/ui-icons_777620_256x240.png
7501	%%WWWDIR%%/skins/classic/css/flat/views/montage_freeform.css	7691	%%WWWDIR%%/skins/classic/graphics/ui-icons_777777_256x240.png
7502	%%WWWDIR%%/skins/classic/css/flat/views/options.css	7692	%%WWWDIR%%/skins/classic/graphics/ui-icons_cc0000_256x240.png
7503	%%WWWDIR%%/skins/classic/css/flat/views/plugin.css	7693	%%WWWDIR%%/skins/classic/graphics/ui-icons_ffffff_256x240.png
7504	%%WWWDIR%%/skins/classic/css/flat/views/stats.css
7505	%%WWWDIR%%/skins/classic/css/flat/views/timeline.css
7506	%%WWWDIR%%/skins/classic/css/flat/views/timeline.css.php
7507	%%WWWDIR%%/skins/classic/css/flat/views/video.css
7508	%%WWWDIR%%/skins/classic/css/flat/views/watch.css
7509	%%WWWDIR%%/skins/classic/css/flat/views/zone.css
7510	%%WWWDIR%%/skins/classic/css/flat/views/zones.css
7511	%%WWWDIR%%/skins/classic/graphics/arrow-d.gif
7512	%%WWWDIR%%/skins/classic/graphics/arrow-dl.gif
7513	%%WWWDIR%%/skins/classic/graphics/arrow-dr.gif
7514	%%WWWDIR%%/skins/classic/graphics/arrow-l-d.gif
7515	%%WWWDIR%%/skins/classic/graphics/arrow-l-u.gif
7516	%%WWWDIR%%/skins/classic/graphics/arrow-l.gif
7517	%%WWWDIR%%/skins/classic/graphics/arrow-r.gif
7518	%%WWWDIR%%/skins/classic/graphics/arrow-s-d.gif
7519	%%WWWDIR%%/skins/classic/graphics/arrow-s-u.gif
7520	%%WWWDIR%%/skins/classic/graphics/arrow-u.gif
7521	%%WWWDIR%%/skins/classic/graphics/arrow-ul.gif
7522	%%WWWDIR%%/skins/classic/graphics/arrow-ur.gif
7523	%%WWWDIR%%/skins/classic/graphics/center.gif
7524	%%WWWDIR%%/skins/classic/graphics/point-g.gif
7525	%%WWWDIR%%/skins/classic/graphics/point-o.gif
7526	%%WWWDIR%%/skins/classic/graphics/point-r.gif
7527	%%WWWDIR%%/skins/classic/graphics/seq-d.gif
7528	%%WWWDIR%%/skins/classic/graphics/seq-u.gif
7529	%%WWWDIR%%/skins/classic/includes/config.php	7694	%%WWWDIR%%/skins/classic/includes/config.php
7530	%%WWWDIR%%/skins/classic/includes/control_functions.php	7695	%%WWWDIR%%/skins/classic/includes/control_functions.php
7531	%%WWWDIR%%/skins/classic/includes/export_functions.php	7696	%%WWWDIR%%/skins/classic/includes/export_functions.php
7532	%%WWWDIR%%/skins/classic/includes/functions.php	7697	%%WWWDIR%%/skins/classic/includes/functions.php
7533	%%WWWDIR%%/skins/classic/includes/timeline_functions.php	7698	%%WWWDIR%%/skins/classic/includes/timeline_functions.php
		7699	%%WWWDIR%%/skins/classic/js/base.js
		7700	%%WWWDIR%%/skins/classic/js/bootstrap.js
		7701	%%WWWDIR%%/skins/classic/js/bootstrap.js.URL
		7702	%%WWWDIR%%/skins/classic/js/bootstrap.min.js
		7703	%%WWWDIR%%/skins/classic/js/chosen/chosen-sprite.png
		7704	%%WWWDIR%%/skins/classic/js/chosen/chosen-sprite@2x.png
		7705	%%WWWDIR%%/skins/classic/js/chosen/chosen.css
		7706	%%WWWDIR%%/skins/classic/js/chosen/chosen.jquery.js
		7707	%%WWWDIR%%/skins/classic/js/chosen/chosen.jquery.min.js
		7708	%%WWWDIR%%/skins/classic/js/chosen/chosen.min.css
7534	%%WWWDIR%%/skins/classic/js/classic.js	7709	%%WWWDIR%%/skins/classic/js/classic.js
7535	%%WWWDIR%%/skins/classic/js/dark.js	7710	%%WWWDIR%%/skins/classic/js/dateTimePicker/jquery-ui-timepicker-addon.css
7536	%%WWWDIR%%/skins/classic/js/flat.js	7711	%%WWWDIR%%/skins/classic/js/dateTimePicker/jquery-ui-timepicker-addon.js
		7712	%%WWWDIR%%/skins/classic/js/font/vjs.eot
		7713	%%WWWDIR%%/skins/classic/js/font/vjs.ttf
		7714	%%WWWDIR%%/skins/classic/js/font/vjs.woff
7537	%%WWWDIR%%/skins/classic/js/jquery-1.11.3.js	7715	%%WWWDIR%%/skins/classic/js/jquery-1.11.3.js
		7716	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/AUTHORS.txt
		7717	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/LICENSE.txt
		7718	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/images/ui-icons_444444_256x240.png
		7719	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/images/ui-icons_555555_256x240.png
		7720	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/images/ui-icons_777620_256x240.png
		7721	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/images/ui-icons_777777_256x240.png
		7722	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/images/ui-icons_cc0000_256x240.png
		7723	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/images/ui-icons_ffffff_256x240.png
		7724	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/index.html
		7725	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.css
		7726	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.js
		7727	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.min.css
		7728	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.min.js
		7729	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.structure.css
		7730	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.structure.min.css
		7731	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.theme.css
		7732	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/jquery-ui.theme.min.css
		7733	%%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/package.json
		7734	%%WWWDIR%%/skins/classic/js/jquery-ui-structure.css
		7735	%%WWWDIR%%/skins/classic/js/jquery-ui.js
7538	%%WWWDIR%%/skins/classic/js/jquery.js	7736	%%WWWDIR%%/skins/classic/js/jquery.js
7539	%%WWWDIR%%/skins/classic/js/jquery.url	7737	%%WWWDIR%%/skins/classic/js/jquery.js.URL
		7738	%%WWWDIR%%/skins/classic/js/moment.js
		7739	%%WWWDIR%%/skins/classic/js/moment.js.URL
		7740	%%WWWDIR%%/skins/classic/js/moment.min.js
7540	%%WWWDIR%%/skins/classic/js/skin.js	7741	%%WWWDIR%%/skins/classic/js/skin.js
7541	%%WWWDIR%%/skins/classic/js/skin.js.php	7742	%%WWWDIR%%/skins/classic/js/skin.js.php
		7743	%%WWWDIR%%/skins/classic/js/video-js-skin.css
		7744	%%WWWDIR%%/skins/classic/js/video-js.css
		7745	%%WWWDIR%%/skins/classic/js/video-js.css.URL
		7746	%%WWWDIR%%/skins/classic/js/video.js
		7747	%%WWWDIR%%/skins/classic/js/video.js.URL
		7748	%%WWWDIR%%/skins/classic/js/video.min.js
7542	%%WWWDIR%%/skins/classic/skin.php	7749	%%WWWDIR%%/skins/classic/skin.php
		7750	%%WWWDIR%%/skins/classic/views/_monitor_filters.php
		7751	%%WWWDIR%%/skins/classic/views/_monitor_source_nvsocket.php
		7752	%%WWWDIR%%/skins/classic/views/add_monitors.php
7543	%%WWWDIR%%/skins/classic/views/bandwidth.php	7753	%%WWWDIR%%/skins/classic/views/bandwidth.php
7544	%%WWWDIR%%/skins/classic/views/blank.php	7754	%%WWWDIR%%/skins/classic/views/blank.php
7545	%%WWWDIR%%/skins/classic/views/console.php	7755	%%WWWDIR%%/skins/classic/views/console.php
Lines 7551-7556 Link Here
7551	%%WWWDIR%%/skins/classic/views/device.php	7761	%%WWWDIR%%/skins/classic/views/device.php
7552	%%WWWDIR%%/skins/classic/views/devices.php	7762	%%WWWDIR%%/skins/classic/views/devices.php
7553	%%WWWDIR%%/skins/classic/views/donate.php	7763	%%WWWDIR%%/skins/classic/views/donate.php
		7764	%%WWWDIR%%/skins/classic/views/download.php
7554	%%WWWDIR%%/skins/classic/views/error.php	7765	%%WWWDIR%%/skins/classic/views/error.php
7555	%%WWWDIR%%/skins/classic/views/event.php	7766	%%WWWDIR%%/skins/classic/views/event.php
7556	%%WWWDIR%%/skins/classic/views/eventdetail.php	7767	%%WWWDIR%%/skins/classic/views/eventdetail.php
Lines 7557-7568 Link Here
7557	%%WWWDIR%%/skins/classic/views/events.php	7768	%%WWWDIR%%/skins/classic/views/events.php
7558	%%WWWDIR%%/skins/classic/views/export.php	7769	%%WWWDIR%%/skins/classic/views/export.php
7559	%%WWWDIR%%/skins/classic/views/filter.php	7770	%%WWWDIR%%/skins/classic/views/filter.php
7560	%%WWWDIR%%/skins/classic/views/filtersave.php
7561	%%WWWDIR%%/skins/classic/views/frame.php	7771	%%WWWDIR%%/skins/classic/views/frame.php
7562	%%WWWDIR%%/skins/classic/views/frames.php	7772	%%WWWDIR%%/skins/classic/views/frames.php
7563	%%WWWDIR%%/skins/classic/views/function.php	7773	%%WWWDIR%%/skins/classic/views/function.php
7564	%%WWWDIR%%/skins/classic/views/group.php	7774	%%WWWDIR%%/skins/classic/views/group.php
7565	%%WWWDIR%%/skins/classic/views/groups.php	7775	%%WWWDIR%%/skins/classic/views/groups.php
		7776	%%WWWDIR%%/skins/classic/views/image-ffmpeg.php
		7777	%%WWWDIR%%/skins/classic/views/js/add_monitors.js
7566	%%WWWDIR%%/skins/classic/views/js/console.js	7778	%%WWWDIR%%/skins/classic/views/js/console.js
7567	%%WWWDIR%%/skins/classic/views/js/console.js.php	7779	%%WWWDIR%%/skins/classic/views/js/console.js.php
7568	%%WWWDIR%%/skins/classic/views/js/control.js	7780	%%WWWDIR%%/skins/classic/views/js/control.js
Lines 7574-7579 Link Here
7574	%%WWWDIR%%/skins/classic/views/js/devices.js	7786	%%WWWDIR%%/skins/classic/views/js/devices.js
7575	%%WWWDIR%%/skins/classic/views/js/donate.js	7787	%%WWWDIR%%/skins/classic/views/js/donate.js
7576	%%WWWDIR%%/skins/classic/views/js/donate.js.php	7788	%%WWWDIR%%/skins/classic/views/js/donate.js.php
		7789	%%WWWDIR%%/skins/classic/views/js/download.js
		7790	%%WWWDIR%%/skins/classic/views/js/download.js.php
7577	%%WWWDIR%%/skins/classic/views/js/event.js	7791	%%WWWDIR%%/skins/classic/views/js/event.js
7578	%%WWWDIR%%/skins/classic/views/js/event.js.php	7792	%%WWWDIR%%/skins/classic/views/js/event.js.php
7579	%%WWWDIR%%/skins/classic/views/js/events.js	7793	%%WWWDIR%%/skins/classic/views/js/events.js
Lines 7582-7587 Link Here
7582	%%WWWDIR%%/skins/classic/views/js/export.js.php	7796	%%WWWDIR%%/skins/classic/views/js/export.js.php
7583	%%WWWDIR%%/skins/classic/views/js/filter.js	7797	%%WWWDIR%%/skins/classic/views/js/filter.js
7584	%%WWWDIR%%/skins/classic/views/js/filter.js.php	7798	%%WWWDIR%%/skins/classic/views/js/filter.js.php
		7799	%%WWWDIR%%/skins/classic/views/js/frame.js
		7800	%%WWWDIR%%/skins/classic/views/js/frame.js.php
7585	%%WWWDIR%%/skins/classic/views/js/group.js	7801	%%WWWDIR%%/skins/classic/views/js/group.js
7586	%%WWWDIR%%/skins/classic/views/js/groups.js	7802	%%WWWDIR%%/skins/classic/views/js/groups.js
7587	%%WWWDIR%%/skins/classic/views/js/log.js	7803	%%WWWDIR%%/skins/classic/views/js/log.js
Lines 7593-7605 Link Here
7593	%%WWWDIR%%/skins/classic/views/js/monitorprobe.js	7809	%%WWWDIR%%/skins/classic/views/js/monitorprobe.js
7594	%%WWWDIR%%/skins/classic/views/js/montage.js	7810	%%WWWDIR%%/skins/classic/views/js/montage.js
7595	%%WWWDIR%%/skins/classic/views/js/montage.js.php	7811	%%WWWDIR%%/skins/classic/views/js/montage.js.php
		7812	%%WWWDIR%%/skins/classic/views/js/montagereview.js
		7813	%%WWWDIR%%/skins/classic/views/js/montagereview.js.php
7596	%%WWWDIR%%/skins/classic/views/js/onvifprobe.js	7814	%%WWWDIR%%/skins/classic/views/js/onvifprobe.js
7597	%%WWWDIR%%/skins/classic/views/js/options.js.php	7815	%%WWWDIR%%/skins/classic/views/js/options.js.php
7598	%%WWWDIR%%/skins/classic/views/js/plugin.js	7816	%%WWWDIR%%/skins/classic/views/js/plugin.js
7599	%%WWWDIR%%/skins/classic/views/js/postlogin.js.php	7817	%%WWWDIR%%/skins/classic/views/js/postlogin.js.php
		7818	%%WWWDIR%%/skins/classic/views/js/privacy.js
		7819	%%WWWDIR%%/skins/classic/views/js/report_event_audit.js
7600	%%WWWDIR%%/skins/classic/views/js/server.js	7820	%%WWWDIR%%/skins/classic/views/js/server.js
7601	%%WWWDIR%%/skins/classic/views/js/state.js	7821	%%WWWDIR%%/skins/classic/views/js/state.js
7602	%%WWWDIR%%/skins/classic/views/js/state.js.php	7822	%%WWWDIR%%/skins/classic/views/js/state.js.php
		7823	%%WWWDIR%%/skins/classic/views/js/storage.js
7603	%%WWWDIR%%/skins/classic/views/js/timeline.js	7824	%%WWWDIR%%/skins/classic/views/js/timeline.js
7604	%%WWWDIR%%/skins/classic/views/js/timeline.js.php	7825	%%WWWDIR%%/skins/classic/views/js/timeline.js.php
7605	%%WWWDIR%%/skins/classic/views/js/user.js	7826	%%WWWDIR%%/skins/classic/views/js/user.js
Lines 7619-7624 Link Here
7619	%%WWWDIR%%/skins/classic/views/monitor.php	7840	%%WWWDIR%%/skins/classic/views/monitor.php
7620	%%WWWDIR%%/skins/classic/views/monitorpreset.php	7841	%%WWWDIR%%/skins/classic/views/monitorpreset.php
7621	%%WWWDIR%%/skins/classic/views/monitorprobe.php	7842	%%WWWDIR%%/skins/classic/views/monitorprobe.php
		7843	%%WWWDIR%%/skins/classic/views/monitors.php
7622	%%WWWDIR%%/skins/classic/views/montage.php	7844	%%WWWDIR%%/skins/classic/views/montage.php
7623	%%WWWDIR%%/skins/classic/views/montagereview.php	7845	%%WWWDIR%%/skins/classic/views/montagereview.php
7624	%%WWWDIR%%/skins/classic/views/none.php	7846	%%WWWDIR%%/skins/classic/views/none.php
Lines 7627-7637 Link Here
7627	%%WWWDIR%%/skins/classic/views/options.php	7849	%%WWWDIR%%/skins/classic/views/options.php
7628	%%WWWDIR%%/skins/classic/views/plugin.php	7850	%%WWWDIR%%/skins/classic/views/plugin.php
7629	%%WWWDIR%%/skins/classic/views/postlogin.php	7851	%%WWWDIR%%/skins/classic/views/postlogin.php
		7852	%%WWWDIR%%/skins/classic/views/privacy.php
		7853	%%WWWDIR%%/skins/classic/views/report_event_audit.php
7630	%%WWWDIR%%/skins/classic/views/server.php	7854	%%WWWDIR%%/skins/classic/views/server.php
7631	%%WWWDIR%%/skins/classic/views/settings.php	7855	%%WWWDIR%%/skins/classic/views/settings.php
7632	%%WWWDIR%%/skins/classic/views/state.php	7856	%%WWWDIR%%/skins/classic/views/state.php
7633	%%WWWDIR%%/skins/classic/views/stats.php	7857	%%WWWDIR%%/skins/classic/views/stats.php
7634	%%WWWDIR%%/skins/classic/views/status.php	7858	%%WWWDIR%%/skins/classic/views/status.php
		7859	%%WWWDIR%%/skins/classic/views/storage.php
7635	%%WWWDIR%%/skins/classic/views/timeline.php	7860	%%WWWDIR%%/skins/classic/views/timeline.php
7636	%%WWWDIR%%/skins/classic/views/user.php	7861	%%WWWDIR%%/skins/classic/views/user.php
7637	%%WWWDIR%%/skins/classic/views/version.php	7862	%%WWWDIR%%/skins/classic/views/version.php
Lines 7639-7652 Link Here
7639	%%WWWDIR%%/skins/classic/views/watch.php	7864	%%WWWDIR%%/skins/classic/views/watch.php
7640	%%WWWDIR%%/skins/classic/views/zone.php	7865	%%WWWDIR%%/skins/classic/views/zone.php
7641	%%WWWDIR%%/skins/classic/views/zones.php	7866	%%WWWDIR%%/skins/classic/views/zones.php
7642	%%WWWDIR%%/tools/mootools/mootools-core-1.4.5-compat.js	7867	%%WWWDIR%%/tools/mootools/mootools-core-1.6.0-compat.js
		7868	%%WWWDIR%%/tools/mootools/mootools-core-compat.js.URL
7643	%%WWWDIR%%/tools/mootools/mootools-core.js	7869	%%WWWDIR%%/tools/mootools/mootools-core.js
7644	%%WWWDIR%%/tools/mootools/mootools-more-1.5.1.js	7870	%%WWWDIR%%/tools/mootools/mootools-more-1.6.0.js
7645	%%WWWDIR%%/tools/mootools/mootools-more.js	7871	%%WWWDIR%%/tools/mootools/mootools-more.js
		7872	%%WWWDIR%%/views/archive.php
7646	%%WWWDIR%%/views/image.php	7873	%%WWWDIR%%/views/image.php
		7874	%%WWWDIR%%/views/view_video.php
7647	@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/api/app/tmp	7875	@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/api/app/tmp
7648	@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/events
7649	@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/images
7650	@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/temp	7876	@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/temp
		7877	@dir(%%WWWOWN%%,%%WWWGRP%%,) /var/db/zoneminder
		7878	@dir(%%WWWOWN%%,%%WWWGRP%%,) /var/cache/zoneminder
		7879	@dir(%%WWWOWN%%,%%WWWGRP%%,) /var/cache/zoneminder/events
		7880	@dir(%%WWWOWN%%,%%WWWGRP%%,) /var/cache/zoneminder/images
7651	@dir(%%WWWOWN%%,%%WWWGRP%%,) /var/run/zm	7881	@dir(%%WWWOWN%%,%%WWWGRP%%,) /var/run/zm
7652	@dir(%%WWWOWN%%,%%WWWGRP%%,) /var/tmp/zm	7882	@dir(%%WWWOWN%%,%%WWWGRP%%,) /var/tmp/zm

Return to bug 233289

Lines 14-26 Link Here

(-)files/README.FreeBSD (-31 / +61 lines)
14		14
15	1. Preliminary steps	15	1. Preliminary steps
16		16
17	1.1 Install databases/mysql56-server or newer	17	1.1 Install databases/mysql57-server or newer
18	You may choose your favourite method - ports or packages here.	18	You may choose your favourite method - ports or packages here.
19	FreeBSD default setting use STRICT_TRANS_TABLES sql_mode. It's mandatory to disable it. Edit your my.cnf accordingly
20		19
21	The following SQL mode should be compatible with ZM:
22	sql_mode= NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
23
24	ZoneMinder use very simple queries, however it tends to write to	20	ZoneMinder use very simple queries, however it tends to write to
25	the database quite a lot depending on your capture mode and number	21	the database quite a lot depending on your capture mode and number
26	of cameras. So tweak your MySQL instance accordantly	22	of cameras. So tweak your MySQL instance accordantly
Lines 33-74 Link Here
33	We provide an example for an HTTP install, however, you should use	29	We provide an example for an HTTP install, however, you should use
34	HTTPS if you plan to expose your installation to the public. There	30	HTTPS if you plan to expose your installation to the public. There
35	are plenty guides how to do it and security/letsencrypt.sh is a	31	are plenty guides how to do it and security/letsencrypt.sh is a
36	good way to get a valid SSL certificate.	32	good way to get a valid SSL certificate. Probably, your installation
		33	will be behind reverse proxy, so this example should work for you.
37		34
		35	Please, notive the following issues with ZM:
		36
		37	- web interface has several hardcoded /zm in url generation, so it is
		38	mandatory to serve your installtion from /zm subfolder
		39	- if behind reverse proxy, HTTP_X_FORWARDED_PROTO must be supplied or link
		40	generation will use http://
		41
38	Your server block should include the following:	42	Your server block should include the following:
39		43
40	server {	44	server {
41	root /usr/local/www/zoneminder;	45	listen 80;
42	try_files $uri $uri/ /index.php$is_args$args;
43	index index.php;
44		46
45	location = /cgi-bin/nph-zms {	47	root /usr/local/www/zoneminder;
46	include fastcgi_params;	48	index index.php
47	fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;	49	gzip off;
48	fastcgi_pass unix:/var/run/fcgiwrap/fcgiwrap.sock;
49	}
50		50
51	location ~ \.php$ {	51	location /cgi-bin/nph-zms {
52	include fastcgi_params;
53	fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
54	fastcgi_pass unix:/var/run/php-fpm.sock;
55	}
56		52
57	location /api {	53	include fastcgi_params;
58	rewrite ^/api/(.+)$ /api/index.php?p=$1 last;	54	fastcgi_param SCRIPT_FILENAME $request_filename;
59	}	55	fastcgi_pass unix:/var/run/fcgiwrap/fcgiwrap.sock;
60	}	56	}
61		57
62	1.2.1 ZoneMinder has it's own authentication system, however it's recommend to use NGINX basic	58	location /zm/cache {
63	auth over HTTPS if you don't need fine grain control to ZoneMinder components.
64		59
65	1.2.2 If you choose ZoneMinder authentication, it's recommended to prohibit access to	60	alias /var/cache/zoneminder;
66	image and events folder as it's possible to guess file names inside it.	61	}
67		62
68	location ~ ^/(?:images\|events)/ {	63	location /zm {
69	deny all;	64
70	}	65	alias /usr/local/www/zoneminder;
71		66
		67	location ~ \.php$ {
		68
		69	if (!-f $request_filename) { return 404; }
		70	include fastcgi_params;
		71	fastcgi_param SCRIPT_FILENAME $request_filename;
		72	fastcgi_index index.php;
		73	fastcgi_pass unix:/var/run/php-fpm.sock;
		74	}
		75
		76	location ~ \.(jpg\|jpeg\|gif\|png\|ico)$ {
		77	access_log off;
		78	expires 33d;
		79	}
		80
		81	location /zm/api/ {
		82	alias /usr/local/www/zoneminder;
		83	rewrite ^/zm/api(.+)$ /zm/api/app/webroot/index.php?p=$1 last;
		84	}
		85	}
		86	}
		87
72	Enable and start NGINX	88	Enable and start NGINX
73	sysrc nginx_enable="YES"	89	sysrc nginx_enable="YES"
74	service nginx start	90	service nginx start
Lines 158-160 Link Here
158		174
159	3. Start ZoneMinder	175	3. Start ZoneMinder
160	service zoneminder start	176	service zoneminder start
		177
		178	Upgrading from www/zoneminder 1.30.x or www/zoneminder-h264
		179	=====================================================
		180
		181	Before proceeding to upgrade sequence listed above,
		182
		183	1. Connect to mysql server with root and issue
		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.

Lines 1-32 Link Here

(-)files/patch-CMakeLists.txt (-30 / +21 lines)
1	--- CMakeLists.txt.orig 2016-06-01 00:41:17 UTC	1	--- CMakeLists.txt.orig 2018-10-13 18:36:15 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -385,13 +385,13 @@ find_library(MYSQLCLIENT_LIBRARIES mysql	3	@@ -127,7 +127,8 @@ mark_as_advanced(
4	if(MYSQLCLIENT_LIBRARIES)	4	ZM_PATH_ARP
5	set(HAVE_LIBMYSQLCLIENT 1)	5	ZM_CONFIG_DIR
6	list(APPEND ZM_BIN_LIBS "${MYSQLCLIENT_LIBRARIES}")	6	ZM_CONFIG_SUBDIR
7	- find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql.h)	7	- ZM_SYSTEMD)
8	+ find_path(MYSQLCLIENT_INCLUDE_DIR mysql.h /usr/local/include/mysql /usr/include/mysql)	8	+ ZM_SYSTEMD
9	if(MYSQLCLIENT_INCLUDE_DIR)	9	+ ZM_MANPAGE_DEST_PREFIX)
10	include_directories("${MYSQLCLIENT_INCLUDE_DIR}")
11	set(CMAKE_REQUIRED_INCLUDES "${MYSQLCLIENT_INCLUDE_DIR}")
12	endif(MYSQLCLIENT_INCLUDE_DIR)
13	mark_as_advanced(FORCE MYSQLCLIENT_LIBRARIES MYSQLCLIENT_INCLUDE_DIR)
14	- check_include_file("mysql/mysql.h" HAVE_MYSQL_H)
15	+ check_include_file("mysql.h" HAVE_MYSQL_H)
16	if(NOT HAVE_MYSQL_H)
17	message(FATAL_ERROR
18	"ZoneMinder requires MySQL headers - check that MySQL development packages are installed")
19	@@ -658,13 +658,6 @@ endif(NOT ZM_WEB_GROUP)
20	message(STATUS "Using web user: ${ZM_WEB_USER}")
21	message(STATUS "Using web group: ${ZM_WEB_GROUP}")
22		10
23	-# Check for polkit	11	set(ZM_RUNDIR "/var/run/zm" CACHE PATH
24	-find_package(Polkit)	12	"Location of transient process files, default: /var/run/zm")
25	-if(NOT POLKIT_FOUND)	13	@@ -210,6 +211,10 @@ set(ZM_TARGET_DISTRO "" CACHE STRING
26	- message(FATAL_ERROR	14	"Build ZoneMinder for a specific distribution. Currently, valid names are: fc27, fc26, el7, OS13, FreeBSD")
27	- "Running ZoneMinder requires polkit. Building ZoneMinder requires the polkit development package.")	15	set(ZM_SYSTEMD "OFF" CACHE BOOL
28	-endif(NOT POLKIT_FOUND)	16	"Set to ON to force building ZM with systemd support. default: OFF")
29	-	17	+set(ZM_MANPAGE_DEST_PREFIX "share/man" CACHE PATH
30	# Some variables that zm expects	18	+ "Relative path used to install ZoneMinder's Man pages into a
31	set(ZM_PID "${ZM_RUNDIR}/zm.pid")	19	+ non-standard folder. Most Linux users will not need to change this.
32	set(ZM_CONFIG "${ZM_CONFIG_DIR}/zm.conf")	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"))

Line 0 Link Here

(-)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

Lines 1-80 Link Here

(-)files/patch-ffmpeg4 (-80 lines)
1	Partially based on https://github.com/ZoneMinder/zoneminder/commit/e17bcb9178d0
2
3	--- src/zm_mpeg.cpp.orig 2017-05-09 14:54:48 UTC
4	+++ src/zm_mpeg.cpp
5	@@ -240,7 +240,11 @@ void VideoStream::SetupCodec( int colours, int subpixe
6	{
7	// Quality based bitrate control (VBR). Scale is 1..31 where 1 is best.
8	// This gets rid of artifacts in the beginning of the movie; and well, even quality.
9	+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
10	+ c->flags \|= AV_CODEC_FLAG_QSCALE;
11	+#else
12	c->flags \|= CODEC_FLAG_QSCALE;
13	+#endif
14	c->global_quality = FF_QP2LAMBDA * (31 - (31 * (bitrate / 100.0)));
15	}
16	else
17	@@ -265,7 +269,11 @@ void VideoStream::SetupCodec( int colours, int subpixe
18
19	// some formats want stream headers to be separate
20	if ( of->flags & AVFMT_GLOBALHEADER )
21	+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
22	+ c->flags \|= AV_CODEC_FLAG_GLOBAL_HEADER;
23	+#else
24	c->flags \|= CODEC_FLAG_GLOBAL_HEADER;
25	+#endif
26	}
27	else
28	{
29	@@ -425,7 +433,9 @@ void VideoStream::OpenStream( )
30	}
31
32	video_outbuf = NULL;
33	+#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0)
34	if ( !(of->flags & AVFMT_RAWPICTURE) )
35	+#endif
36	{
37	/* allocate output buffer */
38	/* XXX: API change will be done */
39	@@ -672,6 +682,7 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t
40	AVPacket *pkt = packet_buffers[packet_index];
41	av_init_packet( pkt );
42	int got_packet = 0;
43	+#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0)
44	if ( of->flags & AVFMT_RAWPICTURE )
45	{
46	#if LIBAVCODEC_VERSION_CHECK(52, 30, 2, 30, 2)
47	@@ -685,6 +696,7 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t
48	got_packet = 1;
49	}
50	else
51	+#endif
52	{
53	opicture_ptr->pts = c->frame_number;
54	opicture_ptr->quality = c->global_quality;
55	--- src/zm_sdp.cpp.orig 2017-05-09 14:54:48 UTC
56	+++ src/zm_sdp.cpp
57	@@ -483,7 +483,11 @@ AVFormatContext *SessionDescriptor::generateFormatCont
58	uint8_t *dest =
59	(uint8_t *)av_malloc(packet_size + sizeof(start_sequence) +
60	stream->codec->extradata_size +
61	+#if LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
62	+ AV_INPUT_BUFFER_PADDING_SIZE);
63	+#else
64	FF_INPUT_BUFFER_PADDING_SIZE);
65	+#endif
66	if(dest) {
67	if(stream->codec->extradata_size) {
68	// av_realloc?
69	@@ -494,7 +498,11 @@ AVFormatContext *SessionDescriptor::generateFormatCont
70	memcpy(dest+stream->codec->extradata_size, start_sequence, sizeof(start_sequence));
71	memcpy(dest+stream->codec->extradata_size+sizeof(start_sequence), decoded_packet, packet_size);
72	memset(dest+stream->codec->extradata_size+sizeof(start_sequence)+
73	+#if LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
74	+ packet_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
75	+#else
76	packet_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
77	+#endif
78
79	stream->codec->extradata= dest;
80	stream->codec->extradata_size+= sizeof(start_sequence)+packet_size;

Lines 1-12 Link Here

(-)files/patch-misc_CMakeLists.txt (-12 lines)
1	--- misc/CMakeLists.txt.orig 2016-06-01 00:41:17 UTC
2	+++ misc/CMakeLists.txt
3	@@ -13,6 +13,7 @@ configure_file(zoneminder-tmpfiles.conf.
4	#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/apache.conf" "${CMAKE_CURRENT_BINARY_DIR}/logrotate.conf" "${CMAKE_CURRENT_BINARY_DIR}/syslog.conf" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/misc")
5
6	# Install Policykit rules and actions into the proper folders
7	-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.policy" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions")
8	-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.rules" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/rules.d")
9	+# polkit is not required for FreeBSD
10	+#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.policy" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions")
11	+#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.rules" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/rules.d")
12

Lines 1-11 Link Here

(-)files/patch-scripts_CMakeLists.txt (-7 / +7 lines)
1	--- scripts/CMakeLists.txt.orig 2016-06-01 00:41:17 UTC	1	--- scripts/CMakeLists.txt.orig 2018-10-13 18:36:15 UTC
2	+++ scripts/CMakeLists.txt	2	+++ scripts/CMakeLists.txt
3	@@ -32,7 +32,7 @@ FOREACH(PERLSCRIPT ${perlscripts})	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})
4	ENDFOREACH(PERLSCRIPT ${perlscripts})	9	ENDFOREACH(PERLSCRIPT ${perlscripts})
5		10
6	# Install the perl scripts	11	# Install the perl scripts
7	-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmaudit.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcontrol.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmdc.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmfilter.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmpkg.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrack.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrigger.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmupdate.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtelemetry.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
8	+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmaudit.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcontrol.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmdc.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmfilter.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmpkg.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrack.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrigger.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmupdate.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtelemetry.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
9	if(NOT ZM_NO_X10)
10	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
11	endif(NOT ZM_NO_X10)

Lines 1-18 Link Here

(-)files/patch-src_zm__image.cpp (-18 lines)
1	--- src/zm_image.cpp.orig 2016-06-01 00:41:17 UTC
2	+++ src/zm_image.cpp
3	@@ -1619,12 +1619,9 @@ Image *Image::Highlight( unsigned int n_
4	for ( unsigned int j = 0; j < n_images; j++ )
5	{
6	uint8_t *psrc = images[j]->buffer+c;
7	-
8	-#ifndef SOLARIS
9	- if ( (unsigned)abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
10	-#else
11	- if ( (unsigned)std::abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
12	-#endif
13	+ unsigned int diff = ((psrc)-RGB_VAL(ref_colour,c)) > 0 ? (psrc)-RGB_VAL(ref_colour,c) : RGB_VAL(ref_colour,c) - (*psrc);
14	+
15	+ if (diff >= RGB_VAL(threshold,c))
16	{
17	count++;
18	}

Lines 1-20 Link Here

(-)files/patch-src_zm__logger.cpp (-20 lines)
1	--- src/zm_logger.cpp
2	+++ src/zm_logger.cpp
3	@@ -504,7 +504,8 @@
4	va_list argPtr;
5	struct timeval timeVal;
6
7	- const char * const file = basename(filepath);
8	+ char *filecopy = strdup(filepath);
9	+ const char * const file = basename(filecopy);
10
11	if ( level < PANIC \|\| level > DEBUG9 )
12	Panic( "Invalid logger level %d", level );
13	@@ -624,6 +625,8 @@
14	abort();
15	exit( -1 );
16	}
17	+
18	+ free(filecopy);
19	}
20	}

Lines 1-29 Link Here

(-)files/patch-src_zm__monitor.cpp (-27 / +18 lines)
1	--- src/zm_monitor.cpp.orig 2016-07-28 01:45:26 UTC	1	--- src/zm_monitor.cpp.orig 2018-10-13 18:36:15 UTC
2	+++ src/zm_monitor.cpp	2	+++ src/zm_monitor.cpp
3	@@ -160,7 +160,7 @@ bool Monitor::MonitorLink::connect()	3	@@ -2110,6 +2110,7 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zone
4	return( false );	4	Camera *camera = 0;
5	}	5	if ( type == "Local" ) {
6	mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
7	- if ( mem_ptr < 0 )
8	+ if ( mem_ptr < (void *)0 )
9	{
10	Debug( 3, "Can't shmat link memory: %s", strerror(errno) );
11	connected = false;
12	@@ -194,7 +194,7 @@ bool Monitor::MonitorLink::disconnect()
13	connected = false;
14		6
15	#if ZM_MEM_MAPPED	7	+#if ZM_HAS_V4L
16	- if ( mem_ptr > 0 )	8	int extras = (deinterlacing>>24)&0xff;
17	+ if ( mem_ptr > (void *)0 )	9
18	{	10	camera = new LocalCamera(
19	msync( mem_ptr, mem_size, MS_ASYNC );	11	@@ -2132,6 +2133,9 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zone
20	munmap( mem_ptr, mem_size );	12	record_audio,
21	@@ -558,7 +558,7 @@ bool Monitor::connect() {	13	extras
22	exit( -1 );	14	);
23	}	15	+#else
24	mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );	16	+ Fatal("ZoneMinder not built with Local Camera support");
25	- if ( mem_ptr < 0 )	17	+#endif
26	+ if ( mem_ptr < (void *)0 )	18	} else if ( type == "Remote" ) {
27	{	19	if ( protocol == "http" ) {
28	Error( "Can't shmat: %s", strerror(errno));	20	camera = new RemoteCameraHttp(
29	exit( -1 );

Lines 1-20 Link Here

(-)files/patch-src_zm__signal.cpp (-20 lines)
1	--- src/zm_signal.cpp.orig 2016-06-01 00:41:17 UTC
2	+++ src/zm_signal.cpp
3	@@ -63,17 +63,9 @@ RETSIGTYPE zm_die_handler(int signal)
4	ucontext_t uc = (ucontext_t ) context;
5	cr2 = info->si_addr;
6	#if defined(__x86_64__)
7	- #ifdef __FreeBSD_kernel__
8	ip = (void *)(uc->uc_mcontext.mc_rip);
9	- #else
10	- ip = (void *)(uc->uc_mcontext.gregs[REG_RIP]);
11	- #endif
12	#else
13	- #ifdef __FreeBSD_kernel__
14	ip = (void *)(uc->uc_mcontext.mc_eip);
15	- #else
16	- ip = (void *)(uc->uc_mcontext.gregs[REG_EIP]);
17	- #endif
18	#endif // defined(__x86_64__)
19
20	// Print the signal address and instruction pointer if available

Lines 1-11 Link Here

(-)files/patch-src_zm__stream.cpp (-8 / +8 lines)
1	--- src/zm_stream.cpp.orig 2017-05-09 14:54:48 UTC	1	--- src/zm_stream.cpp.orig 2018-11-07 16:33:47 UTC
2	+++ src/zm_stream.cpp	2	+++ src/zm_stream.cpp
3	@@ -332,7 +332,7 @@ void StreamBase::openComms()	3	@@ -325,7 +325,7 @@ void StreamBase::openComms() {
4		4	strncpy(loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path));
5	strncpy( loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path) );
6	loc_addr.sun_family = AF_UNIX;	5	loc_addr.sun_family = AF_UNIX;
7	- if ( bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1 ) < 0 )	6	Debug(3, "Binding to %s", loc_sock_path);
8	+ if ( ::bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1 ) < 0 )	7	- if ( bind(sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1) < 0 ) {
9	{	8	+ if ( ::bind(sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1) < 0 ) {
10	Fatal( "Can't bind: %s", strerror(errno) );	9	Fatal("Can't bind: %s", strerror(errno));
11	}	10	}
		11

Lines 1-20 Link Here

(-)files/patch-src_zmf.cpp (-20 lines)
1	--- src/zmf.cpp.orig 2017-05-09 14:54:48 UTC
2	+++ src/zmf.cpp
3	@@ -92,7 +92,7 @@ int OpenSocket( int monitor_id )
4	strncpy( addr.sun_path, sock_path, sizeof(addr.sun_path) );
5	addr.sun_family = AF_UNIX;
6
7	- if ( bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
8	+ if ( ::bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
9	{
10	Error( "Can't bind: %s", strerror(errno) );
11	exit( -1 );
12	@@ -331,7 +331,7 @@ int main( int argc, char *argv[] )
13	Debug( 1, "Got image, writing to %s", path );
14
15	FILE *fd = 0;
16	- if ( (fd = fopen( path, "w" )) < 0 )
17	+ if ( (fd = fopen( path, "w" )) == NULL )
18	{
19	Error( "Can't fopen '%s': %s", path, strerror(errno) );
20	exit( -1 );