From a2d7ac86fec4250adab6d836d3c00e1940fe5a8d Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Fri, 21 Aug 2015 10:29:54 -0500 Subject: [PATCH 01/14] add rtsp_describe to RtspThread class --- src/zm_monitor.cpp | 12 ++++++++---- src/zm_remote_camera_rtsp.cpp | 7 ++++--- src/zm_remote_camera_rtsp.h | 12 +++++++----- src/zm_rtsp.cpp | 34 ++++++++++++++++++++-------------- src/zm_rtsp.h | 3 ++- 5 files changed, 41 insertions(+), 27 deletions(-) diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index d3d873f4c..778028f8b 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -2198,11 +2198,11 @@ int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const c static char sql[ZM_SQL_MED_BUFSIZ]; if ( !protocol ) { - strncpy( sql, "select Id, Name, Function+0, Enabled, LinkedMonitors, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'Remote'", sizeof(sql) ); + strncpy( sql, "select Id, Name, Function+0, Enabled, LinkedMonitors, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'Remote'", sizeof(sql) ); } else { - snprintf( sql, sizeof(sql), "select Id, Name, Function+0, Enabled, LinkedMonitors, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'Remote' and Protocol = '%s' and Host = '%s' and Port = '%s' and Path = '%s'", protocol, host, port, path ); + snprintf( sql, sizeof(sql), "select Id, Name, Function+0, Enabled, LinkedMonitors, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'Remote' and Protocol = '%s' and Host = '%s' and Port = '%s' and Path = '%s'", protocol, host, port, path ); } if ( mysql_query( &dbconn, sql ) ) { @@ -2241,7 +2241,8 @@ int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const c int colours = atoi(dbrow[col]); col++; /* int palette = atoi(dbrow[col]); */ col++; Orientation orientation = (Orientation)atoi(dbrow[col]); col++; - unsigned int deinterlacing = atoi(dbrow[col]); col++; + unsigned int deinterlacing = atoi(dbrow[col]); col++; + bool rtsp_describe = (*dbrow[col] != '0'); col++; int brightness = atoi(dbrow[col]); col++; int contrast = atoi(dbrow[col]); col++; int hue = atoi(dbrow[col]); col++; @@ -2306,6 +2307,7 @@ int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const c path, // Path cam_width, cam_height, + rtsp_describe, colours, brightness, contrast, @@ -2670,7 +2672,7 @@ int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose Monitor *Monitor::Load( int id, bool load_zones, Purpose purpose ) { static char sql[ZM_SQL_MED_BUFSIZ]; - snprintf( sql, sizeof(sql), "select Id, Name, Type, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Protocol, Method, Host, Port, Path, Options, User, Pass, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Id = %d", id ); + snprintf( sql, sizeof(sql), "select Id, Name, Type, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Protocol, Method, Host, Port, Path, Options, User, Pass, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Id = %d", id ); if ( mysql_query( &dbconn, sql ) ) { Error( "Can't run query: %s", mysql_error( &dbconn ) ); @@ -2737,6 +2739,7 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame ); int palette = atoi(dbrow[col]); col++; Orientation orientation = (Orientation)atoi(dbrow[col]); col++; unsigned int deinterlacing = atoi(dbrow[col]); col++; + bool rtsp_describe = (*dbrow[col] != '0'); col++; int brightness = atoi(dbrow[col]); col++; int contrast = atoi(dbrow[col]); col++; int hue = atoi(dbrow[col]); col++; @@ -2838,6 +2841,7 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame ); path.c_str(), cam_width, cam_height, + rtsp_describe, colours, brightness, contrast, diff --git a/src/zm_remote_camera_rtsp.cpp b/src/zm_remote_camera_rtsp.cpp index 9f7b39227..b7b976996 100644 --- a/src/zm_remote_camera_rtsp.cpp +++ b/src/zm_remote_camera_rtsp.cpp @@ -28,9 +28,10 @@ #include #include -RemoteCameraRtsp::RemoteCameraRtsp( int p_id, const std::string &p_method, const std::string &p_host, const std::string &p_port, const std::string &p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) : +RemoteCameraRtsp::RemoteCameraRtsp( int p_id, const std::string &p_method, const std::string &p_host, const std::string &p_port, const std::string &p_path, int p_width, int p_height, bool p_rtsp_describe, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) : RemoteCamera( p_id, "rtsp", p_host, p_port, p_path, p_width, p_height, p_colours, p_brightness, p_contrast, p_hue, p_colour, p_capture ), - rtspThread( 0 ) + rtspThread( 0 ), + rtsp_describe( p_rtsp_describe ) { if ( p_method == "rtpUni" ) method = RtspThread::RTP_UNICAST; @@ -125,7 +126,7 @@ void RemoteCameraRtsp::Terminate() int RemoteCameraRtsp::Connect() { - rtspThread = new RtspThread( id, method, protocol, host, port, path, auth ); + rtspThread = new RtspThread( id, method, protocol, host, port, path, auth, rtsp_describe ); rtspThread->start(); diff --git a/src/zm_remote_camera_rtsp.h b/src/zm_remote_camera_rtsp.h index b5a1e3c89..71debf40b 100644 --- a/src/zm_remote_camera_rtsp.h +++ b/src/zm_remote_camera_rtsp.h @@ -40,10 +40,11 @@ protected: int rtsp_sd; int rtp_sd; int rtcp_sd; + bool rtsp_describe; Buffer buffer; - Buffer lastSps; - Buffer lastPps; + Buffer lastSps; + Buffer lastPps; RtspThread::RtspMethod method; @@ -66,18 +67,19 @@ protected: #endif public: - RemoteCameraRtsp( int p_id, const std::string &method, const std::string &host, const std::string &port, const std::string &path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ); + RemoteCameraRtsp( int p_id, const std::string &method, const std::string &host, const std::string &port, const std::string &path, int p_width, int p_height, bool p_rtsp_describe, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ); ~RemoteCameraRtsp(); void Initialise(); void Terminate(); - int Connect(); - int Disconnect(); + int Connect(); + int Disconnect(); int PrimeCapture(); int PreCapture(); int Capture( Image &image ); int PostCapture(); + }; #endif // ZM_REMOTE_CAMERA_RTSP_H diff --git a/src/zm_rtsp.cpp b/src/zm_rtsp.cpp index 556174291..abf9660e2 100644 --- a/src/zm_rtsp.cpp +++ b/src/zm_rtsp.cpp @@ -167,13 +167,14 @@ void RtspThread::releasePorts( int port ) smAssignedPorts.erase( port ); } -RtspThread::RtspThread( int id, RtspMethod method, const std::string &protocol, const std::string &host, const std::string &port, const std::string &path, const std::string &auth) : +RtspThread::RtspThread( int id, RtspMethod method, const std::string &protocol, const std::string &host, const std::string &port, const std::string &path, const std::string &auth, bool rtsp_describe) : mId( id ), mMethod( method ), mProtocol( protocol ), mHost( host ), mPort( port ), mPath( path ), + mRtspDescribe( rtsp_describe ), mSessDesc( 0 ), mFormatContext( 0 ), mSeq( 0 ), @@ -382,20 +383,25 @@ int RtspThread::run() if( sdpStart == std::string::npos ) return( -1 ); - std::string DescHeader = response.substr( 0,sdpStart ); - Debug( 1, "Processing DESCRIBE response header '%s'", DescHeader.c_str() ); + Info("Value of RTSPDescribe: %d", mRtspDescribe ); - lines = split( DescHeader, "\r\n" ); - for ( size_t i = 0; i < lines.size(); i++ ) - { - // If the device sends us a url value for Content-Base in the response header, we should use that instead - if ( ( lines[i].size() > 13 ) && ( lines[i].substr( 0, 13 ) == "Content-Base:" ) ) - { - mUrl = trimSpaces( lines[i].substr( 13 ) ); - Info("Received new Content-Base in DESCRIBE response header. Updated device Url to: '%s'", mUrl.c_str() ); - break; - } - } + if ( mRtspDescribe ) + { + std::string DescHeader = response.substr( 0,sdpStart ); + Debug( 1, "Processing DESCRIBE response header '%s'", DescHeader.c_str() ); + + lines = split( DescHeader, "\r\n" ); + for ( size_t i = 0; i < lines.size(); i++ ) + { + // If the device sends us a url value for Content-Base in the response header, we should use that instead + if ( ( lines[i].size() > 13 ) && ( lines[i].substr( 0, 13 ) == "Content-Base:" ) ) + { + mUrl = trimSpaces( lines[i].substr( 13 ) ); + Info("Received new Content-Base in DESCRIBE response header. Updated device Url to: '%s'", mUrl.c_str() ); + break; + } + } + } sdpStart += endOfHeaders.length(); diff --git a/src/zm_rtsp.h b/src/zm_rtsp.h index 937646b6d..f5dcb9552 100644 --- a/src/zm_rtsp.h +++ b/src/zm_rtsp.h @@ -50,6 +50,7 @@ private: private: int mId; + bool mRtspDescribe; RtspMethod mMethod; std::string mProtocol; std::string mHost; @@ -95,7 +96,7 @@ private: void checkAuthResponse(std::string &response); public: - RtspThread( int id, RtspMethod method, const std::string &protocol, const std::string &host, const std::string &port, const std::string &path, const std::string &auth); + RtspThread( int id, RtspMethod method, const std::string &protocol, const std::string &host, const std::string &port, const std::string &path, const std::string &auth, bool rtsp_describe ); ~RtspThread(); public: From f5f7363d35d73a87e5c02417e4651e64ea1ec45f Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Fri, 21 Aug 2015 10:32:04 -0500 Subject: [PATCH 02/14] add RTSPDescribe column to Monitors table --- db/zm_create.sql.in | 1 + db/zm_update-1.28.105.sql | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 db/zm_update-1.28.105.sql diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in index 6c376be7f..081f71181 100644 --- a/db/zm_create.sql.in +++ b/db/zm_create.sql.in @@ -341,6 +341,7 @@ CREATE TABLE `Monitors` ( `Palette` int(10) unsigned NOT NULL default '0', `Orientation` enum('0','90','180','270','hori','vert') NOT NULL default '0', `Deinterlacing` int(10) unsigned NOT NULL default '0', + `RTSPDescribe` tinyint(1) unsigned NOT NULL default '0', `Brightness` mediumint(7) NOT NULL default '-1', `Contrast` mediumint(7) NOT NULL default '-1', `Hue` mediumint(7) NOT NULL default '-1', diff --git a/db/zm_update-1.28.105.sql b/db/zm_update-1.28.105.sql new file mode 100644 index 000000000..0262658e5 --- /dev/null +++ b/db/zm_update-1.28.105.sql @@ -0,0 +1,21 @@ +-- +-- This updates a 1.28.104 database to 1.28.105 +-- + +-- +-- Add Monitor RTSPDescribe field +-- Used to enable or disable processing of the remote camera RTSP DESCRIBE response header +-- +SET @s = (SELECT IF( + (SELECT COUNT(*) + FROM INFORMATION_SCHEMA.COLUMNS + WHERE table_name = 'Monitors' + AND table_schema = DATABASE() + AND column_name = 'RTSPDescribe' + ) > 0, +"SELECT 'Column RTSPDescribe already exists in Monitors'", +"ALTER TABLE `Monitors` ADD `RTSPDescribe` tinyint(1) unsigned NOT NULL default '0' AFTER `Deinterlacing`" +)); + +PREPARE stmt FROM @s; +EXECUTE stmt; From 2fbf79674b19be5510e5d29da32c47864c3ab610 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Fri, 21 Aug 2015 10:32:50 -0500 Subject: [PATCH 03/14] Add RTSP Describe checkbox to web console --- web/includes/actions.php | 3 ++- web/lang/en_gb.php | 9 ++++++++- web/skins/classic/views/monitor.php | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/web/includes/actions.php b/web/includes/actions.php index 5f5b56db8..ff677c200 100644 --- a/web/includes/actions.php +++ b/web/includes/actions.php @@ -422,7 +422,8 @@ if ( !empty($action) ) 'TrackMotion' => 'toggle', 'Enabled' => 'toggle', 'DoNativeMotDet' => 'toggle', - 'Exif' => 'toggle' + 'Exif' => 'toggle', + 'RTSPDescribe' => 'toggle', ); $columns = getTableColumns( 'Monitors' ); diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php index bf0258caf..76a71e301 100644 --- a/web/lang/en_gb.php +++ b/web/lang/en_gb.php @@ -256,6 +256,7 @@ $SLANG = array( 'DefaultScale' => 'Default Scale', 'DefaultView' => 'Default View', 'Deinterlacing' => 'Deinterlacing', + 'RTSPDescribe' => 'Use RTSP Response Media URL', 'Delay' => 'Delay', 'DeleteAndNext' => 'Delete & Next', 'DeleteAndPrev' => 'Delete & Prev', @@ -903,7 +904,13 @@ $OLANG = array( 'OPTIONS_EXIF' => array( 'Help' => "Enable this option to embed EXIF data into each jpeg frame." ), - + 'OPTIONS_RTSPDESCRIBE' => array( + 'Help' => "Sometimes, during the intial RTSP handshake, the camera will send an updated media URL. ". + "Enable this option to tell ZoneMinder to use this URL. Disable this option to ignore the ". + "value from the camera and use the value as entered in the monitor configuration~~~~". + "Generally this should be enabled. However, there are cases where the camera can get its". + "own URL incorrect, such as when the camera is streaming through a firewall" + ), // 'LANG_DEFAULT' => array( // 'Prompt' => "This is a new prompt for this option", diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index 5920409ad..369319608 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -78,6 +78,7 @@ if ( ! empty($_REQUEST['mid']) ) { 'Height' => "240", 'Orientation' => "0", 'Deinterlacing' => 0, + 'RTSPDescribe' => 0, 'LabelFormat' => '%N - %d/%m/%y %H:%M:%S', 'LabelX' => 0, 'LabelY' => 0, @@ -563,6 +564,12 @@ if ( $tab != 'source' ) + + @@ -823,6 +830,14 @@ switch ( $tab ) + +  () checked="checked"/> + Date: Fri, 21 Aug 2015 10:33:42 -0500 Subject: [PATCH 04/14] bump version to 1.28.105 --- CMakeLists.txt | 2 +- configure.ac | 2 +- version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b3b8f7fd..c7bf19162 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ # cmake_minimum_required (VERSION 2.6) project (zoneminder) -set(zoneminder_VERSION "1.28.104") +set(zoneminder_VERSION "1.28.105") # make API version a minor of ZM version set(zoneminder_API_VERSION "${zoneminder_VERSION}.1") diff --git a/configure.ac b/configure.ac index 32548d791..32ba09ae1 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ # For instructions on building with cmake, please see INSTALL # AC_PREREQ(2.59) -AC_INIT(zm,1.28.104,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html) +AC_INIT(zm,1.28.105,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR(src/zm.h) AC_CONFIG_HEADERS(config.h) diff --git a/version b/version index e6a0823f8..8424efb95 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.28.104 +1.28.105 From 22dc049bf47072921b31ec335d3948f5a784cbe3 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Fri, 21 Aug 2015 10:34:23 -0500 Subject: [PATCH 05/14] remove Info statement used for testing --- src/zm_rtsp.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/zm_rtsp.cpp b/src/zm_rtsp.cpp index abf9660e2..0dbcb7329 100644 --- a/src/zm_rtsp.cpp +++ b/src/zm_rtsp.cpp @@ -383,8 +383,6 @@ int RtspThread::run() if( sdpStart == std::string::npos ) return( -1 ); - Info("Value of RTSPDescribe: %d", mRtspDescribe ); - if ( mRtspDescribe ) { std::string DescHeader = response.substr( 0,sdpStart ); From d014a34b9a649b97c4b7399ef27ad24bddca9da4 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 28 Aug 2015 15:55:16 -0400 Subject: [PATCH 06/14] added note about potential Perl and PHP time translation conflict with filters --- docs/userguide/filterevents.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/userguide/filterevents.rst b/docs/userguide/filterevents.rst index 10f7f92d1..4d7a50fd5 100644 --- a/docs/userguide/filterevents.rst +++ b/docs/userguide/filterevents.rst @@ -184,3 +184,4 @@ If your filter is not working, here are some useful tips: * Run ``sudo zmfilter.pl -f `` from command line and see the log output * Check how long your action is taking - zmfilter.pl will wait for the action to complete before it checks again * If you are using relative times like 'now' or '1 year ago' etc. remember that zmfilter converts that relative time to an absolute date only when it reloads filters, which is dictated by the FILTER_RELOAD_DELAY duration. So, for example, if you are wondering why your events are not being detected before intervals of 5 minutes and you have used such a relative condition, this is why +* In the event that you see your new filter is working great when you try it out from the Web Console (using the Submit or Execute button) but does not seem to work when its running in background mode, you might have just chanced upon a compatibility issue between how Perl and PHP translate free form text to dates/times. When you test it via the "Submit" or "Execute" button, you are invoking a PHP function for time conversion. When the filter runs in background mode, zmfilter.pl calls a perl equivalent function. In some cases, depending on the version of Perl and PHP you have, the results may vary. If you face this situation, the best thing to do is to run ``sudo zmfilter.pl -f `` from a terminal to make sure the filter actually works in Perl as well. From e822265512a05ffa9b74acd1c99d119f5c3b586f Mon Sep 17 00:00:00 2001 From: Robin Daermann Date: Sat, 29 Aug 2015 10:06:56 +0200 Subject: [PATCH 07/14] Add Documentation for Privacy zones --- docs/userguide/definezone.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/userguide/definezone.rst b/docs/userguide/definezone.rst index 1a221b196..d3eaeb8c6 100644 --- a/docs/userguide/definezone.rst +++ b/docs/userguide/definezone.rst @@ -17,7 +17,7 @@ Name Each Zone can be named for reference purposes. It is used for logging and debugging. Choose a name that helps you identify your zones. Type - This is one of the more important concepts in ZoneMinder and there are five to choose from. + This is one of the more important concepts in ZoneMinder and there are six to choose from. * Active Triggers an alarm when motion is detected within it. This is the zone type you'll use most often, and which will be set for your default zone. Only Active and Exclusive zones can trigger an alarm. @@ -32,7 +32,10 @@ Type This zone type is relatively recent. It is called a Preclusive zone because if it is triggered it actually precludes an alarm being generated for that image frame. So motion or other changes that occur in a Preclusive zone will have the effect of ensuring that no alarm occurs at all. The application for this zone type is primarily as a shortcut for detecting general large-scale lighting or other changes. Generally this may be achieved by limiting the maximum number of alarm pixels or other measure in an Active zone. However in some cases that zone may cover an area where the area of variable illumination occurs in different places as the sun and/or shadows move and it thus may be difficult to come up with general values. Additionally, if the sun comes out rapidly then although the initial change may be ignored in this way as the reference image catches up an alarm may ultimately be triggered as the image becomes less different. Using one or more Preclusive zones offers a different approach. Preclusive zones are designed to be fairly small, even just a few pixels across, with quite low alarm thresholds. They should be situated in areas of the image that are less likely to have motion occur such as high on a wall or in a corner. Should a general illumination change occur they would be triggered at least as early as any Active zones and prevent any other zones from generating an alarm. Obviously careful placement is required to ensure that they do not cancel any genuine alarms or that they are not so close together that any motion just hops from one Preclusive zone to another. Preclusive zones may also be used to reduce processing time by situating one over an Active zone. The Preclusive zone is processed first; if it is small, and is triggered, the rest of the zone/image will not be processed. * Inactive - Suppresses the detection of motion within it. This can be layered on top of any other zone type, preventing motion within the Inactive zone from being effective for any other zone type. Use inactive zones to cover areas in which nothing notable will ever happen or where you get false alarms that don't relate to what you are trying to monitor. Inactive zones may be overlaid on other zones to blank out areas, and are processed first. As a general practice, you should try and make zones abut each other instead of overlapping to avoid repeated duplicate processing of the same area. + Suppresses the detection of motion within it. This can be layered on top of any other zone type, preventing motion within the Inactive zone from being effective for any other zone type. Use inactive zones to cover areas in which nothing notable will ever happen or where you get false alarms that don't relate to what you are trying to monitor. Inactive zones may be overlaid on other zones to blank out areas, and are processed first (with the exception of Privacy zones, see below). As a general practice, you should try and make zones abut each other instead of overlapping to avoid repeated duplicate processing of the same area. + + * Privacy + Blackens the pixels within it. This can be used if you want to hide some regions in the image if the situation does not allow an other solution. This zone type is different to all the others in that it gets processed as soon as possible during capture (even before the timestamp gets into the image) and not in the analyzing process. So if you add, change or delete a Privacy zone, you don't see the changes in the image until the capture process gets restarted. This will be done automatically, but needs a few seconds. Preset The preset chooser sets sensible default values based on computational needs (fast v. best) and sensitivity (low, medium, high.) It is not required that you select a preset, and you can alter any of the parameters after choosing a preset. For a small number of monitors with ZoneMinder running on modern equipment, Best, high sensitivity can be chosen as a good starting point. From 4fdd32b59638dceea568eae8bdefa92493cd72ab Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Sat, 29 Aug 2015 07:53:08 -0500 Subject: [PATCH 08/14] bump version to 1.28.106 --- CMakeLists.txt | 2 +- configure.ac | 2 +- db/{zm_update-1.28.105.sql => zm_update-1.28.106.sql} | 2 +- version | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename db/{zm_update-1.28.105.sql => zm_update-1.28.106.sql} (91%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c7bf19162..e3e3779f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ # cmake_minimum_required (VERSION 2.6) project (zoneminder) -set(zoneminder_VERSION "1.28.105") +set(zoneminder_VERSION "1.28.106") # make API version a minor of ZM version set(zoneminder_API_VERSION "${zoneminder_VERSION}.1") diff --git a/configure.ac b/configure.ac index 32ba09ae1..6917403a4 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ # For instructions on building with cmake, please see INSTALL # AC_PREREQ(2.59) -AC_INIT(zm,1.28.105,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html) +AC_INIT(zm,1.28.106,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR(src/zm.h) AC_CONFIG_HEADERS(config.h) diff --git a/db/zm_update-1.28.105.sql b/db/zm_update-1.28.106.sql similarity index 91% rename from db/zm_update-1.28.105.sql rename to db/zm_update-1.28.106.sql index 0262658e5..894022d22 100644 --- a/db/zm_update-1.28.105.sql +++ b/db/zm_update-1.28.106.sql @@ -1,5 +1,5 @@ -- --- This updates a 1.28.104 database to 1.28.105 +-- This updates a 1.28.105 database to 1.28.106 -- -- diff --git a/version b/version index 8424efb95..71864bd8d 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.28.105 +1.28.106 From 4a04d0411b28bdfe89a888abae1d478896aa31df Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Sat, 29 Aug 2015 08:00:02 -0500 Subject: [PATCH 09/14] bump version to 1.28.106 --- CMakeLists.txt | 4 ---- configure.ac | 4 ---- version | 4 ---- 3 files changed, 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 23cc145de..e3e3779f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,11 +4,7 @@ # cmake_minimum_required (VERSION 2.6) project (zoneminder) -<<<<<<< HEAD -set(zoneminder_VERSION "1.28.105") -======= set(zoneminder_VERSION "1.28.106") ->>>>>>> 4fdd32b59638dceea568eae8bdefa92493cd72ab # make API version a minor of ZM version set(zoneminder_API_VERSION "${zoneminder_VERSION}.1") diff --git a/configure.ac b/configure.ac index a5360775a..32ba09ae1 100644 --- a/configure.ac +++ b/configure.ac @@ -3,11 +3,7 @@ # For instructions on building with cmake, please see INSTALL # AC_PREREQ(2.59) -<<<<<<< HEAD AC_INIT(zm,1.28.105,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html) -======= -AC_INIT(zm,1.28.106,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html) ->>>>>>> 4fdd32b59638dceea568eae8bdefa92493cd72ab AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR(src/zm.h) AC_CONFIG_HEADERS(config.h) diff --git a/version b/version index 0bb901a8c..71864bd8d 100644 --- a/version +++ b/version @@ -1,5 +1 @@ -<<<<<<< HEAD -1.28.105 -======= 1.28.106 ->>>>>>> 4fdd32b59638dceea568eae8bdefa92493cd72ab From ef8830b373057dc6482ba12366760d925d6eaad0 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sat, 29 Aug 2015 11:12:55 -0500 Subject: [PATCH 10/14] Update zoneminder.el6.spec rpm specfile - update location of perl packlist --- distros/redhat/zoneminder.el6.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/redhat/zoneminder.el6.spec b/distros/redhat/zoneminder.el6.spec index 3a65a80db..1d6d5ead1 100644 --- a/distros/redhat/zoneminder.el6.spec +++ b/distros/redhat/zoneminder.el6.spec @@ -146,7 +146,7 @@ rm -rf %{_docdir}/%{name}-%{version} #%{_bindir}/zmonvif-probe.pl %{perl_vendorlib}/ZoneMinder* -%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ZoneMinder* +%{perl_vendorarch}/auto/ZoneMinder/.packlist #%{perl_vendorlib}/ONVIF* #%{perl_vendorlib}/WSDiscovery* #%{perl_vendorlib}/WSSecurity* From d9c3061b527732998555ad4ab88fdd495681a706 Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Sat, 29 Aug 2015 14:01:45 -0500 Subject: [PATCH 11/14] Add reference to mysql Create permission in rpm README's --- distros/fedora/README.Fedora | 6 +++--- distros/redhat/README.CentOS | 6 +++--- distros/redhat/README.Centos7 | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/distros/fedora/README.Fedora b/distros/fedora/README.Fedora index 159e5345b..a75efc185 100644 --- a/distros/fedora/README.Fedora +++ b/distros/fedora/README.Fedora @@ -25,8 +25,8 @@ New installs introduce an obvious security issue. The following should set this up: mysql -u root -p - grant select,insert,update,delete,lock tables,alter on zm.* to - 'zmuser'@localhost identified by 'zmpass'; + grant select,insert,update,delete,lock tables,alter,create + on zm.* to 'zmuser'@localhost identified by 'zmpass'; Obviously, change at least zmpass to an actual, secure password or passphrase. You can change zmuser as well if you like. @@ -95,7 +95,7 @@ Upgrades 2. Add additional permissions to the zmuser account: mysql -u root -p - grant lock tables,alter on zm.* to + grant lock tables,alter,create on zm.* to 'zmuser'@localhost identified by 'zmpass'; Since this is an upgrade, the assumption is that the zmuser account already diff --git a/distros/redhat/README.CentOS b/distros/redhat/README.CentOS index cc5e247f3..640d11ad1 100644 --- a/distros/redhat/README.CentOS +++ b/distros/redhat/README.CentOS @@ -15,8 +15,8 @@ mysql -uroot -p mysql> create database zm; - mysql> grant select,insert,update,delete,lock tables,alter on zm.* to - 'zmuser'@localhost identified by 'zmpass'; + mysql> grant select,insert,update,delete,lock tables,alter,create + on zm.* to 'zmuser'@localhost identified by 'zmpass'; mysql> exit; mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql mysqladmin -uroot -p reload @@ -69,7 +69,7 @@ 1. Add additional permissions to the zmuser account: mysql -u root -p - grant lock tables,alter on zm.* to + grant lock tables,alter,create on zm.* to 'zmuser'@localhost identified by 'zmpass'; Since this is an upgrade, the assumption is that the zmuser account exists diff --git a/distros/redhat/README.Centos7 b/distros/redhat/README.Centos7 index ce7d9af51..54f355397 100644 --- a/distros/redhat/README.Centos7 +++ b/distros/redhat/README.Centos7 @@ -36,8 +36,8 @@ New installs mysql -u root -p < /usr/share/zoneminder/db/zm_create.sql mysql -u root -p - mysql> grant select,insert,update,delete,lock tables,alter on zm.* to - 'zmuser'@localhost identified by 'zmpass'; + mysql> grant select,insert,update,delete,lock tables,alter, create + on zm.* to 'zmuser'@localhost identified by 'zmpass'; mysql> exit; mysqladmin -u root -p reload @@ -101,8 +101,8 @@ Upgrades Overtime, the database account permissions required for normal operation have changed. Verify the zmuser database account has been granted select, - insert, update, delete, lock tables, and alter permission to the ZoneMinder - database: + insert, update, delete, lock tables, alter, and create permission to the + ZoneMinder database: mysql -u root -p mysql> show grants for zmuser@localhost; From 4915b7fc726f4f4dd8e817968b36ad004c5fb3b8 Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Sat, 29 Aug 2015 16:52:16 -0500 Subject: [PATCH 12/14] rpm spec file - create cakephp tmp folder symlink --- distros/fedora/CMakeLists.txt | 1 + distros/redhat/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/distros/fedora/CMakeLists.txt b/distros/fedora/CMakeLists.txt index deec840f7..632f17d8f 100644 --- a/distros/fedora/CMakeLists.txt +++ b/distros/fedora/CMakeLists.txt @@ -25,6 +25,7 @@ install(DIRECTORY events images temp DESTINATION /var/lib/zoneminder DIRECTORY_P install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/events \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/events\")") install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/images \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/images\")") install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/temp\")") +install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/apt/app/tmp\")") # Fedora requires cambozola as a separate package so just link to it install(CODE "execute_process(COMMAND ln -sf ../../java/cambozola.jar \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/cambozola.jar\")") diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt index fe69c6371..df3b44640 100644 --- a/distros/redhat/CMakeLists.txt +++ b/distros/redhat/CMakeLists.txt @@ -51,6 +51,7 @@ install(DIRECTORY events images temp DESTINATION /var/lib/zoneminder DIRECTORY_P install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/events \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/events\")") install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/images \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/images\")") install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/temp\")") +install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/apt/app/tmp\")") # Install auxillary files required to run zoneminder on CentOS install(FILES redalert.wav DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/sounds PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) From 4ddeddeb322c682cf330d6fec8b06b3b2c7f0fb6 Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Sat, 29 Aug 2015 17:28:06 -0500 Subject: [PATCH 13/14] rpm specfile - correct typo --- distros/fedora/CMakeLists.txt | 2 +- distros/redhat/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distros/fedora/CMakeLists.txt b/distros/fedora/CMakeLists.txt index 632f17d8f..61c1105cd 100644 --- a/distros/fedora/CMakeLists.txt +++ b/distros/fedora/CMakeLists.txt @@ -25,7 +25,7 @@ install(DIRECTORY events images temp DESTINATION /var/lib/zoneminder DIRECTORY_P install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/events \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/events\")") install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/images \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/images\")") install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/temp\")") -install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/apt/app/tmp\")") +install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/api/app/tmp\")") # Fedora requires cambozola as a separate package so just link to it install(CODE "execute_process(COMMAND ln -sf ../../java/cambozola.jar \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/cambozola.jar\")") diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt index df3b44640..f14482792 100644 --- a/distros/redhat/CMakeLists.txt +++ b/distros/redhat/CMakeLists.txt @@ -51,7 +51,7 @@ install(DIRECTORY events images temp DESTINATION /var/lib/zoneminder DIRECTORY_P install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/events \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/events\")") install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/images \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/images\")") install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/temp\")") -install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/apt/app/tmp\")") +install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/api/app/tmp\")") # Install auxillary files required to run zoneminder on CentOS install(FILES redalert.wav DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/sounds PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) From 9320efdd454b24de70c481d7270a0455e99fc0f3 Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Sat, 29 Aug 2015 18:04:26 -0500 Subject: [PATCH 14/14] rpm specfile - modify symlinks --- distros/fedora/CMakeLists.txt | 2 +- distros/redhat/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distros/fedora/CMakeLists.txt b/distros/fedora/CMakeLists.txt index 61c1105cd..c4275d45a 100644 --- a/distros/fedora/CMakeLists.txt +++ b/distros/fedora/CMakeLists.txt @@ -25,7 +25,7 @@ install(DIRECTORY events images temp DESTINATION /var/lib/zoneminder DIRECTORY_P install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/events \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/events\")") install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/images \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/images\")") install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/temp\")") -install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/api/app/tmp\")") +install(CODE "execute_process(COMMAND ln -sf ../../../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/api/app/tmp\")") # Fedora requires cambozola as a separate package so just link to it install(CODE "execute_process(COMMAND ln -sf ../../java/cambozola.jar \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/cambozola.jar\")") diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt index f14482792..10d43b2d9 100644 --- a/distros/redhat/CMakeLists.txt +++ b/distros/redhat/CMakeLists.txt @@ -51,7 +51,7 @@ install(DIRECTORY events images temp DESTINATION /var/lib/zoneminder DIRECTORY_P install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/events \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/events\")") install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/images \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/images\")") install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/temp\")") -install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/api/app/tmp\")") +install(CODE "execute_process(COMMAND ln -sf ../../../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/api/app/tmp\")") # Install auxillary files required to run zoneminder on CentOS install(FILES redalert.wav DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/sounds PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)