Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
This commit is contained in:
commit
746a096483
|
@ -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
|
||||||
|
```
|
|
@ -82,7 +82,7 @@
|
||||||
- header typo corrections [\#1058](https://github.com/ZoneMinder/ZoneMinder/pull/1058) ([onlyjob](https://github.com/onlyjob))
|
- 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))
|
- 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))
|
- 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))
|
- 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))
|
- 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))
|
- 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))
|
- 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))
|
- 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))
|
- 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))
|
- 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))
|
- 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))
|
- update german translation [\#854](https://github.com/ZoneMinder/ZoneMinder/pull/854) ([seeebek](https://github.com/seeebek))
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# Created by mastertheknife (Kfir Itzhak)
|
# Created by mastertheknife (Kfir Itzhak)
|
||||||
# For more information and installation, see the INSTALL file
|
# For more information and installation, see the INSTALL file
|
||||||
#
|
#
|
||||||
cmake_minimum_required (VERSION 2.6)
|
cmake_minimum_required (VERSION 2.8.7)
|
||||||
project (zoneminder)
|
project (zoneminder)
|
||||||
file (STRINGS "version" zoneminder_VERSION)
|
file (STRINGS "version" zoneminder_VERSION)
|
||||||
# make API version a minor of ZM version
|
# make API version a minor of ZM version
|
||||||
|
@ -163,6 +163,7 @@ elseif(ZM_TARGET_DISTRO STREQUAL "el6")
|
||||||
set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
|
set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
|
||||||
set(ZM_TMPDIR "/var/lib/zoneminder/temp")
|
set(ZM_TMPDIR "/var/lib/zoneminder/temp")
|
||||||
set(ZM_LOGDIR "/var/log/zoneminder")
|
set(ZM_LOGDIR "/var/log/zoneminder")
|
||||||
|
set(ZM_CONFIG_DIR "/etc/zm")
|
||||||
set(ZM_WEBDIR "/usr/share/zoneminder/www")
|
set(ZM_WEBDIR "/usr/share/zoneminder/www")
|
||||||
set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
|
set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
|
||||||
elseif(ZM_TARGET_DISTRO STREQUAL "el7")
|
elseif(ZM_TARGET_DISTRO STREQUAL "el7")
|
||||||
|
@ -709,7 +710,7 @@ endif(ZM_ONVIF)
|
||||||
|
|
||||||
# Process distro subdirectories
|
# Process distro subdirectories
|
||||||
if((ZM_TARGET_DISTRO STREQUAL "fc24") OR (ZM_TARGET_DISTRO STREQUAL "fc25"))
|
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"))
|
elseif((ZM_TARGET_DISTRO STREQUAL "el6") OR (ZM_TARGET_DISTRO STREQUAL "el7"))
|
||||||
add_subdirectory(distros/redhat)
|
add_subdirectory(distros/redhat)
|
||||||
elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
|
elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
|
||||||
|
|
41
COPYING
41
COPYING
|
@ -1,12 +1,12 @@
|
||||||
GNU GENERAL PUBLIC LICENSE
|
GNU GENERAL PUBLIC LICENSE
|
||||||
Version 2, June 1991
|
Version 2, June 1991
|
||||||
|
|
||||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||||
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
of this license document, but changing it is not allowed.
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
Preamble
|
Preamble
|
||||||
|
|
||||||
The licenses for most software are designed to take away your
|
The licenses for most software are designed to take away your
|
||||||
freedom to share and change it. By contrast, the GNU General Public
|
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
|
General Public License applies to most of the Free Software
|
||||||
Foundation's software and to any other program whose authors commit to
|
Foundation's software and to any other program whose authors commit to
|
||||||
using it. (Some other Free Software Foundation software is covered by
|
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.
|
your programs, too.
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
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
|
The precise terms and conditions for copying, distribution and
|
||||||
modification follow.
|
modification follow.
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
GNU GENERAL PUBLIC LICENSE
|
||||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
|
|
||||||
0. This License applies to any program or other work which contains
|
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
|
License. (Exception: if the Program itself is interactive but
|
||||||
does not normally print such an announcement, your work based on
|
does not normally print such an announcement, your work based on
|
||||||
the Program is not required to print an announcement.)
|
the Program is not required to print an announcement.)
|
||||||
|
|
||||||
These requirements apply to the modified work as a whole. If
|
These requirements apply to the modified work as a whole. If
|
||||||
identifiable sections of that work are not derived from the Program,
|
identifiable sections of that work are not derived from the Program,
|
||||||
and can be reasonably considered independent and separate works in
|
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
|
access to copy the source code from the same place counts as
|
||||||
distribution of the source code, even though third parties are not
|
distribution of the source code, even though third parties are not
|
||||||
compelled to copy the source along with the object code.
|
compelled to copy the source along with the object code.
|
||||||
|
|
||||||
4. You may not copy, modify, sublicense, or distribute the Program
|
4. You may not copy, modify, sublicense, or distribute the Program
|
||||||
except as expressly provided under this License. Any attempt
|
except as expressly provided under this License. Any attempt
|
||||||
otherwise to copy, modify, sublicense or distribute the Program is
|
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
|
This section is intended to make thoroughly clear what is believed to
|
||||||
be a consequence of the rest of this License.
|
be a consequence of the rest of this License.
|
||||||
|
|
||||||
8. If the distribution and/or use of the Program is restricted in
|
8. If the distribution and/or use of the Program is restricted in
|
||||||
certain countries either by patents or by copyrighted interfaces, the
|
certain countries either by patents or by copyrighted interfaces, the
|
||||||
original copyright holder who places the Program under this License
|
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 preserving the free status of all derivatives of our free software and
|
||||||
of promoting the sharing and reuse of software generally.
|
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
|
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
|
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
|
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||||
POSSIBILITY OF SUCH DAMAGES.
|
POSSIBILITY OF SUCH DAMAGES.
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
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
|
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
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License along
|
||||||
along with this program; if not, write to the Free Software
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
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
|
If the program is interactive, make it output a short notice like this
|
||||||
when it starts in an interactive mode:
|
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'.
|
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
This is free software, and you are welcome to redistribute it
|
This is free software, and you are welcome to redistribute it
|
||||||
under certain conditions; type `show c' for details.
|
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
|
This General Public License does not permit incorporating your program into
|
||||||
proprietary programs. If your program is a subroutine library, you may
|
proprietary programs. If your program is a subroutine library, you may
|
||||||
consider it more useful to permit linking proprietary applications with the
|
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.
|
Public License instead of this License.
|
||||||
|
|
|
@ -477,7 +477,7 @@ CREATE TABLE `Users` (
|
||||||
`Devices` enum('None','View','Edit') NOT NULL default 'None',
|
`Devices` enum('None','View','Edit') NOT NULL default 'None',
|
||||||
`System` enum('None','View','Edit') NOT NULL default 'None',
|
`System` enum('None','View','Edit') NOT NULL default 'None',
|
||||||
`MaxBandwidth` varchar(16) NOT NULL default '',
|
`MaxBandwidth` varchar(16) NOT NULL default '',
|
||||||
`MonitorIds` tinytext NOT NULL,
|
`MonitorIds` text NOT NULL,
|
||||||
PRIMARY KEY (`Id`),
|
PRIMARY KEY (`Id`),
|
||||||
UNIQUE KEY `UC_Username` (`Username`)
|
UNIQUE KEY `UC_Username` (`Username`)
|
||||||
) ENGINE=@ZM_MYSQL_ENGINE@;
|
) ENGINE=@ZM_MYSQL_ENGINE@;
|
||||||
|
@ -595,6 +595,7 @@ INSERT INTO `Controls` VALUES (NULL,'IPCC 7210W','Libvlc','IPCC7210W', 1, 1, 1,
|
||||||
INSERT INTO `Controls` VALUES (NULL,'Vivotek ePTZ','Remote','Vivotek_ePTZ',0,0,1,1,0,0,0,1,0,0,0,0,1,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,1,0,5,0,0,1,0,0,0,0,1,0,5,0,0,0,0);
|
INSERT INTO `Controls` VALUES (NULL,'Vivotek ePTZ','Remote','Vivotek_ePTZ',0,0,1,1,0,0,0,1,0,0,0,0,1,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,1,0,5,0,0,1,0,0,0,0,1,0,5,0,0,0,0);
|
||||||
INSERT INTO `Controls` VALUES (NULL,'Netcat ONVIF','Ffmpeg','Netcat',0,0,1,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,100,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,100,5,5,0,0,0,1,255,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
|
INSERT INTO `Controls` VALUES (NULL,'Netcat ONVIF','Ffmpeg','Netcat',0,0,1,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,100,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,100,5,5,0,0,0,1,255,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
|
||||||
INSERT INTO `Controls` VALUES (NULL,'Keekoon','Remote','Keekoon', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 6, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
INSERT INTO `Controls` VALUES (NULL,'Keekoon','Remote','Keekoon', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 6, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||||
|
INSERT INTO `Controls` VALUES (NULL,'HikVision','Local','',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,1,1,1,1,0,0,0,1,1,0,0,0,0,1,1,100,0,0,1,0,0,0,0,1,1,100,1,0,0,0);
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Add some monitor preset values
|
-- Add some monitor preset values
|
||||||
|
@ -667,6 +668,8 @@ INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI9821W FFMPEG H.264','Ffmpeg',N
|
||||||
INSERT INTO MonitorPresets VALUES (NULL,'Loftek Sentinel PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<ip-address>','80','/videostream.cgi?user=<username>&pwd=<password>&resolution=32&rate=11',NULL,640,480,4,NULL,1,'13','','<username>:<pwd>@<ip-address>',100,100);
|
INSERT INTO MonitorPresets VALUES (NULL,'Loftek Sentinel PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<ip-address>','80','/videostream.cgi?user=<username>&pwd=<password>&resolution=32&rate=11',NULL,640,480,4,NULL,1,'13','','<username>:<pwd>@<ip-address>',100,100);
|
||||||
INSERT INTO MonitorPresets VALUES (NULL,'Airlink 777W PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<username>:<password>@<ip-address>','80','/cgi/mjpg/mjpg.cgi',NULL,640,480,4,NULL,1,'7','','<username>:<pwd>@<ip-address>',100,100);
|
INSERT INTO MonitorPresets VALUES (NULL,'Airlink 777W PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<username>:<password>@<ip-address>','80','/cgi/mjpg/mjpg.cgi',NULL,640,480,4,NULL,1,'7','','<username>:<pwd>@<ip-address>',100,100);
|
||||||
INSERT INTO MonitorPresets VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','/dev/video<?>','0',255,'','rtpMulti','','80','rtsp://<ip-address>:554/11','',1920,1080,0,0.00,1,'16','-speed=64','<ip-address>:<port>',100,33);
|
INSERT INTO MonitorPresets VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','/dev/video<?>','0',255,'','rtpMulti','','80','rtsp://<ip-address>:554/11','',1920,1080,0,0.00,1,'16','-speed=64','<ip-address>:<port>',100,33);
|
||||||
|
INSERT INTO MonitorPresets VALUES (NULL,'Qihan IP, 1280x720, RTP/RTSP','Ffmpeg','rtsp','rtpRtsp',255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1280,720,3,NULL,0,NULL,NULL,NULL,100,100);
|
||||||
|
INSERT INTO MonitorPresets VALUES (NULL,'Qihan IP, 1920x1080, RTP/RTSP','Ffmpeg','rtsp','rtpRtsp',255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1920,1080,3,NULL,0,NULL,NULL,NULL,100,100);
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Add some zone preset values
|
-- Add some zone preset values
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
--
|
||||||
|
-- This updates a 1.30.1 database to 1.30.2
|
||||||
|
--
|
||||||
|
|
||||||
|
ALTER TABLE Users MODIFY MonitorIds TEXT NOT 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)
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
../redhat/README.https
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
Fedora rpm build files have been merged with redhat.
|
||||||
|
See /distros/redhat.
|
||||||
|
|
|
@ -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.
|
|
|
@ -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 )
|
|
|
@ -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 '.<pid>' 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},
|
|
|
@ -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@
|
|
|
@ -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,,)
|
|
||||||
|
|
|
@ -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@
|
|
|
@ -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 <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Include ONVIF support files
|
|
||||||
|
|
||||||
* Fri Mar 14 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Tweak build requirements for cmake
|
|
||||||
|
|
||||||
* Sat Feb 01 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Add zmcamtool.pl. Bump version for 1.27 release.
|
|
||||||
|
|
||||||
* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
|
|
||||||
- This is a bug fixe release
|
|
||||||
- RTSP fixes, cmake enhancements, couple other misc fixes
|
|
||||||
|
|
||||||
* Mon Oct 07 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
|
||||||
- Initial cmake build.
|
|
||||||
|
|
||||||
* Sat Oct 05 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 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 <knnniggett@users.sourceforge.net> - 1.26.3
|
|
||||||
- Initial rebuild for ZoneMinder 1.26.3 release.
|
|
||||||
|
|
||||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.25.0-12
|
|
||||||
- rebuild due to "jpeg8-ABI" feature drop
|
|
||||||
|
|
||||||
* Mon Jan 7 2013 Remi Collet <rcollet@redhat.com> - 1.25.0-11
|
|
||||||
- fix configuration file for httpd 2.4, #871502
|
|
||||||
|
|
||||||
* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
|
|
||||||
- rebuild against new libjpeg
|
|
||||||
|
|
||||||
* Thu Aug 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-9
|
|
||||||
- Add patch to work around v4l2 api breakage in 3.5 kernel.
|
|
||||||
|
|
||||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jun 23 2012 Petr Pisar <ppisar@redhat.com> - 1.25.0-7
|
|
||||||
- Perl 5.16 rebuild
|
|
||||||
|
|
||||||
* Wed Mar 21 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-6
|
|
||||||
- Fix stupid thinko in sql modifications.
|
|
||||||
|
|
||||||
* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-5
|
|
||||||
- Clean up macro usage.
|
|
||||||
|
|
||||||
* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 1.25.0-2
|
|
||||||
- Rebuild for new pcre.
|
|
||||||
|
|
||||||
* Thu Jan 19 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <rel-eng@lists.fedoraproject.org> - 1.24.4-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-3
|
|
||||||
- Re-add the dist-tag that somehow got lost.
|
|
||||||
|
|
||||||
* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <contyk@redhat.com> - 1.24.3-7.20110324svn3310
|
|
||||||
- Perl mass rebuild
|
|
||||||
|
|
||||||
* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-6.20110324svn3310
|
|
||||||
- Perl mass rebuild
|
|
||||||
|
|
||||||
* Mon May 09 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-5.20110324svn3310
|
|
||||||
- Bump for gnutls update.
|
|
||||||
|
|
||||||
* Thu Mar 24 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <dan@danny.cz> - 1.24.3-3
|
|
||||||
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
|
|
||||||
|
|
||||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <mmaslano@redhat.com> - 1.24.2-5
|
|
||||||
- Mass rebuild with perl-5.12.0
|
|
||||||
|
|
||||||
* Fri Dec 4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
|
|
||||||
- rebuild against perl 5.10.1
|
|
||||||
- use Perl vendorarch and archlib variables correctly
|
|
||||||
|
|
||||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <martin@zepler.org> - 1.24.1-3
|
|
||||||
- Remove unused Sys::Mmap perl dependency RPM is finding
|
|
||||||
|
|
||||||
* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.24.1-1
|
|
||||||
- Patch for gcc 4.4 compilation errors
|
|
||||||
- Upgrade to 1.24.1
|
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
|
|
||||||
- rebuild for dependencies
|
|
||||||
|
|
||||||
* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
|
|
||||||
- Fix permissions on zm.conf
|
|
||||||
|
|
||||||
* Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
|
|
||||||
- Initial attempt at packaging 1.23.
|
|
||||||
|
|
||||||
* Tue Jul 1 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-15
|
|
||||||
- Add perl module compat dependency, bz #453590
|
|
||||||
|
|
||||||
* Tue May 6 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-14
|
|
||||||
- Remove default runlevel, bz #441315
|
|
||||||
|
|
||||||
* Mon Apr 28 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <rel-eng@fedoraproject.org> - 1.22.3-12
|
|
||||||
- Autorebuild for GCC 4.3
|
|
||||||
|
|
||||||
* Thu Jan 3 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-11
|
|
||||||
- Fix compilation on gcc 4.3
|
|
||||||
|
|
||||||
* Thu Dec 6 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-10
|
|
||||||
- Rebuild for new openssl
|
|
||||||
|
|
||||||
* Thu Aug 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-8
|
|
||||||
- Fix licence tag
|
|
||||||
|
|
||||||
* Thu Jul 12 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-7
|
|
||||||
- Fixes from testing by Jitz including missing dependencies and database creation
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-6
|
|
||||||
- Disable crashtrace on ppc
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-5
|
|
||||||
- Fix uid for directories in /var/lib/zoneminder
|
|
||||||
|
|
||||||
* Tue Jun 26 2007 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.22.3-3
|
|
||||||
- Changes recommended in review by Jason Tibbitts
|
|
||||||
|
|
||||||
* Mon Apr 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-2
|
|
||||||
- Standardised on package name of zoneminder
|
|
||||||
|
|
||||||
* Thu Dec 28 2006 Martin Ebourne <martin@zepler.org> - 1.22.3-1
|
|
||||||
- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin
|
|
|
@ -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"
|
|
||||||
<Directory "/usr/share/zoneminder/www">
|
|
||||||
Options -Indexes +MultiViews +FollowSymLinks
|
|
||||||
AllowOverride All
|
|
||||||
<IfModule mod_authz_core.c>
|
|
||||||
# Apache 2.4
|
|
||||||
Require all granted
|
|
||||||
</IfModule>
|
|
||||||
<IfModule !mod_authz_core.c>
|
|
||||||
# Apache 2.2
|
|
||||||
Order deny,allow
|
|
||||||
Allow from all
|
|
||||||
</IfModule>
|
|
||||||
# The code unfortunately uses short tags in many places
|
|
||||||
php_value short_open_tag 1
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
ScriptAlias /cgi-bin/zm "/usr/libexec/zoneminder/cgi-bin"
|
|
||||||
<Directory "/usr/libexec/zoneminder/cgi-bin">
|
|
||||||
AllowOverride All
|
|
||||||
Options +ExecCGI +FollowSymLinks
|
|
||||||
<IfModule mod_authz_core.c>
|
|
||||||
# Apache 2.4
|
|
||||||
Require all granted
|
|
||||||
</IfModule>
|
|
||||||
<IfModule !mod_authz_core.c>
|
|
||||||
# Apache 2.2
|
|
||||||
Order deny,allow
|
|
||||||
Allow from all
|
|
||||||
</IfModule>
|
|
||||||
</Directory>
|
|
|
@ -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 <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Add zmcamtool.pl. Bump version for 1.27 release.
|
|
||||||
|
|
||||||
* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
|
|
||||||
- This is a bug fixe release
|
|
||||||
- RTSP fixes, cmake enhancements, couple other misc fixes
|
|
||||||
|
|
||||||
* Sat Oct 05 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 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 <knnniggett@users.sourceforge.net> - 1.26.3
|
|
||||||
- Initial rebuild for ZoneMinder 1.26.3 release.
|
|
||||||
|
|
||||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.25.0-12
|
|
||||||
- rebuild due to "jpeg8-ABI" feature drop
|
|
||||||
|
|
||||||
* Mon Jan 7 2013 Remi Collet <rcollet@redhat.com> - 1.25.0-11
|
|
||||||
- fix configuration file for httpd 2.4, #871502
|
|
||||||
|
|
||||||
* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
|
|
||||||
- rebuild against new libjpeg
|
|
||||||
|
|
||||||
* Thu Aug 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-9
|
|
||||||
- Add patch to work around v4l2 api breakage in 3.5 kernel.
|
|
||||||
|
|
||||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jun 23 2012 Petr Pisar <ppisar@redhat.com> - 1.25.0-7
|
|
||||||
- Perl 5.16 rebuild
|
|
||||||
|
|
||||||
* Wed Mar 21 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-6
|
|
||||||
- Fix stupid thinko in sql modifications.
|
|
||||||
|
|
||||||
* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-5
|
|
||||||
- Clean up macro usage.
|
|
||||||
|
|
||||||
* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 1.25.0-2
|
|
||||||
- Rebuild for new pcre.
|
|
||||||
|
|
||||||
* Thu Jan 19 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <rel-eng@lists.fedoraproject.org> - 1.24.4-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-3
|
|
||||||
- Re-add the dist-tag that somehow got lost.
|
|
||||||
|
|
||||||
* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <contyk@redhat.com> - 1.24.3-7.20110324svn3310
|
|
||||||
- Perl mass rebuild
|
|
||||||
|
|
||||||
* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-6.20110324svn3310
|
|
||||||
- Perl mass rebuild
|
|
||||||
|
|
||||||
* Mon May 09 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-5.20110324svn3310
|
|
||||||
- Bump for gnutls update.
|
|
||||||
|
|
||||||
* Thu Mar 24 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <dan@danny.cz> - 1.24.3-3
|
|
||||||
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
|
|
||||||
|
|
||||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <mmaslano@redhat.com> - 1.24.2-5
|
|
||||||
- Mass rebuild with perl-5.12.0
|
|
||||||
|
|
||||||
* Fri Dec 4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
|
|
||||||
- rebuild against perl 5.10.1
|
|
||||||
- use Perl vendorarch and archlib variables correctly
|
|
||||||
|
|
||||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <martin@zepler.org> - 1.24.1-3
|
|
||||||
- Remove unused Sys::Mmap perl dependency RPM is finding
|
|
||||||
|
|
||||||
* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.24.1-1
|
|
||||||
- Patch for gcc 4.4 compilation errors
|
|
||||||
- Upgrade to 1.24.1
|
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
|
|
||||||
- rebuild for dependencies
|
|
||||||
|
|
||||||
* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
|
|
||||||
- Fix permissions on zm.conf
|
|
||||||
|
|
||||||
* Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
|
|
||||||
- Initial attempt at packaging 1.23.
|
|
||||||
|
|
||||||
* Tue Jul 1 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-15
|
|
||||||
- Add perl module compat dependency, bz #453590
|
|
||||||
|
|
||||||
* Tue May 6 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-14
|
|
||||||
- Remove default runlevel, bz #441315
|
|
||||||
|
|
||||||
* Mon Apr 28 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <rel-eng@fedoraproject.org> - 1.22.3-12
|
|
||||||
- Autorebuild for GCC 4.3
|
|
||||||
|
|
||||||
* Thu Jan 3 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-11
|
|
||||||
- Fix compilation on gcc 4.3
|
|
||||||
|
|
||||||
* Thu Dec 6 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-10
|
|
||||||
- Rebuild for new openssl
|
|
||||||
|
|
||||||
* Thu Aug 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-8
|
|
||||||
- Fix licence tag
|
|
||||||
|
|
||||||
* Thu Jul 12 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-7
|
|
||||||
- Fixes from testing by Jitz including missing dependencies and database creation
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-6
|
|
||||||
- Disable crashtrace on ppc
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-5
|
|
||||||
- Fix uid for directories in /var/lib/zoneminder
|
|
||||||
|
|
||||||
* Tue Jun 26 2007 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.22.3-3
|
|
||||||
- Changes recommended in review by Jason Tibbitts
|
|
||||||
|
|
||||||
* Mon Apr 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-2
|
|
||||||
- Standardised on package name of zoneminder
|
|
||||||
|
|
||||||
* Thu Dec 28 2006 Martin Ebourne <martin@zepler.org> - 1.22.3-1
|
|
||||||
- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin
|
|
|
@ -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 <knnniggett@users.sourceforge.net> - 1.28.0
|
|
||||||
- Bump version for 1.28.0 release.
|
|
||||||
|
|
||||||
* Fri Mar 14 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Tweak build requirements for cmake
|
|
||||||
|
|
||||||
* Sat Feb 01 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Add zmcamtool.pl. Bump version for 1.27 release.
|
|
||||||
|
|
||||||
* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
|
|
||||||
- This is a bug fixe release
|
|
||||||
- RTSP fixes, cmake enhancements, couple other misc fixes
|
|
||||||
|
|
||||||
* Mon Oct 07 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
|
||||||
- Initial cmake build.
|
|
||||||
|
|
||||||
* Sat Oct 05 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 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 <knnniggett@users.sourceforge.net> - 1.26.3
|
|
||||||
- Initial rebuild for ZoneMinder 1.26.3 release.
|
|
||||||
|
|
||||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.25.0-12
|
|
||||||
- rebuild due to "jpeg8-ABI" feature drop
|
|
||||||
|
|
||||||
* Mon Jan 7 2013 Remi Collet <rcollet@redhat.com> - 1.25.0-11
|
|
||||||
- fix configuration file for httpd 2.4, #871502
|
|
||||||
|
|
||||||
* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
|
|
||||||
- rebuild against new libjpeg
|
|
||||||
|
|
||||||
* Thu Aug 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-9
|
|
||||||
- Add patch to work around v4l2 api breakage in 3.5 kernel.
|
|
||||||
|
|
||||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jun 23 2012 Petr Pisar <ppisar@redhat.com> - 1.25.0-7
|
|
||||||
- Perl 5.16 rebuild
|
|
||||||
|
|
||||||
* Wed Mar 21 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-6
|
|
||||||
- Fix stupid thinko in sql modifications.
|
|
||||||
|
|
||||||
* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-5
|
|
||||||
- Clean up macro usage.
|
|
||||||
|
|
||||||
* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 1.25.0-2
|
|
||||||
- Rebuild for new pcre.
|
|
||||||
|
|
||||||
* Thu Jan 19 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <rel-eng@lists.fedoraproject.org> - 1.24.4-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-3
|
|
||||||
- Re-add the dist-tag that somehow got lost.
|
|
||||||
|
|
||||||
* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <contyk@redhat.com> - 1.24.3-7.20110324svn3310
|
|
||||||
- Perl mass rebuild
|
|
||||||
|
|
||||||
* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-6.20110324svn3310
|
|
||||||
- Perl mass rebuild
|
|
||||||
|
|
||||||
* Mon May 09 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-5.20110324svn3310
|
|
||||||
- Bump for gnutls update.
|
|
||||||
|
|
||||||
* Thu Mar 24 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <dan@danny.cz> - 1.24.3-3
|
|
||||||
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
|
|
||||||
|
|
||||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <mmaslano@redhat.com> - 1.24.2-5
|
|
||||||
- Mass rebuild with perl-5.12.0
|
|
||||||
|
|
||||||
* Fri Dec 4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
|
|
||||||
- rebuild against perl 5.10.1
|
|
||||||
- use Perl vendorarch and archlib variables correctly
|
|
||||||
|
|
||||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <martin@zepler.org> - 1.24.1-3
|
|
||||||
- Remove unused Sys::Mmap perl dependency RPM is finding
|
|
||||||
|
|
||||||
* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.24.1-1
|
|
||||||
- Patch for gcc 4.4 compilation errors
|
|
||||||
- Upgrade to 1.24.1
|
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
|
|
||||||
- rebuild for dependencies
|
|
||||||
|
|
||||||
* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
|
|
||||||
- Fix permissions on zm.conf
|
|
||||||
|
|
||||||
* Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
|
|
||||||
- Initial attempt at packaging 1.23.
|
|
||||||
|
|
||||||
* Tue Jul 1 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-15
|
|
||||||
- Add perl module compat dependency, bz #453590
|
|
||||||
|
|
||||||
* Tue May 6 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-14
|
|
||||||
- Remove default runlevel, bz #441315
|
|
||||||
|
|
||||||
* Mon Apr 28 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <rel-eng@fedoraproject.org> - 1.22.3-12
|
|
||||||
- Autorebuild for GCC 4.3
|
|
||||||
|
|
||||||
* Thu Jan 3 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-11
|
|
||||||
- Fix compilation on gcc 4.3
|
|
||||||
|
|
||||||
* Thu Dec 6 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-10
|
|
||||||
- Rebuild for new openssl
|
|
||||||
|
|
||||||
* Thu Aug 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-8
|
|
||||||
- Fix licence tag
|
|
||||||
|
|
||||||
* Thu Jul 12 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-7
|
|
||||||
- Fixes from testing by Jitz including missing dependencies and database creation
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-6
|
|
||||||
- Disable crashtrace on ppc
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-5
|
|
||||||
- Fix uid for directories in /var/lib/zoneminder
|
|
||||||
|
|
||||||
* Tue Jun 26 2007 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.22.3-3
|
|
||||||
- Changes recommended in review by Jason Tibbitts
|
|
||||||
|
|
||||||
* Mon Apr 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-2
|
|
||||||
- Standardised on package name of zoneminder
|
|
||||||
|
|
||||||
* Thu Dec 28 2006 Martin Ebourne <martin@zepler.org> - 1.22.3-1
|
|
||||||
- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin
|
|
|
@ -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 <knnniggett@users.sourceforge.net> - 1.28.1
|
|
||||||
- Bump version for 1.28.1 release on Fedora 21.
|
|
||||||
|
|
||||||
* Sun Oct 5 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.0
|
|
||||||
- Bump version for 1.28.0 release.
|
|
||||||
|
|
||||||
* Fri Mar 14 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Tweak build requirements for cmake
|
|
||||||
|
|
||||||
* Sat Feb 01 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Add zmcamtool.pl. Bump version for 1.27 release.
|
|
||||||
|
|
||||||
* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
|
|
||||||
- This is a bug fixe release
|
|
||||||
- RTSP fixes, cmake enhancements, couple other misc fixes
|
|
||||||
|
|
||||||
* Mon Oct 07 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
|
||||||
- Initial cmake build.
|
|
||||||
|
|
||||||
* Sat Oct 05 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 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 <knnniggett@users.sourceforge.net> - 1.26.3
|
|
||||||
- Initial rebuild for ZoneMinder 1.26.3 release.
|
|
||||||
|
|
||||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.25.0-12
|
|
||||||
- rebuild due to "jpeg8-ABI" feature drop
|
|
||||||
|
|
||||||
* Mon Jan 7 2013 Remi Collet <rcollet@redhat.com> - 1.25.0-11
|
|
||||||
- fix configuration file for httpd 2.4, #871502
|
|
||||||
|
|
||||||
* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
|
|
||||||
- rebuild against new libjpeg
|
|
||||||
|
|
||||||
* Thu Aug 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-9
|
|
||||||
- Add patch to work around v4l2 api breakage in 3.5 kernel.
|
|
||||||
|
|
||||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jun 23 2012 Petr Pisar <ppisar@redhat.com> - 1.25.0-7
|
|
||||||
- Perl 5.16 rebuild
|
|
||||||
|
|
||||||
* Wed Mar 21 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-6
|
|
||||||
- Fix stupid thinko in sql modifications.
|
|
||||||
|
|
||||||
* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-5
|
|
||||||
- Clean up macro usage.
|
|
||||||
|
|
||||||
* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 1.25.0-2
|
|
||||||
- Rebuild for new pcre.
|
|
||||||
|
|
||||||
* Thu Jan 19 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <rel-eng@lists.fedoraproject.org> - 1.24.4-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-3
|
|
||||||
- Re-add the dist-tag that somehow got lost.
|
|
||||||
|
|
||||||
* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <contyk@redhat.com> - 1.24.3-7.20110324svn3310
|
|
||||||
- Perl mass rebuild
|
|
||||||
|
|
||||||
* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-6.20110324svn3310
|
|
||||||
- Perl mass rebuild
|
|
||||||
|
|
||||||
* Mon May 09 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-5.20110324svn3310
|
|
||||||
- Bump for gnutls update.
|
|
||||||
|
|
||||||
* Thu Mar 24 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <dan@danny.cz> - 1.24.3-3
|
|
||||||
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
|
|
||||||
|
|
||||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <mmaslano@redhat.com> - 1.24.2-5
|
|
||||||
- Mass rebuild with perl-5.12.0
|
|
||||||
|
|
||||||
* Fri Dec 4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
|
|
||||||
- rebuild against perl 5.10.1
|
|
||||||
- use Perl vendorarch and archlib variables correctly
|
|
||||||
|
|
||||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <martin@zepler.org> - 1.24.1-3
|
|
||||||
- Remove unused Sys::Mmap perl dependency RPM is finding
|
|
||||||
|
|
||||||
* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.24.1-1
|
|
||||||
- Patch for gcc 4.4 compilation errors
|
|
||||||
- Upgrade to 1.24.1
|
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
|
|
||||||
- rebuild for dependencies
|
|
||||||
|
|
||||||
* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
|
|
||||||
- Fix permissions on zm.conf
|
|
||||||
|
|
||||||
* Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
|
|
||||||
- Initial attempt at packaging 1.23.
|
|
||||||
|
|
||||||
* Tue Jul 1 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-15
|
|
||||||
- Add perl module compat dependency, bz #453590
|
|
||||||
|
|
||||||
* Tue May 6 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-14
|
|
||||||
- Remove default runlevel, bz #441315
|
|
||||||
|
|
||||||
* Mon Apr 28 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <rel-eng@fedoraproject.org> - 1.22.3-12
|
|
||||||
- Autorebuild for GCC 4.3
|
|
||||||
|
|
||||||
* Thu Jan 3 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-11
|
|
||||||
- Fix compilation on gcc 4.3
|
|
||||||
|
|
||||||
* Thu Dec 6 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-10
|
|
||||||
- Rebuild for new openssl
|
|
||||||
|
|
||||||
* Thu Aug 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-8
|
|
||||||
- Fix licence tag
|
|
||||||
|
|
||||||
* Thu Jul 12 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-7
|
|
||||||
- Fixes from testing by Jitz including missing dependencies and database creation
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-6
|
|
||||||
- Disable crashtrace on ppc
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-5
|
|
||||||
- Fix uid for directories in /var/lib/zoneminder
|
|
||||||
|
|
||||||
* Tue Jun 26 2007 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.22.3-3
|
|
||||||
- Changes recommended in review by Jason Tibbitts
|
|
||||||
|
|
||||||
* Mon Apr 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-2
|
|
||||||
- Standardised on package name of zoneminder
|
|
||||||
|
|
||||||
* Thu Dec 28 2006 Martin Ebourne <martin@zepler.org> - 1.22.3-1
|
|
||||||
- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin
|
|
|
@ -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 <knnniggett@users.sourceforge.net> - 1.30.0
|
|
||||||
- Bump version fo 1.30.0 release.
|
|
||||||
|
|
||||||
* Sat Nov 21 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.29.0
|
|
||||||
- Bump version for 1.29.0 release on Fedora 23.
|
|
||||||
|
|
||||||
* Sat Feb 14 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.1
|
|
||||||
- Bump version for 1.28.1 release on Fedora 21.
|
|
||||||
|
|
||||||
* Sun Oct 5 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.0
|
|
||||||
- Bump version for 1.28.0 release.
|
|
||||||
|
|
||||||
* Fri Mar 14 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Tweak build requirements for cmake
|
|
||||||
|
|
||||||
* Sat Feb 01 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Add zmcamtool.pl. Bump version for 1.27 release.
|
|
||||||
|
|
||||||
* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
|
|
||||||
- This is a bug fixe release
|
|
||||||
- RTSP fixes, cmake enhancements, couple other misc fixes
|
|
||||||
|
|
||||||
* Mon Oct 07 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
|
||||||
- Initial cmake build.
|
|
||||||
|
|
||||||
* Sat Oct 05 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 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 <knnniggett@users.sourceforge.net> - 1.26.3
|
|
||||||
- Initial rebuild for ZoneMinder 1.26.3 release.
|
|
||||||
|
|
||||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.25.0-12
|
|
||||||
- rebuild due to "jpeg8-ABI" feature drop
|
|
||||||
|
|
||||||
* Mon Jan 7 2013 Remi Collet <rcollet@redhat.com> - 1.25.0-11
|
|
||||||
- fix configuration file for httpd 2.4, #871502
|
|
||||||
|
|
||||||
* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
|
|
||||||
- rebuild against new libjpeg
|
|
||||||
|
|
||||||
* Thu Aug 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-9
|
|
||||||
- Add patch to work around v4l2 api breakage in 3.5 kernel.
|
|
||||||
|
|
||||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jun 23 2012 Petr Pisar <ppisar@redhat.com> - 1.25.0-7
|
|
||||||
- Perl 5.16 rebuild
|
|
||||||
|
|
||||||
* Wed Mar 21 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-6
|
|
||||||
- Fix stupid thinko in sql modifications.
|
|
||||||
|
|
||||||
* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-5
|
|
||||||
- Clean up macro usage.
|
|
||||||
|
|
||||||
* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 1.25.0-2
|
|
||||||
- Rebuild for new pcre.
|
|
||||||
|
|
||||||
* Thu Jan 19 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <rel-eng@lists.fedoraproject.org> - 1.24.4-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-3
|
|
||||||
- Re-add the dist-tag that somehow got lost.
|
|
||||||
|
|
||||||
* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <contyk@redhat.com> - 1.24.3-7.20110324svn3310
|
|
||||||
- Perl mass rebuild
|
|
||||||
|
|
||||||
* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-6.20110324svn3310
|
|
||||||
- Perl mass rebuild
|
|
||||||
|
|
||||||
* Mon May 09 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-5.20110324svn3310
|
|
||||||
- Bump for gnutls update.
|
|
||||||
|
|
||||||
* Thu Mar 24 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <dan@danny.cz> - 1.24.3-3
|
|
||||||
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
|
|
||||||
|
|
||||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <mmaslano@redhat.com> - 1.24.2-5
|
|
||||||
- Mass rebuild with perl-5.12.0
|
|
||||||
|
|
||||||
* Fri Dec 4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
|
|
||||||
- rebuild against perl 5.10.1
|
|
||||||
- use Perl vendorarch and archlib variables correctly
|
|
||||||
|
|
||||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <martin@zepler.org> - 1.24.1-3
|
|
||||||
- Remove unused Sys::Mmap perl dependency RPM is finding
|
|
||||||
|
|
||||||
* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.24.1-1
|
|
||||||
- Patch for gcc 4.4 compilation errors
|
|
||||||
- Upgrade to 1.24.1
|
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
|
|
||||||
- rebuild for dependencies
|
|
||||||
|
|
||||||
* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
|
|
||||||
- Fix permissions on zm.conf
|
|
||||||
|
|
||||||
* Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
|
|
||||||
- Initial attempt at packaging 1.23.
|
|
||||||
|
|
||||||
* Tue Jul 1 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-15
|
|
||||||
- Add perl module compat dependency, bz #453590
|
|
||||||
|
|
||||||
* Tue May 6 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-14
|
|
||||||
- Remove default runlevel, bz #441315
|
|
||||||
|
|
||||||
* Mon Apr 28 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <rel-eng@fedoraproject.org> - 1.22.3-12
|
|
||||||
- Autorebuild for GCC 4.3
|
|
||||||
|
|
||||||
* Thu Jan 3 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-11
|
|
||||||
- Fix compilation on gcc 4.3
|
|
||||||
|
|
||||||
* Thu Dec 6 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-10
|
|
||||||
- Rebuild for new openssl
|
|
||||||
|
|
||||||
* Thu Aug 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-8
|
|
||||||
- Fix licence tag
|
|
||||||
|
|
||||||
* Thu Jul 12 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-7
|
|
||||||
- Fixes from testing by Jitz including missing dependencies and database creation
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-6
|
|
||||||
- Disable crashtrace on ppc
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-5
|
|
||||||
- Fix uid for directories in /var/lib/zoneminder
|
|
||||||
|
|
||||||
* Tue Jun 26 2007 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.22.3-3
|
|
||||||
- Changes recommended in review by Jason Tibbitts
|
|
||||||
|
|
||||||
* Mon Apr 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-2
|
|
||||||
- Standardised on package name of zoneminder
|
|
||||||
|
|
||||||
* Thu Dec 28 2006 Martin Ebourne <martin@zepler.org> - 1.22.3-1
|
|
||||||
- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin
|
|
|
@ -1,8 +0,0 @@
|
||||||
/var/log/zoneminder/*.log {
|
|
||||||
missingok
|
|
||||||
notifempty
|
|
||||||
sharedscripts
|
|
||||||
postrotate
|
|
||||||
/usr/bin/zmpkg.pl logrot 2> /dev/null > /dev/null || :
|
|
||||||
endscript
|
|
||||||
}
|
|
|
@ -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
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
d /run/zoneminder 0755 apache apache
|
|
|
@ -1 +0,0 @@
|
||||||
../redhat/jscalendar-1.0.zip
|
|
|
@ -1 +0,0 @@
|
||||||
../redhat/jscalendar.sh
|
|
|
@ -1 +0,0 @@
|
||||||
../redhat/redalert.wav
|
|
|
@ -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},
|
|
|
@ -1 +0,0 @@
|
||||||
../redhat/zoneminder.el7.conf.in
|
|
|
@ -1 +0,0 @@
|
||||||
zoneminder.f25.spec
|
|
|
@ -1 +0,0 @@
|
||||||
../redhat/zoneminder.el7.logrotate.in
|
|
|
@ -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
|
|
|
@ -1 +0,0 @@
|
||||||
../redhat/zoneminder.tmpfiles.in
|
|
|
@ -1,40 +1,56 @@
|
||||||
# CMakeLists.txt for the Redhat/CentOS Target Distro.
|
# CMakeLists.txt for the Redhat/CentOS Target Distro.
|
||||||
|
|
||||||
# Display a message to show the RHEL build options are being processed.
|
# 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 "el6") AND (ZM_WEB_USER STREQUAL "nginx"))
|
||||||
if(ZM_TARGET_DISTRO STREQUAL "el7")
|
message([FATAL_ERROR] "Nginx is Not a Supported Build Option on EL6 Target Distro" ...)
|
||||||
configure_file(zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
|
endif((ZM_TARGET_DISTRO STREQUAL "el6") AND (ZM_WEB_USER STREQUAL "nginx"))
|
||||||
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 the zoneminder service files
|
||||||
configure_file(zoneminder.el7.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.el7.logrotate @ONLY)
|
if(ZM_TARGET_DISTRO STREQUAL "el6")
|
||||||
else(ZM_TARGET_DISTRO STREQUAL "el7")
|
configure_file(sysvinit/zoneminder.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.sysvinit @ONLY)
|
||||||
configure_file(zoneminder.sysvinit.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.sysvinit @ONLY)
|
configure_file(sysvinit/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
|
||||||
configure_file(zoneminder.el6.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.el6.logrotate @ONLY)
|
configure_file(sysvinit/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY)
|
||||||
configure_file(zoneminder.el6.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.el6.conf @ONLY)
|
else(ZM_TARGET_DISTRO STREQUAL "el6")
|
||||||
endif(ZM_TARGET_DISTRO STREQUAL "el7")
|
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
|
# Unpack jscalendar & move files into position
|
||||||
message(STATUS "Unpacking and Installing jscalendar...")
|
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}
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
ERROR_VARIABLE unzip_jsc
|
ERROR_VARIABLE unzip_jsc
|
||||||
)
|
)
|
||||||
if("${unzip_jsc}" STREQUAL "")
|
if("${unzip_jsc}" STREQUAL "")
|
||||||
message(STATUS "jscalendar successfully installed.")
|
message(STATUS "jscalendar successfully installed.")
|
||||||
else("${unzip_jsc}" STREQUAL "")
|
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 "")
|
endif("${unzip_jsc}" STREQUAL "")
|
||||||
|
|
||||||
# Create several empty folders
|
# Create several empty folders
|
||||||
file(MAKE_DIRECTORY sock swap zoneminder zoneminder-upload events images temp)
|
file(MAKE_DIRECTORY sock swap zoneminder zoneminder-upload events images temp)
|
||||||
|
|
||||||
# Install the empty folders
|
# 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 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 /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 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)
|
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)
|
||||||
|
|
||||||
|
@ -44,21 +60,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/temp\")")
|
||||||
install(CODE "execute_process(COMMAND ln -sf ../../../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/api/app/tmp\")")
|
install(CODE "execute_process(COMMAND ln -sf ../../../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/api/app/tmp\")")
|
||||||
|
|
||||||
# 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(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 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)
|
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.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
|
||||||
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)
|
if(ZM_WEB_USER STREQUAL "nginx")
|
||||||
install(FILES zoneminder.service DESTINATION /usr/lib/systemd/system PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
|
install(FILES zoneminder.conf DESTINATION /etc/nginx/default.d 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 zoneminder.php-fpm.conf DESTINATION /etc/php-fpm.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME zoneminder.conf)
|
||||||
else(ZM_TARGET_DISTRO STREQUAL "el7")
|
else(ZM_WEB_USER STREQUAL "nginx")
|
||||||
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.conf DESTINATION /etc/httpd/conf.d 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)
|
endif(ZM_WEB_USER STREQUAL "nginx")
|
||||||
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")
|
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 /usr/lib/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
|
||||||
|
endif(ZM_TARGET_DISTRO STREQUAL "el6")
|
||||||
|
|
||||||
|
|
|
@ -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
|
|
|
@ -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 )
|
|
|
@ -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@
|
|
|
@ -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 '.<pid>' 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},
|
|
|
@ -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},
|
|
|
@ -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.
|
|
|
@ -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 <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Include ONVIF support files
|
|
||||||
|
|
||||||
* Fri Mar 14 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Tweak build requirements for cmake
|
|
||||||
|
|
||||||
* Sat Feb 01 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Add zmcamtool.pl. Bump version for 1.27 release.
|
|
||||||
|
|
||||||
* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
|
|
||||||
- This is a bug fixe release
|
|
||||||
- RTSP fixes, cmake enhancements, couple other misc fixes
|
|
||||||
|
|
||||||
* Sun Oct 06 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
|
||||||
- All files are now part of the zoneminder source tree. Update specfile accordingly.
|
|
||||||
|
|
||||||
* Thu Sep 05 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.0
|
|
||||||
- 1.26.0 Release
|
|
||||||
- https://github.com/ZoneMinder/ZoneMinder/archive/v1.26.0.tar.gz
|
|
||||||
|
|
||||||
* Sun Sep 01 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.0-beta
|
|
||||||
- Update SELinux policy module
|
|
||||||
|
|
||||||
* Thu Aug 29 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 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 <knnniggett@users.sourceforge.net> - 1.26.0-beta
|
|
||||||
- Initial Beta release
|
|
||||||
- https://github.com/ZoneMinder/ZoneMinder/tree/release-1.26
|
|
||||||
|
|
||||||
* Sun Aug 11 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 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 <knnniggett@users.sourceforge.net> - 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 <knnniggett@users.sourceforge.net> - 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 <tibbs@math.uh.edu> - 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 <dan@danny.cz> - 1.24.3-3
|
|
||||||
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
|
|
||||||
|
|
||||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <mmaslano@redhat.com> - 1.24.2-5
|
|
||||||
- Mass rebuild with perl-5.12.0
|
|
||||||
|
|
||||||
* Fri Dec 4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
|
|
||||||
- rebuild against perl 5.10.1
|
|
||||||
- use Perl vendorarch and archlib variables correctly
|
|
||||||
|
|
||||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <martin@zepler.org> - 1.24.1-3
|
|
||||||
- Remove unused Sys::Mmap perl dependency RPM is finding
|
|
||||||
|
|
||||||
* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.24.1-1
|
|
||||||
- Patch for gcc 4.4 compilation errors
|
|
||||||
- Upgrade to 1.24.1
|
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
|
|
||||||
- rebuild for dependencies
|
|
||||||
|
|
||||||
* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
|
|
||||||
- Fix permissions on zm.conf
|
|
||||||
|
|
||||||
* Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
|
|
||||||
- Initial attempt at packaging 1.23.
|
|
||||||
|
|
||||||
* Tue Jul 1 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-15
|
|
||||||
- Add perl module compat dependency, bz #453590
|
|
||||||
|
|
||||||
* Tue May 6 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-14
|
|
||||||
- Remove default runlevel, bz #441315
|
|
||||||
|
|
||||||
* Mon Apr 28 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <rel-eng@fedoraproject.org> - 1.22.3-12
|
|
||||||
- Autorebuild for GCC 4.3
|
|
||||||
|
|
||||||
* Thu Jan 3 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-11
|
|
||||||
- Fix compilation on gcc 4.3
|
|
||||||
|
|
||||||
* Thu Dec 6 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-10
|
|
||||||
- Rebuild for new openssl
|
|
||||||
|
|
||||||
* Thu Aug 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-8
|
|
||||||
- Fix licence tag
|
|
||||||
|
|
||||||
* Thu Jul 12 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-7
|
|
||||||
- Fixes from testing by Jitz including missing dependencies and database creation
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-6
|
|
||||||
- Disable crashtrace on ppc
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-5
|
|
||||||
- Fix uid for directories in /var/lib/zoneminder
|
|
||||||
|
|
||||||
* Tue Jun 26 2007 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.22.3-3
|
|
||||||
- Changes recommended in review by Jason Tibbitts
|
|
||||||
|
|
||||||
* Mon Apr 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-2
|
|
||||||
- Standardised on package name of zoneminder
|
|
||||||
|
|
||||||
* Thu Dec 28 2006 Martin Ebourne <martin@zepler.org> - 1.22.3-1
|
|
||||||
- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
unzip -o jscalendar-1.0.zip
|
unzip -o misc/jscalendar-1.0.zip
|
||||||
mkdir -v jscalendar-doc
|
mkdir -v jscalendar-doc
|
||||||
cd jscalendar-1.0
|
cd jscalendar-1.0
|
||||||
mv -v *html *php doc/* README ../jscalendar-doc
|
mv -v *html *php doc/* README ../jscalendar-doc
|
|
@ -30,7 +30,7 @@ New installs
|
||||||
Mysql server, you need to ensure that the server is configured to start
|
Mysql server, you need to ensure that the server is configured to start
|
||||||
during boot and properly secured by running:
|
during boot and properly secured by running:
|
||||||
|
|
||||||
sudo yum install mariadb-server
|
sudo dnf install mariadb-server
|
||||||
sudo systemctl enable mariadb
|
sudo systemctl enable mariadb
|
||||||
sudo systemctl start mariadb.service
|
sudo systemctl start mariadb.service
|
||||||
mysql_secure_installation
|
mysql_secure_installation
|
|
@ -8,12 +8,15 @@ Requires=mariadb.service nginx.service php-fpm.service fcgiwrap.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
User=@WEB_USER@
|
User=@WEB_USER@
|
||||||
|
Group=@WEB_GROUP@
|
||||||
Type=forking
|
Type=forking
|
||||||
ExecStart=@BINDIR@/zmpkg.pl start
|
ExecStart=@BINDIR@/zmpkg.pl start
|
||||||
ExecReload=@BINDIR@/zmpkg.pl restart
|
ExecReload=@BINDIR@/zmpkg.pl restart
|
||||||
ExecStop=@BINDIR@/zmpkg.pl stop
|
ExecStop=@BINDIR@/zmpkg.pl stop
|
||||||
PIDFile="@ZM_RUNDIR@/zm.pid"
|
PIDFile=@ZM_RUNDIR@/zm.pid
|
||||||
Environment=TZ=/etc/localtime
|
Environment=TZ=/etc/localtime
|
||||||
|
RuntimeDirectory=zoneminder
|
||||||
|
RuntimeDirectoryMode=0755
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
|
@ -0,0 +1,5 @@
|
||||||
|
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@
|
||||||
|
|
|
@ -22,12 +22,10 @@ What's New
|
||||||
New installs
|
New installs
|
||||||
============
|
============
|
||||||
|
|
||||||
1. This package supports either community-mysql-server or mariadb-server with
|
1. Unless you are already using MariaDB server, you need to ensure that the
|
||||||
mariadb being the preferred choice. Unless you are already using MariaDB or
|
server is configured to start during boot and properly secured by running:
|
||||||
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 enable mariadb
|
||||||
sudo systemctl start mariadb.service
|
sudo systemctl start mariadb.service
|
||||||
mysql_secure_installation
|
mysql_secure_installation
|
||||||
|
@ -82,7 +80,7 @@ New installs
|
||||||
signed certificate on your system. The recommended way to complete this step
|
signed certificate on your system. The recommended way to complete this step
|
||||||
is to simply install mod_ssl:
|
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
|
If this does not meet your needs, then read README.https to
|
||||||
learn about alternatives. When in doubt, install mod_ssl.
|
learn about alternatives. When in doubt, install mod_ssl.
|
|
@ -1,15 +1,37 @@
|
||||||
What's New
|
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
|
ALL permission to the ZoneMinder mysql account. This change must be done
|
||||||
manually before ZoneMinder will run. See the installation steps below.
|
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
|
Requests using HTTP will auto-redirect to HTTPS. See README.https for
|
||||||
more information.
|
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
|
API. If you require API functionality (such as using a mobile app) then you
|
||||||
should consider an upgrade to CentOS 7 or use Fedora.
|
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
|
the server is confired to start during boot and properly secured
|
||||||
by running:
|
by running:
|
||||||
|
|
||||||
|
sudo yum install mysql-server
|
||||||
sudo service mysqld start
|
sudo service mysqld start
|
||||||
/usr/bin/mysql_secure_installation
|
/usr/bin/mysql_secure_installation
|
||||||
sudo chkconfig mysqld on
|
sudo chkconfig mysqld on
|
||||||
|
@ -37,7 +60,7 @@ New installs
|
||||||
anything that suits your environment.
|
anything that suits your environment.
|
||||||
|
|
||||||
3. If you have chosen to change the zoneminder mysql credentials to something
|
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.
|
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
|
4. Edit /etc/php.ini, uncomment the date.timezone line, and add your local
|
||||||
|
@ -87,16 +110,16 @@ New installs
|
||||||
Upgrades
|
Upgrades
|
||||||
========
|
========
|
||||||
|
|
||||||
1. Verify /etc/zm.conf.
|
1. Verify /etc/zm/zm.conf.
|
||||||
|
|
||||||
If zm.conf was manually edited before running the upgrade, the installation
|
If zm.conf was manually edited before running the upgrade, the installation
|
||||||
may not overwrite it. In this case, it will create the file
|
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
|
For example, this will happen if you are using database account credentials
|
||||||
other than zmuser/zmpass.
|
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.
|
contains any new config settings that may be in zm.conf.rpmnew.
|
||||||
|
|
||||||
2. Verify permissions of the zmuser account.
|
2. Verify permissions of the zmuser account.
|
|
@ -22,13 +22,13 @@ What's New
|
||||||
New installs
|
New installs
|
||||||
============
|
============
|
||||||
|
|
||||||
1. Unless you are already using MariaDB server, you need to ensure that
|
1. Unless you are already using MariaDB server, you need to ensure that the
|
||||||
the server is configured to start during boot and properly secured
|
server is configured to start during boot and properly secured by running:
|
||||||
by running:
|
|
||||||
|
|
||||||
|
sudo dnf install mariadb-server
|
||||||
sudo systemctl enable mariadb
|
sudo systemctl enable mariadb
|
||||||
sudo systemctl start mariadb
|
sudo systemctl start mariadb.service
|
||||||
sudo mysql_secure_installation
|
mysql_secure_installation
|
||||||
|
|
||||||
2. Using the password for the root account set during the previous step, you
|
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
|
will need to create the ZoneMinder database and configure a database
|
|
@ -1,7 +1,7 @@
|
||||||
HTTPS is now a requirement
|
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
|
be installed along with ZoneMinder. Upon installation, the mod_ssl package
|
||||||
will create a default, self-signed certificate. This is the certificate that
|
will create a default, self-signed certificate. This is the certificate that
|
||||||
ZoneMinder will use out of the box.
|
ZoneMinder will use out of the box.
|
|
@ -11,6 +11,9 @@ RewriteRule ^/?(zm)(.*) https://%{SERVER_NAME}/$1$2 [R,L]
|
||||||
|
|
||||||
Alias /zm "@ZM_WEBDIR@"
|
Alias /zm "@ZM_WEBDIR@"
|
||||||
<Directory "@ZM_WEBDIR@">
|
<Directory "@ZM_WEBDIR@">
|
||||||
|
# explicitly set index.php as the only directoryindex
|
||||||
|
DirectoryIndex disabled
|
||||||
|
DirectoryIndex index.php
|
||||||
SSLRequireSSL
|
SSLRequireSSL
|
||||||
Options -Indexes +MultiViews +FollowSymLinks
|
Options -Indexes +MultiViews +FollowSymLinks
|
||||||
AllowOverride All
|
AllowOverride All
|
|
@ -7,12 +7,15 @@ Requires=mariadb.service httpd.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
User=@WEB_USER@
|
User=@WEB_USER@
|
||||||
|
Group=@WEB_GROUP@
|
||||||
Type=forking
|
Type=forking
|
||||||
ExecStart=@BINDIR@/zmpkg.pl start
|
ExecStart=@BINDIR@/zmpkg.pl start
|
||||||
ExecReload=@BINDIR@/zmpkg.pl restart
|
ExecReload=@BINDIR@/zmpkg.pl restart
|
||||||
ExecStop=@BINDIR@/zmpkg.pl stop
|
ExecStop=@BINDIR@/zmpkg.pl stop
|
||||||
PIDFile="@ZM_RUNDIR@/zm.pid"
|
PIDFile=@ZM_RUNDIR@/zm.pid
|
||||||
Environment=TZ=/etc/localtime
|
Environment=TZ=/etc/localtime
|
||||||
|
RuntimeDirectory=zoneminder
|
||||||
|
RuntimeDirectoryMode=0755
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
|
@ -1,3 +1,2 @@
|
||||||
D @ZM_RUNDIR@ 0755 @WEB_USER@ @WEB_GROUP@
|
|
||||||
D @ZM_TMPDIR@ 0755 @WEB_USER@ @WEB_GROUP@
|
D @ZM_TMPDIR@ 0755 @WEB_USER@ @WEB_GROUP@
|
||||||
D @ZM_SOCKDIR@ 0755 @WEB_USER@ @WEB_GROUP@
|
D @ZM_SOCKDIR@ 0755 @WEB_USER@ @WEB_GROUP@
|
|
@ -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 <knnniggett@users.sourceforge.net> - 1.30.0
|
|
||||||
- Bump version fo 1.30.0 release.
|
|
||||||
|
|
||||||
* Tue Sep 8 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.1
|
|
||||||
- Require https, freshen dB on updates.
|
|
||||||
|
|
||||||
* Wed Feb 18 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.1
|
|
||||||
- Include ONVIF support files
|
|
||||||
|
|
||||||
* Sun Oct 5 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.0
|
|
||||||
- Bump version for 1.28.0 release.
|
|
||||||
|
|
||||||
* Fri Mar 14 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Tweak build requirements for cmake
|
|
||||||
|
|
||||||
* Sat Feb 01 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Add zmcamtool.pl. Bump version for 1.27 release.
|
|
||||||
|
|
||||||
* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
|
|
||||||
- This is a bug fixe release
|
|
||||||
- RTSP fixes, cmake enhancements, couple other misc fixes
|
|
||||||
|
|
||||||
* Sat Oct 19 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
|
||||||
- Streamline the cmake build. Move much code into cmakelist.txt file.
|
|
||||||
|
|
||||||
* Mon Oct 07 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
|
||||||
- Initial cmake build.
|
|
||||||
|
|
||||||
* Sun Oct 06 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
|
||||||
- All files are now part of the zoneminder source tree. Update specfile accordingly.
|
|
||||||
|
|
||||||
* Thu Sep 05 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.0
|
|
||||||
- 1.26.0 Release
|
|
||||||
- https://github.com/ZoneMinder/ZoneMinder/archive/v1.26.0.tar.gz
|
|
||||||
|
|
||||||
* Sun Sep 01 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.0-beta
|
|
||||||
- Update SELinux policy module
|
|
||||||
|
|
||||||
* Thu Aug 29 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 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 <knnniggett@users.sourceforge.net> - 1.26.0-beta
|
|
||||||
- Initial Beta release
|
|
||||||
- https://github.com/ZoneMinder/ZoneMinder/tree/release-1.26
|
|
||||||
|
|
||||||
* Sun Aug 11 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 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 <knnniggett@users.sourceforge.net> - 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 <knnniggett@users.sourceforge.net> - 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 <tibbs@math.uh.edu> - 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 <dan@danny.cz> - 1.24.3-3
|
|
||||||
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
|
|
||||||
|
|
||||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <mmaslano@redhat.com> - 1.24.2-5
|
|
||||||
- Mass rebuild with perl-5.12.0
|
|
||||||
|
|
||||||
* Fri Dec 4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
|
|
||||||
- rebuild against perl 5.10.1
|
|
||||||
- use Perl vendorarch and archlib variables correctly
|
|
||||||
|
|
||||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <martin@zepler.org> - 1.24.1-3
|
|
||||||
- Remove unused Sys::Mmap perl dependency RPM is finding
|
|
||||||
|
|
||||||
* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.24.1-1
|
|
||||||
- Patch for gcc 4.4 compilation errors
|
|
||||||
- Upgrade to 1.24.1
|
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
|
|
||||||
- rebuild for dependencies
|
|
||||||
|
|
||||||
* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
|
|
||||||
- Fix permissions on zm.conf
|
|
||||||
|
|
||||||
* Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
|
|
||||||
- Initial attempt at packaging 1.23.
|
|
||||||
|
|
||||||
* Tue Jul 1 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-15
|
|
||||||
- Add perl module compat dependency, bz #453590
|
|
||||||
|
|
||||||
* Tue May 6 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-14
|
|
||||||
- Remove default runlevel, bz #441315
|
|
||||||
|
|
||||||
* Mon Apr 28 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <rel-eng@fedoraproject.org> - 1.22.3-12
|
|
||||||
- Autorebuild for GCC 4.3
|
|
||||||
|
|
||||||
* Thu Jan 3 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-11
|
|
||||||
- Fix compilation on gcc 4.3
|
|
||||||
|
|
||||||
* Thu Dec 6 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-10
|
|
||||||
- Rebuild for new openssl
|
|
||||||
|
|
||||||
* Thu Aug 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-8
|
|
||||||
- Fix licence tag
|
|
||||||
|
|
||||||
* Thu Jul 12 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-7
|
|
||||||
- Fixes from testing by Jitz including missing dependencies and database creation
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-6
|
|
||||||
- Disable crashtrace on ppc
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-5
|
|
||||||
- Fix uid for directories in /var/lib/zoneminder
|
|
||||||
|
|
||||||
* Tue Jun 26 2007 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.22.3-3
|
|
||||||
- Changes recommended in review by Jason Tibbitts
|
|
||||||
|
|
||||||
* Mon Apr 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-2
|
|
||||||
- Standardised on package name of zoneminder
|
|
||||||
|
|
||||||
* Thu Dec 28 2006 Martin Ebourne <martin@zepler.org> - 1.22.3-1
|
|
||||||
- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin
|
|
|
@ -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="el7" \
|
|
||||||
.
|
|
||||||
|
|
||||||
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 <knnniggett@users.sourceforge.net> - 1.30.0
|
|
||||||
- Bump version fo 1.30.0 release.
|
|
||||||
|
|
||||||
* Mon Sep 7 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.1
|
|
||||||
- Require https, disable selinux module, freshen dB on updates.
|
|
||||||
|
|
||||||
* Sun Feb 8 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.1
|
|
||||||
- Initial release for CentOS 7.
|
|
||||||
|
|
||||||
* Sun Oct 5 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.0
|
|
||||||
- Bump version for 1.28.0 release.
|
|
||||||
|
|
||||||
* Fri Mar 14 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Tweak build requirements for cmake
|
|
||||||
|
|
||||||
* Sat Feb 01 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
|
||||||
- Add zmcamtool.pl. Bump version for 1.27 release.
|
|
||||||
|
|
||||||
* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
|
|
||||||
- This is a bug fixe release
|
|
||||||
- RTSP fixes, cmake enhancements, couple other misc fixes
|
|
||||||
|
|
||||||
* Mon Oct 07 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
|
||||||
- Initial cmake build.
|
|
||||||
|
|
||||||
* Sat Oct 05 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 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 <knnniggett@users.sourceforge.net> - 1.26.3
|
|
||||||
- Initial rebuild for ZoneMinder 1.26.3 release.
|
|
||||||
|
|
||||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.25.0-12
|
|
||||||
- rebuild due to "jpeg8-ABI" feature drop
|
|
||||||
|
|
||||||
* Mon Jan 7 2013 Remi Collet <rcollet@redhat.com> - 1.25.0-11
|
|
||||||
- fix configuration file for httpd 2.4, #871502
|
|
||||||
|
|
||||||
* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
|
|
||||||
- rebuild against new libjpeg
|
|
||||||
|
|
||||||
* Thu Aug 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-9
|
|
||||||
- Add patch to work around v4l2 api breakage in 3.5 kernel.
|
|
||||||
|
|
||||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jun 23 2012 Petr Pisar <ppisar@redhat.com> - 1.25.0-7
|
|
||||||
- Perl 5.16 rebuild
|
|
||||||
|
|
||||||
* Wed Mar 21 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-6
|
|
||||||
- Fix stupid thinko in sql modifications.
|
|
||||||
|
|
||||||
* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-5
|
|
||||||
- Clean up macro usage.
|
|
||||||
|
|
||||||
* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 1.25.0-2
|
|
||||||
- Rebuild for new pcre.
|
|
||||||
|
|
||||||
* Thu Jan 19 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <rel-eng@lists.fedoraproject.org> - 1.24.4-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-3
|
|
||||||
- Re-add the dist-tag that somehow got lost.
|
|
||||||
|
|
||||||
* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <contyk@redhat.com> - 1.24.3-7.20110324svn3310
|
|
||||||
- Perl mass rebuild
|
|
||||||
|
|
||||||
* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-6.20110324svn3310
|
|
||||||
- Perl mass rebuild
|
|
||||||
|
|
||||||
* Mon May 09 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-5.20110324svn3310
|
|
||||||
- Bump for gnutls update.
|
|
||||||
|
|
||||||
* Thu Mar 24 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <dan@danny.cz> - 1.24.3-3
|
|
||||||
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
|
|
||||||
|
|
||||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <mmaslano@redhat.com> - 1.24.2-5
|
|
||||||
- Mass rebuild with perl-5.12.0
|
|
||||||
|
|
||||||
* Fri Dec 4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
|
|
||||||
- rebuild against perl 5.10.1
|
|
||||||
- use Perl vendorarch and archlib variables correctly
|
|
||||||
|
|
||||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 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 <martin@zepler.org> - 1.24.1-3
|
|
||||||
- Remove unused Sys::Mmap perl dependency RPM is finding
|
|
||||||
|
|
||||||
* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.24.1-1
|
|
||||||
- Patch for gcc 4.4 compilation errors
|
|
||||||
- Upgrade to 1.24.1
|
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
|
|
||||||
- rebuild for dependencies
|
|
||||||
|
|
||||||
* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
|
|
||||||
- Fix permissions on zm.conf
|
|
||||||
|
|
||||||
* Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
|
|
||||||
- Initial attempt at packaging 1.23.
|
|
||||||
|
|
||||||
* Tue Jul 1 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-15
|
|
||||||
- Add perl module compat dependency, bz #453590
|
|
||||||
|
|
||||||
* Tue May 6 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-14
|
|
||||||
- Remove default runlevel, bz #441315
|
|
||||||
|
|
||||||
* Mon Apr 28 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <rel-eng@fedoraproject.org> - 1.22.3-12
|
|
||||||
- Autorebuild for GCC 4.3
|
|
||||||
|
|
||||||
* Thu Jan 3 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-11
|
|
||||||
- Fix compilation on gcc 4.3
|
|
||||||
|
|
||||||
* Thu Dec 6 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-10
|
|
||||||
- Rebuild for new openssl
|
|
||||||
|
|
||||||
* Thu Aug 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-8
|
|
||||||
- Fix licence tag
|
|
||||||
|
|
||||||
* Thu Jul 12 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-7
|
|
||||||
- Fixes from testing by Jitz including missing dependencies and database creation
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-6
|
|
||||||
- Disable crashtrace on ppc
|
|
||||||
|
|
||||||
* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-5
|
|
||||||
- Fix uid for directories in /var/lib/zoneminder
|
|
||||||
|
|
||||||
* Tue Jun 26 2007 Martin Ebourne <martin@zepler.org> - 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 <martin@zepler.org> - 1.22.3-3
|
|
||||||
- Changes recommended in review by Jason Tibbitts
|
|
||||||
|
|
||||||
* Mon Apr 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-2
|
|
||||||
- Standardised on package name of zoneminder
|
|
||||||
|
|
||||||
* Thu Dec 28 2006 Martin Ebourne <martin@zepler.org> - 1.22.3-1
|
|
||||||
- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin
|
|
|
@ -1,67 +1,136 @@
|
||||||
%define zmuid $(id -un)
|
%global zmuid_final apache
|
||||||
%define zmgid $(id -gn)
|
%global zmgid_final apache
|
||||||
%define zmuid_final apache
|
|
||||||
%define zmgid_final apache
|
|
||||||
|
|
||||||
|
# Crud is configured as a git submodule
|
||||||
|
%global crud_version 3.0.10
|
||||||
|
|
||||||
|
%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
|
%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
|
Name: zoneminder
|
||||||
Version: 1.30.0
|
Version: 1.30.1
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: A camera monitoring and analysis tool
|
Summary: A camera monitoring and analysis tool
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/
|
# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/
|
||||||
# Mootools is inder the MIT license: http://mootools.net/
|
# Mootools is inder the MIT license: http://mootools.net/
|
||||||
|
# CakePHP is under the MIT license: https://github.com/cakephp/cakephp
|
||||||
|
# Crud is under the MIT license: https://github.com/FriendsOfCake/crud
|
||||||
License: GPLv2+ and LGPLv2+ and MIT
|
License: GPLv2+ and LGPLv2+ and MIT
|
||||||
URL: http://www.zoneminder.com/
|
URL: http://www.zoneminder.com/
|
||||||
|
|
||||||
#Source: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz
|
Source0: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
Source: ZoneMinder-%{version}.tar.gz
|
Source1: https://github.com/FriendsOfCake/crud/archive/v%{crud_version}.tar.gz#/crud-%{crud_version}.tar.gz
|
||||||
|
|
||||||
BuildRequires: cmake gnutls-devel systemd-units bzip2-devel
|
%{?with_init_systemd:BuildRequires: systemd-devel}
|
||||||
BuildRequires: mariadb-devel pcre-devel libjpeg-turbo-devel
|
%{?with_init_systemd:BuildRequires: mariadb-devel}
|
||||||
BuildRequires: perl(Archive::Tar) perl(Archive::Zip) perl-podlators
|
%{?with_init_systemd:BuildRequires: perl-podlators}
|
||||||
BuildRequires: perl(Date::Manip) perl(DBD::mysql)
|
%{?with_init_sysv:BuildRequires: mysql-devel}
|
||||||
BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
|
%{?el6:BuildRequires: epel-rpm-macros}
|
||||||
BuildRequires: perl(MIME::Entity) perl(MIME::Lite)
|
BuildRequires: cmake >= 2.8.7
|
||||||
BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap)
|
BuildRequires: gnutls-devel
|
||||||
BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign)
|
BuildRequires: bzip2-devel
|
||||||
BuildRequires: perl(Expect) perl(Sys::Syslog)
|
BuildRequires: pcre-devel
|
||||||
BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel
|
BuildRequires: libjpeg-turbo-devel
|
||||||
%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel}
|
BuildRequires: findutils
|
||||||
%{!?_without_x10:BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime)}
|
BuildRequires: coreutils
|
||||||
# cmake needs the following installed at build time due to the way it auto-detects certain parameters
|
BuildRequires: perl
|
||||||
BuildRequires: httpd polkit-devel
|
BuildRequires: perl-generators
|
||||||
%{!?_without_ffmpeg:BuildRequires: ffmpeg}
|
BuildRequires: perl(Archive::Tar)
|
||||||
|
BuildRequires: perl(Archive::Zip)
|
||||||
|
BuildRequires: perl(Date::Manip)
|
||||||
|
BuildRequires: perl(DBD::mysql)
|
||||||
|
BuildRequires: perl(ExtUtils::MakeMaker)
|
||||||
|
BuildRequires: perl(LWP::UserAgent)
|
||||||
|
BuildRequires: perl(MIME::Entity)
|
||||||
|
BuildRequires: perl(MIME::Lite)
|
||||||
|
BuildRequires: perl(PHP::Serialization)
|
||||||
|
BuildRequires: perl(Sys::Mmap)
|
||||||
|
BuildRequires: perl(Time::HiRes)
|
||||||
|
BuildRequires: perl(Net::SFTP::Foreign)
|
||||||
|
BuildRequires: perl(Expect)
|
||||||
|
BuildRequires: perl(Sys::Syslog)
|
||||||
|
BuildRequires: gcc
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: vlc-devel
|
||||||
|
BuildRequires: libcurl-devel
|
||||||
|
BuildRequires: libv4l-devel
|
||||||
|
BuildRequires: ffmpeg-devel
|
||||||
|
BuildRequires: polkit-devel
|
||||||
|
|
||||||
# php-mysql was deprecated beginning with f25
|
%{?with_nginx:Requires: nginx}
|
||||||
%if 0%{?fedora} >= 25
|
%{?with_nginx:Requires: fcgiwrap}
|
||||||
Requires: php-mysqlnd
|
%{?with_nginx:Requires: php-fpm}
|
||||||
%else
|
%{!?with_nginx:Requires: httpd php}
|
||||||
Requires: php-mysql
|
%{!?with_nginx:Requires: php}
|
||||||
%endif
|
%{?with_php_mysqlnd:Requires: php-mysqlnd}
|
||||||
|
%{?with_php_mysql:Requires: php-mysql}
|
||||||
Requires: httpd php php-gd cambozola polkit net-tools psmisc
|
Requires: php-common
|
||||||
Requires: libjpeg-turbo vlc-core libcurl
|
Requires: php-gd
|
||||||
|
Requires: cambozola
|
||||||
|
Requires: net-tools
|
||||||
|
Requires: psmisc
|
||||||
|
Requires: polkit
|
||||||
|
Requires: libjpeg-turbo
|
||||||
|
Requires: vlc-core
|
||||||
|
Requires: ffmpeg
|
||||||
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
||||||
Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
|
Requires: perl(DBD::mysql)
|
||||||
Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP)
|
Requires: perl(Archive::Tar)
|
||||||
|
Requires: perl(Archive::Zip)
|
||||||
|
Requires: perl(MIME::Entity)
|
||||||
|
Requires: perl(MIME::Lite)
|
||||||
|
Requires: perl(Net::SMTP)
|
||||||
|
Requires: perl(Net::FTP)
|
||||||
Requires: perl(LWP::Protocol::https)
|
Requires: perl(LWP::Protocol::https)
|
||||||
%{!?_without_ffmpeg:Requires: ffmpeg}
|
|
||||||
|
|
||||||
Requires(post): systemd-units systemd-sysv
|
%{?with_init_systemd:Requires(post): systemd}
|
||||||
Requires(post): /usr/bin/gpasswd
|
%{?with_init_systemd:Requires(post): systemd-sysv}
|
||||||
Requires(post): /usr/bin/less
|
%{?with_init_systemd:Requires(preun): systemd}
|
||||||
Requires(preun): systemd-units
|
%{?with_init_systemd:Requires(postun): systemd}
|
||||||
Requires(postun): systemd-units
|
|
||||||
|
%{?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
|
%description
|
||||||
ZoneMinder is a set of applications which is intended to provide a complete
|
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
|
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
|
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
|
attached to BTTV cards, various USB cameras and IP network cameras. It is
|
||||||
|
@ -69,13 +138,16 @@ designed to support as many cameras as you can attach to your computer without
|
||||||
too much degradation of performance.
|
too much degradation of performance.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n ZoneMinder-%{version}
|
%autosetup
|
||||||
|
%autosetup -a 1
|
||||||
|
rmdir ./web/api/app/Plugin/Crud
|
||||||
|
mv -f crud-%{crud_version} ./web/api/app/Plugin/Crud
|
||||||
|
|
||||||
# Change the following default values
|
# Change the following default values
|
||||||
./utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin-zm/nph-zms
|
./utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin-zm/nph-zms
|
||||||
./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
|
./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
|
||||||
./utils/zmeditconfigdata.sh ZM_PATH_SWAP /dev/shm
|
./utils/zmeditconfigdata.sh ZM_PATH_SWAP /dev/shm
|
||||||
./utils/zmeditconfigdata.sh ZM_UPLOAD_FTP_LOC_DIR /var/spool/zoneminder-upload
|
./utils/zmeditconfigdata.sh ZM_UPLOAD_FTP_LOC_DIR %{_localstatedir}/spool/zoneminder-upload
|
||||||
./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes
|
./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes
|
||||||
./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no
|
./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no
|
||||||
./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no
|
./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no
|
||||||
|
@ -83,30 +155,38 @@ too much degradation of performance.
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake \
|
%cmake \
|
||||||
-DZM_TARGET_DISTRO="fc%{fedora}" \
|
-DZM_WEB_USER="%{zmuid_final}" \
|
||||||
%{?_without_ffmpeg:-DZM_NO_FFMPEG=ON} \
|
-DZM_WEB_GROUP="%{zmuid_final}" \
|
||||||
%{?_without_x10:-DZM_NO_X10=ON} \
|
-DZM_TARGET_DISTRO="%{zmtargetdistro}" \
|
||||||
.
|
.
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
|
|
||||||
%install
|
%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 || :
|
||||||
|
|
||||||
%post
|
%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)
|
# Create and load zoneminder selinux policy module
|
||||||
%{_bindir}/zmcamtool.pl --import >/dev/null 2>&1 || :
|
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
|
if [ $1 -eq 1 ] ; then
|
||||||
# Initial installation
|
%systemd_post %{name}.service
|
||||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
|
||||||
fi
|
fi
|
||||||
|
%endif
|
||||||
# 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
|
# Upgrade from a previous version of zoneminder
|
||||||
if [ $1 -eq 2 ] ; then
|
if [ $1 -eq 2 ] ; then
|
||||||
|
@ -120,47 +200,105 @@ if [ $1 -eq 2 ] ; then
|
||||||
# We can't run this automatically when new sql account permissions need to
|
# We can't run this automatically when new sql account permissions need to
|
||||||
# be manually added first
|
# be manually added first
|
||||||
# Run zmupdate non-interactively
|
# Run zmupdate non-interactively
|
||||||
#/usr/bin/zmupdate.pl --nointeractive
|
# zmupdate.pl --nointeractive
|
||||||
fi
|
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
|
# 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"
|
echo -e "\nThe README file is located here: %{_docdir}/%{name}\n"
|
||||||
|
|
||||||
%preun
|
%if 0%{?with_nginx}
|
||||||
if [ $1 -eq 0 ] ; then
|
# Nginx does not create an SSL certificate like the apache package does so lets do that here
|
||||||
# Package removal, not upgrade
|
if [ -f %{sslkey} -o -f %{sslcert} ]; then
|
||||||
/bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || :
|
exit 0
|
||||||
/bin/systemctl stop zoneminder.service > /dev/null 2>&1 || :
|
|
||||||
fi
|
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
|
%postun
|
||||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
%if 0%{?with_init_sysv}
|
||||||
if [ $1 -ge 1 ] ; then
|
if [ $1 -ge 1 ]; then
|
||||||
# Package upgrade, not uninstall
|
/sbin/service zoneminder condrestart > /dev/null 2>&1 || :
|
||||||
/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Remove the doc folder.
|
||||||
|
rm -rf %{_docdir}/%{name}-%{version}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?with_init_systemd}
|
||||||
|
%systemd_postun_with_restart %{name}.service
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?with_init_systemd}
|
||||||
%triggerun -- zoneminder < 1.25.0-4
|
%triggerun -- zoneminder < 1.25.0-4
|
||||||
# Save the current service runlevel info
|
# Save the current service runlevel info
|
||||||
# User must manually run systemd-sysv-convert --apply zoneminder
|
# User must manually run systemd-sysv-convert --apply zoneminder
|
||||||
# to migrate them to systemd targets
|
# 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
|
# Run these because the SysV package being removed won't do them
|
||||||
/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || :
|
/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || :
|
||||||
/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
|
/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
|
||||||
|
%endif
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%license COPYING
|
||||||
%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/README.https distros/fedora/jscalendar-doc
|
%doc AUTHORS README.md distros/redhat/readme/README.%{readme_suffix} distros/redhat/readme/README.https distros/redhat/jscalendar-doc
|
||||||
%config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf
|
%config(noreplace) %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf
|
||||||
%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
|
%config(noreplace) %attr(644,root,root) %{wwwconfdir}/zoneminder.conf
|
||||||
%config(noreplace) /etc/tmpfiles.d/zoneminder.conf
|
|
||||||
%config(noreplace) /etc/logrotate.d/zoneminder
|
%config(noreplace) /etc/logrotate.d/zoneminder
|
||||||
|
|
||||||
|
%if 0%{?with_nginx}
|
||||||
|
%config(noreplace) %{_sysconfdir}/php-fpm.d/zoneminder.conf
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?with_init_systemd}
|
||||||
|
%{_tmpfilesdir}/zoneminder.conf
|
||||||
%{_unitdir}/zoneminder.service
|
%{_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}/zma
|
||||||
%{_bindir}/zmaudit.pl
|
%{_bindir}/zmaudit.pl
|
||||||
|
@ -179,7 +317,7 @@ fi
|
||||||
%{_bindir}/zmcamtool.pl
|
%{_bindir}/zmcamtool.pl
|
||||||
%{_bindir}/zmsystemctl.pl
|
%{_bindir}/zmsystemctl.pl
|
||||||
%{_bindir}/zmtelemetry.pl
|
%{_bindir}/zmtelemetry.pl
|
||||||
%{!?_without_x10:%{_bindir}/zmx10.pl}
|
%{_bindir}/zmx10.pl
|
||||||
%{_bindir}/zmonvif-probe.pl
|
%{_bindir}/zmonvif-probe.pl
|
||||||
|
|
||||||
%{perl_vendorlib}/ZoneMinder*
|
%{perl_vendorlib}/ZoneMinder*
|
||||||
|
@ -188,57 +326,62 @@ fi
|
||||||
%{perl_vendorlib}/WSSecurity*
|
%{perl_vendorlib}/WSSecurity*
|
||||||
%{perl_vendorlib}/WSNotification*
|
%{perl_vendorlib}/WSNotification*
|
||||||
%{_mandir}/man*/*
|
%{_mandir}/man*/*
|
||||||
%dir %{_libexecdir}/zoneminder
|
|
||||||
%{_libexecdir}/zoneminder/cgi-bin
|
%{_libexecdir}/zoneminder/
|
||||||
%dir %{_datadir}/zoneminder
|
%{_datadir}/zoneminder/
|
||||||
%{_datadir}/zoneminder/db
|
|
||||||
%{_datadir}/zoneminder/www
|
|
||||||
|
|
||||||
%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
|
%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
|
||||||
%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
|
%{_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}) %{_sharedstatedir}/zoneminder
|
||||||
%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events
|
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/events
|
||||||
%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images
|
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/images
|
||||||
%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock
|
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/sock
|
||||||
%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap
|
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/swap
|
||||||
%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp
|
%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}) %{_localstatedir}/log/zoneminder
|
||||||
%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload
|
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload
|
||||||
%dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder
|
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %ghost %{_localstatedir}/run/zoneminder
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Mar 3 2016 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.30.0
|
* Wed Dec 28 2016 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.30.1-2
|
||||||
|
- Changes from rpmfusion #4393
|
||||||
|
|
||||||
|
* Fri Dec 23 2016 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.30.1-1
|
||||||
|
- Consolidate fedora/centos spec files
|
||||||
|
- Add preliminary nginx support
|
||||||
|
- New contact email
|
||||||
|
|
||||||
|
* Thu Mar 3 2016 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.30.0-1
|
||||||
- Bump version fo 1.30.0 release.
|
- Bump version fo 1.30.0 release.
|
||||||
|
|
||||||
* Sat Nov 21 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.29.0
|
* Sat Nov 21 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.29.0-1
|
||||||
- Bump version for 1.29.0 release on Fedora 23.
|
- Bump version for 1.29.0 release on Fedora 23.
|
||||||
|
|
||||||
* Sat Feb 14 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.1
|
* Sat Feb 14 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.1-1
|
||||||
- Bump version for 1.28.1 release on Fedora 21.
|
- Bump version for 1.28.1 release on Fedora 21.
|
||||||
|
|
||||||
* Sun Oct 5 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.0
|
* Sun Oct 5 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.0-1
|
||||||
- Bump version for 1.28.0 release.
|
- Bump version for 1.28.0 release.
|
||||||
|
|
||||||
* Fri Mar 14 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
* Fri Mar 14 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27-1
|
||||||
- Tweak build requirements for cmake
|
- Tweak build requirements for cmake
|
||||||
|
|
||||||
* Sat Feb 01 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
|
* Sat Feb 01 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27-1
|
||||||
- Add zmcamtool.pl. Bump version for 1.27 release.
|
- Add zmcamtool.pl. Bump version for 1.27 release.
|
||||||
|
|
||||||
* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
|
* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5-1
|
||||||
- This is a bug fixe release
|
- This is a bug fixe release
|
||||||
- RTSP fixes, cmake enhancements, couple other misc fixes
|
- RTSP fixes, cmake enhancements, couple other misc fixes
|
||||||
|
|
||||||
* Mon Oct 07 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
* Mon Oct 07 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4-1
|
||||||
- Initial cmake build.
|
- Initial cmake build.
|
||||||
|
|
||||||
* Sat Oct 05 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
* Sat Oct 05 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4-1
|
||||||
- Fedora specific path changes have been moved to zoneminder-1.26.0-defaults.patch
|
- 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.
|
- All files are now part of the zoneminder source tree. Update specfile accordingly.
|
||||||
|
|
||||||
* Sat Sep 21 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.3
|
* Sat Sep 21 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.3-1
|
||||||
- Initial rebuild for ZoneMinder 1.26.3 release.
|
- Initial rebuild for ZoneMinder 1.26.3 release.
|
||||||
|
|
||||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
|
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
|
|
@ -395,7 +395,7 @@ zoneminder (1.24.2-4.1) unstable; urgency=low
|
||||||
zoneminder (1.24.2-4) unstable; urgency=high
|
zoneminder (1.24.2-4) unstable; urgency=high
|
||||||
* Update init.d to list mysql dependency
|
* Update init.d to list mysql dependency
|
||||||
(closes: #583505)
|
(closes: #583505)
|
||||||
* Change depenency from libmime-perl to libmime-tools-perl
|
* Change dependency from libmime-perl to libmime-tools-perl
|
||||||
(closes: #585589)
|
(closes: #585589)
|
||||||
* Problems in changelog format fixed
|
* Problems in changelog format fixed
|
||||||
(closes: #585592)
|
(closes: #585592)
|
||||||
|
@ -432,7 +432,7 @@ zoneminder (1.24.1-1) unstable; urgency=high
|
||||||
(closes: #497640)
|
(closes: #497640)
|
||||||
* Change syslog dependency to rsyslog.
|
* Change syslog dependency to rsyslog.
|
||||||
(closes: #526918)
|
(closes: #526918)
|
||||||
* Add missing perl depenency.
|
* Add missing perl dependency.
|
||||||
* Restore patch to disable "check for updates" by default.
|
* Restore patch to disable "check for updates" by default.
|
||||||
* Removed spurious '$' in init script.
|
* Removed spurious '$' in init script.
|
||||||
(closes: #486064)
|
(closes: #486064)
|
||||||
|
|
|
@ -429,7 +429,7 @@ zoneminder (1.24.2-4.1) unstable; urgency=low
|
||||||
zoneminder (1.24.2-4) unstable; urgency=high
|
zoneminder (1.24.2-4) unstable; urgency=high
|
||||||
* Update init.d to list mysql dependency
|
* Update init.d to list mysql dependency
|
||||||
(closes: #583505)
|
(closes: #583505)
|
||||||
* Change depenency from libmime-perl to libmime-tools-perl
|
* Change dependency from libmime-perl to libmime-tools-perl
|
||||||
(closes: #585589)
|
(closes: #585589)
|
||||||
* Problems in changelog format fixed
|
* Problems in changelog format fixed
|
||||||
(closes: #585592)
|
(closes: #585592)
|
||||||
|
@ -466,7 +466,7 @@ zoneminder (1.24.1-1) unstable; urgency=high
|
||||||
(closes: #497640)
|
(closes: #497640)
|
||||||
* Change syslog dependency to rsyslog.
|
* Change syslog dependency to rsyslog.
|
||||||
(closes: #526918)
|
(closes: #526918)
|
||||||
* Add missing perl depenency.
|
* Add missing perl dependency.
|
||||||
* Restore patch to disable "check for updates" by default.
|
* Restore patch to disable "check for updates" by default.
|
||||||
* Removed spurious '$' in init script.
|
* Removed spurious '$' in init script.
|
||||||
(closes: #486064)
|
(closes: #486064)
|
||||||
|
|
10
docs/faq.rst
10
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.
|
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.
|
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.
|
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:
|
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.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -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
|
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 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:
|
'''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.
|
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?
|
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?
|
||||||
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -71,11 +71,17 @@ Source Tab
|
||||||
|
|
||||||
FFmpeg
|
FFmpeg
|
||||||
^^^^^^
|
^^^^^^
|
||||||
|
This is the recommended source type for most modern ip cameras.
|
||||||
Source Path
|
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
|
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
|
Capture Width/Height
|
||||||
Make sure you enter here the same values as they are in the remote camera's internal setting.
|
Make sure you enter here the same values as they are in the remote camera's internal setting.
|
||||||
Keep aspect ratio
|
Keep aspect ratio
|
||||||
|
@ -85,6 +91,7 @@ Orientation
|
||||||
|
|
||||||
LibVLC
|
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
|
cURL
|
||||||
^^^^
|
^^^^
|
||||||
|
@ -97,7 +104,7 @@ Device Path/Channel
|
||||||
Device Format
|
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.
|
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
|
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
|
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.
|
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
|
Keep aspect ratio
|
||||||
|
@ -108,8 +115,12 @@ Orientation
|
||||||
Remote
|
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
|
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 <username>:<password>@<hostname>.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 <username>:<password>@<hostname>.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
|
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.
|
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
|
Capture Width/Height
|
||||||
|
@ -127,7 +138,7 @@ File
|
||||||
File Path
|
File Path
|
||||||
Enter the full path to the file to be used as the image source.
|
Enter the full path to the file to be used as the image source.
|
||||||
File Colours
|
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
|
Capture Width/Height
|
||||||
As per local devices.
|
As per local devices.
|
||||||
Keep aspect ratio
|
Keep aspect ratio
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
The XML images present in this folder have been drawn using http://draw.io
|
||||||
|
To edit images, simple go to draw.io and load the .xml files
|
Binary file not shown.
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 93 KiB |
File diff suppressed because one or more lines are too long
|
@ -14,7 +14,7 @@ GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
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
|
1. PURPOSE
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -18,7 +18,7 @@ use strict;
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
@ -1550,6 +1550,19 @@ our @options = (
|
||||||
type => $types{string},
|
type => $types{string},
|
||||||
category => "web",
|
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",
|
name => "ZM_WEB_RESIZE_CONSOLE",
|
||||||
default => "yes",
|
default => "yes",
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# 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 ====================================================================================
|
# V1.0 ====================================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# 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 ====================================================================================
|
# V1.1 ====================================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# =========================================================================================
|
# =========================================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# =========================================================================================
|
# =========================================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -0,0 +1,411 @@
|
||||||
|
# ==========================================================================
|
||||||
|
#
|
||||||
|
# ZoneMinder HikVision Control Protocol Module
|
||||||
|
# Copyright (C) 2016 Terry Sanders
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License
|
||||||
|
# as published by the Free Software Foundation; either version 2
|
||||||
|
# of the License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# 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.
|
||||||
|
#
|
||||||
|
# ==========================================================================
|
||||||
|
#
|
||||||
|
# This module contains an implementation of the HikVision ISAPI camera control
|
||||||
|
# protocol
|
||||||
|
#
|
||||||
|
package ZoneMinder::Control::HikVision;
|
||||||
|
|
||||||
|
use 5.006;
|
||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
|
||||||
|
require ZoneMinder::Base;
|
||||||
|
require ZoneMinder::Control;
|
||||||
|
|
||||||
|
our @ISA = qw(ZoneMinder::Control);
|
||||||
|
|
||||||
|
# ==========================================================================
|
||||||
|
#
|
||||||
|
# HiKVision ISAPI Control Protocol
|
||||||
|
#
|
||||||
|
# Set the following:
|
||||||
|
# ControlAddress: username:password@camera_webaddress:port
|
||||||
|
# ControlDevice: IP Camera Model
|
||||||
|
#
|
||||||
|
# ==========================================================================
|
||||||
|
|
||||||
|
use ZoneMinder::Logger qw(:all);
|
||||||
|
|
||||||
|
use Time::HiRes qw( usleep );
|
||||||
|
|
||||||
|
use LWP::UserAgent;
|
||||||
|
use HTTP::Cookies;
|
||||||
|
|
||||||
|
my $ChannelID = 1; # Usually...
|
||||||
|
my $DefaultFocusSpeed = 50; # Should be between 1 and 100
|
||||||
|
my $DefaultIrisSpeed = 50; # Should be between 1 and 100
|
||||||
|
|
||||||
|
sub new {
|
||||||
|
my $class = shift;
|
||||||
|
my $id = shift;
|
||||||
|
my $self = ZoneMinder::Control->new( $id );
|
||||||
|
bless( $self, $class );
|
||||||
|
srand( time() );
|
||||||
|
return $self;
|
||||||
|
}
|
||||||
|
|
||||||
|
our $AUTOLOAD;
|
||||||
|
|
||||||
|
sub AUTOLOAD {
|
||||||
|
my $self = shift;
|
||||||
|
my $class = ref($self) || croak( "$self not object" );
|
||||||
|
my $name = $AUTOLOAD;
|
||||||
|
$name =~ s/.*://;
|
||||||
|
if ( exists($self->{$name}) )
|
||||||
|
{
|
||||||
|
return( $self->{$name} );
|
||||||
|
}
|
||||||
|
Fatal( "Can't access $name member of object of class $class" );
|
||||||
|
}
|
||||||
|
sub open {
|
||||||
|
my $self = shift;
|
||||||
|
$self->loadMonitor();
|
||||||
|
#
|
||||||
|
# Create a UserAgent for the requests
|
||||||
|
#
|
||||||
|
$self->{UA} = LWP::UserAgent->new();
|
||||||
|
$self->{UA}->cookie_jar( {} );
|
||||||
|
#
|
||||||
|
# Extract the username/password host/port from ControlAddress
|
||||||
|
#
|
||||||
|
my ($user,$pass,$host,$port);
|
||||||
|
if( $self->{Monitor}{ControlAddress} =~ /^([^:]+):([^@]+)@(.+)/ ) { # user:pass@host...
|
||||||
|
$user = $1;
|
||||||
|
$pass = $2;
|
||||||
|
$host = $3;
|
||||||
|
}
|
||||||
|
elsif( $self->{Monitor}{ControlAddress} =~ /^([^@]+)@(.+)/ ) { # user@host...
|
||||||
|
$user = $1;
|
||||||
|
$host = $2;
|
||||||
|
}
|
||||||
|
else { # Just a host
|
||||||
|
$host = $self->{Monitor}{ControlAddress};
|
||||||
|
}
|
||||||
|
# Check if it is a host and port or just a host
|
||||||
|
if( $host =~ /([^:]+):(.+)/ ) {
|
||||||
|
$host = $1;
|
||||||
|
$port = $2;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$port = 80;
|
||||||
|
}
|
||||||
|
# Save the credentials
|
||||||
|
if( defined($user) ) {
|
||||||
|
$self->{UA}->credentials( "$host:$port", $self->{Monitor}{ControlDevice}, $user, $pass );
|
||||||
|
}
|
||||||
|
# Save the base url
|
||||||
|
$self->{BaseURL} = "http://$host:$port";
|
||||||
|
}
|
||||||
|
sub PutCmd {
|
||||||
|
my $self = shift;
|
||||||
|
my $cmd = shift;
|
||||||
|
my $content = shift;
|
||||||
|
my $req = HTTP::Request->new(PUT => "$self->{BaseURL}/$cmd");
|
||||||
|
if(defined($content)) {
|
||||||
|
$req->content_type("application/x-www-form-urlencoded; charset=UTF-8");
|
||||||
|
$req->content('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . $content);
|
||||||
|
}
|
||||||
|
my $res = $self->{UA}->request($req);
|
||||||
|
unless( $res->is_success ) {
|
||||||
|
#
|
||||||
|
# The camera timeouts connections at short intervals. When this
|
||||||
|
# happens the user agent connects again and uses the same auth tokens.
|
||||||
|
# The camera rejects this and asks for another token but the UserAgent
|
||||||
|
# just gives up. Because of this I try the request again and it should
|
||||||
|
# succeed the second time if the credentials are correct.
|
||||||
|
#
|
||||||
|
if($res->code == 401) {
|
||||||
|
$res = $self->{UA}->request($req);
|
||||||
|
unless( $res->is_success ) {
|
||||||
|
#
|
||||||
|
# It has failed authentication. The odds are
|
||||||
|
# that the user has set some paramater incorrectly
|
||||||
|
# so check the realm against the ControlDevice
|
||||||
|
# entry and send a message if different
|
||||||
|
#
|
||||||
|
my $auth = $res->headers->www_authenticate;
|
||||||
|
foreach (split(/\s*,\s*/,$auth)) {
|
||||||
|
if( $_ =~ /^realm\s*=\s*"([^"]+)"/i ) {
|
||||||
|
if( $self->{Monitor}{ControlDevice} ne $1 ) {
|
||||||
|
Info "Control Device appears to be incorrect.";
|
||||||
|
Info "Control Device should be set to \"$1\".";
|
||||||
|
Info "Control Device currently set to \"$self->{Monitor}{ControlDevice}\".";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#
|
||||||
|
# Check for username/password
|
||||||
|
#
|
||||||
|
if( $self->{Monitor}{ControlAddress} =~ /.+:(.+)@.+/ ) {
|
||||||
|
Info "Check username/password is correct";
|
||||||
|
} elsif ( $self->{Monitor}{ControlAddress} =~ /^[^:]+@.+/ ) {
|
||||||
|
Info "No password in Control Address. Should there be one?";
|
||||||
|
} elsif ( $self->{Monitor}{ControlAddress} =~ /^:.+@.+/ ) {
|
||||||
|
Info "Password but no username in Control Address.";
|
||||||
|
} else {
|
||||||
|
Info "Missing username and password in Control Address.";
|
||||||
|
}
|
||||||
|
Fatal $res->status_line;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Fatal $res->status_line;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#
|
||||||
|
# The move continuous functions all call moveVector
|
||||||
|
# with the direction to move in. This includes zoom
|
||||||
|
#
|
||||||
|
sub moveVector {
|
||||||
|
my $self = shift;
|
||||||
|
my $pandirection = shift;
|
||||||
|
my $tiltdirection = shift;
|
||||||
|
my $zoomdirection = shift;
|
||||||
|
my $params = shift;
|
||||||
|
my $command; # The ISAPI/PTZ command
|
||||||
|
|
||||||
|
# Calculate autostop time
|
||||||
|
my $duration = $self->getParam( $params, 'autostop', 0 ) * $self->{Monitor}{AutoStopTimeout};
|
||||||
|
# Change from microseconds to milliseconds
|
||||||
|
$duration = int($duration/1000);
|
||||||
|
my $momentxml;
|
||||||
|
if( $duration ) {
|
||||||
|
$momentxml = "<Momentary><duration>$duration</duration></Momentary>";
|
||||||
|
$command = "ISAPI/PTZCtrl/channels/$ChannelID/momentary";
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$momentxml = "";
|
||||||
|
$command = "ISAPI/PTZCtrl/channels/$ChannelID/continuous";
|
||||||
|
}
|
||||||
|
# Calculate movement speeds
|
||||||
|
my $x = $pandirection * $self->getParam( $params, 'panspeed', 0 );
|
||||||
|
my $y = $tiltdirection * $self->getParam( $params, 'tiltspeed', 0 );
|
||||||
|
my $z = $zoomdirection * $self->getParam( $params, 'speed', 0 );
|
||||||
|
# Create the XML
|
||||||
|
my $xml = "<PTZData><pan>$x</pan><tilt>$y</tilt><zoom>$z</zoom>$momentxml</PTZData>";
|
||||||
|
# Send it to the camera
|
||||||
|
$self->PutCmd($command,$xml);
|
||||||
|
}
|
||||||
|
sub moveStop { $_[0]->moveVector( 0, 0, 0, splice(@_,1)); }
|
||||||
|
sub moveConUp { $_[0]->moveVector( 0, 1, 0, splice(@_,1)); }
|
||||||
|
sub moveConUpRight { $_[0]->moveVector( 1, 1, 0, splice(@_,1)); }
|
||||||
|
sub moveConRight { $_[0]->moveVector( 1, 0, 0, splice(@_,1)); }
|
||||||
|
sub moveConDownRight { $_[0]->moveVector( 1, -1, 0, splice(@_,1)); }
|
||||||
|
sub moveConDown { $_[0]->moveVector( 0, -1, 0, splice(@_,1)); }
|
||||||
|
sub moveConDownLeft { $_[0]->moveVector( -1, -1, 0, splice(@_,1)); }
|
||||||
|
sub moveConLeft { $_[0]->moveVector( -1, 0, 0, splice(@_,1)); }
|
||||||
|
sub moveConUpLeft { $_[0]->moveVector( -1, 1, 0, splice(@_,1)); }
|
||||||
|
sub zoomConTele { $_[0]->moveVector( 0, 0, 1, splice(@_,1)); }
|
||||||
|
sub zoomConWide { $_[0]->moveVector( 0, 0,-1, splice(@_,1)); }
|
||||||
|
#
|
||||||
|
# Presets including Home set and clear
|
||||||
|
#
|
||||||
|
sub presetGoto {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
my $preset = $self->getParam($params,'preset');
|
||||||
|
$self->PutCmd("ISAPI/PTZCtrl/channels/$ChannelID/presets/$preset/goto");
|
||||||
|
}
|
||||||
|
sub presetSet {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
my $preset = $self->getParam($params,'preset');
|
||||||
|
my $xml = "<PTZPreset><id>$preset</id></PTZPreset>";
|
||||||
|
$self->PutCmd("ISAPI/PTZCtrl/channels/$ChannelID/presets/$preset",$xml);
|
||||||
|
}
|
||||||
|
sub presetHome {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
$self->PutCmd("ISAPI/PTZCtrl/channels/$ChannelID/homeposition/goto");
|
||||||
|
}
|
||||||
|
#
|
||||||
|
# Focus controls all call Focus with a +/- speed
|
||||||
|
#
|
||||||
|
sub Focus {
|
||||||
|
my $self = shift;
|
||||||
|
my $speed = shift;
|
||||||
|
my $xml = "<FocusData><focus>$speed</focus></FocusData>";
|
||||||
|
$self->PutCmd("ISAPI/System/Video/inputs/channels/$ChannelID/focus",$xml);
|
||||||
|
}
|
||||||
|
sub focusConNear {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
|
||||||
|
# Calculate autostop time
|
||||||
|
my $duration = $self->getParam( $params, 'autostop', 0 ) * $self->{Monitor}{AutoStopTimeout};
|
||||||
|
# Get the focus speed
|
||||||
|
my $speed = $self->getParam( $params, 'speed', $DefaultFocusSpeed );
|
||||||
|
$self->Focus(-$speed);
|
||||||
|
if($duration) {
|
||||||
|
usleep($duration);
|
||||||
|
$self->moveStop($params);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sub Near {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
$self->Focus(-$DefaultFocusSpeed);
|
||||||
|
}
|
||||||
|
sub focusAbsNear {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
|
||||||
|
# Get the focus speed
|
||||||
|
my $speed = $self->getParam( $params, 'speed', $DefaultFocusSpeed );
|
||||||
|
$self->Focus(-$speed);
|
||||||
|
}
|
||||||
|
sub focusRelNear {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
# Get the focus speed
|
||||||
|
my $speed = $self->getParam( $params, 'speed', $DefaultFocusSpeed );
|
||||||
|
$self->Focus(-$speed);
|
||||||
|
}
|
||||||
|
sub focusConFar {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
|
||||||
|
# Calculate autostop time
|
||||||
|
my $duration = $self->getParam( $params, 'autostop', 0 ) * $self->{Monitor}{AutoStopTimeout};
|
||||||
|
# Get the focus speed
|
||||||
|
my $speed = $self->getParam( $params, 'speed', $DefaultFocusSpeed );
|
||||||
|
$self->Focus($speed);
|
||||||
|
if($duration) {
|
||||||
|
usleep($duration);
|
||||||
|
$self->moveStop($params);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sub Far {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
$self->Focus($DefaultFocusSpeed);
|
||||||
|
}
|
||||||
|
sub focusAbsFar {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
|
||||||
|
# Get the focus speed
|
||||||
|
my $speed = $self->getParam( $params, 'speed', $DefaultFocusSpeed );
|
||||||
|
$self->Focus($speed);
|
||||||
|
}
|
||||||
|
sub focusRelFar {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
|
||||||
|
# Get the focus speed
|
||||||
|
my $speed = $self->getParam( $params, 'speed', $DefaultFocusSpeed );
|
||||||
|
$self->Focus($speed);
|
||||||
|
}
|
||||||
|
#
|
||||||
|
# Iris controls all call Iris with a +/- speed
|
||||||
|
#
|
||||||
|
sub Iris {
|
||||||
|
my $self = shift;
|
||||||
|
my $speed = shift;
|
||||||
|
|
||||||
|
my $xml = "<IrisData><iris>$speed</iris></IrisData>";
|
||||||
|
$self->PutCmd("ISAPI/System/Video/inputs/channels/$ChannelID/iris",$xml);
|
||||||
|
}
|
||||||
|
sub irisConClose {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
|
||||||
|
# Calculate autostop time
|
||||||
|
my $duration = $self->getParam( $params, 'autostop', 0 ) * $self->{Monitor}{AutoStopTimeout};
|
||||||
|
# Get the iris speed
|
||||||
|
my $speed = $self->getParam( $params, 'speed', $DefaultIrisSpeed );
|
||||||
|
$self->Iris(-$speed);
|
||||||
|
if($duration) {
|
||||||
|
usleep($duration);
|
||||||
|
$self->moveStop($params);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sub Close {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
|
||||||
|
$self->Iris(-$DefaultIrisSpeed);
|
||||||
|
}
|
||||||
|
sub irisAbsClose {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
|
||||||
|
# Get the iris speed
|
||||||
|
my $speed = $self->getParam( $params, 'speed', $DefaultIrisSpeed );
|
||||||
|
$self->Iris(-$speed);
|
||||||
|
}
|
||||||
|
sub irisRelClose {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
|
||||||
|
# Get the iris speed
|
||||||
|
my $speed = $self->getParam( $params, 'speed', $DefaultIrisSpeed );
|
||||||
|
$self->Iris(-$speed);
|
||||||
|
}
|
||||||
|
sub irisConOpen {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
|
||||||
|
# Calculate autostop time
|
||||||
|
my $duration = $self->getParam( $params, 'autostop', 0 ) * $self->{Monitor}{AutoStopTimeout};
|
||||||
|
# Get the iris speed
|
||||||
|
my $speed = $self->getParam( $params, 'speed', $DefaultIrisSpeed );
|
||||||
|
$self->Iris($speed);
|
||||||
|
if($duration) {
|
||||||
|
usleep($duration);
|
||||||
|
$self->moveStop($params);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sub Open {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
|
||||||
|
$self->Iris($DefaultIrisSpeed);
|
||||||
|
}
|
||||||
|
sub irisAbsOpen {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
|
||||||
|
# Get the iris speed
|
||||||
|
my $speed = $self->getParam( $params, 'speed', $DefaultIrisSpeed );
|
||||||
|
$self->Iris($speed);
|
||||||
|
}
|
||||||
|
sub irisRelOpen {
|
||||||
|
my $self = shift;
|
||||||
|
my $params = shift;
|
||||||
|
|
||||||
|
# Get the iris speed
|
||||||
|
my $speed = $self->getParam( $params, 'speed', $DefaultIrisSpeed );
|
||||||
|
$self->Iris($speed);
|
||||||
|
}
|
||||||
|
#
|
||||||
|
# reset (reboot) the device
|
||||||
|
#
|
||||||
|
sub reset {
|
||||||
|
my $self = shift;
|
||||||
|
|
||||||
|
$self->PutCmd("ISAPI/System/reboot");
|
||||||
|
}
|
||||||
|
|
||||||
|
1;
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# 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)
|
# Tested: KK002 (22 July 2016)
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
#
|
#
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue