Merge pull request #3450 from gonzalezcalleja/fix_zmpkg

Fix when using a custom state with zmpkg.pl

.cirrus.yml

@@ -1,17 +1,19 @@
 task:
   name: freebsd-build
   freebsd_instance:
-    image_family: freebsd-12-2
+    matrix:
+      - image_family: freebsd-12-2
+      - image_family: freebsd-13-0
 
   prepare_script:
-    - pkg install -yq git cmake jpeg-turbo mysql80-client ffmpeg libvncserver libjwt catch p5-DBI p5-DBD-mysql p5-Date-Manip p5-Test-LWP-UserAgent p5-Sys-Mmap
+    - pkg install -yq git cmake pkgconf jpeg-turbo mysql80-client ffmpeg libvncserver libjwt catch p5-DBI p5-DBD-mysql p5-Date-Manip p5-Test-LWP-UserAgent p5-Sys-Mmap v4l_compat
 
   configure_script:
     - git submodule update --init --recursive
     - mkdir build
     - cd build
     - cmake --version
-    - cmake ../ -DBUILD_MAN=0 -DBUILD_TEST_SUITE=1 -DENABLE_WERROR=1
+    - cmake ../ -DBUILD_MAN=0 -DBUILD_TEST_SUITE=1 -DENABLE_WERROR=1 -DCMAKE_C_FLAGS="-Wno-deprecated-declarations" -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations"
 
   build_script:
     - cd build

.eslintignore

@@ -4,7 +4,8 @@
 web/api/lib
 web/includes/csrf/
 web/js/videojs.zoomrotate.js
-web/skins/classic/js/bootstrap.js
+web/skins/classic/js/bootstrap-4.5.0.js
+web/skins/classic/js/bootstrap.bundle.min.js
 web/skins/classic/js/chosen
 web/skins/classic/js/dateTimePicker
 web/skins/classic/js/jquery-*.js
@@ -13,6 +14,8 @@ web/skins/classic/js/jquery.js
 web/skins/classic/js/moment.js
 web/skins/classic/js/video.js
 web/tools/mootools
+web/js/janus.js
+web/js/ajaxQueue.js
 
 # Cannot be parsed as JS
 web/skins/classic/includes/export_functions.php

.eslintrc.js

@@ -3,7 +3,7 @@
 module.exports = {
   "env": {
     "browser": true,
-    "es6": true,
+    "es2017": true,
   },
   "extends": ["google"],
   "overrides": [{

.github/FUNDING.yml

@@ -2,7 +2,7 @@
 
 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
+open_collective: zoneminder # 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

.github/workflows/ci-bionic.yml

@@ -0,0 +1,51 @@
+name: CI Ubuntu Bionic (18.04)
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    defaults:
+      run:
+        shell: bash
+    strategy:
+      matrix:
+        crypto_backend: [ openssl ]
+        jwt_backend: [ libjwt, jwt_cpp ]
+        include:
+          - crypto_backend: openssl
+            crypto_package: libssl-dev
+            jwt_package: libjwt-dev
+    runs-on: ubuntu-latest
+    container: ubuntu:bionic
+
+    steps:
+      - name: Update packages
+        run: apt-get -qq update && apt-get -qq upgrade && apt-get -qq install software-properties-common
+      - name: Install git
+        run: |
+          add-apt-repository ppa:git-core/ppa
+          apt-get -qq update
+          apt-get -qq install git
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Install dependencies
+        run: >
+          apt-get -qq install make cmake g++
+          default-libmysqlclient-dev
+          libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev
+          libcurl4-gnutls-dev libvlc-dev libvncserver-dev
+          libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl
+          libpolkit-gobject-1-dev
+          ${{ matrix.crypto_package }} ${{ matrix.jwt_package }}
+      - name: Prepare
+        run: mkdir build
+      - name: Configure
+        run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DENABLE_WERROR=1 -DZM_CRYPTO_BACKEND=${{ matrix.crypto_backend }} -DZM_JWT_BACKEND=${{ matrix.jwt_backend }}
+      - name: Build
+        run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]})

.github/workflows/ci-bullseye.yml

@@ -0,0 +1,57 @@
+name: CI Debian Bullseye
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    defaults:
+      run:
+        shell: bash
+    strategy:
+      matrix:
+        crypto_backend: [ gnutls, openssl ]
+        jwt_backend: [ libjwt, jwt_cpp ]
+        include:
+          - crypto_backend: gnutls
+            crypto_package: libgnutls28-dev
+            jwt_package: libjwt-gnutls-dev
+          - crypto_backend: openssl
+            crypto_package: libssl-dev
+            jwt_package: libjwt-dev
+        exclude:
+          - crypto_backend: gnutls
+            jwt_backend: jwt_cpp
+    runs-on: ubuntu-latest
+    container: debian:bullseye
+
+    steps:
+      - name: Update packages
+        run: apt-get -qq update && apt-get -qq upgrade
+      - name: Install git
+        run: apt-get -qq install git
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Install dependencies
+        run: >
+          apt-get -qq install make cmake g++
+          default-libmysqlclient-dev
+          libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev
+          libcurl4-gnutls-dev libvlc-dev libvncserver-dev
+          libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl
+          libpolkit-gobject-1-dev
+          catch2
+          ${{ matrix.crypto_package }} ${{ matrix.jwt_package }}
+      - name: Prepare
+        run: mkdir build
+      - name: Configure
+        run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DBUILD_TEST_SUITE=1 -DENABLE_WERROR=1 -DZM_CRYPTO_BACKEND=${{ matrix.crypto_backend }} -DZM_JWT_BACKEND=${{ matrix.jwt_backend }}
+      - name: Build
+        run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]})
+      - name: Run tests
+        run: cd build/tests && ./tests "~[notCI]"

.github/workflows/ci-buster.yml

@@ -0,0 +1,54 @@
+name: CI Debian Buster
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    defaults:
+      run:
+        shell: bash
+    strategy:
+      matrix:
+        crypto_backend: [ gnutls, openssl ]
+        jwt_backend: [ libjwt, jwt_cpp ]
+        include:
+          - crypto_backend: gnutls
+            crypto_package: libgnutls28-dev
+            jwt_package: libjwt-gnutls-dev
+          - crypto_backend: openssl
+            crypto_package: libssl-dev
+            jwt_package: libjwt-dev
+        exclude:
+          - crypto_backend: gnutls
+            jwt_backend: jwt_cpp
+    runs-on: ubuntu-latest
+    container: debian:buster
+
+    steps:
+      - name: Update packages
+        run: apt-get -qq update && apt-get -qq upgrade
+      - name: Install git
+        run: apt-get -qq install git
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Install dependencies
+        run: >
+          apt-get -qq install make cmake g++
+          default-libmysqlclient-dev
+          libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev
+          libcurl4-gnutls-dev libvlc-dev libvncserver-dev
+          libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl
+          libpolkit-gobject-1-dev
+          ${{ matrix.crypto_package }} ${{ matrix.jwt_package }}
+      - name: Prepare
+        run: mkdir build
+      - name: Configure
+        run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DENABLE_WERROR=1 -DZM_CRYPTO_BACKEND=${{ matrix.crypto_backend }} -DZM_JWT_BACKEND=${{ matrix.jwt_backend }}
+      - name: Build
+        run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]})

.github/workflows/ci-centos-7.yml

@@ -0,0 +1,39 @@
+name: CI CentOS 7
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        crypto_backend: [ gnutls, openssl ]
+        jwt_backend: [ libjwt, jwt_cpp ]
+        exclude:
+          - crypto_backend: gnutls
+            jwt_backend: jwt_cpp
+          - crypto_backend: gnutls
+            jwt_backend: libjwt
+    runs-on: ubuntu-latest
+    container: centos:7
+
+    steps:
+      - name: Enable RPMFusion and EPEL
+        run: yum -y install https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+      - name: Install git
+        run: yum -y install https://repo.ius.io/ius-release-el7.rpm && yum -y install git224
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Install dependencies
+        run: yum -y update && yum -y install make cmake3 gcc-c++ mariadb-devel ffmpeg-devel libcurl-devel vlc-devel libvncserver-devel libjpeg-turbo-devel "perl(Date::Manip)" "perl(DBD::mysql)" "perl(ExtUtils::MakeMaker)" "perl(Sys::Mmap)" "perl(Sys::Syslog)" "perl(LWP::UserAgent)" polkit-devel libjwt-devel
+      - name: Prepare
+        run: mkdir build
+      - name: Configure
+        run: cd build && cmake3 --version && cmake3 .. -DBUILD_MAN=0 -DENABLE_WERROR=1 -DZM_CRYPTO_BACKEND=${{ matrix.crypto_backend }} -DZM_JWT_BACKEND=${{ matrix.jwt_backend }}
+      - name: Build
+        run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]})

.github/workflows/ci-centos-8.yml

@@ -0,0 +1,41 @@
+name: CI CentOS 8
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        crypto_backend: [ gnutls, openssl ]
+        jwt_backend: [ libjwt, jwt_cpp ]
+        exclude:
+          - crypto_backend: gnutls
+            jwt_backend: jwt_cpp
+          - crypto_backend: gnutls
+            jwt_backend: libjwt
+    runs-on: ubuntu-latest
+    container: rockylinux:8
+
+    steps:
+      - name: Enable RPMFusion, EPEL and PowerTools
+        run: yum -y install "dnf-command(config-manager)" https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && yum config-manager --set-enabled powertools
+      - name: Install git
+        run: yum -y install git
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Install dependencies
+        run: yum -y update && yum -y install make cmake gcc-c++ catch-devel mariadb-devel ffmpeg-devel libcurl-devel vlc-devel libvncserver-devel libjpeg-turbo-devel "perl(Date::Manip)" "perl(DBD::mysql)" "perl(ExtUtils::MakeMaker)" "perl(Sys::Mmap)" "perl(Sys::Syslog)" "perl(LWP::UserAgent)" polkit-devel libjwt-devel
+      - name: Prepare
+        run: mkdir build
+      - name: Configure
+        run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DBUILD_TEST_SUITE=1 -DENABLE_WERROR=1  -DZM_CRYPTO_BACKEND=${{ matrix.crypto_backend }} -DZM_JWT_BACKEND=${{ matrix.jwt_backend }}
+      - name: Build
+        run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]})
+      - name: Run tests
+        run: cd build/tests && ./tests "~[notCI]"

.github/workflows/ci-eslint.yml

@@ -0,0 +1,21 @@
+name: CI ESLint
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  eslint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Install ESLint
+        run: npm install eslint@8.7.0 eslint-config-google@0.14.0 eslint-plugin-html@6.2.0 eslint-plugin-php-markup@6.0.0
+      - name: Run ESLint
+        run: npx eslint --ext .php,.js .

.github/workflows/ci-stretch.yml

@@ -0,0 +1,41 @@
+name: CI Debian Stretch
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    defaults:
+      run:
+        shell: bash
+    runs-on: ubuntu-latest
+    container: debian:stretch-backports
+
+    steps:
+      - name: Update packages
+        run: apt-get -qq update && apt-get -qq upgrade
+      - name: Install git
+        run: apt-get -qq install git/stretch-backports git-man/stretch-backports
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Install dependencies
+        run: >
+          apt-get -qq install make cmake g++
+          default-libmysqlclient-dev
+          libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libavdevice-dev
+          libcurl4-gnutls-dev libvlc-dev libvncserver-dev
+          libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl
+          libpolkit-gobject-1-dev
+          libssl-dev
+          libgsoap-dev
+      - name: Prepare
+        run: mkdir build
+      - name: Configure
+        run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DENABLE_WERROR=1
+      - name: Build
+        run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]})

.github/workflows/ci-xenial.yml

@@ -1,25 +0,0 @@
-name: CI Xenial
-
-on:
-  push:
-    branches:
-      - '*'
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: ubuntu-16.04
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install libavdevice-dev libcurl4-gnutls-dev libvlc-dev libvncserver-dev libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libpolkit-gobject-1-dev
-      - name: Prepare
-        run: mkdir build
-      - name: Configure
-        run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DENABLE_WERROR=1
-      - name: Build
-        run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]})

.github/workflows/codeql-analysis.yml

@@ -52,8 +52,8 @@ jobs:
         git submodule init
         git submodule update --init --recursive
         sudo apt-get update
-        sudo apt-get install libavdevice-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev  libjwt-gnutls-dev
-        sudo apt-get install libbz2-dev libgcrypt20-dev libcurl4-gnutls-dev libjpeg-turbo8-dev libturbojpeg0-dev
+        sudo apt-get install libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libjwt-gnutls-dev
+        sudo apt-get install libbz2-dev libcurl4-gnutls-dev libjpeg-turbo8-dev libturbojpeg0-dev
         sudo apt-get install default-libmysqlclient-dev libpcre3-dev libpolkit-gobject-1-dev libv4l-dev libvlc-dev
         sudo apt-get install libdate-manip-perl libdbd-mysql-perl libphp-serialization-perl libsys-mmap-perl
         sudo apt-get install libwww-perl libdata-uuid-perl libssl-dev libcrypt-eksblowfish-perl libdata-entropy-perl

.github/workflows/create-packages.yml

@@ -0,0 +1,41 @@
+name: Create packages
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  package:
+    strategy:
+      matrix:
+        os_dist:
+          - os: debian
+            dist: buster
+          - os: debian
+            dist: bullseye
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+          submodules: recursive
+      - name: Run packpack
+        env:
+          SMPFLAGS: -j4
+          OS: ${{ matrix.os_dist.os }}
+          DIST: ${{ matrix.os_dist.dist }}
+          DOCKER_REPO: iconzm/packpack
+        run: utils/packpack/startpackpack.sh
+
+      - name: Publish
+        uses: easingthemes/ssh-deploy@main
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.ZMREPO_SSH_KEY }}
+          ARGS: "-rltgoDzvO"
+          SOURCE: build/
+          REMOTE_HOST: ${{ secrets.ZMREPO_HOST }}
+          REMOTE_USER: ${{ secrets.ZMREPO_SSH_USER }}
+          TARGET: debian/master/mini-dinstall/incoming/

.gitignore

@@ -124,6 +124,7 @@ src/zmc
 src/zmf
 src/zms
 src/zmu
+src/zm_rtsp_server
 src/zoneminder-zmc.8
 src/zoneminder-zmc.8.gz
 src/zoneminder-zmf.8

.gitlab-ci.yml

@@ -0,0 +1,18 @@
+default:
+  image:
+    name: ubuntu:latest
+  before_script:
+    - apt-get update -yq
+    - DEBIAN_FRONTEND=noninteractive apt-get install -yq devscripts sudo
+
+deb:
+  stage: build
+  tags:
+    - docker
+  script:
+    - yes "" | ./utils/do_debian_package.sh --snapshot=stable --type=binary --interactive=no --dput=no --debbuild-extra=--no-sign || true
+  timeout: 2h
+  artifacts:
+    paths:
+      - '*.deb'
+    expire_in: 1 week

.readthedocs.yaml

@@ -0,0 +1,9 @@
+version: 2
+
+build:
+  os: "ubuntu-20.04"
+  tools:
+    python: "3.8"
+
+sphinx:
+  fail_on_warning: true

.travis.yml

@@ -1,58 +0,0 @@
-language: cpp
-sudo: required
-dist: bionic
-git:
-  depth: 9999999
-notifications:
-  irc: chat.freenode.net#zoneminder-dev
-branches:
-  except:
-  - modern
-cache: ccache
-addons:
-  ssh_known_hosts: zmrepo.zoneminder.com
-  apt:
-    sources:
-    - sourceline: ppa:iconnor/zoneminder-master
-    - key_url: http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x4D0BF748776FFB04
-    packages:
-    - gdebi
-    - yum-utils
-    - patch
-    - git
-    - curl
-    - sshfs
-    - sed
-    - binfmt-support
-    - qemu
-    - qemu-user-static
-    - dnsutils
-    - traceroute
-install:
-  - update-binfmts --enable qemu-arm
-
-env:
-  - SMPFLAGS=-j4 OS=eslint DIST=eslint
-  - SMPFLAGS=-j4 OS=ubuntu DIST=bionic DOCKER_REPO=iconzm/packpack
-
-compiler:
-- gcc
-services:
-- mysql
-- docker
-
-script:
-- utils/packpack/startpackpack.sh
-
-before_deploy:
-- openssl aes-256-cbc -K $encrypted_62a62750aa73_key -iv $encrypted_62a62750aa73_iv -in ./utils/packpack/deploy_rsa.enc -out /tmp/deploy_rsa -d
-- eval "$(ssh-agent -s)"
-- chmod 600 /tmp/deploy_rsa
-- ssh-add /tmp/deploy_rsa
-
-deploy:
-  provider: script
-  skip_cleanup: true
-  script: utils/packpack/rsync_xfer.sh
-  on:
-    branch: master

CMakeLists.txt

@@ -69,9 +69,7 @@ include(GNUInstallDirs)
 include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckFunctionExists)
-include(CheckPrototypeDefinition_fixed)
 include(CheckTypeSize)
-include(CheckStructHasMember)
 include(CheckSendfile)
 
 # Configuration options
@@ -85,6 +83,7 @@ mark_as_advanced(
   ZM_TARGET_DISTRO
   ZM_PATH_MAP
   ZM_PATH_ARP
+  ZM_PATH_ARP_SCAN
   ZM_CONFIG_DIR
   ZM_CONFIG_SUBDIR
   ZM_SYSTEMD
@@ -147,6 +146,8 @@ set(ZM_PATH_MAP "/dev/shm" CACHE PATH
   "Location to save mapped memory files, default: /dev/shm")
 set(ZM_PATH_ARP "" CACHE PATH
   "Full path to compatible arp binary. Leave empty for automatic detection.")
+set(ZM_PATH_ARP_SCAN "" CACHE PATH
+  "Full path to compatible scan_arp binary. Leave empty for automatic detection.")
 set(ZM_CONFIG_DIR "/${CMAKE_INSTALL_SYSCONFDIR}" CACHE PATH
   "Location of ZoneMinder configuration, default system config directory")
 set(ZM_CONFIG_SUBDIR "${ZM_CONFIG_DIR}/conf.d" CACHE PATH
@@ -169,6 +170,8 @@ set(ZM_NO_X10 "OFF" CACHE BOOL
 set(ZM_ONVIF "ON" CACHE BOOL
   "Set to ON to enable basic ONVIF support. This is EXPERIMENTAL and may not
     work with all cameras claiming to be ONVIF compliant. default: ON")
+set(ZM_NO_PCRE "OFF" CACHE BOOL
+  "Set to ON to skip libpcre3 checks and force building ZM without libpcre3. default: OFF")
 set(ZM_NO_RTSPSERVER "OFF" CACHE BOOL
   "Set to ON to skip building ZM with rtsp server support. default: OFF")
 set(ZM_PERL_MM_PARMS INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 CACHE STRING
@@ -192,6 +195,24 @@ set(ZM_MANPAGE_DEST_PREFIX "share/man" CACHE PATH
 set(ZM_CAKEPHP_CACHE "Apc" CACHE STRING
   "Set the CakePHP cache engine, default: Apc")
 
+# Supported crypto backends. Using OpenSSL by default to be compatible with jwt-cpp.
+set(ZM_CRYPTO_BACKEND_OPTIONS gnutls openssl)
+set(ZM_CRYPTO_BACKEND openssl CACHE STRING "Determines which crypto backend should be used.")
+set_property(CACHE ZM_CRYPTO_BACKEND PROPERTY STRINGS ${ZM_CRYPTO_BACKEND_OPTIONS})
+
+if(NOT ZM_CRYPTO_BACKEND IN_LIST ZM_CRYPTO_BACKEND_OPTIONS)
+  message(FATAL_ERROR "Invalid value for ZM_CRYPTO_BACKEND. Possible options: ${ZM_CRYPTO_BACKEND_OPTIONS}")
+endif()
+
+# Supported JWT backends. Using jwt-cpp as default.
+set(ZM_JWT_BACKEND_OPTIONS libjwt jwt_cpp)
+set(ZM_JWT_BACKEND jwt_cpp CACHE STRING "Determines which JWT backend should be used.")
+set_property(CACHE ZM_JWT_BACKEND PROPERTY STRINGS ${ZM_JWT_BACKEND_OPTIONS})
+
+if(NOT ZM_JWT_BACKEND IN_LIST ZM_JWT_BACKEND_OPTIONS)
+  message(FATAL_ERROR "Invalid value for ZM_JWT_BACKEND. Possible options: ${ZM_JWT_BACKEND_OPTIONS}")
+endif()
+
 # Reassign some variables if a target distro has been specified
 if(ZM_TARGET_DISTRO MATCHES "^fc")
   set(ZM_CAKEPHP_CACHE "Memcached")
@@ -252,11 +273,6 @@ if(ZM_SYSTEMD OR (IS_DIRECTORY /usr/lib/systemd/system) OR (IS_DIRECTORY /lib/sy
 endif()
 
 # System checks
-check_include_file("libv4l1-videodev.h" HAVE_LIBV4L1_VIDEODEV_H)
-if(NOT HAVE_LIBV4L1_VIDEODEV_H)
-  check_include_file("linux/videodev.h" HAVE_LINUX_VIDEODEV_H)
-endif()
-check_include_file("linux/videodev2.h" HAVE_LINUX_VIDEODEV2_H)
 check_include_file("execinfo.h" HAVE_EXECINFO_H)
 if(HAVE_EXECINFO_H)
   check_function_exists("backtrace" HAVE_DECL_BACKTRACE)
@@ -305,10 +321,10 @@ endif()
 # Do not check for cURL if ZM_NO_CURL is on
 if(NOT ZM_NO_CURL)
   # cURL
-  find_package(CURL)
+  find_package(CURL REQUIRED)
   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)
@@ -336,19 +352,20 @@ else()
     "ZoneMinder requires jpeg but it was not found on your system")
 endif()
 
-# LIBJWT
-find_package(LibJWT)
-if(LIBJWT_FOUND)
+# libjwt
+if (${ZM_JWT_BACKEND} STREQUAL "libjwt")
+  find_package(LibJWT REQUIRED COMPONENTS ${ZM_CRYPTO_BACKEND})
+  if(LIBJWT_FOUND)
     set(HAVE_LIBJWT 1)
     set(optlibsfound "${optlibsfound} LIBJWT")
-  list(APPEND ZM_BIN_LIBS "${LIBJWT_LIBRARY}")
-else()
+  else()
     set(optlibsnotfound "${optlibsnotfound} LIBJWT")
+  endif()
 endif()
 
-# gnutls (using find_library and find_path)
-if(HAVE_LIBJWT)
-  find_library(GNUTLS_LIBRARIES gnutls)
+# GnuTLS
+if (${ZM_CRYPTO_BACKEND} STREQUAL "gnutls")
+  find_library(GNUTLS_LIBRARIES gnutls REQUIRED)
   if(GNUTLS_LIBRARIES)
     set(HAVE_LIBGNUTLS 1)
     list(APPEND ZM_BIN_LIBS "${GNUTLS_LIBRARIES}")
@@ -358,23 +375,18 @@ if(HAVE_LIBJWT)
       set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
     endif()
     mark_as_advanced(FORCE GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIR)
-    check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
     set(optlibsfound "${optlibsfound} GnuTLS")
   else()
     set(optlibsnotfound "${optlibsnotfound} GnuTLS")
   endif()
-endif()
-
 # OpenSSL
-if(NOT HAVE_LIBGNUTLS OR NOT HAVE_LIBJWT)
-  find_package(OpenSSL)
+elseif (${ZM_CRYPTO_BACKEND} STREQUAL "openssl")
+  find_package(OpenSSL REQUIRED)
   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()
     set(optlibsnotfound "${optlibsnotfound} OpenSSL")
@@ -400,9 +412,11 @@ else()
   message(FATAL_ERROR "ZoneMinder requires pthread but it was not found on your system")
 endif()
 
-# pcre (using find_library and find_path)
-find_library(PCRE_LIBRARIES pcre)
-if(PCRE_LIBRARIES)
+# Do not check for cURL if ZM_NO_CURL is on
+if(NOT ZM_NO_PRCE)
+  # pcre (using find_library and find_path)
+  find_library(PCRE_LIBRARIES pcre)
+  if(PCRE_LIBRARIES)
     set(HAVE_LIBPCRE 1)
     list(APPEND ZM_BIN_LIBS "${PCRE_LIBRARIES}")
     find_path(PCRE_INCLUDE_DIR pcre.h)
@@ -413,25 +427,9 @@ if(PCRE_LIBRARIES)
     mark_as_advanced(FORCE PCRE_LIBRARIES PCRE_INCLUDE_DIR)
     check_include_file("pcre.h" HAVE_PCRE_H)
     set(optlibsfound "${optlibsfound} PCRE")
-else()
+  else()
     set(optlibsnotfound "${optlibsnotfound} PCRE")
-endif()
-
-# gcrypt (using find_library and find_path)
-find_library(GCRYPT_LIBRARIES gcrypt)
-if(GCRYPT_LIBRARIES)
-  set(HAVE_LIBGCRYPT 1)
-  list(APPEND ZM_BIN_LIBS "${GCRYPT_LIBRARIES}")
-  find_path(GCRYPT_INCLUDE_DIR gcrypt.h)
-  if(GCRYPT_INCLUDE_DIR)
-    include_directories("${GCRYPT_INCLUDE_DIR}")
-    set(CMAKE_REQUIRED_INCLUDES "${GCRYPT_INCLUDE_DIR}")
   endif()
-  mark_as_advanced(FORCE GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIR)
-  check_include_file("gcrypt.h" HAVE_GCRYPT_H)
-  set(optlibsfound "${optlibsfound} GCrypt")
-else()
-  set(optlibsnotfound "${optlibsnotfound} GCrypt")
 endif()
 
 # mysqlclient (using find_library and find_path)
@@ -453,129 +451,19 @@ else()
   message(FATAL_ERROR "ZoneMinder requires mysqlclient but it was not found on your system")
 endif()
 
+find_package(FFMPEG 55.34.100 REQUIRED
+  COMPONENTS
+    avcodec
+    avformat
+    avutil
+    swresample
+    swscale)
+
+set(CMAKE_REQUIRED_INCLUDES ${FFMPEG_avutil_INCLUDE_DIRS})
+check_include_file("libavutil/hwcontext.h" HAVE_LIBAVUTIL_HWCONTEXT_H)
+
 set(PATH_FFMPEG "")
 set(OPT_FFMPEG "no")
-# avformat (using find_library and find_path)
-find_library(AVFORMAT_LIBRARIES avformat)
-if(AVFORMAT_LIBRARIES)
-  set(HAVE_LIBAVFORMAT 1)
-  list(APPEND ZM_BIN_LIBS "${AVFORMAT_LIBRARIES}")
-  find_path(AVFORMAT_INCLUDE_DIR "libavformat/avformat.h" /usr/include/ffmpeg)
-  if(AVFORMAT_INCLUDE_DIR)
-    include_directories("${AVFORMAT_INCLUDE_DIR}")
-    set(CMAKE_REQUIRED_INCLUDES "${AVFORMAT_INCLUDE_DIR}")
-  endif()
-  mark_as_advanced(FORCE AVFORMAT_LIBRARIES AVFORMAT_INCLUDE_DIR)
-  check_include_file("libavformat/avformat.h" HAVE_LIBAVFORMAT_AVFORMAT_H)
-  set(optlibsfound "${optlibsfound} AVFormat")
-else()
-  set(optlibsnotfound "${optlibsnotfound} AVFormat")
-endif()
-
-# avcodec (using find_library and find_path)
-find_library(AVCODEC_LIBRARIES avcodec)
-if(AVCODEC_LIBRARIES)
-  set(HAVE_LIBAVCODEC 1)
-  list(APPEND ZM_BIN_LIBS "${AVCODEC_LIBRARIES}")
-  find_path(AVCODEC_INCLUDE_DIR "libavcodec/avcodec.h" /usr/include/ffmpeg)
-  if(AVCODEC_INCLUDE_DIR)
-    include_directories("${AVCODEC_INCLUDE_DIR}")
-    set(CMAKE_REQUIRED_INCLUDES "${AVCODEC_INCLUDE_DIR}")
-  endif()
-  mark_as_advanced(FORCE AVCODEC_LIBRARIES AVCODEC_INCLUDE_DIR)
-  check_include_file("libavcodec/avcodec.h" HAVE_LIBAVCODEC_AVCODEC_H)
-  set(optlibsfound "${optlibsfound} AVCodec")
-else()
-  message(WARNING "\nWhile it should be possible to build ZM without AVCODEC the result will pretty useless.")
-  set(optlibsnotfound "${optlibsnotfound} AVCodec")
-endif()
-
-# avdevice (using find_library and find_path)
-find_library(AVDEVICE_LIBRARIES avdevice)
-if(AVDEVICE_LIBRARIES)
-  set(HAVE_LIBAVDEVICE 1)
-  list(APPEND ZM_BIN_LIBS "${AVDEVICE_LIBRARIES}")
-  find_path(AVDEVICE_INCLUDE_DIR "libavdevice/avdevice.h" /usr/include/ffmpeg)
-  if(AVDEVICE_INCLUDE_DIR)
-    include_directories("${AVDEVICE_INCLUDE_DIR}")
-    set(CMAKE_REQUIRED_INCLUDES "${AVDEVICE_INCLUDE_DIR}")
-  endif()
-  mark_as_advanced(FORCE AVDEVICE_LIBRARIES AVDEVICE_INCLUDE_DIR)
-  check_include_file("libavdevice/avdevice.h" HAVE_LIBAVDEVICE_AVDEVICE_H)
-  set(optlibsfound "${optlibsfound} AVDevice")
-else()
-  set(optlibsnotfound "${optlibsnotfound} AVDevice")
-endif()
-
-# avutil (using find_library and find_path)
-find_library(AVUTIL_LIBRARIES avutil)
-if(AVUTIL_LIBRARIES)
-  set(HAVE_LIBAVUTIL 1)
-  list(APPEND ZM_BIN_LIBS "${AVUTIL_LIBRARIES}")
-  find_path(AVUTIL_INCLUDE_DIR "libavutil/avutil.h" /usr/include/ffmpeg)
-  if(AVUTIL_INCLUDE_DIR)
-    include_directories("${AVUTIL_INCLUDE_DIR}")
-    set(CMAKE_REQUIRED_INCLUDES "${AVUTIL_INCLUDE_DIR}")
-  endif()
-  mark_as_advanced(FORCE AVUTIL_LIBRARIES AVUTIL_INCLUDE_DIR)
-  check_include_file("libavutil/avutil.h" HAVE_LIBAVUTIL_AVUTIL_H)
-  check_include_file("libavutil/mathematics.h" HAVE_LIBAVUTIL_MATHEMATICS_H)
-  check_include_file("libavutil/hwcontext.h" HAVE_LIBAVUTIL_HWCONTEXT_H)
-  set(optlibsfound "${optlibsfound} AVUtil")
-else()
-  set(optlibsnotfound "${optlibsnotfound} AVUtil")
-endif()
-
-# swscale (using find_library and find_path)
-find_library(SWSCALE_LIBRARIES swscale)
-if(SWSCALE_LIBRARIES)
-  set(HAVE_LIBSWSCALE 1)
-  list(APPEND ZM_BIN_LIBS "${SWSCALE_LIBRARIES}")
-  find_path(SWSCALE_INCLUDE_DIR "libswscale/swscale.h" /usr/include/ffmpeg)
-  if(SWSCALE_INCLUDE_DIR)
-    include_directories("${SWSCALE_INCLUDE_DIR}")
-    set(CMAKE_REQUIRED_INCLUDES "${SWSCALE_INCLUDE_DIR}")
-  endif()
-  mark_as_advanced(FORCE SWSCALE_LIBRARIES SWSCALE_INCLUDE_DIR)
-  check_include_file("libswscale/swscale.h" HAVE_LIBSWSCALE_SWSCALE_H)
-  set(optlibsfound "${optlibsfound} SWScale")
-else()
-  set(optlibsnotfound "${optlibsnotfound} SWScale")
-endif()
-
-# SWresample (using find_library and find_path)
-find_library(SWRESAMPLE_LIBRARIES swresample)
-if(SWRESAMPLE_LIBRARIES)
-  set(HAVE_LIBSWRESAMPLE 1)
-  list(APPEND ZM_BIN_LIBS "${SWRESAMPLE_LIBRARIES}")
-  find_path(SWRESAMPLE_INCLUDE_DIR "libswresample/swresample.h" /usr/include/ffmpeg)
-  if(SWRESAMPLE_INCLUDE_DIR)
-    include_directories("${SWRESAMPLE_INCLUDE_DIR}")
-    set(CMAKE_REQUIRED_INCLUDES "${SWRESAMPLE_INCLUDE_DIR}")
-  endif()
-  mark_as_advanced(FORCE SWRESAMPLE_LIBRARIES SWRESAMPLE_INCLUDE_DIR)
-  check_include_file("libswresample/swresample.h" HAVE_LIBSWRESAMPLE_SWRESAMPLE_H)
-  set(optlibsfound "${optlibsfound} SWResample")
-else()
-  set(optlibsnotfound "${optlibsnotfound} SWResample")
-
-  # AVresample (using find_library and find_path)
-  find_library(AVRESAMPLE_LIBRARIES avresample)
-  if(AVRESAMPLE_LIBRARIES)
-    set(HAVE_LIBAVRESAMPLE 1)
-    list(APPEND ZM_BIN_LIBS "${AVRESAMPLE_LIBRARIES}")
-    find_path(AVRESAMPLE_INCLUDE_DIR "libavresample/avresample.h" /usr/include/ffmpeg)
-    if(AVRESAMPLE_INCLUDE_DIR)
-      include_directories("${AVRESAMPLE_INCLUDE_DIR}")
-      set(CMAKE_REQUIRED_INCLUDES "${AVRESAMPLE_INCLUDE_DIR}")
-    endif()
-    mark_as_advanced(FORCE AVRESAMPLE_LIBRARIES AVRESAMPLE_INCLUDE_DIR)
-    check_include_file("libavresample/avresample.h" HAVE_LIBAVRESAMPLE_AVRESAMPLE_H)
-    set(optlibsfound "${optlibsfound} AVResample")
-  else()
-    set(optlibsnotfound "${optlibsnotfound} AVResample")
-  endif()
-endif()
 
 # Find the path to the ffmpeg executable
 find_program(FFMPEG_EXECUTABLE
@@ -633,6 +521,15 @@ endif()
 #list(APPEND ZM_BIN_LIBS "${Boost_LIBRARIES}")
 #endif()
 
+
+find_package(GSOAP 2.0.0)
+if (GSOAP_FOUND)
+  set(optlibsfound "${optlibsfound} gsoap")
+  add_compile_definitions(WITH_GSOAP)
+else()
+  set(optlibsnotfound "${optlibsnotfound} gsoap")
+endif()
+
 if(NOT ZM_NO_RTSPSERVER)
   set(HAVE_RTSP_SERVER 1)
 else()
@@ -642,34 +539,25 @@ endif()
 #
 # *** END OF LIBRARY CHECKS ***
 
-# Check for gnutls or crypto
-if((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))
-  message(FATAL_ERROR "ZoneMinder requires crypto or gnutls but none were found on your system")
+# If libjwt is not present we fall back to jwt-cpp which requires OpenSSL
+if((NOT HAVE_LIBJWT) AND (NOT HAVE_LIBOPENSSL))
+  message(FATAL_ERROR "Using the jwt-cpp backend requires OpenSSL as crypto backend.")
 endif()
 
-# Check for V4L header files and enable ZM_HAS_V4L, ZM_HAS_V4L1, ZM_HAS_V4L2 accordingly
-# Setting to zeros first is required because ZM uses #define for these
-set(ZM_HAS_V4L 0)
-set(ZM_HAS_V4L1 0)
-set(ZM_HAS_V4L2 0)
-if(HAVE_LINUX_VIDEODEV_H OR HAVE_LIBV4L1_VIDEODEV_H)
-  set(ZM_HAS_V4L 1)
-  set(ZM_HAS_V4L1 1)
-endif()
-if(HAVE_LINUX_VIDEODEV2_H)
-  set(ZM_HAS_V4L 1)
+find_package(V4L2)
+if(TARGET V4L2::videodev2)
   set(ZM_HAS_V4L2 1)
-endif()
-if((NOT HAVE_LINUX_VIDEODEV_H)
-  AND (NOT HAVE_LIBV4L1_VIDEODEV_H)
-  AND (NOT HAVE_LINUX_VIDEODEV2_H))
+else()
+  set(ZM_HAS_V4L2 0)
   message(AUTHOR_WARNING "Video 4 Linux headers weren't found - Analog and USB camera support will not be available")
 endif()
+
 # Check for PCRE and enable ZM_PCRE accordingly
 set(ZM_PCRE 0)
 if(HAVE_LIBPCRE AND HAVE_PCRE_H)
   set(ZM_PCRE 1)
 endif()
+
 # Check for mmap and enable in all components
 set(ZM_MEM_MAPPED 0)
 set(ENABLE_MMAP no)
@@ -685,42 +573,6 @@ if(ZM_ONVIF)
   set(ZM_HAS_ONVIF 1)
 endif()
 
-# Check for authentication functions
-if(HAVE_OPENSSL_MD5_H)
-  set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
-  set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
-  check_prototype_definition(
-    MD5
-    "unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md)" "NULL" "openssl/md5.h"
-    HAVE_MD5_OPENSSL)
-endif()
-
-if(HAVE_GNUTLS_GNUTLS_H)
-  set(CMAKE_REQUIRED_LIBRARIES "${GNUTLS_LIBRARIES}")
-  set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
-  check_prototype_definition(
-    gnutls_fingerprint
-    "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()
-
-if(NOT HAVE_DECL_GNUTLS_FINGERPRINT AND HAVE_MD5_OPENSSL)
-  set(HAVE_DECL_MD5 1)
-endif()
-
-if((NOT HAVE_MD5_OPENSSL) AND (NOT HAVE_DECL_GNUTLS_FINGERPRINT))
-  message(AUTHOR_WARNING
-    "ZoneMinder requires a working MD5 function for hashed authentication but
-     none were found - hashed authentication will not be available")
-endif()
-
-# 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)
-  set(HAVE_GCRYPT_H 0)
-  set(HAVE_GNUTLS_OPENSSL_H 0)
-endif()
-
 # Check for Perl
 find_package(Perl)
 if(NOT PERL_FOUND)
@@ -792,6 +644,18 @@ if(ZM_PATH_ARP STREQUAL "")
   endif()
 endif()
 
+# Find the path to an arp-scan compatible executable
+if(ZM_PATH_ARP_SCAN STREQUAL "")
+  find_program(ARP_SCAN_EXECUTABLE arp-scan)
+  if(ARP_SCAN_EXECUTABLE)
+    set(ZM_PATH_ARP_SCAN "${ARP_SCAN_EXECUTABLE}")
+    mark_as_advanced(ARP_SCAN_EXECUTABLE)
+  endif()
+  if(ARP_SCAN_EXECUTABLE-NOTFOUND)
+    message(WARNING "Unable to find a compatible arp-scan binary. Monitor probe will be less powerful.")
+  endif()
+endif()
+
 # Some variables that zm expects
 set(ZM_PID "${ZM_RUNDIR}/zm.pid")
 set(ZM_CONFIG "${ZM_CONFIG_DIR}/zm.conf")
@@ -858,6 +722,9 @@ endif()
 message(STATUS "Optional libraries found:${optlibsfound}")
 message(STATUS "Optional libraries not found:${optlibsnotfound}")
 
+message(STATUS "Enabled crypto backend: ${ZM_CRYPTO_BACKEND}")
+message(STATUS "Enabled JWT backend: ${ZM_JWT_BACKEND}")
+
 # Run ZM configuration generator
 message(STATUS "Running ZoneMinder configuration generator")
 execute_process(COMMAND perl ${CMAKE_CURRENT_BINARY_DIR}/zmconfgen.pl RESULT_VARIABLE ZMCONFGEN_RESULT)

README.md

@@ -1,10 +1,8 @@
 ZoneMinder
 ==========
 
-[![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
 
@@ -26,11 +24,11 @@ https://github.com/ZoneMinder/zmdockerfiles
 
 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)
+- Ubuntu via [Isaac Connor'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)
-- OpenSuse via [third party repository](http://www.zoneminder.com/wiki/index.php/Installing_using_ZoneMinder_RPMs_for_SuSE)
+- OpenSuse via [third party repository](https://wiki.zoneminder.com/Installing_using_ZoneMinder_RPMs_for_SuSE)
 - Mageia from their default repository
 - Arch via the [AUR](https://aur.archlinux.org/packages/zoneminder/)
 - Gentoo via [Portage Overlays](http://gpo.zugaina.org/www-misc/zoneminder)

cmake/Modules/CheckPrototypeDefinition.c.in

@@ -1,29 +0,0 @@
-@CHECK_PROTOTYPE_DEFINITION_HEADER@
-
-static void cmakeRequireSymbol(int dummy, ...) {
-  (void) dummy;
-}
-
-static void checkSymbol(void) {
-#ifndef @CHECK_PROTOTYPE_DEFINITION_SYMBOL@
-  cmakeRequireSymbol(0, &@CHECK_PROTOTYPE_DEFINITION_SYMBOL@);
-#endif
-}
-
-@CHECK_PROTOTYPE_DEFINITION_PROTO@ {
-  return @CHECK_PROTOTYPE_DEFINITION_RETURN@;
-}
-
-#ifdef __CLASSIC_C__
-int main() {
-  int ac;
-  char*av[];
-#else
-int main(int ac, char *av[]) {
-#endif
-  checkSymbol();
-  if (ac > 1000) {
-    return *av[0];
-  }
-  return 0;
-}

cmake/Modules/CheckPrototypeDefinition.cmake

@@ -1,98 +0,0 @@
-# - Check if the protoype we expect is correct.
-# check_prototype_definition(FUNCTION PROTOTYPE RETURN HEADER VARIABLE)
-#  FUNCTION - The name of the function (used to check if prototype exists)
-#  PROTOTYPE- The prototype to check.
-#  RETURN - The return value of the function.
-#  HEADER - The header files required.
-#  VARIABLE - The variable to store the result.
-# Example:
-#  check_prototype_definition(getpwent_r
-#   "struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)"
-#   "NULL"
-#   "unistd.h;pwd.h"
-#   SOLARIS_GETPWENT_R)
-# The following variables may be set before calling this macro to
-# modify the way the check is run:
-#
-#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
-#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
-#  CMAKE_REQUIRED_INCLUDES = list of include directories
-#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
-
-#=============================================================================
-# Copyright 2005-2009 Kitware, Inc.
-# Copyright 2010-2011 Andreas Schneider <asn@cryptomilk.org>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-#
-
-
-get_filename_component(__check_proto_def_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
-
-
-function(CHECK_PROTOTYPE_DEFINITION _FUNCTION _PROTOTYPE _RETURN _HEADER _VARIABLE)
-
-  if ("${_VARIABLE}" MATCHES "^${_VARIABLE}$")
-    set(CHECK_PROTOTYPE_DEFINITION_CONTENT "/* */\n")
-
-    set(CHECK_PROTOTYPE_DEFINITION_FLAGS ${CMAKE_REQUIRED_FLAGS})
-    if (CMAKE_REQUIRED_LIBRARIES)
-      set(CHECK_PROTOTYPE_DEFINITION_LIBS
-        LINK_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-    else()
-      set(CHECK_PROTOTYPE_DEFINITION_LIBS)
-    endif()
-    if (CMAKE_REQUIRED_INCLUDES)
-      set(CMAKE_SYMBOL_EXISTS_INCLUDES
-        "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
-    else()
-      set(CMAKE_SYMBOL_EXISTS_INCLUDES)
-    endif()
-
-    foreach(_FILE ${_HEADER})
-      set(CHECK_PROTOTYPE_DEFINITION_HEADER
-        "${CHECK_PROTOTYPE_DEFINITION_HEADER}#include <${_FILE}>\n")
-    endforeach()
-
-    set(CHECK_PROTOTYPE_DEFINITION_SYMBOL ${_FUNCTION})
-    set(CHECK_PROTOTYPE_DEFINITION_PROTO ${_PROTOTYPE})
-    set(CHECK_PROTOTYPE_DEFINITION_RETURN ${_RETURN})
-
-    configure_file("${__check_proto_def_dir}/CheckPrototypeDefinition.c.in"
-      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c" @ONLY)
-
-    file(READ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c _SOURCE)
-
-    try_compile(${_VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c
-      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
-      ${CHECK_PROTOTYPE_DEFINITION_LIBS}
-      CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CHECK_PROTOTYPE_DEFINITION_FLAGS}
-      "${CMAKE_SYMBOL_EXISTS_INCLUDES}"
-      OUTPUT_VARIABLE OUTPUT)
-
-    if (${_VARIABLE})
-      set(${_VARIABLE} 1 CACHE INTERNAL "Have correct prototype for ${_FUNCTION}")
-      message(STATUS "Checking prototype ${_FUNCTION} for ${_VARIABLE} - True")
-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-        "Determining if the prototype ${_FUNCTION} exists for ${_VARIABLE} passed with the following output:\n"
-        "${OUTPUT}\n\n")
-    else ()
-      message(STATUS "Checking prototype ${_FUNCTION} for ${_VARIABLE} - False")
-      set(${_VARIABLE} 0 CACHE INTERNAL "Have correct prototype for ${_FUNCTION}")
-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-        "Determining if the prototype ${_FUNCTION} exists for ${_VARIABLE} failed with the following output:\n"
-        "${OUTPUT}\n\n${_SOURCE}\n\n")
-    endif ()
-  endif()
-
-endfunction()

cmake/Modules/CheckPrototypeDefinition_fixed.cmake

@@ -1,98 +0,0 @@
-# - Check if the protoype we expect is correct.
-# check_prototype_definition(FUNCTION PROTOTYPE RETURN HEADER VARIABLE)
-#  FUNCTION - The name of the function (used to check if prototype exists)
-#  PROTOTYPE- The prototype to check.
-#  RETURN - The return value of the function.
-#  HEADER - The header files required.
-#  VARIABLE - The variable to store the result.
-# Example:
-#  check_prototype_definition(getpwent_r
-#   "struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)"
-#   "NULL"
-#   "unistd.h;pwd.h"
-#   SOLARIS_GETPWENT_R)
-# The following variables may be set before calling this macro to
-# modify the way the check is run:
-#
-#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
-#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
-#  CMAKE_REQUIRED_INCLUDES = list of include directories
-#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
-
-#=============================================================================
-# Copyright 2005-2009 Kitware, Inc.
-# Copyright 2010-2011 Andreas Schneider <asn@cryptomilk.org>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-#
-
-
-get_filename_component(__check_proto_def_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
-
-
-function(CHECK_PROTOTYPE_DEFINITION _FUNCTION _PROTOTYPE _RETURN _HEADER _VARIABLE)
-
-  if ("${_VARIABLE}" MATCHES "^${_VARIABLE}$")
-    set(CHECK_PROTOTYPE_DEFINITION_CONTENT "/* */\n")
-
-    set(CHECK_PROTOTYPE_DEFINITION_FLAGS ${CMAKE_REQUIRED_FLAGS})
-    if (CMAKE_REQUIRED_LIBRARIES)
-      set(CHECK_PROTOTYPE_DEFINITION_LIBS
-        ${LINK_LIBRARIES} ${CMAKE_REQUIRED_LIBRARIES})
-    else()
-      set(CHECK_PROTOTYPE_DEFINITION_LIBS)
-    endif()
-    if (CMAKE_REQUIRED_INCLUDES)
-      set(CMAKE_SYMBOL_EXISTS_INCLUDES
-        "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
-    else()
-      set(CMAKE_SYMBOL_EXISTS_INCLUDES)
-    endif()
-
-    foreach(_FILE ${_HEADER})
-      set(CHECK_PROTOTYPE_DEFINITION_HEADER
-        "${CHECK_PROTOTYPE_DEFINITION_HEADER}#include <${_FILE}>\n")
-    endforeach()
-
-    set(CHECK_PROTOTYPE_DEFINITION_SYMBOL ${_FUNCTION})
-    set(CHECK_PROTOTYPE_DEFINITION_PROTO ${_PROTOTYPE})
-    set(CHECK_PROTOTYPE_DEFINITION_RETURN ${_RETURN})
-
-    configure_file("${__check_proto_def_dir}/CheckPrototypeDefinition.c.in"
-      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c" @ONLY)
-
-    file(READ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c _SOURCE)
-
-    try_compile(${_VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c
-      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
-      ${CHECK_PROTOTYPE_DEFINITION_LIBS}
-      CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CHECK_PROTOTYPE_DEFINITION_FLAGS}
-      "${CMAKE_SYMBOL_EXISTS_INCLUDES}"
-      OUTPUT_VARIABLE OUTPUT)
-
-    if (${_VARIABLE})
-      set(${_VARIABLE} 1 CACHE INTERNAL "Have correct prototype for ${_FUNCTION}")
-      message(STATUS "Checking prototype ${_FUNCTION} for ${_VARIABLE} - True")
-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-        "Determining if the prototype ${_FUNCTION} exists for ${_VARIABLE} passed with the following output:\n"
-        "${OUTPUT}\n\n")
-    else ()
-      message(STATUS "Checking prototype ${_FUNCTION} for ${_VARIABLE} - False")
-      set(${_VARIABLE} 0 CACHE INTERNAL "Have correct prototype for ${_FUNCTION}")
-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-        "Determining if the prototype ${_FUNCTION} exists for ${_VARIABLE} failed with the following output:\n"
-        "${OUTPUT}\n\n${_SOURCE}\n\n")
-    endif ()
-  endif()
-
-endfunction()

cmake/Modules/FindFFMPEG.cmake

@@ -0,0 +1,163 @@
+#[=======================================================================[.rst:
+FindFFMPEG
+----------
+
+Find the FFmpeg and associated libraries.
+
+
+This module accepts following COMPONENTS::
+
+  avcodec
+  avdevice
+  avfilter
+  avformat
+  avutil
+  swresample
+  swscale
+
+IMPORTED Targets
+^^^^^^^^^^^^^^^^
+
+This module defines the following :prop_tgt:`IMPORTED` targets:
+
+``FFMPEG::<component>``
+  The FFmpeg component.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+``FFMPEG_INCLUDE_DIRS``
+  Include directories necessary to use FFmpeg.
+``FFMPEG_LIBRARIES``
+  Libraries necessary to use FFmpeg. Note that this only includes libraries for the components requested.
+``FFMPEG_VERSION``
+  The version of FFMPEG found (avutil).
+
+
+For each component, the following are provided:
+
+``FFMPEG_<component>_FOUND``
+  FFmpeg component was found.
+``FFMPEG_<component>_INCLUDE_DIRS``
+  Include directories for the component.
+``FFMPEG_<component>_LIBRARIES``
+  Libraries for the component.
+
+#]=======================================================================]
+
+function(_ffmpeg_find component pkgconfig_name header)
+  find_package(PkgConfig)
+  pkg_check_modules(PC_FFMPEG_${component} ${pkgconfig_name})
+
+  find_path(FFMPEG_${component}_INCLUDE_DIR
+    NAMES "lib${component}/${header}"
+    HINTS
+      ${PC_FFMPEG_${component}_INCLUDEDIR}
+      ${PC_FFMPEG_${component}_INCLUDE_DIRS}
+    PATH_SUFFIXES
+      ffmpeg)
+  mark_as_advanced("FFMPEG_${component}_INCLUDE_DIR")
+
+  find_library(FFMPEG_${component}_LIBRARY
+    NAMES
+      ${component}
+      ${PC_FFMPEG_${component}_LIBRARIES}
+    HINTS
+      ${PC_FFMPEG_${component}_LIBDIR}
+      ${PC_FFMPEG_${component}_LIBRARY_DIRS})
+  mark_as_advanced("${component}_LIBRARY")
+
+  if(FFMPEG_${component}_LIBRARY AND FFMPEG_${component}_INCLUDE_DIR)
+    set(_deps_found TRUE)
+    set(_deps_link)
+    foreach(_ffmpeg_dep IN LISTS ARGN)
+      if(TARGET "FFMPEG::${_ffmpeg_dep}")
+        list(APPEND _deps_link "FFMPEG::${_ffmpeg_dep}")
+      else()
+        set(_deps_found FALSE)
+      endif()
+    endforeach()
+    if(_deps_found)
+      if(NOT TARGET "FFMPEG::${component}")
+        add_library("FFMPEG::${component}" UNKNOWN IMPORTED)
+        set_target_properties("FFMPEG::${component}" PROPERTIES
+          IMPORTED_LOCATION "${FFMPEG_${component}_LIBRARY}"
+          INTERFACE_INCLUDE_DIRECTORIES "${FFMPEG_${component}_INCLUDE_DIR}"
+          IMPORTED_LINK_INTERFACE_LIBRARIES "${_deps_link}")
+      endif()
+      set(FFMPEG_${component}_FOUND 1 PARENT_SCOPE)
+      set(FFMPEG_${component}_VERSION "${PC_FFMPEG_${component}_VERSION}" PARENT_SCOPE)
+    else()
+      set("FFMPEG_${component}_FOUND" 0 PARENT_SCOPE)
+      set(what)
+      if(NOT FFMPEG_${component}_LIBRARY)
+        set(what "library")
+      endif()
+      if(NOT FFMPEG_${component}_INCLUDE_DIR)
+        if(what)
+          string(APPEND what " or headers")
+        else()
+          set(what "headers")
+        endif()
+      endif()
+      set("FFMPEG_${component}_NOT_FOUND_MESSAGE"
+        "Could not find the ${what} for ${component}."
+        PARENT_SCOPE)
+    endif()
+  endif()
+endfunction()
+
+_ffmpeg_find(avutil libavutil avutil.h)
+_ffmpeg_find(swresample libswresample swresample.h
+  avutil)
+_ffmpeg_find(swscale libswscale swscale.h
+  avutil)
+_ffmpeg_find(avcodec libavcodec avcodec.h
+  avutil)
+_ffmpeg_find(avformat libavformat avformat.h
+  avcodec avutil)
+_ffmpeg_find(avfilter libavfilter avfilter.h
+  avutil)
+_ffmpeg_find(avdevice libavdevice avdevice.h
+  avformat avutil)
+
+if(TARGET FFMPEG::avutil)
+  set(FFMPEG_VERSION "${FFMPEG_avutil_VERSION}")
+endif()
+
+set(FFMPEG_INCLUDE_DIRS)
+set(FFMPEG_LIBRARIES)
+set(_ffmpeg_required_vars)
+foreach(_ffmpeg_component IN LISTS FFMPEG_FIND_COMPONENTS)
+  if(TARGET "FFMPEG::${_ffmpeg_component}")
+    set(FFMPEG_${_ffmpeg_component}_INCLUDE_DIRS
+      "${FFMPEG_${_ffmpeg_component}_INCLUDE_DIR}")
+    set(FFMPEG_${_ffmpeg_component}_LIBRARIES
+      "${FFMPEG_${_ffmpeg_component}_LIBRARY}")
+    list(APPEND FFMPEG_INCLUDE_DIRS
+      "${FFMPEG_${_ffmpeg_component}_INCLUDE_DIRS}")
+    list(APPEND FFMPEG_LIBRARIES
+      "${FFMPEG_${_ffmpeg_component}_LIBRARIES}")
+    if(FFMEG_FIND_REQUIRED_${_ffmpeg_component})
+      list(APPEND _ffmpeg_required_vars
+        "FFMPEG_${_ffmpeg_required_vars}_INCLUDE_DIRS"
+        "FFMPEG_${_ffmpeg_required_vars}_LIBRARIES")
+    endif()
+  endif()
+endforeach()
+unset(_ffmpeg_component)
+
+if(FFMPEG_INCLUDE_DIRS)
+  list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(FFMPEG
+  REQUIRED_VARS
+    FFMPEG_INCLUDE_DIRS
+    FFMPEG_LIBRARIES
+    ${_ffmpeg_required_vars}
+  VERSION_VAR
+    FFMPEG_VERSION
+  HANDLE_COMPONENTS)
+unset(_ffmpeg_required_vars)

cmake/Modules/FindFmt.cmake

@@ -0,0 +1,100 @@
+# FindFmt
+# -------
+# Finds the Fmt library
+#
+# This will define the following variables::
+#
+# FMT_FOUND - system has Fmt
+# FMT_INCLUDE_DIRS - the Fmt include directory
+# FMT_LIBRARIES - the Fmt libraries
+#
+# and the following imported targets::
+#
+#   Fmt::Fmt   - The Fmt library
+
+if(ENABLE_INTERNAL_FMT)
+  include(ExternalProject)
+  file(STRINGS ${CMAKE_SOURCE_DIR}/tools/depends/target/libfmt/Makefile VER REGEX "^[ ]*VERSION[ ]*=.+$")
+  string(REGEX REPLACE "^[ ]*VERSION[ ]*=[ ]*" "" FMT_VERSION "${VER}")
+
+  # allow user to override the download URL with a local tarball
+  # needed for offline build envs
+  if(FMT_URL)
+      get_filename_component(FMT_URL "${FMT_URL}" ABSOLUTE)
+  else()
+      set(FMT_URL http://mirrors.kodi.tv/build-deps/sources/fmt-${FMT_VERSION}.tar.gz)
+  endif()
+  if(VERBOSE)
+      message(STATUS "FMT_URL: ${FMT_URL}")
+  endif()
+
+  if(APPLE)
+    set(EXTRA_ARGS "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}")
+  endif()
+
+  set(FMT_LIBRARY ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/libfmt.a)
+  set(FMT_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include)
+  externalproject_add(fmt
+                      URL ${FMT_URL}
+                      DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/download
+                      PREFIX ${CORE_BUILD_DIR}/fmt
+                      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
+                                 -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}
+                                 -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
+                                 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+                                 -DCMAKE_INSTALL_LIBDIR=lib
+                                 -DFMT_DOC=OFF
+                                 -DFMT_TEST=OFF
+                                 "${EXTRA_ARGS}"
+                      BUILD_BYPRODUCTS ${FMT_LIBRARY})
+  set_target_properties(fmt PROPERTIES FOLDER "External Projects")
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(Fmt
+                                    REQUIRED_VARS FMT_LIBRARY FMT_INCLUDE_DIR
+                                    VERSION_VAR FMT_VERSION)
+
+  set(FMT_LIBRARIES ${FMT_LIBRARY})
+  set(FMT_INCLUDE_DIRS ${FMT_INCLUDE_DIR})
+
+else()
+
+find_package(FMT 6.1.2 CONFIG REQUIRED QUIET)
+
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_FMT libfmt QUIET)
+  if(PC_FMT_VERSION AND NOT FMT_VERSION)
+    set(FMT_VERSION ${PC_FMT_VERSION})
+  endif()
+endif()
+
+find_path(FMT_INCLUDE_DIR NAMES fmt/format.h
+                          PATHS ${PC_FMT_INCLUDEDIR})
+
+find_library(FMT_LIBRARY_RELEASE NAMES fmt
+                                PATHS ${PC_FMT_LIBDIR})
+find_library(FMT_LIBRARY_DEBUG NAMES fmtd
+                               PATHS ${PC_FMT_LIBDIR})
+
+include(SelectLibraryConfigurations)
+select_library_configurations(FMT)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Fmt
+                                  REQUIRED_VARS FMT_LIBRARY FMT_INCLUDE_DIR FMT_VERSION
+                                  VERSION_VAR FMT_VERSION)
+
+if(FMT_FOUND)
+  set(FMT_LIBRARIES ${FMT_LIBRARY})
+  set(FMT_INCLUDE_DIRS ${FMT_INCLUDE_DIR})
+
+  if(NOT TARGET fmt)
+    add_library(fmt UNKNOWN IMPORTED)
+    set_target_properties(fmt PROPERTIES
+                               IMPORTED_LOCATION "${FMT_LIBRARY}"
+                               INTERFACE_INCLUDE_DIRECTORIES "${FMT_INCLUDE_DIR}")
+  endif()
+endif()
+
+endif()
+mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)

cmake/Modules/FindGSOAP.cmake

@@ -0,0 +1,113 @@
+#
+# This module detects if gsoap is installed and determines where the
+# include files and libraries are.
+#
+# This code sets the following variables:
+#
+# GSOAP_IMPORT_DIR      = full path to the gsoap import directory
+# GSOAP_LIBRARIES       = full path to the gsoap libraries
+# GSOAP_SSL_LIBRARIES   = full path to the gsoap ssl libraries
+# GSOAP_INCLUDE_DIR     = include dir to be used when using the gsoap library
+# GSOAP_PLUGIN_DIR      = gsoap plugins directory
+# GSOAP_WSDL2H          = wsdl2h binary
+# GSOAP_SOAPCPP2        = soapcpp2 binary
+# GSOAP_FOUND           = set to true if gsoap was found successfully
+#
+# GSOAP_ROOT
+#   setting this enables search for gsoap libraries / headers in this location
+
+# -----------------------------------------------------
+# GSOAP Import Directories
+# -----------------------------------------------------
+find_path(GSOAP_IMPORT_DIR
+  NAMES wsa.h
+  PATHS ${GSOAP_ROOT}/import ${GSOAP_ROOT}/share/gsoap/import
+)
+
+# -----------------------------------------------------
+# GSOAP Libraries
+# -----------------------------------------------------
+find_library(GSOAP_CXX_LIBRARIES
+	NAMES gsoap++
+	HINTS ${GSOAP_ROOT}/lib ${GSOAP_ROOT}/lib64
+		  ${GSOAP_ROOT}/lib32
+	DOC "The main gsoap library"
+)
+find_library(GSOAP_SSL_CXX_LIBRARIES
+	NAMES gsoapssl++
+	HINTS ${GSOAP_ROOT}/lib ${GSOAP_ROOT}/lib64
+		  ${GSOAP_ROOT}/lib32
+	DOC "The ssl gsoap library"
+)
+
+
+# -----------------------------------------------------
+# GSOAP Include Directories
+# -----------------------------------------------------
+find_path(GSOAP_INCLUDE_DIR
+	NAMES stdsoap2.h
+	HINTS ${GSOAP_ROOT} ${GSOAP_ROOT}/include ${GSOAP_ROOT}/include/*
+	DOC "The gsoap include directory"
+)
+
+# -----------------------------------------------------
+# GSOAP plugin Directories
+# -----------------------------------------------------
+find_path(GSOAP_PLUGIN_DIR
+	NAMES wsseapi.c
+	HINTS ${GSOAP_ROOT} /usr/share/gsoap/plugin
+	DOC "The gsoap plugin directory"
+)
+
+# -----------------------------------------------------
+# GSOAP Binaries
+# ----------------------------------------------------
+if(NOT GSOAP_TOOL_DIR)
+	set(GSOAP_TOOL_DIR GSOAP_ROOT)
+endif()
+
+find_program(GSOAP_WSDL2H
+	NAMES wsdl2h
+	HINTS ${GSOAP_TOOL_DIR}/bin
+	DOC "The gsoap bin directory"
+)
+find_program(GSOAP_SOAPCPP2
+	NAMES soapcpp2
+	HINTS ${GSOAP_TOOL_DIR}/bin
+	DOC "The gsoap bin directory"
+)
+# -----------------------------------------------------
+# GSOAP version
+# try to determine the flagfor the 2.7.6 compatiblity, break with 2.7.13 and re-break with 2.7.16
+# ----------------------------------------------------
+if(GSOAP_SOAPCPP2)
+  execute_process(COMMAND ${GSOAP_SOAPCPP2}  "-V"   OUTPUT_VARIABLE GSOAP_STRING_VERSION ERROR_VARIABLE GSOAP_STRING_VERSION )
+  string(REGEX MATCH "[0-9]*\\.[0-9]*\\.[0-9]*" GSOAP_VERSION ${GSOAP_STRING_VERSION})
+endif()
+# -----------------------------------------------------
+# GSOAP_276_COMPAT_FLAGS and GSOAPVERSION
+# try to determine the flagfor the 2.7.6 compatiblity, break with 2.7.13 and re-break with 2.7.16
+# ----------------------------------------------------
+if( "${GSOAP_VERSION}"  VERSION_LESS "2.7.6")
+	set(GSOAP_276_COMPAT_FLAGS "")
+elseif ( "${GSOAP_VERSION}"  VERSION_LESS "2.7.14")
+	set(GSOAP_276_COMPAT_FLAGS "-z")
+else ( "${GSOAP_VERSION}"  VERSION_LESS "2.7.14")
+	set(GSOAP_276_COMPAT_FLAGS "-z1 -z2")
+endif ( "${GSOAP_VERSION}"  VERSION_LESS "2.7.6")
+
+# -----------------------------------------------------
+# handle the QUIETLY and REQUIRED arguments and set GSOAP_FOUND to TRUE if
+# all listed variables are TRUE
+# -----------------------------------------------------
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GSOAP DEFAULT_MSG GSOAP_CXX_LIBRARIES
+	GSOAP_INCLUDE_DIR GSOAP_WSDL2H GSOAP_SOAPCPP2)
+mark_as_advanced(GSOAP_INCLUDE_DIR GSOAP_LIBRARIES GSOAP_WSDL2H GSOAP_SOAPCPP2)
+
+if(GSOAP_FOUND)
+  if(GSOAP_FIND_REQUIRED AND GSOAP_FIND_VERSION AND ${GSOAP_VERSION} VERSION_LESS ${GSOAP_FIND_VERSION})
+	message(SEND_ERROR "Found GSOAP version ${GSOAP_VERSION} less then required ${GSOAP_FIND_VERSION}.")
+  endif()
+endif()
+

cmake/Modules/FindLibJWT.cmake

@@ -1,28 +1,89 @@
-include(FindPackageHandleStandardArgs)
+#[=======================================================================[.rst:
+FindLibJWT
+----------
 
+Find the JWT C Library (libjwt)
+
+
+This module accepts optional COMPONENTS to select the crypto backend (these are mutually exclusive)::
+
+  openssl (default)
+  gnutls
+
+IMPORTED Targets
+^^^^^^^^^^^^^^^^
+
+This module defines the following :prop_tgt:`IMPORTED` targets:
+
+``JWT::libjwt``
+  The JWT library, if found with the specified crypto backend.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+``LIBJWT_FOUND``
+  System has libjwt
+``LIBJWT_INCLUDE_DIRS``
+  The libjwt include directory
+``LIBJWT_LIBRARIES``
+  The libraries needed to use libjwt
+#]=======================================================================]
+
+include(FindPackageHandleStandardArgs)
 find_package(PkgConfig QUIET)
+
+if(LibJWT_FIND_COMPONENTS)
+  set(LIBJWT_CRYPTO_BACKEND "")
+  foreach(component IN LISTS LibJWT_FIND_COMPONENTS)
+    if(component MATCHES "^(openssl|gnutls)")
+      if(LIBJWT_CRYPTO_BACKEND)
+        message(FATAL_ERROR "LibJWT: Only one crypto library can be selected.")
+      endif()
+    set(LIBJWT_CRYPTO_BACKEND ${component})
+    else()
+      message(FATAL_ERROR "LibJWT: Wrong crypto backend specified.")
+    endif()
+  endforeach()
+else()
+  set(LIBJWT_CRYPTO_BACKEND "openssl")
+endif()
+
+set(LIBJWT_LIB_NAMES "")
+if(LIBJWT_CRYPTO_BACKEND STREQUAL "openssl")
+  set(LIBJWT_LIB_NAMES "jwt" "libjwt")
+elseif(LIBJWT_CRYPTO_BACKEND STREQUAL "gnutls")
+  set(LIBJWT_LIB_NAMES "jwt-gnutls" "libjwt-gnutls")
+endif()
+
 pkg_check_modules(PC_LIBJWT QUIET libjwt)
 
 find_path(LIBJWT_INCLUDE_DIR
   NAMES jwt.h
-  HINTS ${PC_LIBJWT_INCLUDEDIR} ${PC_LIBJWT_INCLUDE_DIRS}
-  )
+  HINTS
+    ${PC_LIBJWT_INCLUDEDIR}
+    ${PC_LIBJWT_INCLUDE_DIRS})
+mark_as_advanced(LIBJWT_INCLUDE_DIR)
 
 find_library(LIBJWT_LIBRARY
-  NAMES jwt-gnutls libjwt-gnutls liblibjwt-gnutls
-  HINTS ${PC_LIBJWT_LIBDIR} ${PC_LIBJWT_LIBRARY_DIR}
-  )
+  NAMES ${LIBJWT_LIB_NAMES}
+  HINTS
+    ${PC_LIBJWT_LIBDIR}
+    ${PC_LIBJWT_LIBRARY_DIR})
+mark_as_advanced(LIBJWT_LIBRARY)
 
 find_package_handle_standard_args(LibJWT
-  REQUIRED_VARS LIBJWT_INCLUDE_DIR LIBJWT_LIBRARY
-  )
+  REQUIRED_VARS
+    LIBJWT_INCLUDE_DIR
+    LIBJWT_LIBRARY
+  FAIL_MESSAGE
+    "Could NOT find LibJWT with the crypto backend ${LIBJWT_CRYPTO_BACKEND}.")
 
 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()
+  set(LIBJWT_LIBRARIES ${LIBJWT_LIBRARY})
+  set(LIBJWT_INCLUDE_DIRS ${LIBJWT_INCLUDE_DIR})
 
-mark_as_advanced(LIBJWT_INCLUDE_DIR LIBJWT_LIBRARY)
+  add_library(JWT::libjwt UNKNOWN IMPORTED)
+  set_target_properties(JWT::libjwt PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${LIBJWT_INCLUDE_DIRS}"
+    IMPORTED_LOCATION "${LIBJWT_LIBRARY}")
+endif()

cmake/Modules/FindV4L2.cmake

@@ -0,0 +1,99 @@
+#[=======================================================================[.rst:
+FindV4L2
+----------
+
+Find V4L2 headers and libv4l2
+
+
+This module accepts optional COMPONENTS:
+
+  videodev2 (default)
+  libv4l2
+
+IMPORTED Targets
+^^^^^^^^^^^^^^^^
+
+This module defines the following :prop_tgt:`IMPORTED` targets::
+
+``V4L2::videodev2``
+  The Video for Linux Two header file, if found.
+``V4L2::libv4l2``
+  A thin abstraction layer on top of video4linux2 devices, if found.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+``V4L2_FOUND``
+  System has v4l2 support. If no components are specified only the videodev2.h header has to be found.
+``V4L2_INCLUDE_DIRS``
+  The v4l2 include directories.
+``V4L2_LIBRARIES``
+  The libraries needed to have v4l2 support according to the specified components.
+#]=======================================================================]
+
+find_path(V4L2_VIDEODEV2_INCLUDE_DIR
+  NAMES linux/videodev2.h)
+mark_as_advanced(V4L2_VIDEODEV2_INCLUDE_DIR)
+
+if(EXISTS "${V4L2_VIDEODEV2_INCLUDE_DIR}")
+  set(V4L2_videodev2_FOUND TRUE)
+else()
+  set(V4L2_videodev2_FOUND FALSE)
+endif()
+
+pkg_check_modules(PC_V4L2_LIBV4L2 QUIET libv4l2)
+
+find_path(V4L2_LIBV4L2_INCLUDE_DIR
+  NAMES libv4l2.h
+  HINTS
+    ${PC_V4L2_LIBV4L2_INCLUDEDIR}
+    ${PC_V4L2_LIBV4L2_INCLUDE_DIRS})
+mark_as_advanced(V4L2_LIBV4L2_INCLUDE_DIR)
+
+find_library(V4L2_LIBV4L2_LIBRARY
+  NAMES ${PC_V4L2_LIBV4L2_LIBRARIES}
+  HINTS
+    ${PC_V4L2_LIBV4L2_LIBDIR}
+    ${PC_V4L2_LIBV4L2_LIBRARY_DIR})
+mark_as_advanced(V4L2_LIBV4L2_LIBRARY)
+
+if(EXISTS "${V4L2_LIBV4L2_INCLUDE_DIR}" AND
+  EXISTS "${V4L2_LIBV4L2_LIBRARY}")
+  set(V4L2_libv4l2_FOUND TRUE)
+else()
+  set(V4L2_libv4l2_FOUND FALSE)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(V4L2
+  REQUIRED_VARS
+    V4L2_VIDEODEV2_INCLUDE_DIR
+  HANDLE_COMPONENTS)
+
+set(V4L2_INCLUDE_DIRS)
+set(V4L2_LIBRARIES)
+
+if(V4L2_videodev2_FOUND)
+  set(V4L2_VIDEODEV2_INCLUDE_DIRS ${V4L2_VIDEODEV2_INCLUDE_DIR})
+  list(APPEND V4L2_INCLUDE2_DIRS
+    "${V4L2_VIDEODEV2_INCLUDE_DIRS}")
+
+  add_library(V4L2::videodev2 INTERFACE IMPORTED)
+  set_target_properties(V4L2::videodev2 PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${V4L2_VIDEODEV2_INCLUDE_DIRS}")
+endif()
+
+if(V4L2_libv4l2_FOUND)
+  set(V4L2_LIBV4L2_INCLUDE_DIRS ${V4L2_LIBV4L2_INCLUDE_DIR})
+  set(V4L2_LIBV4L2_LIBRARIES ${V4L2_LIBV4L2_LIBRARY})
+
+  list(APPEND V4L2_INCLUDE_DIRS
+    "${V4L2_LIBV4L2_INCLUDE_DIRS}")
+  list(APPEND V4L2_LIBRARIES
+    "${V4L2_LIBV4L2_LIBRARIES}")
+
+  add_library(V4L2::libv4l2 UNKNOWN IMPORTED)
+  set_target_properties(V4L2::libv4l2 PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${V4L2_LIBV4L2_INCLUDE_DIRS}"
+    IMPORTED_LOCATION "${V4L2_LIBV4L2_LIBRARY}")
+endif()

cmake/compiler/gcc/settings.cmake

@@ -6,6 +6,7 @@ target_compile_options(zm-warning-interface
     -Wformat-security
     -Wno-cast-function-type
     $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,11>:-Wno-clobbered>
+    $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,5.1>:-Wno-missing-field-initializers>
     -Wno-unused-parameter
     -Woverloaded-virtual
     -Wvla)
@@ -23,7 +24,8 @@ if(ASAN)
       -fno-omit-frame-pointer
       -fsanitize=address
       -fsanitize-recover=address
-      -fsanitize-address-use-after-scope)
+      -fsanitize-address-use-after-scope
+      -Wno-stringop-truncation)
 
   target_link_options(zm-compile-option-interface
     INTERFACE

conf.d/01-system-paths.conf.in

@@ -47,5 +47,9 @@ ZM_PATH_SWAP=@ZM_TMPDIR@
 # ZoneMinder will find the arp binary automatically on most systems
 ZM_PATH_ARP="@ZM_PATH_ARP@"
 
+# Full path to optional arp-scan binary
+# ZoneMinder will find the arp-scan binary automatically on most systems
+ZM_PATH_ARP_SCAN="@ZM_PATH_ARP_SCAN@"
+
 #Full path to shutdown binary
 ZM_PATH_SHUTDOWN="@ZM_PATH_SHUTDOWN@"

db/CMakeLists.txt

@@ -4,6 +4,7 @@
 configure_file(zm_create.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_create.sql" @ONLY)
 configure_file(zm_update-1.31.30.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.31.30.sql" @ONLY)
 configure_file(zm_update-1.35.24.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.35.24.sql" @ONLY)
+configure_file(zm_update-1.37.4.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.37.4.sql" @ONLY)
 
 # Glob all database upgrade scripts
 file(GLOB dbfileslist RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "zm_update-*.sql")
@@ -15,6 +16,8 @@ install(FILES ${dbfileslist} DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.31.30.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
 # install zm_update-1.35.24.sql
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.35.24.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
+# install zm_update-1.37.4.sql
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.37.4.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
 
 # install zm_create.sql
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_create.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
@@ -22,3 +25,8 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_create.sql" DESTINATION "${CMAKE_I
 # install triggers.sql
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/triggers.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
 
+# install manufacturers.sql
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/manufacturers.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
+
+# install models.sql
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/models.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")

db/manufacturers.sql

@@ -0,0 +1,24 @@
+INSERT IGNORE INTO Manufacturers VALUES (1, 'Acti');
+INSERT IGNORE INTO Manufacturers VALUES (2, 'Amcrest');
+INSERT IGNORE INTO Manufacturers VALUES (3, 'Airlink101');
+INSERT IGNORE INTO Manufacturers VALUES (4, 'Arecont Vision');
+INSERT IGNORE INTO Manufacturers VALUES (5, 'Axis');
+INSERT IGNORE INTO Manufacturers VALUES (6, 'Dahua');
+INSERT IGNORE INTO Manufacturers VALUES (7, 'D-Link');
+INSERT IGNORE INTO Manufacturers VALUES (8, 'Edimax');
+INSERT IGNORE INTO Manufacturers VALUES (9, 'Foscam');
+INSERT IGNORE INTO Manufacturers VALUES (10, 'Gadspot');
+INSERT IGNORE INTO Manufacturers VALUES (11, 'GrandStream');
+INSERT IGNORE INTO Manufacturers VALUES (12, 'HikVision');
+INSERT IGNORE INTO Manufacturers VALUES (13, 'JVC');
+INSERT IGNORE INTO Manufacturers VALUES (14, 'Maginon');
+INSERT IGNORE INTO Manufacturers VALUES (15, 'Mobotix');
+INSERT IGNORE INTO Manufacturers VALUES (16, 'Oncam Grandeye');
+INSERT IGNORE INTO Manufacturers VALUES (17, 'Panasonic');
+INSERT IGNORE INTO Manufacturers VALUES (18, 'Pelco');
+INSERT IGNORE INTO Manufacturers VALUES (19, 'Sony');
+INSERT IGNORE INTO Manufacturers VALUES (20, 'TP-Link');
+INSERT IGNORE INTO Manufacturers VALUES (21, 'Trendnet');
+INSERT IGNORE INTO Manufacturers VALUES (22, 'VisionTek');
+INSERT IGNORE INTO Manufacturers VALUES (23, 'Vivotek');
+INSERT IGNORE INTO Manufacturers VALUES (24, 'Wansview');

db/models.sql

@@ -0,0 +1,56 @@
+/* INSERT INTO Manufacturers VALUES (1, 'Acti'); */
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A21');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A23');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A24');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A28');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A31');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A310');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A311');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A32');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A41');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A415');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A416');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A418');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A42');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A421');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A43');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A45');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A46');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A48');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A74');
+/*
+INSERT INTO Manufacturers VALUES (2, 'Amcrest');
+*/
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (2, 'IP8M-T2499EW');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (2, 'ASH42-B');
+/*
+INSERT INTO Manufacturers VALUES (3, 'Airlink101');
+INSERT INTO Manufacturers VALUES (4, 'Arecont Vision');
+INSERT INTO Manufacturers VALUES (5, 'Axis');
+INSERT INTO Manufacturers VALUES (6, 'Dahua');
+INSERT INTO Manufacturers VALUES (7, 'D-Link');
+*/
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (7, 'DCS-930L');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (7, 'DCS-932L');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (7, 'DCS-933L');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (7, 'DCS-942L');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (7, 'DCS-5020L');
+/*
+INSERT INTO Manufacturers VALUES (8, 'Edimax');
+INSERT INTO Manufacturers VALUES (9, 'Foscam');
+INSERT INTO Manufacturers VALUES (10, 'Gadspot');
+INSERT INTO Manufacturers VALUES (11, 'GrandStream');
+INSERT INTO Manufacturers VALUES (12, 'HikVision');
+INSERT INTO Manufacturers VALUES (13, 'JVC');
+INSERT INTO Manufacturers VALUES (14, 'Maginon');
+INSERT INTO Manufacturers VALUES (15, 'Mobotix');
+INSERT INTO Manufacturers VALUES (16, 'Oncam Grandeye');
+INSERT INTO Manufacturers VALUES (17, 'Panasonic');
+INSERT INTO Manufacturers VALUES (18, 'Pelco');
+INSERT INTO Manufacturers VALUES (19, 'Sony');
+INSERT INTO Manufacturers VALUES (20, 'TP-Link');
+INSERT INTO Manufacturers VALUES (21, 'Trendnet');
+INSERT INTO Manufacturers VALUES (22, 'VisionTek');
+INSERT INTO Manufacturers VALUES (23, 'Vivotek');
+INSERT INTO Manufacturers VALUES (24, 'Wansview');
+*/

db/zm_create.sql.in

@@ -39,6 +39,7 @@ CREATE TABLE `Config` (
   `Help` text,
   `Category` varchar(32) NOT NULL default '',
   `Readonly` tinyint(3) unsigned NOT NULL default '0',
+  `Private` BOOLEAN NOT NULL DEFAULT FALSE,
   `Requires` text,
   PRIMARY KEY (`Name`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
@@ -188,7 +189,7 @@ CREATE TABLE `Events` (
   `StorageId`	smallint(5) unsigned default 0,
   `SecondaryStorageId`	smallint(5) unsigned default 0,
   `Name` varchar(64) NOT NULL default '',
-  `Cause` varchar(32) NOT NULL default '',
+  `Cause` TEXT,
   `StartDateTime` datetime default NULL,
   `EndDateTime` datetime default NULL,
   `Width` smallint(5) unsigned NOT NULL default '0',
@@ -283,6 +284,7 @@ CREATE TABLE `Filters` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
   `UserId`  int(10) unsigned,
+  `ExecuteInterval` int(10) unsigned NOT NULL default '60',
   `Query_json` text NOT NULL,
   `AutoArchive` tinyint(3) unsigned NOT NULL default '0',
   `AutoUnarchive` tinyint(3) unsigned NOT NULL default '0',
@@ -412,6 +414,7 @@ CREATE TABLE `Models` (
 DROP TABLE IF EXISTS `MonitorPresets`;
 CREATE TABLE `MonitorPresets` (
   `Id` int(10) unsigned NOT NULL auto_increment,
+  `ModelId`  int unsigned, FOREIGN KEY (`ModelId`) REFERENCES `Models` (Id),
   `Name` varchar(64) NOT NULL default '',
   `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local',
   `Device` tinytext,
@@ -447,16 +450,28 @@ CREATE TABLE `Monitors` (
   `Notes` TEXT,
   `ServerId` int(10) unsigned,
   `StorageId`	smallint(5) unsigned default 0,
+  `ManufacturerId`  int unsigned, FOREIGN KEY (`ManufacturerId`) REFERENCES `Manufacturers` (Id),
+  `ModelId`  int unsigned, FOREIGN KEY (`ModelId`) REFERENCES `Models` (Id),
   `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',
+  `Capturing` enum('None','Ondemand', 'Always') NOT NULL default 'Always',
+  `Analysing` enum('None','Always') NOT NULL default 'Always',
+  `AnalysisSource` enum('Primary','Secondary') NOT NULL DEFAULT 'Primary',
+  `Recording` enum('None', 'OnMotion', 'Always') NOT NULL default 'Always',
   `Enabled` tinyint(3) unsigned NOT NULL default '1',
   `DecodingEnabled` tinyint(3) unsigned NOT NULL default '1',
+  `JanusEnabled` BOOLEAN NOT NULL default false,
+  `JanusAudioEnabled` BOOLEAN NOT NULL default false,
   `LinkedMonitors` varchar(255),
   `Triggers` set('X10') NOT NULL default '',
+  `EventStartCommand` VARCHAR(255) NOT NULL DEFAULT '',
+  `EventEndCommand` VARCHAR(255) 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 '',
+  `ONVIF_Event_Listener`  BOOLEAN NOT NULL DEFAULT FALSE,
+  `use_Amcrest_API`  BOOLEAN NOT NULL DEFAULT FALSE,
   `Device` tinytext NOT NULL default '',
   `Channel` tinyint(3) unsigned NOT NULL default '0',
   `Format` int(10) unsigned NOT NULL default '0',
@@ -487,6 +502,7 @@ CREATE TABLE `Monitors` (
   `OutputContainer` enum('auto','mp4','mkv'),
   `EncoderParameters` TEXT,
   `RecordAudio` TINYINT NOT NULL DEFAULT '0',
+  `RecordingSource`  enum('Primary','Secondary','Both') NOT NULL DEFAULT 'Primary',
   `RTSPDescribe` tinyint(1) unsigned,
   `Brightness` mediumint(7) NOT NULL default '-1',
   `Contrast` mediumint(7) NOT NULL default '-1',
@@ -539,7 +555,7 @@ CREATE TABLE `Monitors` (
   `Longitude`  DECIMAL(11,8),
   `RTSPServer`  BOOLEAN NOT NULL DEFAULT FALSE,
   `RTSPStreamName`  varchar(255) NOT NULL default '',
-  `Importance`  enum('Not','Less','Normal'),
+  `Importance`  enum('Normal','Less','Not') NOT NULL default 'Normal',
   PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
@@ -971,81 +987,81 @@ 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);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg, B&W','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&color=0',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg, B&W','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&color=0',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 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,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, unicast','Remote','rtsp',0,255,'rtsp','rtpUni','<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, multicast','Remote','rtsp',0,255,'rtsp','rtpMulti','<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','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);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 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,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/GetData.cgi',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'IP Webcam by Pavel Khlebovich 1920x1080','Remote','/dev/video<?>','0',255,'http','simple','<ip-address>','8080','/video','',1920,1080,0,NULL,0,'0','','',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'VEO Observer, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Blue Net Video Server, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/cgi-bin/image.cgi?control=0&id=admin&passwd=admin',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES (NULL,'ACTi IP, mpeg4, unicast','Remote',NULL,NULL,NULL,'rtsp','rtpUni','<ip-address>',7070,'','/track',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp?videocodec=h264',NULL,NULL,NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Vivotek FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>:554/live.sdp',NULL,NULL,NULL,352,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp',NULL,NULL,NULL,640,480,NULL,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'ACTi TCM FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://admin:123456@<host/address>:7070',NULL,NULL,NULL,320,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 320x240','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 320x240, max 5 FPS','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 640x480','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 640x480, max 5 FPS','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 320x240','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 640x480','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 320x240','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 320x240, max 5 FPS','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 640x480','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 640x480, max 5 FPS','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 320x240','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 640x480','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Remote ZoneMinder','Remote',NULL,NULL,NULL,'http','simple','<ip-address>',80,'/cgi-bin/nph-zms?mode=jpeg&monitor=<monitor-id>&scale=100&maxfps=5&buffer=0',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI8620 FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,704,576,0,NULL,1,'10','<admin_pwd>','<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI8608W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,640,480,0,NULL,1,'11','<admin_pwd>','<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI9821W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:88/videoMain',NULL,1280,720,0,NULL,1,'12','<admin_pwd>','<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Loftek Sentinel PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<ip-address>','80','/videostream.cgi?user=<username>&pwd=<password>&resolution=32&rate=11',NULL,640,480,4,NULL,1,'13','','<username>:<pwd>@<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Airlink 777W PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<username>:<password>@<ip-address>','80','/cgi/mjpg/mjpg.cgi',NULL,640,480,4,NULL,1,'7','','<username>:<pwd>@<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','/dev/video<?>','0',255,'','rtpMulti','','80','rtsp://<ip-address>:554/11','',1920,1080,0,0.00,1,'16','-speed=64','<ip-address>:<port>',100,33);
-INSERT INTO MonitorPresets VALUES (NULL,'Qihan IP, 1280x720, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1280,720,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Qihan IP, 1920x1080, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1920,1080,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,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,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,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,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,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);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 640x480, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 320x240, mpjpeg, B&W','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&color=0',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 640x480, mpjpeg, B&W','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&color=0',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 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,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 640x480, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT into MonitorPresets VALUES (NULL,NULL,'Axis IP, mpeg4, unicast','Remote','rtsp',0,255,'rtsp','rtpUni','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,NULL,'Axis IP, mpeg4, multicast','Remote','rtsp',0,255,'rtsp','rtpMulti','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,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,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,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,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,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,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,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);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP PTZ, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP PTZ, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP PTZ, 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,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP PTZ, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP PTZ, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Gadspot IP, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Gadspot IP, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Gadspot IP, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/GetData.cgi',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Gadspot IP, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'IP Webcam by Pavel Khlebovich 1920x1080','Remote','/dev/video<?>','0',255,'http','simple','<ip-address>','8080','/video','',1920,1080,0,NULL,0,'0','','',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'VEO Observer, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Blue Net Video Server, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/cgi-bin/image.cgi?control=0&id=admin&passwd=admin',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,NULL,'ACTi IP, mpeg4, unicast','Remote',NULL,NULL,NULL,'rtsp','rtpUni','<ip-address>',7070,'','/track',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp?videocodec=h264',NULL,NULL,NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Vivotek FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>:554/live.sdp',NULL,NULL,NULL,352,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp',NULL,NULL,NULL,640,480,NULL,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'ACTi TCM FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://admin:123456@<host/address>:7070',NULL,NULL,NULL,320,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), PAL, 320x240','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), PAL, 320x240, max 5 FPS','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), PAL, 640x480','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), PAL, 640x480, max 5 FPS','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), NTSC, 320x240','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), NTSC, 640x480','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), PAL, 320x240','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), PAL, 320x240, max 5 FPS','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), PAL, 640x480','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), PAL, 640x480, max 5 FPS','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), NTSC, 320x240','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), NTSC, 640x480','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Remote ZoneMinder','Remote',NULL,NULL,NULL,'http','simple','<ip-address>',80,'/cgi-bin/nph-zms?mode=jpeg&monitor=<monitor-id>&scale=100&maxfps=5&buffer=0',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Foscam FI8620 FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,704,576,0,NULL,1,'10','<admin_pwd>','<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Foscam FI8608W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,640,480,0,NULL,1,'11','<admin_pwd>','<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Foscam FI9821W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:88/videoMain',NULL,1280,720,0,NULL,1,'12','<admin_pwd>','<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Loftek Sentinel PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<ip-address>','80','/videostream.cgi?user=<username>&pwd=<password>&resolution=32&rate=11',NULL,640,480,4,NULL,1,'13','','<username>:<pwd>@<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Airlink 777W PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<username>:<password>@<ip-address>','80','/cgi/mjpg/mjpg.cgi',NULL,640,480,4,NULL,1,'7','','<username>:<pwd>@<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'SunEyes SP-P1802SWPTZ','Libvlc','/dev/video<?>','0',255,'','rtpMulti','','80','rtsp://<ip-address>:554/11','',1920,1080,0,0.00,1,'16','-speed=64','<ip-address>:<port>',100,33);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Qihan IP, 1280x720, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1280,720,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Qihan IP, 1920x1080, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1920,1080,3,NULL,0,NULL,NULL,NULL,100,100);
 
 --
 -- Add some zone preset values
@@ -1080,11 +1096,11 @@ CREATE TABLE MontageLayouts (
   PRIMARY KEY (`Id`)
 );
 
-INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('Freeform', '{ "default":{"float":"left","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
-INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('2 Wide', '{ "default":{"float":"left", "width":"49%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('Freeform', '{ "default":{"float":"left","left":"0px","right":"0px","top":"0px","bottom":"0px","width":"auto"} }' );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('2 Wide', '{ "default":{"float":"left", "width":"50%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
 INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('3 Wide', '{ "default":{"float":"left", "width":"33%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
-INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('4 Wide', '{ "default":{"float":"left", "width":"24.5%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
-INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('5 Wide', '{ "default":{"float":"left", "width":"19%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('4 Wide', '{ "default":{"float":"left", "width":"25%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('5 Wide', '{ "default":{"float":"left", "width":"20%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
 
 CREATE TABLE Sessions (
   id char(32) not null,
@@ -1115,6 +1131,9 @@ CREATE TABLE Snapshot_Events (
 
 -- We generally don't alter triggers, we drop and re-create them, so let's keep them in a separate file that we can just source in update scripts.
 source @PKGDATADIR@/db/triggers.sql
+
+source @PKGDATADIR@/db/manufacturers.sql
+source @PKGDATADIR@/db/models.sql
 --
 -- Apply the initial configuration
 --

db/zm_update-1.35.14.sql

@@ -28,8 +28,8 @@ SET @s = (SELECT IF(
      AND table_name = 'Monitors'
      AND column_name = 'TotalEvents'
     ) > 0,
-"SELECT 'Column TotalEvents is already removed from Monitors'",
-"ALTER TABLE `Monitors` DROP `TotalEvents`"
+"ALTER TABLE `Monitors` DROP `TotalEvents`",
+"SELECT 'Column TotalEvents is already removed from Monitors'"
 ));
 PREPARE stmt FROM @s;
 EXECUTE stmt;
@@ -50,8 +50,8 @@ SET @s = (SELECT IF(
      AND table_name = 'Monitors'
      AND column_name = 'TotalEventDiskSpace'
     ) > 0,
-"SELECT 'Column TotalEventDiskSpace is already removed from Monitors'",
-"ALTER TABLE `Monitors` DROP `TotalEventDiskSpace`"
+"ALTER TABLE `Monitors` DROP `TotalEventDiskSpace`",
+"SELECT 'Column TotalEventDiskSpace is already removed from Monitors'"
 ));
 PREPARE stmt FROM @s;
 EXECUTE stmt;

db/zm_update-1.35.25.sql

@@ -56,7 +56,7 @@ EXECUTE stmt;
 SET @s = (SELECT IF(
     (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
      AND table_name = 'Monitor_Status'
-     AND column_name = 'DayEvents'
+     AND column_name = 'DayEventDiskSpace'
     ) > 0,
 "ALTER TABLE `Monitor_Status` DROP `DayEventDiskSpace`",
 "SELECT 'Column DayEventDiskSpace already removed from Monitor_Status'"

db/zm_update-1.35.29.sql

@@ -0,0 +1,47 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ManufacturerId'
+    ) > 0,
+"SELECT 'Column ManufacturerId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `ManufacturerId`  int(10) unsigned AFTER `StorageId`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ManufacturerId'
+    ) > 0,
+"SELECT 'FOREIGN KEY for ManufacturerId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ManufacturerId`) REFERENCES `Manufacturers` (Id)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF( 
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'Column ModelId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `ModelId`  int(10) unsigned AFTER `ManufacturerId`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'FOREIGN KEY for ModelId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ModelId`) REFERENCES `Models` (Id)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

db/zm_update-1.37.1.sql

@@ -0,0 +1 @@
+ALTER TABLE `Monitors` MODIFY `Longitude`  DECIMAL(11,8);

db/zm_update-1.37.10.sql

@@ -0,0 +1,20 @@
+--
+-- Update Config table to have Private
+--
+
+SELECT 'Checking for Private in Config';
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Config'
+  AND table_schema = DATABASE()
+  AND column_name = 'Private'
+  ) > 0,
+"SELECT 'Column Private already exists in Config'",
+"ALTER TABLE `Config` ADD COLUMN `Private` BOOLEAN NOT NULL DEFAULT FALSE AFTER `Readonly`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+

db/zm_update-1.37.11.sql

@@ -0,0 +1,18 @@
+--
+-- Update Monitors table to have use_Amcrest_API
+--
+
+SELECT 'Checking for use_Amcrest_API in Monitors';
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Monitors'
+  AND table_schema = DATABASE()
+  AND column_name = 'use_Amcrest_API'
+  ) > 0,
+"SELECT 'Column use_Amcrest_API already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `use_Amcrest_API` BOOLEAN NOT NULL default false AFTER `ONVIF_Event_Listener`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

db/zm_update-1.37.12.sql

@@ -0,0 +1,69 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'Capturing'
+    ) > 0,
+"SELECT 'Column Capturing already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `Capturing` enum('None','Ondemand', 'Always') NOT NULL default 'Always' AFTER `Function`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+UPDATE `Monitors` SET `Capturing` = 'None' WHERE `Function` = 'None';
+UPDATE `Monitors` SET `Capturing` = 'Always' WHERE `Function` != 'None';
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'Analysing'
+    ) > 0,
+"SELECT 'Column Analysing already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `Analysing` enum('None','Always') NOT NULL default 'Always'"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+UPDATE `Monitors` SET `Analysing` = 'None' WHERE `Function` = 'Record' OR `Function` = 'Nodect' OR `Function` = 'None';
+UPDATE `Monitors` SET `Analysing` = 'Always' WHERE `Function` = 'Modect' OR `Function` = 'Mocord';
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'AnalysisSource'
+    ) > 0,
+"SELECT 'Column AnalysisSource already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `AnalysisSource` enum('Primary','Secondary') NOT NULL DEFAULT 'Primary' AFTER `Analysing`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'Recording'
+    ) > 0,
+"SELECT 'Column Recording already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `Recording` enum('None', 'OnMotion', 'Always') NOT NULL default 'Always'"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+UPDATE `Monitors` SET `Recording` = 'None' WHERE `Function` = 'Monitor';
+UPDATE `Monitors` SET `Recording` = 'OnMotion' WHERE `Function` = 'Modect' OR `Function` = 'Nodect';
+UPDATE `Monitors` SET `Recording` = 'Always' WHERE `Function` = 'Mocord';
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'RecordingSource'
+    ) > 0,
+"SELECT 'Column RecordingSource already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `RecordingSource` enum('Primary','Secondary','Both') NOT NULL DEFAULT 'Primary' AFTER `RecordAudio`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

db/zm_update-1.37.2.sql

@@ -0,0 +1,7 @@
+UPDATE MontageLayouts SET `Positions` = '{ "default":{"float":"left","left":"0px","right":"0px","top":"0px","bottom":"0px","width":"auto"} }' WHERE `Name`='Freeform';
+UPDATE MontageLayouts SET `Positions` = '{ "default":{"float":"left", "width":"49%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' WHERE `Name`='2 Wide';
+UPDATE MontageLayouts SET `Positions` = '{ "default":{"float":"left", "width":"25%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' WHERE `Name`='4 Wide';
+UPDATE MontageLayouts SET `Positions` = '{ "default":{"float":"left", "width":"20%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' WHERE `Name`='5 Wide';
+
+UPDATE Monitors set Importance = 'Normal' where Importance IS NULL;
+ALTER TABLE `Monitors` MODIFY `Importance`  enum('Normal','Less','Not') NOT NULL default 'Normal';

db/zm_update-1.37.3.sql

@@ -0,0 +1,74 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ManufacturerId'
+    ) > 0,
+"SELECT 'Column ManufacturerId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `ManufacturerId`  int(10) unsigned AFTER `StorageId`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ManufacturerId'
+    ) > 0,
+"SELECT 'FOREIGN KEY for ManufacturerId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ManufacturerId`) REFERENCES `Manufacturers` (Id)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF( 
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'Column ModelId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `ModelId`  int(10) unsigned AFTER `ManufacturerId`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'FOREIGN KEY for ModelId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ModelId`) REFERENCES `Models` (Id)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF( 
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'MonitorPresets'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'Column ModelId already exists in MonitorPresets'",
+"ALTER TABLE `MonitorPresets` ADD `ModelId`  int(10) unsigned AFTER `Id`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
+     AND table_name = 'MonitorPresets'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'FOREIGN KEY for ModelId already exists in MonitorPresets'",
+"ALTER TABLE `MonitorPresets` ADD FOREIGN KEY  (`ModelId`) REFERENCES `Models` (Id)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+UPDATE `MonitorPresets` SET `ModelId`=(SELECT `Id` FROM `Models` WHERE `Name`='IP8M-T2499EW') WHERE `Name` like 'Amcrest, IP8M-T2499EW
+%';

db/zm_update-1.37.4.sql.in

@@ -0,0 +1,2 @@
+source @PKGDATADIR@/db/manufacturers.sql
+source @PKGDATADIR@/db/models.sql

db/zm_update-1.37.5.sql

@@ -0,0 +1,31 @@
+--
+-- This update adds EventStartCommand and EventEndCommand
+--
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'EventEndCommand'
+	) > 0,
+"SELECT 'Column EventEndCommand already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `EventEndCommand` 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 = 'EventStartCommand'
+	) > 0,
+"SELECT 'Column EventStartCommand already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `EventStartCommand` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

db/zm_update-1.37.6.sql

@@ -0,0 +1,18 @@
+--
+-- Update Filters table to have a ExecuteInterval Column
+--
+
+SELECT 'Checking for ExecuteInterval in Filters';
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Filters'
+  AND table_schema = DATABASE()
+  AND column_name = 'ExecuteInterval'
+  ) > 0,
+"SELECT 'Column ExecuteInterval already exists in Filters'",
+"ALTER TABLE Filters ADD COLUMN `ExecuteInterval` int(10) unsigned NOT NULL default '60' AFTER `UserId`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

db/zm_update-1.37.7.sql

@@ -0,0 +1,21 @@
+/* Change Cause from varchar(32) to TEXT.  We now include alarmed zone name */
+ALTER TABLE `Events` MODIFY `Cause` TEXT;
+
+--
+-- Update Monitors table to have a ONVIF_Event_Listener Column
+--
+
+SELECT 'Checking for ONVIF_Event_Listener in Monitors';
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Monitors'
+  AND table_schema = DATABASE()
+  AND column_name = 'ONVIF_Event_Listener'
+  ) > 0,
+"SELECT 'Column ONVIF_Event_Listener already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_Event_Listener` BOOLEAN NOT NULL default false AFTER `ONVIF_Options`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

db/zm_update-1.37.8.sql

@@ -0,0 +1,18 @@
+--
+-- Update Monitors table to have JanusEnabled
+--
+
+SELECT 'Checking for JanusEnabled in Monitors';
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Monitors'
+  AND table_schema = DATABASE()
+  AND column_name = 'JanusEnabled'
+  ) > 0,
+"SELECT 'Column JanusEnabled already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `JanusEnabled` BOOLEAN NOT NULL default false AFTER `DecodingEnabled`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

db/zm_update-1.37.9.sql

@@ -0,0 +1,18 @@
+--
+-- Update Monitors table to have JanusEnabled
+--
+
+SELECT 'Checking for JanusAudioEnabled in Monitors';
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Monitors'
+  AND table_schema = DATABASE()
+  AND column_name = 'JanusAudioEnabled'
+  ) > 0,
+"SELECT 'Column JanusAudioEnabled already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `JanusAudioEnabled` BOOLEAN NOT NULL default false AFTER `JanusEnabled`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

dep/RtspServer

@@ -1 +1 @@
-Subproject commit cd7fd49becad6010a1b8466bfebbd93999a39878
+Subproject commit 1b40f1661f93f50fd5805f239d1e466a3bcf888f

distros/beowulf/control

@@ -5,7 +5,6 @@ Maintainer: Isaac Connor <isaac@zoneminder.com>
 Uploaders: Isaac Connor <isaac@zoneminder.com>
 Build-Depends: debhelper, sphinx-doc, dh-linktree, dh-apache2
               ,cmake
-              ,libavdevice-dev
               ,libavcodec-dev
               ,libavformat-dev
               ,libavutil-dev
@@ -14,7 +13,6 @@ Build-Depends: debhelper, sphinx-doc, dh-linktree, dh-apache2
               ,ffmpeg
               ,net-tools
               ,libbz2-dev
-              ,libgcrypt20-dev
               ,libcurl4-gnutls-dev
               ,libturbojpeg0-dev
               ,default-libmysqlclient-dev | libmysqlclient-dev | libmariadbclient-dev-compat

distros/beowulf/copyright

@@ -41,7 +41,6 @@ Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org)
 License: Expat
 
 Files:
-    cmake/Modules/CheckPrototypeDefinition*.cmake
     cmake/Modules/FindGLIB2.cmake
     cmake/Modules/FindPolkit.cmake
     cmake/Modules/GNUInstallDirs.cmake

distros/debian/control

@@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 9), cmake
     , libjpeg8-dev | libjpeg-dev
     , libpcre3-dev
     , libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev
-    , libavdevice-dev
     , libv4l-dev (>= 0.8.3)
     , libbz2-dev
     , ffmpeg | libav-tools
@@ -17,7 +16,7 @@ Build-Depends: debhelper (>= 9), cmake
     , libnetpbm10-dev
     , libvlccore-dev, libvlc-dev
     , libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
-    , libgcrypt11-dev, libpolkit-gobject-1-dev
+    , libpolkit-gobject-1-dev
     , libphp-serialization-perl
     , libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, libdbd-mysql-perl
     , libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl
@@ -47,7 +46,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
     ,libnumber-bytes-human-perl
     ,libfile-slurp-perl
     , libpcre3
-    , ffmpeg | libav-tools, libavdevice53 | libavdevice55 | libavdevice57
+    , ffmpeg | libav-tools
     , rsyslog | system-log-daemon
     , netpbm
     , zip

distros/opensuse/redalert.wav

@@ -1 +1 @@
-../redhat/misc/redalert.wav
+../redhat/common/redalert.wav

distros/opensuse/zoneminder.cmake.OS13.spec

@@ -27,7 +27,7 @@ Source: ZoneMinder-%{version}.tar.gz
 
 BuildRequires: cmake polkit-devel
 BuildRequires: perl-DBI perl-DBD-mysql perl-Date-Manip perl-Sys-Mmap 
-BuildRequires: libjpeg62 libjpeg62-devel libmysqld-devel libSDL-devel libgcrypt-devel libgnutls-devel
+BuildRequires: libjpeg62 libjpeg62-devel libmysqld-devel libSDL-devel libgnutls-devel
 BuildRequires: libffmpeg-devel x264
 BuildRequires: pcre-devel w32codec-all  
 

distros/redhat/zoneminder.spec

@@ -9,7 +9,7 @@
 %global ceb_version 1.0-zm
 
 # RtspServer is configured as a git submodule
-%global rtspserver_commit     cd7fd49becad6010a1b8466bfebbd93999a39878
+%global rtspserver_commit     eab32851421ffe54fec0229c3efc44c642bc8d46
 
 %global sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
 %global sslkey %{_sysconfdir}/pki/tls/private/localhost.key
@@ -36,7 +36,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.36.5
+Version: 1.37.12
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
@@ -352,7 +352,8 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %config(noreplace) %{_sysconfdir}/logrotate.d/zoneminder
 
 %{_unitdir}/zoneminder.service
-%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
+%{_datadir}/polkit-1/actions/com.zoneminder.*
+%{_datadir}/polkit-1/rules.d/com.zoneminder.arp-scan.rules
 %{_bindir}/zmsystemctl.pl
 
 %{_bindir}/zmaudit.pl
@@ -430,6 +431,9 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
 
 %changelog
+* Mon Jul 05 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.37.1-1
+- 1.37.x development build
+
 * Tue Jun 22 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.5-1
 - 1.36.5 release
 

distros/ubuntu1504_cmake_split_packages/control

@@ -8,14 +8,14 @@ Build-Depends: debhelper (>= 9), po-debconf (>= 1.0), autoconf, automake, libtoo
 , libdate-manip-perl, libwww-perl
 , libjpeg8-dev | libjpeg9-dev | libjpeg62-turbo-dev
 , libpcre3-dev
-, libavcodec-ffmpeg-dev, libavformat-ffmpeg-dev, libswscale-ffmpeg-dev, libavutil-ffmpeg-dev, libavdevice-ffmpeg-dev
+, libavcodec-ffmpeg-dev, libavformat-ffmpeg-dev, libswscale-ffmpeg-dev, libavutil-ffmpeg-dev
 , libv4l-dev (>= 0.8.3)
 , libbz2-dev
 , libsys-mmap-perl
 , libdevice-serialport-perl, libarchive-zip-perl, libmime-lite-perl
 , libvlccore-dev, libvlc-dev
 , libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
-, libgcrypt11-dev | libgcrypt20-dev, libpolkit-gobject-1-dev
+, libpolkit-gobject-1-dev
 , libdbi-perl, libnet-sftp-foreign-perl, libexpect-perl, libmime-tools-perl
 Standards-Version: 3.9.6
 Homepage: http://www.zoneminder.com/

distros/ubuntu1504_cmake_split_packages/rules

@@ -15,7 +15,6 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 CFLAGS = -Wall
-CXXFLAGS = -DHAVE_LIBCRYPTO
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 DEBOPT = --enable-debug

distros/ubuntu1604/NEWS

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

distros/ubuntu1604/README.Debian

@@ -1,130 +0,0 @@
-Zoneminder for Debian
----------------------
-
-Initializing database
----------------------
-
-    pv /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
-OR
-    cat /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
-
-    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"
-accordingly.
-
-The following command can help to ensure that zoneminder can read its
-configuration file:
-
-    chgrp -c www-data /etc/zm/zm.conf
-
-
-Upgrading 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:
-
-    zmupdate.pl
-
-Additional permissions may be required to perform upgrade:
-
-    echo 'grant lock tables, create, alter on zm.* to 'zmuser'@localhost identified by "zmpass";'\
-    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
-
-The following command prints the current version of zoneminder database:
-
-    echo 'select Value from Config where Name = "ZM_DYN_CURR_VERSION";' \
-    | sudo mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names zm
-
-
-Enabling service
-----------------
-
-By default Zoneminder service is not automatically started and needs to be
-manually enabled once database is configured:
-
-    sudo systemctl enable zoneminder.service
-
-
-Web server set-up
------------------
-
-There are few manual steps to get the web interface working:
-
-## Apache2
-
-Apache can be configured as folder "/zm" using sample .conf:
-
-    sudo a2enconf zoneminder
-
-Alternatively Apache web site configuration template can be used to setup
-zoneminder as "http://zoneminder":
-
-    sudo cp -v /usr/share/doc/zoneminder/examples/apache.conf /etc/apache2/sites-available/
-    sudo a2ensite zoneminder.conf
-
-Common configuration steps for Apache2:
-
-    sudo a2enmod cgi
-    sudo service apache2 reload
-
-
-## nginx / fcgiwrap
-
-Nginx needs "php-fpm" package to support PHP and "fcgiwrap" package
-for binary "cgi-bin" applications:
-
-    sudo apt-get install php-fpm fcgiwrap
-
-To enable a URL alias that makes Zoneminder available from
-
-    http://yourserver/zm
-
-the following line is to be added to "server" section of a web site
-configuration:
-
-    include /usr/share/doc/zoneminder/examples/nginx.conf;
-
-For "default" web site it would be sufficient to include the above
-statement to the file
-
-    /etc/nginx/sites-enabled/default
-
-To avoid problems with feeds from multiple cameras "fcgiwrap" should be
-configured to start at least as many processes as there are cameras.
-It can be done by adjusting DAEMON_OPTS in "/etc/default/fcgiwrap".
-Systemd users may be affected by the following bug:
-
-    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792705
-
-
-## Note:
-
-When Zoneminder web site is running it may be necessary to set
-Options/Paths/PATH_ZMS to "/zm/cgi-bin/nph-zms" or according to chosen web
-site configuration.
-
-
-Changing the location for images and events
--------------------------------------------
-
-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*
----------------------
-
-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

distros/ubuntu1604/TODO.Debian

@@ -1,12 +0,0 @@
-
-## Separate substantial /usr/share into its own arch-all package.
-
-## Decide how to handle database updates.
-
-  * Consider possibility that database may be on another machine (#469239).
-  * Consider dbconfig-common? Probably not (what if database is not on localhost?).
-
-### Run `zmupdate.pl` from service control scripts (init.d, service) on start?
-
- Automatic upgrade will break "one DB, many zoneminders" setup (unimportant?).
-

distros/ubuntu1604/changelog

@@ -1,3 +0,0 @@
-zoneminder (1.35.6~20200825.27-xenial) xenial; urgency=low
-  *
- -- Isaac Connor <isaac@zoneminder.com>  Tue, 25 Aug 2020 09:28:18 -0400

distros/ubuntu1604/clean

@@ -1,3 +0,0 @@
-.gitattributes
-web/api/.gitattributes
-web/api/.gitignore

distros/ubuntu1604/compat

@@ -1 +0,0 @@
-9

distros/ubuntu1604/conf/apache2/zoneminder.conf

@@ -1,57 +0,0 @@
-# Remember to enable cgi mod (i.e. "a2enmod cgi").
-ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin"
-<Directory "/usr/lib/zoneminder/cgi-bin">
-    Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-    AllowOverride All
-    Require all granted
-</Directory>
-
-
-# Order matters. This alias must come first.
-Alias /zm/cache /var/cache/zoneminder/cache
-<Directory /var/cache/zoneminder/cache>
-    Options -Indexes +FollowSymLinks
-    AllowOverride None
-    <IfModule mod_authz_core.c>
-        # Apache 2.4
-        Require all granted
-    </IfModule>
-    <IfModule !mod_authz_core.c>
-        # Apache 2.2
-        Order deny,allow
-        Allow from all
-    </IfModule>
-</Directory>
-
-Alias /zm /usr/share/zoneminder/www
-<Directory /usr/share/zoneminder/www>
-  Options -Indexes +FollowSymLinks
-  <IfModule mod_dir.c>
-    DirectoryIndex index.php
-  </IfModule>
-</Directory>
-
-# For better visibility, the following directives have been migrated from the
-# default .htaccess files included with the CakePHP project.
-# Parameters not set here are inherited from the parent directive above.
-<Directory "/usr/share/zoneminder/www/api">
-   RewriteEngine on
-   RewriteRule ^$ app/webroot/ [L]
-   RewriteRule (.*) app/webroot/$1 [L]
-   RewriteBase /zm/api
-</Directory>
-
-<Directory "/usr/share/zoneminder/www/api/app">
-   RewriteEngine on
-   RewriteRule ^$ webroot/ [L]
-   RewriteRule (.*) webroot/$1 [L]
-   RewriteBase /zm/api
-</Directory>
-
-<Directory "/usr/share/zoneminder/www/api/app/webroot">
-    RewriteEngine On
-    RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^ index.php [L]
-    RewriteBase /zm/api
-</Directory>

distros/ubuntu1604/control

@@ -1,165 +0,0 @@
-Source: zoneminder
-Section: net
-Priority: optional
-Maintainer: Isaac Connor <isaac@zoneminder.com>
-Uploaders: Isaac Connor <isaac@zoneminder.com>
-Build-Depends: debhelper (>= 9), dh-systemd, python3-sphinx, apache2-dev, dh-linktree, dh-systemd, dh-apache2
-              ,cmake
-              ,libavdevice-dev (>= 6:10~)
-              ,libavcodec-dev (>= 6:10~)
-              ,libavformat-dev  (>= 6:10~)
-              ,libavutil-dev (>= 6:10~)
-              ,libswresample-dev | libavresample-dev
-              ,libswscale-dev (>= 6:10~)
-              ,ffmpeg | libav-tools
-              ,net-tools
-              ,libbz2-dev
-              ,libgcrypt-dev | libgcrypt11-dev
-              ,libcurl4-gnutls-dev
-              ,libgnutls-openssl-dev
-              ,libjpeg8-dev | libjpeg9-dev | libjpeg62-turbo-dev
-              ,default-libmysqlclient-dev | libmysqlclient-dev | libmariadbclient-dev-compat
-              ,libpcre3-dev
-              ,libpolkit-gobject-1-dev
-              ,libv4l-dev (>= 0.8.3) [!hurd-any]
-              ,libvlc-dev
-              ,libdate-manip-perl
-              ,libdbd-mysql-perl
-              ,libphp-serialization-perl
-              ,libsys-mmap-perl [!hurd-any]
-              ,libwww-perl
-              ,libdata-uuid-perl
-              ,libssl-dev
-              ,libcrypt-eksblowfish-perl
-              ,libdata-entropy-perl
-              ,libvncserver-dev
-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
-
-Package: zoneminder
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-        ,javascript-common
-        ,libswscale-ffmpeg3|libswscale4|libswscale3|libswscale5
-        ,libswresample2|libswresample3|libswresample24|libswresample-ffmpeg1
-        ,ffmpeg | libav-tools
-        ,libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
-        ,libdbd-mysql-perl
-        ,libphp-serialization-perl
-        ,libmodule-load-conditional-perl
-        ,libnet-sftp-foreign-perl
-        ,libarchive-zip-perl
-        ,libdbd-mysql-perl
-        ,libdevice-serialport-perl
-        ,libimage-info-perl
-        ,libjson-maybexs-perl
-        ,libsys-mmap-perl [!hurd-any]
-        ,liburi-encode-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 | mariadb-client | virtual-mysql-client
-        ,perl-modules
-        ,php5-mysql | php-mysql, php5-gd | php-gd , php5-apcu | php-apcu , php-apc | php-apcu-bc, php-json | php5-json
-        ,policykit-1
-        ,rsyslog | system-log-daemon
-        ,zip
-        ,libpcre3
-        ,libssl | libssl1.0.0 | libssl1.1
-        ,libcrypt-eksblowfish-perl
-        ,libdata-entropy-perl
-        ,libvncclient1|libvncclient0
-Recommends: ${misc:Recommends}
-           ,libapache2-mod-php5 | libapache2-mod-php | php5-fpm | 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
- 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
-#Multi-Arch: foreign
-#Depends: ${misc:Depends}, ${perl:Depends}
-#        ,libarchive-zip-perl
-#        ,libdbd-mysql-perl
-#        ,libdevice-serialport-perl
-#        ,libimage-info-perl
-#        ,libjson-maybexs-perl
-#        ,libsys-mmap-perl [!hurd-any]
-#        ,liburi-encode-perl
-#        ,libwww-perl
-#Description: ZoneMinder Perl libraries
-# 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.
-# .
-# This package provides ZoneMinder Perl libraries; it can be used to
-# write custom interfaces as well.
-
-Package: zoneminder-doc
-Section: doc
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}, python3-sphinx-rtd-theme
-Suggests: www-browser
-Description: ZoneMinder documentation
- 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.
- .
- This package provides ZoneMinder documentation in HTML format.
-
-Package: zoneminder-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: zoneminder (= ${binary:Version}), ${misc:Depends}
-Description: Zoneminder -- debugging symbols
- 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.
- .
- This package provides debugging symbols

distros/ubuntu1604/copyright

@@ -1,168 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: ZoneMinder
-Upstream-Contact: Philip Coombes <philip.coombes@zoneminder.com>
-Source: https://github.com/ZoneMinder/ZoneMinder
-Comment:
- This package was originally debianized by matrix <matrix@cecilia>
- on Mon,  7 Mar 2005 02:07:57 -0500.
- It was re-done for submission to the Debian project by Peter Howard
- <pjh@northern-ridge.com.au> on Fri, 8 Dec 2006 10:19:43 +1100
-Files-Excluded:
-    web/skins/*/js/jquery-*
-
-Files: *
-Copyright: 2001-2014 Philip Coombes <philip.coombes@zoneminder.com>
-           2008      Brian Rudy <brudyNO@SPAMpraecogito.com>
-           2014      Vincent Giovannone
-           2013      Tim Craig <timcraigNO@SPAMsonic.net>
-           2003-2008 Corey DeLasaux
-           2001-2010 Chris Kistner
-License: GPL-2+
-
-Files: distros/*
-Copyright: 2001-2008 Philip Coombes <philip.coombes@zoneminder.com>
-           2014      Isaac Connor <iconnor@connortechnology.com>
-           2005      Serg Oskin
-License: GPL-2+
-
-Files: web/skins/*/js/jquery-*
-Copyright: 2010 John Resig
-           2010 The Dojo Foundation
-License: GPL-2 or Expat
-Comment:
- Dual licensed under the MIT or GPL Version 2 licenses.
- http://jquery.org/license
- .
- Includes Sizzle.js http://sizzlejs.com/
- Released under the MIT, BSD, and GPL Licenses.
-
-Files: web/api/*
-Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org)
-License: Expat
-
-Files:
-    cmake/Modules/CheckPrototypeDefinition*.cmake
-    cmake/Modules/FindGLIB2.cmake
-    cmake/Modules/FindPolkit.cmake
-    cmake/Modules/GNUInstallDirs.cmake
-Copyright:
-    2005-2011 Kitware, Inc.
-    2010-2011 Andreas Schneider <asn@cryptomilk.org>
-    2009      Dario Freddi <drf@kde.org>
-    2008      Laurent Montel, <montel@kde.org>
-    2011      Nikita Krupen'ko <krnekit@gmail.com>
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
-  * Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
- .
-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
- .
-  * The names of Kitware, Inc., the Insight Consortium, or the names of
-    any consortium members, or of any contributors, may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files: cmake/Modules/FindPerlModules.cmake
-Copyright: 2012 Iowa State University
-License: Boost-1.0
- Boost Software License - Version 1.0 - August 17th, 2003
- .
- Permission is hereby granted, free of charge, to any person or organization
- obtaining a copy of the software and accompanying documentation covered by
- this license (the "Software") to use, reproduce, display, distribute,
- execute, and transmit the Software, and to prepare derivative works of the
- Software, and to permit third-parties to whom the Software is furnished to
- do so, all subject to the following:
- .
- The copyright notices in the Software and this entire statement, including
- the above license grant, this restriction and the following disclaimer,
- must be included in all copies of the Software, in whole or in part, and
- all derivative works of the Software, unless such copies or derivative
- works are solely in the form of machine-executable object code generated by
- a source language processor.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
-Files: debian/*
-Copyright: 2015      Dmitry Smirnov <onlyjob@debian.org>
-           2007-2014 Peter Howard <pjh@northern-ridge.com.au>
-           2010-2012 Vagrant Cascadian <vagrant@debian.org>
-           2001-2008 Philip Coombes <philip.coombes@zoneminder.com>
-License: GPL-2+
-
-License: Expat
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  .
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  .
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
-License: GPL-2+
- 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
- .
- The complete text of the GNU General Public License version 2
- can be found in "/usr/share/common-licenses/GPL-2".
-
-License: GPL-2
- 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; version 2 of the License.
- .
- 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
- .
- The complete text of the GNU General Public License version 2
- can be found in "/usr/share/common-licenses/GPL-2".

distros/ubuntu1604/examples/nginx.conf

@@ -1,32 +0,0 @@
-location /zm/cgi-bin {
-    gzip off;
-    alias /usr/lib/zoneminder/cgi-bin;
-
-    include /etc/nginx/fastcgi_params;
-    fastcgi_param SCRIPT_FILENAME $request_filename;
-    fastcgi_pass  unix:/var/run/fcgiwrap.socket;
-}
-
-location /zm {
-#   if ($scheme ~ ^http:){
-#       rewrite ^(.*)$  https://$host$1 permanent;
-#   }
-
-    gzip off;
-    alias                   /usr/share/zoneminder/www;
-    index                   index.php;
-
-    location ~ \.php$ {
-        if (!-f $request_filename) { return 404; }
-        expires             epoch;
-        include             /etc/nginx/fastcgi_params;
-        fastcgi_param       SCRIPT_FILENAME         $request_filename;
-        fastcgi_index       index.php;
-        fastcgi_pass        unix:/var/run/php5-fpm.sock;
-    }
-
-    location ~ \.(jpg|jpeg|gif|png|ico)$ {
-        access_log          off;
-        expires         33d;
-    }
-}

distros/ubuntu1604/gbp.conf

@@ -1,7 +0,0 @@
-
-[dch]
-id-length    = 0
-
-[import-orig]
-pristine-tar = False
-merge        = False

distros/ubuntu1604/libzoneminder-perl.install

@@ -1,2 +0,0 @@
-usr/share/man/man3
-usr/share/perl5

distros/ubuntu1604/rules

@@ -1,96 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND += -Wl,--as-needed
-
-ifeq ($(DEB_BUILD_ARCH_OS),hurd)
-ARGS:= -DZM_NO_MMAP=ON
-endif
-
-%:
-	dh $@ --parallel --buildsystem=cmake --builddirectory=dbuild \
-            --with systemd,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="/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"
-
-override_dh_clean:
-	dh_clean $(MANPAGES1)
-	$(RM) -r docs/_build
-
-build-indep:
-	#$(MAKE) -C docs text
-	$(MAKE) -C docs html
-
-MANPAGES1 = dbuild/scripts/zmupdate.pl.1
-$(MANPAGES1):
-	# generate man page(s):
-	pod2man -s1 --stderr --utf8 $(patsubst %.1, %, $@) $@
-
-## reproducible build:
-LAST_CHANGE=$(shell dpkg-parsechangelog -S Date)
-BUILD_DATE=$(shell LC_ALL=C date -u "+%B %d, %Y" -d "$(LAST_CHANGE)")
-override_dh_installman: $(MANPAGES1)
-	$(MAKE) -C docs man SPHINXOPTS="-D today=\"$(BUILD_DATE)\""
-	dh_installman --language=C $(MANPAGES1)
-
-override_dh_auto_install:
-	dh_auto_install --destdir=$(CURDIR)/debian/tmp
-	# remove worthless files:
-	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*/*/.packlist
-	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*.in
-	# remove empty directories:
-	find $(CURDIR)/debian/tmp/usr -type d -empty -delete -printf 'removed %p\n'
-	# remove extra-license-file:
-	$(RM) -v $(CURDIR)/debian/tmp/usr/share/zoneminder/www/api/lib/Cake/LICENSE.txt
-
-override_dh_fixperms:
-	dh_fixperms
-	#
-	# As requested by the Debian Webapps Policy Manual §3.2.1
-	chown root:www-data $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
-	chmod 640 $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
-
-override_dh_systemd_start:
-	dh_systemd_start --no-start
-
-override_dh_systemd_enable:
-	dh_systemd_enable --no-enable
-
-override_dh_apache2:
-	dh_apache2 --noenable
-
-override_dh_strip:
-	[ -d "$(CURDIR)/debian/zoneminder-dbg" ] \
-        && dh_strip --dbg-package=zoneminder-dbg \
-        || dh_strip
-
-#%:
-#	dh $@ --parallel --buildsystem=autoconf --with autoreconf
-#
-#override_dh_auto_configure:
-#	dh_auto_configure -- \
-#            --sysconfdir=/etc/zm \
-#            --with-mysql=/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

distros/ubuntu1604/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

distros/ubuntu1604/source/lintian-overrides

@@ -1,5 +0,0 @@
-## We're using "libjs-jquery" instead.
-source-is-missing web/skins/*/js/jquery-3.5.1.min.js
-
-## Acknowledged, will repack eventually.
-source-contains-prebuilt-javascript-object web/skins/*/js/jquery-3.5.1.min.js

distros/ubuntu1604/zoneminder-doc.doc-base

@@ -1,8 +0,0 @@
-Document: zoneminder-doc
-Title: Zoneminder documentation
-Abstract: This document describes how to use Zoneminder.
-Section: System/Administration
-
-Format: HTML
-Index: /usr/share/doc/zoneminder-doc/html/index.html
-Files: /usr/share/doc/zoneminder-doc/html/*

distros/ubuntu1604/zoneminder-doc.install

@@ -1 +0,0 @@
-docs/_build/html	usr/share/doc/zoneminder-doc/

distros/ubuntu1604/zoneminder-doc.links

@@ -1,2 +0,0 @@
-## Convenience symlink:
-/usr/share/doc/zoneminder-doc/html    /usr/share/doc/zoneminder/html

distros/ubuntu1604/zoneminder.apache2

@@ -1 +0,0 @@
-conf debian/conf/apache2/zoneminder.conf  nginx

distros/ubuntu1604/zoneminder.bug-presubj

@@ -1,5 +0,0 @@
-Unless bug is specific to Debian please consider reporting it directly to
-upstream developer(s):
-
-    https://github.com/ZoneMinder/ZoneMinder/issues
-

distros/ubuntu1604/zoneminder.dirs

@@ -1,10 +0,0 @@
-var/log/zm
-var/lib/zm
-var/cache/zoneminder/events
-var/cache/zoneminder/images
-var/cache/zoneminder/temp
-var/cache/zoneminder/cache
-usr/share/zoneminder/db
-usr/share/zoneminder/fonts
-etc/zm/
-etc/zm/conf.d

distros/ubuntu1604/zoneminder.docs

@@ -1 +0,0 @@
-README.md

distros/ubuntu1604/zoneminder.examples

@@ -1,2 +0,0 @@
-debian/examples/*
-dbuild/misc/apache.conf

distros/ubuntu1604/zoneminder.install

@@ -1,12 +0,0 @@
-etc/zm/zm.conf
-etc/zm/conf.d/*
-usr/bin
-usr/lib/zoneminder
-usr/share/polkit-1
-usr/share/zoneminder/db
-usr/share/zoneminder/www
-usr/share/zoneminder/fonts
-
-# libzoneminder-perl files:
-usr/share/man/man3
-usr/share/perl5

distros/ubuntu1604/zoneminder.links

@@ -1 +0,0 @@
-/var/tmp  /usr/share/zoneminder/www/api/app/tmp

distros/ubuntu1604/zoneminder.linktrees

@@ -1,6 +0,0 @@
-## cakephp
-#replace  /usr/share/php/Cake					/usr/share/zoneminder/www/api/lib/Cake
-
-## libjs-jquery
-#replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/classic/js/jquery-3.5.1.min.js
-#replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/flat/js/jquery-3.5.1.min.js

distros/ubuntu1604/zoneminder.lintian-overrides

@@ -1,14 +0,0 @@
-# Depends: policykit-1
-unusual-interpreter usr/bin/zmsystemctl.pl #!/usr/bin/pkexec
-
-# Intentionally not others-readable, #637685.
-non-standard-file-perm etc/zm/zm.conf 0640 != 0644
-
-# Bundled Cake PHP framework, not intended for direct execution:
-script-not-executable usr/share/zoneminder/www/api/*
-
-# Annoying but seems to be too much troubles to fix; should be fixed upstream:
-script-with-language-extension usr/bin/*.pl
-
-# dh-linktree:
-package-contains-broken-symlink usr/share/zoneminder/www/api/lib/Cake/*

distros/ubuntu1604/zoneminder.logrotate

@@ -1,13 +0,0 @@
-/var/log/zm/*.log {
-    missingok
-    notifempty
-    sharedscripts
-    delaycompress
-    compress
-    postrotate
-        /usr/bin/zmpkg.pl logrot >>/dev/null 2>&1 || :
-    endscript
-    daily
-    rotate 7
-    maxage 7
-}

distros/ubuntu1604/zoneminder.maintscript

@@ -1 +0,0 @@
-rm_conffile  /etc/zm/apache.conf  1.28.1-5~

distros/ubuntu1604/zoneminder.manpages

@@ -1 +0,0 @@
-docs/_build/man/*.1

distros/ubuntu1604/zoneminder.postinst

@@ -1,101 +0,0 @@
-#! /bin/sh
-
-set +e
-
-if [ "$1" = "configure" ]; then
-    
-  . /etc/zm/zm.conf
-  for CONFFILE in /etc/zm/conf.d/*.conf; do
-    . "$CONFFILE"
-  done
-  
-  # The logs can contain passwords, etc... so by setting group root, only www-data can read them, not people in the www-data group
-  chown www-data:root /var/log/zm
-  chown www-data:www-data /var/lib/zm
-  chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
-  if [ ! -e "/etc/apache2/mods-enabled/cgi.load" ] && [ "$(command -v a2enmod)" != "" ]; then
-    echo "The cgi module is not enabled in apache2.  I am enabling it using a2enmod cgi."
-    a2enmod cgi
-  fi
-  if [ ! -e "/etc/apache2/mods-enabled/rewrite.load" ] && [ "$(command -v a2enmod)" != "" ]; then
-    echo "The rewrite module is not enabled in apache2.  I am enabling it using a2enmod rewrite."
-    a2enmod rewrite
-  fi
-
-  if [ "$ZM_DB_HOST" = "localhost" ]; then
-
-    if [ -e "/lib/systemd/system/mysql.service" ] || [ -e "/lib/systemd/system/mariadb.service" ] || [ -e "/etc/init.d/mysql" ]; then
-      # Ensure zoneminder is stopped
-      deb-systemd-invoke stop zoneminder.service || exit $?
-          
-      #
-      # Get mysql started if it isn't running
-      #
-      
-      if [ -e "/lib/systemd/system/mariadb.service" ]; then
-        DBSERVICE="mariadb.service"
-      else
-        DBSERVICE="mysql.service"
-      fi
-      echo "Detected db service is $DBSERVICE"
-      if systemctl is-failed --quiet $DBSERVICE; then
-        echo "$DBSERVICE is in a failed state; it will not be started."
-        echo "If you have already resolved the problem preventing $DBSERVICE from running,"
-        echo "run sudo systemctl restart $DBSERVICE then run sudo dpkg-reconfigure zoneminder."
-        exit 1
-      fi
-      
-      if ! systemctl is-active --quiet mysql.service mariadb.service; then
-        # Due to /etc/init.d service autogeneration, mysql.service always returns the status of mariadb.service
-        # However, mariadb.service will not return the status of mysql.service.
-        deb-systemd-invoke start $DBSERVICE
-      fi
-      
-      # Make sure systemctl status exit code is 0; i.e. the DB is running
-      if systemctl is-active --quiet "$DBSERVICE"; then
-        mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
-        # test if database if already present...
-        if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
-            echo "Creating zm db"
-            cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
-            if [ $? -ne 0 ]; then
-              echo "Error creating db."
-              exit 1;
-            fi
-            # This creates the user.
-            echo "CREATE USER '${ZM_DB_USER}'@localhost IDENTIFIED BY '${ZM_DB_PASS}';" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-        fi
-        echo "Updating permissions for user ${ZM_DB_USER}@localhost"
-        echo "GRANT LOCK TABLES,ALTER,DROP,SELECT,INSERT,UPDATE,DELETE,CREATE,INDEX,ALTER ROUTINE,CREATE ROUTINE, TRIGGER,EXECUTE,REFERENCES ON ${ZM_DB_NAME}.* TO '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-
-        zmupdate.pl -s --nointeractive
-        if [ $? -ne 0 ]; then
-          echo "Error updating db."
-          exit 1;
-        fi
-        zmupdate.pl --nointeractive -f
-        if [ $? -ne 0 ]; then
-          echo "Error updating config."
-          exit 1;
-        fi
-
-        # Add any new PTZ control configurations to the database (will not overwrite)
-        zmcamtool.pl --import >/dev/null 2>&1
-        echo "Done Updating; starting ZoneMinder."
-      else
-        echo 'NOTE: MySQL/MariaDB not running; please start mysql and run dpkg-reconfigure zoneminder when it is running.'
-      fi
-    else
-      echo 'MySQL/MariaDB not found; assuming remote server.'
-    fi
-
-  else
-    echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)."
-  fi
-
-  echo "Done Updating; starting ZoneMinder."
-  deb-systemd-invoke restart zoneminder.service
-
-fi
-
-#DEBHELPER#

distros/ubuntu1604/zoneminder.postrm

@@ -1,14 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" = "purge" ]; then
-    echo "
-Reminder: to completely remove \"zoneminder\" it may be necessary
- * to delete database using the following sample command:
-        sudo mysqladmin --defaults-file=/etc/mysql/debian.cnf -f drop zm
- * to delete remaining data files in "/var/cache/zoneminder".
-"
-fi
-
-#DEBHELPER#

distros/ubuntu1604/zoneminder.preinst

@@ -1,11 +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
-
-#DEBHELPER#

distros/ubuntu1604/zoneminder.service

@@ -1,23 +0,0 @@
-# ZoneMinder systemd unit file
-# This file is intended to work with Debian distributions
-
-[Unit]
-Description=ZoneMinder CCTV recording and surveillance system
-After=network.target mysql.service
-# Remarked out so that it will start ZM on machines that don't have mysql installed
-#Requires=mysql.service
-
-[Service]
-#User=www-data
-Type=forking
-ExecStart=/usr/bin/zmpkg.pl start
-ExecReload=/usr/bin/zmpkg.pl restart
-ExecStop=/usr/bin/zmpkg.pl stop
-PIDFile=/run/zm/zm.pid
-Restart=always
-RestartSec=10
-Environment=TZ=:/etc/localtime
-TimeoutSec=600
-
-[Install]
-WantedBy=multi-user.target

distros/ubuntu1604/zoneminder.tmpfile

@@ -1,4 +0,0 @@
-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

distros/ubuntu2004/control

@@ -2,9 +2,8 @@ Source: zoneminder
 Section: net
 Priority: optional
 Maintainer: Isaac Connor <isaac@zoneminder.com>
-Build-Depends: debhelper (>= 12), sphinx-doc, python3-sphinx, dh-linktree, dh-apache2
+Build-Depends: debhelper (>= 11), sphinx-doc, python3-sphinx, dh-linktree, dh-apache2
               ,cmake
-              ,libavdevice-dev
               ,libavcodec-dev
               ,libavformat-dev
               ,libavutil-dev
@@ -13,12 +12,10 @@ Build-Depends: debhelper (>= 12), sphinx-doc, python3-sphinx, dh-linktree, dh-ap
               ,ffmpeg
               ,net-tools
               ,libbz2-dev
-              ,libgcrypt20-dev
               ,libcurl4-gnutls-dev
               ,libjpeg-turbo8-dev | libjpeg62-turbo-dev | libjpeg8-dev | libjpeg9-dev
               ,libturbojpeg0-dev
               ,default-libmysqlclient-dev | libmysqlclient-dev | libmariadbclient-dev-compat
-              ,libpcre3-dev
               ,libpolkit-gobject-1-dev
               ,libv4l-dev [!hurd-any]
               ,libvlc-dev
@@ -33,17 +30,20 @@ Build-Depends: debhelper (>= 12), sphinx-doc, python3-sphinx, dh-linktree, dh-ap
               ,libdata-entropy-perl
               ,libvncserver-dev
               ,libjwt-gnutls-dev|libjwt-dev
+              ,libgsoap-dev
 Standards-Version: 4.5.0
 Homepage: https://www.zoneminder.com/
 
 Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+        ,sudo
         ,javascript-common
-        ,libswscale5
-        ,libswresample3
+        ,libswscale5|libswscale4
+        ,libswresample3|libswresample2
         ,ffmpeg
-        ,libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
+        ,libcurl4, libcurl4-gnutls-dev
+        ,libdatetime-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
         ,libdbd-mysql-perl
         ,libphp-serialization-perl
         ,libmodule-load-conditional-perl
@@ -71,11 +71,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,policykit-1
         ,rsyslog | system-log-daemon
         ,zip
-        ,libpcre3
         ,libcrypt-eksblowfish-perl
         ,libdata-entropy-perl
         ,libvncclient1|libvncclient0
-        ,libjwt-gnutls0
+        ,libjwt-gnutls0|libjwt0
+        ,libgsoap-2.8.104|libgsoap-2.8.91|libgsoap-2.8.75|libgsoap-2.8.60|libgsoap10
 Recommends: ${misc:Recommends}
            ,libapache2-mod-php | php-fpm
            ,default-mysql-server | mariadb-server | virtual-mysql-server

distros/ubuntu2004/copyright

@@ -41,7 +41,6 @@ Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org)
 License: Expat
 
 Files:
-    cmake/Modules/CheckPrototypeDefinition*.cmake
     cmake/Modules/FindGLIB2.cmake
     cmake/Modules/FindPolkit.cmake
     cmake/Modules/GNUInstallDirs.cmake

distros/ubuntu2004/rules

@@ -19,6 +19,7 @@ override_dh_auto_configure:
             -DCMAKE_VERBOSE_MAKEFILE=ON                \
             -DCMAKE_BUILD_TYPE=Release                 \
 						-DBUILD_MAN=0 \
+						-DZM_NO_PCRE=ON \
             -DZM_CONFIG_DIR="/etc/zm"                  \
             -DZM_CONFIG_SUBDIR="/etc/zm/conf.d"        \
             -DZM_RUNDIR="/run/zm"                  \

distros/ubuntu2004/zoneminder.postinst

@@ -5,6 +5,12 @@ set +e
 create_db () {
   echo "Checking for db"
   mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
+  if [ $? -ne 0 ]; then
+    echo "Cannot talk to database. You will have to create the db manually with something like:";
+    echo "cat /usr/share/zoneminder/db/zm_create.sql | mysql -u root";
+    return;
+  fi
+
   # test if database if already present...
   if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
     echo "Creating zm db"

distros/ubuntu2004/zoneminder.service

@@ -5,7 +5,8 @@
 Description=ZoneMinder CCTV recording and surveillance system
 After=network.target mysql.service
 # Remarked out so that it will start ZM on machines that don't have mysql installed
-#Requires=mysql.service
+# Override it by placing an override.conf in /etc/systemd/system/zoneminder.service.d
+#BindsTo=mysql.service
 
 [Service]
 #User=www-data

distros/ubuntu2004/zoneminder.tmpfile

@@ -1,4 +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/tmp/zm                   0755 www-data www-data  7d
 d /var/cache/zoneminder/cache   0755 www-data www-data