Merge branch 'master' into api_auth

.dockerignore

@@ -0,0 +1 @@
+.git

.eslintignore

@@ -0,0 +1,4 @@
+web/api/lib
+web/skins/classic/js/jquery-1.11.3.js
+web/skins/classic/js/jquery.js
+web/tools/mootools

.eslintrc.js

@@ -0,0 +1,29 @@
+"use strict";
+
+module.exports = {
+  "env": {
+    "browser": true,
+  },
+  "extends": ["google"],
+  "rules": {
+    "brace-style": "off",
+    "camelcase": "off",
+    "comma-dangle": "off",
+    "key-spacing": "off",
+    "max-len": "off",
+    "new-cap": ["error", {
+      capIsNewExceptions: ["Error", "Warning", "Debug", "Polygon_calcArea", "Play", "Stop"],
+      newIsCapExceptionPattern: "^Asset\.."
+    }],
+    "no-array-constructor": "off",
+    "no-caller": "off",
+    "no-new-object": "off",
+    "no-unused-vars": "off",
+    "no-var": "off",
+    "object-curly-spacing": "off",
+    "prefer-rest-params": "off",
+    "quotes": "off",
+    "require-jsdoc": "off",
+    "spaced-comment": "off",
+  },
+};

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,21 @@
+You should only file an issue if you found a bug.  Feature and enhancement requests, general discussions and support questions should occur in one of the following areas:
+
+- The ZoneMinder IRC channel - irc.freenode.net #zoneminder
+- The [ZoneMinder Forum](https://forums.zoneminder.com/)
+
+**Do not post feature or enhancement requests, general discussions or support questions here.**
+
+Make sure you are running the latest version of ZoneMinder before reporting an issue.
+
+**ZoneMinder Version (`zmaudit.pl -v`):**
+
+**Are you using a development snapshot / git checkout?  If so, what is the latest commit? (`git rev-parse HEAD`):**
+
+**Linux Distribution and Version (`cat /etc/os-release` or `cat /etc/redhat-release`):**
+
+**If the issue concerns a camera, provide the make, model, frame rate, resolution and ZoneMinder Source Type:**
+
+**Relevant log lines:**
+```
+log lines here
+```

.gitignore

@@ -1,42 +1,71 @@
-configure
+# If you are adding to this file, please ensure sorting is maintained. If using vim, you can use :%sort u
-config.h.in
+CMakeCache.txt
-config.h.in~
+CMakeFiles/
-autom4te.cache
-aclocal.m4
-depcomp
-install-sh
-missing
-mkinstalldirs
-stamp-h1
-stamp-h.in
-scripts/ZoneMinder/blib
-Makefile.in
 Makefile
-docs/_build
+Makefile.in
+aclocal.m4
+autom4te.cache
+cmake/cmake_uninstall.cmake
+cmake_install.cmake
 compile
 config.guess
 config.h
+config.h.in
+config.h.in~
 config.log
 config.status
 config.sub
+configure
+db/CMakeFiles/
+db/cmake_install.cmake
 db/zm_create.sql
+depcomp
+docs/_build
+install-sh
+misc/CMakeFiles/
 misc/apache.conf
+misc/cmake_install.cmake
 misc/com.zoneminder.systemctl.policy
 misc/com.zoneminder.systemctl.rules
 misc/logrotate.conf
 misc/syslog.conf
+misc/zoneminder-tmpfiles.conf
+misc/zoneminder.service
+missing
+mkinstalldirs
+onvif/CMakeFiles/
+onvif/cmake_install.cmake
+onvif/modules/CMakeFiles/
 onvif/modules/MYMETA.json
 onvif/modules/MYMETA.yml
+onvif/modules/MakefilePerl
+onvif/modules/cmake_install.cmake
+onvif/modules/output/
+onvif/modules/pm_to_blib
+onvif/proxy/CMakeFiles/
 onvif/proxy/MYMETA.json
 onvif/proxy/MYMETA.yml
-scripts/ZoneMinder/Makefile.old
+onvif/proxy/MakefilePerl
+onvif/proxy/cmake_install.cmake
+onvif/proxy/output/
+onvif/proxy/pm_to_blib
+onvif/scripts/CMakeFiles/
+onvif/scripts/cmake_install.cmake
+scripts/CMakeFiles/
+scripts/ZoneMinder/CMakeFiles/
 scripts/ZoneMinder/MYMETA.json
 scripts/ZoneMinder/MYMETA.yml
+scripts/ZoneMinder/Makefile.old
+scripts/ZoneMinder/MakefilePerl
+scripts/ZoneMinder/blib
+scripts/ZoneMinder/cmake_install.cmake
 scripts/ZoneMinder/lib/ZoneMinder/Base.pm
 scripts/ZoneMinder/lib/ZoneMinder/Config.pm
 scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm
 scripts/ZoneMinder/lib/ZoneMinder/Memory.pm
+scripts/ZoneMinder/output/
 scripts/ZoneMinder/pm_to_blib
+scripts/cmake_install.cmake
 scripts/zm
 scripts/zmaudit.pl
 scripts/zmcamtool.pl
@@ -49,14 +78,18 @@ scripts/zmfilter.pl
 scripts/zmlogrotate.conf
 scripts/zmpkg.pl
 scripts/zmsystemctl.pl
+scripts/zmtelemetry.pl
 scripts/zmtrack.pl
 scripts/zmtrigger.pl
 scripts/zmupdate.pl
 scripts/zmvideo.pl
 scripts/zmwatch.pl
 scripts/zmx10.pl
-src/.deps/
 src/*.o
+src/.deps/
+src/CMakeFiles/
+src/cmake_install.cmake
+src/libzm.a
 src/zm_config.h
 src/zm_config_defines.h
 src/zma
@@ -64,6 +97,19 @@ src/zmc
 src/zmf
 src/zms
 src/zmu
+stamp-h.in
+stamp-h1
+web/CMakeFiles/
+web/api/CMakeFiles/
+web/api/app/Config/bootstrap.php
+web/api/app/Config/core.php
+web/api/cmake_install.cmake
+web/cmake_install.cmake
 web/includes/config.php
+web/tools/mootools/CMakeFiles/
+web/tools/mootools/cmake_install.cmake
+web/tools/mootools/mootools-core.js
+web/tools/mootools/mootools-more.js
 zm.conf
 zmconfgen.pl
+zmlinkcontent.sh

.travis.yml

@@ -1,48 +1,56 @@
 language: cpp
 sudo: required
 dist: trusty
+git:
+  depth: 9999999
 notifications:
-  irc: "chat.freenode.net#zoneminder-dev"
+  irc: chat.freenode.net#zoneminder-dev
 branches:
   except:
   - modern
+cache: ccache
 addons:
-  sauce_connect:
+  ssh_known_hosts: zmrepo.zoneminder.com
-    username: "zoneminder"
+  apt:
-    access_key: "046ec7c1-c598-4e7e-949a-f86e725d1722"
+    sources:
+    - sourceline: ppa:iconnor/zoneminder
+    - key_url: http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x4D0BF748776FFB04
+    packages:
+    - gdebi
+    - yum-utils
+    - patch
+    - git
+    - curl
+    - sshfs
+    - sed
 env:
-  global:
-    - LD_LIBRARY_PATH="/usr/local/lib:/opt/libjpeg-turbo/lib:$LD_LIBRARY_PATH"
-    - DEB_HOST_GNU_TYPE=$(dpkg-architecture -qDEB_HOST_GNU_TYPE)
-    - DEB_BUILD_GNU_TYPE=$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-    - CFLAGS="-DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO -I/usr/local/include"
-    - CXXFLAGS="$CFLAGS"
   matrix:
-    - ZM_BUILDMETHOD=cmake
+  - OS=el DIST=6
+  - OS=el DIST=7
+  - OS=fedora DIST=24
+  - OS=fedora DIST=25
+  - OS=ubuntu DIST=trusty
+  - OS=ubuntu DIST=xenial
+  - OS=ubuntu DIST=trusty ARCH=i386
+  - OS=ubuntu DIST=xenial ARCH=i386
 compiler:
-  - gcc
+- gcc
-  - clang
+services:
-before_install:
+- mysql
-  - sudo apt-get update -qq
+- docker
-  - sudo apt-get install -y -qq libpolkit-gobject-1-dev zlib1g-dev apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf cmake libjpeg-turbo8-dev apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev libvlccore-dev libvlc-dev 2>&1 > /dev/null 
-install:
-  - git clone -b n3.0 --depth=1 git://source.ffmpeg.org/ffmpeg.git
-  - cd ffmpeg
-  - ./configure --enable-shared --enable-swscale --enable-gpl  --enable-libx264 --enable-libvpx --enable-libvorbis --enable-libtheora 
-  - make -j `grep processor /proc/cpuinfo|wc -l` 
-  - sudo make install 
-  - sudo make install-libs
-before_script:
-  - cd $TRAVIS_BUILD_DIR
-  - mysql -uroot -e "CREATE DATABASE IF NOT EXISTS zm"
-  - mysql -uroot -e "GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'zmpass'";
-  - mysql -uroot -e "FLUSH PRIVILEGES"
 script:
-  - if [ "$ZM_BUILDMETHOD" = "cmake" ]; then cmake -DCMAKE_INSTALL_PREFIX="/usr"; fi
+- utils/packpack/startpackpack.sh
-  - make
+
-  - sudo make install
+before_deploy:
-  - if [ "$ZM_BUILDMETHOD" = "cmake" ]; then sudo ./zmlinkcontent.sh; fi
+- openssl aes-256-cbc -K $encrypted_62a62750aa73_key -iv $encrypted_62a62750aa73_iv -in ./utils/packpack/deploy_rsa.enc -out /tmp/deploy_rsa -d
-  - mysql -uzmuser -pzmpass < db/zm_create.sql
+- eval "$(ssh-agent -s)"
-  - mysql -uzmuser -pzmpass zm < db/test.monitor.sql
+- chmod 600 /tmp/deploy_rsa
-  - sudo zmpkg.pl start
+- ssh-add /tmp/deploy_rsa
-  - sudo zmfilter.pl -f purgewhenfull
+
+deploy:
+  provider: script
+  skip_cleanup: true
+  script: utils/packpack/rsync_xfer.sh
+  on:
+    branch: master
+

CHANGELOG.md

@@ -82,7 +82,7 @@
 - header typo corrections [\#1058](https://github.com/ZoneMinder/ZoneMinder/pull/1058) ([onlyjob](https://github.com/onlyjob))
 - quick fix for \#1055: make sure our mmap fd is \> 2 [\#1057](https://github.com/ZoneMinder/ZoneMinder/pull/1057) ([connortechnology](https://github.com/connortechnology))
 - Fix sgfault caused by the privacy mask stuff [\#1056](https://github.com/ZoneMinder/ZoneMinder/pull/1056) ([connortechnology](https://github.com/connortechnology))
-- link to cambozola pacakge, rather than download during build [\#1054](https://github.com/ZoneMinder/ZoneMinder/pull/1054) ([knnniggett](https://github.com/knnniggett))
+- link to cambozola package, rather than download during build [\#1054](https://github.com/ZoneMinder/ZoneMinder/pull/1054) ([knnniggett](https://github.com/knnniggett))
 - redhat rpm packaging modifications [\#1052](https://github.com/ZoneMinder/ZoneMinder/pull/1052) ([knnniggett](https://github.com/knnniggett))
 - remove core.php, modify core.php.default [\#1049](https://github.com/ZoneMinder/ZoneMinder/pull/1049) ([knnniggett](https://github.com/knnniggett))
 - Google recaptcha [\#1048](https://github.com/ZoneMinder/ZoneMinder/pull/1048) ([pliablepixels](https://github.com/pliablepixels))
@@ -167,7 +167,7 @@
 - alter the logic of ReadData. New behaviour is documented.   [\#870](https://github.com/ZoneMinder/ZoneMinder/pull/870) ([connortechnology](https://github.com/connortechnology))
 - analysis optimisations [\#867](https://github.com/ZoneMinder/ZoneMinder/pull/867) ([connortechnology](https://github.com/connortechnology))
 - Don't die if db goes away during logging [\#866](https://github.com/ZoneMinder/ZoneMinder/pull/866) ([connortechnology](https://github.com/connortechnology))
-- Move iostream inclusion in zm.h and declare explicitely the namespace [\#859](https://github.com/ZoneMinder/ZoneMinder/pull/859) ([manupap1](https://github.com/manupap1))
+- Move iostream inclusion in zm.h and declare explicitly the namespace [\#859](https://github.com/ZoneMinder/ZoneMinder/pull/859) ([manupap1](https://github.com/manupap1))
 - Fix detection of deprecated libav / ffmpeg functions [\#858](https://github.com/ZoneMinder/ZoneMinder/pull/858) ([manupap1](https://github.com/manupap1))
 - Correct bareword config entries with newer {} style [\#856](https://github.com/ZoneMinder/ZoneMinder/pull/856) ([connortechnology](https://github.com/connortechnology))
 - update german translation [\#854](https://github.com/ZoneMinder/ZoneMinder/pull/854) ([seeebek](https://github.com/seeebek))

CMakeLists.txt

@@ -2,9 +2,9 @@
 # Created by mastertheknife (Kfir Itzhak)
 # For more information and installation, see the INSTALL file
 #
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.7)
 project (zoneminder)
-set(zoneminder_VERSION "1.30.0")
+file (STRINGS "version" zoneminder_VERSION)
 # make API version a minor of ZM version
 set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")
 
@@ -66,6 +66,24 @@ set(CMAKE_CXX_FLAGS_DEBUG "-Wall -D__STDC_CONSTANT_MACROS -g")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
+# GCC below 6.0 doesn't support __target__("fpu=neon") attribute, required for compiling ARM Neon code, otherwise compilation fails.
+# Must use -mfpu=neon compiler flag instead, but only do that for processors that support neon, otherwise strip the neon code alltogether,
+# because passing -fmpu=neon is unsafe to processors that don't support neon
+IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
+	IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+		EXEC_PROGRAM(grep ARGS " neon " "/proc/cpuinfo" OUTPUT_VARIABLE neonoutput RETURN_VALUE neonresult)
+		IF(neonresult EQUAL 0)
+			set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpu=neon")
+			set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpu=neon")
+			set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -mfpu=neon")
+			set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mfpu=neon")
+		ELSE(neonresult EQUAL 0)
+			add_definitions(-DZM_STRIP_NEON=1)
+			message(STATUS "ARM Neon is not available on this processor. Neon functions will be absent")
+		ENDIF(neonresult EQUAL 0)
+	ENDIF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
+
 # Modules that we need:
 include (GNUInstallDirs)
 include (CheckIncludeFile)
@@ -85,7 +103,9 @@ mark_as_advanced(
     ZM_PERL_MM_PARMS 
     ZM_PERL_SEARCH_PATH 
     ZM_TARGET_DISTRO 
-    ZM_CONFIG_DIR)
+    ZM_CONFIG_DIR
+    ZM_CONFIG_SUBDIR
+    ZM_SYSTEMD)
 
 set(ZM_RUNDIR "/var/run/zm" CACHE PATH 
     "Location of transient process files, default: /var/run/zm")
@@ -118,6 +138,8 @@ set(ZM_WEB_GROUP "" CACHE STRING
 # Advanced
 set(ZM_CONFIG_DIR "/${CMAKE_INSTALL_SYSCONFDIR}" CACHE PATH 
     "Location of ZoneMinder configuration, default system config directory")
+set(ZM_CONFIG_SUBDIR "${ZM_CONFIG_DIR}/conf.d" CACHE PATH 
+    "Location of ZoneMinder configuration subfolder, default: ZM_CONFIG_DIR/conf.d")
 set(ZM_EXTRA_LIBS "" CACHE STRING 
     "A list of optional libraries, separated by semicolons, e.g. ssl;theora")
 set(ZM_MYSQL_ENGINE "InnoDB" CACHE STRING 
@@ -147,30 +169,18 @@ set(ZM_PERL_SEARCH_PATH "" CACHE PATH
 	where ZM_PERL_MM_PARMS has been modified such that ZoneMinder's Perl modules are 
 	installed outside Perl's default search path.")
 set(ZM_TARGET_DISTRO "" CACHE STRING 
-    "Build ZoneMinder for a specific distribution.  Currently, valid names are: f22, f23, el6, el7, OS13")
+    "Build ZoneMinder for a specific distribution.  Currently, valid names are: fc24, fc25, el6, el7, OS13, FreeBSD")
+set(ZM_SYSTEMD "OFF" CACHE BOOL 
+    "Set to ON to force building ZM with systemd support. default: OFF")
 
 # Reassign some variables if a target distro has been specified
-if((ZM_TARGET_DISTRO STREQUAL "f22") OR (ZM_TARGET_DISTRO STREQUAL "f23"))
+if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
-	set(ZM_RUNDIR "/var/run/zoneminder")
-	set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
-	set(ZM_TMPDIR "/var/lib/zoneminder/temp")
-	set(ZM_LOGDIR "/var/log/zoneminder")
-	set(ZM_CONFIG_DIR "/etc/zm")
-	set(ZM_WEBDIR "/usr/share/zoneminder/www")
-	set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
-elseif(ZM_TARGET_DISTRO STREQUAL "el6")
-	set(ZM_RUNDIR "/var/run/zoneminder")
-	set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
-	set(ZM_TMPDIR "/var/lib/zoneminder/temp")
-	set(ZM_LOGDIR "/var/log/zoneminder")
-	set(ZM_WEBDIR "/usr/share/zoneminder/www")
-	set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
-elseif(ZM_TARGET_DISTRO STREQUAL "el7")
 	set(ZM_RUNDIR "/var/run/zoneminder")
 	set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
 	set(ZM_TMPDIR "/var/lib/zoneminder/temp")
 	set(ZM_LOGDIR "/var/log/zoneminder")
 	set(ZM_CONFIG_DIR "/etc/zm")
+        set(ZM_CONFIG_SUBDIR "/etc/zm/conf.d")
 	set(ZM_WEBDIR "/usr/share/zoneminder/www")
 	set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
 elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
@@ -190,10 +200,11 @@ elseif(ZM_TARGET_DISTRO STREQUAL "FreeBSD")
         set(ZM_WEB_USER "www")
         set(ZM_WEB_GROUP "www")
         set(ZM_CONFIG_DIR "/usr/local/etc/zm")
+        set(ZM_CONFIG_SUBDIR "/usr/local/etc/zm/conf.d")
         set(ZM_WEBDIR "/usr/local/share/zoneminder/www")
         set(ZM_CGIDIR "/usr/local/libexec/zoneminder/cgi-bin")
         set(ZM_PERL_MM_PARMS "INSTALLDIRS=site")
-endif((ZM_TARGET_DISTRO STREQUAL "f22") OR (ZM_TARGET_DISTRO STREQUAL "f23"))
+endif((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
 
 # Required for certain checks to work
 set(CMAKE_EXTRA_INCLUDE_FILES 
@@ -204,6 +215,11 @@ include_directories("${CMAKE_BINARY_DIR}")
 # This is required to enable searching in lib64 (if exists), do not change
 set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
 
+# Set the systemd flag if systemd is autodetected or ZM_SYSTEMD has been set
+if(ZM_SYSTEMD OR (IS_DIRECTORY /usr/lib/systemd/system) OR (IS_DIRECTORY /lib/systemd/system))
+    set(WITH_SYSTEMD 1)
+endif(ZM_SYSTEMD OR (IS_DIRECTORY /usr/lib/systemd/system) OR (IS_DIRECTORY /lib/systemd/system))
+
 # System checks
 check_include_file("libv4l1-videodev.h" HAVE_LIBV4L1_VIDEODEV_H)
 if(NOT HAVE_LIBV4L1_VIDEODEV_H)
@@ -385,13 +401,13 @@ find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)
 if(MYSQLCLIENT_LIBRARIES)
 	set(HAVE_LIBMYSQLCLIENT 1)
 	list(APPEND ZM_BIN_LIBS "${MYSQLCLIENT_LIBRARIES}")
-	find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql.h)
+	find_path(MYSQLCLIENT_INCLUDE_DIR mysql.h PATH_SUFFIXES mysql)
 	if(MYSQLCLIENT_INCLUDE_DIR)
 		include_directories("${MYSQLCLIENT_INCLUDE_DIR}")
 		set(CMAKE_REQUIRED_INCLUDES "${MYSQLCLIENT_INCLUDE_DIR}")
 	endif(MYSQLCLIENT_INCLUDE_DIR)
 	mark_as_advanced(FORCE MYSQLCLIENT_LIBRARIES MYSQLCLIENT_INCLUDE_DIR)
-	check_include_file("mysql/mysql.h" HAVE_MYSQL_H)
+	check_include_file("mysql.h" HAVE_MYSQL_H)
 	if(NOT HAVE_MYSQL_H)
 		message(FATAL_ERROR 
                     "ZoneMinder requires MySQL headers - check that MySQL development packages are installed")
@@ -401,6 +417,59 @@ else(MYSQLCLIENT_LIBRARIES)
             "ZoneMinder requires mysqlclient but it was not found on your system")
 endif(MYSQLCLIENT_LIBRARIES)
 
+# x264 (using find_library and find_path)
+find_library(X264_LIBRARIES x264)
+if(X264_LIBRARIES)
+	set(HAVE_LIBX264 1)
+	list(APPEND ZM_BIN_LIBS "${X264_LIBRARIES}")
+	find_path(X264_INCLUDE_DIR x264.h)
+	if(X264_INCLUDE_DIR)
+		include_directories("${X264_INCLUDE_DIR}")
+		set(CMAKE_REQUIRED_INCLUDES "${X264_INCLUDE_DIR}")
+	endif(X264_INCLUDE_DIR)
+	mark_as_advanced(FORCE X264_LIBRARIES X264_INCLUDE_DIR)
+	check_include_files("stdint.h;x264.h" HAVE_X264_H)
+	set(optlibsfound "${optlibsfound} x264")
+else(X264_LIBRARIES)
+	set(optlibsnotfound "${optlibsnotfound} x264")
+endif(X264_LIBRARIES)
+
+# mp4v2 (using find_library and find_path)
+find_library(MP4V2_LIBRARIES mp4v2)
+if(MP4V2_LIBRARIES)
+	set(HAVE_LIBMP4V2 1)
+	list(APPEND ZM_BIN_LIBS "${MP4V2_LIBRARIES}")
+
+        # mp4v2/mp4v2.h
+	find_path(MP4V2_INCLUDE_DIR mp4v2/mp4v2.h)
+	if(MP4V2_INCLUDE_DIR)
+		include_directories("${MP4V2_INCLUDE_DIR}")
+		set(CMAKE_REQUIRED_INCLUDES "${MP4V2_INCLUDE_DIR}")
+	endif(MP4V2_INCLUDE_DIR)
+	check_include_file("mp4v2/mp4v2.h" HAVE_MP4V2_MP4V2_H)
+
+        # mp4v2.h
+	find_path(MP4V2_INCLUDE_DIR mp4v2.h)
+	if(MP4V2_INCLUDE_DIR)
+		include_directories("${MP4V2_INCLUDE_DIR}")
+		set(CMAKE_REQUIRED_INCLUDES "${MP4V2_INCLUDE_DIR}")
+	endif(MP4V2_INCLUDE_DIR)
+	check_include_file("mp4v2.h" HAVE_MP4V2_H)
+
+	# mp4.h
+	find_path(MP4V2_INCLUDE_DIR mp4.h)
+	if(MP4V2_INCLUDE_DIR)
+		include_directories("${MP4V2_INCLUDE_DIR}")
+		set(CMAKE_REQUIRED_INCLUDES "${MP4V2_INCLUDE_DIR}")
+	endif(MP4V2_INCLUDE_DIR)
+	check_include_file("mp4.h" HAVE_MP4_H)
+
+	mark_as_advanced(FORCE MP4V2_LIBRARIES MP4V2_INCLUDE_DIR)
+	set(optlibsfound "${optlibsfound} mp4v2")
+else(MP4V2_LIBRARIES)
+	set(optlibsnotfound "${optlibsnotfound} mp4v2")
+endif(MP4V2_LIBRARIES)
+
 set(PATH_FFMPEG "")
 set(OPT_FFMPEG "no")
 # Do not check for ffmpeg if ZM_NO_FFMPEG is on
@@ -491,6 +560,23 @@ if(NOT ZM_NO_FFMPEG)
 		set(optlibsnotfound "${optlibsnotfound} SWScale")
 	endif(SWSCALE_LIBRARIES)
 
+	# rescale (using find_library and find_path)
+	find_library(AVRESAMPLE_LIBRARIES avresample)
+	if(AVRESAMPLE_LIBRARIES)
+		set(HAVE_LIBAVRESAMPLE 1)
+		list(APPEND ZM_BIN_LIBS "${AVRESAMPLE_LIBRARIES}")
+		find_path(AVRESAMPLE_INCLUDE_DIR "libavresample/avresample.h" /usr/include/ffmpeg)
+		if(AVRESAMPLE_INCLUDE_DIR)
+			include_directories("${AVRESAMPLE_INCLUDE_DIR}")
+			set(CMAKE_REQUIRED_INCLUDES "${AVRESAMPLE_INCLUDE_DIR}")
+		endif(AVRESAMPLE_INCLUDE_DIR)
+		mark_as_advanced(FORCE AVRESAMPLE_LIBRARIES AVRESAMPLE_INCLUDE_DIR)
+		check_include_file("libavresample/avresample.h" HAVE_LIBAVRESAMPLE_AVRESAMPLE_H)
+		set(optlibsfound "${optlibsfound} AVResample")
+	else(AVRESAMPLE_LIBRARIES)
+		set(optlibsnotfound "${optlibsnotfound} AVResample")
+	endif(AVRESAMPLE_LIBRARIES)
+
 	# Find the path to the ffmpeg executable
 	find_program(FFMPEG_EXECUTABLE 
 		NAMES ffmpeg avconv
@@ -523,6 +609,13 @@ if(NOT ZM_NO_LIBVLC)
 	endif(LIBVLC_LIBRARIES)
 endif(NOT ZM_NO_LIBVLC)
 
+find_package(Boost 1.36.0)
+if(Boost_FOUND)
+  include_directories(${Boost_INCLUDE_DIRS})
+  set(CMAKE_REQUIRED_INCLUDES "${Boost_INCLUDE_DIRS}")
+  list(APPEND ZM_BIN_LIBS "${Boost_LIBRARIES}")
+endif()
+
 # *** END OF LIBRARY CHECKS ***
 
 # Check for gnutls or crypto
@@ -658,12 +751,14 @@ endif(NOT ZM_WEB_GROUP)
 message(STATUS "Using web user: ${ZM_WEB_USER}")
 message(STATUS "Using web group: ${ZM_WEB_GROUP}")
 
-# Check for polkit
+if(WITH_SYSTEMD)
-find_package(Polkit)
+    # Check for polkit
-if(NOT POLKIT_FOUND)
+    find_package(Polkit)
+    if(NOT POLKIT_FOUND)
 	    message(FATAL_ERROR 
                 "Running ZoneMinder requires polkit. Building ZoneMinder requires the polkit development package.")
-endif(NOT POLKIT_FOUND)
+    endif(NOT POLKIT_FOUND)
+endif(WITH_SYSTEMD)
 
 # Some variables that zm expects
 set(ZM_PID "${ZM_RUNDIR}/zm.pid")
@@ -685,6 +780,11 @@ else(ZM_PERL_SEARCH_PATH)
 	set(EXTRA_PERL_LIB "# Include from system perl paths only")
 endif(ZM_PERL_SEARCH_PATH)
 
+# If this is an out-of-source build, copy the files we need to the binary directory
+if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/conf.d" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/conf.d")
+endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+
 # Generate files from the .in files
 configure_file(zm.conf.in "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" @ONLY)
 configure_file(zoneminder-config.cmake "${CMAKE_CURRENT_BINARY_DIR}/config.h" @ONLY)
@@ -708,13 +808,11 @@ if(ZM_ONVIF)
 endif(ZM_ONVIF)
 
 # Process distro subdirectories
-if((ZM_TARGET_DISTRO STREQUAL "f22") OR (ZM_TARGET_DISTRO STREQUAL "f23"))
+if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
-	add_subdirectory(distros/fedora)
-elseif((ZM_TARGET_DISTRO STREQUAL "el6") OR (ZM_TARGET_DISTRO STREQUAL "el7"))
 	add_subdirectory(distros/redhat)
 elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
 	add_subdirectory(distros/opensuse)
-endif((ZM_TARGET_DISTRO STREQUAL "f22") OR (ZM_TARGET_DISTRO STREQUAL "f23"))
+endif((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
 
 # Print optional libraries detection status
 message(STATUS "Optional libraries found:${optlibsfound}")
@@ -731,8 +829,9 @@ else(zmconfgen_result EQUAL 0)
             "ZoneMinder configuration generator failed. Exit code: ${zmconfgen_result}")
 endif(zmconfgen_result EQUAL 0)
 
-# Install zm.conf
+# Install zm.conf and conf.d subfolder
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}")
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/conf.d/" DESTINATION "${ZM_CONFIG_SUBDIR}")
 
 # Uninstall target
 configure_file(
@@ -742,3 +841,10 @@ configure_file(
 add_custom_target(uninstall
     COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake)
 
+# Configure CCache if available
+find_program(CCACHE_FOUND ccache)
+if(CCACHE_FOUND)
+        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+endif(CCACHE_FOUND)
+

COPYING

@@ -1,8 +1,8 @@
                     GNU GENERAL PUBLIC LICENSE
                        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
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
                     GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
                      END OF TERMS AND CONDITIONS
-
+
             How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+    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.
 
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

Dockerfile

@@ -1,25 +1,75 @@
-# ZoneMinder
+# ZoneMinder, you need the GIT repository code and submodules (git submodule update --init --recursive)
 
-FROM ubuntu:trusty
+FROM ubuntu:xenial
-MAINTAINER Kyle Johnson <kjohnson@gnulnx.net>
+MAINTAINER Markos Vakondios <mvakondios@gmail.com>
-
-# Let the container know that there is no tty
-ENV DEBIAN_FRONTEND noninteractive
 
 # Resynchronize the package index files 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update \
-	libpolkit-gobject-1-dev build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-	libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 \
+    apache2 \
-	libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm cmake libjpeg-turbo8-dev \
+    build-essential \
-	libjpeg-turbo8 libtheora-dev libvorbis-dev libvpx-dev libx264-dev libmp4v2-dev libav-tools mysql-client \
+    cmake \
-	apache2 php5 php5-mysql apache2-mpm-prefork libapache2-mod-php5 php5-cli openssh-server \
+    dh-autoreconf \
-	mysql-server libvlc-dev libvlc5 libvlccore-dev libvlccore7 vlc-data libcurl4-openssl-dev \
+    dpatch \
-	libavformat-dev libswscale-dev libavutil-dev libavcodec-dev libavfilter-dev \
+    libapache2-mod-php \
-	libavresample-dev libavdevice-dev libpostproc-dev libv4l-dev libtool libnetpbm10-dev \
+    libarchive-zip-perl \
-	libmime-lite-perl dh-autoreconf dpatch
+    libavcodec-dev \
+    libavdevice-dev \
+    libavfilter-dev \
+    libavformat-dev \
+    libavresample-dev \
+    libav-tools \
+    libavutil-dev \
+    libbz2-dev \
+    libcurl4-openssl-dev \
+    libdate-manip-perl \
+    libdbd-mysql-perl \
+    libdbi-perl \
+    libdevice-serialport-perl \
+    libjpeg-turbo8 \
+    libjpeg-turbo8-dev \
+    libmime-lite-perl \
+    libmime-perl \
+    libmp4v2-dev \
+    libmysqlclient-dev \
+    libnetpbm10-dev \
+    libpcre3 \
+    libpcre3-dev \
+    libpolkit-gobject-1-dev \
+    libpostproc-dev \
+    libssl-dev \
+    libswscale-dev \
+    libsys-mmap-perl \
+    libtheora-dev \
+    libtool \
+    libv4l-dev \
+    libvlc5 \
+    libvlccore8 \
+    libvlccore-dev \
+    libvlc-dev \
+    libvorbis-dev \
+    libvpx-dev \
+    libwww-perl \
+    libx264-dev \
+    mysql-client \
+    mysql-server \
+    php \
+    php-cli \
+    php-mysql \
+    vlc-data \
+    yasm \
+	&& rm -rf /var/lib/apt/lists/*
 
 # Copy local code into our container
-ADD . /ZoneMinder
+ADD cmake /ZoneMinder/cmake/
+ADD db /ZoneMinder/db/
+ADD misc /ZoneMinder/misc/
+ADD onvif /ZoneMinder/onvif/
+ADD scripts /ZoneMinder/scripts/
+ADD src /ZoneMinder/src/
+ADD umutils /ZoneMinder/umutils/
+ADD web /ZoneMinder/web/
+ADD cmakecacheimport.sh CMakeLists.txt version zm.conf.in zmconfgen.pl.in zmlinkcontent.sh.in zoneminder-config.cmake /ZoneMinder/
 
 # Change into the ZoneMinder directory
 WORKDIR /ZoneMinder
@@ -31,11 +81,8 @@ WORKDIR /ZoneMinder
 #RUN ./configure --with-libarch=lib/$DEB_HOST_GNU_TYPE --disable-debug --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr  --with-webdir=/var/www/zm --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-mmap=yes --enable-onvif ZM_SSL_LIB=openssl ZM_DB_USER=zm ZM_DB_PASS=zm
 RUN cmake .
 
-# Build ZoneMinder
+# Build & install ZoneMinder
-RUN make
+RUN make && make install
-
-# Install ZoneMinder
-RUN make install
 
 # ensure writable folders
 RUN ./zmlinkcontent.sh
@@ -43,29 +90,20 @@ RUN ./zmlinkcontent.sh
 # Adding the start script
 ADD utils/docker/start.sh /tmp/start.sh
 
-# Ensure we can run this
+# Settings rights for /usr/local/share/zoneminder/
-# TODO - Files ADD'ed have 755 already...why do we need this?
-RUN chmod 755 /tmp/start.sh
-
-# give files in /usr/local/share/zoneminder/
 RUN chown -R www-data:www-data /usr/local/share/zoneminder/
 
-# Creating SSH privilege escalation dir
-RUN mkdir /var/run/sshd
-
 # Adding apache virtual hosts file
-ADD utils/docker/apache-vhost /etc/apache2/sites-available/000-default.conf
+RUN cp misc/apache.conf /etc/apache2/sites-available/000-default.conf
-ADD utils/docker/phpdate.ini /etc/php5/apache2/conf.d/25-phpdate.ini
 
-# Set the root passwd
+# Expose http port
-RUN echo 'root:root' | chpasswd
-
-# Add a user we can actually login with
-RUN useradd -m -s /bin/bash -G sudo zoneminder
-RUN echo 'zoneminder:zoneminder' | chpasswd
-
-# Expose ssh and http ports
 EXPOSE 80
-EXPOSE 22
 
-CMD "/tmp/start.sh"
+VOLUME /var/lib/zoneminder/images /var/lib/zoneminder/events /var/lib/mysql /var/log/zm
+
+# To speed up configuration testing, we put it here
+ADD utils/docker /ZoneMinder/utils/docker/
+
+CMD /ZoneMinder/utils/docker/setup.sh && /ZoneMinder/utils/docker/start.sh >/var/log/start.log 2>&1 & /bin/bash
+
+# Run example docker run -it -p 1080:80 -e PHP_TIMEZONE='Europe/Paris' -v /disk/zoneminder/events:/var/lib/zoneminder/events -v /disk/zoneminder/images:/var/lib/zoneminder/images -v /disk/zoneminder/mysql:/var/lib/mysql -v /disk/zoneminder/logs:/var/log/zm --name zoneminder zoneminder/zoneminder

README.md

@@ -30,7 +30,7 @@ This is the recommended method to install ZoneMinder onto your system. ZoneMinde
 - RHEL/CentOS and clones via [zmrepo](http://zmrepo.zoneminder.com/)
 - Fedora via [zmrepo](http://zmrepo.zoneminder.com/)
 - OpenSuse via [third party repository](http://www.zoneminder.com/wiki/index.php/Installing_using_ZoneMinder_RPMs_for_SuSE)
-- Maegia from their default repository
+- Mageia from their default repository
 
 If a repository that hosts ZoneMinder packages is not available for your distro, then you are encouraged to build your own package, rather than build from source.  While each distro is different in ways that set it apart from all the others, they are often similar enough to allow you to adapt another distro's package building instructions to your own.
 

code_of_conduct.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at abuse@zoneminder.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

conf.d/README

@@ -0,0 +1,19 @@
+conf.d/README
+
+Any changes to ZoneMinder's configuration should be made here in this folder,
+rather than directly editing the default zm.conf file.
+
+ZoneMinder will process each file in this folder with a ".conf" extension.
+Each "Var = Value" pair, in each config file, will be loaded into ZoneMinder's
+running configuration, overriding any variables with the same name found in the 
+default zm.conf file.
+
+After creating a custom config file, don't forget to set the proper file and
+owner permission on it. For example, this is typically what you should do after
+saving the config file to disk:
+
+    sudo chown root:apache *.conf
+    sudo chmod 640 *.conf
+
+Substitute "apache" with the name of the web server user account on your system.
+

conf.d/zm-server-host.conf

@@ -0,0 +1,7 @@
+# Do NOT set ZM_SERVER_HOST if you are not using Multi-Server
+# You have been warned
+#
+# The name specified here must have a corresponding entry
+# in the Servers tab under Options
+ZM_SERVER_HOST=
+

db/zm_create.sql.in

@@ -193,6 +193,7 @@ CREATE TABLE `Events` (
   `Length` decimal(10,2) NOT NULL default '0.00',
   `Frames` int(10) unsigned default NULL,
   `AlarmFrames` int(10) unsigned default NULL,
+  `DefaultVideo` VARCHAR( 64 ) NOT NULL,
   `TotScore` int(10) unsigned NOT NULL default '0',
   `AvgScore` smallint(5) unsigned default '0',
   `MaxScore` smallint(5) unsigned default '0',
@@ -322,7 +323,7 @@ CREATE TABLE `Monitors` (
   `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL') NOT NULL default 'Local',
   `Function` enum('None','Monitor','Modect','Record','Mocord','Nodect') NOT NULL default 'Monitor',
   `Enabled` tinyint(3) unsigned NOT NULL default '1',
-  `LinkedMonitors` varchar(255) NOT NULL default '',
+  `LinkedMonitors` varchar(255),
   `Triggers` set('X10') NOT NULL default '',
   `Device` tinytext NOT NULL default '',
   `Channel` tinyint(3) unsigned NOT NULL default '0',
@@ -331,26 +332,30 @@ CREATE TABLE `Monitors` (
   `V4LCapturesPerFrame`	tinyint(3) unsigned,
   `Protocol` varchar(16) NOT NULL default '',
   `Method` varchar(16) NOT NULL default '',
-  `Host` varchar(64) NOT NULL default '',
+  `Host` varchar(64),
   `Port` varchar(8) NOT NULL default '',
   `SubPath` varchar(64) NOT NULL default '',
-  `Path` varchar(255) NOT NULL default '',
+  `Path` varchar(255),
   `Options` varchar(255) not null default '',
-  `User` varchar(64) NOT NULL default '',
+  `User` varchar(64),
-  `Pass` varchar(64) NOT NULL default '',
+  `Pass` varchar(64),
   `Width` smallint(5) unsigned NOT NULL default '0',
   `Height` smallint(5) unsigned NOT NULL default '0',
   `Colours` tinyint(3) unsigned NOT NULL default '1',
   `Palette` int(10) unsigned NOT NULL default '0',
   `Orientation` enum('0','90','180','270','hori','vert') NOT NULL default '0',
   `Deinterlacing` int(10) unsigned NOT NULL default '0',
-  `RTSPDescribe` tinyint(1) unsigned NOT NULL default '0',
+  `SaveJPEGs` TINYINT NOT NULL DEFAULT '3' ,
+  `VideoWriter` TINYINT NOT NULL DEFAULT '0',
+  `EncoderParameters` TEXT,
+  `RecordAudio` TINYINT NOT NULL DEFAULT '0',
+  `RTSPDescribe` tinyint(1) unsigned,
   `Brightness` mediumint(7) NOT NULL default '-1',
   `Contrast` mediumint(7) NOT NULL default '-1',
   `Hue` mediumint(7) NOT NULL default '-1',
   `Colour` mediumint(7) NOT NULL default '-1',
   `EventPrefix` varchar(32) NOT NULL default 'Event-',
-  `LabelFormat` varchar(64) NOT NULL default '%N - %y/%m/%d %H:%M:%S',
+  `LabelFormat` varchar(64),
   `LabelX` smallint(5) unsigned NOT NULL default '0',
   `LabelY` smallint(5) unsigned NOT NULL default '0',
   `LabelSize` smallint(5) unsigned NOT NULL DEFAULT '1',
@@ -371,14 +376,14 @@ CREATE TABLE `Monitors` (
   `RefBlendPerc` tinyint(3) unsigned NOT NULL default '6',
   `AlarmRefBlendPerc` tinyint(3) unsigned NOT NULL default '6',
   `Controllable` tinyint(3) unsigned NOT NULL default '0',
-  `ControlId` int(10) unsigned NOT NULL default '0',
+  `ControlId` int(10) unsigned,
   `ControlDevice` varchar(255) default NULL,
   `ControlAddress` varchar(255) default NULL,
   `AutoStopTimeout` decimal(5,2) default NULL,
   `TrackMotion` tinyint(3) unsigned NOT NULL default '0',
-  `TrackDelay` smallint(5) unsigned NOT NULL default '0',
+  `TrackDelay` smallint(5) unsigned,
   `ReturnLocation` tinyint(3) NOT NULL default '-1',
-  `ReturnDelay` smallint(5) unsigned NOT NULL default '0',
+  `ReturnDelay` smallint(5) unsigned,
   `DefaultView` enum('Events','Control') NOT NULL default 'Events',
   `DefaultRate` smallint(5) unsigned NOT NULL default '100',
   `DefaultScale` smallint(5) unsigned NOT NULL default '100',
@@ -467,7 +472,7 @@ CREATE TABLE `Users` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Username` varchar(32) character set latin1 collate latin1_bin NOT NULL default '',
   `Password` varchar(64) NOT NULL default '',
-  `Language` varchar(8) NOT NULL default '',
+  `Language` varchar(8),
   `Enabled` tinyint(3) unsigned NOT NULL default '1',
   `Stream` enum('None','View') NOT NULL default 'None',
   `Events` enum('None','View','Edit') NOT NULL default 'None',
@@ -476,8 +481,8 @@ CREATE TABLE `Users` (
   `Groups` 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',
-  `MaxBandwidth` varchar(16) NOT NULL default '',
+  `MaxBandwidth` varchar(16),
-  `MonitorIds` tinytext NOT NULL,
+  `MonitorIds` tinytext,
   PRIMARY KEY (`Id`),
   UNIQUE KEY `UC_Username` (`Username`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
@@ -594,6 +599,8 @@ INSERT INTO `Controls` VALUES (NULL,'Wanscam HW0025','Libvlc','WanscamHW0025', 1
 INSERT INTO `Controls` VALUES (NULL,'IPCC 7210W','Libvlc','IPCC7210W', 1, 1, 1, 1, 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, 1, 16, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 350, 0, 0, 1, 0, 10, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 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,'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
@@ -666,6 +673,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,'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,'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

db/zm_update-1.30.1.sql

@@ -0,0 +1,7 @@
+--
+-- This updates a 1.30.0 database to 1.30.1
+--
+-- Alter type of Messages column from VARCHAR(255) to TEXT
+--
+
+ALTER TABLE Logs MODIFY Message TEXT;

db/zm_update-1.30.2.sql

@@ -0,0 +1,5 @@
+--
+-- This updates a 1.30.1 database to 1.30.2
+--
+
+ALTER TABLE Users MODIFY MonitorIds TEXT NOT NULL;

db/zm_update-1.30.3.sql

@@ -0,0 +1,5 @@
+--
+-- This updates a 1.30.2 database to 1.30.3
+--
+-- No changes required
+--

db/zm_update-1.30.4.sql

@@ -0,0 +1,5 @@
+--
+-- This updates a 1.30.3 database to 1.30.4
+--
+-- No changes required
+--

db/zm_update-1.31.0.sql

@@ -0,0 +1,97 @@
+--
+-- This updates a 1.29.0 database to 1.30.0
+--
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'SaveJPEGs'
+	) > 0,
+"SELECT 'Column SaveJPEGs exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `SaveJPEGs` TINYINT NOT NULL DEFAULT '3' AFTER `Deinterlacing`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'VideoWriter'
+	) > 0,
+"SELECT 'Column VideoWriter exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `VideoWriter` TINYINT NOT NULL DEFAULT '0' AFTER `SaveJPEGs`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'EncoderParameters'
+	) > 0,
+"SELECT 'Column EncoderParameters exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `EncoderParameters` TEXT NOT NULL AFTER `VideoWriter`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Events'
+	AND table_schema = DATABASE()
+	AND column_name = 'DefaultVideo'
+	) > 0,
+"SELECT 'Column DefaultVideo exists in Events'",
+"ALTER TABLE `Events` ADD `DefaultVideo` VARCHAR( 64 ) NOT NULL AFTER `AlarmFrames`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'RecordAudio'
+	) > 0,
+"SELECT 'Column RecordAudio exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `RecordAudio` TINYINT NOT NULL DEFAULT '0' AFTER `EncoderParameters`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+--
+-- The following alters various columns to allow NULLs
+--
+
+ALTER TABLE Monitors MODIFY Host varchar(64);
+ALTER TABLE Monitors MODIFY LabelFormat varchar(64);
+ALTER TABLE Monitors MODIFY LinkedMonitors varchar(255);
+ALTER TABLE Monitors MODIFY Options varchar(255);
+ALTER TABLE Monitors MODIFY Protocol varchar(16);
+ALTER TABLE Monitors MODIFY User varchar(64);
+ALTER TABLE Monitors MODIFY Pass varchar(64);
+ALTER TABLE Monitors MODIFY RTSPDescribe tinyint(1) unsigned;
+ALTER TABLE Monitors MODIFY ControlId int(10) unsigned;
+ALTER TABLE Monitors MODIFY TrackDelay smallint(5) unsigned;
+ALTER TABLE Monitors MODIFY ReturnDelay smallint(5) unsigned;
+ALTER TABLE Monitors MODIFY EncoderParameters TEXT;
+ALTER TABLE Monitors MODIFY Path varchar(255);
+ALTER TABLE Monitors MODIFY V4LMultiBuffer tinyint(1) unsigned;
+
+ALTER TABLE Users MODIFY MonitorIds tinytext;
+ALTER TABLE Users MODIFY Language varchar(8);
+ALTER TABLE Users MODIFY MaxBandwidth varchar(16);
+

distros/debian/apache.conf

@@ -1,8 +1,20 @@
 Alias /zm /usr/share/zoneminder/www
 
-<Directory /usr/share/zoneminder/www>
+<IfModule mod_fcgid.c>
-  Options Indexes FollowSymLinks
+  <Directory /usr/share/zoneminder/www>
+    Options -Indexes +ExecCGI
+    AllowOverride All
+    AddHandler fcgid-script .php
+    FCGIWrapper /usr/bin/php5-cgi
+    Order allow,deny
+    Allow from all
+  </Directory>
+</IfModule>
+<IfModule mod_php5.c>
+  <Directory /usr/share/zoneminder/www>
+    Options -Indexes +FollowSymLinks
     <IfModule mod_dir.c>
       DirectoryIndex index.php
     </IfModule>
-</Directory>
+  </Directory>
+</IfModule>

distros/debian/control

@@ -6,14 +6,14 @@ Build-Depends: debhelper (>= 9), cmake
     , libphp-serialization-perl
     , libgnutls28-dev | libgnutls-dev
     , libmysqlclient-dev | libmariadbclient-dev
-    , libjpeg8-dev
+    , libjpeg8-dev | libjpeg-dev
     , libpcre3-dev
     , libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev
+    , libavdevice-dev
     , libv4l-dev (>= 0.8.3)
     , libbz2-dev
-    , libav-tools
+    , ffmpeg | libav-tools
     , libnetpbm10-dev
-    , libavdevice-dev
     , libvlccore-dev, libvlc-dev
     , libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
     , libgcrypt11-dev, libpolkit-gobject-1-dev
@@ -42,11 +42,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
     , libsys-cpu-perl, libsys-meminfo-perl
     , libdata-uuid-perl
     , libpcre3
-    , libav-tools, libavdevice53
+    , ffmpeg | libav-tools, libavdevice53 | libavdevice55 | libavdevice57
     , rsyslog | system-log-daemon
     , netpbm , libjpeg8
     , zip
-    , libvlccore5 | libvlccore7, libvlc5
+    , libvlccore5 | libvlccore7 | libvlccore8, libvlc5
     , libpolkit-gobject-1-0, php5-gd
 Recommends: mysql-server | mariadb-server
 Description: Video camera security and surveillance solution

distros/debian/postinst

@@ -38,6 +38,7 @@ if [ "$1" = "configure" ]; then
                 invoke-rc.d zoneminder stop || true
                 zmupdate.pl --nointeractive
                 zmupdate.pl --nointeractive -f
+                echo "Done Updating, starting ZoneMinder"
                 invoke-rc.d zoneminder start || true
             else
                 echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'

distros/debian/rules

@@ -22,14 +22,15 @@ override_dh_auto_configure:
 		-DZM_CGIDIR=/usr/lib/zoneminder/cgi-bin \
 		-DZM_WEB_USER=www-data \
 		-DZM_WEB_GROUP=www-data \
-		-DCMAKE_INSTALL_SYSCONFDIR=etc/zm
+                -DZM_CONFIG_SUBDIR="/etc/zm/conf.d" \
+		-DZM_CONFIG_DIR="/etc/zm"
 
 override_dh_auto_install:
 	dh_auto_install --buildsystem=cmake
 	install -D -m 0644 debian/apache.conf  $(INSTDIR)/etc/zm/apache.conf
-	rm $(INSTDIR)/usr/share/zoneminder/api/lib/Cake/LICENSE.txt
+	rm -f $(INSTDIR)/usr/share/zoneminder/www/api/lib/Cake/LICENSE.txt
-	rm $(INSTDIR)/usr/share/zoneminder/api/.gitignore
+	rm -f $(INSTDIR)/usr/share/zoneminder/www/api/.gitignore
-	rm -r $(INSTDIR)/usr/share/zoneminder/api/lib/Cake/Test
+	rm -rf $(INSTDIR)/usr/share/zoneminder/www/api/lib/Cake/Test
 
 override_dh_auto_test:
 	# do not run tests...

distros/fedora

@@ -0,0 +1 @@
+redhat

distros/fedora/CMakeLists.txt

@@ -1,52 +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" ...)
-
-# Create the ZoneMinder Apache config file
-configure_file(zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
-configure_file(zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY)
-configure_file(zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY)
-configure_file(zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
-
-# Download jscalendar & move files into position
-file(DOWNLOAD http://iweb.dl.sourceforge.net/project/jscalendar/jscalendar/1.0/jscalendar-1.0.zip ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar-1.0.zip STATUS download_jsc)
-if(download_jsc EQUAL 0)
-message(STATUS "Jscalander successfully downloaded.  Installing...")
-execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ERROR_VARIABLE unzip_jsc)
-message(STATUS "Status of jscalender script was: ${unzip_jsc}")
-else(download_jsc EQUAL 0)
-message(STATUS "Unable to download optional jscalander. Skipping...")
-endif(download_jsc EQUAL 0)
-
-# 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
-install(FILES zoneminder.conf DESTINATION /etc/httpd/conf.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
-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 jscalendar
-if(unzip_jsc STREQUAL "")
-install(DIRECTORY jscalendar-1.0/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/tools/jscalendar)
-endif(unzip_jsc STREQUAL "")

distros/fedora/README.https

@@ -1 +0,0 @@
-../redhat/README.https

distros/fedora/archive/zoneminder-1.24.3-runlevel.patch

@@ -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.

distros/fedora/archive/zoneminder-1.24.4-installfix.patch

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

distros/fedora/archive/zoneminder-1.26.0-defaults.patch

@@ -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},

distros/fedora/archive/zoneminder-1.26.3-dbinstall.patch

@@ -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@

distros/fedora/archive/zoneminder-1.26.3-noffmpeg.patch

@@ -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,,)
- 

distros/fedora/archive/zoneminder-1.26.4-dbinstall.patch

@@ -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@

distros/fedora/archive/zoneminder.cmake.f19.spec

@@ -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

distros/fedora/archive/zoneminder.conf

@@ -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>

distros/fedora/archive/zoneminder.f19.spec

@@ -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

distros/fedora/archive/zoneminder.f20.spec

@@ -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

distros/fedora/archive/zoneminder.f21.spec

@@ -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

distros/fedora/archive/zoneminder.logrotate

@@ -1,8 +0,0 @@
-/var/log/zoneminder/*.log {
-    missingok
-    notifempty
-    sharedscripts
-    postrotate
-        /usr/bin/zmpkg.pl logrot 2> /dev/null > /dev/null || :
-    endscript
-}

distros/fedora/archive/zoneminder.service

@@ -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
-

distros/fedora/archive/zoneminder.tmpfiles

@@ -1 +0,0 @@
-d   /run/zoneminder     0755    apache  apache

distros/fedora/jscalendar.sh

@@ -1 +0,0 @@
-../redhat/jscalendar.sh

distros/fedora/redalert.wav

@@ -1 +0,0 @@
-../redhat/redalert.wav

distros/fedora/zoneminder-1.28.0-defaults.patch

@@ -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},

distros/fedora/zoneminder.conf.in

@@ -1 +0,0 @@
-../redhat/zoneminder.el7.conf.in

distros/fedora/zoneminder.f22.spec

@@ -1 +0,0 @@
-zoneminder.f23.spec

distros/fedora/zoneminder.logrotate.in

@@ -1 +0,0 @@
-../redhat/zoneminder.el7.logrotate.in

distros/fedora/zoneminder.tmpfiles.in

@@ -1 +0,0 @@
-../redhat/zoneminder.tmpfiles.in

distros/redhat/CMakeLists.txt

@@ -1,50 +1,57 @@
 # CMakeLists.txt for the Redhat/CentOS Target Distro.
 
 # Display a message to show the RHEL build options are being processed.
-message([STATUS] "Starting RHEL Build Options" ...)
+if(ZM_TARGET_DISTRO MATCHES "^el")
+    message([STATUS] "Starting RHEL Build Options" ...)
+elseif(ZM_TARGET_DISTRO MATCHES "^fc")
+    message([STATUS] "Starting Fedora Build Options" ...)
+else(ZM_TARGET_DISTRO MATCHES "^el")
+    message([WARNING] "Unknown Build Option Detected" ...)
+endif(ZM_TARGET_DISTRO MATCHES "^el")
 
-# Create the zoneminder service file
+if((ZM_TARGET_DISTRO STREQUAL "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_file(zoneminder.el7.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.el7.logrotate @ONLY)
-else(ZM_TARGET_DISTRO STREQUAL "el7")
-	configure_file(zoneminder.sysvinit.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.sysvinit @ONLY)
-	configure_file(zoneminder.el6.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.el6.logrotate @ONLY)
-	configure_file(zoneminder.el6.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.el6.conf @ONLY)
-endif(ZM_TARGET_DISTRO STREQUAL "el7")
 
-# Download jscalendar & move files into position
+# Configure the zoneminder service files
-file(DOWNLOAD http://iweb.dl.sourceforge.net/project/jscalendar/jscalendar/1.0/jscalendar-1.0.zip ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar-1.0.zip LOG jsc_log STATUS download_jsc)
+if(ZM_TARGET_DISTRO STREQUAL "el6")
-#message(STATUS "Log of jscalender script was: ${jsc_log}")
+    configure_file(sysvinit/zoneminder.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.sysvinit @ONLY)
-if(download_jsc EQUAL 0)
+    configure_file(sysvinit/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
-	message(STATUS "Jscalander successfully downloaded.  Installing...")
+    configure_file(sysvinit/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY)
-	execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ERROR_VARIABLE unzip_jsc)
+else(ZM_TARGET_DISTRO STREQUAL "el6")
-	message(STATUS "Status of jscalender script was: ${unzip_jsc}")
+    configure_file(systemd/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
-else(download_jsc EQUAL 0)
+    if(ZM_WEB_USER STREQUAL "nginx")
-	message(STATUS "Unable to download optional jscalander. Skipping...")
+        configure_file(nginx/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
-endif(download_jsc EQUAL 0)
+        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")
 
-# Cambozola is now packaged in zmrepo
+# Unpack jscalendar & move files into position
-# Download cambozola & move files into position
+message(STATUS "Unpacking and Installing jscalendar...")
-#file(DOWNLOAD http://www.andywilcock.com/code/cambozola/cambozola-0.931.tar.gz ${CMAKE_CURRENT_SOURCE_DIR}/cambozola-0.931.tar.gz STATUS download_camb)
+execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/misc/jscalendar.sh 
-#if(download_camb EQUAL 0)
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 
-#	message(STATUS "Cambozola successfully downloaded.  Installing...")
+                ERROR_VARIABLE unzip_jsc
-#	execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cambozola.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ERROR_VARIABLE untar_camb)
+               )
-#	message(STATUS "Status of cambozola script was: ${untar_camb}")
+if("${unzip_jsc}" STREQUAL "")
-#else(download_camb EQUAL 0)
+    message(STATUS "jscalendar successfully installed.")
-#	message(STATUS "Unable to download optional Cambozola. Skipping...")
+else("${unzip_jsc}" STREQUAL "")
-#endif(download_camb EQUAL 0)
+    message(FATAL_ERROR "\nAn error occurred 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 DESTINATION /var/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)
 
@@ -54,28 +61,26 @@ install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/imag
 install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/temp\")")
 install(CODE "execute_process(COMMAND ln -sf ../../../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/api/app/tmp\")")
 
-# Link to Cambozola, which is now packaged in zmrepo
+# Link to Cambozola
 install(CODE "execute_process(COMMAND ln -sf ../../java/cambozola.jar \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/cambozola.jar\")")
 
 # Install auxiliary files required to run zoneminder on CentOS
-install(FILES redalert.wav DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/sounds PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(FILES misc/redalert.wav DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/sounds PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-if(ZM_TARGET_DISTRO STREQUAL "el7")
+install(DIRECTORY jscalendar-1.0/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/tools/jscalendar)
-	install(FILES zoneminder.el7.conf DESTINATION /etc/httpd/conf.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+
-	install(FILES zoneminder.el7.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+install(FILES zoneminder.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
-	install(FILES zoneminder.service DESTINATION /usr/lib/systemd/system PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+
-	install(FILES ../../misc/zoneminder-tmpfiles.conf DESTINATION /etc/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+if(ZM_WEB_USER STREQUAL "nginx")
-else(ZM_TARGET_DISTRO STREQUAL "el7")
+    install(FILES zoneminder.conf DESTINATION /etc/nginx/default.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
-	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.php-fpm.conf DESTINATION /etc/php-fpm.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME zoneminder.conf)
-	install(FILES zoneminder.el6.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+else(ZM_WEB_USER STREQUAL "nginx")
+    install(FILES zoneminder.conf DESTINATION /etc/httpd/conf.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+endif(ZM_WEB_USER STREQUAL "nginx")
+
+if(ZM_TARGET_DISTRO STREQUAL "el6")
 	install(FILES zoneminder.sysvinit DESTINATION /etc/rc.d/init.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
-endif(ZM_TARGET_DISTRO STREQUAL "el7")
+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")
 
-# Install jscalendar
-if(unzip_jsc STREQUAL "")
-	install(DIRECTORY jscalendar-1.0/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/tools/jscalendar)
-endif(unzip_jsc STREQUAL "")
-
-# Install cambozola
-if(untar_camb STREQUAL "")
-	install(FILES cambozola-0.931/dist/cambozola.jar DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www)
-endif(untar_camb STREQUAL "")

distros/redhat/archive/zm-init

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

distros/redhat/archive/zoneminder-1.26.0-dbinstall.patch

@@ -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@

distros/redhat/archive/zoneminder-1.26.0-defaults.patch

@@ -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},

distros/redhat/archive/zoneminder-1.28.0-defaults.patch

@@ -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},

distros/redhat/archive/zoneminder-runlevel.patch

@@ -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.

distros/redhat/archive/zoneminder.el6.spec

@@ -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

distros/redhat/cambozola.sh

@@ -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

distros/redhat/misc/jscalendar.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-unzip -o jscalendar-1.0.zip
+unzip -o misc/jscalendar-1.0.zip
 mkdir -v jscalendar-doc
 cd jscalendar-1.0
 mv -v *html *php doc/* README ../jscalendar-doc

distros/redhat/nginx/README.Fedora

@@ -1,7 +1,10 @@
 What's New
 ==========
 
-1. The Apache ScriptAlias has been changed from "/cgi-bin/zm/zms" to 
+1. This is an *experimental* build of zoneminder which uses the 
+   nginx web server.
+
+2. The Apache ScriptAlias has been changed from "/cgi-bin/zm/zms" to 
    "/cgi-bin-zm/zms". This has been to done to avoid this bug:
    https://bugzilla.redhat.com/show_bug.cgi?id=973067
 
@@ -9,15 +12,15 @@ What's New
    and verify it is set to "/cgi-bin-zm/nph-zms". Failure to do so will result
    in a broken system. You have been warned.
 
-2. Due to the active state of the ZoneMinder project, we now recommend granting
+3. Due to the active state of the ZoneMinder project, we now recommend granting
    ALL permission to the ZoneMinder mysql account. This change must be done
    manually before ZoneMinder will run. See the installation steps below.
 
-3. This package uses the HTTPS protocol by default to access the web portal.
+4. This package uses the HTTPS protocol by default to access the web portal.
    Requests using HTTP will auto-redirect to HTTPS. See README.https for
    more information.
    
-4. This package ships with the new ZoneMinder API enabled.
+5. This package ships with the new ZoneMinder API enabled.
 
 New installs
 ============
@@ -27,7 +30,7 @@ New installs
    Mysql server, you need to ensure that the server is configured to start
    during boot and properly secured by running:
 
-	sudo yum install mariadb-server
+	sudo dnf install mariadb-server
 	sudo systemctl enable mariadb
 	sudo systemctl start  mariadb.service
 	mysql_secure_installation
@@ -77,26 +80,36 @@ New installs
    SELINUX line from "enforcing" to "disabled". This change will take
    effect after a reboot.
 
-6. Install mod_ssl or configure /etc/httpd/conf.d/zoneminder.conf to meet your
+6. This package comes preconfigured for HTTPS using the default self signed
-   needs. This package comes preconfigured for HTTPS using the default self
+   certificate on your system. We recommend you keep this configuration.
-   signed certificate on your system. The recommended way to complete this step
-   is to simply install mod_ssl:
-
-	sudo yum install mod_ssl
 
    If this does not meet your needs, then read README.https to
-   learn about alternatives. When in doubt, install mod_ssl.
+   learn about alternatives. 
 
-7. Now start the web server:
+7. Edit /etc/sysconfig/fcgiwrap and set DAEMON_PROCS to the maximum number of
+   simulatneous streams the server should support. Generally, a good minimum 
+   value for this equals the total number of cameras you expect to view at the
+   same time.
 
-	sudo systemctl enable httpd
+8. Now start the web server:
-	sudo systemctl start httpd
 
-8. Now start zoneminder:
+	sudo systemctl enable nginx
+	sudo systemctl start nginx
+
+9. Now start zoneminder:
 
 	sudo systemctl enable zoneminder
 	sudo systemctl start zoneminder
 
+10.The Fedora repos have a ZoneMinder package available, but it does not
+   support ffmpeg or libvlc, which many modern IP cameras require. Most users
+   will want to prevent the ZoneMinder package in the Fedora repos from
+   overwriting the ZoneMinder package in zmrepo, during a future dnf update. To
+   prevent that from happening you must edit /etc/yum.repos.d/fedora.repo
+   and /etc/yum.repos.d/fedora-updates.repo. Add the line "exclude=zoneminder*"
+   without the quotes under the [fedora] and [fedora-updates] blocks,
+   respectively.
+
 Upgrades
 ========
 
@@ -144,7 +157,9 @@ Upgrades
 
    sudo zmupdate.pl --user=root --pass=<mysql_root_pwd> --version=<from version>
 
-5. Now start zoneminder:
+5. Now restart nginx and php-fpm then start and zoneminder:
 
+	sudo systemctl restart nginx
+	sudo systemctl restart php-fpm
 	sudo systemctl start zoneminder
 

distros/redhat/nginx/zoneminder.conf.in

@@ -0,0 +1,49 @@
+listen       443 ssl;
+listen       [::]:443 ssl;
+
+ssl_certificate "/etc/pki/tls/certs/localhost.crt";
+ssl_certificate_key "/etc/pki/tls/private/localhost.key";
+ssl_session_cache shared:SSL:1m;
+ssl_session_timeout  10m;
+ssl_ciphers PROFILE=SYSTEM;
+ssl_prefer_server_ciphers on;
+
+# Auto-redirect HTTP requests to HTTPS
+if ($scheme != "https") {
+    rewrite ^/?(zm)(.*)$	https://$host/$1$2 permanent;
+}
+
+location /cgi-bin-zm {
+    gzip off;
+    alias "@ZM_CGIDIR@";
+
+    include /etc/nginx/fastcgi_params;
+    fastcgi_param SCRIPT_FILENAME $request_filename;
+    fastcgi_pass  unix:/run/fcgiwrap.sock;
+}
+
+location /zm {
+    gzip off;
+    alias                   "@ZM_WEBDIR@";
+    index                   index.php;
+
+    location ~ \.php$ {
+        if (!-f $request_filename) { return 404; }
+        expires             epoch;
+        include             /etc/nginx/fastcgi_params;
+        fastcgi_param       SCRIPT_FILENAME         $request_filename;
+        fastcgi_index       index.php;
+        fastcgi_pass        unix:/run/php-fpm/www.sock;
+    }
+
+    location ~ \.(jpg|jpeg|gif|png|ico)$ {
+        access_log          off;
+        expires         33d;
+    }
+
+    location /zm/api/ {
+        alias                   "@ZM_WEBDIR@";
+        rewrite ^/zm/api(.+)$ /zm/api/index.php?p=$1 last;
+    }
+}
+

distros/redhat/nginx/zoneminder.php-fpm.conf.in

@@ -0,0 +1,10 @@
+# Change the user and group of the default pool to the web server account
+[www]
+
+user = @WEB_USER@
+group = @WEB_GROUP@
+
+# Uncomment these on machines with little memory
+#pm = ondemand
+#pm.max_children = 10
+#pm.process_idle_timeout = 10s

distros/redhat/nginx/zoneminder.service.in

@@ -3,16 +3,20 @@
 
 [Unit]
 Description=ZoneMinder CCTV recording and security system
-After=network.target mariadb.service httpd.service
+After=network.target mariadb.service nginx.service php-fpm.service fcgiwrap.service
-Requires=mariadb.service httpd.service
+Requires=mariadb.service nginx.service php-fpm.service fcgiwrap.service
 
 [Service]
 User=@WEB_USER@
+Group=@WEB_GROUP@
 Type=forking
 ExecStart=@BINDIR@/zmpkg.pl start
 ExecReload=@BINDIR@/zmpkg.pl restart
 ExecStop=@BINDIR@/zmpkg.pl stop
-PIDFile="@ZM_RUNDIR@/zm.pid"
+PIDFile=@ZM_RUNDIR@/zm.pid
+Environment=TZ=/etc/localtime
+RuntimeDirectory=zoneminder
+RuntimeDirectoryMode=0755
 
 [Install]
 WantedBy=multi-user.target

distros/redhat/nginx/zoneminder.tmpfiles.in

@@ -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@
+

distros/redhat/readme/README.Fedora

@@ -0,0 +1,155 @@
+What's New
+==========
+
+1. ZoneMinder now uses a conf.d subfolder to process custom changes to
+   variables found in zm.conf. Changes to zm.conf will be overwritten
+   during an upgrade. Instead, create a file with a ".conf" extension under
+   the conf.d folder and make your changes there.
+   
+2. ZoneMinder now supports recording directly to video container! This feature
+   is new and should be treated as experimental. Refer to the documentation
+   regarding how to use this feature.
+
+3. The Apache ScriptAlias has been changed from "/cgi-bin/zm/zms" to 
+   "/cgi-bin-zm/zms". This has been to done to avoid this bug:
+   https://bugzilla.redhat.com/show_bug.cgi?id=973067
+
+   IMPORTANT: You must manually inspect the value for PATH_ZMS under Options
+   and verify it is set to "/cgi-bin-zm/nph-zms". Failure to do so will result
+   in a broken system. You have been warned.
+
+4. This package uses the HTTPS protocol by default to access the web portal.
+   Requests using HTTP will auto-redirect to HTTPS. See README.https for
+   more information.
+   
+New installs
+============
+
+1. Unless you are already using MariaDB server, you need to ensure that the
+   server is configured to start during boot and properly secured by running:
+
+	sudo dnf install mariadb-server
+	sudo systemctl enable mariadb
+	sudo systemctl start  mariadb.service
+	mysql_secure_installation
+
+2. Assuming the database is local and using the password for the root account
+   set during the previous step, you will need to create the ZoneMinder
+   database and configure a database account for ZoneMinder to use:
+
+     mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
+     mysql -uroot -p -e "grant all on zm.* to \
+                        'zmuser'@localhost identified by 'zmpass';"
+     mysqladmin -uroot -p reload
+
+   The database account credentials, zmuser/zmpass, are arbitrary. Set them to
+   anything that suits your environment.
+
+3. If you have chosen to change the zoneminder database account credentials to
+   something other than zmuser/zmpass, you must now create a config file under
+   /etc/zm/conf.d and set your credentials there. For example, create the file
+   /etc/zm/conf.d/zm-db-user.conf and add the following content to it:
+      
+      ZM_DB_USER = {username of the sql account you want to use}
+      ZM_DB_PASS = {password of the sql account you want to use}
+
+   Once the file has been saved, set proper file & ownership permissions on it:
+  
+      sudo chown root:apache *.conf
+      sudo chmod 640 *.conf     
+
+4. Edit /etc/php.ini, uncomment the date.timezone line, and add your local
+   timezone.  PHP will complain loudly if this is not set, or if it is set
+   incorrectly, and these complaints will show up in the zoneminder logging
+   system as errors.
+
+   If you are not sure of the proper timezone specification to use, look at
+   http://php.net/date.timezone
+
+5. Disable SELinux 
+
+   We currently do not have the resources to create and maintain an accurate
+   SELinux policy for ZoneMinder on Fedora. We will gladly accept pull
+   reqeusts from anyone who wishes to do the work. In the meantime, SELinux
+   will need to be disabled or put into permissive mode.
+   
+   To immediately disbale SELinux for the current seesion, issue the following
+   from the command line:
+
+     sudo setenforce 0
+
+   To permanently disable SELinux, edit /etc/selinux/config and change the
+   SELINUX line from "enforcing" to "disabled". This change will take
+   effect after a reboot.
+
+6. Install mod_ssl or configure /etc/httpd/conf.d/zoneminder.conf to meet your
+   needs. This package comes preconfigured for HTTPS using the default self
+   signed certificate on your system. The recommended way to complete this step
+   is to simply install mod_ssl:
+
+	sudo dnf install mod_ssl
+
+   If this does not meet your needs, then read README.https to
+   learn about alternatives. When in doubt, install mod_ssl.
+
+7. Now start the web server:
+
+	sudo systemctl enable httpd
+	sudo systemctl start httpd
+
+8. Now start zoneminder:
+
+	sudo systemctl enable zoneminder
+	sudo systemctl start zoneminder
+
+9. The Fedora repos have a ZoneMinder package available, but it does not
+   support ffmpeg or libvlc, which many modern IP cameras require. Most users
+   will want to prevent the ZoneMinder package in the Fedora repos from
+   overwriting the ZoneMinder package in zmrepo, during a future dnf update. To
+   prevent that from happening you must edit /etc/yum.repos.d/fedora.repo
+   and /etc/yum.repos.d/fedora-updates.repo. Add the line "exclude=zoneminder*"
+   without the quotes under the [fedora] and [fedora-updates] blocks,
+   respectively.
+
+Upgrades
+========
+
+1. Conf.d folder support has been added to ZoneMinder 1.31.0. Any custom
+   changes previously made to zm.conf must now be made in one or more custom
+   config files, created under the conf.d folder. Do this now. See 
+   /etc/zm/conf.d/README for details. Once you recreate any custom config changes
+   under the conf.d folder, they will remain in place indefinitely.
+
+2. Verify permissions of the zmuser account.
+
+   Over time, the database account permissions required for normal operation
+   have increased. Verify the zmuser database account has been granted all
+   permission to the ZoneMinder database:
+
+     mysql -uroot -p -e "show grants for zmuser@localhost;"
+
+   See step 2 of the Installation section to add missing permissions.
+   
+3. Verify the ZoneMinder Apache configuration file in the folder 
+   /etc/httpd/conf.d. You will have a file called "zoneminder.conf" and there
+   may also be a file called "zoneminder.conf.rpmnew". If the rpmnew file
+   exists, inspect it and merge anything new in that file with zoneminder.conf.
+   Verify the SSL REquirements meet your needs. Read README.https if necessary.
+
+4. Upgrade the database before starting ZoneMinder.
+
+   Most upgrades can be performed by executing the following command:
+   
+     sudo zmupdate.pl
+
+   Recent versions of ZoneMinder don't require any parameters added to the 
+   zmupdate command. However, if ZoneMinder complains, you may need to call
+   zmupdate in the following manner:
+
+   sudo zmupdate.pl --user=root --pass=<mysql_root_pwd> --version=<from version>
+
+5. Now restart the web server then start zoneminder:
+
+        sudo systemctl restart httpd
+	sudo systemctl start zoneminder
+

distros/redhat/readme/README.Redhat6

@@ -1,15 +1,38 @@
 What's New
 ==========
 
-1. Due to the active state of the ZoneMinder project, we now recommend granting
+1. ***EOL NOTICE***
-   ALL permission to the ZoneMinder mysql account. This change must be done
+   It has become increasingly difficult to maintain the ZoneMinder project such
-   manually before ZoneMinder will run. See the installation steps below.
+   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. This package uses the HTTPS protocol by default to access the web portal.
+2. ZoneMinder now uses a conf.d subfolder to process custom changes to
+   variables found in zm.conf. Changes to zm.conf will be overwritten
+   during an upgrade. Instead, create a file with a ".conf" extension under
+   th2 conf.d folder and make your changes there.
+
+3. ZoneMinder now supports recording directly to video container! This feature
+   is new and should be treated as experimental. Refer to the documentation
+   regarding how to use this feature.
+
+4. 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.
+
+5. This package uses the HTTPS protocol by default to access the web portal.
    Requests using HTTP will auto-redirect to HTTPS. See README.https for
    more information.
 
-3. The php package that ships with CentOS 6 does not support the new ZoneMinder
+6. The php package that ships with CentOS 6 does not support the new ZoneMinder
    API. If you require API functionality (such as using a mobile app) then you
    should consider an upgrade to CentOS 7 or use Fedora.
 
@@ -20,6 +43,7 @@ New installs
    the server is confired to start during boot and properly secured
    by running:
 
+     sudo yum install mysql-server
      sudo service mysqld start
      /usr/bin/mysql_secure_installation
      sudo chkconfig mysqld on
@@ -36,9 +60,18 @@ New installs
    The database account credentials, zmuser/zmpass, are arbitrary. Set them to
    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 database account credentials to
-   other than zmuser/zmpass then you must now edit /etc/zm.conf. Change
+   something other than zmuser/zmpass, you must now create a config file under
-   ZM_DB_USER and ZM_DB_PASS to the values you created in the previous step.
+   /etc/zm/conf.d and set your credentials there. For example, create the file
+   /etc/zm/conf.d/zm-db-user.conf and add the following content to it:
+      
+      ZM_DB_USER = {username of the sql account you want to use}
+      ZM_DB_PASS = {password of the sql account you want to use}
+
+   Once the file has been saved, set proper file & ownership permissions on it:
+  
+      sudo chown root:apache *.conf
+      sudo chmod 640 *.conf 
 
 4. Edit /etc/php.ini, uncomment the date.timezone line, and add your local
    timezone.  PHP will complain loudly if this is not set, or if it is set
@@ -87,17 +120,11 @@ New installs
 Upgrades
 ========
 
-1. Verify /etc/zm.conf.
+1. Conf.d folder support has been added to ZoneMinder 1.31.0. Any custom
-
+   changes previously made to zm.conf must now be made in one or more custom
-   If zm.conf was manually edited before running the upgrade, the installation
+   config files, created under the conf.d folder. Do this now. See 
-   may not overwrite it. In this case, it will create the file
+   /etc/zm/conf.d/README for details. Once you recreate any custom config changes
-   /etc/zm.conf.rpmnew.
+   under the conf.d folder, they will remain in place indefinitely.
-
-   For example, this will happen if you are using database account credentials
-   other than zmuser/zmpass.
-
-   Compare /etc/zm.conf to /etc/zm.conf.rpmnew. Verify that zm.conf
-   contains any new config settings that may be in zm.conf.rpmnew.
 
 2. Verify permissions of the zmuser account.
 
@@ -127,7 +154,8 @@ Upgrades
 
    sudo zmupdate.pl --user=root --pass=<mysql_root_pwd> --version=<from version>
 
-5. Now start zoneminder:
+5. Now restart the web server then start zoneminder:
 
+        sudo service httpd restart
 	sudo service zoneminder start
 

distros/redhat/readme/README.Redhat7

@@ -1,34 +1,37 @@
 What's New
 ==========
 
-1. The Apache ScriptAlias has been changed from "/cgi-bin/zm/zms" to 
+1. ZoneMinder now uses a conf.d subfolder to process custom changes to
+   variables found in zm.conf. Changes to zm.conf will be overwritten
+   during an upgrade. Instead, create a file with a ".conf" extension under
+   the conf.d folder and make your changes there.
+   
+2. ZoneMinder now supports recording directly to video container! This feature
+   is new and should be treated as experimental. Refer to the documentation
+   regarding how to use this feature.
+
+3. The Apache ScriptAlias has been changed from "/cgi-bin/zm/zms" to 
    "/cgi-bin-zm/zms". This has been to done to avoid this bug:
    https://bugzilla.redhat.com/show_bug.cgi?id=973067
 
-   IMPORTANT: You must manually verify the value of PATH_ZMS under Options.
+   IMPORTANT: You must manually inspect the value for PATH_ZMS under Options
-   Make sure it is set to "/cgi-bin-zm/nph-zms". Failure to do so will result
+   and verify it is set to "/cgi-bin-zm/nph-zms". Failure to do so will result
    in a broken system. You have been warned.
 
-2. Due to the active state of the ZoneMinder project, we now recommend granting
+4. This package uses the HTTPS protocol by default to access the web portal.
-   ALL permission to the ZoneMinder mysql account. This change must be done
-   manually before ZoneMinder will run. See the installation steps below.
-
-3. This package uses the HTTPS protocol by default to access the web portal.
    Requests using HTTP will auto-redirect to HTTPS. See README.https for
    more information.
 
-4. This package ships with the new ZoneMinder API enabled.
-
 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 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
    will need to create the ZoneMinder database and configure a database
@@ -43,13 +46,17 @@ New installs
    anything that suits your environment.
 
 3. If you have chosen to change the zoneminder database account credentials to
-   something other than zmuser/zmpass, you must now edit /etc/zm/zm.conf.
+   something other than zmuser/zmpass, you must now create a config file under
-   Change ZM_DB_USER and ZM_DB_PASS to the values you created in the previous
+   /etc/zm/conf.d and set your credentials there. For example, create the file
-   step.
+   /etc/zm/conf.d/zm-db-user.conf and add the following content to it:
       
-   This version of zoneminder no longer requires you to make a similar change 
+      ZM_DB_USER = {username of the sql account you want to use}
-   to the credentials in /usr/share/zoneminder/www/api/app/Config/database.php 
+      ZM_DB_PASS = {password of the sql account you want to use}
-   This now happens dynamically. Do *not* make any changes to this file.
+
+   Once the file has been saved, set proper file & ownership permissions on it:
+  
+      sudo chown root:apache *.conf
+      sudo chmod 640 *.conf 
 
 4. Edit /etc/php.ini, uncomment the date.timezone line, and add your local
    timezone.  PHP will complain loudly if this is not set, or if it is set
@@ -98,21 +105,11 @@ New installs
 Upgrades
 ========
 
-1. Verify /etc/zm/zm.conf.
+1. Conf.d folder support has been added to ZoneMinder 1.31.0. Any custom
-
+   changes previously made to zm.conf must now be made in one or more custom
-   If zm.conf was manually edited before running the upgrade, the installation
+   config files, created under the conf.d folder. Do this now. See 
-   may not overwrite it. In this case, it will create the file
+   /etc/zm/conf.d/README for details. Once you recreate any custom config changes
-   /etc/zm/zm.conf.rpmnew.
+   under the conf.d folder, they will remain in place indefinitely.
-
-   For example, this will happen if you are using database account credentials
-   other than zmuser/zmpass.
-
-   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.
-
-   This version of zoneminder no longer requires you to make a similar change 
-   to the credentials in /usr/share/zoneminder/www/api/app/Config/database.php 
-   This now happens dynamically. Do *not* make any changes to this file.
 
 2. Verify permissions of the zmuser account.
 
@@ -142,7 +139,9 @@ Upgrades
 
    sudo zmupdate.pl --user=root --pass=<mysql_root_pwd> --version=<from version>
 
-5. Now start zoneminder:
+5. Now restart the web server then start zoneminder:
 
+        sudo systemctl restart httpd
 	sudo systemctl start zoneminder
 
+

distros/redhat/readme/README.https

@@ -1,7 +1,7 @@
 HTTPS is now a requirement
 ==========================
 
-This package now depends on Apache's mod_ssl pacakge. This will automatically
+This package now depends on Apache's mod_ssl package. This will automatically
 be installed along with ZoneMinder. Upon installation, the mod_ssl package
 will create a default, self-signed certificate. This is the certificate that
 ZoneMinder will use out of the box. 
@@ -23,3 +23,7 @@ here are a couple of considerations you may want to take.
    directives found in /etc/httpd/conf.d/zoneminder.conf. You should also
    comment out the HTTP -> HTTPS Rewrite rule.
 
+3. Install a fully signed certificate from letsencrypt. See the Letsencrypt
+   site for more information. https://letsencrypt.org/
+   This service is totally free!
+

distros/redhat/systemd/zoneminder.conf.in

@@ -11,6 +11,9 @@ RewriteRule ^/?(zm)(.*) https://%{SERVER_NAME}/$1$2 [R,L]
 
 Alias /zm "@ZM_WEBDIR@"
 <Directory "@ZM_WEBDIR@">
+    # explicitly set index.php as the only directoryindex
+    DirectoryIndex disabled
+    DirectoryIndex index.php
     SSLRequireSSL
     Options -Indexes +MultiViews +FollowSymLinks
     AllowOverride All

distros/redhat/systemd/zoneminder.service.in

@@ -7,11 +7,15 @@ Requires=mariadb.service httpd.service
 
 [Service]
 User=@WEB_USER@
+Group=@WEB_GROUP@
 Type=forking
 ExecStart=@BINDIR@/zmpkg.pl start
 ExecReload=@BINDIR@/zmpkg.pl restart
 ExecStop=@BINDIR@/zmpkg.pl stop
-PIDFile="@ZM_RUNDIR@/zm.pid"
+PIDFile=@ZM_RUNDIR@/zm.pid
+Environment=TZ=/etc/localtime
+RuntimeDirectory=zoneminder
+RuntimeDirectoryMode=0755
 
 [Install]
 WantedBy=multi-user.target

distros/redhat/systemd/zoneminder.tmpfiles.in

@@ -1,3 +1,2 @@
-D @ZM_RUNDIR@ 0755 @WEB_USER@ @WEB_GROUP@
 D @ZM_TMPDIR@ 0755 @WEB_USER@ @WEB_GROUP@
 D @ZM_SOCKDIR@ 0755 @WEB_USER@ @WEB_GROUP@

distros/redhat/sysvinit/zoneminder.logrotate.in

@@ -3,5 +3,5 @@
 	weekly
 	notifempty
 	missingok
-	create 660 http http
+	create 660 @WEB_USER@ @WEB_GROUP@
 }

distros/redhat/zoneminder.el6.spec

@@ -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

distros/redhat/zoneminder.el7.spec

@@ -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

distros/redhat/zoneminder.spec

@@ -1,60 +1,135 @@
-%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 %{_sysconfdir}/nginx/default.d
+%else
+%global wwwconfdir %{_sysconfdir}/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}}
+
+# Fedora >= 25 needs apcu backwards compatibility module
+%if 0%{?fedora} >= 25
+%global with_apcu_bc 1
+%endif
+
+# 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
+
+%global readme_suffix %{?rhel:Redhat%{?rhel}}%{!?rhel:Fedora}
 %global _hardened_build 1
 
-### Delete the lines below to build with ffmpeg and/or x10
-%define _without_ffmpeg 1
-%define _without_x10 1
-
 Name: zoneminder
-Version: 1.30.0
+Version: 1.30.4
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
 # jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/
 # Mootools is inder the MIT license: http://mootools.net/
+# CakePHP is under the MIT license: https://github.com/cakephp/cakephp
+# Crud is under the MIT license: https://github.com/FriendsOfCake/crud
 License: GPLv2+ and LGPLv2+ and MIT
 URL: http://www.zoneminder.com/
 
-#Source: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz
+Source0: https://github.com/ZoneMinder/ZoneMinder/archive/%{version}.tar.gz#/zoneminder-%{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_systemd:BuildRequires: polkit-devel}
-BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
+%{?with_init_sysv:BuildRequires: mysql-devel}
-BuildRequires: perl(MIME::Entity) perl(MIME::Lite)
+%{?el6:BuildRequires: epel-rpm-macros}
-BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap)
+BuildRequires: cmake >= 2.8.7
-BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign)
+BuildRequires: gnutls-devel
-BuildRequires: perl(Expect) perl(Sys::Syslog)
+BuildRequires: bzip2-devel
-BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel
+BuildRequires: pcre-devel 
-%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel}
+BuildRequires: libjpeg-turbo-devel
-%{!?_without_x10:BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime)}
+BuildRequires: findutils
-# cmake needs the following installed at build time due to the way it auto-detects certain parameters
+BuildRequires: coreutils
-BuildRequires:  httpd polkit-devel
+BuildRequires: perl
-%{!?_without_ffmpeg:BuildRequires: ffmpeg}
+BuildRequires: perl-generators
+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
 
-Requires: httpd php php-gd php-mysql cambozola polkit net-tools psmisc
+%{?with_nginx:Requires: nginx}
-Requires: libjpeg-turbo vlc-core libcurl
+%{?with_nginx:Requires: fcgiwrap}
+%{?with_nginx:Requires: php-fpm}
+%{!?with_nginx:Requires: httpd}
+%{!?with_nginx:Requires: php}
+Requires: php-mysqli
+Requires: php-common
+Requires: php-gd
+Requires: php-pecl-apcu
+%{?with_apcu_bc:Requires: php-pecl-apcu-bc}
+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(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)
-%{!?_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
 ZoneMinder is a set of applications which is intended to provide a complete
-solution allowing you to capture, analyse, record and monitor any cameras you
+solution allowing you to capture, analyze, record and monitor any cameras you
 have attached to a Linux based machine. It is designed to run on kernels which
 support the Video For Linux (V4L) interface and has been tested with cameras
 attached to BTTV cards, various USB cameras and IP network cameras. It is
@@ -62,13 +137,15 @@ designed to support as many cameras as you can attach to your computer without
 too much degradation of performance.
 
 %prep
-%setup -q -n ZoneMinder-%{version}
+%autosetup -p 1 -a 1 -n ZoneMinder-%{version}
+%{__rm} -rf ./web/api/app/Plugin/Crud
+%{__mv} -f crud-%{crud_version} ./web/api/app/Plugin/Crud
 
 # 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_UPLOAD_FTP_LOC_DIR %{_localstatedir}/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
@@ -76,30 +153,38 @@ too much degradation of performance.
 
 %build
 %cmake \
-	-DZM_TARGET_DISTRO="f23" \
+        -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
-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
+%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
-    # Initial installation
+    %systemd_post %{name}.service
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 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 
 if [ $1 -eq 2 ] ; then
@@ -113,54 +198,119 @@ if [ $1 -eq 2 ] ; then
     # We can't run this automatically when new sql account permissions need to
     # be manually added first
     # Run zmupdate non-interactively
-    #/usr/bin/zmupdate.pl --nointeractive
+    # zmupdate.pl --nointeractive
 fi
 
+# Allow zoneminder access to local video sources, serial ports, and x10
+%{_bindir}/gpasswd -a %{zmuid_final} video >/dev/null 2>&1 || :
+%{_bindir}/gpasswd -a %{zmuid_final} dialout >/dev/null 2>&1 || :
+
 # Warn the end user to read the README file
-echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, read README.Fedora to finish the\ninstallation or upgrade!\n"
+echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, read README.%{readme_suffix} to finish the\ninstallation or upgrade!\n"
 echo -e "\nThe README file is located here: %{_docdir}/%{name}\n"
 
-%preun
+%if 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
 
+umask 077
+%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 2048 > %{sslkey} 2> /dev/null
+
+FQDN=`hostname`
+# A >59 char FQDN means "root@FQDN" exceeds 64-char max length for emailAddress
+if [ "x${FQDN}" = "x" -o ${#FQDN} -gt 59 ]; then
+   FQDN=localhost.localdomain
+fi
+
+cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \
+         -x509 -sha256 -days 365 -set_serial $RANDOM -extensions v3_req \
+         -out %{sslcert} 2>/dev/null
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+${FQDN}
+root@${FQDN}
+EOF
+%endif
+
+%preun
+%if 0%{?with_init_sysv}
+if [ $1 -eq 0 ]; then
+    /sbin/service zoneminder stop > /dev/null 2>&1 || :
+    /sbin/chkconfig --del zoneminder
+    echo -e "\nRemoving ZoneMinder SELinux policy module. Please wait.\n"
+    %{_sbindir}/semodule -r local_zoneminder.pp
+fi
+%endif
+
+%if 0%{?with_init_systemd}
+%systemd_preun %{name}.service
+%endif
+
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%if 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
 
+# 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
 # Save the current service runlevel info
 # User must manually run systemd-sysv-convert --apply zoneminder
 # to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||:
+%{_bindir}/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||:
 
 # Run these because the SysV package being removed won't do them
 /sbin/chkconfig --del zoneminder >/dev/null 2>&1 || :
 /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
-
+%endif
 
 %files
-%defattr(-,root,root,-)
+%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
+%dir %{_sysconfdir}/zm
-%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
+%dir %{_sysconfdir}/zm/conf.d
-%config(noreplace) /etc/tmpfiles.d/zoneminder.conf
+%{_sysconfdir}/zm/conf.d/README
-%config(noreplace) /etc/logrotate.d/zoneminder
+# Always overwrite zm.conf now that ZoneMinder supports conf.d folder
+%attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm/zm.conf
+%config(noreplace) %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm/conf.d/*.conf
 
+%config(noreplace) %attr(644,root,root) %{wwwconfdir}/zoneminder.conf
+%config(noreplace) %{_sysconfdir}/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
+%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
+%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
+%endif
+
+%if 0%{?with_init_sysv}
+%doc distros/redhat/misc/local_zoneminder.te
+%attr(755,root,root) %{_initrddir}/zoneminder
+%endif
 
 %{_bindir}/zma
 %{_bindir}/zmaudit.pl
 %{_bindir}/zmc
 %{_bindir}/zmcontrol.pl
 %{_bindir}/zmdc.pl
-%{_bindir}/zmf
 %{_bindir}/zmfilter.pl
 %{_bindir}/zmpkg.pl
 %{_bindir}/zmtrack.pl
@@ -172,7 +322,7 @@ fi
 %{_bindir}/zmcamtool.pl
 %{_bindir}/zmsystemctl.pl
 %{_bindir}/zmtelemetry.pl
-%{!?_without_x10:%{_bindir}/zmx10.pl}
+%{_bindir}/zmx10.pl
 %{_bindir}/zmonvif-probe.pl
 
 %{perl_vendorlib}/ZoneMinder*
@@ -181,57 +331,73 @@ fi
 %{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
+%{_libexecdir}/zoneminder/
-%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
+%{_datadir}/zoneminder/
-
-%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
 
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/events
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/images
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/sock
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/swap
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/run/zoneminder
 
 %changelog
-* Thu Mar 3 2016 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.30.0 
+* Tue May 09 2017 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.30.4-1
+- modify autosetup macro parameters
+- modify requirements for php-pecl-acpu-bc package
+- 1.30.4 release
+
+* Tue May 02 2017 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.30.3-1
+- 1.30.3 release
+
+* Thu Mar 30 2017 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.30.2-2
+- 1.30.2 release
+
+* Wed Feb 08 2017 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.30.2-1
+- Bump version for 1.30.2 release candidate 1
+
+* 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.
 
-* 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.
 
-* 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.
 
-* 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.
 
-* 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
 
-* 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. 
 
-* 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
 - 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.
 
-* 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
 - 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.
 
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13

distros/ubuntu1204/NEWS

@@ -1,10 +0,0 @@
-zoneminder (1.28.1-1) unstable; urgency=low
-
-  This version is no longer automatically initialize or upgrade database.
-  See README.Debian for details.
-
-  Changed installation paths (please correct your web server configuration):
-    /usr/share/zoneminder --> /usr/share/zoneminder/www
-    /usr/lib/cgi-bin --> /usr/lib/zoneminder/cgi-bin
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 31 Mar 2015 15:12:17 +1100

distros/ubuntu1204/changelog

@@ -1,573 +0,0 @@
-zoneminder (1.28.1+1-vivid-SNAPSHOT2015081701) vivid; urgency=medium
-
-  * include api, switch to cmake build
-
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 17 Aug 2015 10:29:23 -0400
-
-
-zoneminder (1.28.1-8) unstable; urgency=medium
-
-  * Patchworks:
-    + New upstream "980-fix-image-size.patch".
-    + New "default_cgi-path.patch" to correct default ZM_PATH_ZMS.
-  * postinst: set "root" as group owner for "/var/log/zm" to silence
-    logrotate warnings.
-  * Minor correction to README.Debian.
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 16 Aug 2015 19:19:50 +1000
-
-zoneminder (1.28.1-7) unstable; urgency=medium
-
-  * Build-Depends += "cakephp (<< 3.0.0~)";
-    Zoneminder is not compatible with latest CakePHP.
-  * Handle conffile removal from maintscript.
-  * rules: build man pages reproducibly.
-  * gbp.conf: renamed old style config section [git-dch] to [dch].
-  * README
-    + added instructions to update owner of the "/etc/zm/zm.conf"
-      (Closes: #789327).
-    + zmupdate.pl needs CREATE rights.
-    + added note about required number of "fcgiwrap" workers.
-  * New upstream patch: "zmtrigger-plus.patch".
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 20 Jul 2015 16:30:15 +1000
-
-zoneminder (1.28.1-6) unstable; urgency=low
-
-  * New "zoneminder-doc" and "zoneminder-dbg" packages.
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 19 Apr 2015 14:50:41 +1000
-
-zoneminder (1.28.1-5) unstable; urgency=low
-
-  * Move handling of "/var/run/zm" and "/tmp/zm" from .service into .tmpfile.
-    Let dh_installinit do the job. Thanks, Andrew Bauer.
-  * Use dh_apache2 to install Apache conf file; remove old conf and symlink.
-  * Promote "libapache2-mod-php5 | php5-fpm" to Recommends.
-  * Build-Depends:
-    + dh-linktree
-    + cakephp (>= 2.6.3)
-    + libjs-jquery
-    + libjs-mootools
-  * Depends:
-    - libjs-jquery
-    - libjs-mootools
-  * Build-time replace bundled CakePHP with system one using "dh-linktree".
-  * Use "dh-linktree" to handle mootools and jquery symlinks.
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 19 Apr 2015 11:45:01 +1000
-
-zoneminder (1.28.1-4) unstable; urgency=low
-
-  * New patch to fix HTML export with USE_DEEP_STORAGE (closes: #723706).
-  * New "783.patch" to describe potential data loss in ZM_USE_DEEP_STORAGE.
-  * New patch to change default date format to region-neutral ISO notation
-    with time zone.
-  * Build sphinx documentation:
-    + Install "zoneminder.1" man page.
-    + Build-Depends += "python-sphinx | python3-sphinx"
-    + Added commented "zoneminder-doc" package.
-    + Added "docs.patch" to unlink distro-specific installation docs.
-  * rules:
-    + set ZM_CONTENTDIR, ZM_SOCKDIR and ZM_TMPDIR.
-    + remove mistakengly installed Perl module templates.
-  * Updated startup scripts to create ZM_TMPDIR.
-  * Hurd improvements:
-    + New patch to add PATH_MAX definitions.
-    + Build without MMAP support on Hurd.
-    + libsys-mmap-perl [!hurd-any].
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 06 Apr 2015 18:18:55 +1000
-
-zoneminder (1.28.1-3) unstable; urgency=low
-
-  * Updated Apache2 and nginx configuration templates to support CGI.
-  * Updated README.Debian to document cgi-bin setup.
-  * Removed "/usr/share/zoneminder/www/cgi-bin" symlink.
-  * Added "apache2.patch" to correct Apache2 site configuration example.
-  * control: Suggests += "fcgiwrap".
-  * rules: added dh_systemd overrides to prevent automatic service
-    activation and start.
-  * Added note about manual service activation to README.Debian
-    (Closes: #781733).
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 02 Apr 2015 23:20:20 +1100
-
-zoneminder (1.28.1-2) unstable; urgency=low
-
-  * Removed word "Linux" from short package description.
-  * Build-Depends: do not require "libv4l-dev" on Hurd i.e. [!hurd-any].
-  * Added run-time Perl Depends:
-     + libdbd-mysql-perl
-     + libimage-info-perl
-     + libmodule-load-conditional-perl
-     + libnet-sftp-foreign-perl
-     + liburi-encode-perl
-  * Prepare for package split: added commented "libzoneminder-perl"
-    and "zoneminder-dbg" packages to "debian/control".
-  * rules: do not install worthless ".packlist" file.
-  * Updated "libv4l1-videodev.h.patch" to fix v4lv1 detection in CMake.
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 02 Apr 2015 13:25:19 +1100
-
-zoneminder (1.28.1-1) unstable; urgency=low
-
-  [ Dmitry Smirnov <onlyjob@debian.org> ]
-  * New upstream release [February 2015].
-  * Upload to unstable.
-  * Disabled automatic database upgrades: post(inst|rm) scripts no longer
-    touch database or do unexpected stuff (Closes: #779254).
-    See README.Debian for details.
-  * Updated installation paths:
-    + /usr/share/zoneminder --> /usr/share/zoneminder/www
-    + /usr/lib/cgi-bin --> /usr/lib/zoneminder/cgi-bin
-  * Added logrotate config (Closes: #544826).
-    Thanks, Alberto Reyes.
-  * Native systemd service; "--with systemd" added to dh.
-  * Build with CMake instead of autoconf; rules clean-up.
-  * Build with all hardening.
-  * Build and install "zmupdate.pl.1" man page.
-  * Added nginx/php5-fpm configuration example.
-  * Install upstream "apache.conf" example.
-  * Described setup of Zoneminer web site and database in README.Debian.
-  * Install "/etc/zm/zm.conf" with tighter permissions.
-  * Added TODO.Debian.
-  * Added "debian/clean"; "debian/gbp.conf"; bug-presubj.
-  * Remove bundled Cake tests to take ~5 MB off big-usr-share.
-  * Standards-Version: 3.9.6; compat/debhelper to version 9.
-  * Vcs links to new git repository at collab-maint.
-  * Build-Depends:
-    + dh-systemd
-    + libgcrypt11-dev --> libgcrypt-dev
-    + libcurl4-gnutls-dev
-    + libvlc-dev
-    + policykit-1 (required by "zmsystemctl.pl")
-    - dh-autoreconf, autoconf, automake
-  * Depends:
-    - apache2
-    - libapache2-mod-php5 (moved to Suggests)
-    - libpcre3 (invalid)
-    - libmodule-load-perl (obsolete; replaced with perl-modules)
-    - libarchive-tar-perl (obsolete; replaced with perl-modules)
-    - mysql-server (moved to Recommends, Closes: #759504).
-    - php5
-    + libav-tools
-    + libjs-jquery  (replaces bundled component)
-    + libjs-mootool (replaces bundled component)
-    + libjson-any-perl (Closes: #690803).
-    + perl-modules (Closes: #745819).
-  * Recommends:
-    + apache2 | httpd
-    + mysql-server | virtual-mysql-server (Closes: #732874).
-  * Suggests:
-    + libapache2-mod-php5 | php5-fpm
-    + logrotate
-  * Refreshed, renamed and re-ordered patches; added DEP-3 headers.
-  * Removed "vendor_perl" patch (applied-upstream).
-  * New patches:
-    + cmake-fix-confpath.patch
-    + cmake-gnutls.patch
-    + cmake-nossl.patch
-    + cmake.patch
-    + format-hardening.patch
-    + pod_man_fixes.patch
-    + pod_name_fixes.patch
-    + pod_zmupdate-to-pod2usage.patch
-  * Lintianisation (incomplete):
-    - extra-license-file
-    - init.d-script-missing-lsb-description
-    - init.d-script-does-not-source-init-functions
-    - privacy-breach-generic
-    - package-contains-empty-directory
-    - manpage-has-errors-from-pod2man
-    - manpage-has-bad-whatis-entry
-    - quilt-patch-missing-description
-    - no-dep5-copyright
-  * Lintian-overrides:
-    + unusual-interpreter usr/bin/zmsystemctl.pl #!/usr/bin/pkexec
-    + script-not-executable usr/share/zoneminder/www/api/*
-    + script-with-language-extension usr/bin/*.pl
-    + source-is-missing web/tools/mootools/mootools-*-yc.js
-    + source-is-missing web/skins/*/js/jquery-1.4.2.min.js
-    + source-contains-prebuilt-javascript-object
-  * Renamed files in "debian".
-  * watch: dfsg repacksuffix and dversionmangle.
-  * "debian/copyright" to Copyright-Format-1.0.
-  * Set myself as new Maintainer (Closes: #760314).
-
-  [ Vagrant Cascadian <vagrant@debian.org> ]
-  * Removed obsolete DM-Upload-Allowed flag.
-  * Update debian/watch to use tarballs from github.
-  * Add Build-Depends on libgcrypt11-dev (Closes: #745819).
-  * Use canonical alioth Vcs-Hg URL.
-  * debian/control: Add Build-Depends: libpolkit-gobject-1-dev.
-  * Removed configure flag "--enable-crashtrace=no", which is no longer
-    present upstream.
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 31 Mar 2015 15:11:13 +1100
-
-zoneminder (1.26.5-3.1) experimental; urgency=low
-
-  * Non-maintainer upload.
-  * Add libav10.patch and compile against libav10 (Closes: #739461)
-
- -- Reinhard Tartler <siretart@tauware.de>  Wed, 19 Mar 2014 00:31:22 +0000
-
-zoneminder (1.26.5-3) unstable; urgency=low
-
-
-  * Previous release still didn't build on PPC - this has been corrected.
-    (Closes: #736516)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 4 Feb 2014 02:02:10 +1000
-
-zoneminder (1.26.5-2) unstable; urgency=low
-
-  * Remove dependency on ffmpeg
-    (Closes: #721161)
-
-  * Builds again on non-x86 target architectures.
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 23 Jan 2014 01:02:10 +1000
-
-zoneminder (1.26.5-1) unstable; urgency=low
-
-  * New upstream version
-    (Closes: #694131)
-  * Change Build-Depends on libgnutls-dev to libgnutls-openssl-dev
-    (Closes: #731560)
- -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 17 Dec 2013 01:02:10 +1000
-
-zoneminder (1.25.0-4) unstable; urgency=high
-
-  * Add CVE-2013-0232 patch
-    [SECURITY] CVE-2013-0232: Shell escape commands with untrusted content.
-    Thanks to James McCoy <jamessan@debian.org> (Closes: #698910)
-    Thanks also to Salvatore Bonaccorso <carnil@debian.org>
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 12 Jun 2013 12:02:10 +1000
-
-zoneminder (1.25.0-3) unstable; urgency=low
-
-  * debian/rules: Export CFLAGS, CPPFLAGS, CXXFLAGS and LDFLAGS, to ensure
-    hardening build flags are enabled.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Tue, 28 Aug 2012 12:10:03 -0700
-
-zoneminder (1.25.0-2) unstable; urgency=low
-
-  [ Vagrant Cascadian ]
-  * Add a patch to disable checking for updated versions by default, as
-    upgrades should happen through package management.
-  * Use dpkg-buildflags in debian/rules to set default compiler flags.
-  * Ensure zoneminder is stopped before starting (Closes: #657407).
-
-  [ Peter Howard ]
-  * Fix postinst to add permission for table creation during upgrade
-    (Closes: #657407).
-
- -- Vagrant Cascadian <vagrant@debian.org>  Thu, 23 Aug 2012 12:40:34 -0700
-
-zoneminder (1.25.0-1.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Fix "ftbfs with GCC-4.7": add patch Fix-FTBFS-with-gcc-4.7 from Cyril
-    Brulebois: fix missing <unistd.h> includes.
-    (Closes: #667428)
-
- -- gregor herrmann <gregoa@debian.org>  Sun, 13 May 2012 17:02:21 +0200
-
-zoneminder (1.25.0-1) unstable; urgency=low
-
-  * Fix typo in libv4l1-videodev.h patch that caused v4l1 support to be
-    dropped.
-  * Fail to build if version in postinst doesn't match upstream version.
-  * Add Build-Depends: libavdevice-dev to fix MPEG streaming (Closes: #515558).
-  * debian/rules: Convert to using debhelper overrides.
-  * Set debian/compat to 7.
-  * Simplify debian/watch file.
-  * Refresh debian/patches/use_libjs-mootools.
-  * Refresh debian/patches/libv4l1-videodev.h.
-  * Remove dependencies on php4 and related packages.
-  * Remove build-dependencies on libmysqlclient14-dev and
-    libmysqlclient15-dev.
-  * Update Build-Depends to use libjpeg-dev instead of libjpeg62-dev
-    (Closes: #647114).
-  * Add patch to fix build by testing for C headers rather than C++ headers.
-    Thanks to Ryan Niebur. (Closes: #654230)
-  * Add a patch to fix build problems caused by API changes in libav 0.8.
-    Thanks again to Ryan Niebur. (Closes: #654230)
-
- -- Vagrant Cascadian <vagrant@debian.org>  Mon, 16 Jan 2012 11:58:05 -0800
-
-zoneminder (1.24.4-1) unstable; urgency=low
-
-  [ Peter Howard ]
-  * Initial release of 1.24.4 (Closes: #634985).
-    - Fix 32/64-bit type declarations (Closes: #614404).
-  * Update patches.
-
-  [ Vagrant Cascadian ]
-  * Add patch to fix FTBFS by using libv4l1-videodev.h from libv4l-dev.
-    Thanks to Andreas Metzler for reporting the issue.
-    (Closes: #619813).
-  * Document adding the www-data user to the video group in README.Debian.
-    (Closes: #611324)
-  * Depend on libsys-mmap-perl to enable mapped memory support.
-    (Closes: #607331)
-  * Update libjs-mootools patch to use -nc variants (Closes: #635075).
-  * Depend on javascript-common, to ensure that /javascript is available in
-    the web server.
-  * Set the upstream version in postinst at build time.
-  * Use dh-autoreconf to properly clean up autogenerated files during build.
-  * Add Vcs-HG to debian/control.
-  * Add Build-Depends: libv4l-dev, libbz2-dev, dh-autoreconf, libsys-mmap-perl.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Sun, 24 Jul 2011 16:44:30 +0200
-
-zoneminder (1.24.2-9) unstable; urgency=low
-
-  * Apply patch from Ubuntu to fix FTBFS with ffmpeg 0.6:
-    - Add -D__STDC_CONSTANT_MACROS to CPPFLAGS (closes: 614080).
-  * Update Standards-Version to 3.9.1, no changes necessary.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Sun, 20 Feb 2011 23:43:02 -0800
-
-zoneminder (1.24.2-8) unstable; urgency=medium
-
-  [ Vagrant Cascadian ]
-  * Apply patch to fix V4L2 cameras without crop support (closes: #608790).
-    Thanks to piratebab.
-  * Add preinst script which aborts if dangerous symlinks exist.
-    (closes: #608793)
-
-  [ Peter Howard ]
-  * Added to README.Debian with info about images and events directories.
-    (closes: #608793)
-
- -- Vagrant Cascadian <vagrant@debian.org>  Sat, 15 Jan 2011 19:39:26 -0800
-
-zoneminder (1.24.2-7) unstable; urgency=medium
-
-  * Do not set ownership of /var/cache/zoneminder when upgrading, which fixes a
-    regression causing upgrades to take inordinately long with large
-    installations (closes: #597040).
-
- -- Vagrant Cascadian <vagrant@debian.org>  Fri, 17 Sep 2010 11:24:41 -0700
-
-zoneminder (1.24.2-6) unstable; urgency=low
-
-  * Only remove database on purge. This requires only creating the database if
-    it doesn't already exist, and upgrading the database only if the database
-    is an older version (closes: #497107).
-
-  * Do not prompt the user on database upgrades by using the --nointeractive
-    flag when calling zmupdate.pl from postinst (closes: #595902).
-
- -- Vagrant Cascadian <vagrant@debian.org>  Fri, 10 Sep 2010 10:06:06 -0700
-
-zoneminder (1.24.2-5) unstable; urgency=low
-
-  [ Peter Howard ]
-  * Add zip dependency
-    (closes: #494261)
-  * Add debian/watch file
-    (closes: #545552)
-  * Use packaged libjs-mootools
-    (closes: #585590)
-  * Miscellaneous cleanups
-
-  [ Vagrant Cascadian ]
-  * Add vagrant@debian.org as uploader
-  * Update Standards-Version to 3.9.0, no changes necessary.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Fri, 23 Jul 2010 18:12:50 -0500
-
-zoneminder (1.24.2-4.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Fix "package removed, processes still running": apply patch to
-    debian/postinst by Vagrant Cascadian: use invoke-rc.d and run
-    mysql-related actions only when mysql is running (closes: #583648).
-
- -- gregor herrmann <gregoa@debian.org>  Thu, 01 Jul 2010 19:47:10 +0200
-
-zoneminder (1.24.2-4) unstable; urgency=high
-  * Update init.d to list mysql dependency
-    (closes: #583505)
-  * Change depenency from libmime-perl to libmime-tools-perl
-    (closes: #585589)
-  * Problems in changelog format fixed
-    (closes: #585592)
-  * Fix debian-rules-ignores-make-clean-error
-    (closes: #585593)
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 14 jun 2010 15:02:10 +1000
-
-zoneminder (1.24.2-3) unstable; urgency=high
-  * Changes symbols to build with libjpeg8
-    (closes: #565326, #568327)
-  * Note: location of all perl files should have been fixed in previous release
-    (closes: #553096)
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 26 apr 2010 15:02:10 +1000
-
-zoneminder (1.24.2-2) unstable; urgency=high
-
-  * Remove custom perl parth from zmpkg.pl, fix location of manpages.
-    (closes: #551746, #553092)
-  * Fix GCC4.4 bug
-    (closes: #531717)
-  * Fix potential bug in postinst script
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Nov 2009 15:02:10 +1000
-
-zoneminder (1.24.2-1) unstable; urgency=high
-
-  * Initial release of zoneminder 1.24.2
- -- Peter Howard <pjh@northern-ridge.com.au>  Fri, 11 Sep 2009 07:02:50 +1000
-
-zoneminder (1.24.1-1) unstable; urgency=high
-
-  * Initial release of zoneminder 1.24.1, closing CVE-2008-3882,
-    CVE-2008-3881, CVE-2008-3880
-    (closes: #497640)
-  * Change syslog dependency to rsyslog.
-    (closes: #526918)
-  * Add missing perl depenency.
-  * Restore patch to disable "check for updates" by default.
-  * Removed spurious '$' in init script.
-    (closes: #486064)
-  * Change permission of zm.conf from 0600 to 0400 for CVE-2008-6755
-    (closes: #528252)
- -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 16 May 2009 07:02:50 +1000
-
-zoneminder (1.23.3-4) unstable; urgency=high
-
-  * update to get it building with latest unstable. Thanks to waldi@debian.org
-    (closes: #517569)
- -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 16 Apr 2009 01:02:50 +1000
-
-zoneminder (1.23.3-3) unstable; urgency=high
-
-  * ffmpeg confirmed  working
-    (closes: #475145)
-  * Fix upgrade problem intrudouced in 1.23.3-1
-    (closes: #481637)
-  * Include libmime-lite-perl in dependencies
-    (closes: #486312)
- -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 18 Sep 2008 01:02:50 +1000
-
-zoneminder (1.23.3-2) unstable; urgency=high
-
-  * ffmpeg finally working?
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 13 Aug 2008 01:02:50 +1000
-
-zoneminder (1.23.3-1) unstable; urgency=high
-
-  * Initial version for 1.23.3 - security fix.
-    (closes: #479034)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 19 Mar 2008 01:02:50 +1000
-
-zoneminder (1.23.2-2) unstable; urgency=low
-
-  * Update to init.d
-    (closes: #468856)
-  * Add dependency on logging daemon
-    (closes: #471277)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 19 Mar 2008 01:02:50 +1000
-
-zoneminder (1.23.2-1) unstable; urgency=low
-
-  * Initial version for 1.23.2
-    (closes: #464152)
-  * Zoneminder 1.23.2 upstream includes fix for GCC 4.3
-    (closes: #454980)
-  * Includes ffmpeg patch by Alexander Kushnirenko <kushnir@uni-protvino.ru>
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 01 Mar 2008 16:02:50 +1000
-
-zoneminder (1.22.3-10) unstable; urgency=low
-
-  * Fix bug introduced in -9 where perl is put under /usr/local
-    (closes: #457507)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 24 Dec 2007 16:02:50 +1000
-
-zoneminder (1.22.3-9) unstable; urgency=low
-
-  * Starting zoneminder via init script now  invokes "zmfix -a"
-    (closes: #481637)
-  * Change apache2-mpm-prefork dependency to apache2
-  * Temp dir for export under /var/cache/zoneminder (but linked back to
-    /usr/share/zoneminder for now)
-  * Redo use of gnutls rather than openssl for md5 hashes
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 10 Dec 2007 16:02:50 +1000
-
-zoneminder (1.22.3-8) unstable; urgency=low
-
-  * Build now includes libpcre3
-    (closes: #437533)
-  * "Monitor Presets" patch now applied to package during build.
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 18 Aug 2007 14:35:23 +1000
-
-zoneminder (1.22.3-7) unstable; urgency=low
-
-  * Turn off debug trace and crash dump on build
-    (closes:#414857,#414891)
-  * Additional perl libraries added in dependencies
-    (closes:#416291)
-  * Change preferred PHP version from 4 to 5
- -- Peter Howard <pjh@northern-ridge.com.au>  Sun, 29 Jul 2007 15:11:13 +1000
-
-zoneminder (1.22.3-6) unstable; urgency=low
-
-  * Removed a similar bash only statement from zmpkg.pl
-    (closes:414882)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Apr 2007 11:46:56 +1000
-
-zoneminder (1.22.3-5) unstable; urgency=low
-
-  * Installs with "phone home" feature turned off by default, and permissions
-    on /etc/zm/zm.conf fixed (now the 0600 it s hould be)
-    (closes:415349)
-  * Removed "stupid bash-ism" on mysqld check in postinst file.
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Fri,  6 Apr 2007 15:50:00 +1000
-
-zoneminder (1.22.3-4) unstable; urgency=low
-
-  * Put libmysqlclient-15-dev in front of -14-dev so sbuild works
-    (closes: #414410)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 12 Mar 2007 11:38:56 +1100
-
-zoneminder (1.22.3-3) unstable; urgency=low
-
-  * Clean up of postinstall, postrm ; user "zm" definitely was a mistake
-  * Also in postinstall: check and start MySQL if it's not running.
-  * init.d script now checks if zoneminder isn't running and still returns 0
-    (which helps uninstalling)
-  * Addition of php5 dependency options as well as php4.
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 26 Feb 2007 10:40:52 +1100
-
-zoneminder (1.22.3-2) unstable; urgency=low
-
-  * Added zmuser in the mysql creation; this should fix the install problem
-    for people, but needs to be cleaned up (in -3)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Fri, 16 Feb 2007 14:16:03 +1100
-
-zoneminder (1.22.3-1) unstable; urgency=low
-
-  * Initial Version. (closes: #248393)
-  * Patched out use of openssl; uses gnutls instead for MD5 hashes.
-  * Removed MakeMaker-inserted Perl licensing (with authors permission) in
-    various scripts; replaced with GPL.
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Wed,  7 Feb 2007 14:09:01 +1100

distros/ubuntu1204/conf/apache2/zoneminder.conf

@@ -9,7 +9,7 @@ ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin"
 Alias /zm /usr/share/zoneminder/www
 <Directory /usr/share/zoneminder/www>
   php_flag register_globals off
-  Options Indexes FollowSymLinks
+  Options -Indexes +FollowSymLinks
   <IfModule mod_dir.c>
     DirectoryIndex index.php
   </IfModule>

distros/ubuntu1204/control

@@ -6,6 +6,7 @@ Uploaders: Vagrant Cascadian <vagrant@debian.org>
 Build-Depends: debhelper (>= 9), python-sphinx | python3-sphinx, apache2-dev, dh-linktree
               ,cmake
               ,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
+              ,libboost1.55-dev
               ,libbz2-dev
               ,libgcrypt-dev
               ,libcurl4-gnutls-dev
@@ -54,7 +55,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libdata-uuid-perl 
         ,mysql-client | virtual-mysql-client
         ,perl-modules
-        ,php5-mysql, php5-gd
+        ,php5-mysql, php5-gd, php5-apcu, php-apc
         ,policykit-1
         ,rsyslog | system-log-daemon
         ,zip

distros/ubuntu1204/patches/default_cgi-path.patch

@@ -1,16 +0,0 @@
-Last-Update: 2015-08-16
-Forwarded: no
-Author: Dmitry Smirnov <onlyjob@member.fsf.org>
-Description: correct path to CGI app according to default web server configuration.
-
---- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
-+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
-@@ -428,7 +428,7 @@ our @options =
-     },
-     {
-         name        => "ZM_PATH_ZMS",
--        default     => "/cgi-bin/nph-zms",
-+        default     => "/zm/cgi-bin/nph-zms",
-         description => "Web path to zms streaming server",
-         help        => qqq("
-             The ZoneMinder streaming server is required to send streamed

distros/ubuntu1204/patches/series

@@ -1,2 +0,0 @@
-default_cgi-path.patch
-use_libjs-mootools.patch

distros/ubuntu1204/patches/use_libjs-mootools.patch

@@ -1,18 +0,0 @@
-Last-Update: 2015-03-29
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/585590
-Reviewed-By: Dmitry Smirnov <onlyjob@member.fsf.org>
-Description: use mootools shipped by debian, rather than the zoneminder included mootools.
-
---- a/web/skins/classic/includes/functions.php
-+++ b/web/skins/classic/includes/functions.php
-@@ -63,9 +63,8 @@
-     }
- ?>
-   <script type="text/javascript" src="tools/mootools/mootools-core.js"></script>
-   <script type="text/javascript" src="tools/mootools/mootools-more.js"></script>
--  <script type="text/javascript" src="js/mootools.ext.js"></script>
-   <script type="text/javascript" src="js/logger.js"></script>
-   <script type="text/javascript" src="js/overlay.js"></script>
- <?php
-     if ( $skinJsPhpFile )

distros/ubuntu1204/rules

@@ -20,6 +20,7 @@ override_dh_auto_configure:
             -DCMAKE_VERBOSE_MAKEFILE=ON                \
             -DCMAKE_BUILD_TYPE=Release                 \
             -DZM_CONFIG_DIR="/etc/zm"                  \
+            -DZM_CONFIG_SUBDIR="/etc/zm/conf.d"        \
             -DZM_RUNDIR="/var/run/zm"                  \
             -DZM_SOCKDIR="/var/run/zm"                 \
             -DZM_TMPDIR="/tmp/zm"                      \
@@ -58,8 +59,10 @@ override_dh_auto_install:
 
 override_dh_fixperms:
 	dh_fixperms
-	## 637685
+	#
-	chmod -c o-r $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
+	# As requested by the Debian Webapps Policy Manual §3.2.1
+	chown root:www-data $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
+	chmod 640 $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
 
 override_dh_installinit:
 	dh_installinit --no-start

distros/ubuntu1204/source/format

@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)

distros/ubuntu1204/zoneminder.init

@@ -23,6 +23,13 @@ command="$ZM_PATH_BIN/zmpkg.pl"
 
 start() {
 	echo -n "Starting $prog: "
+        # Wait for mysqld to start. Continue if it takes too long.
+            count=0
+            while [ ! -e /var/run/mysqld/mysqld.sock ] && [ $count -lt 60 ]
+                do
+                    sleep 1
+                    count=$((count+1))
+            done
 	export TZ=:/etc/localtime
 	mkdir -p "$RUNDIR" && chown www-data:www-data "$RUNDIR"
 	mkdir -p "$TMPDIR" && chown www-data:www-data "$TMPDIR"

distros/ubuntu1204/zoneminder.logrotate

@@ -2,9 +2,11 @@
     missingok
     notifempty
     sharedscripts
+    delaycompress
+    compress
     postrotate
         /usr/bin/zmpkg.pl logrot >>/dev/null 2>&1 || :
     endscript
-    weekly
+    daily
-    rotate 3
+    rotate 7
 }

distros/ubuntu1204/zoneminder.postinst

@@ -38,6 +38,7 @@ if [ "$1" = "configure" ]; then
                 invoke-rc.d zoneminder stop || true
                 zmupdate.pl --nointeractive
                 zmupdate.pl --nointeractive -f
+                echo "Done Updating, starting ZoneMinder"
                 invoke-rc.d zoneminder start || true
             else
                 echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'

distros/ubuntu1204/zoneminder.tmpfile

@@ -1,2 +1,3 @@
 d /var/run/zm 0755 www-data www-data
 d /tmp/zm     0755 www-data www-data
+d /var/tmp/zm                   0755 www-data www-data

distros/ubuntu1504_cmake_split_packages/apache.conf

@@ -1,8 +1,19 @@
-Alias /zm /usr/share/zoneminder/www
+# Remember to enable cgi mod (i.e. "a2enmod cgi").
+ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin"
+<Directory "/usr/lib/zoneminder/cgi-bin">
+    Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+    AllowOverride All
+    Require all granted
+</Directory>
 
+Alias /zm /usr/share/zoneminder/www
 <Directory /usr/share/zoneminder/www>
-  Options Indexes FollowSymLinks
+  Options -Indexes +FollowSymLinks
   <IfModule mod_dir.c>
     DirectoryIndex index.php
   </IfModule>
 </Directory>
+
+<Directory /usr/share/zoneminder/www/api>
+    AllowOverride All
+</Directory>

distros/ubuntu1504_cmake_split_packages/rules

@@ -62,7 +62,9 @@ override_dh_auto_configure:
 		-DZM_CGIDIR=/usr/lib/cgi-bin \
 		-DZM_WEB_USER=www-data \
 		-DZM_WEB_GROUP=www-data \
-		-DCMAKE_INSTALL_SYSCONFDIR=etc/zm
+                -DZM_CONFIG_SUBDIR="/etc/zm/conf.d" \
+		-DZM_CONFIG_DIR="/etc/zm"
+
 
 override_dh_auto_test:
 	# do not run tests...

distros/ubuntu1604/changelog

@@ -429,7 +429,7 @@ zoneminder (1.24.2-4.1) unstable; urgency=low
 zoneminder (1.24.2-4) unstable; urgency=high
   * Update init.d to list mysql dependency
     (closes: #583505)
-  * Change depenency from libmime-perl to libmime-tools-perl
+  * Change dependency from libmime-perl to libmime-tools-perl
     (closes: #585589)
   * Problems in changelog format fixed
     (closes: #585592)
@@ -466,7 +466,7 @@ zoneminder (1.24.1-1) unstable; urgency=high
     (closes: #497640)
   * Change syslog dependency to rsyslog.
     (closes: #526918)
-  * Add missing perl depenency.
+  * Add missing perl dependency.
   * Restore patch to disable "check for updates" by default.
   * Removed spurious '$' in init script.
     (closes: #486064)

distros/ubuntu1604/conf/apache2/zoneminder.conf

@@ -8,7 +8,7 @@ ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin"
 
 Alias /zm /usr/share/zoneminder/www
 <Directory /usr/share/zoneminder/www>
-  Options Indexes FollowSymLinks
+  Options -Indexes +FollowSymLinks
   <IfModule mod_dir.c>
     DirectoryIndex index.php
   </IfModule>

distros/ubuntu1604/control

@@ -5,6 +5,8 @@ Maintainer: Dmitry Smirnov <onlyjob@debian.org>
 Uploaders: Vagrant Cascadian <vagrant@debian.org>
 Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apache2-dev, dh-linktree
               ,cmake
+              ,libx264-dev, libmp4v2-dev
+              ,libboost-dev
               ,libavdevice-dev (>= 6:10~)
               ,libavcodec-dev (>= 6:10~)
               ,libavformat-dev  (>= 6:10~)
@@ -14,7 +16,7 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa
               ,libgcrypt-dev
               ,libcurl4-gnutls-dev
               ,libgnutls-openssl-dev
-              ,libjpeg-dev
+              ,libjpeg8-dev | libjpeg9-dev | libjpeg62-turbo-dev
               ,libmysqlclient-dev
               ,libpcre3-dev
               ,libpolkit-gobject-1-dev
@@ -29,7 +31,7 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa
 # Unbundled (dh_linktree):
         ,libjs-jquery
         ,libjs-mootools
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://www.zoneminder.com/
 Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git
 Vcs-Git: git://anonscm.debian.org/collab-maint/zoneminder.git
@@ -38,11 +40,10 @@ Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,javascript-common
-        ,libav-tools
+        ,libmp4v2-2, libx264-142|libx264-148, libswscale-ffmpeg3|libswscale4|libswscale3
-        ,libdate-manip-perl
+        ,ffmpeg | libav-tools
+        ,libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
         ,libdbd-mysql-perl
-        ,libmime-lite-perl
-        ,libmime-tools-perl
         ,libphp-serialization-perl
         ,libmodule-load-conditional-perl
         ,libnet-sftp-foreign-perl
@@ -63,10 +64,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libdata-uuid-perl
         ,mysql-client | virtual-mysql-client
         ,perl-modules
-        ,php5-mysql | php-mysql, php5-gd | php-gd
+        ,php5-mysql | php-mysql, php5-gd | php-gd , php5-apcu | php-apcu , php-apc | php-apcu-bc
         ,policykit-1
         ,rsyslog | system-log-daemon
         ,zip
+        ,libpcre3
 Recommends: ${misc:Recommends}
            ,libapache2-mod-php5 | libapache2-mod-php | php5-fpm | php-fpm
            ,mysql-server | virtual-mysql-server

distros/ubuntu1604/patches/series

@@ -1,2 +0,0 @@
-default_cgi-path.patch
-use_libjs-mootools.patch

distros/ubuntu1604/rules

@@ -20,6 +20,7 @@ override_dh_auto_configure:
             -DCMAKE_VERBOSE_MAKEFILE=ON                \
             -DCMAKE_BUILD_TYPE=Release                 \
             -DZM_CONFIG_DIR="/etc/zm"                  \
+            -DZM_CONFIG_SUBDIR="/etc/zm/conf.d"        \
             -DZM_RUNDIR="/var/run/zm"                  \
             -DZM_SOCKDIR="/var/run/zm"                 \
             -DZM_TMPDIR="/tmp/zm"                      \
@@ -28,7 +29,7 @@ override_dh_auto_configure:
 
 override_dh_clean:
 	dh_clean $(MANPAGES1)
-	$(RM) -r docs/_build docs/installationguide
+	$(RM) -r docs/_build
 
 build-indep:
 	#$(MAKE) -C docs text
@@ -58,8 +59,10 @@ override_dh_auto_install:
 
 override_dh_fixperms:
 	dh_fixperms
-	## 637685
+	#
-	chmod -c o-r $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
+	# As requested by the Debian Webapps Policy Manual §3.2.1
+	chown root:www-data $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
+	chmod 640 $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
 
 override_dh_installinit:
 	dh_installinit --no-start

distros/ubuntu1604/source/format

@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)