merge master into modern

2013-10-04 10:40:30 +13:00 · 2013-10-04 10:40:30 +13:00 · d3d3460f21
parent 64f28a8b97 21caddf97b
commit d3d3460f21
139 changed files with 2890 additions and 16871 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,12 @@
+configure
+config.h.in
+autom4te.cache
+aclocal.m4
+depcomp
+install-sh
+missing
+mkinstalldirs
+stamp-h1
+stamp-h.in
+scripts/ZoneMinder/blib
+Makefile.in
--- a/.travis.yml
+++ b/.travis.yml
@ -9,15 +9,19 @@ env:
    - LD_LIBRARY_PATH="/usr/local/lib:/opt/libjpeg-turbo/lib:$LD_LIBRARY_PATH"
    - DEB_HOST_GNU_TYPE=$(dpkg-architecture -qDEB_HOST_GNU_TYPE)
    - DEB_BUILD_GNU_TYPE=$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-    - CXXFLAGS=" -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO -msse2 -I/usr/local/include"
+    - CFLAGS="-DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO -I/usr/local/include"
+    - CXXFLAGS="$CFLAGS"
+  matrix:
+    - ZM_BUILDMETHOD=cmake
+    - ZM_BUILDMETHOD=autotools
 compiler:
  - gcc
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get upgrade -y -qq
-  - sudo apt-get install -y -qq apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm subversion automake autoconf libjpeg-turbo8-dev libjpeg-turbo8 apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev
+  - sudo apt-get install -y -qq apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm subversion automake autoconf cmake libjpeg-turbo8-dev libjpeg-turbo8 apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev 2>&1 > /dev/null 
 install:
-  - git clone git://source.ffmpeg.org/ffmpeg.git 
+  - git clone --depth=10 --branch=master git://source.ffmpeg.org/ffmpeg.git 
  - cd ffmpeg 
  - ./configure --enable-shared --enable-swscale --enable-gpl  --enable-libx264 --enable-libvpx --enable-libvorbis --enable-libtheora 
  - make -j `grep processor /proc/cpuinfo|wc -l` 
@ -25,13 +29,21 @@ install:
  - sudo make install-libs
 before_script:
  - cd $TRAVIS_BUILD_DIR
-  - libtoolize --force
-  - aclocal
-  - autoheader
-  - automake --force-missing --add-missing
-  - autoconf
-  - mysql -e 'create database zoneminder;'
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then libtoolize --force; fi
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then aclocal; fi
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then autoheader; fi
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then automake --force-missing --add-missing; fi
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then autoconf; fi
 script:
-  - CXXFLAGS="$CXXFLAGS" ./configure --with-libarch=lib/$DEB_HOST_GNU_TYPE --disable-debug --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr --with-webdir=/var/www/zm --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes ZM_SSL_LIB=openssl ZM_DB_USER=travis ZM_DB_PASS= 
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then ./configure --prefix=/usr --with-libarch=lib/$DEB_HOST_GNU_TYPE --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr --with-ffmpeg=/usr --with-webdir=/usr/share/zoneminder/www --with-cgidir=/usr/libexec/zoneminder/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=yes --disable-debug --enable-mmap=yes ZM_SSL_LIB=openssl; fi
+  - if [ "$ZM_BUILDMETHOD" = "cmake" ]; then cmake -DCMAKE_INSTALL_PREFIX="/usr"; fi
  - make
-after_success: mysql -u travis < db/zm_create.sql
+  - sudo make install
+after_success:
+  - if [ "$ZM_BUILDMETHOD" = "cmake" ]; then sudo ./zmlinkcontent.sh; fi
+  - mysql -uroot -e "CREATE DATABASE IF NOT EXISTS zm"
+  - mysql -uroot -e "GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'zmpass'";
+  - mysql -uroot -e "FLUSH PRIVILEGES"
+  - mysql -uzmuser -pzmpass < db/zm_create.sql
+  - mysql -uzmuser -pzmpass zm < db/test.monitor.sql
+  - sudo zmpkg.pl start
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -0,0 +1,361 @@
+# Main CMake file for the ZoneMinder project.
+# Created by mastertheknife (Kfir Itzhak)
+# The goal is to ease up the installation of zoneminder.
+# Our current installation method (using autotools) is outdated, slow and breaks now and then.
+# The CMake installation method will require no parameters at all, default should sufficient and reliable.
+# It will be still possible to install ZoneMinder using autotools, they don't conflict with each other. The cmake way is a complete re-write (different syntax) and aims to be identical to the autotools way,
+# by having options using the same name and leaving ZM totally unmodified, while providing exactly the same things that ZM expects (config.h, configuration in *.in files, etc).
+#
+# For more information and installation, see the INSTALL file
+#
+cmake_minimum_required (VERSION 2.6)
+project (ZoneMinder)
+# ZoneMinder version
+set(ZoneMinder_VERSION "1.26.3")
+# Default build type. To change the build type, use the CMAKE_BUILD_TYPE configuration option.
+if(NOT CMAKE_BUILD_TYPE)
+	set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type: Release or Debug" FORCE)
+endif(NOT CMAKE_BUILD_TYPE)
+
+# Can make finding problems easier when troubleshooting.
+#set(CMAKE_VERBOSE_MAKEFILE ON)
+#set(CMAKE_INSTALL_ALWAYS ON)
+
+# Default CLFAGS and CXXFLAGS:
+set(CMAKE_C_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")
+set(CMAKE_CXX_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")
+set(CMAKE_C_FLAGS_DEBUG "-Wall -D__STDC_CONSTANT_MACROS -g")
+set(CMAKE_CXX_FLAGS_DEBUG "-Wall -D__STDC_CONSTANT_MACROS -g")
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+# Modules that we need:
+include (GNUInstallDirs)
+include (CheckIncludeFile)
+include (CheckIncludeFiles)
+include (CheckFunctionExists)
+include (CheckPrototypeDefinition)
+include (CheckTypeSize)
+include (CheckStructHasMember)
+
+# Default variables for some configuration options
+mark_as_advanced(FORCE ZM_EXTRA_LIBS ZM_MYSQL_ENGINE ZM_NO_MMAP ZM_NO_CRASHTRACE CMAKE_INSTALL_FULL_BINDIR)
+set(ZM_RUNDIR "/var/run/zm" CACHE PATH "Location of transient process files, default: /var/run/zm")
+set(ZM_TMPDIR "/tmp/zm" CACHE PATH "Location of temporary files, default: /tmp/zm")
+set(ZM_LOGDIR "/var/log/zm" CACHE PATH "Location of generated log files, default: /var/log/zm")
+set(ZM_WEBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/zoneminder/www" CACHE PATH "Location of the web files, default: <prefix>/${CMAKE_INSTALL_DATADIR}/zoneminder/www")
+set(ZM_CGIDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin" CACHE PATH "Location of the cgi-bin files, default: <prefix>/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin")
+set(ZM_CONTENTDIR "/var/lib/zoneminder" CACHE PATH "Location of dynamic content (events and images), default: /var/lib/zoneminder")
+# This one is not needed anymore. we do automatic detection of whats available, let ZM know and have ZM decide
+#set(ZM_SSL_LIB "openssl" CACHE STRING "Library to use for ssl functions, default: openssl")
+set(ZM_DB_HOST "localhost" CACHE STRING "Hostname where ZoneMinder database located, default: localhost")
+set(ZM_DB_NAME "zm" CACHE STRING "Name of ZoneMinder database, default: zm")
+set(ZM_DB_USER "zmuser" CACHE STRING "Name of ZoneMinder database user, default: zmuser")
+set(ZM_DB_PASS "zmpass" CACHE STRING "Password of ZoneMinder database user, default: zmpass")
+set(ZM_WEB_USER "" CACHE STRING "The user apache or the local web server runs on. Leave empty for automatic detection. If that fails, you can use this variable to force")
+set(ZM_WEB_GROUP "" CACHE STRING "The group apache or the local web server runs on, Leave empty to be the same as the web user")
+# Advanced
+set(ZM_EXTRA_LIBS "" CACHE STRING "A list of optional libraries, separated by semicolons, e.g. ssl;theora")
+set(ZM_MYSQL_ENGINE "InnoDB" CACHE STRING "MySQL engine to use with database, default: InnoDB")
+set(ZM_NO_MMAP "OFF" CACHE BOOL "Set to ON to not use mmap shared memory. Shouldn't be enabled unless you experience problems with the shared memory. default: OFF")
+set(ZM_NO_CRASHTRACE "OFF" CACHE BOOL "Set to ON to skip crash trace code. Useful if zm_signal.cpp fails to compile. default: OFF")
+# Only required for cmakecacheimport:
+set(CMAKE_INSTALL_FULL_BINDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" CACHE PATH "Override default binary directory")
+
+# Required for certain checks to work
+set(CMAKE_EXTRA_INCLUDE_FILES ${CMAKE_EXTRA_INCLUDE_FILES} stdio.h stdlib.h math.h signal.h)
+# Required for including headers from the this folder
+include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+# This is required to enable searching in lib64 (if exists), do not change
+set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
+
+# Check for misc required stuff
+check_include_file("linux/videodev.h" HAVE_LINUX_VIDEODEV_H)
+check_include_file("linux/videodev2.h" HAVE_LINUX_VIDEODEV2_H)
+check_include_file("execinfo.h" HAVE_EXECINFO_H)
+check_include_file("sys/sendfile.h" HAVE_SYS_SENDFILE_H)
+check_include_file("sys/syscall.h" HAVE_SYS_SYSCALL_H)
+check_function_exists("syscall" HAVE_SYSCALL)
+check_function_exists("sendfile" HAVE_SENDFILE)
+check_function_exists("backtrace" HAVE_DECL_BACKTRACE)
+check_function_exists("posix_memalign" HAVE_POSIX_MEMALIGN)
+check_function_exists("strsignal" HAVE_STRSIGNAL)
+check_prototype_definition("round" "double round (double x)" "0.0" "math.h" HAVE_DECL_ROUND)
+check_type_size("siginfo_t" SIGINFO_T)
+check_type_size("ucontext_t" UCONTEXT_T)
+check_type_size("struct sigcontext" STRUCT_SIGCONTEXT)
+check_struct_has_member("struct sigcontext" eip signal.h HAVE_STRUCT_SIGCONTEXT_EIP)
+check_struct_has_member("struct sigcontext" rip signal.h HAVE_STRUCT_SIGCONTEXT_RIP)
+
+# *** LIBRARY CHECKS ***
+
+# zlib
+find_package(ZLIB)
+if(ZLIB_FOUND)
+	set(HAVE_LIBZLIB 1)
+	list(APPEND ZM_BIN_LIBS ${ZLIB_LIBRARIES})
+	include_directories(${ZLIB_INCLUDE_DIR})
+	check_include_file("zlib.h" HAVE_ZLIB_H)
+endif(ZLIB_FOUND)
+
+# jpeg
+find_package(JPEG)
+if(JPEG_FOUND)
+	set(HAVE_LIBJPEG 1)
+	list(APPEND ZM_BIN_LIBS ${JPEG_LIBRARIES})
+	include_directories(${JPEG_INCLUDE_DIR})
+	check_include_files("stdio.h;jpeglib.h" HAVE_JPEGLIB_H)
+	#link_directories(${JPEG_LIBRARY})
+else(JPEG_FOUND)
+	message(FATAL_ERROR "zm requires jpeg but it was not found on your system")
+endif(JPEG_FOUND)
+
+# OpenSSL
+find_package(OpenSSL)
+if(OPENSSL_FOUND)
+	set(HAVE_LIBOPENSSL 1)
+	list(APPEND ZM_BIN_LIBS ${OPENSSL_LIBRARIES})
+	include_directories(${OPENSSL_INCLUDE_DIR})
+	check_include_file("openssl/md5.h" HAVE_OPENSSL_MD5_H)
+endif(OPENSSL_FOUND)
+# crypto using find_library. 
+# This library should be a part of the OpenSSL package but just need to be sure
+# In any case, we still need to define HAVE_LIBCRYPTO for zm if its available
+find_library(CRYPTO_LIBRARIES crypto)
+if(CRYPTO_LIBRARIES)
+	set(HAVE_LIBCRYPTO 1)
+	list(APPEND ZM_BIN_LIBS ${CRYPTO_LIBRARIES})
+endif(CRYPTO_LIBRARIES)
+
+# pthread using find_library
+find_library(PTHREAD_LIBRARIES pthread)
+if(PTHREAD_LIBRARIES)
+	set(HAVE_LIBPTHREAD 1)
+	list(APPEND ZM_BIN_LIBS ${PTHREAD_LIBRARIES})
+	check_include_file("pthread.h" HAVE_PTHREAD_H)
+else(PTHREAD_LIBRARIES)
+	message(FATAL_ERROR "zm requires pthread but it was not found on your system")
+endif(PTHREAD_LIBRARIES)
+
+# pcre using find_library
+find_library(PCRE_LIBRARIES pcre)
+if(PCRE_LIBRARIES)
+	set(HAVE_LIBPCRE 1)
+	list(APPEND ZM_BIN_LIBS ${PCRE_LIBRARIES})
+	check_include_file("pcre.h" HAVE_PCRE_H)
+endif(PCRE_LIBRARIES)
+
+# gcrypt using find_library
+find_library(GCRYPT_LIBRARIES gcrypt)
+if(GCRYPT_LIBRARIES)
+	set(HAVE_LIBGCRYPT 1)
+	list(APPEND ZM_BIN_LIBS ${GCRYPT_LIBRARIES})
+	check_include_file("gcrypt.h" HAVE_GCRYPT_H)
+endif(GCRYPT_LIBRARIES)
+
+# gnutls using find_library
+find_library(GNUTLS_LIBRARIES gnutls)
+if(GNUTLS_LIBRARIES)
+	set(HAVE_LIBGNUTLS 1)
+	list(APPEND ZM_BIN_LIBS ${GNUTLS_LIBRARIES})
+	check_include_file("gnutls/openssl.h" HAVE_GNUTLS_OPENSSL_H)
+	check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
+endif(GNUTLS_LIBRARIES)
+
+# mysqlclient using find_library
+find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)
+if(MYSQLCLIENT_LIBRARIES)
+	set(HAVE_LIBMYSQLCLIENT 1)
+	list(APPEND ZM_BIN_LIBS ${MYSQLCLIENT_LIBRARIES})	
+	check_include_file("mysql/mysql.h" HAVE_MYSQL_H)
+else(MYSQLCLIENT_LIBRARIES)
+	message(FATAL_ERROR "zm requires mysqlclient but it was not found on your system")
+endif(MYSQLCLIENT_LIBRARIES)
+
+# avformat using find_library
+find_library(AVFORMAT_LIBRARIES avformat)
+if(AVFORMAT_LIBRARIES)
+	set(HAVE_LIBAVFORMAT 1)
+	list(APPEND ZM_BIN_LIBS ${AVFORMAT_LIBRARIES})	
+	check_include_file("libavformat/avformat.h" HAVE_LIBAVFORMAT_AVFORMAT_H)
+endif(AVFORMAT_LIBRARIES)
+
+# avcodec using find_library
+find_library(AVCODEC_LIBRARIES avcodec)
+if(AVCODEC_LIBRARIES)
+	set(HAVE_LIBAVCODEC 1)
+	list(APPEND ZM_BIN_LIBS ${AVCODEC_LIBRARIES})	
+	check_include_file("libavcodec/avcodec.h" HAVE_LIBAVCODEC_AVCODEC_H)
+endif(AVCODEC_LIBRARIES)
+
+# avdevice using find_library
+find_library(AVDEVICE_LIBRARIES avdevice)
+if(AVDEVICE_LIBRARIES)
+	set(HAVE_LIBAVDEVICE 1)
+	list(APPEND ZM_BIN_LIBS ${AVDEVICE_LIBRARIES})	
+	check_include_file("libavdevice/avdevice.h" HAVE_LIBAVDEVICE_AVDEVICE_H)
+endif(AVDEVICE_LIBRARIES)
+
+# avutil using find_library
+find_library(AVUTIL_LIBRARIES avutil)
+if(AVUTIL_LIBRARIES)
+	set(HAVE_LIBAVUTIL 1)
+	list(APPEND ZM_BIN_LIBS ${AVUTIL_LIBRARIES})	
+	check_include_file("libavutil/avutil.h" HAVE_LIBAVUTIL_AVUTIL_H)
+	check_include_file("libavutil/mathematics.h" HAVE_LIBAVUTIL_MATHEMATICS_H)
+endif(AVUTIL_LIBRARIES)
+
+# swscale using find_library
+find_library(SWSCALE_LIBRARIES swscale)
+if(SWSCALE_LIBRARIES)
+	set(HAVE_LIBSWSCALE 1)
+	list(APPEND ZM_BIN_LIBS ${SWSCALE_LIBRARIES})	
+	check_include_file("libswscale/swscale.h" HAVE_LIBSWSCALE_SWSCALE_H)
+endif(SWSCALE_LIBRARIES)
+
+# *** END OF LIBRARY CHECKS ***
+
+# Check for gnutls or crypto
+if((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))
+	message(FATAL_ERROR " zm requires crypto or gnutls but none were found on your system")
+endif((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))
+
+# Check for absolutely required headers:
+if(NOT HAVE_MYSQL_H)
+	message(FATAL_ERROR "zm requires MySQL headers - check that MySQL development packages are installed")
+endif(NOT HAVE_MYSQL_H)
+if(NOT HAVE_JPEGLIB_H)
+	message(FATAL_ERROR " zm requires libjpeg headers - check that libjpeg development packages are installed")
+endif(NOT HAVE_JPEGLIB_H)
+if(NOT HAVE_PTHREAD_H)
+	message(FATAL_ERROR " zm requires pthread headers - check that pthread development packages are installed")
+endif(NOT HAVE_PTHREAD_H)
+
+# 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)
+	set(ZM_HAS_V4L 1)
+	set(ZM_HAS_V4L1 1)
+endif(HAVE_LINUX_VIDEODEV_H)
+if(HAVE_LINUX_VIDEODEV2_H)
+	set(ZM_HAS_V4L 1)
+	set(ZM_HAS_V4L2 1)
+endif(HAVE_LINUX_VIDEODEV2_H)
+if((NOT HAVE_LINUX_VIDEODEV_H) AND (NOT HAVE_LINUX_VIDEODEV2_H))
+	message(AUTHOR_WARNING " Video 4 Linux headers weren't found - Analog and USB camera support will not be available")
+endif((NOT HAVE_LINUX_VIDEODEV_H) AND (NOT HAVE_LINUX_VIDEODEV2_H))
+# Check for PCRE and enable ZM_PCRE accordingly
+set(ZM_PCRE 0)
+if(HAVE_LIBPCRE AND HAVE_PCRE_H)
+	set(ZM_PCRE 1)
+endif(HAVE_LIBPCRE AND HAVE_PCRE_H)
+
+
+# Check for authenication functions
+if(HAVE_OPENSSL_MD5_H)
+	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(HAVE_OPENSSL_MD5_H)
+if(HAVE_GNUTLS_OPENSSL_H)
+	check_prototype_definition(MD5 "unsigned char *MD5 (const unsigned char *buf, unsigned long len, unsigned char *md)" "NULL" "gnutls/openssl.h" HAVE_MD5_GNUTLS)
+endif(HAVE_GNUTLS_OPENSSL_H)
+if(HAVE_GNUTLS_GNUTLS_H)
+	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(HAVE_GNUTLS_GNUTLS_H)
+if(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
+	set(HAVE_DECL_MD5 1)
+else(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
+	message(AUTHOR_WARNING " ZM requires a working MD5 function for hashed authenication but none were found - hashed authenication will not be available")
+endif(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
+# 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(HAVE_LIBCRYPTO AND HAVE_OPENSSL_MD5_H AND HAVE_MD5_OPENSSL)
+
+# Disable backtrace if not available
+if((NOT ZM_NO_CRASHTRACE) AND ((NOT HAVE_DECL_BACKTRACE) OR (NOT HAVE_EXECINFO_H)))
+	message(AUTHOR_WARNING " Backtrace is not available. disabling")
+	set(ZM_NO_CRASHTRACE ON)
+	set(HAVE_EXECINFO_H 0)
+	set(HAVE_DECL_BACKTRACE 0)
+endif((NOT ZM_NO_CRASHTRACE) AND ((NOT HAVE_DECL_BACKTRACE) OR (NOT HAVE_EXECINFO_H)))
+
+
+if(NOT ZM_NO_MMAP)
+	set(ZM_MMAP_PERLPACKAGE "Sys::Mmap")
+endif(NOT ZM_NO_MMAP)
+# Check for Perl. Version checking is removed because its ignored before CMake 2.8.8 and it seems that Perl is being detected as 5.16. instead of 5.6.0 ??
+find_package(Perl)
+if(NOT PERL_FOUND)
+	message(FATAL_ERROR "zm requires Perl 5.6.0 or newer but it was not found on your system")
+endif(NOT PERL_FOUND)
+# Checking for perl modules requires FindPerlModules.cmake
+# Check all required modules at once
+# TODO: Add checking for the optional modules
+find_package(PerlModules COMPONENTS Sys::Syslog DBI DBD::mysql Getopt::Long Time::HiRes Date::Manip LWP::UserAgent ExtUtils::MakeMaker ${ZM_MMAP_PERLPACKAGE})
+if(NOT PERLMODULES_FOUND)
+	message(FATAL_ERROR "Not all required perl modules were found on your system")
+endif(NOT PERLMODULES_FOUND)
+
+# Attempt to check which user apache (or other web server) runs on by searching for a user beginning with apache or www and then cutting the user from the first matching user line
+if(ZM_WEB_USER STREQUAL "")
+	# Check for a user matching ^apache and cut the username from the userline in the first match
+	file(STRINGS "/etc/passwd" userline_apache REGEX "^apache")
+	file(STRINGS "/etc/passwd" userline_www REGEX "^www")
+	if(NOT (userline_apache STREQUAL ""))
+		execute_process(COMMAND echo ${userline_apache} COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER OUTPUT_STRIP_TRAILING_WHITESPACE)
+	elseif(NOT (userline_www STREQUAL ""))
+		execute_process(COMMAND echo ${userline_www} COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER OUTPUT_STRIP_TRAILING_WHITESPACE)
+	endif(NOT (userline_apache STREQUAL ""))
+	message(STATUS "Detected web server user: ${ZM_WEB_USER}")
+endif(ZM_WEB_USER STREQUAL "")
+# Check if webgroup contains anything. If not, use the web user as the web group
+if(NOT ZM_WEB_GROUP)
+	set(ZM_WEB_GROUP ${ZM_WEB_USER})
+endif(NOT ZM_WEB_GROUP)
+message(STATUS "Using web user: ${ZM_WEB_USER}")
+message(STATUS "Using web group: ${ZM_WEB_GROUP}")
+
+# Some variables that zm expects
+set(ZM_PID "${ZM_RUNDIR}/zm.pid")
+set(ZM_CONFIG "/${CMAKE_INSTALL_SYSCONFDIR}/zm.conf")
+set(VERSION "${ZoneMinder_VERSION}")
+set(PATH_BUILD "${PROJECT_SOURCE_DIR}")
+set(TIME_BUILD "1000000") # Don't have a solution for this one yet
+set(BINDIR "${CMAKE_INSTALL_FULL_BINDIR}")
+set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+set(SYSCONFDIR "/${CMAKE_INSTALL_SYSCONFDIR}")
+set(WEB_PREFIX "${ZM_WEBDIR}")
+set(CGI_PREFIX "${ZM_CGIDIR}")
+set(WEB_USER "${ZM_WEB_USER}")
+set(WEB_GROUP "${ZM_WEB_GROUP}")
+set(EXTRA_PERL_LIB "use lib '${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/perl5';")
+
+# Generate files from the .in files
+configure_file(zoneminder-config.cmake config.h @ONLY)
+configure_file(zm.conf.in zm.conf @ONLY)
+configure_file(zmconfgen.pl.in zmconfgen.pl @ONLY)
+configure_file(zmlinkcontent.sh.in zmlinkcontent.sh @ONLY)
+
+# Process subdirectories
+add_subdirectory(src)
+add_subdirectory(scripts)
+add_subdirectory(db)
+add_subdirectory(misc)
+add_subdirectory(web)
+
+# Run ZM configuration generator
+message(STATUS "Running ZoneMinder configuration generator")
+execute_process(COMMAND perl ./zmconfgen.pl RESULT_VARIABLE zmconfgen_result)
+if(zmconfgen_result EQUAL 0)
+	message(STATUS "ZoneMinder configuration generator completed successfully")
+else(zmconfgen_result EQUAL 0)
+	message(FATAL_ERROR "ZoneMinder configuration generator failed. Exit code: ${zmconfgen_result}")
+endif(zmconfgen_result EQUAL 0)
+
+# Install zm.conf
+install(FILES zm.conf DESTINATION "/${CMAKE_INSTALL_SYSCONFDIR}")
+
--- a/112
+++ b/112
@ -0,0 +1,112 @@
+Installing ZoneMinder with cmake
+--------------------------------
+Starting with ZoneMinder 1.26.4, ZoneMinder can now be installed using cmake. This requires cmake version 2.6 or newer.
+cmake is an alternative to the autotools collection (libtool, autoconf, automake, autoheader and such). Its more recent and has many advantages, including, but not limited to:
+* One program (cmake) instead of multiple. (libtool, autoconf, automake, etc)
+* One file per directory (CMakeLists.txt) instead of multiple. (configure.ac, Makefile.am and sometimes more)
+* One syntax (cmake's syntax) instead of multiple. (bash and m4)
+* Generation of makefiles for many platforms, including Windows.
+* Newer than autotools and is being actively developed.
+* Generates colored makefiles with progress indicator.
+* Slightly faster because its based on C and not bash.
+* Lots of documentation, unlike autotools: http://www.cmake.org/cmake/help/cmake2.6docs.html
+
+At this point, its still possible to use autotools for the ZoneMinder project. Choosing cmake or autotools is now a matter of preference.
+Hopefully in the future, cmake will become the default way to install ZoneMinder.
+
+Important differences
+---------------------
+* Unlike the autotools way, the cmake way does not require any options. It attempts to detect some things by its own (system directories, libarch, web user and group) and uses defaults for others (installation paths and such).
+* Unlike the autotools way, which links the binaries to a fixed list of libraries, the cmake way only links to libraries that it found on the system. If a library is not found, but required, a fatal error will be shown during the configuration step.
+* Unlike the autotools way, the cmake way does not modify the system in any way it shouldnt. It only does what its supposed to do: Install files to your system. Nothing else and nothing leaks out of the DESTDIR environment variable (if used). This means that depending on your configuration, there might be an extra required step after installation: to link WEB_PATH/events and WEB_PATH/images folders to the correct places.
+* Currently there is no "make uninstall" target for cmake. However, its possible to do this manually. The file install_manifest.txt contains the list of files installed to the system. This can be used in many ways to delete all files installed by cmake, such as: xargs rm < install_manifest.txt
+
+Configuration
+-------------
+cmake by default does not require any parameters, but its possible to override the defaults with the options below.
+
+Configuration can be done in 4 ways:
+1) As a command line parameter, e.g. cmake -DCMAKE_VERBOSE_MAKEFILE=ON .
+2) Using cmake-gui
+4) Providing cmake with an initial cache file with the -C option
+4) By editing the cache file CMakeCache.txt (after it has been generated) - Not recommended
+
+Possible configuration options: 
+	ZM_RUNDIR		Location of transient process files, default: /var/run/zm
+	ZM_TMPDIR		Location of temporary files, default: /tmp/zm
+	ZM_LOGDIR 		Location of generated log files, default: /var/log/zm
+	ZM_WEBDIR		Location of the web files, default: <prefix>/share/zoneminder/www
+	ZM_CGIDIR		Location of the cgi-bin files, default: <prefix>/libexec/zoneminder/cgi-bin
+	ZM_CONTENTDIR		Location of dynamic content (events and images), default: /var/lib/zoneminder
+	ZM_DB_HOST		Hostname where ZoneMinder database located, default: localhost
+	ZM_DB_NAME		Name of ZoneMinder database, default: zm
+	ZM_DB_USER		Name of ZoneMinder database user, default: zmuser
+	ZM_DB_PASS		Password of ZoneMinder database user, default: zmpass
+	ZM_WEB_USER		The user apache or the local web server runs on. Leave empty for automatic detection. If that fails, you can use this variable to force
+	ZM_WEB_GROUP		The group apache or the local web server runs on, Leave empty to be the same as the web user
+Advanced:
+	ZM_EXTRA_LIBS		A list of optional libraries, separated by semicolons, e.g. ssl;theora
+	ZM_MYSQL_ENGINE		MySQL engine to use with database, default: InnoDB
+	ZM_NO_MMAP		Set to ON to not use mmap shared memory. Shouldn't be enabled unless you experience problems with the shared memory. default: OFF
+	ZM_NO_CRASHTRACE	Set to ON to skip crash trace code. Useful if zm_signal.cpp fails to compile. default: OFF
+
+
+Useful configuration options provided by cmake:
+CMAKE_VERBOSE_MAKEFILE - Set this to ON (default OFF) to see what cmake is doing. Very useful for troubleshooting.
+CMAKE_BUILD_TYPE - Set this to Debug (default Release) to build ZoneMinder with debugging enabled.
+CMAKE_INSTALL_PREFIX - Use this to change the prefix (default /usr/local). This option behaves like --prefix from autoconf. Package maintainers will probably want to set this to "/usr".
+CMAKE_INCLUDE_PATH - Use this to change the include search path.
+CMAKE_LIBRARY_PATH - Use this to change the library search path.
+Also see CMAKE_PREFIX_PATH for overriding both and some others.
+
+CFLAGS, CPPFLAGS and other environment variables:
+To append to the CFLAGS and CXXFLAGS, please use the CFLAGS and CXXFLAGS environment variables.
+Or use the CMAKE_C_FLAGS and CMAKE_CXX_FLAGS configuration options.
+To replace the CFLAGS and CXXFLAGS entirely:
+*   For the Release build type: use CMAKE_C_FLAGS_RELEASE for the CFLAGS and CMAKE_CXX_FLAGS_RELEASE for the CXXFLAGS
+*   For the Debug build type: use CMAKE_C_FLAGS_DEBUG for the CFLAGS and CMAKE_CXX_FLAGS_DEBUG for the CXXFLAGS
+Other important environment variables (such as LDFLAGS) are also supported.
+
+The DESTDIR environment variable is also supported.
+For more information about DESTDIR, see:
+*   http://www.gnu.org/prep/standards/html_node/DESTDIR.html
+
+Basic steps for installing ZoneMinder on a fresh system
+-------------------------------------------------------
+1) After installing all the required dependencies, in the project directory, run "cmake [extra options] ."
+This behaves like ./configure. It is also possible to supply configuration options, e.g. cmake -DZM_DB_PASS="mypass" .
+2) Run "make" to compile ZoneMinder
+3) Run "make install" (as root, or use sudo) to install ZoneMinder to your system.
+4) Create a directory for the content and the necessary symlinks by running zmlinkcontent.sh with the directory you want to use. e.g. ./zmlinkcontent.sh /nfs/zm
+5) Create a database for zoneminder, called "zm".
+6) Create a user for the zoneminder database, called zmuser with password and full privileges to the "zm" database.
+NOTE: The database server, database name, user and password can be different and adjusted during configuration step with the options in this file, or by editing /etc/zm.conf
+7) Populate the zoneminder database using the script zm_create.sql. This should be found in <prefix>/share/zoneminder/db or in the project/db directory.
+
+8) Create an apache virtual host for ZoneMinder. Make sure to use the same paths as ZM_WEBDIR and ZM_CGIDIR in /etc/zm.conf
+9) Create other config if desired (e.g. rsyslog, logrotate and such). Some of this can be found in <prefix>/share/zoneminder/misc or project/misc directory
+10) Setup an init script for your system. Its also possible to use "zmpkg.pl start" and "zmpkg.pl stop" if you can't find a one.
+
+Basic steps for upgrading ZoneMinder
+------------------------------------
+1) If you wish to use the same paths and configuration as the currently installed ZoneMinder, you need to provide cmake with options that match your current installation.
+You can provide those options in the command line to cmake, e.g. cmake -DZM_DB_PASS="blah" -DZM_WEBDIR="/usr/local/share/zoneminder/www" -DCMAKE_INSTALL_FULL_BINDIR="/usr/bin" .
+Or alternatively, for convenience, use the cmakecacheimport.sh script. This reads a zoneminder configuration file (zm.conf) and creates a cmake initial cache file called zm_conf.cmake, which you can then provide to cmake.
+For example:
+./cmakecacheimport.sh /etc/zm.conf
+cmake -C zm_conf.cmake [extra options] .
+
+2) Run "make" to compile ZoneMinder
+3) Run "make install" (as root, or use sudo) to install ZoneMinder to your system.
+4) Depending on your configuration: If the DIR_EVENTS and DIR_IMAGES options are set to default (pointing to web directory/events and web directory/images), You will need to update the symlinks in the web directory to the correct folders. e.g. web directory/events should point to the real events directory, and likewise for the images directory.
+You can use the zmlinkcontent.sh script for this. For example, if /var/lib/zoneminder is the folder that contains the "images" and "events" directories, you can use:
+./zmlinkcontent.sh /var/lib/zoneminder
+By default, the content directory for new installations is /var/lib/zoneminder. This can be overridden in cmake with the ZM_CONTENTDIR option. e.g. cmake -DZM_CONTENTDIR="/some/big/storage/zm" .
+
+5) Run zmupdate.pl to update the database layout to the new version.
+
+Contributions:
+--------------
+Please visit our GitHub at http://github.com/ZoneMinder/ZoneMinder
+
+
--- a/Makefile.am
+++ b/Makefile.am
@ -20,12 +20,11 @@ EXTRA_DIST = \
 # Yes, you are correct. This is a HACK!
 install-data-hook:
 	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
-	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )
-	( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )
-	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "/var/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )
+	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR); fi )
+	( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR); fi )

 uninstall-hook:
 	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
-	@-( if test "$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(ZM_RUNDIR); fi )
-	@-( if test "$(ZM_TMPDIR)" != "/tmp"; then rm -rf $(ZM_TMPDIR); fi )
-	@-( if test "$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(ZM_LOGDIR); fi )
+	@-( if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_RUNDIR); fi )
+	@-( if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then rm -rf $(DESTDIR)$(ZM_TMPDIR); fi )
+	@-( if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(DESTDIR)$(ZM_LOGDIR); fi )
--- a/README.md
+++ b/README.md
@ -1,6 +1,8 @@
 ZoneMinder
 ==========

+[![Build Status](https://travis-ci.org/ZoneMinder/ZoneMinder.png)](https://travis-ci.org/ZoneMinder/ZoneMinder)
+
 All documentation for ZoneMinder is now online at http://www.zoneminder.com/wiki/index.php/Documentation

 ## Overview
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 4d508d8be232a4f84aefe37327b0e737196f58d1
--- a/cmake/Modules/CheckPrototypeDefinition.c.in
+++ b/cmake/Modules/CheckPrototypeDefinition.c.in
@ -0,0 +1,29 @@
+@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;
+}
--- a/cmake/Modules/CheckPrototypeDefinition.cmake
+++ b/cmake/Modules/CheckPrototypeDefinition.cmake
@ -0,0 +1,98 @@
+# - 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()
--- a/cmake/Modules/FindPerlModules.cmake
+++ b/cmake/Modules/FindPerlModules.cmake
@ -0,0 +1,78 @@
+# - try to find perl modules, passed as COMPONENTS
+#
+# Non-cache variable you might use in your CMakeLists.txt:
+#  PERLMODULES_FOUND
+#
+# Requires these CMake modules:
+#  FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
+#
+# Original Author:
+# 2012 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2012.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(NOT PERL_FOUND)
+	find_package(Perl QUIET)
+endif()
+
+set(_deps_check)
+if(PERL_FOUND)
+	foreach(module ${PerlModules_FIND_COMPONENTS})
+		string(REPLACE "::" "/" modfilename "${module}.pm")
+		string(REPLACE "::" "_" modvarname "PERLMODULES_${module}_MODULE")
+		string(TOUPPER "${modvarname}" modvarname)
+		list(APPEND _deps_check ${modvarname})
+		if(NOT ${modvarname})
+			if(NOT PerlModules_FIND_QUIETLY)
+				message(STATUS "Checking for perl module ${module}")
+			endif()
+			execute_process(COMMAND
+				"${PERL_EXECUTABLE}"
+				"-e"
+				"use ${module}; print \$INC{\"${modfilename}\"}"
+				RESULT_VARIABLE result_code
+				OUTPUT_VARIABLE filename
+				ERROR_VARIABLE error_info
+				OUTPUT_STRIP_TRAILING_WHITESPACE)
+			if(result_code EQUAL 0)
+				if(NOT PerlModules_FIND_QUIETLY)
+					message(STATUS
+						"Checking for perl module ${module} - found at ${filename}")
+				endif()
+				set(${modvarname}
+					"${filename}"
+					CACHE
+					FILEPATH
+					"Location found for module ${module}"
+					FORCE)
+				mark_as_advanced(${modvarname})
+			else()
+				if(NOT PerlModules_FIND_QUIETLY)
+					message(STATUS "Checking for perl module ${module} - failed")
+				endif()
+				set(${modvarname}
+					"NOTFOUND"
+					CACHE
+					FILEPATH
+					"No location found for module ${module}"
+					FORCE)
+				file(APPEND
+					${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+					"Determining if the Perl module ${module} exists failed with the following error output:\n"
+					"${error_info}\n\n")
+			endif()
+		endif()
+	endforeach()
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PerlModules
+	DEFAULT_MSG
+	PERL_FOUND
+	${_deps_check})
+
--- a/cmake/Modules/GNUInstallDirs.cmake
+++ b/cmake/Modules/GNUInstallDirs.cmake
@ -0,0 +1,188 @@
+# - Define GNU standard installation directories
+# Provides install directory variables as defined for GNU software:
+#  http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+# Inclusion of this module defines the following variables:
+#  CMAKE_INSTALL_<dir>      - destination for files of a given type
+#  CMAKE_INSTALL_FULL_<dir> - corresponding absolute path
+# where <dir> is one of:
+#  BINDIR           - user executables (bin)
+#  SBINDIR          - system admin executables (sbin)
+#  LIBEXECDIR       - program executables (libexec)
+#  SYSCONFDIR       - read-only single-machine data (etc)
+#  SHAREDSTATEDIR   - modifiable architecture-independent data (com)
+#  LOCALSTATEDIR    - modifiable single-machine data (var)
+#  LIBDIR           - object code libraries (lib or lib64 or lib/<multiarch-tuple> on Debian)
+#  INCLUDEDIR       - C header files (include)
+#  OLDINCLUDEDIR    - C header files for non-gcc (/usr/include)
+#  DATAROOTDIR      - read-only architecture-independent data root (share)
+#  DATADIR          - read-only architecture-independent data (DATAROOTDIR)
+#  INFODIR          - info documentation (DATAROOTDIR/info)
+#  LOCALEDIR        - locale-dependent data (DATAROOTDIR/locale)
+#  MANDIR           - man documentation (DATAROOTDIR/man)
+#  DOCDIR           - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
+# Each CMAKE_INSTALL_<dir> value may be passed to the DESTINATION options of
+# install() commands for the corresponding file type.  If the includer does
+# not define a value the above-shown default will be used and the value will
+# appear in the cache for editing by the user.
+# Each CMAKE_INSTALL_FULL_<dir> value contains an absolute path constructed
+# from the corresponding destination by prepending (if necessary) the value
+# of CMAKE_INSTALL_PREFIX.
+
+#=============================================================================
+# Copyright 2011 Nikita Krupen'ko <krnekit@gmail.com>
+# Copyright 2011 Kitware, Inc.
+#
+# 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.)
+
+# Installation directories
+#
+if(NOT DEFINED CMAKE_INSTALL_BINDIR)
+  set(CMAKE_INSTALL_BINDIR "bin" CACHE PATH "user executables (bin)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_SBINDIR)
+  set(CMAKE_INSTALL_SBINDIR "sbin" CACHE PATH "system admin executables (sbin)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_LIBEXECDIR)
+  set(CMAKE_INSTALL_LIBEXECDIR "libexec" CACHE PATH "program executables (libexec)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
+  set(CMAKE_INSTALL_SYSCONFDIR "etc" CACHE PATH "read-only single-machine data (etc)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_SHAREDSTATEDIR)
+  set(CMAKE_INSTALL_SHAREDSTATEDIR "com" CACHE PATH "modifiable architecture-independent data (com)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
+  set(CMAKE_INSTALL_LOCALSTATEDIR "var" CACHE PATH "modifiable single-machine data (var)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+  set(_LIBDIR_DEFAULT "lib")
+  # Override this default 'lib' with 'lib64' iff:
+  #  - we are on Linux system but NOT cross-compiling
+  #  - we are NOT on debian
+  #  - we are on a 64 bits system
+  # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+  # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
+  # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
+  # See http://wiki.debian.org/Multiarch
+  if(CMAKE_SYSTEM_NAME MATCHES "Linux"
+      AND NOT CMAKE_CROSSCOMPILING)
+    if (EXISTS "/etc/debian_version") # is this a debian system ?
+       if(CMAKE_LIBRARY_ARCHITECTURE)
+         set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+       endif()
+    else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
+      if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+        message(AUTHOR_WARNING
+          "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
+          "Please enable at least one language before including GNUInstallDirs.")
+      else()
+        if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+          set(_LIBDIR_DEFAULT "lib64")
+        endif()
+      endif()
+    endif()
+  endif()
+  set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
+  set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE PATH "C header files (include)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_OLDINCLUDEDIR)
+  set(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" CACHE PATH "C header files for non-gcc (/usr/include)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
+  set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE PATH "read-only architecture-independent data root (share)")
+endif()
+
+#-----------------------------------------------------------------------------
+# Values whose defaults are relative to DATAROOTDIR.  Store empty values in
+# the cache and store the defaults in local variables if the cache values are
+# not set explicitly.  This auto-updates the defaults as DATAROOTDIR changes.
+
+if(NOT CMAKE_INSTALL_DATADIR)
+  set(CMAKE_INSTALL_DATADIR "" CACHE PATH "read-only architecture-independent data (DATAROOTDIR)")
+  set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
+endif()
+
+if(NOT CMAKE_INSTALL_INFODIR)
+  set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (DATAROOTDIR/info)")
+  set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
+endif()
+
+if(NOT CMAKE_INSTALL_LOCALEDIR)
+  set(CMAKE_INSTALL_LOCALEDIR "" CACHE PATH "locale-dependent data (DATAROOTDIR/locale)")
+  set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
+endif()
+
+if(NOT CMAKE_INSTALL_MANDIR)
+  set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
+  set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
+endif()
+
+if(NOT CMAKE_INSTALL_DOCDIR)
+  set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/PROJECT_NAME)")
+  set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}")
+endif()
+
+#-----------------------------------------------------------------------------
+
+mark_as_advanced(
+  CMAKE_INSTALL_BINDIR
+  CMAKE_INSTALL_SBINDIR
+  CMAKE_INSTALL_LIBEXECDIR
+  CMAKE_INSTALL_SYSCONFDIR
+  CMAKE_INSTALL_SHAREDSTATEDIR
+  CMAKE_INSTALL_LOCALSTATEDIR
+  CMAKE_INSTALL_LIBDIR
+  CMAKE_INSTALL_INCLUDEDIR
+  CMAKE_INSTALL_OLDINCLUDEDIR
+  CMAKE_INSTALL_DATAROOTDIR
+  CMAKE_INSTALL_DATADIR
+  CMAKE_INSTALL_INFODIR
+  CMAKE_INSTALL_LOCALEDIR
+  CMAKE_INSTALL_MANDIR
+  CMAKE_INSTALL_DOCDIR
+  )
+
+# Result directories
+#
+foreach(dir
+    BINDIR
+    SBINDIR
+    LIBEXECDIR
+    SYSCONFDIR
+    SHAREDSTATEDIR
+    LOCALSTATEDIR
+    LIBDIR
+    INCLUDEDIR
+    OLDINCLUDEDIR
+    DATAROOTDIR
+    DATADIR
+    INFODIR
+    LOCALEDIR
+    MANDIR
+    DOCDIR
+    )
+  if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_${dir}})
+    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_${dir}}")
+  else()
+    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_${dir}}")
+  endif()
+endforeach()
--- a/cmakecacheimport.sh
+++ b/cmakecacheimport.sh
@ -0,0 +1,79 @@
+#!/bin/bash
+# The purpose of this file is to add entries from zm.conf to cmake's cache.
+
+echo "*** This bash script imports configuration from zm.conf into cmake initial cache file"
+echo "*** The file can be used with cmake like so: cmake -C zm_conf.cmake [extra cmake options] ."
+echo "*** Usage: ./cmakecacheimport.sh [PATH TO ZM.CONF]"
+echo ""
+
+# Check for too many prameters
+if [[ "$#" -gt "0" && "$#" -ne "1" ]]; then
+       echo "Error: Too many parameters!"
+       exit 50
+fi
+
+# Check if zm.conf was supplied as an argument and that it exists
+if [ "$#" -eq "1" ]; then
+	ZM_CONFIG="$1"
+	if [ ! -f "$ZM_CONFIG" ]; then
+		echo "The zoneminder configuration file $ZM_CONFIG does not exist!"
+		exit 40
+	fi
+fi
+
+# Load zm.conf
+if [ -n "$ZM_CONFIG" ]; then
+	echo "Using custom zm.conf $ZM_CONFIG"
+	source "$ZM_CONFIG"
+elif [ -f "/etc/zm.conf" ]; then
+	echo "Using system zm.conf"
+	source "/etc/zm.conf"
+elif [ -f "zm.conf" ]; then
+	echo "Using local zm.conf"
+	source "zm.conf"
+else
+	echo "Failed locating zoneminder configuration file (zm.conf)\nPlease specify the full path to the zoneminder configuration file"
+	exit 45
+fi
+
+# Create the file
+touch "zm_conf.cmake"
+if [ "$?" != "0" ]; then
+	echo "Failed creating zm_conf.cmake in the current directory"
+	exit 10
+fi
+
+# Print some information
+echo "Executables directory      : $ZM_PATH_BIN"
+#echo "Libraries directory        : $ZM_PATH_LIB"
+#echo "System config directory    : $ZM_PATH_CONF"
+echo "Web directory              : $ZM_PATH_WEB"
+echo "CGI directory              : $ZM_PATH_CGI"
+echo "Web user                   : $ZM_WEB_USER"
+echo "Web group                  : $ZM_WEB_GROUP"
+echo "Database host              : $ZM_DB_HOST"
+echo "Database name              : $ZM_DB_NAME"
+echo "Database user              : $ZM_DB_USER"
+echo "Database password          : Not shown"
+
+
+CMPATH="CACHE PATH \"Imported by cmakecacheimport.sh\" FORCE"
+CMSTRING="CACHE STRING \"Imported by cmakecacheimport.sh\" FORCE"
+# Write
+echo "# Generated by cmakecacheimport.sh">zm_conf.cmake
+echo "set(CMAKE_INSTALL_FULL_BINDIR \"$ZM_PATH_BIN\" $CMPATH)">>zm_conf.cmake
+#echo "set(CMAKE_INSTALL_FULL_LIBDIR \"$ZM_PATH_LIB\" $CMPATH)">>zm_conf.cmake
+#echo "set(CMAKE_INSTALL_FULL_SYSCONFDIR \"$ZM_PATH_CONF\" $CMPATH)">>zm_conf.cmake
+echo "set(ZM_WEBDIR \"$ZM_PATH_WEB\" $CMPATH)">>zm_conf.cmake
+echo "set(ZM_CGIDIR \"$ZM_PATH_CGI\" $CMPATH)">>zm_conf.cmake
+echo "set(ZM_WEB_USER \"$ZM_WEB_USER\" $CMSTRING)">>zm_conf.cmake
+echo "set(ZM_WEB_GROUP \"$ZM_WEB_GROUP\" $CMSTRING)">>zm_conf.cmake
+echo "set(ZM_DB_HOST \"$ZM_DB_HOST\" $CMSTRING)">>zm_conf.cmake
+echo "set(ZM_DB_NAME \"$ZM_DB_NAME\" $CMSTRING)">>zm_conf.cmake
+echo "set(ZM_DB_USER \"$ZM_DB_USER\" $CMSTRING)">>zm_conf.cmake
+echo "set(ZM_DB_PASS \"$ZM_DB_PASS\" $CMSTRING)">>zm_conf.cmake
+
+echo ""
+echo "Wrote zm_conf.cmake"
+echo ""
+echo "All done"
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(zm,1.26.3,[http://www.zoneminder.com/forums/ - Please check FAQ first],ZoneMinder,http://www.zoneminder.com/downloads.html)
+AC_INIT(zm,1.26.4,[http://www.zoneminder.com/forums/ - Please check FAQ first],ZoneMinder,http://www.zoneminder.com/downloads.html)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/zm.h)
 AC_CONFIG_HEADERS(config.h)
@ -302,7 +302,7 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h limits.h memory.h stddef.h stdlib.h string.h strings.h sys/param.h sys/time.h syslog.h unistd.h values.h])
 AC_CHECK_HEADERS([netdb.h netinet/in.h arpa/inet.h sys/ioctl.h sys/socket.h sys/un.h glob.h sys/sendfile.h])
 AC_CHECK_HEADERS(execinfo.h,,,)
-AC_CHECK_HEADERS(syscall.h,,,)
+AC_CHECK_HEADERS(sys/syscall.h,,,)
 AC_CHECK_HEADERS(pthread.h,,,)
 AC_CHECK_HEADERS(linux/videodev.h,AC_SUBST(ZM_HAS_V4L1,1),AC_SUBST(ZM_HAS_V4L1,0),)
 AC_CHECK_HEADERS(linux/videodev2.h,AC_SUBST(ZM_HAS_V4L2,1),AC_SUBST(ZM_HAS_V4L2,0),)
--- a/db/CMakeLists.txt
+++ b/db/CMakeLists.txt
@ -0,0 +1,11 @@
+# CMakeLists.txt for the ZoneMinder database scripts
+
+# Create files from the .in files
+configure_file(zm_create.sql.in ${CMAKE_CURRENT_SOURCE_DIR}/zm_create.sql @ONLY)
+
+# Glob all files matching zm*.sql (to exclude *.in files and autotools's files)
+file(GLOB dbfileslist RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "zm*.sql")
+
+# Install the database scripts, exclude makefiles and cmake stuff
+install(FILES ${dbfileslist} DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
+
--- a/db/test.monitor.sql
+++ b/db/test.monitor.sql
@ -0,0 +1 @@
+INSERT INTO Monitors (Name, Type, Function, Enabled, Format, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation, Deinterlacing, Brightness, Contrast, Hue, Colour, RefBlendPerc) VALUES ('travis_test','Remote','Modect',1,255,'http','simple','50.79.143.149','21146','/mjpg/video.mjpg',1280,800,3,0,'0',0,-1,-1,-1,-1,12);
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@ -1,8 +1,8 @@
-- MySQL dump 10.9
+-- MySQL dump 10.13  Distrib 5.6.13, for Linux (i686)
 --
 -- Host: localhost    Database: @ZM_DB_NAME@
 -- ------------------------------------------------------
-- Server version	4.1.16-log
+-- Server version       5.6.13

 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@ -31,7 +31,7 @@ CREATE TABLE `Config` (
  `Name` varchar(32) NOT NULL default '',
  `Value` text NOT NULL,
  `Type` tinytext NOT NULL,
-  `DefaultValue` tinytext,
+  `DefaultValue` text,
  `Hint` tinytext,
  `Pattern` tinytext,
  `Format` tinytext,
@ -268,7 +268,7 @@ CREATE TABLE `Logs` (
  `Pid` smallint(6) DEFAULT NULL,
  `Level` tinyint(3) NOT NULL,
  `Code` char(3) NOT NULL,
-  `Message` varchar(255) NOT NULL,
+  `Message` text NOT NULL,
  `File` varchar(255) DEFAULT NULL,
  `Line` smallint(5) unsigned DEFAULT NULL,
  KEY `TimeKey` (`TimeKey`)
@ -284,7 +284,7 @@ CREATE TABLE `MonitorPresets` (
  `Name` varchar(64) NOT NULL default '',
  `Type` enum('Local','Remote','File','Ffmpeg') NOT NULL default 'Local',
  `Device` tinytext,
-  `Channel` tinyint(3) unsigned default NULL,
+  `Channel` tinytext,
  `Format` int(10) unsigned default NULL,
  `Protocol` varchar(16) default NULL,
  `Method` varchar(16) default NULL,
@ -520,7 +520,7 @@ CREATE TABLE `Zones` (
 --
 -- Create a default admin user.
 --
-insert into Users values ('','admin',password('admin'),'',1,'View','Edit','Edit','Edit','Edit','Edit','','');
+insert into Users VALUES (NULL,'admin',password('admin'),'',1,'View','Edit','Edit','Edit','Edit','Edit','','');

 --
 -- Add a sample filter to purge the oldest 5 events when the disk is 95% full, delete is disabled though
@ -535,8 +535,8 @@ insert into Controls values (2,'Pelco-P','Local','PelcoP',1,1,0,1,1,0,0,1,NULL,N
 insert into Controls values (3,'Sony VISCA','Local','Visca',1,1,0,1,0,0,0,1,0,16384,10,4000,1,1,6,1,1,1,0,1,0,1536,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,3,1,1,1,1,0,1,1,0,1,-15578,15578,100,10000,1,1,50,1,254,1,-7789,7789,100,5000,1,1,50,1,254,0,0);
 INSERT INTO Controls VALUES (4,'Axis API v2','Remote','AxisV2',0,0,0,1,0,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,12,1,1,1,1,1,0,1,0,1,-360,360,1,90,0,NULL,NULL,0,NULL,1,-360,360,1,90,0,NULL,NULL,0,NULL,0,0);
 insert into Controls values (5,'Panasonic IP','Remote','PanasonicIP',0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
-insert into Controls values (6,'Neu-Fusion NCS370','Remote','Ncs370',0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,24,1,0,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0); 
-insert into Controls values (7,'AirLink SkyIPCam 7xx','Remote','SkyIPCam7xx',0,0,1,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,1,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0); 
+insert into Controls values (6,'Neu-Fusion NCS370','Remote','Ncs370',0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,24,1,0,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
+insert into Controls values (7,'AirLink SkyIPCam 7xx','Remote','SkyIPCam7xx',0,0,1,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,1,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
 insert into Controls values (8,'Pelco-D','Ffmpeg','PelcoD',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
 insert into Controls values (9,'Pelco-P','Ffmpeg','PelcoP',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
 INSERT INTO Controls VALUES (10,'Foscam FI8620','Ffmpeg','FI8620_Y2k',0,0,0,1,0,0,0,1,1,10,1,10,1,1,63,1,1,0,0,1,1,63,1,63,1,1,63,1,1,0,0,1,0,0,0,0,1,0,255,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,1,8,0,1,1,1,0,0,0,1,1,1,360,1,360,1,1,63,0,0,1,1,90,1,90,1,1,63,0,0,0,0);
@ -547,73 +547,73 @@ INSERT INTO Controls VALUES (13,'Loftek Sentinel','Remote','LoftekSentinel',0,0,
 --
 -- Add some monitor preset values
 --
-INSERT INTO MonitorPresets VALUES ('','Axis IP, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP, 320x240, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP, 640x480, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP, 320x240, mpjpeg, B&W','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP, 640x480, mpjpeg, B&W','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP PTZ, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP PTZ, 320x240, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP PTZ, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP PTZ, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP PTZ, 640x480, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP PTZ, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Axis IP, mpeg4, unicast','Remote',NULL,NULL,NULL,'rtsp','rtpUni','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES ('','Axis IP, mpeg4, multicast','Remote',NULL,NULL,NULL,'rtsp','rtpMulti','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES ('','Axis IP, mpeg4, RTP/RTSP','Remote',NULL,NULL,NULL,'rtsp','rtpRtsp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES ('','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 ('','Panasonic IP, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP PTZ, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Panasonic IP PTZ, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Panasonic IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Panasonic IP PTZ, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Panasonic IP PTZ, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Panasonic IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<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 ('','Gadspot IP, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Gadspot IP, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Gadspot IP, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/GetData.cgi',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Gadspot IP, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','VEO Observer, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Blue Net Video Server, jpeg','Remote','http','simple',NULL,NULL,NULL,'<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 ('','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 ('','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 ('','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 ('','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 ('','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 ('','BTTV Video (V4L2), PAL, 320x240','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L2), PAL, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L2), PAL, 640x480','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L2), PAL, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L2), NTSC, 320x240','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L2), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L2), NTSC, 640x480','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L2), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), PAL, 320x240','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), PAL, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), PAL, 640x480','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), PAL, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), NTSC, 320x240','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), NTSC, 640x480','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','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 ('','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 ('','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 ('','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 ('','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 ('','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,'Axis IP, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','rtpUni',NULL,NULL,NULL,'<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','rtpMulti',NULL,NULL,NULL,'<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','rtpRtsp',NULL,NULL,NULL,'<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,'Panasonic IP, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'VEO Observer, jpeg','Remote','http','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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<?>','<?>',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<?>','<?>',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<?>','<?>',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<?>','<?>',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<?>','<?>',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<?>','<?>',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<?>','<?>',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<?>','<?>',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,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,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,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,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<?>','<?>',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<?>','<?>',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<?>','<?>',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<?>','<?>',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);

 --
 -- Add some zone preset values
--- a/distros/debian/changelog
+++ b/distros/debian/changelog
@ -1,3 +1,15 @@
+zoneminder (1.26.4-1) unstable; urgency=low
+
+  * improvements to zmupdate.pl, cleanups
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Thu, 03 Oct 2013 11:40:32 -0400
+
+zoneminder (1.26.3-1) unstable; urgency=low
+
+  * A 'minor' release focusing on performance improvement and bug fixes.
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Sun, 22 Sep 2013 09:36:42 +0800
+
 zoneminder (1.25.1-1) unstable; urgency=low

  * Initial Version.
--- a/distros/debian/control
+++ b/distros/debian/control
@ -2,12 +2,12 @@ Source: zoneminder
 Section: net
 Priority: optional
 Maintainer: Isaac Connor <iconnor@connortechnology.com>
-Build-Depends: debhelper (>= 5), autoconf, automake, dpatch, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, ffmpeg, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libpcre3, libarchive-zip-perl, libmime-lite-perl, libjpeg-turbo8, dh-autoreconf
+Build-Depends: debhelper (>= 5), autoconf, automake, dpatch, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, ffmpeg, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libpcre3, libarchive-zip-perl, libmime-lite-perl, libjpeg8, dh-autoreconf
 Standards-Version: 3.9.2

 Package: zoneminder
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5, php5, php5-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-lite-perl, mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg-turbo8, zip, libnet-sftp-foreign-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5, php5, php5-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-lite-perl, mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl
 Description: Linux 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
--- a/distros/debian/docs
+++ b/distros/debian/docs
@ -1 +1 @@
-README
+README.md
--- a/distros/debian/init.d
+++ b/distros/debian/init.d
@ -18,11 +18,13 @@
 prog=ZoneMinder
 ZM_PATH_BIN="/usr/bin"
 RUNDIR=/var/run/zm
+TMPDIR=/tmp/zm
 command="$ZM_PATH_BIN/zmpkg.pl"

 start() {
 	echo -n "Starting $prog: "
-	mkdir -p $RUNDIR
+	mkdir -p $RUNDIR && chown www-data:www-data $RUNDIR
+	mkdir -p $TMPDIR && chown www-data:www-data $TMPDIR
    zmfix -a
 	$command start
 	RETVAL=$?
--- a/distros/debian/postinst
+++ b/distros/debian/postinst
@ -2,7 +2,51 @@

 set -e

-VERSION=1.26.3
+VERSION=1.26.4
+
+if [ "$1" = "configure" ]; then
+                #
+                # Get mysql started if it isn't
+                #
+                if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                        invoke-rc.d mysql start
+                fi
+                if $(/etc/init.d/mysql status >/dev/null 2>&1); 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
+                            cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
+                            echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                        fi
+
+                        # get old version from upgrade...
+                        OLD_ZM_VERSION=${2%-*}
+                        if [ -z "$OLD_ZM_VERSION" ]; then
+                                # fall back to getting version from database itself, which may not necessarily be accurate?
+                                OLD_ZM_VERSION=$(echo 'select Value from Config where Name = "ZM_DYN_CURR_VERSION";' | mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names zm )
+                        fi
+                        if [ -n "$OLD_ZM_VERSION" ] && [ "$OLD_ZM_VERSION" != "$VERSION" ] ; then
+                                echo 'grant lock tables, create, alter on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                                # stop zoneminder before performing database upgrade.
+                                invoke-rc.d zoneminder stop || true
+                                zmupdate.pl --nointeractive --version $OLD_ZM_VERSION
+                        fi
+
+                else
+                        echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+                fi
+                chown www-data:www-data /var/log/zm
+                chown www-data:www-data /var/lib/zm/
+                if [ -z "$2" ]; then
+                        chown www-data:www-data -R /var/cache/zoneminder
+                fi
+fi
+# Ensure zoneminder is stopped...
+if [ -x "/etc/init.d/zoneminder" ]; then
+        if invoke-rc.d zoneminder status ; then
+                invoke-rc.d zoneminder stop || exit $?
+        fi
+fi

 if [ "$1" = "configure" ]; then
 	if [ -z "$2" ]; then
--- a/distros/fedora/README.Fedora
+++ b/distros/fedora/README.Fedora
@ -4,18 +4,18 @@ New installs
 1. Unless you are already using the MySQL server or you are running it
   remotely you will need to ensure that the server is installed and secured:

-     yum install mysql-community or
+	yum install mysql-community-server
+	--OR--
+	yum install mariadb-server

-	 yum install mysql (Mariadb)
+	sudo systemctl enable mysqld

-     sudo systemctl mysqld enable
-
-	 sudo system mysqld start
+	sudo system start mysqld
     
-     mysql_secure_installation
+	mysql_secure_installation

-2. You will need to create the ZoneMinder database. These commands should do
-   the trick, assuming your database server is local:
+2. Using the password for the root account set during the previous step, you
+   will need to create the ZoneMinder database, assuming your database server is local:

     mysql -u root -p < /usr/share/zoneminder/db/zm_create.sql
     mysqladmin reload
@ -24,7 +24,7 @@ New installs
   introduce an obvious security issue.  The following should set this up:

     mysql -u root -p
-     grant select,insert,update,delete on zm.* to 'zmuser'@localhost identified by 'zmpass';
+     grant select,insert,update,delete,alter on zm.* to 'zmuser'@localhost identified by 'zmpass';

   Obviously, change at least zmpass to an actual, secure password or
   passphrase.  You can change zmuser as well if you like.
@ -48,18 +48,34 @@ New installs

   for testing, and edit /etc/sysconfig/selinux to disable it at boot time.

-7. The zoneminder.service file fails at present but the zmpkg.pl script
-   can be run as root to start zoneminder.
+7. IMPORTANT: Edit /etc/httpd/conf.d/zoneminder.conf and/or /etc/httpd/conf.

-	sudo zmpkg.pl start
+   The httpd.conf file included with this version of Fedora processes the conf.d
+   folder after the default ScriptAlias directive in the httpd.conf file.
+   Previously, the conf.d folder was processed before the default ScriptAlias
+   directive. This causes a ScriptAlias overlap and breaks Zoneminder's streaming
+   abilities.

-8. The ZoneMinder web interface is disabled by default (which makes it rather
-   useless but also secure by default), you will need to edit
-   /etc/httpd/conf.d/zoneminder.conf to enable it.  Afterwards, you can start
-   the web server:
+   Reference: http://httpd.apache.org/docs/2.4/mod/mod_alias.html#order
+   Bug Report: https://bugzilla.redhat.com/show_bug.cgi?id=973067

-     sudo systemctl enable httpd.service
-     sudo systemctl start httpd.service
+   WORKAROUND #1
+   If you are running zoneminder on a dedicated server then the simplest solution
+   may be to simply comment out the line in httpd.conf that reads:
+
+	ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"
+
+   WORKAROUND #2
+   If you need both the default cgi-bin folder & the zoneminder cgi-bin folder then
+   a solution might be to move the following line before the default ScriptAlias
+   directive in the httpd.conf file:
+
+	IncludeOptional conf.d/*.conf
+
+8. Now start the web server:
+
+	sudo systemctl enable httpd.service
+	sudo systemctl start httpd.service

 9. You should immediately visit http://localhost/zm and secure the system if
   it is network facing.  To do this:
@ -71,7 +87,19 @@ New installs
   e) You should be prompted to log in; the default username/password is admin/admin.
   f) Open Options again, choose the newly visible Users tab.
   g) click the admin user and set a password.
+   h) enable OPT_CONTROL on the Ssytem tab to enable ptz camera control.

+10. The zoneminder.service file fails at present but the zmpkg.pl script
+    can be run as root to start zoneminder.
+
+	sudo zmpkg.pl start
+
+    To start zoneminder automatically, create /etc/rc.d/rc.local and place the 
+    following inside it:
+	#!/bin/sh
+	/usr/bin/zmpkg.pl start 
+
+    The rc.local file must be made executable.

 Upgrades
 ========
@ -83,4 +111,4 @@ Upgrades
 2. You will need to upgrade the ZoneMinder database as described in the
   manual. This command should be sufficient when run as root:

-     zmupdate.pl --user=root --pass={mysql_root_pwd} --version=<from version>
+     zmupdate.pl --user=root --pass=<mysql_root_pwd> --version=<from version>
--- a/distros/fedora/redalart.wav
+++ b/distros/fedora/redalart.wav
@ -0,0 +1 @@
+../redhat/redalert.wav
--- a/distros/fedora/zoneminder-1.24.3-runlevel.patch
+++ b/distros/fedora/zoneminder-1.24.3-runlevel.patch
@ -0,0 +1,11 @@
+diff -up ./scripts/zm.in.runlevel ./scripts/zm.in
+--- ./scripts/zm.in.runlevel	2010-11-28 15:22:05.000000000 -0600
+++ ./scripts/zm.in	2011-03-24 21:39:01.973010160 -0500
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ # description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008
+-# chkconfig: 2345 99 00
+# chkconfig: - 99 00
+ # processname: zmpkg.pl
+ 
+ # Source function library.
--- a/distros/fedora/zoneminder-1.24.4-installfix.patch
+++ b/distros/fedora/zoneminder-1.24.4-installfix.patch
@ -0,0 +1,22 @@
+diff -up ./Makefile.am.installfix ./Makefile.am
+--- ./Makefile.am.installfix	2011-06-19 15:51:14.000000000 -0500
+++ ./Makefile.am	2011-08-13 20:33:30.288587436 -0500
+@@ -21,12 +21,12 @@ EXTRA_DIST = \
+ # Yes, you are correct. This is a HACK!
+ install-data-hook:
+ 	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
+-	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )
+-	( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )
+-	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "/var/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )
+	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR); fi )
+	( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR); fi )
+	( if ! test -e $(DESTDIR)$(ZM_LOGDIR); then mkdir -p $(DESTDIR)$(ZM_LOGDIR); fi; if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_LOGDIR); chmod u+w $(DESTDIR)$(ZM_LOGDIR); fi )
+ 
+ uninstall-hook:
+ 	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
+-	@-( if test "$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(ZM_RUNDIR); fi )
+-	@-( if test "$(ZM_TMPDIR)" != "/tmp"; then rm -rf $(ZM_TMPDIR); fi )
+-	@-( if test "$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(ZM_LOGDIR); fi )
+	@-( if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_RUNDIR); fi )
+	@-( if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then rm -rf $(DESTDIR)$(ZM_TMPDIR); fi )
+	@-( if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(DESTDIR)$(ZM_LOGDIR); fi )
--- a/distros/fedora/zoneminder-1.26.3-dbinstall.patch
+++ b/distros/fedora/zoneminder-1.26.3-dbinstall.patch
@ -0,0 +1,72 @@
+--- configure.ac	2013-09-05 10:33:08.000000000 -0500
+++ configure.ac.dbinstall	2013-09-05 17:23:28.555553447 -0500
+@@ -1,13 +1,11 @@
+ AC_PREREQ(2.59)
+-AC_INIT(zm,1.26.3,[http://www.zoneminder.com/forums/ - Please check FAQ first],ZoneMinder,http://www.zoneminder.com/downloads.html)
+AC_INIT(zm,1.26.3,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR(src/zm.h)
+ AC_CONFIG_HEADERS(config.h)
+ 
+ AC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])
+ 
+-PATH_BUILD=`pwd`
+-AC_SUBST(PATH_BUILD)
+ TIME_BUILD=`date +'%s'`
+ AC_SUBST(TIME_BUILD)
+
+@@ -354,6 +352,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
+ 
+ AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
+ AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
+AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
+AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
+ AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
+ AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
+ AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
+diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
+--- ./db/Makefile.am.dbinstall	2009-10-14 04:42:46.000000000 -0500
+++ ./db/Makefile.am	2011-03-24 22:50:14.173912137 -0500
+@@ -1,7 +1,16 @@
+ AUTOMAKE_OPTIONS = gnu
+ 
+zmdbdatadir = $(pkgdatadir)/db
+
+ EXTRA_DIST = \
+ 	zm_create.sql.in \
+	$(dbupgrade_scripts)
+
+dist_zmdbdata_DATA = \
+	zm_create.sql \
+	$(dbupgrade_scripts)
+
+dbupgrade_scripts = \
+ 	zm_update-0.0.1.sql \
+ 	zm_update-0.9.7.sql \
+ 	zm_update-0.9.8.sql \
+diff -up ./scripts/zmupdate.pl.in.dbinstall ./scripts/zmupdate.pl.in
+--- ./scripts/zmupdate.pl.in.dbinstall	2011-08-27 15:44:05.335602405 -0500
+++ ./scripts/zmupdate.pl.in	2011-08-26 02:51:37.000000000 -0500
+@@ -424,7 +424,7 @@ if ( $version )
+         }
+         else
+         {
+-            $command .= ZM_PATH_BUILD."/db";
+            $command .= ZM_PATH_DATA."/db";
+         }
+         $command .= "/zm_update-".$version.".sql";
+
+diff -up ./zm.conf.in.dbinstall ./zm.conf.in
+--- ./zm.conf.in.dbinstall	2008-07-25 04:48:16.000000000 -0500
+++ ./zm.conf.in	2011-03-24 22:50:14.175912077 -0500
+@@ -12,8 +12,8 @@
+ # Current version of ZoneMinder
+ ZM_VERSION=@VERSION@
+ 
+-# Path to build directory, used mostly for finding DB upgrade scripts
+-ZM_PATH_BUILD=@PATH_BUILD@
+# Path to installed data directory, used mostly for finding DB upgrade scripts
+ZM_PATH_DATA=@PKGDATADIR@
+ 
+ # Build time, used to record when to trigger various checks
+ ZM_TIME_BUILD=@TIME_BUILD@
--- a/distros/fedora/zoneminder-1.26.3-noffmpeg.patch
+++ b/distros/fedora/zoneminder-1.26.3-noffmpeg.patch
@ -0,0 +1,26 @@
+--- configure.ac	2013-09-10 12:42:56.000000000 -0500
+++ configure.ac.noffmpeg	2013-09-14 17:25:41.988388970 -0500
+@@ -284,15 +284,15 @@
+ AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
+ AC_CHECK_LIB(z,zlibVersion)
+ AC_CHECK_LIB(x264,x264_predict_16x16_init)
+-AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+ # Don't bother to warn about this one
+-AC_CHECK_LIB(avcore,av_image_copy,,)
+-AC_CHECK_LIB(avcodec,avcodec_version,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+-AC_CHECK_LIB(avformat,avformat_version,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+-#AC_CHECK_LIB(avcodec,avcodec_open,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+-#AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+-AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
+-AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
+dnl AC_CHECK_LIB(avcore,av_image_copy,,)
+dnl AC_CHECK_LIB(avcodec,avcodec_version,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+dnl AC_CHECK_LIB(avformat,avformat_version,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+dnl AC_CHECK_LIB(avcodec,avcodec_open,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+dnl AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+dnl AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
+dnl AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
+ AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
+ AC_CHECK_LIB(z,compress,,)
+ 
--- a/distros/fedora/zoneminder.conf
+++ b/distros/fedora/zoneminder.conf
@ -0,0 +1,45 @@
+# The Zoneminder web interface has been disabled by default due to a small
+# security issue in the default install.
+#
+# When using Zoneminder's own authentication, recorded CCTV images are
+# accessible from the web directly without passing the authentication. This
+# means any attacker could see your CCTV images without a password. In order
+# to avoid this you can disable Zoneminder's authentication and configure
+# standard Apache authentication (see the Apache documentation for details on
+# this).
+#
+# If you still wish to use Zoneminder's own authentication, or have an
+# internal site which needs no authentication, you need to delete the line
+# marked below and restart Apache.
+
+Alias /zm "/usr/share/zoneminder/www"
+<Directory "/usr/share/zoneminder/www">
+    Options -Indexes +MultiViews +FollowSymLinks
+    AllowOverride All
+    <IfModule mod_authz_core.c>
+       # Apache 2.4
+       Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order deny,allow
+        Allow from all
+    </IfModule>
+    # The code unfortunately uses short tags in many places
+    php_value short_open_tag 1
+</Directory>
+
+ScriptAlias /cgi-bin/zm "/usr/libexec/zoneminder/cgi-bin"
+<Directory "/usr/libexec/zoneminder/cgi-bin">
+    AllowOverride All
+    Options ExecCGI
+    <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>
--- a/distros/fedora/zoneminder.f19.spec
+++ b/distros/fedora/zoneminder.f19.spec
@ -0,0 +1,463 @@
+%define zmuid $(id -un)
+%define zmgid $(id -gn)
+%define zmuid_final apache
+%define zmgid_final apache
+
+Name:       zoneminder
+Version:    1.26.3
+Release:    1%{?dist}
+Summary:    A camera monitoring and analysis tool
+Group:      System Environment/Daemons
+# jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
+# Mootools is inder the MIT license: http://mootools.net/
+License:    GPLv2+ and LGPLv2+ and MIT 
+URL:        http://www.zoneminder.com/
+
+#Source:     http://www2.zoneminder.com/downloads/ZoneMinder-%{version}.tar.gz
+Source:     ZoneMinder-%{version}.tar.gz
+Source2:    zoneminder.conf
+Source3:    redalert.wav
+Source4:    README.Fedora
+Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
+Source6:    zoneminder.service
+Source7:    zoneminder.logrotate
+# Need to unravel the proper mootools files to grab from upstream, since the
+# number of them keeps multiplying.  In the meantime, rely on the ones bundled
+# with zoneminder.  As these are javascript, there is no guideline violation
+# here.
+#Source8:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
+Patch1:     zoneminder-1.26.3-dbinstall.patch
+Patch2:     zoneminder-1.24.3-runlevel.patch
+#Patch3:     zoneminder-1.26.3-noffmpeg.patch
+Patch10:    zoneminder-1.24.4-installfix.patch
+Patch11:    zoneminder-1.26.3-gcc48.patch
+#Patch12:    zoneminder-1.25.0-gcrypt.patch
+#Patch13:    zoneminder-1.25.0-kernel35.patch
+#Patch14:    zoneminder-1.26.3-ffmpeg.patch
+
+BuildRequires:  automake gnutls-devel systemd-units
+BuildRequires:  libtool bzip2-devel
+BuildRequires:  mysql-devel pcre-devel libjpeg-devel
+BuildRequires:  perl(Archive::Tar) perl(Archive::Zip)
+BuildRequires:  perl(Date::Manip) perl(DBD::mysql)
+BuildRequires:  perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
+BuildRequires:  perl(MIME::Entity) perl(MIME::Lite)
+BuildRequires:  perl(PHP::Serialization) perl(Sys::Mmap)
+BuildRequires:  perl(Time::HiRes) perl(Net::SFTP::Foreign)
+BuildRequires:  perl(Expect) 
+BuildRequires:  gcc gcc-c++ ffmpeg-devel
+BuildRequires:  autoconf autoconf-archive
+# Uncomment for X10 support
+#BuildRequires:  perl(X10::ActiveHome) perl(Astro::SunTime)
+
+Requires:   httpd php php-mysql cambozola
+Requires:   libjpeg-turbo ffmpeg
+Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:   perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
+Requires:   perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP)
+Requires:   perl(LWP::Protocol::https)
+
+Requires(post): systemd-units systemd-sysv
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+
+
+%description
+ZoneMinder is a set of applications which is intended to provide a complete
+solution allowing you to capture, analyse, record and monitor any cameras you
+have attached to a Linux based machine. It is designed to run on kernels which
+support the Video For Linux (V4L) interface and has been tested with cameras
+attached to BTTV cards, various USB cameras and IP network cameras. It is
+designed to support as many cameras as you can attach to your computer without
+too much degradation of performance.
+
+
+%prep
+%setup -q -n ZoneMinder-%{version}
+
+# Unpack jscalendar and move some files around
+%setup -q -D -T -a 5 -n ZoneMinder-%{version}
+mkdir jscalendar-doc
+pushd jscalendar-1.0
+mv *html *php doc/* README ../jscalendar-doc
+rmdir doc
+popd
+
+%patch1 -p0 -b .dbinstall
+%patch2 -p0 -b .runlevel
+#%patch3 -p0 -b .noffmpeg
+%patch10 -p0 -b .installfix
+%patch11 -p0 -b .gcc47
+#%patch12 -p0 -b .gcrypt
+#%patch13 -p0 -b .kernel35
+#%patch14 -p0 -b .ffmpeg
+cp %{SOURCE4} README.Fedora
+chmod -x src/zm_event.cpp src/zm_user.h
+
+
+%build
+libtoolize --force
+aclocal
+autoheader
+automake --force-missing --add-missing
+autoconf
+#autoreconf
+
+OPTS=""
+#%ifnarch %{ix86} x86_64
+#    OPTS="$OPTS --disable-crashtrace"
+#%endif
+
+export ZM_RUNDIR=/var/run/zoneminder
+export ZM_TMPDIR=/var/lib/zoneminder/temp
+%configure \
+    --disable-crashtrace \
+    --with-libarch=%{_lib} \
+    --with-mysql=%{_prefix} \
+    --with-ffmpeg=%{_prefix} \
+    --with-webdir=%{_datadir}/%{name}/www \
+    --with-cgidir=%{_libexecdir}/%{name}/cgi-bin \
+    --with-webuser=%{zmuid} \
+    --with-webgroup=%{zmgid} \
+    --enable-mmap=yes \
+    --disable-debug \
+    --with-webhost=zm.local \
+    ZM_SSL_LIB="gnutls" \
+    ZM_RUNDIR=/var/run/zoneminder \
+    ZM_TMPDIR=/var/lib/zoneminder/temp \
+    CXXFLAGS="-D__STDC_CONSTANT_MACROS -msse2" \
+    --with-extralibs="" \
+    $OPTS
+
+# Have to do this now because the configure script wipes out modifications made to this file
+cat <<EOF >> db/zm_create.sql
+# Fedora change:
+# Alter some default paths to match the default URL and selinux expectations
+update Config set Value = '/cgi-bin/zm/nph-zms' where Name = 'ZM_PATH_ZMS';
+update Config set Value = '/var/log/zoneminder' where Name = 'ZM_PATH_LOGS';
+update Config set Value = '/var/log/zoneminder/zm_debug_log+' where Name = 'ZM_EXTRA_DEBUG_LOG';
+update Config set Value = '/var/log/zoneminder/zm_xml.log' where Name = 'ZM_EYEZM_LOG_FILE';
+update Config set Value = '/var/lib/zoneminder/sock' where Name = 'ZM_PATH_SOCKS';
+update Config set Value = '/var/lib/zoneminder/swap' where Name = 'ZM_PATH_SWAP';
+update Config set Value = '/var/spool/zoneminder-upload' where Name = 'ZM_UPLOAD_FTP_LOC_DIR';
+EOF
+
+make %{?_smp_mflags}
+%{__perl} -pi -e 's/(ZM_WEB_USER=).*$/${1}%{zmuid_final}/;' \
+          -e 's/(ZM_WEB_GROUP=).*$/${1}%{zmgid_final}/;' zm.conf
+
+
+%install
+install -d %{buildroot}/%{_localstatedir}/run
+make install DESTDIR=%{buildroot} \
+    INSTALLDIRS=vendor
+rm -rf %{buildroot}/%{perl_vendorarch} %{buildroot}/%{perl_archlib}
+rm -f %{buildroot}/%{_bindir}/zmx10.pl
+
+install -m 755 -d %{buildroot}/var/log/zoneminder
+for dir in events images temp
+do
+    install -m 755 -d %{buildroot}/var/lib/zoneminder/$dir
+    rmdir %{buildroot}/%{_datadir}/zoneminder/www/$dir
+    ln -sf ../../../../var/lib/zoneminder/$dir %{buildroot}/%{_datadir}/zoneminder/www/$dir
+done
+install -m 755 -d %{buildroot}/var/lib/zoneminder/sock
+install -m 755 -d %{buildroot}/var/lib/zoneminder/swap
+install -m 755 -d %{buildroot}/var/spool/zoneminder-upload
+
+install -D -m 644 %{SOURCE2} %{buildroot}/etc/httpd/conf.d/zoneminder.conf
+install -D -m 755 %{SOURCE3} %{buildroot}/%{_datadir}/zoneminder/www/sounds/redalert.wav
+install -D -m 644 %{SOURCE6} %{buildroot}/%{_unitdir}/zoneminder.service
+install -D -m 644 %{SOURCE7} %{buildroot}/etc/logrotate.d/zoneminder
+
+# Install jscalendar - this really should be in its own package
+install -d -m 755 %{buildroot}/%{_datadir}/%{name}/www/jscalendar
+cp -rp jscalendar-1.0/* %{buildroot}/%{_datadir}/zoneminder/www/jscalendar
+
+# Set up cambozola
+pushd %{buildroot}/%{_datadir}/zoneminder/www
+ln -s ../../java/cambozola.jar
+popd
+
+install -d -m 755 %{buildroot}/etc/tmpfiles.d
+cat > %{buildroot}/etc/tmpfiles.d/zoneminder.conf <<EOF
+d   /run/zoneminder     0755    %{zmuid_final}  %{zmgid_final}
+EOF
+install -m 755 -d %{buildroot}/run/zoneminder
+
+
+%post
+if [ $1 -eq 1 ] ; then
+    # Initial installation 
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+%preun
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || :
+    /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || :
+fi
+
+%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
+fi
+
+%triggerun -- zoneminder < 1.25.0-4
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply zoneminder
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || :
+/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md README.Fedora jscalendar-doc
+%config(noreplace) %attr(640,root,%{zmgid_final}) /etc/zm.conf
+%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
+%config(noreplace) /etc/tmpfiles.d/zoneminder.conf
+%config(noreplace) /etc/logrotate.d/zoneminder
+
+%{_unitdir}/zoneminder.service
+
+%{_bindir}/zma
+%{_bindir}/zmaudit.pl
+%{_bindir}/zmc
+%{_bindir}/zmcontrol.pl
+%{_bindir}/zmdc.pl
+%{_bindir}/zmf
+%{_bindir}/zmfilter.pl
+%attr(4755,root,root) %{_bindir}/zmfix
+%{_bindir}/zmpkg.pl
+%{_bindir}/zmstreamer
+%{_bindir}/zmtrack.pl
+%{_bindir}/zmtrigger.pl
+%{_bindir}/zmu
+%{_bindir}/zmupdate.pl
+%{_bindir}/zmvideo.pl
+%{_bindir}/zmwatch.pl
+#%{_bindir}/zmx10.pl
+
+%{perl_vendorlib}/ZoneMinder*
+%{_mandir}/man*/*
+%dir %{_libexecdir}/zoneminder
+%{_libexecdir}/zoneminder/cgi-bin
+%dir %{_datadir}/zoneminder
+%{_datadir}/zoneminder/db
+%{_datadir}/zoneminder/www
+
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder
+
+
+%changelog
+* Sat Sep 21 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.3
+- Initial rebuild for ZoneMinder 1.26.3 release.  
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.25.0-12
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Mon Jan  7 2013 Remi Collet <rcollet@redhat.com> - 1.25.0-11
+- fix configuration file for httpd 2.4, #871502
+
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
+- rebuild against new libjpeg
+
+* Thu Aug 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-9
+- Add patch to work around v4l2 api breakage in 3.5 kernel.
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jun 23 2012 Petr Pisar <ppisar@redhat.com> - 1.25.0-7
+- Perl 5.16 rebuild
+
+* Wed Mar 21 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-6
+- Fix stupid thinko in sql modifications.
+
+* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-5
+- Clean up macro usage.
+
+* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-4
+- Convert to systemd.
+- Add tmpfiles.d configuration since the initscript isn't around to create
+  /run/zoneminder.
+- Remove some pointless executable permissions.
+- Add logrotate file.
+
+* Wed Feb 22 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-3
+- Update README.Fedora to reference systemctl and mention timezone info in
+  php.ini.
+- Add proper default for EYEZM_LOG_TO_FILE.
+
+
+* Thu Feb 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-2
+- Rebuild for new pcre.
+
+* Thu Jan 19 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-1
+- Update to 1.25.0
+- Fix gcc4.7 build problems.
+- Drop gcc4.4 build fixes; for whatever reason they now break the build.
+- Clean up old patches.
+- Force setting of ZM_TMPDIR and ZM_RUNDIR.
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-3
+- Re-add the dist-tag that somehow got lost.
+
+* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-2
+- Add patch for bug 711780 - fix syntax issue in Mapped.pm.
+- Undo that patch, and undo another which was the cause of the whole mess.
+- Fix up other patches so ZM_PATH_BUILD is both defined and useful.
+- Make sure database creation mods actually take.
+- Update Fedora-specific docs with some additional info.
+- Use bundled mootools (javascript, so no guideline violation).
+- Update download location.
+- Update the gcrypt patch to actually work.
+- Upstream changed the tarball without changing the version to patch a
+  vulnerability, so redownload.
+
+* Sun Aug 14 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-1
+- Initial attempt to upgrade to 1.24.4.
+- Add patch from BZ 460310 to build against libgcrypt instead of requiring the
+  gnutls openssl libs.
+
+* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-7.20110324svn3310
+- Perl mass rebuild
+
+* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-6.20110324svn3310
+- Perl mass rebuild
+
+* Mon May 09 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-5.20110324svn3310
+- Bump for gnutls update.
+
+* Thu Mar 24 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-4.20110324svn3310
+- Update to latest 1.24.3 subversion.  Turns out that what upstream was calling
+  1.24.3 is really just an occasionally updated devel snapshot.
+- Rebase various patches.
+
+* Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 1.24.3-3
+- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-1
+- Update to latest upstream version.
+- Rebase patches.
+- Initial incomplete attempt to disable v4l1 support.
+
+* Fri Jan 21 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-6
+- Unbundle cambozola; instead link to the separately pacakged copy.
+- Remove BuildRoot:, %%clean and buildroot cleaning in %%install.
+- Git rid of mixed space/tab usage by removing all tabs.
+- Remove unnecessary Conflicts: line.
+- Attempt to force short_open_tag on for the code directories.
+- Move default location of sockets, swaps, logfiles and some temporary files to
+  make more sense and allow things to work better with a future selinux policy.
+- Fix errors in README.Fedora.
+
+* Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.24.2-5
+- Mass rebuild with perl-5.12.0
+
+* Fri Dec  4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
+- rebuild against perl 5.10.1
+- use Perl vendorarch and archlib variables correctly
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-2
+- Bump release since 1.24.2-1 was mistakenly tagged a few months ago.
+
+* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-1
+- Initial update to 1.24.2.
+- Rebase patches.
+- Update mootools download location.
+- Update to mootools 1.2.3.
+- Add additional dependencies for some optional features.
+
+* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-3
+- Remove unused Sys::Mmap perl dependency RPM is finding
+
+* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-2
+- Update gcc44 patch to disable -frepo, seems to be broken with gcc44
+- Added noffmpeg patch to make building outside mock easier
+
+* Sat Mar 21 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-1
+- Patch for gcc 4.4 compilation errors
+- Upgrade to 1.24.1
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
+- rebuild for dependencies
+
+* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
+- Fix permissions on zm.conf
+
+* Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
+- Initial attempt at packaging 1.23.
+
+* Tue Jul  1 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-15
+- Add perl module compat dependency, bz #453590
+
+* Tue May  6 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-14
+- Remove default runlevel, bz #441315
+
+* Mon Apr 28 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.22.3-13
+- Backport patch for CVE-2008-1381 from 1.23.3 to 1.22.3.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.22.3-12
+- Autorebuild for GCC 4.3
+
+* Thu Jan  3 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-11
+- Fix compilation on gcc 4.3
+
+* Thu Dec  6 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-10
+- Rebuild for new openssl
+
+* Thu Aug  2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-8
+- Fix licence tag
+
+* Thu Jul 12 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-7
+- Fixes from testing by Jitz including missing dependencies and database creation
+
+* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-6
+- Disable crashtrace on ppc
+
+* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-5
+- Fix uid for directories in /var/lib/zoneminder
+
+* Tue Jun 26 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-4
+- Added perl Archive::Tar dependency
+- Disabled web interface due to lack of access control on the event images
+
+* Sun Jun 10 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-3
+- Changes recommended in review by Jason Tibbitts
+
+* Mon Apr  2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-2
+- Standardised on package name of zoneminder
+
+* Thu Dec 28 2006 Martin Ebourne <martin@zepler.org> - 1.22.3-1
+- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin
--- a/distros/fedora/zoneminder.logrotate
+++ b/distros/fedora/zoneminder.logrotate
@ -0,0 +1,8 @@
+/var/log/zoneminder/*.log {
+    missingok
+    notifempty
+    sharedscripts
+    postrotate
+        /usr/bin/zmpkg.pl logrot 2> /dev/null > /dev/null || :
+    endscript
+}
--- a/distros/fedora/zoneminder.service
+++ b/distros/fedora/zoneminder.service
@ -0,0 +1,12 @@
+[Unit]
+Description=Video security and surveillance system
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/zmpkg.pl start
+ExecReload=/usr/bin/zmpkg.pl reload
+PIDFile=/run/zoneminder/zm.pid
+
+[Install]
+WantedBy=multi-user.target
+
--- a/distros/redhat/README.CentOS
+++ b/distros/redhat/README.CentOS
@ -15,7 +15,7 @@

     mysql -uroot -p
 	mysql> create database zm;
-	mysql> grant select,insert,update,delete on zm.* to
+	mysql> grant select,insert,update,delete,alter on zm.* to
               'zmuser'@localhost identified by 'zmpass';
 	mysql> exit;
     mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
--- a/distros/redhat/README.SuSE
+++ b/distros/redhat/README.SuSE
@ -1,17 +0,0 @@
-After install run "zm_database_init" to create
-the database and the zm database user (zm_admin).
-The config file is automaticly adjusted with the
-entered password for zm_admin.
-
-If you want to use X10 thwn install the the required
-perl module with cpan.
-
-information:
-during the run of zm_database_init a .my.cnf will
-be created/updated (in the home directory of root)
-so that root can access the database without password.
-It Does not delete the .my.cnf when it exists, but checks
-whether it has an entry for the mysql client [client] which
-contains as username root. When the entry not exist or
-the username is not root the .my.cnf will be modified
-to fit the above requirements.
--- a/distros/ubuntu1204/README.Debian
+++ b/distros/ubuntu1204/README.Debian
@ -0,0 +1,51 @@
+zoneminder for Debian
+---------------------
+
+There is one manual step to get the web interface working.
+You need to link /etc/zm/apache.conf to /etc/apache2/conf.d/zoneminder.conf,
+then reload the apache config (i.e. /etc/init.d/apache2 reload)
+
+Changing the location for images and events
+-------------------------------------------
+
+Zoneminder, in its upstream form, stores data in /usr/share/zoneminder/.  This
+package modifies that by changing /usr/share/zoneminder/images and
+/usr/share/zoneminder/events to symlinks to directories under
+/var/cache/zoneminder.
+
+There are numerous places these could be put and ways to do it.  But, at the
+moment, if you change this, an upgrade will fail with a warning about these
+locations having changed (the reason for this was that previously, an  upgrade
+would silently revert the changes and cause event loss - refer
+bug #608793).
+
+If you do want to change the location, here are a couple of suggestions.
+(thanks to vagrant@freegeek.org):
+
+These lines in fstab could allow you to bind-mount an alternate location
+
+         /dev/sdX1 /otherdrive ext3 defaults 0 2
+         /otherdrive/zoneminder/images /var/cache/zoneminder/images bind defaults 0 2
+         /otherdrive/zoneminder/events /var/cache/zoneminder/events bind defaults 0 2
+
+        or if you have a separate partition for each:
+
+         /dev/sdX1 /var/cache/zoneminder/images ext3 defaults 0 2
+         /dev/sdX2 /var/cache/zoneminder/events ext3 defaults 0 2
+
+
+
+ -- Peter Howard <pjh@northern-ridge.com.au>, Sun, 16 Jan 2010 01:35:51 +1100
+
+Access to /dev/video*
+---------------------
+
+For cameras which require access to /dev/video*, zoneminder may need the 
+www-data user added to the video group in order to see those cameras:
+
+  adduser www-data video
+
+Note that all web applications running on the zoneminder server will then have 
+access to all video devices on the system.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sun, 27 Mar 2011 13:06:56 -0700
--- a/distros/ubuntu1204/apache.conf
+++ b/distros/ubuntu1204/apache.conf
@ -0,0 +1,9 @@
+Alias /zm /usr/share/zoneminder
+
+<Directory /usr/share/zoneminder>
+  php_flag register_globals off
+  Options Indexes FollowSymLinks
+  <IfModule mod_dir.c>
+    DirectoryIndex index.php
+  </IfModule>
+</Directory>
--- a/distros/ubuntu1204/changelog
+++ b/distros/ubuntu1204/changelog
@ -0,0 +1,18 @@
+zoneminder (1.26.4-2) precise; urgency=high
+
+  * improvements to zmupdate.pl, cleanups
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Thu, 03 Oct 2013 11:40:32 -0400
+
+zoneminder (1.26.3-1) unstable; urgency=low
+
+  * A 'minor' release focusing on performance improvement and bug fixes.
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Sun, 22 Sep 2013 09:36:42 +0800
+
+zoneminder (1.25.1-1) unstable; urgency=low
+
+  * Initial Version.
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Mon, 29 Apr 2013 12:38:00 -0400
+
--- a/distros/ubuntu1204/compat
+++ b/distros/ubuntu1204/compat
@ -0,0 +1 @@
+9
--- a/distros/ubuntu1204/control
+++ b/distros/ubuntu1204/control
@ -0,0 +1,21 @@
+Source: zoneminder
+Section: net
+Priority: optional
+Maintainer: Isaac Connor <iconnor@connortechnology.com>
+Build-Depends: debhelper (>= 5), autoconf, automake, dpatch, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, ffmpeg, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libpcre3, libarchive-zip-perl, libmime-lite-perl, libjpeg8, dh-autoreconf
+Standards-Version: 3.9.2
+
+Package: zoneminder
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5, php5, php5-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-lite-perl, mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl
+Description: Linux 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.
--- a/distros/ubuntu1204/copyright
+++ b/distros/ubuntu1204/copyright
@ -0,0 +1,22 @@
+Copyright:
+
+Copyright 2002 Philip Coombes <philip.coombes@zoneminder.com>
+
+License:
+
+This package is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.
+
+This package is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this package; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian GNU/Linux systems, the text of the GPL can be found in
+/usr/share/common-licenses/GPL.
--- a/distros/ubuntu1204/dirs
+++ b/distros/ubuntu1204/dirs
@ -0,0 +1,6 @@
+var/log/zm
+var/lib/zm
+var/cache/zoneminder/events
+var/cache/zoneminder/images
+var/cache/zoneminder/temp
+usr/share/zoneminder/db
--- a/distros/ubuntu1204/docs
+++ b/distros/ubuntu1204/docs
@ -0,0 +1 @@
+README.md
--- a/distros/ubuntu1204/init.d
+++ b/distros/ubuntu1204/init.d
@ -0,0 +1,91 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          zoneminder
+# Required-Start:    $network $remote_fs $syslog
+# Required-Stop:     $network $remote_fs $syslog
+# Should-Start:      mysql
+# Should-Stop:       mysql
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description:  Control ZoneMinder as a Service
+### END INIT INFO
+# description: Control ZoneMinder as a Service
+# chkconfig: 2345 20 20
+
+# Source function library.
+#. /etc/rc.d/init.d/functions
+
+prog=ZoneMinder
+ZM_PATH_BIN="/usr/bin"
+RUNDIR=/var/run/zm
+TMPDIR=/tmp/zm
+command="$ZM_PATH_BIN/zmpkg.pl"
+
+start() {
+	echo -n "Starting $prog: "
+	mkdir -p $RUNDIR && chown www-data:www-data $RUNDIR
+	mkdir -p $TMPDIR && chown www-data:www-data $TMPDIR
+    zmfix -a
+	$command start
+	RETVAL=$?
+	[ $RETVAL = 0 ] && echo success
+	[ $RETVAL != 0 ] && echo failure
+	echo
+	[ $RETVAL = 0 ] && touch /var/lock/zm
+	return $RETVAL
+}
+stop() {
+	echo -n "Stopping $prog: "
+	#
+	# Why is this status check being done?
+	# as $command stop returns 1 if zoneminder 
+	# is stopped, which will result in 
+	# this returning 1, which will stuff 
+	# dpkg when it tries to stop zoneminder before
+	# uninstalling . . . 
+	#
+	result=`$command status`
+	if [ ! "$result" = "running" ]; then
+		echo "Zoneminder already stopped"
+		echo
+		RETVAL=0
+	else
+		$command stop
+		RETVAL=$?
+		[ $RETVAL = 0 ] && echo success
+		[ $RETVAL != 0 ] && echo failure
+		echo
+		[ $RETVAL = 0 ] && rm -f /var/lock/zm
+	fi
+}
+status() {
+	result=`$command status`
+	if [ "$result" = "running" ]; then
+		echo "ZoneMinder is running"
+		RETVAL=0
+	else
+		echo "ZoneMinder is stopped"
+		RETVAL=1
+	fi
+}
+
+case "$1" in
+'start')
+	start
+	;;
+'stop')
+	stop
+	;;
+'restart' | 'force-reload')
+	stop
+	start
+	;;
+'status')
+	status
+	;;
+*)
+	echo "Usage: $0 { start | stop | restart | status }"
+	RETVAL=1
+	;;
+esac
+exit $RETVAL
--- a/distros/ubuntu1204/postinst
+++ b/distros/ubuntu1204/postinst
@ -0,0 +1,64 @@
+#! /bin/sh
+
+set -e
+
+VERSION=1.26.4
+
+if [ "$1" = "configure" ]; then
+                #
+                # Get mysql started if it isn't
+                #
+                if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                        invoke-rc.d mysql start
+                fi
+                if $(/etc/init.d/mysql status >/dev/null 2>&1); 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
+                            cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
+                            echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                        fi
+
+                        # get old version from upgrade...
+                        OLD_ZM_VERSION=${2%-*}
+                        if [ -z "$OLD_ZM_VERSION" ]; then
+                                # fall back to getting version from database itself, which may not necessarily be accurate?
+                                OLD_ZM_VERSION=$(echo 'select Value from Config where Name = "ZM_DYN_CURR_VERSION";' | mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names zm )
+                        fi
+                        if [ -n "$OLD_ZM_VERSION" ] && [ "$OLD_ZM_VERSION" != "$VERSION" ] ; then
+                                echo 'grant lock tables, create, alter on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                                # stop zoneminder before performing database upgrade.
+                                invoke-rc.d zoneminder stop || true
+                                zmupdate.pl --nointeractive --version $OLD_ZM_VERSION
+                        fi
+
+                else
+                        echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+                fi
+                chown www-data:www-data /var/log/zm
+                chown www-data:www-data /var/lib/zm/
+                if [ -z "$2" ]; then
+                        chown www-data:www-data -R /var/cache/zoneminder
+                fi
+fi
+# Ensure zoneminder is stopped...
+if [ -x "/etc/init.d/zoneminder" ]; then
+        if invoke-rc.d zoneminder status ; then
+                invoke-rc.d zoneminder stop || exit $?
+        fi
+fi
+
+if [ "$1" = "configure" ]; then
+	if [ -z "$2" ]; then
+		chown www-data:www-data /var/log/zm
+		chown www-data:www-data /var/lib/zm/
+		chown www-data:www-data -R /var/cache/zoneminder
+    else
+		chown www-data:www-data /var/log/zm
+        OLD_ZM_VERSION=${2%-*}
+        if [ "$OLD_ZM_VERSION" != "$VERSION" ] ; then
+            zmupdate.pl --version $OLD_ZM_VERSION 
+        fi
+	fi
+fi
+#DEBHELPER#
--- a/distros/ubuntu1204/postrm
+++ b/distros/ubuntu1204/postrm
@ -0,0 +1,9 @@
+#! /bin/sh
+# set -e # to be reinstated later
+
+if [ "$1" = "purge" ]; then
+    echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+    echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+    mysqladmin --defaults-file=/etc/mysql/debian.cnf -f drop zm
+fi
+#DEBHELPER#
--- a/distros/ubuntu1204/preinst
+++ b/distros/ubuntu1204/preinst
@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+abort=false
+if [ -L /usr/share/zoneminder/events ]; then
+    l=$(readlink /usr/share/zoneminder/events)
+    if [ "$l" != "/var/cache/zoneminder/events" ]; then
+        abort=true
+    fi
+fi
+if [ -L /usr/share/zoneminder/images ]; then
+    l=$(readlink /usr/share/zoneminder/images )
+    if [ "$l" != "/var/cache/zoneminder/images" ]; then
+        abort=true
+    fi
+fi
+
+if [ "$abort" = "true" ]; then
+    cat >&2 << EOF 
+Aborting installation of zoneminder due to non-default symlinks in
+/usr/share/zoneminder for the images and/or events directory, which could
+result in loss of data. Please move your data in each of these directories to
+/var/cache/zoneminder before installing zoneminder from the package.
+EOF
+    exit 1
+
+fi
+
+#DEBHELPER#
+
+exit 0
--- a/distros/ubuntu1204/rules
+++ b/distros/ubuntu1204/rules
@ -0,0 +1,73 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d - -f 1)
+POSTINST_VERSION := $(shell egrep ^VERSION= debian/postinst | cut -d = -f 2)
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+CPPFLAGS = -D__STDC_CONSTANT_MACROS
+CXXFLAGS = -DHAVE_LIBCRYPTO
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+%:
+	dh $@ --with autoreconf
+
+override_dh_auto_configure:
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --sysconfdir=/etc/zm --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-mysql=/usr  --with-webdir=/usr/share/zoneminder --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes
+
+override_dh_clean:
+	# check to make sure that postinst contains the correct upstream version
+	[ $(UPSTREAM_VERSION) = $(POSTINST_VERSION) ]
+
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean
+
+override_dh_install:
+	# Add here commands to install the package into debian/zm.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/zoneminder RUNDIR=$(CURDIR)/debian/zoneminder/var/run ZM_RUNDIR=$(CURDIR)/debian/zoneminder/var/run
+	install -D -m 0644 db/zm_create.sql		$(CURDIR)/debian/zoneminder/usr/share/zoneminder/db
+	install -D -m 0644 db/zm_update-*.sql $(CURDIR)/debian/zoneminder/usr/share/zoneminder/db
+	install -D -m 0644 debian/apache.conf  $(CURDIR)/debian/zoneminder/etc/zm
+	#
+	# NOTE: This is a short-term kludge; hopefully changes in the next
+	# upstream version will render this unnecessary.
+	rm -rf debian/zoneminder/usr/share/zoneminder/events
+	rm -rf debian/zoneminder/usr/share/zoneminder/images
+	rm -rf debian/zoneminder/usr/share/zoneminder/temp
+	ln -s /var/cache/zoneminder/events debian/zoneminder/usr/share/zoneminder/
+	ln -s /var/cache/zoneminder/images debian/zoneminder/usr/share/zoneminder/
+	ln -s /var/cache/zoneminder/temp debian/zoneminder/usr/share/zoneminder/
+
+	#
+	# This is a slightly lesser kludge; moving the cgi stuff to 
+	# /usr/share/zoneminder/cgi-bin breaks one set of behavior,
+	# having it just in /usr/lib/cgi-bin breaks another bit of 
+	# behavior.
+	#
+	ln -s /usr/lib/cgi-bin debian/zoneminder/usr/share/zoneminder/
+
+override_dh_fixperms:
+	dh_fixperms
+	chown root:root debian/zoneminder/etc/zm/zm.conf
+
+override_dh_auto_test:
+	# do not run tests...
--- a/distros/ubuntu1204/watch
+++ b/distros/ubuntu1204/watch
@ -0,0 +1,3 @@
+version=3
+http://www.zoneminder.com/downloads.html \
+  .*/ZoneMinder-(.*).tar.gz
--- a/misc/CMakeLists.txt
+++ b/misc/CMakeLists.txt
@ -0,0 +1,10 @@
+# CMakeLists.txt for the ZoneMinder misc files
+
+# Create files from the .in files
+configure_file(apache.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/apache.conf @ONLY)
+configure_file(logrotate.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/logrotate.conf @ONLY)
+configure_file(syslog.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/syslog.conf @ONLY)
+
+# Install the misc files
+install(FILES apache.conf logrotate.conf syslog.conf DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/misc")
+
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@ -0,0 +1,24 @@
+# CMakeLists.txt for the ZoneMinder perl scripts.
+
+# Process the perl modules subdirectory
+add_subdirectory(ZoneMinder ZoneMinder)
+
+# Create files from the .in files
+configure_file(zmaudit.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmaudit.pl @ONLY)
+configure_file(zmcontrol.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmcontrol.pl @ONLY)
+configure_file(zmdc.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmdc.pl @ONLY)
+configure_file(zmfilter.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmfilter.pl @ONLY)
+configure_file(zmpkg.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmpkg.pl @ONLY)
+configure_file(zmtrack.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmtrack.pl @ONLY)
+configure_file(zmtrigger.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmtrigger.pl @ONLY)
+configure_file(zmupdate.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmupdate.pl @ONLY)
+configure_file(zmvideo.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmvideo.pl @ONLY)
+configure_file(zmwatch.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmwatch.pl @ONLY)
+configure_file(zmx10.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmx10.pl @ONLY)
+#configure_file(zmdbbackup.in ${CMAKE_CURRENT_SOURCE_DIR}/zmdbbackup @ONLY)
+#configure_file(zmdbrestore.in ${CMAKE_CURRENT_SOURCE_DIR}/zmdbrestore @ONLY)
+#configure_file(zm.in ${CMAKE_CURRENT_SOURCE_DIR}/zm @ONLY)
+#configure_file(zmeventdump.in ${CMAKE_CURRENT_SOURCE_DIR}/zmeventdump @ONLY)
+
+# Install the perl scripts
+install(FILES zmaudit.pl zmcontrol.pl zmdc.pl zmfilter.pl zmpkg.pl zmtrack.pl zmtrigger.pl zmupdate.pl zmvideo.pl zmwatch.pl zmx10.pl DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
--- a/scripts/ZoneMinder/CMakeLists.txt
+++ b/scripts/ZoneMinder/CMakeLists.txt
@ -0,0 +1,19 @@
+# CMakeLists.txt for the ZoneMinder perl module.
+
+# Create files from the .in files
+configure_file(lib/ZoneMinder/Base.pm.in ${CMAKE_CURRENT_SOURCE_DIR}/lib/ZoneMinder/Base.pm @ONLY)
+configure_file(lib/ZoneMinder/Config.pm.in ${CMAKE_CURRENT_SOURCE_DIR}/lib/ZoneMinder/Config.pm @ONLY)
+configure_file(lib/ZoneMinder/Memory.pm.in ${CMAKE_CURRENT_SOURCE_DIR}/lib/ZoneMinder/Memory.pm @ONLY)
+configure_file(lib/ZoneMinder/ConfigData.pm.in ${CMAKE_CURRENT_SOURCE_DIR}/lib/ZoneMinder/ConfigData.pm @ONLY)
+
+# Add build target for the perl modules
+add_custom_target(zmperlmodules ALL perl Makefile.PL FIRST_MAKEFILE="${CMAKE_CURRENT_SOURCE_DIR}/MakefilePerl" INSTALL_BASE="${CMAKE_CURRENT_SOURCE_DIR}/output" INSTALLPRIVLIB="${CMAKE_CURRENT_SOURCE_DIR}/output/${CMAKE_INSTALL_LIBDIR}/perl5" INSTALLARCHLIB="${CMAKE_CURRENT_SOURCE_DIR}/optout/${CMAKE_INSTALL_LIBDIR}/perl5/arch" INSTALLSITELIB="${CMAKE_CURRENT_SOURCE_DIR}/output/${CMAKE_INSTALL_LIBDIR}/perl5" INSTALLSITEARCH="${CMAKE_CURRENT_SOURCE_DIR}/optout/${CMAKE_INSTALL_LIBDIR}/perl5/arch" COMMAND make --makefile=MakefilePerl COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl modules")
+
+# Add install target for the perl modules
+install(DIRECTORY output/ DESTINATION "${CMAKE_INSTALL_PREFIX}")
+
+
+
+
+
+
--- a/scripts/ZoneMinder/MYMETA.yml
+++ b/scripts/ZoneMinder/MYMETA.yml
@ -1,22 +0,0 @@
---
-abstract: 'Container module for common ZoneMinder modules'
-author:
-  - 'Philip Coombes <philip.coombes@zoneminder.com>'
-build_requires:
-  ExtUtils::MakeMaker: 0
-configure_requires:
-  ExtUtils::MakeMaker: 0
-distribution_type: module
-dynamic_config: 0
-generated_by: 'ExtUtils::MakeMaker version 6.57_05'
-license: unknown
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: 1.4
-name: ZoneMinder
-no_index:
-  directory:
-    - t
-    - inc
-requires: {}
-version: 1.25.0
--- a/scripts/ZoneMinder/blib/arch/.exists
+++ b/scripts/ZoneMinder/blib/arch/.exists
--- a/scripts/ZoneMinder/blib/arch/auto/ZoneMinder/.exists
+++ b/scripts/ZoneMinder/blib/arch/auto/ZoneMinder/.exists
--- a/scripts/ZoneMinder/blib/bin/.exists
+++ b/scripts/ZoneMinder/blib/bin/.exists
--- a/scripts/ZoneMinder/blib/lib/.exists
+++ b/scripts/ZoneMinder/blib/lib/.exists
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder.pm
@ -1,130 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Common Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the common definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-use ZoneMinder::Base qw(:all);
-use ZoneMinder::Config qw(:all);
-use ZoneMinder::Logger qw(:all);
-use ZoneMinder::General qw(:all);
-use ZoneMinder::Database qw(:all);
-use ZoneMinder::Memory qw(:all);
-
-our @ISA = qw(Exporter ZoneMinder::Base ZoneMinder::Config ZoneMinder::Logger ZoneMinder::General ZoneMinder::Database ZoneMinder::Memory);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-	'base' => [ 
-		@ZoneMinder::Base::EXPORT_OK
-	],
-	'config' => [ 
-		@ZoneMinder::Config::EXPORT_OK
-	],
-	'debug' => [ 
-		@ZoneMinder::Logger::EXPORT_OK
-	],
-	'general' => [ 
-		@ZoneMinder::General::EXPORT_OK
-	],
-	'database' => [ 
-		@ZoneMinder::Database::EXPORT_OK
-	],
-	'memory' => [ 
-		@ZoneMinder::Memory::EXPORT_OK
-	],
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = @{ $EXPORT_TAGS{'all'} };
-
-our @EXPORT = ( @EXPORT_OK );
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-1;
-__END__
-
-=head1 NAME
-
-ZoneMinder - Container module for common ZoneMinder modules
-
-=head1 SYNOPSIS
-
-  use ZoneMinder;
-
-=head1 DESCRIPTION
-
-This module is a convenience container module that uses the
-ZoneMinder::Base, ZoneMinder::Common, ZoneMinder::Logger,
-ZoneMinder::Database and ZoneMinder::Memory modules. It also
-exports by default all symbols provided by the 'all' tag of 
-each of the modules.
-
-Thus 'use'ing this module is equivalent to the following 
-
-  use ZoneMinder::Base qw(:all);
-  use ZoneMinder::Config qw(:all);
-  use ZoneMinder::Logger qw(:all);
-  use ZoneMinder::Database qw(:all);
-  use ZoneMinder::Memory qw(:all);
-
-but is somewhat easier.
-
-=head2 EXPORT
-
-All symbols exported by the 'all' tag of each of the included
-modules.
-
-=head1 SEE ALSO
-
-ZoneMinder::Base, ZoneMinder::Common, ZoneMinder::Logger,
-ZoneMinder::Database, ZoneMinder::Memory
-
-http://www.zoneminder.com
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2005 by Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Base.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Base.pm
@ -1,86 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Base Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the common definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::Base;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-
-our @ISA = qw(Exporter);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = ( 'all' => [ qw() ] );
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = "1.25.0";
-
-1;
-__END__
-
-=head1 NAME
-
-ZoneMinder::Base - Base perl module for ZoneMinder
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Base;
-
-=head1 DESCRIPTION
-
-This module is the base module for the rest of the ZoneMinder modules. It is included by each of the other modules but serves no purpose other than to propagate the perl module version amongst the other modules. You will never need to use this module directly but if you write new ZoneMinder modules they should include it.
-
-=head2 EXPORT
-
-None by default.
-
-=head1 SEE ALSO
-
-http://www.zoneminder.com
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Config.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Config.pm
@ -1,145 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Config Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the common definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::Config;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our @EXPORT_CONFIG; # Get populated by BEGIN
-
-our %EXPORT_TAGS = (
-	'constants' => [ qw(
-		ZM_PID
-	) ]
-);
-push( @{$EXPORT_TAGS{config}}, @EXPORT_CONFIG );
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-use constant ZM_PID => "/var/run/zm/zm.pid"; # Path to the ZoneMinder run pid file
-use constant ZM_CONFIG => "/etc/zm/zm.conf"; # Path to the ZoneMinder config file
-
-use Carp;
-
-# Load the config from the database into the symbol table
-BEGIN
-{
-	no strict 'refs';
-
-	my $config_file = ZM_CONFIG;
-	( my $local_config_file = $config_file ) =~ s|^.*/|./|;
-	if ( -s $local_config_file && -r $local_config_file )
-	{
-		print( STDERR "Warning, overriding installed $local_config_file file with local copy\n" );
-		$config_file = $local_config_file;
-	}
-	open( CONFIG, "<".$config_file ) or croak( "Can't open config file '$config_file': $!" );
-	foreach my $str ( <CONFIG> )
-	{
-		next if ( $str =~ /^\s*$/ );
-		next if ( $str =~ /^\s*#/ );
-        my ( $name, $value ) = $str =~ /^\s*([^=\s]+)\s*=\s*(.+?)\s*$/;
-		$name =~ tr/a-z/A-Z/;
-		*{$name} = sub { $value };
-		push( @EXPORT_CONFIG, $name );
-	}
-	close( CONFIG );
-
-	use DBI;
-	my $dbh = DBI->connect( "DBI:mysql:database=".&ZM_DB_NAME.";host=".&ZM_DB_HOST, &ZM_DB_USER, &ZM_DB_PASS );
-	my $sql = "select * from Config";
-	my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute() or croak( "Can't execute: ".$sth->errstr() );
-	while( my $config = $sth->fetchrow_hashref() )
-	{
-		*{$config->{Name}} = sub { $config->{Value} };
-		push( @EXPORT_CONFIG, $config->{Name} );
-	}
-	$sth->finish();
-	$dbh->disconnect();
-}
-
-1;
-__END__
-
-=head1 NAME
-
-ZoneMinder::Config - ZoneMinder configuration module.
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Config qw(:all);
-
-=head1 DESCRIPTION
-
-The ZoneMinder::Config module is used to import the ZoneMinder configuration from the database. It will do this at compile time in a BEGIN block and require access to the zm.conf file either in the current directory or in its defined location in order to determine database access details, configuration from this file will also be included. If the :all or :config tags are used then this configuration is exported into the namespace of the calling program or module.
-
-Once the configuration has been imported then configuration variables are defined as constants and can be accessed directory by name, e.g.
-
- $lang = ZM_LANG_DEFAULT;
-
-=head2 EXPORT
-
-None by default.
-The :constants tag will export the ZM_PID constant which details the location of the zm.pid file
-The :config tag will export all configuration from the database as well as any from the zm.conf file
-The :all tag will export all above symbols.
-
-=head1 SEE ALSO
-
-http://www.zoneminder.com
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/ConfigAdmin.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/ConfigAdmin.pm
@ -1,213 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Config Admin Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the debug definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::ConfigAdmin;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-	'functions' => [ qw(
-		loadConfigFromDB
-		saveConfigToDB
-	) ]
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'functions'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Configuration Administration
-#
-# ==========================================================================
-
-use ZoneMinder::Config qw(:all);
-use ZoneMinder::ConfigData qw(:all);
-
-use Carp;
-
-sub loadConfigFromDB
-{
-	print( "Loading config from DB\n" );
-	my $dbh = DBI->connect( "DBI:mysql:database=".ZM_DB_NAME.";host=".ZM_DB_HOST, ZM_DB_USER, ZM_DB_PASS );
-	
-	if ( !$dbh )
-	{
-		print( "Error: unable to load options from database: $DBI::errstr\n" );
-		return( 0 );
-	}
-	my $sql = "select * from Config";
-	my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute() or croak( "Can't execute: ".$sth->errstr() );
-	my $option_count = 0;
-	while( my $config = $sth->fetchrow_hashref() )
-	{
-		my ( $name, $value ) = ( $config->{Name}, $config->{Value} );
-		#print( "Name = '$name'\n" );
-		my $option = $options_hash{$name};
-		if ( !$option )
-		{
-			warn( "No option '$name' found, removing" );
-			next;
-		}
-		#next if ( $option->{category} eq 'hidden' );
-		if ( defined($value) )
-		{
-			if ( $option->{type} == $types{boolean} )
-			{
-				$option->{value} = $value?"yes":"no";
-			}
-			else
-			{
-				$option->{value} = $value;
-			}
-		}
-		$option_count++;;
-	}
-	$sth->finish();
-	$dbh->disconnect();
-	return( $option_count );
-}
-
-sub saveConfigToDB
-{
-	print( "Saving config to DB\n" );
-	my $dbh = DBI->connect( "DBI:mysql:database=".ZM_DB_NAME.";host=".ZM_DB_HOST, ZM_DB_USER, ZM_DB_PASS );
-
-	if ( !$dbh )
-	{
-		print( "Error: unable to save options to database: $DBI::errstr\n" );
-		return( 0 );
-	}
-	my $sql = "delete from Config";
-	my $res = $dbh->do( $sql ) or croak( "Can't do '$sql': ".$dbh->errstr() );
-
-	$sql = "replace into Config set Id = ?, Name = ?, Value = ?, Type = ?, DefaultValue = ?, Hint = ?, Pattern = ?, Format = ?, Prompt = ?, Help = ?, Category = ?, Readonly = ?, Requires = ?";
-	my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-	foreach my $option ( @options )
-	{
-		#next if ( $option->{category} eq 'hidden' );
-		#print( $option->{name}."\n" ) if ( !$option->{category} );
-		$option->{db_type} = $option->{type}->{db_type};
-		$option->{db_hint} = $option->{type}->{hint};
-		$option->{db_pattern} = $option->{type}->{pattern};
-		$option->{db_format} = $option->{type}->{format};
-		if ( $option->{db_type} eq "boolean" )
-		{
-			$option->{db_value} = ($option->{value} eq "yes")?"1":"0";
-		}
-		else
-		{
-			$option->{db_value} = $option->{value};
-		}
-		if ( my $requires = $option->{requires} )
-		{
-			$option->{db_requires} = join( ";", map { my $value = $_->{value}; $value = ($value eq "yes")?1:0 if ( $options_hash{$_->{name}}->{db_type} eq "boolean" ); ( "$_->{name}=$value" ) } @$requires );
-		}
-		else
-		{
-		}
-		my $res = $sth->execute( $option->{id}, $option->{name}, $option->{db_value}, $option->{db_type}, $option->{default}, $option->{db_hint}, $option->{db_pattern}, $option->{db_format}, $option->{description}, $option->{help}, $option->{category}, $option->{readonly}?1:0, $option->{db_requires} ) or croak( "Can't execute: ".$sth->errstr() );
-	}
-	$sth->finish();
-	$dbh->disconnect();
-}
-
-1;
-__END__
-
-=head1 NAME
-
-ZoneMinder::ConfigAdmin - ZoneMinder Configuration Administration module
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::ConfigAdmin;
-  use ZoneMinder::ConfigAdmin qw(:all);
-
-  loadConfigFromDB();
-  saveConfigToDB();
-
-=head1 DESCRIPTION
-
-The ZoneMinder:ConfigAdmin module contains the master definition of the ZoneMinder configuration options as well as helper methods. This module is intended for specialist confguration management and would not normally be used by end users.
-
-The configuration held in this module, which was previously in zmconfig.pl, includes the name, default value, description, help text, type and category for each option, as well as a number of additional fields in a small number of cases.
-
-=head1 METHODS
-
-=over 4
-
-=item loadConfigFromDB ();
-
-Loads existing configuration from the database (if any) and merges it with the definitions held in this module. This results in the merging of any new configuration and the removal of any deprecated configuration while preserving the existing values of every else.
-
-=item saveConfigToDB ();
-
-Saves configuration held in memory to the database. The act of loading and saving configuration is a convenient way to ensure that the configuration held in the database corresponds with the most recent definitions and that all components are using the same set of configuration.
-
-=head2 EXPORT
-
-None by default.
-The :data tag will export the various configuration data structures
-The :functions tag will export the helper functions.
-The :all tag will export all above symbols.
-
-
-=head1 SEE ALSO
-
-http://www.zoneminder.com
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/ConfigData.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/ConfigData.pm
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Control.pm
@ -1,205 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Base Control Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the base class definitions for the camera control 
-# protocol implementations
-#
-package ZoneMinder::Control;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Base connection class
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-use ZoneMinder::Database qw(:all);
-
-our $AUTOLOAD;
-
-sub new
-{
-	my $class = shift;
-	my $id = shift;
-	my $self = {};
-	$self->{name} = "PelcoD";
-    if ( !defined($id) )
-    {
-        Fatal( "No monitor defined when invoking protocol ".$self->{name} );
-    }
-	$self->{id} = $id;
-	bless( $self, $class );
-	return $self;
-}
-
-sub DESTROY
-{
-}
-
-sub AUTOLOAD
-{
-	my $self = shift;
-	my $class = ref($self) || croak( "$self not object" );
-	my $name = $AUTOLOAD;
-	$name =~ s/.*://;
-	if ( exists($self->{$name}) )
-	{
-		return( $self->{$name} );
-	}
-	croak( "Can't access $name member of object of class $class" );
-}
-
-sub getKey()
-{
-	my $self = shift;
-    return( $self->{id} );
-}
-
-sub open
-{
-	my $self = shift;
-    Fatal( "No open method defined for protocol ".$self->{name} );
-}
-
-sub close
-{
-	my $self = shift;
-    Fatal( "No close method defined for protocol ".$self->{name} );
-}
-
-sub loadMonitor
-{
-    my $self = shift;
-    if ( !$self->{Monitor} )
-    {
-        if ( !($self->{Monitor} = zmDbGetMonitor( $self->{id} )) )
-        {
-            Fatal( "Monitor id ".$self->{id}." not found or not controllable" );
-        }
-        if ( defined($self->{Monitor}->{AutoStopTimeout}) )
-        {
-            # Convert to microseconds.
-            $self->{Monitor}->{AutoStopTimeout} = int(1000000*$self->{Monitor}->{AutoStopTimeout});
-        }
-    }
-}
-
-sub getParam
-{
-    my $self = shift;
-    my $params = shift;
-    my $name = shift;
-    my $default = shift;
-
-    if ( defined($params->{$name}) )
-    {
-        return( $params->{$name} );
-    }
-    elsif ( defined($default) )
-    {
-        return( $default );
-    }
-    Fatal( "Missing mandatory parameter '$name'" );
-}
-
-sub executeCommand
-{
-    my $self = shift;
-    my $params = shift;
-
-    $self->loadMonitor();
-
-    my $command = $params->{command};
-    delete $params->{command};
-
-    #if ( !defined($self->{$command}) )
-    #{
-        #Fatal( "Unsupported command '$command'" );
-    #}
-    &{$self->{$command}}( $self, $params );
-}
-
-sub printMsg()
-{
-	my $self = shift;
-    Fatal( "No printMsg method defined for protocol ".$self->{name} );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/AxisV2.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/AxisV2.pm
@ -1,475 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Axis version 2 API Control Protocol Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the implementation of the Axis V2 API camera control
-# protocol
-#
-package ZoneMinder::Control::AxisV2;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Control;
-
-our @ISA = qw(ZoneMinder::Control);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Axis V2 Control Protocol
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-use ZoneMinder::Config qw(:all);
-
-use Time::HiRes qw( usleep );
-
-sub new
-{
-    my $class = shift;
-    my $id = shift;
-    my $self = ZoneMinder::Control->new( $id );
-    bless( $self, $class );
-    srand( time() );
-    return $self;
-}
-
-our $AUTOLOAD;
-
-sub AUTOLOAD
-{
-    my $self = shift;
-    my $class = ref($self) || croak( "$self not object" );
-    my $name = $AUTOLOAD;
-    $name =~ s/.*://;
-    if ( exists($self->{$name}) )
-    {
-        return( $self->{$name} );
-    }
-    Fatal( "Can't access $name member of object of class $class" );
-}
-
-sub open
-{
-    my $self = shift;
-
-    $self->loadMonitor();
-
-    use LWP::UserAgent;
-    $self->{ua} = LWP::UserAgent->new;
-    $self->{ua}->agent( "ZoneMinder Control Agent/".ZM_VERSION );
-
-    $self->{state} = 'open';
-}
-
-sub close
-{
-    my $self = shift;
-    $self->{state} = 'closed';
-}
-
-sub printMsg
-{
-    my $self = shift;
-    my $msg = shift;
-    my $msg_len = length($msg);
-
-    Debug( $msg."[".$msg_len."]" );
-}
-
-sub sendCmd
-{
-    my $self = shift;
-    my $cmd = shift;
-
-    my $result = undef;
-
-    printMsg( $cmd, "Tx" );
-
-    #print( "http://$address/$cmd\n" );
-    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd" );
-    my $res = $self->{ua}->request($req);
-
-    if ( $res->is_success )
-    {
-        $result = !undef;
-    }
-    else
-    {
-        Error( "Error check failed: '".$res->status_line()."'" );
-    }
-
-    return( $result );
-}
-
-sub cameraReset
-{
-    my $self = shift;
-    Debug( "Camera Reset" );
-    my $cmd = "/axis-cgi/admin/restart.cgi";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConUp
-{
-    my $self = shift;
-    Debug( "Move Up" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=up";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConDown
-{
-    my $self = shift;
-    Debug( "Move Down" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=down";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConLeft
-{
-    my $self = shift;
-    Debug( "Move Left" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=left";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConRight
-{
-    my $self = shift;
-    Debug( "Move Right" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=right";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConUpRight
-{
-    my $self = shift;
-    Debug( "Move Up/Right" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=upright";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConUpLeft
-{
-    my $self = shift;
-    Debug( "Move Up/Left" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=upleft";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConDownRight
-{
-    my $self = shift;
-    Debug( "Move Down/Right" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=downright";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConDownLeft
-{
-    my $self = shift;
-    Debug( "Move Down/Left" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=downleft";
-    $self->sendCmd( $cmd );
-}
-
-sub moveMap
-{
-    my $self = shift;
-    my $params = shift;
-    my $xcoord = $self->getParam( $params, 'xcoord' );
-    my $ycoord = $self->getParam( $params, 'ycoord' );
-    Debug( "Move Map to $xcoord,$ycoord" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?center=$xcoord,$ycoord&imagewidth=".$self->{Monitor}->{Width}."&imageheight=".$self->{Monitor}->{Height};
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelUp
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Up $step" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rtilt=$step";
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelDown
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Down $step" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rtilt=-$step";
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'panstep' );
-    Debug( "Step Left $step" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$step";
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'panstep' );
-    Debug( "Step Right $step" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$step";
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelUpRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Up/Right $tiltstep/$panstep" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$panstep&rtilt=$tiltstep";
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelUpLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Up/Left $tiltstep/$panstep" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$panstep&rtilt=$tiltstep";
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelDownRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Down/Right $tiltstep/$panstep" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$panstep&rtilt=-$tiltstep";
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelDownLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Down/Left $tiltstep/$panstep" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$panstep&rtilt=-$tiltstep";
-    $self->sendCmd( $cmd );
-}
-
-sub zoomRelTele
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Zoom Tele" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rzoom=$step";
-    $self->sendCmd( $cmd );
-}
-
-sub zoomRelWide
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Zoom Wide" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rzoom=-$step";
-    $self->sendCmd( $cmd );
-}
-
-sub focusRelNear
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Focus Near" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=-$step";
-    $self->sendCmd( $cmd );
-}
-
-sub focusRelFar
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Focus Far" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=$step";
-    $self->sendCmd( $cmd );
-}
-
-sub focusAuto
-{
-    my $self = shift;
-    Debug( "Focus Auto" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?autofocus=on";
-    $self->sendCmd( $cmd );
-}
-
-sub focusMan
-{
-    my $self = shift;
-    Debug( "Focus Manual" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?autofocus=off";
-    $self->sendCmd( $cmd );
-}
-
-sub irisRelOpen
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Iris Open" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?riris=$step";
-    $self->sendCmd( $cmd );
-}
-
-sub irisRelClose
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Iris Close" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?riris=-$step";
-    $self->sendCmd( $cmd );
-}
-
-sub irisAuto
-{
-    my $self = shift;
-    Debug( "Iris Auto" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?autoiris=on";
-    $self->sendCmd( $cmd );
-}
-
-sub irisMan
-{
-    my $self = shift;
-    Debug( "Iris Manual" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?autoiris=off";
-    $self->sendCmd( $cmd );
-}
-
-sub presetClear
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Clear Preset $preset" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?removeserverpresetno=$preset";
-    $self->sendCmd( $cmd );
-}
-
-sub presetSet
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Set Preset $preset" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?setserverpresetno=$preset";
-    $self->sendCmd( $cmd );
-}
-
-sub presetGoto
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Goto Preset $preset" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?gotoserverpresetno=$preset";
-    $self->sendCmd( $cmd );
-}
-
-sub presetHome
-{
-    my $self = shift;
-    Debug( "Home Preset" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=home";
-    $self->sendCmd( $cmd );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/Ncs370.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/Ncs370.pm
@ -1,241 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Neu-Fusion Control Protocol Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the implementation of the Neu-Fusion NCS370 IP camera
-# control protocol
-#
-package ZoneMinder::Control::Ncs370;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Control;
-
-our @ISA = qw(ZoneMinder::Control);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Ncs370 IP Control Protocol
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-use ZoneMinder::Config qw(:all);
-
-use Time::HiRes qw( usleep );
-
-sub new
-{
-    my $class = shift;
-    my $id = shift;
-    my $self = ZoneMinder::Control->new( $id );
-    bless( $self, $class );
-    srand( time() );
-    return $self;
-}
-
-our $AUTOLOAD;
-
-sub AUTOLOAD
-{
-    my $self = shift;
-    my $class = ref($self) || croak( "$self not object" );
-    my $name = $AUTOLOAD;
-    $name =~ s/.*://;
-    if ( exists($self->{$name}) )
-    {
-        return( $self->{$name} );
-    }
-    Fatal( "Can't access $name member of object of class $class" );
-}
-
-sub open
-{
-    my $self = shift;
-
-    $self->loadMonitor();
-
-    use LWP::UserAgent;
-    $self->{ua} = LWP::UserAgent->new;
-    $self->{ua}->agent( "ZoneMinder Control Agent/".ZM_VERSION );
-
-    $self->{state} = 'open';
-}
-
-sub close
-{
-    my $self = shift;
-    $self->{state} = 'closed';
-}
-
-sub printMsg
-{
-    my $self = shift;
-    my $msg = shift;
-    my $msg_len = length($msg);
-
-    Debug( $msg."[".$msg_len."]" );
-}
-
-sub sendCmd
-{
-    my $self = shift;
-    my $cmd = shift;
-
-    my $result = undef;
-
-    printMsg( $cmd, "Tx" );
-
-    my $req = HTTP::Request->new( POST=>"http://".$self->{Monitor}->{ControlAddress}."/PANTILTCONTROL.CGI" );
-    my $res = $self->{ua}->request($req);
-
-    if ( $res->is_success )
-    {
-        $result = !undef;
-    }
-    else
-    {
-        Error( "Error check failed: '".$res->status_line()."'" );
-    }
-
-    return( $result );
-}
-
-sub moveConUp
-{
-    my $self = shift;
-    Debug( "Move Up" );
-    my $cmd = "PanSingleMoveDegree=1\nTiltSingleMoveDegree=1\nPanTiltSingleMove=1";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConDown
-{
-    my $self = shift;
-    Debug( "Move Down" );
-    my $cmd = "PanSingleMoveDegree=1\nTiltSingleMoveDegree=1\nPanTiltSingleMove=7";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConLeft
-{
-    my $self = shift;
-    Debug( "Move Left" );
-    my $cmd = "PanSingleMoveDegree=1\nTiltSingleMoveDegree=1\nPanTiltSingleMove=3";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConRight
-{
-    my $self = shift;
-    Debug( "Move Right" );
-    my $cmd = "PanSingleMoveDegree=1\nTiltSingleMoveDegree=1\nPanTiltSingleMove=5";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConUpRight
-{
-    moveConUp();
-    moveConRight();
-}
-
-sub moveConUpLeft
-{
-    moveConUp();
-    moveConLeft();
-}
-
-sub moveConDownRight
-{
-    moveConDown();
-    moveConRight();
-}
-
-sub moveConDownLeft
-{
-    moveConDown();
-    moveConLeft();
-}
-
-sub presetHome
-{
-    my $self = shift;
-    Debug( "Home Preset" );
-    my $cmd = "PanSingleMoveDegree=1\nTiltSingleMoveDegree=1\nPanTiltSingleMove=4";
-    $self->sendCmd( $cmd );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/PanasonicIP.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/PanasonicIP.pm
@ -1,322 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Panasonic IP Control Protocol Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the implementation of the Panasonic IP camera control
-# protocol
-#
-package ZoneMinder::Control::PanasonicIP;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Control;
-
-our @ISA = qw(ZoneMinder::Control);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Panasonic IP Control Protocol
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-use ZoneMinder::Config qw(:all);
-
-use Time::HiRes qw( usleep );
-
-sub new
-{
-    my $class = shift;
-    my $id = shift;
-    my $self = ZoneMinder::Control->new( $id );
-    bless( $self, $class );
-    srand( time() );
-    return $self;
-}
-
-our $AUTOLOAD;
-
-sub AUTOLOAD
-{
-    my $self = shift;
-    my $class = ref($self) || croak( "$self not object" );
-    my $name = $AUTOLOAD;
-    $name =~ s/.*://;
-    if ( exists($self->{$name}) )
-    {
-        return( $self->{$name} );
-    }
-    Fatal( "Can't access $name member of object of class $class" );
-}
-
-sub open
-{
-    my $self = shift;
-
-    $self->loadMonitor();
-
-    use LWP::UserAgent;
-    $self->{ua} = LWP::UserAgent->new;
-    $self->{ua}->agent( "ZoneMinder Control Agent/".ZM_VERSION );
-
-    $self->{state} = 'open';
-}
-
-sub close
-{
-    my $self = shift;
-    $self->{state} = 'closed';
-}
-
-sub printMsg
-{
-    my $self = shift;
-    my $msg = shift;
-    my $msg_len = length($msg);
-
-    Debug( $msg."[".$msg_len."]" );
-}
-
-sub sendCmd
-{
-    my $self = shift;
-    my $cmd = shift;
-
-    my $result = undef;
-
-    printMsg( $cmd, "Tx" );
-
-    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd" );
-    my $res = $self->{ua}->request($req);
-
-    if ( $res->is_success )
-    {
-        $result = !undef;
-    }
-    else
-    {
-        Error( "Error check failed: '".$res->status_line()."'" );
-    }
-
-    return( $result );
-}
-
-sub cameraReset
-{
-    my $self = shift;
-    Debug( "Camera Reset" );
-    my $cmd = "nphRestart?PAGE=Restart&Restart=OK";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConUp
-{
-    my $self = shift;
-    Debug( "Move Up" );
-    my $cmd = "nphControlCamera?Direction=TiltUp";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConDown
-{
-    my $self = shift;
-    Debug( "Move Down" );
-    my $cmd = "nphControlCamera?Direction=TiltDown";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConLeft
-{
-    my $self = shift;
-    Debug( "Move Left" );
-    my $cmd = "nphControlCamera?Direction=PanLeft";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConRight
-{
-    my $self = shift;
-    Debug( "Move Right" );
-    my $cmd = "nphControlCamera?Direction=PanRight";
-    $self->sendCmd( $cmd );
-}
-
-sub moveMap
-{
-    my $self = shift;
-    my $params = shift;
-    my $xcoord = $self->getParam( $params, 'xcoord' );
-    my $ycoord = $self->getParam( $params, 'ycoord' );
-    Debug( "Move Map to $xcoord,$ycoord" );
-    my $cmd = "nphControlCamera?Direction=Direct&NewPosition.x=$xcoord&NewPosition.y=$ycoord&Width=".$self->{Monitor}->{Width}."&Height=".$self->{Monitor}->{Height};
-    $self->sendCmd( $cmd );
-}
-
-sub zoomConTele
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Zoom Tele" );
-    my $cmd = "nphControlCamera?Direction=ZoomTele";
-    $self->sendCmd( $cmd );
-}
-
-sub zoomConWide
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Zoom Wide" );
-    my $cmd = "nphControlCamera?Direction=ZoomWide";
-    $self->sendCmd( $cmd );
-}
-
-sub focusConNear
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Focus Near" );
-    my $cmd = "nphControlCamera?Direction=FocusNear";
-    $self->sendCmd( $cmd );
-}
-
-sub focusConFar
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Focus Far" );
-    my $cmd = "nphControlCamera?Direction=FocusFar";
-    $self->sendCmd( $cmd );
-}
-
-sub focusAuto
-{
-    my $self = shift;
-    Debug( "Focus Auto" );
-    my $cmd = "nphControlCamera?Direction=FocusAuto";
-    $self->sendCmd( $cmd );
-}
-
-sub focusMan
-{
-    my $self = shift;
-    Debug( "Focus Manual" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?autofocus=off";
-    $self->sendCmd( $cmd );
-}
-
-sub presetClear
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Clear Preset $preset" );
-    my $cmd = "nphPresetNameCheck?Data=$preset";
-    $self->sendCmd( $cmd );
-}
-
-sub presetSet
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Set Preset $preset" );
-    my $cmd = "nphPresetNameCheck?PresetName=$preset&Data=$preset";
-    $self->sendCmd( $cmd );
-}
-
-sub presetGoto
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Goto Preset $preset" );
-    my $cmd = "nphControlCamera?Direction=Preset&PresetOperation=Move&Data=$preset";
-    $self->sendCmd( $cmd );
-}
-
-sub presetHome
-{
-    my $self = shift;
-    Debug( "Home Preset" );
-    my $cmd = "nphControlCamera?Direction=HomePosition";
-    $self->sendCmd( $cmd );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/PelcoD.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/PelcoD.pm
@ -1,735 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Pelco-D Control Protocol Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the implementation of the Pelco-D camera control
-# protocol
-#
-package ZoneMinder::Control::PelcoD;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Control;
-
-our @ISA = qw(ZoneMinder::Control);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Pelco-D Control Protocol
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-use Time::HiRes qw( usleep );
-
-use constant SYNC => 0xff;
-use constant COMMAND_GAP => 100000; # In ms
-
-sub new
-{
-    my $class = shift;
-    my $id = shift;
-    my $self = ZoneMinder::Control->new( $id );
-    bless( $self, $class );
-    srand( time() );
-    return $self;
-}
-
-our $AUTOLOAD;
-
-sub AUTOLOAD
-{
-    my $self = shift;
-    my $class = ref($self) || croak( "$self not object" );
-    my $name = $AUTOLOAD;
-    $name =~ s/.*://;
-    if ( exists($self->{$name}) )
-    {
-        return( $self->{$name} );
-    }
-    Fatal( "Can't access $name member of object of class $class" );
-}
-
-sub open
-{
-    my $self = shift;
-
-    $self->loadMonitor();
-
-    use Device::SerialPort;
-    $self->{port} = new Device::SerialPort( $self->{Monitor}->{ControlDevice} );
-    $self->{port}->baudrate(2400);
-    $self->{port}->databits(8);
-    $self->{port}->parity('none');
-    $self->{port}->stopbits(1);
-    $self->{port}->handshake('none');
-
-    $self->{port}->read_const_time(50);
-    $self->{port}->read_char_time(10);
-
-    $self->{state} = 'open';
-}
-
-sub close
-{
-    my $self = shift;
-    $self->{state} = 'closed';
-    $self->{port}->close();
-}
-
-sub printMsg
-{
-    if ( logDebugging() )
-    {
-        my $self = shift;
-        my $msg = shift;
-        my $prefix = shift || "";
-        $prefix = $prefix.": " if ( $prefix );
-
-        my $line_length = 16;
-        my $msg_len = int(@$msg);
-
-        my $msg_str = $prefix;
-        for ( my $i = 0; $i < $msg_len; $i++ )
-        {
-            if ( ($i > 0) && ($i%$line_length == 0) && ($i != ($msg_len-1)) )
-            {
-                $msg_str .= sprintf( "\n%*s", length($prefix), "" );
-            }
-            $msg_str .= sprintf( "%02x ", $msg->[$i] );
-        }
-        $msg_str .= "[".$msg_len."]";
-        Debug( $msg_str );
-    }
-}
-
-sub sendCmd
-{
-    my $self = shift;
-    my $cmd = shift;
-    my $ack = shift || 0;
-
-    my $result = undef;
-
-    my $checksum = 0x00;
-    for ( my $i = 1; $i < int(@$cmd); $i++ )
-    {
-        $checksum += $cmd->[$i];
-        $checksum &= 0xff;
-    }
-    push( @$cmd, $checksum );
-
-    $self->printMsg( $cmd, "Tx" );
-    my $id = $cmd->[0] & 0xf;
-
-    my $tx_msg = pack( "C*", @$cmd );
-
-    #print( "Tx: ".length( $tx_msg )." bytes\n" );
-    my $n_bytes = $self->{port}->write( $tx_msg );
-    if ( !$n_bytes )
-    {
-        Error( "Write failed: $!" );
-    }
-    if ( $n_bytes != length($tx_msg) )
-    {
-        Error( "Incomplete write, only ".$n_bytes." of ".length($tx_msg)." written: $!" );
-    }
-
-    if ( $ack )
-    {
-        Debug( "Waiting for ack" );
-        my $max_wait = 3;
-        my $now = time();
-        while( 1 )
-        {
-            my ( $count, $rx_msg ) = $self->{port}->read(4);
-
-            if ( $count )
-            {
-                #print( "Rx1: ".$count." bytes\n" );
-                my @resp = unpack( "C*", $rx_msg );
-                printMsg( \@resp, "Rx" );
-
-                if ( $resp[0] = 0x80 + ($id<<4) )
-                {
-                    if ( ($resp[1] & 0xf0) == 0x40 )
-                    {
-                        my $socket = $resp[1] & 0x0f;
-                        Debug( "Got ack for socket $socket" );
-                        $result = !undef;
-                    }
-                    else
-                    {
-                        Error( "Got bogus response" );
-                    }
-                    last;
-                }
-                else
-                {
-                    Error( "Got message for camera ".(($resp[0]-0x80)>>4) );
-                }
-            }
-            if ( (time() - $now) > $max_wait )
-            {
-                Warning( "Response timeout" );
-                last;
-            }
-        }
-    }
-}
-
-sub remoteReset
-{
-    my $self = shift;
-    Debug( "Remote Reset" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x0f, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub resetDefaults
-{
-    my $self = shift;
-    Debug( "Reset Defaults" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x29, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub cameraOff
-{
-    my $self = shift;
-    Debug( "Camera Off" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x08, 0x00, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub cameraOn
-{
-    my $self = shift;
-    Debug( "Camera On" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x88, 0x00, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub autoScan
-{
-    my $self = shift;
-    Debug( "Auto Scan" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x90, 0x00, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub manScan
-{
-    my $self = shift;
-    Debug( "Manual Scan" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x10, 0x00, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub stop
-{
-    my $self = shift;
-    Debug( "Stop" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x00, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub moveConUp
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'tiltspeed' );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Up" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x08, 0x00, $speed );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveConDown
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'tiltspeed' );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Down" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x10, 0x00, $speed );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop();
-    }
-}
-
-sub moveConLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'panspeed' );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Left" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x04, $speed, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop();
-    }
-}
-
-sub moveConRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'panspeed' );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Right" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x02, $speed, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop();
-    }
-}
-
-sub moveConUpLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x3f );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x3f );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Up/Left" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x0c, $panspeed, $tiltspeed );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop();
-    }
-}
-
-sub moveConUpRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x3f );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x3f );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Up/Right" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x0a, $panspeed, $tiltspeed );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop();
-    }
-}
-
-sub moveConDownLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x3f );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x3f );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Down/Left" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x14, $panspeed, $tiltspeed );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop();
-    }
-}
-
-sub moveConDownRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x3f );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x3f );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Down/Right" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x12, $panspeed, $tiltspeed );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop();
-    }
-}
-
-sub moveStop
-{
-    my $self = shift;
-    Debug( "Move Stop" );
-    $self->stop();
-}
-
-sub flip180
-{
-    my $self = shift;
-    Debug( "Flip 180" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x07, 0x00, 0x21 );
-    $self->sendCmd( \@msg );
-}
-
-sub zeroPan
-{
-    my $self = shift;
-    Debug( "Zero Pan" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x07, 0x00, 0x22 );
-    $self->sendCmd( \@msg );
-}
-
-sub _setZoomSpeed
-{
-    my $self = shift;
-    my $speed = shift;
-    Debug( "Set Zoom Speed $speed" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x25, 0x00, $speed );
-    $self->sendCmd( \@msg );
-}
-
-sub zoomStop
-{
-    my $self = shift;
-    Debug( "Zoom Stop" );
-    $self->stop();
-    $self->_setZoomSpeed( 0 );
-}
-
-sub zoomConTele
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'speed', 0x01 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Zoom Tele" );
-    $self->_setZoomSpeed( $speed );
-    usleep( COMMAND_GAP );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x20, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->zoomStop();
-    }
-}
-
-sub zoomConWide
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'speed', 0x01 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Zoom Wide" );
-    $self->_setZoomSpeed( $speed );
-    usleep( COMMAND_GAP );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x40, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->zoomStop();
-    }
-}
-
-sub _setFocusSpeed
-{
-    my $self = shift;
-    my $speed = shift;
-    Debug( "Set Focus Speed $speed" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x27, 0x00, $speed );
-    $self->sendCmd( \@msg );
-}
-
-sub focusConNear
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'speed', 0x03 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Focus Near" );
-    $self->_setFocusSpeed( $speed );
-    usleep( COMMAND_GAP );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x01, 0x00, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->_setFocusSpeed( 0 );
-    }
-}
-
-sub focusConFar
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'speed', 0x03 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Focus Far" );
-    $self->_setFocusSpeed( $speed );
-    usleep( COMMAND_GAP );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x80, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->_setFocusSpeed( 0 );
-    }
-}
-
-sub focusStop
-{
-    my $self = shift;
-    Debug( "Focus Stop" );
-    $self->stop();
-    $self->_setFocusSpeed( 0 );
-}
-
-sub focusAuto
-{
-    my $self = shift;
-    Debug( "Focus Auto" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x2b, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub focusMan
-{
-    my $self = shift;
-    Debug( "Focus Man" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x2b, 0x00, 0x02 );
-    $self->sendCmd( \@msg );
-}
-
-sub _setIrisSpeed
-{
-    my $self = shift;
-    my $speed = shift;
-    Debug( "Set Iris Speed $speed" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x27, 0x00, $speed );
-    $self->sendCmd( \@msg );
-}
-
-sub irisConClose
-{
-    my $self = shift;
-    my $params = shift;
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Iris Close" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x04, 0x00, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->_setIrisSpeed( 0 );
-    }
-}
-
-sub irisConOpen
-{
-    my $self = shift;
-    my $params = shift;
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Iris Open" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x02, 0x80, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->_setIrisSpeed( 0 );
-    }
-}
-
-sub irisStop
-{
-    my $self = shift;
-    Debug( "Iris Stop" );
-    $self->stop();
-    $self->_setIrisSpeed( 0 );
-}
-
-sub irisAuto
-{
-    my $self = shift;
-    Debug( "Iris Auto" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x2d, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub irisMan
-{
-    my $self = shift;
-    Debug( "Iris Man" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x2d, 0x00, 0x02 );
-    $self->sendCmd( \@msg );
-}
-
-sub writeScreen
-{
-    my $self = shift;
-    my $params = shift;
-    my $string = $self->getParam( $params, 'string' );
-    Debug( "Writing '$string' to screen" );
-    
-    my @chars = unpack( "C*", $string );
-    for ( my $i = 0; $i < length($string); $i++ )
-    {
-        my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x15, $i, $chars[$i] );
-        $self->sendCmd( \@msg );
-        usleep( COMMAND_GAP );
-    }
-}
-
-sub clearScreen
-{
-    my $self = shift;
-    Debug( "Clear Screen" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x17, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub clearPreset
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset', 1 );
-    Debug( "Clear Preset $preset" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x05, 0x00, $preset );
-    $self->sendCmd( \@msg );
-}
-
-sub presetSet
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset', 1 );
-    Debug( "Set Preset $preset" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x03, 0x00, $preset );
-    $self->sendCmd( \@msg );
-}
-
-sub presetGoto
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset', 1 );
-    Debug( "Goto Preset $preset" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x07, 0x00, $preset );
-    $self->sendCmd( \@msg );
-}
-
-sub presetHome
-{
-    my $self = shift;
-    Debug( "Home Preset" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x07, 0x00, 0x22 );
-    $self->sendCmd( \@msg );
-}
-
-sub reset
-{
-    my $self = shift;
-    Debug( "Reset" );
-    $self->remoteReset();
-    $self->resetDefaults();
-}
-
-sub wake
-{
-    my $self = shift;
-    Debug( "Wake" );
-    $self->cameraOn();
-}
-
-sub sleep
-{
-    my $self = shift;
-    Debug( "Sleep" );
-    $self->cameraOff();
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/Visca.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/Visca.pm
@ -1,668 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Visca Control Protocol Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the implementation of the Visca camera control
-# protocol
-#
-package ZoneMinder::Control::Visca;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Control;
-
-our @ISA = qw(ZoneMinder::Control);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Visca Control Protocol
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-use Time::HiRes qw( usleep );
-
-use constant SYNC => 0xff;
-use constant COMMAND_GAP => 100000; # In ms
-
-sub new
-{
-    my $class = shift;
-    my $id = shift;
-    my $self = ZoneMinder::Control->new( $id );
-    bless( $self, $class );
-    srand( time() );
-    return $self;
-}
-
-our $AUTOLOAD;
-
-sub AUTOLOAD
-{
-    my $self = shift;
-    my $class = ref($self) || croak( "$self not object" );
-    my $name = $AUTOLOAD;
-    $name =~ s/.*://;
-    if ( exists($self->{$name}) )
-    {
-        return( $self->{$name} );
-    }
-    Fatal( "Can't access $name member of object of class $class" );
-}
-
-sub open
-{
-    my $self = shift;
-
-    $self->loadMonitor();
-
-    use Device::SerialPort;
-    $self->{port} = new Device::SerialPort( $self->{Monitor}->{ControlDevice} );
-    $self->{port}->baudrate(9600);
-    $self->{port}->databits(8);
-    $self->{port}->parity('none');
-    $self->{port}->stopbits(1);
-    $self->{port}->handshake('rts');
-    $self->{port}->stty_echo(0);
-
-    #$self->{port}->read_const_time(250);
-    $self->{port}->read_char_time(2);
-
-    $self->{state} = 'open';
-}
-
-sub close
-{
-    my $self = shift;
-    $self->{state} = 'closed';
-    $self->{port}->close();
-}
-
-sub printMsg
-{
-    if ( logDebugging() )
-    {
-        my $self = shift;
-        my $msg = shift;
-        my $prefix = shift || "";
-        $prefix = $prefix.": " if ( $prefix );
-
-        my $line_length = 16;
-        my $msg_len = int(@$msg);
-
-        my $msg_str = $prefix;
-        for ( my $i = 0; $i < $msg_len; $i++ )
-        {
-            if ( ($i > 0) && ($i%$line_length == 0) && ($i != ($msg_len-1)) )
-            {
-                $msg_str .= sprintf( "\n%*s", length($prefix), "" );
-            }
-            $msg_str .= sprintf( "%02x ", $msg->[$i] );
-        }
-        $msg_str .= "[".$msg_len."]";
-        Debug( $msg_str );
-    }
-}
-
-sub sendCmd
-{
-    my $self = shift;
-    my $cmd = shift;
-    my $ack = shift || 0;
-    my $cmp = shift || 0;
-
-    my $result = undef;
-
-    $self->printMsg( $cmd, "Tx" );
-    my $id = $cmd->[0] & 0xf;
-
-    my $tx_msg = pack( "C*", @$cmd );
-
-    #print( "Tx: ".length( $tx_msg )." bytes\n" );
-    my $n_bytes = $self->{port}->write( $tx_msg );
-    if ( !$n_bytes )
-    {
-        Error( "Write failed: $!" );
-    }
-    if ( $n_bytes != length($tx_msg) )
-    {
-        Error( "Incomplete write, only ".$n_bytes." of ".length($tx_msg)." written: $!" );
-    }
-
-    if ( $ack )
-    {
-        Debug( "Waiting for ack" );
-        my $max_wait = 3;
-        my $now = time();
-        while( 1 )
-        {
-            my ( $count, $rx_msg ) = $self->{port}->read(4);
-
-            if ( $count )
-            {
-                #print( "Rx1: ".$count." bytes\n" );
-                my @resp = unpack( "C*", $rx_msg );
-                $self->printMsg( \@resp, "Rx" );
-
-                if ( $resp[0] = 0x80 + ($id<<4) )
-                {
-                    if ( ($resp[1] & 0xf0) == 0x40 )
-                    {
-                        my $socket = $resp[1] & 0x0f;
-                        Debug( "Got ack for socket $socket" );
-                        $result = !undef;
-                    }
-                    else
-                    {
-                        Error( "Got bogus response" );
-                    }
-                    last;
-                }
-                else
-                {
-                    Error( "Got message for camera ".(($resp[0]-0x80)>>4) );
-                }
-            }
-            if ( (time() - $now) > $max_wait )
-            {
-                last;
-            }
-        }
-    }
-
-    if ( $cmp )
-    {
-        Debug( "Waiting for command complete" );
-        my $max_wait = 10;
-        my $now = time();
-        while( 1 )
-        {
-            #print( "Waiting\n" );
-            my ( $count, $rx_msg ) = $self->{port}->read(16);
-
-            if ( $count )
-            {
-                #print( "Rx1: ".$count." bytes\n" );
-                my @resp = unpack( "C*", $rx_msg );
-                $self->printMsg( \@resp, "Rx" );
-
-                if ( $resp[0] = 0x80 + ($id<<4) )
-                {
-                    if ( ($resp[1] & 0xf0) == 0x50 )
-                    {
-                        Debug( "Got command complete" );
-                        $result = !undef;
-                    }
-                    else
-                    {
-                        Error( "Got bogus response" );
-                    }
-                    last;
-                }
-                else
-                {
-                    Error( "Got message for camera ".(($resp[0]-0x80)>>4) );
-                }
-            }
-            if ( (time() - $now) > $max_wait )
-            {
-                last;
-            }
-        }
-    }
-    return( $result );
-}
-
-sub cameraOff
-{
-    my $self = shift;
-    Debug( "Camera Off\n" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x00, 0x0, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub cameraOn
-{
-    my $self = shift;
-    Debug( "Camera On\n" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x00, 0x2, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub stop
-{
-    my $self = shift;
-    Debug( "Stop\n" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, 0x00, 0x00, 0x03, 0x03, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub moveConUp
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Up" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, 0x00, $speed, 0x03, 0x01, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveConDown
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Down" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, 0x00, $speed, 0x03, 0x02, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub movConLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Left" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, $speed, 0x00, 0x01, 0x03, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveConRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Right" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, $speed, 0x00, 0x02, 0x03, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveUpLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Up/Left" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, $panspeed, $tiltspeed, 0x01, 0x01, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveUpRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Up/Right" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, $panspeed, $tiltspeed, 0x02, 0x01, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveDownLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Down/Left" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, $panspeed, $tiltspeed, 0x01, 0x02, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveDownRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Down/Right" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, $panspeed, $tiltspeed, 0x02, 0x02, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveRelUp
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'tiltstep' );
-    my $speed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    Debug( "Step Up" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, 0x00, $speed, 0x00, 0x00, 0x00, 0x00, ($step&0xf000)>>12, ($step&0x0f00)>>8, ($step&0x00f0)>>4, ($step&0x000f)>>0, SYNC );
-
-    $self->sendCmd( \@msg );
-}
-
-sub moveRelDown
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = -$self->getParam( $params, 'tiltstep' );
-    my $speed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    Debug( "Step Down" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, 0x00, $speed, 0x00, 0x00, 0x00, 0x00, ($step&0xf000)>>12, ($step&0x0f00)>>8, ($step&0x00f0)>>4, ($step&0x000f)>>0, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub moveRelLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = -$self->getParam( $params, 'panstep' );
-    my $speed = $self->getParam( $params, 'panspeed', 0x40 );
-    Debug( "Step Left" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, $speed, 0x00, ($step&0xf000)>>12, ($step&0x0f00)>>8, ($step&0x00f0)>>4, ($step&0x000f)>>0, 0x00, 0x00, 0x00, 0x00, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub moveRelRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'panstep' );
-    my $speed = $self->getParam( $params, 'panspeed', 0x40 );
-    Debug( "Step Right" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, $speed, 0x00, ($step&0xf000)>>12, ($step&0x0f00)>>8, ($step&0x00f0)>>4, ($step&0x000f)>>0, 0x00, 0x00, 0x00, 0x00, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub moveRelUpLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = -$self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    Debug( "Step Up/Left" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, $panspeed, $tiltspeed, ($panstep&0xf000)>>12, ($panstep&0x0f00)>>8, ($panstep&0x00f0)>>4, ($panstep&0x000f)>>0, ($tiltstep&0xf000)>>12, ($tiltstep&0x0f00)>>8, ($tiltstep&0x00f0)>>4, ($tiltstep&0x000f)>>0, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub moveRelUpRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    Debug( "Step Up/Right" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, $panspeed, $tiltspeed, ($panstep&0xf000)>>12, ($panstep&0x0f00)>>8, ($panstep&0x00f0)>>4, ($panstep&0x000f)>>0, ($tiltstep&0xf000)>>12, ($tiltstep&0x0f00)>>8, ($tiltstep&0x00f0)>>4, ($tiltstep&0x000f)>>0, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub moveRelDownLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = -$self->getParam( $params, 'panstep' );
-    my $tiltstep = -$self->getParam( $params, 'tiltstep' );
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    Debug( "Step Down/Left" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, $panspeed, $tiltspeed, ($panstep&0xf000)>>12, ($panstep&0x0f00)>>8, ($panstep&0x00f0)>>4, ($panstep&0x000f)>>0, ($tiltstep&0xf000)>>12, ($tiltstep&0x0f00)>>8, ($tiltstep&0x00f0)>>4, ($tiltstep&0x000f)>>0, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub moveRelDownRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = -$self->getParam( $params, 'tiltstep' );
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    Debug( "Step Down/Right" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, $panspeed, $tiltspeed, ($panstep&0xf000)>>12, ($panstep&0x0f00)>>8, ($panstep&0x00f0)>>4, ($panstep&0x000f)>>0, ($tiltstep&0xf000)>>12, ($tiltstep&0x0f00)>>8, ($tiltstep&0x00f0)>>4, ($tiltstep&0x000f)>>0, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub zoomConTele
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'speed', 0x06 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Zoom Tele" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x07, 0x20|$speed, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->zoomStop();
-    }
-}
-
-sub zoomWide
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'speed', 0x06 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Zoom Wide" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x07, 0x30|$speed, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->zoomStop();
-    }
-}
-
-sub zoomStop
-{
-    my $self = shift;
-    my $params = shift;
-    Debug( "Zoom Stop" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x07, 0x00, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub focusConNear
-{
-    my $self = shift;
-    my $params = shift;
-    Debug( "Focus Near" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x08, 0x03, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub focusConFar
-{
-    my $self = shift;
-    my $params = shift;
-    Debug( "Focus Far" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x08, 0x02, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub focusStop
-{
-    my $self = shift;
-    my $params = shift;
-    Debug( "Focus Stop" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x08, 0x00, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub focusAuto
-{
-    my $self = shift;
-    my $params = shift;
-    Debug( "Focus Auto" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x38, 0x02, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub focusMan
-{
-    my $self = shift;
-    my $params = shift;
-    Debug( "Focus Man" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x38, 0x03, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub presetClear
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset', 1 );
-    Debug( "Clear Preset $preset" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x3f, 0x00, $preset, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub presetSet
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset', 1 );
-    Debug( "Set Preset $preset" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x3f, 0x01, $preset, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub presetGoto
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset', 1 );
-    Debug( "Goto Preset $preset" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x3f, 0x02, $preset, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub presetHome
-{
-    my $self = shift;
-    my $params = shift;
-    Debug( "Home Preset" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x04, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/mjpgStreamer.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/mjpgStreamer.pm
@ -1,252 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder mjpg STreamer Control Protocol Module, $Date: 2007-11-04 17:30:29 +0000 (Sun, 04 Nov 2007) $, $Revision: 2229 $
-# Copyright (C) 2003, 2004, 2005, 2006  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the implementation of the mjpg streamer camera control
-# protocol
-#
-package ZoneMinder::Control::mjpgStreamer;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Control;
-
-our @ISA = qw(ZoneMinder::Control);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# mjpgSTreamer Control Protocol
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-use ZoneMinder::Config qw(:all);
-
-use Time::HiRes qw( usleep );
-
-sub new
-{
-    my $class = shift;
-    my $id = shift;
-    my $self = ZoneMinder::Control->new( $id );
-    Debug( "Camera New" );
-    bless( $self, $class );
-    srand( time() );
-    return $self;
-}
-
-our $AUTOLOAD;
-
-sub AUTOLOAD
-{
-    my $self = shift;
-    my $class = ref($self) || croak( "$self not object" );
-    my $name = $AUTOLOAD;
-    Debug( "Camera AUTOLOAD" );
-    $name =~ s/.*://;
-    if ( exists($self->{$name}) )
-    {
-        return( $self->{$name} );
-    }
-    Fatal( "Can't access $name member of object of class $class" );
-}
-
-sub open
-{
-    my $self = shift;
-
-    $self->loadMonitor();
-    Debug( "Camera open" );
-    use LWP::UserAgent;
-    $self->{ua} = LWP::UserAgent->new;
-    $self->{ua}->agent( "ZoneMinder Control Agent/".ZM_VERSION );
-
-    $self->{state} = 'open';
-}
-
-sub close
-{
-    my $self = shift;
-    $self->{state} = 'closed';
-}
-
-sub printMsg
-{
-    my $self = shift;
-    my $msg = shift;
-    my $msg_len = length($msg);
-
-    Debug( $msg."[".$msg_len."]" );
-}
-
-sub sendCmd
-{
-    my $self = shift;
-    my $cmd = shift;
-
-    my $result = undef;
-
-    printMsg( $cmd, "Tx" );
-
-    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd" );
-    my $res = $self->{ua}->request($req);
-
-    if ( $res->is_success )
-    {
-        $result = !undef;
-    }
-    else
-    {
-        Error( "Error check failed: '".$res->status_line()."'" );
-    }
-
-    return( $result );
-}
-
-sub Up
-{
-   my $self = shift;
-   $self->moveConUp();	
-}
-
-sub Down
-{
-   my $self = shift;
-   $self->moveConDown();	
-}
-
-sub Left
-{
-   my $self = shift;
-   $self->moveConLeft();	
-}
-
-sub Right
-{
-   my $self = shift;
-   $self->moveConRight();	
-}
-
-
-sub reset
-{
-   my $self = shift;
-   $self->cameraReset();	
-}
-
-
-
-sub cameraReset
-{
-    my $self = shift;
-    Debug( "Camera Reset" );
-    my $cmd = "?action=command&command=reset_pan_tilt";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConUp
-{
-    my $self = shift;
-    Debug( "Move Up" );
-    my $cmd = "?action=command&command=tilt_minus";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConDown
-{
-    my $self = shift;
-    Debug( "Move Down" );
-    my $cmd = "?action=command&command=tilt_plus";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConLeft
-{
-    my $self = shift;
-    Debug( "Move Left" );
-    my $cmd = "?action=command&command=pan_plus";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConRight
-{
-    my $self = shift;
-    Debug( "Move Right" );
-    my $cmd = "?action=command&command=pan_minus";
-    $self->sendCmd( $cmd );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2005 by Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Database.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Database.pm
@ -1,238 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Database Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the common definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::Database;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-    'functions' => [ qw(
-		zmDbConnect
-		zmDbDisconnect
-		zmDbGetMonitors
-		zmDbGetMonitor
-		zmDbGetMonitorAndControl
-	) ]
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Database Access
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-use ZoneMinder::Config qw(:all);
-
-use Carp;
-
-our $dbh = undef;
-
-sub zmDbConnect( ;$ )
-{
-	my $force = shift;
-	if ( $force )
-	{
-		 zmDbDisconnect();
-	}
-	if ( !defined( $dbh ) )
-	{
-        my ( $host, $port ) = ( ZM_DB_HOST =~ /^([^:]+)(?::(.+))?$/ );
-
-        if ( defined($port) )
-        {
-		    $dbh = DBI->connect( "DBI:mysql:database=".ZM_DB_NAME.";host=".$host.";port=".$port, ZM_DB_USER, ZM_DB_PASS );
-        }
-        else
-        {
-		    $dbh = DBI->connect( "DBI:mysql:database=".ZM_DB_NAME.";host=".ZM_DB_HOST, ZM_DB_USER, ZM_DB_PASS );
-        }
-        $dbh->trace( 0 );
-	}
-	return( $dbh );
-}
-
-sub zmDbDisconnect()
-{
-	if ( defined( $dbh ) )
-	{
-		$dbh->disconnect();
-		$dbh = undef;
-	}
-}
-
-use constant DB_MON_ALL => 0; # All monitors
-use constant DB_MON_CAPT => 1; # All monitors that are capturing
-use constant DB_MON_ACTIVE => 2; # All monitors that are active
-use constant DB_MON_MOTION => 3; # All monitors that are doing motion detection
-use constant DB_MON_RECORD => 4; # All monitors that are doing unconditional recording
-use constant DB_MON_PASSIVE => 5; # All monitors that are in nodect state
-
-sub zmDbGetMonitors( ;$ )
-{
-	zmDbConnect();
-
-	my $function = shift || DB_MON_ALL;
-	my $sql = "select * from Monitors";
-
-	if ( $function )
-	{
-		if ( $function == DB_MON_CAPT )
-		{
-			$sql .= " where Function >= 'Monitor'";
-		}
-		elsif ( $function == DB_MON_ACTIVE )
-		{
-			$sql .= " where Function > 'Monitor'";
-		}
-		elsif ( $function == DB_MON_MOTION )
-		{
-			$sql .= " where Function = 'Modect' or Function = 'Mocord'";
-		}
-		elsif ( $function == DB_MON_RECORD )
-		{
-			$sql .= " where Function = 'Record' or Function = 'Mocord'";
-		}
-		elsif ( $function == DB_MON_PASSIVE )
-		{
-			$sql .= " where Function = 'Nodect'";
-		}
-	}
-	my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute() or croak( "Can't execute '$sql': ".$sth->errstr() );
-
-	my @monitors;
-    while( my $monitor = $sth->fetchrow_hashref() )
-    {
-		push( @monitors, $monitor );
-	}
-	$sth->finish();
-	return( \@monitors );
-}
-
-sub zmDbGetMonitor( $ )
-{
-	zmDbConnect();
-
-	my $id = shift;
-
-	return( undef ) if ( !defined($id) );
-
-	my $sql = "select * from Monitors where Id = ?";
-	my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute( $id ) or croak( "Can't execute '$sql': ".$sth->errstr() );
-    my $monitor = $sth->fetchrow_hashref();
-
-	return( $monitor );
-}
-
-sub zmDbGetMonitorAndControl( $ )
-{
-	zmDbConnect();
-
-	my $id = shift;
-
-	return( undef ) if ( !defined($id) );
-
-    my $sql = "select C.*,M.*,C.Protocol from Monitors as M inner join Controls as C on (M.ControlId = C.Id) where M.Id = ?";
-	my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute( $id ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
-    my $monitor = $sth->fetchrow_hashref();
-
-	return( $monitor );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/General.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/General.pm
@ -1,768 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder General Utility Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the common definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::General;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration   use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-    'functions' => [ qw(
-        executeShellCommand
-        getCmdFormat
-        runCommand
-        setFileOwner
-        getEventPath
-        createEventPath
-        createEvent
-        deleteEventFiles
-        makePath
-        jsonEncode
-        jsonDecode
-    ) ]
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# General Utility Functions
-#
-# ==========================================================================
-
-use ZoneMinder::Config qw(:all);
-use ZoneMinder::Logger qw(:all);
-use ZoneMinder::Database qw(:all);
-
-use POSIX;
-
-# For running general shell commands
-sub executeShellCommand( $ )
-{
-    my $command = shift;
-    my $output = qx( $command );
-    my $status = $? >> 8;
-    if ( $status || logDebugging() )
-    {
-        Debug( "Command: $command\n" );
-        chomp( $output );
-        Debug( "Output: $output\n" );
-    }
-    return( $status );
-}
-
-sub getCmdFormat()
-{
-    Debug( "Testing valid shell syntax\n" );
-
-    my ( $name ) = getpwuid( $> );
-    if ( $name eq ZM_WEB_USER )
-    {
-        Debug( "Running as '$name', su commands not needed\n" );
-        return( "" );
-    }
-
-    my $null_command = "true";
-
-    my $prefix = "sudo -u ".ZM_WEB_USER." ";
-    my $suffix = "";
-    my $command = $prefix.$null_command.$suffix;
-    Debug( "Testing \"$command\"\n" );
-    $command .= " > /dev/null 2>&1"; 
-    my $output = qx($command);
-    my $status = $? >> 8;
-    if ( !$status )
-    {
-        Debug( "Test ok, using format \"$prefix<command>$suffix\"\n" );
-        return( $prefix, $suffix );
-    }
-    else
-    {
-        chomp( $output );
-        Debug( "Test failed, '$output'\n" );
-
-        $prefix = "su ".ZM_WEB_USER." --shell=/bin/sh --command='";
-        $suffix = "'";
-        $command = $prefix.$null_command.$suffix;
-        Debug( "Testing \"$command\"\n" );
-        my $output = qx($command);
-        my $status = $? >> 8;
-        if ( !$status )
-        {
-            Debug( "Test ok, using format \"$prefix<command>$suffix\"\n" );
-            return( $prefix, $suffix );
-        }
-        else
-        {
-            chomp( $output );
-            Debug( "Test failed, '$output'\n" );
-
-            $prefix = "su ".ZM_WEB_USER." -c '";
-            $suffix = "'";
-            $command = $prefix.$null_command.$suffix;
-            Debug( "Testing \"$command\"\n" );
-            $output = qx($command);
-            $status = $? >> 8;
-            if ( !$status )
-            {
-                Debug( "Test ok, using format \"$prefix<command>$suffix\"\n" );
-                return( $prefix, $suffix );
-            }
-            else
-            {
-                chomp( $output );
-                Debug( "Test failed, '$output'\n" );
-            }
-        }
-    }
-    Error( "Unable to find valid 'su' syntax\n" );
-    exit( -1 );
-}
-
-our $testedShellSyntax = 0;
-our ( $cmdPrefix, $cmdSuffix );
-
-# For running ZM daemons etc
-sub runCommand( $ )
-{
-    if ( !$testedShellSyntax )
-    {
-        # Determine the appropriate syntax for the su command
-        ( $cmdPrefix, $cmdSuffix ) = getCmdFormat();
-        $testedShellSyntax = !undef;
-    }
-
-    my $command = shift;
-    $command = ZM_PATH_BIN."/".$command;
-    if ( $cmdPrefix )
-    {
-        $command = $cmdPrefix.$command.$cmdSuffix;
-    }
-    Debug( "Command: $command\n" );
-    my $output = qx($command);
-    my $status = $? >> 8;
-    chomp( $output );
-    if ( $status || logDebugging() )
-    {
-        if ( $status )
-        {
-            Error( "Unable to run \"$command\", output is \"$output\"\n" );
-            exit( -1 );
-        }
-        else
-        {
-            Debug( "Output: $output\n" );
-        }
-    }
-    return( $output );
-}
-
-sub getEventPath( $ )
-{
-    my $event = shift;
-
-    my $event_path = "";
-    if ( ZM_USE_DEEP_STORAGE )
-    {
-        $event_path = ZM_DIR_EVENTS.'/'.$event->{MonitorId}.'/'.strftime( "%y/%m/%d/%H/%M/%S", localtime($event->{Time}) );
-    }
-    else
-    {
-        $event_path = ZM_DIR_EVENTS.'/'.$event->{MonitorId}.'/'.$event->{Id};
-    }
-    $event_path = ZM_PATH_WEB.'/'.$event_path if ( index(ZM_DIR_EVENTS,'/') != 0 );
-    return( $event_path );
-}
-
-sub createEventPath( $ )
-{
-    #
-    # WARNING assumes running from events directory
-    #
-    my $event = shift;
-    my $eventRootPath = (ZM_DIR_EVENTS=~m|/|)?ZM_DIR_EVENTS:(ZM_PATH_WEB.'/'.ZM_DIR_EVENTS);
-    my $eventPath = $eventRootPath.'/'.$event->{MonitorId};
-
-    if ( ZM_USE_DEEP_STORAGE )
-    {
-        my @startTime = localtime( $event->{StartTime} );
-
-        my @datetimeParts = ();
-        $datetimeParts[0] = sprintf( "%02d", $startTime[5]-100 );
-        $datetimeParts[1] = sprintf( "%02d", $startTime[4]+1 );
-        $datetimeParts[2] = sprintf( "%02d", $startTime[3] );
-        $datetimeParts[3] = sprintf( "%02d", $startTime[2] );
-        $datetimeParts[4] = sprintf( "%02d", $startTime[1] );
-        $datetimeParts[5] = sprintf( "%02d", $startTime[0] );
-
-        my $datePath = join('/',@datetimeParts[0..2]);
-        my $timePath = join('/',@datetimeParts[3..5]);
-
-        makePath( $datePath, $eventPath );
-        $eventPath .= '/'.$datePath;
-
-        # Create event id symlink
-        my $idFile = sprintf( "%s/.%d", $eventPath, $event->{Id} );
-        symlink( $timePath, $idFile ) or Fatal( "Can't symlink $idFile -> $eventPath: $!" );
-
-        makePath( $timePath, $eventPath );
-        $eventPath .= '/'.$timePath;
-        setFileOwner( $idFile ); # Must come after directory has been created
-
-        # Create empty id tag file
-        $idFile = sprintf( "%s/.%d", $eventPath, $event->{Id} );
-        open( ID_FP, ">$idFile" ) or Fatal( "Can't open $idFile: $!" );
-        close( ID_FP );
-        setFileOwner( $idFile );
-    }
-    else
-    {
-        makePath( $event->{Id}, $eventPath );
-        $eventPath .= '/'.$event->{Id};
-
-        my $idFile = sprintf( "%s/.%d", $eventPath, $event->{Id} );
-        open( ID_FP, ">$idFile" ) or Fatal( "Can't open $idFile: $!" );
-        close( ID_FP );
-        setFileOwner( $idFile );
-    }
-    return( $eventPath );
-}
-
-use Data::Dumper;
-
-our $_setFileOwner = undef;
-our ( $_ownerUid, $_ownerGid );
-
-sub _checkProcessOwner()
-{
-    if ( !defined($_setFileOwner) )
-    {
-        my ( $processOwner ) = getpwuid( $> );
-        if ( $processOwner ne ZM_WEB_USER )
-        {
-            # Not running as web user, so should be root in whch case chown the temporary directory
-            ( my $ownerName, my $ownerPass, $_ownerUid, $_ownerGid ) = getpwnam( ZM_WEB_USER ) or Fatal( "Can't get user details for web user '".ZM_WEB_USER."': $!" );
-            $_setFileOwner = 1;
-        }
-        else
-        {
-            $_setFileOwner = 0;
-        }
-    }
-    return( $_setFileOwner );
-}
-
-sub setFileOwner( $ )
-{
-    my $file = shift;
-
-    if ( _checkProcessOwner() )
-    {
-        chown( $_ownerUid, $_ownerGid, $file ) or Fatal( "Can't change ownership of file '$file' to '".ZM_WEB_USER.":".ZM_WEB_GROUP."': $!" );
-    }
-}
-
-our $_hasImageInfo = undef;
-
-sub _checkForImageInfo()
-{
-    if ( !defined($_hasImageInfo) )
-    {
-        my $result = eval
-        {
-            require Image::Info;
-            Image::Info->import();
-        };
-        $_hasImageInfo = $@?0:1;
-    }
-    return( $_hasImageInfo );
-}
-
-sub createEvent( $;$ )
-{
-    my $event = shift;
-
-    Debug( "Creating event" );
-    #print( Dumper( $event )."\n" );
-
-    _checkForImageInfo();
-
-    my $dbh = zmDbConnect();
-
-    if ( $event->{monitor} )
-    {
-        $event->{MonitorId} = $event->{monitor}->{Id};
-    }
-    elsif ( $event->{MonitorId} )
-    {
-        my $sql = "select * from Monitors where Id = ?";
-        my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $event->{MonitorId} ) or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
-        $event->{monitor} = $sth->fetchrow_hashref() or Fatal( "Unable to create event, can't load monitor with id '".$event->{MonitorId}."'" );
-        $sth->finish();
-    }
-    else
-    {
-        Fatal( "Unable to create event, no monitor or monitor id supplied" );
-    }
-    $event->{Name} = "New Event" unless( $event->{Name} );
-    $event->{Frames} = int(@{$event->{frames}});
-    $event->{TotScore} = $event->{MaxScore} = 0;
-
-    my $lastTimestamp = 0.0;
-    foreach my $frame ( @{$event->{frames}} )
-    {
-        if ( !$event->{Width} )
-        {
-            if ( $_hasImageInfo )
-            {
-                my $imageInfo = Image::Info::image_info( $frame->{imagePath} );
-                if ( $imageInfo->{error} )
-                {
-                    Error( "Unable to extract image info from '".$frame->{imagePath}."': ".$imageInfo->{error} );
-                }
-                else
-                {
-                    ( $event->{Width}, $event->{Height} ) = Image::Info::dim( $imageInfo );
-                }
-            }
-        }
-        $frame->{Type} = $frame->{Score}>0?'Alarm':'Normal' unless( $frame->{Type} );
-        $frame->{Delta} = $lastTimestamp?($frame->{TimeStamp}-$lastTimestamp):0.0;
-        $event->{StartTime} = $frame->{TimeStamp} unless ( $event->{StartTime} );
-        $event->{TotScore} += $frame->{Score};
-        $event->{MaxScore} = $frame->{Score} if ( $frame->{Score} > $event->{MaxScore} );
-        $event->{AlarmFrames}++ if ( $frame->{Type} eq 'Alarm' );
-        $event->{EndTime} = $frame->{TimeStamp};
-        $lastTimestamp = $frame->{TimeStamp};
-    }
-    $event->{Width} = $event->{monitor}->{Width} unless( $event->{Width} );
-    $event->{Height} = $event->{monitor}->{Height} unless( $event->{Height} );
-    $event->{AvgScore} = $event->{TotScore}/int($event->{AlarmFrames});
-    $event->{Length} = $event->{EndTime} - $event->{StartTime};
-
-    my %formats = (
-        StartTime => 'from_unixtime(?)',
-        EndTime => 'from_unixtime(?)',
-    );
-
-    my ( @fields, @formats, @values );
-    while ( my ( $field, $value ) = each( %$event ) )
-    {
-        next unless $field =~ /^[A-Z]/;
-        push( @fields, $field );
-        push( @formats, ($formats{$field} or '?') );
-        push( @values, $event->{$field} );
-    }
-
-    my $sql = "insert into Events (".join(',',@fields).") values (".join(',',@formats).")";
-    my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute( @values ) or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
-    $event->{Id} = $dbh->{mysql_insertid};
-    Info( "Created event ".$event->{Id} );
-
-    if ( $event->{EndTime} )
-    {
-        $event->{Name} = $event->{monitor}->{EventPrefix}.$event->{Id} if ( $event->{Name} eq 'New Event' );
-        my $sql = "update Events set Name = ? where Id = ?";
-        my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $event->{Name}, $event->{Id} ) or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
-    }
-
-    my $eventPath = createEventPath( $event );
-
-    my %frameFormats = (
-        TimeStamp => 'from_unixtime(?)',
-    );
-    my $frameId = 1;
-    foreach my $frame ( @{$event->{frames}} )
-    {
-        $frame->{EventId} = $event->{Id};
-        $frame->{FrameId} = $frameId++;
-
-        my ( @fields, @formats, @values );
-        while ( my ( $field, $value ) = each( %$frame ) )
-        {
-            next unless $field =~ /^[A-Z]/;
-            push( @fields, $field );
-            push( @formats, ($frameFormats{$field} or '?') );
-            push( @values, $frame->{$field} );
-        }
-
-        my $sql = "insert into Frames (".join(',',@fields).") values (".join(',',@formats).")";
-        my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( @values ) or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
-        #$frame->{FrameId} = $dbh->{mysql_insertid};
-        if ( $frame->{imagePath} )
-        {
-            $frame->{capturePath} = sprintf( "%s/%0".ZM_EVENT_IMAGE_DIGITS."d-capture.jpg", $eventPath, $frame->{FrameId} );
-            rename( $frame->{imagePath}, $frame->{capturePath} ) or Fatal( "Can't copy ".$frame->{imagePath}." to ".$frame->{capturePath}.": $!" );
-            setFileOwner( $frame->{capturePath} );
-            if ( 0 && ZM_CREATE_ANALYSIS_IMAGES )
-            {
-                $frame->{analysePath} = sprintf( "%s/%0".ZM_EVENT_IMAGE_DIGITS."d-analyse.jpg", $eventPath, $frame->{FrameId} );
-                link( $frame->{capturePath}, $frame->{analysePath} ) or Fatal( "Can't link ".$frame->{capturePath}." to ".$frame->{analysePath}.": $!" );
-                setFileOwner( $frame->{analysePath} );
-            }
-        }
-    }
-}
-
-sub addEventImage( $$ )
-{
-    my $event = shift;
-    my $frame = shift;
-
-    # TBD
-}
-
-sub updateEvent( $ )
-{
-    my $event = shift;
-
-    if ( !$event->{EventId} )
-    {
-        Error( "Unable to update event, no event id supplied" );
-        return( 0 );
-    }
-
-    my $dbh = zmDbConnect();
-
-    $event->{Name} = $event->{monitor}->{EventPrefix}.$event->{Id} if ( $event->{Name} eq 'New Event' );
-
-    my %formats = (
-        StartTime => 'from_unixtime(?)',
-        EndTime => 'from_unixtime(?)',
-    );
-
-    my ( @values, @sets );
-    while ( my ( $field, $value ) = each( %$event ) )
-    {
-        next if ( $field eq 'Id' );
-        push( @values, $event->{$field} );
-        push( @sets, $field." = ".($formats{$field} or '?') );
-    }
-    my $sql = "update Events set ".join(',',@sets)." where Id = ?";
-    push( @values, $event->{Id} );
-
-    my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute( @values ) or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
-}
-
-sub deleteEventFiles( $;$ )
-{
-    #
-    # WARNING assumes running from events directory
-    #
-    my $event_id = shift;
-    my $monitor_id = shift;
-    $monitor_id = '*' if ( !defined($monitor_id) );
-
-    if ( ZM_USE_DEEP_STORAGE )
-    {
-        my $link_path = $monitor_id."/*/*/*/.".$event_id;
-        #Debug( "LP1:$link_path" );
-        my @links = glob($link_path);
-        #Debug( "L:".$links[0].": $!" );
-        if ( @links )
-        {
-            ( $link_path ) = ( $links[0] =~ /^(.*)$/ ); # De-taint
-            #Debug( "LP2:$link_path" );
-
-            ( my $day_path = $link_path ) =~ s/\.\d+//;
-            #Debug( "DP:$day_path" );
-            my $event_path = $day_path.readlink( $link_path );
-            ( $event_path ) = ( $event_path =~ /^(.*)$/ ); # De-taint
-            #Debug( "EP:$event_path" );
-            my $command = "/bin/rm -rf ".$event_path;
-            #Debug( "C:$command" );
-            executeShellCommand( $command );
-
-            unlink( $link_path ) or Error( "Unable to unlink '$link_path': $!" );
-            my @path_parts = split( /\//, $event_path );
-            for ( my $i = int(@path_parts)-2; $i >= 1; $i-- )
-            {
-                my $delete_path = join( '/', @path_parts[0..$i] );
-                #Debug( "DP$i:$delete_path" );
-                my @has_files = glob( $delete_path."/*" );
-                #Debug( "HF1:".$has_files[0] ) if ( @has_files );
-                last if ( @has_files );
-                @has_files = glob( $delete_path."/.[0-9]*" );
-                #Debug( "HF2:".$has_files[0] ) if ( @has_files );
-                last if ( @has_files );
-                my $command = "/bin/rm -rf ".$delete_path;
-                executeShellCommand( $command );
-            }
-        }
-    }
-    else
-    {
-        my $command = "/bin/rm -rf $monitor_id/$event_id";
-        executeShellCommand( $command );
-    }
-}
-
-sub makePath( $;$ )
-{
-    my $path = shift;
-    my $root = shift;
-    $root = (( $path =~ m|^/| )?'':'.' ) unless( $root );
-
-    Debug( "Creating path '$path' in $root'\n" );
-    my @parts = split( '/', $path );
-    my $fullPath = $root;
-    foreach my $dir ( @parts )
-    {
-        $fullPath .= '/'.$dir;
-        if ( !-d $fullPath )
-        {
-            if ( -e $fullPath )
-            {
-                Fatal( "Can't create '$fullPath', already exists as non directory" );
-            }
-            else
-            {
-                Debug( "Creating '$fullPath'\n" );
-                mkdir( $fullPath, 0755 ) or Fatal( "Can't mkdir '$fullPath': $!" );
-                setFileOwner( $fullPath );
-            }
-        }
-    }
-    return( $fullPath );
-}
-
-our $testedJSON = 0;
-our $hasJSONAny = 0;
-
-sub _testJSON
-{
-    return if ( $testedJSON );
-    my $result = eval
-    {
-        require JSON::Any;
-        JSON::Any->import();
-    };
-    $testedJSON = 1;
-    $hasJSONAny = 1 if ( $result );
-}
-
-sub _getJSONType( $ )
-{
-    my $value = shift;
-    return( 'null' ) unless( defined($value) );
-    return( 'integer' ) if ( $value =~ /^\d+$/ );
-    return( 'double' ) if ( $value =~ /^\d+$/ );
-    return( 'hash' ) if ( ref($value) eq 'HASH' );
-    return( 'array' ) if ( ref($value) eq 'ARRAY' );
-    return( 'string' );
-}
-
-sub jsonEncode( $ );
-
-sub jsonEncode( $ )
-{
-    my $value = shift;
-
-    _testJSON();
-    if ( $hasJSONAny )
-    {
-        my $string = eval { JSON::Any->objToJson( $value ) };
-        Fatal( "Unable to encode object to JSON: $@" ) unless( $string );
-        return( $string );
-    }
-
-    my $type = _getJSONType($value);
-    if ( $type eq 'integer' || $type eq 'double' )
-    {
-        return( $value );
-    }
-    elsif ( $type eq 'boolean' )
-    {
-        return( $value?'true':'false' );
-    }
-    elsif ( $type eq 'string' )
-    {
-        $value =~ s|(["\\/])|\\$1|g;
-        $value =~ s|\r?\n|\n|g;
-        return( '"'.$value.'"' );
-    }
-    elsif ( $type eq 'null' )
-    {
-        return( 'null' );
-    }
-    elsif ( $type eq 'array' )
-    {
-        return( '['.join( ',', map { jsonEncode( $_ ) } @$value ).']' );
-    }
-    elsif ( $type eq 'hash' )
-    {
-        my $result = '{';
-        while ( my ( $subKey=>$subValue ) = each( %$value ) )
-        {
-            $result .= ',' if ( $result ne '{' );
-            $result .= '"'.$subKey.'":'.jsonEncode( $subValue );
-        }
-        return( $result.'}' );
-    }
-    else
-    {
-        Fatal( "Unexpected type '$type'" );
-    }
-}
-
-sub jsonDecode( $ )
-{
-    my $value = shift;
-
-    _testJSON();
-    if ( $hasJSONAny )
-    {
-        my $object = eval { JSON::Any->jsonToObj( $value ) };
-        Fatal( "Unable to decode JSON string '$value': $@" ) unless( $object );
-        return( $object );
-    }
-
-    my $comment = 0;
-    my $unescape = 0;
-    my $out = '';
-    my @chars = split( //, $value );
-    for ( my $i = 0; $i < @chars; $i++ )
-    {
-        if ( !$comment )
-        {
-            if ( $chars[$i] eq ':' )
-            {
-                $out .= '=>';
-            }
-            else
-            {
-                $out .= $chars[$i];         
-            }
-        }
-        elsif ( !$unescape )
-        {
-            if ( $chars[$i] eq '\\' )
-            {
-                $unescape = 1;
-            }
-            else
-            {
-                $out .= $chars[$i];
-            }
-        }
-        else
-        {
-            if ( $chars[$i] ne '/' )
-            {
-                $out .= '\\';
-            }
-            $out .= $chars[$i];
-            $unescape = 0;
-        }
-        if ( $chars[$i] eq '"' )
-        {
-            $comment = !$comment;
-        }
-    }
-    $out =~ s/=>true/=>1/g;
-    $out =~ s/=>false/=>0/g;
-    $out =~ s/=>null/=>undef/g;
-    $out =~ s/`/'/g;
-    $out =~ s/qx/qq/g;
-    ( $out ) = $out =~ m/^({.+})$/; # Detaint and check it's a valid object syntax
-    my $result = eval $out;
-    Fatal( $@ ) if ( $@ );
-    return( $result );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Logger.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Logger.pm
@ -1,861 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Logger Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the debug definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::Logger;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration   use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-    'constants' => [ qw(
-        DEBUG
-        INFO
-        WARNING
-        ERROR
-        FATAL
-        PANIC
-        NOLOG
-    ) ],
-    'functions' => [ qw(
-        logInit
-        logReinit
-        logTerm
-        logSetSignal
-        logClearSignal
-        logDebugging
-        logLevel
-        logTermLevel
-        logDatabaseLevel
-        logFileLevel
-        logSyslogLevel
-        Mark
-        Dump
-        Debug
-        Info
-        Warning
-        Error
-        Fatal
-        Panic
-    ) ]
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Logger Facilities
-#
-# ==========================================================================
-
-use ZoneMinder::Config qw(:all);
-
-use DBI;
-use Carp;
-use POSIX;
-use IO::Handle;
-use Data::Dumper;
-use Time::HiRes qw/gettimeofday/;
-use Sys::Syslog;
-
-use constant {
-    DEBUG => 1,
-    INFO => 0,
-    WARNING => -1,
-    ERROR => -2,
-    FATAL => -3,
-    PANIC => -4,
-    NOLOG => -5
-};
-
-our %codes = (
-    &DEBUG => "DBG",
-    &INFO => "INF",
-    &WARNING => "WAR",
-    &ERROR => "ERR",
-    &FATAL => "FAT",
-    &PANIC => "PNC",
-    &NOLOG => "OFF"
-);
-
-our %priorities = (
-    &DEBUG => "debug",
-    &INFO => "info",
-    &WARNING => "warning",
-    &ERROR => "err",
-    &FATAL => "err",
-    &PANIC => "err"
-);
-
-our $logger;
-
-sub new
-{
-    my $class = shift;
-    my $this = {};
-
-    $this->{initialised} = undef;
-
-    #$this->{id} = "zmundef";
-    ( $this->{id} ) = $0 =~ m|^(?:.*/)?([^/]+?)(?:\.[^/.]+)?$|;
-    $this->{idRoot} = $this->{id};
-    $this->{idArgs} = "";
-
-    $this->{level} = INFO;
-    $this->{termLevel} = NOLOG;
-    $this->{databaseLevel} = NOLOG;
-    $this->{fileLevel} = NOLOG;
-    $this->{syslogLevel} = NOLOG;
-    $this->{effectiveLevel} = INFO;
-
-    $this->{autoFlush} = 1;
-    $this->{hasTerm} = -t STDERR;
-
-    ( $this->{fileName} = $0 ) =~ s|^.*/||;
-    $this->{logPath} = ZM_PATH_LOGS;
-    $this->{logFile} = $this->{logPath}."/".$this->{id}.".log";
-
-    $this->{trace} = 0;
-
-    bless( $this, $class );
-    return $this;
-}
-
-sub BEGIN
-{
-    # Fake the config variables that are used in case they are not defined yet
-    # Only really necessary to support upgrade from previous version
-    if ( !eval('defined(ZM_LOG_DEBUG)') )
-    {
-        no strict 'subs';
-        no strict 'refs';
-        my %dbgConfig = (
-            ZM_LOG_LEVEL_DATABASE => 0,
-            ZM_LOG_LEVEL_FILE => 0,
-            ZM_LOG_LEVEL_SYSLOG => 0,
-            ZM_LOG_DEBUG => 0,
-            ZM_LOG_DEBUG_TARGET => "",
-            ZM_LOG_DEBUG_LEVEL => 1,
-            ZM_LOG_DEBUG_FILE => "" 
-        );
-        while ( my ( $name, $value ) = each( %dbgConfig ) )
-        {
-            *{$name} = sub { $value };
-        }
-        use strict 'subs';
-        use strict 'refs';
-    }
-}
-
-sub DESTROY
-{
-    my $this = shift;
-    $this->terminate();
-}
-
-sub initialise( @ )
-{
-    my $this = shift;
-    my %options = @_;
-
-    $this->{id} = $options{id} if ( defined($options{id}) );
-
-    $this->{logPath} = $options{logPath} if ( defined($options{logPath}) );
-
-    my $tempLogFile;
-    $tempLogFile = $this->{logPath}."/".$this->{id}.".log";
-    $tempLogFile = $options{logFile} if ( defined($options{logFile}) );
-    if ( my $logFile = $this->getTargettedEnv('LOG_FILE') )
-    {
-        $tempLogFile = $logFile;
-    }
-
-    my $tempLevel = INFO;
-    my $tempTermLevel = $this->{termLevel};
-    my $tempDatabaseLevel = $this->{databaseLevel};
-    my $tempFileLevel = $this->{fileLevel};
-    my $tempSyslogLevel = $this->{syslogLevel};
-
-    $tempTermLevel = $options{termLevel} if ( defined($options{termLevel}) );
-    if ( defined($options{databaseLevel}) )
-    {
-        $tempDatabaseLevel = $options{databaseLevel};
-    }
-    else
-    {
-        $tempDatabaseLevel = ZM_LOG_LEVEL_DATABASE;
-    }
-    if ( defined($options{fileLevel}) )
-    {
-        $tempFileLevel = $options{fileLevel};
-    }
-    else
-    {
-        $tempFileLevel = ZM_LOG_LEVEL_FILE;
-    }
-    if ( defined($options{syslogLevel}) )
-    {
-        $tempSyslogLevel = $options{syslogLevel};
-    }
-    else
-    {
-        $tempSyslogLevel = ZM_LOG_LEVEL_SYSLOG;
-    }
-
-    if ( defined($ENV{'LOG_PRINT'}) )
-    {
-        $tempTermLevel = $ENV{'LOG_PRINT'}? DEBUG : NOLOG;
-    }
-
-    my $level;
-    $tempLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL')) );
-
-    $tempTermLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_TERM')) );
-    $tempDatabaseLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_DATABASE')) );
-    $tempFileLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_FILE')) );
-    $tempSyslogLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_SYSLOG')) );
-
-    if ( ZM_LOG_DEBUG )
-    {
-        foreach my $target ( split( /\|/, ZM_LOG_DEBUG_TARGET ) )
-        {
-            if ( $target eq $this->{id} || $target eq "_".$this->{id} || $target eq $this->{idRoot} || $target eq "_".$this->{idRoot} || $target eq "" )
-            {
-                if ( ZM_LOG_DEBUG_LEVEL > NOLOG )
-                {
-                    $tempLevel = $this->limit( ZM_LOG_DEBUG_LEVEL );
-                    if ( ZM_LOG_DEBUG_FILE ne "" )
-                    {
-                        $tempLogFile = ZM_LOG_DEBUG_FILE;
-                        $tempFileLevel = $tempLevel;
-                    }
-                }
-            }
-        }
-    }
-
-    $this->logFile( $tempLogFile );
-
-    $this->termLevel( $tempTermLevel );
-    $this->databaseLevel( $tempDatabaseLevel );
-    $this->fileLevel( $tempFileLevel );
-    $this->syslogLevel( $tempSyslogLevel );
-
-    $this->level( $tempLevel );
-
-    $this->{trace} = $options{trace} if ( defined($options{trace}) );
-
-    $this->{autoFlush} = $ENV{'LOG_FLUSH'}?1:0 if ( defined($ENV{'LOG_FLUSH'}) );
-
-    $this->{initialised} = !undef;
-    
-    Debug( "LogOpts: level=".$codes{$this->{level}}."/".$codes{$this->{effectiveLevel}}.", screen=".$codes{$this->{termLevel}}.", database=".$codes{$this->{databaseLevel}}.", logfile=".$codes{$this->{fileLevel}}."->".$this->{logFile}.", syslog=".$codes{$this->{syslogLevel}} );
-}
-
-sub terminate()
-{
-    my $this = shift;
-    return unless ( $this->{initialised} );
-    $this->syslogLevel( NOLOG );
-    $this->fileLevel( NOLOG );
-    $this->databaseLevel( NOLOG );
-    $this->termLevel( NOLOG );
-}
-
-sub reinitialise()
-{
-    my $this = shift;
-
-    return unless ( $this->{initialised} );
-
-    # Bit of a nasty hack to reopen connections to log files and the DB
-    my $syslogLevel = $this->syslogLevel();
-    $this->syslogLevel( NOLOG );
-    my $logfileLevel = $this->fileLevel();
-    $this->fileLevel( NOLOG );
-    my $databaseLevel = $this->databaseLevel();
-    $this->databaseLevel( NOLOG );
-    my $screenLevel = $this->termLevel();
-    $this->termLevel( NOLOG );
-
-    $this->syslogLevel( $syslogLevel ) if ( $syslogLevel > NOLOG );
-    $this->fileLevel( $logfileLevel ) if ( $logfileLevel > NOLOG );
-    $this->databaseLevel( $databaseLevel ) if ( $databaseLevel > NOLOG );
-    $this->databaseLevel( $databaseLevel ) if ( $databaseLevel > NOLOG );
-}
-
-sub limit( $ )
-{
-    my $this = shift;
-    my $level = shift;
-    return( DEBUG ) if ( $level > DEBUG );
-    return( NOLOG ) if ( $level < NOLOG );
-    return( $level );
-}
-
-sub getTargettedEnv( $ )
-{
-    my $this = shift;
-    my $name = shift;
-    my $envName = $name."_".$this->{id};
-    my $value;
-    $value = $ENV{$envName} if ( defined($ENV{$envName}) );
-    if ( !defined($value) && $this->{id} ne $this->{idRoot} )
-    {
-        $envName = $name."_".$this->{idRoot};
-        $value = $ENV{$envName} if ( defined($ENV{$envName}) );
-    }
-    if ( !defined($value) )
-    {
-        $value = $ENV{$name} if ( defined($ENV{$name}) );
-    }
-    if ( defined($value) )
-    {
-        ( $value ) = $value =~ m/(.*)/;
-    }
-    return( $value );
-}
-
-sub fetch()
-{
-    if ( !$logger )
-    {
-        $logger = ZoneMinder::Logger->new();
-        $logger->initialise( 'syslogLevel'=>INFO, 'databaseLevel'=>INFO );
-    }
-    return( $logger );
-}
-
-sub id( ;$ )
-{
-    my $this = shift;
-    my $id = shift;
-    if ( defined($id) && $this->{id} ne $id )
-    {
-        # Remove whitespace
-        $id =~ s/\S//g;
-        # Replace non-alphanum with underscore
-        $id =~ s/[^a-zA-Z_]/_/g;
-
-        if ( $this->{id} ne $id )
-        {
-            $this->{id} = $this->{idRoot} = $id;
-            if ( $id =~ /^([^_]+)_(.+)$/ )
-            {
-                $this->{idRoot} = $1;
-                $this->{idArgs} = $2;
-            }
-        }
-    }
-    return( $this->{id} );
-}
-
-sub level( ;$ )
-{
-    my $this = shift;
-    my $level = shift;
-    if ( defined($level) )
-    {
-        $this->{level} = $this->limit( $level );
-        $this->{effectiveLevel} = NOLOG;
-        $this->{effectiveLevel} = $this->{termLevel} if ( $this->{termLevel} > $this->{effectiveLevel} );
-        $this->{effectiveLevel} = $this->{databaseLevel} if ( $this->{databaseLevel} > $this->{effectiveLevel} );
-        $this->{effectiveLevel} = $this->{fileLevel} if ( $this->{fileLevel} > $this->{effectiveLevel} );
-        $this->{effectiveLevel} = $this->{syslogLevel} if ( $this->{syslogLevel} > $this->{level} );
-        $this->{effectiveLevel} = $this->{level} if ( $this->{effectiveLevel} > $this->{level} );
-    }
-    return( $this->{level} );
-}
-
-sub debugOn()
-{
-    my $this = shift;
-    return( $this->{effectiveLevel} >= DEBUG );
-}
-
-sub trace( ;$ )
-{
-    my $this = shift;
-    $this->{trace} = $_[0] if ( @_ );
-    return( $this->{trace} );
-}
-
-sub termLevel( ;$ )
-{
-    my $this = shift;
-    my $termLevel = shift;
-    if ( defined($termLevel) )
-    {
-        $termLevel = NOLOG if ( !$this->{hasTerm} );
-        $termLevel = $this->limit( $termLevel );
-        if ( $this->{termLevel} != $termLevel )
-        {
-            $this->{termLevel} = $termLevel;
-        }
-    }
-    return( $this->{termLevel} );
-}
-
-sub databaseLevel( ;$ )
-{
-    my $this = shift;
-    my $databaseLevel = shift;
-    if ( defined($databaseLevel) )
-    {
-        $databaseLevel = $this->limit( $databaseLevel );
-        if ( $this->{databaseLevel} != $databaseLevel )
-        {
-            if ( $databaseLevel > NOLOG && $this->{databaseLevel} <= NOLOG )
-            {
-                if ( !$this->{dbh} )
-                {
-                    my ( $host, $port ) = ( ZM_DB_HOST =~ /^([^:]+)(?::(.+))?$/ );
-
-                    if ( defined($port) )
-                    {
-                        $this->{dbh} = DBI->connect( "DBI:mysql:database=".ZM_DB_NAME.";host=".$host.";port=".$port, ZM_DB_USER, ZM_DB_PASS );
-                    }
-                    else
-                    {
-                        $this->{dbh} = DBI->connect( "DBI:mysql:database=".ZM_DB_NAME.";host=".ZM_DB_HOST, ZM_DB_USER, ZM_DB_PASS );
-                    }
-                    if ( !$this->{dbh} )
-                    {
-                        $databaseLevel = NOLOG;
-                        Error( "Unable to write log entries to DB, can't connect to database '".ZM_DB_NAME."' on host '".ZM_DB_HOST."'" );
-                    }
-                    else
-                    {
-                        $this->{dbh}->{AutoCommit} = 1;
-                        Fatal( "Can't set AutoCommit on in database connection" ) unless( $this->{dbh}->{AutoCommit} );
-                        $this->{dbh}->{mysql_auto_reconnect} = 1;
-                        Fatal( "Can't set mysql_auto_reconnect on in database connection" ) unless( $this->{dbh}->{mysql_auto_reconnect} );
-                        $this->{dbh}->trace( 0 );
-                    }
-                }
-            }
-            elsif ( $databaseLevel <= NOLOG && $this->{databaseLevel} > NOLOG )
-            {
-                if ( $this->{dbh} )
-                {
-                    $this->{dbh}->disconnect();
-                    undef($this->{dbh});
-                }
-            }
-            $this->{databaseLevel} = $databaseLevel;
-        }
-    }
-    return( $this->{databaseLevel} );
-}
-
-sub fileLevel( ;$ )
-{
-    my $this = shift;
-    my $fileLevel = shift;
-    if ( defined($fileLevel) )
-    {
-        $fileLevel = $this->limit($fileLevel);
-        if ( $this->{fileLevel} != $fileLevel )
-        {
-            $this->closeFile() if ( $this->{fileLevel} > NOLOG );
-            $this->{fileLevel} = $fileLevel;
-            $this->openFile() if ( $this->{fileLevel} > NOLOG );
-        }
-    }
-    return( $this->{fileLevel} );
-}
-
-sub syslogLevel( ;$ )
-{
-    my $this = shift;
-    my $syslogLevel = shift;
-    if ( defined($syslogLevel) )
-    {
-        $syslogLevel = $this->limit($syslogLevel);
-        if ( $this->{syslogLevel} != $syslogLevel )
-        {
-            $this->closeSyslog() if ( $syslogLevel <= NOLOG && $this->{syslogLevel} > NOLOG );
-            $this->openSyslog() if ( $syslogLevel > NOLOG && $this->{syslogLevel} <= NOLOG );
-            $this->{syslogLevel} = $syslogLevel;
-        }
-    }
-    return( $this->{syslogLevel} );
-}
-
-sub openSyslog()
-{
-    my $this = shift;
-    openlog( $this->{id}, "pid", "local1" );
-}
-
-sub closeSyslog()
-{
-    my $this = shift;
-    #closelog();
-}
-
-sub logFile( $ )
-{
-    my $this = shift;
-    my $logFile = shift;
-    if ( $logFile =~ /^(.+)\+$/ )
-    {
-        $this->{logFile} = $1.'.'.$$;
-    }
-    else
-    {
-        $this->{logFile} = $logFile;
-    }
-}
-
-sub openFile()
-{
-    my $this = shift;
-    if ( open( LOGFILE, ">>".$this->{logFile} ) )
-    {
-        LOGFILE->autoflush() if ( $this->{autoFlush} );
-
-        my $webUid = (getpwnam( ZM_WEB_USER ))[2];
-        my $webGid = (getgrnam( ZM_WEB_GROUP ))[2];
-        if ( $> == 0 )
-        {
-            chown( $webUid, $webGid, $this->{logFile} ) or Fatal( "Can't change permissions on log file '".$this->{logFile}."': $!" )
-        }
-    }
-    else
-    {
-        $this->fileLevel( NOLOG );
-        Error( "Can't open log file '".$this->{logFile}."': $!" );
-    }
-}
-
-sub closeFile()
-{
-    my $this = shift;
-    close( LOGFILE ) if ( fileno(LOGFILE) );
-}
-
-sub logPrint( $;$ )
-{
-    my $this = shift;
-    my $level = shift;
-    my $string = shift;
-
-    if ( $level <= $this->{effectiveLevel} )
-    {
-        $string =~ s/[\r\n]+$//g;
-
-        my $code = $codes{$level};
-
-        my ($seconds, $microseconds) = gettimeofday();
-        my $message = sprintf( "%s.%06d %s[%d].%s [%s]", strftime( "%x %H:%M:%S", localtime( $seconds ) ), $microseconds, $this->{id}, $$, $code, $string );
-        if ( $this->{trace} )
-        {
-            $message = Carp::shortmess( $message );
-        }
-        else
-        {
-            $message = $message."\n";
-        }
-        syslog( $priorities{$level}, $code." [%s]", $string ) if ( $level <= $this->{syslogLevel} );
-        print( LOGFILE $message ) if ( $level <= $this->{fileLevel} );
-        if ( $level <= $this->{databaseLevel} )
-        {
-            my $sql = "insert into Logs ( TimeKey, Component, Pid, Level, Code, Message, File, Line ) values ( ?, ?, ?, ?, ?, ?, ?, NULL )";
-            $this->{sth} = $this->{dbh}->prepare_cached( $sql );
-            if ( !$this->{sth} )
-            {
-                $this->{databaseLevel} = NOLOG;
-                Fatal( "Can't prepare log entry '$sql': ".$this->{dbh}->errstr() );
-            }
-            my $res = $this->{sth}->execute( $seconds+($microseconds/1000000.0), $this->{id}, $$, $level, $code, $string, $this->{fileName} );
-            if ( !$res )
-            {
-                $this->{databaseLevel} = NOLOG;
-                Fatal( "Can't execute log entry '$sql': ".$this->{sth}->errstr() );
-            }
-        }
-        print( STDERR $message ) if ( $level <= $this->{termLevel} );
-    }
-}
-
-sub logInit( ;@ )
-{
-    my %options = @_ ? @_ : ();
-    $logger = ZoneMinder::Logger->new() if ( !$logger );
-    $logger->initialise( %options );
-}
-
-sub logReinit()
-{
-    fetch()->reinitialise();
-}
-
-sub logTerm
-{
-    return unless ( $logger );
-    $logger->terminate();
-    $logger = undef;
-}
-
-sub logHupHandler()
-{
-    my $savedErrno = $!;
-    return unless( $logger );
-    fetch()->reinitialise();
-    logSetSignal();
-    $! = $savedErrno;
-}
-
-sub logSetSignal()
-{
-    $SIG{HUP} = \&logHupHandler;
-}
-
-sub logClearSignal()
-{
-    $SIG{HUP} = 'DEFAULT';
-}
-
-sub logLevel( ;$ )
-{
-    return( fetch()->level( @_ ) );
-}
-
-sub logDebugging()
-{
-    return( fetch()->debugOn() );
-}
-
-sub logTermLevel( ;$ )
-{
-    return( fetch()->termLevel( @_ ) );
-}
-
-sub logDatabaseLevel( ;$ )
-{
-    return( fetch()->databaseLevel( @_ ) );
-}
-
-sub logFileLevel( ;$ )
-{
-    return( fetch()->fileLevel( @_ ) );
-}
-
-sub logSyslogLevel( ;$ )
-{
-    return( fetch()->syslogLevel( @_ ) );
-}
-
-sub Mark( ;$$ )
-{
-    my $level = shift;
-    $level = DEBUG unless( defined($level) );
-    my $tag = "Mark";
-    fetch()->logPrint( $level, $tag );
-}
-
-sub Dump( \$;$ )
-{
-    my $var = shift;
-    my $label = shift;
-    $label = "VAR" unless( defined($label) );
-    fetch()->logPrint( DEBUG, Data::Dumper->Dump( [ $var ], [ $label ] ) );
-}
-
-sub Debug( @ )
-{
-    fetch()->logPrint( DEBUG, @_ );
-}
-
-sub Info( @ )
-{
-    fetch()->logPrint( INFO, @_ );
-}
-
-sub Warning( @ )
-{
-    fetch()->logPrint( WARNING, @_ );
-}
-
-sub Error( @ )
-{
-    fetch()->logPrint( ERROR, @_ );
-}
-
-sub Fatal( @ )
-{
-    fetch()->logPrint( FATAL, @_ );
-    exit( -1 );
-}
-
-sub Panic( @ )
-{
-    fetch()->logPrint( PANIC, @_ );
-    confess( $_[0] );
-}
-
-1;
-__END__
-
-=head1 NAME
-
-ZoneMinder::Logger - ZoneMinder Logger module
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Logger;
-  use ZoneMinder::Logger qw(:all);
-
-  logInit( "myproc", DEBUG );
-
-  Debug( "This is what is happening" );
-  Info( "Something interesting is happening" );
-  Warning( "Something might be going wrong." );
-  Error( "Something has gone wrong!!" );
-  Fatal( "Something has gone badly wrong, gotta stop!!" );
-  Panic( "Something fundamental has gone wrong, die with stack trace );
-
-=head1 DESCRIPTION
-
-The ZoneMinder:Logger module contains the common debug and error reporting routines used by the ZoneMinder scripts.
-
-To use debug in your scripts you need to include this module, and call logInit. Thereafter you can sprinkle Debug or Error calls etc throughout the code safe in the knowledge that they will be reported to your error log, and possibly the syslogger, in a meaningful and consistent format.
-
-Debug is discussed in terms of levels where 1 and above (currently only 1 for scripts) is considered debug, 0 is considered as informational, -1 is a warning, -2 is an error and -3 is a fatal error or panic. Where levels are mentioned below as thresholds the value given and anything with a lower level (ie. more serious) will be included.
-
-=head1 METHODS
-
-=over 4
-
-=item logInit ( $id, %options );
-
-Initialises the debug and prepares the logging for forthcoming operations. If not called explicitly it will be called by the first debug call in your script, but with default (and probably meaningless) options. The only compulsory arguments are $id which must be a string that will identify debug coming from this script in mixed logs. Other options may be provided as below,
-
- Option        Default        Description
- ---------     ---------      -----------
- level         INFO       The initial debug level which defines which statements are output and which are ignored
- trace         0          Whether to use the Carp::shortmess format in debug statements to identify where the debug was emitted from
- termLevel     NOLOG      At what level debug is written to terminal standard error, 0 is no, 1 is yes, 2 is write only if terminal
- databaseLevel INFO       At what level debug is written to the Log table in the database;
- fileLevel     NOLOG      At what level debug is written to a log file of the format of <id>.log in the standard log directory.
- syslogLevel   INFO       At what level debug is written to syslog.
- 
-To disable any of these action entirely set to NOLOG
-
-=item logTerm ();
-
-Used to end the debug session and close any logs etc. Not usually necessary.
-
-=item $id            = logId ( [$id] );
-
-=item $level         = logLevel ( [$level] );
-
-=item $trace         = logTrace ( [$trace] );
-
-=item $level         = logLevel ( [$level] );
-
-=item $termLevel     = logTermLevel ( [$termLevel] );
-
-=item $databaseLevel = logDatabaseLevel ( [$databaseLevel] );
-
-=item $fileLevel     = logFileLevel ( [$fileLevel] );
-
-=item $syslogLevel   = logSyslogLevel ( [$syslogLevel] );
-
-These methods can be used to get and set the current settings as defined in logInit.
-
-=item Debug( $string );
-
-This method will output a debug message if the current debug level permits it, otherwise does nothing. This message will be tagged with the DBG string in the logs.
-
-=item Info( $string );
-
-This method will output an informational message if the current debug level permits it, otherwise does nothing. This message will be tagged with the INF string in the logs.
-
-=item Warning( $string );
-
-This method will output a warning message if the current debug level permits it, otherwise does nothing. This message will be tagged with the WAR string in the logs.
-
-=item Error( $string );
-
-This method will output an error message if the current debug level permits it, otherwise does nothing. This message will be tagged with the ERR string in the logs.
-
-=item Fatal( $string );
-
-This method will output a fatal error message and then die if the current debug level permits it, otherwise does nothing. This message will be tagged with the FAT string in the logs.
-
-=item Panic( $string );
-
-This method will output a panic error message and then die with a stack trace if the current debug level permits it, otherwise does nothing. This message will be tagged with the PNC string in the logs.
-
-=head2 EXPORT
-
-None by default.
-The :constants tag will export the debug constants which define the various levels of debug
-The :variables tag will export variables containing the current debug id and level
-The :functions tag will export the debug functions. This or :all is what you would normally use.
-The :all tag will export all above symbols.
-
-
-=head1 SEE ALSO
-
-Carp
-Sys::Syslog
-
-The ZoneMinder README file Troubleshooting section for an extended discussion on the use and configuration of syslog with ZoneMinder.
-
-http://www.zoneminder.com
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Memory.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Memory.pm
@ -1,873 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Memory Access Module, $Date: 2008-02-25 10:13:13 +0000 (Mon, 25 Feb 2008) $, $Revision: 2323 $
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the common definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::Memory;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-	'constants' => [ qw(
-		STATE_IDLE
-		STATE_PREALARM
-		STATE_ALARM
-		STATE_ALERT
-		STATE_TAPE
-		ACTION_GET
-		ACTION_SET
-		ACTION_RELOAD
-		ACTION_SUSPEND
-		ACTION_RESUME
-		TRIGGER_CANCEL
-		TRIGGER_ON
-		TRIGGER_OFF 
-	) ],
-	'functions' => [ qw(
-		zmMemVerify
-		zmMemInvalidate
-		zmMemRead
-		zmMemWrite
-		zmMemTidy
-		zmGetMonitorState
-		zmGetAlarmLocation
-		zmIsAlarmed
-		zmInAlarm
-		zmHasAlarmed
-		zmGetLastEvent
-		zmGetLastWriteTime
-		zmGetLastReadTime
-		zmMonitorEnable
-		zmMonitorDisable
-		zmMonitorSuspend
-		zmMonitorResume
-		zmTriggerEventOn
-		zmTriggerEventOff
-		zmTriggerEventCancel
-		zmTriggerShowtext
-	) ],
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Shared Memory Facilities
-#
-# ==========================================================================
-
-use ZoneMinder::Config qw(:all);
-use ZoneMinder::Logger qw(:all);
-
-use constant STATE_IDLE     => 0;
-use constant STATE_PREALARM => 1;
-use constant STATE_ALARM    => 2;
-use constant STATE_ALERT    => 3;
-use constant STATE_TAPE     => 4;
-
-use constant ACTION_GET     => 1;
-use constant ACTION_SET     => 2;
-use constant ACTION_RELOAD  => 4;
-use constant ACTION_SUSPEND => 16;
-use constant ACTION_RESUME  => 32;
-
-use constant TRIGGER_CANCEL => 0;
-use constant TRIGGER_ON     => 1;
-use constant TRIGGER_OFF    => 2;
-
-use Storable qw( freeze thaw );
-
-if ( "yes" eq 'yes' ) # 'yes' if memory is mmapped
-{
-    require ZoneMinder::Memory::Mapped;
-    ZoneMinder::Memory::Mapped->import();
-}
-else
-{
-    require ZoneMinder::Memory::Shared;
-    ZoneMinder::Memory::Shared->import();
-}
-
-# Native architecture
-our $arch = int(3.2*length(~0));
-our $native = $arch/8;
-our $mem_seq = 0;
-
-our $mem_data =
-{
-	"shared_data" => { "type"=>"SharedData", "seq"=>$mem_seq++, "contents"=> {
-		"size"             => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"last_write_index" => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"last_read_index"  => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"state"            => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"last_event"       => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"action"           => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"brightness"       => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"hue"              => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"colour"           => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"contrast"         => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"alarm_x"          => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"alarm_y"          => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"valid"            => { "type"=>"uint8", "seq"=>$mem_seq++ },
-		"active"           => { "type"=>"uint8", "seq"=>$mem_seq++ },
-		"signal"           => { "type"=>"uint8", "seq"=>$mem_seq++ },
-		"format"           => { "type"=>"uint8", "seq"=>$mem_seq++ },
-		"imagesize"        => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"epadding1"        => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"epadding2"        => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"last_write_time"  => { "type"=>"time_t64", "seq"=>$mem_seq++ },
-		"last_read_time"   => { "type"=>"time_t64", "seq"=>$mem_seq++ },
-		"control_state"    => { "type"=>"uint8[256]", "seq"=>$mem_seq++ },
-		}
-	},
-	"trigger_data" => { "type"=>"TriggerData", "seq"=>$mem_seq++, "contents"=> {
-		"size"             => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"trigger_state"    => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"trigger_score"    => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"padding"          => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"trigger_cause"    => { "type"=>"int8[32]", "seq"=>$mem_seq++ },
-		"trigger_text"     => { "type"=>"int8[256]", "seq"=>$mem_seq++ },
-		"trigger_showtext" => { "type"=>"int8[256]", "seq"=>$mem_seq++ },
-		}
-	},
-	"end" => { "seq"=>$mem_seq++, "size"=> 0 }
-};
-
-our $mem_size = 0;
-our $mem_verified = {};
-
-sub zmMemInit
-{
-	my $offset = 0;
-
-	foreach my $section_data ( sort { $a->{seq} <=> $b->{seq} } values( %$mem_data ) )
-	{
-		$section_data->{offset} = $offset;
-		$section_data->{align} = 0;
-
-		if ( $section_data->{align} > 1 )
-		{
-			my $rem = $offset % $section_data->{align};
-			if ( $rem > 0 )
-			{
-				$offset += ($section_data->{align} - $rem);
-			}
-		}
-		foreach my $member_data ( sort { $a->{seq} <=> $b->{seq} } values( %{$section_data->{contents}} ) )
-		{
-			if ( $member_data->{type} eq "long" || $member_data->{type} eq "ulong" || $member_data->{type} eq "size_t")
-			{
-				$member_data->{size} = $member_data->{align} = $native;
-			}
-			elsif( $member_data->{type} eq "int64" || $member_data->{type} eq "uint64" || $member_data->{type} eq "time_t64")
-			{
-				$member_data->{size} = $member_data->{align} = 8;
-			}
-			elsif ( $member_data->{type} eq "int32" || $member_data->{type} eq "uint32" || $member_data->{type} eq "bool4" )
-			{
-				$member_data->{size} = $member_data->{align} = 4;
-			}
-			elsif ($member_data->{type} eq "int16" || $member_data->{type} eq "uint16")
-			{
-				$member_data->{size} = $member_data->{align} = 2;
-			}
-			elsif ( $member_data->{type} eq "int8" || $member_data->{type} eq "uint8" || $member_data->{type} eq "bool1" )
-			{
-				$member_data->{size} = $member_data->{align} = 1;
-			}
-			elsif ( $member_data->{type} =~ /^u?int8\[(\d+)\]$/ )
-			{
-				$member_data->{size} = $1;
-				$member_data->{align} = 1;
-			}
-			else
-			{
-				Fatal( "Unexpected type '".$member_data->{type}."' found in shared data definition." );
-			}
-
-			if ( $member_data->{align} > 1 && ($offset%$member_data->{align}) > 0 )
-			{
-				$offset += ($member_data->{align} - ($offset%$member_data->{align}));
-			}
-			$member_data->{offset} = $offset;
-			$offset += $member_data->{size}
-		}
-		$section_data->{size} = $offset - $section_data->{offset};
-	}
-
-	$mem_size = $offset;
-}
-
-&zmMemInit();
-
-sub zmMemVerify( $ )
-{
-	my $monitor = shift;
-	if ( !zmMemAttach( $monitor, $mem_size ) )
-	{
-		return( undef );
-	}
-
-    my $mem_key = zmMemKey( $monitor );
-	if ( !defined($mem_verified->{$mem_key}) )
-	{
-		my $sd_size = zmMemRead( $monitor, "shared_data:size", 1 );
-		if ( $sd_size != $mem_data->{shared_data}->{size} )
-		{
-			if ( $sd_size )
-			{
-				Error( "Shared data size conflict in shared_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{shared_data}->{size}.", got ".$sd_size );
-			}
-			else
-			{
-				Debug( "Shared data size conflict in shared_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{shared_data}->{size}.", got ".$sd_size );
-			}
-			return( undef );
-		}
-		my $td_size = zmMemRead( $monitor, "trigger_data:size", 1 );
-		if ( $td_size != $mem_data->{trigger_data}->{size} )
-		{
-			if ( $td_size )
-			{
-				Error( "Shared data size conflict in trigger_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{triggger_data}->{size}.", got ".$td_size );
-			}
-			else
-			{
-				Debug( "Shared data size conflict in trigger_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{triggger_data}->{size}.", got ".$td_size );
-			}
-			return( undef );
-		}
-		$mem_verified->{$mem_key} = !undef;
-	}
-	return( !undef );
-}
-
-sub zmMemRead( $$;$ )
-{
-	my $monitor = shift;
-	my $fields = shift;
-	my $nocheck = shift;
-
-	if ( !($nocheck || zmMemVerify( $monitor )) )
-	{
-		return( undef );
-	}
-
-	if ( !ref($fields) )
-	{
-		$fields = [ $fields ];
-	}
-	my @values;
-	foreach my $field ( @$fields )
-	{
-		my ( $section, $element ) = split( /[\/:.]/, $field );
-		Fatal( "Invalid shared data selector '$field'" ) if ( !$section || !$element );
-
-		my $offset = $mem_data->{$section}->{contents}->{$element}->{offset};
-		my $type = $mem_data->{$section}->{contents}->{$element}->{type};
-		my $size = $mem_data->{$section}->{contents}->{$element}->{size};
-
-		my $data = zmMemGet( $monitor, $offset, $size );
-        if ( !defined($data) )
-        {
-            Error( "Unable to read '$field' from memory for monitor ".$monitor->{Id} );
-            zmMemInvalidate( $monitor );
-            return( undef );
-        }
-		my $value;
-		if ( $type eq "long" )
-		{
-			( $value ) = unpack( "l!", $data );
-		}
-		elsif ( $type eq "ulong" || $type eq "size_t" )
-		{
-			( $value ) = unpack( "L!", $data );
-		}
-		elsif ( $type eq "int64" || $type eq "time_t64" )
-		{
-			# The "q" type is only available on 64bit platforms, so use native.
-			( $value ) = unpack( "l!", $data );
-		}
-		elsif ( $type eq "uint64" )
-		{
-			# The "q" type is only available on 64bit platforms, so use native.
-			( $value ) = unpack( "L!", $data );
-		}
-		elsif ( $type eq "int32" )
-		{
-			( $value ) = unpack( "l", $data );
-		}
-		elsif ( $type eq "uint32" || $type eq "bool4" )
-		{
-			( $value ) = unpack( "L", $data );
-		}
-		elsif ( $type eq "int16" )
-		{
-			( $value ) = unpack( "s", $data );
-		}
-		elsif ( $type eq "uint16" )
-		{
-			( $value ) = unpack( "S", $data );
-		}
-		elsif ( $type eq "int8" )
-		{
-			( $value ) = unpack( "c", $data );
-		}
-		elsif ( $type eq "uint8" || $type eq "bool1" )
-		{
-			( $value ) = unpack( "C", $data );
-		}
-		elsif ( $type =~ /^int8\[\d+\]$/ )
-		{
-			( $value ) = unpack( "Z".$size, $data );
-		} 
-		elsif ( $type =~ /^uint8\[\d+\]$/ )
-		{
-			( $value ) = unpack( "C".$size, $data );
-		} 
-		else
-		{
-			Fatal( "Unexpected type '".$type."' found for '".$field."'" );
-		}
-		push( @values, $value );
-	}
-	if ( wantarray() )
-	{
-		return( @values )
-	}
-	return( $values[0] );
-}
-
-sub zmMemInvalidate( $ )
-{
-	my $monitor = shift;
-    my $mem_key = zmMemKey($monitor);
-    if ( $mem_key )
-    {
-        delete $mem_verified->{$mem_key};
-        zmMemDetach( $monitor );
-    }
-}
-
-sub zmMemTidy()
-{
-    zmMemClean();
-}
-
-sub zmMemWrite( $$;$ )
-{
-	my $monitor = shift;
-	my $field_values = shift;
-	my $nocheck = shift;
-
-	if ( !($nocheck || zmMemVerify( $monitor )) )
-	{
-		return( undef );
-	}
-
-	while ( my ( $field, $value ) = each( %$field_values ) )
-	{
-		my ( $section, $element ) = split( /[\/:.]/, $field );
-		Fatal( "Invalid shared data selector '$field'" ) if ( !$section || !$element );
-
-		my $offset = $mem_data->{$section}->{contents}->{$element}->{offset};
-		my $type = $mem_data->{$section}->{contents}->{$element}->{type};
-		my $size = $mem_data->{$section}->{contents}->{$element}->{size};
-
-		my $data;
-		if ( $type eq "long" )
-		{
-			$data = pack( "l!", $value );
-		}
-		elsif ( $type eq "ulong" || $type eq "size_t" )
-		{
-			$data = pack( "L!", $value );
-		}
-		elsif ( $type eq "int64" || $type eq "time_t64" )
-		{
-			# The "q" type is only available on 64bit platforms, so use native.
-			$data = pack( "l!", $value );
-		}
-		elsif ( $type eq "uint64" )
-		{
-			# The "q" type is only available on 64bit platforms, so use native.
-			$data = pack( "L!", $value );
-		}
-		elsif ( $type eq "int32" )
-		{
-			$data = pack( "l", $value );
-		}
-		elsif ( $type eq "uint32" || $type eq "bool4" )
-		{
-			$data = pack( "L", $value );
-		}
-		elsif ( $type eq "int16" )
-		{
-			$data = pack( "s", $value );
-		}
-		elsif ( $type eq "uint16" )
-		{
-			$data = pack( "S", $value );
-		}
-		elsif ( $type eq "int8" )
-		{
-			$data = pack( "c", $value );
-		}
-		elsif ( $type eq "uint8" || $type eq "bool1" )
-		{
-			$data = pack( "C", $value );
-		}
-		elsif ( $type =~ /^int8\[\d+\]$/ )
-		{
-			$data = pack( "Z".$size, $value );
-		} 
-		elsif ( $type =~ /^uint8\[\d+\]$/ )
-		{
-			$data = pack( "C".$size, $value );
-		} 
-		else
-		{
-			Fatal( "Unexpected type '".$type."' found for '".$field."'" );
-		}
-
-        if ( !zmMemPut( $monitor, $offset, $size, $data ) )
-        {
-            Error( "Unable to write '$value' to '$field' in memory for monitor ".$monitor->{Id} );
-            zmMemInvalidate( $monitor );
-            return( undef );
-        }
-	}
-	return( !undef );
-}
-
-sub zmGetMonitorState( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, "shared_data:state" ) );
-}
-
-sub zmGetAlarmLocation( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, [ "shared_data:alarm_x", "shared_data:alarm_y" ] ) );
-}
-
-sub zmSetControlState( $$ )
-{
-	my $monitor = shift;
-	my $control_state = shift;
-
-	zmMemWrite( $monitor, { "shared_data:control_state" => $control_state } );
-}
-
-sub zmGetControlState( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, "shared_data:control_state" ) );
-}
-
-sub zmSaveControlState( $$ )
-{
-	my $monitor = shift;
-	my $control_state = shift;
-
-	zmSetControlState( $monitor, freeze( $control_state ) );
-}
-
-sub zmRestoreControlState( $ )
-{
-	my $monitor = shift;
-
-	return( thaw( zmGetControlState( $monitor ) ) );
-}
-
-sub zmIsAlarmed( $ )
-{
-	my $monitor = shift;
-
-	my $state = zmGetMonitorState( $monitor );
-
-	return( $state == STATE_ALARM );
-}
-
-sub zmInAlarm( $ )
-{
-	my $monitor = shift;
-
-	my $state = zmGetMonitorState( $monitor );
-
-	return( $state == STATE_ALARM || $state == STATE_ALERT );
-}
-
-sub zmHasAlarmed( $$ )
-{
-	my $monitor = shift;
-	my $last_event_id = shift;
-
-	my ( $state, $last_event ) = zmMemRead( $monitor, [ "shared_data:state", "shared_data:last_event" ] );
-
-	if ( $state == STATE_ALARM || $state == STATE_ALERT )
-	{
-		return( $last_event );
-	}
-	elsif( $last_event != $last_event_id )
-	{
-		return( $last_event );
-	}
-	return( undef );
-}
-
-sub zmGetLastEvent( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, "shared_data:last_event" ) );
-}
-
-sub zmGetLastWriteTime( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, "shared_data:last_write_time" ) );
-}
-
-sub zmGetLastReadTime( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, "shared_data:last_read_time" ) );
-}
-
-sub zmGetMonitorActions( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, "shared_data:action" ) );
-}
-
-sub zmMonitorEnable( $ )
-{
-	my $monitor = shift;
-
-	my $action = zmMemRead( $monitor, "shared_data:action" );
-	$action |= ACTION_SUSPEND;
-	zmMemWrite( $monitor, { "shared_data:action" => $action } );
-}
-
-sub zmMonitorDisable( $ )
-{
-	my $monitor = shift;
-
-	my $action = zmMemRead( $monitor, "shared_data:action" );
-	$action |= ACTION_RESUME;
-	zmMemWrite( $monitor, { "shared_data:action" => $action } );
-}
-
-sub zmMonitorSuspend( $ )
-{
-	my $monitor = shift;
-
-	my $action = zmMemRead( $monitor, "shared_data:action" );
-	$action |= ACTION_SUSPEND;
-	zmMemWrite( $monitor, { "shared_data:action" => $action } );
-}
-
-sub zmMonitorResume( $ )
-{
-	my $monitor = shift;
-
-	my $action = zmMemRead( $monitor, "shared_data:action" );
-	$action |= ACTION_RESUME;
-	zmMemWrite( $monitor, { "shared_data:action" => $action } );
-}
-
-sub zmGetTriggerState( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, "trigger_data:trigger_state" ) );
-}
-
-sub zmTriggerEventOn( $$$;$$ )
-{
-	my $monitor = shift;
-	my $score = shift;
-	my $cause = shift;
-	my $text = shift;
-	my $showtext = shift;
-
-	my $values = {
-		"trigger_data:trigger_score" => $score,
-		"trigger_data:trigger_cause" => $cause,
-	};
-	$values->{"trigger_data:trigger_text"} = $text if ( defined($text) );
-	$values->{"trigger_data:trigger_showtext"} = $showtext if ( defined($showtext) );
-	$values->{"trigger_data:trigger_state"} = TRIGGER_ON; # Write state last so event not read incomplete
-
-	zmMemWrite( $monitor, $values );
-}
-
-sub zmTriggerEventOff( $ )
-{
-	my $monitor = shift;
-
-	my $values = {
-		"trigger_data:trigger_state"    => TRIGGER_OFF,
-		"trigger_data:trigger_score"    => 0,
-		"trigger_data:trigger_cause"    => "",
-		"trigger_data:trigger_text"     => "",
-		"trigger_data:trigger_showtext" => "",
-	};
-
-	zmMemWrite( $monitor, $values );
-}
-
-sub zmTriggerEventCancel( $ )
-{
-	my $monitor = shift;
-
-	my $values = {
-		"trigger_data:trigger_state"    => TRIGGER_CANCEL,
-		"trigger_data:trigger_score"    => 0,
-		"trigger_data:trigger_cause"    => "",
-		"trigger_data:trigger_text"     => "",
-		"trigger_data:trigger_showtext" => "",
-	};
-
-	zmMemWrite( $monitor, $values );
-}
-
-sub zmTriggerShowtext( $$ )
-{
-	my $monitor = shift;
-	my $showtext = shift;
-
-	my $values = {
-		"trigger_data:trigger_showtext" => $showtext,
-	};
-
-	zmMemWrite( $monitor, $values );
-}
-
-1;
-__END__
-
-=head1 NAME
-
-ZoneMinder::MappedMem - ZoneMinder Mapped Memory access module
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::MappedMem;
-  use ZoneMinder::MappedMem qw(:all);
-
-  if ( zmMemVerify( $monitor ) )
-  {
-    $state = zmGetMonitorState( $monitor );
-    if ( $state == STATE_ALARM )
-    {
-      ...
-    }
-  }
-
-  ( $lri, $lwi ) = zmMemRead( $monitor, [ "shared_data:last_read_index", "shared_data:last_write_index" ] );
-  zmMemWrite( $monitor, { "trigger_data:trigger_showtext" => "Some Text" } );
-
-=head1 DESCRIPTION
-
-The ZoneMinder:MappedMem module contains methods for accessing and writing to mapped memory as well as helper methods for common operations.
-
-The core elements of ZoneMinder used mapped memory to allow multiple access to resources. Although ZoneMinder scripts have used this information before, up until now it was difficult to access and prone to errors. This module introduces a common API for mapped memory access (both reading and writing) making it a lot easier to customise scripts or even create your own.
-
-All the methods listed below require a 'monitor' parameter. This must be a reference to a hash with at least the 'Id' field set to the monitor id of the mapped memory you wish to access. Using database methods to select the monitor details will also return this kind of data. Some of the mapped memory methods will add and amend new fields to this hash.
-
-=over 4
-
-=head1 METHODS
-
-=item zmMemVerify ( $monitor );
-
-Verify that the mapped memory of the monitor given exists and is valid. It will return an undefined value if it is not valid. You should generally call this method first before using any of the other methods, but most of the remaining methods will also do so if the memory has not already been verified.
-
-=item zmMemInvalidate ( $monitor );
-
-Following an error, reset the mapped memory ids and attempt to reverify on the next operation. This is mostly used when a mapped memory segment has gone away and been recreated with a different id.
-
-=item zmMemRead ( $monitor, $readspec );
-
-This method is used to read data from mapped memory attached to the given monitor. The mapped memory will be verified if it has not already been. The 'readspec' must either be a string of the form "<section>:<field>" or a reference to an array of strings of the same format. In the first case a single value is returned, in the latter case a list of values is return. Errors will cause undefined to be returned. The allowable sections and field names are described below.
-
-=item zmMemWrite ( $monitor, $writespec );
-
-This method is used to write data to mapped memory attached to the given monitor. The mapped memory will be verified if it has not already been. The 'writespec' must be a reference to a hash with keys of the form "<section>:<field>" and values as the data to be written. Errors will cause undefined to be returned, otherwise a non-undefined value will be returned. The allowable sections and field names are described below.
-
-=item $state = zmGetMonitorState ( $monitor );
-
-Return the current state of the given monitor. This is an integer value and can be compared with the STATE constants given below.
-
-=item $event_id = zmGetLastEvent ( $monitor );
-
-Return the event id of the last event that the monitor generated, or 0 if no event has been generated by the current monitor process.
-
-=item zmIsAlarmed ( $monitor );
-
-Return 1 if the monitor given is currently in an alarm state, 0 otherwise.
-
-=item zmInAlarm ( $monitor );
-
-Return 1 if the monitor given is currently in an alarm or alerted state, 0 otherwise.
-
-=item zmHasAlarmed ( $monitor );
-
-Return 1 if the given monitor is in an alarm state, or has been in an alarm state since the last call to this method.
-
-=item ( $x, $y ) = zmGetAlarmLocation ( $monitor );
-
-Return an x,y pair indicating the image co-ordinates of the centre of the last motion event generated by the given monitor. If no event has been generated by the current monitor process, or the alarm was not motion related, returns -1,-1.
-
-=item zmGetLastWriteTime ( $monitor );
-
-Returns the time (in utc seconds) since the last image was captured by the given monitor and written to shared memory, or 0 otherwise.
-
-=item zmGetLastReadTime ( $monitor );
-
-Returns the time (in utc seconds) since the last image was read from shared memory by the analysis daemon of the given monitor, or 0 otherwise or if the monitor is in monitor only mode.
-
-=item zmMonitorSuspend ( $monitor );
-
-Suspend the given monitor from generating events caused by motion. This method can be used to prevent camera actions such as panning or zooming from causing events. If configured to do so, the monitor may automatically resume after a defined period.
-
-=item zmMonitorResume ( $monitor );
-
-Allow the given monitor to resume generating events caused by motion.
-
-=item zmTriggerEventOn ( $monitor, $score, $cause [, $text, $showtext ] );
-
-Trigger the given monitor to generate an event. You must supply an event score and a cause string indicating the reason for the event. You may also supply a text string containing further details about the event and a showtext string which may be included in the timestamp annotation on any images captured during the event, if configured to do so.
-
-=item zmTriggerEventOff ( $monitor );
-
-Trigger the given monitor to not generate any events. This method does not cancel zmTriggerEventOn, but is exclusive to it. This method is intended to allow external triggers to prevent normal events being generated by monitors in the same way as zmMonitorSuspend but applies to all events and not just motion, and is intended for longer timescales than are appropriate for suspension.
-
-=item zmTriggerEventCancel ( $monitor );
-
-Cancel any previous trigger on or off requests. This stops a triggered alarm if it exists from a previous 'on' and allows events to be generated once more following a previous 'off'.
-
-=item zmTriggerShowtext ( $monitor, $showtest );
-
-Indicate that the given text should be displayed in the timestamp annotation on any images captured, if the format of the annotation string defined for the monitor permits.
-
-=head1 DATA
-
-The data fields in mapped memory that may be accessed are as follows. There are two main sections, shared_data which is general data and trigger_data which is used for event triggering. Whilst reading from these fields is harmless, extreme care must be taken when writing to mapped memory, especially in the shared_data section as this is normally written to only by monitor capture and analysis processes.
-
-  shared_data         The general mapped memory section
-    size              The size, in bytes, of this section
-    valid             Flag indicating whether this section has been initialised
-    active            Flag indicating whether this monitor is active (enabled/disabled)
-    signal            Flag indicating whether this monitor is reciving a valid signal
-    state             The current monitor state, see the STATE constants below
-    last_write_index  The last index, in the image buffer, that an image has been saved to
-    last_read_index   The last index, in the image buffer, that an image has been analysed from
-    last_write_time   The time (in utc seconds) when the last image was captured
-    last_read_time    The time (in utc seconds) when the last image was analysed
-    last_event        The id of the last event generated by the monitor analysis process, 0 if none
-    action            The monitor actions bitmask, see the ACTION constants below
-    brightness        Read/write location for the current monitor brightness
-    hue               Read/write location for the current monitor hue
-    colour            Read/write location for the current monitor colour
-    contrast          Read/write location for the current monitor contrast
-    alarm_x           Image x co-ordinate (from left) of the centre of the last motion event, -1 if none
-    alarm_y           Image y co-ordinate (from top) of the centre of the last motion event, -1 if none
-
-  trigger_data        The triggered event mapped memory section
-    size              The size, in bytes of this section
-    trigger_state     The current trigger state, see the TRIGGER constants below
-    trigger_score     The current triggered event score
-    trigger_cause     The current triggered event cause string
-    trigger_text      The current triggered event descriptive text string
-    trigger_showtext  The triggered text that will be displayed on captured image timestamps
-
-=head1 CONSTANTS
-
-The following constants are used by the methods above, but can also be used by user scripts if required.
-
-=item STATE_IDLE STATE_PREALARM STATE_ALARM STATE_ALERT STATE_TAPE
-
-These constants define the state of the monitor with respect to alarms and events. They are used in the shared_data:state field.
-
-=item ACTION_GET ACTION_SET ACTION_RELOAD ACTION_SUSPEND ACTION_RESUME
-
-These constants defines the various values that can exist in the shared_data:action field. This is a bitmask which when non-zero defines an action that an executing monitor process should take. ACTION_GET requires that the current values of brightness, contrast, colour and hue are taken from the camera and written to the equivalent mapped memory fields. ACTION_SET implies the reverse, that the values in mapped memory should be written to the camera. ACTION_RELOAD signal that the monitor process should reload itself from the database in case any settings have changed there. ACTION_SUSPEND signals that a monitor should stop exaiming images for motion, though other alarms may still occur. ACTION_RESUME sigansl that a monitor should resume motion detectiom.
-
-=item TRIGGER_CANCEL TRIGGER_ON TRIGGER_OFF 
-
-These constants are used in the definition of external triggers. TRIGGER_CANCEL is used to indicated that any previous trigger settings should be cancelled, TRIGGER_ON signals that an alarm should be created (or continued)) as a result of the current trigger and TRIGGER_OFF signals that the trigger should prevent any alarms from being generated. See the trigger methods above for further details.
-
-=head1 EXPORT
-
-None by default.
-The :constants tag will export the mapped memory constants which mostly define enumerations for the variables held in memory
-The :functions tag will export the mapped memory access functions.
-The :all tag will export all above symbols.
-
-
-=head1 SEE ALSO
-
-http://www.zoneminder.com
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Memory/Mapped.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Memory/Mapped.pm
@ -1,169 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Mapped Memory Access Module, $Date: 2008-02-25 10:13:13 +0000 (Mon, 25 Feb 2008) $, $Revision: 2323 $
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the definitions and functions used when accessing mapped memory
-#
-package ZoneMinder::Memory::Mapped;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-	'functions' => [ qw(
-		zmMemKey
-		zmMemAttach
-		zmMemDetach
-		zmMemGet
-		zmMemPut
-		zmMemClean
-	) ],
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = @EXPORT_OK;
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Mapped Memory Facilities
-#
-# ==========================================================================
-
-use ZoneMinder::Config qw(:all);
-use ZoneMinder::Logger qw(:all);
-
-use Sys::Mmap;
-
-sub zmMemKey( $ )
-{
-	my $monitor = shift;
-    return( defined($monitor->{MMapAddr})?$monitor->{MMapAddr}:undef );
-}
-
-sub zmMemAttach( $$ )
-{
-	my $monitor = shift;
-	my $size = shift;
-	if ( !defined($monitor->{MMapAddr}) )
-	{
-        my $mmap_file = ZM_PATH_MAP."/zm.mmap.".$monitor->{Id};
-        if ( !open( MMAP, "+<".$mmap_file ) )
-        {
-    		Error( sprintf( "Can't open memory map file '%s': $!\n", $mmap_file ) );
-			return( undef );
-        }
-        my $mmap = undef;
-        my $mmap_addr = mmap( $mmap, $size, PROT_READ|PROT_WRITE, MAP_SHARED, \*MMAP );
-        if ( !$mmap_addr || !$mmap )
-        {
-    		Error( sprintf( "Can't mmap to file '%s': $!\n", $mmap_file ) );
-			return( undef );
-        }
-		$monitor->{MMapHandle} = \*MMAP;
-		$monitor->{MMapAddr} = $mmap_addr;
-		$monitor->{MMap} = \$mmap;
-	}
-	return( !undef );
-}
-
-sub zmMemDetach( $ )
-{
-	my $monitor = shift;
-
-    if ( $monitor->{MMap} )
-    {
-        munmap( ${$monitor->{MMap}} );
-	    delete $monitor->{MMap};
-    }
-    if ( $monitor->{MMapAddr} )
-    {
-	    delete $monitor->{MMapAddr};
-    }
-    if ( $monitor->{MMapHandle} )
-    {
-        close( $monitor->{MMapHandle} );
-	    delete $monitor->{MMapHandle};
-    }
-}
-
-sub zmMemGet( $$$ )
-{
-	my $monitor = shift;
-	my $offset = shift;
-	my $size = shift;
-
-	my $mmap = $monitor->{MMap};
-    if ( !$mmap || !$$mmap )
-    {
-        Error( sprintf( "Can't read from mapped memory for monitor '%d', gone away?", $monitor->{Id} ) );
-        return( undef );
-    }
-	my $data = substr( $$mmap, $offset, $size );
-    return( $data );
-}
-
-sub zmMemPut( $$$$ )
-{
-	my $monitor = shift;
-	my $offset = shift;
-	my $size = shift;
-	my $data = shift;
-
-	my $mmap = $monitor->{MMap};
-    if ( !$mmap || !$$mmap )
-    {
-        Error( sprintf( "Can't write mapped memory for monitor '%d', gone away?", $monitor->{Id} ) );
-        return( undef );
-    }
-	substr( $$mmap, $offset, $size ) = $data;
-	return( !undef );
-}
-
-sub zmMemClean
-{
-	Debug( "Removing memory map files\n" );
-    my $mapPath = ZM_PATH_MAP."/zm.mmap.*";
-    foreach my $mapFile( glob( $mapPath ) )
-    {
-        ( $mapFile ) = $mapFile =~ /^(.+)$/;
-	    Debug( "Removing memory map file '$mapFile'\n" );
-        unlink( $mapFile );
-    }
-}
-
-1;
-__END__
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Memory/Shared.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Memory/Shared.pm
@ -1,161 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Shared Memory Access Module, $Date: 2007-08-29 19:11:09 +0100 (Wed, 29 Aug 2007) $, $Revision: 2175 $
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the common definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::Memory::Shared;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-	'functions' => [ qw(
-        zmMemKey
-        zmMemAttach
-        zmMemDetach
-        zmMemGet
-        zmMemPut
-        zmMemClean
-	) ],
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = @EXPORT_OK;
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Shared Memory Facilities
-#
-# ==========================================================================
-
-use ZoneMinder::Config qw(:all);
-use ZoneMinder::Logger qw(:all);
-
-sub zmMemKey( $ )
-{
-	my $monitor = shift;
-	return( defined($monitor->{ShmKey})?$monitor->{ShmKey}:undef );
-}
-
-sub zmMemAttach( $$ )
-{
-	my $monitor = shift;
-	my $size = shift;
-	if ( !defined($monitor->{ShmId}) )
-	{
-		my $shm_key = (hex(ZM_SHM_KEY)&0xffff0000)|$monitor->{Id};
-		my $shm_id = shmget( $shm_key, $size, 0 );
-		if ( !defined($shm_id) )
-		{
-    		Error( sprintf( "Can't get shared memory id '%x', %d: $!\n", $shm_key, $monitor->{Id} ) );
-			return( undef );
-		}
-		$monitor->{ShmKey} = $shm_key;
-		$monitor->{ShmId} = $shm_id;
-	}
-	return( !undef );
-}
-
-sub zmMemDetach( $ )
-{
-	my $monitor = shift;
-
-	delete $monitor->{ShmId};
-}
-
-sub zmMemGet( $$$ )
-{
-	my $monitor = shift;
-	my $offset = shift;
-	my $size = shift;
-
-	my $shm_key = $monitor->{ShmKey};
-	my $shm_id = $monitor->{ShmId};
-	
-    my $data;
-    if ( !shmread( $shm_id, $data, $offset, $size ) )
-    {
-        Error( sprintf( "Can't read from shared memory '%x/%d': $!", $shm_key, $shm_id ) );
-        return( undef );
-    }
-	return( $data );
-}
-
-sub zmMemPut( $$$$ )
-{
-	my $monitor = shift;
-	my $offset = shift;
-	my $size = shift;
-	my $data = shift;
-
-	my $shm_key = $monitor->{ShmKey};
-	my $shm_id = $monitor->{ShmId};
-	
-    if ( !shmwrite( $shm_id, $data, $offset, $size ) )
-    {
-        Error( sprintf( "Can't write to shared memory '%x/%d': $!", $shm_key, $shm_id ) );
-        return( undef );
-    }
-	return( !undef );
-}
-
-sub zmMemClean
-{
-    Debug( "Removing shared memory\n" );
-    # Find ZoneMinder shared memory
-    my $command = "ipcs -m | grep '^".substr( sprintf( "0x%x", hex(ZM_SHM_KEY) ), 0, -2 )."'";
-    Debug( "Checking for shared memory with '$command'\n" );
-    open( CMD, "$command |" ) or Fatal( "Can't execute '$command': $!" );
-    while( <CMD> )
-    {
-        chomp;
-        my ( $key, $id ) = split( /\s+/ );
-        if ( $id =~ /^(\d+)/ )
-        {
-            $id = $1;
-            $command = "ipcrm shm $id";
-            Debug( "Removing shared memory with '$command'\n" );
-            qx( $command );
-        }
-    }
-    close( CMD );
-}
-
-1;
-__END__
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel.pm
@ -1,166 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the base class definition of the trigger channel
-# class tree
-#
-package ZoneMinder::Trigger::Channel;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Database Access
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-use Carp;
-
-our $AUTOLOAD;
-
-sub new
-{
-	my $class = shift;
-	my $self = {};
-	$self->{readable} = !undef;
-	$self->{writeable} = !undef;
-	$self->{selectable} = undef;
-	$self->{state} = 'closed';
-	bless( $self, $class );
-	return $self;
-}
-
-sub clone
-{
-	my $self = shift;
-	my $clone = { %$self };
-	bless $clone, ref $self;
-}
-
-sub open()
-{
-	my $self = shift;
-	my $class = ref($self) or croak( "Can't get class for non object $self" );
-	croak( "Abstract base class method called for object of class $class" );
-}
-
-sub close()
-{
-	my $self = shift;
-	my $class = ref($self) or croak( "Can't get class for non object $self" );
-	croak( "Abstract base class method called for object of class $class" );
-}
-
-sub getState()
-{
-	my $self = shift;
-	return( $self->{state} );
-}
-
-sub isOpen()
-{
-	my $self = shift;
-	return( $self->{state} eq "open" );
-}
-
-sub isConnected()
-{
-	my $self = shift;
-	return( $self->{state} eq "connected" );
-}
-
-sub DESTROY
-{
-}
-
-sub AUTOLOAD
-{
-	my $self = shift;
-	my $class = ref($self) || croak( "$self not object" );
-	my $name = $AUTOLOAD;
-	$name =~ s/.*://;
-	if ( !exists($self->{$name}) )
-	{
-		croak( "Can't access $name member of object of class $class" );
-	}
-	return( $self->{$name} );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/File.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/File.pm
@ -1,121 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Handle Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the class definition of the simple file based trigger
-# channel class
-#
-package ZoneMinder::Trigger::Channel::File;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Trigger::Channel::Handle;
-
-our @ISA = qw(ZoneMinder::Trigger::Channel::Handle);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Simple file based trigger channel
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-use Carp;
-use Fcntl;
-
-sub new
-{
-	my $class = shift;
-	my %params = @_;
-	my $self = ZoneMinder::Trigger::Channel::Handle->new;
-	$self->{path} = $params{path};
-	bless( $self, $class );
-	return $self;
-}
-
-sub open()
-{
-	my $self = shift;
-	local *sfh;
-	#sysopen( *sfh, $conn->{path}, O_NONBLOCK|O_RDONLY ) or croak( "Can't sysopen: $!" );
-	#open( *sfh, "<".$conn->{path} ) or croak( "Can't open: $!" );
-	open( *sfh, "+<".$self->{path} ) or croak( "Can't open: $!" );
-	$self->{state} = 'open';
-	$self->{handle} = *sfh;
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Handle.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Handle.pm
@ -1,154 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Handle Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the class definition of the handle based trigger channel
-# class
-#
-package ZoneMinder::Trigger::Channel::Handle;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Trigger::Channel;
-
-our @ISA = qw(ZoneMinder::Trigger::Channel);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Base class for handle based trigger channels
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-use POSIX;
-
-sub new
-{
-	my $class = shift;
-	my $port = shift;
-	my $self = ZoneMinder::Trigger::Channel->new();
-	$self->{handle} = undef;
-	bless( $self, $class );
-	return $self;
-}
-
-sub spawns
-{
-    return( undef );
-}
-
-sub close()
-{
-	my $self = shift;
-	close( $self->{handle} );
-	$self->{state} = 'closed';
-	$self->{handle} = undef;
-}
-
-sub read()
-{
-	my $self = shift;
-	my $buffer;
-	my $nbytes = sysread( $self->{handle}, $buffer, POSIX::BUFSIZ );
-	if ( !$nbytes )
-	{
-		return( undef );
-	}
-	Debug( "Read '$buffer' ($nbytes bytes)\n" );
-	return( $buffer );
-}
-
-sub write()
-{
-	my $self = shift;
-	my $buffer = shift;
-	my $nbytes = syswrite( $self->{handle}, $buffer );
-	if ( !defined( $nbytes) || $nbytes < length($buffer) )
-	{
-		Error( "Unable to write buffer '".$buffer.", expected ".length($buffer)." bytes, sent ".$nbytes.": $!\n" );
-		return( undef );
-	}
-	Debug( "Wrote '$buffer' ($nbytes bytes)\n" );
-	return( !undef );
-}
-
-sub fileno()
-{
-	my $self = shift;
-	return( defined($self->{handle})?fileno($self->{handle}):-1 );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Inet.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Inet.pm
@ -1,142 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Handle Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the class definition of the tcp socket based trigger
-# channel class
-#
-package ZoneMinder::Trigger::Channel::Inet;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Trigger::Channel::Spawning;
-
-our @ISA = qw(ZoneMinder::Trigger::Channel::Spawning);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Internet (TCP) based trigger channel
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-use Carp;
-use Socket;
-
-sub new
-{
-	my $class = shift;
-	my %params = @_;
-	my $self = ZoneMinder::Trigger::Channel::Spawning->new();
-	$self->{selectable} = !undef;
-	$self->{port} = $params{port};
-	bless( $self, $class );
-	return $self;
-}
-
-sub open()
-{
-	my $self = shift;
-	local *sfh;
-	my $saddr = sockaddr_in( $self->{port}, INADDR_ANY );
-	socket( *sfh, PF_INET, SOCK_STREAM, getprotobyname('tcp') ) or croak( "Can't open socket: $!" );
-	setsockopt( *sfh, SOL_SOCKET, SO_REUSEADDR, 1 );
-	bind( *sfh, $saddr ) or croak( "Can't bind: $!" );
-	listen( *sfh, SOMAXCONN ) or croak( "Can't listen: $!" );
-	$self->{state} = 'open';
-	$self->{handle} = *sfh;
-}
-
-sub _spawn( $ )
-{
-	my $self = shift;
-	my $new_handle = shift;
-	my $clone = $self->clone();
-	$clone->{handle} = $new_handle;
-	$clone->{state} = 'connected';
-	return( $clone );
-}
-
-sub accept()
-{
-	my $self = shift;
-	local *cfh;
-	my $paddr = accept( *cfh, $self->{handle} );
-	return( $self->_spawn( *cfh ) );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Serial.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Serial.pm
@ -1,160 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Handle Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the class definition of the serial port trigger channel
-# class
-#
-package ZoneMinder::Trigger::Channel::Serial;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Trigger::Channel;
-
-our @ISA = qw(ZoneMinder::Trigger::Channel);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Serial access trigger channel
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-use Device::SerialPort;
-
-sub new
-{
-	my $class = shift;
-	my %params = @_;
-	my $self = ZoneMinder::Trigger::Channel->new;
-	$self->{path} = $params{path};
-	bless( $self, $class );
-	return $self;
-}
-
-sub open()
-{
-	my $self = shift;
-	my $device = new Device::SerialPort( $self->{path} );
-	$device->baudrate(9600);
-	$device->databits(8);
-	$device->parity('none');
-	$device->stopbits(1);
-	$device->handshake('none');
-
-	$device->read_const_time(50);
-	$device->read_char_time(10);
-
-	$self->{device} = $device;
-	$self->{state} = 'open';
-	$self->{state} = 'connected';
-}
-
-sub close()
-{
-	my $self = shift;
-	$self->{device}->close();
-	$self->{state} = 'closed';
-}
-
-sub read()
-{
-	my $self = shift;
-	my $buffer = $self->{device}->lookfor();
-	if ( !$buffer || !length($buffer) )
-	{
-		return( undef );
-	}
-	Debug( "Read '$buffer' (".length($buffer)." bytes)\n" );
-	return( $buffer );
-}
-
-sub write()
-{
-	my $self = shift;
-	my $buffer = shift;
-	my $nbytes = $self->{device}->write( $buffer );
-	$self->{device}->write_drain();
-	if ( !defined( $nbytes) || $nbytes < length($buffer) )
-	{
-		Error( "Unable to write buffer '".$buffer.", expected ".length($buffer)." bytes, sent ".$nbytes.": $!\n" );
-		return( undef );
-	}
-	Debug( "Wrote '$buffer' ($nbytes bytes)\n" );
-	return( !undef );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Spawning.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Spawning.pm
@ -1,112 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Handle Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the class definition of the handle based trigger channel
-# classes that spawn new connections when connected.
-#
-package ZoneMinder::Trigger::Channel::Spawning;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Trigger::Channel::Handle;
-
-our @ISA = qw(ZoneMinder::Trigger::Channel::Handle);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Base class for handle based triggers that spawn new connections
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-sub new
-{
-	my $class = shift;
-	my $port = shift;
-	my $self = ZoneMinder::Trigger::Channel::Handle->new();
-	$self->{spawns} = !undef;
-	bless( $self, $class );
-	return $self;
-}
-
-sub spawns
-{
-    return( !undef );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Unix.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Unix.pm
@ -1,141 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Handle Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the class definition of the unix socket based trigger
-# channel class
-#
-package ZoneMinder::Trigger::Channel::Unix;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Trigger::Channel::Spawning;
-
-our @ISA = qw(ZoneMinder::Trigger::Channel::Spawning);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Unix socket based trigger channel
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-use Carp;
-use Socket;
-
-sub new
-{
-	my $class = shift;
-	my %params = @_;
-	my $self = ZoneMinder::Trigger::Channel->new;
-	$self->{selectable} = !undef;
-	$self->{path} = $params{path};
-	bless( $self, $class );
-	return $self;
-}
-
-sub open()
-{
-	my $self = shift;
-	local *sfh;
-	unlink( $self->{path} );
-	my $saddr = sockaddr_un( $self->{path} );
-	socket( *sfh, PF_UNIX, SOCK_STREAM, 0 ) or croak( "Can't open socket: $!" );
-	bind( *sfh, $saddr ) or croak( "Can't bind: $!" );
-	listen( *sfh, SOMAXCONN ) or croak( "Can't listen: $!" );
-	$self->{handle} = *sfh;
-}
-
-sub _spawn( $ )
-{
-    my $self = shift;
-    my $new_handle = shift;
-    my $clone = $self->clone();
-    $clone->{handle} = $new_handle;
-    $clone->{state} = 'connected';
-    return( $clone );
-}
-
-sub accept()
-{
-    my $self = shift;
-    local *cfh;
-    my $paddr = accept( *cfh, $self->{handle} );
-    return( $self->_spawn( *cfh ) );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Connection.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Connection.pm
@ -1,239 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Connection Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the base class definition of the trigger connection
-# class tree
-#
-package ZoneMinder::Trigger::Connection;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Base connection class
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-use Carp;
-
-our $AUTOLOAD;
-
-sub new
-{
-	my $class = shift;
-	my %params = @_;
-	my $self = {};
-	$self->{name} = $params{name};
-	$self->{channel} = $params{channel};
-	$self->{input} = $params{mode} =~ /r/i;
-	$self->{output} = $params{mode} =~ /w/i;
-	bless( $self, $class );
-	return $self;
-}
-
-sub clone
-{
-	my $self = shift;
-	my $clone = { %$self };
-	bless $clone, ref $self;
-	return( $clone );
-}
-
-sub spawns
-{
-	my $self = shift;
-    return( $self->{channel}->spawns() );
-}
-
-sub _spawn( $ )
-{
-	my $self = shift;
-	my $new_channel = shift;
-	my $clone = $self->clone();
-	$clone->{channel} = $new_channel;
-	return( $clone );
-}
-
-sub accept()
-{
-	my $self = shift;
-	my $new_channel = $self->{channel}->accept();
-	return( $self->_spawn( $new_channel ) );
-}
-
-sub open()
-{
-	my $self = shift;
-	return( $self->{channel}->open() );
-}
-
-sub close()
-{
-	my $self = shift;
-	return( $self->{channel}->close() );
-}
-
-sub fileno()
-{
-	my $self = shift;
-	return( $self->{channel}->fileno() );
-}
-
-sub isOpen()
-{
-	my $self = shift;
-	return( $self->{channel}->isOpen() );
-}
-
-sub isConnected()
-{
-	my $self = shift;
-	return( $self->{channel}->isConnected() );
-}
-
-sub canRead()
-{
-	my $self = shift;
-	return( $self->{input} && $self->isConnected() );
-}
-
-sub canWrite()
-{
-	my $self = shift;
-	return( $self->{output} && $self->isConnected() );
-}
-
-sub getMessages
-{
-	my $self = shift;
-	my $buffer = $self->{channel}->read();
-
-	return( undef ) if ( !defined($buffer) );
-
-	my @messages = split( /\r?\n/, $buffer );
-	return( \@messages );
-}
-
-sub putMessages
-{
-	my $self = shift;
-	my $messages = shift;
-
-	if ( @$messages )
-	{
-		my $buffer = join( "\n", @$messages );
-		$buffer .= "\n";
-		if ( !$self->{channel}->write( $buffer ) )
-		{
-			Error( "Unable to write buffer '".$buffer." to connection ".$self->{name}." (".$self->fileno().")\n" );
-		}
-	}
-	return( undef );
-}
-
-sub timedActions
-{
-}
-
-sub DESTROY
-{
-}
-
-sub AUTOLOAD
-{
-	my $self = shift;
-	my $class = ref($self) || croak( "$self not object" );
-	my $name = $AUTOLOAD;
-	$name =~ s/.*://;
-	if ( exists($self->{$name}) )
-	{
-		return( $self->{$name} );
-	}
-	elsif ( defined($self->{channel}) )
-	{
-		if ( exists($self->{channel}->{$name}) )
-		{
-			return( $self->{channel}->{$name} );
-		}
-	}
-	croak( "Can't access $name member of object of class $class" );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Connection/Example.pm
+++ b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Connection/Example.pm
@ -1,134 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Handle Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains an example overriden trigger connection class
-#
-package ZoneMinder::Trigger::Connection::Example;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Trigger::Connection;
-
-our @ISA = qw(ZoneMinder::Trigger::Connection);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Example overridden connection class
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-sub new
-{
-	my $class = shift;
-	my $path = shift;
-	my $self = ZoneMinder::Trigger::Connection->new( @_ );
-	bless( $self, $class );
-	return $self;
-}
-
-sub getMessages
-{
-	my $self = shift;
-	my $buffer = $self->{channel}->read();
-
-	return( undef ) if ( !defined($buffer) );
-
-	Debug( "Handling buffer '$buffer'\n" );
-	my @messages = grep { s/-/|/g; 1; } split( /\r?\n/, $buffer );
-	return( \@messages );
-}
-
-sub putMessages
-{
-	my $self = shift;
-	my $messages = shift;
-
-	if ( @$messages )
-	{
-		my $buffer = join( "\n", grep{ s/\|/-/; 1; } @$messages );
-		$buffer .= "\n";
-		if ( !$self->{channel}->write( $buffer ) )
-		{
-			Error( "Unable to write buffer '".$buffer." to connection ".$self->{name}." (".$self->fileno().")\n" );
-		}
-	}
-	return( undef );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
--- a/scripts/ZoneMinder/blib/lib/auto/ZoneMinder/.exists
+++ b/scripts/ZoneMinder/blib/lib/auto/ZoneMinder/.exists
--- a/scripts/ZoneMinder/blib/man1/.exists
+++ b/scripts/ZoneMinder/blib/man1/.exists
--- a/scripts/ZoneMinder/blib/man3/.exists
+++ b/scripts/ZoneMinder/blib/man3/.exists
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder.3pm
+++ b/scripts/ZoneMinder/blib/man3/ZoneMinder.3pm
@ -1,177 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder 3pm"
-.TH ZoneMinder 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder \- Container module for common ZoneMinder modules
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 1
-\&  use ZoneMinder;
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-This module is a convenience container module that uses the
-ZoneMinder::Base, ZoneMinder::Common, ZoneMinder::Logger,
-ZoneMinder::Database and ZoneMinder::Memory modules. It also
-exports by default all symbols provided by the 'all' tag of 
-each of the modules.
-.PP
-Thus 'use'ing this module is equivalent to the following
-.PP
-.Vb 5
-\&  use ZoneMinder::Base qw(:all);
-\&  use ZoneMinder::Config qw(:all);
-\&  use ZoneMinder::Logger qw(:all);
-\&  use ZoneMinder::Database qw(:all);
-\&  use ZoneMinder::Memory qw(:all);
-.Ve
-.PP
-but is somewhat easier.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-All symbols exported by the 'all' tag of each of the included
-modules.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-ZoneMinder::Base, ZoneMinder::Common, ZoneMinder::Logger,
-ZoneMinder::Database, ZoneMinder::Memory
-.PP
-http://www.zoneminder.com
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2005 by Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Base.3pm
+++ b/scripts/ZoneMinder/blib/man3/ZoneMinder::Base.3pm
@ -1,157 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Base 3pm"
-.TH ZoneMinder::Base 3pm "2012-09-11" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Base \- Base perl module for ZoneMinder
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 1
-\&  use ZoneMinder::Base;
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-This module is the base module for the rest of the ZoneMinder modules. It is included by each of the other modules but serves no purpose other than to propagate the perl module version amongst the other modules. You will never need to use this module directly but if you write new ZoneMinder modules they should include it.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-http://www.zoneminder.com
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Config.3pm
+++ b/scripts/ZoneMinder/blib/man3/ZoneMinder::Config.3pm
@ -1,166 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Config 3pm"
-.TH ZoneMinder::Config 3pm "2012-09-11" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Config \- ZoneMinder configuration module.
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 1
-\&  use ZoneMinder::Config qw(:all);
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-The ZoneMinder::Config module is used to import the ZoneMinder configuration from the database. It will do this at compile time in a \s-1BEGIN\s0 block and require access to the zm.conf file either in the current directory or in its defined location in order to determine database access details, configuration from this file will also be included. If the :all or :config tags are used then this configuration is exported into the namespace of the calling program or module.
-.PP
-Once the configuration has been imported then configuration variables are defined as constants and can be accessed directory by name, e.g.
-.PP
-.Vb 1
-\& $lang = ZM_LANG_DEFAULT;
-.Ve
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-The :constants tag will export the \s-1ZM_PID\s0 constant which details the location of the zm.pid file
-The :config tag will export all configuration from the database as well as any from the zm.conf file
-The :all tag will export all above symbols.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-http://www.zoneminder.com
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::ConfigAdmin.3pm
+++ b/scripts/ZoneMinder/blib/man3/ZoneMinder::ConfigAdmin.3pm
@ -1,180 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::ConfigAdmin 3pm"
-.TH ZoneMinder::ConfigAdmin 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::ConfigAdmin \- ZoneMinder Configuration Administration module
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::ConfigAdmin;
-\&  use ZoneMinder::ConfigAdmin qw(:all);
-\&
-\&  loadConfigFromDB();
-\&  saveConfigToDB();
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-The ZoneMinder:ConfigAdmin module contains the master definition of the ZoneMinder configuration options as well as helper methods. This module is intended for specialist confguration management and would not normally be used by end users.
-.PP
-The configuration held in this module, which was previously in zmconfig.pl, includes the name, default value, description, help text, type and category for each option, as well as a number of additional fields in a small number of cases.
-.SH "METHODS"
-.IX Header "METHODS"
-.IP "loadConfigFromDB ();" 4
-.IX Item "loadConfigFromDB ();"
-Loads existing configuration from the database (if any) and merges it with the definitions held in this module. This results in the merging of any new configuration and the removal of any deprecated configuration while preserving the existing values of every else.
-.IP "saveConfigToDB ();" 4
-.IX Item "saveConfigToDB ();"
-Saves configuration held in memory to the database. The act of loading and saving configuration is a convenient way to ensure that the configuration held in the database corresponds with the most recent definitions and that all components are using the same set of configuration.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-The :data tag will export the various configuration data structures
-The :functions tag will export the helper functions.
-The :all tag will export all above symbols.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-http://www.zoneminder.com
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-.SH "POD ERRORS"
-.IX Header "POD ERRORS"
-Hey! \fBThe above document had some coding errors, which are explained below:\fR
-.IP "Around line 188:" 4
-.IX Item "Around line 188:"
-You forgot a '=back' before '=head2'
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::ConfigData.3pm
+++ b/scripts/ZoneMinder/blib/man3/ZoneMinder::ConfigData.3pm
@ -1,180 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::ConfigData 3pm"
-.TH ZoneMinder::ConfigData 3pm "2012-09-11" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::ConfigData \- ZoneMinder Configuration Data module
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::ConfigData;
-\&  use ZoneMinder::ConfigData qw(:all);
-\&
-\&  loadConfigFromDB();
-\&  saveConfigToDB();
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-The ZoneMinder:ConfigData module contains the master definition of the ZoneMinder configuration options as well as helper methods. This module is intended for specialist confguration management and would not normally be used by end users.
-.PP
-The configuration held in this module, which was previously in zmconfig.pl, includes the name, default value, description, help text, type and category for each option, as well as a number of additional fields in a small number of cases.
-.SH "METHODS"
-.IX Header "METHODS"
-.IP "loadConfigFromDB ();" 4
-.IX Item "loadConfigFromDB ();"
-Loads existing configuration from the database (if any) and merges it with the definitions held in this module. This results in the merging of any new configuration and the removal of any deprecated configuration while preserving the existing values of every else.
-.IP "saveConfigToDB ();" 4
-.IX Item "saveConfigToDB ();"
-Saves configuration held in memory to the database. The act of loading and saving configuration is a convenient way to ensure that the configuration held in the database corresponds with the most recent definitions and that all components are using the same set of configuration.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-The :data tag will export the various configuration data structures
-The :functions tag will export the helper functions.
-The :all tag will export all above symbols.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-http://www.zoneminder.com
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-.SH "POD ERRORS"
-.IX Header "POD ERRORS"
-Hey! \fBThe above document had some coding errors, which are explained below:\fR
-.IP "Around line 2031:" 4
-.IX Item "Around line 2031:"
-You forgot a '=back' before '=head2'
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control.3pm
+++ b/scripts/ZoneMinder/blib/man3/ZoneMinder::Control.3pm
@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Control 3pm"
-.TH ZoneMinder::Control 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::AxisV2.3pm
+++ b/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::AxisV2.3pm
@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Control::AxisV2 3pm"
-.TH ZoneMinder::Control::AxisV2 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::Ncs370.3pm
+++ b/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::Ncs370.3pm
@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Control::Ncs370 3pm"
-.TH ZoneMinder::Control::Ncs370 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::PanasonicIP.3pm
+++ b/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::PanasonicIP.3pm
@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Control::PanasonicIP 3pm"
-.TH ZoneMinder::Control::PanasonicIP 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::PelcoD.3pm
+++ b/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::PelcoD.3pm
@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Control::PelcoD 3pm"
-.TH ZoneMinder::Control::PelcoD 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::Visca.3pm
+++ b/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::Visca.3pm
@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Control::Visca 3pm"
-.TH ZoneMinder::Control::Visca 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::mjpgStreamer.3pm
+++ b/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::mjpgStreamer.3pm
@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Control::mjpgStreamer 3pm"
-.TH ZoneMinder::Control::mjpgStreamer 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2005 by Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Database.3pm
+++ b/scripts/ZoneMinder/blib/man3/ZoneMinder::Database.3pm
@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Database 3pm"
-.TH ZoneMinder::Database 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::General.3pm
+++ b/scripts/ZoneMinder/blib/man3/ZoneMinder::General.3pm
@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::General 3pm"
-.TH ZoneMinder::General 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Logger.3pm
+++ b/scripts/ZoneMinder/blib/man3/ZoneMinder::Logger.3pm
@ -1,259 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Logger 3pm"
-.TH ZoneMinder::Logger 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Logger \- ZoneMinder Logger module
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Logger;
-\&  use ZoneMinder::Logger qw(:all);
-\&
-\&  logInit( "myproc", DEBUG );
-\&
-\&  Debug( "This is what is happening" );
-\&  Info( "Something interesting is happening" );
-\&  Warning( "Something might be going wrong." );
-\&  Error( "Something has gone wrong!!" );
-\&  Fatal( "Something has gone badly wrong, gotta stop!!" );
-\&  Panic( "Something fundamental has gone wrong, die with stack trace );
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-The ZoneMinder:Logger module contains the common debug and error reporting routines used by the ZoneMinder scripts.
-.PP
-To use debug in your scripts you need to include this module, and call logInit. Thereafter you can sprinkle Debug or Error calls etc throughout the code safe in the knowledge that they will be reported to your error log, and possibly the syslogger, in a meaningful and consistent format.
-.PP
-Debug is discussed in terms of levels where 1 and above (currently only 1 for scripts) is considered debug, 0 is considered as informational, \-1 is a warning, \-2 is an error and \-3 is a fatal error or panic. Where levels are mentioned below as thresholds the value given and anything with a lower level (ie. more serious) will be included.
-.SH "METHODS"
-.IX Header "METHODS"
-.ie n .IP "logInit ( $id, %options );" 4
-.el .IP "logInit ( \f(CW$id\fR, \f(CW%options\fR );" 4
-.IX Item "logInit ( $id, %options );"
-Initialises the debug and prepares the logging for forthcoming operations. If not called explicitly it will be called by the first debug call in your script, but with default (and probably meaningless) options. The only compulsory arguments are \f(CW$id\fR which must be a string that will identify debug coming from this script in mixed logs. Other options may be provided as below,
-.Sp
-.Vb 8
-\& Option        Default        Description
-\& \-\-\-\-\-\-\-\-\-     \-\-\-\-\-\-\-\-\-      \-\-\-\-\-\-\-\-\-\-\-
-\& level         INFO       The initial debug level which defines which statements are output and which are ignored
-\& trace         0          Whether to use the Carp::shortmess format in debug statements to identify where the debug was emitted from
-\& termLevel     NOLOG      At what level debug is written to terminal standard error, 0 is no, 1 is yes, 2 is write only if terminal
-\& databaseLevel INFO       At what level debug is written to the Log table in the database;
-\& fileLevel     NOLOG      At what level debug is written to a log file of the format of <id>.log in the standard log directory.
-\& syslogLevel   INFO       At what level debug is written to syslog.
-.Ve
-.Sp
-To disable any of these action entirely set to \s-1NOLOG\s0
-.IP "logTerm ();" 4
-.IX Item "logTerm ();"
-Used to end the debug session and close any logs etc. Not usually necessary.
-.ie n .IP "$id            = logId ( [$id] );" 4
-.el .IP "\f(CW$id\fR            = logId ( [$id] );" 4
-.IX Item "$id            = logId ( [$id] );"
-.PD 0
-.ie n .IP "$level         = logLevel ( [$level] );" 4
-.el .IP "\f(CW$level\fR         = logLevel ( [$level] );" 4
-.IX Item "$level         = logLevel ( [$level] );"
-.ie n .IP "$trace         = logTrace ( [$trace] );" 4
-.el .IP "\f(CW$trace\fR         = logTrace ( [$trace] );" 4
-.IX Item "$trace         = logTrace ( [$trace] );"
-.ie n .IP "$level         = logLevel ( [$level] );" 4
-.el .IP "\f(CW$level\fR         = logLevel ( [$level] );" 4
-.IX Item "$level         = logLevel ( [$level] );"
-.ie n .IP "$termLevel     = logTermLevel ( [$termLevel] );" 4
-.el .IP "\f(CW$termLevel\fR     = logTermLevel ( [$termLevel] );" 4
-.IX Item "$termLevel     = logTermLevel ( [$termLevel] );"
-.ie n .IP "$databaseLevel = logDatabaseLevel ( [$databaseLevel] );" 4
-.el .IP "\f(CW$databaseLevel\fR = logDatabaseLevel ( [$databaseLevel] );" 4
-.IX Item "$databaseLevel = logDatabaseLevel ( [$databaseLevel] );"
-.ie n .IP "$fileLevel     = logFileLevel ( [$fileLevel] );" 4
-.el .IP "\f(CW$fileLevel\fR     = logFileLevel ( [$fileLevel] );" 4
-.IX Item "$fileLevel     = logFileLevel ( [$fileLevel] );"
-.ie n .IP "$syslogLevel   = logSyslogLevel ( [$syslogLevel] );" 4
-.el .IP "\f(CW$syslogLevel\fR   = logSyslogLevel ( [$syslogLevel] );" 4
-.IX Item "$syslogLevel   = logSyslogLevel ( [$syslogLevel] );"
-.PD
-These methods can be used to get and set the current settings as defined in logInit.
-.ie n .IP "Debug( $string );" 4
-.el .IP "Debug( \f(CW$string\fR );" 4
-.IX Item "Debug( $string );"
-This method will output a debug message if the current debug level permits it, otherwise does nothing. This message will be tagged with the \s-1DBG\s0 string in the logs.
-.ie n .IP "Info( $string );" 4
-.el .IP "Info( \f(CW$string\fR );" 4
-.IX Item "Info( $string );"
-This method will output an informational message if the current debug level permits it, otherwise does nothing. This message will be tagged with the \s-1INF\s0 string in the logs.
-.ie n .IP "Warning( $string );" 4
-.el .IP "Warning( \f(CW$string\fR );" 4
-.IX Item "Warning( $string );"
-This method will output a warning message if the current debug level permits it, otherwise does nothing. This message will be tagged with the \s-1WAR\s0 string in the logs.
-.ie n .IP "Error( $string );" 4
-.el .IP "Error( \f(CW$string\fR );" 4
-.IX Item "Error( $string );"
-This method will output an error message if the current debug level permits it, otherwise does nothing. This message will be tagged with the \s-1ERR\s0 string in the logs.
-.ie n .IP "Fatal( $string );" 4
-.el .IP "Fatal( \f(CW$string\fR );" 4
-.IX Item "Fatal( $string );"
-This method will output a fatal error message and then die if the current debug level permits it, otherwise does nothing. This message will be tagged with the \s-1FAT\s0 string in the logs.
-.ie n .IP "Panic( $string );" 4
-.el .IP "Panic( \f(CW$string\fR );" 4
-.IX Item "Panic( $string );"
-This method will output a panic error message and then die with a stack trace if the current debug level permits it, otherwise does nothing. This message will be tagged with the \s-1PNC\s0 string in the logs.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-The :constants tag will export the debug constants which define the various levels of debug
-The :variables tag will export variables containing the current debug id and level
-The :functions tag will export the debug functions. This or :all is what you would normally use.
-The :all tag will export all above symbols.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Carp
-Sys::Syslog
-.PP
-The ZoneMinder \s-1README\s0 file Troubleshooting section for an extended discussion on the use and configuration of syslog with ZoneMinder.
-.PP
-http://www.zoneminder.com
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-.SH "POD ERRORS"
-.IX Header "POD ERRORS"
-Hey! \fBThe above document had some coding errors, which are explained below:\fR
-.IP "Around line 830:" 4
-.IX Item "Around line 830:"
-You forgot a '=back' before '=head2'
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`Subproject commit 4d508d8be232a4f84aefe37327b0e737196f58d1`
				`@ -0,0 +1 @@`
				`INSERT INTO Monitors (Name, Type, Function, Enabled, Format, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation, Deinterlacing, Brightness, Contrast, Hue, Colour, RefBlendPerc) VALUES ('travis_test','Remote','Modect',1,255,'http','simple','50.79.143.149','21146','/mjpg/video.mjpg',1280,800,3,0,'0',0,-1,-1,-1,-1,12);`