From cd43d1fa7a4f7fce1b81efdee2dc49c70595e8a5 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 19 Jul 2016 17:34:01 -0400 Subject: [PATCH 01/38] Rough in Event disk space reporting --- web/includes/Event.php | 3 +++ web/includes/functions.php | 8 +++++++ web/skins/classic/views/events.php | 38 +++++++++++++++++------------- 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/web/includes/Event.php b/web/includes/Event.php index 5ad1c4031..71e61b7c4 100644 --- a/web/includes/Event.php +++ b/web/includes/Event.php @@ -148,5 +148,8 @@ public function getStreamSrc( $args, $querySep='&' ) { return( $streamSrc ); } // end function getStreamSrc + function DiskSpace() { + return folder_size( $this->Path() ); + } } # end class ?> diff --git a/web/includes/functions.php b/web/includes/functions.php index 2b73160db..cde212563 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -2107,4 +2107,12 @@ function getStreamHTML( $monitor, $scale=100 ) { } } // end function getStreamHTML +function folder_size($dir) { + $size = 0; + foreach (glob(rtrim($dir, '/').'/*', GLOB_NOSORT) as $each) { + $size += is_file($each) ? filesize($each) : folderSize($each); + } + return $size; +} // end fucntion folder_size + ?> diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php index b7d707b22..4085c1a93 100644 --- a/web/skins/classic/views/events.php +++ b/web/skins/classic/views/events.php @@ -30,7 +30,7 @@ if ( !empty($_REQUEST['execute']) ) } $countSql = 'SELECT count(E.Id) AS EventCount FROM Monitors AS M INNER JOIN Events AS E ON (M.Id = E.MonitorId) WHERE'; -$eventsSql = 'SELECT E.Id,E.MonitorId,M.Name AS MonitorName,M.DefaultScale,E.Name,E.Width,E.Height,E.Cause,E.Notes,E.StartTime,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived FROM Monitors AS M INNER JOIN Events AS E on (M.Id = E.MonitorId) WHERE'; +$eventsSql = 'SELECT E.*,M.Name AS MonitorName FROM Monitors AS M INNER JOIN Events AS E on (M.Id = E.MonitorId) WHERE'; if ( $user['MonitorIds'] ) { $user_monitor_ids = ' M.Id in ('.$user['MonitorIds'].')'; $countSql .= $user_monitor_ids; @@ -95,8 +95,10 @@ $unarchived = false; $events = array(); foreach ( dbFetchAll( $eventsSql ) as $event ) { - $events[] = $event; - $scale = max( reScale( SCALE_BASE, $event['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE ); + $events[] = new Event( $event ); + + # Doesn this code do anything? + $scale = max( reScale( SCALE_BASE, $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE ); $eventWidth = reScale( $event['Width'], $scale ); $eventHeight = reScale( $event['Height'], $scale ); if ( $maxWidth < $eventWidth ) $maxWidth = $eventWidth; @@ -183,6 +185,7 @@ foreach ( $events as $event ) + DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE ); ?> - - - - - - - - - - - + Id().$filterQuery.$sortQuery.'&page=1', 'zmEvent', array( 'event', reScale( $event->Width(), $scale ), reScale( $event->Height(), $scale ) ), $event->Id().($event->Archived()?'*':'') ) ?> + Id().$filterQuery.$sortQuery.'&page=1', 'zmEvent', array( 'event', reScale( $event->Width(), $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), reScale( $event->Height(), $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ) ), validHtmlStr($event->Name()).($event->Archived()?'*':'' ) ) ?> + MonitorName() ?> + Id(), 'zmEventDetail', 'eventdetail', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="'.htmlspecialchars($event->Notes()).'"' ) ?> + StartTime()) ) ?> + Length() ) ?> + Id(), 'zmFrames', 'frames', $event->Frames() ) ?> + Id(), 'zmFrames', 'frames', $event->AlarmFrames() ) ?> + TotScore() ?> + AvgScore() ?> + Id().'&fid=0', 'zmImage', array( 'image', reScale( $event->Width(), $scale ), reScale( $event->Height(), $scale ) ), $event->MaxScore() ) ?> + DiskSpace() ?> - ' ) ?> + Id().'&fid='.$thumbData['FrameId'], 'zmImage', array( 'image', reScale( $event->Width(), $scale ), reScale( $event->Height(), $scale ) ), ''.$thumbData['FrameId'].'/'.$event->MaxScore().'' ) ?> - disabled="disabled"/> + disabled="disabled"/> Date: Mon, 12 Dec 2016 12:09:47 -0600 Subject: [PATCH 02/38] Update control --- distros/ubuntu1604/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/ubuntu1604/control b/distros/ubuntu1604/control index c1ee3cc0d..9e2ec96e7 100644 --- a/distros/ubuntu1604/control +++ b/distros/ubuntu1604/control @@ -38,7 +38,7 @@ Package: zoneminder Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} ,javascript-common - ,libav-tools + ,ffmpeg | libav-tools ,libdate-manip-perl ,libdbd-mysql-perl ,libmime-lite-perl From 9b76a16af4c163170c492abb53ca464306299eb4 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 12 Dec 2016 21:41:55 -0500 Subject: [PATCH 03/38] log failed sql when db insert fails. Also, don't permanently turn off db logging just for one failed insert --- src/zm_logger.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp index 9e28135ba..a26e7868e 100644 --- a/src/zm_logger.cpp +++ b/src/zm_logger.cpp @@ -618,8 +618,10 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co snprintf( sql, sizeof(sql), "insert into Logs ( TimeKey, Component, ServerId, Pid, Level, Code, Message, File, Line ) values ( %ld.%06ld, '%s', %d, %d, %d, '%s', '%s', '%s', %d )", timeVal.tv_sec, timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString, file, line ); if ( mysql_query( &mDbConnection, sql ) ) { + Level tempDatabaseLevel = mDatabaseLevel; databaseLevel( NOLOG ); - Error( "Can't insert log entry: %s", mysql_error( &mDbConnection ) ); + Error( "Can't insert log entry: sql(%s) error(%s)", sql, mysql_error( &mDbConnection ) ); + databaseLevel(tempDatabaseLevel); } } if ( level <= mSyslogLevel ) From 1f6a6f97586da1b64b49e5e247eb5e801203056e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 12 Dec 2016 21:43:07 -0500 Subject: [PATCH 04/38] fix whitespace --- src/zm_logger.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp index a26e7868e..997820c9a 100644 --- a/src/zm_logger.cpp +++ b/src/zm_logger.cpp @@ -619,10 +619,10 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co if ( mysql_query( &mDbConnection, sql ) ) { Level tempDatabaseLevel = mDatabaseLevel; - databaseLevel( NOLOG ); - Error( "Can't insert log entry: sql(%s) error(%s)", sql, mysql_error( &mDbConnection ) ); - databaseLevel(tempDatabaseLevel); - } + databaseLevel( NOLOG ); + Error( "Can't insert log entry: sql(%s) error(%s)", sql, mysql_error( &mDbConnection ) ); + databaseLevel(tempDatabaseLevel); + } } if ( level <= mSyslogLevel ) { From 6fa3b25d2a576f2cc223ca9d1d54fcbf37ab511e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 12 Dec 2016 21:44:03 -0500 Subject: [PATCH 05/38] fix whitespace --- src/zm_logger.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp index 997820c9a..b3db91d83 100644 --- a/src/zm_logger.cpp +++ b/src/zm_logger.cpp @@ -618,11 +618,11 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co snprintf( sql, sizeof(sql), "insert into Logs ( TimeKey, Component, ServerId, Pid, Level, Code, Message, File, Line ) values ( %ld.%06ld, '%s', %d, %d, %d, '%s', '%s', '%s', %d )", timeVal.tv_sec, timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString, file, line ); if ( mysql_query( &mDbConnection, sql ) ) { - Level tempDatabaseLevel = mDatabaseLevel; - databaseLevel( NOLOG ); - Error( "Can't insert log entry: sql(%s) error(%s)", sql, mysql_error( &mDbConnection ) ); - databaseLevel(tempDatabaseLevel); - } + Level tempDatabaseLevel = mDatabaseLevel; + databaseLevel( NOLOG ); + Error( "Can't insert log entry: sql(%s) error(%s)", sql, mysql_error( &mDbConnection ) ); + databaseLevel(tempDatabaseLevel); + } } if ( level <= mSyslogLevel ) { From 6fe88adc02be1a9027ac8d89f06817c831beb214 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 12 Dec 2016 20:50:53 -0600 Subject: [PATCH 06/38] Update zoneminder.f25.spec --- distros/fedora/zoneminder.f25.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/fedora/zoneminder.f25.spec b/distros/fedora/zoneminder.f25.spec index 436b2a8ba..bd2d73b32 100644 --- a/distros/fedora/zoneminder.f25.spec +++ b/distros/fedora/zoneminder.f25.spec @@ -83,7 +83,7 @@ too much degradation of performance. %build %cmake \ - -DZM_TARGET_DISTRO="%{dist}" \ + -DZM_TARGET_DISTRO="fc%{fedora}" \ %{?_without_ffmpeg:-DZM_NO_FFMPEG=ON} \ %{?_without_x10:-DZM_NO_X10=ON} \ . From e058217a4b2543b5608a03dc2ffffb9cb1706d93 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 12 Dec 2016 21:55:32 -0500 Subject: [PATCH 07/38] add a db update script to update the Messages column to a TEXT type. --- db/zm_update-1.30.1.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 db/zm_update-1.30.1.sql diff --git a/db/zm_update-1.30.1.sql b/db/zm_update-1.30.1.sql new file mode 100644 index 000000000..f3d5698d3 --- /dev/null +++ b/db/zm_update-1.30.1.sql @@ -0,0 +1,7 @@ +-- +-- This updates a 1.30.0 database to 1.30.1 +-- +-- Alter type of Messages column from VARCHAR(255) to TEXT +-- + +ALTER TABLE Logs MODIFY Message TEXT; From 5bd41fd65f2d5f25e9bfba2cc93b4818b9f28866 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 12 Dec 2016 21:56:17 -0500 Subject: [PATCH 08/38] db update script requires version bump to 1.30.1 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 034552a83..7f3c3affd 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.30.0 +1.30.1 From 8009bce3d92c757bc65a9994ff4060b5b6ff35d0 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 13 Dec 2016 13:23:20 -0500 Subject: [PATCH 09/38] quote the link name so that spaces don't break it --- scripts/zmaudit.pl.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in index 7f2df08b9..3bd8aa99a 100644 --- a/scripts/zmaudit.pl.in +++ b/scripts/zmaudit.pl.in @@ -293,7 +293,7 @@ MAIN: while( $loop ) { if ( confirm() ) { ( $link ) = ( $link =~ /^(.*)$/ ); # De-taint - my $command = "rm $link"; + my $command = qq`rm "$link"`; executeShellCommand( $command ); $cleaned = 1; } From a9548d3f6bdfe7b59dc908e8978d95066a3adf6c Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 13 Dec 2016 13:34:56 -0500 Subject: [PATCH 10/38] Add a config entry to turn event disk space on/off --- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in | 13 +++++++++++++ web/skins/classic/views/events.php | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in index 063630ed0..1924d3576 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in +++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in @@ -1550,6 +1550,19 @@ our @options = ( type => $types{string}, category => "web", }, + { + name => 'ZM_WEB_EVENT_DISK_SPACE', + default => '', + description => "Whether to show disk space used by each event.", + help => qqq("Adds another column to the listing of events + showing the disk space used by the event. This will impart a small + overhead as it will call du on the event directory. In practice + this overhead is fairly small but may be noticeable on IO-constrained + systems. + "), + type => $types{string}, + category => "web", + }, { name => "ZM_WEB_RESIZE_CONSOLE", default => "yes", diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php index 4085c1a93..e090617d0 100644 --- a/web/skins/classic/views/events.php +++ b/web/skins/classic/views/events.php @@ -185,8 +185,10 @@ foreach ( $events as $event ) + @@ -212,8 +214,10 @@ foreach ( $events as $event ) TotScore() ?> AvgScore() ?> Id().'&fid=0', 'zmImage', array( 'image', reScale( $event->Width(), $scale ), reScale( $event->Height(), $scale ) ), $event->MaxScore() ) ?> + DiskSpace() ?> Date: Thu, 15 Dec 2016 08:28:37 -0600 Subject: [PATCH 11/38] Update zoneminder.el7.spec minor specfile change --- distros/redhat/zoneminder.el7.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/redhat/zoneminder.el7.spec b/distros/redhat/zoneminder.el7.spec index b72e0bbe7..357ced2b3 100644 --- a/distros/redhat/zoneminder.el7.spec +++ b/distros/redhat/zoneminder.el7.spec @@ -69,7 +69,7 @@ too much degradation of performance. %build %cmake \ - -DZM_TARGET_DISTRO="el7" \ + -DZM_TARGET_DISTRO="el%{rhel}" \ . make %{?_smp_mflags} From fe3f3d91ceaba2dbcb4fb6a1523d2c925cc5760d Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 16 Dec 2016 09:12:27 -0500 Subject: [PATCH 12/38] replace the old socket_sendto error message with something more useful so that people stop asking us how to fix it. --- web/ajax/stream.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/web/ajax/stream.php b/web/ajax/stream.php index 5e9798011..da6c0133e 100644 --- a/web/ajax/stream.php +++ b/web/ajax/stream.php @@ -47,12 +47,16 @@ switch ( $_REQUEST['command'] ) $remSockFile = ZM_PATH_SOCKS.'/zms-'.sprintf("%06d",$_REQUEST['connkey']).'s.sock'; $max_socket_tries = 10; -while ( !file_exists($remSockFile) && $max_socket_tries-- ) //sometimes we are too fast for our own good, if it hasn't been setup yet give it a second. - usleep(200000); +while ( !file_exists($remSockFile) && $max_socket_tries-- ) { //sometimes we are too fast for our own good, if it hasn't been setup yet give it a second. + usleep(200000); +} -if ( !@socket_sendto( $socket, $msg, strlen($msg), 0, $remSockFile ) ) -{ +if ( !file_exists($remSockFile) ) { + ajaxError("Socket $ramSocketFile does not exist. This file is created by zms, and since it does not exist, either zms did not run, or zms exited early. Please check your zms logs and ensure that CGI is enabled in apache (sudo a2enmod CGI) and check that the PATH_ZMS is set correctly (typically /zm/cgi-bin/nph-zms). Make sure that ZM is actually recording. If you are trying to view a live stream and the capture process (zmc) is not running then zms will exit."); +} else { + if ( !@socket_sendto( $socket, $msg, strlen($msg), 0, $remSockFile ) ) { ajaxError( "socket_sendto( $remSockFile ) failed: ".socket_strerror(socket_last_error()) ); + } } $rSockets = array( $socket ); From 8b726996f755d6b46bb3016600747764632196b2 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 19 Dec 2016 21:36:39 -0500 Subject: [PATCH 13/38] FAQ fixes, more text about zms problems in it, and adjust the socket_sendto error message to point to the FAQ entry that is relevant. --- docs/faq.rst | 10 +++++++--- web/ajax/stream.php | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/faq.rst b/docs/faq.rst index cfa2da302..20591ddbf 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -8,7 +8,7 @@ How can I stop ZoneMinder filling up my disk? --------------------------------------------- Recent versions of ZoneMinder come with a filter you can use for this purpose already included. -The filter is called **PurgeWhenFull** and to find it, choose one of the event counts from the console page, for instance events in the last hour, for one of your monitors. **Note** that this filter is automatically enabled if you do a frresh install of ZoneMinder including creating a new Database. If you already have an existing Database and are upgrading Zoneminder, it will retain the settings of the filter (which in earlier releases was disabled by default). So you may want to check if PurgeWhenFull is enabled and if not, enable it. +The filter is called **PurgeWhenFull** and to find it, choose one of the event counts from the console page, for instance events in the last hour, for one of your monitors. **Note** that this filter is automatically enabled if you do a fresh install of ZoneMinder including creating a new database. If you already have an existing database and are upgrading ZoneMinder, it will retain the settings of the filter (which in earlier releases was disabled by default). So you may want to check if PurgeWhenFull is enabled and if not, enable it. To enable it, go to Web Console, click on any of your Events of any of your monitors. This will bring up an event listing and a filter window. @@ -36,7 +36,7 @@ There are two methods for ZM to remove files when they are deleted that can be f ZM_OPT_FAST_DELETE: -Normally an event created as the result of an alarm consists of entries in one or more database tables plus the various files associated with it. When deleting events in the browser it can take a long time to remove all of this if your are trying to do a lot of events at once. It is recommended that you set this option which means that the browser client only deletes the key entries in the events table, which means the events will no longer appear in the listing, and leaves the zmaudit daemon to clear up the rest later. +Normally an event created as the result of an alarm consists of entries in one or more database tables plus the various files associated with it. When deleting events in the browser it can take a long time to remove all of this if your are trying to do a lot of events at once. It is recommended that you set this option which means that the browser client only deletes the key entries in the events table, which means the events will no longer appear in the listing, and leaves the zmaudit daemon to clear up the rest later. @@ -257,7 +257,7 @@ Why can't I see streamed images when I can see stills in the Zone window etc? This issue is normally down to one of two causes -1) You are using Internet Explorer and are trying to view multi-part jpeg streams. IE does not support these streams directly, unlike most other browsers. You will need to install Cambozola or another multi-part jpeg aware pluging to view them. To do this you will need to obtain the applet from the Downloads page and install the cambozola.jar file in the same directly as the ZoneMinder php files. Then find the ZoneMinder Options->Images page and enable ZM_OPT_CAMBOZOLA and enter the web path to the .jar file in ZM_PATH_CAMBOZOLA. This will ordinarily just be cambozola.jar. Provided (Options / B/W tabs) WEB_H_CAN_STREAM is set to auto and WEB_H_STREAM_METHOD is set to jpeg then Cambozola should be loaded next time you try and view a stream. +1) You are using Internet Explorer and are trying to view multi-part jpeg streams. IE does not support these streams directly, unlike most other browsers. You will need to install Cambozola or another multi-part jpeg aware pluging to view them. To do this you will need to obtain the applet from the Downloads page and install the cambozola.jar file in the same directory as the ZoneMinder php files. Then find the ZoneMinder Options->Images page and enable ZM_OPT_CAMBOZOLA and enter the web path to the .jar file in ZM_PATH_CAMBOZOLA. This will ordinarily just be cambozola.jar. Provided (Options / B/W tabs) WEB_H_CAN_STREAM is set to auto and WEB_H_STREAM_METHOD is set to jpeg then Cambozola should be loaded next time you try and view a stream. '''NOTE''': If you find that the Cambozola applet loads in IE but the applet just displays the version # of Cambozola and the author's name (as opposed to seeing the streaming images), you may need to chmod (''-rwxrwxr-x'') your (''usr/share/zoneminder/'') cambozola.jar: @@ -269,6 +269,10 @@ Once I did this, images started to stream for me. 2) The other common cause for being unable to view streams is that you have installed the ZoneMinder cgi binaries (zms and nph-zms) in a different directory than your web server is expecting. Make sure that the --with-cgidir option you use to the ZoneMinder configure script is the same as the CGI directory configure for your web server. If you are using Apache, which is the most common one, then in your httpd.conf file there should be a line like ``ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"`` where the last directory in the quotes is the one you have specified. If not then change one or the other to match. Be warned that configuring apache can be complex so changing the one passed to the ZoneMinder configure (and then rebuilding and reinstalling) is recommended in the first instance. If you change the apache config you will need to restart apache for the changes to take effect. If you still cannot see stream reliably then try changing Options->Paths->ZM_PATH_ZMS to just use zms if nph-zms is specified, or vice versa. Also check in your apache error logs. +Also, please check the value of the ZM_PATH_ZMS setting under the Paths Options tab. It is where you configure the URL to the zms or nph-zms CGI executable. Under most Debian-based distros this value should be /zm/cgi-bin/nph-zms but in the past may have been /cgi-bin/nph-zms or you may have configured it to be something else. + +Lastly, please look for errors created by the zmc processes. If zmc isn't running, then zms will not be able to get an image from it and will exit. + I have several monitors configured but when I load the Montage view in FireFox why can I only see two? or, Why don't all my cameras display when I use the Montage view in FireFox? -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/web/ajax/stream.php b/web/ajax/stream.php index da6c0133e..f862cfaf9 100644 --- a/web/ajax/stream.php +++ b/web/ajax/stream.php @@ -52,7 +52,7 @@ while ( !file_exists($remSockFile) && $max_socket_tries-- ) { //sometimes we are } if ( !file_exists($remSockFile) ) { - ajaxError("Socket $ramSocketFile does not exist. This file is created by zms, and since it does not exist, either zms did not run, or zms exited early. Please check your zms logs and ensure that CGI is enabled in apache (sudo a2enmod CGI) and check that the PATH_ZMS is set correctly (typically /zm/cgi-bin/nph-zms). Make sure that ZM is actually recording. If you are trying to view a live stream and the capture process (zmc) is not running then zms will exit."); + ajaxError("Socket $ramSocketFile does not exist. This file is created by zms, and since it does not exist, either zms did not run, or zms exited early. Please check your zms logs and ensure that CGI is enabled in apache and check that the PATH_ZMS is set correctly. Make sure that ZM is actually recording. If you are trying to view a live stream and the capture process (zmc) is not running then zms will exit. Please go to http://zoneminder.readthedocs.io/en/latest/faq.html#why-can-t-i-see-streamed-images-when-i-can-see-stills-in-the-zone-window-etc for more information."); } else { if ( !@socket_sendto( $socket, $msg, strlen($msg), 0, $remSockFile ) ) { ajaxError( "socket_sendto( $remSockFile ) failed: ".socket_strerror(socket_last_error()) ); From 4e892981832d4108819c4e0c77b4c195f36eaa60 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 19 Dec 2016 22:01:45 -0500 Subject: [PATCH 14/38] fix another typo and stop recommending that people use ZM_OPT_FAST_DELETE --- docs/faq.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/faq.rst b/docs/faq.rst index 20591ddbf..857012a17 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -36,7 +36,7 @@ There are two methods for ZM to remove files when they are deleted that can be f ZM_OPT_FAST_DELETE: -Normally an event created as the result of an alarm consists of entries in one or more database tables plus the various files associated with it. When deleting events in the browser it can take a long time to remove all of this if your are trying to do a lot of events at once. It is recommended that you set this option which means that the browser client only deletes the key entries in the events table, which means the events will no longer appear in the listing, and leaves the zmaudit daemon to clear up the rest later. +Normally an event created as the result of an alarm consists of entries in one or more database tables plus the various files associated with it. When deleting events in the browser it can take a long time to remove all of this if you are trying to do a lot of events at once. If you are running on an older or under-powered system, you may want to set this option which means that the browser client only deletes the key entries in the events table, which means the events will no longer appear in the listing, and leaves the zmaudit daemon to clear up the rest later. If you do so, disk space will not be freed immediately so you will need to run zmaudit more frequently. On modern systems, we recommend that you leave this off. From 38c31be720ad18d82a4da399c8e6f0db708a2a0a Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 19 Dec 2016 22:02:44 -0500 Subject: [PATCH 15/38] typo fix pluging -> plugin --- docs/faq.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/faq.rst b/docs/faq.rst index 857012a17..1460e034d 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -257,7 +257,7 @@ Why can't I see streamed images when I can see stills in the Zone window etc? This issue is normally down to one of two causes -1) You are using Internet Explorer and are trying to view multi-part jpeg streams. IE does not support these streams directly, unlike most other browsers. You will need to install Cambozola or another multi-part jpeg aware pluging to view them. To do this you will need to obtain the applet from the Downloads page and install the cambozola.jar file in the same directory as the ZoneMinder php files. Then find the ZoneMinder Options->Images page and enable ZM_OPT_CAMBOZOLA and enter the web path to the .jar file in ZM_PATH_CAMBOZOLA. This will ordinarily just be cambozola.jar. Provided (Options / B/W tabs) WEB_H_CAN_STREAM is set to auto and WEB_H_STREAM_METHOD is set to jpeg then Cambozola should be loaded next time you try and view a stream. +1) You are using Internet Explorer and are trying to view multi-part jpeg streams. IE does not support these streams directly, unlike most other browsers. You will need to install Cambozola or another multi-part jpeg aware plugin to view them. To do this you will need to obtain the applet from the Downloads page and install the cambozola.jar file in the same directory as the ZoneMinder php files. Then find the ZoneMinder Options->Images page and enable ZM_OPT_CAMBOZOLA and enter the web path to the .jar file in ZM_PATH_CAMBOZOLA. This will ordinarily just be cambozola.jar. Provided (Options / B/W tabs) WEB_H_CAN_STREAM is set to auto and WEB_H_STREAM_METHOD is set to jpeg then Cambozola should be loaded next time you try and view a stream. '''NOTE''': If you find that the Cambozola applet loads in IE but the applet just displays the version # of Cambozola and the author's name (as opposed to seeing the streaming images), you may need to chmod (''-rwxrwxr-x'') your (''usr/share/zoneminder/'') cambozola.jar: From 09937e87f73fb43daa45eefc1da428701f2cfdef Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Tue, 20 Dec 2016 08:16:10 -0600 Subject: [PATCH 16/38] mention 32 bit color depth and make it preferred --- docs/userguide/definemonitor.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/userguide/definemonitor.rst b/docs/userguide/definemonitor.rst index c7c13d5a3..7ecd0c922 100644 --- a/docs/userguide/definemonitor.rst +++ b/docs/userguide/definemonitor.rst @@ -97,7 +97,7 @@ Device Path/Channel Device Format Enter the video format of the video stream. This is defined in various system files (e.g. /usr/include/linux/videodev.h) but the two most common are 0 for PAL and 1 for NTSC. Capture Palette - Finally for the video part of the configuration enter the colour depth. ZoneMinder supports a handful of the most common palettes, so choose one here. If in doubt try grey first, and then 24 bit colour. If neither of these work very well then YUV420P or one of the others probably will. There is a slight performance penalty when using palettes other than grey or 24 bit colour as an internal conversion is involved. These other formats are intended to be supported natively in a future version but for now if you have the choice choose one of grey or 24 bit colour. + Finally for the video part of the configuration enter the colour depth. ZoneMinder supports a handful of the most common palettes, so choose one here. If in doubt try 32 bit colour first, then 24 bit colour, then grey. If none of these work very well, and your camera is local, then YUV420P or one of the others probably will. There is a slight performance penalty when using palettes other than 32, 24, or grey palettes as an internal conversion is involved. Recent versions of ZoneMinder support 32bit colour. This capture palette provides a performance boost when used on all modern Intel-based processors. Capture Width/Height The dimensions of the video stream your camera will supply. If your camera supports several just enter the one you'll want to use for this application, you can always change it later. However I would recommend starting with no larger than 320x240 or 384x288 and then perhaps increasing and seeing how performance is affected. This size should be adequate in most cases. Some cameras are quite choosy about the sizes you can use here so unusual sizes such as 197x333 should be avoided initially. Keep aspect ratio @@ -109,7 +109,7 @@ Remote ^^^^^^ Remote Host/Port/Path - Use these fields to enter the full URL of the camera. Basically if your camera is at http://camserver.home.net:8192/cameras/camera1.jpg then these fields will be camserver.home.net, 8192 and /cameras/camera1.jpg respectively. Leave the port at 80 if there is no special port required. If you require authentication to access your camera then add this onto the host name in the form :@.com. This will usually be 24 bit colour even if the image looks black and white. Look in Supported Hardware > Network Cameras section, how to obtain these strings that may apply to your camera. + Use these fields to enter the full URL of the camera. Basically if your camera is at http://camserver.home.net:8192/cameras/camera1.jpg then these fields will be camserver.home.net, 8192 and /cameras/camera1.jpg respectively. Leave the port at 80 if there is no special port required. If you require authentication to access your camera then add this onto the host name in the form :@.com. This will usually be 32 or 24 bit colour even if the image looks black and white. Look in Supported Hardware > Network Cameras section, how to obtain these strings that may apply to your camera. Remote Image Colours Specify the amount of colours in the captured image. Unlike with local cameras changing this has no controlling effect on the remote camera itself so ensure that your camera is actually capturing to this palette beforehand. Capture Width/Height @@ -127,7 +127,7 @@ File File Path Enter the full path to the file to be used as the image source. File Colours - Specify the amount of colours in the image. Usually 24 bit colour. + Specify the amount of colours in the image. Usually 32 bit colour. Capture Width/Height As per local devices. Keep aspect ratio From c25dd50a21f37428e8cb546474be32caab16c8dc Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Tue, 20 Dec 2016 08:30:21 -0600 Subject: [PATCH 17/38] add Remote Protocol and Remote Method to the documentation --- docs/userguide/definemonitor.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/userguide/definemonitor.rst b/docs/userguide/definemonitor.rst index 7ecd0c922..dbc3e259d 100644 --- a/docs/userguide/definemonitor.rst +++ b/docs/userguide/definemonitor.rst @@ -108,6 +108,10 @@ Orientation Remote ^^^^^^ +Remote Protocol + Choices are currently HTTP and RTSP. Before RTSP became the industry standard, many ip cameras streamed directly from their web portal. If you have an ip camera that does not speak RTSP then choose HTTP here. If you camera does speak RTSP then you should change your source type to ffmpeg instead of selecting RTSP here. The Remote -> RTSP method is no longer being maintained and may go away at some point in the future. +Remote Method + When HTTP is the Remote Protocol, your choices are Simple and Regexp. Most should choose Simple. When RTSP is the Remote Protocol, your choices are RTP/Unicast, RTP/Multicast, RTP/RTSP, RTP,RTSP,HTTP. Try each of these to determine which works with your camera. Most cameras will use either RTP/Unicast (UDP) or RTP/RTSP (TCP). Remote Host/Port/Path Use these fields to enter the full URL of the camera. Basically if your camera is at http://camserver.home.net:8192/cameras/camera1.jpg then these fields will be camserver.home.net, 8192 and /cameras/camera1.jpg respectively. Leave the port at 80 if there is no special port required. If you require authentication to access your camera then add this onto the host name in the form :@.com. This will usually be 32 or 24 bit colour even if the image looks black and white. Look in Supported Hardware > Network Cameras section, how to obtain these strings that may apply to your camera. Remote Image Colours From a20da2aa7167ffb66a671838c433b4fef4c7af70 Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Tue, 20 Dec 2016 08:47:02 -0600 Subject: [PATCH 18/38] modify ffmpeg documentation, add a note to libvlc source type --- docs/userguide/definemonitor.rst | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/userguide/definemonitor.rst b/docs/userguide/definemonitor.rst index dbc3e259d..60f174d39 100644 --- a/docs/userguide/definemonitor.rst +++ b/docs/userguide/definemonitor.rst @@ -71,11 +71,16 @@ Source Tab FFmpeg ^^^^^^ - + This is the recommended source type for most modern ip cameras. Source Path - Use this field to enter the full URL of the stream or file. Look in Supported Hardware > Network Cameras section, how to obtain these strings that may apply to your camera. RTSP streams may be specified here. + Use this field to enter the full URL of the stream or file your camera supports. This is usually an RTSP url. There are several methods to learn this: + * Check the documentation that came with your camera + * Look for your camera in the hardware compatibilty list in the wiki http://wiki.zoneminder.com/Hardware_Compatibilty_List + * Try ZoneMinder's new ONVIF probe feature + * Download and install the ONVIF Device Manager onto a Windows machine https://sourceforge.net/projects/onvifdm/ + * Use Google to find third party sites, such as ispy, which document this information Source Colours - Specify the amount of colours in the captured image. Unlike with local cameras changing this has no controlling effect on the remote camera itself so ensure that your camera is actually capturing to this palette beforehand. + Specify the amount of colours in the captured image. 32 bit is the preferred choice here. Unlike with local cameras changing this has no controlling effect on the remote camera itself so ensure that your camera is actually capturing to this palette beforehand. Capture Width/Height Make sure you enter here the same values as they are in the remote camera's internal setting. Keep aspect ratio @@ -85,6 +90,7 @@ Orientation LibVLC ^^^^^^ + The fields for the LibVLC source type are configured the same way as the ffmpeg source type. We recommend only using this source type if issues are experienced with the ffmpeg source type. cURL ^^^^ From 454894e3e8f3b89fac081fa9b6e08705bf28dd2d Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 20 Dec 2016 11:30:19 -0600 Subject: [PATCH 19/38] fix rst formatting It is amazing how seemingly small changes in whitespace significantly affect the formatting --- docs/userguide/definemonitor.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/userguide/definemonitor.rst b/docs/userguide/definemonitor.rst index 60f174d39..5a6d17cd8 100644 --- a/docs/userguide/definemonitor.rst +++ b/docs/userguide/definemonitor.rst @@ -74,6 +74,7 @@ FFmpeg This is the recommended source type for most modern ip cameras. Source Path Use this field to enter the full URL of the stream or file your camera supports. This is usually an RTSP url. There are several methods to learn this: + * Check the documentation that came with your camera * Look for your camera in the hardware compatibilty list in the wiki http://wiki.zoneminder.com/Hardware_Compatibilty_List * Try ZoneMinder's new ONVIF probe feature From 02dac96cd920ad409cee9df69f04d59afa7a01a9 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 20 Dec 2016 11:33:14 -0600 Subject: [PATCH 20/38] more rst formatting changes make the note about using ffmpeg over remote->rtsp in bold --- docs/userguide/definemonitor.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userguide/definemonitor.rst b/docs/userguide/definemonitor.rst index 5a6d17cd8..6fe946c28 100644 --- a/docs/userguide/definemonitor.rst +++ b/docs/userguide/definemonitor.rst @@ -116,7 +116,7 @@ Remote ^^^^^^ Remote Protocol - Choices are currently HTTP and RTSP. Before RTSP became the industry standard, many ip cameras streamed directly from their web portal. If you have an ip camera that does not speak RTSP then choose HTTP here. If you camera does speak RTSP then you should change your source type to ffmpeg instead of selecting RTSP here. The Remote -> RTSP method is no longer being maintained and may go away at some point in the future. + Choices are currently HTTP and RTSP. Before RTSP became the industry standard, many ip cameras streamed directly from their web portal. If you have an ip camera that does not speak RTSP then choose HTTP here. **If you camera does speak RTSP then you should change your source type to ffmpeg instead of selecting RTSP here.** The Remote -> RTSP method is no longer being maintained and may go away at some point in the future. Remote Method When HTTP is the Remote Protocol, your choices are Simple and Regexp. Most should choose Simple. When RTSP is the Remote Protocol, your choices are RTP/Unicast, RTP/Multicast, RTP/RTSP, RTP,RTSP,HTTP. Try each of these to determine which works with your camera. Most cameras will use either RTP/Unicast (UDP) or RTP/RTSP (TCP). Remote Host/Port/Path From 38c0cedeccfc173aaf7ed400c7e897ca6fe1b8bb Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 20 Dec 2016 16:37:42 -0500 Subject: [PATCH 21/38] remove the use of empty which on php < 5.5 only supports variables. --- web/skins/classic/includes/control_functions.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/skins/classic/includes/control_functions.php b/web/skins/classic/includes/control_functions.php index b1702bc94..3f6ca9d01 100644 --- a/web/skins/classic/includes/control_functions.php +++ b/web/skins/classic/includes/control_functions.php @@ -30,7 +30,7 @@ function getControlCommands( $monitor ) $cmds['PresetGoto'] = "presetGoto"; $cmds['PresetHome'] = "presetHome"; - if ( !empty($monitor->CanZoom()) ) + if ( $monitor->CanZoom() ) { if ( $monitor->CanZoomCon() ) $cmds['ZoomRoot'] = "zoomCon"; @@ -45,7 +45,7 @@ function getControlCommands( $monitor ) $cmds['ZoomMan'] = "zoomMan"; } - if ( !empty($monitor->CanFocus()) ) + if ( $monitor->CanFocus() ) { if ( $monitor->CanFocusCon() ) $cmds['FocusRoot'] = "focusCon"; @@ -60,7 +60,7 @@ function getControlCommands( $monitor ) $cmds['FocusMan'] = "focusMan"; } - if ( !empty($monitor->CanIris()) ) + if ( $monitor->CanIris() ) { if ( $monitor->CanIrisCon() ) $cmds['IrisRoot'] = "irisCon"; @@ -75,7 +75,7 @@ function getControlCommands( $monitor ) $cmds['IrisMan'] = "irisMan"; } - if ( !empty($monitor->CanWhite()) ) + if ( $monitor->CanWhite() ) { if ( $monitor->CanWhiteCon() ) $cmds['WhiteRoot'] = "whiteCon"; @@ -89,7 +89,7 @@ function getControlCommands( $monitor ) $cmds['WhiteMan'] = "whiteMan"; } - if ( !empty($monitor->CanGain()) ) + if ( $monitor->CanGain() ) { if ( $monitor->CanGainCon() ) $cmds['GainRoot'] = "gainCon"; @@ -103,7 +103,7 @@ function getControlCommands( $monitor ) $cmds['GainMan'] = "gainMan"; } - if ( !empty($monitor->CanMove()) ) + if ( $monitor->CanMove() ) { if ( $monitor->CanMoveCon() ) { From 47b33917c43bf9003a46ce5a41c13253ed7a4b84 Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Fri, 23 Dec 2016 08:56:10 -0600 Subject: [PATCH 22/38] bump minimum version of cmake --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 56ad12580..96bf1d7d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ # Created by mastertheknife (Kfir Itzhak) # For more information and installation, see the INSTALL file # -cmake_minimum_required (VERSION 2.6) +cmake_minimum_required (VERSION 2.8.7) project (zoneminder) file (STRINGS "version" zoneminder_VERSION) # make API version a minor of ZM version From 1b81d790b224082ffbc5e395bb573bf5e74dccd5 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Fri, 23 Dec 2016 13:06:44 -0600 Subject: [PATCH 23/38] rpm specfile consolidation --- CMakeLists.txt | 3 +- distros/fedora/CMakeLists.txt | 64 --- distros/fedora/README.https | 1 - distros/fedora/README.txt | 3 + .../archive/zoneminder-1.24.3-runlevel.patch | 11 - .../zoneminder-1.24.4-installfix.patch | 22 - .../archive/zoneminder-1.26.0-defaults.patch | 76 --- .../archive/zoneminder-1.26.3-dbinstall.patch | 72 --- .../archive/zoneminder-1.26.3-noffmpeg.patch | 26 - .../archive/zoneminder-1.26.4-dbinstall.patch | 81 --- .../fedora/archive/zoneminder.cmake.f19.spec | 397 --------------- distros/fedora/archive/zoneminder.conf | 45 -- distros/fedora/archive/zoneminder.f19.spec | 478 ------------------ distros/fedora/archive/zoneminder.f20.spec | 395 --------------- distros/fedora/archive/zoneminder.f21.spec | 396 --------------- distros/fedora/archive/zoneminder.f23.spec | 429 ---------------- distros/fedora/archive/zoneminder.logrotate | 8 - distros/fedora/archive/zoneminder.service | 13 - distros/fedora/archive/zoneminder.tmpfiles | 1 - distros/fedora/jscalendar-1.0.zip | 1 - distros/fedora/jscalendar.sh | 1 - distros/fedora/redalert.wav | 1 - .../fedora/zoneminder-1.28.0-defaults.patch | 47 -- distros/fedora/zoneminder.conf.in | 1 - distros/fedora/zoneminder.f24.spec | 1 - distros/fedora/zoneminder.logrotate.in | 1 - distros/fedora/zoneminder.service.in | 19 - distros/fedora/zoneminder.tmpfiles.in | 1 - distros/redhat/CMakeLists.txt | 73 ++- distros/redhat/archive/cambozola.sh | 7 - distros/redhat/archive/zm-init | 48 -- .../archive/zoneminder-1.26.0-dbinstall.patch | 72 --- .../archive/zoneminder-1.26.0-defaults.patch | 76 --- .../archive/zoneminder-1.28.0-defaults.patch | 47 -- .../redhat/archive/zoneminder-runlevel.patch | 11 - distros/redhat/archive/zoneminder.el6.spec | 434 ---------------- distros/redhat/{ => misc}/jscalendar-1.0.zip | Bin distros/redhat/{ => misc}/jscalendar.sh | 2 +- distros/redhat/{ => misc}/local_zoneminder.te | 0 distros/redhat/{ => misc}/redalert.wav | Bin .../{fedora => redhat}/nginx/README.Fedora | 2 +- .../nginx/zoneminder.conf.in | 0 .../nginx/zoneminder.php-fpm.conf.in | 0 .../nginx/zoneminder.service.in | 0 distros/redhat/nginx/zoneminder.tmpfiles.in | 6 + .../{fedora => redhat/readme}/README.Fedora | 10 +- .../{README.CentOS => readme/README.Redhat6} | 37 +- .../{README.Centos7 => readme/README.Redhat7} | 10 +- distros/redhat/{ => readme}/README.https | 0 .../zoneminder.conf.in} | 0 .../zoneminder.logrotate.in} | 0 .../{ => systemd}/zoneminder.service.in | 0 .../{ => systemd}/zoneminder.tmpfiles.in | 0 .../zoneminder.conf.in} | 0 .../zoneminder.in} | 0 .../zoneminder.logrotate.in} | 0 distros/redhat/zoneminder.el6.spec | 363 ------------- distros/redhat/zoneminder.el7.spec | 427 ---------------- .../zoneminder.spec} | 237 ++++++--- 59 files changed, 270 insertions(+), 4186 deletions(-) delete mode 100644 distros/fedora/CMakeLists.txt delete mode 120000 distros/fedora/README.https create mode 100644 distros/fedora/README.txt delete mode 100644 distros/fedora/archive/zoneminder-1.24.3-runlevel.patch delete mode 100644 distros/fedora/archive/zoneminder-1.24.4-installfix.patch delete mode 100644 distros/fedora/archive/zoneminder-1.26.0-defaults.patch delete mode 100644 distros/fedora/archive/zoneminder-1.26.3-dbinstall.patch delete mode 100644 distros/fedora/archive/zoneminder-1.26.3-noffmpeg.patch delete mode 100644 distros/fedora/archive/zoneminder-1.26.4-dbinstall.patch delete mode 100644 distros/fedora/archive/zoneminder.cmake.f19.spec delete mode 100644 distros/fedora/archive/zoneminder.conf delete mode 100644 distros/fedora/archive/zoneminder.f19.spec delete mode 100644 distros/fedora/archive/zoneminder.f20.spec delete mode 100644 distros/fedora/archive/zoneminder.f21.spec delete mode 100644 distros/fedora/archive/zoneminder.f23.spec delete mode 100644 distros/fedora/archive/zoneminder.logrotate delete mode 100644 distros/fedora/archive/zoneminder.service delete mode 100644 distros/fedora/archive/zoneminder.tmpfiles delete mode 120000 distros/fedora/jscalendar-1.0.zip delete mode 120000 distros/fedora/jscalendar.sh delete mode 120000 distros/fedora/redalert.wav delete mode 100644 distros/fedora/zoneminder-1.28.0-defaults.patch delete mode 120000 distros/fedora/zoneminder.conf.in delete mode 120000 distros/fedora/zoneminder.f24.spec delete mode 120000 distros/fedora/zoneminder.logrotate.in delete mode 100644 distros/fedora/zoneminder.service.in delete mode 120000 distros/fedora/zoneminder.tmpfiles.in delete mode 100755 distros/redhat/archive/cambozola.sh delete mode 100644 distros/redhat/archive/zm-init delete mode 100644 distros/redhat/archive/zoneminder-1.26.0-dbinstall.patch delete mode 100644 distros/redhat/archive/zoneminder-1.26.0-defaults.patch delete mode 100644 distros/redhat/archive/zoneminder-1.28.0-defaults.patch delete mode 100644 distros/redhat/archive/zoneminder-runlevel.patch delete mode 100644 distros/redhat/archive/zoneminder.el6.spec rename distros/redhat/{ => misc}/jscalendar-1.0.zip (100%) rename distros/redhat/{ => misc}/jscalendar.sh (77%) rename distros/redhat/{ => misc}/local_zoneminder.te (100%) rename distros/redhat/{ => misc}/redalert.wav (100%) rename distros/{fedora => redhat}/nginx/README.Fedora (99%) rename distros/{fedora => redhat}/nginx/zoneminder.conf.in (100%) rename distros/{fedora => redhat}/nginx/zoneminder.php-fpm.conf.in (100%) rename distros/{fedora => redhat}/nginx/zoneminder.service.in (100%) create mode 100644 distros/redhat/nginx/zoneminder.tmpfiles.in rename distros/{fedora => redhat/readme}/README.Fedora (94%) rename distros/redhat/{README.CentOS => readme/README.Redhat6} (73%) rename distros/redhat/{README.Centos7 => readme/README.Redhat7} (96%) rename distros/redhat/{ => readme}/README.https (100%) rename distros/redhat/{zoneminder.el7.conf.in => systemd/zoneminder.conf.in} (100%) rename distros/redhat/{zoneminder.el7.logrotate.in => systemd/zoneminder.logrotate.in} (100%) rename distros/redhat/{ => systemd}/zoneminder.service.in (100%) rename distros/redhat/{ => systemd}/zoneminder.tmpfiles.in (100%) rename distros/redhat/{zoneminder.el6.conf.in => sysvinit/zoneminder.conf.in} (100%) rename distros/redhat/{zoneminder.sysvinit.in => sysvinit/zoneminder.in} (100%) rename distros/redhat/{zoneminder.el6.logrotate.in => sysvinit/zoneminder.logrotate.in} (100%) delete mode 100644 distros/redhat/zoneminder.el6.spec delete mode 100644 distros/redhat/zoneminder.el7.spec rename distros/{fedora/zoneminder.f25.spec => redhat/zoneminder.spec} (69%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96bf1d7d6..baba4218d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,6 +163,7 @@ elseif(ZM_TARGET_DISTRO STREQUAL "el6") set(ZM_SOCKDIR "/var/lib/zoneminder/sock") set(ZM_TMPDIR "/var/lib/zoneminder/temp") set(ZM_LOGDIR "/var/log/zoneminder") + set(ZM_CONFIG_DIR "/etc/zm") set(ZM_WEBDIR "/usr/share/zoneminder/www") set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin") elseif(ZM_TARGET_DISTRO STREQUAL "el7") @@ -709,7 +710,7 @@ endif(ZM_ONVIF) # Process distro subdirectories if((ZM_TARGET_DISTRO STREQUAL "fc24") OR (ZM_TARGET_DISTRO STREQUAL "fc25")) - add_subdirectory(distros/fedora) + add_subdirectory(distros/redhat) elseif((ZM_TARGET_DISTRO STREQUAL "el6") OR (ZM_TARGET_DISTRO STREQUAL "el7")) add_subdirectory(distros/redhat) elseif(ZM_TARGET_DISTRO STREQUAL "OS13") diff --git a/distros/fedora/CMakeLists.txt b/distros/fedora/CMakeLists.txt deleted file mode 100644 index c6f07c2e6..000000000 --- a/distros/fedora/CMakeLists.txt +++ /dev/null @@ -1,64 +0,0 @@ -# CMakeLists.txt for the Fedora Target Distro. - -# Display a message to show the Fedora build options are being processed. -message([STATUS] "Starting Fedora Build Options" ...) - -# Process config files -configure_file(zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY) -configure_file(zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY) -if(ZM_WEB_USER STREQUAL "nginx") - configure_file(nginx/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY) - configure_file(nginx/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY) - configure_file(nginx/zoneminder.php-fpm.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.php-fpm.conf @ONLY) - configure_file(nginx/README.Fedora ${CMAKE_CURRENT_SOURCE_DIR}/README.Fedora COPYONLY) -else(ZM_WEB_USER STREQUAL "nginx") - configure_file(zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY) - configure_file(zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY) -endif(ZM_WEB_USER STREQUAL "nginx") - -# Unpack jscalendar & move files into position -message(STATUS "Unpacking and Installing jscalendar...") -execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar.sh - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ERROR_VARIABLE unzip_jsc - ) -if("${unzip_jsc}" STREQUAL "") - message(STATUS "jscalendar successfully installed.") -else("${unzip_jsc}" STREQUAL "") - message(FATAL_ERROR "\nAn error occured while jscalendar was being processed:\n${unzip_jsc}") -endif("${unzip_jsc}" STREQUAL "") - -# Create several empty folders -file(MAKE_DIRECTORY sock swap zoneminder zoneminder-upload events images temp) - -# Install the empty folders -#install(DIRECTORY run DESTINATION /var DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_WRITE GROUP_READ GROUP_EXECUTE WORLD_WRITE WORLD_READ WORLD_EXECUTE) -install(DIRECTORY sock swap DESTINATION /var/lib/zoneminder DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -install(DIRECTORY zoneminder DESTINATION /var/log DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -install(DIRECTORY zoneminder DESTINATION /run DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -install(DIRECTORY zoneminder-upload DESTINATION /var/spool DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -install(DIRECTORY events images temp DESTINATION /var/lib/zoneminder DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - -# Create symlinks -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\")") - -# 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\")") - -# Install auxiliary files required to run zoneminder on Fedora -if(ZM_WEB_USER STREQUAL "nginx") - install(FILES zoneminder.conf DESTINATION /etc/nginx/default.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) - install(FILES zoneminder.php-fpm.conf DESTINATION /etc/php-fpm.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME zoneminder.conf) -else(ZM_WEB_USER STREQUAL "nginx") - install(FILES zoneminder.conf DESTINATION /etc/httpd/conf.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) -endif(ZM_WEB_USER STREQUAL "nginx") - -install(FILES zoneminder.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) -install(FILES ../../misc/zoneminder-tmpfiles.conf DESTINATION /etc/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) -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) -install(FILES zoneminder.service DESTINATION /usr/lib/systemd/system PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) -install(DIRECTORY jscalendar-1.0/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/tools/jscalendar) - diff --git a/distros/fedora/README.https b/distros/fedora/README.https deleted file mode 120000 index 18f7407c1..000000000 --- a/distros/fedora/README.https +++ /dev/null @@ -1 +0,0 @@ -../redhat/README.https \ No newline at end of file diff --git a/distros/fedora/README.txt b/distros/fedora/README.txt new file mode 100644 index 000000000..09659129f --- /dev/null +++ b/distros/fedora/README.txt @@ -0,0 +1,3 @@ +Fedora rpm build files have been merged with redhat. +See /distros/redhat. + diff --git a/distros/fedora/archive/zoneminder-1.24.3-runlevel.patch b/distros/fedora/archive/zoneminder-1.24.3-runlevel.patch deleted file mode 100644 index de7b49b0b..000000000 --- a/distros/fedora/archive/zoneminder-1.24.3-runlevel.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ./scripts/zm.in.runlevel ./scripts/zm.in ---- ./scripts/zm.in.runlevel 2010-11-28 15:22:05.000000000 -0600 -+++ ./scripts/zm.in 2011-03-24 21:39:01.973010160 -0500 -@@ -1,6 +1,6 @@ - #!/bin/sh - # description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008 --# chkconfig: 2345 99 00 -+# chkconfig: - 99 00 - # processname: zmpkg.pl - - # Source function library. diff --git a/distros/fedora/archive/zoneminder-1.24.4-installfix.patch b/distros/fedora/archive/zoneminder-1.24.4-installfix.patch deleted file mode 100644 index 8831d597a..000000000 --- a/distros/fedora/archive/zoneminder-1.24.4-installfix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up ./Makefile.am.installfix ./Makefile.am ---- ./Makefile.am.installfix 2011-06-19 15:51:14.000000000 -0500 -+++ ./Makefile.am 2011-08-13 20:33:30.288587436 -0500 -@@ -21,12 +21,12 @@ EXTRA_DIST = \ - # Yes, you are correct. This is a HACK! - install-data-hook: - ( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) ) -- ( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi ) -- ( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi ) -- ( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "/var/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi ) -+ ( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR); fi ) -+ ( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR); fi ) -+ ( if ! test -e $(DESTDIR)$(ZM_LOGDIR); then mkdir -p $(DESTDIR)$(ZM_LOGDIR); fi; if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_LOGDIR); chmod u+w $(DESTDIR)$(ZM_LOGDIR); fi ) - - uninstall-hook: - @-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp ) -- @-( if test "$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(ZM_RUNDIR); fi ) -- @-( if test "$(ZM_TMPDIR)" != "/tmp"; then rm -rf $(ZM_TMPDIR); fi ) -- @-( if test "$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(ZM_LOGDIR); fi ) -+ @-( if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_RUNDIR); fi ) -+ @-( if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then rm -rf $(DESTDIR)$(ZM_TMPDIR); fi ) -+ @-( if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(DESTDIR)$(ZM_LOGDIR); fi ) diff --git a/distros/fedora/archive/zoneminder-1.26.0-defaults.patch b/distros/fedora/archive/zoneminder-1.26.0-defaults.patch deleted file mode 100644 index 3e5dda67c..000000000 --- a/distros/fedora/archive/zoneminder-1.26.0-defaults.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- configure.ac 2013-08-15 11:44:10.000000000 -0500 -+++ configure.ac.logdir 2013-08-17 09:20:07.326053328 -0500 -@@ -46,7 +46,7 @@ - AC_SUBST(ZM_TMPDIR,[/tmp/zm]) - fi - if test "$ZM_LOGDIR" == ""; then -- AC_SUBST(ZM_LOGDIR,[/var/log/zm]) -+ AC_SUBST(ZM_LOGDIR,[/var/log/zoneminder]) - fi - - LIB_ARCH=lib ---- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in 2013-08-01 18:14:45.175241378 -0500 -+++ scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in.defaults 2013-08-07 18:57:42.525006149 -0500 -@@ -187,7 +187,7 @@ - }, - { - name => "ZM_PATH_ZMS", -- default => "/cgi-bin/nph-zms", -+ default => "/cgi-bin/zm/nph-zms", - description => "Web path to zms streaming server", - help => "The ZoneMinder streaming server is required to send streamed images to your browser. It will be installed into the cgi-bin path given at configuration time. This option determines what the web path to the server is rather than the local path on your machine. Ordinarily the streaming server runs in parser-header mode however if you experience problems with streaming you can change this to non-parsed-header (nph) mode by changing 'zms' to 'nph-zms'.", - type => $types{rel_path}, -@@ -276,7 +276,7 @@ - }, - { - name => "ZM_OPT_CAMBOZOLA", -- default => "no", -+ default => "yes", - description => "Is the (optional) cambozola java streaming client installed", - help => "Cambozola is a handy low fat cheese flavoured Java applet that ZoneMinder uses to view image streams on browsers such as Internet Explorer that don't natively support this format. If you use this browser it is highly recommended to install this from http://www.charliemouse.com/code/cambozola/ however if it is not installed still images at a lower refresh rate can still be viewed.", - type => $types{boolean}, -@@ -526,7 +526,7 @@ - }, - { - name => "ZM_LOG_DEBUG_FILE", -- default => "@ZM_TMPDIR@/zm_debug.log+", -+ default => "/var/log/zoneminder/zm_debug_log+", - description => "Where extra debug is output to", - help => "This option allows you to specify a different target for debug output. All components have a default log file which will norally be in /tmp or /var/log and this is where debug will be written to if this value is empty. Adding a path here will temporarily redirect debug, and other logging output, to this file. This option is a simple filename and you are debugging several components then they will all try and write to the same file with undesirable consequences. Appending a '+' to the filename will cause the file to be created with a '.' suffix containing your process id. In this way debug from each run of a component is kept separate. This is the recommended setting as it will also prevent subsequent runs from overwriting the same log. You should ensure that permissions are set up to allow writing to the file and directory specified here.", - requires => [ { name => "ZM_LOG_DEBUG", value => "yes" } ], -@@ -623,7 +623,7 @@ - }, - { - name => "ZM_PATH_SOCKS", -- default => "@ZM_TMPDIR@", -+ default => "/var/lib/zoneminder/sock", - description => "Path to the various Unix domain socket files that ZoneMinder uses", - help => "ZoneMinder generally uses Unix domain sockets where possible. This reduces the need for port assignments and prevents external applications from possibly compromising the daemons. However each Unix socket requires a .sock file to be created. This option indicates where those socket files go.", - type => $types{abs_path}, -@@ -639,7 +639,7 @@ - }, - { - name => "ZM_PATH_SWAP", -- default => "@ZM_TMPDIR@", -+ default => "/dev/shm", - description => "Path to location for temporary swap images used in streaming", - help => "Buffered playback requires temporary swap images to be stored for each instance of the streaming daemons. This option determines where these images will be stored. The images will actually be stored in sub directories beneath this location and will be automatically cleaned up after a period of time.", - type => $types{abs_path}, -@@ -902,7 +902,7 @@ - }, - { - name => "ZM_UPLOAD_FTP_LOC_DIR", -- default => "@ZM_TMPDIR@", -+ default => "/var/spool/zoneminder-upload", - description => "The local directory in which to create upload files", - help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the local directory that ZoneMinder should use for temporary upload files. These are files that are created from events, uploaded and then deleted.", - requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ], -@@ -1258,7 +1258,7 @@ - }, - { - name => "ZM_OPT_CONTROL", -- default => "no", -+ default => "yes", - description => "Support controllable (e.g. PTZ) cameras", - help => "ZoneMinder includes limited support for controllable cameras. A number of sample protocols are included and others can easily be added. If you wish to control your cameras via ZoneMinder then select this option otherwise if you only have static cameras or use other control methods then leave this option off.", - type => $types{boolean}, diff --git a/distros/fedora/archive/zoneminder-1.26.3-dbinstall.patch b/distros/fedora/archive/zoneminder-1.26.3-dbinstall.patch deleted file mode 100644 index 04af9e8b2..000000000 --- a/distros/fedora/archive/zoneminder-1.26.3-dbinstall.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- configure.ac 2013-09-05 10:33:08.000000000 -0500 -+++ configure.ac.dbinstall 2013-09-05 17:23:28.555553447 -0500 -@@ -1,13 +1,11 @@ - AC_PREREQ(2.59) --AC_INIT(zm,1.26.3,[http://www.zoneminder.com/forums/ - Please check FAQ first],ZoneMinder,http://www.zoneminder.com/downloads.html) -+AC_INIT(zm,1.26.3,[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) - - AC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS]) - --PATH_BUILD=`pwd` --AC_SUBST(PATH_BUILD) - TIME_BUILD=`date +'%s'` - AC_SUBST(TIME_BUILD) - -@@ -354,6 +352,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC - - AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory]) - AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory]) -+AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory]) -+AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE") - AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid") - AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory]) - AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf") -diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am ---- ./db/Makefile.am.dbinstall 2009-10-14 04:42:46.000000000 -0500 -+++ ./db/Makefile.am 2011-03-24 22:50:14.173912137 -0500 -@@ -1,7 +1,16 @@ - AUTOMAKE_OPTIONS = gnu - -+zmdbdatadir = $(pkgdatadir)/db -+ - EXTRA_DIST = \ - zm_create.sql.in \ -+ $(dbupgrade_scripts) -+ -+dist_zmdbdata_DATA = \ -+ zm_create.sql \ -+ $(dbupgrade_scripts) -+ -+dbupgrade_scripts = \ - zm_update-0.0.1.sql \ - zm_update-0.9.7.sql \ - zm_update-0.9.8.sql \ -diff -up ./scripts/zmupdate.pl.in.dbinstall ./scripts/zmupdate.pl.in ---- ./scripts/zmupdate.pl.in.dbinstall 2011-08-27 15:44:05.335602405 -0500 -+++ ./scripts/zmupdate.pl.in 2011-08-26 02:51:37.000000000 -0500 -@@ -424,7 +424,7 @@ if ( $version ) - } - else - { -- $command .= ZM_PATH_BUILD."/db"; -+ $command .= ZM_PATH_DATA."/db"; - } - $command .= "/zm_update-".$version.".sql"; - -diff -up ./zm.conf.in.dbinstall ./zm.conf.in ---- ./zm.conf.in.dbinstall 2008-07-25 04:48:16.000000000 -0500 -+++ ./zm.conf.in 2011-03-24 22:50:14.175912077 -0500 -@@ -12,8 +12,8 @@ - # Current version of ZoneMinder - ZM_VERSION=@VERSION@ - --# Path to build directory, used mostly for finding DB upgrade scripts --ZM_PATH_BUILD=@PATH_BUILD@ -+# Path to installed data directory, used mostly for finding DB upgrade scripts -+ZM_PATH_DATA=@PKGDATADIR@ - - # Build time, used to record when to trigger various checks - ZM_TIME_BUILD=@TIME_BUILD@ diff --git a/distros/fedora/archive/zoneminder-1.26.3-noffmpeg.patch b/distros/fedora/archive/zoneminder-1.26.3-noffmpeg.patch deleted file mode 100644 index e8e8d4b3e..000000000 --- a/distros/fedora/archive/zoneminder-1.26.3-noffmpeg.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- configure.ac 2013-09-10 12:42:56.000000000 -0500 -+++ configure.ac.noffmpeg 2013-09-14 17:25:41.988388970 -0500 -@@ -284,15 +284,15 @@ - AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support)) - AC_CHECK_LIB(z,zlibVersion) - AC_CHECK_LIB(x264,x264_predict_16x16_init) --AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming)) -+dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming)) - # Don't bother to warn about this one --AC_CHECK_LIB(avcore,av_image_copy,,) --AC_CHECK_LIB(avcodec,avcodec_version,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming)) --AC_CHECK_LIB(avformat,avformat_version,,AC_MSG_WARN(libavformat.a is required for MPEG streaming)) --#AC_CHECK_LIB(avcodec,avcodec_open,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming)) --#AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming)) --AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming)) --AC_CHECK_LIB(swscale,sws_scale,,,-lswscale) -+dnl AC_CHECK_LIB(avcore,av_image_copy,,) -+dnl AC_CHECK_LIB(avcodec,avcodec_version,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming)) -+dnl AC_CHECK_LIB(avformat,avformat_version,,AC_MSG_WARN(libavformat.a is required for MPEG streaming)) -+dnl AC_CHECK_LIB(avcodec,avcodec_open,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming)) -+dnl AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming)) -+dnl AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming)) -+dnl AC_CHECK_LIB(swscale,sws_scale,,,-lswscale) - AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg)) - AC_CHECK_LIB(z,compress,,) - diff --git a/distros/fedora/archive/zoneminder-1.26.4-dbinstall.patch b/distros/fedora/archive/zoneminder-1.26.4-dbinstall.patch deleted file mode 100644 index 6c4a43d9d..000000000 --- a/distros/fedora/archive/zoneminder-1.26.4-dbinstall.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- configure.ac 2013-09-05 10:33:08.000000000 -0500 -+++ configure.ac.dbinstall 2013-09-05 17:23:28.555553447 -0500 -@@ -1,13 +1,11 @@ - AC_PREREQ(2.59) --AC_INIT(zm,1.26.4,[http://www.zoneminder.com/forums/ - Please check FAQ first],ZoneMinder,http://www.zoneminder.com/downloads.html) -+AC_INIT(zm,1.26.4,[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) - - AC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS]) - --PATH_BUILD=`pwd` --AC_SUBST(PATH_BUILD) - TIME_BUILD=`date +'%s'` - AC_SUBST(TIME_BUILD) - -@@ -354,6 +352,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC - - AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory]) - AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory]) -+AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory]) -+AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE") - AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid") - AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory]) - AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf") -diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am ---- ./db/Makefile.am.dbinstall 2009-10-14 04:42:46.000000000 -0500 -+++ ./db/Makefile.am 2011-03-24 22:50:14.173912137 -0500 -@@ -1,7 +1,16 @@ - AUTOMAKE_OPTIONS = gnu - -+zmdbdatadir = $(pkgdatadir)/db -+ - EXTRA_DIST = \ - zm_create.sql.in \ -+ $(dbupgrade_scripts) -+ -+dist_zmdbdata_DATA = \ -+ zm_create.sql \ -+ $(dbupgrade_scripts) -+ -+dbupgrade_scripts = \ - zm_update-0.0.1.sql \ - zm_update-0.9.7.sql \ - zm_update-0.9.8.sql \ -diff -up ./scripts/zmupdate.pl.in.dbinstall ./scripts/zmupdate.pl.in ---- scripts/zmupdate.pl.in 2013-10-05 14:46:16.000000000 -0500 -+++ scripts/zmupdate.pl.in.dbinstall 2013-10-05 18:56:05.431045910 -0500 -@@ -429,7 +429,7 @@ if ( $version ) - } - else - { -- $command .= ZM_PATH_BUILD."/db"; -+ $command .= ZM_PATH_DATA."/db"; - } - $command .= "/zm_update-".$version.".sql"; - -@@ -1030,7 +1030,7 @@ if ( $version ) - if ( $version ge '1.26.0' ) { - - my @files; -- $updateDir = ZM_PATH_BUILD."/db" if ! $updateDir; -+ $updateDir = ZM_PATH_DATA."/db" if ! $updateDir; - opendir( my $dh, $updateDir ) || die "Can't open updateDir $!"; - @files = sort grep { (!/^\./) && /^zm_update\-[\d\.]+\.sql$/ && -f "$updateDir/$_" } readdir($dh); - closedir $dh; -diff -up ./zm.conf.in.dbinstall ./zm.conf.in ---- ./zm.conf.in.dbinstall 2008-07-25 04:48:16.000000000 -0500 -+++ ./zm.conf.in 2011-03-24 22:50:14.175912077 -0500 -@@ -12,8 +12,8 @@ - # Current version of ZoneMinder - ZM_VERSION=@VERSION@ - --# Path to build directory, used mostly for finding DB upgrade scripts --ZM_PATH_BUILD=@PATH_BUILD@ -+# Path to installed data directory, used mostly for finding DB upgrade scripts -+ZM_PATH_DATA=@PKGDATADIR@ - - # Build time, used to record when to trigger various checks - ZM_TIME_BUILD=@TIME_BUILD@ diff --git a/distros/fedora/archive/zoneminder.cmake.f19.spec b/distros/fedora/archive/zoneminder.cmake.f19.spec deleted file mode 100644 index 0af88f41f..000000000 --- a/distros/fedora/archive/zoneminder.cmake.f19.spec +++ /dev/null @@ -1,397 +0,0 @@ -%define zmuid $(id -un) -%define zmgid $(id -gn) -%define zmuid_final apache -%define zmgid_final apache - -%global _hardened_build 1 - -### Delete the lines below to build with ffmpeg and/or x10 -%define _without_ffmpeg 1 -%define _without_x10 1 - -Name: zoneminder -Version: 1.27 -Release: 1%{?dist} -Summary: A camera monitoring and analysis tool -Group: System Environment/Daemons -# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/ -# Mootools is inder the MIT license: http://mootools.net/ -License: GPLv2+ and LGPLv2+ and MIT -URL: http://www.zoneminder.com/ - -#Source: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz -Source: ZoneMinder-%{version}.tar.gz - -Patch1: zoneminder-1.26.0-defaults.patch - -BuildRequires: cmake gnutls-devel systemd-units bzip2-devel -BuildRequires: community-mysql-devel pcre-devel libjpeg-turbo-devel -BuildRequires: perl(Archive::Tar) perl(Archive::Zip) -BuildRequires: perl(Date::Manip) perl(DBD::mysql) -BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent) -BuildRequires: perl(MIME::Entity) perl(MIME::Lite) -BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap) -BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign) -BuildRequires: perl(Expect) perl(Sys::Syslog) -BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel -%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel} -%{!?_without_x10:BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime)} -# cmake needs the following installed at build time due to the way it auto-detects certain parameters -BuildRequires: httpd polkit-devel -%{!?_without_ffmpeg:BuildRequires: ffmpeg} - -Requires: httpd php php-mysql cambozola polkit -Requires: libjpeg-turbo vlc-core libcurl -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) -Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP) -Requires: perl(LWP::Protocol::https) -%{!?_without_ffmpeg:Requires: ffmpeg} - -Requires(post): systemd-units systemd-sysv -Requires(post): /usr/bin/gpasswd -Requires(post): /usr/bin/less -Requires(preun): systemd-units -Requires(postun): systemd-units - -%description -ZoneMinder is a set of applications which is intended to provide a complete -solution allowing you to capture, analyse, record and monitor any cameras you -have attached to a Linux based machine. It is designed to run on kernels which -support the Video For Linux (V4L) interface and has been tested with cameras -attached to BTTV cards, various USB cameras and IP network cameras. It is -designed to support as many cameras as you can attach to your computer without -too much degradation of performance. - -%prep -%setup -q -n ZoneMinder-%{version} - -%patch1 -p0 -b .defaults -#%patch2 -p0 -b .noffmpeg - -%build -%cmake \ - -DZM_TARGET_DISTRO="f19" \ -%{?_without_ffmpeg:-DZM_NO_FFMPEG=ON} \ -%{?_without_x10:-DZM_NO_X10=ON} \ - . - -make %{?_smp_mflags} - -%install -export DESTDIR=%{buildroot} -make install - -%post -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - -# Allow zoneminder access to local video sources, serial ports, and x10 -/usr/bin/gpasswd -a %{zmuid_final} video -/usr/bin/gpasswd -a %{zmuid_final} dialout - -# Display the README for post installation instructions -/usr/bin/less %{_docdir}/%{name}-%{version}/README.Fedora - -%preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || : - /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || : -fi - -%postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || : -fi - -%triggerun -- zoneminder < 1.25.0-4 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply zoneminder -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || : -/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/jscalendar-doc -%config %attr(640,root,%{zmgid_final}) /etc/zm.conf -%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf -%config(noreplace) /etc/tmpfiles.d/zoneminder.conf -%config(noreplace) /etc/logrotate.d/zoneminder - -%{_unitdir}/zoneminder.service - -%{_bindir}/zma -%{_bindir}/zmaudit.pl -%{_bindir}/zmc -%{_bindir}/zmcontrol.pl -%{_bindir}/zmdc.pl -%{_bindir}/zmf -%{_bindir}/zmfilter.pl -# zmfix removed from zoneminder 1.26.6 -#%attr(4755,root,root) %{_bindir}/zmfix -%{_bindir}/zmpkg.pl -%{_bindir}/zmtrack.pl -%{_bindir}/zmtrigger.pl -%{_bindir}/zmu -%{_bindir}/zmupdate.pl -%{_bindir}/zmvideo.pl -%{_bindir}/zmwatch.pl -%{_bindir}/zmcamtool.pl -%{_bindir}/zmsystemctl.pl -%{!?_without_x10:%{_bindir}/zmx10.pl} -%{_bindir}/zmonvif-probe.pl - -%{perl_vendorlib}/ZoneMinder* -%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ZoneMinder* -%{perl_vendorlib}/ONVIF* -%{perl_vendorlib}/WSDiscovery* -%{perl_vendorlib}/WSSecurity* -%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ONVIF* -%{_mandir}/man*/* -%dir %{_libexecdir}/zoneminder -%{_libexecdir}/zoneminder/cgi-bin -%dir %{_datadir}/zoneminder -%{_datadir}/zoneminder/db -%{_datadir}/zoneminder/www - -%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy -%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules - -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder - - -%changelog -* Sun Aug 03 2014 Andrew Bauer - 1.27 -- Include ONVIF support files - -* Fri Mar 14 2014 Andrew Bauer - 1.27 -- Tweak build requirements for cmake - -* Sat Feb 01 2014 Andrew Bauer - 1.27 -- Add zmcamtool.pl. Bump version for 1.27 release. - -* Mon Dec 16 2013 Andrew Bauer - 1.26.5 -- This is a bug fixe release -- RTSP fixes, cmake enhancements, couple other misc fixes - -* Mon Oct 07 2013 Andrew Bauer - 1.26.4 -- Initial cmake build. - -* Sat Oct 05 2013 Andrew Bauer - 1.26.4 -- Fedora specific path changes have been moved to zoneminder-1.26.0-defaults.patch -- All files are now part of the zoneminder source tree. Update specfile accordingly. - -* Sat Sep 21 2013 Andrew Bauer - 1.26.3 -- Initial rebuild for ZoneMinder 1.26.3 release. - -* Fri Feb 15 2013 Fedora Release Engineering - 1.25.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 21 2013 Adam Tkac - 1.25.0-12 -- rebuild due to "jpeg8-ABI" feature drop - -* Mon Jan 7 2013 Remi Collet - 1.25.0-11 -- fix configuration file for httpd 2.4, #871502 - -* Fri Dec 21 2012 Adam Tkac - 1.25.0-10 -- rebuild against new libjpeg - -* Thu Aug 09 2012 Jason L Tibbitts III - 1.25.0-9 -- Add patch to work around v4l2 api breakage in 3.5 kernel. - -* Sun Jul 22 2012 Fedora Release Engineering - 1.25.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jun 23 2012 Petr Pisar - 1.25.0-7 -- Perl 5.16 rebuild - -* Wed Mar 21 2012 Jason L Tibbitts III - 1.25.0-6 -- Fix stupid thinko in sql modifications. - -* Sat Feb 25 2012 Jason L Tibbitts III - 1.25.0-5 -- Clean up macro usage. - -* Sat Feb 25 2012 Jason L Tibbitts III - 1.25.0-4 -- Convert to systemd. -- Add tmpfiles.d configuration since the initscript isn't around to create - /run/zoneminder. -- Remove some pointless executable permissions. -- Add logrotate file. - -* Wed Feb 22 2012 Jason L Tibbitts III - 1.25.0-3 -- Update README.Fedora to reference systemctl and mention timezone info in - php.ini. -- Add proper default for EYEZM_LOG_TO_FILE. - - -* Thu Feb 09 2012 Jason L Tibbitts III - 1.25.0-2 -- Rebuild for new pcre. - -* Thu Jan 19 2012 Jason L Tibbitts III - 1.25.0-1 -- Update to 1.25.0 -- Fix gcc4.7 build problems. -- Drop gcc4.4 build fixes; for whatever reason they now break the build. -- Clean up old patches. -- Force setting of ZM_TMPDIR and ZM_RUNDIR. - -* Sat Jan 14 2012 Fedora Release Engineering - 1.24.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Sep 15 2011 Jason L Tibbitts III - 1.24.4-3 -- Re-add the dist-tag that somehow got lost. - -* Thu Sep 15 2011 Jason L Tibbitts III - 1.24.4-2 -- Add patch for bug 711780 - fix syntax issue in Mapped.pm. -- Undo that patch, and undo another which was the cause of the whole mess. -- Fix up other patches so ZM_PATH_BUILD is both defined and useful. -- Make sure database creation mods actually take. -- Update Fedora-specific docs with some additional info. -- Use bundled mootools (javascript, so no guideline violation). -- Update download location. -- Update the gcrypt patch to actually work. -- Upstream changed the tarball without changing the version to patch a - vulnerability, so redownload. - -* Sun Aug 14 2011 Jason L Tibbitts III - 1.24.4-1 -- Initial attempt to upgrade to 1.24.4. -- Add patch from BZ 460310 to build against libgcrypt instead of requiring the - gnutls openssl libs. - -* Thu Jul 21 2011 Petr Sabata - 1.24.3-7.20110324svn3310 -- Perl mass rebuild - -* Wed Jul 20 2011 Petr Sabata - 1.24.3-6.20110324svn3310 -- Perl mass rebuild - -* Mon May 09 2011 Jason L Tibbitts III - 1.24.3-5.20110324svn3310 -- Bump for gnutls update. - -* Thu Mar 24 2011 Jason L Tibbitts III - 1.24.3-4.20110324svn3310 -- Update to latest 1.24.3 subversion. Turns out that what upstream was calling - 1.24.3 is really just an occasionally updated devel snapshot. -- Rebase various patches. - -* Wed Mar 23 2011 Dan Horák - 1.24.3-3 -- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) - -* Tue Feb 08 2011 Fedora Release Engineering - 1.24.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 25 2011 Jason L Tibbitts III - 1.24.3-1 -- Update to latest upstream version. -- Rebase patches. -- Initial incomplete attempt to disable v4l1 support. - -* Fri Jan 21 2011 Jason L Tibbitts III - 1.24.2-6 -- Unbundle cambozola; instead link to the separately pacakged copy. -- Remove BuildRoot:, %%clean and buildroot cleaning in %%install. -- Git rid of mixed space/tab usage by removing all tabs. -- Remove unnecessary Conflicts: line. -- Attempt to force short_open_tag on for the code directories. -- Move default location of sockets, swaps, logfiles and some temporary files to - make more sense and allow things to work better with a future selinux policy. -- Fix errors in README.Fedora. - -* Wed Jun 02 2010 Marcela Maslanova - 1.24.2-5 -- Mass rebuild with perl-5.12.0 - -* Fri Dec 4 2009 Stepan Kasal - 1.24.2-4 -- rebuild against perl 5.10.1 -- use Perl vendorarch and archlib variables correctly - -* Mon Jul 27 2009 Fedora Release Engineering - 1.24.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-2 -- Bump release since 1.24.2-1 was mistakenly tagged a few months ago. - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-1 -- Initial update to 1.24.2. -- Rebase patches. -- Update mootools download location. -- Update to mootools 1.2.3. -- Add additional dependencies for some optional features. - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-3 -- Remove unused Sys::Mmap perl dependency RPM is finding - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-2 -- Update gcc44 patch to disable -frepo, seems to be broken with gcc44 -- Added noffmpeg patch to make building outside mock easier - -* Sat Mar 21 2009 Martin Ebourne - 1.24.1-1 -- Patch for gcc 4.4 compilation errors -- Upgrade to 1.24.1 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.23.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Jan 24 2009 Caolán McNamara - 1.23.3-3 -- rebuild for dependencies - -* Mon Dec 15 2008 Martin Ebourne - 1.23.3-2 -- Fix permissions on zm.conf - -* Fri Jul 11 2008 Jason L Tibbitts III - 1.23.3-1 -- Initial attempt at packaging 1.23. - -* Tue Jul 1 2008 Martin Ebourne - 1.22.3-15 -- Add perl module compat dependency, bz #453590 - -* Tue May 6 2008 Martin Ebourne - 1.22.3-14 -- Remove default runlevel, bz #441315 - -* Mon Apr 28 2008 Jason L Tibbitts III - 1.22.3-13 -- Backport patch for CVE-2008-1381 from 1.23.3 to 1.22.3. - -* Tue Feb 19 2008 Fedora Release Engineering - 1.22.3-12 -- Autorebuild for GCC 4.3 - -* Thu Jan 3 2008 Martin Ebourne - 1.22.3-11 -- Fix compilation on gcc 4.3 - -* Thu Dec 6 2007 Martin Ebourne - 1.22.3-10 -- Rebuild for new openssl - -* Thu Aug 2 2007 Martin Ebourne - 1.22.3-8 -- Fix licence tag - -* Thu Jul 12 2007 Martin Ebourne - 1.22.3-7 -- Fixes from testing by Jitz including missing dependencies and database creation - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-6 -- Disable crashtrace on ppc - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-5 -- Fix uid for directories in /var/lib/zoneminder - -* Tue Jun 26 2007 Martin Ebourne - 1.22.3-4 -- Added perl Archive::Tar dependency -- Disabled web interface due to lack of access control on the event images - -* Sun Jun 10 2007 Martin Ebourne - 1.22.3-3 -- Changes recommended in review by Jason Tibbitts - -* Mon Apr 2 2007 Martin Ebourne - 1.22.3-2 -- Standardised on package name of zoneminder - -* Thu Dec 28 2006 Martin Ebourne - 1.22.3-1 -- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin diff --git a/distros/fedora/archive/zoneminder.conf b/distros/fedora/archive/zoneminder.conf deleted file mode 100644 index 66b3dc146..000000000 --- a/distros/fedora/archive/zoneminder.conf +++ /dev/null @@ -1,45 +0,0 @@ -# The Zoneminder web interface has been disabled by default due to a small -# security issue in the default install. -# -# When using Zoneminder's own authentication, recorded CCTV images are -# accessible from the web directly without passing the authentication. This -# means any attacker could see your CCTV images without a password. In order -# to avoid this you can disable Zoneminder's authentication and configure -# standard Apache authentication (see the Apache documentation for details on -# this). -# -# If you still wish to use Zoneminder's own authentication, or have an -# internal site which needs no authentication, you need to delete the line -# marked below and restart Apache. - -Alias /zm "/usr/share/zoneminder/www" - - Options -Indexes +MultiViews +FollowSymLinks - AllowOverride All - - # Apache 2.4 - Require all granted - - - # Apache 2.2 - Order deny,allow - Allow from all - - # The code unfortunately uses short tags in many places - php_value short_open_tag 1 - - -ScriptAlias /cgi-bin/zm "/usr/libexec/zoneminder/cgi-bin" - - AllowOverride All - Options +ExecCGI +FollowSymLinks - - # Apache 2.4 - Require all granted - - - # Apache 2.2 - Order deny,allow - Allow from all - - diff --git a/distros/fedora/archive/zoneminder.f19.spec b/distros/fedora/archive/zoneminder.f19.spec deleted file mode 100644 index d1be12aa2..000000000 --- a/distros/fedora/archive/zoneminder.f19.spec +++ /dev/null @@ -1,478 +0,0 @@ -%define cambrev 0.931 -%define moorev 1.3.2 -%define jscrev 1.0 - -%define zmuid $(id -un) -%define zmgid $(id -gn) -%define zmuid_final apache -%define zmgid_final apache - -%global _hardened_build 1 - -### Delete the lines below to build with ffmpeg and/or x10 -%define _without_ffmpeg 1 -%define _without_x10 1 - -Name: zoneminder -Version: 1.27 -Release: 1%{?dist} -Summary: A camera monitoring and analysis tool -Group: System Environment/Daemons -# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/ -# Mootools is inder the MIT license: http://mootools.net/ -License: GPLv2+ and LGPLv2+ and MIT -URL: http://www.zoneminder.com/ - -#Source: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz -Source: ZoneMinder-%{version}.tar.gz -Source2: jscalendar-%{jscrev}.zip -#Source2: http://downloads.sourceforge.net/jscalendar/jscalendar-%{jscrev}.zip - -# Need to unravel the proper mootools files to grab from upstream, since the -# number of them keeps multiplying. In the meantime, rely on the ones bundled -# with zoneminder. As these are javascript, there is no guideline violation -# here. -#Source3: http://mootools.net/download/get/mootools-core-%{moorev}-full-compat-yc.js - -Patch1: zoneminder-1.24.3-runlevel.patch -Patch2: zoneminder-1.26.0-defaults.patch -%{?_without_ffmpeg:Patch3: zoneminder-1.26.3-noffmpeg.patch} - -BuildRequires: automake gnutls-devel systemd-units -BuildRequires: libtool bzip2-devel -BuildRequires: community-mysql-devel pcre-devel libjpeg-turbo-devel -BuildRequires: perl(Archive::Tar) perl(Archive::Zip) -BuildRequires: perl(Date::Manip) perl(DBD::mysql) -BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent::Determined) -BuildRequires: perl(MIME::Entity) perl(MIME::Lite) -BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap) -BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign) -BuildRequires: perl(Expect) perl(Sys::Syslog) -BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel -BuildRequires: autoconf autoconf-archive polkit-devel -%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel} -%{!?_without_x10:BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime)} - -Requires: httpd php php-mysql cambozola polkit -Requires: libjpeg-turbo libcurl vlc-core ffmpeg -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) -Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP) -Requires: perl(LWP::Protocol::https) - -Requires(post): systemd-units systemd-sysv -Requires(post): /usr/bin/gpasswd -Requires(post): /usr/bin/less -Requires(preun): systemd-units -Requires(postun): systemd-units - -%description -ZoneMinder is a set of applications which is intended to provide a complete -solution allowing you to capture, analyse, record and monitor any cameras you -have attached to a Linux based machine. It is designed to run on kernels which -support the Video For Linux (V4L) interface and has been tested with cameras -attached to BTTV cards, various USB cameras and IP network cameras. It is -designed to support as many cameras as you can attach to your computer without -too much degradation of performance. - -%prep -%setup -q -n ZoneMinder-%{version} - -# Unpack jscalendar and move some files around -%setup -q -D -T -a 2 -n ZoneMinder-%{version} -mkdir jscalendar-doc -pushd jscalendar-1.0 -mv *html *php doc/* README ../jscalendar-doc -rmdir doc -popd - -%patch1 -p0 -b .runlevel -%patch2 -p0 -b .defaults -%{?_without_ffmpeg:%patch3 -p0 -b .noffmpeg} - -chmod -x src/zm_event.cpp src/zm_user.h - -%build -libtoolize --force -aclocal -autoheader -automake --force-missing --add-missing -autoconf - -OPTS="" - -%configure \ - --disable-crashtrace \ - --with-libarch=%{_lib} \ - --with-mysql=%{_prefix} \ - --with-ffmpeg=%{_prefix} \ - --with-webdir=%{_datadir}/%{name}/www \ - --with-cgidir=%{_libexecdir}/%{name}/cgi-bin \ - --with-webuser=%{zmuid} \ - --with-webgroup=%{zmgid} \ - --enable-mmap=yes \ - --disable-debug \ - --with-webhost=zm.local \ - ZM_SSL_LIB="gnutls" \ - ZM_RUNDIR=/var/run/zoneminder \ - ZM_TMPDIR=/var/lib/zoneminder/temp \ -%ifarch x86_64 - CXXFLAGS="-D__STDC_CONSTANT_MACROS -msse2" \ -%else - CXXFLAGS="-D__STDC_CONSTANT_MACROS" \ -%endif - --with-extralibs="" \ - $OPTS - -make %{?_smp_mflags} -%{__perl} -pi -e 's/(ZM_WEB_USER=).*$/${1}%{zmuid_final}/;' \ - -e 's/(ZM_WEB_GROUP=).*$/${1}%{zmgid_final}/;' zm.conf - -%install -install -d %{buildroot}/%{_localstatedir}/run -make install DESTDIR=%{buildroot} \ - INSTALLDIRS=vendor -rm -rf %{buildroot}/%{perl_vendorarch} %{buildroot}/%{perl_archlib} -%{?_without_x10:%{__rm} -f %{buildroot}/%{_bindir}/zmx10.pl} - -install -m 755 -d %{buildroot}/var/log/zoneminder -for dir in events images temp -do - install -m 755 -d %{buildroot}/var/lib/zoneminder/$dir - if [ -d %{buildroot}/%{_datadir}/zoneminder/www/$dir ]; then - rmdir %{buildroot}/%{_datadir}/zoneminder/www/$dir - fi - ln -sf ../../../../var/lib/zoneminder/$dir %{buildroot}/%{_datadir}/zoneminder/www/$dir -done -install -m 755 -d %{buildroot}/var/lib/zoneminder/sock -install -m 755 -d %{buildroot}/var/lib/zoneminder/swap -install -m 755 -d %{buildroot}/var/spool/zoneminder-upload - -install -D -m 644 distros/fedora/zoneminder.conf %{buildroot}/etc/httpd/conf.d/zoneminder.conf -install -D -m 755 distros/fedora/redalert.wav %{buildroot}/%{_datadir}/zoneminder/www/sounds/redalert.wav -install -D -m 644 distros/fedora/zoneminder.service %{buildroot}/%{_unitdir}/zoneminder.service -install -D -m 644 distros/fedora/zoneminder.logrotate %{buildroot}/etc/logrotate.d/zoneminder - -# Install jscalendar - this really should be in its own package -install -d -m 755 %{buildroot}/%{_datadir}/%{name}/www/jscalendar -cp -rp jscalendar-1.0/* %{buildroot}/%{_datadir}/zoneminder/www/jscalendar - -# Set up cambozola -pushd %{buildroot}/%{_datadir}/zoneminder/www -%{__ln_s} ../../java/cambozola.jar -popd - -# Set up mootools -pushd %{buildroot}/%{_datadir}/%{name}/www -ln -f -s tools/mootools/mootools-core-%{moorev}-yc.js mootools-core.js -ln -f -s tools/mootools/mootools-more-%{moorev}.1-yc.js mootools-more.js -popd - -# Create an entry for tmpfiles.d -install -D -m 755 distros/fedora/zoneminder.tmpfiles %{buildroot}/etc/tmpfiles.d/zoneminder.conf - -install -m 755 -d %{buildroot}/run/zoneminder - - -%post -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - -# Allow zoneminder access to local video sources, serial ports, and x10 -/usr/bin/gpasswd -a %{zmuid_final} video -/usr/bin/gpasswd -a %{zmuid_final} dialout - -# Display the README for post installation instructions -/usr/bin/less %{_docdir}/%{name}-%{version}/README.Fedora - -%preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || : - /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || : -fi - -%postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || : -fi - -%triggerun -- zoneminder < 1.25.0-4 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply zoneminder -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || : -/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README.md distros/fedora/README.Fedora jscalendar-doc -%config %attr(640,root,%{zmgid_final}) /etc/zm.conf -%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf -%config(noreplace) /etc/tmpfiles.d/zoneminder.conf -%config(noreplace) /etc/logrotate.d/zoneminder - -%{_unitdir}/zoneminder.service - -%{_bindir}/zma -%{_bindir}/zmaudit.pl -%{_bindir}/zmc -%{_bindir}/zmcontrol.pl -%{_bindir}/zmdc.pl -%{_bindir}/zmf -%{_bindir}/zmfilter.pl -# zmfix removed from zoneminder 1.26.6 -#%attr(4755,root,root) %{_bindir}/zmfix -%{_bindir}/zmpkg.pl -%{_bindir}/zmtrack.pl -%{_bindir}/zmtrigger.pl -%{_bindir}/zmu -%{_bindir}/zmupdate.pl -%{_bindir}/zmvideo.pl -%{_bindir}/zmwatch.pl -%{_bindir}/zmcamtool.pl -%{_bindir}/zmsystemctl.pl -%{!?_without_x10:%{_bindir}/zmx10.pl} -%{_bindir}/zmonvif-probe.pl - -%{perl_vendorlib}/ZoneMinder* -%{perl_vendorlib}/ONVIF* -%{perl_vendorlib}/WSDiscovery* -%{perl_vendorlib}/WSSecurity* -%{_mandir}/man*/* -%dir %{_libexecdir}/zoneminder -%{_libexecdir}/zoneminder/cgi-bin -%dir %{_datadir}/zoneminder -%{_datadir}/zoneminder/db -%{_datadir}/zoneminder/www - -%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy -%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules - -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder - - -%changelog -* Sat Feb 01 2014 Andrew Bauer - 1.27 -- Add zmcamtool.pl. Bump version for 1.27 release. - -* Mon Dec 16 2013 Andrew Bauer - 1.26.5 -- This is a bug fixe release -- RTSP fixes, cmake enhancements, couple other misc fixes - -* Sat Oct 05 2013 Andrew Bauer - 1.26.4 -- Fedora specific path changes have been moved to zoneminder-1.26.0-defaults.patch -- All files are now part of the zoneminder source tree. Update specfile accordingly. - -* Sat Sep 21 2013 Andrew Bauer - 1.26.3 -- Initial rebuild for ZoneMinder 1.26.3 release. - -* Fri Feb 15 2013 Fedora Release Engineering - 1.25.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 21 2013 Adam Tkac - 1.25.0-12 -- rebuild due to "jpeg8-ABI" feature drop - -* Mon Jan 7 2013 Remi Collet - 1.25.0-11 -- fix configuration file for httpd 2.4, #871502 - -* Fri Dec 21 2012 Adam Tkac - 1.25.0-10 -- rebuild against new libjpeg - -* Thu Aug 09 2012 Jason L Tibbitts III - 1.25.0-9 -- Add patch to work around v4l2 api breakage in 3.5 kernel. - -* Sun Jul 22 2012 Fedora Release Engineering - 1.25.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jun 23 2012 Petr Pisar - 1.25.0-7 -- Perl 5.16 rebuild - -* Wed Mar 21 2012 Jason L Tibbitts III - 1.25.0-6 -- Fix stupid thinko in sql modifications. - -* Sat Feb 25 2012 Jason L Tibbitts III - 1.25.0-5 -- Clean up macro usage. - -* Sat Feb 25 2012 Jason L Tibbitts III - 1.25.0-4 -- Convert to systemd. -- Add tmpfiles.d configuration since the initscript isn't around to create - /run/zoneminder. -- Remove some pointless executable permissions. -- Add logrotate file. - -* Wed Feb 22 2012 Jason L Tibbitts III - 1.25.0-3 -- Update README.Fedora to reference systemctl and mention timezone info in - php.ini. -- Add proper default for EYEZM_LOG_TO_FILE. - - -* Thu Feb 09 2012 Jason L Tibbitts III - 1.25.0-2 -- Rebuild for new pcre. - -* Thu Jan 19 2012 Jason L Tibbitts III - 1.25.0-1 -- Update to 1.25.0 -- Fix gcc4.7 build problems. -- Drop gcc4.4 build fixes; for whatever reason they now break the build. -- Clean up old patches. -- Force setting of ZM_TMPDIR and ZM_RUNDIR. - -* Sat Jan 14 2012 Fedora Release Engineering - 1.24.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Sep 15 2011 Jason L Tibbitts III - 1.24.4-3 -- Re-add the dist-tag that somehow got lost. - -* Thu Sep 15 2011 Jason L Tibbitts III - 1.24.4-2 -- Add patch for bug 711780 - fix syntax issue in Mapped.pm. -- Undo that patch, and undo another which was the cause of the whole mess. -- Fix up other patches so ZM_PATH_BUILD is both defined and useful. -- Make sure database creation mods actually take. -- Update Fedora-specific docs with some additional info. -- Use bundled mootools (javascript, so no guideline violation). -- Update download location. -- Update the gcrypt patch to actually work. -- Upstream changed the tarball without changing the version to patch a - vulnerability, so redownload. - -* Sun Aug 14 2011 Jason L Tibbitts III - 1.24.4-1 -- Initial attempt to upgrade to 1.24.4. -- Add patch from BZ 460310 to build against libgcrypt instead of requiring the - gnutls openssl libs. - -* Thu Jul 21 2011 Petr Sabata - 1.24.3-7.20110324svn3310 -- Perl mass rebuild - -* Wed Jul 20 2011 Petr Sabata - 1.24.3-6.20110324svn3310 -- Perl mass rebuild - -* Mon May 09 2011 Jason L Tibbitts III - 1.24.3-5.20110324svn3310 -- Bump for gnutls update. - -* Thu Mar 24 2011 Jason L Tibbitts III - 1.24.3-4.20110324svn3310 -- Update to latest 1.24.3 subversion. Turns out that what upstream was calling - 1.24.3 is really just an occasionally updated devel snapshot. -- Rebase various patches. - -* Wed Mar 23 2011 Dan Horák - 1.24.3-3 -- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) - -* Tue Feb 08 2011 Fedora Release Engineering - 1.24.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 25 2011 Jason L Tibbitts III - 1.24.3-1 -- Update to latest upstream version. -- Rebase patches. -- Initial incomplete attempt to disable v4l1 support. - -* Fri Jan 21 2011 Jason L Tibbitts III - 1.24.2-6 -- Unbundle cambozola; instead link to the separately pacakged copy. -- Remove BuildRoot:, %%clean and buildroot cleaning in %%install. -- Git rid of mixed space/tab usage by removing all tabs. -- Remove unnecessary Conflicts: line. -- Attempt to force short_open_tag on for the code directories. -- Move default location of sockets, swaps, logfiles and some temporary files to - make more sense and allow things to work better with a future selinux policy. -- Fix errors in README.Fedora. - -* Wed Jun 02 2010 Marcela Maslanova - 1.24.2-5 -- Mass rebuild with perl-5.12.0 - -* Fri Dec 4 2009 Stepan Kasal - 1.24.2-4 -- rebuild against perl 5.10.1 -- use Perl vendorarch and archlib variables correctly - -* Mon Jul 27 2009 Fedora Release Engineering - 1.24.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-2 -- Bump release since 1.24.2-1 was mistakenly tagged a few months ago. - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-1 -- Initial update to 1.24.2. -- Rebase patches. -- Update mootools download location. -- Update to mootools 1.2.3. -- Add additional dependencies for some optional features. - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-3 -- Remove unused Sys::Mmap perl dependency RPM is finding - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-2 -- Update gcc44 patch to disable -frepo, seems to be broken with gcc44 -- Added noffmpeg patch to make building outside mock easier - -* Sat Mar 21 2009 Martin Ebourne - 1.24.1-1 -- Patch for gcc 4.4 compilation errors -- Upgrade to 1.24.1 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.23.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Jan 24 2009 Caolán McNamara - 1.23.3-3 -- rebuild for dependencies - -* Mon Dec 15 2008 Martin Ebourne - 1.23.3-2 -- Fix permissions on zm.conf - -* Fri Jul 11 2008 Jason L Tibbitts III - 1.23.3-1 -- Initial attempt at packaging 1.23. - -* Tue Jul 1 2008 Martin Ebourne - 1.22.3-15 -- Add perl module compat dependency, bz #453590 - -* Tue May 6 2008 Martin Ebourne - 1.22.3-14 -- Remove default runlevel, bz #441315 - -* Mon Apr 28 2008 Jason L Tibbitts III - 1.22.3-13 -- Backport patch for CVE-2008-1381 from 1.23.3 to 1.22.3. - -* Tue Feb 19 2008 Fedora Release Engineering - 1.22.3-12 -- Autorebuild for GCC 4.3 - -* Thu Jan 3 2008 Martin Ebourne - 1.22.3-11 -- Fix compilation on gcc 4.3 - -* Thu Dec 6 2007 Martin Ebourne - 1.22.3-10 -- Rebuild for new openssl - -* Thu Aug 2 2007 Martin Ebourne - 1.22.3-8 -- Fix licence tag - -* Thu Jul 12 2007 Martin Ebourne - 1.22.3-7 -- Fixes from testing by Jitz including missing dependencies and database creation - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-6 -- Disable crashtrace on ppc - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-5 -- Fix uid for directories in /var/lib/zoneminder - -* Tue Jun 26 2007 Martin Ebourne - 1.22.3-4 -- Added perl Archive::Tar dependency -- Disabled web interface due to lack of access control on the event images - -* Sun Jun 10 2007 Martin Ebourne - 1.22.3-3 -- Changes recommended in review by Jason Tibbitts - -* Mon Apr 2 2007 Martin Ebourne - 1.22.3-2 -- Standardised on package name of zoneminder - -* Thu Dec 28 2006 Martin Ebourne - 1.22.3-1 -- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin diff --git a/distros/fedora/archive/zoneminder.f20.spec b/distros/fedora/archive/zoneminder.f20.spec deleted file mode 100644 index 513a9cfee..000000000 --- a/distros/fedora/archive/zoneminder.f20.spec +++ /dev/null @@ -1,395 +0,0 @@ -%define zmuid $(id -un) -%define zmgid $(id -gn) -%define zmuid_final apache -%define zmgid_final apache - -%global _hardened_build 1 - -### Delete the lines below to build with ffmpeg and/or x10 -%define _without_ffmpeg 1 -%define _without_x10 1 - -Name: zoneminder -Version: 1.28.1 -Release: 1%{?dist} -Summary: A camera monitoring and analysis tool -Group: System Environment/Daemons -# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/ -# Mootools is inder the MIT license: http://mootools.net/ -License: GPLv2+ and LGPLv2+ and MIT -URL: http://www.zoneminder.com/ - -#Source: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz -Source: ZoneMinder-%{version}.tar.gz - -BuildRequires: cmake gnutls-devel systemd-units bzip2-devel -BuildRequires: community-mysql-devel pcre-devel libjpeg-turbo-devel -BuildRequires: perl(Archive::Tar) perl(Archive::Zip) perl-podlators -BuildRequires: perl(Date::Manip) perl(DBD::mysql) -BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent) -BuildRequires: perl(MIME::Entity) perl(MIME::Lite) -BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap) -BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign) -BuildRequires: perl(Expect) perl(Sys::Syslog) -BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel -%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel} -%{!?_without_x10:BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime)} -# cmake needs the following installed at build time due to the way it auto-detects certain parameters -BuildRequires: httpd polkit-devel -%{!?_without_ffmpeg:BuildRequires: ffmpeg} - -Requires: httpd php php-gd php-mysql cambozola polkit net-tools psmisc -Requires: libjpeg-turbo vlc-core libcurl -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) -Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP) -Requires: perl(LWP::Protocol::https) -%{!?_without_ffmpeg:Requires: ffmpeg} - -Requires(post): systemd-units systemd-sysv -Requires(post): /usr/bin/gpasswd -Requires(post): /usr/bin/less -Requires(preun): systemd-units -Requires(postun): systemd-units - -%description -ZoneMinder is a set of applications which is intended to provide a complete -solution allowing you to capture, analyse, record and monitor any cameras you -have attached to a Linux based machine. It is designed to run on kernels which -support the Video For Linux (V4L) interface and has been tested with cameras -attached to BTTV cards, various USB cameras and IP network cameras. It is -designed to support as many cameras as you can attach to your computer without -too much degradation of performance. - -%prep -%setup -q -n ZoneMinder-%{version} - -# Change the following default values -./utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin/zm/nph-zms -./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes -./utils/zmeditconfigdata.sh ZM_PATH_SWAP /dev/shm -./utils/zmeditconfigdata.sh ZM_UPLOAD_FTP_LOC_DIR /var/spool/zoneminder-upload -./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes -./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no -./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no - -%build -%cmake \ - -DZM_TARGET_DISTRO="f20" \ -%{?_without_ffmpeg:-DZM_NO_FFMPEG=ON} \ -%{?_without_x10:-DZM_NO_X10=ON} \ - . - -make %{?_smp_mflags} - -%install -export DESTDIR=%{buildroot} -make install - -%post -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - -# Allow zoneminder access to local video sources, serial ports, and x10 -/usr/bin/gpasswd -a %{zmuid_final} video -/usr/bin/gpasswd -a %{zmuid_final} dialout - -# Display the README for post installation instructions -/usr/bin/less %{_docdir}/%{name}/README.Fedora - -%preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || : - /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || : -fi - -%postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || : -fi - -%triggerun -- zoneminder < 1.25.0-4 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply zoneminder -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || : -/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/jscalendar-doc -%config %attr(640,root,%{zmgid_final}) /etc/zm.conf -%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf -%config(noreplace) /etc/tmpfiles.d/zoneminder.conf -%config(noreplace) /etc/logrotate.d/zoneminder - -%{_unitdir}/zoneminder.service - -%{_bindir}/zma -%{_bindir}/zmaudit.pl -%{_bindir}/zmc -%{_bindir}/zmcontrol.pl -%{_bindir}/zmdc.pl -%{_bindir}/zmf -%{_bindir}/zmfilter.pl -%{_bindir}/zmpkg.pl -%{_bindir}/zmtrack.pl -%{_bindir}/zmtrigger.pl -%{_bindir}/zmu -%{_bindir}/zmupdate.pl -%{_bindir}/zmvideo.pl -%{_bindir}/zmwatch.pl -%{_bindir}/zmcamtool.pl -%{_bindir}/zmsystemctl.pl -%{!?_without_x10:%{_bindir}/zmx10.pl} - -%{perl_vendorlib}/ZoneMinder* -%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ZoneMinder* -#%{perl_archlib}/ZoneMinder* -%{_mandir}/man*/* -%dir %{_libexecdir}/zoneminder -%{_libexecdir}/zoneminder/cgi-bin -%dir %{_datadir}/zoneminder -%{_datadir}/zoneminder/db -%{_datadir}/zoneminder/www - -%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy -%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules - -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder - - -%changelog -* Sun Oct 5 2014 Andrew Bauer - 1.28.0 -- Bump version for 1.28.0 release. - -* Fri Mar 14 2014 Andrew Bauer - 1.27 -- Tweak build requirements for cmake - -* Sat Feb 01 2014 Andrew Bauer - 1.27 -- Add zmcamtool.pl. Bump version for 1.27 release. - -* Mon Dec 16 2013 Andrew Bauer - 1.26.5 -- This is a bug fixe release -- RTSP fixes, cmake enhancements, couple other misc fixes - -* Mon Oct 07 2013 Andrew Bauer - 1.26.4 -- Initial cmake build. - -* Sat Oct 05 2013 Andrew Bauer - 1.26.4 -- Fedora specific path changes have been moved to zoneminder-1.26.0-defaults.patch -- All files are now part of the zoneminder source tree. Update specfile accordingly. - -* Sat Sep 21 2013 Andrew Bauer - 1.26.3 -- Initial rebuild for ZoneMinder 1.26.3 release. - -* Fri Feb 15 2013 Fedora Release Engineering - 1.25.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 21 2013 Adam Tkac - 1.25.0-12 -- rebuild due to "jpeg8-ABI" feature drop - -* Mon Jan 7 2013 Remi Collet - 1.25.0-11 -- fix configuration file for httpd 2.4, #871502 - -* Fri Dec 21 2012 Adam Tkac - 1.25.0-10 -- rebuild against new libjpeg - -* Thu Aug 09 2012 Jason L Tibbitts III - 1.25.0-9 -- Add patch to work around v4l2 api breakage in 3.5 kernel. - -* Sun Jul 22 2012 Fedora Release Engineering - 1.25.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jun 23 2012 Petr Pisar - 1.25.0-7 -- Perl 5.16 rebuild - -* Wed Mar 21 2012 Jason L Tibbitts III - 1.25.0-6 -- Fix stupid thinko in sql modifications. - -* Sat Feb 25 2012 Jason L Tibbitts III - 1.25.0-5 -- Clean up macro usage. - -* Sat Feb 25 2012 Jason L Tibbitts III - 1.25.0-4 -- Convert to systemd. -- Add tmpfiles.d configuration since the initscript isn't around to create - /run/zoneminder. -- Remove some pointless executable permissions. -- Add logrotate file. - -* Wed Feb 22 2012 Jason L Tibbitts III - 1.25.0-3 -- Update README.Fedora to reference systemctl and mention timezone info in - php.ini. -- Add proper default for EYEZM_LOG_TO_FILE. - - -* Thu Feb 09 2012 Jason L Tibbitts III - 1.25.0-2 -- Rebuild for new pcre. - -* Thu Jan 19 2012 Jason L Tibbitts III - 1.25.0-1 -- Update to 1.25.0 -- Fix gcc4.7 build problems. -- Drop gcc4.4 build fixes; for whatever reason they now break the build. -- Clean up old patches. -- Force setting of ZM_TMPDIR and ZM_RUNDIR. - -* Sat Jan 14 2012 Fedora Release Engineering - 1.24.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Sep 15 2011 Jason L Tibbitts III - 1.24.4-3 -- Re-add the dist-tag that somehow got lost. - -* Thu Sep 15 2011 Jason L Tibbitts III - 1.24.4-2 -- Add patch for bug 711780 - fix syntax issue in Mapped.pm. -- Undo that patch, and undo another which was the cause of the whole mess. -- Fix up other patches so ZM_PATH_BUILD is both defined and useful. -- Make sure database creation mods actually take. -- Update Fedora-specific docs with some additional info. -- Use bundled mootools (javascript, so no guideline violation). -- Update download location. -- Update the gcrypt patch to actually work. -- Upstream changed the tarball without changing the version to patch a - vulnerability, so redownload. - -* Sun Aug 14 2011 Jason L Tibbitts III - 1.24.4-1 -- Initial attempt to upgrade to 1.24.4. -- Add patch from BZ 460310 to build against libgcrypt instead of requiring the - gnutls openssl libs. - -* Thu Jul 21 2011 Petr Sabata - 1.24.3-7.20110324svn3310 -- Perl mass rebuild - -* Wed Jul 20 2011 Petr Sabata - 1.24.3-6.20110324svn3310 -- Perl mass rebuild - -* Mon May 09 2011 Jason L Tibbitts III - 1.24.3-5.20110324svn3310 -- Bump for gnutls update. - -* Thu Mar 24 2011 Jason L Tibbitts III - 1.24.3-4.20110324svn3310 -- Update to latest 1.24.3 subversion. Turns out that what upstream was calling - 1.24.3 is really just an occasionally updated devel snapshot. -- Rebase various patches. - -* Wed Mar 23 2011 Dan Horák - 1.24.3-3 -- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) - -* Tue Feb 08 2011 Fedora Release Engineering - 1.24.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 25 2011 Jason L Tibbitts III - 1.24.3-1 -- Update to latest upstream version. -- Rebase patches. -- Initial incomplete attempt to disable v4l1 support. - -* Fri Jan 21 2011 Jason L Tibbitts III - 1.24.2-6 -- Unbundle cambozola; instead link to the separately pacakged copy. -- Remove BuildRoot:, %%clean and buildroot cleaning in %%install. -- Git rid of mixed space/tab usage by removing all tabs. -- Remove unnecessary Conflicts: line. -- Attempt to force short_open_tag on for the code directories. -- Move default location of sockets, swaps, logfiles and some temporary files to - make more sense and allow things to work better with a future selinux policy. -- Fix errors in README.Fedora. - -* Wed Jun 02 2010 Marcela Maslanova - 1.24.2-5 -- Mass rebuild with perl-5.12.0 - -* Fri Dec 4 2009 Stepan Kasal - 1.24.2-4 -- rebuild against perl 5.10.1 -- use Perl vendorarch and archlib variables correctly - -* Mon Jul 27 2009 Fedora Release Engineering - 1.24.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-2 -- Bump release since 1.24.2-1 was mistakenly tagged a few months ago. - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-1 -- Initial update to 1.24.2. -- Rebase patches. -- Update mootools download location. -- Update to mootools 1.2.3. -- Add additional dependencies for some optional features. - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-3 -- Remove unused Sys::Mmap perl dependency RPM is finding - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-2 -- Update gcc44 patch to disable -frepo, seems to be broken with gcc44 -- Added noffmpeg patch to make building outside mock easier - -* Sat Mar 21 2009 Martin Ebourne - 1.24.1-1 -- Patch for gcc 4.4 compilation errors -- Upgrade to 1.24.1 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.23.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Jan 24 2009 Caolán McNamara - 1.23.3-3 -- rebuild for dependencies - -* Mon Dec 15 2008 Martin Ebourne - 1.23.3-2 -- Fix permissions on zm.conf - -* Fri Jul 11 2008 Jason L Tibbitts III - 1.23.3-1 -- Initial attempt at packaging 1.23. - -* Tue Jul 1 2008 Martin Ebourne - 1.22.3-15 -- Add perl module compat dependency, bz #453590 - -* Tue May 6 2008 Martin Ebourne - 1.22.3-14 -- Remove default runlevel, bz #441315 - -* Mon Apr 28 2008 Jason L Tibbitts III - 1.22.3-13 -- Backport patch for CVE-2008-1381 from 1.23.3 to 1.22.3. - -* Tue Feb 19 2008 Fedora Release Engineering - 1.22.3-12 -- Autorebuild for GCC 4.3 - -* Thu Jan 3 2008 Martin Ebourne - 1.22.3-11 -- Fix compilation on gcc 4.3 - -* Thu Dec 6 2007 Martin Ebourne - 1.22.3-10 -- Rebuild for new openssl - -* Thu Aug 2 2007 Martin Ebourne - 1.22.3-8 -- Fix licence tag - -* Thu Jul 12 2007 Martin Ebourne - 1.22.3-7 -- Fixes from testing by Jitz including missing dependencies and database creation - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-6 -- Disable crashtrace on ppc - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-5 -- Fix uid for directories in /var/lib/zoneminder - -* Tue Jun 26 2007 Martin Ebourne - 1.22.3-4 -- Added perl Archive::Tar dependency -- Disabled web interface due to lack of access control on the event images - -* Sun Jun 10 2007 Martin Ebourne - 1.22.3-3 -- Changes recommended in review by Jason Tibbitts - -* Mon Apr 2 2007 Martin Ebourne - 1.22.3-2 -- Standardised on package name of zoneminder - -* Thu Dec 28 2006 Martin Ebourne - 1.22.3-1 -- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin diff --git a/distros/fedora/archive/zoneminder.f21.spec b/distros/fedora/archive/zoneminder.f21.spec deleted file mode 100644 index 35662bf6c..000000000 --- a/distros/fedora/archive/zoneminder.f21.spec +++ /dev/null @@ -1,396 +0,0 @@ -%define zmuid $(id -un) -%define zmgid $(id -gn) -%define zmuid_final apache -%define zmgid_final apache - -%global _hardened_build 1 - -### Delete the lines below to build with ffmpeg and/or x10 -%define _without_ffmpeg 1 -%define _without_x10 1 - -Name: zoneminder -Version: 1.28.1 -Release: 1%{?dist} -Summary: A camera monitoring and analysis tool -Group: System Environment/Daemons -# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/ -# Mootools is inder the MIT license: http://mootools.net/ -License: GPLv2+ and LGPLv2+ and MIT -URL: http://www.zoneminder.com/ - -#Source: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz -Source: ZoneMinder-%{version}.tar.gz - -BuildRequires: cmake gnutls-devel systemd-units bzip2-devel -BuildRequires: community-mysql-devel pcre-devel libjpeg-turbo-devel -BuildRequires: perl(Archive::Tar) perl(Archive::Zip) perl-podlators -BuildRequires: perl(Date::Manip) perl(DBD::mysql) -BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent) -BuildRequires: perl(MIME::Entity) perl(MIME::Lite) -BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap) -BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign) -BuildRequires: perl(Expect) perl(Sys::Syslog) -BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel -%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel} -%{!?_without_x10:BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime)} -# cmake needs the following installed at build time due to the way it auto-detects certain parameters -BuildRequires: httpd polkit-devel -%{!?_without_ffmpeg:BuildRequires: ffmpeg} - -Requires: httpd php php-gd php-mysql cambozola polkit net-tools psmisc -Requires: libjpeg-turbo vlc-core libcurl -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) -Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP) -Requires: perl(LWP::Protocol::https) -%{!?_without_ffmpeg:Requires: ffmpeg} - -Requires(post): systemd-units systemd-sysv -Requires(post): /usr/bin/gpasswd -Requires(post): /usr/bin/less -Requires(preun): systemd-units -Requires(postun): systemd-units - -%description -ZoneMinder is a set of applications which is intended to provide a complete -solution allowing you to capture, analyse, record and monitor any cameras you -have attached to a Linux based machine. It is designed to run on kernels which -support the Video For Linux (V4L) interface and has been tested with cameras -attached to BTTV cards, various USB cameras and IP network cameras. It is -designed to support as many cameras as you can attach to your computer without -too much degradation of performance. - -%prep -%setup -q -n ZoneMinder-%{version} - -# Change the following default values -./utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin/zm/nph-zms -./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes -./utils/zmeditconfigdata.sh ZM_PATH_SWAP /dev/shm -./utils/zmeditconfigdata.sh ZM_UPLOAD_FTP_LOC_DIR /var/spool/zoneminder-upload -./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes -./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no -./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no - -%build -%cmake \ - -DZM_TARGET_DISTRO="f21" \ -%{?_without_ffmpeg:-DZM_NO_FFMPEG=ON} \ -%{?_without_x10:-DZM_NO_X10=ON} \ - . - -make %{?_smp_mflags} - -%install -export DESTDIR=%{buildroot} -make install - -%post -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - -# Allow zoneminder access to local video sources, serial ports, and x10 -/usr/bin/gpasswd -a %{zmuid_final} video -/usr/bin/gpasswd -a %{zmuid_final} dialout - -# Display the README for post installation instructions -/usr/bin/less %{_docdir}/%{name}/README.Fedora - -%preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || : - /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || : -fi - -%postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || : -fi - -%triggerun -- zoneminder < 1.25.0-4 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply zoneminder -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || : -/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/jscalendar-doc -%config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf -%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf -%config(noreplace) /etc/tmpfiles.d/zoneminder.conf -%config(noreplace) /etc/logrotate.d/zoneminder - -%{_unitdir}/zoneminder.service - -%{_bindir}/zma -%{_bindir}/zmaudit.pl -%{_bindir}/zmc -%{_bindir}/zmcontrol.pl -%{_bindir}/zmdc.pl -%{_bindir}/zmf -%{_bindir}/zmfilter.pl -%{_bindir}/zmpkg.pl -%{_bindir}/zmtrack.pl -%{_bindir}/zmtrigger.pl -%{_bindir}/zmu -%{_bindir}/zmupdate.pl -%{_bindir}/zmvideo.pl -%{_bindir}/zmwatch.pl -%{_bindir}/zmcamtool.pl -%{_bindir}/zmsystemctl.pl -%{!?_without_x10:%{_bindir}/zmx10.pl} - -%{perl_vendorlib}/ZoneMinder* -%{_mandir}/man*/* -%dir %{_libexecdir}/zoneminder -%{_libexecdir}/zoneminder/cgi-bin -%dir %{_datadir}/zoneminder -%{_datadir}/zoneminder/db -%{_datadir}/zoneminder/www - -%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy -%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules - -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder - - -%changelog -* Sat Feb 14 2015 Andrew Bauer - 1.28.1 -- Bump version for 1.28.1 release on Fedora 21. - -* Sun Oct 5 2014 Andrew Bauer - 1.28.0 -- Bump version for 1.28.0 release. - -* Fri Mar 14 2014 Andrew Bauer - 1.27 -- Tweak build requirements for cmake - -* Sat Feb 01 2014 Andrew Bauer - 1.27 -- Add zmcamtool.pl. Bump version for 1.27 release. - -* Mon Dec 16 2013 Andrew Bauer - 1.26.5 -- This is a bug fixe release -- RTSP fixes, cmake enhancements, couple other misc fixes - -* Mon Oct 07 2013 Andrew Bauer - 1.26.4 -- Initial cmake build. - -* Sat Oct 05 2013 Andrew Bauer - 1.26.4 -- Fedora specific path changes have been moved to zoneminder-1.26.0-defaults.patch -- All files are now part of the zoneminder source tree. Update specfile accordingly. - -* Sat Sep 21 2013 Andrew Bauer - 1.26.3 -- Initial rebuild for ZoneMinder 1.26.3 release. - -* Fri Feb 15 2013 Fedora Release Engineering - 1.25.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 21 2013 Adam Tkac - 1.25.0-12 -- rebuild due to "jpeg8-ABI" feature drop - -* Mon Jan 7 2013 Remi Collet - 1.25.0-11 -- fix configuration file for httpd 2.4, #871502 - -* Fri Dec 21 2012 Adam Tkac - 1.25.0-10 -- rebuild against new libjpeg - -* Thu Aug 09 2012 Jason L Tibbitts III - 1.25.0-9 -- Add patch to work around v4l2 api breakage in 3.5 kernel. - -* Sun Jul 22 2012 Fedora Release Engineering - 1.25.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jun 23 2012 Petr Pisar - 1.25.0-7 -- Perl 5.16 rebuild - -* Wed Mar 21 2012 Jason L Tibbitts III - 1.25.0-6 -- Fix stupid thinko in sql modifications. - -* Sat Feb 25 2012 Jason L Tibbitts III - 1.25.0-5 -- Clean up macro usage. - -* Sat Feb 25 2012 Jason L Tibbitts III - 1.25.0-4 -- Convert to systemd. -- Add tmpfiles.d configuration since the initscript isn't around to create - /run/zoneminder. -- Remove some pointless executable permissions. -- Add logrotate file. - -* Wed Feb 22 2012 Jason L Tibbitts III - 1.25.0-3 -- Update README.Fedora to reference systemctl and mention timezone info in - php.ini. -- Add proper default for EYEZM_LOG_TO_FILE. - - -* Thu Feb 09 2012 Jason L Tibbitts III - 1.25.0-2 -- Rebuild for new pcre. - -* Thu Jan 19 2012 Jason L Tibbitts III - 1.25.0-1 -- Update to 1.25.0 -- Fix gcc4.7 build problems. -- Drop gcc4.4 build fixes; for whatever reason they now break the build. -- Clean up old patches. -- Force setting of ZM_TMPDIR and ZM_RUNDIR. - -* Sat Jan 14 2012 Fedora Release Engineering - 1.24.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Sep 15 2011 Jason L Tibbitts III - 1.24.4-3 -- Re-add the dist-tag that somehow got lost. - -* Thu Sep 15 2011 Jason L Tibbitts III - 1.24.4-2 -- Add patch for bug 711780 - fix syntax issue in Mapped.pm. -- Undo that patch, and undo another which was the cause of the whole mess. -- Fix up other patches so ZM_PATH_BUILD is both defined and useful. -- Make sure database creation mods actually take. -- Update Fedora-specific docs with some additional info. -- Use bundled mootools (javascript, so no guideline violation). -- Update download location. -- Update the gcrypt patch to actually work. -- Upstream changed the tarball without changing the version to patch a - vulnerability, so redownload. - -* Sun Aug 14 2011 Jason L Tibbitts III - 1.24.4-1 -- Initial attempt to upgrade to 1.24.4. -- Add patch from BZ 460310 to build against libgcrypt instead of requiring the - gnutls openssl libs. - -* Thu Jul 21 2011 Petr Sabata - 1.24.3-7.20110324svn3310 -- Perl mass rebuild - -* Wed Jul 20 2011 Petr Sabata - 1.24.3-6.20110324svn3310 -- Perl mass rebuild - -* Mon May 09 2011 Jason L Tibbitts III - 1.24.3-5.20110324svn3310 -- Bump for gnutls update. - -* Thu Mar 24 2011 Jason L Tibbitts III - 1.24.3-4.20110324svn3310 -- Update to latest 1.24.3 subversion. Turns out that what upstream was calling - 1.24.3 is really just an occasionally updated devel snapshot. -- Rebase various patches. - -* Wed Mar 23 2011 Dan Horák - 1.24.3-3 -- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) - -* Tue Feb 08 2011 Fedora Release Engineering - 1.24.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 25 2011 Jason L Tibbitts III - 1.24.3-1 -- Update to latest upstream version. -- Rebase patches. -- Initial incomplete attempt to disable v4l1 support. - -* Fri Jan 21 2011 Jason L Tibbitts III - 1.24.2-6 -- Unbundle cambozola; instead link to the separately pacakged copy. -- Remove BuildRoot:, %%clean and buildroot cleaning in %%install. -- Git rid of mixed space/tab usage by removing all tabs. -- Remove unnecessary Conflicts: line. -- Attempt to force short_open_tag on for the code directories. -- Move default location of sockets, swaps, logfiles and some temporary files to - make more sense and allow things to work better with a future selinux policy. -- Fix errors in README.Fedora. - -* Wed Jun 02 2010 Marcela Maslanova - 1.24.2-5 -- Mass rebuild with perl-5.12.0 - -* Fri Dec 4 2009 Stepan Kasal - 1.24.2-4 -- rebuild against perl 5.10.1 -- use Perl vendorarch and archlib variables correctly - -* Mon Jul 27 2009 Fedora Release Engineering - 1.24.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-2 -- Bump release since 1.24.2-1 was mistakenly tagged a few months ago. - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-1 -- Initial update to 1.24.2. -- Rebase patches. -- Update mootools download location. -- Update to mootools 1.2.3. -- Add additional dependencies for some optional features. - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-3 -- Remove unused Sys::Mmap perl dependency RPM is finding - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-2 -- Update gcc44 patch to disable -frepo, seems to be broken with gcc44 -- Added noffmpeg patch to make building outside mock easier - -* Sat Mar 21 2009 Martin Ebourne - 1.24.1-1 -- Patch for gcc 4.4 compilation errors -- Upgrade to 1.24.1 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.23.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Jan 24 2009 Caolán McNamara - 1.23.3-3 -- rebuild for dependencies - -* Mon Dec 15 2008 Martin Ebourne - 1.23.3-2 -- Fix permissions on zm.conf - -* Fri Jul 11 2008 Jason L Tibbitts III - 1.23.3-1 -- Initial attempt at packaging 1.23. - -* Tue Jul 1 2008 Martin Ebourne - 1.22.3-15 -- Add perl module compat dependency, bz #453590 - -* Tue May 6 2008 Martin Ebourne - 1.22.3-14 -- Remove default runlevel, bz #441315 - -* Mon Apr 28 2008 Jason L Tibbitts III - 1.22.3-13 -- Backport patch for CVE-2008-1381 from 1.23.3 to 1.22.3. - -* Tue Feb 19 2008 Fedora Release Engineering - 1.22.3-12 -- Autorebuild for GCC 4.3 - -* Thu Jan 3 2008 Martin Ebourne - 1.22.3-11 -- Fix compilation on gcc 4.3 - -* Thu Dec 6 2007 Martin Ebourne - 1.22.3-10 -- Rebuild for new openssl - -* Thu Aug 2 2007 Martin Ebourne - 1.22.3-8 -- Fix licence tag - -* Thu Jul 12 2007 Martin Ebourne - 1.22.3-7 -- Fixes from testing by Jitz including missing dependencies and database creation - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-6 -- Disable crashtrace on ppc - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-5 -- Fix uid for directories in /var/lib/zoneminder - -* Tue Jun 26 2007 Martin Ebourne - 1.22.3-4 -- Added perl Archive::Tar dependency -- Disabled web interface due to lack of access control on the event images - -* Sun Jun 10 2007 Martin Ebourne - 1.22.3-3 -- Changes recommended in review by Jason Tibbitts - -* Mon Apr 2 2007 Martin Ebourne - 1.22.3-2 -- Standardised on package name of zoneminder - -* Thu Dec 28 2006 Martin Ebourne - 1.22.3-1 -- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin diff --git a/distros/fedora/archive/zoneminder.f23.spec b/distros/fedora/archive/zoneminder.f23.spec deleted file mode 100644 index 5335b90cc..000000000 --- a/distros/fedora/archive/zoneminder.f23.spec +++ /dev/null @@ -1,429 +0,0 @@ -%define zmuid $(id -un) -%define zmgid $(id -gn) -%define zmuid_final apache -%define zmgid_final apache - -%global _hardened_build 1 - -### Delete the lines below to build with ffmpeg and/or x10 -%define _without_ffmpeg 1 -%define _without_x10 1 - -Name: zoneminder -Version: 1.30.0 -Release: 1%{?dist} -Summary: A camera monitoring and analysis tool -Group: System Environment/Daemons -# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/ -# Mootools is inder the MIT license: http://mootools.net/ -License: GPLv2+ and LGPLv2+ and MIT -URL: http://www.zoneminder.com/ - -#Source: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz -Source: ZoneMinder-%{version}.tar.gz - -BuildRequires: cmake gnutls-devel systemd-units bzip2-devel -BuildRequires: mariadb-devel pcre-devel libjpeg-turbo-devel -BuildRequires: perl(Archive::Tar) perl(Archive::Zip) perl-podlators -BuildRequires: perl(Date::Manip) perl(DBD::mysql) -BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent) -BuildRequires: perl(MIME::Entity) perl(MIME::Lite) -BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap) -BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign) -BuildRequires: perl(Expect) perl(Sys::Syslog) -BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel -%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel} -%{!?_without_x10:BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime)} -# cmake needs the following installed at build time due to the way it auto-detects certain parameters -BuildRequires: httpd polkit-devel -%{!?_without_ffmpeg:BuildRequires: ffmpeg} - -Requires: httpd php php-gd php-mysql cambozola polkit net-tools psmisc -Requires: libjpeg-turbo vlc-core libcurl -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) -Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP) -Requires: perl(LWP::Protocol::https) -%{!?_without_ffmpeg:Requires: ffmpeg} - -Requires(post): systemd-units systemd-sysv -Requires(post): /usr/bin/gpasswd -Requires(post): /usr/bin/less -Requires(preun): systemd-units -Requires(postun): systemd-units - -%description -ZoneMinder is a set of applications which is intended to provide a complete -solution allowing you to capture, analyse, record and monitor any cameras you -have attached to a Linux based machine. It is designed to run on kernels which -support the Video For Linux (V4L) interface and has been tested with cameras -attached to BTTV cards, various USB cameras and IP network cameras. It is -designed to support as many cameras as you can attach to your computer without -too much degradation of performance. - -%prep -%setup -q -n ZoneMinder-%{version} - -# Change the following default values -./utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin-zm/nph-zms -./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes -./utils/zmeditconfigdata.sh ZM_PATH_SWAP /dev/shm -./utils/zmeditconfigdata.sh ZM_UPLOAD_FTP_LOC_DIR /var/spool/zoneminder-upload -./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes -./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no -./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no -./utils/zmeditconfigdata.sh ZM_OPT_FAST_DELETE no - -%build -%cmake \ - -DZM_TARGET_DISTRO="f23" \ -%{?_without_ffmpeg:-DZM_NO_FFMPEG=ON} \ -%{?_without_x10:-DZM_NO_X10=ON} \ - . - -make %{?_smp_mflags} - -%install -export DESTDIR=%{buildroot} -make install - -%post - -# Add any new PTZ control configurations to the database (will not overwrite) -%{_bindir}/zmcamtool.pl --import >/dev/null 2>&1 || : - -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - -# Allow zoneminder access to local video sources, serial ports, and x10 -/usr/bin/gpasswd -a %{zmuid_final} video -/usr/bin/gpasswd -a %{zmuid_final} dialout - -# Upgrade from a previous version of zoneminder -if [ $1 -eq 2 ] ; then - - # Add any new PTZ control configurations to the database (will not overwrite) - %{_bindir}/zmcamtool.pl --import >/dev/null 2>&1 || : - - # Freshen the database - %{_bindir}/zmupdate.pl -f >/dev/null 2>&1 || : - - # We can't run this automatically when new sql account permissions need to - # be manually added first - # Run zmupdate non-interactively - #/usr/bin/zmupdate.pl --nointeractive -fi - -# Warn the end user to read the README file -echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, read README.Fedora to finish the\ninstallation or upgrade!\n" -echo -e "\nThe README file is located here: %{_docdir}/%{name}\n" - -%preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || : - /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || : -fi - -%postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || : -fi - -%triggerun -- zoneminder < 1.25.0-4 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply zoneminder -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || : -/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/README.https distros/fedora/jscalendar-doc -%config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf -%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf -%config(noreplace) /etc/tmpfiles.d/zoneminder.conf -%config(noreplace) /etc/logrotate.d/zoneminder - -%{_unitdir}/zoneminder.service - -%{_bindir}/zma -%{_bindir}/zmaudit.pl -%{_bindir}/zmc -%{_bindir}/zmcontrol.pl -%{_bindir}/zmdc.pl -%{_bindir}/zmf -%{_bindir}/zmfilter.pl -%{_bindir}/zmpkg.pl -%{_bindir}/zmtrack.pl -%{_bindir}/zmtrigger.pl -%{_bindir}/zmu -%{_bindir}/zmupdate.pl -%{_bindir}/zmvideo.pl -%{_bindir}/zmwatch.pl -%{_bindir}/zmcamtool.pl -%{_bindir}/zmsystemctl.pl -%{_bindir}/zmtelemetry.pl -%{!?_without_x10:%{_bindir}/zmx10.pl} -%{_bindir}/zmonvif-probe.pl - -%{perl_vendorlib}/ZoneMinder* -%{perl_vendorlib}/ONVIF* -%{perl_vendorlib}/WSDiscovery* -%{perl_vendorlib}/WSSecurity* -%{perl_vendorlib}/WSNotification* -%{_mandir}/man*/* -%dir %{_libexecdir}/zoneminder -%{_libexecdir}/zoneminder/cgi-bin -%dir %{_datadir}/zoneminder -%{_datadir}/zoneminder/db -%{_datadir}/zoneminder/www - -%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy -%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules - -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder - - -%changelog -* Thu Mar 3 2016 Andrew Bauer - 1.30.0 -- Bump version fo 1.30.0 release. - -* Sat Nov 21 2015 Andrew Bauer - 1.29.0 -- Bump version for 1.29.0 release on Fedora 23. - -* Sat Feb 14 2015 Andrew Bauer - 1.28.1 -- Bump version for 1.28.1 release on Fedora 21. - -* Sun Oct 5 2014 Andrew Bauer - 1.28.0 -- Bump version for 1.28.0 release. - -* Fri Mar 14 2014 Andrew Bauer - 1.27 -- Tweak build requirements for cmake - -* Sat Feb 01 2014 Andrew Bauer - 1.27 -- Add zmcamtool.pl. Bump version for 1.27 release. - -* Mon Dec 16 2013 Andrew Bauer - 1.26.5 -- This is a bug fixe release -- RTSP fixes, cmake enhancements, couple other misc fixes - -* Mon Oct 07 2013 Andrew Bauer - 1.26.4 -- Initial cmake build. - -* Sat Oct 05 2013 Andrew Bauer - 1.26.4 -- Fedora specific path changes have been moved to zoneminder-1.26.0-defaults.patch -- All files are now part of the zoneminder source tree. Update specfile accordingly. - -* Sat Sep 21 2013 Andrew Bauer - 1.26.3 -- Initial rebuild for ZoneMinder 1.26.3 release. - -* Fri Feb 15 2013 Fedora Release Engineering - 1.25.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 21 2013 Adam Tkac - 1.25.0-12 -- rebuild due to "jpeg8-ABI" feature drop - -* Mon Jan 7 2013 Remi Collet - 1.25.0-11 -- fix configuration file for httpd 2.4, #871502 - -* Fri Dec 21 2012 Adam Tkac - 1.25.0-10 -- rebuild against new libjpeg - -* Thu Aug 09 2012 Jason L Tibbitts III - 1.25.0-9 -- Add patch to work around v4l2 api breakage in 3.5 kernel. - -* Sun Jul 22 2012 Fedora Release Engineering - 1.25.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jun 23 2012 Petr Pisar - 1.25.0-7 -- Perl 5.16 rebuild - -* Wed Mar 21 2012 Jason L Tibbitts III - 1.25.0-6 -- Fix stupid thinko in sql modifications. - -* Sat Feb 25 2012 Jason L Tibbitts III - 1.25.0-5 -- Clean up macro usage. - -* Sat Feb 25 2012 Jason L Tibbitts III - 1.25.0-4 -- Convert to systemd. -- Add tmpfiles.d configuration since the initscript isn't around to create - /run/zoneminder. -- Remove some pointless executable permissions. -- Add logrotate file. - -* Wed Feb 22 2012 Jason L Tibbitts III - 1.25.0-3 -- Update README.Fedora to reference systemctl and mention timezone info in - php.ini. -- Add proper default for EYEZM_LOG_TO_FILE. - - -* Thu Feb 09 2012 Jason L Tibbitts III - 1.25.0-2 -- Rebuild for new pcre. - -* Thu Jan 19 2012 Jason L Tibbitts III - 1.25.0-1 -- Update to 1.25.0 -- Fix gcc4.7 build problems. -- Drop gcc4.4 build fixes; for whatever reason they now break the build. -- Clean up old patches. -- Force setting of ZM_TMPDIR and ZM_RUNDIR. - -* Sat Jan 14 2012 Fedora Release Engineering - 1.24.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Sep 15 2011 Jason L Tibbitts III - 1.24.4-3 -- Re-add the dist-tag that somehow got lost. - -* Thu Sep 15 2011 Jason L Tibbitts III - 1.24.4-2 -- Add patch for bug 711780 - fix syntax issue in Mapped.pm. -- Undo that patch, and undo another which was the cause of the whole mess. -- Fix up other patches so ZM_PATH_BUILD is both defined and useful. -- Make sure database creation mods actually take. -- Update Fedora-specific docs with some additional info. -- Use bundled mootools (javascript, so no guideline violation). -- Update download location. -- Update the gcrypt patch to actually work. -- Upstream changed the tarball without changing the version to patch a - vulnerability, so redownload. - -* Sun Aug 14 2011 Jason L Tibbitts III - 1.24.4-1 -- Initial attempt to upgrade to 1.24.4. -- Add patch from BZ 460310 to build against libgcrypt instead of requiring the - gnutls openssl libs. - -* Thu Jul 21 2011 Petr Sabata - 1.24.3-7.20110324svn3310 -- Perl mass rebuild - -* Wed Jul 20 2011 Petr Sabata - 1.24.3-6.20110324svn3310 -- Perl mass rebuild - -* Mon May 09 2011 Jason L Tibbitts III - 1.24.3-5.20110324svn3310 -- Bump for gnutls update. - -* Thu Mar 24 2011 Jason L Tibbitts III - 1.24.3-4.20110324svn3310 -- Update to latest 1.24.3 subversion. Turns out that what upstream was calling - 1.24.3 is really just an occasionally updated devel snapshot. -- Rebase various patches. - -* Wed Mar 23 2011 Dan Horák - 1.24.3-3 -- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) - -* Tue Feb 08 2011 Fedora Release Engineering - 1.24.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 25 2011 Jason L Tibbitts III - 1.24.3-1 -- Update to latest upstream version. -- Rebase patches. -- Initial incomplete attempt to disable v4l1 support. - -* Fri Jan 21 2011 Jason L Tibbitts III - 1.24.2-6 -- Unbundle cambozola; instead link to the separately pacakged copy. -- Remove BuildRoot:, %%clean and buildroot cleaning in %%install. -- Git rid of mixed space/tab usage by removing all tabs. -- Remove unnecessary Conflicts: line. -- Attempt to force short_open_tag on for the code directories. -- Move default location of sockets, swaps, logfiles and some temporary files to - make more sense and allow things to work better with a future selinux policy. -- Fix errors in README.Fedora. - -* Wed Jun 02 2010 Marcela Maslanova - 1.24.2-5 -- Mass rebuild with perl-5.12.0 - -* Fri Dec 4 2009 Stepan Kasal - 1.24.2-4 -- rebuild against perl 5.10.1 -- use Perl vendorarch and archlib variables correctly - -* Mon Jul 27 2009 Fedora Release Engineering - 1.24.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-2 -- Bump release since 1.24.2-1 was mistakenly tagged a few months ago. - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-1 -- Initial update to 1.24.2. -- Rebase patches. -- Update mootools download location. -- Update to mootools 1.2.3. -- Add additional dependencies for some optional features. - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-3 -- Remove unused Sys::Mmap perl dependency RPM is finding - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-2 -- Update gcc44 patch to disable -frepo, seems to be broken with gcc44 -- Added noffmpeg patch to make building outside mock easier - -* Sat Mar 21 2009 Martin Ebourne - 1.24.1-1 -- Patch for gcc 4.4 compilation errors -- Upgrade to 1.24.1 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.23.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Jan 24 2009 Caolán McNamara - 1.23.3-3 -- rebuild for dependencies - -* Mon Dec 15 2008 Martin Ebourne - 1.23.3-2 -- Fix permissions on zm.conf - -* Fri Jul 11 2008 Jason L Tibbitts III - 1.23.3-1 -- Initial attempt at packaging 1.23. - -* Tue Jul 1 2008 Martin Ebourne - 1.22.3-15 -- Add perl module compat dependency, bz #453590 - -* Tue May 6 2008 Martin Ebourne - 1.22.3-14 -- Remove default runlevel, bz #441315 - -* Mon Apr 28 2008 Jason L Tibbitts III - 1.22.3-13 -- Backport patch for CVE-2008-1381 from 1.23.3 to 1.22.3. - -* Tue Feb 19 2008 Fedora Release Engineering - 1.22.3-12 -- Autorebuild for GCC 4.3 - -* Thu Jan 3 2008 Martin Ebourne - 1.22.3-11 -- Fix compilation on gcc 4.3 - -* Thu Dec 6 2007 Martin Ebourne - 1.22.3-10 -- Rebuild for new openssl - -* Thu Aug 2 2007 Martin Ebourne - 1.22.3-8 -- Fix licence tag - -* Thu Jul 12 2007 Martin Ebourne - 1.22.3-7 -- Fixes from testing by Jitz including missing dependencies and database creation - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-6 -- Disable crashtrace on ppc - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-5 -- Fix uid for directories in /var/lib/zoneminder - -* Tue Jun 26 2007 Martin Ebourne - 1.22.3-4 -- Added perl Archive::Tar dependency -- Disabled web interface due to lack of access control on the event images - -* Sun Jun 10 2007 Martin Ebourne - 1.22.3-3 -- Changes recommended in review by Jason Tibbitts - -* Mon Apr 2 2007 Martin Ebourne - 1.22.3-2 -- Standardised on package name of zoneminder - -* Thu Dec 28 2006 Martin Ebourne - 1.22.3-1 -- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin diff --git a/distros/fedora/archive/zoneminder.logrotate b/distros/fedora/archive/zoneminder.logrotate deleted file mode 100644 index 7bd1d189b..000000000 --- a/distros/fedora/archive/zoneminder.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/zoneminder/*.log { - missingok - notifempty - sharedscripts - postrotate - /usr/bin/zmpkg.pl logrot 2> /dev/null > /dev/null || : - endscript -} diff --git a/distros/fedora/archive/zoneminder.service b/distros/fedora/archive/zoneminder.service deleted file mode 100644 index fdd9b3af2..000000000 --- a/distros/fedora/archive/zoneminder.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Video security and surveillance system -After=mysqld.service - -[Service] -Type=forking -ExecStart=/usr/bin/zmpkg.pl start -ExecReload=/usr/bin/zmpkg.pl reload -PIDFile=/run/zoneminder/zm.pid - -[Install] -WantedBy=multi-user.target - diff --git a/distros/fedora/archive/zoneminder.tmpfiles b/distros/fedora/archive/zoneminder.tmpfiles deleted file mode 100644 index a56fa54ba..000000000 --- a/distros/fedora/archive/zoneminder.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/zoneminder 0755 apache apache diff --git a/distros/fedora/jscalendar-1.0.zip b/distros/fedora/jscalendar-1.0.zip deleted file mode 120000 index a28f64655..000000000 --- a/distros/fedora/jscalendar-1.0.zip +++ /dev/null @@ -1 +0,0 @@ -../redhat/jscalendar-1.0.zip \ No newline at end of file diff --git a/distros/fedora/jscalendar.sh b/distros/fedora/jscalendar.sh deleted file mode 120000 index 0d12509bb..000000000 --- a/distros/fedora/jscalendar.sh +++ /dev/null @@ -1 +0,0 @@ -../redhat/jscalendar.sh \ No newline at end of file diff --git a/distros/fedora/redalert.wav b/distros/fedora/redalert.wav deleted file mode 120000 index eec3dce64..000000000 --- a/distros/fedora/redalert.wav +++ /dev/null @@ -1 +0,0 @@ -../redhat/redalert.wav \ No newline at end of file diff --git a/distros/fedora/zoneminder-1.28.0-defaults.patch b/distros/fedora/zoneminder-1.28.0-defaults.patch deleted file mode 100644 index 30d4d87e4..000000000 --- a/distros/fedora/zoneminder-1.28.0-defaults.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in 2013-08-01 18:14:45.175241378 -0500 -+++ scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in.defaults 2013-08-07 18:57:42.525006149 -0500 -@@ -187,7 +187,7 @@ - }, - { - name => "ZM_PATH_ZMS", -- default => "/cgi-bin/nph-zms", -+ default => "/cgi-bin/zm/nph-zms", - description => "Web path to zms streaming server", - help => "The ZoneMinder streaming server is required to send streamed images to your browser. It will be installed into the cgi-bin path given at configuration time. This option determines what the web path to the server is rather than the local path on your machine. Ordinarily the streaming server runs in parser-header mode however if you experience problems with streaming you can change this to non-parsed-header (nph) mode by changing 'zms' to 'nph-zms'.", - type => $types{rel_path}, -@@ -276,7 +276,7 @@ - }, - { - name => "ZM_OPT_CAMBOZOLA", -- default => "no", -+ default => "yes", - description => "Is the (optional) cambozola java streaming client installed", - help => "Cambozola is a handy low fat cheese flavoured Java applet that ZoneMinder uses to view image streams on browsers such as Internet Explorer that don't natively support this format. If you use this browser it is highly recommended to install this from http://www.charliemouse.com/code/cambozola/ however if it is not installed still images at a lower refresh rate can still be viewed.", - type => $types{boolean}, -@@ -639,7 +639,7 @@ - }, - { - name => "ZM_PATH_SWAP", -- default => "@ZM_TMPDIR@", -+ default => "/dev/shm", - description => "Path to location for temporary swap images used in streaming", - help => "Buffered playback requires temporary swap images to be stored for each instance of the streaming daemons. This option determines where these images will be stored. The images will actually be stored in sub directories beneath this location and will be automatically cleaned up after a period of time.", - type => $types{abs_path}, -@@ -902,7 +902,7 @@ - }, - { - name => "ZM_UPLOAD_FTP_LOC_DIR", -- default => "@ZM_TMPDIR@", -+ default => "/var/spool/zoneminder-upload", - description => "The local directory in which to create upload files", - help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the local directory that ZoneMinder should use for temporary upload files. These are files that are created from events, uploaded and then deleted.", - requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ], -@@ -1258,7 +1258,7 @@ - }, - { - name => "ZM_OPT_CONTROL", -- default => "no", -+ default => "yes", - description => "Support controllable (e.g. PTZ) cameras", - help => "ZoneMinder includes limited support for controllable cameras. A number of sample protocols are included and others can easily be added. If you wish to control your cameras via ZoneMinder then select this option otherwise if you only have static cameras or use other control methods then leave this option off.", - type => $types{boolean}, diff --git a/distros/fedora/zoneminder.conf.in b/distros/fedora/zoneminder.conf.in deleted file mode 120000 index fd0098cf5..000000000 --- a/distros/fedora/zoneminder.conf.in +++ /dev/null @@ -1 +0,0 @@ -../redhat/zoneminder.el7.conf.in \ No newline at end of file diff --git a/distros/fedora/zoneminder.f24.spec b/distros/fedora/zoneminder.f24.spec deleted file mode 120000 index 2d5cc6c93..000000000 --- a/distros/fedora/zoneminder.f24.spec +++ /dev/null @@ -1 +0,0 @@ -zoneminder.f25.spec \ No newline at end of file diff --git a/distros/fedora/zoneminder.logrotate.in b/distros/fedora/zoneminder.logrotate.in deleted file mode 120000 index c7e334ca4..000000000 --- a/distros/fedora/zoneminder.logrotate.in +++ /dev/null @@ -1 +0,0 @@ -../redhat/zoneminder.el7.logrotate.in \ No newline at end of file diff --git a/distros/fedora/zoneminder.service.in b/distros/fedora/zoneminder.service.in deleted file mode 100644 index ad1488aed..000000000 --- a/distros/fedora/zoneminder.service.in +++ /dev/null @@ -1,19 +0,0 @@ -# ZoneMinder systemd unit file for Fedora -# Replace mariadb with community-mysql if using mysql service instead of mariadb - -[Unit] -Description=ZoneMinder CCTV recording and security system -After=network.target mariadb.service httpd.service -Requires=mariadb.service httpd.service - -[Service] -User=@WEB_USER@ -Type=forking -ExecStart=@BINDIR@/zmpkg.pl start -ExecReload=@BINDIR@/zmpkg.pl restart -ExecStop=@BINDIR@/zmpkg.pl stop -PIDFile="@ZM_RUNDIR@/zm.pid" -Environment=TZ=/etc/localtime - -[Install] -WantedBy=multi-user.target diff --git a/distros/fedora/zoneminder.tmpfiles.in b/distros/fedora/zoneminder.tmpfiles.in deleted file mode 120000 index 0e4f721f6..000000000 --- a/distros/fedora/zoneminder.tmpfiles.in +++ /dev/null @@ -1 +0,0 @@ -../redhat/zoneminder.tmpfiles.in \ No newline at end of file diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt index 87000d35f..bafed6ac4 100644 --- a/distros/redhat/CMakeLists.txt +++ b/distros/redhat/CMakeLists.txt @@ -1,23 +1,41 @@ # CMakeLists.txt for the Redhat/CentOS Target Distro. # Display a message to show the RHEL build options are being processed. -message([STATUS] "Starting RHEL Build Options" ...) +if(ZM_TARGET_DISTRO MATCHES "^el") + message([STATUS] "Starting RHEL Build Options" ...) +elseif(ZM_TARGET_DISTRO MATCHES "^fc") + message([STATUS] "Starting Fedora Build Options" ...) +else(ZM_TARGET_DISTRO MATCHES "^el") + message([WARNING] "Unknown Build Option Detected" ...) +endif(ZM_TARGET_DISTRO MATCHES "^el") -# Create the zoneminder service file -if(ZM_TARGET_DISTRO STREQUAL "el7") - configure_file(zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY) - configure_file(zoneminder.el7.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.el7.conf @ONLY) - configure_file(zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY) - configure_file(zoneminder.el7.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.el7.logrotate @ONLY) -else(ZM_TARGET_DISTRO STREQUAL "el7") - configure_file(zoneminder.sysvinit.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.sysvinit @ONLY) - configure_file(zoneminder.el6.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.el6.logrotate @ONLY) - configure_file(zoneminder.el6.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.el6.conf @ONLY) -endif(ZM_TARGET_DISTRO STREQUAL "el7") +if((ZM_TARGET_DISTRO STREQUAL "el6") AND (ZM_WEB_USER STREQUAL "nginx")) + message([FATAL_ERROR] "Nginx is Not a Supported Build Option on EL6 Target Distro" ...) +endif((ZM_TARGET_DISTRO STREQUAL "el6") AND (ZM_WEB_USER STREQUAL "nginx")) + +# Configure the zoneminder service files +if(ZM_TARGET_DISTRO STREQUAL "el6") + configure_file(sysvinit/zoneminder.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.sysvinit @ONLY) + configure_file(sysvinit/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY) + configure_file(sysvinit/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY) +else(ZM_TARGET_DISTRO STREQUAL "el6") + configure_file(systemd/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY) + if(ZM_WEB_USER STREQUAL "nginx") + configure_file(nginx/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY) + configure_file(nginx/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY) + configure_file(nginx/zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY) + configure_file(nginx/zoneminder.php-fpm.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.php-fpm.conf @ONLY) + configure_file(nginx/README.Fedora ${CMAKE_CURRENT_SOURCE_DIR}/readme/README.Fedora COPYONLY) + else(ZM_WEB_USER STREQUAL "nginx") + configure_file(systemd/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY) + configure_file(systemd/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY) + configure_file(systemd/zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY) + endif(ZM_WEB_USER STREQUAL "nginx") +endif(ZM_TARGET_DISTRO STREQUAL "el6") # Unpack jscalendar & move files into position message(STATUS "Unpacking and Installing jscalendar...") -execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar.sh +execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/misc/jscalendar.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ERROR_VARIABLE unzip_jsc ) @@ -44,21 +62,26 @@ install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/imag 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\")") -# Link to Cambozola, which is now packaged in zmrepo +# Link to Cambozola install(CODE "execute_process(COMMAND ln -sf ../../java/cambozola.jar \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/cambozola.jar\")") # Install auxiliary 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) +install(FILES misc/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) install(DIRECTORY jscalendar-1.0/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/tools/jscalendar) -if(ZM_TARGET_DISTRO STREQUAL "el7") - install(FILES zoneminder.el7.conf DESTINATION /etc/httpd/conf.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) - install(FILES zoneminder.el7.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) - install(FILES zoneminder.service DESTINATION /usr/lib/systemd/system PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) - install(FILES ../../misc/zoneminder-tmpfiles.conf DESTINATION /etc/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) -else(ZM_TARGET_DISTRO STREQUAL "el7") - install(FILES zoneminder.el6.conf DESTINATION /etc/httpd/conf.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) - install(FILES zoneminder.el6.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) - install(FILES zoneminder.sysvinit DESTINATION /etc/rc.d/init.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) -endif(ZM_TARGET_DISTRO STREQUAL "el7") +install(FILES zoneminder.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) + +if(ZM_WEB_USER STREQUAL "nginx") + install(FILES zoneminder.conf DESTINATION /etc/nginx/default.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) + install(FILES zoneminder.php-fpm.conf DESTINATION /etc/php-fpm.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME zoneminder.conf) +else(ZM_WEB_USER STREQUAL "nginx") + install(FILES zoneminder.conf DESTINATION /etc/httpd/conf.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) +endif(ZM_WEB_USER STREQUAL "nginx") + +if(ZM_TARGET_DISTRO STREQUAL "el6") + install(FILES zoneminder.sysvinit DESTINATION /etc/rc.d/init.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) +else(ZM_TARGET_DISTRO STREQUAL "el6") + install(FILES zoneminder.service DESTINATION /usr/lib/systemd/system PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) + install(FILES zoneminder.tmpfiles DESTINATION /etc/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) +endif(ZM_TARGET_DISTRO STREQUAL "el6") diff --git a/distros/redhat/archive/cambozola.sh b/distros/redhat/archive/cambozola.sh deleted file mode 100755 index 645c5aa77..000000000 --- a/distros/redhat/archive/cambozola.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -tar -xvzf cambozola-0.931.tar.gz -mkdir -v cambozola-doc -cd cambozola-0.931 -mv -v application.properties build.xml dist.sh *html LICENSE testPages/* ../cambozola-doc -rmdir -v testPages diff --git a/distros/redhat/archive/zm-init b/distros/redhat/archive/zm-init deleted file mode 100644 index 90e645f43..000000000 --- a/distros/redhat/archive/zm-init +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -#$Id: zm-init,v 1.1 2005/04/19 00:49:53 hunter Exp $ - -# -# Copyright (C) 2005 Serg Oskin -# - -ZM_VERSION= -ZM_CONFIG=/etc/zm.conf -ZM_PATH=/usr/lib/zm - -if [ -f $ZM_CONFIG ]; then - . $ZM_CONFIG -else - echo "ERROR: $ZM_CONFIG not found." - exit 1 -fi -for n in ZM_DB_SERVER ZM_DB_NAME ZM_DB_USER ZM_DB_PASS; do - eval "val=\$$n" - if [ "$val" = "" ]; then - echo "ERROR($ZM_CONFIG): $n should exist and be not empty." - exit 1 - fi -done - -if [ "$ZM_DB_SERVER" = "localhost" ]; then - ClientHost=localhost -else - ClientHost=`hostname` -fi - - -sql=/tmp/zm.crdb.sql -echo "" >$sql -chmod 600 $sql - -echo "CREATE DATABASE /*!32312 IF NOT EXISTS*/ $ZM_DB_NAME;" >>$sql -echo "USE $ZM_DB_NAME;" >>$sql - -echo "GRANT all on $ZM_DB_NAME.* TO '$ZM_DB_USER'@'$ClientHost' IDENTIFIED BY '$ZM_DB_PASS';" >>$sql - -echo -n "Enter MySQL Administrator username: " -read admin -cat $sql | mysql -B -h $ZM_DB_SERVER -u $admin -p -rm -f $sql - -cat /usr/lib/zm/init/zmschema.sql | mysql -h $ZM_DB_SERVER -u $ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME -( cd $ZM_PATH/init; perl $ZM_PATH/init/zmoptions -f $ZM_PATH/init/zmconfig.txt ) diff --git a/distros/redhat/archive/zoneminder-1.26.0-dbinstall.patch b/distros/redhat/archive/zoneminder-1.26.0-dbinstall.patch deleted file mode 100644 index 5b688a75d..000000000 --- a/distros/redhat/archive/zoneminder-1.26.0-dbinstall.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- configure.ac 2013-09-05 10:33:08.000000000 -0500 -+++ configure.ac.dbinstall 2013-09-05 17:23:28.555553447 -0500 -@@ -1,13 +1,11 @@ - AC_PREREQ(2.59) --AC_INIT(zm,1.26.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],ZoneMinder,http://www.zoneminder.com/downloads.html) -+AC_INIT(zm,1.26.0,[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) - - AC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS]) - --PATH_BUILD=`pwd` --AC_SUBST(PATH_BUILD) - TIME_BUILD=`date +'%s'` - AC_SUBST(TIME_BUILD) - -@@ -354,6 +352,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC - - AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory]) - AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory]) -+AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory]) -+AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE") - AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid") - AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory]) - AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf") -diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am ---- ./db/Makefile.am.dbinstall 2009-10-14 04:42:46.000000000 -0500 -+++ ./db/Makefile.am 2011-03-24 22:50:14.173912137 -0500 -@@ -1,7 +1,16 @@ - AUTOMAKE_OPTIONS = gnu - -+zmdbdatadir = $(pkgdatadir)/db -+ - EXTRA_DIST = \ - zm_create.sql.in \ -+ $(dbupgrade_scripts) -+ -+dist_zmdbdata_DATA = \ -+ zm_create.sql \ -+ $(dbupgrade_scripts) -+ -+dbupgrade_scripts = \ - zm_update-0.0.1.sql \ - zm_update-0.9.7.sql \ - zm_update-0.9.8.sql \ -diff -up ./scripts/zmupdate.pl.in.dbinstall ./scripts/zmupdate.pl.in ---- ./scripts/zmupdate.pl.in.dbinstall 2011-08-27 15:44:05.335602405 -0500 -+++ ./scripts/zmupdate.pl.in 2011-08-26 02:51:37.000000000 -0500 -@@ -424,7 +424,7 @@ if ( $version ) - } - else - { -- $command .= ZM_PATH_BUILD."/db"; -+ $command .= ZM_PATH_DATA."/db"; - } - $command .= "/zm_update-".$version.".sql"; - -diff -up ./zm.conf.in.dbinstall ./zm.conf.in ---- ./zm.conf.in.dbinstall 2008-07-25 04:48:16.000000000 -0500 -+++ ./zm.conf.in 2011-03-24 22:50:14.175912077 -0500 -@@ -12,8 +12,8 @@ - # Current version of ZoneMinder - ZM_VERSION=@VERSION@ - --# Path to build directory, used mostly for finding DB upgrade scripts --ZM_PATH_BUILD=@PATH_BUILD@ -+# Path to installed data directory, used mostly for finding DB upgrade scripts -+ZM_PATH_DATA=@PKGDATADIR@ - - # Build time, used to record when to trigger various checks - ZM_TIME_BUILD=@TIME_BUILD@ diff --git a/distros/redhat/archive/zoneminder-1.26.0-defaults.patch b/distros/redhat/archive/zoneminder-1.26.0-defaults.patch deleted file mode 100644 index 3e5dda67c..000000000 --- a/distros/redhat/archive/zoneminder-1.26.0-defaults.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- configure.ac 2013-08-15 11:44:10.000000000 -0500 -+++ configure.ac.logdir 2013-08-17 09:20:07.326053328 -0500 -@@ -46,7 +46,7 @@ - AC_SUBST(ZM_TMPDIR,[/tmp/zm]) - fi - if test "$ZM_LOGDIR" == ""; then -- AC_SUBST(ZM_LOGDIR,[/var/log/zm]) -+ AC_SUBST(ZM_LOGDIR,[/var/log/zoneminder]) - fi - - LIB_ARCH=lib ---- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in 2013-08-01 18:14:45.175241378 -0500 -+++ scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in.defaults 2013-08-07 18:57:42.525006149 -0500 -@@ -187,7 +187,7 @@ - }, - { - name => "ZM_PATH_ZMS", -- default => "/cgi-bin/nph-zms", -+ default => "/cgi-bin/zm/nph-zms", - description => "Web path to zms streaming server", - help => "The ZoneMinder streaming server is required to send streamed images to your browser. It will be installed into the cgi-bin path given at configuration time. This option determines what the web path to the server is rather than the local path on your machine. Ordinarily the streaming server runs in parser-header mode however if you experience problems with streaming you can change this to non-parsed-header (nph) mode by changing 'zms' to 'nph-zms'.", - type => $types{rel_path}, -@@ -276,7 +276,7 @@ - }, - { - name => "ZM_OPT_CAMBOZOLA", -- default => "no", -+ default => "yes", - description => "Is the (optional) cambozola java streaming client installed", - help => "Cambozola is a handy low fat cheese flavoured Java applet that ZoneMinder uses to view image streams on browsers such as Internet Explorer that don't natively support this format. If you use this browser it is highly recommended to install this from http://www.charliemouse.com/code/cambozola/ however if it is not installed still images at a lower refresh rate can still be viewed.", - type => $types{boolean}, -@@ -526,7 +526,7 @@ - }, - { - name => "ZM_LOG_DEBUG_FILE", -- default => "@ZM_TMPDIR@/zm_debug.log+", -+ default => "/var/log/zoneminder/zm_debug_log+", - description => "Where extra debug is output to", - help => "This option allows you to specify a different target for debug output. All components have a default log file which will norally be in /tmp or /var/log and this is where debug will be written to if this value is empty. Adding a path here will temporarily redirect debug, and other logging output, to this file. This option is a simple filename and you are debugging several components then they will all try and write to the same file with undesirable consequences. Appending a '+' to the filename will cause the file to be created with a '.' suffix containing your process id. In this way debug from each run of a component is kept separate. This is the recommended setting as it will also prevent subsequent runs from overwriting the same log. You should ensure that permissions are set up to allow writing to the file and directory specified here.", - requires => [ { name => "ZM_LOG_DEBUG", value => "yes" } ], -@@ -623,7 +623,7 @@ - }, - { - name => "ZM_PATH_SOCKS", -- default => "@ZM_TMPDIR@", -+ default => "/var/lib/zoneminder/sock", - description => "Path to the various Unix domain socket files that ZoneMinder uses", - help => "ZoneMinder generally uses Unix domain sockets where possible. This reduces the need for port assignments and prevents external applications from possibly compromising the daemons. However each Unix socket requires a .sock file to be created. This option indicates where those socket files go.", - type => $types{abs_path}, -@@ -639,7 +639,7 @@ - }, - { - name => "ZM_PATH_SWAP", -- default => "@ZM_TMPDIR@", -+ default => "/dev/shm", - description => "Path to location for temporary swap images used in streaming", - help => "Buffered playback requires temporary swap images to be stored for each instance of the streaming daemons. This option determines where these images will be stored. The images will actually be stored in sub directories beneath this location and will be automatically cleaned up after a period of time.", - type => $types{abs_path}, -@@ -902,7 +902,7 @@ - }, - { - name => "ZM_UPLOAD_FTP_LOC_DIR", -- default => "@ZM_TMPDIR@", -+ default => "/var/spool/zoneminder-upload", - description => "The local directory in which to create upload files", - help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the local directory that ZoneMinder should use for temporary upload files. These are files that are created from events, uploaded and then deleted.", - requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ], -@@ -1258,7 +1258,7 @@ - }, - { - name => "ZM_OPT_CONTROL", -- default => "no", -+ default => "yes", - description => "Support controllable (e.g. PTZ) cameras", - help => "ZoneMinder includes limited support for controllable cameras. A number of sample protocols are included and others can easily be added. If you wish to control your cameras via ZoneMinder then select this option otherwise if you only have static cameras or use other control methods then leave this option off.", - type => $types{boolean}, diff --git a/distros/redhat/archive/zoneminder-1.28.0-defaults.patch b/distros/redhat/archive/zoneminder-1.28.0-defaults.patch deleted file mode 100644 index 30d4d87e4..000000000 --- a/distros/redhat/archive/zoneminder-1.28.0-defaults.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in 2013-08-01 18:14:45.175241378 -0500 -+++ scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in.defaults 2013-08-07 18:57:42.525006149 -0500 -@@ -187,7 +187,7 @@ - }, - { - name => "ZM_PATH_ZMS", -- default => "/cgi-bin/nph-zms", -+ default => "/cgi-bin/zm/nph-zms", - description => "Web path to zms streaming server", - help => "The ZoneMinder streaming server is required to send streamed images to your browser. It will be installed into the cgi-bin path given at configuration time. This option determines what the web path to the server is rather than the local path on your machine. Ordinarily the streaming server runs in parser-header mode however if you experience problems with streaming you can change this to non-parsed-header (nph) mode by changing 'zms' to 'nph-zms'.", - type => $types{rel_path}, -@@ -276,7 +276,7 @@ - }, - { - name => "ZM_OPT_CAMBOZOLA", -- default => "no", -+ default => "yes", - description => "Is the (optional) cambozola java streaming client installed", - help => "Cambozola is a handy low fat cheese flavoured Java applet that ZoneMinder uses to view image streams on browsers such as Internet Explorer that don't natively support this format. If you use this browser it is highly recommended to install this from http://www.charliemouse.com/code/cambozola/ however if it is not installed still images at a lower refresh rate can still be viewed.", - type => $types{boolean}, -@@ -639,7 +639,7 @@ - }, - { - name => "ZM_PATH_SWAP", -- default => "@ZM_TMPDIR@", -+ default => "/dev/shm", - description => "Path to location for temporary swap images used in streaming", - help => "Buffered playback requires temporary swap images to be stored for each instance of the streaming daemons. This option determines where these images will be stored. The images will actually be stored in sub directories beneath this location and will be automatically cleaned up after a period of time.", - type => $types{abs_path}, -@@ -902,7 +902,7 @@ - }, - { - name => "ZM_UPLOAD_FTP_LOC_DIR", -- default => "@ZM_TMPDIR@", -+ default => "/var/spool/zoneminder-upload", - description => "The local directory in which to create upload files", - help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the local directory that ZoneMinder should use for temporary upload files. These are files that are created from events, uploaded and then deleted.", - requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ], -@@ -1258,7 +1258,7 @@ - }, - { - name => "ZM_OPT_CONTROL", -- default => "no", -+ default => "yes", - description => "Support controllable (e.g. PTZ) cameras", - help => "ZoneMinder includes limited support for controllable cameras. A number of sample protocols are included and others can easily be added. If you wish to control your cameras via ZoneMinder then select this option otherwise if you only have static cameras or use other control methods then leave this option off.", - type => $types{boolean}, diff --git a/distros/redhat/archive/zoneminder-runlevel.patch b/distros/redhat/archive/zoneminder-runlevel.patch deleted file mode 100644 index de7b49b0b..000000000 --- a/distros/redhat/archive/zoneminder-runlevel.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ./scripts/zm.in.runlevel ./scripts/zm.in ---- ./scripts/zm.in.runlevel 2010-11-28 15:22:05.000000000 -0600 -+++ ./scripts/zm.in 2011-03-24 21:39:01.973010160 -0500 -@@ -1,6 +1,6 @@ - #!/bin/sh - # description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008 --# chkconfig: 2345 99 00 -+# chkconfig: - 99 00 - # processname: zmpkg.pl - - # Source function library. diff --git a/distros/redhat/archive/zoneminder.el6.spec b/distros/redhat/archive/zoneminder.el6.spec deleted file mode 100644 index 46bce099a..000000000 --- a/distros/redhat/archive/zoneminder.el6.spec +++ /dev/null @@ -1,434 +0,0 @@ -%define cambrev 0.931 -%define moorev 1.3.2 -%define jscrev 1.0 - -%define zmuid $(id -un) -%define zmgid $(id -gn) -%define zmuid_final apache -%define zmgid_final apache - -Name: zoneminder -Version: 1.27 -Release: 1%{?dist} -Summary: A camera monitoring and analysis tool -Group: System Environment/Daemons -# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/ -# Mootools is inder the MIT license: http://mootools.net/ -# Cambozola is GPL: http://www.charliemouse.com/code/cambozola/ -License: GPLv2+ and LGPLv2+ and MIT -URL: http://www.zoneminder.com/ - -#Source0: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz -Source0: ZoneMinder-%{version}.tar.gz -Source1: jscalendar-%{jscrev}.zip -#Source1: http://downloads.sourceforge.net/jscalendar/jscalendar-%{jscrev}.zip - -# Mootools is currently bundled in the zoneminder tarball -#Source2: mootools-core-%{moorev}-full-compat-yc.js -#Source2: http://mootools.net/download/get/mootools-core-%{moorev}-full-compat-yc.js - -Source3: cambozola-%{cambrev}.tar.gz -#Source3: http://www.andywilcock.com/code/cambozola/cambozola-%{cambrev}.tar.gz - -#Patch1: zoneminder-1.26.4-dbinstall.patch -Patch2: zoneminder-runlevel.patch -#Patch3: zoneminder-1.25.0-installfix.patch -Patch4: zoneminder-1.26.0-defaults.patch - -# BuildRoot is depreciated and ignored in EPEL6 -#BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: automake gnutls-devel bzip2-devel libtool -BuildRequires: mysql-devel pcre-devel libjpeg-turbo-devel -BuildRequires: perl(Archive::Tar) perl(Archive::Zip) -BuildRequires: perl(Date::Manip) perl(DBD::mysql) -BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent) -BuildRequires: perl(MIME::Entity) perl(MIME::Lite) -BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap) -BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign) -BuildRequires: perl(Expect) perl(X10::ActiveHome) perl(Astro::SunTime) -BuildRequires: libcurl-devel vlc-devel polkit-devel ffmpeg-devel >= 0.4.9 - -Requires: httpd php php-mysql mysql-server libjpeg-turbo polkit -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) -Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP) -Requires: libcurl vlc-core ffmpeg >= 0.4.9 - -Requires(post): /sbin/chkconfig -Requires(post): /usr/bin/checkmodule -Requires(post): /usr/bin/semodule_package -Requires(post): /usr/sbin/semodule -Requires(post): /usr/bin/gpasswd -Requires(post): /usr/bin/less -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -Requires(preun): /usr/sbin/semodule -Requires(postun): /sbin/service - - -%description -ZoneMinder is a set of applications which is intended to provide a complete -solution allowing you to capture, analyse, record and monitor any cameras you -have attached to a Linux based machine. It is designed to run on kernels which -support the Video For Linux (V4L) interface and has been tested with cameras -attached to BTTV cards, various USB cameras and IP network cameras. It is -designed to support as many cameras as you can attach to your computer without -too much degradation of performance. - - -%prep -%setup -q -n ZoneMinder-%{version} - -# Unpack jscalendar and move some files around -%setup -q -D -T -a 1 -n ZoneMinder-%{version} -mkdir jscalendar-doc -pushd jscalendar-%{jscrev} -mv *html *php doc/* README ../jscalendar-doc -rmdir doc -popd - -# Unpack Cambozola and move some files around -%setup -q -D -T -a 3 -n ZoneMinder-%{version} -mkdir cambozola-doc -pushd cambozola-%{cambrev} -mv application.properties build.xml dist.sh *html LICENSE testPages/* ../cambozola-doc -rmdir testPages -popd - -#%patch1 -p0 -b .dbinstall -%patch2 -p0 -b .runlevel -#%patch3 -p0 -b .installfix -%patch4 -p0 - -%build -libtoolize --force -aclocal -autoheader -automake --force-missing --add-missing -autoconf - -OPTS="" -%ifnarch %{ix86} x86_64 - OPTS="$OPTS --disable-crashtrace" -%endif - -%configure \ - --with-libarch=%{_lib} \ -%ifarch %{ix86} %{x8664} - --enable-crashtrace \ -%else - --disable-crashtrace \ -%endif - --with-mysql=%{_prefix} \ - --with-ffmpeg=%{_prefix} \ - --with-webdir=%{_datadir}/%{name}/www \ - --with-cgidir=%{_libexecdir}/%{name}/cgi-bin \ - --with-webuser=%{zmuid} \ - --with-webgroup=%{zmgid} \ - --enable-mmap=yes \ - --disable-debug \ - --with-webhost=zm.local \ - ZM_SSL_LIB="gnutls" \ - ZM_RUNDIR=/var/run/zoneminder \ - ZM_TMPDIR=/var/lib/zoneminder/temp \ -%ifarch x86_64 - CXXFLAGS="-D__STDC_CONSTANT_MACROS -msse2" \ -%else - CXXFLAGS="-D__STDC_CONSTANT_MACROS" \ -%endif - --with-extralibs="" - -make %{?_smp_mflags} -%{__perl} -pi -e 's/(ZM_WEB_USER=).*$/${1}%{zmuid_final}/;' \ - -e 's/(ZM_WEB_GROUP=).*$/${1}%{zmgid_final}/;' zm.conf - -%install -install -d %{buildroot}/%{_localstatedir}/run -install -d %{buildroot}/etc/logrotate.d - -make install DESTDIR=%{buildroot} \ - INSTALLDIRS=vendor - -rm -rf %{buildroot}/%{perl_vendorarch} %{buildroot}/%{perl_archlib} - -install -m 755 -d %{buildroot}/%{_localstatedir}/log/zoneminder -for dir in events images temp -do - install -m 755 -d %{buildroot}/%{_localstatedir}/lib/zoneminder/$dir - if [ -d %{buildroot}/%{_datadir}/zoneminder/www/$dir ]; then - rmdir %{buildroot}/%{_datadir}/%{name}/www/$dir - fi - ln -sf ../../../..%{_localstatedir}/lib/zoneminder/$dir %{buildroot}/%{_datadir}/%{name}/www/$dir -done -install -m 755 -d %{buildroot}/%{_localstatedir}/lib/zoneminder/sock -install -m 755 -d %{buildroot}/%{_localstatedir}/lib/zoneminder/swap -install -m 755 -d %{buildroot}/%{_localstatedir}/spool/zoneminder-upload - -install -D -m 755 scripts/zm %{buildroot}/%{_initrddir}/zoneminder -install -D -m 644 distros/redhat/zoneminder.conf %{buildroot}/%{_sysconfdir}/httpd/conf.d/zoneminder.conf -install -D -m 755 distros/redhat/redalert.wav %{buildroot}/%{_datadir}/%{name}/www/sounds/redalert.wav -install distros/redhat/zm-logrotate_d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} - -# Install jscalendar -install -d -m 755 %{buildroot}/%{_datadir}/%{name}/www/jscalendar -cp -rp jscalendar-%{jscrev}/* %{buildroot}/%{_datadir}/%{name}/www/jscalendar - -# Install Cambozola -cp -rp cambozola-%{cambrev}/dist/cambozola.jar %{buildroot}/%{_datadir}/%{name}/www/ -rm -rf cambozola-%{cambrev} - -# Install mootools -pushd %{buildroot}/%{_datadir}/%{name}/www -#install -m 644 %{Source2} mootools-core-%{moorev}-full-compat-yc.js -#ln -s mootools-core-%{moorev}-full-compat-yc.js mootools.js -ln -f -s tools/mootools/mootools-core-%{moorev}-yc.js mootools-core.js -ln -f -s tools/mootools/mootools-more-%{moorev}.1-yc.js mootools-more.js -popd - -%post -/sbin/chkconfig --add zoneminder -/sbin/chkconfig zoneminder on - -# Allow zoneminder access to local video sources, serial ports, and x10 -echo -/usr/bin/gpasswd -a %{zmuid_final} video -/usr/bin/gpasswd -a %{zmuid_final} dialout - -# Create and load zoneminder selinux policy module -echo -e "\nCreating and installing a ZoneMinder SELinux policy module. Please wait.\n" -/usr/bin/checkmodule -M -m -o %{_docdir}/%{name}-%{version}/local_zoneminder.mod %{_docdir}/%{name}-%{version}/local_zoneminder.te > /dev/null -/usr/bin/semodule_package -o %{_docdir}/%{name}-%{version}/local_zoneminder.pp -m %{_docdir}/%{name}-%{version}/local_zoneminder.mod > /dev/null -/usr/sbin/semodule -i %{_docdir}/%{name}-%{version}/local_zoneminder.pp > /dev/null - -# Display the README for post installation instructions -/usr/bin/less %{_docdir}/%{name}-%{version}/README.CentOS - -%preun -if [ $1 -eq 0 ]; then - /sbin/service zoneminder stop > /dev/null 2>&1 || : - /sbin/chkconfig --del zoneminder - echo -e "\nRemoving ZoneMinder SELinux policy module. Please wait.\n" - /usr/sbin/semodule -r local_zoneminder.pp -fi - - -%postun -if [ $1 -ge 1 ]; then - /sbin/service zoneminder condrestart > /dev/null 2>&1 || : -fi - - -%files -%defattr(-,root,root,-) -%doc AUTHORS BUGS ChangeLog COPYING LICENSE NEWS README.md distros/redhat/README.CentOS jscalendar-doc cambozola-doc distros/redhat/local_zoneminder.te -%config %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm.conf -%config(noreplace) %attr(644,root,root) %{_sysconfdir}/httpd/conf.d/zoneminder.conf -%config(noreplace) /etc/logrotate.d/%{name} -%attr(755,root,root) %{_initrddir}/zoneminder - -%{_bindir}/zma -%{_bindir}/zmaudit.pl -%{_bindir}/zmc -%{_bindir}/zmcontrol.pl -%{_bindir}/zmdc.pl -%{_bindir}/zmf -%{_bindir}/zmfilter.pl -# zmfix removed from zoneminder 1.26.6 -#%attr(4755,root,root) %{_bindir}/zmfix -%{_bindir}/zmpkg.pl -%{_bindir}/zmtrack.pl -%{_bindir}/zmtrigger.pl -%{_bindir}/zmu -%{_bindir}/zmupdate.pl -%{_bindir}/zmvideo.pl -%{_bindir}/zmwatch.pl -%{_bindir}/zmcamtool.pl -%{_bindir}/zmsystemctl.pl -%{_bindir}/zmx10.pl -%{_bindir}/zmonvif-probe.pl - -%{perl_vendorlib}/ZoneMinder* -%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ZoneMinder* -#%{perl_vendorlib}/ONVIF* -#%{perl_vendorlib}/WSDiscovery* -#%{perl_vendorlib}/WSSecurity* -#%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ONVIF* -%{_mandir}/man*/* -%dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/cgi-bin -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/db -%{_datadir}/%{name}/www - -%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy -%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules - -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/events -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/images -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/sock -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/swap -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/temp -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload - - -%changelog -* Sun Aug 03 2014 Andrew Bauer - 1.27 -- Include ONVIF support files - -* Fri Mar 14 2014 Andrew Bauer - 1.27 -- Tweak build requirements for cmake - -* Sat Feb 01 2014 Andrew Bauer - 1.27 -- Add zmcamtool.pl. Bump version for 1.27 release. - -* Mon Dec 16 2013 Andrew Bauer - 1.26.5 -- This is a bug fixe release -- RTSP fixes, cmake enhancements, couple other misc fixes - -* Sun Oct 06 2013 Andrew Bauer - 1.26.4 -- All files are now part of the zoneminder source tree. Update specfile accordingly. - -* Thu Sep 05 2013 Andrew Bauer - 1.26.0 -- 1.26.0 Release -- https://github.com/ZoneMinder/ZoneMinder/archive/v1.26.0.tar.gz - -* Sun Sep 01 2013 Andrew Bauer - 1.26.0-beta -- Update SELinux policy module - -* Thu Aug 29 2013 Andrew Bauer - 1.26.0-beta -- Third Beta release -- https://github.com/ZoneMinder/ZoneMinder/tree/release-1.26 -- Reduce number of uneeded dependencies by integrating cambozola into spec file - -* Thu Aug 15 2013 Andrew Bauer - 1.26.0-beta -- Initial Beta release -- https://github.com/ZoneMinder/ZoneMinder/tree/release-1.26 - -* Sun Aug 11 2013 Andrew Bauer - 1.25.0-kfirproper -- Modified specfile to work with kfir-proper branch -- https://github.com/ZoneMinder/ZoneMinder/tree/kfir-proper - -* Wed Aug 07 2013 Andrew Bauer - 1.25.0-2svn3827 -- Move RHEL/CentOS specific defaults to a patch file -- Add bzip2-devel as a build dependency -- Default ZM_SSL_LIB back to gnutls. AUTH_RELAY = hashed didn't work with openssl. - -* Fri Aug 02 2013 Andrew Bauer - 1.25.0-1svn3827 -- Update to latest 1.25.0 subversion. -- Does not compile with modern versions of ffmpeg. Configure to work only with older versions. -- Does not compile with gcc 4.7. Configure to build with gcc less than 4.7. - -* Thu Mar 24 2011 Jason L Tibbitts III - 1.24.3-4.20110324svn3310 -- Update to latest 1.24.3 subversion. Turns out that what upstream was calling - 1.24.3 is really just an occasionally updated devel snapshot. -- Rebase various patches. - -* Wed Mar 23 2011 Dan Horák - 1.24.3-3 -- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) - -* Tue Feb 08 2011 Fedora Release Engineering - 1.24.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 25 2011 Jason L Tibbitts III - 1.24.3-1 -- Update to latest upstream version. -- Rebase patches. -- Initial incomplete attempt to disable v4l1 support. - -* Fri Jan 21 2011 Jason L Tibbitts III - 1.24.2-6 -- Unbundle cambozola; instead link to the separately pacakged copy. -- Remove BuildRoot:, %%clean and buildroot cleaning in %%install. -- Git rid of mixed space/tab usage by removing all tabs. -- Remove unnecessary Conflicts: line. -- Attempt to force short_open_tag on for the code directories. -- Move default location of sockets, swaps, logfiles and some temporary files to - make more sense and allow things to work better with a future selinux policy. -- Fix errors in README.CentOS. - -* Wed Jun 02 2010 Marcela Maslanova - 1.24.2-5 -- Mass rebuild with perl-5.12.0 - -* Fri Dec 4 2009 Stepan Kasal - 1.24.2-4 -- rebuild against perl 5.10.1 -- use Perl vendorarch and archlib variables correctly - -* Mon Jul 27 2009 Fedora Release Engineering - 1.24.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-2 -- Bump release since 1.24.2-1 was mistakenly tagged a few months ago. - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-1 -- Initial update to 1.24.2. -- Rebase patches. -- Update mootools download location. -- Update to mootools 1.2.3. -- Add additional dependencies for some optional features. - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-3 -- Remove unused Sys::Mmap perl dependency RPM is finding - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-2 -- Update gcc44 patch to disable -frepo, seems to be broken with gcc44 -- Added noffmpeg patch to make building outside mock easier - -* Sat Mar 21 2009 Martin Ebourne - 1.24.1-1 -- Patch for gcc 4.4 compilation errors -- Upgrade to 1.24.1 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.23.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Jan 24 2009 Caolán McNamara - 1.23.3-3 -- rebuild for dependencies - -* Mon Dec 15 2008 Martin Ebourne - 1.23.3-2 -- Fix permissions on zm.conf - -* Fri Jul 11 2008 Jason L Tibbitts III - 1.23.3-1 -- Initial attempt at packaging 1.23. - -* Tue Jul 1 2008 Martin Ebourne - 1.22.3-15 -- Add perl module compat dependency, bz #453590 - -* Tue May 6 2008 Martin Ebourne - 1.22.3-14 -- Remove default runlevel, bz #441315 - -* Mon Apr 28 2008 Jason L Tibbitts III - 1.22.3-13 -- Backport patch for CVE-2008-1381 from 1.23.3 to 1.22.3. - -* Tue Feb 19 2008 Fedora Release Engineering - 1.22.3-12 -- Autorebuild for GCC 4.3 - -* Thu Jan 3 2008 Martin Ebourne - 1.22.3-11 -- Fix compilation on gcc 4.3 - -* Thu Dec 6 2007 Martin Ebourne - 1.22.3-10 -- Rebuild for new openssl - -* Thu Aug 2 2007 Martin Ebourne - 1.22.3-8 -- Fix licence tag - -* Thu Jul 12 2007 Martin Ebourne - 1.22.3-7 -- Fixes from testing by Jitz including missing dependencies and database creation - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-6 -- Disable crashtrace on ppc - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-5 -- Fix uid for directories in /var/lib/zoneminder - -* Tue Jun 26 2007 Martin Ebourne - 1.22.3-4 -- Added perl Archive::Tar dependency -- Disabled web interface due to lack of access control on the event images - -* Sun Jun 10 2007 Martin Ebourne - 1.22.3-3 -- Changes recommended in review by Jason Tibbitts - -* Mon Apr 2 2007 Martin Ebourne - 1.22.3-2 -- Standardised on package name of zoneminder - -* Thu Dec 28 2006 Martin Ebourne - 1.22.3-1 -- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin diff --git a/distros/redhat/jscalendar-1.0.zip b/distros/redhat/misc/jscalendar-1.0.zip similarity index 100% rename from distros/redhat/jscalendar-1.0.zip rename to distros/redhat/misc/jscalendar-1.0.zip diff --git a/distros/redhat/jscalendar.sh b/distros/redhat/misc/jscalendar.sh similarity index 77% rename from distros/redhat/jscalendar.sh rename to distros/redhat/misc/jscalendar.sh index 80acaafec..068e47bf9 100755 --- a/distros/redhat/jscalendar.sh +++ b/distros/redhat/misc/jscalendar.sh @@ -1,6 +1,6 @@ #!/bin/bash -unzip -o jscalendar-1.0.zip +unzip -o misc/jscalendar-1.0.zip mkdir -v jscalendar-doc cd jscalendar-1.0 mv -v *html *php doc/* README ../jscalendar-doc diff --git a/distros/redhat/local_zoneminder.te b/distros/redhat/misc/local_zoneminder.te similarity index 100% rename from distros/redhat/local_zoneminder.te rename to distros/redhat/misc/local_zoneminder.te diff --git a/distros/redhat/redalert.wav b/distros/redhat/misc/redalert.wav similarity index 100% rename from distros/redhat/redalert.wav rename to distros/redhat/misc/redalert.wav diff --git a/distros/fedora/nginx/README.Fedora b/distros/redhat/nginx/README.Fedora similarity index 99% rename from distros/fedora/nginx/README.Fedora rename to distros/redhat/nginx/README.Fedora index 40b8b875d..2ae3c2dcb 100644 --- a/distros/fedora/nginx/README.Fedora +++ b/distros/redhat/nginx/README.Fedora @@ -30,7 +30,7 @@ New installs Mysql server, you need to ensure that the server is configured to start during boot and properly secured by running: - sudo yum install mariadb-server + sudo dnf install mariadb-server sudo systemctl enable mariadb sudo systemctl start mariadb.service mysql_secure_installation diff --git a/distros/fedora/nginx/zoneminder.conf.in b/distros/redhat/nginx/zoneminder.conf.in similarity index 100% rename from distros/fedora/nginx/zoneminder.conf.in rename to distros/redhat/nginx/zoneminder.conf.in diff --git a/distros/fedora/nginx/zoneminder.php-fpm.conf.in b/distros/redhat/nginx/zoneminder.php-fpm.conf.in similarity index 100% rename from distros/fedora/nginx/zoneminder.php-fpm.conf.in rename to distros/redhat/nginx/zoneminder.php-fpm.conf.in diff --git a/distros/fedora/nginx/zoneminder.service.in b/distros/redhat/nginx/zoneminder.service.in similarity index 100% rename from distros/fedora/nginx/zoneminder.service.in rename to distros/redhat/nginx/zoneminder.service.in diff --git a/distros/redhat/nginx/zoneminder.tmpfiles.in b/distros/redhat/nginx/zoneminder.tmpfiles.in new file mode 100644 index 000000000..d92ceaafd --- /dev/null +++ b/distros/redhat/nginx/zoneminder.tmpfiles.in @@ -0,0 +1,6 @@ +D @ZM_RUNDIR@ 0755 @WEB_USER@ @WEB_GROUP@ +D @ZM_TMPDIR@ 0755 @WEB_USER@ @WEB_GROUP@ +D @ZM_SOCKDIR@ 0755 @WEB_USER@ @WEB_GROUP@ +D /var/lib/php/session 770 root @WEB_GROUP@ +D /var/lib/php/wsdlcache 770 root @WEB_GROUP@ + diff --git a/distros/fedora/README.Fedora b/distros/redhat/readme/README.Fedora similarity index 94% rename from distros/fedora/README.Fedora rename to distros/redhat/readme/README.Fedora index 72f2554ba..6e169a039 100644 --- a/distros/fedora/README.Fedora +++ b/distros/redhat/readme/README.Fedora @@ -22,12 +22,10 @@ What's New New installs ============ -1. This package supports either community-mysql-server or mariadb-server with - mariadb being the preferred choice. Unless you are already using MariaDB or - Mysql server, you need to ensure that the server is configured to start - during boot and properly secured by running: +1. Unless you are already using MariaDB server, you need to ensure that the + server is configured to start during boot and properly secured by running: - sudo yum install mariadb-server + sudo dnf install mariadb-server sudo systemctl enable mariadb sudo systemctl start mariadb.service mysql_secure_installation @@ -82,7 +80,7 @@ New installs signed certificate on your system. The recommended way to complete this step is to simply install mod_ssl: - sudo yum install mod_ssl + sudo dnf install mod_ssl If this does not meet your needs, then read README.https to learn about alternatives. When in doubt, install mod_ssl. diff --git a/distros/redhat/README.CentOS b/distros/redhat/readme/README.Redhat6 similarity index 73% rename from distros/redhat/README.CentOS rename to distros/redhat/readme/README.Redhat6 index f9c7ea1fb..2026b94cb 100644 --- a/distros/redhat/README.CentOS +++ b/distros/redhat/readme/README.Redhat6 @@ -1,15 +1,37 @@ What's New ========== -1. Due to the active state of the ZoneMinder project, we now recommend granting +1. ***EOL NOTICE*** + It has become increasingly difficult to maintain the ZoneMinder project such + that it remains compatible with EL6 distros. The version of php shipped with + EL6 distros and the version of ffmpeg which will build against EL6 are too + old. It is with regret that I must announce our plans to stop supporting + ZoneMinder on EL6 distros soon. Your best option is to upgrade to an EL7 + distro or another distro with newer php & ffmpeg packages. Please note that + replacing core packages, such as php, will not be supported by us. You are + on your own should you choose to go down that path. + +2. The Apache ScriptAlias has been changed from "/cgi-bin/zm/zms" to + "/cgi-bin-zm/zms". This has been to done match the configuration of + CentOS7/Fedora and simplify the build process. + + IMPORTANT: You must manually verify the value of PATH_ZMS under Options. + Make sure it is set to "/cgi-bin-zm/nph-zms". Failure to do so will result + in a broken system. You have been warned. + +3. The ZoneMinder configuration file, zm.conf, has been moved to /etc/zm/. + This has been to done match the configuration of CentOS7/Fedora and + simplify the build process. + +4. Due to the active state of the ZoneMinder project, we now recommend granting ALL permission to the ZoneMinder mysql account. This change must be done manually before ZoneMinder will run. See the installation steps below. -2. This package uses the HTTPS protocol by default to access the web portal. +5. This package uses the HTTPS protocol by default to access the web portal. Requests using HTTP will auto-redirect to HTTPS. See README.https for more information. -3. The php package that ships with CentOS 6 does not support the new ZoneMinder +6. The php package that ships with CentOS 6 does not support the new ZoneMinder API. If you require API functionality (such as using a mobile app) then you should consider an upgrade to CentOS 7 or use Fedora. @@ -20,6 +42,7 @@ New installs the server is confired to start during boot and properly secured by running: + sudo yum install mysql-server sudo service mysqld start /usr/bin/mysql_secure_installation sudo chkconfig mysqld on @@ -37,7 +60,7 @@ New installs anything that suits your environment. 3. If you have chosen to change the zoneminder mysql credentials to something - other than zmuser/zmpass then you must now edit /etc/zm.conf. Change + other than zmuser/zmpass then you must now edit /etc/zm/zm.conf. Change ZM_DB_USER and ZM_DB_PASS to the values you created in the previous step. 4. Edit /etc/php.ini, uncomment the date.timezone line, and add your local @@ -87,16 +110,16 @@ New installs Upgrades ======== -1. Verify /etc/zm.conf. +1. Verify /etc/zm/zm.conf. If zm.conf was manually edited before running the upgrade, the installation may not overwrite it. In this case, it will create the file - /etc/zm.conf.rpmnew. + /etc/zm/zm.conf.rpmnew. For example, this will happen if you are using database account credentials other than zmuser/zmpass. - Compare /etc/zm.conf to /etc/zm.conf.rpmnew. Verify that zm.conf + Compare /etc/zm/zm.conf to /etc/zm/zm.conf.rpmnew. Verify that zm.conf contains any new config settings that may be in zm.conf.rpmnew. 2. Verify permissions of the zmuser account. diff --git a/distros/redhat/README.Centos7 b/distros/redhat/readme/README.Redhat7 similarity index 96% rename from distros/redhat/README.Centos7 rename to distros/redhat/readme/README.Redhat7 index 1cd26a1af..540b1cb8a 100644 --- a/distros/redhat/README.Centos7 +++ b/distros/redhat/readme/README.Redhat7 @@ -22,13 +22,13 @@ What's New New installs ============ -1. Unless you are already using MariaDB server, you need to ensure that - the server is configured to start during boot and properly secured - by running: +1. Unless you are already using MariaDB server, you need to ensure that the + server is configured to start during boot and properly secured by running: + sudo dnf install mariadb-server sudo systemctl enable mariadb - sudo systemctl start mariadb - sudo mysql_secure_installation + sudo systemctl start mariadb.service + mysql_secure_installation 2. Using the password for the root account set during the previous step, you will need to create the ZoneMinder database and configure a database diff --git a/distros/redhat/README.https b/distros/redhat/readme/README.https similarity index 100% rename from distros/redhat/README.https rename to distros/redhat/readme/README.https diff --git a/distros/redhat/zoneminder.el7.conf.in b/distros/redhat/systemd/zoneminder.conf.in similarity index 100% rename from distros/redhat/zoneminder.el7.conf.in rename to distros/redhat/systemd/zoneminder.conf.in diff --git a/distros/redhat/zoneminder.el7.logrotate.in b/distros/redhat/systemd/zoneminder.logrotate.in similarity index 100% rename from distros/redhat/zoneminder.el7.logrotate.in rename to distros/redhat/systemd/zoneminder.logrotate.in diff --git a/distros/redhat/zoneminder.service.in b/distros/redhat/systemd/zoneminder.service.in similarity index 100% rename from distros/redhat/zoneminder.service.in rename to distros/redhat/systemd/zoneminder.service.in diff --git a/distros/redhat/zoneminder.tmpfiles.in b/distros/redhat/systemd/zoneminder.tmpfiles.in similarity index 100% rename from distros/redhat/zoneminder.tmpfiles.in rename to distros/redhat/systemd/zoneminder.tmpfiles.in diff --git a/distros/redhat/zoneminder.el6.conf.in b/distros/redhat/sysvinit/zoneminder.conf.in similarity index 100% rename from distros/redhat/zoneminder.el6.conf.in rename to distros/redhat/sysvinit/zoneminder.conf.in diff --git a/distros/redhat/zoneminder.sysvinit.in b/distros/redhat/sysvinit/zoneminder.in similarity index 100% rename from distros/redhat/zoneminder.sysvinit.in rename to distros/redhat/sysvinit/zoneminder.in diff --git a/distros/redhat/zoneminder.el6.logrotate.in b/distros/redhat/sysvinit/zoneminder.logrotate.in similarity index 100% rename from distros/redhat/zoneminder.el6.logrotate.in rename to distros/redhat/sysvinit/zoneminder.logrotate.in diff --git a/distros/redhat/zoneminder.el6.spec b/distros/redhat/zoneminder.el6.spec deleted file mode 100644 index 0b7770b50..000000000 --- a/distros/redhat/zoneminder.el6.spec +++ /dev/null @@ -1,363 +0,0 @@ -%define zmuid $(id -un) -%define zmgid $(id -gn) -%define zmuid_final apache -%define zmgid_final apache - -Name: zoneminder -Version: 1.30.0 -Release: 1%{?dist} -Summary: A camera monitoring and analysis tool -Group: System Environment/Daemons -# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/ -# Mootools is inder the MIT license: http://mootools.net/ -# Cambozola is GPL: http://www.charliemouse.com/code/cambozola/ -License: GPLv2+ and LGPLv2+ and MIT -URL: http://www.zoneminder.com/ - -#Source0: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz -Source0: ZoneMinder-%{version}.tar.gz - -BuildRequires: cmake gnutls-devel bzip2-devel -BuildRequires: mysql-devel pcre-devel libjpeg-turbo-devel -BuildRequires: perl(Archive::Tar) perl(Archive::Zip) -BuildRequires: perl(Date::Manip) perl(DBD::mysql) -BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent) -BuildRequires: perl(MIME::Entity) perl(MIME::Lite) -BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap) -BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign) -BuildRequires: perl(Expect) perl(X10::ActiveHome) perl(Astro::SunTime) -BuildRequires: libcurl-devel vlc-devel ffmpeg-devel polkit-devel -# cmake needs the following installed at build time due to the way it auto-detects certain parameters -BuildRequires: httpd ffmpeg - -Requires: httpd php php-gd php-mysql mysql-server libjpeg-turbo cambozola polkit net-tools -Requires: psmisc perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) -Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP) -Requires: libcurl vlc-core ffmpeg - -Requires(post): /sbin/chkconfig -Requires(post): /usr/bin/checkmodule -Requires(post): /usr/bin/semodule_package -Requires(post): /usr/sbin/semodule -Requires(post): /usr/bin/gpasswd -Requires(post): /usr/bin/less -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -Requires(preun): /usr/sbin/semodule -Requires(postun): /sbin/service - - -%description -ZoneMinder is a set of applications which is intended to provide a complete -solution allowing you to capture, analyse, record and monitor any cameras you -have attached to a Linux based machine. It is designed to run on kernels which -support the Video For Linux (V4L) interface and has been tested with cameras -attached to BTTV cards, various USB cameras and IP network cameras. It is -designed to support as many cameras as you can attach to your computer without -too much degradation of performance. - - -%prep -%setup -q -n ZoneMinder-%{version} - -# Change the following default values -./utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin/zm/nph-zms -./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes -./utils/zmeditconfigdata.sh ZM_PATH_SWAP /dev/shm -./utils/zmeditconfigdata.sh ZM_UPLOAD_FTP_LOC_DIR /var/spool/zoneminder-upload -./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes -./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no -./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no -./utils/zmeditconfigdata.sh ZM_OPT_FAST_DELETE no - -%build -# Have to override CMAKE_INSTALL_LIBDIR for cmake < 2.8.7 due to this bug: -# https://bugzilla.redhat.com/show_bug.cgi?id=795542 -%cmake -DZM_TARGET_DISTRO="el6" -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} . - -make %{?_smp_mflags} - -%install -export DESTDIR=%{buildroot} -make install - -%post -/sbin/chkconfig --add zoneminder -/sbin/chkconfig zoneminder on - -# Allow zoneminder access to local video sources, serial ports, and x10 -echo -/usr/bin/gpasswd -a %{zmuid_final} video -/usr/bin/gpasswd -a %{zmuid_final} dialout - -# Create and load zoneminder selinux policy module -echo -e "\nCreating and installing a ZoneMinder SELinux policy module. Please wait.\n" -/usr/bin/checkmodule -M -m -o %{_docdir}/%{name}-%{version}/local_zoneminder.mod %{_docdir}/%{name}-%{version}/local_zoneminder.te > /dev/null -/usr/bin/semodule_package -o %{_docdir}/%{name}-%{version}/local_zoneminder.pp -m %{_docdir}/%{name}-%{version}/local_zoneminder.mod > /dev/null -/usr/sbin/semodule -i %{_docdir}/%{name}-%{version}/local_zoneminder.pp > /dev/null - -# Upgrade from a previous version of zoneminder -if [ $1 -eq 2 ] ; then - - # Add any new PTZ control configurations to the database (will not overwrite) - %{_bindir}/zmcamtool.pl --import >/dev/null 2>&1 || : - - # Freshen the database - %{_bindir}/zmupdate.pl -f >/dev/null 2>&1 || : - - # We can't run this automatically when new sql account permissions need to - # be manually added first - # Run zmupdate non-interactively - #/usr/bin/zmupdate.pl --nointeractive -fi - -# Warn the end user to read the README file -echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, read README.Centos to finish the\ninstallation or upgrade!\n" -echo -e "\nThe README file is located here: %{_docdir}/%{name}-%{version}.\n" - -%preun -if [ $1 -eq 0 ]; then - /sbin/service zoneminder stop > /dev/null 2>&1 || : - /sbin/chkconfig --del zoneminder - echo -e "\nRemoving ZoneMinder SELinux policy module. Please wait.\n" - /usr/sbin/semodule -r local_zoneminder.pp -fi - - -%postun -if [ $1 -ge 1 ]; then - /sbin/service zoneminder condrestart > /dev/null 2>&1 || : -fi - -# Remove the doc folder. -rm -rf %{_docdir}/%{name}-%{version} - -%files -%defattr(-,root,root,-) -%doc AUTHORS BUGS ChangeLog COPYING LICENSE NEWS README.md distros/redhat/README.CentOS distros/redhat/README.https distros/redhat/jscalendar-doc -%doc distros/redhat/local_zoneminder.te -%config %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm.conf -%config(noreplace) %attr(644,root,root) %{_sysconfdir}/httpd/conf.d/zoneminder.conf -%config(noreplace) /etc/logrotate.d/%{name} -%attr(755,root,root) %{_initrddir}/zoneminder - -%{_bindir}/zma -%{_bindir}/zmaudit.pl -%{_bindir}/zmc -%{_bindir}/zmcontrol.pl -%{_bindir}/zmdc.pl -%{_bindir}/zmf -%{_bindir}/zmfilter.pl -%{_bindir}/zmpkg.pl -%{_bindir}/zmtrack.pl -%{_bindir}/zmtrigger.pl -%{_bindir}/zmu -%{_bindir}/zmupdate.pl -%{_bindir}/zmvideo.pl -%{_bindir}/zmwatch.pl -%{_bindir}/zmcamtool.pl -%{_bindir}/zmsystemctl.pl -%{_bindir}/zmtelemetry.pl -%{_bindir}/zmx10.pl -%{_bindir}/zmonvif-probe.pl - -%{perl_vendorlib}/ZoneMinder* -%{perl_vendorarch}/auto/ZoneMinder/.packlist -%{perl_vendorarch}/auto/ONVIF/.packlist -%{perl_vendorlib}/ONVIF* -%{perl_vendorlib}/WSDiscovery* -%{perl_vendorlib}/WSSecurity* -%{perl_vendorlib}/WSNotification* -%{_mandir}/man*/* -%dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/cgi-bin -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/db -%{_datadir}/%{name}/www - -%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy -%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules - -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/events -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/images -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/sock -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/swap -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/temp -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload - -%changelog -* Thu Mar 3 2016 Andrew Bauer - 1.30.0 -- Bump version fo 1.30.0 release. - -* Tue Sep 8 2015 Andrew Bauer - 1.28.1 -- Require https, freshen dB on updates. - -* Wed Feb 18 2015 Andrew Bauer - 1.28.1 -- Include ONVIF support files - -* Sun Oct 5 2014 Andrew Bauer - 1.28.0 -- Bump version for 1.28.0 release. - -* Fri Mar 14 2014 Andrew Bauer - 1.27 -- Tweak build requirements for cmake - -* Sat Feb 01 2014 Andrew Bauer - 1.27 -- Add zmcamtool.pl. Bump version for 1.27 release. - -* Mon Dec 16 2013 Andrew Bauer - 1.26.5 -- This is a bug fixe release -- RTSP fixes, cmake enhancements, couple other misc fixes - -* Sat Oct 19 2013 Andrew Bauer - 1.26.4 -- Streamline the cmake build. Move much code into cmakelist.txt file. - -* Mon Oct 07 2013 Andrew Bauer - 1.26.4 -- Initial cmake build. - -* Sun Oct 06 2013 Andrew Bauer - 1.26.4 -- All files are now part of the zoneminder source tree. Update specfile accordingly. - -* Thu Sep 05 2013 Andrew Bauer - 1.26.0 -- 1.26.0 Release -- https://github.com/ZoneMinder/ZoneMinder/archive/v1.26.0.tar.gz - -* Sun Sep 01 2013 Andrew Bauer - 1.26.0-beta -- Update SELinux policy module - -* Thu Aug 29 2013 Andrew Bauer - 1.26.0-beta -- Third Beta release -- https://github.com/ZoneMinder/ZoneMinder/tree/release-1.26 -- Reduce number of uneeded dependencies by integrating cambozola into spec file - -* Thu Aug 15 2013 Andrew Bauer - 1.26.0-beta -- Initial Beta release -- https://github.com/ZoneMinder/ZoneMinder/tree/release-1.26 - -* Sun Aug 11 2013 Andrew Bauer - 1.25.0-kfirproper -- Modified specfile to work with kfir-proper branch -- https://github.com/ZoneMinder/ZoneMinder/tree/kfir-proper - -* Wed Aug 07 2013 Andrew Bauer - 1.25.0-2svn3827 -- Move RHEL/CentOS specific defaults to a patch file -- Add bzip2-devel as a build dependency -- Default ZM_SSL_LIB back to gnutls. AUTH_RELAY = hashed didn't work with openssl. - -* Fri Aug 02 2013 Andrew Bauer - 1.25.0-1svn3827 -- Update to latest 1.25.0 subversion. -- Does not compile with modern versions of ffmpeg. Configure to work only with older versions. -- Does not compile with gcc 4.7. Configure to build with gcc less than 4.7. - -* Thu Mar 24 2011 Jason L Tibbitts III - 1.24.3-4.20110324svn3310 -- Update to latest 1.24.3 subversion. Turns out that what upstream was calling - 1.24.3 is really just an occasionally updated devel snapshot. -- Rebase various patches. - -* Wed Mar 23 2011 Dan Horák - 1.24.3-3 -- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) - -* Tue Feb 08 2011 Fedora Release Engineering - 1.24.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 25 2011 Jason L Tibbitts III - 1.24.3-1 -- Update to latest upstream version. -- Rebase patches. -- Initial incomplete attempt to disable v4l1 support. - -* Fri Jan 21 2011 Jason L Tibbitts III - 1.24.2-6 -- Unbundle cambozola; instead link to the separately pacakged copy. -- Remove BuildRoot:, %%clean and buildroot cleaning in %%install. -- Git rid of mixed space/tab usage by removing all tabs. -- Remove unnecessary Conflicts: line. -- Attempt to force short_open_tag on for the code directories. -- Move default location of sockets, swaps, logfiles and some temporary files to - make more sense and allow things to work better with a future selinux policy. -- Fix errors in README.CentOS. - -* Wed Jun 02 2010 Marcela Maslanova - 1.24.2-5 -- Mass rebuild with perl-5.12.0 - -* Fri Dec 4 2009 Stepan Kasal - 1.24.2-4 -- rebuild against perl 5.10.1 -- use Perl vendorarch and archlib variables correctly - -* Mon Jul 27 2009 Fedora Release Engineering - 1.24.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-2 -- Bump release since 1.24.2-1 was mistakenly tagged a few months ago. - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-1 -- Initial update to 1.24.2. -- Rebase patches. -- Update mootools download location. -- Update to mootools 1.2.3. -- Add additional dependencies for some optional features. - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-3 -- Remove unused Sys::Mmap perl dependency RPM is finding - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-2 -- Update gcc44 patch to disable -frepo, seems to be broken with gcc44 -- Added noffmpeg patch to make building outside mock easier - -* Sat Mar 21 2009 Martin Ebourne - 1.24.1-1 -- Patch for gcc 4.4 compilation errors -- Upgrade to 1.24.1 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.23.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Jan 24 2009 Caolán McNamara - 1.23.3-3 -- rebuild for dependencies - -* Mon Dec 15 2008 Martin Ebourne - 1.23.3-2 -- Fix permissions on zm.conf - -* Fri Jul 11 2008 Jason L Tibbitts III - 1.23.3-1 -- Initial attempt at packaging 1.23. - -* Tue Jul 1 2008 Martin Ebourne - 1.22.3-15 -- Add perl module compat dependency, bz #453590 - -* Tue May 6 2008 Martin Ebourne - 1.22.3-14 -- Remove default runlevel, bz #441315 - -* Mon Apr 28 2008 Jason L Tibbitts III - 1.22.3-13 -- Backport patch for CVE-2008-1381 from 1.23.3 to 1.22.3. - -* Tue Feb 19 2008 Fedora Release Engineering - 1.22.3-12 -- Autorebuild for GCC 4.3 - -* Thu Jan 3 2008 Martin Ebourne - 1.22.3-11 -- Fix compilation on gcc 4.3 - -* Thu Dec 6 2007 Martin Ebourne - 1.22.3-10 -- Rebuild for new openssl - -* Thu Aug 2 2007 Martin Ebourne - 1.22.3-8 -- Fix licence tag - -* Thu Jul 12 2007 Martin Ebourne - 1.22.3-7 -- Fixes from testing by Jitz including missing dependencies and database creation - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-6 -- Disable crashtrace on ppc - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-5 -- Fix uid for directories in /var/lib/zoneminder - -* Tue Jun 26 2007 Martin Ebourne - 1.22.3-4 -- Added perl Archive::Tar dependency -- Disabled web interface due to lack of access control on the event images - -* Sun Jun 10 2007 Martin Ebourne - 1.22.3-3 -- Changes recommended in review by Jason Tibbitts - -* Mon Apr 2 2007 Martin Ebourne - 1.22.3-2 -- Standardised on package name of zoneminder - -* Thu Dec 28 2006 Martin Ebourne - 1.22.3-1 -- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin diff --git a/distros/redhat/zoneminder.el7.spec b/distros/redhat/zoneminder.el7.spec deleted file mode 100644 index 357ced2b3..000000000 --- a/distros/redhat/zoneminder.el7.spec +++ /dev/null @@ -1,427 +0,0 @@ -%define zmuid $(id -un) -%define zmgid $(id -gn) -%define zmuid_final apache -%define zmgid_final apache - -%global _hardened_build 1 - -Name: zoneminder -Version: 1.30.0 -Release: 1%{?dist} -Summary: A camera monitoring and analysis tool -Group: System Environment/Daemons -# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/ -# Mootools is inder the MIT license: http://mootools.net/ -License: GPLv2+ and LGPLv2+ and MIT -URL: http://www.zoneminder.com/ - -#Source: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz -Source: ZoneMinder-%{version}.tar.gz - -BuildRequires: cmake gnutls-devel systemd-units bzip2-devel -BuildRequires: mariadb-devel pcre-devel libjpeg-turbo-devel -BuildRequires: perl(Archive::Tar) perl(Archive::Zip) perl-podlators -BuildRequires: perl(Date::Manip) perl(DBD::mysql) -BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent) -BuildRequires: perl(MIME::Entity) perl(MIME::Lite) -BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap) -BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign) -BuildRequires: perl(Expect) perl(Sys::Syslog) -BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel -BuildRequires: ffmpeg ffmpeg-devel perl(X10::ActiveHome) perl(Astro::SunTime) -# cmake needs the following installed at build time due to the way it auto-detects certain parameters -BuildRequires: httpd polkit-devel - -Requires: httpd php php-gd php-mysql mariadb-server cambozola polkit net-tools -Requires: psmisc libjpeg-turbo vlc-core libcurl -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) -Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP) -Requires: perl(LWP::Protocol::https) ffmpeg - -Requires(post): systemd-units systemd-sysv -Requires(post): /usr/bin/gpasswd -Requires(post): /usr/bin/less -Requires(preun): systemd-units -Requires(postun): systemd-units - -%description -ZoneMinder is a set of applications which is intended to provide a complete -solution allowing you to capture, analyse, record and monitor any cameras you -have attached to a Linux based machine. It is designed to run on kernels which -support the Video For Linux (V4L) interface and has been tested with cameras -attached to BTTV cards, various USB cameras and IP network cameras. It is -designed to support as many cameras as you can attach to your computer without -too much degradation of performance. - -%prep -%setup -q -n ZoneMinder-%{version} - -# Change the following default values -./utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin-zm/nph-zms -./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes -./utils/zmeditconfigdata.sh ZM_PATH_SWAP /dev/shm -./utils/zmeditconfigdata.sh ZM_UPLOAD_FTP_LOC_DIR /var/spool/zoneminder-upload -./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes -./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no -./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no -./utils/zmeditconfigdata.sh ZM_OPT_FAST_DELETE no - -%build -%cmake \ - -DZM_TARGET_DISTRO="el%{rhel}" \ - . - -make %{?_smp_mflags} - -%install -export DESTDIR=%{buildroot} -make install - -%post -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - -# Allow zoneminder access to local video sources, serial ports, and x10 -/usr/bin/gpasswd -a %{zmuid_final} video -/usr/bin/gpasswd -a %{zmuid_final} dialout - -# Disabled. SELinux policy does not work for RHEL 7. -# Create and load zoneminder selinux policy module -#echo -e "\nCreating and installing a ZoneMinder SELinux policy module. Please wait.\n" -#/usr/bin/checkmodule -M -m -o %{_docdir}/%{name}-%{version}/local_zoneminder.mod %{_docdir}/%{name}-%{version}/local_zoneminder.te > /dev/null -#/usr/bin/semodule_package -o %{_docdir}/%{name}-%{version}/local_zoneminder.pp -m %{_docdir}/%{name}-%{version}/local_zoneminder.mod > /dev/null -#/usr/sbin/semodule -i %{_docdir}/%{name}-%{version}/local_zoneminder.pp > /dev/null - -# Upgrade from a previous version of zoneminder -if [ $1 -eq 2 ] ; then - - # Add any new PTZ control configurations to the database (will not overwrite) - %{_bindir}/zmcamtool.pl --import >/dev/null 2>&1 || : - - # Freshen the database - %{_bindir}/zmupdate.pl -f >/dev/null 2>&1 || : - - # We can't run this automatically when new sql account permissions need to - # be manually added first - # Run zmupdate non-interactively - #/usr/bin/zmupdate.pl --nointeractive -fi - -# Warn the end user to read the README file -echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, read README.Centos7 to finish the\ninstallation or upgrade!\n" -echo -e "\nThe README file is located here: %{_docdir}/%{name}-%{version}.\n" - -%preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || : - /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || : -# echo -e "\nRemoving ZoneMinder SELinux policy module. Please wait.\n" -# /usr/sbin/semodule -r local_zoneminder.pp -fi - -%postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || : -fi - -%triggerun -- zoneminder < 1.25.0-4 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply zoneminder -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || : -/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || : - -%files -%defattr(-,root,root,-) -%doc AUTHORS BUGS ChangeLog COPYING LICENSE NEWS README.md distros/redhat/README.Centos7 distros/redhat/README.https distros/redhat/jscalendar-doc -%doc distros/redhat/local_zoneminder.te -%config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf -%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf -%config(noreplace) /etc/tmpfiles.d/zoneminder.conf -%config(noreplace) /etc/logrotate.d/zoneminder - -%{_unitdir}/zoneminder.service - -%{_bindir}/zma -%{_bindir}/zmaudit.pl -%{_bindir}/zmc -%{_bindir}/zmcontrol.pl -%{_bindir}/zmdc.pl -%{_bindir}/zmf -%{_bindir}/zmfilter.pl -%{_bindir}/zmpkg.pl -%{_bindir}/zmtrack.pl -%{_bindir}/zmtrigger.pl -%{_bindir}/zmu -%{_bindir}/zmupdate.pl -%{_bindir}/zmvideo.pl -%{_bindir}/zmwatch.pl -%{_bindir}/zmcamtool.pl -%{_bindir}/zmsystemctl.pl -%{_bindir}/zmtelemetry.pl -%{_bindir}/zmx10.pl -%{_bindir}/zmonvif-probe.pl - -%{perl_vendorlib}/ZoneMinder* -%{perl_vendorarch}/auto/ZoneMinder/.packlist -%{perl_vendorarch}/auto/ONVIF/.packlist -%{perl_vendorlib}/ONVIF* -%{perl_vendorlib}/WSDiscovery* -%{perl_vendorlib}/WSSecurity* -%{perl_vendorlib}/WSNotification* -%{_mandir}/man*/* -%dir %{_libexecdir}/zoneminder -%{_libexecdir}/zoneminder/cgi-bin -%dir %{_datadir}/zoneminder -%{_datadir}/zoneminder/db -%{_datadir}/zoneminder/www - -%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy -%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules - -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder - - -%changelog -* Thu Mar 3 2016 Andrew Bauer - 1.30.0 -- Bump version fo 1.30.0 release. - -* Mon Sep 7 2015 Andrew Bauer - 1.28.1 -- Require https, disable selinux module, freshen dB on updates. - -* Sun Feb 8 2015 Andrew Bauer - 1.28.1 -- Initial release for CentOS 7. - -* Sun Oct 5 2014 Andrew Bauer - 1.28.0 -- Bump version for 1.28.0 release. - -* Fri Mar 14 2014 Andrew Bauer - 1.27 -- Tweak build requirements for cmake - -* Sat Feb 01 2014 Andrew Bauer - 1.27 -- Add zmcamtool.pl. Bump version for 1.27 release. - -* Mon Dec 16 2013 Andrew Bauer - 1.26.5 -- This is a bug fixe release -- RTSP fixes, cmake enhancements, couple other misc fixes - -* Mon Oct 07 2013 Andrew Bauer - 1.26.4 -- Initial cmake build. - -* Sat Oct 05 2013 Andrew Bauer - 1.26.4 -- Fedora specific path changes have been moved to zoneminder-1.26.0-defaults.patch -- All files are now part of the zoneminder source tree. Update specfile accordingly. - -* Sat Sep 21 2013 Andrew Bauer - 1.26.3 -- Initial rebuild for ZoneMinder 1.26.3 release. - -* Fri Feb 15 2013 Fedora Release Engineering - 1.25.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 21 2013 Adam Tkac - 1.25.0-12 -- rebuild due to "jpeg8-ABI" feature drop - -* Mon Jan 7 2013 Remi Collet - 1.25.0-11 -- fix configuration file for httpd 2.4, #871502 - -* Fri Dec 21 2012 Adam Tkac - 1.25.0-10 -- rebuild against new libjpeg - -* Thu Aug 09 2012 Jason L Tibbitts III - 1.25.0-9 -- Add patch to work around v4l2 api breakage in 3.5 kernel. - -* Sun Jul 22 2012 Fedora Release Engineering - 1.25.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jun 23 2012 Petr Pisar - 1.25.0-7 -- Perl 5.16 rebuild - -* Wed Mar 21 2012 Jason L Tibbitts III - 1.25.0-6 -- Fix stupid thinko in sql modifications. - -* Sat Feb 25 2012 Jason L Tibbitts III - 1.25.0-5 -- Clean up macro usage. - -* Sat Feb 25 2012 Jason L Tibbitts III - 1.25.0-4 -- Convert to systemd. -- Add tmpfiles.d configuration since the initscript isn't around to create - /run/zoneminder. -- Remove some pointless executable permissions. -- Add logrotate file. - -* Wed Feb 22 2012 Jason L Tibbitts III - 1.25.0-3 -- Update README.Fedora to reference systemctl and mention timezone info in - php.ini. -- Add proper default for EYEZM_LOG_TO_FILE. - - -* Thu Feb 09 2012 Jason L Tibbitts III - 1.25.0-2 -- Rebuild for new pcre. - -* Thu Jan 19 2012 Jason L Tibbitts III - 1.25.0-1 -- Update to 1.25.0 -- Fix gcc4.7 build problems. -- Drop gcc4.4 build fixes; for whatever reason they now break the build. -- Clean up old patches. -- Force setting of ZM_TMPDIR and ZM_RUNDIR. - -* Sat Jan 14 2012 Fedora Release Engineering - 1.24.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Sep 15 2011 Jason L Tibbitts III - 1.24.4-3 -- Re-add the dist-tag that somehow got lost. - -* Thu Sep 15 2011 Jason L Tibbitts III - 1.24.4-2 -- Add patch for bug 711780 - fix syntax issue in Mapped.pm. -- Undo that patch, and undo another which was the cause of the whole mess. -- Fix up other patches so ZM_PATH_BUILD is both defined and useful. -- Make sure database creation mods actually take. -- Update Fedora-specific docs with some additional info. -- Use bundled mootools (javascript, so no guideline violation). -- Update download location. -- Update the gcrypt patch to actually work. -- Upstream changed the tarball without changing the version to patch a - vulnerability, so redownload. - -* Sun Aug 14 2011 Jason L Tibbitts III - 1.24.4-1 -- Initial attempt to upgrade to 1.24.4. -- Add patch from BZ 460310 to build against libgcrypt instead of requiring the - gnutls openssl libs. - -* Thu Jul 21 2011 Petr Sabata - 1.24.3-7.20110324svn3310 -- Perl mass rebuild - -* Wed Jul 20 2011 Petr Sabata - 1.24.3-6.20110324svn3310 -- Perl mass rebuild - -* Mon May 09 2011 Jason L Tibbitts III - 1.24.3-5.20110324svn3310 -- Bump for gnutls update. - -* Thu Mar 24 2011 Jason L Tibbitts III - 1.24.3-4.20110324svn3310 -- Update to latest 1.24.3 subversion. Turns out that what upstream was calling - 1.24.3 is really just an occasionally updated devel snapshot. -- Rebase various patches. - -* Wed Mar 23 2011 Dan Horák - 1.24.3-3 -- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) - -* Tue Feb 08 2011 Fedora Release Engineering - 1.24.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 25 2011 Jason L Tibbitts III - 1.24.3-1 -- Update to latest upstream version. -- Rebase patches. -- Initial incomplete attempt to disable v4l1 support. - -* Fri Jan 21 2011 Jason L Tibbitts III - 1.24.2-6 -- Unbundle cambozola; instead link to the separately pacakged copy. -- Remove BuildRoot:, %%clean and buildroot cleaning in %%install. -- Git rid of mixed space/tab usage by removing all tabs. -- Remove unnecessary Conflicts: line. -- Attempt to force short_open_tag on for the code directories. -- Move default location of sockets, swaps, logfiles and some temporary files to - make more sense and allow things to work better with a future selinux policy. -- Fix errors in README.Fedora. - -* Wed Jun 02 2010 Marcela Maslanova - 1.24.2-5 -- Mass rebuild with perl-5.12.0 - -* Fri Dec 4 2009 Stepan Kasal - 1.24.2-4 -- rebuild against perl 5.10.1 -- use Perl vendorarch and archlib variables correctly - -* Mon Jul 27 2009 Fedora Release Engineering - 1.24.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-2 -- Bump release since 1.24.2-1 was mistakenly tagged a few months ago. - -* Wed Jul 22 2009 Jason L Tibbitts III - 1.24.2-1 -- Initial update to 1.24.2. -- Rebase patches. -- Update mootools download location. -- Update to mootools 1.2.3. -- Add additional dependencies for some optional features. - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-3 -- Remove unused Sys::Mmap perl dependency RPM is finding - -* Sat Apr 11 2009 Martin Ebourne - 1.24.1-2 -- Update gcc44 patch to disable -frepo, seems to be broken with gcc44 -- Added noffmpeg patch to make building outside mock easier - -* Sat Mar 21 2009 Martin Ebourne - 1.24.1-1 -- Patch for gcc 4.4 compilation errors -- Upgrade to 1.24.1 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.23.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Jan 24 2009 Caolán McNamara - 1.23.3-3 -- rebuild for dependencies - -* Mon Dec 15 2008 Martin Ebourne - 1.23.3-2 -- Fix permissions on zm.conf - -* Fri Jul 11 2008 Jason L Tibbitts III - 1.23.3-1 -- Initial attempt at packaging 1.23. - -* Tue Jul 1 2008 Martin Ebourne - 1.22.3-15 -- Add perl module compat dependency, bz #453590 - -* Tue May 6 2008 Martin Ebourne - 1.22.3-14 -- Remove default runlevel, bz #441315 - -* Mon Apr 28 2008 Jason L Tibbitts III - 1.22.3-13 -- Backport patch for CVE-2008-1381 from 1.23.3 to 1.22.3. - -* Tue Feb 19 2008 Fedora Release Engineering - 1.22.3-12 -- Autorebuild for GCC 4.3 - -* Thu Jan 3 2008 Martin Ebourne - 1.22.3-11 -- Fix compilation on gcc 4.3 - -* Thu Dec 6 2007 Martin Ebourne - 1.22.3-10 -- Rebuild for new openssl - -* Thu Aug 2 2007 Martin Ebourne - 1.22.3-8 -- Fix licence tag - -* Thu Jul 12 2007 Martin Ebourne - 1.22.3-7 -- Fixes from testing by Jitz including missing dependencies and database creation - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-6 -- Disable crashtrace on ppc - -* Sat Jun 30 2007 Martin Ebourne - 1.22.3-5 -- Fix uid for directories in /var/lib/zoneminder - -* Tue Jun 26 2007 Martin Ebourne - 1.22.3-4 -- Added perl Archive::Tar dependency -- Disabled web interface due to lack of access control on the event images - -* Sun Jun 10 2007 Martin Ebourne - 1.22.3-3 -- Changes recommended in review by Jason Tibbitts - -* Mon Apr 2 2007 Martin Ebourne - 1.22.3-2 -- Standardised on package name of zoneminder - -* Thu Dec 28 2006 Martin Ebourne - 1.22.3-1 -- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin diff --git a/distros/fedora/zoneminder.f25.spec b/distros/redhat/zoneminder.spec similarity index 69% rename from distros/fedora/zoneminder.f25.spec rename to distros/redhat/zoneminder.spec index bd2d73b32..8f6d6540f 100644 --- a/distros/fedora/zoneminder.f25.spec +++ b/distros/redhat/zoneminder.spec @@ -1,63 +1,92 @@ -%define zmuid $(id -un) -%define zmgid $(id -gn) -%define zmuid_final apache -%define zmgid_final apache +%global zmuid $(id -un) +%global zmgid $(id -gn) +%global zmuid_final apache +%global zmgid_final apache +%if "%{zmuid_final}" == "nginx" + %global with_nginx 1 + %global wwwconfdir /etc/nginx/default.d +%else + %global wwwconfdir /etc/httpd/conf.d +%endif + +%global sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt +%global sslkey %{_sysconfdir}/pki/tls/private/localhost.key + +# This will tell zoneminder's cmake process we are building against a known distro +%global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}} + +# Include files for SysV init or systemd +%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 +%global with_init_systemd 1 +%else +%global with_init_sysv 1 +%endif + +# php-mysql deprecated in f25 +%if 0%{?fedora} >= 25 +%global with_php_mysqlnd 1 +%else +%global with_php_mysql 1 +%endif + +%global readme_suffix %{?rhel:Redhat%{?rhel}}%{!?rhel:Fedora} %global _hardened_build 1 -### Delete the lines below to build with ffmpeg and/or x10 -%define _without_ffmpeg 1 -%define _without_x10 1 - Name: zoneminder -Version: 1.30.0 +Version: 1.30.1 Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons # jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/ # Mootools is inder the MIT license: http://mootools.net/ +# CakePHP is under the MIT license: https://github.com/cakephp/cakephp License: GPLv2+ and LGPLv2+ and MIT URL: http://www.zoneminder.com/ #Source: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz Source: ZoneMinder-%{version}.tar.gz -BuildRequires: cmake gnutls-devel systemd-units bzip2-devel -BuildRequires: mariadb-devel pcre-devel libjpeg-turbo-devel -BuildRequires: perl(Archive::Tar) perl(Archive::Zip) perl-podlators +%{?with_init_systemd:BuildRequires: systemd systemd-devel mariadb-devel perl-podlators} +%{?with_init_sysv:BuildRequires: mysql-devel} +BuildRequires: cmake >= 2.8.7 +BuildRequires: gnutls-devel bzip2-devel +BuildRequires: pcre-devel libjpeg-turbo-devel +BuildRequires: perl(Archive::Tar) perl(Archive::Zip) BuildRequires: perl(Date::Manip) perl(DBD::mysql) BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent) BuildRequires: perl(MIME::Entity) perl(MIME::Lite) BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap) BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign) BuildRequires: perl(Expect) perl(Sys::Syslog) +BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime) BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel -%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel} -%{!?_without_x10:BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime)} -# cmake needs the following installed at build time due to the way it auto-detects certain parameters -BuildRequires: httpd polkit-devel -%{!?_without_ffmpeg:BuildRequires: ffmpeg} +BuildRequires: ffmpeg-devel polkit-devel +BuildRequires: ffmpeg -# php-mysql was deprecated beginning with f25 -%if 0%{?fedora} >= 25 -Requires: php-mysqlnd -%else -Requires: php-mysql -%endif - -Requires: httpd php php-gd cambozola polkit net-tools psmisc -Requires: libjpeg-turbo vlc-core libcurl +%{?with_nginx:Requires: nginx fcgiwrap php-fpm} +%{!?with_nginx:Requires: httpd} +%{?with_php_mysqlnd:Requires: php-mysqlnd} +%{?with_php_mysql:Requires: php-mysql} +Requires: php-common php-gd cambozola polkit net-tools psmisc +Requires: libjpeg-turbo vlc-core libcurl ffmpeg Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP) Requires: perl(LWP::Protocol::https) -%{!?_without_ffmpeg:Requires: ffmpeg} -Requires(post): systemd-units systemd-sysv -Requires(post): /usr/bin/gpasswd -Requires(post): /usr/bin/less -Requires(preun): systemd-units -Requires(postun): systemd-units +%{?with_init_systemd:%{systemd_requires}} +%{?with_init_sysv:Requires(post): /sbin/chkconfig} +%{?with_init_sysv:Requires(post): %{_bindir}/checkmodule} +%{?with_init_sysv:Requires(post): %{_bindir}/semodule_package} +%{?with_init_sysv:Requires(post): %{_sbindir}/semodule} +%{?with_init_sysv:Requires(preun): /sbin/chkconfig} +%{?with_init_sysv:Requires(preun): /sbin/service} +%{?with_init_sysv:Requires(preun): %{_sbindir}/semodule} +%{?with_init_sysv:Requires(postun): /sbin/service} + +Requires(post): %{_bindir}/gpasswd +Requires(post): %{_bindir}/less %description ZoneMinder is a set of applications which is intended to provide a complete @@ -83,9 +112,9 @@ too much degradation of performance. %build %cmake \ - -DZM_TARGET_DISTRO="fc%{fedora}" \ -%{?_without_ffmpeg:-DZM_NO_FFMPEG=ON} \ -%{?_without_x10:-DZM_NO_X10=ON} \ + -DZM_WEB_USER="%{zmuid_final}" \ + -DZM_WEB_GROUP="%{zmuid_final}" \ + -DZM_TARGET_DISTRO="%{zmtargetdistro}" \ . make %{?_smp_mflags} @@ -94,19 +123,30 @@ make %{?_smp_mflags} export DESTDIR=%{buildroot} make install +# Must manually remove packlist files from older Perls which don't support the NO_PACKLIST flag +%if 0%{?with_init_sysv} +find $RPM_BUILD_ROOT -type f -name .packlist -delete +%endif + %post +%if 0%{?with_init_sysv} +/sbin/chkconfig --add zoneminder +/sbin/chkconfig zoneminder on -# Add any new PTZ control configurations to the database (will not overwrite) -%{_bindir}/zmcamtool.pl --import >/dev/null 2>&1 || : +# Create and load zoneminder selinux policy module +echo -e "\nCreating and installing a ZoneMinder SELinux policy module. Please wait.\n" +%{_bindir}/checkmodule -M -m -o %{_docdir}/%{name}-%{version}/local_zoneminder.mod %{_docdir}/%{name}-%{version}/local_zoneminder.te > /dev/null 2>&1 || : +%{_bindir}/semodule_package -o %{_docdir}/%{name}-%{version}/local_zoneminder.pp -m %{_docdir}/%{name}-%{version}/local_zoneminder.mod > /dev/null 2>&1 || : +%{_sbindir}/semodule -i %{_docdir}/%{name}-%{version}/local_zoneminder.pp > /dev/null 2>&1 || : +%endif + +%if 0%{?with_init_systemd} +# Initial installation if [ $1 -eq 1 ] ; then - # Initial installation /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi - -# Allow zoneminder access to local video sources, serial ports, and x10 -/usr/bin/gpasswd -a %{zmuid_final} video -/usr/bin/gpasswd -a %{zmuid_final} dialout +%endif # Upgrade from a previous version of zoneminder if [ $1 -eq 2 ] ; then @@ -120,47 +160,106 @@ if [ $1 -eq 2 ] ; then # We can't run this automatically when new sql account permissions need to # be manually added first # Run zmupdate non-interactively - #/usr/bin/zmupdate.pl --nointeractive + #%{_bindir}/zmupdate.pl --nointeractive fi +# Allow zoneminder access to local video sources, serial ports, and x10 +%{_bindir}/gpasswd -a %{zmuid_final} video >/dev/null 2>&1 || : +%{_bindir}/gpasswd -a %{zmuid_final} dialout >/dev/null 2>&1 || : + # Warn the end user to read the README file -echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, read README.Fedora to finish the\ninstallation or upgrade!\n" +echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, read README.%{readme_suffix} to finish the\ninstallation or upgrade!\n" echo -e "\nThe README file is located here: %{_docdir}/%{name}\n" -%preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || : - /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || : +%if 0%{?with_nginx} +# Nginx does not create an SSL certificate like the apache package does so lets do that here +if [ -f %{sslkey} -o -f %{sslcert} ]; then + exit 0 fi +umask 077 +%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 2048 > %{sslkey} 2> /dev/null + +FQDN=`hostname` +# A >59 char FQDN means "root@FQDN" exceeds 64-char max length for emailAddress +if [ "x${FQDN}" = "x" -o ${#FQDN} -gt 59 ]; then + FQDN=localhost.localdomain +fi + +cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \ + -x509 -sha256 -days 365 -set_serial $RANDOM -extensions v3_req \ + -out %{sslcert} 2>/dev/null +-- +SomeState +SomeCity +SomeOrganization +SomeOrganizationalUnit +${FQDN} +root@${FQDN} +EOF +%endif + +%preun +%if 0%{?with_init_sysv} +if [ $1 -eq 0 ]; then + /sbin/service zoneminder stop > /dev/null 2>&1 || : + /sbin/chkconfig --del zoneminder + echo -e "\nRemoving ZoneMinder SELinux policy module. Please wait.\n" + %{_sbindir}/semodule -r local_zoneminder.pp +fi +%endif + +%if 0%{?with_init_systemd} +%systemd_preun %{name}.service +%endif + %postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || : +%if 0%{?with_init_sysv} +if [ $1 -ge 1 ]; then + /sbin/service zoneminder condrestart > /dev/null 2>&1 || : fi +# Remove the doc folder. +rm -rf %{_docdir}/%{name}-%{version} +%endif + +%if 0%{?with_init_systemd} +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +%systemd_postun_with_restart %{name}.service +%endif + +%if 0%{?with_init_systemd} %triggerun -- zoneminder < 1.25.0-4 # Save the current service runlevel info # User must manually run systemd-sysv-convert --apply zoneminder # to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||: +%{_bindir}/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||: # Run these because the SysV package being removed won't do them /sbin/chkconfig --del zoneminder >/dev/null 2>&1 || : /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || : - +%endif %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/README.https distros/fedora/jscalendar-doc -%config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf -%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf -%config(noreplace) /etc/tmpfiles.d/zoneminder.conf +%doc AUTHORS COPYING README.md distros/redhat/readme/README.%{readme_suffix} distros/redhat/readme/README.https distros/redhat/jscalendar-doc +%config(noreplace) %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf +%config(noreplace) %attr(644,root,root) %{wwwconfdir}/zoneminder.conf %config(noreplace) /etc/logrotate.d/zoneminder +%if 0%{?with_nginx} +%config(noreplace) %{_sysconfdir}/php-fpm.d/zoneminder.conf +%endif + +%if 0%{?with_init_systemd} +%config(noreplace) /etc/tmpfiles.d/zoneminder.conf %{_unitdir}/zoneminder.service +%endif + +%if 0%{?with_init_sysv} +%doc distros/redhat/misc/local_zoneminder.te +%attr(755,root,root) %{_initrddir}/zoneminder +%endif %{_bindir}/zma %{_bindir}/zmaudit.pl @@ -179,7 +278,7 @@ fi %{_bindir}/zmcamtool.pl %{_bindir}/zmsystemctl.pl %{_bindir}/zmtelemetry.pl -%{!?_without_x10:%{_bindir}/zmx10.pl} +%{_bindir}/zmx10.pl %{_bindir}/zmonvif-probe.pl %{perl_vendorlib}/ZoneMinder* @@ -197,18 +296,22 @@ fi %{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy %{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp +%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder +%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/events +%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/images +%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/sock +%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/swap +%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp %dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder %dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload %dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder - %changelog +* Fri Dec 24 2016 Andrew Bauer - 1.30.1 +- Consolidate fedora/centos spec files +- Add preliminary nginx support +- New contact email + * Thu Mar 3 2016 Andrew Bauer - 1.30.0 - Bump version fo 1.30.0 release. From 3d15ac315bc77af06ce9a875f5acf87554505610 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Fri, 23 Dec 2016 13:11:06 -0600 Subject: [PATCH 24/38] Update CMakeLists.txt minor whitespace change --- distros/redhat/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt index bafed6ac4..0334f1a7c 100644 --- a/distros/redhat/CMakeLists.txt +++ b/distros/redhat/CMakeLists.txt @@ -19,7 +19,7 @@ if(ZM_TARGET_DISTRO STREQUAL "el6") configure_file(sysvinit/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY) configure_file(sysvinit/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY) else(ZM_TARGET_DISTRO STREQUAL "el6") - configure_file(systemd/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY) + configure_file(systemd/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY) if(ZM_WEB_USER STREQUAL "nginx") configure_file(nginx/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY) configure_file(nginx/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY) From eb0b85ec133cf753ec4c8848c6224def10472bac Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Fri, 23 Dec 2016 14:02:39 -0600 Subject: [PATCH 25/38] changes based on feedback from rpmlint --- distros/redhat/zoneminder.spec | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index 8f6d6540f..e9ad7182a 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -90,7 +90,7 @@ Requires(post): %{_bindir}/less %description ZoneMinder is a set of applications which is intended to provide a complete -solution allowing you to capture, analyse, record and monitor any cameras you +solution allowing you to capture, analyze, record and monitor any cameras you have attached to a Linux based machine. It is designed to run on kernels which support the Video For Linux (V4L) interface and has been tested with cameras attached to BTTV cards, various USB cameras and IP network cameras. It is @@ -112,10 +112,10 @@ too much degradation of performance. %build %cmake \ - -DZM_WEB_USER="%{zmuid_final}" \ - -DZM_WEB_GROUP="%{zmuid_final}" \ - -DZM_TARGET_DISTRO="%{zmtargetdistro}" \ - . + -DZM_WEB_USER="%{zmuid_final}" \ + -DZM_WEB_GROUP="%{zmuid_final}" \ + -DZM_TARGET_DISTRO="%{zmtargetdistro}" \ + . make %{?_smp_mflags} @@ -123,10 +123,8 @@ make %{?_smp_mflags} export DESTDIR=%{buildroot} make install -# Must manually remove packlist files from older Perls which don't support the NO_PACKLIST flag -%if 0%{?with_init_sysv} -find $RPM_BUILD_ROOT -type f -name .packlist -delete -%endif +# Remove unwanted files and folders +find %{buildroot} \( -name .packlist -or -name .git -or -name .gitignore -or -name .gitattributes -or -name .travis.yml \) -type f -delete > /dev/null 2>&1 || : %post %if 0%{?with_init_sysv} @@ -307,7 +305,7 @@ rm -rf %{_docdir}/%{name}-%{version} %dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder %changelog -* Fri Dec 24 2016 Andrew Bauer - 1.30.1 +* Fri Dec 23 2016 Andrew Bauer - 1.30.1 - Consolidate fedora/centos spec files - Add preliminary nginx support - New contact email From 0dd6f4916e0d8431a95b827f1ca74a74c0710148 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 26 Dec 2016 08:31:21 -0600 Subject: [PATCH 26/38] rpm specfile - move tmpfile config under /usr/lib --- distros/redhat/CMakeLists.txt | 2 +- distros/redhat/zoneminder.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt index 0334f1a7c..923367fa7 100644 --- a/distros/redhat/CMakeLists.txt +++ b/distros/redhat/CMakeLists.txt @@ -82,6 +82,6 @@ if(ZM_TARGET_DISTRO STREQUAL "el6") install(FILES zoneminder.sysvinit DESTINATION /etc/rc.d/init.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) else(ZM_TARGET_DISTRO STREQUAL "el6") install(FILES zoneminder.service DESTINATION /usr/lib/systemd/system PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) - install(FILES zoneminder.tmpfiles DESTINATION /etc/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) + install(FILES zoneminder.tmpfiles DESTINATION /usr/lib/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) endif(ZM_TARGET_DISTRO STREQUAL "el6") diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index e9ad7182a..a5b9da92c 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -250,7 +250,7 @@ rm -rf %{_docdir}/%{name}-%{version} %endif %if 0%{?with_init_systemd} -%config(noreplace) /etc/tmpfiles.d/zoneminder.conf +%{_tmpfilesdir}/zoneminder.conf %{_unitdir}/zoneminder.service %endif From 69c2cd697c938efc1160f3fb352c822500ad92cb Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Mon, 26 Dec 2016 09:08:08 -0600 Subject: [PATCH 27/38] update gpl 2 statement --- COPYING | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/COPYING b/COPYING index d60c31a97..d159169d1 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. From 254fcbcef790c0db11cd845548cd0383b7660e90 Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Mon, 26 Dec 2016 09:23:16 -0600 Subject: [PATCH 28/38] update gpl 2 mailing address in source files --- scripts/ZoneMinder/lib/ZoneMinder.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Base.pm.in | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in | 2 +- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/3S.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/FI8608W_Y2k.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/FI8620_Y2k.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/FI9821W_Y2k.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/FI9831W.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/M8640.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/Ncs370.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/PanasonicIP.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoD.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoP.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/TVIP862.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/Toshiba_IK_WB11A.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/Visca.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/Vivotek_ePTZ.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/mjpgStreamer.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Database.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Event.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Filter.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/General.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Logger.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Server.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Handle.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Spawning.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection/Example.pm | 2 +- scripts/zmaudit.pl.in | 2 +- scripts/zmcamtool.pl.in | 2 +- scripts/zmcontrol.pl.in | 2 +- scripts/zmdc.pl.in | 2 +- scripts/zmfilter.pl.in | 2 +- scripts/zmpkg.pl.in | 2 +- scripts/zmsystemctl.pl.in | 2 +- scripts/zmtelemetry.pl.in | 2 +- scripts/zmtrack.pl.in | 2 +- scripts/zmtrigger.pl.in | 2 +- scripts/zmupdate.pl.in | 2 +- scripts/zmvideo.pl.in | 2 +- scripts/zmwatch.pl.in | 2 +- scripts/zmx10.pl.in | 2 +- src/zm.cpp | 2 +- src/zm.h | 2 +- src/zm_box.cpp | 2 +- src/zm_box.h | 2 +- src/zm_buffer.cpp | 2 +- src/zm_buffer.h | 2 +- src/zm_camera.cpp | 2 +- src/zm_camera.h | 2 +- src/zm_comms.cpp | 2 +- src/zm_comms.h | 2 +- src/zm_config.cpp | 2 +- src/zm_config.h.in | 2 +- src/zm_coord.cpp | 2 +- src/zm_coord.h | 2 +- src/zm_curl_camera.cpp | 2 +- src/zm_curl_camera.h | 2 +- src/zm_db.cpp | 2 +- src/zm_db.h | 2 +- src/zm_event.cpp | 2 +- src/zm_event.h | 2 +- src/zm_exception.cpp | 2 +- src/zm_exception.h | 2 +- src/zm_ffmpeg.cpp | 2 +- src/zm_ffmpeg.h | 2 +- src/zm_ffmpeg_camera.cpp | 2 +- src/zm_ffmpeg_camera.h | 2 +- src/zm_file_camera.cpp | 2 +- src/zm_file_camera.h | 2 +- src/zm_image.cpp | 2 +- src/zm_image.h | 2 +- src/zm_jpeg.cpp | 2 +- src/zm_jpeg.h | 2 +- src/zm_libvlc_camera.cpp | 2 +- src/zm_libvlc_camera.h | 2 +- src/zm_local_camera.cpp | 2 +- src/zm_local_camera.h | 2 +- src/zm_logger.cpp | 2 +- src/zm_logger.h | 2 +- src/zm_mem_utils.h | 2 +- src/zm_monitor.cpp | 2 +- src/zm_monitor.h | 2 +- src/zm_mpeg.cpp | 2 +- src/zm_mpeg.h | 2 +- src/zm_poly.cpp | 2 +- src/zm_poly.h | 2 +- src/zm_regexp.cpp | 2 +- src/zm_regexp.h | 2 +- src/zm_remote_camera.cpp | 2 +- src/zm_remote_camera.h | 2 +- src/zm_remote_camera_http.cpp | 2 +- src/zm_remote_camera_http.h | 2 +- src/zm_remote_camera_rtsp.cpp | 2 +- src/zm_remote_camera_rtsp.h | 2 +- src/zm_rgb.h | 2 +- src/zm_rtp.cpp | 2 +- src/zm_rtp.h | 2 +- src/zm_rtp_ctrl.cpp | 2 +- src/zm_rtp_ctrl.h | 2 +- src/zm_rtp_data.cpp | 2 +- src/zm_rtp_data.h | 2 +- src/zm_rtp_source.cpp | 2 +- src/zm_rtp_source.h | 2 +- src/zm_rtsp.cpp | 2 +- src/zm_rtsp.h | 2 +- src/zm_rtsp_auth.cpp | 2 +- src/zm_rtsp_auth.h | 2 +- src/zm_sdp.cpp | 2 +- src/zm_sdp.h | 2 +- src/zm_signal.cpp | 2 +- src/zm_signal.h | 2 +- src/zm_stream.cpp | 2 +- src/zm_stream.h | 2 +- src/zm_thread.cpp | 2 +- src/zm_thread.h | 2 +- src/zm_threaddata.cpp | 2 +- src/zm_time.cpp | 2 +- src/zm_time.h | 2 +- src/zm_timer.cpp | 2 +- src/zm_timer.h | 2 +- src/zm_user.cpp | 2 +- src/zm_user.h | 2 +- src/zm_utils.cpp | 2 +- src/zm_utils.h | 2 +- src/zm_zone.cpp | 2 +- src/zm_zone.h | 2 +- src/zma.cpp | 2 +- src/zmc.cpp | 2 +- src/zmf.cpp | 2 +- src/zmf.h | 2 +- src/zms.cpp | 2 +- src/zmstreamer.cpp | 2 +- src/zmu.cpp | 2 +- utils/mk_bigfont.pl | 2 +- web/css/reset.css | 2 +- web/includes/actions.php | 2 +- web/includes/config.php.in | 2 +- web/includes/database.php | 2 +- web/includes/functions.php | 2 +- web/includes/lang.php | 2 +- web/index.php | 2 +- web/js/logger.js | 2 +- web/lang/big5_big5.php | 2 +- web/lang/cn_zh.php | 2 +- web/lang/cs_cz.php | 2 +- web/lang/de_de.php | 2 +- web/lang/dk_dk.php | 2 +- web/lang/en_gb.php | 2 +- web/lang/en_us.php | 2 +- web/lang/es_ar.php | 2 +- web/lang/es_es.php | 2 +- web/lang/fr_fr.php | 2 +- web/lang/he_il.php | 2 +- web/lang/hu_hu.php | 2 +- web/lang/it_it.php | 2 +- web/lang/ja_jp.php | 2 +- web/lang/nl_nl.php | 2 +- web/lang/pl_pl.php | 2 +- web/lang/ro_ro.php | 2 +- web/lang/ru_ru.php | 2 +- web/lang/se_se.php | 2 +- web/scripts/retag.sh | 2 +- web/scripts/swap.pl | 2 +- web/skins/classic/css/classic/skin.css | 2 +- web/skins/classic/css/dark/skin.css | 2 +- web/skins/classic/css/flat/skin.css | 2 +- web/skins/classic/includes/config.php | 2 +- web/skins/classic/includes/control_functions.php | 2 +- web/skins/classic/includes/export_functions.php | 2 +- web/skins/classic/includes/functions.php | 2 +- web/skins/classic/js/classic.js | 2 +- web/skins/classic/js/dark.js | 2 +- web/skins/classic/js/flat.js | 2 +- web/skins/classic/js/skin.js | 2 +- web/skins/classic/js/skin.js.php | 2 +- web/skins/classic/skin.php | 2 +- web/skins/classic/views/bandwidth.php | 2 +- web/skins/classic/views/blank.php | 2 +- web/skins/classic/views/console.php | 2 +- web/skins/classic/views/control.php | 2 +- web/skins/classic/views/controlcap.php | 2 +- web/skins/classic/views/controlcaps.php | 2 +- web/skins/classic/views/controlpreset.php | 2 +- web/skins/classic/views/cycle.php | 2 +- web/skins/classic/views/device.php | 2 +- web/skins/classic/views/devices.php | 2 +- web/skins/classic/views/donate.php | 2 +- web/skins/classic/views/error.php | 2 +- web/skins/classic/views/event.php | 2 +- web/skins/classic/views/eventdetail.php | 2 +- web/skins/classic/views/events.php | 2 +- web/skins/classic/views/export.php | 2 +- web/skins/classic/views/filter.php | 2 +- web/skins/classic/views/filtersave.php | 2 +- web/skins/classic/views/frame.php | 2 +- web/skins/classic/views/frames.php | 2 +- web/skins/classic/views/function.php | 2 +- web/skins/classic/views/group.php | 2 +- web/skins/classic/views/groups.php | 2 +- web/skins/classic/views/log.php | 2 +- web/skins/classic/views/logout.php | 2 +- web/skins/classic/views/monitor.php | 2 +- web/skins/classic/views/monitorpreset.php | 2 +- web/skins/classic/views/monitorprobe.php | 2 +- web/skins/classic/views/montage.php | 2 +- web/skins/classic/views/montagereview.php | 2 +- web/skins/classic/views/none.php | 2 +- web/skins/classic/views/onvifprobe.php | 2 +- web/skins/classic/views/optionhelp.php | 2 +- web/skins/classic/views/options.php | 2 +- web/skins/classic/views/plugin.php | 2 +- web/skins/classic/views/postlogin.php | 2 +- web/skins/classic/views/server.php | 2 +- web/skins/classic/views/settings.php | 2 +- web/skins/classic/views/state.php | 2 +- web/skins/classic/views/stats.php | 2 +- web/skins/classic/views/status.php | 2 +- web/skins/classic/views/timeline.php | 2 +- web/skins/classic/views/user.php | 2 +- web/skins/classic/views/version.php | 2 +- web/skins/classic/views/video.php | 2 +- web/skins/classic/views/watch.php | 2 +- web/skins/classic/views/zone.php | 2 +- web/skins/classic/views/zones.php | 2 +- web/views/file.php | 2 +- web/views/image.php | 2 +- zmconfgen.pl.in | 2 +- 240 files changed, 240 insertions(+), 240 deletions(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder.pm b/scripts/ZoneMinder/lib/ZoneMinder.pm index 87a6b14b7..d6ab646ae 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Base.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Base.pm.in index 6e9aba3a1..d80add206 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Base.pm.in +++ b/scripts/ZoneMinder/lib/ZoneMinder/Base.pm.in @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in index b4f09605c..486468cc8 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in +++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in index 1924d3576..3f80748db 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in +++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control.pm index dc8ed2ad4..4603645fa 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/3S.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/3S.pm index 47d783bff..2ccd275ce 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/3S.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/3S.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm index 2372a2d81..daa39ed72 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8608W_Y2k.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8608W_Y2k.pm index 2e5b21f76..c8a77aa2c 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8608W_Y2k.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8608W_Y2k.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # V1.0 ==================================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8620_Y2k.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8620_Y2k.pm index 3e2addf85..5eb06219d 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8620_Y2k.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8620_Y2k.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # V1.1 ==================================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9821W_Y2k.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9821W_Y2k.pm index dd73a04e6..7165fd686 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9821W_Y2k.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9821W_Y2k.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================================= # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9831W.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9831W.pm index 739ff1175..37022a188 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9831W.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9831W.pm @@ -23,7 +23,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================================= # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/M8640.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/M8640.pm index 10bbea5de..bacfc77aa 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/M8640.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/M8640.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Ncs370.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Ncs370.pm index c69b4f29d..32ac9a50c 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Ncs370.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Ncs370.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/PanasonicIP.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/PanasonicIP.pm index d3e19e3aa..070f5fb18 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/PanasonicIP.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/PanasonicIP.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoD.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoD.pm index 8e5d07f74..68547da6f 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoD.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoD.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoP.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoP.pm index 794393644..9c411c0cd 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoP.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoP.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm index f3fc94754..e5917536f 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/TVIP862.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/TVIP862.pm index d7c669583..eb083eb60 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/TVIP862.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/TVIP862.pm @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Toshiba_IK_WB11A.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Toshiba_IK_WB11A.pm index e96b30c85..562365e95 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Toshiba_IK_WB11A.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Toshiba_IK_WB11A.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Visca.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Visca.pm index 749beae21..e356c77f0 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Visca.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Visca.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Vivotek_ePTZ.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Vivotek_ePTZ.pm index 3649b35bc..7ddf2dc6d 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Vivotek_ePTZ.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Vivotek_ePTZ.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/mjpgStreamer.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/mjpgStreamer.pm index 18a73cae8..7ac00c995 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/mjpgStreamer.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/mjpgStreamer.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm index cc75ab471..9e8e041c8 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm index 6726798a2..71ca57680 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm index cc5152c86..22bcb0062 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/General.pm b/scripts/ZoneMinder/lib/ZoneMinder/General.pm index dd059dbc4..bb03fe70c 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/General.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/General.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm index 6503f71e1..8563a95ef 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in index 7e2f03c68..286d83db1 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in +++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm index 017b5aa8c..e41019647 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm index 301327095..fe2cfe115 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Server.pm b/scripts/ZoneMinder/lib/ZoneMinder/Server.pm index 95f6c4265..9c68f5a51 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Server.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Server.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel.pm index 8b746ac3d..c8552f4a0 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm index 0a4bdea8a..18444ab93 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Handle.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Handle.pm index d26924476..8341cc8d2 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Handle.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Handle.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm index 0f977f3da..dcd9d63dc 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm index ddfc53436..5708510d1 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Spawning.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Spawning.pm index aeaca182e..97d82b8e7 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Spawning.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Spawning.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm index ea74c957e..017c2071a 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection.pm index 12cf3136d..a7829a532 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection/Example.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection/Example.pm index 6f3a86575..8bef82460 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection/Example.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection/Example.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in index 3bd8aa99a..f74f8ed90 100644 --- a/scripts/zmaudit.pl.in +++ b/scripts/zmaudit.pl.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== diff --git a/scripts/zmcamtool.pl.in b/scripts/zmcamtool.pl.in index 8d6a6321c..28d258582 100644 --- a/scripts/zmcamtool.pl.in +++ b/scripts/zmcamtool.pl.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== diff --git a/scripts/zmcontrol.pl.in b/scripts/zmcontrol.pl.in index 9b34533f7..79aeccb10 100644 --- a/scripts/zmcontrol.pl.in +++ b/scripts/zmcontrol.pl.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in index f6ccf4491..918df8574 100644 --- a/scripts/zmdc.pl.in +++ b/scripts/zmdc.pl.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in index edadd86c5..e51993bec 100644 --- a/scripts/zmfilter.pl.in +++ b/scripts/zmfilter.pl.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in index 42de011fe..cd9910aa6 100644 --- a/scripts/zmpkg.pl.in +++ b/scripts/zmpkg.pl.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== diff --git a/scripts/zmsystemctl.pl.in b/scripts/zmsystemctl.pl.in index 75acae242..d4de9cfed 100644 --- a/scripts/zmsystemctl.pl.in +++ b/scripts/zmsystemctl.pl.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in index 5a5328829..39e7b73ec 100644 --- a/scripts/zmtelemetry.pl.in +++ b/scripts/zmtelemetry.pl.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== diff --git a/scripts/zmtrack.pl.in b/scripts/zmtrack.pl.in index cd00e809d..f12f6bff0 100644 --- a/scripts/zmtrack.pl.in +++ b/scripts/zmtrack.pl.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in index 2f180e090..3fc5f43e9 100644 --- a/scripts/zmtrigger.pl.in +++ b/scripts/zmtrigger.pl.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in index 7497309c3..cb0781c2e 100644 --- a/scripts/zmupdate.pl.in +++ b/scripts/zmupdate.pl.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== diff --git a/scripts/zmvideo.pl.in b/scripts/zmvideo.pl.in index a47685033..5f71451a3 100644 --- a/scripts/zmvideo.pl.in +++ b/scripts/zmvideo.pl.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== diff --git a/scripts/zmwatch.pl.in b/scripts/zmwatch.pl.in index c35c4ea8a..8f551f79d 100644 --- a/scripts/zmwatch.pl.in +++ b/scripts/zmwatch.pl.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== diff --git a/scripts/zmx10.pl.in b/scripts/zmx10.pl.in index 8daa63c87..58064a89f 100644 --- a/scripts/zmx10.pl.in +++ b/scripts/zmx10.pl.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== diff --git a/src/zm.cpp b/src/zm.cpp index b840d11fb..e25ce45ce 100644 --- a/src/zm.cpp +++ b/src/zm.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm.h b/src/zm.h index 0c780b244..092561378 100644 --- a/src/zm.h +++ b/src/zm.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #if !defined(PATH_MAX) diff --git a/src/zm_box.cpp b/src/zm_box.cpp index 2cb8c9a5e..4a69fbf6d 100644 --- a/src/zm_box.cpp +++ b/src/zm_box.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_box.h b/src/zm_box.h index f5fe69a38..3432bacc5 100644 --- a/src/zm_box.h +++ b/src/zm_box.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_BOX_H diff --git a/src/zm_buffer.cpp b/src/zm_buffer.cpp index b46cb2f15..73c9603e1 100644 --- a/src/zm_buffer.cpp +++ b/src/zm_buffer.cpp @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include diff --git a/src/zm_buffer.h b/src/zm_buffer.h index 620fce1a8..bcc952dc6 100644 --- a/src/zm_buffer.h +++ b/src/zm_buffer.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef ZM_BUFFER_H diff --git a/src/zm_camera.cpp b/src/zm_camera.cpp index bbf2edcb6..899d7822a 100644 --- a/src/zm_camera.cpp +++ b/src/zm_camera.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_camera.h b/src/zm_camera.h index ba8224c09..e56e68c55 100644 --- a/src/zm_camera.h +++ b/src/zm_camera.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_CAMERA_H diff --git a/src/zm_comms.cpp b/src/zm_comms.cpp index d5fb49c2e..24d1a1a63 100644 --- a/src/zm_comms.cpp +++ b/src/zm_comms.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm_comms.h" diff --git a/src/zm_comms.h b/src/zm_comms.h index f00691f70..cf108c1ea 100644 --- a/src/zm_comms.h +++ b/src/zm_comms.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_COMMS_H diff --git a/src/zm_config.cpp b/src/zm_config.cpp index c08b65e56..6f4e59b6e 100644 --- a/src/zm_config.cpp +++ b/src/zm_config.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_config.h.in b/src/zm_config.h.in index 1deeff861..919cb0c82 100644 --- a/src/zm_config.h.in +++ b/src/zm_config.h.in @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_CONFIG_H diff --git a/src/zm_coord.cpp b/src/zm_coord.cpp index cef188b63..df9bc0a87 100644 --- a/src/zm_coord.cpp +++ b/src/zm_coord.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_coord.h b/src/zm_coord.h index 7316244a2..5858cef23 100644 --- a/src/zm_coord.h +++ b/src/zm_coord.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_COORD_H diff --git a/src/zm_curl_camera.cpp b/src/zm_curl_camera.cpp index f9b6d0712..3751088a8 100644 --- a/src/zm_curl_camera.cpp +++ b/src/zm_curl_camera.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_curl_camera.h b/src/zm_curl_camera.h index f7c3540fe..8a06428c6 100644 --- a/src/zm_curl_camera.h +++ b/src/zm_curl_camera.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_CURL_CAMERA_H diff --git a/src/zm_db.cpp b/src/zm_db.cpp index 430f4553b..8eed90569 100644 --- a/src/zm_db.cpp +++ b/src/zm_db.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include diff --git a/src/zm_db.h b/src/zm_db.h index 6ec1b5e4e..4cadcf587 100644 --- a/src/zm_db.h +++ b/src/zm_db.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_DB_H diff --git a/src/zm_event.cpp b/src/zm_event.cpp index f984421dc..9b6202966 100644 --- a/src/zm_event.cpp +++ b/src/zm_event.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include diff --git a/src/zm_event.h b/src/zm_event.h index f3c5d7961..901e5dc52 100644 --- a/src/zm_event.h +++ b/src/zm_event.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_EVENT_H diff --git a/src/zm_exception.cpp b/src/zm_exception.cpp index b7fe9e9a4..993a56866 100644 --- a/src/zm_exception.cpp +++ b/src/zm_exception.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm_exception.h" diff --git a/src/zm_exception.h b/src/zm_exception.h index a503be7c9..83d1ecab1 100644 --- a/src/zm_exception.h +++ b/src/zm_exception.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_EXCEPTION_H diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp index def7ef0c3..d088477a8 100644 --- a/src/zm_ffmpeg.cpp +++ b/src/zm_ffmpeg.cpp @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "zm_ffmpeg.h" diff --git a/src/zm_ffmpeg.h b/src/zm_ffmpeg.h index f1486c2ee..da3c33a76 100644 --- a/src/zm_ffmpeg.h +++ b/src/zm_ffmpeg.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef ZM_FFMPEG_H diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp index 533b69b2c..5fd7ea382 100644 --- a/src/zm_ffmpeg_camera.cpp +++ b/src/zm_ffmpeg_camera.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_ffmpeg_camera.h b/src/zm_ffmpeg_camera.h index a8ed2a6a6..c11be9b3c 100644 --- a/src/zm_ffmpeg_camera.h +++ b/src/zm_ffmpeg_camera.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_FFMPEG_CAMERA_H diff --git a/src/zm_file_camera.cpp b/src/zm_file_camera.cpp index 4292cea48..dfb12d38a 100644 --- a/src/zm_file_camera.cpp +++ b/src/zm_file_camera.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include diff --git a/src/zm_file_camera.h b/src/zm_file_camera.h index 19e5971b8..84d720050 100644 --- a/src/zm_file_camera.h +++ b/src/zm_file_camera.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_FILE_CAMERA_H diff --git a/src/zm_image.cpp b/src/zm_image.cpp index e3147a998..9c8c12fda 100644 --- a/src/zm_image.cpp +++ b/src/zm_image.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" #include "zm_font.h" diff --git a/src/zm_image.h b/src/zm_image.h index 7afa84d5e..0a01f1f18 100644 --- a/src/zm_image.h +++ b/src/zm_image.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_IMAGE_H diff --git a/src/zm_jpeg.cpp b/src/zm_jpeg.cpp index c47bbe267..ba0085c6b 100644 --- a/src/zm_jpeg.cpp +++ b/src/zm_jpeg.cpp @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "zm_jpeg.h" diff --git a/src/zm_jpeg.h b/src/zm_jpeg.h index b7807d0d3..1a1a9f42f 100644 --- a/src/zm_jpeg.h +++ b/src/zm_jpeg.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include diff --git a/src/zm_libvlc_camera.cpp b/src/zm_libvlc_camera.cpp index 26c4701fb..186af1144 100644 --- a/src/zm_libvlc_camera.cpp +++ b/src/zm_libvlc_camera.cpp @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "zm.h" diff --git a/src/zm_libvlc_camera.h b/src/zm_libvlc_camera.h index d08b310f5..5f571adea 100644 --- a/src/zm_libvlc_camera.h +++ b/src/zm_libvlc_camera.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef ZM_LIBVLC_CAMERA_H diff --git a/src/zm_local_camera.cpp b/src/zm_local_camera.cpp index 8df65d8b5..e82115e70 100644 --- a/src/zm_local_camera.cpp +++ b/src/zm_local_camera.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_local_camera.h b/src/zm_local_camera.h index db0a1c671..785709c2c 100644 --- a/src/zm_local_camera.h +++ b/src/zm_local_camera.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_LOCAL_CAMERA_H diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp index b3db91d83..dee423503 100644 --- a/src/zm_logger.cpp +++ b/src/zm_logger.cpp @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "zm_logger.h" diff --git a/src/zm_logger.h b/src/zm_logger.h index d30396056..e50b81ca5 100644 --- a/src/zm_logger.h +++ b/src/zm_logger.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef ZM_LOGGER_H diff --git a/src/zm_mem_utils.h b/src/zm_mem_utils.h index 351fa3ac8..dd0e2a3f9 100644 --- a/src/zm_mem_utils.h +++ b/src/zm_mem_utils.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_MEM_UTILS_H diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index 0bacadd0f..b7920c166 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include diff --git a/src/zm_monitor.h b/src/zm_monitor.h index 57fd7a369..7d33cc725 100644 --- a/src/zm_monitor.h +++ b/src/zm_monitor.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_MONITOR_H diff --git a/src/zm_mpeg.cpp b/src/zm_mpeg.cpp index bf2ac9952..7b46cd397 100644 --- a/src/zm_mpeg.cpp +++ b/src/zm_mpeg.cpp @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include diff --git a/src/zm_mpeg.h b/src/zm_mpeg.h index e2ec33592..931f9d687 100644 --- a/src/zm_mpeg.h +++ b/src/zm_mpeg.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef ZM_MPEG_H diff --git a/src/zm_poly.cpp b/src/zm_poly.cpp index cddcced46..13a21e7e0 100644 --- a/src/zm_poly.cpp +++ b/src/zm_poly.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_poly.h b/src/zm_poly.h index 7ba3043fd..6bbeeea75 100644 --- a/src/zm_poly.h +++ b/src/zm_poly.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_POLY_H diff --git a/src/zm_regexp.cpp b/src/zm_regexp.cpp index cfa686688..d1bca34a5 100644 --- a/src/zm_regexp.cpp +++ b/src/zm_regexp.cpp @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include diff --git a/src/zm_regexp.h b/src/zm_regexp.h index 1b1a9d518..c859823d5 100644 --- a/src/zm_regexp.h +++ b/src/zm_regexp.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "zm.h" diff --git a/src/zm_remote_camera.cpp b/src/zm_remote_camera.cpp index b82589cd6..cc2e49739 100644 --- a/src/zm_remote_camera.cpp +++ b/src/zm_remote_camera.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm_remote_camera.h" diff --git a/src/zm_remote_camera.h b/src/zm_remote_camera.h index 647782fd1..5378d56a1 100644 --- a/src/zm_remote_camera.h +++ b/src/zm_remote_camera.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_REMOTE_CAMERA_H diff --git a/src/zm_remote_camera_http.cpp b/src/zm_remote_camera_http.cpp index c8d49ca5b..b354dc521 100644 --- a/src/zm_remote_camera_http.cpp +++ b/src/zm_remote_camera_http.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm_remote_camera_http.h" diff --git a/src/zm_remote_camera_http.h b/src/zm_remote_camera_http.h index bfadecce5..e10175de3 100644 --- a/src/zm_remote_camera_http.h +++ b/src/zm_remote_camera_http.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_REMOTE_CAMERA_HTTP_H diff --git a/src/zm_remote_camera_rtsp.cpp b/src/zm_remote_camera_rtsp.cpp index 42df5c9ac..0f1997198 100644 --- a/src/zm_remote_camera_rtsp.cpp +++ b/src/zm_remote_camera_rtsp.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_remote_camera_rtsp.h b/src/zm_remote_camera_rtsp.h index 20261f82d..079f38a56 100644 --- a/src/zm_remote_camera_rtsp.h +++ b/src/zm_remote_camera_rtsp.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_REMOTE_CAMERA_RTSP_H diff --git a/src/zm_rgb.h b/src/zm_rgb.h index af74d872b..1b6cb7550 100644 --- a/src/zm_rgb.h +++ b/src/zm_rgb.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_RGB_H diff --git a/src/zm_rtp.cpp b/src/zm_rtp.cpp index 2ce21db5a..e02dbc2df 100644 --- a/src/zm_rtp.cpp +++ b/src/zm_rtp.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm_rtp.h" diff --git a/src/zm_rtp.h b/src/zm_rtp.h index 6fbeeabe6..25403f1a5 100644 --- a/src/zm_rtp.h +++ b/src/zm_rtp.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_RTP_H diff --git a/src/zm_rtp_ctrl.cpp b/src/zm_rtp_ctrl.cpp index 012a377fc..3973e5a71 100644 --- a/src/zm_rtp_ctrl.cpp +++ b/src/zm_rtp_ctrl.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_rtp_ctrl.h b/src/zm_rtp_ctrl.h index f487d1191..6d8f3024c 100644 --- a/src/zm_rtp_ctrl.h +++ b/src/zm_rtp_ctrl.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_RTP_CTRL_H diff --git a/src/zm_rtp_data.cpp b/src/zm_rtp_data.cpp index 5742c60b1..496c0bcfd 100644 --- a/src/zm_rtp_data.cpp +++ b/src/zm_rtp_data.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_rtp_data.h b/src/zm_rtp_data.h index 378c5e2e6..dae449ea5 100644 --- a/src/zm_rtp_data.h +++ b/src/zm_rtp_data.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_RTP_DATA_H diff --git a/src/zm_rtp_source.cpp b/src/zm_rtp_source.cpp index bbdd59a6a..64106a667 100644 --- a/src/zm_rtp_source.cpp +++ b/src/zm_rtp_source.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm_rtp_source.h" diff --git a/src/zm_rtp_source.h b/src/zm_rtp_source.h index b86577e01..b53fb975b 100644 --- a/src/zm_rtp_source.h +++ b/src/zm_rtp_source.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_RTP_SOURCE_H diff --git a/src/zm_rtsp.cpp b/src/zm_rtsp.cpp index 67f347d81..d08ba166d 100644 --- a/src/zm_rtsp.cpp +++ b/src/zm_rtsp.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_rtsp.h b/src/zm_rtsp.h index 656db65e3..51a2c99aa 100644 --- a/src/zm_rtsp.h +++ b/src/zm_rtsp.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_RTSP_H diff --git a/src/zm_rtsp_auth.cpp b/src/zm_rtsp_auth.cpp index 4f816b64a..6598bd254 100644 --- a/src/zm_rtsp_auth.cpp +++ b/src/zm_rtsp_auth.cpp @@ -13,7 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_rtsp_auth.h b/src/zm_rtsp_auth.h index 9249a15e2..152dab85a 100644 --- a/src/zm_rtsp_auth.h +++ b/src/zm_rtsp_auth.h @@ -13,7 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_RTSP_AUTH_H diff --git a/src/zm_sdp.cpp b/src/zm_sdp.cpp index fa8a602ee..ffcea791b 100644 --- a/src/zm_sdp.cpp +++ b/src/zm_sdp.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_sdp.h b/src/zm_sdp.h index 2d08905c8..48a05b706 100644 --- a/src/zm_sdp.h +++ b/src/zm_sdp.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_SDP_H diff --git a/src/zm_signal.cpp b/src/zm_signal.cpp index bbc40e916..08f3d76a0 100644 --- a/src/zm_signal.cpp +++ b/src/zm_signal.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_signal.h b/src/zm_signal.h index 0302b47ee..89a4b408a 100644 --- a/src/zm_signal.h +++ b/src/zm_signal.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef ZM_SIGNAL_H diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp index 8bbfda4e9..01b9fa4ed 100644 --- a/src/zm_stream.cpp +++ b/src/zm_stream.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include diff --git a/src/zm_stream.h b/src/zm_stream.h index c7df53d16..98d96389f 100644 --- a/src/zm_stream.h +++ b/src/zm_stream.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_STREAM_H diff --git a/src/zm_thread.cpp b/src/zm_thread.cpp index 7d84037d9..166c40703 100644 --- a/src/zm_thread.cpp +++ b/src/zm_thread.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm_thread.h" diff --git a/src/zm_thread.h b/src/zm_thread.h index 15c13bb17..cb853a113 100644 --- a/src/zm_thread.h +++ b/src/zm_thread.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_THREAD_H diff --git a/src/zm_threaddata.cpp b/src/zm_threaddata.cpp index cda094213..6b25d5714 100644 --- a/src/zm_threaddata.cpp +++ b/src/zm_threaddata.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // template class ThreadData; diff --git a/src/zm_time.cpp b/src/zm_time.cpp index 08b673469..417ee2b2b 100644 --- a/src/zm_time.cpp +++ b/src/zm_time.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm_time.h" diff --git a/src/zm_time.h b/src/zm_time.h index df79e7fff..de9d2a22f 100644 --- a/src/zm_time.h +++ b/src/zm_time.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_TIME_H diff --git a/src/zm_timer.cpp b/src/zm_timer.cpp index a067308b7..e6d6d16da 100644 --- a/src/zm_timer.cpp +++ b/src/zm_timer.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm_timer.h" diff --git a/src/zm_timer.h b/src/zm_timer.h index 2213d3cd0..221aec222 100644 --- a/src/zm_timer.h +++ b/src/zm_timer.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_TIMER_H diff --git a/src/zm_user.cpp b/src/zm_user.cpp index 73f5c7932..12dcf0cf4 100644 --- a/src/zm_user.cpp +++ b/src/zm_user.cpp @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "zm.h" diff --git a/src/zm_user.h b/src/zm_user.h index 09f5a2f0a..648ef21db 100644 --- a/src/zm_user.h +++ b/src/zm_user.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "zm.h" diff --git a/src/zm_utils.cpp b/src/zm_utils.cpp index 67af64a66..e777a9266 100644 --- a/src/zm_utils.cpp +++ b/src/zm_utils.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // //#include "zm_logger.h" diff --git a/src/zm_utils.h b/src/zm_utils.h index a6cb2e150..6dbf76a4d 100644 --- a/src/zm_utils.h +++ b/src/zm_utils.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_UTILS_H diff --git a/src/zm_zone.cpp b/src/zm_zone.cpp index f3d1120bc..90ba855dc 100644 --- a/src/zm_zone.cpp +++ b/src/zm_zone.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "zm.h" diff --git a/src/zm_zone.h b/src/zm_zone.h index 9b8a63747..d2576c5d3 100644 --- a/src/zm_zone.h +++ b/src/zm_zone.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZM_ZONE_H diff --git a/src/zma.cpp b/src/zma.cpp index b9483d7c9..f9557ba59 100644 --- a/src/zma.cpp +++ b/src/zma.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // /* diff --git a/src/zmc.cpp b/src/zmc.cpp index 9afb37bcf..288fc0d7e 100644 --- a/src/zmc.cpp +++ b/src/zmc.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // /* diff --git a/src/zmf.cpp b/src/zmf.cpp index a739927f1..2245d9ba3 100644 --- a/src/zmf.cpp +++ b/src/zmf.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // /* diff --git a/src/zmf.h b/src/zmf.h index 211577309..9d5bab127 100644 --- a/src/zmf.h +++ b/src/zmf.h @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #ifndef ZMFILE_H diff --git a/src/zms.cpp b/src/zms.cpp index e40fcdf95..87eaf3202 100644 --- a/src/zms.cpp +++ b/src/zms.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include diff --git a/src/zmstreamer.cpp b/src/zmstreamer.cpp index b33c61246..74cc01226 100644 --- a/src/zmstreamer.cpp +++ b/src/zmstreamer.cpp @@ -17,7 +17,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /* diff --git a/src/zmu.cpp b/src/zmu.cpp index 0c5a5a41e..21b623c4b 100644 --- a/src/zmu.cpp +++ b/src/zmu.cpp @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // /* diff --git a/utils/mk_bigfont.pl b/utils/mk_bigfont.pl index ff2b1c30c..41ebb34bf 100755 --- a/utils/mk_bigfont.pl +++ b/utils/mk_bigfont.pl @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== diff --git a/web/css/reset.css b/web/css/reset.css index 12656ad4c..8bd161385 100644 --- a/web/css/reset.css +++ b/web/css/reset.css @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* diff --git a/web/includes/actions.php b/web/includes/actions.php index 3fc6f80c8..8c1300f37 100644 --- a/web/includes/actions.php +++ b/web/includes/actions.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // diff --git a/web/includes/config.php.in b/web/includes/config.php.in index ba96d9a54..801fa30cf 100644 --- a/web/includes/config.php.in +++ b/web/includes/config.php.in @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // diff --git a/web/includes/database.php b/web/includes/database.php index f9071026e..a23a2c8f1 100644 --- a/web/includes/database.php +++ b/web/includes/database.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // define( "DB_LOG_OFF", 0 ); diff --git a/web/includes/functions.php b/web/includes/functions.php index f386bee51..ba58bffaf 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // Compatibility functions diff --git a/web/includes/lang.php b/web/includes/lang.php index 30af6f4c0..b5dbda09d 100644 --- a/web/includes/lang.php +++ b/web/includes/lang.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // function translate( $name ) diff --git a/web/index.php b/web/index.php index 4beaaa985..d639b1ae4 100644 --- a/web/index.php +++ b/web/index.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // error_reporting( E_ALL ); diff --git a/web/js/logger.js b/web/js/logger.js index 1f4eb6752..c4e072541 100644 --- a/web/js/logger.js +++ b/web/js/logger.js @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !window.console ) diff --git a/web/lang/big5_big5.php b/web/lang/big5_big5.php index 631bdc1ce..382a0f89a 100644 --- a/web/lang/big5_big5.php +++ b/web/lang/big5_big5.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder Translation by diff --git a/web/lang/cn_zh.php b/web/lang/cn_zh.php index 2a17f42ea..bfaf32f90 100644 --- a/web/lang/cn_zh.php +++ b/web/lang/cn_zh.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder Translation by diff --git a/web/lang/cs_cz.php b/web/lang/cs_cz.php index 015b62921..01eda0118 100644 --- a/web/lang/cs_cz.php +++ b/web/lang/cs_cz.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder Czech Translation by Lukas Pokorny/Mlada Boleslav diff --git a/web/lang/de_de.php b/web/lang/de_de.php index c413c3755..424d91e94 100644 --- a/web/lang/de_de.php +++ b/web/lang/de_de.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder german Translation by Robert Schumann (rs at core82 dot de) diff --git a/web/lang/dk_dk.php b/web/lang/dk_dk.php index b04487d1b..54ad0df31 100644 --- a/web/lang/dk_dk.php +++ b/web/lang/dk_dk.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder Danish Translation by Tom Stage diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php index dc4398dae..c314a6ab3 100644 --- a/web/lang/en_gb.php +++ b/web/lang/en_gb.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder Translation by diff --git a/web/lang/en_us.php b/web/lang/en_us.php index 262e47cec..ed39227f0 100644 --- a/web/lang/en_us.php +++ b/web/lang/en_us.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder Translation by diff --git a/web/lang/es_ar.php b/web/lang/es_ar.php index 0f1b9b70d..e723af417 100644 --- a/web/lang/es_ar.php +++ b/web/lang/es_ar.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder Spanish 'Argentina' Translation by Fernando Diaz. diff --git a/web/lang/es_es.php b/web/lang/es_es.php index 03489b381..3e27d0fae 100644 --- a/web/lang/es_es.php +++ b/web/lang/es_es.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder Spanish 'Spain' Translation by Rafael Medina diff --git a/web/lang/fr_fr.php b/web/lang/fr_fr.php index 6c4eaca22..b140886fe 100644 --- a/web/lang/fr_fr.php +++ b/web/lang/fr_fr.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder French Translation by Jerome Hanoteau diff --git a/web/lang/he_il.php b/web/lang/he_il.php index 69f9348e5..43f220b4d 100644 --- a/web/lang/he_il.php +++ b/web/lang/he_il.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder Hebrew Translation by oc666@netvision.net.il diff --git a/web/lang/hu_hu.php b/web/lang/hu_hu.php index 56f763ae4..3f0928be1 100644 --- a/web/lang/hu_hu.php +++ b/web/lang/hu_hu.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // // ZoneMinder Hungarian Translation by szimszon at oregpreshaz dot eu, robi diff --git a/web/lang/it_it.php b/web/lang/it_it.php index d456b3c48..e6e603e88 100644 --- a/web/lang/it_it.php +++ b/web/lang/it_it.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder IT modified by Nicola Murino (23/09/2007) diff --git a/web/lang/ja_jp.php b/web/lang/ja_jp.php index f3a8aa049..b637ac3fd 100644 --- a/web/lang/ja_jp.php +++ b/web/lang/ja_jp.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder Japanese Translation by Andrew Arkley diff --git a/web/lang/nl_nl.php b/web/lang/nl_nl.php index 6106f2959..8d07eefa9 100644 --- a/web/lang/nl_nl.php +++ b/web/lang/nl_nl.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder Dutch Translation by Alco (a.k. nightcrawler) diff --git a/web/lang/pl_pl.php b/web/lang/pl_pl.php index 36f6841f1..4edb6b118 100644 --- a/web/lang/pl_pl.php +++ b/web/lang/pl_pl.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // // ZoneMinder Polish Translation by Robert Krysztof diff --git a/web/lang/ro_ro.php b/web/lang/ro_ro.php index 33d11aa0a..f0c440a9a 100644 --- a/web/lang/ro_ro.php +++ b/web/lang/ro_ro.php @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder Romanian translation by Alex Ciobanu // diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php index c2cd63a86..2d93c9f6a 100644 --- a/web/lang/ru_ru.php +++ b/web/lang/ru_ru.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder Russian Translation by Borodin A.S. diff --git a/web/lang/se_se.php b/web/lang/se_se.php index afb14e11d..60b26d741 100644 --- a/web/lang/se_se.php +++ b/web/lang/se_se.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // ZoneMinder Swedish Translation by Mikael Carlsson diff --git a/web/scripts/retag.sh b/web/scripts/retag.sh index f43ab4b68..2e8c283cf 100644 --- a/web/scripts/retag.sh +++ b/web/scripts/retag.sh @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/web/scripts/swap.pl b/web/scripts/swap.pl index 51c14f077..f65e67d95 100644 --- a/web/scripts/swap.pl +++ b/web/scripts/swap.pl @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/web/skins/classic/css/classic/skin.css b/web/skins/classic/css/classic/skin.css index f066837bb..04c99b36f 100644 --- a/web/skins/classic/css/classic/skin.css +++ b/web/skins/classic/css/classic/skin.css @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* diff --git a/web/skins/classic/css/dark/skin.css b/web/skins/classic/css/dark/skin.css index d8ecbc006..e65f2d109 100644 --- a/web/skins/classic/css/dark/skin.css +++ b/web/skins/classic/css/dark/skin.css @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* diff --git a/web/skins/classic/css/flat/skin.css b/web/skins/classic/css/flat/skin.css index 528eb6e4b..721dba009 100644 --- a/web/skins/classic/css/flat/skin.css +++ b/web/skins/classic/css/flat/skin.css @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* diff --git a/web/skins/classic/includes/config.php b/web/skins/classic/includes/config.php index 459bbc587..02bd04771 100644 --- a/web/skins/classic/includes/config.php +++ b/web/skins/classic/includes/config.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // $rates = array( diff --git a/web/skins/classic/includes/control_functions.php b/web/skins/classic/includes/control_functions.php index 3f6ca9d01..eb2a9cb15 100644 --- a/web/skins/classic/includes/control_functions.php +++ b/web/skins/classic/includes/control_functions.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // function getControlCommands( $monitor ) diff --git a/web/skins/classic/includes/export_functions.php b/web/skins/classic/includes/export_functions.php index 36a8e56d6..9d8ac6925 100644 --- a/web/skins/classic/includes/export_functions.php +++ b/web/skins/classic/includes/export_functions.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // function exportHeader( $title ) diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php index 2e1c43566..7fba6c5ac 100644 --- a/web/skins/classic/includes/functions.php +++ b/web/skins/classic/includes/functions.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // Only load new js & css in these views diff --git a/web/skins/classic/js/classic.js b/web/skins/classic/js/classic.js index 8868c8ce7..33061eee5 100644 --- a/web/skins/classic/js/classic.js +++ b/web/skins/classic/js/classic.js @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // diff --git a/web/skins/classic/js/dark.js b/web/skins/classic/js/dark.js index e99980f61..4331ddddd 100644 --- a/web/skins/classic/js/dark.js +++ b/web/skins/classic/js/dark.js @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // diff --git a/web/skins/classic/js/flat.js b/web/skins/classic/js/flat.js index 8b821f816..5e878a8b5 100644 --- a/web/skins/classic/js/flat.js +++ b/web/skins/classic/js/flat.js @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js index 8f92d233e..859b34fcd 100644 --- a/web/skins/classic/js/skin.js +++ b/web/skins/classic/js/skin.js @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php index d5d414111..2f49df239 100644 --- a/web/skins/classic/js/skin.js.php +++ b/web/skins/classic/js/skin.js.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // diff --git a/web/skins/classic/skin.php b/web/skins/classic/skin.php index c6af0dd59..739e3df46 100644 --- a/web/skins/classic/skin.php +++ b/web/skins/classic/skin.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( empty($_COOKIE['zmBandwidth']) ) diff --git a/web/skins/classic/views/bandwidth.php b/web/skins/classic/views/bandwidth.php index e0526311a..a1a2a7119 100644 --- a/web/skins/classic/views/bandwidth.php +++ b/web/skins/classic/views/bandwidth.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // $newBandwidth = $_COOKIE['zmBandwidth']; diff --git a/web/skins/classic/views/blank.php b/web/skins/classic/views/blank.php index ac5c9caa7..b1152832c 100644 --- a/web/skins/classic/views/blank.php +++ b/web/skins/classic/views/blank.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // ?> diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index 22368b619..b1d985e09 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // require_once('includes/Server.php'); diff --git a/web/skins/classic/views/control.php b/web/skins/classic/views/control.php index fe403abd1..a13ef750a 100644 --- a/web/skins/classic/views/control.php +++ b/web/skins/classic/views/control.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Control' ) ) diff --git a/web/skins/classic/views/controlcap.php b/web/skins/classic/views/controlcap.php index 88e0d1212..694cfc8a4 100644 --- a/web/skins/classic/views/controlcap.php +++ b/web/skins/classic/views/controlcap.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canEdit( 'Control' ) ) diff --git a/web/skins/classic/views/controlcaps.php b/web/skins/classic/views/controlcaps.php index 517f8141e..debf3afb0 100644 --- a/web/skins/classic/views/controlcaps.php +++ b/web/skins/classic/views/controlcaps.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Control' ) ) diff --git a/web/skins/classic/views/controlpreset.php b/web/skins/classic/views/controlpreset.php index a36d03db9..23fec060e 100644 --- a/web/skins/classic/views/controlpreset.php +++ b/web/skins/classic/views/controlpreset.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canEdit( 'Monitors' ) ) diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php index a49e43953..2d486a176 100644 --- a/web/skins/classic/views/cycle.php +++ b/web/skins/classic/views/cycle.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Stream' ) ) diff --git a/web/skins/classic/views/device.php b/web/skins/classic/views/device.php index 4b58d3e5f..489521d00 100644 --- a/web/skins/classic/views/device.php +++ b/web/skins/classic/views/device.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canEdit( 'Devices' ) ) diff --git a/web/skins/classic/views/devices.php b/web/skins/classic/views/devices.php index c2f7a384f..34f2efd49 100644 --- a/web/skins/classic/views/devices.php +++ b/web/skins/classic/views/devices.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Devices' ) ) diff --git a/web/skins/classic/views/donate.php b/web/skins/classic/views/donate.php index 35dd002a1..7293b16e2 100644 --- a/web/skins/classic/views/donate.php +++ b/web/skins/classic/views/donate.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canEdit( 'System' ) ) diff --git a/web/skins/classic/views/error.php b/web/skins/classic/views/error.php index 21741c557..31eaea7de 100644 --- a/web/skins/classic/views/error.php +++ b/web/skins/classic/views/error.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // $focusWindow = true; diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php index d90ce4fda..a66781907 100644 --- a/web/skins/classic/views/event.php +++ b/web/skins/classic/views/event.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Events' ) ) diff --git a/web/skins/classic/views/eventdetail.php b/web/skins/classic/views/eventdetail.php index e6b02aec5..491de763f 100644 --- a/web/skins/classic/views/eventdetail.php +++ b/web/skins/classic/views/eventdetail.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canEdit( 'Events' ) ) diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php index e090617d0..3946da2db 100644 --- a/web/skins/classic/views/events.php +++ b/web/skins/classic/views/events.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Events' ) || (!empty($_REQUEST['execute']) && !canEdit('Events')) ) diff --git a/web/skins/classic/views/export.php b/web/skins/classic/views/export.php index 5585b96c4..2c9205bee 100644 --- a/web/skins/classic/views/export.php +++ b/web/skins/classic/views/export.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Events' ) ) diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php index c8f4d7554..390e94ee1 100644 --- a/web/skins/classic/views/filter.php +++ b/web/skins/classic/views/filter.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Events' ) ) diff --git a/web/skins/classic/views/filtersave.php b/web/skins/classic/views/filtersave.php index 52ced4265..924ab3d48 100644 --- a/web/skins/classic/views/filtersave.php +++ b/web/skins/classic/views/filtersave.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canEdit( 'Events' ) ) diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php index abb4a3cc7..96289f7bc 100644 --- a/web/skins/classic/views/frame.php +++ b/web/skins/classic/views/frame.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Events' ) ) diff --git a/web/skins/classic/views/frames.php b/web/skins/classic/views/frames.php index 5883286ca..b4b777b96 100644 --- a/web/skins/classic/views/frames.php +++ b/web/skins/classic/views/frames.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Events' ) ) diff --git a/web/skins/classic/views/function.php b/web/skins/classic/views/function.php index a52020185..443a276d7 100644 --- a/web/skins/classic/views/function.php +++ b/web/skins/classic/views/function.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canEdit( 'Monitors' ) ) diff --git a/web/skins/classic/views/group.php b/web/skins/classic/views/group.php index 1236835b9..159575537 100644 --- a/web/skins/classic/views/group.php +++ b/web/skins/classic/views/group.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canEdit( 'Groups' ) ) diff --git a/web/skins/classic/views/groups.php b/web/skins/classic/views/groups.php index 1cd1e66b4..74df85dad 100644 --- a/web/skins/classic/views/groups.php +++ b/web/skins/classic/views/groups.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Groups' ) ) { diff --git a/web/skins/classic/views/log.php b/web/skins/classic/views/log.php index 50ba58d42..bc97cf879 100644 --- a/web/skins/classic/views/log.php +++ b/web/skins/classic/views/log.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'System' ) ) diff --git a/web/skins/classic/views/logout.php b/web/skins/classic/views/logout.php index f8b83157b..6b0f7eca7 100644 --- a/web/skins/classic/views/logout.php +++ b/web/skins/classic/views/logout.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // $focusWindow = true; diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index fff1b8f17..5ef870a63 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // require_once( 'includes/Server.php'); diff --git a/web/skins/classic/views/monitorpreset.php b/web/skins/classic/views/monitorpreset.php index db2c06252..0603f9d56 100644 --- a/web/skins/classic/views/monitorpreset.php +++ b/web/skins/classic/views/monitorpreset.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canEdit( 'Monitors' ) ) diff --git a/web/skins/classic/views/monitorprobe.php b/web/skins/classic/views/monitorprobe.php index 8714383fc..d89858cae 100644 --- a/web/skins/classic/views/monitorprobe.php +++ b/web/skins/classic/views/monitorprobe.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canEdit( 'Monitors' ) ) diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php index fc86ad64b..2016889fb 100644 --- a/web/skins/classic/views/montage.php +++ b/web/skins/classic/views/montage.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Stream' ) ) diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php index 6f1c3e482..4c1195190 100644 --- a/web/skins/classic/views/montagereview.php +++ b/web/skins/classic/views/montagereview.php @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // diff --git a/web/skins/classic/views/none.php b/web/skins/classic/views/none.php index 72a5f1045..29ea57dcd 100644 --- a/web/skins/classic/views/none.php +++ b/web/skins/classic/views/none.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // $skinJsPhpFile = getSkinFile( 'js/skin.js.php' ); diff --git a/web/skins/classic/views/onvifprobe.php b/web/skins/classic/views/onvifprobe.php index 01e52ee38..2095e14e9 100644 --- a/web/skins/classic/views/onvifprobe.php +++ b/web/skins/classic/views/onvifprobe.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canEdit( 'Monitors' ) ) diff --git a/web/skins/classic/views/optionhelp.php b/web/skins/classic/views/optionhelp.php index fbfd3be69..705c5101f 100644 --- a/web/skins/classic/views/optionhelp.php +++ b/web/skins/classic/views/optionhelp.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // $optionHelpIndex = preg_replace( '/^ZM_/', '', $_REQUEST['option'] ); diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php index 1140b7bfd..854f2560c 100644 --- a/web/skins/classic/views/options.php +++ b/web/skins/classic/views/options.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'System' ) ) diff --git a/web/skins/classic/views/plugin.php b/web/skins/classic/views/plugin.php index 3061ea394..dd7de246a 100644 --- a/web/skins/classic/views/plugin.php +++ b/web/skins/classic/views/plugin.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // diff --git a/web/skins/classic/views/postlogin.php b/web/skins/classic/views/postlogin.php index c27b773c8..8177dcd01 100644 --- a/web/skins/classic/views/postlogin.php +++ b/web/skins/classic/views/postlogin.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // xhtmlHeaders(__FILE__, translate('LoggingIn') ); diff --git a/web/skins/classic/views/server.php b/web/skins/classic/views/server.php index 83df0501e..a155b9b1a 100644 --- a/web/skins/classic/views/server.php +++ b/web/skins/classic/views/server.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canEdit( 'System' ) ) diff --git a/web/skins/classic/views/settings.php b/web/skins/classic/views/settings.php index 3302d2063..e5ac9707b 100644 --- a/web/skins/classic/views/settings.php +++ b/web/skins/classic/views/settings.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Control' ) ) diff --git a/web/skins/classic/views/state.php b/web/skins/classic/views/state.php index e55e4e234..47f9be8d3 100644 --- a/web/skins/classic/views/state.php +++ b/web/skins/classic/views/state.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canEdit( 'System' ) ) diff --git a/web/skins/classic/views/stats.php b/web/skins/classic/views/stats.php index 55a9fab6e..2270eefe8 100644 --- a/web/skins/classic/views/stats.php +++ b/web/skins/classic/views/stats.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Events' ) ) diff --git a/web/skins/classic/views/status.php b/web/skins/classic/views/status.php index 9bfa3ed19..ae5a7f632 100644 --- a/web/skins/classic/views/status.php +++ b/web/skins/classic/views/status.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'System' ) ) diff --git a/web/skins/classic/views/timeline.php b/web/skins/classic/views/timeline.php index fae579546..24963912d 100644 --- a/web/skins/classic/views/timeline.php +++ b/web/skins/classic/views/timeline.php @@ -14,7 +14,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Events' ) ) diff --git a/web/skins/classic/views/user.php b/web/skins/classic/views/user.php index d6f577604..9d5e38bfd 100644 --- a/web/skins/classic/views/user.php +++ b/web/skins/classic/views/user.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // $selfEdit = ZM_USER_SELF_EDIT && $_REQUEST['uid'] == $user['Id']; diff --git a/web/skins/classic/views/version.php b/web/skins/classic/views/version.php index dca598b7c..e2db1de68 100644 --- a/web/skins/classic/views/version.php +++ b/web/skins/classic/views/version.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canEdit( 'System' ) ) diff --git a/web/skins/classic/views/video.php b/web/skins/classic/views/video.php index 34537f0b2..cfbb6f929 100644 --- a/web/skins/classic/views/video.php +++ b/web/skins/classic/views/video.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Events' ) ) diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php index 492ed5b29..48d25cb65 100644 --- a/web/skins/classic/views/watch.php +++ b/web/skins/classic/views/watch.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // require_once('includes/Monitor.php'); diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php index c7875e08a..b0dd88508 100644 --- a/web/skins/classic/views/zone.php +++ b/web/skins/classic/views/zone.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Monitors' ) ) diff --git a/web/skins/classic/views/zones.php b/web/skins/classic/views/zones.php index f9f4c65ed..ee767acf1 100644 --- a/web/skins/classic/views/zones.php +++ b/web/skins/classic/views/zones.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Monitors' ) ) diff --git a/web/views/file.php b/web/views/file.php index 772226a55..9b49ff059 100644 --- a/web/views/file.php +++ b/web/views/file.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // if ( !canView( 'Events' ) ) diff --git a/web/views/image.php b/web/views/image.php index 0135df7e0..a7aacb6d2 100644 --- a/web/views/image.php +++ b/web/views/image.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // // Calling sequence: ... /zm/index.php?view=image&path=/monid/path/image.jpg&scale=nnn&width=wwww&height=hhhhh diff --git a/zmconfgen.pl.in b/zmconfgen.pl.in index 5acc98daa..cbffa1e6d 100644 --- a/zmconfgen.pl.in +++ b/zmconfgen.pl.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # From 0d1dbf1745cc4501bf3237750e8a5662b1138085 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 26 Dec 2016 09:31:11 -0600 Subject: [PATCH 29/38] fix rpm specfile versioning in changelog --- distros/redhat/zoneminder.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index a5b9da92c..fbf75d0af 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -305,41 +305,41 @@ rm -rf %{_docdir}/%{name}-%{version} %dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder %changelog -* Fri Dec 23 2016 Andrew Bauer - 1.30.1 +* Fri Dec 23 2016 Andrew Bauer - 1.30.1-1 - Consolidate fedora/centos spec files - Add preliminary nginx support - New contact email -* Thu Mar 3 2016 Andrew Bauer - 1.30.0 +* Thu Mar 3 2016 Andrew Bauer - 1.30.0-1 - Bump version fo 1.30.0 release. -* Sat Nov 21 2015 Andrew Bauer - 1.29.0 +* Sat Nov 21 2015 Andrew Bauer - 1.29.0-1 - Bump version for 1.29.0 release on Fedora 23. -* Sat Feb 14 2015 Andrew Bauer - 1.28.1 +* Sat Feb 14 2015 Andrew Bauer - 1.28.1-1 - Bump version for 1.28.1 release on Fedora 21. -* Sun Oct 5 2014 Andrew Bauer - 1.28.0 +* Sun Oct 5 2014 Andrew Bauer - 1.28.0-1 - Bump version for 1.28.0 release. -* Fri Mar 14 2014 Andrew Bauer - 1.27 +* Fri Mar 14 2014 Andrew Bauer - 1.27-1 - Tweak build requirements for cmake -* Sat Feb 01 2014 Andrew Bauer - 1.27 +* Sat Feb 01 2014 Andrew Bauer - 1.27-1 - Add zmcamtool.pl. Bump version for 1.27 release. -* Mon Dec 16 2013 Andrew Bauer - 1.26.5 +* Mon Dec 16 2013 Andrew Bauer - 1.26.5-1 - This is a bug fixe release - RTSP fixes, cmake enhancements, couple other misc fixes -* Mon Oct 07 2013 Andrew Bauer - 1.26.4 +* Mon Oct 07 2013 Andrew Bauer - 1.26.4-1 - Initial cmake build. -* Sat Oct 05 2013 Andrew Bauer - 1.26.4 +* Sat Oct 05 2013 Andrew Bauer - 1.26.4-1 - Fedora specific path changes have been moved to zoneminder-1.26.0-defaults.patch - All files are now part of the zoneminder source tree. Update specfile accordingly. -* Sat Sep 21 2013 Andrew Bauer - 1.26.3 +* Sat Sep 21 2013 Andrew Bauer - 1.26.3-1 - Initial rebuild for ZoneMinder 1.26.3 release. * Fri Feb 15 2013 Fedora Release Engineering - 1.25.0-13 From 2dda2d9e1eb3ef15212d25c0159f770364cfe2ea Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Mon, 26 Dec 2016 09:49:14 -0600 Subject: [PATCH 30/38] remove unneeded, empty files --- web/api/app/Console/Command/Task/empty | 0 web/api/app/Console/Templates/empty | 0 web/api/app/Controller/Component/empty | 0 web/api/app/Lib/empty | 0 web/api/app/Locale/eng/LC_MESSAGES/empty | 0 web/api/app/Model/Behavior/empty | 0 web/api/app/Model/Datasource/empty | 0 web/api/app/Plugin/empty | 0 web/api/app/Test/Case/Controller/Component/empty | 0 web/api/app/Test/Case/Model/Behavior/empty | 0 web/api/app/Test/Case/View/Helper/empty | 0 web/api/app/Test/Fixture/empty | 0 web/api/app/Vendor/empty | 0 web/api/app/View/Elements/empty | 0 web/api/app/View/Scaffolds/empty | 0 web/api/app/View/View/Elements/empty | 0 web/api/app/View/View/Scaffolds/empty | 0 web/api/app/webroot/files/empty | 0 web/api/app/webroot/js/empty | 0 .../lib/Cake/Console/Templates/skel/Console/Command/Task/empty | 0 web/api/lib/Cake/Console/Templates/skel/Console/Templates/empty | 0 .../lib/Cake/Console/Templates/skel/Controller/Component/empty | 0 web/api/lib/Cake/Console/Templates/skel/Lib/empty | 0 .../lib/Cake/Console/Templates/skel/Locale/eng/LC_MESSAGES/empty | 0 web/api/lib/Cake/Console/Templates/skel/Model/Behavior/empty | 0 web/api/lib/Cake/Console/Templates/skel/Model/Datasource/empty | 0 web/api/lib/Cake/Console/Templates/skel/Plugin/empty | 0 .../Console/Templates/skel/Test/Case/Controller/Component/empty | 0 .../Cake/Console/Templates/skel/Test/Case/Model/Behavior/empty | 0 .../lib/Cake/Console/Templates/skel/Test/Case/View/Helper/empty | 0 web/api/lib/Cake/Console/Templates/skel/Test/Fixture/empty | 0 web/api/lib/Cake/Console/Templates/skel/Vendor/empty | 0 web/api/lib/Cake/Console/Templates/skel/View/Elements/empty | 0 web/api/lib/Cake/Console/Templates/skel/View/Scaffolds/empty | 0 web/api/lib/Cake/Console/Templates/skel/webroot/files/empty | 0 web/api/lib/Cake/Console/Templates/skel/webroot/js/empty | 0 web/api/lib/Cake/Test/test_app/Console/Command/Task/empty | 0 web/api/lib/Cake/Test/test_app/Controller/Component/empty | 0 .../Cake/Test/test_app/Plugin/TestPlugin/Console/Templates/empty | 0 .../test_app/Plugin/TestPluginTwo/Console/Command/Task/empty | 0 .../Test/test_app/Plugin/TestPluginTwo/Console/Templates/empty | 0 web/api/lib/Cake/Test/test_app/View/Scaffolds/empty | 0 web/api/lib/Cake/Test/test_app/tmp/empty | 0 web/index.php | 1 - web/skins/classic/includes/init.php | 0 web/skins/classic/views/js/plugin.js.php | 0 web/skins/classic/views/nph-zms | 0 47 files changed, 1 deletion(-) delete mode 100644 web/api/app/Console/Command/Task/empty delete mode 100644 web/api/app/Console/Templates/empty delete mode 100644 web/api/app/Controller/Component/empty delete mode 100644 web/api/app/Lib/empty delete mode 100644 web/api/app/Locale/eng/LC_MESSAGES/empty delete mode 100644 web/api/app/Model/Behavior/empty delete mode 100644 web/api/app/Model/Datasource/empty delete mode 100644 web/api/app/Plugin/empty delete mode 100644 web/api/app/Test/Case/Controller/Component/empty delete mode 100644 web/api/app/Test/Case/Model/Behavior/empty delete mode 100644 web/api/app/Test/Case/View/Helper/empty delete mode 100644 web/api/app/Test/Fixture/empty delete mode 100644 web/api/app/Vendor/empty delete mode 100644 web/api/app/View/Elements/empty delete mode 100644 web/api/app/View/Scaffolds/empty delete mode 100644 web/api/app/View/View/Elements/empty delete mode 100644 web/api/app/View/View/Scaffolds/empty delete mode 100644 web/api/app/webroot/files/empty delete mode 100644 web/api/app/webroot/js/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/Console/Command/Task/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/Console/Templates/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/Controller/Component/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/Lib/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/Locale/eng/LC_MESSAGES/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/Model/Behavior/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/Model/Datasource/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/Plugin/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/Test/Case/Controller/Component/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/Test/Case/Model/Behavior/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/Test/Case/View/Helper/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/Test/Fixture/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/Vendor/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/View/Elements/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/View/Scaffolds/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/webroot/files/empty delete mode 100644 web/api/lib/Cake/Console/Templates/skel/webroot/js/empty delete mode 100644 web/api/lib/Cake/Test/test_app/Console/Command/Task/empty delete mode 100644 web/api/lib/Cake/Test/test_app/Controller/Component/empty delete mode 100644 web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Templates/empty delete mode 100644 web/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/Task/empty delete mode 100644 web/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Templates/empty delete mode 100644 web/api/lib/Cake/Test/test_app/View/Scaffolds/empty delete mode 100644 web/api/lib/Cake/Test/test_app/tmp/empty delete mode 100644 web/skins/classic/includes/init.php delete mode 100644 web/skins/classic/views/js/plugin.js.php delete mode 100644 web/skins/classic/views/nph-zms diff --git a/web/api/app/Console/Command/Task/empty b/web/api/app/Console/Command/Task/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/Console/Templates/empty b/web/api/app/Console/Templates/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/Controller/Component/empty b/web/api/app/Controller/Component/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/Lib/empty b/web/api/app/Lib/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/Locale/eng/LC_MESSAGES/empty b/web/api/app/Locale/eng/LC_MESSAGES/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/Model/Behavior/empty b/web/api/app/Model/Behavior/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/Model/Datasource/empty b/web/api/app/Model/Datasource/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/Plugin/empty b/web/api/app/Plugin/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/Test/Case/Controller/Component/empty b/web/api/app/Test/Case/Controller/Component/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/Test/Case/Model/Behavior/empty b/web/api/app/Test/Case/Model/Behavior/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/Test/Case/View/Helper/empty b/web/api/app/Test/Case/View/Helper/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/Test/Fixture/empty b/web/api/app/Test/Fixture/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/Vendor/empty b/web/api/app/Vendor/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/View/Elements/empty b/web/api/app/View/Elements/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/View/Scaffolds/empty b/web/api/app/View/Scaffolds/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/View/View/Elements/empty b/web/api/app/View/View/Elements/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/View/View/Scaffolds/empty b/web/api/app/View/View/Scaffolds/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/webroot/files/empty b/web/api/app/webroot/files/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/app/webroot/js/empty b/web/api/app/webroot/js/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/Console/Command/Task/empty b/web/api/lib/Cake/Console/Templates/skel/Console/Command/Task/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/Console/Templates/empty b/web/api/lib/Cake/Console/Templates/skel/Console/Templates/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/Controller/Component/empty b/web/api/lib/Cake/Console/Templates/skel/Controller/Component/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/Lib/empty b/web/api/lib/Cake/Console/Templates/skel/Lib/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/Locale/eng/LC_MESSAGES/empty b/web/api/lib/Cake/Console/Templates/skel/Locale/eng/LC_MESSAGES/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/Model/Behavior/empty b/web/api/lib/Cake/Console/Templates/skel/Model/Behavior/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/Model/Datasource/empty b/web/api/lib/Cake/Console/Templates/skel/Model/Datasource/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/Plugin/empty b/web/api/lib/Cake/Console/Templates/skel/Plugin/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/Test/Case/Controller/Component/empty b/web/api/lib/Cake/Console/Templates/skel/Test/Case/Controller/Component/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/Test/Case/Model/Behavior/empty b/web/api/lib/Cake/Console/Templates/skel/Test/Case/Model/Behavior/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/Test/Case/View/Helper/empty b/web/api/lib/Cake/Console/Templates/skel/Test/Case/View/Helper/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/Test/Fixture/empty b/web/api/lib/Cake/Console/Templates/skel/Test/Fixture/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/Vendor/empty b/web/api/lib/Cake/Console/Templates/skel/Vendor/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Elements/empty b/web/api/lib/Cake/Console/Templates/skel/View/Elements/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Scaffolds/empty b/web/api/lib/Cake/Console/Templates/skel/View/Scaffolds/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/webroot/files/empty b/web/api/lib/Cake/Console/Templates/skel/webroot/files/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Console/Templates/skel/webroot/js/empty b/web/api/lib/Cake/Console/Templates/skel/webroot/js/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Test/test_app/Console/Command/Task/empty b/web/api/lib/Cake/Test/test_app/Console/Command/Task/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Test/test_app/Controller/Component/empty b/web/api/lib/Cake/Test/test_app/Controller/Component/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Templates/empty b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Templates/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/Task/empty b/web/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/Task/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Templates/empty b/web/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Templates/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Test/test_app/View/Scaffolds/empty b/web/api/lib/Cake/Test/test_app/View/Scaffolds/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/api/lib/Cake/Test/test_app/tmp/empty b/web/api/lib/Cake/Test/test_app/tmp/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/index.php b/web/index.php index d639b1ae4..73993f527 100644 --- a/web/index.php +++ b/web/index.php @@ -109,7 +109,6 @@ define( "ZM_SKIN_PATH", "skins/$skin" ); $skinBase = array(); // To allow for inheritance of skins if ( !file_exists( ZM_SKIN_PATH ) ) Fatal( "Invalid skin '$skin'" ); -require_once( ZM_SKIN_PATH.'/includes/init.php' ); $skinBase[] = $skin; ini_set( "session.name", "ZMSESSID" ); diff --git a/web/skins/classic/includes/init.php b/web/skins/classic/includes/init.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/skins/classic/views/js/plugin.js.php b/web/skins/classic/views/js/plugin.js.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/skins/classic/views/nph-zms b/web/skins/classic/views/nph-zms deleted file mode 100644 index e69de29bb..000000000 From 56277bce0963dd9eb74bd754687faad1d14675c4 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 26 Dec 2016 10:07:38 -0600 Subject: [PATCH 31/38] minor rpm specfile changes --- distros/redhat/zoneminder.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index fbf75d0af..d18481ff6 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -142,7 +142,7 @@ echo -e "\nCreating and installing a ZoneMinder SELinux policy module. Please wa %if 0%{?with_init_systemd} # Initial installation if [ $1 -eq 1 ] ; then - /bin/systemctl daemon-reload >/dev/null 2>&1 || : + %systemd_post %{name}.service fi %endif @@ -222,7 +222,6 @@ rm -rf %{_docdir}/%{name}-%{version} %endif %if 0%{?with_init_systemd} -/bin/systemctl daemon-reload >/dev/null 2>&1 || : %systemd_postun_with_restart %{name}.service %endif From 0f15b3ae62ec43bd89d8cc0bce5244daee09b83a Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Mon, 26 Dec 2016 10:33:03 -0600 Subject: [PATCH 32/38] update gpl 2 mailing address --- onvif/README | 2 +- onvif/modules/lib/ONVIF/Client.pm | 2 +- onvif/modules/lib/ONVIF/Deserializer/MessageParser.pm | 2 +- onvif/modules/lib/ONVIF/Deserializer/XSD.pm | 2 +- onvif/modules/lib/ONVIF/Serializer/Base.pm | 2 +- onvif/modules/lib/ONVIF/Serializer/SOAP11.pm | 2 +- onvif/modules/lib/ONVIF/Serializer/SOAP12.pm | 2 +- onvif/modules/lib/WSDiscovery/TransportUDP.pm | 2 +- onvif/modules/lib/WSSecurity/SecuritySerializer.pm | 2 +- onvif/scripts/zmonvif-probe.pl | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/FI8908W.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/FI8918W.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/Keekoon.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/LoftekSentinel.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/Wanscam.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/WanscamHW0025.pm | 2 +- scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/onvif/README b/onvif/README index 25065e18a..06df9cc64 100644 --- a/onvif/README +++ b/onvif/README @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -------------------------------------------------------------------------- 1. PURPOSE diff --git a/onvif/modules/lib/ONVIF/Client.pm b/onvif/modules/lib/ONVIF/Client.pm index c835caca9..00137b90a 100644 --- a/onvif/modules/lib/ONVIF/Client.pm +++ b/onvif/modules/lib/ONVIF/Client.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/onvif/modules/lib/ONVIF/Deserializer/MessageParser.pm b/onvif/modules/lib/ONVIF/Deserializer/MessageParser.pm index 0e4b6dcfb..218a4caa5 100644 --- a/onvif/modules/lib/ONVIF/Deserializer/MessageParser.pm +++ b/onvif/modules/lib/ONVIF/Deserializer/MessageParser.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/onvif/modules/lib/ONVIF/Deserializer/XSD.pm b/onvif/modules/lib/ONVIF/Deserializer/XSD.pm index b4694d90d..215a3cb4d 100644 --- a/onvif/modules/lib/ONVIF/Deserializer/XSD.pm +++ b/onvif/modules/lib/ONVIF/Deserializer/XSD.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/onvif/modules/lib/ONVIF/Serializer/Base.pm b/onvif/modules/lib/ONVIF/Serializer/Base.pm index adbb173c6..e68ef9ae3 100644 --- a/onvif/modules/lib/ONVIF/Serializer/Base.pm +++ b/onvif/modules/lib/ONVIF/Serializer/Base.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/onvif/modules/lib/ONVIF/Serializer/SOAP11.pm b/onvif/modules/lib/ONVIF/Serializer/SOAP11.pm index 442a11d7a..c3c4caf60 100644 --- a/onvif/modules/lib/ONVIF/Serializer/SOAP11.pm +++ b/onvif/modules/lib/ONVIF/Serializer/SOAP11.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/onvif/modules/lib/ONVIF/Serializer/SOAP12.pm b/onvif/modules/lib/ONVIF/Serializer/SOAP12.pm index 2805ea40f..d0e589cac 100644 --- a/onvif/modules/lib/ONVIF/Serializer/SOAP12.pm +++ b/onvif/modules/lib/ONVIF/Serializer/SOAP12.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/onvif/modules/lib/WSDiscovery/TransportUDP.pm b/onvif/modules/lib/WSDiscovery/TransportUDP.pm index 007fcf053..5bbf05671 100644 --- a/onvif/modules/lib/WSDiscovery/TransportUDP.pm +++ b/onvif/modules/lib/WSDiscovery/TransportUDP.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/onvif/modules/lib/WSSecurity/SecuritySerializer.pm b/onvif/modules/lib/WSSecurity/SecuritySerializer.pm index 11a918af7..a99d9064c 100644 --- a/onvif/modules/lib/WSSecurity/SecuritySerializer.pm +++ b/onvif/modules/lib/WSSecurity/SecuritySerializer.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/onvif/scripts/zmonvif-probe.pl b/onvif/scripts/zmonvif-probe.pl index a5aee9574..c66403e56 100755 --- a/onvif/scripts/zmonvif-probe.pl +++ b/onvif/scripts/zmonvif-probe.pl @@ -18,7 +18,7 @@ use strict; # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8908W.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8908W.pm index dd30484c3..de4d56346 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8908W.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8908W.pm @@ -16,7 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8918W.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8918W.pm index c9997526d..9d023320a 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8918W.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8918W.pm @@ -28,7 +28,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm index cd21316d3..01cff6c62 100755 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Keekoon.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Keekoon.pm index 09edb7d47..0fc14135d 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Keekoon.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Keekoon.pm @@ -16,7 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # ========================================================================== # # Tested: KK002 (22 July 2016) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/LoftekSentinel.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/LoftekSentinel.pm index 610b8d78c..a5500e2b0 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/LoftekSentinel.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/LoftekSentinel.pm @@ -18,7 +18,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm index 0e273b5b7..6aefbb6c3 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm @@ -16,7 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Wanscam.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Wanscam.pm index f419aacfc..894fe970d 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Wanscam.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Wanscam.pm @@ -31,7 +31,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/WanscamHW0025.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/WanscamHW0025.pm index 3dd9c2cc5..3459c097f 100755 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/WanscamHW0025.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/WanscamHW0025.pm @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm index 76b161582..8214b9f5d 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # From 25ab1bee1816a3ea772a4a22fd34d60dd4fe6c2d Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Mon, 26 Dec 2016 10:40:09 -0600 Subject: [PATCH 33/38] more fixed to gpl license text --- .../lib/ZoneMinder/Control/IPCC7210W.pm | 0 .../lib/ZoneMinder/Control/SPP1802SWPTZ.pm | 6 ++-- .../lib/ZoneMinder/Control/WanscamHW0025.pm | 0 web/lang/et_ee.php | 32 +++++++++++-------- 4 files changed, 22 insertions(+), 16 deletions(-) mode change 100755 => 100644 scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm mode change 100755 => 100644 scripts/ZoneMinder/lib/ZoneMinder/Control/WanscamHW0025.pm diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm old mode 100755 new mode 100644 diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/SPP1802SWPTZ.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/SPP1802SWPTZ.pm index 77d2da751..0f7a75012 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/SPP1802SWPTZ.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/SPP1802SWPTZ.pm @@ -16,9 +16,9 @@ # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more # details. # -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place - Suite 330, Boston, MA 02111-1307, USA. +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # ========================================================================== # diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/WanscamHW0025.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/WanscamHW0025.pm old mode 100755 new mode 100644 diff --git a/web/lang/et_ee.php b/web/lang/et_ee.php index b48192507..cb990495a 100644 --- a/web/lang/et_ee.php +++ b/web/lang/et_ee.php @@ -1,19 +1,25 @@ Date: Tue, 27 Dec 2016 09:06:50 -0600 Subject: [PATCH 34/38] update rpm specfile --- distros/redhat/zoneminder.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index d18481ff6..d2e41ef2e 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -44,10 +44,9 @@ Group: System Environment/Daemons License: GPLv2+ and LGPLv2+ and MIT URL: http://www.zoneminder.com/ -#Source: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz Source: ZoneMinder-%{version}.tar.gz -%{?with_init_systemd:BuildRequires: systemd systemd-devel mariadb-devel perl-podlators} +%{?with_init_systemd:BuildRequires: systemd-devel mariadb-devel perl-podlators} %{?with_init_sysv:BuildRequires: mysql-devel} BuildRequires: cmake >= 2.8.7 BuildRequires: gnutls-devel bzip2-devel @@ -59,10 +58,8 @@ BuildRequires: perl(MIME::Entity) perl(MIME::Lite) BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap) BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign) BuildRequires: perl(Expect) perl(Sys::Syslog) -BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime) BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel BuildRequires: ffmpeg-devel polkit-devel -BuildRequires: ffmpeg %{?with_nginx:Requires: nginx fcgiwrap php-fpm} %{!?with_nginx:Requires: httpd} @@ -73,9 +70,12 @@ Requires: libjpeg-turbo vlc-core libcurl ffmpeg Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP) -Requires: perl(LWP::Protocol::https) +Requires: perl(LWP::Protocol::https) perl(X10::ActiveHome) perl(Astro::SunTime) + +%{?with_init_systemd:Requires(post): systemd systemd-sysv} +%{?with_init_systemd:Requires(preun): systemd} +%{?with_init_systemd:Requires(postun): systemd} -%{?with_init_systemd:%{systemd_requires}} %{?with_init_sysv:Requires(post): /sbin/chkconfig} %{?with_init_sysv:Requires(post): %{_bindir}/checkmodule} %{?with_init_sysv:Requires(post): %{_bindir}/semodule_package} @@ -158,7 +158,7 @@ if [ $1 -eq 2 ] ; then # We can't run this automatically when new sql account permissions need to # be manually added first # Run zmupdate non-interactively - #%{_bindir}/zmupdate.pl --nointeractive + # zmupdate.pl --nointeractive fi # Allow zoneminder access to local video sources, serial ports, and x10 @@ -301,7 +301,7 @@ rm -rf %{_docdir}/%{name}-%{version} %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp %dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder %dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload -%dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder +%dir %attr(755,%{zmuid_final},%{zmgid_final}) %ghost /run/zoneminder %changelog * Fri Dec 23 2016 Andrew Bauer - 1.30.1-1 From 76db2e811df5e78d74c4283b006397d0174761ee Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Wed, 28 Dec 2016 09:27:30 -0600 Subject: [PATCH 35/38] more rpm specfile changes --- distros/redhat/zoneminder.spec | 41 +++++++++++----------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index d2e41ef2e..7dae9546a 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -1,8 +1,9 @@ -%global zmuid $(id -un) -%global zmgid $(id -gn) %global zmuid_final apache %global zmgid_final apache +# In some cases older distros do not have this macro defined +%{!?make_build: %global make_build %{__make} %{?_smp_mflags} } + %if "%{zmuid_final}" == "nginx" %global with_nginx 1 %global wwwconfdir /etc/nginx/default.d @@ -35,7 +36,7 @@ Name: zoneminder Version: 1.30.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons # jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/ @@ -98,7 +99,7 @@ designed to support as many cameras as you can attach to your computer without too much degradation of performance. %prep -%setup -q -n ZoneMinder-%{version} +%autosetup -n ZoneMinder-%{version} # Change the following default values ./utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin-zm/nph-zms @@ -117,11 +118,10 @@ too much degradation of performance. -DZM_TARGET_DISTRO="%{zmtargetdistro}" \ . -make %{?_smp_mflags} +%make_build %install -export DESTDIR=%{buildroot} -make install +%make_install # Remove unwanted files and folders find %{buildroot} \( -name .packlist -or -name .git -or -name .gitignore -or -name .gitattributes -or -name .travis.yml \) -type f -delete > /dev/null 2>&1 || : @@ -238,8 +238,8 @@ rm -rf %{_docdir}/%{name}-%{version} %endif %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README.md distros/redhat/readme/README.%{readme_suffix} distros/redhat/readme/README.https distros/redhat/jscalendar-doc +%license COPYING +%doc AUTHORS README.md distros/redhat/readme/README.%{readme_suffix} distros/redhat/readme/README.https distros/redhat/jscalendar-doc %config(noreplace) %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf %config(noreplace) %attr(644,root,root) %{wwwconfdir}/zoneminder.conf %config(noreplace) /etc/logrotate.d/zoneminder @@ -258,25 +258,7 @@ rm -rf %{_docdir}/%{name}-%{version} %attr(755,root,root) %{_initrddir}/zoneminder %endif -%{_bindir}/zma -%{_bindir}/zmaudit.pl -%{_bindir}/zmc -%{_bindir}/zmcontrol.pl -%{_bindir}/zmdc.pl -%{_bindir}/zmf -%{_bindir}/zmfilter.pl -%{_bindir}/zmpkg.pl -%{_bindir}/zmtrack.pl -%{_bindir}/zmtrigger.pl -%{_bindir}/zmu -%{_bindir}/zmupdate.pl -%{_bindir}/zmvideo.pl -%{_bindir}/zmwatch.pl -%{_bindir}/zmcamtool.pl -%{_bindir}/zmsystemctl.pl -%{_bindir}/zmtelemetry.pl -%{_bindir}/zmx10.pl -%{_bindir}/zmonvif-probe.pl +%{_bindir}/* %{perl_vendorlib}/ZoneMinder* %{perl_vendorlib}/ONVIF* @@ -304,6 +286,9 @@ rm -rf %{_docdir}/%{name}-%{version} %dir %attr(755,%{zmuid_final},%{zmgid_final}) %ghost /run/zoneminder %changelog +* Wed Dec 28 2016 Andrew Bauer - 1.30.1-2 +- Changes from rpmfusion #4393 + * Fri Dec 23 2016 Andrew Bauer - 1.30.1-1 - Consolidate fedora/centos spec files - Add preliminary nginx support From 0d549f1db3128b767faae06e12ad5d621eca820c Mon Sep 17 00:00:00 2001 From: klemens Date: Thu, 29 Dec 2016 10:31:05 +0100 Subject: [PATCH 36/38] spelling fixes --- CHANGELOG.md | 4 ++-- distros/redhat/CMakeLists.txt | 2 +- distros/redhat/readme/README.https | 2 +- distros/ubuntu1204/changelog | 4 ++-- distros/ubuntu1604/changelog | 4 ++-- src/zm_jpeg.h | 2 +- src/zm_thread.h | 2 +- utils/docker/start.sh | 2 +- web/includes/Event.php | 2 +- web/includes/functions.php | 4 ++-- web/lang/big5_big5.php | 2 +- web/lang/cn_zh.php | 2 +- web/lang/cs_cz.php | 2 +- web/lang/en_gb.php | 4 ++-- web/lang/et_ee.php | 2 +- web/lang/he_il.php | 2 +- web/lang/it_it.php | 2 +- web/lang/ja_jp.php | 2 +- web/lang/nl_nl.php | 2 +- web/lang/pt_br.php | 2 +- web/lang/ru_ru.php | 2 +- 21 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 471066ac3..ac76176c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -82,7 +82,7 @@ - header typo corrections [\#1058](https://github.com/ZoneMinder/ZoneMinder/pull/1058) ([onlyjob](https://github.com/onlyjob)) - quick fix for \#1055: make sure our mmap fd is \> 2 [\#1057](https://github.com/ZoneMinder/ZoneMinder/pull/1057) ([connortechnology](https://github.com/connortechnology)) - Fix sgfault caused by the privacy mask stuff [\#1056](https://github.com/ZoneMinder/ZoneMinder/pull/1056) ([connortechnology](https://github.com/connortechnology)) -- link to cambozola pacakge, rather than download during build [\#1054](https://github.com/ZoneMinder/ZoneMinder/pull/1054) ([knnniggett](https://github.com/knnniggett)) +- link to cambozola package, rather than download during build [\#1054](https://github.com/ZoneMinder/ZoneMinder/pull/1054) ([knnniggett](https://github.com/knnniggett)) - redhat rpm packaging modifications [\#1052](https://github.com/ZoneMinder/ZoneMinder/pull/1052) ([knnniggett](https://github.com/knnniggett)) - remove core.php, modify core.php.default [\#1049](https://github.com/ZoneMinder/ZoneMinder/pull/1049) ([knnniggett](https://github.com/knnniggett)) - Google recaptcha [\#1048](https://github.com/ZoneMinder/ZoneMinder/pull/1048) ([pliablepixels](https://github.com/pliablepixels)) @@ -167,7 +167,7 @@ - alter the logic of ReadData. New behaviour is documented. [\#870](https://github.com/ZoneMinder/ZoneMinder/pull/870) ([connortechnology](https://github.com/connortechnology)) - analysis optimisations [\#867](https://github.com/ZoneMinder/ZoneMinder/pull/867) ([connortechnology](https://github.com/connortechnology)) - Don't die if db goes away during logging [\#866](https://github.com/ZoneMinder/ZoneMinder/pull/866) ([connortechnology](https://github.com/connortechnology)) -- Move iostream inclusion in zm.h and declare explicitely the namespace [\#859](https://github.com/ZoneMinder/ZoneMinder/pull/859) ([manupap1](https://github.com/manupap1)) +- Move iostream inclusion in zm.h and declare explicitly the namespace [\#859](https://github.com/ZoneMinder/ZoneMinder/pull/859) ([manupap1](https://github.com/manupap1)) - Fix detection of deprecated libav / ffmpeg functions [\#858](https://github.com/ZoneMinder/ZoneMinder/pull/858) ([manupap1](https://github.com/manupap1)) - Correct bareword config entries with newer {} style [\#856](https://github.com/ZoneMinder/ZoneMinder/pull/856) ([connortechnology](https://github.com/connortechnology)) - update german translation [\#854](https://github.com/ZoneMinder/ZoneMinder/pull/854) ([seeebek](https://github.com/seeebek)) diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt index 923367fa7..df3edf7d9 100644 --- a/distros/redhat/CMakeLists.txt +++ b/distros/redhat/CMakeLists.txt @@ -42,7 +42,7 @@ execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/misc/jscalendar.sh if("${unzip_jsc}" STREQUAL "") message(STATUS "jscalendar successfully installed.") else("${unzip_jsc}" STREQUAL "") - message(FATAL_ERROR "\nAn error occured while jscalendar was being processed:\n${unzip_jsc}") + message(FATAL_ERROR "\nAn error occurred while jscalendar was being processed:\n${unzip_jsc}") endif("${unzip_jsc}" STREQUAL "") # Create several empty folders diff --git a/distros/redhat/readme/README.https b/distros/redhat/readme/README.https index 23affeb96..f808432f0 100644 --- a/distros/redhat/readme/README.https +++ b/distros/redhat/readme/README.https @@ -1,7 +1,7 @@ HTTPS is now a requirement ========================== -This package now depends on Apache's mod_ssl pacakge. This will automatically +This package now depends on Apache's mod_ssl package. This will automatically be installed along with ZoneMinder. Upon installation, the mod_ssl package will create a default, self-signed certificate. This is the certificate that ZoneMinder will use out of the box. diff --git a/distros/ubuntu1204/changelog b/distros/ubuntu1204/changelog index 74cf1d0b8..c7e86f69d 100644 --- a/distros/ubuntu1204/changelog +++ b/distros/ubuntu1204/changelog @@ -395,7 +395,7 @@ zoneminder (1.24.2-4.1) unstable; urgency=low zoneminder (1.24.2-4) unstable; urgency=high * Update init.d to list mysql dependency (closes: #583505) - * Change depenency from libmime-perl to libmime-tools-perl + * Change dependency from libmime-perl to libmime-tools-perl (closes: #585589) * Problems in changelog format fixed (closes: #585592) @@ -432,7 +432,7 @@ zoneminder (1.24.1-1) unstable; urgency=high (closes: #497640) * Change syslog dependency to rsyslog. (closes: #526918) - * Add missing perl depenency. + * Add missing perl dependency. * Restore patch to disable "check for updates" by default. * Removed spurious '$' in init script. (closes: #486064) diff --git a/distros/ubuntu1604/changelog b/distros/ubuntu1604/changelog index beef67111..2f42d6d18 100644 --- a/distros/ubuntu1604/changelog +++ b/distros/ubuntu1604/changelog @@ -429,7 +429,7 @@ zoneminder (1.24.2-4.1) unstable; urgency=low zoneminder (1.24.2-4) unstable; urgency=high * Update init.d to list mysql dependency (closes: #583505) - * Change depenency from libmime-perl to libmime-tools-perl + * Change dependency from libmime-perl to libmime-tools-perl (closes: #585589) * Problems in changelog format fixed (closes: #585592) @@ -466,7 +466,7 @@ zoneminder (1.24.1-1) unstable; urgency=high (closes: #497640) * Change syslog dependency to rsyslog. (closes: #526918) - * Add missing perl depenency. + * Add missing perl dependency. * Restore patch to disable "check for updates" by default. * Removed spurious '$' in init script. (closes: #486064) diff --git a/src/zm_jpeg.h b/src/zm_jpeg.h index 1a1a9f42f..d0348dd3e 100644 --- a/src/zm_jpeg.h +++ b/src/zm_jpeg.h @@ -29,7 +29,7 @@ extern "C" { -/* Stuff for overriden error handlers */ +/* Stuff for overridden error handlers */ struct zm_error_mgr { struct jpeg_error_mgr pub; diff --git a/src/zm_thread.h b/src/zm_thread.h index cb853a113..8c84d9041 100644 --- a/src/zm_thread.h +++ b/src/zm_thread.h @@ -224,7 +224,7 @@ protected: #endif bool mStarted; bool mRunning; - int status; // Used in various funcions to get around return a local variable + int status; // Used in various functions to get around return a local variable protected: Thread(); diff --git a/utils/docker/start.sh b/utils/docker/start.sh index c32f09783..ff3d6c705 100755 --- a/utils/docker/start.sh +++ b/utils/docker/start.sh @@ -1,7 +1,7 @@ #!/bin/bash # Prepare proper amount of shared memory -# For H.264 cameras it may be necessary to increase the amout of shared memory +# For H.264 cameras it may be necessary to increase the amount of shared memory # to 2048 megabytes. umount /dev/shm mount -t tmpfs -o rw,nosuid,nodev,noexec,relatime,size=512M tmpfs /dev/shm diff --git a/web/includes/Event.php b/web/includes/Event.php index 3b7a1e5e0..9ec0f22e6 100644 --- a/web/includes/Event.php +++ b/web/includes/Event.php @@ -93,7 +93,7 @@ class Event { $start_date['year'] = $start_date['year'] % 100; $Storage = $this->Storage(); -# So this is because ZM creates a link under teh day pointing to the time that the event happened. +# So this is because ZM creates a link under the day pointing to the time that the event happened. $eventlink_path = $Storage->Path().'/'.$this->Link_Path(); if ( $id_files = glob( $eventlink_path ) ) { diff --git a/web/includes/functions.php b/web/includes/functions.php index ba58bffaf..36a80cf2e 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -482,7 +482,7 @@ function deleteEvent( $event, $mid=false ) { $start_date = date_parse( $event['StartTime'] ); $start_date['year'] = $start_date['year'] % 100; -# So this is because ZM creates a link under teh day pointing to the time that the event happened. +# So this is because ZM creates a link under the day pointing to the time that the event happened. $eventlink_path = sprintf('%s/%d/%02d/%02d/%02d/.%d', ZM_DIR_EVENTS, $mid, $start_date['year'], $start_date['month'], $start_date['day'], $event['Id'] ); if ( $id_files = glob( $eventlink_path ) ) { @@ -2137,6 +2137,6 @@ function folder_size($dir) { $size += is_file($each) ? filesize($each) : folderSize($each); } return $size; -} // end fucntion folder_size +} // end function folder_size ?> diff --git a/web/lang/big5_big5.php b/web/lang/big5_big5.php index 382a0f89a..b8bc173a5 100644 --- a/web/lang/big5_big5.php +++ b/web/lang/big5_big5.php @@ -818,7 +818,7 @@ $VLANG = array( // in to generate the correct noun form. // // In languages such as English this is fairly simple -// Note this still has to be used with printf etc to get the right formating +// Note this still has to be used with printf etc to get the right formatting function zmVlang( $langVarArray, $count ) { krsort( $langVarArray ); diff --git a/web/lang/cn_zh.php b/web/lang/cn_zh.php index bfaf32f90..9ed821417 100644 --- a/web/lang/cn_zh.php +++ b/web/lang/cn_zh.php @@ -813,7 +813,7 @@ $VLANG = array( // in to generate the correct noun form. // // In languages such as English this is fairly simple -// Note this still has to be used with printf etc to get the right formating +// Note this still has to be used with printf etc to get the right formatting function zmVlang( $langVarArray, $count ) { krsort( $langVarArray ); diff --git a/web/lang/cs_cz.php b/web/lang/cs_cz.php index 01eda0118..adcdeb61d 100644 --- a/web/lang/cs_cz.php +++ b/web/lang/cs_cz.php @@ -814,7 +814,7 @@ $VLANG = array( // in to generate the correct noun form. // // In languages such as English this is fairly simple -// Note this still has to be used with printf etc to get the right formating +// Note this still has to be used with printf etc to get the right formatting function zmVlang( $langVarArray, $count ) { krsort( $langVarArray ); diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php index c314a6ab3..4adb1fc7f 100644 --- a/web/lang/en_gb.php +++ b/web/lang/en_gb.php @@ -825,7 +825,7 @@ $VLANG = array( // in to generate the correct noun form. // // In languages such as English this is fairly simple -// Note this still has to be used with printf etc to get the right formating +// Note this still has to be used with printf etc to get the right formatting function zmVlang( $langVarArray, $count ) { krsort( $langVarArray ); @@ -913,7 +913,7 @@ $OLANG = 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. ". + 'Help' => "Sometimes, during the initial 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". diff --git a/web/lang/et_ee.php b/web/lang/et_ee.php index cb990495a..250728550 100644 --- a/web/lang/et_ee.php +++ b/web/lang/et_ee.php @@ -820,7 +820,7 @@ $VLANG = array( // in to generate the correct noun form. // // In languages such as English this is fairly simple -// Note this still has to be used with printf etc to get the right formating +// Note this still has to be used with printf etc to get the right formatting function zmVlang( $langVarArray, $count ) { krsort( $langVarArray ); diff --git a/web/lang/he_il.php b/web/lang/he_il.php index 43f220b4d..0d54d43e9 100644 --- a/web/lang/he_il.php +++ b/web/lang/he_il.php @@ -814,7 +814,7 @@ $VLANG = array( // in to generate the correct noun form. // // In languages such as English this is fairly simple -// Note this still has to be used with printf etc to get the right formating +// Note this still has to be used with printf etc to get the right formatting function zmVlang( $langVarArray, $count ) { krsort( $langVarArray ); diff --git a/web/lang/it_it.php b/web/lang/it_it.php index e6e603e88..338f2c07f 100644 --- a/web/lang/it_it.php +++ b/web/lang/it_it.php @@ -819,7 +819,7 @@ $VLANG = array( // in to generate the correct noun form. // // In languages such as English this is fairly simple -// Note this still has to be used with printf etc to get the right formating +// Note this still has to be used with printf etc to get the right formatting function zmVlang( $langVarArray, $count ) { krsort( $langVarArray ); diff --git a/web/lang/ja_jp.php b/web/lang/ja_jp.php index b637ac3fd..df8acc409 100644 --- a/web/lang/ja_jp.php +++ b/web/lang/ja_jp.php @@ -814,7 +814,7 @@ $VLANG = array( // in to generate the correct noun form. // // In languages such as English this is fairly simple -// Note this still has to be used with printf etc to get the right formating +// Note this still has to be used with printf etc to get the right formatting function zmVlang( $langVarArray, $count ) { krsort( $langVarArray ); diff --git a/web/lang/nl_nl.php b/web/lang/nl_nl.php index 8d07eefa9..fca70a829 100644 --- a/web/lang/nl_nl.php +++ b/web/lang/nl_nl.php @@ -815,7 +815,7 @@ $VLANG = array( // in to generate the correct noun form. // // In languages such as English this is fairly simple -// Note this still has to be used with printf etc to get the right formating +// Note this still has to be used with printf etc to get the right formatting function zmVlang( $langVarArray, $count ) { krsort( $langVarArray ); diff --git a/web/lang/pt_br.php b/web/lang/pt_br.php index f47882da5..ae9c8c5b1 100644 --- a/web/lang/pt_br.php +++ b/web/lang/pt_br.php @@ -754,7 +754,7 @@ $VLANG = array( // in to generate the correct noun form. // // In languages such as English this is fairly simple -// Note this still has to be used with printf etc to get the right formating +// Note this still has to be used with printf etc to get the right formatting function zmVlang( $langVarArray, $count ) { krsort( $langVarArray ); diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php index 2d93c9f6a..25ddc62a5 100644 --- a/web/lang/ru_ru.php +++ b/web/lang/ru_ru.php @@ -816,7 +816,7 @@ $VLANG = array( // in to generate the correct noun form. // // In languages such as English this is fairly simple -// Note this still has to be used with printf etc to get the right formating +// Note this still has to be used with printf etc to get the right formatting /*function zmVlang( $langVarArray, $count ) { krsort( $langVarArray ); From bcad334c2bc39b7d1bc04f026497a4b6326411cb Mon Sep 17 00:00:00 2001 From: Kyle Johnson Date: Sat, 31 Dec 2016 08:50:39 -0700 Subject: [PATCH 37/38] Initial commit of github issue template. --- .github/ISSUE_TEMPLATE.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..309d79785 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,21 @@ +You should only file an issue if you found a bug. Feature and enhancement requests, general discussions and support questions should occur in one of the following areas: + +- The ZoneMinder IRC channel - irc.freenode.net #zoneminder +- The [ZoneMinder Forum](https://forums.zoneminder.com/) + +**Do not post feature or enhancement requests, general discussions or support questions here.** + +Make sure you are running the latest version of ZoneMinder before reporting an issue. + +**ZoneMinder Version (`zmaudit.pl -v`):** + +**Are you using a development snapshot / git checkout? If so, what is the latest commit? (`git rev-parse HEAD`):** + +**Linux Distribution and Version (`cat /etc/os-release` or `cat /etc/redhat-release`):** + +**If the issue concerns a camera, provide the make, model, frame rate, resolution and ZoneMinder Source Type:** + +**Relevant log lines:** +``` +log lines here +``` From ef71ae248c0f694632da70b70ddc4b8d0321f2cb Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Jan 2017 09:31:26 -0500 Subject: [PATCH 38/38] fix ramSocketFile to remSocketFile --- web/ajax/stream.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ajax/stream.php b/web/ajax/stream.php index f862cfaf9..4f453d50f 100644 --- a/web/ajax/stream.php +++ b/web/ajax/stream.php @@ -52,7 +52,7 @@ while ( !file_exists($remSockFile) && $max_socket_tries-- ) { //sometimes we are } if ( !file_exists($remSockFile) ) { - ajaxError("Socket $ramSocketFile does not exist. This file is created by zms, and since it does not exist, either zms did not run, or zms exited early. Please check your zms logs and ensure that CGI is enabled in apache and check that the PATH_ZMS is set correctly. Make sure that ZM is actually recording. If you are trying to view a live stream and the capture process (zmc) is not running then zms will exit. Please go to http://zoneminder.readthedocs.io/en/latest/faq.html#why-can-t-i-see-streamed-images-when-i-can-see-stills-in-the-zone-window-etc for more information."); + ajaxError("Socket $remSocketFile does not exist. This file is created by zms, and since it does not exist, either zms did not run, or zms exited early. Please check your zms logs and ensure that CGI is enabled in apache and check that the PATH_ZMS is set correctly. Make sure that ZM is actually recording. If you are trying to view a live stream and the capture process (zmc) is not running then zms will exit. Please go to http://zoneminder.readthedocs.io/en/latest/faq.html#why-can-t-i-see-streamed-images-when-i-can-see-stills-in-the-zone-window-etc for more information."); } else { if ( !@socket_sendto( $socket, $msg, strlen($msg), 0, $remSockFile ) ) { ajaxError( "socket_sendto( $remSockFile ) failed: ".socket_strerror(socket_last_error()) );