Merge branch 'zma_to_thread' of github.com:Connortechnology/zoneminder into zma_to_thread

2026-03-19 14:27:05 -04:00 · 2020-10-20 16:05:35 -04:00
parent d2f852b9db a39a656373
commit 56bbd91a02
742 changed files with 78177 additions and 25125 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -3,6 +3,7 @@
 module.exports = {
  "env": {
    "browser": true,
+    "es6": true,
  },
  "extends": ["google"],
  "overrides": [{
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [connortechnology,pliablepixels] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: zoneminder # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,5 @@
+<!--
+
 **THIS FORUM IS FOR BUG REPORTS ONLY**

 Do not post feature or enhancement requests, general discussions, or support questions here.
@@ -12,35 +14,46 @@ Docker related issues should be posted here: https://github.com/ZoneMinder/zmdoc
 In order to submit a bug report, please populate the fields below this line. This is required.

 ----------------------------------------------------------------------------------------------------
-
+-->
 **Describe Your Environment**
+<!--
 - Version of ZoneMinder [release version, development version, or commit]
 - How you installed ZoneMinder [e.g. PPA, RPMFusion, from-source, etc]
 - Full name and version of OS
 - Browser name and version (if this is an issue with the web interface)
+-->

 **If the issue concerns a camera**
+<!--
 - Make and Model
- frame rate
- resolution
+- Frame rate
+- Resolution
 - ZoneMinder Source Type:
+-->

 **Describe the bug**
+<!--
 A clear and concise description of what the bug is.
-
+-->
 **To Reproduce**
+<!--
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
+-->

 **Expected behavior**
+<!--
 A clear and concise description of what you expected to happen.
+-->

 **Debug Logs**
 ```

+<!--
 <insert debug logs here, please make sure they are within the ``` quotes so they are formatted properly>
+-->

 ```
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,16 +1,17 @@
 # Configuration for probot-stale - https://github.com/probot/stale

 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
+daysUntilStale: 180

 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
+daysUntilClose: 30

 # Issues with these labels will never be considered stale
 exemptLabels:
  - "Under Review"
  - "Bounty"
  - "bug"
+  - "Feature"

 # Set to true to ignore issues in a milestone (defaults to false)
 exemptMilestones: true
--- a/.gitignore
+++ b/.gitignore
@@ -120,7 +120,7 @@ src/CMakeFiles/
 src/cmake_install.cmake
 src/libzm.a
 src/nph-zms
-src/zm_config.h
+src/zm_config_data.h
 src/zm_config_defines.h
 src/zma
 src/zmc
@@ -157,3 +157,4 @@ web/undef.log
 zm.conf
 zmconfgen.pl
 zmlinkcontent.sh
+**/.DS_Store
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: cpp
 sudo: required
-dist: trusty
+dist: bionic
 git:
  depth: 9999999
 notifications:
@@ -13,7 +13,7 @@ addons:
  ssh_known_hosts: zmrepo.zoneminder.com
  apt:
    sources:
-    - sourceline: ppa:iconnor/zoneminder
+    - sourceline: ppa:iconnor/zoneminder-master
    - key_url: http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x4D0BF748776FFB04
    packages:
    - gdebi
@@ -32,14 +32,17 @@ install:
  - update-binfmts --enable qemu-arm

 env:
-  - SMPFLAGS=-j4 OS=el DIST=7
-  - SMPFLAGS=-j4 OS=fedora DIST=28 DOCKER_REPO=knnniggett/packpack
-  - SMPFLAGS=-j4 OS=fedora DIST=29 DOCKER_REPO=knnniggett/packpack
-  - SMPFLAGS=-j4 OS=ubuntu DIST=trusty
-  - SMPFLAGS=-j4 OS=ubuntu DIST=xenial
-  - SMPFLAGS=-j4 OS=ubuntu DIST=trusty ARCH=i386
-  - SMPFLAGS=-j4 OS=ubuntu DIST=xenial ARCH=i386
-  - SMPFLAGS=-j4 OS=raspbian DIST=stretch ARCH=armhf DOCKER_REPO=knnniggett/packpack
+  - SMPFLAGS=-j4 OS=eslint DIST=eslint
+  - SMPFLAGS=-j4 OS=el DIST=7 DOCKER_REPO=knnniggett/packpack
+  - SMPFLAGS=-j4 OS=el DIST=8 DOCKER_REPO=knnniggett/packpack
+  - SMPFLAGS=-j4 OS=fedora DIST=31 DOCKER_REPO=knnniggett/packpack
+  - SMPFLAGS=-j4 OS=fedora DIST=32 DOCKER_REPO=knnniggett/packpack
+  - SMPFLAGS=-j4 OS=fedora DIST=33 DOCKER_REPO=knnniggett/packpack
+  - SMPFLAGS=-j4 OS=ubuntu DIST=xenial DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=ubuntu DIST=bionic DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=ubuntu DIST=focal DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=debian DIST=stretch DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=debian DIST=buster DOCKER_REPO=iconzm/packpack

 compiler:
 - gcc
@@ -47,12 +50,6 @@ services:
 - mysql
 - docker

-jobs:
-  include:
-    - name: eslint
-      install: npm install -g eslint@5.12.0 eslint-config-google@0.11.0 eslint-plugin-html@5.0.0 eslint-plugin-php-markup@0.2.5
-      script: eslint --ext .php,.js .
-
 script:
 - utils/packpack/startpackpack.sh

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,6 +65,8 @@ set(CMAKE_C_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")
 set(CMAKE_CXX_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")
 set(CMAKE_C_FLAGS_DEBUG "-Wall -D__STDC_CONSTANT_MACROS -g")
 set(CMAKE_CXX_FLAGS_DEBUG "-Wall -D__STDC_CONSTANT_MACROS -g")
+set(CMAKE_C_FLAGS_OPTIMISED "-Wall -D__STDC_CONSTANT_MACROS -O3")
+set(CMAKE_CXX_FLAGS_OPTIMISED "-Wall -D__STDC_CONSTANT_MACROS -O3")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 set (CMAKE_CXX_STANDARD 11)
@@ -140,9 +142,9 @@ set(ZM_TMPDIR "/var/tmp/zm" CACHE PATH
    "Location of temporary files, default: /tmp/zm")
 set(ZM_LOGDIR "/var/log/zm" CACHE PATH 
    "Location of generated log files, default: /var/log/zm")
-set(ZM_WEBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/zoneminder/www" CACHE PATH 
+set(ZM_WEBDIR "${CMAKE_INSTALL_FULL_DATADIR}/zoneminder/www" CACHE PATH 
    "Location of the web files, default: <prefix>/${CMAKE_INSTALL_DATADIR}/zoneminder/www")
-set(ZM_CGIDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin" CACHE PATH 
+set(ZM_CGIDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/zoneminder/cgi-bin" CACHE PATH 
    "Location of the cgi-bin files, default: <prefix>/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin")
 set(ZM_CACHEDIR "/var/cache/zoneminder" CACHE PATH 
    "Location of the web server cache busting files, default: /var/cache/zoneminder")
@@ -189,6 +191,8 @@ set(ZM_NO_MMAP "OFF" CACHE BOOL
    experience problems with the shared memory. default: OFF")
 set(ZM_NO_LIBVLC "OFF" CACHE BOOL 
 "Set to ON to skip libvlc checks and force building ZM without libvlc. default: OFF")
+set(ZM_NO_LIBVNC "OFF" CACHE BOOL 
+"Set to ON to skip libvnc checks and force building ZM without libvnc. default: OFF")
 set(ZM_NO_CURL "OFF" CACHE BOOL 
    "Set to ON to skip cURL checks and force building ZM without cURL. default: OFF")
 set(ZM_NO_X10 "OFF" CACHE BOOL 
@@ -321,7 +325,7 @@ if(NOT ZM_NO_CURL)
 	find_package(CURL)
 	if(CURL_FOUND)
 		set(HAVE_LIBCURL 1)
-		list(APPEND ZM_BIN_LIBS ${CURL_LIBRARIES})
+		#list(APPEND ZM_BIN_LIBS ${CURL_LIBRARIES})
 		include_directories(${CURL_INCLUDE_DIRS})
 		set(CMAKE_REQUIRED_INCLUDES ${CURL_INCLUDE_DIRS})
 		check_include_file("curl/curl.h" HAVE_CURL_CURL_H)
@@ -349,19 +353,50 @@ else(JPEG_FOUND)
            "ZoneMinder requires jpeg but it was not found on your system")
 endif(JPEG_FOUND)

+# LIBJWT
+find_package(LibJWT)
+if(LIBJWT_FOUND)
+	set(HAVE_LIBJWT 1)
+	set(optlibsfound "${optlibsfound} LIBJWT")
+	list(APPEND ZM_BIN_LIBS "${LIBJWT_LIBRARY}")
+else(LIBJWT_FOUND)
+	set(optlibsnotfound "${optlibsnotfound} LIBJWT")
+endif(LIBJWT_FOUND)
+
+# gnutls (using find_library and find_path)
+if(HAVE_LIBJWT)
+	find_library(GNUTLS_LIBRARIES gnutls)
+	if(GNUTLS_LIBRARIES)
+		set(HAVE_LIBGNUTLS 1)
+		list(APPEND ZM_BIN_LIBS "${GNUTLS_LIBRARIES}")
+		find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h)
+		if(GNUTLS_INCLUDE_DIR)
+			include_directories("${GNUTLS_INCLUDE_DIR}")
+			set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
+		endif(GNUTLS_INCLUDE_DIR)
+		mark_as_advanced(FORCE GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIR)
+		check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
+		set(optlibsfound "${optlibsfound} GnuTLS")
+	else(GNUTLS_LIBRARIES)
+		set(optlibsnotfound "${optlibsnotfound} GnuTLS")
+	endif(GNUTLS_LIBRARIES)
+endif(HAVE_LIBJWT)
+
 # OpenSSL
-find_package(OpenSSL)
-if(OPENSSL_FOUND)
-	set(HAVE_LIBOPENSSL 1)
-	set(HAVE_LIBCRYPTO 1)
-	list(APPEND ZM_BIN_LIBS "${OPENSSL_LIBRARIES}")
-	include_directories("${OPENSSL_INCLUDE_DIR}")
-	set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
-	check_include_file("openssl/md5.h" HAVE_OPENSSL_MD5_H)
-	set(optlibsfound "${optlibsfound} OpenSSL")
-else(OPENSSL_FOUND)
-	set(optlibsnotfound "${optlibsnotfound} OpenSSL")
-endif(OPENSSL_FOUND)
+if(NOT HAVE_LIBGNUTLS OR NOT HAVE_LIBJWT)
+    find_package(OpenSSL)
+    if(OPENSSL_FOUND)
+        set(HAVE_LIBOPENSSL 1)
+        set(HAVE_LIBCRYPTO 1)
+        list(APPEND ZM_BIN_LIBS "${OPENSSL_LIBRARIES}")
+        include_directories("${OPENSSL_INCLUDE_DIR}")
+        set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
+        check_include_file("openssl/md5.h" HAVE_OPENSSL_MD5_H)
+        set(optlibsfound "${optlibsfound} OpenSSL")
+    else(OPENSSL_FOUND)
+        set(optlibsnotfound "${optlibsnotfound} OpenSSL")
+    endif(OPENSSL_FOUND)
+endif(NOT HAVE_LIBGNUTLS OR NOT HAVE_LIBJWT)

 # pthread (using find_library and find_path)
 find_library(PTHREAD_LIBRARIES pthread)
@@ -418,28 +453,6 @@ else(GCRYPT_LIBRARIES)
 	set(optlibsnotfound "${optlibsnotfound} GCrypt")
 endif(GCRYPT_LIBRARIES)

-# gnutls (using find_library and find_path)
-find_library(GNUTLS_LIBRARIES gnutls-openssl)
-if(NOT GNUTLS_LIBRARIES)
-    find_library(GNUTLS_LIBRARIES gnutls)
-endif(NOT GNUTLS_LIBRARIES)
-
-if(GNUTLS_LIBRARIES)
-	set(HAVE_LIBGNUTLS 1)
-	list(APPEND ZM_BIN_LIBS "${GNUTLS_LIBRARIES}")
-	find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h)
-	if(GNUTLS_INCLUDE_DIR)
-		include_directories("${GNUTLS_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
-	endif(GNUTLS_INCLUDE_DIR)
-	mark_as_advanced(FORCE GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIR)
-	check_include_file("gnutls/openssl.h" HAVE_GNUTLS_OPENSSL_H)
-	check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
-	set(optlibsfound "${optlibsfound} GnuTLS")
-else(GNUTLS_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} GnuTLS")
-endif(GNUTLS_LIBRARIES)
-
 # mysqlclient (using find_library and find_path)
 find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)
 if(MYSQLCLIENT_LIBRARIES)
@@ -547,6 +560,7 @@ if(AVCODEC_LIBRARIES)
 	check_include_file("libavcodec/avcodec.h" HAVE_LIBAVCODEC_AVCODEC_H)
 	set(optlibsfound "${optlibsfound} AVCodec")
 else(AVCODEC_LIBRARIES)
+  message(WARNING "\nWhile it should be possible to build ZM without AVCODEC the result will pretty useless.")
 	set(optlibsnotfound "${optlibsnotfound} AVCodec")
 endif(AVCODEC_LIBRARIES)

@@ -654,7 +668,7 @@ if(NOT ZM_NO_LIBVLC)
 	find_library(LIBVLC_LIBRARIES vlc)
 	if(LIBVLC_LIBRARIES)
 		set(HAVE_LIBVLC 1)
-		list(APPEND ZM_BIN_LIBS "${LIBVLC_LIBRARIES}")
+		#list(APPEND ZM_BIN_LIBS "${LIBVLC_LIBRARIES}")
 		find_path(LIBVLC_INCLUDE_DIR "vlc/vlc.h")
 		if(LIBVLC_INCLUDE_DIR)
 			include_directories("${LIBVLC_INCLUDE_DIR}")
@@ -668,6 +682,25 @@ if(NOT ZM_NO_LIBVLC)
 	endif(LIBVLC_LIBRARIES)
 endif(NOT ZM_NO_LIBVLC)

+if(NOT ZM_NO_LIBVNC)
+	# libvncclient (using find_library and find_path)
+	find_library(LIBVNC_LIBRARIES vncclient)
+	if(LIBVNC_LIBRARIES)
+		set(HAVE_LIBVNC 1)
+		#list(APPEND ZM_BIN_LIBS "${LIBVNC_LIBRARIES}")
+		find_path(LIBVNC_INCLUDE_DIR "rfb/rfb.h")
+		if(LIBVNC_INCLUDE_DIR)
+			include_directories("${LIBVNC_INCLUDE_DIR}")
+			set(CMAKE_REQUIRED_INCLUDES "${LIBVNC_INCLUDE_DIR}")
+		endif(LIBVNC_INCLUDE_DIR)
+		mark_as_advanced(FORCE LIBVNC_LIBRARIES LIBVNC_INCLUDE_DIR)
+		check_include_file("rfb/rfb.h" HAVE_RFB_RFB_H)
+		set(optlibsfound "${optlibsfound} libVNC")
+	else(LIBVNC_LIBRARIES)
+		set(optlibsnotfound "${optlibsnotfound} libVNC")
+	endif(LIBVNC_LIBRARIES)
+endif(NOT ZM_NO_LIBVNC)
+
 #find_package(Boost 1.36.0)
 #if(Boost_FOUND)
  #include_directories(${Boost_INCLUDE_DIRS})
@@ -733,14 +766,7 @@ if(HAVE_OPENSSL_MD5_H)
            "unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md)" "NULL" "openssl/md5.h" 
            HAVE_MD5_OPENSSL)
 endif(HAVE_OPENSSL_MD5_H)
-if(HAVE_GNUTLS_OPENSSL_H)
-	set(CMAKE_REQUIRED_LIBRARIES "${GNUTLS_LIBRARIES}")
-	set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
-	check_prototype_definition(
-            MD5 
-            "unsigned char *MD5 (const unsigned char *buf, unsigned long len, unsigned char *md)" "NULL" "gnutls/openssl.h" 
-            HAVE_MD5_GNUTLS)
-endif(HAVE_GNUTLS_OPENSSL_H)
+
 if(HAVE_GNUTLS_GNUTLS_H)
 	set(CMAKE_REQUIRED_LIBRARIES "${GNUTLS_LIBRARIES}")
 	set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
@@ -749,13 +775,17 @@ if(HAVE_GNUTLS_GNUTLS_H)
            "int gnutls_fingerprint (gnutls_digest_algorithm_t algo, const gnutls_datum_t * data, void *result, size_t * result_size)" "0" "stdlib.h;gnutls/gnutls.h" 
            HAVE_DECL_GNUTLS_FINGERPRINT)
 endif(HAVE_GNUTLS_GNUTLS_H)
-if(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
+
+if(NOT HAVE_DECL_GNUTLS_FINGERPRINT AND HAVE_MD5_OPENSSL)
 	set(HAVE_DECL_MD5 1)
-else(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
+endif(NOT HAVE_DECL_GNUTLS_FINGERPRINT AND HAVE_MD5_OPENSSL)
+
+if((NOT HAVE_MD5_OPENSSL) AND (NOT HAVE_DECL_GNUTLS_FINGERPRINT))
 	message(AUTHOR_WARNING 
-        "ZoneMinder requires a working MD5 function for hashed authenication but 
-        none were found - hashed authenication will not be available")
-endif(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
+        "ZoneMinder requires a working MD5 function for hashed authentication but 
+        none were found - hashed authentication will not be available")
+endif((NOT HAVE_MD5_OPENSSL) AND (NOT HAVE_DECL_GNUTLS_FINGERPRINT))
+
 # Dirty fix for zm_user only using openssl's md5 if gnutls and gcrypt are not available.
 # This needs to be fixed in zm_user.[h,cpp] but such fix will also require changes to configure.ac
 if(HAVE_LIBCRYPTO AND HAVE_OPENSSL_MD5_H AND HAVE_MD5_OPENSSL)
@@ -871,7 +901,6 @@ configure_file(zmlinkcontent.sh.in "${CMAKE_CURRENT_BINARY_DIR}/zmlinkcontent.sh

 # Create a target for man pages
 include(Pod2Man)
-ADD_MANPAGE_TARGET()

 # Process subdirectories

@@ -886,11 +915,7 @@ add_subdirectory(scripts)
 add_subdirectory(db)
 add_subdirectory(web)
 add_subdirectory(misc)
-
-# Enable ONVIF support
-if(ZM_ONVIF)
-	add_subdirectory(onvif)
-endif(ZM_ONVIF)
+add_subdirectory(onvif)

 # Process distro subdirectories
 if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
@@ -905,7 +930,7 @@ message(STATUS "Optional libraries not found:${optlibsnotfound}")

 # Run ZM configuration generator
 message(STATUS "Running ZoneMinder configuration generator")
-execute_process(COMMAND perl ./zmconfgen.pl RESULT_VARIABLE zmconfgen_result)
+execute_process(COMMAND perl ${CMAKE_CURRENT_BINARY_DIR}/zmconfgen.pl RESULT_VARIABLE zmconfgen_result)
 if(zmconfgen_result EQUAL 0)
 	message(STATUS 
            "ZoneMinder configuration generator completed successfully")
--- a/README.md
+++ b/README.md
@@ -1,9 +1,10 @@
 ZoneMinder
 ==========

-[![Build Status](https://travis-ci.org/ZoneMinder/zoneminder.png)](https://travis-ci.org/ZoneMinder/zoneminder) [![Bountysource](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
-
-[![Join Slack](https://github.com/ozonesecurity/ozonebase/blob/master/img/slacksm.png?raw=true)](https://join.slack.com/t/zoneminder-chat/shared_invite/enQtNTU0NDkxMDM5NDQwLTlhZDU2MGU4MmZmN2MxOTg1MmNmNmZjZGRmY2EzMThhNGQ0MWNmZTg1ZmYzNDQ4YjliMzVmYTQ3MDc5MTkzODE)
+[![Build Status](https://travis-ci.org/ZoneMinder/zoneminder.png)](https://travis-ci.org/ZoneMinder/zoneminder)
+[![Bounty Source](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
+[![Join Slack](https://github.com/ozonesecurity/ozonebase/blob/master/img/slacksm.png?raw=true)](https://join.slack.com/t/zoneminder-chat/shared_invite/enQtNTU0NDkxMDM5NDQwLTdhZmQ5Y2M2NWQyN2JkYTBiN2ZkMzIzZGQ0MDliMTRmM2FjZWRlYzUwYTQ2MjMwMTVjMzQ1NjYxOTdmMjE2MTE)
+[![IRC Network](https://img.shields.io/badge/irc-%23zoneminder-blue.svg "IRC Freenode")](https://webchat.freenode.net/?channels=zoneminder)

 All documentation for ZoneMinder is now online at https://zoneminder.readthedocs.org

@@ -21,17 +22,11 @@ https://github.com/ZoneMinder/zmdockerfiles

 ## Installation Methods

-### Building from Source is Discouraged
-
-Historically, installing ZoneMinder onto your system required building from source code by issuing the traditional configure, make, make install commands.  To get ZoneMinder to build, all of its dependencies had to be determined and installed beforehand. Init and logrotate scripts had to be manually copied into place following the build.  Optional packages such as jscalendar and Cambozola had to be manually installed. Uninstalls could leave stale files around, which could cause problems during an upgrade.  Speaking of upgrades, when it comes time to upgrade all these manual steps must be repeated again.
-
-Better methods exist today that do much of this for you. The current development team, along with other volunteers, have taken great strides in providing the resources necessary to avoid building from source.  
-
 ### Install from a Package Repository

 This is the recommended method to install ZoneMinder onto your system. ZoneMinder packages are maintained for the following distros:

- Ubuntu via [Iconnor's PPA](https://launchpad.net/~iconnor/+archive/ubuntu/zoneminder)
+- Ubuntu via [Iconnor's PPA](https://launchpad.net/~iconnor)
 - Debian from their [default repository](https://packages.debian.org/search?searchon=names&keywords=zoneminder) 
 - RHEL/CentOS and clones via [RPM Fusion](http://rpmfusion.org)
 - Fedora via [RPM Fusion](http://rpmfusion.org)
@@ -42,6 +37,13 @@ This is the recommended method to install ZoneMinder onto your system. ZoneMinde

 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.

+### Building from Source is Discouraged
+
+Historically, installing ZoneMinder onto your system required building from source code by issuing the traditional configure, make, make install commands.  To get ZoneMinder to build, all of its dependencies had to be determined and installed beforehand. Init and logrotate scripts had to be manually copied into place following the build.  Optional packages such as jscalendar and Cambozola had to be manually installed. Uninstalls could leave stale files around, which could cause problems during an upgrade.  Speaking of upgrades, when it comes time to upgrade all these manual steps must be repeated again.
+
+Better methods exist today that do much of this for you. The current development team, along with other volunteers, have taken great strides in providing the resources necessary to avoid building from source.  
+
+
 ### Building a ZoneMinder Package ###

 Building ZoneMinder into a package is not any harder than building from source.  As a matter of fact, if you have successfully built ZoneMinder from source in the past, then you may find these steps to be easier. 
@@ -68,18 +70,19 @@ Docker is a system to run applications inside isolated containers. ZoneMinder, a
 Dockerfile contained in this repository. However, there is still work needed to ensure that the main ZM features work 
 properly and are documented. 

-## Contribution Model and  Development
+## Contribution Model and Development

 * Source hosted at [GitHub](https://github.com/ZoneMinder/ZoneMinder/)
-* Report issues/questions/feature requests on [GitHub Issues](https://github.com/ZoneMinder/ZoneMinder/issues)
+* Report issues at [GitHub Issues](https://github.com/ZoneMinder/ZoneMinder/issues)
+* Questions/feature requests in [Slack](https://zoneminder-chat.slack.com/) or [forums](https://forums.zoneminder.com)

 Pull requests are very welcome!  If you would like to contribute, please follow
-the following steps.
+the following steps.  While step 3 is optional, it is preferred.

 1. Fork the repo
 2. Open an issue at our [GitHub Issues Tracker](https://github.com/ZoneMinder/ZoneMinder/issues).
-   Describe the bug that you've found, or the feature which you're asking for.
-   Jot down the issue number (e.g. 456)
+   Follow the issue template to describe the bug or security issue you found. Please note feature
+   requests or questions should be posted in our user forum or Slack channel.
 3. Create your feature branch (`git checkout -b 456-my-new-feature`)
 4. Commit your changes (`git commit -am 'Added some feature'`)
   It is preferred that you 'commit early and often' instead of bunching all
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,18 @@
+# Security Policy
+
+## Supported Versions
+
+Time and computers move on. We do not have the resources to support every ancient version of everything
+(unless you'd like to pay us to do so.)  We ONLY support the latest stable release and development releases.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 1.34.x   | :white_check_mark: |
+| 1.35.x   | :white_check_mark: |
+| < 1.34.x   | :x:                |
+
+## Reporting a Vulnerability
+
+Since sometimes security vulnerabilities can be sensitive, you can just email me at isaac@zoneminder.com.
+If it's not such a big deal, by all means, create an issue here on github
+
--- a/cmake/Modules/FindLibJWT.cmake
+++ b/cmake/Modules/FindLibJWT.cmake
@@ -0,0 +1,28 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_LIBJWT QUIET libjwt)
+
+find_path(LIBJWT_INCLUDE_DIR
+  NAMES jwt.h
+  HINTS ${PC_LIBJWT_INCLUDEDIR} ${PC_LIBJWT_INCLUDE_DIRS}
+  )
+
+find_library(LIBJWT_LIBRARY
+  NAMES jwt-gnutls libjwt-gnutls liblibjwt-gnutls
+  HINTS ${PC_LIBJWT_LIBDIR} ${PC_LIBJWT_LIBRARY_DIR}
+  )
+
+find_package_handle_standard_args(LibJWT
+  REQUIRED_VARS LIBJWT_INCLUDE_DIR LIBJWT_LIBRARY
+  )
+
+if(LIBJWT_FOUND)
+  add_library(libjwt STATIC IMPORTED GLOBAL)
+  set_target_properties(libjwt PROPERTIES
+    IMPORTED_LOCATION "${LIBJWT_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${LIBJWT_INCLUDE_DIR}"
+    )
+endif()
+
+mark_as_advanced(LIBJWT_INCLUDE_DIR LIBJWT_LIBRARY)
--- a/cmake/Modules/Pod2Man.cmake
+++ b/cmake/Modules/Pod2Man.cmake
@@ -53,8 +53,7 @@ MACRO(POD2MAN PODFILE MANFILE SECTION MANPAGE_DEST_PREFIX)

 	SET(MANPAGE_TARGET "man-${MANFILE}")

-	ADD_CUSTOM_TARGET(${MANPAGE_TARGET} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz)
-	ADD_DEPENDENCIES(man ${MANPAGE_TARGET})
+	ADD_CUSTOM_TARGET(${MANPAGE_TARGET} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz)

 	INSTALL(
 		FILES ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
--- a/conf.d/01-system-paths.conf.in
+++ b/conf.d/01-system-paths.conf.in
@@ -46,3 +46,6 @@ ZM_PATH_SWAP=@ZM_TMPDIR@
 # Full path to optional arp binary
 # ZoneMinder will find the arp binary automatically on most systems
 ZM_PATH_ARP="@ZM_PATH_ARP@"
+
+#Full path to shutdown binary
+ZM_PATH_SHUTDOWN="@ZM_PATH_SHUTDOWN@"
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -63,7 +63,7 @@ DROP TABLE IF EXISTS `Controls`;
 CREATE TABLE `Controls` (
  `Id` int(10) unsigned NOT NULL auto_increment,
  `Name` varchar(64) NOT NULL default '',
-  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local',
+  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local',
  `Protocol` varchar(64) default NULL,
  `CanWake` tinyint(3) unsigned NOT NULL default '0',
  `CanSleep` tinyint(3) unsigned NOT NULL default '0',
@@ -209,7 +209,7 @@ CREATE TABLE `Events` (
  `Executed` tinyint(3) unsigned NOT NULL default '0',
  `Notes` text,
  `StateId` int(10) unsigned NOT NULL,
-  `Orientation` enum('0','90','180','270','hori','vert') NOT NULL default '0',
+  `Orientation` enum('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0',
  `DiskSpace`   bigint unsigned default NULL,
  `Scheme`   enum('Deep','Medium','Shallow') NOT NULL default 'Medium',
  `Locked`    BOOLEAN NOT NULL DEFAULT False,
@@ -282,17 +282,23 @@ DROP TABLE IF EXISTS `Filters`;
 CREATE TABLE `Filters` (
  `Id` int(10) unsigned NOT NULL auto_increment,
  `Name` varchar(64) NOT NULL default '',
-  `Query` text NOT NULL,
+  `UserId`  int(10) unsigned,
+  `Query_json` text NOT NULL,
  `AutoArchive` tinyint(3) unsigned NOT NULL default '0',
  `AutoVideo` tinyint(3) unsigned NOT NULL default '0',
  `AutoUpload` tinyint(3) unsigned NOT NULL default '0',
  `AutoEmail` tinyint(3) unsigned NOT NULL default '0',
+	`EmailTo`				TEXT,
+	`EmailSubject`	TEXT,
+	`EmailBody`			TEXT,
  `AutoMessage` tinyint(3) unsigned NOT NULL default '0',
  `AutoExecute` tinyint(3) unsigned NOT NULL default '0',
  `AutoExecuteCmd` tinytext,
  `AutoDelete` tinyint(3) unsigned NOT NULL default '0',
  `AutoMove` tinyint(3) unsigned NOT NULL default '0',
  `AutoMoveTo`	smallint(5) unsigned NOT NULL default 0,
+  `AutoCopy` tinyint(3) unsigned NOT NULL default '0',
+  `AutoCopyTo`	smallint(5) unsigned NOT NULL default 0,
  `UpdateDiskSpace` tinyint(3) unsigned NOT NULL default '0',
  `Background` tinyint(1) unsigned NOT NULL default '0',
  `Concurrent` tinyint(1) unsigned NOT NULL default '0',
@@ -401,7 +407,7 @@ DROP TABLE IF EXISTS `MonitorPresets`;
 CREATE TABLE `MonitorPresets` (
  `Id` int(10) unsigned NOT NULL auto_increment,
  `Name` varchar(64) NOT NULL default '',
-  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local',
+  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local',
  `Device` tinytext,
  `Channel` tinyint(3) unsigned default NULL,
  `Format` int(10) unsigned default NULL,
@@ -432,13 +438,18 @@ DROP TABLE IF EXISTS `Monitors`;
 CREATE TABLE `Monitors` (
  `Id` int(10) unsigned NOT NULL auto_increment,
  `Name` varchar(64) NOT NULL default '',
+  `Notes` TEXT,
  `ServerId` int(10) unsigned,
  `StorageId`	smallint(5) unsigned default 0,
-  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local',
+  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') 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),
  `Triggers` set('X10') NOT NULL default '',
+  `ONVIF_URL` VARCHAR(255) NOT NULL DEFAULT '',
+  `ONVIF_Username` VARCHAR(64) NOT NULL DEFAULT '',
+  `ONVIF_Password` VARCHAR(64) NOT NULL DEFAULT '',
+  `ONVIF_Options` VARCHAR(64) NOT NULL DEFAULT '',
  `Device` tinytext NOT NULL default '',
  `Channel` tinyint(3) unsigned NOT NULL default '0',
  `Format` int(10) unsigned NOT NULL default '0',
@@ -457,7 +468,7 @@ CREATE TABLE `Monitors` (
  `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',
+  `Orientation` enum('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0',
  `Deinterlacing` int(10) unsigned NOT NULL default '0',
  `DecoderHWAccelName`  varchar(64),
  `DecoderHWAccelDevice`  varchar(255),
@@ -474,7 +485,7 @@ CREATE TABLE `Monitors` (
  `Hue` mediumint(7) NOT NULL default '-1',
  `Colour` mediumint(7) NOT NULL default '-1',
  `EventPrefix` varchar(32) NOT NULL default 'Event-',
-  `LabelFormat` varchar(64) 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',
@@ -728,13 +739,14 @@ CREATE TABLE `Storage` (
  `Scheme`   enum('Deep','Medium','Shallow') NOT NULL default 'Medium',
  `ServerId` int(10) unsigned,
  `DoDelete`  BOOLEAN NOT NULL DEFAULT true,
+  `Enabled`  BOOLEAN NOT NULL DEFAULT true,
 	PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;

 --
 -- Create a default storage location
 --
-insert into Storage VALUES (NULL, '@ZM_DIR_EVENTS@', 'Default', 'local', NULL, NULL, 'Medium', 0, true );
+insert into Storage VALUES (NULL, '@ZM_DIR_EVENTS@', 'Default', 'local', NULL, NULL, 'Medium', 0, true, true );

 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -757,8 +769,95 @@ insert into Users VALUES (NULL,'admin','$2b$12$NHZsm6AM2f2LQVROriz79ul3D6DnmFiZC
 -- Add a sample filter to purge the oldest 100 events when the disk is 95% full
 --

-insert into Filters values (NULL,'PurgeWhenFull','{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="}],"limit":100,"sort_asc":1}',0/*AutoArchive*/,0/*AutoVideo*/,0/*AutoUpload*/,0/*AutoEmail*/,0/*AutoMessage*/,0/*AutoExecute*/,'',1/*AutoDelete*/,0/*AutoMove*/,0/*MoveTo*/,0/*UpdateDiskSpace*/,1/*Background*/,0/*Concurrent*/);
-insert into Filters values (NULL,'Update DiskSpace','{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"}]}',0,0,0,0,0,0,'',0,0,0,1,1,0);
+INSERT INTO `Filters`
+  (
+    `Name`,
+    `Query_json`,
+    `AutoArchive`,
+    `AutoVideo`,
+    `AutoUpload`,
+    `AutoEmail`,
+    `EmailTo`,
+    `EmailSubject`,
+    `EmailBody`,
+    `AutoMessage`,
+    `AutoExecute`,
+    `AutoExecuteCmd`,
+    `AutoDelete`,
+    `AutoMove`,
+    `AutoMoveTo`,
+    `AutoCopy`,
+    `AutoCopyTo`,
+    `UpdateDiskSpace`,
+    `UserId`,
+    `Background`,
+    `Concurrent`
+  )
+  VALUES
+  (
+    'PurgeWhenFull',
+    '{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="}],"limit":100,"sort_asc":1}',
+    0/*AutoArchive*/,
+    0/*AutoVideo*/,
+    0/*AutoUpload*/,
+    0/*AutoEmail*/,
+    ''/*EmailTo*/,
+    ''/*EmailSubject*/,
+    ''/*EmailBody*/,
+    0/*AutoMessage*/,
+    0/*AutoExecute*/,'',
+    1/*AutoDelete*/,
+    0/*AutoMove*/,0/*MoveTo*/,
+    0/*AutoCopy*/,0/*CopyTo*/,
+    0/*UpdateDiskSpace*/,
+    1/*UserId = admin*/,
+    1/*Background*/,
+    0/*Concurrent*/
+  );
+INSERT INTO `Filters`
+  (
+    `Name`,
+    `Query_json`,
+    `AutoArchive`,
+    `AutoVideo`,
+    `AutoUpload`,
+    `AutoEmail`,
+    `EmailTo`,
+    `EmailSubject`,
+    `EmailBody`,
+    `AutoMessage`,
+    `AutoExecute`,
+    `AutoExecuteCmd`,
+    `AutoDelete`,
+    `AutoMove`,
+    `AutoMoveTo`,
+    `AutoCopy`,
+    `AutoCopyTo`,
+    `UpdateDiskSpace`,
+    `UserId`,
+    `Background`,
+    `Concurrent`
+  )
+VALUES (
+  'Update DiskSpace',
+  '{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"}]}',
+  0/*AutoArchive*/,
+  0/*AutoVideo*/,
+  0/*AutoUpload*/,
+  0/*AutoEmail*/,
+  ''/*EmailTo*/,
+  ''/*EmailSubject*/,
+  ''/*EmailBody*/,
+  0/*AutoMessage*/,
+  0/*AutoExecute*/,'',
+  0/*AutoDelete*/,
+  0/*AutoMove*/,0/*MoveTo*/,
+  0/*AutoCopy*/,0/*CopyTo*/,
+  1/*UpdateDiskSpace*/,
+  1/*UserId=admin*/,
+  1/*Background*/,
+  0/*Concurrent*/
+);

 --
 -- Add in some sample control protocol definitions
@@ -796,6 +895,7 @@ INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-423','Ffmpeg','Reolink',0,0,1,0
 INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-411','Ffmpeg','Reolink',0,0,1,0,1,0,0,0,1,0,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-420','Ffmpeg','Reolink',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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'D-LINK DCS-3415','Remote','DCS3415',0,0,0,0,1,0,0,0,0,0,0,0,0,0,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,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,'D-Link DCS-5020L','Remote','DCS5020L',1,1,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,0,1,24,1,0,1,1,1,0,1,0,1,0,0,1,30,0,0,0,0,0,1,0,0,1,30,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'IOS Camera','Ffmpeg','IPCAMIOS',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,1,0,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,'Dericam P2','Ffmpeg','DericamP2',0,1,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,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,45,0,0,1,0,0,0,0,1,1,45,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Trendnet','Remote','Trendnet',1,1,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,0,0,0,0,0,1,1,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
@@ -807,6 +907,9 @@ INSERT INTO `Controls` VALUES (NULL,'Amcrest HTTP API','Ffmpeg','Amcrest_HTTP',0
 --
 -- Add some monitor preset values
 --
+
+INSERT into MonitorPresets VALUES (NULL,'Amcrest, IP8M-T2499EW 640x480, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp','NULL',554,'rtsp://<username>:<password>@<ip-address>/cam/realmonitor?channel=1&subtype=1',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,'Amcrest, IP8M-T2499EW 3840x2160, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp','NULL',554,'rtsp://<username>:<password>@<ip-address>/cam/realmonitor?channel=1&subtype=0',NULL,3840,2160,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
@@ -830,6 +933,7 @@ INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, multicast','Remote','rt
 INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP','Remote','rtsp',0,255,'rtsp','rtpRtsp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP/HTTP','Remote',NULL,NULL,NULL,'rtsp','rtpRtspHttp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'D-link DCS-930L, 640x480, mjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/mjpeg.cgi',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'D-Link DCS-5020L, 640x480, mjpeg','Remote','http',0,0,'http','simple','<username>:<pwd>@<ip-address>','80','/video.cgi',NULL,640,480,0,NULL,1,'34',NULL,'<username>:<pwd>@<ip-address>',100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
--- a/db/zm_update-1.27.99.0.sql
+++ b/db/zm_update-1.27.99.0.sql
@@ -1,206 +0,0 @@
--
-- This updates a 1.27.0 database to 1.27.1
--
-
--
-- Add Controls definition for Wanscam
--
-INSERT INTO Controls 
-SELECT * FROM (SELECT NULL as Id,
-                     'WanscamPT' as Name,
-                     'Remote' as Type,
-                     'Wanscam' as Protocol,
-                     1 as CanWake,
-                     1 as CanSleep,
-                     1 as CanReset,
-                     0 as CanZoom,
-                     0 as CanAutoZoom,
-                     0 as CanZoomAbs,
-                     0 as CanZoomRel,
-                     0 as CanZoomCon,
-                     0 as MinZoomRange,
-                     0 as MaxZoomRange,
-                     0 as MinZoomStep,
-                     0 as MaxZoomStep,
-                     0 as HasZoomSpeed,
-                     0 as MinZoomSpeed,
-                     0 as MaxZoomSpeed,
-                     0 as CanFocus,
-                     0 as CanAutoFocus,
-                     0 as CanFocusAbs,
-                     0 as CanFocusRel,
-                     0 as CanFocusCon,
-                     0 as MinFocusRange,
-                     0 as MaxFocusRange,
-                     0 as MinFocusStep,
-                     0 as MaxFocusStep,
-                     0 as HasFocusSpeed,
-                     0 as MinFocusSpeed,
-                     0 as MaxFocusSpeed,
-                     1 as CanIris,
-                     0 as CanAutoIris,
-                     1 as CanIrisAbs,
-                     0 as CanIrisRel,
-                     0 as CanIrisCon,
-                     0 as MinIrisRange,
-                     16 as MaxIrisRange,
-                     0 as MinIrisStep,
-                     0 as MaxIrisStep,
-                     0 as HasIrisSpeed,
-                     0 as MinIrisSpeed,
-                     0 as MaxIrisSpeed,
-                     0 as CanGain,
-                     0 as CanAutoGain,
-                     0 as CanGainAbs,
-                     0 as CanGainRel,
-                     0 as CanGainCon,
-                     0 as MinGainRange,
-                     0 as MaxGainRange,
-                     0 as MinGainStep,
-                     0 as MaxGainStep,
-                     0 as HasGainSpeed,
-                     0 as MinGainSpeed,
-                     0 as MaxGainSpeed,
-                     1 as CanWhite,
-                     0 as CanAutoWhite,
-                     1 as CanWhiteAbs,
-                     0 as CanWhiteRel,
-                     0 as CanWhiteCon,
-                     0 as MinWhiteRange,
-                     16 as MaxWhiteRange,
-                     0 as MinWhiteStep,
-                     0 as MaxWhiteStep,
-                     0 as HasWhiteSpeed,
-                     0 as MinWhiteSpeed,
-                     0 as MaxWhiteSpeed,
-                     1 as HasPresets,
-                     16 as NumPresets,
-                     1 as HasHomePreset,
-                     1 as CanSetPresets,
-                     1 as CanMove,
-                     1 as CanMoveDiag,
-                     0 as CanMoveMap,
-                     0 as CanMoveAbs,
-                     0 as CanMoveRel,
-                     1 as CanMoveCon,
-                     1 as CanPan,
-                     0 as MinPanRange,
-                     0 as MaxPanRange,
-                     0 as MinPanStep,
-                     0 as MaxPanStep,
-                     0 as HasPanSpeed,
-                     0 as MinPanSpeed,
-                     0 as MaxPanSpeed,
-                     0 as HasTurboPan,
-                     0 as TurboPanSpeed,
-                     1 as CanTilt,
-                     0 as MinTiltRange,
-                     0 as MaxTiltRange,
-                     0 as MinTiltStep,
-                     0 as MaxTiltStep,
-                     0 as HasTiltSpeed,
-                     0 as MinTiltSpeed,
-                     0 as MaxTiltSpeed,
-                     0 as HasTurboTilt,
-                     0 as TurboTiltSpeed,
-                     0 as CanAutoScan,
-                     0 as NumScanPaths) AS tmp
-WHERE NOT EXISTS (
-    SELECT Name FROM Controls WHERE name = 'WanscamPT'
-) LIMIT 1;
-
-- Add extend alarm frame count to zone definition and Presets
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Zones'
-	AND table_schema = DATABASE()
-	AND column_name = 'ExtendAlarmFrames'
-	) > 0,
-"SELECT 'Column ExtendAlarmFrames exists in Zones'",
-"ALTER TABLE `Zones` ADD `ExtendAlarmFrames` smallint(5) unsigned not null default 0 AFTER `OverloadFrames`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'ZonePresets'
-	AND table_schema = DATABASE()
-	AND column_name = 'ExtendAlarmFrames'
-	) > 0,
-"SELECT 'Column ExtendAlarmFrames exists in ZonePresets'",
-"ALTER TABLE `ZonePresets` ADD `ExtendAlarmFrames` smallint(5) unsigned not null default 0 AFTER `OverloadFrames`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
--
-- Add MotionSkipFrame field for controlling how many frames motion detection should skip.
--
-
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Monitors'
-	AND table_schema = DATABASE()
-	AND column_name = 'MotionFrameSkip'
-	) > 0,
-"SELECT 1",
-"ALTER TABLE `Monitors` ADD `MotionFrameSkip` smallint(5) unsigned NOT NULL default '0' AFTER `FrameSkip`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
--
-- Add Monitor Options field; used for specifying Ffmpeg AVoptions like rtsp_transport http or libVLC options
--
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Monitors'
-	AND table_schema = DATABASE()
-	AND column_name = 'Options'
-	) > 0,
-"SELECT 'Column Options already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `Options` varchar(255) not null default '' AFTER `Path`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
--
-- Add V4LMultiBuffer and V4LCapturesPerFrame to Monitor
--
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Monitors'
-    AND table_schema = DATABASE()
-    AND column_name = 'V4LMultiBuffer'
-    ) > 0,
-"SELECT 'Column V4LMultiBuffer exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `V4LMultiBuffer` tinyint(1) unsigned AFTER `Format`"
-));
-
-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 = 'V4LCapturesPerFrame'
-    ) > 0,
-"SELECT 'Column V4LCapturesPerFrame exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `V4LCapturesPerFrame` tinyint(3) unsigned AFTER `V4LMultiBuffer`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.31.13.sql
+++ b/db/zm_update-1.31.13.sql
@@ -13,6 +13,8 @@ SET @s = (SELECT IF(
 PREPARE stmt FROM @s;
 EXECUTE stmt;

+UPDATE `Events` SET `SaveJPEGs`=(SELECT `SaveJPEGs` FROM `Monitors` WHERE Monitors.Id = MonitorId)  WHERE `SaveJPEGs` IS NULL;
+
 SET @s = (SELECT IF(
    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
     AND table_name = 'Storage'
--- a/db/zm_update-1.33.15.sql
+++ b/db/zm_update-1.33.15.sql
@@ -0,0 +1,19 @@
+ALTER TABLE Events MODIFY `Orientation` enum('0','90','180','270','hori','vert','ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0';
+UPDATE Events SET Orientation='ROTATE_0' WHERE Orientation='0';
+UPDATE Events SET Orientation='ROTATE_90' WHERE Orientation='90';
+UPDATE Events SET Orientation='ROTATE_180' WHERE Orientation='180';
+UPDATE Events SET Orientation='ROTATE_270' WHERE Orientation='270';
+UPDATE Events SET Orientation='FLIP_HORI' WHERE Orientation='hori';
+UPDATE Events SET Orientation='FLIP_VERT' WHERE Orientation='vert';
+
+ALTER TABLE Events MODIFY `Orientation` enum('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0';
+
+ALTER TABLE Monitors MODIFY `Orientation` enum('0','90','180','270','hori','vert','ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0';
+UPDATE Monitors SET Orientation='ROTATE_0' WHERE Orientation='0';
+UPDATE Monitors SET Orientation='ROTATE_90' WHERE Orientation='90';
+UPDATE Monitors SET Orientation='ROTATE_180' WHERE Orientation='180';
+UPDATE Monitors SET Orientation='ROTATE_270' WHERE Orientation='270';
+UPDATE Monitors SET Orientation='FLIP_HORI' WHERE Orientation='hori';
+UPDATE Monitors SET Orientation='FLIP_VERT' WHERE Orientation='vert';
+
+ALTER TABLE Monitors MODIFY `Orientation` enum('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0';
--- a/db/zm_update-1.33.16.sql
+++ b/db/zm_update-1.33.16.sql
@@ -0,0 +1,12 @@
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+      AND table_name = 'Monitors'
+      AND column_name = 'Notes'
+    ) > 0,
+    "SELECT 'Column Notes already exists in Monitors'",
+    "ALTER TABLE `Monitors` ADD `Notes` TEXT AFTER `Name`"
+    ));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
--- a/db/zm_update-1.34.0.sql
+++ b/db/zm_update-1.34.0.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.33.16 database to 1.34.0
+--
+-- No changes required
+--
--- a/db/zm_update-1.34.1.sql
+++ b/db/zm_update-1.34.1.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.34.0 database to 1.34.1
+--
+-- No changes required
+--
--- a/db/zm_update-1.34.2.sql
+++ b/db/zm_update-1.34.2.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.34.1 database to 1.34.2
+--
+-- No changes required
+--
--- a/db/zm_update-1.34.20.sql
+++ b/db/zm_update-1.34.20.sql
@@ -0,0 +1,2 @@
+/* This was done in 1.31.0 but zm_create.sql.in wasn't updated to match. */
+ALTER TABLE Monitors MODIFY LinkedMonitors varchar(255);
--- a/db/zm_update-1.34.3.sql
+++ b/db/zm_update-1.34.3.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.34.2 database to 1.34.3
+--
+-- No changes required
+--
--- a/db/zm_update-1.34.4.sql
+++ b/db/zm_update-1.34.4.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.34.3 database to 1.34.4
+--
+-- No changes required
+--
--- a/db/zm_update-1.34.5.sql
+++ b/db/zm_update-1.34.5.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.34.4 database to 1.34.5
+--
+-- No changes required
+--
--- a/db/zm_update-1.34.6.sql
+++ b/db/zm_update-1.34.6.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.34.5 database to 1.34.6
+--
+-- No changes required
+--
--- a/db/zm_update-1.34.7.sql
+++ b/db/zm_update-1.34.7.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.34.6 database to 1.34.7
+--
+-- No changes required
+--
--- a/db/zm_update-1.35.0.sql
+++ b/db/zm_update-1.35.0.sql
@@ -0,0 +1,41 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Filters'
+     AND column_name = 'EmailTo'
+    ) > 0,
+"SELECT 'Column EmailTo already exists in Filters'",
+"ALTER TABLE `Filters` ADD `EmailTo` TEXT AFTER `AutoEmail`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+UPDATE Filters SET EmailTo=(SELECT Value FROM Config WHERE Name='ZM_EMAIL_ADDRESS') WHERE AutoEmail=1;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Filters'
+     AND column_name = 'EmailSubject'
+    ) > 0,
+"SELECT 'Column EmailSubject already exists in Filters'",
+"ALTER TABLE `Filters` ADD `EmailSubject` TEXT AFTER `EmailTo`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+UPDATE Filters SET EmailSubject=(SELECT Value FROM Config WHERE Name='ZM_EMAIL_SUBJECT') WHERE AutoEmail=1;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Filters'
+     AND column_name = 'EmailBody'
+    ) > 0,
+"SELECT 'Column EmailBody already exists in Filters'",
+"ALTER TABLE `Filters` ADD `EmailBody` TEXT AFTER `EmailSubject`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+UPDATE Filters SET EmailBody=(SELECT Value FROM Config WHERE Name='ZM_EMAIL_BODY') WHERE AutoEmail=1;
--- a/db/zm_update-1.35.1.sql
+++ b/db/zm_update-1.35.1.sql
@@ -0,0 +1,12 @@
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Storage'
+     AND column_name = 'Enabled'
+    ) > 0,
+"SELECT 'Column Enabled already exists in Storage'",
+"ALTER TABLE `Storage` ADD `Enabled` BOOLEAN NOT NULL default true AFTER `DoDelete`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
--- a/db/zm_update-1.35.2.sql
+++ b/db/zm_update-1.35.2.sql
@@ -0,0 +1 @@
+ALTER TABLE Monitors MODIFY `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local';
--- a/db/zm_update-1.35.3.sql
+++ b/db/zm_update-1.35.3.sql
@@ -0,0 +1,2 @@
+SELECT 'ALTERING Frames.Id to a BIGINT.  This could take a long time.';
+ALTER TABLE Frames MODIFY Id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT;
--- a/db/zm_update-1.35.4.sql
+++ b/db/zm_update-1.35.4.sql
@@ -0,0 +1,60 @@
+--
+-- This update adds ONVIF features
+--
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'ONVIF_URL'
+	) > 0,
+"SELECT 'Column ONVIF_URL already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_URL` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`"
+));
+
+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 = 'ONVIF_Username'
+	) > 0,
+"SELECT 'Column ONVIF_Username already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_Username` VARCHAR(64) NOT NULL DEFAULT '' AFTER `ONVIF_URL`"
+));
+
+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 = 'ONVIF_Password'
+  ) > 0,
+"SELECT 'Column ONVIF_Password already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_Password` VARCHAR(64) NOT NULL DEFAULT '' AFTER `ONVIF_Username`"
+));
+
+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 = 'ONVIF_Options'
+  ) > 0,
+"SELECT 'Column ONVIF_Options already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_Options` VARCHAR(64) NOT NULL DEFAULT '' AFTER `ONVIF_Password`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
--- a/db/zm_update-1.35.5.sql
+++ b/db/zm_update-1.35.5.sql
@@ -0,0 +1,11 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Filters'
+     AND column_name = 'UserId'
+    ) > 0,
+"SELECT 'Column UserId already exists in Filters'",
+"ALTER TABLE `Filters` ADD `UserId`  int(10) unsigned AFTER `Name`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
--- a/db/zm_update-1.35.6.sql
+++ b/db/zm_update-1.35.6.sql
@@ -0,0 +1,2 @@
+/* This was done in 1.31.0 but zm_create.sql.in wasn't updated to match. */
+ALTER TABLE Monitors MODIFY LinkedMonitors varchar(255);
--- a/distros/beowulf/NEWS
+++ b/distros/beowulf/NEWS
@@ -0,0 +1,10 @@
+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
--- a/distros/ubuntu1204/README.Debian
+++ b/distros/ubuntu1204/README.Debian
@@ -8,7 +8,7 @@ Initializing database
 OR
    cat /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf

-    echo 'grant lock tables,alter,create,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";'\
+    echo 'grant lock tables,alter,create,index,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";'\
    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql

 Hint: generate secure password with `pwgen` and update "/etc/zm/zm.conf"
@@ -23,8 +23,7 @@ configuration file:
 Upgrading database
 ------------------

-Prior to 1.28.1 database upgrade was performed automatically.
-"zoneminder" service will refuse to start with outdated database.
+The database is updated automatically on installation. You should not need to take this step.

 Assuming that database is on "localhost" then the following command can be
 used to upgrade "zm" database:
@@ -45,17 +44,11 @@ The following command prints the current version of zoneminder database:
 Enabling service
 ----------------

-By default Zoneminder service is not starting automatically and need to be
-manually activated once database is configured:
-
-On systemd:
+By default Zoneminder service is not automatically started and needs to be
+manually enabled once database is configured:

    sudo systemctl enable zoneminder.service

-On SysV:
-
-    sudo update-rc.d zoneminder enable
-

 Web server set-up
 -----------------
@@ -82,10 +75,10 @@ Common configuration steps for Apache2:

 ## nginx / fcgiwrap

-Nginx needs "php5-fpm" package to support PHP and "fcgiwrap" package
+Nginx needs "php-fpm" package to support PHP and "fcgiwrap" package
 for binary "cgi-bin" applications:

-    sudo apt-get install php5-fpm fcgiwrap
+    sudo apt-get install php-fpm fcgiwrap

 To enable a URL alias that makes Zoneminder available from

@@ -119,32 +112,9 @@ site configuration.
 Changing the location for images and events
 -------------------------------------------

-Zoneminder, in its upstream form, stores data in /usr/share/zoneminder/.  This
-package modifies that by changing /usr/share/zoneminder/images and
-/usr/share/zoneminder/events to symlinks to directories under
-/var/cache/zoneminder.
-
-There are numerous places these could be put and ways to do it.  But, at the
-moment, if you change this, an upgrade will fail with a warning about these
-locations having changed (the reason for this was that previously, an  upgrade
-would silently revert the changes and cause event loss - refer
-bug #608793).
-
-If you do want to change the location, here are a couple of suggestions.
-(thanks to vagrant@freegeek.org):
-
-These lines in fstab could allow you to bind-mount an alternate location
-
-         /dev/sdX1 /otherdrive ext3 defaults 0 2
-         /otherdrive/zoneminder/images /var/cache/zoneminder/images bind defaults 0 2
-         /otherdrive/zoneminder/events /var/cache/zoneminder/events bind defaults 0 2
-
-        or if you have a separate partition for each:
-
-         /dev/sdX1 /var/cache/zoneminder/images ext3 defaults 0 2
-         /dev/sdX2 /var/cache/zoneminder/events ext3 defaults 0 2
-
- -- Peter Howard <pjh@northern-ridge.com.au>, Sun, 16 Jan 2010 01:35:51 +1100
+ZoneMinder is now able to be configured to use an alternative location for storing
+events and images at compile time. This package makes use of that, so symlinks in
+/usr/share/zoneminder/www are no longer necessary.

 Access to /dev/video*
 ---------------------
--- a/distros/ubuntu1204/TODO.Debian
+++ b/distros/ubuntu1204/TODO.Debian
--- a/distros/beowulf/changelog
+++ b/distros/beowulf/changelog
@@ -0,0 +1,3 @@
+zoneminder (1.31.39~20180223.27-stretch-1) unstable; urgency=low
+  * 
+ -- Isaac Connor <iconnor@connortechnology.com>  Fri, 23 Feb 2018 14:15:59 -0500
--- a/distros/ubuntu1204/clean
+++ b/distros/ubuntu1204/clean
--- a/distros/ubuntu1204/compat
+++ b/distros/ubuntu1204/compat
--- a/distros/ubuntu1204/conf/apache2/zoneminder.conf
+++ b/distros/ubuntu1204/conf/apache2/zoneminder.conf
@@ -6,7 +6,8 @@ ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin"
    Require all granted
 </Directory>

-# Order matters. This Alias must come first
+
+# Order matters. This alias must come first.
 Alias /zm/cache /var/cache/zoneminder/cache
 <Directory /var/cache/zoneminder/cache>
    Options -Indexes +FollowSymLinks
@@ -24,7 +25,6 @@ Alias /zm/cache /var/cache/zoneminder/cache

 Alias /zm /usr/share/zoneminder/www
 <Directory /usr/share/zoneminder/www>
-  php_flag register_globals off
  Options -Indexes +FollowSymLinks
  <IfModule mod_dir.c>
    DirectoryIndex index.php
--- a/distros/ubuntu1204/control
+++ b/distros/ubuntu1204/control
@@ -1,35 +1,41 @@
 Source: zoneminder
 Section: net
 Priority: optional
-Maintainer: Dmitry Smirnov <onlyjob@debian.org>
-Uploaders: Vagrant Cascadian <vagrant@debian.org>
-Build-Depends: debhelper (>= 9), python-sphinx | python3-sphinx, apache2-dev, dh-linktree
+Maintainer: Isaac Connor <isaac@zoneminder.com>
+Uploaders: Isaac Connor <isaac@zoneminder.com>
+Build-Depends: debhelper, sphinx-doc, dh-linktree, dh-apache2
              ,cmake
              ,libx264-dev, libmp4v2-dev
-              ,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
+              ,libavdevice-dev
+              ,libavcodec-dev
+              ,libavformat-dev
+              ,libavutil-dev
+              ,libswresample-dev
+              ,libswscale-dev
+              ,ffmpeg
+              ,net-tools
              ,libbz2-dev
-              ,libgcrypt-dev
+              ,libgcrypt20-dev
              ,libcurl4-gnutls-dev
-              ,libgnutls-openssl-dev
-              ,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, 
-              ,libmysqlclient-dev
+              ,libturbojpeg0-dev
+              ,default-libmysqlclient-dev | libmysqlclient-dev | libmariadbclient-dev-compat
              ,libpcre3-dev
              ,libpolkit-gobject-1-dev
-              ,libv4l-dev (>= 0.8.3) [!hurd-any]
+              ,libv4l-dev [!hurd-any]
              ,libvlc-dev
              ,libdate-manip-perl
              ,libdbd-mysql-perl
              ,libphp-serialization-perl
              ,libsys-mmap-perl [!hurd-any]
              ,libwww-perl
-              ,libdata-uuid-perl 
+              ,libdata-uuid-perl
              ,libssl-dev
              ,libcrypt-eksblowfish-perl
              ,libdata-entropy-perl
 # Unbundled (dh_linktree):
        ,libjs-jquery
        ,libjs-mootools
-Standards-Version: 3.9.4
+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,16 +44,15 @@ Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
        ,javascript-common
-        ,libmp4v2-2, libx264-142
-        ,libav-tools|ffmpeg
-        ,libdate-manip-perl
+        ,libmp4v2-2, libx264-155
+        ,libswscale5
+        ,libswresample3
+        ,ffmpeg
+        ,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
-#       ,libzoneminder-perl (= ${source:Version})
        ,libarchive-zip-perl
        ,libdbd-mysql-perl
        ,libdevice-serialport-perl
@@ -55,26 +60,31 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
        ,libjson-maybexs-perl
        ,libsys-mmap-perl [!hurd-any]
        ,liburi-encode-perl
-        ,libwww-perl
-        ,libdata-uuid-perl 
+        ,libwww-perl, liburi-perl
+        ,libdata-dump-perl
+        ,libdatetime-perl
+        ,libclass-std-fast-perl
+        ,libsoap-wsdl-perl
+        ,libio-socket-multicast-perl
+        ,libdigest-sha-perl
+        ,libsys-cpu-perl, libsys-meminfo-perl
+        ,libdata-uuid-perl
        ,libnumber-bytes-human-perl
        ,libfile-slurp-perl
-        ,mysql-client | virtual-mysql-client
+        ,mysql-client | mariadb-client | virtual-mysql-client
        ,perl-modules
-        ,php5-mysql, php5-gd, php5-apcu, php-apc
+        ,php-mysql, php-gd, php-apcu, php-apc | php-apcu-bc, php-json
        ,policykit-1
        ,rsyslog | system-log-daemon
        ,zip
-        ,libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl
-        ,libio-socket-multicast-perl, libdigest-sha-perl
-        ,libsys-cpu-perl, libsys-meminfo-perl
-        ,libssl | libssl1.0.0
+        ,libpcre3
        ,libcrypt-eksblowfish-perl
        ,libdata-entropy-perl
 Recommends: ${misc:Recommends}
-           ,libapache2-mod-php5 | php5-fpm
-           ,mysql-server | virtual-mysql-server
+           ,libapache2-mod-php | php-fpm
+           ,mysql-server | mariadb-server | virtual-mysql-server
           ,zoneminder-doc (>= ${source:Version})
+           ,ffmpeg
 Suggests: fcgiwrap, logrotate
 Description: video camera security and surveillance solution
 ZoneMinder is intended for use in single or multi-camera video security
@@ -120,7 +130,7 @@ Package: zoneminder-doc
 Section: doc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}, python-sphinx-rtd-theme | python3-sphinx-rtd-theme
 Suggests: www-browser
 Description: ZoneMinder documentation
 ZoneMinder is intended for use in single or multi-camera video security
--- a/distros/ubuntu1204/copyright
+++ b/distros/ubuntu1204/copyright
--- a/distros/ubuntu1204/examples/nginx.conf
+++ b/distros/ubuntu1204/examples/nginx.conf
--- a/distros/ubuntu1204/gbp.conf
+++ b/distros/ubuntu1204/gbp.conf
--- a/distros/ubuntu1204/libzoneminder-perl.install
+++ b/distros/ubuntu1204/libzoneminder-perl.install
--- a/distros/ubuntu1204/patches/series
+++ b/distros/ubuntu1204/patches/series
--- a/distros/ubuntu1204/rules
+++ b/distros/ubuntu1204/rules
@@ -16,23 +16,23 @@ endif
            --with sphinxdoc,apache2,linktree

 override_dh_auto_configure:
-	dh_auto_configure -- $(ARGS)                          \
-            -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"                             \
-            -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"         \
-            -DZM_CACHEDIR="/var/cache/zoneminder/cache"       \
+	dh_auto_configure -- $(ARGS)                  \
+            -DCMAKE_VERBOSE_MAKEFILE=ON                \
+            -DCMAKE_BUILD_TYPE=Release                 \
+            -DZM_CONFIG_DIR="/etc/zm"                  \
+            -DZM_CONFIG_SUBDIR="/etc/zm/conf.d"        \
+            -DZM_RUNDIR="/run/zm"                  \
+            -DZM_SOCKDIR="/run/zm"                 \
+            -DZM_TMPDIR="/tmp/zm"                      \
+            -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"  \
+            -DZM_CACHEDIR="/var/cache/zoneminder/cache"  \
            -DZM_DIR_EVENTS="/var/cache/zoneminder/events"    \
-            -DZM_PATH_SHUTDOWN="/sbin/shutdown"               \
-            -DZM_PATH_ZMS="/zm/cgi-bin/nph-zms"               
+            -DZM_PATH_SHUTDOWN="/sbin/shutdown"        \
+            -DZM_PATH_ZMS="/zm/cgi-bin/nph-zms"

 override_dh_clean:
 	dh_clean $(MANPAGES1)
-	$(RM) -r docs/_build docs/installationguide
+	$(RM) -r docs/_build

 build-indep:
 	#$(MAKE) -C docs text
@@ -67,12 +67,6 @@ override_dh_fixperms:
 	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
-
-override_dh_apache2:
-	dh_apache2 --noenable
-
 override_dh_strip:
 	[ -d "$(CURDIR)/debian/zoneminder-dbg" ] \
        && dh_strip --dbg-package=zoneminder-dbg \
--- a/distros/ubuntu1204/source/format
+++ b/distros/ubuntu1204/source/format
--- a/distros/ubuntu1204/source/lintian-overrides
+++ b/distros/ubuntu1204/source/lintian-overrides
--- a/distros/ubuntu1204/zoneminder-doc.doc-base
+++ b/distros/ubuntu1204/zoneminder-doc.doc-base
--- a/distros/ubuntu1204/zoneminder-doc.install
+++ b/distros/ubuntu1204/zoneminder-doc.install
--- a/distros/ubuntu1204/zoneminder-doc.links
+++ b/distros/ubuntu1204/zoneminder-doc.links
--- a/distros/ubuntu1204/zoneminder.apache2
+++ b/distros/ubuntu1204/zoneminder.apache2
--- a/distros/ubuntu1204/zoneminder.bug-presubj
+++ b/distros/ubuntu1204/zoneminder.bug-presubj
--- a/distros/ubuntu1204/zoneminder.dirs
+++ b/distros/ubuntu1204/zoneminder.dirs
@@ -5,5 +5,5 @@ var/cache/zoneminder/images
 var/cache/zoneminder/temp
 var/cache/zoneminder/cache
 usr/share/zoneminder/db
-etc/zm
+etc/zm/
 etc/zm/conf.d
--- a/distros/ubuntu1204/zoneminder.docs
+++ b/distros/ubuntu1204/zoneminder.docs
--- a/distros/ubuntu1204/zoneminder.examples
+++ b/distros/ubuntu1204/zoneminder.examples
--- a/distros/ubuntu1204/zoneminder.init
+++ b/distros/ubuntu1204/zoneminder.init
@@ -17,19 +17,12 @@

 prog=ZoneMinder
 ZM_PATH_BIN="/usr/bin"
-RUNDIR="/var/run/zm"
+RUNDIR="/run/zm"
 TMPDIR="/tmp/zm"
 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"
--- a/distros/ubuntu1204/zoneminder.install
+++ b/distros/ubuntu1204/zoneminder.install
--- a/distros/beowulf/zoneminder.links
+++ b/distros/beowulf/zoneminder.links
@@ -0,0 +1 @@
+/var/tmp  /usr/share/zoneminder/www/api/app/tmp
--- a/distros/ubuntu1204/zoneminder.linktrees
+++ b/distros/ubuntu1204/zoneminder.linktrees
--- a/distros/ubuntu1204/zoneminder.lintian-overrides
+++ b/distros/ubuntu1204/zoneminder.lintian-overrides
--- a/distros/ubuntu1204/zoneminder.logrotate
+++ b/distros/ubuntu1204/zoneminder.logrotate
@@ -1,4 +1,4 @@
-/var/log/zm/*log {
+/var/log/zm/*.log {
    missingok
    notifempty
    sharedscripts
@@ -9,4 +9,5 @@
    endscript
    daily
    rotate 7
+    maxage 7
 }
--- a/distros/ubuntu1204/zoneminder.maintscript
+++ b/distros/ubuntu1204/zoneminder.maintscript
--- a/distros/ubuntu1204/zoneminder.manpages
+++ b/distros/ubuntu1204/zoneminder.manpages
--- a/distros/ubuntu1204/zoneminder.postinst
+++ b/distros/ubuntu1204/zoneminder.postinst
--- a/distros/ubuntu1204/zoneminder.postrm
+++ b/distros/ubuntu1204/zoneminder.postrm
--- a/distros/beowulf/zoneminder.preinst
+++ b/distros/beowulf/zoneminder.preinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+## Remove obsolete symlink which is in the way of dh_apache2:
+ol="/etc/apache2/conf-available/zoneminder.conf"
+if [ -h "${ol}" ]; then
+    [ "$(readlink ${ol})" = "/etc/zm/apache.conf" ] && rm -f "${ol}"
+fi
+
+#DEBHELPER#
--- a/distros/beowulf/zoneminder.tmpfile
+++ b/distros/beowulf/zoneminder.tmpfile
@@ -0,0 +1,4 @@
+d /run/zm                   0755 www-data www-data
+d /tmp/zm                       0755 www-data www-data
+d /var/tmp/zm                   0755 www-data www-data
+d /var/cache/zoneminder/cache   0755 www-data www-data
--- a/distros/debian/changelog
+++ b/distros/debian/changelog
@@ -40,7 +40,7 @@ zoneminder (1.27.99+1-testing-SNAPSHOT2014072901) testing; urgency=medium

 -- Isaac Connor <iconnor@connortechnology.com>  Tue, 29 Jul 2014 14:50:20 -0400

-zoneminder (1.27.0+1-testing-v4ltomonitor-1) testing; urgency=high
+zoneminder (1.27.0+1-trusty-v4ltomonitor-1) trusty; urgency=high

  * Snapshot release - 

--- a/distros/redhat/CMakeLists.txt
+++ b/distros/redhat/CMakeLists.txt
@@ -21,7 +21,7 @@ endif(ZM_TARGET_DISTRO MATCHES "^el")
 # Configure the common zoneminder files
 configure_file(common/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
 configure_file(common/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
-file(MAKE_DIRECTORY sock swap zoneminder zoneminder-upload events temp)
+file(MAKE_DIRECTORY sock swap zoneminder events temp)

 # Configure the Apache zoneminder files
 configure_file(httpd/zm-httpd.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zm-httpd.conf @ONLY)
@@ -51,7 +51,6 @@ install(DIRECTORY sock swap DESTINATION /var/lib/zoneminder DIRECTORY_PERMISSION
 install(DIRECTORY zoneminder DESTINATION /var/log DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY zoneminder DESTINATION /var/run DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY zoneminder DESTINATION /var/cache 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 temp DESTINATION /var/lib/zoneminder DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

 # Install the Apache zoneminder files
--- a/distros/redhat/common/zoneminder.service.in
+++ b/distros/redhat/common/zoneminder.service.in
@@ -5,6 +5,7 @@
 Description=ZoneMinder CCTV recording and security system
 After=network.target mariadb.service
 Requires=mariadb.service
+BindsTo=mariadb.service

 [Service]
 Type=forking
--- a/distros/redhat/readme/README
+++ b/distros/redhat/readme/README
@@ -22,14 +22,10 @@ What's New
   switching between httpd <-> nginx requires manaully changing ownership of
   all event folders and the php session folder after the change.

-4. If you have installed ZoneMinder from the FedBerry repositories, this build
-   of ZoneMinder has support for Raspberry Pi hardware acceleration when using
-   ffmpeg. Unforunately, there is a problem with the same hardware acceleration
-   when using libvlc. Consequently, libvlc support in this build of ZoneMinder
-   has been disabled until the problem is resolved. See the following bug
-   report for details: https://trac.videolan.org/vlc/ticket/18594
+4. The timezone must now be set from the ZoneMinder web console. See the
+   appropriate README, mentioned in the next step, for details.

-5. Continue on to the next README that corresponds to the chosen webserver:
+6. Continue on to the next README that corresponds to your chosen webserver:

     README.httpd - Follow these steps when using Apache
     README.nginx - Follow these steps when using Nginx
--- a/distros/redhat/readme/README.httpd
+++ b/distros/redhat/readme/README.httpd
@@ -36,20 +36,17 @@ NOTE: EL7 users should replace "dnf" with "yum" in the instructions below.
     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.
+4. Manually setting the timezone in /etc/php.ini is deprecated.

-   If you are not sure of the proper timezone specification to use, look at
-   http://php.net/date.timezone
+   Instead, navigate to Options -> System from the ZoneMinder web console.
+   Do this after completing step 10, below.
+
+   Note that timezone errors will appear in the ZoneMinder log until this
+   has been completed.

 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.
+   SELinux must be disabled or put into permissive mode. This is not optional!
   
   To immediately disbale SELinux for the current seesion, issue the following
   from the command line:
@@ -166,3 +163,11 @@ Upgrades
        sudo systemctl restart httpd
 	sudo systemctl start zoneminder

+6. Manually setting the timezone in /etc/php.ini is deprecated.
+
+   Instead, navigate to Options -> System from the ZoneMinder web console.
+   Do this now.
+
+   Note that timezone errors will appear in the ZoneMinder log until this
+   has been completed.
+
--- a/distros/redhat/readme/README.nginx
+++ b/distros/redhat/readme/README.nginx
@@ -34,13 +34,13 @@ New installs
     sudo chown root:nginx *.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.
+4. Manually setting the timezone in /etc/php.ini is deprecated.

-   If you are not sure of the proper timezone specification to use, look at
-   http://php.net/date.timezone
+   Instead, navigate to Options -> System from the ZoneMinder web console.
+   Do this after completing step 10, below.
+
+   Note that timezone errors will appear in the ZoneMinder log until this
+   has been completed.

 5. Disable SELinux 

@@ -169,3 +169,11 @@ Upgrades
 	sudo systemctl restart php-fpm
 	sudo systemctl start zoneminder

+6. Manually setting the timezone in /etc/php.ini is deprecated.
+
+   Instead, navigate to Options -> System from the ZoneMinder web console.
+   Do this now.
+
+   Note that timezone errors will appear in the ZoneMinder log until this
+   has been completed.
+
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -14,23 +14,32 @@
 # 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
+# Fedora needs apcu backwards compatibility module
+%if 0%{?fedora}
 %global with_apcu_bc 1
 %endif

+# Newer php's keep json functions in a subpackage
+%if 0%{?fedora} || 0%{?rhel} >= 8
+%global with_php_json 1
+%endif
+
 # The default for everything but el7 these days
 %global _hardened_build 1

 Name: zoneminder
-Version: 1.33.14
+Version: 1.35.6
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
-# Mootools is inder the MIT license: http://mootools.net/
+# Mootools is under the MIT license: http://mootools.net/
+# jQuery is under the MIT license: https://jquery.org/license/
 # CakePHP is under the MIT license: https://github.com/cakephp/cakephp
 # Crud is under the MIT license: https://github.com/FriendsOfCake/crud
 # CakePHP-Enum-Behavior is under the MIT license: https://github.com/asper/CakePHP-Enum-Behavior
+# Bootstrap is under the MIT license: https://getbootstrap.com/docs/4.5/about/license/
+# Bootstrap-table is under the MIT license: https://bootstrap-table.com/docs/about/license/
+# font-awesome is under CC-BY license: https://fontawesome.com/license/free
 License: GPLv2+ and LGPLv2+ and MIT
 URL: http://www.zoneminder.com/

@@ -38,6 +47,7 @@ Source0: https://github.com/ZoneMinder/ZoneMinder/archive/%{version}.tar.gz#/zon
 Source1: https://github.com/ZoneMinder/crud/archive/v%{crud_version}.tar.gz#/crud-%{crud_version}.tar.gz
 Source2: https://github.com/ZoneMinder/CakePHP-Enum-Behavior/archive/%{ceb_version}.tar.gz#/cakephp-enum-behavior-%{ceb_version}.tar.gz

+%{?rhel:BuildRequires: epel-rpm-macros}
 BuildRequires: systemd-devel
 BuildRequires: mariadb-devel
 BuildRequires: perl-podlators
@@ -105,7 +115,7 @@ Summary: Common files for ZoneMinder, not tied to a specific web server
 Requires: php-mysqli
 Requires: php-common
 Requires: php-gd
-%{?fedora:Requires: php-json}
+%{?with_php_json:Requires: php-json}
 Requires: php-pecl-apcu
 %{?with_apcu_bc:Requires: php-pecl-apcu-bc}
 Requires: cambozola
@@ -194,23 +204,24 @@ mv -f CakePHP-Enum-Behavior-%{ceb_version} ./web/api/app/Plugin/CakePHP-Enum-Beh

 # Change the following default values
 ./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
-./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
-./utils/zmeditconfigdata.sh ZM_OPT_FAST_DELETE no

 %build
+# Disable LTO due to top level asm
+# See https://fedoraproject.org/wiki/LTOByDefault
+%define _lto_cflags %{nil}
+
 %cmake3 \
        -DZM_WEB_USER="%{zmuid_final}" \
        -DZM_WEB_GROUP="%{zmgid_final}" \
        -DZM_TARGET_DISTRO="%{zmtargetdistro}" \
        .

-%make_build
+%cmake3_build

 %install
-%make_install
+%cmake3_install

 desktop-file-install					\
 	--dir %{buildroot}%{_datadir}/applications	\
@@ -352,6 +363,7 @@ EOF
 %{_bindir}/zmtelemetry.pl
 %{_bindir}/zmx10.pl
 %{_bindir}/zmonvif-probe.pl
+%{_bindir}/zmonvif-trigger.pl
 %{_bindir}/zmstats.pl
 %{_bindir}/zmrecover.pl

@@ -384,7 +396,6 @@ EOF
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/cache/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload

 %files nginx
 %config(noreplace) %attr(640,root,nginx) %{_sysconfdir}/zm/zm.conf
@@ -408,29 +419,28 @@ EOF
 %dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/temp
 %dir %attr(755,nginx,nginx) %{_localstatedir}/cache/zoneminder
 %dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
-%dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload

 %changelog
-* Sun Aug 11 2019 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.14-1
- Bump to 1.33.13 Development
+* Tue Feb 04 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.2-1
+- 1.34.2 Release

-* Sun Jul 07 2019 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.12-1
- Bump to 1.33.12 Development
+* Fri Jan 31 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.1-1
+- 1.34.1 Release

-* Sun Jun 23 2019 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.9-1
- Bump to 1.33.9 Development
+* Sat Jan 18 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.0-1
+- 1.34.0 Release

-* Tue Apr 30 2019 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.8-1
- Bump to 1.33.8 Development
+* Tue Dec 17 2019 Leigh Scott <leigh123linux@gmail.com> - 1.32.3-5
+- Mass rebuild for x264

-* Sun Apr 07 2019 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.6-1
- Bump to 1.33.6 Development
+* Wed Aug 07 2019 Leigh Scott <leigh123linux@gmail.com> - 1.32.3-4
+- Rebuild for new ffmpeg version

-* Sat Mar 30 2019 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.4-1
- Bump to 1.33.4 Development
+* Tue Mar 12 2019 Sérgio Basto <sergio@serjux.com> - 1.32.3-3
+- Mass rebuild for x264

-* Tue Dec 11 2018 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.0-1
- Bump to 1.33.0 Development
+* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1.32.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

 * Sat Dec 08 2018 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.32.3-1
 - 1.32.3 Release
--- a/distros/ubuntu1204/NEWS
+++ b/distros/ubuntu1204/NEWS
--- a/distros/ubuntu1204/changelog
+++ b/distros/ubuntu1204/changelog
@@ -1,8 +0,0 @@
-<<<<<<< HEAD
-zoneminder (1.31.0-trusty) trusty; urgency=medium
-
-  * placeholder
-
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 13 May 2016 09:45:49 -0400
-=======
->>>>>>> master
--- a/distros/ubuntu1204/watch
+++ b/distros/ubuntu1204/watch
@@ -1,7 +0,0 @@
-version=3
-
-opts=\
-repacksuffix=+dfsg,\
-dversionmangle=s{\+dfsg\d*}{},\
- https://github.com/ZoneMinder/ZoneMinder/releases \
-  .*/ZoneMinder/archive/v(.*).tar.gz
--- a/distros/ubuntu1204/zoneminder.links
+++ b/distros/ubuntu1204/zoneminder.links
@@ -1 +0,0 @@
-/tmp/zm						/usr/share/zoneminder/www/api/app/tmp
--- a/distros/ubuntu1204/zoneminder.preinst
+++ b/distros/ubuntu1204/zoneminder.preinst
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-set -e
-
-## Remove obsolete symlink which is in the way of dh_apache2:
-ol="/etc/apache2/conf-available/zoneminder.conf"
-if [ -h "${ol}" ]; then
-    [ "$(readlink ${ol})" = "/etc/zm/apache.conf" ] && rm -f "${ol}"
-fi
-
-abort=false
-if [ -h /usr/share/zoneminder/www/events ]; then
-    l=$(readlink /usr/share/zoneminder/www/events)
-    if [ "$l" != "/var/cache/zoneminder/events" ]; then
-        abort=true
-    fi
-fi
-if [ -h /usr/share/zoneminder/www/images ]; then
-    l=$(readlink /usr/share/zoneminder/www/images )
-    if [ "$l" != "/var/cache/zoneminder/images" ]; then
-        abort=true
-    fi
-fi
-
-if [ "$abort" = "true" ]; then
-    cat >&2 << EOF
-Aborting installation of zoneminder due to non-default symlinks in
-/usr/share/zoneminder for the images and/or events directory, which could
-result in loss of data. Please move your data in each of these directories to
-/var/cache/zoneminder before installing zoneminder from the package.
-EOF
-    exit 1
-
-fi
-
-#DEBHELPER#
--- a/distros/ubuntu1204/zoneminder.tmpfile
+++ b/distros/ubuntu1204/zoneminder.tmpfile
@@ -1,3 +0,0 @@
-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
--- a/distros/ubuntu1410/README.Debian
+++ b/distros/ubuntu1410/README.Debian
@@ -1,51 +0,0 @@
-zoneminder for Debian
---------------------
-
-There is one manual step to get the web interface working.
-You need to link /etc/zm/apache.conf to /etc/apache2/conf.d/zoneminder.conf,
-then reload the apache config (i.e. /etc/init.d/apache2 reload)
-
-Changing the location for images and events
-------------------------------------------
-
-Zoneminder, in its upstream form, stores data in /usr/share/zoneminder/.  This
-package modifies that by changing /usr/share/zoneminder/images and
-/usr/share/zoneminder/events to symlinks to directories under
-/var/cache/zoneminder.
-
-There are numerous places these could be put and ways to do it.  But, at the
-moment, if you change this, an upgrade will fail with a warning about these
-locations having changed (the reason for this was that previously, an  upgrade
-would silently revert the changes and cause event loss - refer
-bug #608793).
-
-If you do want to change the location, here are a couple of suggestions.
-
-These lines would mount /dev/sdX1 to /video_storage, and then 'link' /video_storage
-to the locations that ZoneMinder expects them to be at.
-
-         /dev/sdX1 /video_storage ext4 defaults 0 2
-         /video_storage/zoneminder/images /var/cache/zoneminder/images none bind 0 2
-         /video_storage/zoneminder/events /var/cache/zoneminder/events none bind 0 2
-
-        or if you have a separate partition for each:
-
-         /dev/sdX1 /var/cache/zoneminder/images ext4 defaults 0 2
-         /dev/sdX2 /var/cache/zoneminder/events ext4 defaults 0 2
-
-
-
- -- Peter Howard <pjh@northern-ridge.com.au>, Sun, 16 Jan 2010 01:35:51 +1100
-
-Access to /dev/video*
---------------------
-
-For cameras which require access to /dev/video*, zoneminder may need the 
-www-data user added to the video group in order to see those cameras:
-
-  adduser www-data video
-
-Note that all web applications running on the zoneminder server will then have 
-access to all video devices on the system.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Sun, 27 Mar 2011 13:06:56 -0700
--- a/distros/ubuntu1410/apache.conf
+++ b/distros/ubuntu1410/apache.conf
@@ -1,9 +0,0 @@
-Alias /zm /usr/share/zoneminder
-
-<Directory /usr/share/zoneminder>
-  php_flag register_globals off
-  Options Indexes FollowSymLinks
-  <IfModule mod_dir.c>
-    DirectoryIndex index.php
-  </IfModule>
-</Directory>
--- a/distros/ubuntu1410/changelog
+++ b/distros/ubuntu1410/changelog
@@ -1,323 +0,0 @@
-zoneminder (1.30.2-trusty-2016033001) trusty; urgency=medium
-
-  * merge master
-
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 30 Mar 2016 14:09:48 -0400
-
-zoneminder (1.30.2-trusty-2016032901) trusty; urgency=medium
-
-  * filter fixes, merge options rework by Kyle
-
- -- Isaac Connor <iconnor@connortechnology.com>  Tue, 29 Mar 2016 12:27:57 -0400
-
-zoneminder (1.30.2-trusty-2016030702) trusty; urgency=medium
-
-  * 
-
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 07 Mar 2016 22:14:03 -0500
-
-zoneminder (1.30.2-trusty-2016030701) trusty; urgency=medium
-
-  * merge master. with telemetry
-
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 07 Mar 2016 21:47:53 -0500
-
-zoneminder (1.30.2-trusty-2016022101) trusty; urgency=medium
-
-  * merge zmtrigger fix
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 22 Feb 2016 09:15:53 -0500
-
-zoneminder (1.30.2-trusty-2016021901) trusty; urgency=medium
-
-  * zmtrigger improvements
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 19 Feb 2016 11:09:57 -0500
-
-zoneminder (1.30.2-trusty-2016021701) trusty; urgency=medium
-
-  * printout id, and ip address when failing to connect
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Wed, 17 Feb 2016 09:40:49 -0500
-
-zoneminder (1.30.2-trusty-2016021001) trusty; urgency=medium
-
-  * 
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Wed, 10 Feb 2016 13:06:09 -0500
-
-zoneminder (1.29.111-trusty-2016020101) trusty; urgency=medium
-
-  * Fix video download and use of Storage Areas
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 01 Feb 2016 13:42:06 -0500
-
-zoneminder (1.29.111-trusty-2016011401) trusty; urgency=medium
-
-  * fix timeline view for storageareas
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 14 Jan 2016 14:03:41 -0500
-
-zoneminder (1.29.111-trusty-2016010801) trusty; urgency=medium
-
-  * Add better debug and skip when event links are not just digits. Merge multi-server stuff from master.
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 08 Jan 2016 10:37:16 -0500
-
-zoneminder (1.29.111-trusty-2016010401) trusty; urgency=medium
-
-  *  include fix to rotate image dimensions when applying a rotation
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 04 Jan 2016 13:24:42 -0500
-
-zoneminder (1.29.111-trusty-2016010101) trusty; urgency=medium
-
-  * fix logging with multi-server
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 01 Jan 2016 17:11:09 -0500
-
-zoneminder (1.29.111-trusty-2015123101) trusty; urgency=medium
-
-  * Add log filtering from multi-server
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 31 Dec 2015 10:18:03 -0500
-
-zoneminder (1.29.109-trusty-2015122401) trusty; urgency=medium
-
-  * fix delete events not in database in zmaudit.pl
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 24 Dec 2015 12:38:05 -0500
-
-zoneminder (1.29.109-trusty-2015122301) trusty; urgency=medium
-
-  * todays release
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Wed, 23 Dec 2015 09:33:46 -0500
-
-zoneminder (1.29.109-trusty-2015122202) trusty; urgency=medium
-
-  * more object work and zmaudit
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Tue, 22 Dec 2015 13:13:56 -0500
-
-zoneminder (1.29.109-trusty-2015122201) trusty; urgency=medium
-
-  * merge multi-server, and master stuff, start work on zmaudit storage areas support
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Tue, 22 Dec 2015 11:11:44 -0500
-
-zoneminder (1.29.109-trusty-2015122103) trusty; urgency=medium
-
-  * Fixes
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 21 Dec 2015 15:20:15 -0500
-
-zoneminder (1.29.109-trusty-2015122102) trusty; urgency=medium
-
-  * fix deleting events
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 21 Dec 2015 14:49:12 -0500
-
-zoneminder (1.29.109-trusty-2015122101) trusty; urgency=medium
-
-  * Make zmfilter work.
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 21 Dec 2015 12:32:27 -0500
-
-zoneminder (1.29.109-trusty-2015121803) trusty; urgency=medium
-
-  * merge zmvideo improvements
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 18 Dec 2015 14:17:56 -0500
-
-zoneminder (1.29.109-trusty-2015121802) trusty; urgency=medium
-
-  * Add some missing files to the autoconf build
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 18 Dec 2015 12:14:08 -0500
-
-zoneminder (1.29.109-trusty-2015121801) trusty; urgency=medium
-
-  * 
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 18 Dec 2015 11:05:58 -0500
-
-zoneminder (1.29.109-trusty-2015121701) trusty; urgency=medium
-
-  * Merge master + better zmvideo
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 17 Dec 2015 15:11:18 -0500
-
-zoneminder (1.29.0-trusty-2015112301) trusty; urgency=medium
-
-  * apply fix for zms crash
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 23 Nov 2015 10:47:49 -0500
-
-zoneminder (1.29.0-trusty-2015110601) trusty; urgency=medium
-
-  * add a FIONREAD test on timeout
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Wed, 22 Jul 2015 09:55:37 -0400
-
-zoneminder (1.29.0-trusty-2015072201) trusty; urgency=medium
-
-  * add AnalysisFPS
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Wed, 22 Jul 2015 09:55:37 -0400
-
-zoneminder (1.29.0-trusty-2015071601) trusty; urgency=medium
-
-  * Merge master and zmtrigger
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 16 Jul 2015 13:15:58 -0400
-
-zoneminder (1.29.0-trusty-38) trusty; urgency=medium
-
-  * Merge master
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Tue, 14 Jul 2015 10:15:00 -0400
-
-zoneminder (1.29.0-trusty-37) trusty; urgency=medium
-
-  * merge master api stuff, set sleep after failure to capture to 5000 instead of 5000000
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 19 Jun 2015 09:59:54 -0400
-
-zoneminder (1.29.0-trusty-36) trusty; urgency=medium
-
-  * Detect select interuption when no action on our fd
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 28 May 2015 09:35:59 -0400
-
-zoneminder (1.29.0-trusty-35) trusty; urgency=medium
-
-  * better logging
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 22 May 2015 15:30:42 -0400
-
-zoneminder (1.29.0-trusty-34) trusty; urgency=medium
-
-  * Faster shutdown and changes to ReadData
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 21 May 2015 15:54:47 -0400
-
-zoneminder (1.29.0-trusty-33) trusty; urgency=medium
-
-  * update zmaudit some more
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 14 May 2015 13:44:35 -0400
-
-zoneminder (1.29.0-trusty-32) trusty; urgency=medium
-
-  * merge zmaudit_updates1
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Wed, 13 May 2015 15:51:56 -0400
-
-zoneminder (1.29.0-trusty-31) trusty; urgency=medium
-
-  * Merge some fixes and zmaudit improvements
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Wed, 13 May 2015 15:16:19 -0400
-
-zoneminder (1.29.0-trusty-27) trusty; urgency=medium
-
-  * fflush logs, merge master.
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 30 Mar 2015 19:28:05 -0400
-
-zoneminder (1.29.0-vivid-26) vivid; urgency=medium
-
-  *  logging improvements, merge RedData changes
-
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 04 Mar 2015 16:39:19 -0500
-
-zoneminder (1.29.0-vivid-25) vivid; urgency=medium
-
-  * some change to ReadData
-
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 02 Mar 2015 12:57:16 -0500
-
-zoneminder (1.29.0-utopic-24) utopic; urgency=medium
-
-  * merge local_raw
-
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 23 Feb 2015 17:49:36 -0500
-
-zoneminder (1.29.0-trusty-23) trusty; urgency=medium
-
-  * more onvif merges, fix to zmfilter
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Sat, 21 Feb 2015 16:17:01 -0500
-
-zoneminder (1.29.0-trusty-22) trusty; urgency=medium
-
-  * updates from master: merge onvif, default to classic if skin not defined.
-
- -- Isaac Connor <iconnor@connortechnology.com>  Thu, 19 Feb 2015 18:14:58 -0500
-
-zoneminder (1.29.0-utopic-21) utopic; urgency=medium
-
-  * updates from master, improve monitor probing and support TRENDnet cameras
-
- -- Isaac Connor <iconnor@connortechnology.com>  Tue, 17 Feb 2015 14:18:52 -0500
-
-zoneminder (1.29.0-wheezy-20) wheezy; urgency=medium
-
-  * zmaudit.pl improvements - double check db before deleting fs event
-
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 04 Feb 2015 11:09:22 -0500
-
-zoneminder (1.29.0-utopic-18) utopic; urgency=medium
-
-  * RTSP Timeout fixes
-
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 28 Jan 2015 13:49:16 -0500
-
-zoneminder (1.29.0-utopic-17) utopic; urgency=medium
-
-  * Merge master, use new split-up debian build
-
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 26 Jan 2015 11:21:07 -0500
-
-zoneminder (1.28.0+nmu1) testing; urgency=medium
-
-  * Non-maintainer upload
-  * Split the debian package into several packages
-  * Switch to native source format
-
- -- Emmanuel Papin <manupap01@gmail.com>  Thu, 15 Jan 2015 20:00:08 +0100
-
-zoneminder (1.28.0-0.2) testing; urgency=medium
-
-  * Non-maintainer upload.
-  * Upstream release for debian jessie
-  * Package dependencies updated
-  * debhelper version upgraded
-  * Standards-Version upgraded
-  * Use debhelper commands instead of standard commands
-  * Install man pages in /usr/share/man (patch added)
-  * Switch to quilt
-  * Switch to systemd
-  * Some lintian fixes
-
- -- Emmanuel Papin <manupap01@gmail.com>  Wed, 26 Nov 2014 00:26:01 +0100
-
-zoneminder (1.28.0-0.1) stable; urgency=medium
-
-  * Release
-
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 17 Oct 2014 09:27:22 -0400
-
-zoneminder (1.27.99+1-testing-SNAPSHOT2014072901) testing; urgency=medium
-
-  * improve error messages
-  * Make zmupdate re-run the most recent patch so that people running the daily builds get their db updates
-
- -- Isaac Connor <iconnor@connortechnology.com>  Tue, 29 Jul 2014 14:50:20 -0400
-
-zoneminder (1.27.0+1-testing-v4ltomonitor-1) testing; urgency=high
-
-  * Snapshot release - 
-
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 09 Jul 2014 21:35:29 -0400
--- a/distros/ubuntu1410/control
+++ b/distros/ubuntu1410/control
@@ -1,122 +0,0 @@
-Source: zoneminder
-Section: net
-Priority: optional
-Maintainer: Isaac Connor <iconnor@connortechnology.com>
-Build-Depends: debhelper (>= 9), po-debconf (>= 1.0), autoconf, automake, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev | libjpeg9-dev | libjpeg62-turbo-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, libavdevice-dev, libdevice-serialport-perl, libarchive-zip-perl, libmime-lite-perl, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev | libgcrypt20-dev, libpolkit-gobject-1-dev, libdbi-perl, libnet-sftp-foreign-perl, libexpect-perl, libmime-tools-perl, libx264-dev, libmp4v2-dev, libpcre3-dev
-Standards-Version: 3.9.6
-
-Package: zoneminder
-Section: metapackages
-Architecture: all
-Depends: ${misc:Depends},
- libzoneminder-perl (>= ${source:Version}),
- zoneminder-database (>= ${source:Version}),
- zoneminder-core (>= ${binary:Version}),
- zoneminder-ui-base (>= ${source:Version}),
- zoneminder-ui-classic (>= ${source:Version}),
- zoneminder-ui-mobile (>= ${source:Version}),
- zoneminder-ui-xml (>= ${source:Version})
-Description: Video camera security and surveillance solution (metapackage)
- ZoneMinder is intended for use in single or multi-camera video security
- applications, including commercial or home CCTV, theft prevention and child
- or family member or home monitoring and other care scenarios. It
- supports capture, analysis, recording, and monitoring of video data coming
- from one or more video or network cameras attached to a Linux system.
- ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
- cameras using a variety of protocols. It is suitable for use as a home
- video security system and for commercial or professional video security
- and surveillance. It can also be integrated into a home automation system
- via X.10 or other protocols.
-
-Package: libzoneminder-perl
-Section: perl
-Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, libdbi-perl,
- libdevice-serialport-perl, libimage-info-perl, libjson-any-perl, libjson-maybexs-perl,
- libsys-mmap-perl, liburi-encode-perl, libwww-perl
-Description: Perl libraries for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the libraries for the perl scripts, it can be used to
- write custom interfaces as well.
-
-Package: zoneminder-database
-Section: database
-Architecture: all
-Depends: ${misc:Depends}, debconf, dbconfig-common,
- mysql-client | mariadb-client
-Recommends: mysql-server | mariadb-server
-Description: Database management package for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the sql files and maintenance scripts to perform all the
- database operations (installation, upgrade or removal) on a local or a remote
- server.
-
-Package: zoneminder-core
-Section: video
-Architecture: any
-Depends: libzoneminder-perl (= ${source:Version}),
- zoneminder-database (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends},
- ${perl:Depends}, libarchive-tar-perl, libarchive-zip-perl, libdate-manip-perl,
- libdbi-perl, libmodule-load-conditional-perl, libmime-lite-perl,
- libmime-tools-perl, libnet-sftp-foreign-perl, libphp-serialization-perl,
- debconf, ffmpeg | libav-tools, rsyslog | system-log-daemon, zip,
- policykit-1, apache2, libmp4v2-2, libpcre++0
-Description: Core binaries and perl scripts for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the executable compiled binaries which do the main video
- processing work and the perl scripts which perform helper and/or external
- interface tasks.
-
-Package: zoneminder-core-dbg
-Priority: extra
-Section: debug
-Architecture: any
-Depends: zoneminder-core (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the debugging symbols for the executable compiled
- binaries.
-
-Package: zoneminder-ui-base
-Section: web
-Architecture: any
-Depends: zoneminder-core (= ${binary:Version}), ${shlibs:Depends},
- ${misc:Depends}, debconf, apache2, libapache2-mod-php5 | libapache2-mod-fcgid,
- php5, php5-mysql | php5-mysqlnd, php5-gd
-Description: Essential files for ZoneMinder's web user interface
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the essential web files and maintenance scripts to set up
- a basic web environment.
-
-Package: zoneminder-ui-classic
-Section: web
-Architecture: all
-Depends: zoneminder-ui-base (>= ${source:Version}), ${misc:Depends}
-Description: Classic web user interface for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the classic web user interface.
-
-Package: zoneminder-ui-mobile
-Section: web
-Architecture: all
-Depends: zoneminder-ui-base (>= ${source:Version}), ${misc:Depends}
-Description: Mobile web user interface for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the web user interface for mobile devices.
-
-Package: zoneminder-ui-xml
-Section: web
-Architecture: all
-Depends: zoneminder-ui-base (>= ${source:Version}), ${misc:Depends}
-Description: XML interface for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides a XML interface mainly intended for use with the eyeZm
- iPhone Application, but can be used with any other custom programs as well.
--- a/distros/ubuntu1410/copyright
+++ b/distros/ubuntu1410/copyright
@@ -1,22 +0,0 @@
-Copyright:
-
-Copyright 2002 Philip Coombes <philip.coombes@zoneminder.com>
-
-License:
-
-This package is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-This package is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public
-License along with this package; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian GNU/Linux systems, the text of the GPL can be found in
-/usr/share/common-licenses/GPL.
--- a/distros/ubuntu1410/libzoneminder-perl.install
+++ b/distros/ubuntu1410/libzoneminder-perl.install
@@ -1,4 +0,0 @@
-usr/share/perl5/ZoneMinder
-usr/share/perl5/ZoneMinder.pm
-debian/tmp/usr/share/man/man3/ZoneMinder.3pm
-debian/tmp/usr/share/man/man3/ZoneMinder::*
--- a/distros/ubuntu1410/po/POTFILES.in
+++ b/distros/ubuntu1410/po/POTFILES.in
@@ -1,3 +0,0 @@
-[type: gettext/rfc822deb] zoneminder-core.templates
-[type: gettext/rfc822deb] zoneminder-database.templates
-[type: gettext/rfc822deb] zoneminder-ui-base.templates
--- a/distros/ubuntu1410/po/fr.po
+++ b/distros/ubuntu1410/po/fr.po
@@ -1,252 +0,0 @@
-# debconf french translation file for ZoneMinder.
-# Copyright (C) 2001-2008 Philip Coombes
-# This file is distributed under the same license as the zoneminder package.
-# First author: Emmanuel Papin <manupap01@gmail.com>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zoneminder\n"
-"Report-Msgid-Bugs-To: zoneminder@packages.debian.org\n"
-"POT-Creation-Date: 2014-12-16 12:34+0100\n"
-"PO-Revision-Date: 2014-12-07 00:40+0100\n"
-"Last-Translator: Emmanuel Papin <manupap01@gmail.com>\n"
-"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid "Delete this non empty directory?"
-msgstr "Supprimer ce répertoire non vide ?"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"A purge of the ZoneMinder package is performed but the directory '/var/cache/"
-"zoneminder' is not empty so it will not be deleted."
-msgstr ""
-"Une purge du paquet ZoneMinder est en cours mais le répertoire '/var/cache/"
-"zoneminder' n'est pas vide et sera donc conservé."
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"Please consider that this directory is designed to contain data resulting "
-"from event detection. Therefore, \"proof of evidence\" could be lost!\""
-msgstr ""
-"Veuillez considérer que ce répertoire est conçu pour contenir des données "
-"résultants de la détection d'événements. Par conséquent, des preuves "
-"pourraient être perdues !"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"If you are not sure of your decision, please do not delete this directory "
-"but perform a manual checkup."
-msgstr ""
-"Si vous n'êtes pas sûr de votre décision, veuillez conserver ce répertoire "
-"et effectuer une vérification manuelle."
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:2001
-msgid "Deletion confirmed?"
-msgstr "Supression confirmée ?"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:2001
-msgid ""
-"You have allowed the deletion of directory '/var/cache/zoneminder' although "
-"it may contain critical data."
-msgstr ""
-"Vous avez autorisé la suppression du répertoire '/var/cache/zoneminder' bien "
-"qu'il puisse contenir des données critiques."
-
-#. Type: select
-#. Choices
-#: ../zoneminder-database.templates:1001
-msgid "local"
-msgstr "local"
-
-#. Type: select
-#. Choices
-#: ../zoneminder-database.templates:1001
-msgid "remote"
-msgstr "distant"
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid "Database location:"
-msgstr "Emplacement de la base de donnée :"
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid ""
-"A database server is required to run ZoneMinder. The database can be "
-"installed either locally or remotely on a machine of your network."
-msgstr ""
-"Un serveur de base de données est requis pour ZoneMinder. La base de donnée "
-"peut être installée localement ou à distance sur une machine de votre réseau."
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid ""
-"If you choose a remote location, you will have to select the 'tcp/ip' "
-"connection method and enter the hostname or ip address of the remote machine "
-"in the next configuration screens."
-msgstr ""
-"Si vous choisissez un emplacement distant, vous devrez sélectionner la "
-"méthode de connexion 'tcp/ip' et entrer le nom réseau ou l'adresse ip de la "
-"machine distante dans les écrans de configuration suivants."
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid "No local database server is available:"
-msgstr "Aucun serveur local de base de données n'est disponible :"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid ""
-"Currently ZoneMinder supports mysql or mariadb database server but none of "
-"them appears to be installed on this machine."
-msgstr ""
-"Actuellement ZoneMinder supporte les serveurs de base de données mysql et "
-"mariadb mais aucun d'entre eux n'est installé sur cette machine."
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid ""
-"In order to complete ZoneMinder's installation, after ending of this "
-"assistant, please install a compatible database server and then restart the "
-"assistant by invoking:"
-msgstr ""
-"Afin de compléter l'installation de ZoneMinder, après la fermeture de cet "
-"assitant, veuillez installer un serveur de base de données compatible et "
-"ensuite redémarrez l'assistant en invoquant :"
-
-#. Type: error
-#. Description
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001 ../zoneminder-database.templates:3001
-msgid "$ sudo dpkg-reconfigure zoneminder"
-msgstr "$ sudo dpkg-reconfigure zoneminder"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid "Remote database servers are not allowed:"
-msgstr "Les serveurs de base de données distants ne sont pas autorisés :"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"The current configuration of dbconfig-common does not allow installation of "
-"a database on remote servers."
-msgstr ""
-"La configuration actuelle de dbconfig-common ne permet pas l'installation de "
-"bases de données sur des serveurs distants."
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"In order to reconfigure dbconfig-common, please invoke the following command "
-"after ending of this assistant:"
-msgstr ""
-"Afin de reconfigurer dbconfig-common, veuillez invoquer la commande suivante "
-"après la fermeture de cet assitant :"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid "$ sudo dpkg-reconfigure dbconfig-common"
-msgstr "$ sudo dpkg-reconfigure dbconfig-common"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"Then, to complete ZoneMinder's installation, please restart this assistant "
-"by invoking:"
-msgstr ""
-"Ensuite, pour compléter l'installation de ZoneMinder, veuillez redémarrer "
-"cet assistant en invoquant :"
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "New password for the ZoneMinder 'admin' user:"
-msgstr "Nouveau mot de passe pour le compte 'admin' de ZoneMinder :"
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "Please enter the password of the default administrative user."
-msgstr "Veuillez entrer le mot de passe du compte administrateur par défaut."
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid ""
-"While not mandatory, it is highly recommended that you set a custom password "
-"for the administrative 'admin' user."
-msgstr ""
-"Bien que cela ne soit pas obligatoire, il est fortement recommandé de "
-"fournir un mot de passe personnalisé pour le compte administrateur 'admin'."
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "If this field is left blank, the password will not be changed."
-msgstr "Si le champ est laissé vide, le mot de passe ne sera pas changé."
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:5001
-msgid "Repeat password for the ZoneMinder 'admin' user:"
-msgstr "Répéter le mot de passe pour le compte 'admin' de ZoneMinder :"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:6001
-msgid "Password input error"
-msgstr "Erreur de mot de passe"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:6001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
-"Les deux mots de passe saisis ne sont pas les mêmes. Veuillez essayer à "
-"nouveau."
-
-#. Type: multiselect
-#. Description
-#: ../zoneminder-ui-base.templates:1001
-msgid "Web server to reconfigure automatically:"
-msgstr "Serveur web à reconfigurer automatiquement :"
-
-#. Type: multiselect
-#. Description
-#: ../zoneminder-ui-base.templates:1001
-msgid ""
-"Please choose the web server that should be automatically configured for "
-"ZoneMinder's web portal access."
-msgstr ""
-"Veuillez choisir le serveur web à reconfigurer automatiquement pour l'accès "
-"au portail web de ZoneMinder."
--- a/distros/ubuntu1410/po/templates.pot
+++ b/distros/ubuntu1410/po/templates.pot
@@ -1,222 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: zoneminder\n"
-"Report-Msgid-Bugs-To: zoneminder@packages.debian.org\n"
-"POT-Creation-Date: 2014-12-16 12:34+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid "Delete this non empty directory?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"A purge of the ZoneMinder package is performed but the directory '/var/cache/"
-"zoneminder' is not empty so it will not be deleted."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"Please consider that this directory is designed to contain data resulting "
-"from event detection. Therefore, \"proof of evidence\" could be lost!\""
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"If you are not sure of your decision, please do not delete this directory "
-"but perform a manual checkup."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:2001
-msgid "Deletion confirmed?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:2001
-msgid ""
-"You have allowed the deletion of directory '/var/cache/zoneminder' although "
-"it may contain critical data."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../zoneminder-database.templates:1001
-msgid "local"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../zoneminder-database.templates:1001
-msgid "remote"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid "Database location:"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid ""
-"A database server is required to run ZoneMinder. The database can be "
-"installed either locally or remotely on a machine of your network."
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid ""
-"If you choose a remote location, you will have to select the 'tcp/ip' "
-"connection method and enter the hostname or ip address of the remote machine "
-"in the next configuration screens."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid "No local database server is available:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid ""
-"Currently ZoneMinder supports mysql or mariadb database server but none of "
-"them appears to be installed on this machine."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid ""
-"In order to complete ZoneMinder's installation, after ending of this "
-"assistant, please install a compatible database server and then restart the "
-"assistant by invoking:"
-msgstr ""
-
-#. Type: error
-#. Description
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001 ../zoneminder-database.templates:3001
-msgid "$ sudo dpkg-reconfigure zoneminder"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid "Remote database servers are not allowed:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"The current configuration of dbconfig-common does not allow installation of "
-"a database on remote servers."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"In order to reconfigure dbconfig-common, please invoke the following command "
-"after ending of this assistant:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid "$ sudo dpkg-reconfigure dbconfig-common"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"Then, to complete ZoneMinder's installation, please restart this assistant "
-"by invoking:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "New password for the ZoneMinder 'admin' user:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "Please enter the password of the default administrative user."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid ""
-"While not mandatory, it is highly recommended that you set a custom password "
-"for the administrative 'admin' user."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "If this field is left blank, the password will not be changed."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:5001
-msgid "Repeat password for the ZoneMinder 'admin' user:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:6001
-msgid "Password input error"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:6001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
-
-#. Type: multiselect
-#. Description
-#: ../zoneminder-ui-base.templates:1001
-msgid "Web server to reconfigure automatically:"
-msgstr ""
-
-#. Type: multiselect
-#. Description
-#: ../zoneminder-ui-base.templates:1001
-msgid ""
-"Please choose the web server that should be automatically configured for "
-"ZoneMinder's web portal access."
-msgstr ""
--- a/distros/ubuntu1410/rules
+++ b/distros/ubuntu1410/rules
@@ -1,154 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall
-CPPFLAGS = -D__STDC_CONSTANT_MACROS
-CXXFLAGS = -DHAVE_LIBCRYPTO
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-DEBOPT = --enable-debug
-CFLAGS += -g
-CXXFLAGS += -g
-else
-DEBOPT =
-endif
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
-
-# These are used to get the most recent version of the original sources from github
-UURL = $(shell git config --get remote.origin.url)
-BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
-HEAD = $(shell git rev-parse HEAD)
-PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
-PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
-VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-|\+nmu\d+.*)};')
-DTYPE =
-TARBALL = ../$(PKG)_$(VER)$(DTYPE).orig.tar.xz
-
-%:
-	dh $@ --with autoreconf
-
-override_dh_auto_configure:
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- \
-	  --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	  --sysconfdir=/etc/zm --prefix=/usr --mandir=\$${prefix}/share/man \
-	  --infodir=\$${prefix}/share/info --with-mysql=/usr \
-	  --with-mariadb=/usr --with-webdir=/usr/share/zoneminder \
-	  --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin \
-	  --with-webuser=www-data --with-webgroup=www-data \
-	  --enable-mmap=yes $(DEBOPT)
-
-override_dh_clean:
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean src/zm_config_defines.h
-	#
-	# Delete remaining auto-generated Makefile if Makefile.in exists
-	find $(CURDIR)/ -type f -name "Makefile" | while read file; do \
-	  [ -f $$file.in ] && rm -f $$file; \
-	done || true
-	#
-	# Delete remaining auto-generated Makefile.in if Makefile.am exists
-	find $(CURDIR)/ -type f -name "Makefile.in" | while read filein; do \
-	  fileam=`echo $$filein | sed 's/\(.*\)\.in/\1\.am/'`; \
-	  [ -f $$fileam ] && rm -f $$filein; \
-	done || true
-
-override_dh_install:
-	dh_install --fail-missing
-	#
-	# NOTE: This is a short-term kludge; hopefully changes in the next
-	# upstream version will render this unnecessary.
-	rm -rf debian/zoneminder/usr/share/zoneminder/events
-	rm -rf debian/zoneminder/usr/share/zoneminder/images
-	rm -rf debian/zoneminder/usr/share/zoneminder/temp
-	# The link stuff for these folders has been moved to
-	# zoneminder-core.links file
-	#
-	# This is a slightly lesser kludge; moving the cgi stuff to
-	# /usr/share/zoneminder/cgi-bin breaks one set of behavior,
-	# having it just in /usr/lib/cgi-bin breaks another bit of
-	# behavior.
-	# The link stuff for /usr/share/zoneminder/cgi-bin has been moved to
-	# zoneminder-ui-base.links file
-
-override_dh_installinit:
-	dh_installinit --package=zoneminder-core --name=zoneminder
-
-override_dh_systemd_start:
-	dh_systemd_start --package=zoneminder-core --name=zoneminder \
-	  --restart-after-upgrade
-
-override_dh_systemd_enable:
-	dh_systemd_enable --package=zoneminder-core --name=zoneminder
-
-override_dh_fixperms:
-	dh_fixperms
-	#
-	# As requested by the Debian Webapps Policy Manual §3.2.1
-	chown root:www-data debian/zoneminder-core/etc/zm/zm.conf
-	chmod 640 debian/zoneminder-core/etc/zm/zm.conf
-
-override_dh_auto_test:
-	# do not run tests...
-
-.PHONY: override_dh_strip
-override_dh_strip:
-	dh_strip --dbg-package=zoneminder-core-dbg
-
-# Inspired by https://wiki.debian.org/onlyjob/get-orig-source
-.PHONY: get-orig-source
-get-orig-source: $(TARBALL) $(info I: $(PKG)_$(VER)$(DTYPE))
-	@
-
-$(TARBALL):
-	$(if $(wildcard $(PKG)-$(VER)),$(error folder '$(PKG)-$(VER)' exists, aborting...))
-	@echo "# Cloning origin repository..."; \
-	if ! git clone $(UURL) $(PKG)-$(VER); then \
-	  $(RM) -r $(PKG)-$(VER); \
-	  echo "failed to clone repository, aborting..."; \
-	  false; \
-	fi
-	@if [ $(BRANCH) != "master" ]; then \
-	  cd $(PKG)-$(VER); \
-	  echo "# Not on master branch, fetching origin branch '$(BRANCH)'..."; \
-	  git fetch origin $(BRANCH):$(BRANCH) || false; \
-	  echo "# Switching to branch '$(BRANCH)'..."; \
-	  git checkout $(BRANCH) || false; \
-	fi
-	@echo "# Checking local source..."
-	@if [ $$(cd $(PKG)-$(VER) && git rev-parse HEAD) = $(HEAD) ]; then \
-	  echo "even with origin, ok"; \
-	  true; \
-	else \
-	  echo "not even with origin, aborting..."; \
-	  false; \
-	fi
-	@echo "# Setting times..."
-	@cd $(PKG)-$(VER) \
-	&& for F in $$(git ls-tree -r --name-only HEAD | sed -e "s/\s/\*/g"); do \
-	  touch --no-dereference -d "$$(git log -1 --format="%ai" -- $$F)" "$$F"; \
-	done
-	@echo "# Cleaning-up..."
-	cd $(PKG)-$(VER) && $(RM) -r .git
-	@echo "# Packing file '$(TARBALL)'..."
-	@find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
-	| XZ_OPT="-6v" tar -caf "$(TARBALL)" -T- --owner=root --group=root --mode=a+rX \
-	&& $(RM) -r "$(PKG)-$(VER)"
--- a/distros/ubuntu1410/source/format
+++ b/distros/ubuntu1410/source/format
@@ -1 +0,0 @@
-3.0 (native)
--- a/distros/ubuntu1410/source/local-options
+++ b/distros/ubuntu1410/source/local-options
--- a/distros/ubuntu1410/source/options
+++ b/distros/ubuntu1410/source/options
@@ -1 +0,0 @@
-extend-diff-ignore = "(^|/)(config\.sub|config\.guess|Makefile|aclocal.m4|compile|config.h.in|configure|depcomp|install-sh|missing)$"
--- a/distros/ubuntu1410/zoneminder-core.config
+++ b/distros/ubuntu1410/zoneminder-core.config
@@ -1,11 +0,0 @@
-#!/bin/sh
-# config maintainer script for zoneminder-core package
-
-set -e
-
-# Source the debconf stuff
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
-
-exit 0
--- a/distros/ubuntu1410/zoneminder-core.install
+++ b/distros/ubuntu1410/zoneminder-core.install
@@ -1,4 +0,0 @@
-etc/zm
-usr/bin
-usr/share/polkit-1/actions
-usr/share/polkit-1/rules.d
--- a/distros/ubuntu1410/zoneminder-core.links
+++ b/distros/ubuntu1410/zoneminder-core.links
@@ -1,3 +0,0 @@
-var/cache/zoneminder/events usr/share/zoneminder/events
-var/cache/zoneminder/images usr/share/zoneminder/images
-var/cache/zoneminder/temp   usr/share/zoneminder/temp
--- a/distros/ubuntu1410/zoneminder-core.postinst
+++ b/distros/ubuntu1410/zoneminder-core.postinst
@@ -1,80 +0,0 @@
-#! /bin/sh
-# postinst maintainer script for zoneminder-core package
-
-set -e
-
-# Source the debconf stuff
-. /usr/share/debconf/confmodule
-
-# Source the config file
-CONFIGFILE=/etc/zm/zm.conf
-. $CONFIGFILE
-
-# Do this when the package is installed, upgraded or reconfigured
-if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
-
-    # Retrieve data from dbconfig (inputs from user)
-    . /etc/dbconfig-common/zoneminder.conf
-
-    # ZoneMinder config file handling
-    # Inspired by: http://manpages.debian.org/cgi-bin/man.cgi?query=debconf-devel&sektion=7
-
-    # Backup the config file
-    cp -a -f $CONFIGFILE ${CONFIGFILE}.postinst.bak
-
-    # Redeclare variables if missing in config file
-    test -z $dbc_dbserver || grep -Eq "^ *ZM_DB_HOST=" $CONFIGFILE \
-      || echo "ZM_DB_HOST=" >> ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbname || grep -Eq "^ *ZM_DB_NAME=" $CONFIGFILE \
-      || echo "ZM_DB_NAME=" >> ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbuser || grep -Eq "^ *ZM_DB_USER=" $CONFIGFILE \
-      || echo "ZM_DB_USER=" >> ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbpass || grep -Eq "^ *ZM_DB_PASS=" $CONFIGFILE \
-      || echo "ZM_DB_PASS=" >> ${CONFIGFILE}.postinst.bak
-
-    # Prevent ZM_DB_HOST to be empty if user selected the 'unix socket' method
-    if test -z $dbc_dbserver; then
-	dbc_dbserver_override="localhost"
-    else
-        dbc_dbserver_override=$dbc_dbserver
-    fi
-
-    # Update variables in config file
-    sed -i "s/^ *ZM_DB_HOST=.*/ZM_DB_HOST=$dbc_dbserver_override/" \
-      ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbname || sed -i "s/^ *ZM_DB_NAME=.*/ZM_DB_NAME=$dbc_dbname/" \
-      ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbuser || sed -i "s/^ *ZM_DB_USER=.*/ZM_DB_USER=$dbc_dbuser/" \
-      ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbpass || sed -i "s/^ *ZM_DB_PASS=.*/ZM_DB_PASS=$dbc_dbpass/" \
-      ${CONFIGFILE}.postinst.bak
-
-    # Clean-up backup file
-    mv -f ${CONFIGFILE}.postinst.bak $CONFIGFILE
-
-
-    # Set some file permissions
-    chown $ZM_WEB_USER:$ZM_WEB_GROUP /var/log/zm
-    if [ -z "$2" ]; then
-        chown $ZM_WEB_USER:$ZM_WEB_GROUP -R /var/cache/zoneminder
-    fi
-    # As requested by the Debian Webapps Policy Manual §3.2.1
-    chown root:${ZM_WEB_GROUP} $CONFIGFILE
-    chmod 640 $CONFIGFILE
-fi
-
-# Do this every time the package is installed or upgraded
-# Test for database presence to avoid failure of zmupdate.pl
-if [ "$dbc_install" = "true" ] && [ "$1" = "configure" ]; then
-
-    # Ensure zoneminder is stopped
-    deb-systemd-invoke stop zoneminder.service || exit $?
-
-    # Run the ZoneMinder update tool
-    zmupdate.pl --nointeractive
-
-fi
-
-#DEBHELPER#
-
-exit 0
--- a/distros/ubuntu1410/zoneminder-core.postrm
+++ b/distros/ubuntu1410/zoneminder-core.postrm
@@ -1,37 +0,0 @@
-#! /bin/sh
-# postrm maintainer script for zoneminder-core package
-
-set -e
-
-# Source the debconf stuff
-if [ -f /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-fi
-
-if [ "$1" = "purge" ]; then
-
-    # Ask the user if we have to remove the cache directory even if not empty
-    if [ -d /var/cache/zoneminder ] \
-      && [ ! $(find /var/cache/zoneminder -maxdepth 0 -type d -empty 2>/dev/null) ]; then
-        RET=""
-        db_input high zoneminder/ask_delete || true
-        db_go || true
-        db_get zoneminder/ask_delete
-        if [ "$RET" = "true" ]; then
-            RET=""
-            db_input high zoneminder/ask_delete_again || true
-            db_go || true
-            db_get zoneminder/ask_delete_again
-            if [ "$RET" = "true" ]; then
-                rm -rf /var/cache/zoneminder
-            fi
-        fi
-    fi
-fi
-
-#DEBHELPER#
-
-# postrm rm may freeze without that
-db_stop
-
-exit 0
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				ALTER TABLE Monitors MODIFY `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local';
				`@@ -0,0 +1 @@`
				`/var/tmp /usr/share/zoneminder/www/api/app/tmp`
				`@@ -1 +0,0 @@`
				`/tmp/zm /usr/share/zoneminder/www/api/app/tmp`
				`@@ -1 +0,0 @@`
				`extend-diff-ignore = "(^\|/)(config\.sub\|config\.guess\|Makefile\|aclocal.m4\|compile\|config.h.in\|configure\|depcomp\|install-sh\|missing)$"`