Merge remote-tracking branch 'upstream/master'

Conflicts: .travis.yml
2014-10-31 12:25:57 -04:00 · 2014-10-31 12:25:57 -04:00 · c48b039b15
parent cda96c7ad9 16c86e6604
commit c48b039b15
110 changed files with 4263 additions and 560 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -17,11 +17,32 @@ env:
 compiler:
  - gcc
 before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y -qq libpolkit-gobject-1-dev zlib1g-dev apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf cmake libjpeg-turbo8-dev apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev libvlccore-dev libvlc-dev libvlccore5 libvlc5 2>&1 > /dev/null 
 install:
-  - travis_retry bash $TRAVIS_BUILD_DIR/utils/travis/install-deps.sh
-  - travis_wait bash $TRAVIS_BUILD_DIR/utils/travis/install-ffmpeg.sh
+  - git clone -b n2.4.2 --depth=1 git://source.ffmpeg.org/ffmpeg.git
+  - cd ffmpeg
+  - ./configure --enable-shared --enable-swscale --enable-gpl  --enable-libx264 --enable-libvpx --enable-libvorbis --enable-libtheora 
+  - make -j `grep processor /proc/cpuinfo|wc -l` 
+  - sudo make install 
+  - sudo make install-libs
 before_script:
-  - bash $TRAVIS_BUILD_DIR/utils/travis/bootstrap-zm.sh
+  - cd $TRAVIS_BUILD_DIR
+  - 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
+  - mysql -uroot -e "CREATE DATABASE IF NOT EXISTS zm"
+  - mysql -uroot -e "GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'zmpass'";
+  - mysql -uroot -e "FLUSH PRIVILEGES"
 script:
-  - bash $TRAVIS_BUILD_DIR/utils/travis/build-zm.sh
-  - bash $TRAVIS_BUILD_DIR/utils/travis/run-tests.sh
+  - 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
+  - sudo make install
+  - if [ "$ZM_BUILDMETHOD" = "cmake" ]; then sudo ./zmlinkcontent.sh; fi
+  - mysql -uzmuser -pzmpass < db/zm_create.sql
+  - mysql -uzmuser -pzmpass zm < db/test.monitor.sql
+  - sudo zmpkg.pl start
+  - sudo zmfilter.pl -f purgewhenfull
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -10,7 +10,7 @@
 #
 cmake_minimum_required (VERSION 2.6)
 project (zoneminder)
-set(zoneminder_VERSION "1.27.99.0")
+set(zoneminder_VERSION "1.28.0")

 # CMake does not allow out-of-source build if CMakeCache.exists in the source folder. Abort and notify the user to save him from headache why it doesn't work.
 if((NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) AND (EXISTS "${CMAKE_SOURCE_DIR}/CMakeCache.txt"))
@ -46,7 +46,8 @@ include (CheckStructHasMember)
 # Configuration options
 mark_as_advanced(FORCE ZM_EXTRA_LIBS ZM_MYSQL_ENGINE ZM_NO_MMAP CMAKE_INSTALL_FULL_BINDIR ZM_PERL_SUBPREFIX ZM_PERL_USE_PATH ZM_TARGET_DISTRO)
 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_SOCKDIR "/var/run/zm" CACHE PATH "Location of Unix domain socket files, default /var/run/zm")
+set(ZM_TMPDIR "/var/tmp/zm" CACHE PATH "Location of temporary files, default: /tmp/zm")
 set(ZM_LOGDIR "/var/log/zm" CACHE PATH "Location of generated log files, default: /var/log/zm")
 set(ZM_WEBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/zoneminder/www" CACHE PATH "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")
@ -67,11 +68,12 @@ set(ZM_NO_CURL "OFF" CACHE BOOL "Set to ON to skip cURL checks and force buildin
 set(ZM_NO_X10 "OFF" CACHE BOOL "Set to ON to build ZoneMinder without X10 support. default: OFF")
 set(ZM_PERL_SUBPREFIX "${CMAKE_INSTALL_LIBDIR}/perl5" CACHE PATH "Use a different directory for the zm perl modules. NOTE: This is a subprefix, e.g. lib will be turned into <prefix>/lib, default: <libdir>/perl5")
 set(ZM_PERL_USE_PATH "${CMAKE_INSTALL_PREFIX}/${ZM_PERL_SUBPREFIX}" CACHE PATH "Override the include path for zm perl modules. Useful if you are moving the perl modules without using the ZM_PERL_SUBPREFIX option. default: <prefix>/<zmperlsubprefix>")
-set(ZM_TARGET_DISTRO "" CACHE STRING "Build ZoneMinder for a specific distribution.  Currently, valid names are: f19, el6, OS13")
+set(ZM_TARGET_DISTRO "" CACHE STRING "Build ZoneMinder for a specific distribution.  Currently, valid names are: f19, f20, el6, OS13")

 # Reassign some variables if a target distro has been specified
-if((ZM_TARGET_DISTRO STREQUAL "f19") OR (ZM_TARGET_DISTRO STREQUAL "el6"))
+if((ZM_TARGET_DISTRO STREQUAL "f19") OR (ZM_TARGET_DISTRO STREQUAL "f20") OR (ZM_TARGET_DISTRO STREQUAL "el6"))
 	set(ZM_RUNDIR "/var/run/zoneminder")
+	set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
 	set(ZM_TMPDIR "/var/lib/zoneminder/temp")
 	set(ZM_LOGDIR "/var/log/zoneminder")
 elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
@ -83,7 +85,7 @@ elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
 	set(ZM_WEB_GROUP "www")
 	set(ZM_WEBDIR "/srv/www/htdocs/zoneminder")
 	set(ZM_CGIDIR "/srv/www/cgi-bin")
-endif((ZM_TARGET_DISTRO STREQUAL "f19") OR (ZM_TARGET_DISTRO STREQUAL "el6"))
+endif((ZM_TARGET_DISTRO STREQUAL "f19") OR (ZM_TARGET_DISTRO STREQUAL "f20") OR (ZM_TARGET_DISTRO STREQUAL "el6"))

 # Required for certain checks to work
 set(CMAKE_EXTRA_INCLUDE_FILES ${CMAKE_EXTRA_INCLUDE_FILES} stdio.h stdlib.h math.h signal.h)
@ -476,6 +478,12 @@ endif(NOT ZM_WEB_GROUP)
 message(STATUS "Using web user: ${ZM_WEB_USER}")
 message(STATUS "Using web group: ${ZM_WEB_GROUP}")

+# Check for polkit
+find_package(Polkit)
+if(NOT POLKIT_FOUND)
+	message(FATAL_ERROR "Running ZoneMinder requires polkit. Building ZoneMinder requires the polkit development package.")
+endif(NOT POLKIT_FOUND)
+
 # Some variables that zm expects
 set(ZM_PID "${ZM_RUNDIR}/zm.pid")
 set(ZM_CONFIG "/${CMAKE_INSTALL_SYSCONFDIR}/zm.conf")
@ -502,17 +510,16 @@ add_subdirectory(src)
 add_subdirectory(scripts)
 add_subdirectory(db)
 add_subdirectory(web)
+add_subdirectory(misc)

-# Process misc subdirectories
-if(ZM_TARGET_DISTRO STREQUAL "f19")
+# Process distro subdirectories
+if((ZM_TARGET_DISTRO STREQUAL "f19") OR (ZM_TARGET_DISTRO STREQUAL "f20"))
 	add_subdirectory(distros/fedora)
 elseif(ZM_TARGET_DISTRO STREQUAL "el6")
 	add_subdirectory(distros/redhat)
 elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
 	add_subdirectory(distros/opensuse)
-else(ZM_TARGET_DISTRO STREQUAL "el6")
-	add_subdirectory(misc)
-endif(ZM_TARGET_DISTRO STREQUAL "f19")
+endif((ZM_TARGET_DISTRO STREQUAL "f19") OR (ZM_TARGET_DISTRO STREQUAL "f20"))

 # Print optional libraries detection status
 message(STATUS "Optional libraries found:${optlibsfound}")
--- a/33
+++ b/33
@ -3,24 +3,23 @@
 FROM ubuntu:precise
 MAINTAINER Kyle Johnson <kjohnson@gnulnx.net>

-# Let the conatiner know that there is no tty
+# Let the container know that there is no tty
 ENV DEBIAN_FRONTEND noninteractive

 # Resynchronize the package index files 
-RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
-RUN apt-get update
+RUN apt-get update && apt-get install -y \
+	libpolkit-gobject-1-dev 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 automake autoconf libjpeg-turbo8-dev \
+	libjpeg-turbo8 libtheora-dev libvorbis-dev libvpx-dev libx264-dev libmp4v2-dev ffmpeg mysql-client \
+	apache2 php5 php5-mysql apache2-mpm-prefork libapache2-mod-php5 php5-cli openssh-server \
+	mysql-server libvlc-dev libvlc5 libvlccore-dev libvlccore5 vlc-data vlc libcurl4-openssl-dev

-# Install the prerequisites
-RUN apt-get install -y 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 automake autoconf libjpeg-turbo8-dev libjpeg-turbo8 libtheora-dev libvorbis-dev libvpx-dev libx264-dev libmp4v2-dev ffmpeg git wget mysql-client apache2 php5 php5-mysql apache2-mpm-prefork libapache2-mod-php5 php5-cli openssh-server mysql-server libvlc-dev libvlc5 libvlccore-dev libvlccore5 vlc-data vlc libcurl4-openssl-dev
-
-# Grab the latest ZoneMinder code in master
-RUN git clone https://github.com/kylejohnson/ZoneMinder.git
+# Copy local code into our container
+ADD . /ZoneMinder

 # Change into the ZoneMinder directory
-WORKDIR ZoneMinder
-
-# Check out the release-1.27 branch
-RUN git checkout release-1.27
+WORKDIR /ZoneMinder

 # Setup the ZoneMinder build environment
 RUN aclocal && autoheader && automake --force-missing --add-missing && autoconf
@ -37,9 +36,16 @@ RUN make install
 # Adding the start script
 ADD utils/docker/start.sh /tmp/start.sh

-# Make start script executable
+# Ensure we can run this
+# TODO - Files ADD'ed have 755 already...why do we need this?
 RUN chmod 755 /tmp/start.sh

+# Creating SSH privledge escalation dir
+RUN mkdir /var/run/sshd
+
+# Adding apache virtual hosts file
+ADD utils/docker/apache-vhost /etc/apache2/sites-enabled/000-default
+
 # Set the root passwd
 RUN echo 'root:root' | chpasswd

@ -47,5 +53,4 @@ RUN echo 'root:root' | chpasswd
 EXPOSE 80
 EXPOSE 22

-
 CMD "/tmp/start.sh"
--- a/Makefile.am
+++ b/Makefile.am
@ -22,10 +22,12 @@ EXTRA_DIST = \
 install-data-hook:
 	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
 	( 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_SOCKDIR); then mkdir -p $(DESTDIR)$(ZM_SOCKDIR); fi; if test "$(DESTDIR)$(ZM_SOCKDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_SOCKDIR); chmod u+w $(DESTDIR)$(ZM_SOCKDIR); fi )
+	( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp" && test "$(DESTDIR)$(ZM_TMPDIR)" != "/var/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 "$(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_SOCKDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_SOCKDIR); fi )
+	@-( if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp" && test "$(DESTDIR)$(ZM_TMPDIR)" != "/var/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
@ -128,6 +128,12 @@ perl-IO-Zlib perl-MailTools perl-MIME-Lite perl-MIME-tools perl-MIME-Types perl-
 perl-TimeDate perl-YAML-Syck php php-cli php-mysql x264 vlc-devel vlc-core libcurl libcurl-devel
 ```

+#### Docker
+
+Docker is a system to run applications inside isolated containers. ZoneMinder, and the ZM webserver, will run using the 
+Dockerfile contained in this repository. However, there is still work needed to ensure that the main ZM features work 
+properly and are documented. 
+
 ### ffmpeg

 This release of ZoneMinder has been tested on and works with ffmpeg version N-55540-g93f4277.
--- a/cmake/Modules/FindGLIB2.cmake
+++ b/cmake/Modules/FindGLIB2.cmake
@ -0,0 +1,55 @@
+# - Try to find the GLIB2 libraries
+# Once done this will define
+#
+#  GLIB2_FOUND - system has glib2
+#  GLIB2_INCLUDE_DIR - the glib2 include directory
+#  GLIB2_LIBRARIES - glib2 library
+
+# Copyright (c) 2008 Laurent Montel, <montel@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
+    # Already in cache, be silent
+    set(GLIB2_FIND_QUIETLY TRUE)
+endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
+
+if (NOT WIN32)
+   find_package(PkgConfig)
+   if (PKG_CONFIG_FOUND)
+     pkg_check_modules(PC_LibGLIB2 glib-2.0)
+   endif (PKG_CONFIG_FOUND)
+endif(NOT WIN32)
+
+if (PC_LibGLIB2_INCLUDEDIR)
+    set(GLIB2_MAIN_INCLUDE_DIR ${PC_LibGLIB2_INCLUDEDIR})
+else (PC_LibGLIB2_INCLUDEDIR)
+    find_path(GLIB2_MAIN_INCLUDE_DIR  NAMES glib.h PATH_SUFFIXES glib-2.0)
+endif (PC_LibGLIB2_INCLUDEDIR)
+
+# search the glibconfig.h include dir under the same root where the library is found
+find_library(GLIB2_LIBRARIES 
+             NAMES glib-2.0 
+             HINTS ${PC_LibGLIB2_LIBDIR}
+)
+
+get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH)
+
+find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h
+          PATH_SUFFIXES glib-2.0/include
+          HINTS ${PC_LibGLIB2_INCLUDEDIR} "${glib2LibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH})
+
+set(GLIB2_INCLUDE_DIR "${GLIB2_MAIN_INCLUDE_DIR}")
+
+# not sure if this include dir is optional or required
+# for now it is optional
+if(GLIB2_INTERNAL_INCLUDE_DIR)
+  set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR} "${GLIB2_INTERNAL_INCLUDE_DIR}")
+endif(GLIB2_INTERNAL_INCLUDE_DIR)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GLIB2  DEFAULT_MSG  GLIB2_LIBRARIES GLIB2_MAIN_INCLUDE_DIR)
+
+mark_as_advanced(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES)
--- a/cmake/Modules/FindPolkit.cmake
+++ b/cmake/Modules/FindPolkit.cmake
@ -0,0 +1,63 @@
+    # - Try to find Polkit
+    # Once done this will define
+    #
+    # POLKIT_FOUND - system has Polkit
+    # POLKIT_INCLUDE_DIRS - Polkit's include directories
+    # POLKIT_AGENT_INCLUDE_DIRS - Polkit-agent's include directories
+    # POLKIT_LIBRARIES - Link this to use polkit's gobject library
+    # POLKIT_AGENT_LIBRARY - Link this to use the agent wrapper in polkit
+    # POLKIT_DEFINITIONS - Compiler switches required for using Polkit
+    # Copyright (c) 2009, Dario Freddi, <drf@kde.org>
+    #
+    # Redistribution and use is allowed according to the terms of the BSD license.
+    # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+    #NOTE: Polkit agent library is disabled!
+    if (POLKIT_INCLUDE_DIR AND POLKIT_LIB)
+    set(POLKIT_FIND_QUIETLY TRUE)
+    endif (POLKIT_INCLUDE_DIR AND POLKIT_LIB)
+    if (NOT WIN32)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig)
+    pkg_check_modules(PC_POLKIT polkit-gobject-1)
+    #pkg_check_modules(PC_POLKIT_AGENT polkit-agent-1)
+    set(POLKIT_DEFINITIONS ${PC_POLKIT_CFLAGS_OTHER})
+    endif (NOT WIN32)
+    # We must include glib paths too... which sucks balls
+    find_package(GLIB2)
+    find_path( GLIB_CONFIG_INCLUDE_DIR
+    NAMES glibconfig.h
+    PATH_SUFFIXES glib-2.0/include
+    HINTS ${PC_POLKIT_INCLUDE_DIRS}
+    )
+    find_path( POLKIT_INCLUDE_DIR
+    NAMES polkit/polkit.h
+    PATH_SUFFIXES polkit-1
+    HINTS ${PC_POLKIT_INCLUDE_DIRS}
+    )
+    #find_path( POLKIT_AGENT_INCLUDE_DIR
+    # NAMES polkitagent/polkitagent.h
+    # PATH_SUFFIXES polkit-1
+    # HINTS ${PC_POLKIT_AGENT_INCLUDE_DIRS}
+    #)
+    #set(POLKIT_INCLUDE_DIRS ${GLIB2_INCLUDE_DIR} ${_POLKIT_INCLUDE_DIR})
+    #set(POLKIT_AGENT_INCLUDE_DIRS ${GLIB2_INCLUDE_DIR} ${_POLKIT_AGENT_INCLUDE_DIR})
+    find_library( POLKIT_LIBRARIES
+    NAMES polkit-gobject-1
+    HINTS ${PC_POLKIT_LIBDIR}
+    )
+    #find_library( POLKIT_AGENT_LIBRARY
+    # NAMES polkit-agent-1
+    # HINTS ${PC_POLKIT_AGENT_LIBDIR}
+    #)
+    #set(POLKIT_LIBRARIES ${_POLKIT_LIBRARIES} ${GLIB2_LIBRARIES})
+    #set(POLKIT_AGENT_LIBRARY ${_POLKIT_AGENT_LIBRARY} ${GLIB2_LIBRARIES})
+    include(FindPackageHandleStandardArgs)
+    # handle the QUIETLY and REQUIRED arguments and set POLKIT_FOUND to TRUE if
+    # all listed variables are TRUE
+    #find_package_handle_standard_args(Polkit DEFAULT_MSG POLKIT_LIBRARIES POLKIT_AGENT_LIBRARY
+    # POLKIT_INCLUDE_DIR POLKIT_AGENT_INCLUDE_DIR GLIB2_FOUND)
+    find_package_handle_standard_args(Polkit DEFAULT_MSG POLKIT_LIBRARIES
+    POLKIT_INCLUDE_DIR GLIB2_FOUND)
+    mark_as_advanced(POLKIT_INCLUDE_DIRS POLKIT_AGENT_INCLUDE_DIRS POLKIT_LIBRARIES POLKIT_AGENT_LIBRARY GLIB_INCLUDE_DIR)
+    set(POLKIT_POLICY_FILES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions)
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(zm,1.27.99.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
+AC_INIT(zm,1.28.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/zm.h)
 AC_CONFIG_HEADERS(config.h)
@ -43,7 +43,8 @@ AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
 AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
 AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default InnoDB])
 AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
-AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /tmp/zm])
+AC_ARG_VAR(ZM_SOCKDIR,[Location of Unix domain socket files, default /var/run/zm])
+AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /var/tmp/zm])
 AC_ARG_VAR(ZM_LOGDIR,[Location of generated log files, default /var/log/zm])

 if test "$ZM_DB_TYPE" == ""; then
@ -70,6 +71,9 @@ fi
 if test "$ZM_RUNDIR" == ""; then
 	AC_SUBST(ZM_RUNDIR,[/var/run/zm])
 fi
+if test "$ZM_SOCKDIR" == ""; then
+	AC_SUBST(ZM_SOCKDIR,[/var/run/zm])
+fi
 if test "$ZM_TMPDIR" == ""; then
 	AC_SUBST(ZM_TMPDIR,[/tmp/zm])
 fi
@ -123,6 +127,15 @@ AC_SUBST(MARIADB_LIBS)
 AC_SUBST(MARIADB_CFLAGS)
 LDFLAGS="$LDFLAGS ${MARIADB_LIBS}"

+POLKIT_PREFIX=/usr
+AC_ARG_WITH(polkit,
+[ --with-polkit=<path> prefix of polkit root directory, default /usr],
+[POLKIT_PREFIX=$with_polkit],
+AC_MSG_WARN([You can call configure with the --with-polkit option.
+This tells configure where to place the polkit policy files.])
+)
+AC_SUBST(POLKIT_PREFIX)
+PKG_CHECK_MODULES(POLKIT, polkit-gobject-1)

 FFMPEG_PREFIX=/usr
 AC_ARG_WITH(ffmpeg,
@ -433,7 +446,7 @@ AC_SUBST(PERL_MM_PARMS)
 AC_SUBST(EXTRA_PERL_LIB)


-AC_CONFIG_FILES([Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql misc/Makefile misc/apache.conf misc/logrotate.conf misc/syslog.conf scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtrack.pl scripts/zmcamtool.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/css/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile web/skins/flat/Makefile web/skins/flat/ajax/Makefile web/skins/flat/css/Makefile web/skins/flat/graphics/Makefile web/skins/flat/includes/Makefile web/skins/flat/js/Makefile web/skins/flat/lang/Makefile web/skins/flat/views/Makefile web/skins/flat/views/css/Makefile web/skins/flat/views/js/Makefile])
+AC_CONFIG_FILES([Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql misc/Makefile misc/apache.conf misc/logrotate.conf misc/syslog.conf misc/com.zoneminder.systemctl.policy misc/com.zoneminder.systemctl.rules scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtrack.pl scripts/zmcamtool.pl scripts/zmsystemctl.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/css/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile web/skins/flat/Makefile web/skins/flat/ajax/Makefile web/skins/flat/css/Makefile web/skins/flat/graphics/Makefile web/skins/flat/includes/Makefile web/skins/flat/js/Makefile web/skins/flat/lang/Makefile web/skins/flat/views/Makefile web/skins/flat/views/css/Makefile web/skins/flat/views/js/Makefile])

 # Create the definitions for compilation and defaults for the database
 AC_CONFIG_COMMANDS([src/zm_config_defines.h],[perl ./zmconfgen.pl])
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@ -323,8 +323,8 @@ CREATE TABLE `Monitors` (
  `Device` varchar(64) NOT NULL default '',
  `Channel` tinyint(3) unsigned NOT NULL default '0',
  `Format` int(10) unsigned NOT NULL default '0',
-  `V4LMultiBuffer`	tinyint(1) unsigned NOT NULL default '0',
-  `V4LCapturesPerFrame`	tinyint(3) unsigned NOT NULL default '1',
+  `V4LMultiBuffer`	tinyint(1) unsigned,
+  `V4LCapturesPerFrame`	tinyint(3) unsigned,
  `Protocol` varchar(16) NOT NULL default '',
  `Method` varchar(16) NOT NULL default '',
  `Host` varchar(64) NOT NULL default '',
--- a/db/zm_update-1.26.0.sql
+++ b/db/zm_update-1.26.0.sql
@ -1,3 +1,27 @@
-ALTER TABLE `Monitors` ADD `Colours` TINYINT UNSIGNED NOT NULL DEFAULT '1' AFTER `Height`;
-ALTER TABLE `Monitors` ADD `Deinterlacing` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `Orientation`;
+SET @s = (SELECT IF(
+    (SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE table_name = 'Monitors'
+    AND table_schema = DATABASE()
+    AND column_name = 'Colours'
+    ) > 0,
+"SELECT 'Column Colours exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `Colours` TINYINT UNSIGNED NOT NULL DEFAULT '1' AFTER `Height`"
+));

+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE table_name = 'Monitors'
+    AND table_schema = DATABASE()
+    AND column_name = 'Deinterlacing'
+    ) > 0,
+"SELECT 'Column Deinterlacing exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `Deinterlacing` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `Orientation`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
--- a/db/zm_update-1.27.99.0.sql
+++ b/db/zm_update-1.27.99.0.sql
@ -185,7 +185,7 @@ SET @s = (SELECT IF(
    AND column_name = 'V4LMultiBuffer'
    ) > 0,
 "SELECT 'Column V4LMultiBuffer exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `V4LMultiBuffer` tinyint(1) unsigned not null default 0 AFTER `Format`"
+"ALTER TABLE `Monitors` ADD `V4LMultiBuffer` tinyint(1) unsigned AFTER `Format`"
 ));

 PREPARE stmt FROM @s;
@ -198,8 +198,8 @@ SET @s = (SELECT IF(
    AND table_schema = DATABASE()
    AND column_name = 'V4LCapturesPerFrame'
    ) > 0,
-"SELECT 'Column CapturesPerFrame exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `V4LCapturesPerFrame` tinyint(3) unsigned not null default 0 AFTER `V4LMultiBuffer`"
+"SELECT 'Column V4LCapturesPerFrame exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `V4LCapturesPerFrame` tinyint(3) unsigned AFTER `V4LMultiBuffer`"
 ));

 PREPARE stmt FROM @s;
--- a/db/zm_update-1.28.0.sql
+++ b/db/zm_update-1.28.0.sql
@ -0,0 +1,6 @@
+--
+-- This updates a 1.27.99 database to 1.28.0
+--
+-- No changes required
+--
+
--- a/distros/debian/changelog
+++ b/distros/debian/changelog
@ -1,11 +1,17 @@
-zoneminder (1.27.99+1-trusty-SNAPSHOT2014072901) trusty; urgency=medium
+zoneminder (1.28.0-wheezy) wheezy; urgency=medium
+
+  * Release
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Fri, 17 Oct 2014 09:27:22 -0400
+
+zoneminder (1.27.99+1-testing-SNAPSHOT2014072901) testing; urgency=medium

  * improve error messages
  * Make zmupdate re-run the most recent patch so that people running the daily builds get their db updates

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

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

  * Snapshot release - 

--- 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 (>= 7.0.50), autoconf, automake, dpatch, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev | libmariadbclient-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 | libav-tools, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libpcre3, libarchive-zip-perl, libmime-lite-perl, libjpeg8, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev
+Build-Depends: debhelper (>= 7.0.50), autoconf, automake, dpatch, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev | libmariadbclient-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 | libav-tools, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libpcre3, libarchive-zip-perl, libmime-lite-perl, libjpeg8, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev, libpolkit-gobject-1-dev
 Standards-Version: 3.9.2

 Package: zoneminder
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2 | httpd, libapache2-mod-php5 | libapache2-mod-fcgid | php5-fpm, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-lite-perl, mariadb-client|mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2 | httpd, libapache2-mod-php5 | libapache2-mod-fcgid | php5-fpm, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0
 Recommends: mysql-server|mariadb-server
 Description: A video camera security and surveillance solution
 ZoneMinder is intended for use in single or multi-camera video security 
--- a/distros/debian/rules
+++ b/distros/debian/rules
@ -9,9 +9,6 @@
 # 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)
@ -31,19 +28,16 @@ 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
+	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-mariadb=/usr --with-webdir=/usr/share/zoneminder --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-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
+	$(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
@ -74,4 +68,4 @@ override_dh_auto_test:

 .PHONY: override_dh_strip
 override_dh_strip:
-	dh_strip --dbg-package=zoneminder-dbg
+		dh_strip --dbg-package=zoneminder-dbg
--- a/distros/fedora/README.Fedora
+++ b/distros/fedora/README.Fedora
@ -80,30 +80,10 @@ New installs
 	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:
+9. Now start zoneminder:

-   a) click Options, then System.
-   b) check OPT_USE_AUTH.
-   c) set AUTH_HASH_SECRET to a random string.
-   d) click Save and refresh the main browser window.
-   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.
+	sudo systemctl enable zoneminder.service
+	sudo systemctl start zoneminder.service

 Upgrades
 ========
--- a/distros/fedora/archive/zoneminder-1.24.3-runlevel.patch
+++ b/distros/fedora/archive/zoneminder-1.24.3-runlevel.patch
--- a/distros/fedora/archive/zoneminder-1.24.4-installfix.patch
+++ b/distros/fedora/archive/zoneminder-1.24.4-installfix.patch
--- a/distros/fedora/archive/zoneminder-1.26.0-defaults.patch
+++ b/distros/fedora/archive/zoneminder-1.26.0-defaults.patch
--- a/distros/fedora/archive/zoneminder-1.26.3-dbinstall.patch
+++ b/distros/fedora/archive/zoneminder-1.26.3-dbinstall.patch
--- a/distros/fedora/archive/zoneminder-1.26.3-noffmpeg.patch
+++ b/distros/fedora/archive/zoneminder-1.26.3-noffmpeg.patch
--- a/distros/fedora/archive/zoneminder-1.26.4-dbinstall.patch
+++ b/distros/fedora/archive/zoneminder-1.26.4-dbinstall.patch
--- a/distros/fedora/archive/zoneminder.cmake.f19.spec
+++ b/distros/fedora/archive/zoneminder.cmake.f19.spec
@ -37,10 +37,10 @@ BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel
 %{!?_without_ffmpeg:BuildRequires: ffmpeg-devel}
 %{!?_without_x10:BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime)}
 # cmake needs the following installed at build time due to the way it auto-detects certain parameters
-BuildRequires:  httpd
+BuildRequires:  httpd polkit-devel
 %{!?_without_ffmpeg:BuildRequires: ffmpeg}

-Requires: httpd php php-mysql cambozola
+Requires: httpd php php-mysql cambozola polkit
 Requires: libjpeg-turbo vlc-core libcurl
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
@ -149,6 +149,7 @@ fi
 %{_bindir}/zmvideo.pl
 %{_bindir}/zmwatch.pl
 %{_bindir}/zmcamtool.pl
+%{_bindir}/zmsystemctl.pl
 %{!?_without_x10:%{_bindir}/zmx10.pl}

 %{perl_vendorlib}/ZoneMinder*
@ -161,6 +162,9 @@ fi
 %{_datadir}/zoneminder/db
 %{_datadir}/zoneminder/www

+%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
+%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
+
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images
--- a/distros/fedora/archive/zoneminder.f19.spec
+++ b/distros/fedora/archive/zoneminder.f19.spec
@ -49,11 +49,11 @@ BuildRequires:  perl(PHP::Serialization) perl(Sys::Mmap)
 BuildRequires:  perl(Time::HiRes) perl(Net::SFTP::Foreign)
 BuildRequires:  perl(Expect) perl(Sys::Syslog)
 BuildRequires:  gcc gcc-c++ vlc-devel libcurl-devel
-BuildRequires:  autoconf autoconf-archive
+BuildRequires:  autoconf autoconf-archive polkit-devel
 %{!?_without_ffmpeg:BuildRequires: ffmpeg-devel}
 %{!?_without_x10:BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime)}

-Requires:   httpd php php-mysql cambozola
+Requires:   httpd php php-mysql cambozola polkit
 Requires:   libjpeg-turbo libcurl vlc-core ffmpeg
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:   perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
@ -240,6 +240,7 @@ fi
 %{_bindir}/zmvideo.pl
 %{_bindir}/zmwatch.pl
 %{_bindir}/zmcamtool.pl
+%{_bindir}/zmsystemctl.pl
 %{!?_without_x10:%{_bindir}/zmx10.pl}

 %{perl_vendorlib}/ZoneMinder*
@ -250,6 +251,9 @@ fi
 %{_datadir}/zoneminder/db
 %{_datadir}/zoneminder/www

+%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
+%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
+
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images
--- a/distros/fedora/zoneminder-1.28.0-defaults.patch
+++ b/distros/fedora/zoneminder-1.28.0-defaults.patch
@ -0,0 +1,47 @@
+--- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in	2013-08-01 18:14:45.175241378 -0500
+++ scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in.defaults	2013-08-07 18:57:42.525006149 -0500
+@@ -187,7 +187,7 @@
+ 	},
+ 	{
+ 		name => "ZM_PATH_ZMS",
+-		default => "/cgi-bin/nph-zms",
+		default => "/cgi-bin/zm/nph-zms",
+ 		description => "Web path to zms streaming server",
+ 		help => "The ZoneMinder streaming server is required to send streamed images to your browser. It will be installed into the cgi-bin path given at configuration time. This option determines what the web path to the server is rather than the local path on your machine. Ordinarily the streaming server runs in parser-header mode however if you experience problems with streaming you can change this to non-parsed-header (nph) mode by changing 'zms' to 'nph-zms'.",
+ 		type => $types{rel_path},
+@@ -276,7 +276,7 @@
+ 	},
+ 	{
+ 		name => "ZM_OPT_CAMBOZOLA",
+-		default => "no",
+		default => "yes",
+ 		description => "Is the (optional) cambozola java streaming client installed",
+ 		help => "Cambozola is a handy low fat cheese flavoured Java applet that ZoneMinder uses to view image streams on browsers such as Internet Explorer that don't natively support this format. If you use this browser it is highly recommended to install this from http://www.charliemouse.com/code/cambozola/  however if it is not installed still images at a lower refresh rate can still be viewed.",
+ 		type => $types{boolean},
+@@ -639,7 +639,7 @@
+ 	},
+ 	{
+ 		name => "ZM_PATH_SWAP",
+-		default => "@ZM_TMPDIR@",
+		default => "/dev/shm",
+ 		description => "Path to location for temporary swap images used in streaming",
+ 		help => "Buffered playback requires temporary swap images to be stored for each instance of the streaming daemons. This option determines where these images will be stored. The images will actually be stored in sub directories beneath this location and will be automatically cleaned up after a period of time.",
+ 		type => $types{abs_path},
+@@ -902,7 +902,7 @@
+ 	},
+ 	{
+ 		name => "ZM_UPLOAD_FTP_LOC_DIR",
+-		default => "@ZM_TMPDIR@",
+		default => "/var/spool/zoneminder-upload",
+ 		description => "The local directory in which to create upload files",
+ 		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the local directory that ZoneMinder should use for temporary upload files. These are files that are created from events, uploaded and then deleted.",
+ 		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
+@@ -1258,7 +1258,7 @@
+ 	},
+ 	{
+ 		name => "ZM_OPT_CONTROL",
+-		default => "no",
+		default => "yes",
+ 		description => "Support controllable (e.g. PTZ) cameras",
+ 		help => "ZoneMinder includes limited support for controllable cameras. A number of sample protocols are included and others can easily be added. If you wish to control your cameras via ZoneMinder then select this option otherwise if you only have static cameras or use other control methods then leave this option off.",
+ 		type => $types{boolean},
--- a/distros/fedora/zoneminder.cmake.f20.spec
+++ b/distros/fedora/zoneminder.cmake.f20.spec
@ -0,0 +1,392 @@
+%define zmuid $(id -un)
+%define zmgid $(id -gn)
+%define zmuid_final apache
+%define zmgid_final apache
+
+%global _hardened_build 1
+
+### Delete the lines below to build with ffmpeg and/or x10
+%define _without_ffmpeg 1
+%define _without_x10 1
+
+Name: zoneminder
+Version: 1.28.0
+Release: 1%{?dist}
+Summary: A camera monitoring and analysis tool
+Group: System Environment/Daemons
+# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/
+# Mootools is inder the MIT license: http://mootools.net/
+License: GPLv2+ and LGPLv2+ and MIT
+URL: http://www.zoneminder.com/
+
+#Source: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz
+Source: ZoneMinder-%{version}.tar.gz
+
+Patch1: zoneminder-1.28.0-defaults.patch
+
+BuildRequires: cmake gnutls-devel systemd-units bzip2-devel
+BuildRequires: community-mysql-devel pcre-devel libjpeg-turbo-devel
+BuildRequires: perl(Archive::Tar) perl(Archive::Zip)
+BuildRequires: perl(Date::Manip) perl(DBD::mysql)
+BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
+BuildRequires: perl(MIME::Entity) perl(MIME::Lite)
+BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap)
+BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign)
+BuildRequires: perl(Expect) perl(Sys::Syslog)
+BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel
+%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel}
+%{!?_without_x10:BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime)}
+# cmake needs the following installed at build time due to the way it auto-detects certain parameters
+BuildRequires:  httpd polkit-devel
+%{!?_without_ffmpeg:BuildRequires: ffmpeg}
+
+Requires: httpd php php-mysql cambozola polkit
+Requires: libjpeg-turbo vlc-core libcurl
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
+Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP)
+Requires: perl(LWP::Protocol::https)
+%{!?_without_ffmpeg:Requires: ffmpeg}
+
+Requires(post): systemd-units systemd-sysv
+Requires(post): /usr/bin/gpasswd
+Requires(post): /usr/bin/less
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+
+%description
+ZoneMinder is a set of applications which is intended to provide a complete
+solution allowing you to capture, analyse, record and monitor any cameras you
+have attached to a Linux based machine. It is designed to run on kernels which
+support the Video For Linux (V4L) interface and has been tested with cameras
+attached to BTTV cards, various USB cameras and IP network cameras. It is
+designed to support as many cameras as you can attach to your computer without
+too much degradation of performance.
+
+%prep
+%setup -q -n ZoneMinder-%{version}
+
+%patch1 -p0 -b .defaults
+
+%build
+%cmake \
+	-DZM_TARGET_DISTRO="f20" \
+	-DZM_PERL_SUBPREFIX=`x="%{perl_vendorlib}" ; echo ${x#"%{_prefix}"}` \
+%{?_without_ffmpeg:-DZM_NO_FFMPEG=ON} \
+%{?_without_x10:-DZM_NO_X10=ON} \
+	.
+
+make %{?_smp_mflags}
+
+%install
+export DESTDIR=%{buildroot}
+make install
+
+%post
+if [ $1 -eq 1 ] ; then
+    # Initial installation
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+# Allow zoneminder access to local video sources, serial ports, and x10
+/usr/bin/gpasswd -a %{zmuid_final} video
+/usr/bin/gpasswd -a %{zmuid_final} dialout
+
+# Display the README for post installation instructions
+/usr/bin/less %{_docdir}/%{name}/README.Fedora
+
+%preun
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || :
+    /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || :
+fi
+
+%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
+fi
+
+%triggerun -- zoneminder < 1.25.0-4
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply zoneminder
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || :
+/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/jscalendar-doc
+%config %attr(640,root,%{zmgid_final}) /etc/zm.conf
+%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
+%config(noreplace) /etc/tmpfiles.d/zoneminder.conf
+%config(noreplace) /etc/logrotate.d/zoneminder
+
+%{_unitdir}/zoneminder.service
+
+%{_bindir}/zma
+%{_bindir}/zmaudit.pl
+%{_bindir}/zmc
+%{_bindir}/zmcontrol.pl
+%{_bindir}/zmdc.pl
+%{_bindir}/zmf
+%{_bindir}/zmfilter.pl
+%{_bindir}/zmpkg.pl
+%{_bindir}/zmstreamer
+%{_bindir}/zmtrack.pl
+%{_bindir}/zmtrigger.pl
+%{_bindir}/zmu
+%{_bindir}/zmupdate.pl
+%{_bindir}/zmvideo.pl
+%{_bindir}/zmwatch.pl
+%{_bindir}/zmcamtool.pl
+%{_bindir}/zmsystemctl.pl
+%{!?_without_x10:%{_bindir}/zmx10.pl}
+
+%{perl_vendorlib}/ZoneMinder*
+%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ZoneMinder*
+#%{perl_archlib}/ZoneMinder*
+%{_mandir}/man*/*
+%dir %{_libexecdir}/zoneminder
+%{_libexecdir}/zoneminder/cgi-bin
+%dir %{_datadir}/zoneminder
+%{_datadir}/zoneminder/db
+%{_datadir}/zoneminder/www
+
+%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
+%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
+
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder
+
+
+%changelog
+* Sun Oct 5 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.0 
+- Bump version for 1.28.0 release.
+
+* Fri Mar 14 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27 
+- Tweak build requirements for cmake
+
+* Sat Feb 01 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
+- Add zmcamtool.pl. Bump version for 1.27 release. 
+
+* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
+- This is a bug fixe release
+- RTSP fixes, cmake enhancements, couple other misc fixes
+
+* Mon Oct 07 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
+- Initial cmake build.
+
+* Sat Oct 05 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
+- Fedora specific path changes have been moved to zoneminder-1.26.0-defaults.patch
+- All files are now part of the zoneminder source tree. Update specfile accordingly.
+
+* Sat Sep 21 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.3
+- Initial rebuild for ZoneMinder 1.26.3 release.
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.25.0-12
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Mon Jan 7 2013 Remi Collet <rcollet@redhat.com> - 1.25.0-11
+- fix configuration file for httpd 2.4, #871502
+
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
+- rebuild against new libjpeg
+
+* Thu Aug 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-9
+- Add patch to work around v4l2 api breakage in 3.5 kernel.
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jun 23 2012 Petr Pisar <ppisar@redhat.com> - 1.25.0-7
+- Perl 5.16 rebuild
+
+* Wed Mar 21 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-6
+- Fix stupid thinko in sql modifications.
+
+* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-5
+- Clean up macro usage.
+
+* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-4
+- Convert to systemd.
+- Add tmpfiles.d configuration since the initscript isn't around to create
+  /run/zoneminder.
+- Remove some pointless executable permissions.
+- Add logrotate file.
+
+* Wed Feb 22 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-3
+- Update README.Fedora to reference systemctl and mention timezone info in
+  php.ini.
+- Add proper default for EYEZM_LOG_TO_FILE.
+
+
+* Thu Feb 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-2
+- Rebuild for new pcre.
+
+* Thu Jan 19 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-1
+- Update to 1.25.0
+- Fix gcc4.7 build problems.
+- Drop gcc4.4 build fixes; for whatever reason they now break the build.
+- Clean up old patches.
+- Force setting of ZM_TMPDIR and ZM_RUNDIR.
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-3
+- Re-add the dist-tag that somehow got lost.
+
+* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-2
+- Add patch for bug 711780 - fix syntax issue in Mapped.pm.
+- Undo that patch, and undo another which was the cause of the whole mess.
+- Fix up other patches so ZM_PATH_BUILD is both defined and useful.
+- Make sure database creation mods actually take.
+- Update Fedora-specific docs with some additional info.
+- Use bundled mootools (javascript, so no guideline violation).
+- Update download location.
+- Update the gcrypt patch to actually work.
+- Upstream changed the tarball without changing the version to patch a
+  vulnerability, so redownload.
+
+* Sun Aug 14 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-1
+- Initial attempt to upgrade to 1.24.4.
+- Add patch from BZ 460310 to build against libgcrypt instead of requiring the
+  gnutls openssl libs.
+
+* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-7.20110324svn3310
+- Perl mass rebuild
+
+* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-6.20110324svn3310
+- Perl mass rebuild
+
+* Mon May 09 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-5.20110324svn3310
+- Bump for gnutls update.
+
+* Thu Mar 24 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-4.20110324svn3310
+- Update to latest 1.24.3 subversion. Turns out that what upstream was calling
+  1.24.3 is really just an occasionally updated devel snapshot.
+- Rebase various patches.
+
+* Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 1.24.3-3
+- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-1
+- Update to latest upstream version.
+- Rebase patches.
+- Initial incomplete attempt to disable v4l1 support.
+
+* Fri Jan 21 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-6
+- Unbundle cambozola; instead link to the separately pacakged copy.
+- Remove BuildRoot:, %%clean and buildroot cleaning in %%install.
+- Git rid of mixed space/tab usage by removing all tabs.
+- Remove unnecessary Conflicts: line.
+- Attempt to force short_open_tag on for the code directories.
+- Move default location of sockets, swaps, logfiles and some temporary files to
+  make more sense and allow things to work better with a future selinux policy.
+- Fix errors in README.Fedora.
+
+* Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.24.2-5
+- Mass rebuild with perl-5.12.0
+
+* Fri Dec 4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
+- rebuild against perl 5.10.1
+- use Perl vendorarch and archlib variables correctly
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-2
+- Bump release since 1.24.2-1 was mistakenly tagged a few months ago.
+
+* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-1
+- Initial update to 1.24.2.
+- Rebase patches.
+- Update mootools download location.
+- Update to mootools 1.2.3.
+- Add additional dependencies for some optional features.
+
+* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-3
+- Remove unused Sys::Mmap perl dependency RPM is finding
+
+* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-2
+- Update gcc44 patch to disable -frepo, seems to be broken with gcc44
+- Added noffmpeg patch to make building outside mock easier
+
+* Sat Mar 21 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-1
+- Patch for gcc 4.4 compilation errors
+- Upgrade to 1.24.1
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
+- rebuild for dependencies
+
+* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
+- Fix permissions on zm.conf
+
+* Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
+- Initial attempt at packaging 1.23.
+
+* Tue Jul 1 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-15
+- Add perl module compat dependency, bz #453590
+
+* Tue May 6 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-14
+- Remove default runlevel, bz #441315
+
+* Mon Apr 28 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.22.3-13
+- Backport patch for CVE-2008-1381 from 1.23.3 to 1.22.3.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.22.3-12
+- Autorebuild for GCC 4.3
+
+* Thu Jan 3 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-11
+- Fix compilation on gcc 4.3
+
+* Thu Dec 6 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-10
+- Rebuild for new openssl
+
+* Thu Aug 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-8
+- Fix licence tag
+
+* Thu Jul 12 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-7
+- Fixes from testing by Jitz including missing dependencies and database creation
+
+* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-6
+- Disable crashtrace on ppc
+
+* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-5
+- Fix uid for directories in /var/lib/zoneminder
+
+* Tue Jun 26 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-4
+- Added perl Archive::Tar dependency
+- Disabled web interface due to lack of access control on the event images
+
+* Sun Jun 10 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-3
+- Changes recommended in review by Jason Tibbitts
+
+* Mon Apr 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-2
+- Standardised on package name of zoneminder
+
+* Thu Dec 28 2006 Martin Ebourne <martin@zepler.org> - 1.22.3-1
+- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin
--- a/distros/opensuse/README.OpenSuse
+++ b/distros/opensuse/README.OpenSuse
@ -26,7 +26,7 @@ OpenSuse Notes

 3. It is necessary to add repositories to allow the zoneminder rpm to install.
   These can be added using commands (as root):
-   zypper ar -f http://packman.inode.at/suse/openSUSE_13.1/ packman
+   zypper ar -f http://packman.inode.at/suse/openSUSE_13.1 packman
   zypper ar -f -n perl-modules http://download.opensuse.org/repositories/devel:/languages:/perl/openSUSE_13.1 perl-modules
   
   The first time the repositories are accessed a prompt will be issued 
@ -35,7 +35,7 @@ OpenSuse Notes

 4. There may be a prompt about the version of libavcodec.s0.55 and a change
   of vendor for libavutil52.  In order to allow zoneminder to run correctly 
-   this solution change vendro should be accepted.
+   this solution change vendor should be accepted.

 New installs
 ============
@ -44,7 +44,7 @@ New installs
   remotely you will need to ensure that the server is installed and secured:
       
   The rpm install should ensure that the database is installed.  To ensure
-   that it is running at boot time and scure for zoneminder run the 
+   that it is running at boot time and secure for zoneminder run the 
   following commands (as root):

 	systemctl enable mysql
@ -87,7 +87,7 @@ New installs
   show up in the zoneminder logging system as errors.

   If you are not sure of the proper timezone specification to use, look at
-   http://php.net/date.timezone
+   http://php.net/manual/en/timezones.php

 6. This package probably does not work with SELinux enabled at the moment. It
   may be necessary to disable SELinux for httpd, or even completely for
--- a/distros/opensuse/zoneminder.cmake.OS13.spec
+++ b/distros/opensuse/zoneminder.cmake.OS13.spec
@ -26,13 +26,13 @@ Source: ZoneMinder-%{version}.tar.gz
 # patch no longer necessary as OpenSuse now in standard build
 # Patch1: zoneminder-1.26.5-opensuse.patch

-BuildRequires: cmake 
+BuildRequires: cmake polkit-devel
 BuildRequires: perl-DBI perl-DBD-mysql perl-Date-Manip perl-Sys-Mmap 
 BuildRequires: libjpeg62 libjpeg62-devel libmysqld-devel libSDL-devel libgcrypt-devel libgnutls-devel
 BuildRequires: libffmpeg-devel x264
 BuildRequires: pcre-devel w32codec-all  

-Requires: apache2 apache2-mod_php5 mysql 
+Requires: apache2 apache2-mod_php5 mysql polkit
 Requires: ffmpeg libavformat55
 Requires: php php-mysql 
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@ -158,6 +158,10 @@ fi
 %{webcgi}/nph-zms
 %{webcgi}/zms
 %{webroot}/zoneminder
+
+%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
+%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
+
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{webroot}/zoneminder/events
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{webroot}/zoneminder/images
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{webroot}/zoneminder/temp
--- a/distros/redhat/README.CentOS
+++ b/distros/redhat/README.CentOS
@ -41,10 +41,21 @@
     sudo chkconfig httpd on
     sudo service httpd start

-7. This package has automatically configured and installed an SELinux policy
+7. This package will automatically configure and install an SELinux policy
   called local_zoneminder. A copy of this policy is in the documentation
   folder.
   
+   Unfortunately, this has not resolved all the SELinux issues so
+   most will want to disable SELinux permanently by editing the following:
+   
+   /etc/selinux/conf
+   
+   Change SELINUX line from "enforcing" to "disabled". This change will not
+   take effect until a reboot, however. To avoid a reboot, execute the
+   following from the commandline:
+   
+   sudo setenforce 0
+
 8. Finally, you may start the ZoneMinder service:

     sudo service zoneminder start
--- a/distros/redhat/archive/zoneminder-1.26.0-dbinstall.patch
+++ b/distros/redhat/archive/zoneminder-1.26.0-dbinstall.patch
--- a/distros/redhat/archive/zoneminder-1.26.0-defaults.patch
+++ b/distros/redhat/archive/zoneminder-1.26.0-defaults.patch
--- a/distros/redhat/archive/zoneminder-runlevel.patch
+++ b/distros/redhat/archive/zoneminder-runlevel.patch
--- a/distros/redhat/archive/zoneminder.el6.spec
+++ b/distros/redhat/archive/zoneminder.el6.spec
@ -47,9 +47,9 @@ BuildRequires:  perl(MIME::Entity) perl(MIME::Lite)
 BuildRequires:  perl(PHP::Serialization) perl(Sys::Mmap)
 BuildRequires:  perl(Time::HiRes) perl(Net::SFTP::Foreign)
 BuildRequires:  perl(Expect) perl(X10::ActiveHome) perl(Astro::SunTime)
-BuildRequires:  libcurl-devel vlc-devel ffmpeg-devel >= 0.4.9
+BuildRequires:  libcurl-devel vlc-devel polkit-devel ffmpeg-devel >= 0.4.9

-Requires:   httpd php php-mysql mysql-server libjpeg-turbo
+Requires:   httpd php php-mysql mysql-server libjpeg-turbo polkit
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:   perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
 Requires:   perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP)
@ -245,6 +245,7 @@ fi
 %{_bindir}/zmvideo.pl
 %{_bindir}/zmwatch.pl
 %{_bindir}/zmcamtool.pl
+%{_bindir}/zmsystemctl.pl
 %{_bindir}/zmx10.pl

 %{perl_vendorlib}/ZoneMinder*
@ -255,6 +256,9 @@ fi
 %{_datadir}/%{name}/db
 %{_datadir}/%{name}/www

+%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
+%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
+
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/events
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/images
--- a/distros/redhat/zoneminder-1.28.0-defaults.patch
+++ b/distros/redhat/zoneminder-1.28.0-defaults.patch
@ -0,0 +1,47 @@
+--- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in	2013-08-01 18:14:45.175241378 -0500
+++ scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in.defaults	2013-08-07 18:57:42.525006149 -0500
+@@ -187,7 +187,7 @@
+ 	},
+ 	{
+ 		name => "ZM_PATH_ZMS",
+-		default => "/cgi-bin/nph-zms",
+		default => "/cgi-bin/zm/nph-zms",
+ 		description => "Web path to zms streaming server",
+ 		help => "The ZoneMinder streaming server is required to send streamed images to your browser. It will be installed into the cgi-bin path given at configuration time. This option determines what the web path to the server is rather than the local path on your machine. Ordinarily the streaming server runs in parser-header mode however if you experience problems with streaming you can change this to non-parsed-header (nph) mode by changing 'zms' to 'nph-zms'.",
+ 		type => $types{rel_path},
+@@ -276,7 +276,7 @@
+ 	},
+ 	{
+ 		name => "ZM_OPT_CAMBOZOLA",
+-		default => "no",
+		default => "yes",
+ 		description => "Is the (optional) cambozola java streaming client installed",
+ 		help => "Cambozola is a handy low fat cheese flavoured Java applet that ZoneMinder uses to view image streams on browsers such as Internet Explorer that don't natively support this format. If you use this browser it is highly recommended to install this from http://www.charliemouse.com/code/cambozola/  however if it is not installed still images at a lower refresh rate can still be viewed.",
+ 		type => $types{boolean},
+@@ -639,7 +639,7 @@
+ 	},
+ 	{
+ 		name => "ZM_PATH_SWAP",
+-		default => "@ZM_TMPDIR@",
+		default => "/dev/shm",
+ 		description => "Path to location for temporary swap images used in streaming",
+ 		help => "Buffered playback requires temporary swap images to be stored for each instance of the streaming daemons. This option determines where these images will be stored. The images will actually be stored in sub directories beneath this location and will be automatically cleaned up after a period of time.",
+ 		type => $types{abs_path},
+@@ -902,7 +902,7 @@
+ 	},
+ 	{
+ 		name => "ZM_UPLOAD_FTP_LOC_DIR",
+-		default => "@ZM_TMPDIR@",
+		default => "/var/spool/zoneminder-upload",
+ 		description => "The local directory in which to create upload files",
+ 		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the local directory that ZoneMinder should use for temporary upload files. These are files that are created from events, uploaded and then deleted.",
+ 		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
+@@ -1258,7 +1258,7 @@
+ 	},
+ 	{
+ 		name => "ZM_OPT_CONTROL",
+-		default => "no",
+		default => "yes",
+ 		description => "Support controllable (e.g. PTZ) cameras",
+ 		help => "ZoneMinder includes limited support for controllable cameras. A number of sample protocols are included and others can easily be added. If you wish to control your cameras via ZoneMinder then select this option otherwise if you only have static cameras or use other control methods then leave this option off.",
+ 		type => $types{boolean},
--- a/distros/redhat/zoneminder.cmake.el6.spec
+++ b/distros/redhat/zoneminder.cmake.el6.spec
@ -4,7 +4,7 @@
 %define zmgid_final apache

 Name:       zoneminder
-Version:    1.27
+Version:    1.28.0
 Release:    1%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
@ -17,7 +17,7 @@ URL:        http://www.zoneminder.com/
 #Source0: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz
 Source0:    ZoneMinder-%{version}.tar.gz

-Patch1:    zoneminder-1.26.0-defaults.patch
+Patch1:    zoneminder-1.28.0-defaults.patch

 BuildRequires:  cmake gnutls-devel bzip2-devel
 BuildRequires:  mysql-devel pcre-devel libjpeg-turbo-devel
@ -28,11 +28,11 @@ BuildRequires:  perl(MIME::Entity) perl(MIME::Lite)
 BuildRequires:  perl(PHP::Serialization) perl(Sys::Mmap)
 BuildRequires:  perl(Time::HiRes) perl(Net::SFTP::Foreign)
 BuildRequires:  perl(Expect) perl(X10::ActiveHome) perl(Astro::SunTime)
-BuildRequires:  libcurl-devel vlc-devel ffmpeg-devel
+BuildRequires:  libcurl-devel vlc-devel ffmpeg-devel polkit-devel
 # cmake needs the following installed at build time due to the way it auto-detects certain parameters
 BuildRequires:  httpd ffmpeg

-Requires:   httpd php php-mysql mysql-server libjpeg-turbo
+Requires:   httpd php php-mysql mysql-server libjpeg-turbo polkit
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:   perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
 Requires:   perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP)
@ -127,8 +127,6 @@ rm -rf %{_docdir}/%{name}-%{version}
 %{_bindir}/zmdc.pl
 %{_bindir}/zmf
 %{_bindir}/zmfilter.pl
-# zmfix removed from zoneminder 1.26.6
-#%attr(4755,root,root) %{_bindir}/zmfix
 %{_bindir}/zmpkg.pl
 %{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
@ -138,6 +136,7 @@ rm -rf %{_docdir}/%{name}-%{version}
 %{_bindir}/zmvideo.pl
 %{_bindir}/zmwatch.pl
 %{_bindir}/zmcamtool.pl
+%{_bindir}/zmsystemctl.pl
 %{_bindir}/zmx10.pl

 %{perl_vendorlib}/ZoneMinder*
@ -149,6 +148,9 @@ rm -rf %{_docdir}/%{name}-%{version}
 %{_datadir}/%{name}/db
 %{_datadir}/%{name}/www

+%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
+%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
+
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/events
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/images
@ -158,8 +160,10 @@ rm -rf %{_docdir}/%{name}-%{version}
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload

-
 %changelog
+* Sun Oct 5 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.0 
+- Bump version for 1.28.0 release.
+
 * Fri Mar 14 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27 
 - Tweak build requirements for cmake

--- a/distros/ubuntu1204/changelog
+++ b/distros/ubuntu1204/changelog
@ -1,9 +1,52 @@
-zoneminder (1.27.99+1-trusty-SNAPSHOT2014072901) trusty; urgency=medium
+zoneminder (1.28.0-trusty) trusty; urgency=medium
+
+  * Release
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Fri, 17 Oct 2014 09:25:55 -0400
+
+zoneminder (1.27.99+1-trusty-SNAPSHOT2014101401) trusty; urgency=medium
+
+  * Several PR merges in big push for 1.28.0
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Tue, 14 Oct 2014 09:28:29 -0400
+
+zoneminder (1.27.99+1-trusty-SNAPSHOT2014092601) trusty; urgency=medium
+
+  * style updates and db fixes for database logging filters
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Fri, 26 Sep 2014 14:44:45 -0400
+
+zoneminder (1.27.99+1-trusty-SNAPSHOT2014090801) trusty; urgency=medium
+
+  * several segfault fixes for local cameras
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Mon, 08 Sep 2014 16:56:57 -0400
+
+zoneminder (1.27.99+1-trusty-SNAPSHOT2014090701) trusty; urgency=medium
+
+  * Fix segfaults for local cameras, also now includes the systemd support patch
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Sun, 07 Sep 2014 17:19:01 -0400
+
+zoneminder (1.27.99+1-trusty-SNAPSHOT2014082102) trusty; urgency=medium
+
+  * Fix UI inputs for v4l multibuffer and captures per frame
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Thu, 21 Aug 2014 12:03:31 -0400
+
+zoneminder (1.27.99+1-trusty-SNAPSHOT2014082101) trusty; urgency=medium
+
+  * fall back to Config table values for V4l MultiBUffer and Captures Per Frame
+  * add mention of monitor page settings for thse in the config table
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Thu, 21 Aug 2014 10:04:46 -0400
+
+zoneminder (1.27.99+1-precise-SNAPSHOT2014080601) precise; urgency=medium

  * improve error messages
  * Make zmupdate re-run the most recent patch so that people running the daily builds get their db updates

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

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

--- a/distros/ubuntu1204/control
+++ b/distros/ubuntu1204/control
@ -2,12 +2,12 @@ Source: zoneminder
 Section: net
 Priority: optional
 Maintainer: Isaac Connor <iconnor@connortechnology.com>
-Build-Depends: debhelper (>= 7.0.50), autoconf, automake, dpatch, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev | libmariadbclient-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 | libav-tools, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libpcre3, libarchive-zip-perl, libmime-lite-perl, libjpeg8, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev
+Build-Depends: debhelper (>= 7.0.50), autoconf, automake, dpatch, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev | libmariadbclient-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 | libav-tools, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libpcre3, libarchive-zip-perl, libmime-lite-perl, libjpeg8, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev, libpolkit-gobject-1-dev
 Standards-Version: 3.9.2

 Package: zoneminder
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-lite-perl, mariadb-client|mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl
 Recommends: mysql-server|mariadb-server
 Description: A video camera security and surveillance solution
 ZoneMinder is intended for use in single or multi-camera video security 
--- a/distros/ubuntu1204/rules
+++ b/distros/ubuntu1204/rules
@ -68,4 +68,4 @@ override_dh_auto_test:

 .PHONY: override_dh_strip
 override_dh_strip:
-        dh_strip --dbg-package=zoneminder-dbg
+		dh_strip --dbg-package=zoneminder-dbg
--- a/docs/_templates/hiddenglobaltoc.html
+++ b/docs/_templates/hiddenglobaltoc.html
@ -0,0 +1,11 @@
+{#
+    basic/globaltoc.html
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Sphinx sidebar template: global table of contents.
+
+    :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+#}
+<h3><a href="{{ pathto(master_doc) }}">{{ _('Table Of Contents') }}</a></h3>
+{{ toctree(includehidden=True) }}
--- a/docs/api.rst
+++ b/docs/api.rst
@ -50,9 +50,9 @@ This command will add a new http monitor.
 Edit monitor 1
 ^^^^^^^^^^^^^^

-This command will change the 'Name' field of Monitor 1 to 'tits'
+This command will change the 'Name' field of Monitor 1 to 'test1'

-``curl -XPUT http://zmdevapi/monitors/1.json -d "Monitor[Name]=tits"``
+``curl -XPUT http://zmdevapi/monitors/1.json -d "Monitor[Name]=test1"``

 Delete monitor 1
 ^^^^^^^^^^^^^^^^
--- a/docs/conf.py
+++ b/docs/conf.py
@ -103,7 +103,9 @@ html_theme = 'default'
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+html_theme_options = {
+	"stickysidebar": "true"
+}

 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
@ -143,7 +145,9 @@ html_static_path = ['_static']
 #html_use_smartypants = True

 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+html_sidebars = {
+ '**': ['hiddenglobaltoc.html', 'searchbox.html']
+}

 # Additional templates that should be rendered to pages, maps page names to
 # template names.
--- a/docs/faq.rst
+++ b/docs/faq.rst
@ -1,5 +1,5 @@
-Frequently Asked Questions (FAQ)
-================================
+FAQ
+===

 This is the FAQ page. Feel free to contribute any FAQs that you think are missing. 

@ -21,7 +21,7 @@ You may also consider to use the web server security, for example, htaccess file
 4. You will immediately be asked to login. The username is 'admin' and the password is 'admin'.

 To Manage Users
-^^^^^^^^^^^^^^^
+---------------

 1. In main console, go to Options->Users.

--- a/docs/index.rst
+++ b/docs/index.rst
@ -1,20 +1,32 @@
-.. ZoneMinder documentation master file, created by
-   sphinx-quickstart on Fri Apr 25 18:31:58 2014.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Welcome to ZoneMinder's documentation!
-======================================
-
-Contents:
+ZoneMinder Documentation
+========================

 .. toctree::
-   :maxdepth: 2
+   :hidden:

+   installationguide/index
+   userguide/index
   api
   faq
   contributing

+Welcome to ZoneMinder's documentation, the following resources are available
+
+:doc:`installationguide/index`
+  Many distrubution repos only hold older versions of ZoneMinder, current versions contain many bug fixes and updated functionality. Instructions here for installing updated packages or compiling from source.
+
+:doc:`userguide/index`
+  Guide to setting up ZoneMinder for the first time and detailed guides for using the ZoneMinder front end.
+
+:doc:`api`
+  Information on using the CakePHP based API for interfacing to ZoneMinder
+
+:doc:`faq`
+  Frequently Asked Questions
+
+:doc:`contributing`
+  How to contribute to ZoneMinder. As a community project we always need help, you don't need to be a coder to test or update documentation.
+


 Indices and tables
--- a/docs/installationguide/centos.rst
+++ b/docs/installationguide/centos.rst
@ -0,0 +1,5 @@
+Centos
+======
+
+
+
--- a/docs/installationguide/debian.rst
+++ b/docs/installationguide/debian.rst
@ -0,0 +1,37 @@
+Debian
+======
+
+A fresh build based on master branch running Debian 7 (wheezy)\:
+::
+
+  root@host:~# aptitude install -y 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 automake autoconf libjpeg8-dev libjpeg8 apache2-mpm-prefork libapache2-mod-php5 php5-cli libphp-serialization-perl libgnutls-dev libjpeg8-dev libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libv4l-dev libtool ffmpeg libnetpbm10-dev libavdevice-dev libmime-lite-perl dh-autoreconf dpatch;
+
+  root@host:~# git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder;
+  root@host:~# cd zoneminder;
+  root@host:~# ln -s distros/debian;
+  root@host:~# dpkg-checkbuilddeps;
+  root@host:~# dpkg-buildpackage;
+
+One level above you'll now find a deb package matching the architecture of the build host:
+::
+
+  root@host:~# ls -1 ~/zoneminder*;
+  /root/zoneminder_1.26.4-1_amd64.changes
+  /root/zoneminder_1.26.4-1_amd64.deb
+  /root/zoneminder_1.26.4-1.dsc
+  /root/zoneminder_1.26.4-1.tar.gz
+
+The dpkg command itself does not resolve dependencies. That's what high-level interfaces like aptitude and apt-get are normally for. Unfortunately, unlike RPM, there's no easy way to install a separate deb package not contained with any repository.
+
+To overcome this "limitation" we'll use dpkg only to install the zoneminder package and apt-get to fetch all needed dependencies afterwards. Running dpkg-reconfigure in the end will ensure that the setup scripts e.g. for database provisioning were executed.
+::
+
+  root@host:~# dpkg -i /root/zoneminder_1.26.4-1_amd64.deb; apt-get install -f;
+  root@host:~# dpkg-reconfigure zoneminder;
+
+Alternatively you may also use gdebi to automatically resolve dependencies during installation:
+::
+
+  root@host:~# aptitude install -y gdebi;
+  root@host:~# gdebi /root/zoneminder_1.26.4-1_amd64.deb;
+
--- a/docs/installationguide/fedora.rst
+++ b/docs/installationguide/fedora.rst
@ -0,0 +1,4 @@
+Fedora
+======
+
+
--- a/docs/installationguide/index.rst
+++ b/docs/installationguide/index.rst
@ -0,0 +1,12 @@
+Installation Guide
+======================================
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   ubuntu
+   debian
+   fedora
+   centos
--- a/docs/installationguide/ubuntu.rst
+++ b/docs/installationguide/ubuntu.rst
@ -0,0 +1,56 @@
+Ubuntu
+======
+
+PPA Install
+-----------
+Follow these instructions to install current release version on Ubuntu 13.04 or under.:
+
+  sudo apt-add-repository ppa:iconnor/zoneminder
+
+Or Ubuntu 14.10 you will need to install the Snapshot PPA from the master branch instead.:
+
+  sudo apt-add-repository ppa:iconnor/zoneminder-master
+
+Once you have updated the repository then update and install the package.:
+  
+  sudo apt-get update
+  sudo apt-get install zoneminder
+
+
+
+Build Package From Source
+-------------------------
+
+A fresh build based on master branch running Ubuntu 1204 LTS.  Will likely work for other versions as well.::
+
+  root@host:~# aptitude install -y 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 automake autoconf libjpeg8-dev libjpeg8 apache2-mpm-prefork libapache2-mod-php5 php5-cli libphp-serialization-perl libgnutls-dev libjpeg8-dev libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libv4l-dev libtool ffmpeg libnetpbm10-dev libavdevice-dev libmime-lite-perl dh-autoreconf dpatch;
+
+  root@host:~# git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder;
+  root@host:~# cd zoneminder;
+  root@host:~# ln -s distros/ubuntu1204 debian;
+  root@host:~# dpkg-checkbuilddeps;
+  root@host:~# dpkg-buildpackage;
+
+
+One level above you'll now find a deb package matching the architecture of the build host\:::
+
+  root@host:~# ls -1 ~/zoneminder\*;
+  /root/zoneminder_1.26.4-1_amd64.changes
+  /root/zoneminder_1.26.4-1_amd64.deb
+  /root/zoneminder_1.26.4-1.dsc
+  /root/zoneminder_1.26.4-1.tar.gz
+
+
+The dpkg command itself does not resolve dependencies. That's what high-level interfaces like aptitude and apt-get are normally for. Unfortunately, unlike RPM, there's no easy way to install a separate deb package not contained with any repository.
+
+To overcome this "limitation" we'll use dpkg only to install the zoneminder package and apt-get to fetch all needed dependencies afterwards. Running dpkg-reconfigure in the end will ensure that the setup scripts e.g. for database provisioning were executed.::
+
+  root@host:~# dpkg -i /root/zoneminder_1.26.4-1_amd64.deb; apt-get install -f;
+  root@host:~# dpkg-reconfigure zoneminder;
+
+Alternatively you may also use gdebi to automatically resolve dependencies during installation\:::
+
+  root@host:~# aptitude install -y gdebi;
+  root@host:~# gdebi /root/zoneminder_1.26.4-1_amd64.deb;
+
+  sudo apt-get install 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 automake autoconf libjpeg-turbo8-dev libjpeg-turbo8 apache2-mpm-prefork libapache2-mod-php5 php5-cli
--- a/docs/userguide/cameracontrol.rst
+++ b/docs/userguide/cameracontrol.rst
@ -0,0 +1,195 @@
+Camera Control
+==============
+
+ZoneMinder provides the facility to control cameras from the web interface and to some extent automatically. Pan/Tilt/Zoom (PTZ) cameras have a wide range of capabilities and use a large number of different protocols making any kind of generic control solution potentially very difficult. To address this ZoneMinder uses two key approaches to get around this problem.
+
+Definition of Capabilities
+  For each camera model you use, an entry in the camera capabilities table must be created. These indicate what functions the camera supports and ensure that the interface presents only those capabilities that the camera supports. There are a very large number of capabilities that may be supported and it is very important that the entries in this table reflect the actual abilities of the camera. A small number of example capabilities are included in ZoneMinder, these can be used ‘as is’ or modified.
+
+Control Scripts
+  ZoneMinder itself does not generally provide the ability to send commands to cameras or receive responses. What it does is mediate motion requests from the web interface into a standard set of commands which are passed to a script defined in the control capability. Example scripts are provided in ZoneMinder which support a number of serial or network protocols but it is likely that for many cameras new scripts will have to be created. These can be modelled on the example ones, or if control commands already exist from other applications, then the script can just act as a ‘glue’ layer between ZoneMinder and those commands.
+
+It should be emphasised that the control and capability elements of ZoneMinder are not intended to be able to support every camera out of the box. Some degree of development is likely to be required for many cameras.
+
+Control Capabilities
+^^^^^^^^^^^^^^^^^^^^
+
+If you have a camera that supports PTZ controls and wish to use it with ZoneMinder then the first thing you need to do is ensure that it has an accurate entry in the capabilities table. To do this you need to go to the Control tab of the Monitor configuration dialog and select ‘Edit’ where it is listed by the Control Type selection box. This will bring up a new window which lists, with a brief summary, the existing capabilities. To edit an existing capability to modify select the Id or Name of the capability in question, or click on the Add button to add a new control capability. Either of these approaches will create a new window, in familiar style, with tabs along the top and forms fields below. In the case of the capabilities table there are a large number of settings and tabs, the mean and use of these are briefly explained below.
+
+Main Tab
+--------
+Name
+  This is the name of the control capability, it will usually make sense to name capabilities after the camera model or protocol being used.
+Type
+  Whether the capability uses a local (usually serial) or network control protocol.
+Command
+  This is the full path to a script or application that will map the standard set of ZoneMinder control commands to equivalent control protocol command. This may be one of the shipped example zmcontrol-\*.pl scripts or something else entirely.
+Can Wake
+  This is the first of the actual capability definitions. Checking this box indicates that a protocol command exists to wake up the camera from a sleeping state.
+Can Sleep
+  The camera can be put to sleep.
+Can Reset 
+ The camera can be reset to a previously defined state.
+
+Move Tab
+--------
+Can Move
+  The camera is able move, i.e. pan or tilt.
+Can Move Diagonally
+  The camera can move diagonally. Some devices can move only vertically or horizontally at a time.
+Can Move Mapped
+  The camera is able internally map a point on an image to a precise degree of motion to centre that point in the image.
+Can Move Absolute
+  The camera can move to an absolute location.
+Can Move Relative
+  The camera can more to a relative location, e.g. 7 point left or up.
+Can Move Continuous
+  The camera can move continuously in a defined direction until told to stop or the movement limits are reached, e.g. left.
+
+Pan Tab
+-------
+Can Pan
+  The camera can pan, or move horizontally.
+Min/Max Pan Range
+  If the camera supports absolute motion this is the minimum and maximum pan co-ordinates that may be specified, e.g. -100 to 100.
+Min/Man Pan Step
+  If the camera supports relative motion, this is the minimum and maximum amount of movement that can be specified.
+Has Pan Speed
+  The camera supports specification of pan speeds.
+Min/Max Pan Speed
+  The minimum and maximum pan speed supported.
+Has Turbo Pan
+  The camera supports an additional turbo pan speed.
+Turbo Pan Speed
+  The actual turbo pan speed.
+
+Tilt Tab
+--------
+Definition of Tilt capabilities, fields as for ‘Pan’ tab.
+
+Zoom Tab
+--------
+Can Zoom
+  The camera can zoom.
+Can Zoom Absolute
+  The camera can zoom to an absolute position.
+Can Zoom Relative
+  The camera can zoom to a relative position.
+Can Zoom Continuous
+  The camera can zoom continuously in or out until told to stop or the zoom limits are reached.
+Min/Max Zoom Range
+  If the camera supports absolute zoom this is the minimum and maximum zoom amounts that may be specified.
+Min/Man Zoom Step
+  If the camera supports relative zoom, this is the minimum and maximum amount of zoom change that can be specified.
+Has Zoom Speed
+  The camera supports specification of zoom speed.
+Min/Max Zoom Speed
+  The minimum and maximum zoom speed supported.
+
+Focus Tab
+---------
+Definition of Focus capabilities, fields as for ‘Zoom’ tab, but with the following additional capability.
+
+Can Auto Focus
+  The camera can focus automatically.
+
+White Tab
+---------
+Definition of White Balance capabilities, fields as for ‘Focus’ tab.
+
+Iris Tab
+--------
+Definition of Iris Control capabilities, fields as for ‘Focus’ tab.
+
+Presets Tab
+-----------
+
+Has Presets
+  The camera supports preset positions.
+Num Presets
+  How many presets the camera supports. If the camera supports a huge number of presets then it makes sense to specify a more reasonable number here, 20 or less is recommended.
+Has Home Preset
+  The camera has a defined ‘home’ position, usually in the mid point of its range.
+Can Set Presets
+  The camera supports setting preset locations via its control protocol.
+
+Control Scripts
+^^^^^^^^^^^^^^^
+The second key element to controlling cameras with ZoneMinder is ensuring that an appropriate control script or application is present. A small number of sample scripts are included with ZoneMinder and can be used directly or as the basis for development. Control scripts are run atomically, that is to say that one requested action from the web interface results in one execution of the script and no state information is maintained. If your protocol requires state information to be preserved then you should ensure that your scripts do this as ZoneMinder has no concept of the state of the camera in control terms.
+
+If you are writing a new control script then you need to ensure that it supports the parameters that ZoneMinder will pass to it. If you already have scripts or applications that control your cameras, the ZoneMinder control script will just act as glue to convert the parameters passed into a form that your existing application understands. If you are writing a script to support a new protocol then you will need to convert the parameters passed into the script to equivalent protocol commands. If you have carefully defined your control capabilities above then you should only expect commands that correspond to those capabilities.
+
+The standard set of parameters passed to control scripts is defined below,
+
+  --device=<device> : This is the control device from the monitor definition. Absent if no device is specified.
+
+  --address=<address> : This is the control address from the monitor definition. This will usually be a hostname or ip address for network cameras or a simple numeric camera id for other cameras.
+
+  --autostop=<timeout> : This indicates whether an automatic timeout should be applied to '''stop''' the given command. It will only be included for '''continuous''' commands, as listed below, and will be a timeout in decimal seconds, probably fractional.
+
+  --command=<command> : This specifies the command that the script should execute. Valid commands are given below.
+
+  --xcoord=<x>, --ycoord=<y> : This specifies the x and/or y coordinates for commands which require them. These will normally be absolute or mapped commands.
+
+  --width=<width>'', ''--height=<height> : This specifies the width and height of the current image, for mapped motion commands where the coordinates values passed must have a context.
+
+  --speed=<speed> : This specifies the speed that the command should use, if appropriate.
+
+  --panspeed=<speed>'', ''--tiltspeed=<speed> : This indicates the specific pan and tilt speeds for diagonal movements which may allow a different motion rate for horizontal and vertical components.
+
+  --step=<step> : This specifies the amount of motion that the command should use, if appropriate. Normally used for relative commands only.
+
+  --panstep=<step>'', ''--tiltstep=<step> : This indicates the specific pan and tilt steps for diagonal movements which may allow a different amount of motion for horizontal and vertical components.
+
+  --preset=<preset> : This specifies the particular preset that relevant commands should operate on.
+
+The *command* option listed above may take one of the following commands as a parameter.
+
+wake
+  Wake the camera.
+sleep
+  Send the camera to sleep.
+reset
+  Reset the camera.
+move_map
+  Move mapped to a specified location on the image.
+move_pseudo_map
+  As move_map above. Pseudo-mapped motion can be used when mapped motion is not supported but relative motion is in which case mapped motion can be roughly approximated by careful calibration.
+move_abs_<direction>
+  Move to a specified absolute location. The direction element gives a hint to the direction to go but can be omitted. If present it will be one of "up", "down", "left", "right", "upleft", "upright", "downleft" or "downright".
+move_rel_<direction>
+  Move a specified amount in the given direction. 
+move_con_<direction>
+  Move continuously in the given direction until told to stop.
+move_stop
+  Stop any motion which may be in progress. 
+zoom_abs_<direction>
+  Zoom to a specified absolute zoom position. The direction element gives a hint to the direction to go but can be omitted. If present it will be one of "tele" or "wide".
+zoom_rel_<direction>
+  Zoom a specified amount in the given direction.
+zoom_con_<direction>
+  Zoom continuously in the given direction until told to stop.
+zoom_stop
+  Stop any zooming which may be in progress.
+focus_auto
+  Set focusing to be automatic.
+focus_man
+  Set focusing to be manual.
+focus_abs_<direction>
+  Focus to a specified absolute focus position. The direction element gives a hint to the direction to go but can be omitted. If present it will be one of "near" or "far".
+focus_rel_<direction>
+  Focus a specified amount in the given direction.
+focus_con_<direction>
+  Focus continuously in the given direction until told to stop.
+focus_stop
+  Stop any focusing which may be in progress.
+white_<subcommand>
+  As per the focus commands, except that direction may be "in" or "out".
+iris_<subcommand>
+  As per the focus commands, except that direction may be "open" or "close".
+preset_set
+  Set the given preset to the current location.
+preset_goto
+  Move to the given preset.
+preset_home
+  Move to the "home" preset.
--- a/docs/userguide/components.rst
+++ b/docs/userguide/components.rst
@ -0,0 +1,91 @@
+Components
+==========
+
+ZoneMinder is not a single monolithic application but is formed from several components. These components primarily include executable compiled binaries which do the main video processing work, perl scripts which usually perform helper and/or external interface tasks and php web scripts which are used for the web interface.
+
+A brief description of each of the principle components follows.
+
+Binaries
+--------
+**zmc**
+  This is the ZoneMinder Capture daemon. This binary's job is to sit on a video device and suck frames off it as fast as possible, this should 	run at more or less constant speed.
+**zma**
+  This is the ZoneMinder Analysis daemon. This is the component that goes through the captured frames and checks them for motion which might generate an alarm or event. It generally keeps up with the Capture daemon but if very busy may skip some frames to prevent it falling behind.
+**zmf**
+  This is the ZoneMinder Frame daemon. This is an optional daemon that can run in concert with the Analysis daemon and whose function it is to actually write captured frames to disk. This frees up the Analysis daemon to do more analysis (!) and so keep up with the Capture daemon better. If it isn’t running or dies then the Analysis daemon just writes them itself.
+**zms**
+  This is the ZoneMinder Streaming server. The web interface connects with this to get real-time or historical streamed images. It runs only when a live monitor stream or event stream is actually being viewed and dies when the event finishes or the associate web page is closed. If you find you have several zms processes running when nothing is being viewed then it is likely you need a patch for apache (see the Troubleshooting section). A non-parsed header version of zms, called nph-zms, is also installed and may be used instead depending on your web server configuration.
+**zmu**
+  This is the ZoneMinder Utility. It's basically a handy command line interface to several useful functions. It’s not really meant to be used by anyone except the web page (there's only limited 'help' in it so far) but can be if necessary, especially for debugging video problems.
+
+PHP
+---
+As well as this there are the web PHP files in the web directory. Currently these consist of 4 possible skins.
+
+**Classic**
+  Original ZoneMinder skin
+**Flat**
+  An updated version of classic skin, retaining the same layout with a more modern style
+**XMl**
+  Used by eyeZM as an interfacing skin
+**Mobile**
+  [Check status and purpose]
+
+Perl
+----
+Finally some perl scripts in the scripts directory. These scripts all have some configuration at the top of the files which should be viewed and amended if necessary and are as follows.
+
+**zmpkg.pl**
+  This is the ZoneMinder Package Control script. This is used by the web interface and service scripts to control the execution of the system as a whole.
+**zmdc.pl**
+  This is the ZoneMinder Daemon Control script. This is used by the web interface and the zmpkg.pl script to control and maintain the execution of the capture and analysis daemons, amongst others. You should not need to run this script yourself.
+**zmfilter.pl**
+  This script controls the execution of saved filters and will be started and stopped by the web interface based on whether there are filters that have been defined to be autonomous. This script is also responsible for the automatic uploading of events to a 3rd party server.
+**zmaudit.pl**
+  This script is used to check the consistency of the event file system and database. It can delete orphaned events, i.e. ones that appear in one location and not the other as well as checking that all the various event related tables are in line. It can be run interactively or in batch mode either from the command line or a cron job or similar. In the zmconfig.pl there is an option to specify fast event deletes where the web interface only deletes the event entry from the database itself. If this is set then it is this script that tidies up the rest.
+**zmwatch.pl**
+  This is a simple script purely designed to keep an eye on the capture daemons and restart them if they lockup. It has been known for sync problems in the video drivers to cause this so this script makes sure that nothing important gets missed.
+**zmupdate.pl**
+  Currently this script is responsible for checking whether a new version of ZoneMinder is available and other miscellaneous actions related to upgrades and migrations. It is also intended to be a ‘one stop shop’ for any upgrades and will execute everything necessary to update your installation to a new version.
+**zmvideo.pl**
+  This script is used from the web interface to generate video files in various formats in a common way. You can also use it from the command line in certain circumstances but this is not usually necessary.
+**zmx10.pl**
+  This is an optional script that can be used to initiate and monitor X10 Home Automation style events and interface with an alarm system either by the generation of X10 signals on ZoneMinder events or by initiating ZoneMinder monitoring and capture on receipt of X10 signals from elsewhere, for instance the triggering of an X10 PIR. For example I have several cameras that don’t do motion detection until I arm my alarm system whereupon they switch to active mode when an X10 signal is generated by the alarm system and received by ZoneMinder.
+**zmtrigger.pl**
+  This is an optional script that is a more generic solution to external triggering of alarms. It can handle external connections via either internet socket, unix socket or file/device interfaces. You can either use it ‘as is’ if you can interface with the existing format, or override connections and channels to customise it to your needs. The format of triggers used by zmtrigger.pl is as follows "<id>|<action>|<score>|<cause>|<text>|<showtext>" where
+
+  * 'id' is the id number or name of the ZM monitor.
+  * 'action' is 'on', 'off', 'cancel' or ‘show’ where 'on' forces an alarm condition on, 'off' forces an alarm condition off and 'cancel' negates the previous 'on' or 'off'. The ‘show’ action merely updates some auxiliary text which can optionally be displayed in the images captured by the monitor. Ordinarily you would use 'on' and 'cancel', 'off' would tend to be used to suppress motion based events. Additionally 'on' and 'off' can take an additional time offset, e.g. on+20 which automatically 'cancel's the previous action after that number of seconds.
+  * 'score' is the score given to the alarm, usually to indicate it's importance. For 'on' triggers it should be non-zero, otherwise it should be zero.
+  * 'cause' is a 32 char max string indicating the reason for, or source of the alarm e.g. 'Relay 1 open'. This is saved in the ‘Cause’ field of the event. Ignored for 'off' or 'cancel' messages.
+  * 'text' is a 256 char max additional info field, which is saved in the ‘Description’ field of an event. Ignored for 'off' or 'cancel' messages.
+  * 'showtext' is up to 32 characters of text that can be displayed in the timestamp that is added to images. The ‘show’ action is designed to update this text without affecting alarms but the text is updated, if present, for any of the actions. This is designed to allow external input to appear on the images captured, for instance temperature or personnel identity etc.
+
+  Note that multiple messages can be sent at once and should be LF or CRLF delimited. This script is not necessarily intended to be a solution in itself, but is intended to be used as ‘glue’ to help ZoneMinder interface with other systems. It will almost certainly require some customisation before you can make any use of it. If all you want to do is generate alarms from external sources then using the ZoneMinder::SharedMem perl module is likely to be easier.
+**zmcamtool.pl**
+  This optional script is new for the upcoming 1.27 release of ZoneMinder. It is intended to make it easy to do the following: bring in new ptz controls and camera presets, convert existing monitors into presets, and export custom ptz controls and presets. For the initial release, this script is not integrated into the UI and must be called from the command line.  Type ''zmcamtool.pl --help'' from the command line to get an explanation of the different arguments one can pass to the script.
+**zmcontrol-\*.pl**
+  These are a set of example scripts which can be used to control Pan/Tilt/Zoom class cameras. Each script converts a set of standard parameters used for camera control into the actual protocol commands sent to the camera. If you are using a camera control protocol that is not in the shipped list then you will have to create a similar script though it can be created entirely separately from ZoneMinder and does not need to named as these scripts are. Although the scripts are used to action commands originated from the web interface they can also be used directly or from other programs or scripts, for instance to implement periodic scanning to different presets.
+**zmtrack.pl**
+  This script is used to manage the experimental motion tracking feature. It is responsible for detecting that an alarm is taking place and moving the camera to point to the alarmed location, and then subsequently returning it to a defined standby location. As well as moving the camera it also controls when motion detection is suspended and restored so that the action of the camera tracking does not trigger endless further alarms which are not justified.
+**zm**
+  This is the (optional) ZoneMinder init script, see below for details.
+
+Finally, there are also a number of ZoneMinder perl modules included. These are used by the scripts above, but can also be used by your own or 3rd party scripts. Full documentation for most modules is available in ‘pod’ form via ‘perldoc’ but the general purpose of each module is as follows.
+
+**ZoneMinder.pm**
+  This is a general ZoneMinder container module. It includes the Base.pm, Config.pm Debug.pm, Database.pm, and SharedMem.pm modules described below. It also exports all of their symbols by default. If you use the other modules directly you have request which symbol tags to import.
+**ZoneMinder/Base.pm**
+  This is the base ZoneMinder perl module. It contains only simple data such as version information. It is included by all other ZoneMinder perl modules
+**ZoneMinder/Config.pm**
+  This module imports the ZoneMinder configuration from the database.
+**ZoneMinder/Debug.pm**
+  This module contains the defined Debug and Error functions etc, that are used by scripts to produce diagnostic information in a standard format.
+**ZoneMinder/Database.pm**
+  This module contains database access definitions and functions. Currently not a lot is in this module but it is included as a placeholder for future development.
+**ZoneMinder/SharedMem.pm**
+  This module contains standard shared memory access functions. These can be used to access the current state of monitors etc as well as issuing commands to the monitors to switch things on and off. This module effectively provides a ZoneMinder API.
+**ZoneMinder/ConfigAdmin.pm**
+  This module is a specialised module that contains the definition, and other information, about the various configuration options. It is not intended for use by 3rd parties.
+**ZoneMinder/Trigger/\*.pm**
+  These modules contain definitions of trigger channels and connections used by the zmtrigger.pl script. Although they can be used ‘as is’, they are really intended as examples that can be customised or specialised for different interfaces. Contributed modules for new channels or connections will be welcomed and included in future versions of ZoneMinder.
--- a/docs/userguide/controlmonitor.rst
+++ b/docs/userguide/controlmonitor.rst
@ -0,0 +1,8 @@
+Controlling Monitors
+====================
+
+If you have defined your system as having controllable monitors and you are looking at a monitor that is configured for control, then clicking on the ‘Control’ link along the top of the window will change the short event listing area to a control area. The capabilities you have defined earlier determine exactly what is displayed in this window. Generally you will have a Pan/Tilt control area along with one or subsidiary areas such as zoom or focus control to the side. If you have preset support then these will be near the bottom of the window. The normal method of controlling the monitor is by clicking on the appropriate graphics which then send a command via the control script to the camera itself. This may sometimes take a noticeable delay before the camera responds.
+
+It is usually the case that the control arrows are sensitive to where you click on them. If you have a camera that allows different speeds to be used for panning or zooming etc then clicking near the point of the arrow will invoke the faster speed whilst clicking near the base of the arrow will be slower. If you have defined continuous motion then ongoing activities can be stopped by clicking on the area between the arrows, which will either be a graphic in the case of pan/tilt controls or a word in the case of zoom and focus controls etc.
+
+Certain control capabilities such as mapped motion allow direct control by clicking on the image itself when used in browsers which support streamed images directly. Used in this way you can just click on the area of the image that interests you and the camera will centre on that spot. You can also use direct image control for relative motion when the area of the image you click on defines the direction and the distance away from the centre of the image determines the speed. As it is not always very easy to estimate direction near the centre of the image, the active area does not start until a short distance away from the centre, resulting in a ‘dead’ zone in the middle of the image. 
--- a/docs/userguide/definemonitor.rst
+++ b/docs/userguide/definemonitor.rst
@ -0,0 +1,200 @@
+Defining Monitors
+=================
+
+To use ZoneMinder properly you need to define at least one Monitor. Essentially, a monitor is associated with a camera and can continually check it for motion detection and such like.
+
+There are a small number of camera setups that ZoneMinder knows about and which can be accessed by clicking on the ‘Presets’ link. Selecting one of the presets will fill in the monitor configuration with appropriate values but you will still need to enter others and confirm the preset settings.
+
+The options are divided into a set of tabs to make it easier to edit. You do not have to ‘save’ to change to different tab so you can make all the changes you require and then click ‘Save’ at the end. The individual options are explained in a little more detail below,
+
+Monitor Tab
+-----------
+
+Name 
+    The name for your monitor. This should be made up of alphanumeric characters (a-z,A-Z,0-9) and hyphen (-) and underscore(_) only. Whitespace is not allowed. 
+
+Source Type 
+    This determines whether the camera is a local one attached to a physical video or USB port on your machine, a remote network camera or an image source that is represented by a file (for instance periodically downloaded from a alternate location). Choosing one or the other affects which set of options are shown in the Source tab. 
+
+Function 
+    This essentially defines what the monitor is doing. This can be one of the following; 
+
+        None – The monitor is currently disabled. No streams can be viewed or events generated. Nothing is recorded.
+        Monitor – The monitor is only available for live streaming. No image analysis is done so no alarms or events will be generated, and nothing will be recorded.
+        Modect – or MOtion DEteCTtion. All captured images will be analysed and events generated with recorded video where motion is detected.
+        Record – The monitor will be continuously recorded. Events of a fixed-length will be generated regardless of motion, analogous to a conventional time-lapse video recorder. No motion detection takes place in this mode.
+        Mocord – The monitor will be continuously recorded, with any motion being highlighted within those events.
+        Nodect – or No DEteCTtion. This is a special mode designed to be used with external triggers. In Nodect no motion detection takes place but events are recorded if external triggers require it. 
+
+    Generally speaking it is best to choose ‘Monitor’ as an initial setting here. 
+
+Enabled 
+    The enabled field indicates whether the monitor should be started in an active mode or in a more passive state. You will nearly always want to check this box, the only exceptions being when you want the camera to be enabled or disabled by external triggers or scripts. If not enabled then the monitor will not create any events in response to motion or any other triggers. 
+
+Linked Monitors 
+    This field allows you to select other monitors on your system that act as triggers for this monitor. So if you have a camera covering one aspect of your property you can force all cameras to record while that camera detects motion or other events. You can either directly enter a comma separated list of monitor ids or click on ‘Select’ to choose a selection. Be very careful not to create circular dependencies with this feature however you will have infinitely persisting alarms which is almost certainly not what you want! To unlink monitors you can ctrl-click. 
+
+Maximum FPS 
+    On some occasions you may have one or more cameras capable of high capture rates but find that you generally do not require this performance at all times and would prefer to lighten the load on your server. This option permits you to limit the maximum capture rate to a specified value. This may allow you to have more cameras supported on your system by reducing the CPU load or to allocate video bandwidth unevenly between cameras sharing the same video device. This value is only a rough guide and the lower the value you set the less close the actual FPS may approach it especially on shared devices where it can be difficult to synchronise two or more different capture rates precisely. This option controls the maximum FPS in the circumstance where no alarm is occurring only. (Note for IP cameras: ZoneMinder has no way to set or limit the mjpeg stream the camera passes, some cams you can set this through the url string, others do not. So if you're using mjpeg feeds you must NOT throttle here at the server end, only the cam end. If you want to use this feature, the server to throttle, then you MUST use jpeg instead of mjpeg method to get picture from the camera) 
+
+Alarm Maximum FPS 
+    If you have specified a Maximum FPS it may be that you don’t want this limitation to apply when your monitor is recording motion or other event. This setting allows you to override the Maximum FPS value if this circumstance occurs. As with the Maximum FPS setting leaving this blank implies no limit so if you have set a maximum fps in the previous option then when an alarm occurs this limit would be ignored and ZoneMinder would capture as fast as possible for the duration of the alarm, returning to the limited value after the alarm has concluded. Equally you could set this to the same, or higher (or even lower) value than Maximum FPS for more precise control over the capture rate in the event of an alarm. 
+
+Reference Image Blend %ge 
+    Each analysed image in ZoneMinder is a composite of previous images and is formed by applying the current image as a certain percentage of the previous reference image. Thus, if we entered the value of 10 here, each image’s part in the reference image will diminish by a factor of 0.9 each time round. So a typical reference image will be 10% the previous image, 9% the one before that and then 8.1%, 7.2%, 6.5% and so on of the rest of the way. An image will effectively vanish around 25 images later than when it was added. This blend value is what is specified here and if higher will make slower progressing events less detectable as the reference image would change more quickly. Similarly events will be deemed to be over much sooner as the reference image adapts to the new images more quickly. In signal processing terms the higher this value the steeper the event attack and decay of the signal. It depends on your particular requirements what the appropriate value would be for you but start with 10 here and adjust it (usually down) later if necessary. 
+
+Triggers 
+    This small section lets you select which triggers will apply if the run mode has been set to ‘triggered’ above. The most common trigger is X10 and this will appear here if you indicated that your system supported it during installation. Only X10 is supported as a shipped trigger with ZoneMinder at present but it is possible that other triggers will become available as necessary. You can also just use ‘cron’ jobs or other mechanisms to actually control the camera and keep them completely outside of the ZoneMinder settings. The zmtrigger.pl script is also available to implement custom external triggering. 
+
+Source Tab
+----------
+
+FFmpeg
+^^^^^^
+
+Source Path 
+    Use this field to enter the full URL of the stream or file. Look in Supported Hardware > Network Cameras section, how to obtain these strings that may apply to your camera. RTSP streams may be specified here. 
+Source Colours 
+    Specify the amount of colours in the captured image. Unlike with local cameras changing this has no controlling effect on the remote camera itself so ensure that your camera is actually capturing to this palette beforehand. 
+Capture Width/Height 
+    Make sure you enter here the same values as they are in the remote camera's internal setting. 
+Keep aspect ratio
+    As per local devices. 
+Orientation 
+    As per local devices. 
+
+LibVLC
+^^^^^^
+
+cURL
+^^^^
+
+Local
+^^^^^
+
+Device Path/Channel 
+    Enter the full path to the device file that your camera is attached to, e.g. /dev/video0. Some video devices, e.g. BTTV cards support multiple cameras on one device so in this case enter the channel number in the Channel box or leave it at zero if you're using a USB camera or one with just one channel. Look in Supported Hardware section, how to see if your capture card or USB webcam is supported or not, and what extra settings you may have to do, to make it work. 
+Device Format 
+    Enter the video format of the video stream. This is defined in various system files (e.g. /usr/include/linux/videodev.h) but the two most common are 0 for PAL and 1 for NTSC. 
+Capture Palette 
+    Finally for the video part of the configuration enter the colour depth. ZoneMinder supports a handful of the most common palettes, so choose one here. If in doubt try grey first, and then 24 bit colour. If neither of these work very well then YUV420P or one of the others probably will. There is a slight performance penalty when using palettes other than grey or 24 bit colour as an internal conversion is involved. These other formats are intended to be supported natively in a future version but for now if you have the choice choose one of grey or 24 bit colour. 
+Capture Width/Height 
+    The dimensions of the video stream your camera will supply. If your camera supports several just enter the one you'll want to use for this application, you can always change it later. However I would recommend starting with no larger than 320x240 or 384x288 and then perhaps increasing and seeing how performance is affected. This size should be adequate in most cases. Some cameras are quite choosy about the sizes you can use here so unusual sizes such as 197x333 should be avoided initially. 
+Keep aspect ratio
+    When typing in the dimensions of monitors you can click this checkbox to ensure that the width stays in the correct ratio to the height, or vice versa. It allows height to be calculated automatically from width (or vice versa) according to preset aspect ratio. This is preset to 4:3 but can be amended globally via the Options->Config->ZM_DEFAULT_ASPECT_RATIO setting. Aside from 4:3 which is the usual for network and analog cameras another common setting is 11:9 for CIF (352x288) based sources. 
+Orientation 
+    If your camera is mounted upside down or at right angles you can use this field to specify a rotation that is applied to the image as it is captured. This incurs an additional processing overhead so if possible it is better to mount your camera the right way round if you can. If you choose one of the rotation options remember to switch the height and width fields so that they apply, e.g. if your camera captures at 352x288 and you choose ‘Rotate Right’ here then set the height to be 352 and width to be 288. You can also choose to ‘flip’ the image if your camera provides mirrored input. 
+
+Remote
+^^^^^^
+
+Remote Host/Port/Path 
+    Use these fields to enter the full URL of the camera. Basically if your camera is at http://camserver.home.net:8192/cameras/camera1.jpg then these fields will be camserver.home.net, 8192 and /cameras/camera1.jpg respectively. Leave the port at 80 if there is no special port required. If you require authentication to access your camera then add this onto the host name in the form <username>:<password>@<hostname>.com. This will usually be 24 bit colour even if the image looks black and white. Look in Supported Hardware > Network Cameras section, how to obtain these strings that may apply to your camera. 
+Remote Image Colours 
+    Specify the amount of colours in the captured image. Unlike with local cameras changing this has no controlling effect on the remote camera itself so ensure that your camera is actually capturing to this palette beforehand. 
+Capture Width/Height 
+    Make sure you enter here the same values as they are in the remote camera's internal setting. 
+Keep aspect ratio
+    As per local devices. 
+Orientation 
+    As per local devices. 
+
+For an example to setup a MPEG-4 camera see: How_to_Setup_an_Axis211A_with_MPEG-4_streaming
+
+File
+^^^^
+
+File Path 
+    Enter the full path to the file to be used as the image source. 
+File Colours 
+    Specify the amount of colours in the image. Usually 24 bit colour. 
+Capture Width/Height
+    As per local devices. 
+Keep aspect ratio
+    As per local devices. 
+Orientation 
+    As per local devices. 
+
+Timestamp Tab
+-------------
+
+Timestamp Label Format 
+    This relates to the timestamp that is applied to each frame. It is a ‘strftime’ style string with a few extra tokens. You can add %f to add the decimal hundredths of a second to the frame timestamp, so %H:%M:%S.%f will output time like 10:45:37.45. You can also use %N for the name of the monitor and %Qwhich will be filled by any of the ‘show text’ detailed in the zmtriggers.pl section. 
+Timestamp Label X/Y 
+    The X and Y values determine where to put the timestamp. A value of 0 for the X value will put it on the left side of the image and a Y value of 0 will place it at the top of the image. To place the timestamp at the bottom of the image use a value eight less than the image height. 
+
+Buffers Tab
+-----------
+
+Image Buffer Size 
+    This option determines how many frames are held in the ring buffer at any one time. The ring buffer is the storage space where the last ‘n’ images are kept, ready to be resurrected on an alarm or just kept waiting to be analysed. It can be any value you like with a couple of provisos, (see next options). However it is stored in shared memory and making it too large especially for large images with a high colour depth can use a lot of memory. A value of no more than 50 is usually ok. If you find that your system will not let you use the value you want it is probably because your system has an arbitrary limit on the size of shared memory that may be used even though you may have plenty of free memory available. This limit is usually fairly easy to change, see the Troubleshooting section for details. 
+Warm-up Frames 
+    This specifies how many frames the analysis daemon should process but not examine when it starts. This allows it to generate an accurate reference image from a series of images before looking too carefully for any changes. I use a value of 25 here, too high and it will take a long time to start, too low and you will get false alarms when the analysis daemon starts up. 
+Pre/Post Event Image Buffer 
+    These options determine how many frames from before and after an event should be preserved with it. This allows you to view what happened immediately prior and subsequent to the event. A value of 10 for both of these will get you started but if you get a lot of short events and would prefer them to run together to form fewer longer ones then increase the Post Event buffer size. The pre-event buffer is a true buffer and should not really exceed half the ring buffer size. However the post-event buffer is just a count that is applied to captured frames and so can be managed more flexibly. You should also bear in mind the frame rate of the camera when choosing these values. For instance a network camera capturing at 1FPS will give you 10 seconds before and after each event if you chose 10 here. This may well be too much and pad out events more than necessary. However a fast video card may capture at 25FPS and you will want to ensure that this setting enables you to view a reasonable time frame pre and post event. 
+Stream Replay Image Buffer
+    This option ... 
+Alarm Frame Count 
+    This option allows you to specify how many consecutive alarm frames must occur before an alarm event is generated. The usual, and default, value is 1 which implies that any alarm frame will cause or participate in an event. You can enter any value up to 16 here to eliminate bogus events caused perhaps by screen flickers or other transients. Values over 3 or 4 are unlikely to be useful however. Please note that if you have statistics recording enabled then currently statistics are not recorded for the first ‘Alarm Frame Count’-1 frames of an event. So if you set this value to 5 then the first 4 frames will be missing statistics whereas the more usual value of 1 will ensure that all alarm frames have statistics recorded. 
+
+Control Tab
+-----------
+
+Note: This tab and its options will only appear if you have selected the ZM_OPT_CONTROL option to indicate that your system contains cameras which are able to be controlled via Pan/Tilt/Zoom or other mechanisms. See the Camera Control section elsewhere in this document for further details on camera control protocols and methods.
+
+Controllable 
+    Check this box to indicate your camera can be controlled. 
+Control Type 
+    Select the control type that is appropriate for your camera. ZoneMinder ships with a small number of predefined control protocols which will works with some cameras without modification but which may have to amended to function with others, Choose the edit link to create new control types or to edit the existing ones. 
+Control Device 
+    This is the device that is used to control your camera. This will normally be a serial or similar port. If your camera is a network camera, you will generally not need to specify a control device. 
+Control Address 
+    This is the address of your camera. Some control protocols require that each camera is identified by a particular, usually numeric, id. If your camera uses addressing then enter the id of your camera here. If your camera is a network camera then you will usually need to enter the hostname or IP address of it here. This is ordinarily the same as that given for the camera itself. 
+Auto Stop Timeout 
+    Some cameras only support a continuous mode of movement. For instance you tell the camera to pan right and then when it is aligned correctly you tell it to stop. In some cases it is difficult to time this precisely over a web interface so this option allows you to specify an automatic timeout where the command will be automatically stopped. So a value of 0.25 here can tell the script to stop moving a quarter of a second after starting. This allows a more precise method of fine control. If this value is left blank or at zero it will be ignored, if set then it will be used as the timeout however it will only be applied for the lower 25% of possible speed ranges. In other words if your camera has a pan speed range of 1 to 100 then selecting to move at 26 or over will be assumed to imply that you want a larger movement that you can control yourself and no timeout will be applied. Selecting motion at lower speeds will be interpreted as requiring finer control and the automatic timeout will be invoked. 
+Track Motion 
+    This and the following four options are used with the experimental motion function. This will only work if your camera supports mapped movement modes where a point on an image can be mapped to a control command. This is generally most common on network cameras but can be replicated to some degree on other cameras that support relative movement modes. See the Camera Control section for more details. Check this box to enable motion tracking. 
+Track Delay 
+    This is the number of seconds to suspend motion detection for following any movement that the camera may make to track motion. 
+Return Location 
+    If you camera supports a ‘home’ position or presets you can choose which preset the camera should return to after tracking motion. 
+Return Delay 
+    This is the delay, in seconds, once motion has stopped being detected, before the camera returns to any defined return location. 
+
+X10 Tab
+-------
+
+Note: This tab and its options will only appear if you have indicated that your system supports the X10 home automation protocol during initial system configuration.
+
+X10 Activation String 
+    The contents of this field determine when a monitor starts and/or stops being active when running in ‘Triggered; mode and with X10 triggers. The format of this string is as follows, 
+
+        n : If you simply enter a number then the monitor will be activated when an X10 ON signal for that unit code is detected and will be deactivated when an OFF signal is detected.
+        !n : This inverts the previous mode, e.g. !5 means that the monitor is activated when an OFF signal for unit code 5 is detected and deactivated by an ON.
+        n+ : Entering a unit code followed by + means that the monitor is activated on receipt of a ON signal for that unit code but will ignore the OFF signal and as such will not be deactivated by this instruction. If you prepend a '!' as per the previous definition it similarly inverts the mode, i.e. the ON signal deactivates the monitor.
+        n+<seconds> : As per the previous mode except that the monitor will deactivate itself after the given number of seconds.
+        n- : Entering a unit code followed by - means that the monitor is deactivated on receipt of a OFF signal for that unit code but will ignore the ON signal and as such will not be activated by this instruction. If you prepend a '!' as per the previous definition it similarly inverts the mode, i.e. the OFF signal activates the monitor.
+        n-<seconds> : As per the previous mode except that the monitor will activate itself after the given number of seconds. 
+
+    You can also combine several of these expressions to by separating them with a comma to create multiple circumstances of activation. However for now leave this blank. 
+
+X10 Input Alarm String 
+    This has the same format as the previous field but instead of activating the monitor with will cause a forced alarm to be generated and an event recorded if the monitor is Active. The same definition as above applies except that for activated read alarmed and for deactivated read unalarmed(!). Again leave this blank for now. 
+X10 Output Alarm String 
+    This X10 string also has the same format as the two above options. However it works in a slightly different way. Instead of ZoneMinder reacting to X10 events this option controls how ZoneMinder emits X10 signals when the current monitor goes into or comes out of the alarm state. Thus just entering a number will cause the ON signal for that unit code to be sent when going into alarm state and the OFF signal when coming out of alarm state. Similarly 7+30 will send the unit code 7 ON signal when going into alarm state and the OFF signal 30 seconds later regardless of state. The combination of the X10 instruction allows ZoneMinder to react intelligently to, and also assume control of, other devices when necessary. However the indiscriminate use of the Input Alarm and Output Alarm signals can cause some horrendous race conditions such as a light going on in response to an alarm which then causes an alarm itself and so on. Thus some circumspection is required here. Leave this blank for now anyway. 
+
+Misc Tab
+--------
+
+Event Prefix 
+    By default events are named ‘Event-<event id>’, however you are free to rename them individually as you wish. This option lets you modify the event prefix, the ‘Event-‘ part, to be a value of your choice so that events are named differently as they are generated. This allows you to name events according to which monitor generated them. 
+Section Length 
+    This specifies the length (in seconds) of any fixed length events produced when the monitor function is ‘Record’ or ‘Mocord’. Otherwise it is ignored. This should not be so long that events are difficult to navigate nor so short that too many events are generated. A length of between 300 and 900 seconds I recommended. 
+Frame Skip 
+    This setting also applies only to the ‘Record’ or ‘Mocord’ functions and specifies how many frames should be skipped in the recorded events. The default setting of zero results in every captured frame being saved. Using a value of one would mean that one frame is skipped between each saved, two means that two frames are skipped between each saved frame etc. An alternate way of thinking is that one in every ‘Frame Skip + 1’ frames is saved. The point of this is to ensure that saved events do not take up too much space unnecessarily whilst still allowing the camera to capture at a fairly high frame rate. The alternate approach is to limit the capture frame rate which will obviously affect the rate at which frames are saved. 
+FPS Report Interval 
+    How often the current performance in terms of Frames Per Second is output to the system log. Not used in any functional way so set it to maybe 1000 for now. If you watch /var/log/messages (normally) you will see this value being emitted at the frequency you specify both for video capture and processing. 
+Default Scale 
+    If your monitor has been defined with a particularly large or small image size then you can choose a default scale here with which to view the monitor so it is easier or more visible from the web interface. 
+Web Colour 
+    Some elements of ZoneMinder now use colours to identify monitors on certain views. You can select which colour is used for each monitor here. Any specification that is valid for HTML colours is valid here, e.g. ‘red’ or ‘#ff0000’. A small swatch next to the input box displays the colour you have chosen. 
--- a/docs/userguide/definezone.rst
+++ b/docs/userguide/definezone.rst
@ -0,0 +1,90 @@
+Defining Zones
+==============
+
+The next important thing to do with a new monitor is set up Zones for it to use. By default you'll already have one generated for you when you created your monitor but you might want to modify it or add others. Click on the Zones column for your monitor and you should see a small popup window appear which contains an image from your camera overlain with a stippled pattern representing your zone. In the default case this will cover the whole image. The colour of the zones appearing here is determined by what type they are. The default zone is Active and so will be red, Inclusive zones are orange, exclusive zones are purple, preclusive zones are blue and inactive zones are white.
+
+Beneath the zones image will be a table containing a listing of your zones. Clicking on either the relevant bit of the image or on the Id or Name in the table will bring up another window where you can edit the particulars for your Zones. For more information on defining or editing a zone, see Defining Zones.
+
+Zone configuration and tuning are important when running in the motion detection modes to avoid storing, sorting through, or being alerted on uninteresting video data.  Configuring a zone involves setting some basic parameters, as well as choosing an alarm check method and tuning their associated detection parameters.
+
+The Zone view is split into two main areas, on the left is the options are area and on the right is the zone drawing area. A default or new zone will cover the whole drawing area and will overlay any other zones you already have on there. Unlike the previous zones image, the current zone is coloured green, other zones will be orange regardless of type. The smaller the zone, the less processing time it takes to examine it.
+
+Basic parameters
+^^^^^^^^^^^^^^^^
+Name
+  Each Zone can be named for reference purposes.  It is used for logging and debugging.  Choose a name that helps you identify your zones.
+
+Type
+  This is one of the more important concepts in ZoneMinder and there are five to choose from.
+
+  * Active 
+    Triggers an alarm when motion is detected within it.  This is the zone type you'll use most often, and which will be set for your default zone.  Only Active and Exclusive zones can trigger an alarm.
+
+  * Inclusive 
+    This zone type can be used for any zones that you want to trigger an alarm only if at least one other Active zone has already triggered one. This might be for example to cover an area of the image like a plant or tree which moves a lot and which would trigger lots of alarms. Perhaps this is behind an area you'd like to monitor though, in this case you'd create an active zone covering the non-moving parts and an inclusive zone covering the tree perhaps with less sensitive detection settings also. If something triggered an alarm in the Active zone and also in the Inclusive zone they would both be registered and the resulting alarm would be that much bigger than if you had blanked it out altogether.
+
+  * Exclusive
+    Triggers an alarm when motion is detected within it, as long as no alarms have already been triggered in an Active zone.  This is the most specialized of the zone types. For instance in the camera covering my garden I keep watch for a hedgehog that visits most nights and scoffs the food out of my cats bowls. By creating a sensitive Exclusive zone in that area I can ensure that a hedgehog alarm will only trigger if there is activity in that small area. If something much bigger occurs, like someone walking by it will trigger a regular alarm and not one from the Exclusive zone. Thus I can ensure I get alarms for big events and also special small events but not the noise in between.
+
+  * Preclusive 
+    This zone type is relatively recent. It is called a Preclusive zone because if it is triggered it actually precludes an alarm being generated for that image frame. So motion or other changes that occur in a Preclusive zone will have the effect of ensuring that no alarm occurs at all. The application for this zone type is primarily as a shortcut for detecting general large-scale lighting or other changes. Generally this may be achieved by limiting the maximum number of alarm pixels or other measure in an Active zone. However in some cases that zone may cover an area where the area of variable illumination occurs in different places as the sun and/or shadows move and it thus may be difficult to come up with general values. Additionally, if the sun comes out rapidly then although the initial change may be ignored in this way as the reference image catches up an alarm may ultimately be triggered as the image becomes less different. Using one or more Preclusive zones offers a different approach. Preclusive zones are designed to be fairly small, even just a few pixels across, with quite low alarm thresholds. They should be situated in areas of the image that are less likely to have motion occur such as high on a wall or in a corner. Should a general illumination change occur they would be triggered at least as early as any Active zones and prevent any other zones from generating an alarm. Obviously careful placement is required to ensure that they do not cancel any genuine alarms or that they are not so close together that any motion just hops from one Preclusive zone to another.  Preclusive zones may also be used to reduce processing time by situating one over an Active zone.  The Preclusive zone is processed first; if it is small, and is triggered, the rest of the zone/image will not be processed.
+
+  * Inactive
+    Suppresses the detection of motion within it.  This can be layered on top of any other zone type, preventing motion within the Inactive zone from being effective for any other zone type.  Use inactive zones to cover areas in which nothing notable will ever happen or where you get false alarms that don't relate to what you are trying to monitor.  Inactive zones may be overlaid on other zones to blank out areas, and are processed first.  As a general practice, you should try and make zones abut each other instead of overlapping to avoid repeated duplicate processing of the same area.  
+
+Preset
+  The preset chooser sets sensible default values based on computational needs (fast v. best) and sensitivity (low, medium, high.)  It is not required that you select a preset, and you can alter any of the parameters after choosing a preset.  For a small number of monitors with ZoneMinder running on modern equipment, Best, high sensitivity can be chosen as a good starting point.
+
+Units
+  * Pixels - Selecting this option will allow many of the following values to be entered (or viewed) in units of pixels.
+  * Percentage -  Selecting this option will allow may of the following values to be entered (or viewed) as a percentage.  The sense of the percentage values refers to the area of the zone and not the image as a whole. This makes trying to work out necessary sizes rather easier.
+
+Region points
+  [[File:Zone - Region sample.jpg|frame|right|The sample region shown to the right shows a region defined by 6 control points.  The shape of the region causes the check methods to ignore the sidewalk and areas of the porch wall that receive changing sunlight; two conditions that are not of interest in this zone.]]
+  A region is a part of the captured image that is of interest for this zone.  By default, a region is configured to cover the whole captured image.  Depending on the selected type of this zone, the shape of the region can be adjusted to accommodate multiple effects.  This can be done by dragging the control points in the reference image around, or by altering the coordinates found in the controls below the reference image.  Clicking on a control point in the reference image highlights the coordinates in the table below.  Clicking the + button in a point row adds a control point between this point and the next; clicking the - button removes this control point.  It is possible to accidentally place a control point outside of the valid coordinates of the image.  This will prevent the monitor from working properly.  You can make zones almost any shape you like; except that zones may not self-intersect (i.e. edges crossing over each other).
+
+Alarm Colour
+  These parameters can be used to individually colorize the zone overlay pattern.  Alarms in this zone will be highlighted in the alarm colour.  This option is irrelevant for Preclusive and Inactive zones and will be disabled.
+
+Alarm Check Methods
+  There are 3 Alarm Check Methods.  They are sequential, and are layered:  In AlarmedPixels mode, only the AlarmedPixel analysis is performed.  In FilteredPixels mode, the AlarmedPixel analysis is performed first, followed by the AlarmedPixel analysis.  In the Blobs mode, all 3 analysis methods are performed in order.  An alarm is only triggered if *all* of the enabled analysis modes are triggered.  For performance reasons, as soon as the criteria for one of the analysis modes is not met, the alarm checking for the frame is complete.  Since the subsequent modes each require progressively more computations, it is a good idea to tune the parameters in each of the activated layers.
+
+  For reference purposes, the Zone Area box shows the area of the entire region of interest.  In percent mode, this is 100.  In Pixels mode, this is the pixel count of the region.  All 3 Min/Max Area parameter groups are based on the Zone Area as the maximum sensible value, and all 3 are interpreted in the units specified in the Units input.
+
+AlarmedPixels
+  Alarmed pixels is the first layer of analysis, and is always enabled.  Its recommended that you start with this method and move on to the subsequent methods once the effects of the basic parameters are understood.  In the AlarmedPixels mode, 2 parameter categories are available for tuning: Min/Max Pixel Threshold, and Min/Max Alarmed Area.
+
+Min/Max Pixel Threshold (0-255)
+  In the AlarmedPixel layer of analysis, each individual pixel of the image is compared to the current reference image.  Pixels that are different from the reference image are considered alarmed pixels.  However, small aberrations in lighting or auto exposure camera adjustments may cause the explicit value of a pixel to vary by small amounts from image to image.  This parameter allows you to set the limits of what will be considered a changed pixel.  For example, if your camera points to a blank white wall, and you raise a black colored item into view, then the change in any one pixel will be great, indeed, extreme.  If however, you raise a white piece of paper, then the change in an individual pixel will be less.
+
+  The minimum pixel threshold setting should be high enough to cause minor lighting, imaging, or compression changes to be ignored.  Setting the minimum value too high, may allow a white cat to walk undetected across the view of the white wall.  A good starting point for the minimum pixel threshold is 40, meaning that the difference in pixel value from must be greater than 40.  A good default for the maximum pixel threshold is 0 (indicating that all differences above the minimum threshold are considered a change.)
+
+Min/Max Alarmed Area
+  The count of alarmed pixels (or percentage of alarmed pixels relative to the pixel area of the region if in percent mode) is used in this first layer of analysis to determine if an alarm is triggered.  If the count or percentage is above the minimum alarmed area, but less than the maximum alarmed area, an alarm is triggered.  These settings depend on the size of the object you are trying to capture: a value too low may cause false alarms, while a value too high might not detect small objects.  A good starting point for both the minimum and maximum are 0 and 0, indicating that any number of alarmed pixels (or any percentage) greater than 0 will trigger an alarm.  The frame scores from logged events can then be used to bring the minimum up to a reasonable value.  An alternative starting point for the minimum alarmed area (in percent) is 25% of the area that an object of interest takes up in the region.  For example, if you approximate that a subject moving through the frame takes up 30% of the frame, then a good starting minimum area is about 7.5%.
+
+FilteredPixels
+  Selecting the FilteredPixels Alarm Check Method adds an additional layer of analysis to the AlarmedPixels check along with 2 additional parameter categories for tuning.  This layer works by analyzing the alarmed pixels identified in the first layer.  Alarmed pixels are disregarded, in this and future layers if enabled, if they are not in groups of a minimum small square size.  Primarily, this filtering removes isolated alarmed pixels that may be artifacts of the camera, lens, or compression.
+
+Filter Width/Height (pixels)
+  This parameter is always specified in Pixels, even when Percentages are the selected units.  It specifies the size of the group of pixels surrounding a given pixel that must be in alarmed pixels for the pixel itself to be considered an alarmed pixel.  The width and height should always be an odd number.  3 x 3 is the default value, and 5 x 5 is also suggested as a sensible alternative.  Avoid using large numbers for the width and height of the filter area.  When using the Blobs Alarm Check Method, FilteredPixels can be effectively disabled by setting either the width or height to a value less than 1.
+Min/Max Filtered Area
+  Applying the filtering analysis results in an area that is less than or equal to the alarmed area.  Thus the minimum and maximum filtered area parameters for alarm should be equal to or less than the corresponding alarm area parameters, or the FilteredPixels analysis will never trigger an alarm.  In particular, it is useful to raise the minimum alarmed area parameter until false events from image artifacts disappear, and setting a minimum filtered area parameter less the minimum alarmed area parameter by enough to capture small events of interest.
+
+Blobs
+  File:Zone - 1 blob example.jpg|frame|right|This captured frame shows an image with 1 identified blob.  The blob is outlined in the Alarm Colour specified above.
+  When two or more Filtered areas touch or share a boundary, it is sensible to evaluate the regions as one contiguous area instead of separate entities.  A Blob is a contiguous area made up of multiple filtered areas.  Whereas FilteredPixes is useful for excluding parts of the image that are not part of the actual scene, Blob filtering is better suited to disregarding areas of the actual scene that are not of interest. 
+  Selecting the Blobs Alarm Check Method opens up all of the available parameters.  Enabling Blobs adds one more layer of analysis to the AlarmedPixel and FilteredPixel checks in the determination of a valid alarm along along with 2 additional parameter categories for tuning: the size of the blobs, and the number of blobs.  A Blob is not necessarily the whole object that may be of interest.  In the example image, the subject is moving, but only a portion of him is marked as a blob.  This is because as the subject moves, many pixels of the image do not change in value beyond the set threshold.  A pixel that is representing the subject's shoulder in one frame may be representing his back in the next, however, the value of the pixel remains nearly the same. 
+
+Min/Max Blob Area
+  The blob area parameters control the smallest and largest contiguous areas that are to be considered a blob.  A good value for the maximum area is the default of 0. (There is no upper bound for the size of a contiguous area that will still be considered a blob.)
+
+Min/Max Blobs
+  Normally, you would want any positive number of blobs to trigger an event, so the default value of 1 should suffice.  In some circumstances, it may benefit to have only one blob NOT trigger an event, in which case, setting this value to 2 or higher may serve some special purpose.  A good value for the maximum blobs is the default of 0. (There is no upper bound for the number of blobs that will trigger an event.  Use the maximum blobs parameter can be used to tune out events that show a high number of blobs.
+
+Overload Frame Ignore Count
+  This setting specifies the number of frames to NOT raise an alarm after an overload. In this context, overload is defined as a detected change too big to raise an alarm. Depending on the alarm check method that could be 
+  * Number of alarmed pixels > Max Alarmed Area or
+  * Number of filtered pixels > Max Filtered Area or
+  * Number of Blobs > Max Blobs
+  The idea is that after a change like a light going on that is considered too big to count as an alarm, it could take a couple of frames for things to settle down again.
+
--- a/docs/userguide/filterevents.rst
+++ b/docs/userguide/filterevents.rst
@ -0,0 +1,100 @@
+Filtering Events
+================
+
+The other columns on the main console window contain various event totals for your monitors over the last hour, day, week and month as well as a grand total and a total for events that you may have archived for safekeeping. Clicking on one of these totals or on the 'All' or 'Archive' links from the monitor window described above will present you with a new display. This is the full event window and contains a list of events selected according to a filter which will also pop up in its own window. Thus if you clicked on a 'day' total the filter will indicate that this is the period for which events are being filtered. The event listing window contains a similar listing to the recent events in the monitor window. The primary differences are that the frames and alarm frames and the score and maximum score are now broken out into their own columns, all of which can be sorted by clicking on the heading. Also this window will not refresh automatically, rather only on request. Other than that, you can choose to view events here or delete them as before.
+
+The other window that appeared is a filter window. You can use this window to create your own filters or to modify existing ones. You can even save your favourite filters to re-use at a future date. Filtering itself is fairly simple; you first choose how many expressions you'd like your filter to contain. Changing this value will cause the window to redraw with a corresponding row for each expression. You then select what you want to filter on and how the expressions relate by choosing whether they are 'and' or 'or' relationships. For filters comprised of many expressions you will also get the option to bracket parts of the filter to ensure you can express it as desired. Then if you like choose how you want your results sorted and whether you want to limit the amount of events displayed.
+
+There are several different elements to an event that you can filter on, some of which require further explanation. These are as follows, 'Date/Time' which must evaluate to a date and a time together, 'Date' and 'Time' which are variants which may only contain the relevant subsets of this, 'Weekday' which as expected is a day of the week.
+
+All of the preceding elements take a very flexible free format of dates and time based on the PHP strtotime function (http://www.php.net/manual/en/function.strtotime.php). This allows values such as 'last Wednesday' etc to be entered. I recommend acquainting yourself with this function to see what the allowed formats are. However automated filters are run in perl and so are parsed by the Date::Manip package. Not all date formats are available in both so if you are saved your filter to do automatic deletions or other tasks you should make sure that the date and time format you use is compatible with both methods. The safest type of format to use is ‘-3 day’ or similar with easily parseable numbers and units are in English.
+
+The other things you can filter on are all fairly self explanatory, except perhaps for 'Archived' which you can use to include or exclude Archived events. In general you'll probably do most filtering on un-archived events. There are also two elements, Disk Blocks and Disk Percent which don’t directly relate to the events themselves but to the disk partition on which the events are stored. These allow you to specify an amount of disk usage either in blocks or in percentage as returned by the ‘df’ command. They relate to the amount of disk space used and not the amount left free. Once your filter is specified, clicking 'submit' will filter the events according to your specification. As the disk based elements are not event related directly if you create a filter and include the term ‘DiskPercent > 95’ then if your current disk usage is over that amount when you submit the filter then all events will be listed whereas if it is less then none at all will. As such the disk related terms will tend to be used mostly for automatic filters (see below). If you have created a filter you want to keep, you can name it and save it by clicking 'Save'.
+
+If you do this then the subsequent dialog will also allow you specify whether you want this filter automatically applied in order to delete events or upload events via ftp to another server and mail notifications of events to one or more email accounts. Emails and messages (essentially small emails intended for mobile phones or pagers) have a format defined in the Options screen, and may include a variety of tokens that can be substituted for various details of the event that caused them. This includes links to the event view or the filter as well as the option of attaching images or videos to the email itself. Be aware that tokens that represent links may require you to log in to access the actual page, and sometimes may function differently when viewed outside of the general ZoneMinder context. The tokens you can use are as follows.
+
+:    %EI%           Id of the event
+:    %EN%          Name of the event
+:    %EC%          Cause of the event
+:    %ED%          Event description
+:    %ET%          Time of the event
+:    %EL%          Length of the event
+:    %EF%          Number of frames in the event
+:    %EFA%        Number of alarm frames in the event
+:    %EST%        Total score of the event
+:    %ESA%       Average score of the event
+:    %ESM%       Maximum score of the event
+:    %EP%          Path to the event
+:    %EPS%       Path to the event stream
+:    %EPI%         Path to the event images
+:    %EPI1%       Path to the first alarmed event image
+:    %EPIM%      Path to the (first) event image with the highest score
+:    %EI1%         Attach first alarmed event image
+:    %EIM%        Attach (first) event image with the highest score
+:    %EV%          Attach event mpeg video
+:    %MN%         Name of the monitor
+:    %MET%       Total number of events for the monitor
+:    %MEH%       Number of events for the monitor in the last hour
+:    %MED%       Number of events for the monitor in the last day
+:    %MEW%      Number of events for the monitor in the last week
+:    %MEM%      Number of events for the monitor in the last month
+:    %MEA%       Number of archived events for the monitor
+:    %MP%         Path to the monitor window
+:    %MPS%       Path to the monitor stream
+:    %MPI%        Path to the monitor recent image
+:    %FN%          Name of the current filter that matched
+:    %FP%          Path to the current filter that matched
+:    %ZP%          Path to your ZoneMinder console
+
+Finally you can also specify a script which is run on each matched event. This script should be readable and executable by your web server user. It will get run once per event and the relative path to the directory containing the event in question. Normally this will be of the form <MonitorName>/<EventId> so from this path you can derive both the monitor name and event id and perform any action you wish. Note that arbitrary commands are not allowed to be specified in the filter, for security the only thing it may contain is the full path to an executable. What that contains is entirely up to you however.
+
+Filtering is a powerful mechanism you can use to eliminate events that fit a certain pattern however in many cases modifying the zone settings will better address this. Where it really comes into its own is generally in applying time filters, so for instance events that happen during weekdays or at certain times of the day are highlighted, uploaded or deleted. Additionally using disk related terms in your filters means you can automatically create filters that delete the oldest events when your disk gets full. Be warned however that if you use this strategy then you should limit the returned results to the amount of events you want deleted in each pass until the disk usage is at an acceptable level. If you do not do this then the first pass when the disk usage is high will match, and then delete, all events unless you have used other criteria inside of limits. ZoneMinder ships with a sample filter already installed, though disabled. The PurgeWhenFull filter can be used to delete the oldest events when your disk starts filling up. To use it you should select and load it in the filter interface, modify it to your requirements, and then save it making you sure you check the ‘Delete all matches’ option. This will then run in the background and ensure that your disk does not fill up with events.
+
+
+Relative items in date strings
+------------------------------
+
+Relative items adjust a date (or the current date if none) forward or backward. The effects of relative items accumulate. Here are some examples:
+ 	
+
+1 year
+1 year ago
+3 years
+2 days
+
+The unit of time displacement may be selected by the string ‘year’ or ‘month’ for moving by whole years or months. These are fuzzy units, as years and months are not all of equal duration. More precise units are ‘fortnight’ which is worth 14 days, ‘week’ worth 7 days, ‘day’ worth 24 hours, ‘hour’ worth 60 minutes, ‘minute’ or ‘min’ worth 60 seconds, and ‘second’ or ‘sec’ worth one second. An ‘s’ suffix on these units is accepted and ignored.
+
+The unit of time may be preceded by a multiplier, given as an optionally signed number. Unsigned numbers are taken as positively signed. No number at all implies 1 for a multiplier. Following a relative item by the string ‘ago’ is equivalent to preceding the unit by a multiplier with value -1.
+
+The string ‘tomorrow’ is worth one day in the future (equivalent to ‘day’), the string ‘yesterday’ is worth one day in the past (equivalent to ‘day ago’).
+
+The strings ‘now’ or ‘today’ are relative items corresponding to zero-valued time displacement, these strings come from the fact a zero-valued time displacement represents the current time when not otherwise changed by previous items. They may be used to stress other items, like in ‘12:00 today’. The string ‘this’ also has the meaning of a zero-valued time displacement, but is preferred in date strings like ‘this thursday’.
+
+When a relative item causes the resulting date to cross a boundary where the clocks were adjusted, typically for daylight saving time, the resulting date and time are adjusted accordingly.
+
+The fuzz in units can cause problems with relative items. For example, ‘2003-07-31 -1 month’ might evaluate to 2003-07-01, because 2003-06-31 is an invalid date. To determine the previous month more reliably, you can ask for the month before the 15th of the current month. For example:
+ 	
+
+ $ date -R
+ Thu, 31 Jul 2003 13:02:39 -0700
+ $ date --date='-1 month' +'Last month was %B?'
+ Last month was July?
+ $ date --date="$(date +%Y-%m-15) -1 month" +'Last month was %B!'
+ Last month was June!
+
+
+As this applies to ZoneMinder filters, you might want to search  for events in a period of time, or maybe for example create a purge filter that removes events older than 30 days.
+For the later you would want at least two lines in your filter. The first line should be:
+
+ [<Archive Status> <equal to> <Unarchived Only>] 
+
+as you don't want to delete your archived events. 
+
+Your second line to find events older than 30 days would be:
+
+ [and <Date><less than> -30 days] 
+
+You use "less than" to indicate that you want to match events before the specified date, and you specify "-30 days" to indicate a date 30 days before the time the filter is run. Of course you could use 30 days ago as well(?).
+
+You should always test your filters before enabling any actions based on them to make sure they consistently return the results you want. You can use the submit button to see what events are returned by your query.
+
--- a/docs/userguide/gettingstarted.rst
+++ b/docs/userguide/gettingstarted.rst
@ -0,0 +1,8 @@
+Getting Started
+===============
+
+Having followed the :doc:`/installationguide/index` for your distribution you should now be able to load the ZoneMinder web frontend. By default this will be with the Classic skin, below is an example of the page you should now see.
+
+To add cameras to the system you need to create a Monitor for each camera. Click 'Add New Monitor' to bring up the dialog.
+
+[To be completed, removing tutorial style documentation from wiki documentation and putting first time user guide here]
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@ -0,0 +1,19 @@
+User Guide
+==========
+
+.. toctree::
+
+   introduction
+   components
+   gettingstarted
+   definemonitor
+   definezone
+   viewmonitors
+   controlmonitor
+   filterevents
+   viewevents
+   options
+   cameracontrol
+   mobile
+   logging
+
--- a/docs/userguide/introduction.rst
+++ b/docs/userguide/introduction.rst
@ -0,0 +1,15 @@
+Introduction
+============
+
+Welcome to ZoneMinder, the all-in-one Linux GPL'd security camera solution.
+
+Most commercial "security systems" are designed as a monitoring system that also records.  Recording quality can vary from bad to unusable, locating the relevant video can range from challenging to impractical, and exporting can often only be done with the manual present.  ZoneMinder was designed primarily to record, and allow easy searches and exporting.  Recordings are of the best possible quality, easy to filter and find, and simple to export using any system with a web browser.  It also monitors.
+
+ZoneMinder is designed around a series of independent components that only function when necessary limiting any wasted resource and maximising the efficiency of your machine. A fairly ancient Pentium II PC should be able to track one camera per device at up to 25 frames per second with this dropping by half approximately for each additional camera on the same device. Additional cameras on other devices do not interact so can maintain this frame rate. Even monitoring several cameras still will not overload the CPU as frame processing is designed to synchronise with capture and not stall it.
+
+As well as being fast ZoneMinder is designed to be friendly and even more than that, actually useful. As well as the fast video interface core it also comes with a user friendly and comprehensive PHP based web interface allowing you to control and monitor your cameras from home, at work, on the road, or even a web enabled cell phone. It supports variable web capabilities based on available bandwidth. The web interface also allows you to view events that your cameras have captured and archive them or review them time and again, or delete the ones you no longer wish to keep. The web pages directly interact with the core daemons ensuring full co-operation at all times. ZoneMinder can even be installed as a system service ensuring it is right there if your computer has to reboot for any reason.
+
+The core of ZoneMinder is the capture and analysis of images and there is a highly configurable set of parameters that allow you to ensure that you can eliminate false positives whilst ensuring that anything you don't want to miss will be captured and saved. ZoneMinder allows you to define a set of 'zones' for each camera of varying sensitivity and functionality. This allows you to eliminate regions that you don't wish to track or define areas that will alarm if various thresholds are exceeded in conjunction with other zones.
+
+ZoneMinder is free, but if you do find it useful then please feel free to visit http://www.zoneminder.com/donate.html and help to fund future improvements to ZoneMinder.
+
--- a/docs/userguide/logging.rst
+++ b/docs/userguide/logging.rst
@ -0,0 +1,64 @@
+Logging
+=======
+
+Most components of ZoneMinder can emit informational, warning, error and debug messages in a standard format. These messages can be logged in one or more locations. By default all messages produced by scripts are logged in <script name>.log files which are placed in the directory defined by the ZM_PATH_LOGS configuration variable. This is initially defined as ‘/tmp’ though it can be overridden (see the Options and Users section above). So for example, the zmpkg.pl script will output messages to /tmp/zmpkg.pl, an example of these messages is::
+
+  03/01/06 13:46:00.166046 zmpkg[11148].INF [Command: start]
+
+where the first part refers to the date and time of the entry, the next section is the name (or an abbreviated version) of the script, followed by the process id in square brackets, a severity code (INF, WAR, ERR or DBG) and the debug text. If you change the location of the log directory, ensure it refers to an existing directory which the web user has permissions to write to. Also ensure that no logs are present in that directory the web user does not have permission to open. This can happen if you run commands or scripts as the root user for testing at some point. If this occurs then subsequent non-privileged runs will fails due to being unable to open the log files.
+
+As well as specific script logging above, information, warning and error messages are logged via the system syslog service. This is a standard component on Linux systems and allows logging of all sorts of messages in a standard way and using a standard format. On most systems, unless otherwise configured, messages produced by ZoneMinder will go to the /var/log/messages file. On some distributions they may end up in another file, but usually still in /var/log. Messages in this file are similar to those in the script log files but differ slightly. For example the above event in the system log file looks like::
+ 
+  Jan  3 13:46:00 shuttle52 zmpkg[11148]: INF [Command: start]
+
+where you can see that the date is formatted differently (and only to 1 second precision) and there is an additional field for the hostname (as syslog can operate over a network). As well as ZoneMinder entries in this file you may also see entries from various other system components. You should ensure that your syslogd daemon is running for syslog messages to be correctly handled.
+
+A number of users have asked how to suppress or redirect ZoneMinder messages that are written to this file. This most often occurs due to not wanting other system messages to be overwhelmed and obscured by the ZoneMinder produced ones (which can be quite frequent by default). In order to control syslog messages you need to locate and edit the syslog.conf file on your system. This will often be in the /etc directory. This file allows configuration of syslog so that certain classes and categories of messages are routed to different files or highlighted to a console, or just ignored. Full details of the format of this file is outside the scope of this document (typing ‘man syslog.conf’ will give you more information) but the most often requested changes are easy to implement.
+
+The syslog service uses the concept of priorities and facilities where the former refers to the importance of the message and the latter refers to that part of the system from which it originated. Standard priorities include ‘info’, ‘warning’, ‘err’ and ‘debug’ and ZoneMinder uses these priorities when generating the corresponding class of message. Standard facilities include ‘mail’, ‘cron’ and ‘security’ etc but as well this, there are eight ‘local’ facilities that can be used by machine specific message generators. ZoneMinder produces it’s messages via the ‘local1’ facility.
+
+So armed with the knowledge of the priority and facility of a message, the syslog.conf file can be amended to handle messages however you like.
+
+So to ensure that all ZoneMinder messages go to a specific log file you can add the following line near the top of your syslog.conf file::
+
+  <pre># Save ZoneMinder messages to zm.log
+  local1.*                        /var/log/zm/zm.log</pre>
+
+which will ensure that all messages produced with the local1 facility are routed to fhe /var/log/zm/zm.log file. However this does not necessarily prevent them also going into the standard system log. To do this you will need to modify the line that determines which messages are logged to this file. This may look something like::
+
+  <pre># Log anything (except mail) of level info or higher.
+  # Don't log private authentication messages!
+  *.info;mail.none;news.none;authpriv.none;cron.none      /var/log/messages</pre>
+
+by default. To remove ZoneMinder messages altogether from this file you can modify this line to look like::
+
+  <pre>*.info;local1.!*;mail.none;news.none;authpriv.none;cron.none     /var/log/messages</pre>
+
+which instructs syslog to ignore any messages from the local1 facility. If however you still want warnings and errors to occur in the system log file, you could change it to::
+
+  <pre>*.info;local1.!*;local1.warning;mail.none;news.none;authpriv.none;cron.none     /var/log/messages</pre>
+
+which follows the ignore instruction with a further one to indicate that any messages with a facility of local1 and a priority of warning or above should still go into the file.
+
+These recipes are just examples of how you can modify the logging to suit your system, there are a lot of other modifications you could make. If you do make any changes to syslog.conf you should ensure you restart the syslogd process or send it a HUP signal to force it to reread its configuration file otherwise your changes will be ignored.
+
+The discussion of logging above began by describing how scripts produce error and debug messages. The way that the binaries work is slightly different. Binaries generate information, warning and error messages using syslog in exactly the same way as scripts and these messages will be handled identically. However debug output is somewhat different. For the scripts, if you want to enable debug you will need to edit the script file itself and change the DBG_LEVEL constant to have a value of 1. This will then cause debug messages to be written to the <script>.log file as well as the more important messages. Debug messages however are not routed via syslog. Scripts currently only have one level of debug so this will cause any and all debug messages to be generated. Binaries work slightly differently and while you can edit the call to zmDbgInit that is present in every binary’s ‘main’ function to update the initial value of the debug level, there are easier ways.
+
+The simplest way of collecting debug output is to click on the Options link from the main ZoneMinder console view and then go to the Debug tab. There you will find a number of debug options. The first thing you should do is ensure that the ZM_EXTRA_DEBUG setting is switched on. This enables debug generally. The next thing you need to do is select the debug target, level and destination file using the relevant options. Click on the ‘?’ by each option for more information about valid settings. You will need to restart ZoneMinder as a whole or at least the component in question for logging to take effect. When you have finished debugging you should ensure you switch debug off by unchecking the ZM_EXTRA_DEBUG option and restarting ZoneMinder. You can leave the other options as you like as they are ignored if the master debug option is off.
+
+Once you have debug being logged you can modify the level by sending USR1 and USR2 signals to the relevant binary (or binaries) to increase or decrease the level of debug being emitted with immediate effect. This modification will not persist if the binary gets restarted however.
+
+If you wish to run a binary directly from the command line to test specific functionality or scenarios, you can set the ZM_DBG_LEVEL and ZM_DBG_LOG environment variables to set the level and log file of the debug you wish to see, and the ZM_DBG_PRINT environment variable to 1 to output the debug directly to your terminal.
+
+All ZoneMinder logs can now be rotated by logrotate. A sample logrotate config file is shown below.::
+
+  <pre>/var/log/zm/*.log {
+      missingok
+      notifempty
+      sharedscripts
+      postrotate
+          /usr/local/bin/zmpkg.pl logrot 2> /dev/null > /dev/null || true
+      endscript
+  }</pre>
+
+
--- a/docs/userguide/mobile.rst
+++ b/docs/userguide/mobile.rst
@ -0,0 +1,20 @@
+Mobile Devices
+==============
+
+* After 1.24.x, access to the "light" interface changed to http://xxx.xxx.xxx.xxx/zm/index.php?skin=mobile ; You may find that you have a directory named "skins" under ZoneMinder base dir, so you may use one of the existent skins as a base to adapt to your needs; 
+
+Type this in your mobile browser: http://xxx.xxx.xxx.xxx/zm/index.php?format=xhtml (deprecated)
+
+ZoneMinder has always had a minimal WML (Wireless Markup Language) capability to allow it to function on mobile phones and similar devices. However as of 1.20.0 this is now deprecated and has been replaced with a new XHTML – Mobile Profile mode as well as the default HTML4. XHTML-MP is a small, and limited, version of XHTML intended for mobile devices and is based on XHTML Basic. It does not contain scripting or other dynamic elements and essentially is a subset of HTML as most people know it.
+
+The ZoneMinder XHTML-MP interface allows you to log into your installation via your phone or mobile devices and perform a limited number of tasks. These include viewing recent events, and monitoring live streams. However unlike the full interfaces these elements are presented as still images requiring manual refreshing. For now the XHTML-MP interface is presented as a prototype interface; rather than one offering full capabilities. As such, please feel free to make comments or offer suggestions via the forums on http://www.zoneminder.com.
+
+As well as XHTML-MP, ideally I’d like to be able to offer a WML2.0 interface. WML2.0 is a blending of WML1.3, which is traditional WAP, and XHTML. As such it offers the scripting that WML has traditionally included plus the better control of mark-up that is the realm of XHTML. Unfortunately so far I’m unaware of any devices that support WML2.0 even if they say they are WAP2 compliant; certainly I’ve never had a phone that does. If you find out that a particular phone does support this then please let me know (or better still send me the phone!).
+
+If you wish to use the XHTML-MP interface to ZoneMinder there is no extra configuration required to enable it per se. However ZoneMinder needs to be able to figure out what kind of content to deliver to particular browsers, so you have two choices. You can edit zm.php and include a definition that corresponds to your phone, describing a small number of basic capabilities, you will see a couple of examples already there, or you can use the comprehensive open source WURFL package available from http://wurfl.sourceforge.net/. You will need to download both the WURFL php files and the wurfl.xml file itself. WURFL is a resource containing information on the capabilities of a huge number of mobile phones, devices and browsers. Thus once it has matched your phone it can determine various capabilities it may possess. This means that ZoneMinder itself only has to deal with these capabilities and not the individual phone types. If you prefer you can also add the format=xHTML url parameter when you load ZoneMinder to force the xHTML format and skip the automatic determination altoghether.
+
+To use WURFL you should install the php files in the same directory as ZoneMinder and then create a ‘wurfl’ sub-directory and ensure it is readable and writeable (or preferably owned by) your web server user. You should put the wurfl.xml file in there. One other thing you may need to change, as the xml file is quite large, is the ‘memory_limit’ setting in php.ini as the default setting of 8Mb may be too small. Once you’ve done this you should find that your phone or device is recognised and if it can support XHTML-MP it will receive that interface. If your phone is very new, or you are using an old version of the XML file you might find that it is not present however. The WURFL library uses a caching strategy to avoid reloading the whole XML file each time so check if a sensible looking cache file has been created in the ‘wurfl’ sub-directory also check the wurfl.log in the same place.
+
+The WURFL is a third party application and as such I am unable to offer support directly for it. If you feel your device is missing or incorrectly represented please contact the authors via their own channels. If on the other hand you have any comments on ZoneMinder on your device specifically please let me know and I would be pleased to hear about it.
+
+As support for cookies in mobile devices is patchy at best, the groups feature is not fully implemented in the XHTML-MP views. Instead if there is a group called ‘Mobile’ already defined then that group will always be effective, if not then all monitors available to the logged in user will be visible,
--- a/docs/userguide/options.rst
+++ b/docs/userguide/options.rst
@ -0,0 +1,17 @@
+Options
+=======
+The final area covered by the tutorial is the options and user section. If you are running in authenticated mode and don’t have system privileges then you will not see this section at all and if you are running in un-authenticated mode then no user section will be displayed.
+
+The various options you can specify are displayed in a tabbed dialog with each group of options displayed under a different heading. Each option is displayed with its name, a short description and the current value. You can also click on the ‘?’ link following each description to get a fuller explanation about each option. This is the same as you would get from zmconfig.pl. A number of option groups have a master option near the top which enables or disables the whole group so you should be aware of the state of this before modifying options and expecting them to make any difference.
+
+If you have changed the value of an option you should then ‘save’ it. A number of the option groups will then prompt you to let you know that the option(s) you have changed will require a system restart. This is not done automatically in case you will be changing many values in the same session, however once you have made all of your changes you should restart ZoneMinder as soon as possible. The reason for this is that web and some scripts will pick up the new changes immediately but some of the daemons will still be using the old values and this can lead to data inconsistency or loss.
+
+One of the options you may notice in the ‘System’ tab allows you to specify the default language for your installation of ZoneMinder. Versions 1.17.0 and later support multiple languages but rely on users to assist in creating language files for specific languages. To specify a language you will have to give the applicable code, thus for UK English this is en_gb, and for US English it would be en_us, if no language is given then UK English is assumed. Most languages will be specified in this nn_mm format and to check which languages are available look for files named zm_lang_*.php in the ZoneMinder build directory where the parts represented by the ‘*’ would be what you would enter as a language. This is slightly unwieldy and will probably be improved in future to make it easier to determine language availability. On checking which languages are available it may be that your preferred language is not currently included and if this is the case please consider doing a translation and sending it back to it may be included in future releases. All the language elements are given in the zm_lang_en_gb.php file along with a few notes to help you understand the format.
+
+As mentioned above, you may also see a ‘users’ tab in the Options area. In this section you will see a list of the current users defined on the system. You can also add or delete users from here. It is recommended you do not delete the admin user unless you have created another fully privileged user to take over the same role. Each user is defined with a name and password (which is hidden) as well as an enabled setting which you can use to temporarily enable or disable users, for example a guest user for limited time access. As well as that there is a language setting that allows you to define user specific languages. Setting a language here that is different than the system language will mean that when that user logs in they will have the web interface presented in their own language rather than the system default, if it is available. Specifying a language here is done in the same way as for the system default language described above.
+
+There are also five values that define the user permissions, these are ‘Stream’, ‘Events’, ‘Control’, ‘Monitors’ and ‘System’ Each can have values of ‘None’, ‘View’ or ‘Edit’ apart from ‘Stream’ which has no ‘Edit’ setting. These values cover access to the following areas; ‘Stream’ defines whether a user is allowed to view the ‘live’ video feeds coming from the cameras. You may wish to allow a user to view historical events only in which case this setting should be ‘none’. The ‘Events’ setting determines whether a user can view and modify or delete any retained historical events. The ‘Control’ setting allows you to indicate whether the user is able to control any Pan/Tilt/Zoom type cameras you may have on your system. The ‘Monitors’ setting specifies whether a user can see the current monitor settings and change them. Finally the ‘System’ setting determines whether a user can view or modify the system settings as a whole, such as options and users or controlling the running of the system as a whole.
+
+As well as these settings there is also a ‘Bandwidth’ setting which can be used to limit the maximum bandwidth that a user can view at and a ‘Monitor Ids’ setting that can be used for non-’System’ users to restrict them to only being able to access streams, events or monitors for the given monitors ids as a comma separated list with no spaces. If a user with ‘Monitors’ edit privileges is limited to specific monitors here they will not be able to add or delete monitors but only change the details of those they have access to. If a user has ‘System’ privileges then the ‘Monitors Ids’ setting is ignored and has no effect.’
+
+That’s pretty much is it for the tour, though there is a lot more to ZoneMinder as you will discover. You should experiment with the various settings to get the results you think are right for your requirements.
--- a/docs/userguide/viewevents.rst
+++ b/docs/userguide/viewevents.rst
@ -0,0 +1,13 @@
+Viewing Events
+==============
+From the monitor or filtered events listing you can now click on an event to view it in more detail. If you have streaming capability you will see a series of images that make up the event. Under that you should also see a progress bar. Depending on your configuration this will either be static or will be filled in to indicate how far through the event you are. By default this functionality is turned off for low bandwidth settings as the image delivery tends to not be able to keep up with real-time and the progress bar cannot take this into account. Regardless of whether the progress bar updates, you can click on it to navigate to particular points in the events.
+
+You will also see a link to allow you to view the still images themselves. If you don't have streaming then you will be taken directly to this page. The images themselves are thumbnail size and depending on the configuration and bandwidth you have chosen will either be the full images scaled in your browser of actual scaled images. If it is the latter, if you have low bandwidth for example, it may take a few seconds to generate the images. If thumbnail images are required to be generated, they will be kept and not re-generated in future. Once the images appear you can mouse over them to get the image sequence number and the image score.
+
+You will notice for the first time that alarm images now contain an overlay outlining the blobs that represent the alarmed area. This outline is in the colour defined for that zone and lets you see what it was that caused the alarm. Clicking on one of the thumbnails will take you to a full size window where you can see the image in all its detail and scroll through the various images that make up the event. If you have the ZM_RECORD_EVENT_STATS option on, you will be able to click the 'Stats' link here and get some analysis of the cause of the event. Should you determine that you don't wish to keep the event, clicking on Delete will erase it from the database and file system. Returning to the event window, other options here are renaming the event to something more meaningful, refreshing the window to replay the event stream, deleting the event, switching between streamed and still versions of the event (if supported) and generating an MPEG video of the event (if supported).
+
+These last two options require further explanation. Archiving an event means that it is kept to one side and not displayed in the normal event listings unless you specifically ask to view the archived events. This is useful for keeping events that you think may be important or just wish to protect. Once an event is archived it can be deleted or unarchived but you cannot accidentally delete it when viewing normal unarchived events.
+
+The final option of generating an MPEG video is still somewhat experimental and its usefulness may vary. It uses the open source ffmpeg encoder to generate short videos, which will be downloaded to your browsing machine or viewed in place. When using the ffmpeg encoder, ZoneMinder will attempt to match the duration of the video with the duration of the event. Ffmpeg has a particularly rich set of options and you can specify during configuration which additional options you may wish to include to suit your preferences. In particular you may need to specify additional, or different, options if you are creating videos of events with particularly slow frame rates as some codecs only support certain ranges of frame rates. A common value for FFMPEG_OUTPUT_OPTIONS under Options > Images might be '-r 25 -b 800k' for 25 fps and 800 kbps.  Details of these options can be found in the [http://ffmpeg.org/ffmpeg-doc.html documentation] for the encoders and is outside the scope of this document.
+
+Building an MPEG video, especially for a large event, can take some time and should not be undertaken lightly as the effect on your host box of many CPU intensive encoders will not be good. However once a video has been created for an event it will be kept so subsequent viewing will not incur the generation overhead. Videos can also be included in notification emails, however care should be taken when using this option as for many frequent events the penalty in CPU and disk space can quickly mount up.
--- a/docs/userguide/viewmonitors.rst
+++ b/docs/userguide/viewmonitors.rst
@ -0,0 +1,16 @@
+Viewing Monitors
+================
+
+As this point you should have one or more Monitors running with one or more Zones each. Returning to the main Console window you will see your monitors listed once more. The columns not explored so far are the Monitor name, and various event totals for certain periods of time. Clicking on any of the event totals will bring up a variation on the same window but click on the Monitor name for now. If it is not a link then this means that that monitor is not running so ensure that you have started ZoneMinder and that your Monitor function is not set to ‘None’. If the link works, clicking on it will pop another window up which should be scaled to contain a heading, an image from your monitor, a status and a list of recent events if any have been generated.
+
+Depending on whether you are able to view a streamed image or not the image frame will either be this stream or a series of stills. You have the option to change from one to the other (if available) at the centre of the top heading. Also along the top are a handful of other links. These let you change the scale of the image stream, modify image settings (for local devices) or close the window. If you have cameras that can be controlled, a ‘Control’ link should also be present which is described below.
+
+The image should be self-explanatory but if it looks like garbage it is possible that the video configuration is wrong so look in your system error log and check for or report anything unusual. The centre of the window will have a tiny frame that just contains a status; this will be 'Idle', 'Alarm' or 'Alert' depending on the function of the Monitor and what's going on in the field of view. Idle means nothing is happening, Alarm means there is an alarm in progress and Alert means that an alarm has happened and the monitor is ‘cooling down’, if another alarm is generated in this time it will just become part of the same event. These indicators are colour coded in green, red and amber.
+
+By default if you have minimised this window or opened other windows in front it will pop up to the front if it goes to Alarm state. This behaviour can be turned off in ‘options’ if required. You can also specify a sound file in the configuration, which will be played when an alarm occurs to alert you to the fact if you are not in front of your computer. This should be a short sound of only a couple of seconds ideally. Note that as the status is refreshed every few seconds it is possible for this not to alert you to every event that takes place, so you shouldn't rely on it for this purpose if you expect very brief events. Alternatively you can decrease the refresh interval for this window in the configuration though having too frequent refreshing may impact on performance.
+
+Below the status is a list of recent events that have occurred, by default this is a listing of just the last 10 but clicking on 'All' will give you a full list and 'Archive' will take you to the event archive for this monitor, more on this later. Clicking on any of the column headings will sort the events appropriately.
+
+From here you can also delete events if you wish. The events themselves are listed with the event id, and event name (which you can change), the time that the event occurred, the length of the event including any preamble and postamble frames, the number of frames comprising the event with the number that actually contain an alarm in brackets and finally a score. This column lists the average score per alarm frame as well as the maximum score that any alarm frame had.
+
+The score is an arbitrary value that essentially represents the percentage of pixels in the zone that are in blobs divided by the square root of the number of blobs and then divided by the size of the zone. This gives a nominal maximum of 100 for a zone and the totals for each zone are added together, Active zones scores are added unchanged, Inclusive zones are halved first and Exclusive zones are doubled. In reality values are likely to be much less than 100 but it does give a simple indication of how major the event was. 
--- a/misc/CMakeLists.txt
+++ b/misc/CMakeLists.txt
@ -4,7 +4,14 @@
 configure_file(apache.conf.in "${CMAKE_CURRENT_BINARY_DIR}/apache.conf" @ONLY)
 configure_file(logrotate.conf.in "${CMAKE_CURRENT_BINARY_DIR}/logrotate.conf" @ONLY)
 configure_file(syslog.conf.in "${CMAKE_CURRENT_BINARY_DIR}/syslog.conf" @ONLY)
+configure_file(com.zoneminder.systemctl.policy.in "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.policy" @ONLY)
+configure_file(com.zoneminder.systemctl.rules.in "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.rules" @ONLY)
+configure_file(zoneminder.service.in "${CMAKE_CURRENT_BINARY_DIR}/zoneminder.service" @ONLY)

 # Do not install the misc files by default
 #install(FILES "${CMAKE_CURRENT_BINARY_DIR}/apache.conf" "${CMAKE_CURRENT_BINARY_DIR}/logrotate.conf" "${CMAKE_CURRENT_BINARY_DIR}/syslog.conf" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/misc")

+# Install Policykit rules and actions into the proper folders
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.policy" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.rules" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/rules.d")
+
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@ -3,4 +3,14 @@ AUTOMAKE_OPTIONS = gnu
 EXTRA_DIST = \
 	apache.conf.in \
 	logrotate.conf.in \
-	syslog.conf.in
+	syslog.conf.in \
+	zoneminder.service.in \
+        com.zoneminder.systemctl.policy.in \
+        com.zoneminder.systemctl.rules.in
+
+polkit_actiondir = @POLKIT_PREFIX@/share/polkit-1/actions
+dist_polkit_action_DATA = com.zoneminder.systemctl.policy
+
+polkit_rulesdir = @POLKIT_PREFIX@/share/polkit-1/rules.d
+dist_polkit_rules_DATA = com.zoneminder.systemctl.rules
+
--- a/misc/com.zoneminder.systemctl.policy.in
+++ b/misc/com.zoneminder.systemctl.policy.in
@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <vendor>The ZoneMinder Project</vendor>
+  <vendor_url>http://www.zoneminder.com/</vendor_url>
+
+  <action id="com.zoneminder.policykit.pkexec.run-zmsystemctl">
+    <description>Allow the ZoneMinder webuser to run zmsystemctl.pl</description>
+    <message>The ZoneMinder webuser is trusted to run zmsystemctl.pl</message>
+    <defaults>
+      <allow_any>yes</allow_any>
+      <allow_inactive>yes</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/perl</annotate>
+    <annotate key="org.freedesktop.policykit.exec.argv1">@BINDIR@/zmsystemctl.pl</annotate>
+  </action>
+
+</policyconfig>
--- a/misc/com.zoneminder.systemctl.rules.in
+++ b/misc/com.zoneminder.systemctl.rules.in
@ -0,0 +1,7 @@
+polkit.addRule(function(action, subject) {
+    if (action.id == "com.zoneminder.policykit.pkexec.run-zmsystemctl" &&
+        subject.user != "@WEB_USER@") {
+        return polkit.Result.NO;
+    }
+
+});
--- a/misc/zoneminder.service.in
+++ b/misc/zoneminder.service.in
@ -0,0 +1,19 @@
+# ZoneMinder systemd unit file
+# This file is intended to work with all Linux distributions
+
+[Unit]
+Description=ZoneMinder CCTV recording and security system
+After=network.target mysqld.service httpd.service
+Requires=mysqld.service httpd.service
+
+[Service]
+User=@WEB_USER@
+Type=forking
+ExecStart=@BINDIR@/zmpkg.pl start
+ExecReload=@BINDIR@/zmpkg.pl restart
+ExecStop=/bin/bash -c '[[ "$(@BINDIR@/pgrep zmdc.pl)" > 0 ]] && @BINDIR@/zmpkg.pl stop'
+PIDFile="@ZM_RUNDIR@/zm.pid"
+
+[Install]
+WantedBy=multi-user.target
+
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@ -15,6 +15,7 @@ configure_file(zmupdate.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmupdate.pl" @ONLY)
 configure_file(zmvideo.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl" @ONLY)
 configure_file(zmwatch.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl" @ONLY)
 configure_file(zmcamtool.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" @ONLY)
+configure_file(zmsystemctl.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" @ONLY)
 if(NOT ZM_NO_X10)
 	configure_file(zmx10.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" @ONLY)
 endif(NOT ZM_NO_X10)
@ -24,7 +25,8 @@ configure_file(zm.in "${CMAKE_CURRENT_BINARY_DIR}/zm" @ONLY)
 #configure_file(zmeventdump.in zmeventdump @ONLY)

 # Install the perl scripts
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmaudit.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcontrol.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmdc.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmfilter.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmpkg.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrack.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrigger.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmupdate.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmaudit.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcontrol.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmdc.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmfilter.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmpkg.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrack.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrigger.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmupdate.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 if(NOT ZM_NO_X10)
 	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 endif(NOT ZM_NO_X10)
+
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@ -18,7 +18,8 @@ bin_SCRIPTS = \
 	zmvideo.pl \
 	zmcontrol.pl \
 	zmtrack.pl \
-	zmcamtool.pl
+	zmcamtool.pl \
+	zmsystemctl.pl

 SUBDIRS = \
 	. \
@ -37,6 +38,7 @@ EXTRA_DIST = \
 	zmcontrol.pl.in \
 	zmtrack.pl.in \
 	zmcamtool.pl.in \
+	zmsystemctl.pl.in \
 	ZoneMinder/Makefile.PL \
 	ZoneMinder/README \
 	ZoneMinder/Changes \
@ -70,3 +72,4 @@ EXTRA_DIST = \
 	zmdbrestore.in \
 	zmeventdump.in \
 	zmlogrotate.conf.in
+
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@ -157,7 +157,7 @@ our @options =
 		name => "ZM_DIR_EVENTS",
 		default => "events",
 		description => "Directory where events are stored",
-		help => "This is the path to the events directory where all the event images and other miscellaneous files are stored. It is normally given as a subdirectory of the web directory you have specified earlier however if disk space is tight it can reside on another partition in which case you should create a link from that area to the path you give here.",
+		help => "This is the path to the events directory where all the event images and other miscellaneous files are stored. CAUTION: The directory you specify here cannot be outside the web root. This is a common mistake. Most users should never change this value. If you intend to record events to a second disk or network share, then you should mount the drive or share directly to the ZoneMinder events folder or follow the instructions in the ZoneMinder Wiki titled Using a dedicated Hard Drive.",
 		type => $types{directory},
 		category => "paths",
 	},
@ -173,7 +173,7 @@ our @options =
 		name => "ZM_DIR_IMAGES",
 		default => "images",
 		description => "Directory where the images that the ZoneMinder client generates are stored",
-		help => "ZoneMinder generates a myriad of images, mosty of which are associated with events. For those that aren't this is where they go.",
+		help => "ZoneMinder generates a myriad of images, mostly of which are associated with events. For those that aren't this is where they go. CAUTION: The directory you specify here cannot be outside the web root. This is a common mistake. Most users should never change this value. If you intend to save images to a second disk or network share, then you should mount the drive or share directly to the ZoneMinder images folder or follow the instructions in the ZoneMinder Wiki titled Using a dedicated Hard Drive.",
 		type => $types{directory},
 		category => "paths",
 	},
@ -181,7 +181,7 @@ our @options =
 		name => "ZM_DIR_SOUNDS",
 		default => "sounds",
 		description => "Directory to the sounds that the ZoneMinder client can use",
-		help => "ZoneMinder can optionally play a sound file when an alarm is detected. This indicates where (relative to the web root) to look for this file.",
+		help => "ZoneMinder can optionally play a sound file when an alarm is detected. This indicates where to look for this file. CAUTION: The directory you specify here cannot be outside the web root. Most users should never change this value.",
 		type => $types{directory},
 		category => "paths",
 	},
@ -510,7 +510,7 @@ our @options =
 	},
 	{
 		name => "ZM_LOG_DEBUG_FILE",
-		default => "@ZM_TMPDIR@/zm_debug.log+",
+		default => "@ZM_LOGDIR@/zm_debug.log+",
 		description => "Where extra debug is output to",
 		help => "This option allows you to specify a different target for debug output. All components have a default log file which will norally be in /tmp or /var/log and this is where debug will be written to if this value is empty. Adding a path here will temporarily redirect debug, and other logging output, to this file. This option is a simple filename and you are debugging several components then they will all try and write to the same file with undesirable consequences. Appending a '+' to the filename will cause the file to be created with a '.<pid>' suffix containing your process id. In this way debug from each run of a component is kept separate. This is the recommended setting as it will also prevent subsequent runs from overwriting the same log. You should ensure that permissions are set up to allow writing to the file and directory specified here.",
 		requires => [ { name => "ZM_LOG_DEBUG", value => "yes" } ],
@ -607,7 +607,7 @@ our @options =
 	},
 	{
 		name => "ZM_PATH_SOCKS",
-		default => "@ZM_TMPDIR@",
+		default => "@ZM_SOCKDIR@",
 		description => "Path to the various Unix domain socket files that ZoneMinder uses",
 		help => "ZoneMinder generally uses Unix domain sockets where possible. This reduces the need for port assignments and prevents external applications from possibly compromising the daemons. However each Unix socket requires a .sock file to be created. This option indicates where those socket files go.",
 		type => $types{abs_path},
@ -741,7 +741,7 @@ our @options =
 		name => "ZM_V4L_MULTI_BUFFER",
 		default => "yes",
 		description => "Use more than one buffer for Video 4 Linux devices",
-		help => "Performance when using Video 4 Linux devices is usually best if multiple buffers are used allowing the next image to be captured while the previous one is being processed. If you have multiple devices on a card sharing one input that requires switching then this approach can sometimes cause frames from one source to be mixed up with frames from another. Switching this option off prevents multi buffering resulting in slower but more stable image capture. This option is ignored for non-local cameras or if only one input is present on a capture chip. This option addresses a similar problem to the ZM_CAPTURES_PER_FRAME option and you should normally change the value of only one of the options at a time.",
+		help => "Performance when using Video 4 Linux devices is usually best if multiple buffers are used allowing the next image to be captured while the previous one is being processed. If you have multiple devices on a card sharing one input that requires switching then this approach can sometimes cause frames from one source to be mixed up with frames from another. Switching this option off prevents multi buffering resulting in slower but more stable image capture. This option is ignored for non-local cameras or if only one input is present on a capture chip. This option addresses a similar problem to the ZM_CAPTURES_PER_FRAME option and you should normally change the value of only one of the options at a time.  If you have different capture cards that need different values you can ovveride them in each individual monitor on the source page.",
 		type => $types{boolean},
 		category => "config",
 	},
@ -749,7 +749,7 @@ our @options =
 		name => "ZM_CAPTURES_PER_FRAME",
 		default => "1",
 		description => "How many images are captured per returned frame, for shared local cameras",
-		help => "If you are using cameras attached to a video capture card which forces multiple inputs to share one capture chip, it can sometimes produce images with interlaced frames reversed resulting in poor image quality and a distinctive comb edge appearance. Increasing this setting allows you to force additional image captures before one is selected as the captured frame. This allows the capture hardware to 'settle down' and produce better quality images at the price of lesser capture rates. This option has no effect on (a) network cameras, or (b) where multiple inputs do not share a capture chip. This option addresses a similar problem to the ZM_V4L_MULTI_BUFFER option and you should normally change the value of only one of the options at a time.",
+		help => "If you are using cameras attached to a video capture card which forces multiple inputs to share one capture chip, it can sometimes produce images with interlaced frames reversed resulting in poor image quality and a distinctive comb edge appearance. Increasing this setting allows you to force additional image captures before one is selected as the captured frame. This allows the capture hardware to 'settle down' and produce better quality images at the price of lesser capture rates. This option has no effect on (a) network cameras, or (b) where multiple inputs do not share a capture chip. This option addresses a similar problem to the ZM_V4L_MULTI_BUFFER option and you should normally change the value of only one of the options at a time.  If you have different capture cards that need different values you can ovveride them in each individual monitor on the source page.",
 		type => $types{integer},
 		category => "config",
 	},
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/M8640.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/M8640.pm
@ -0,0 +1,475 @@
+# ==========================================================================
+#
+# ZoneMinder M8640 API Control Protocol Module, $Date$, $Revision$
+# Copyright (C) 2014  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 M8640 API camera control
+# protocol
+# URL's are as follows:
+# /cgi-bin/getLed.cgi
+# /cgi-bin/setGPIO.cgi command:6, duration: 0|1 for led on/off
+# /cgi-bin/reboot.cgi
+# /cgi-bin/restore.cgi
+#
+package ZoneMinder::Control::M8640;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Control;
+
+our @ISA = qw(ZoneMinder::Control);
+
+# ==========================================================================
+#
+# Axis V2 Control Protocol
+#
+# ==========================================================================
+
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
+
+use Time::HiRes qw( usleep );
+use URI::Encode qw();
+
+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/".$ZoneMinder::Base::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 $url;
+	if ( $self->{Monitor}->{ControlAddress} =~ /^http/ ) {
+		$url = $self->{Monitor}->{ControlAddress}.'/cgi-bin/setGPIO.cgi?preventCache='.time;
+	} else {
+		$url = 'http://'.$self->{Monitor}->{ControlAddress}.'/cgi-bin/setGPIO.cgi?preventCache='.time;
+	} # en dif
+	Error("Url: $url  $cmd");
+    my $uri     = URI::Encode->new( { encode_reserved => 0 } );
+    my $encoded = $uri->encode( $cmd );
+    my $res = $self->{ua}->post( $url, Content=>"data=$encoded" );
+
+    if ( $res->is_success ) {
+Debug("Success (" . $res->as_string . ') code: ' . $res->code );
+        $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 Up
+{
+    my $self = shift;
+    Debug( "Move Up" );
+    $self->sendCmd( '{"command":1,"duration":250}' );
+}
+
+sub Down
+{
+    my $self = shift;
+    Debug( "Move Down" );
+    $self->sendCmd( '{"command":2,"duration":250}' );
+}
+
+sub Left
+{
+    my $self = shift;
+    Debug( "Move Left" );
+    $self->sendCmd( '{"command":4,"duration":250}' );
+}
+
+sub Right
+{
+    my $self = shift;
+    Debug( "Move Right" );
+    $self->sendCmd( '{"command":3,"duration":250}' );
+}
+
+sub UpRight
+{
+    my $self = shift;
+    Debug( "Move Up/Right" );
+    my $cmd = "/axis-cgi/com/ptz.cgi?move=upright";
+    $self->sendCmd( $cmd );
+}
+
+sub UpLeft
+{
+    my $self = shift;
+    Debug( "Move Up/Left" );
+    my $cmd = "/axis-cgi/com/ptz.cgi?move=upleft";
+    $self->sendCmd( $cmd );
+}
+
+sub DownRight
+{
+    my $self = shift;
+    Debug( "Move Down/Right" );
+    my $cmd = "/axis-cgi/com/ptz.cgi?move=downright";
+    $self->sendCmd( $cmd );
+}
+
+sub DownLeft
+{
+    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/lib/ZoneMinder/Control/TVIP862.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/TVIP862.pm
@ -0,0 +1,504 @@
+# =========================================================================
+#
+# ZoneMinder Trendnet TV-IP862IC IP Control Protocol Module, $Date: $, $Revision: $
+# Copyright (C) 2014 Vincent Giovannone
+#
+#
+# ==========================================================================
+#
+# 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 Trendnet TV-IP672PI IP camera control
+# protocol. Also works or TV-IP862IC
+#
+#
+#
+#  For Zoneminder 1.26+
+#
+#  Under control capability:
+#
+#   *  Main:  name it (suggest TVIP672PI), type is FFMPEG (or remote if you're using MJPEG), protocol is TVIP672PI
+#   *  Main (more):  Can wake, can sleep, can reset
+#   *  Move:  Can move, can move diagonally, can move mapped, can move relative
+#   *  Pan:  Can pan
+#   *  Tilt:  Can tilt
+#   *  Presets:  Has presets, num presets 20, has home preset  (don't set presets via camera's web server, only set via ZM.)
+#
+#  Under control tab in the monitor itself:
+#
+#   *  Controllable
+#   *  Control type is the name you gave it in control capability above
+#   *  Control device is the password you use to authenticate to the camera  (see further below if you need to change the username from "admin")
+#   *  Control address is the camera's ip address AND web port.  example:  192.168.1.1:80 
+#
+#
+# If using with anything but a TV-IP672PI (ex:  TV-IP672WI), YOU MUST MATCH THE REALM TO MATCH YOUR CAMERA FURTHER DOWN!
+#
+#
+#  Due to how the TVIP672 represents presets internally, you MUST define the presets in order...  i.e. 1,2,3,4...  not 1,10,3,4.
+#   (see much further down for why, if you care...)
+#
+
+
+package ZoneMinder::Control::TVIP862;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Control;
+
+our @ISA = qw(ZoneMinder::Control);
+
+#
+#  ********  YOU MUST CHANGE THE FOLLOWING LINES TO MATCH YOUR CAMERA!  **********
+#  
+#  I assume that "TV-IP672WI" would work for the TV-IP672WI, but can't test since I don't own one.
+#  
+#  TV-IP672PI works for the PI version, of course.
+#
+#  Finally, the username is the username you'd like to authenticate as.
+#
+our $REALM = "TV-IP862IC";
+our $USERNAME = "admin";
+
+
+# ==========================================================================
+#
+# Trendnet TV-IP672PI 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/".$ZoneMinder::Base::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
+{
+
+#   This routine is used for all moving, which are all GET commands...
+
+    my $self = shift;
+    my $cmd = shift;
+
+    my $result = undef;
+
+    Debug ( $cmd, "Tx" );
+
+    my $ua = LWP::UserAgent->new();
+
+    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/cgi/ptdc.cgi?command=".$cmd );
+
+#	credentials:  ("ip:port" (no prefix!), realm (string), username (string), password (string)
+    $self->{ua}->credentials($self->{Monitor}->{ControlAddress},$REALM,$USERNAME,$self->{Monitor}->{ControlDevice});
+
+    Debug ( "sendCmd credentials control address:'".$self->{Monitor}->{ControlAddress}."'  realm:'" . $REALM . "'  username:'" . $USERNAME . "'  password:'".$self->{Monitor}->{ControlDevice}."'"); 
+
+    Debug ("sendCmd command: " . $cmd);
+    
+    my $res = $self->{ua}->request($req);
+
+    if ( $res->is_success ) {
+        $result = !undef;
+    } else {
+		if ( $res->status_line() eq '401 Unauthorized' ) {
+			Error( "Error check failed, trying again: USERNAME: $USERNAME realm: $REALM password: " . $self->{Monitor}->{ControlDevice} );
+			my $res = $self->{ua}->request($req);
+			if ( $res->is_success ) {
+				$result = !undef;
+			}
+		} 
+		if ( ! $result ) {
+			Error( "Error check failed: '".$res->status_line()."' cmd:'".$cmd."'" );
+		}
+    }
+
+    return( $result );
+}
+
+
+
+sub sendCmdPost
+{
+
+#
+#   This routine is used for setting/clearing presets and IR commands, which are POST commands...
+#
+
+    my $self = shift;
+    my $url = shift;
+    my $cmd = shift;
+
+    my $result = undef;
+
+
+    if ($url eq undef)
+	{
+		Error ("url passed to sendCmdPost is undefined.");
+		return(-1);
+	}
+
+    Debug ("sendCmdPost url: " . $url . " cmd: " . $cmd);
+
+    my $ua = LWP::UserAgent->new();
+
+    my $req = HTTP::Request->new(POST => "http://".$self->{Monitor}->{ControlAddress}.$url);
+    $req->content_type('application/x-www-form-urlencoded');
+    $req->content($cmd);
+
+    $self->{ua}->credentials($self->{Monitor}->{ControlAddress},$REALM,$USERNAME,$self->{Monitor}->{ControlDevice});
+
+    Debug ( "sendCmdPost credentials control address:'".$self->{Monitor}->{ControlAddress}."'  realm:'" . $REALM . "'  username:'" . $USERNAME . "'
+password:'".$self->{Monitor}->{ControlDevice}."'");
+    
+    my $res = $self->{ua}->request($req);
+
+    if ( $res->is_success )
+    {
+        $result = !undef;
+    }
+    else
+    {
+			Error( "Error check failed: USERNAME: $USERNAME realm: $REALM password: " . $self->{Monitor}->{ControlDevice} );
+        Error( "Error check failed: '".$res->status_line()."' cmd:'".$cmd."'" );
+		if ( $res->status_line() eq '401 Unauthorized' ) {
+			Error( "Error check failed: USERNAME: $USERNAME realm: $REALM password: " . $self->{Monitor}->{ControlDevice} );
+		} else {
+			Error( "Error check failed: USERNAME: $USERNAME realm: $REALM password: " . $self->{Monitor}->{ControlDevice} );
+		} # endif
+    }
+
+    return( $result );
+}
+
+
+
+sub move
+{
+    my $self = shift;
+    my $panSteps = shift;
+    my $tiltSteps = shift;
+
+    my $cmd = "set_relative_pos&posX=$panSteps&posY=$tiltSteps";
+    $self->sendCmd( $cmd );
+}
+
+sub moveRelUpLeft
+{
+    my $self = shift;
+    Debug( "Move Up Left" );
+    $self->move(-3, 3);
+}
+
+sub moveRelUp
+{
+    my $self = shift;
+    Debug( "Move Up" );
+    $self->move(0, 3);
+}
+
+sub moveRelUpRight
+{
+    my $self = shift;
+    Debug( "Move Up Right" );
+    $self->move(3, 3);
+}
+
+sub moveRelLeft
+{
+    my $self = shift;
+    Debug( "Move Left" );
+    $self->move(-3, 0);
+}
+
+sub moveRelRight
+{
+    my $self = shift;
+    Debug( "Move Right" );
+    $self->move(3, 0);
+}
+
+sub moveRelDownLeft
+{
+    my $self = shift;
+    Debug( "Move Down Left" );
+    $self->move(-3, -3);
+}
+
+sub moveRelDown
+{
+    my $self = shift;
+    Debug( "Move Down" );
+    $self->move(0, -3);
+}
+
+sub moveRelDownRight
+{
+    my $self = shift;
+    Debug( "Move Down Right" );
+    $self->move(3, -3);
+}
+
+
+# moves the camera to center on the point that the user clicked on in the video image. 
+# This isn't mega accurate but good enough for most purposes 
+
+sub moveMap
+{
+
+    # If the camera moves too much, increase hscale and vscale. (...if it doesn't move enough, try decreasing!)
+    # They scale the movement and are here to compensate for manufacturing variation.
+    # It's never going to be perfect, so just get somewhere in the ballpark and call it a day.
+    #  (Don't forget to kill the zmcontrol process while tweaking!)
+
+    #  1280x800
+    my $hscale = 31;
+    my $vscale = 25;
+
+    #  1280x800 with fisheye
+    #my $hscale = 15;
+    #my $vscale = 15;
+
+    #  640x400
+    #my $hscale = 14;
+    #my $vscale = 12;
+
+
+    my $self = shift;
+    my $params = shift;
+    my $xcoord = $self->getParam( $params, 'xcoord' );
+    my $ycoord = $self->getParam( $params, 'ycoord' );
+
+    my $hor = ($xcoord - ($self->{Monitor}->{Width} / 2))/$hscale;
+    my $ver = ($ycoord - ($self->{Monitor}->{Height} / 2))/$vscale;
+
+    $hor = int($hor);
+    $ver = -1 * int($ver);
+   
+    Debug( "Move Map to $xcoord,$ycoord, hor=$hor, ver=$ver" );
+    $self->move( $hor, $ver );
+}
+
+
+#  ****  PRESETS  ****
+#
+#  OK, presets work a little funky but they DO work, provided you define them in order and don't skip any. 
+#  
+#  The problem is that when you load the web page for this camera, it gives a list of preset names tied to index numbers.
+#  So let's say you have four presets...  A, B, C, and D, and defined them in that order.
+#  So A is index 0, B is index 1, C is index 2, D is index 3.  When you tell the camera to go to a preset, you actually tell it by number, not by name. 
+#  (So "Go to D" is really "go to index 3".)
+#
+#  Now let's say somebody deletes C via the camera's web GUI.  The camera re-numbers the existing presets A=0, B=1, D=2.  
+#  There's really no easy way for ZM to discover this re-numbering, so zoneminder would still send "go to preset 3" thinking
+#  it's telling the camera to go to point D.  In actuality it's telling the camera to go to a preset that no longer exists.
+#  
+#  As long as you define your presets in order (i.e. define preset 1, then preset 2, then preset 3, etc.) everything will work just 
+#  fine in ZoneMinder.
+#
+#  (Home preset needs to be set via the camera's web gui, and is unaffected by any of this.)
+#
+#  So that's the limitation:  DEFINE YOUR PRESETS IN ORDER THROUGH (and only through!) ZM AND DON'T SKIP ANY.
+#
+
+
+sub presetClear
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    my $cmd = "presetName=$preset&command=del";
+    my $url = "/eng/admin/cam_control.cgi";
+    Debug ("presetClear: " . $preset . " cmd: " . $cmd);
+    $self->sendCmdPost($url,$cmd);
+}
+
+
+sub presetSet
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    my $cmd = "presetName=$preset&command=add";
+    my $url = "/eng/admin/cam_control.cgi";
+    Debug ("presetSet " . $preset . " cmd: " . $cmd);
+    $self->sendCmdPost ($url,$cmd);
+}
+
+sub presetGoto
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    $preset = $preset - 1;
+    Debug( "Goto Preset $preset" );
+    my $cmd = "goto_preset_position&index=$preset";
+    $self->sendCmd( $cmd );
+}
+
+sub presetHome
+{
+    my $self = shift;
+    Debug( "Home Preset" );
+    my $cmd = "go_home";
+    $self->sendCmd( $cmd );
+}
+
+
+#
+#  ****  IR CONTROLS  ****
+#
+#
+#   Wake:  Force IR on, always.  (always night mode)
+#
+#   Sleep:  Force IR off, always.  (always day mode)
+#
+#   Reset:  Automatic IR mode.  (day/night mode determined by camera)
+#
+
+
+sub wake
+{
+    #  force IR on  ("always night mode")
+
+    my $self = shift;
+    my $url = "/eng/admin/adv_audiovideo.cgi";
+    my $cmd = "irMode=3";
+
+    Debug("Wake -- IR on");
+
+    $self->sendCmdPost ($url,$cmd);
+}
+
+sub sleep
+{
+    #  force IR off ("always day mode")
+
+    my $self=shift;
+    my $url = "/eng/admin/adv_audiovideo.cgi";
+    my $cmd = "irMode=2";
+
+    Debug("Sleep -- IR off");
+
+    $self->sendCmdPost ($url,$cmd);
+}
+
+sub reset
+{
+    #  IR auto
+
+    my $self=shift;
+    my $url = "/eng/admin/adv_audiovideo.cgi";
+    my $cmd = "irMode=0";
+
+    Debug("Reset -- IR auto");
+
+    $self->sendCmdPost ($url,$cmd);
+}
+
+
+1;
+__END__
+# Below is stub documentation for your module. You'd better edit it!
+
+=head1 NAME
+
+ZoneMinder::Database - Perl extension for Trendnet TVIP672
+
+=head1 SYNOPSIS
+
+  use ZoneMinder::Database;
+  stuff this in /usr/share/perl5/ZoneMinder/Control , then eat a sandwich
+
+=head1 DESCRIPTION
+
+Stub documentation for Trendnet TVIP672, created by Vince. 
+
+=head2 EXPORT
+
+None by default.
+
+
+
+=head1 SEE ALSO
+
+Read the comments at the beginning of this file to see the usage for zoneminder 1.25.0
+
+
+=head1 AUTHOR
+
+Vincent Giovannone, I'd rather you not email me.
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2014 by Vincent Giovannone
+
+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/lib/ZoneMinder/Memory.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
@ -126,8 +126,19 @@ else
    ZoneMinder::Memory::Shared->import();
 }

+# Detaint our environment
+$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
+delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
+
 # Native architecture
-our $arch = int(3.2*length(~0));
+
+# The following returned the wrong result on some 32 bit distros running on 64 bit hardware
+#our $arch = int(3.2*length(~0));
+
+# New method for determining the bitness
+our $arch = 32 + 32*( qx(uname -m) =~ /64/ );
+
 our $native = $arch/8;
 our $mem_seq = 0;

--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@ -111,9 +111,20 @@ my $swap_image_path = $Config{ZM_PATH_SWAP};

 my $loop = 1;
 my $cleaned = 0;
-MAIN: while( $loop )
-{
-    my $db_monitors;
+MAIN: while( $loop ) {
+	while ( ! ( $dbh and $dbh->ping() ) ) {
+		$dbh = zmDbConnect();
+
+		last if $dbh;
+		if ( $continuous ) {
+			# if we are running continuously, then just skip to the next interval, otherwise we are a one off run, so wait a second and retry until someone kills us.
+			sleep( $Config{ZM_AUDIT_CHECK_INTERVAL} );
+		} else {
+			sleep 1;
+		} # end if
+	} # end while can't connect to the db
+
+	my $db_monitors;
    my $monitorSelectSql = "select Id from Monitors order by Id";
    my $monitorSelectSth = $dbh->prepare_cached( $monitorSelectSql ) or Fatal( "Can't prepare '$monitorSelectSql': ".$dbh->errstr() );
    my $eventSelectSql = "select Id, (unix_timestamp() - unix_timestamp(StartTime)) as Age from Events where MonitorId = ? order by Id";
--- a/scripts/zmcontrol.pl.in
+++ b/scripts/zmcontrol.pl.in
@ -32,7 +32,7 @@ use ZoneMinder;
 use Getopt::Long;
 use POSIX qw/strftime EPIPE/;
 use Socket;
-use Data::Dumper;
+#use Data::Dumper;
 use Module::Load;

 use constant MAX_CONNECT_DELAY => 10;
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@ -123,6 +123,18 @@ if ( $command eq "state" )
 	$command = "restart";
 }

+# Check if we are running systemd and if we have been called by the system
+if ( $command =~ /^(start|stop|restart)$/ )
+{
+	# We have to detaint to keep perl from complaining
+	$command = $1;
+
+	if ( systemdRunning() && !calledBysystem() ) {
+		qx(@BINDIR@/zmsystemctl.pl $command);
+		$command = "";
+	}
+}
+
 if ( $command =~ /^(?:stop|restart)$/ )
 {
 	my $status = runCommand( "zmdc.pl check" );
@ -153,18 +165,14 @@ if ( $command =~ /^(?:start|restart)$/ )
        }

        # Recreate the temporary directory if it's been wiped
-        if ( !-e "@ZM_TMPDIR@" )
-        {
-            Debug( "Recreating temporary directory '@ZM_TMPDIR@'" );
-            mkdir( "@ZM_TMPDIR@", 0700 ) or Fatal( "Can't create missing temporary directory '@ZM_TMPDIR@': $!" );
-            my ( $runName ) = getpwuid( $> );
-            if ( $runName ne $Config{ZM_WEB_USER} )
-            {
-                # Not running as web user, so should be root in whch case chown the temporary directory
-                my ( $webName, $webPass, $webUid, $webGid ) = getpwnam( $Config{ZM_WEB_USER} ) or Fatal( "Can't get user details for web user '".$Config{ZM_WEB_USER}."': $!" );
-                chown( $webUid, $webGid, "@ZM_TMPDIR@" ) or Fatal( "Can't change ownership of temporary directory '@ZM_TMPDIR@' to '".$Config{ZM_WEB_USER}.":".$Config{ZM_WEB_GROUP}."': $!" );
-            }
-        }
+	verifyFolder("@ZM_TMPDIR@");
+
+        # Recreate the run directory if it's been wiped
+	verifyFolder("@ZM_RUNDIR@");
+
+        # Recreate the sock directory if it's been wiped
+	verifyFolder("@ZM_SOCKDIR@");
+
 		zmMemTidy();
 		runCommand( "zmdc.pl startup" );

@ -245,4 +253,51 @@ if ( $command eq "logrot" )

 exit( $retval );

+sub systemdRunning
+{
+	my $result = 0;
+
+	my $output = qx(ps -o comm="" 1);
+	chomp( $output );
+
+	if ($output =~ /systemd/) {
+		$result = 1;
+	}
+
+	return $result;
+}
+
+sub calledBysystem
+{
+	my $result = 0;
+	my $ppid = getppid();
+
+	my $output = qx(ps -o comm="" $ppid);
+	chomp( $output );
+
+	if ($output =~ /^(?:systemd|init)$/) {
+		$result = 1;
+	}
+
+	return $result;
+}
+
+sub verifyFolder
+{
+	my $folder = shift;
+
+        # Recreate the temporary directory if it's been wiped
+        if ( !-e $folder )
+        {
+            Debug( "Recreating directory '$folder'" );
+            mkdir( "$folder", 0774 ) or Fatal( "Can't create missing temporary directory '$folder': $!" );
+            my ( $runName ) = getpwuid( $> );
+            if ( $runName ne $Config{ZM_WEB_USER} )
+            {
+                # Not running as web user, so should be root in which case chown the directory
+                my ( $webName, $webPass, $webUid, $webGid ) = getpwnam( $Config{ZM_WEB_USER} ) or Fatal( "Can't get user details for web user '".$Config{ZM_WEB_USER}."': $!" );
+                chown( $webUid, $webGid, "$folder" ) or Fatal( "Can't change ownership of directory '$folder' to '".$Config{ZM_WEB_USER}.":".$Config{ZM_WEB_GROUP}."': $!" );
+            }
+        }
+}
 __END__
--- a/scripts/zmsystemctl.pl.in
+++ b/scripts/zmsystemctl.pl.in
@ -0,0 +1,54 @@
+#!/usr/bin/pkexec /usr/bin/perl
+#
+# ==========================================================================
+#
+# ZoneMinder Update Script, $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 is a wrapper script that allows zoneminder to start and stop itself
+# in a manner that keeps it in-sync with systemd.  This script is intended
+# to be called internally by zoneminder and may not give the desired results
+# if run from the command line.
+#
+use warnings;
+use strict;
+use bytes;
+
+@EXTRA_PERL_LIB@
+use ZoneMinder::Logger qw(:all);
+
+my $command = $ARGV[0];
+
+if ( (scalar(@ARGV) == 1) && ($command =~ /^(start|stop|restart)$/ )) {
+	$command = $1;
+} else {
+	die(" USAGE: zmsystemctl.pl <start|stop|restart>\n");
+}
+
+my $path = qx(which systemctl);
+chomp($path);
+
+my $status = $? >> 8;
+if ( !$path || $status ) {
+	Fatal( "Unable to determine systemctl executable. Is systemd in use?" );
+}
+
+Info( "Redirecting command through systemctl\n" );
+exec("$path $command zoneminder");
+
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -4,7 +4,7 @@
 configure_file(zm_config.h.in "${CMAKE_CURRENT_BINARY_DIR}/zm_config.h" @ONLY)

 # Group together all the source files that are used by all the binaries (zmc, zma, zmu, zms etc)
-set(ZM_BIN_SRC_FILES zm_box.cpp zm_buffer.cpp zm_camera.cpp zm_comms.cpp zm_config.cpp zm_coord.cpp zm_curl_camera.cpp zm.cpp zm_db.cpp zm_logger.cpp zm_event.cpp zm_exception.cpp zm_file_camera.cpp zm_ffmpeg_camera.cpp  zm_image.cpp zm_jpeg.cpp zm_libvlc_camera.cpp zm_local_camera.cpp zm_monitor.cpp zm_ffmpeg.cpp zm_mpeg.cpp zm_poly.cpp zm_regexp.cpp zm_remote_camera.cpp zm_remote_camera_http.cpp zm_remote_camera_rtsp.cpp zm_rtp.cpp  zm_rtp_ctrl.cpp zm_rtp_data.cpp zm_rtp_source.cpp zm_rtsp.cpp zm_sdp.cpp zm_signal.cpp zm_stream.cpp zm_thread.cpp zm_time.cpp zm_timer.cpp zm_user.cpp zm_utils.cpp zm_zone.cpp)
+set(ZM_BIN_SRC_FILES zm_box.cpp zm_buffer.cpp zm_camera.cpp zm_comms.cpp zm_config.cpp zm_coord.cpp zm_curl_camera.cpp zm.cpp zm_db.cpp zm_logger.cpp zm_event.cpp zm_exception.cpp zm_file_camera.cpp zm_ffmpeg_camera.cpp  zm_image.cpp zm_jpeg.cpp zm_libvlc_camera.cpp zm_local_camera.cpp zm_monitor.cpp zm_ffmpeg.cpp zm_mpeg.cpp zm_poly.cpp zm_regexp.cpp zm_remote_camera.cpp zm_remote_camera_http.cpp zm_remote_camera_rtsp.cpp zm_rtp.cpp  zm_rtp_ctrl.cpp zm_rtp_data.cpp zm_rtp_source.cpp zm_rtsp.cpp zm_rtsp_auth.cpp zm_sdp.cpp zm_signal.cpp zm_stream.cpp zm_thread.cpp zm_time.cpp zm_timer.cpp zm_user.cpp zm_utils.cpp zm_zone.cpp)

 # A fix for cmake recompiling the source files for every target.
 add_library(zm STATIC ${ZM_BIN_SRC_FILES})
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -51,6 +51,7 @@ zm_SOURCES = \
 	zm_rtp_data.cpp \
 	zm_rtp_source.cpp \
 	zm_rtsp.cpp \
+	zm_rtsp_auth.cpp \
 	zm_sdp.cpp \
 	zm_signal.cpp \
 	zm_stream.cpp \
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@ -133,6 +133,7 @@ int SWScale::Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint
 		return -3;
 	}

+#if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(0, 8, 0)
 	/* Warn if the input or output pixelformat is not supported */
 	if(!sws_isSupportedInput(in_pf)) {
 		Warning("swscale does not support the input format: %c%c%c%c",(in_pf)&0xff,((in_pf)&0xff),((in_pf>>16)&0xff),((in_pf>>24)&0xff));
@ -140,6 +141,7 @@ int SWScale::Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint
 	if(!sws_isSupportedOutput(out_pf)) {
 		Warning("swscale does not support the output format: %c%c%c%c",(out_pf)&0xff,((out_pf>>8)&0xff),((out_pf>>16)&0xff),((out_pf>>24)&0xff));
 	}
+#endif

 	/* Check the buffer sizes */
 	size_t insize = avpicture_get_size(in_pf, width, height);
--- a/src/zm_ffmpeg.h
+++ b/src/zm_ffmpeg.h
@ -32,10 +32,16 @@ extern "C" {
 #include <libavutil/avutil.h>
 #include <libavutil/base64.h>
 #include <libavutil/mathematics.h>
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(50, 28, 0)
+#include <libavutil/opt.h>
+#else
+#include <libavcodec/opt.h>
+#endif
 #elif HAVE_FFMPEG_AVUTIL_H
 #include <ffmpeg/avutil.h>
 #include <ffmpeg/base64.h>
 #include <ffmpeg/mathematics.h>
+#include <ffmpeg/opt.h>
 #endif

 // AVCODEC
@ -45,6 +51,14 @@ extern "C" {
 #include <ffmpeg/avcodec.h>
 #endif
 	
+#if defined(HAVE_LIBAVCODEC_AVCODEC_H)
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
+    #define _AVCODECID AVCodecID
+#else
+    #define _AVCODECID CodecID
+#endif
+#endif
+
 // AVFORMAT
 #if HAVE_LIBAVFORMAT_AVFORMAT_H
 #include <libavformat/avformat.h>
@ -80,18 +94,6 @@ extern "C" {
 #endif
 #endif

-#if FFMPEG_VERSION_INT == 0x000408
-#define ZM_FFMPEG_048	1
-#elif FFMPEG_VERSION_INT == 0x000409
-#if LIBAVCODEC_VERSION_INT < ((50<<16)+(0<<8)+0)
-#define ZM_FFMPEG_049	1
-#else // LIBAVCODEC_VERSION_INT
-#define ZM_FFMPEG_SVN	1
-#endif // LIBAVCODEC_VERSION_INT
-#else // FFMPEG_VERSION_INT
-#define ZM_FFMPEG_SVN	1
-#endif // FFMPEG_VERSION_INT
-
 /* Fix for not having SWS_CPU_CAPS_SSE2 defined */
 #ifndef SWS_CPU_CAPS_SSE2
 #define SWS_CPU_CAPS_SSE2     0x02000000
@ -147,7 +149,36 @@ protected:
 #define AV_CODEC_ID_AMR_NB CODEC_ID_AMR_NB
 #endif

+/*
+ * Some versions of libav does not contain this definition.
+ */
+#ifndef AV_ERROR_MAX_STRING_SIZE
+#define AV_ERROR_MAX_STRING_SIZE 64
+#endif
+
+/*
+ * C++ friendly version of av_err2str taken from http://libav-users.943685.n4.nabble.com/Libav-user-g-4-7-2-fails-to-compile-av-err2str-td4656417.html.
+ * Newer g++ versions fail with "error: taking address of temporary array" when using native libav version.
+ */
+#ifdef  __cplusplus
+
+    inline static const std::string av_make_error_string(int errnum)
+    {
+        char errbuf[AV_ERROR_MAX_STRING_SIZE];
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(50, 12, 13)
+        av_strerror(errnum, errbuf, AV_ERROR_MAX_STRING_SIZE);
+#else
+		snprintf(errbuf, AV_ERROR_MAX_STRING_SIZE, "libav error %d", errnum);
+#endif
+        return (std::string)errbuf;
+    }
+	
+    #undef av_err2str
+    #define av_err2str(errnum) av_make_error_string(errnum).c_str()
+
+    #endif // __cplusplus 
+
+
 #endif // ( HAVE_LIBAVUTIL_AVUTIL_H || HAVE_LIBAVCODEC_AVCODEC_H || HAVE_LIBAVFORMAT_AVFORMAT_H || HAVE_LIBAVDEVICE_AVDEVICE_H )

 #endif // ZM_FFMPEG_H
-
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@ -81,10 +81,10 @@ FfmpegCamera::~FfmpegCamera()
    }
    if ( mFormatContext )
    {
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0)
-        av_close_input_file( mFormatContext );
-#else
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
        avformat_close_input( &mFormatContext );
+#else
+        av_close_input_file( mFormatContext );
 #endif
        mFormatContext = NULL;
    }
@ -207,6 +207,7 @@ int FfmpegCamera::PrimeCapture()
 	}
 	
 #if HAVE_LIBSWSCALE
+#if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(0, 8, 0)
 	if(!sws_isSupportedInput(mCodecContext->pix_fmt)) {
 		Fatal("swscale does not support the codec format: %c%c%c%c",(mCodecContext->pix_fmt)&0xff,((mCodecContext->pix_fmt>>8)&0xff),((mCodecContext->pix_fmt>>16)&0xff),((mCodecContext->pix_fmt>>24)&0xff));
 	}
@ -214,6 +215,7 @@ int FfmpegCamera::PrimeCapture()
 	if(!sws_isSupportedOutput(imagePixFormat)) {
 		Fatal("swscale does not support the target format: %c%c%c%c",(imagePixFormat)&0xff,((imagePixFormat>>8)&0xff),((imagePixFormat>>16)&0xff),((imagePixFormat>>24)&0xff));
 	}
+#endif
 	
 #else // HAVE_LIBSWSCALE
    Fatal( "You must compile ffmpeg with the --enable-swscale option to use ffmpeg cameras" );
@ -252,7 +254,11 @@ int FfmpegCamera::Capture( Image &image )
        Debug( 5, "Got packet from stream %d", packet.stream_index );
        if ( packet.stream_index == mVideoStreamId )
        {
-            if ( avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet ) < 0 )
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 25, 0)
+			if ( avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet ) < 0 )
+#else
+			if ( avcodec_decode_video( mCodecContext, mRawFrame, &frameComplete, packet.data, packet.size ) < 0 )
+#endif
                Fatal( "Unable to decode frame at frame %d", frameCount );

            Debug( 4, "Decoded video packet at frame %d", frameCount );
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@ -2088,10 +2088,10 @@ void Image::Outline( Rgb colour, const Polygon &polygon )

 		double grad;

-		Debug( 9, "dx: %.2lf, dy: %.2lf", dx, dy );
+		//Debug( 9, "dx: %.2lf, dy: %.2lf", dx, dy );
 		if ( fabs(dx) <= fabs(dy) )
 		{
-			Debug( 9, "dx <= dy" );
+			//Debug( 9, "dx <= dy" );
 			if ( y1 != y2 )
 				grad = dx/dy;
 			else
@ -2102,10 +2102,10 @@ void Image::Outline( Rgb colour, const Polygon &polygon )
 			grad *= yinc;
 			if ( colours == ZM_COLOUR_GRAY8 )
 			{
-				Debug( 9, "x1:%d, x2:%d, y1:%d, y2:%d, gr:%.2f", x1, x2, y1, y2, grad );
+				//Debug( 9, "x1:%d, x2:%d, y1:%d, y2:%d, gr:%.2f", x1, x2, y1, y2, grad );
 				for ( x = x1, y = y1; y != y2; y += yinc, x += grad )
 				{
-					Debug( 9, "x:%.2f, y:%d", x, y );
+					//Debug( 9, "x:%.2f, y:%d", x, y );
 					buffer[(y*width)+int(round(x))] = colour;
 				}
 			}
@ -2129,22 +2129,22 @@ void Image::Outline( Rgb colour, const Polygon &polygon )
 		}
 		else
 		{
-			Debug( 9, "dx > dy" );
+			//Debug( 9, "dx > dy" );
 			if ( x1 != x2 )
 				grad = dy/dx;
 			else
 				grad = height;
-			Debug( 9, "grad: %.2lf", grad );
+			//Debug( 9, "grad: %.2lf", grad );

 			double y;
 			int x, xinc = (x1<x2)?1:-1;
 			grad *= xinc;
 			if ( colours == ZM_COLOUR_GRAY8 )
 			{
-				Debug( 9, "x1:%d, x2:%d, y1:%d, y2:%d, gr:%.2lf", x1, x2, y1, y2, grad );
+				//Debug( 9, "x1:%d, x2:%d, y1:%d, y2:%d, gr:%.2lf", x1, x2, y1, y2, grad );
 				for ( y = y1, x = x1; x != x2; x += xinc, y += grad )
 				{
-					Debug( 9, "x:%d, y:%.2f", x, y );
+					//Debug( 9, "x:%d, y:%.2f", x, y );
 					buffer[(int(round(y))*width)+x] = colour;
 				}
 			}
@ -2194,7 +2194,7 @@ void Image::Fill( Rgb colour, int density, const Polygon &polygon )
 		int y1 = p1.Y();
 		int y2 = p2.Y();

-		Debug( 9, "x1:%d,y1:%d x2:%d,y2:%d", x1, y1, x2, y2 );
+		//Debug( 9, "x1:%d,y1:%d x2:%d,y2:%d", x1, y1, x2, y2 );
 		if ( y1 == y2 )
 			continue;

--- a/src/zm_local_camera.cpp
+++ b/src/zm_local_camera.cpp
@ -54,7 +54,7 @@ static PixelFormat getFfPixFormatFromV4lPalette( int v4l_version, int palette )
    {
        switch( palette )
        {
-#ifdef V4L2_PIX_FMT_RGB444
+#if defined(V4L2_PIX_FMT_RGB444) && defined(PIX_FMT_RGB444)
            case V4L2_PIX_FMT_RGB444 :
                pixFormat = PIX_FMT_RGB444;
                break;
@ -423,6 +423,7 @@ LocalCamera::LocalCamera( int p_id, const std::string &p_device, int p_channel,
 				Panic("Unexpected colours: %d",colours);
 			}
 			if( capture ) {
+#if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(0, 8, 0)
 				if(!sws_isSupportedInput(capturePixFormat)) {
 					Error("swscale does not support the used capture format: %c%c%c%c",(capturePixFormat)&0xff,((capturePixFormat>>8)&0xff),((capturePixFormat>>16)&0xff),((capturePixFormat>>24)&0xff));
 					conversion_type = 2; /* Try ZM format conversions */
@ -431,6 +432,7 @@ LocalCamera::LocalCamera( int p_id, const std::string &p_device, int p_channel,
 					Error("swscale does not support the target format: %c%c%c%c",(imagePixFormat)&0xff,((imagePixFormat>>8)&0xff),((imagePixFormat>>16)&0xff),((imagePixFormat>>24)&0xff));
 					conversion_type = 2; /* Try ZM format conversions */
 				}
+#endif
 			}
 #else
 			/* Don't have swscale, see what we can do */
@ -782,6 +784,7 @@ void LocalCamera::Initialise()
       
        memset( &v4l2_data.reqbufs, 0, sizeof(v4l2_data.reqbufs) );
        if ( channel_count > 1 ) {
+			Debug( 3, "Channel count is %d", channel_count );
            if ( v4l_multi_buffer ){
                v4l2_data.reqbufs.count = 2*channel_count;
            } else {
@ -790,6 +793,7 @@ void LocalCamera::Initialise()
        } else {
            v4l2_data.reqbufs.count = 8;
 		}
+		Debug( 3, "Request buffers count is %d", v4l2_data.reqbufs.count );

        v4l2_data.reqbufs.type = v4l2_data.fmt.type;
        v4l2_data.reqbufs.memory = V4L2_MEMORY_MMAP;
@ -809,7 +813,7 @@ void LocalCamera::Initialise()
        if ( v4l2_data.reqbufs.count < (v4l_multi_buffer?2:1) )
            Fatal( "Insufficient buffer memory %d on video device", v4l2_data.reqbufs.count );

-		Debug( 3, "Setting up data buffers: Channels %d MultiBuffer %d Buffers: %s", channel_count, v4l_multi_buffer, v4l2_data.reqbufs.count );
+		Debug( 3, "Setting up data buffers: Channels %d MultiBuffer %d Buffers: %d", channel_count, v4l_multi_buffer, v4l2_data.reqbufs.count );

        v4l2_data.buffers = new V4L2MappedBuffer[v4l2_data.reqbufs.count];
 #if HAVE_LIBSWSCALE
@ -2133,12 +2137,16 @@ int LocalCamera::PostCapture()
                    return( -1 );
                }
            }
-            Debug( 3, "Requeueing buffer %d", v4l2_data.bufptr->index );
-            if ( vidioctl( vid_fd, VIDIOC_QBUF, v4l2_data.bufptr ) < 0 )
-            {
-                Error( "Unable to requeue buffer %d: %s", v4l2_data.bufptr->index, strerror(errno) )
-                return( -1 );
-            }
+			if ( v4l2_data.bufptr ) {
+				Debug( 3, "Requeueing buffer %d", v4l2_data.bufptr->index );
+				if ( vidioctl( vid_fd, VIDIOC_QBUF, v4l2_data.bufptr ) < 0 )
+				{
+					Error( "Unable to requeue buffer %d: %s", v4l2_data.bufptr->index, strerror(errno) )
+						return( -1 );
+				}
+			} else {
+                Error( "Unable to requeue buffer due to not v4l2_data" )
+			}
        }
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@ -425,6 +425,7 @@ Monitor::Monitor(
        }
    }

+	// Will this not happen everytime a monitor is instantiated?  Seems like all the calls to the Monitor constructor pass a zero for n_zones, then load zones after..
    if ( !n_zones ) {
 		Debug( 1, "Monitor %s has no zones, adding one.", name );
        n_zones = 1;
@ -592,19 +593,19 @@ Monitor::~Monitor()

    delete camera;

-    if ( purpose == ANALYSIS )
-    {
-        shared_data->state = state = IDLE;
-        shared_data->last_read_index = image_buffer_count;
-        shared_data->last_read_time = 0;
-    }
-    else if ( purpose == CAPTURE )
-    {
-        shared_data->valid = false;
-        memset( mem_ptr, 0, mem_size );
-    }
-
 	if ( mem_ptr ) {
+		if ( purpose == ANALYSIS )
+		{
+			shared_data->state = state = IDLE;
+			shared_data->last_read_index = image_buffer_count;
+			shared_data->last_read_time = 0;
+		}
+		else if ( purpose == CAPTURE )
+		{
+			shared_data->valid = false;
+			memset( mem_ptr, 0, mem_size );
+		}
+
 #if ZM_MEM_MAPPED
 		if ( msync( mem_ptr, mem_size, MS_SYNC ) < 0 )
 			Error( "Can't msync: %s", strerror(errno) );
@ -1870,8 +1871,26 @@ int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose
        const char *device = dbrow[col]; col++;
        int channel = atoi(dbrow[col]); col++;
        int format = atoi(dbrow[col]); col++;
-		bool v4l_multi_buffer = (*dbrow[col] == 48 ? false : true); col++;
-		int v4l_captures_per_frame = atoi(dbrow[col]); col++;
+		bool v4l_multi_buffer;
+		if ( dbrow[col] ) {
+			if (*dbrow[col] == '0' ) {
+				v4l_multi_buffer = false;
+			} else if ( *dbrow[col] == '1' ) {
+				v4l_multi_buffer = true;
+			} 
+		} else {
+			v4l_multi_buffer = config.v4l_multi_buffer;
+		}
+		col++;
+		
+		int v4l_captures_per_frame = 0;
+		if ( dbrow[col] ) {
+			 v4l_captures_per_frame = atoi(dbrow[col]);
+		} else {
+			v4l_captures_per_frame = config.captures_per_frame;
+		}
+Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
+		col++;
        const char *method = dbrow[col]; col++;

        int width = atoi(dbrow[col]); col++;
@ -2472,8 +2491,27 @@ Monitor *Monitor::Load( int id, bool load_zones, Purpose purpose )
        std::string device = dbrow[col]; col++;
        int channel = atoi(dbrow[col]); col++;
        int format = atoi(dbrow[col]); col++;
-		bool v4l_multi_buffer = (*dbrow[col] == 48 ? false : true); col++;
-		int v4l_captures_per_frame = atoi(dbrow[col]); col++;
+
+        bool v4l_multi_buffer;
+        if ( dbrow[col] ) {
+            if (*dbrow[col] == '0' ) {
+                v4l_multi_buffer = false;
+            } else if ( *dbrow[col] == '1' ) {
+                v4l_multi_buffer = true;
+            }
+        } else {
+            v4l_multi_buffer = config.v4l_multi_buffer;
+        }
+        col++;
+
+        int v4l_captures_per_frame = 0;
+        if ( dbrow[col] ) {
+             v4l_captures_per_frame = atoi(dbrow[col]);
+        } else {
+            v4l_captures_per_frame = config.captures_per_frame;
+        }
+Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
+        col++;

        std::string protocol = dbrow[col]; col++;
        std::string method = dbrow[col]; col++;
--- a/src/zm_mpeg.cpp
+++ b/src/zm_mpeg.cpp
@ -15,7 +15,7 @@
 * 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.
-*/ 
+ */

 #include <stdlib.h>
 #include <string.h>
@ -25,27 +25,11 @@
 #include "zm_mpeg.h"

 #if HAVE_LIBAVCODEC
-extern "C" {
-#include <libavutil/mathematics.h>
-}
-
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 1, 0)
-static int encode_frame(AVCodecContext *c, AVFrame *frame)
+extern "C"
 {
-    AVPacket pkt = { 0 };
-    int ret, got_output;
-
-    av_init_packet(&pkt);
-    av_init_packet(&pkt);
-    ret = avcodec_encode_video2(c, &pkt, frame, &got_output);
-    if (ret < 0)
-        return ret;
-
-    ret = pkt.size;
-    av_free_packet(&pkt);
-    return ret;
+#include <libavutil/mathematics.h>
+#include <libavcodec/avcodec.h>
 }
-#endif

 bool VideoStream::initialised = false;

@ -53,41 +37,90 @@ VideoStream::MimeData VideoStream::mime_data[] = {
 	{ "asf", "video/x-ms-asf" },
 	{ "swf", "application/x-shockwave-flash" },
 	{ "flv", "video/x-flv" },
-	{ "mp4", "video/mp4" },
-	{ "move", "video/quicktime" }
+	{ "mov", "video/quicktime" }
 };

-void VideoStream::Initialise()
+void VideoStream::Initialise( )
 {
-	av_register_all();
+	if ( logDebugging() )
+        av_log_set_level( AV_LOG_DEBUG ); 
+    else
+        av_log_set_level( AV_LOG_QUIET ); 
+	
+	av_register_all( );
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 13, 0)
+	avformat_network_init();
+#endif
 	initialised = true;
 }

-void VideoStream::SetupFormat( const char *p_filename, const char *p_format )
+void VideoStream::SetupFormat( )
 {
-	filename = p_filename;
-	format = p_format;
-
-	/* auto detect the output format from the name. default is mpeg. */
-	of = av_guess_format( format, NULL, NULL);
-	if ( !of )
-	{
-		Warning( "Could not deduce output format from file extension: using mpeg" );
-		of = av_guess_format("mpeg", NULL, NULL);
-	}
-	if ( !of )
-	{
-		Fatal( "Could not find suitable output format" );
-	}
-	
 	/* allocate the output media context */
-	ofc = (AVFormatContext *)av_mallocz(sizeof(AVFormatContext));
+	ofc = NULL;
+#if ((LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 5, 0)) && (LIBAVFORMAT_VERSION_MICRO >= 100))
+	avformat_alloc_output_context2( &ofc, NULL, format, filename );
+#else
+	AVFormatContext *s= avformat_alloc_context();
+	if(!s) 
+	{
+		Fatal( "avformat_alloc_context failed %d \"%s\"", (size_t)ofc, av_err2str((size_t)ofc) );
+	}
+	
+	AVOutputFormat *oformat;
+	if (format) {
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 45, 0)
+		oformat = av_guess_format(format, NULL, NULL);
+#else
+		oformat = guess_format(format, NULL, NULL);
+#endif
+		if (!oformat) {
+			Fatal( "Requested output format '%s' is not a suitable output format", format );
+		}
+	} else {
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 45, 0)
+		oformat = av_guess_format(NULL, filename, NULL);
+#else
+		oformat = guess_format(NULL, filename, NULL);
+#endif
+		if (!oformat) {
+			Fatal( "Unable to find a suitable output format for '%s'", format );
+		}
+	}
+	s->oformat = oformat;
+	
+	if (s->oformat->priv_data_size > 0) {
+		s->priv_data = av_mallocz(s->oformat->priv_data_size);
+		if (!s->priv_data)
+		{
+			Fatal( "Could not allocate private data for output format." );
+		}
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 92, 0)
+		if (s->oformat->priv_class) {
+			*(const AVClass**)s->priv_data = s->oformat->priv_class;
+			av_opt_set_defaults(s->priv_data);
+		}
+#endif
+	} 
+	else
+	{
+		s->priv_data = NULL;
+	}
+	
+	if(filename)
+	{
+		snprintf( s->filename, sizeof(s->filename), filename );
+	}
+	
+	ofc = s;
+#endif
 	if ( !ofc )
 	{
-		Panic( "Memory error" );
+		Fatal( "avformat_alloc_..._context failed: %d", ofc );
 	}
-	ofc->oformat = of;
-	snprintf( ofc->filename, sizeof(ofc->filename), "%s", filename );
+
+	of = ofc->oformat;
+	Debug( 1, "Using output format: %s (%s)", of->name, of->long_name );
 }

 void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int height, int bitrate, double frame_rate )
@ -130,139 +163,178 @@ void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int hei
 	    break;
 	}

+	if ( strcmp( "rtp", of->name ) == 0 )
+	{
+		// RTP must have a packet_size.
+		// Not sure what this value should be really...
+		ofc->packet_size = width*height;
+		
+		if ( of->video_codec ==  AV_CODEC_ID_NONE)
+		{
+			// RTP does not have a default codec in ffmpeg <= 0.8.
+			of->video_codec = AV_CODEC_ID_MPEG4;
+		}
+	}
+	
+	_AVCODECID codec_id = of->video_codec;
+	if ( codec_name )
+	{
+            AVCodec *a = avcodec_find_encoder_by_name(codec_name);
+            if ( a )
+            {
+                codec_id = a->id;
+            }
+            else
+            {
+#if ((LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 11, 0)) && (LIBAVFORMAT_VERSION_MICRO >= 100))
+                    Debug( 1, "Could not find codec \"%s\". Using default \"%s\"", codec_name, avcodec_get_name( codec_id ) );
+#else
+                    Debug( 1, "Could not find codec \"%s\". Using default \"%d\"", codec_name, codec_id );
+#endif
+            }
+	}
+
 	/* add the video streams using the default format codecs
 	   and initialize the codecs */
 	ost = NULL;
-	if (of->video_codec != AV_CODEC_ID_NONE)
+	if ( codec_id != AV_CODEC_ID_NONE )
 	{
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0)
-		ost = av_new_stream(ofc, 0);
-#else
-      ost = avformat_new_stream(ofc, 0);
-#endif
-		if (!ost)
+		codec = avcodec_find_encoder( codec_id );
+		if ( !codec )
 		{
-			Panic( "Could not alloc stream" );
+#if ((LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 11, 0)) && (LIBAVFORMAT_VERSION_MICRO >= 100))
+			Fatal( "Could not find encoder for '%s'", avcodec_get_name( codec_id ) );
+#else
+			Fatal( "Could not find encoder for '%d'", codec_id );
+#endif
 		}

-#if ZM_FFMPEG_SVN
+#if ((LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 11, 0)) && (LIBAVFORMAT_VERSION_MICRO >= 100))
+		Debug( 1, "Found encoder for '%s'", avcodec_get_name( codec_id ) );
+#else
+		Debug( 1, "Found encoder for '%d'", codec_id );
+#endif
+
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 10, 0)		
+		ost = avformat_new_stream( ofc, codec );
+#else
+		ost = av_new_stream( ofc, 0 );
+#endif
+		
+		if ( !ost )
+		{
+			Fatal( "Could not alloc stream" );
+		}
+		ost->id = ofc->nb_streams - 1;
+
+		Debug( 1, "Allocated stream" );
+
 		AVCodecContext *c = ost->codec;
-#else
-		AVCodecContext *c = &ost->codec;
-#endif

-		c->codec_id = of->video_codec;
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
-		c->codec_type = AVMEDIA_TYPE_VIDEO;
-#else
-		c->codec_type = CODEC_TYPE_VIDEO;
-#endif
+		c->codec_id = codec->id;
+		c->codec_type = codec->type;
+
+		c->pix_fmt = strcmp( "mjpeg", ofc->oformat->name ) == 0 ? PIX_FMT_YUVJ422P : PIX_FMT_YUV420P;
+		if ( bitrate <= 100 )
+		{
+			// Quality based bitrate control (VBR). Scale is 1..31 where 1 is best.
+			// This gets rid of artifacts in the beginning of the movie; and well, even quality.
+			c->flags |= CODEC_FLAG_QSCALE;
+			c->global_quality = FF_QP2LAMBDA * (31 - (31 * (bitrate / 100.0)));
+		}
+		else
+		{
+			c->bit_rate = bitrate;
+		}

-		/* put sample parameters */
-		c->bit_rate = bitrate;
-		c->pix_fmt = PIX_FMT_YUV420P;
 		/* resolution must be a multiple of two */
 		c->width = width;
 		c->height = height;
-#if ZM_FFMPEG_SVN
 		/* time base: this is the fundamental unit of time (in seconds) in terms
 		   of which frame timestamps are represented. for fixed-fps content,
 		   timebase should be 1/framerate and timestamp increments should be
 		   identically 1. */
-		//c->time_base.den = (int)(frame_rate*100);
-		//c->time_base.num = 100;
 		c->time_base.den = frame_rate;
 		c->time_base.num = 1;
-#else
-		/* frames per second */
-		c->frame_rate = frame_rate;
-		c->frame_rate_base = 1;
-#endif
-		//c->gop_size = frame_rate/2; /* emit one intra frame every half second or so */
-		c->gop_size = 12;
-		if ( c->gop_size < 3 )
-			c->gop_size = 3;
+		
+		Debug( 1, "Will encode in %d fps.", c->time_base.den );
+		
+		/* emit one intra frame every second */
+		c->gop_size = frame_rate;
+
 		// some formats want stream headers to be seperate
-		if(!strcmp(ofc->oformat->name, "mp4") || !strcmp(ofc->oformat->name, "mov") || !strcmp(ofc->oformat->name, "3gp"))
+		if ( of->flags & AVFMT_GLOBALHEADER )
 			c->flags |= CODEC_FLAG_GLOBAL_HEADER;
 	}
-}
-
-void VideoStream::SetParameters()
-{
-	/* set the output parameters (must be done even if no
-	   parameters). */
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0)
-	if ( av_set_parameters(ofc, NULL) < 0 )
-#else
-	if ( avformat_write_header(ofc, NULL) < 0 )
-#endif
+	else
 	{
-		Panic( "Invalid output format parameters" );
+		Fatal( "of->video_codec == AV_CODEC_ID_NONE" );
 	}
-	//dump_format(ofc, 0, filename, 1);
 }

-const char *VideoStream::MimeType() const
+void VideoStream::SetParameters( )
 {
-	for ( unsigned int i = 0; i < sizeof(mime_data)/sizeof(*mime_data); i++ )
+}
+
+const char *VideoStream::MimeType( ) const
+{
+	for ( unsigned int i = 0; i < sizeof (mime_data) / sizeof (*mime_data); i++ )
 	{
 		if ( strcmp( format, mime_data[i].format ) == 0 )
 		{
-			return( mime_data[i].mime_type );
+			Debug( 1, "MimeType is \"%s\"", mime_data[i].mime_type );
+			return ( mime_data[i].mime_type);
 		}
 	}
 	const char *mime_type = of->mime_type;
 	if ( !mime_type )
 	{
-		mime_type = "video/mpeg";
+		std::string mime = "video/";
+		mime = mime.append( format );
+		mime_type = mime.c_str( );
 		Warning( "Unable to determine mime type for '%s' format, using '%s' as default", format, mime_type );
 	}

-	return( mime_type );
+	Debug( 1, "MimeType is \"%s\"", mime_type );
+
+	return ( mime_type);
 }

-void VideoStream::OpenStream()
+void VideoStream::OpenStream( )
 {
+	int avRet;
+
 	/* now that all the parameters are set, we can open the 
 	   video codecs and allocate the necessary encode buffers */
 	if ( ost )
 	{
-#if ZM_FFMPEG_SVN
 		AVCodecContext *c = ost->codec;
-#else
-		AVCodecContext *c = &ost->codec;
-#endif
-
-		/* find the video encoder */
-		AVCodec *codec = avcodec_find_encoder(c->codec_id);
-		if ( !codec )
-		{
-			Panic( "codec not found" );
-		}
 		
 		/* open the codec */
 #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 7, 0)
-		if ( avcodec_open(c, codec) < 0 )
+		if ( (avRet = avcodec_open( c, codec )) < 0 )
 #else
-      if ( avcodec_open2(c, codec, 0) < 0 )
+		if ( (avRet = avcodec_open2( c, codec, 0 )) < 0 )
 #endif
 		{
-			Panic( "Could not open codec" );
+			Fatal( "Could not open codec. Error code %d \"%s\"", avRet, av_err2str( avRet ) );
 		}

+		Debug( 1, "Opened codec" );
+
 		/* allocate the encoded raw picture */
-		opicture = avcodec_alloc_frame();
+		opicture = avcodec_alloc_frame( );
 		if ( !opicture )
 		{
 			Panic( "Could not allocate opicture" );
 		}
-		int size = avpicture_get_size( c->pix_fmt, c->width, c->height);
-		uint8_t *opicture_buf = (uint8_t *)av_malloc(size);
+		
+		int size = avpicture_get_size( c->pix_fmt, c->width, c->height );
+		uint8_t *opicture_buf = (uint8_t *)av_malloc( size );
 		if ( !opicture_buf )
 		{
-			av_free(opicture);
-			Panic( "Could not allocate opicture" );
+			av_free( opicture );
+			Panic( "Could not allocate opicture_buf" );
 		}
 		avpicture_fill( (AVPicture *)opicture, opicture_buf, c->pix_fmt, c->width, c->height );

@ -272,17 +344,17 @@ void VideoStream::OpenStream()
 		tmp_opicture = NULL;
 		if ( c->pix_fmt != pf )
 		{
-			tmp_opicture = avcodec_alloc_frame();
+			tmp_opicture = avcodec_alloc_frame( );
 			if ( !tmp_opicture )
 			{
-				Panic( "Could not allocate temporary opicture" );
+				Panic( "Could not allocate tmp_opicture" );
 			}
-			int size = avpicture_get_size( pf, c->width, c->height);
-			uint8_t *tmp_opicture_buf = (uint8_t *)av_malloc(size);
-			if (!tmp_opicture_buf)
+			int size = avpicture_get_size( pf, c->width, c->height );
+			uint8_t *tmp_opicture_buf = (uint8_t *)av_malloc( size );
+			if ( !tmp_opicture_buf )
 			{
 				av_free( tmp_opicture );
-				Panic( "Could not allocate temporary opicture" );
+				Panic( "Could not allocate tmp_opicture_buf" );
 			}
 			avpicture_fill( (AVPicture *)tmp_opicture, tmp_opicture_buf, pf, c->width, c->height );
 		}
@ -291,127 +363,251 @@ void VideoStream::OpenStream()
 	/* open the output file, if needed */
 	if ( !(of->flags & AVFMT_NOFILE) )
 	{
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
-		if ( avio_open(&ofc->pb, filename, AVIO_FLAG_WRITE) < 0 )
+		int ret;
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 14, 0)
+		ret = avio_open2( &ofc->pb, filename, AVIO_FLAG_WRITE, NULL, NULL );
+#elif LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 102, 0)
+		ret = avio_open( &ofc->pb, filename, AVIO_FLAG_WRITE );
 #else
-		if ( url_fopen(&ofc->pb, filename, AVIO_FLAG_WRITE) < 0 )
+		ret = url_fopen( &ofc->pb, filename, AVIO_FLAG_WRITE );
 #endif
+		if ( ret < 0 )
 		{
 			Fatal( "Could not open '%s'", filename );
 		}
+
+		Debug( 1, "Opened output \"%s\"", filename );
+	}
+	else
+	{
+		Fatal( "of->flags & AVFMT_NOFILE" );
 	}

 	video_outbuf = NULL;
-	if ( !(ofc->oformat->flags & AVFMT_RAWPICTURE) )
+	if ( !(of->flags & AVFMT_RAWPICTURE) )
 	{
 		/* allocate output buffer */
 		/* XXX: API change will be done */
-		video_outbuf_size = 200000;
-		video_outbuf = (uint8_t *)malloc(video_outbuf_size);
+		// TODO: Make buffer dynamic.
+		video_outbuf_size = 4000000;
+		video_outbuf = (uint8_t *)malloc( video_outbuf_size );
 	}
 	
-	/* write the stream header, if any */
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0)
-	av_write_header(ofc);
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 100, 1)
+	av_dump_format(ofc, 0, filename, 1);
 #else
-	avformat_write_header(ofc, NULL);
+	dump_format(ofc, 0, filename, 1);
 #endif
+    
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0)
+    int ret = av_write_header( ofc );
+#else
+    int ret = avformat_write_header( ofc, NULL );
+#endif
+    
+    if ( ret < 0 )
+    {
+        Fatal( "?_write_header failed with error %d \"%s\"", ret, av_err2str( ret ) );
+    }
 }

-VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height )
+VideoStream::VideoStream( const char *in_filename, const char *in_format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height ) :
+		filename(in_filename),
+		format(in_format),
+		last_pts( -1 ),
+		streaming_thread(0),
+		do_streaming(true),
+		buffer_copy(NULL),
+		buffer_copy_lock(new pthread_mutex_t),
+		buffer_copy_used(0),
+        packet_index(0)
 {
 	if ( !initialised )
 	{
-		Initialise();
+		Initialise( );
 	}
 	
-	SetupFormat( filename, format );
+	if ( format )
+	{
+		int length = strlen(format);
+		codec_and_format = new char[length+1];;
+		strcpy( codec_and_format, format );
+		format = codec_and_format;
+		codec_name = NULL;
+		char *f = strchr(codec_and_format, '/');
+		if (f != NULL)
+		{
+			*f = 0;
+			codec_name = f+1;
+		}
+	}
+
+	SetupFormat( );
 	SetupCodec( colours, subpixelorder, width, height, bitrate, frame_rate );
-	SetParameters();
+	SetParameters( );
+    
+    // Allocate buffered packets.
+    packet_buffers = new AVPacket*[2];
+    packet_buffers[0] = new AVPacket();
+    packet_buffers[1] = new AVPacket();
+    packet_index = 0;
+	
+	// Initialize mutex used by streaming thread.
+	if ( pthread_mutex_init( buffer_copy_lock, NULL ) != 0 )
+	{
+		Fatal("pthread_mutex_init failed");
+	}
 }

-VideoStream::~VideoStream()
+VideoStream::~VideoStream( )
 {
-	/* close each codec */
-	if (ost)
+	Debug( 1, "VideoStream destructor." );
+	
+	// Stop streaming thread.
+	if ( streaming_thread )
 	{
-#if ZM_FFMPEG_SVN
-		avcodec_close(ost->codec);
-#else
-		avcodec_close(&ost->codec);
-#endif
-		av_free(opicture->data[0]);
-		av_free(opicture);
-		if (tmp_opicture)
+		do_streaming = false;
+		void* thread_exit_code;
+		
+		Debug( 1, "Asking streaming thread to exit." );
+		
+		// Wait for thread to exit.
+		pthread_join(streaming_thread, &thread_exit_code);
+	}
+	
+	if ( buffer_copy != NULL )
+	{
+		av_free( buffer_copy );
+	}
+    
+	if ( buffer_copy_lock )
+	{
+		if ( pthread_mutex_destroy( buffer_copy_lock ) != 0 )
 		{
-			av_free(tmp_opicture->data[0]);
-			av_free(tmp_opicture);
+			Error( "pthread_mutex_destroy failed" );
 		}
-		av_free(video_outbuf);
+		delete buffer_copy_lock;
+	}
+    
+    if (packet_buffers) {
+        delete packet_buffers[0];
+        delete packet_buffers[1];
+        delete[] packet_buffers;
+    }
+	
+	/* close each codec */
+	if ( ost )
+	{
+		avcodec_close( ost->codec );
+		av_free( opicture->data[0] );
+		av_free( opicture );
+		if ( tmp_opicture )
+		{
+			av_free( tmp_opicture->data[0] );
+			av_free( tmp_opicture );
+		}
+		av_free( video_outbuf );
 	}

 	/* write the trailer, if any */
-	av_write_trailer(ofc);
+	av_write_trailer( ofc );

 	/* free the streams */
-	for( unsigned int i = 0; i < ofc->nb_streams; i++)
+	for ( unsigned int i = 0; i < ofc->nb_streams; i++ )
 	{
-		av_freep(&ofc->streams[i]);
+		av_freep( &ofc->streams[i] );
 	}

-	if (!(of->flags & AVFMT_NOFILE))
+	if ( !(of->flags & AVFMT_NOFILE) )
 	{
 		/* close the output file */
-#if ZM_FFMPEG_SVN
 #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
-		avio_close(ofc->pb);
+		avio_close( ofc->pb );
 #else
-		url_fclose(ofc->pb);
-#endif
-#else
-		url_fclose(&ofc->pb);
+		url_fclose( ofc->pb );
 #endif
 	}

 	/* free the stream */
-	av_free(ofc);
+	av_free( ofc );
+	
+	/* free format and codec_name data. */
+	if ( codec_and_format )
+	{
+		delete codec_and_format;
+	}
 }

-double VideoStream::EncodeFrame( const uint8_t *buffer, int buffer_size, bool add_timestamp, unsigned int timestamp )
+double VideoStream::EncodeFrame( const uint8_t *buffer, int buffer_size, bool _add_timestamp, unsigned int _timestamp )
 {
-#ifdef HAVE_LIBSWSCALE
-    static struct SwsContext *img_convert_ctx = 0;
-#endif // HAVE_LIBSWSCALE
-	double pts = 0.0;
-
-
-	if (ost)
+	if ( pthread_mutex_lock( buffer_copy_lock ) != 0 )
 	{
-#if ZM_FFMPEG_048
-		pts = (double)ost->pts.val * ofc->pts_num / ofc->pts_den;
-#else
-		pts = (double)ost->pts.val * ost->time_base.num / ost->time_base.den;
-#endif
+		Fatal( "EncodeFrame: pthread_mutex_lock failed." );
 	}
 	
-#if ZM_FFMPEG_SVN
+	if (buffer_copy_size < buffer_size)
+	{
+		if ( buffer_copy )
+		{
+			av_free( buffer_copy );
+		}
+		
+		// Allocate a buffer to store source images for the streaming thread to encode.
+		buffer_copy = (uint8_t *)av_malloc( buffer_size );
+		if ( !buffer_copy )
+		{
+			Panic( "Could not allocate buffer_copy" );
+		}
+		buffer_copy_size = buffer_size;
+	}
+	
+	add_timestamp = _add_timestamp;
+	timestamp = _timestamp;
+	buffer_copy_used = buffer_size;
+	memcpy(buffer_copy, buffer, buffer_size);
+	
+	if ( pthread_mutex_unlock( buffer_copy_lock ) != 0 )
+	{
+		Fatal( "EncodeFrame: pthread_mutex_unlock failed." );
+	}
+	
+	if ( streaming_thread == 0 )
+	{
+		Debug( 1, "Starting streaming thread" );
+		
+		// Start a thread for streaming encoded video.
+		if (pthread_create( &streaming_thread, NULL, StreamingThreadCallback, (void*) this) != 0){
+			// Log a fatal error and exit the process.
+			Fatal( "VideoStream failed to create streaming thread." );
+		}
+	}
+	
+	//return ActuallyEncodeFrame( buffer, buffer_size, add_timestamp, timestamp);
+	
+	return _timestamp;
+}
+
+double VideoStream::ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size, bool add_timestamp, unsigned int timestamp )
+{
+#ifdef HAVE_LIBSWSCALE
+	static struct SwsContext *img_convert_ctx = 0;
+#endif // HAVE_LIBSWSCALE
+
 	AVCodecContext *c = ost->codec;
-#else
-	AVCodecContext *c = &ost->codec;
-#endif
+
 	if ( c->pix_fmt != pf )
 	{
 		memcpy( tmp_opicture->data[0], buffer, buffer_size );
 #ifdef HAVE_LIBSWSCALE
-        if ( !img_convert_ctx )
-        {
-            img_convert_ctx = sws_getCachedContext( NULL, c->width, c->height, pf, c->width, c->height, c->pix_fmt, SWS_BICUBIC, NULL, NULL, NULL );
-            if ( !img_convert_ctx )
-                Panic( "Unable to initialise image scaling context" );
-        }
-        sws_scale( img_convert_ctx, tmp_opicture->data, tmp_opicture->linesize, 0, c->height, opicture->data, opicture->linesize );
+		if ( !img_convert_ctx )
+		{
+			img_convert_ctx = sws_getCachedContext( NULL, c->width, c->height, pf, c->width, c->height, c->pix_fmt, SWS_BICUBIC, NULL, NULL, NULL );
+			if ( !img_convert_ctx )
+				Panic( "Unable to initialise image scaling context" );
+		}
+		sws_scale( img_convert_ctx, tmp_opicture->data, tmp_opicture->linesize, 0, c->height, opicture->data, opicture->linesize );
 #else // HAVE_LIBSWSCALE
-		Fatal("swscale is required for MPEG mode");
+		Fatal( "swscale is required for MPEG mode" );
 #endif // HAVE_LIBSWSCALE
 	}
 	else
@ -420,69 +616,138 @@ double VideoStream::EncodeFrame( const uint8_t *buffer, int buffer_size, bool ad
 	}
 	AVFrame *opicture_ptr = opicture;
 	
-	int ret = 0;
-	if ( ofc->oformat->flags & AVFMT_RAWPICTURE )
+	AVPacket *pkt = packet_buffers[packet_index];
+	av_init_packet( pkt );
+    int got_packet = 0;
+	if ( of->flags & AVFMT_RAWPICTURE )
 	{
-#if ZM_FFMPEG_048
-		ret = av_write_frame( ofc, ost->index, (uint8_t *)opicture_ptr, sizeof(AVPicture) );
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 2, 1)
+		pkt->flags |= AV_PKT_FLAG_KEY;
 #else
-		AVPacket pkt;
-		av_init_packet( &pkt );
-
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
-		pkt.flags |= AV_PKT_FLAG_KEY;
-#else
-		pkt.flags |= PKT_FLAG_KEY;
-#endif
-		pkt.stream_index = ost->index;
-		pkt.data = (uint8_t *)opicture_ptr;
-		pkt.size = sizeof(AVPicture);
-
-		ret = av_write_frame(ofc, &pkt);
+		pkt->flags |= PKT_FLAG_KEY;
 #endif
+		pkt->stream_index = ost->index;
+		pkt->data = (uint8_t *)opicture_ptr;
+		pkt->size = sizeof (AVPicture);
+        got_packet = 1;
 	}
 	else
 	{
-		if ( add_timestamp )
-			ost->pts.val = timestamp;
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(54, 1, 0) // NEXTIME
-		int out_size = avcodec_encode_video(c, video_outbuf, video_outbuf_size, opicture_ptr);
-#else
-      int out_size = encode_frame(c, opicture_ptr);
+		opicture_ptr->pts = c->frame_number;
+		opicture_ptr->quality = c->global_quality;

-#endif
-		if ( out_size > 0 )
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 0, 0)
+		int ret = avcodec_encode_video2( c, pkt, opicture_ptr, &got_packet );
+		if ( ret != 0 )
 		{
-#if ZM_FFMPEG_048
-			ret = av_write_frame(ofc, ost->index, video_outbuf, out_size);
+			Fatal( "avcodec_encode_video2 failed with errorcode %d \"%s\"", ret, av_err2str( ret ) );
+		}
 #else
-			AVPacket pkt;
-			av_init_packet(&pkt);
-
-#if ZM_FFMPEG_049
-			pkt.pts = c->coded_frame->pts;
-#else
-			pkt.pts= av_rescale_q( c->coded_frame->pts, c->time_base, ost->time_base );
+		int out_size = avcodec_encode_video( c, video_outbuf, video_outbuf_size, opicture_ptr );
+		got_packet = out_size > 0 ? 1 : 0;
+		pkt->data = got_packet ? video_outbuf : NULL;
+		pkt->size = got_packet ? out_size : 0;
 #endif
-			if(c->coded_frame->key_frame)
+		if ( got_packet )
+		{
+			if ( c->coded_frame->key_frame )
+			{
 #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
-				pkt.flags |= AV_PKT_FLAG_KEY;
+				pkt->flags |= AV_PKT_FLAG_KEY;
 #else
-				pkt.flags |= PKT_FLAG_KEY;
+				pkt->flags |= PKT_FLAG_KEY;
 #endif
-			pkt.stream_index = ost->index;
-			pkt.data = video_outbuf;
-			pkt.size = out_size;
+			}

-			ret = av_write_frame( ofc, &pkt );
-#endif
+			if ( pkt->pts != (int64_t)AV_NOPTS_VALUE )
+			{
+				pkt->pts = av_rescale_q( pkt->pts, c->time_base, ost->time_base );
+			}
+			if ( pkt->dts != (int64_t)AV_NOPTS_VALUE )
+			{
+				pkt->dts = av_rescale_q( pkt->dts, c->time_base, ost->time_base );
+			}
+			pkt->duration = av_rescale_q( pkt->duration, c->time_base, ost->time_base );
+			pkt->stream_index = ost->index;
 		}
 	}
-	if ( ret != 0 )
+    
+	return ( opicture_ptr->pts);
+}
+
+int VideoStream::SendPacket(AVPacket *packet) {
+    
+    int ret = av_write_frame( ofc, packet );
+    if ( ret != 0 )
+    {
+        Fatal( "Error %d while writing video frame: %s", ret, av_err2str( errno ) );
+    }
+    av_free_packet(packet);
+    return ret;
+}
+
+void *VideoStream::StreamingThreadCallback(void *ctx){
+	
+	Debug( 1, "StreamingThreadCallback started" );
+	
+    if (ctx == NULL) return NULL;
+
+    VideoStream* videoStream = reinterpret_cast<VideoStream*>(ctx);
+	
+	const uint64_t nanosecond_multiplier = 1000000000;
+	
+	uint64_t target_interval_ns = nanosecond_multiplier * ( ((double)videoStream->ost->codec->time_base.num) / (videoStream->ost->codec->time_base.den) );
+	uint64_t frame_count = 0;
+	timespec start_time;
+	clock_gettime(CLOCK_MONOTONIC, &start_time);
+	uint64_t start_time_ns = (start_time.tv_sec*nanosecond_multiplier) + start_time.tv_nsec;
+	while(videoStream->do_streaming)
 	{
-		Fatal( "Error %d while writing video frame: %s", ret, strerror( errno ) );
+		timespec current_time;
+		clock_gettime(CLOCK_MONOTONIC, &current_time);
+		uint64_t current_time_ns = (current_time.tv_sec*nanosecond_multiplier) + current_time.tv_nsec;
+		uint64_t target_ns = start_time_ns + (target_interval_ns * frame_count);
+		
+		if ( current_time_ns < target_ns )
+		{
+			// It's not time to render a frame yet.
+			usleep( (target_ns - current_time_ns) * 0.001 );
+		}
+        
+        // By sending the last rendered frame we deliver frames to the client more accurate.
+        // If we're encoding the frame before sending it there will be lag.
+        // Since this lag is not constant the client may skip frames.
+        
+        // Get the last rendered packet.
+        AVPacket *packet = videoStream->packet_buffers[videoStream->packet_index];
+        if (packet->size) {
+            videoStream->SendPacket(packet);
+        }
+        av_free_packet(packet);
+        videoStream->packet_index = videoStream->packet_index ? 0 : 1;
+        
+		// Lock buffer and render next frame.
+        
+		if ( pthread_mutex_lock( videoStream->buffer_copy_lock ) != 0 )
+		{
+			Fatal( "StreamingThreadCallback: pthread_mutex_lock failed." );
+		}
+		
+		if ( videoStream->buffer_copy )
+		{
+			// Encode next frame.
+			videoStream->ActuallyEncodeFrame( videoStream->buffer_copy, videoStream->buffer_copy_used, videoStream->add_timestamp, videoStream->timestamp );
+		}
+	
+		if ( pthread_mutex_unlock( videoStream->buffer_copy_lock ) != 0 )
+		{
+			Fatal( "StreamingThreadCallback: pthread_mutex_unlock failed." );
+		}
+		
+		frame_count++;
 	}
-	return( pts );
+	
+	return 0;
 }

 #endif // HAVE_LIBAVCODEC
--- a/src/zm_mpeg.h
+++ b/src/zm_mpeg.h
@ -38,24 +38,42 @@ protected:
 	static struct MimeData mime_data[];

 protected:
+	char *codec_and_format;
 	const char *filename;
 	const char *format;
+	const char *codec_name;
 	enum PixelFormat pf;
 	AVOutputFormat *of;
 	AVFormatContext *ofc;
 	AVStream *ost;
+	AVCodec *codec;
 	AVFrame *opicture;
 	AVFrame *tmp_opicture;
 	uint8_t *video_outbuf;
 	int video_outbuf_size;
-	double pts;
+	double last_pts;
+	
+	pthread_t streaming_thread;
+	bool do_streaming;
+	uint8_t *buffer_copy;
+	bool add_timestamp;
+	unsigned int timestamp;
+	pthread_mutex_t *buffer_copy_lock;
+	int buffer_copy_size;
+	int buffer_copy_used;
+    AVPacket** packet_buffers;
+    int packet_index;
+    int SendPacket(AVPacket *packet);
+    static void* StreamingThreadCallback(void *ctx);

 protected:
 	static void Initialise();

-	void SetupFormat( const char *p_filename, const char *format );
+	void SetupFormat( );
 	void SetupCodec( int colours, int subpixelorder, int width, int height, int bitrate, double frame_rate );
 	void SetParameters();
+	void ActuallyOpenStream();
+	double ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size, bool add_timestamp=false, unsigned int timestamp=0 );

 public:
 	VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height );
--- a/src/zm_remote_camera_rtsp.cpp
+++ b/src/zm_remote_camera_rtsp.cpp
@ -292,7 +292,11 @@ int RemoteCameraRtsp::Capture( Image &image )
 	    {
 		packet.data = buffer.head();
 		packet.size = buffer.size();
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 25, 0)
 		int len = avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet );
+#else
+		int len = avcodec_decode_video( mCodecContext, mRawFrame, &frameComplete, packet.data, packet.size );
+#endif
 		if ( len < 0 )
 		{
 			Error( "Error while decoding frame %d", frameCount );
--- a/src/zm_rtp_source.cpp
+++ b/src/zm_rtp_source.cpp
@ -26,12 +26,6 @@

 #if HAVE_LIBAVCODEC

-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
-    #define _AVCODECID AVCodecID
-#else
-    #define _AVCODECID CodecID
-#endif
-
 RtpSource::RtpSource( int id, const std::string &localHost, int localPortBase, const std::string &remoteHost, int remotePortBase, uint32_t ssrc, uint16_t seq, uint32_t rtpClock, uint32_t rtpTime, _AVCODECID codecId ) :
    mId( id ),
    mSsrc( ssrc ),
@ -387,6 +381,4 @@ bool RtpSource::getFrame( Buffer &buffer )
    return( true );
 }

-#undef _AVCODECID
-
 #endif // HAVE_LIBAVCODEC
--- a/src/zm_rtp_source.h
+++ b/src/zm_rtp_source.h
@ -30,12 +30,6 @@

 #if HAVE_LIBAVCODEC

-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
-    #define _AVCODECID AVCodecID
-#else
-    #define _AVCODECID CodecID
-#endif
-
 struct RtpDataHeader;

 class RtpSource
@ -189,8 +183,6 @@ public:
    }
 };

-#undef _AVCODECID
-
 #endif // HAVE_LIBAVCODEC

 #endif // ZM_RTP_SOURCE_H
--- a/src/zm_rtsp.cpp
+++ b/src/zm_rtsp.cpp
@ -39,8 +39,11 @@ RtspThread::PortSet  RtspThread::smAssignedPorts;

 bool RtspThread::sendCommand( std::string message )
 {
-    if ( !mAuth.empty() )
-        message += stringtf( "Authorization: Basic %s\r\n", mAuth64.c_str() );
+	if ( mNeedAuth ) {
+	    StringVector parts = split( message, " " );
+	    if (parts.size() > 1)
+	    	message += mAuthenticator->getAuthHeader(parts[0], parts[1]);
+	}
    message += stringtf( "User-Agent: ZoneMinder/%s\r\n", ZM_VERSION );
    message += stringtf( "CSeq: %d\r\n\r\n", ++mSeq );
    Debug( 2, "Sending RTSP message: %s", message.c_str() );
@ -65,13 +68,41 @@ bool RtspThread::sendCommand( std::string message )
    return( true );
 }

+// find WWW-Authenticate header, send to Authenticator to extract required subfields
+void RtspThread::checkAuthResponse(std::string &response)
+{
+    std::string authLine;
+    StringVector lines = split( response, "\r\n" );
+    const char* authenticate_match = "WWW-Authenticate:";
+    size_t authenticate_match_len = strlen(authenticate_match);
+    
+    for ( size_t i = 0; i < lines.size(); i++ )
+    {
+    	// stop at end of headers
+        if (lines[i].length()==0)
+            break;
+        
+        if (strncasecmp(lines[i].c_str(),authenticate_match,authenticate_match_len) == 0) 
+        {
+            authLine = lines[i];
+            Debug( 2, "Found auth line at %d", i);
+            break;
+        }
+    }
+    if (!authLine.empty()) 
+    {
+        Debug( 2, "Analyze auth line %s", authLine.c_str());
+        mAuthenticator->authHandleHeader( trimSpaces(authLine.substr(authenticate_match_len,authLine.length()-authenticate_match_len)) );
+    }
+}
+
 bool RtspThread::recvResponse( std::string &response )
 {
    if ( mRtspSocket.recv( response ) < 0 )
        Error( "Recv failed; %s", strerror(errno) );
    Debug( 2, "Received RTSP response: %s (%zd bytes)", response.c_str(), response.size() );
    float respVer = 0;
-    int respCode = -1;
+    respCode = -1;
    char respText[ZM_NETWORK_BUFSIZ];
    if ( sscanf( response.c_str(), "RTSP/%f %3d %[^\r\n]\r\n", &respVer, &respCode, respText ) != 3 )
    {
@ -87,7 +118,14 @@ bool RtspThread::recvResponse( std::string &response )
        }
        return( false );
    }
-    if ( respCode != 200 )
+    if ( respCode == 401)
+    {
+    	Debug( 2, "Got 401 access denied response code, check WWW-Authenticate header and retry");
+    	checkAuthResponse(response);
+    	mNeedAuth = true;
+    	return( false );
+    } 
+    else if ( respCode != 200 )
    {
        Error( "Unexpected response code %d, text is '%s'", respCode, respText );
        return( false );
@ -157,14 +195,13 @@ void RtspThread::releasePorts( int port )
        smAssignedPorts.erase( port );
 }

-RtspThread::RtspThread( int id, RtspMethod method, const std::string &protocol, const std::string &host, const std::string &port, const std::string &path, const std::string &auth ) :
+RtspThread::RtspThread( int id, RtspMethod method, const std::string &protocol, const std::string &host, const std::string &port, const std::string &path, const std::string &auth) :
    mId( id ),
    mMethod( method ),
    mProtocol( protocol ),
    mHost( host ),
    mPort( port ),
    mPath( path ),
-    mAuth( auth ),
    mFormatContext( 0 ),
    mSeq( 0 ),
    mSession( 0 ),
@ -189,8 +226,12 @@ RtspThread::RtspThread( int id, RtspMethod method, const std::string &protocol,
    if ( mMethod == RTP_RTSP_HTTP )
        mHttpSession = stringtf( "%d", rand() );
    
-    if ( !mAuth.empty() )
-        mAuth64 = base64Encode( mAuth );
+    mNeedAuth = false;
+    StringVector parts = split(auth,":");
+    if (parts.size() > 1) 
+    	mAuthenticator = new Authenticator(parts[0], parts[1]);
+    else
+    	mAuthenticator = new Authenticator(parts[0], "");
 }

 RtspThread::~RtspThread()
@ -214,6 +255,8 @@ int RtspThread::run()
        //Debug( 4, "Drained %d bytes from RTSP socket", response.size() );
    //}

+    
+    bool authTried = false; 
    if ( mMethod == RTP_RTSP_HTTP )
    {
        if ( !mRtspSocket2.connect( mHost.c_str(), strtol( mPort.c_str(), NULL, 10 ) ) )
@ -226,41 +269,61 @@ int RtspThread::run()
            //Debug( 4, "Drained %d bytes from HTTP socket", response.size() );
        //}
        
-        message = "GET "+mPath+" HTTP/1.0\r\n";
-        message += "X-SessionCookie: "+mHttpSession+"\r\n";
-        if ( !mAuth.empty() )
-            message += stringtf( "Authorization: Basic %s\r\n", mAuth64.c_str() );
-        message += "\r\n";
-        Debug( 2, "Sending HTTP message: %s", message.c_str() );
-        if ( mRtspSocket.send( message.c_str(), message.size() ) != (int)message.length() )
-        {
-            Error( "Unable to send message '%s': %s", message.c_str(), strerror(errno) );
-            return( -1 );
-        }
-        if ( mRtspSocket.recv( response ) < 0 )
-        {
-            Error( "Recv failed; %s", strerror(errno) );
-            return( -1 );
-        }
-
-        Debug( 2, "Received HTTP response: %s (%zd bytes)", response.c_str(), response.size() );
-        float respVer = 0;
+        //possibly retry sending the message for authentication 
        int respCode = -1;
        char respText[256];
-        if ( sscanf( response.c_str(), "HTTP/%f %3d %[^\r\n]\r\n", &respVer, &respCode, respText ) != 3 )
-        {
-            if ( isalnum(response[0]) )
-            {
-                Error( "Response parse failure in '%s'", response.c_str() );
-            }
-            else
-            {
-                Error( "Response parse failure, %zd bytes follow", response.size() );
-                if ( response.size() )
-                    Hexdump( Logger::ERROR, response.data(), min(response.size(),16) );
-            }
-            return( -1 );
-        }
+        do {
+			message = "GET "+mPath+" HTTP/1.0\r\n";
+			message += "X-SessionCookie: "+mHttpSession+"\r\n";
+			if ( mNeedAuth ) {
+				message += mAuthenticator->getAuthHeader("GET", mPath);
+				authTried = true;
+			}
+		    message += "Accept: application/x-rtsp-tunnelled\r\n";
+			message += "\r\n";
+			Debug( 2, "Sending HTTP message: %s", message.c_str() );
+			if ( mRtspSocket.send( message.c_str(), message.size() ) != (int)message.length() )
+			{
+				Error( "Unable to send message '%s': %s", message.c_str(), strerror(errno) );
+				return( -1 );
+			}
+			if ( mRtspSocket.recv( response ) < 0 )
+			{
+				Error( "Recv failed; %s", strerror(errno) );
+				return( -1 );
+			}
+		
+			Debug( 2, "Received HTTP response: %s (%zd bytes)", response.c_str(), response.size() );
+			float respVer = 0;
+			respCode = -1;
+			if ( sscanf( response.c_str(), "HTTP/%f %3d %[^\r\n]\r\n", &respVer, &respCode, respText ) != 3 )
+			{
+				if ( isalnum(response[0]) )
+				{
+				Error( "Response parse failure in '%s'", response.c_str() );
+				}
+				else
+				{
+				Error( "Response parse failure, %zd bytes follow", response.size() );
+				if ( response.size() )
+					Hexdump( Logger::ERROR, response.data(), min(response.size(),16) );
+				}
+				return( -1 );
+			}
+			// If Server requests authentication, check WWW-Authenticate header and fill required fields
+			// for requested authentication method
+			if (respCode == 401 && !authTried) {
+				mNeedAuth = true;
+				checkAuthResponse(response);
+				Debug(2, "Processed 401 response");
+				mRtspSocket.close();
+			    if ( !mRtspSocket.connect( mHost.c_str(), strtol( mPort.c_str(), NULL, 10 ) ) )
+			        Fatal( "Unable to reconnect RTSP socket" );
+			    Debug(2, "connection should be reopened now");
+			}
+			
+		} while (respCode == 401 && !authTried);  
+		
        if ( respCode != 200 )
        {
            Error( "Unexpected response code %d, text is '%s'", respCode, respText );
@ -269,8 +332,8 @@ int RtspThread::run()

        message = "POST "+mPath+" HTTP/1.0\r\n";
        message += "X-SessionCookie: "+mHttpSession+"\r\n";
-        if ( !mAuth.empty() )
-            message += stringtf( "Authorization: Basic %s\r\n", mAuth64.c_str() );
+		if ( mNeedAuth )
+			message += mAuthenticator->getAuthHeader("POST", mPath);
        message += "Content-Length: 32767\r\n";
        message += "Content-Type: application/x-rtsp-tunnelled\r\n";
        message += "\r\n";
@ -290,9 +353,16 @@ int RtspThread::run()
    //recvResponse( response );

    message = "DESCRIBE "+mUrl+" RTSP/1.0\r\n";
-    sendCommand( message );
-    sleep( 1 );
-    recvResponse( response );
+	bool res;
+	do {
+		if (mNeedAuth)
+			authTried = true;
+		sendCommand( message );
+		sleep( 1 );
+		res = recvResponse( response );
+		if (!res && respCode==401)
+			mNeedAuth = true;
+	} while (!res && respCode==401 && !authTried);

    const std::string endOfHeaders = "\r\n\r\n";
    size_t sdpStart = response.find( endOfHeaders );
@ -331,11 +401,7 @@ int RtspThread::run()
    uint32_t rtpClock = 0;
    std::string trackUrl = mUrl;
    
-    #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
-    enum AVCodecID codecId;
-    #else
-    enum CodecID codecId;
-    #endif
+    _AVCODECID codecId;
    
    if ( mFormatContext->nb_streams >= 1 )
    {
--- a/src/zm_rtsp.h
+++ b/src/zm_rtsp.h
@ -25,6 +25,7 @@
 #include "zm_comms.h"
 #include "zm_thread.h"
 #include "zm_rtp_source.h"
+#include "zm_rtsp_auth.h"

 #include <set>
 #include <map>
@ -54,8 +55,16 @@ private:
    std::string mPort;
    std::string mPath;
    std::string mUrl;
-    std::string mAuth;
-    std::string mAuth64;
+    
+    // Reworked authentication system
+    // First try without authentication, even if we have a username and password
+    // on receiving a 401 response, select authentication method (basic or digest)
+    // fill required fields and set needAuth
+    // subsequent requests can set the required authentication header.
+    bool mNeedAuth;
+    int respCode;
+    Authenticator* mAuthenticator;
+

    std::string mHttpSession;           ///< Only for RTSP over HTTP sessions

@ -81,9 +90,10 @@ private:
 private:
    bool sendCommand( std::string message );
    bool recvResponse( std::string &response );
+    void checkAuthResponse(std::string &response);    

 public:
-    RtspThread( int id, RtspMethod method, const std::string &protocol, const std::string &host, const std::string &port, const std::string &path, const std::string &auth );
+    RtspThread( int id, RtspMethod method, const std::string &protocol, const std::string &host, const std::string &port, const std::string &path, const std::string &auth);
    ~RtspThread();

 public:
--- a/src/zm_rtsp_auth.cpp
+++ b/src/zm_rtsp_auth.cpp
@ -0,0 +1,183 @@
+//
+// ZoneMinder RTSP Authentication Class Implementation, $Date$, $Revision$
+// 
+// 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.
+// 
+
+#include "zm.h"
+#include "zm_utils.h"
+#include "zm_rtsp_auth.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+Authenticator::Authenticator(std::string &username, std::string password) {
+#ifdef HAVE_GCRYPT_H
+    // Special initialisation for libgcrypt
+    if ( !gcry_check_version( GCRYPT_VERSION ) )
+    {
+        Fatal( "Unable to initialise libgcrypt" );
+    }
+    gcry_control( GCRYCTL_DISABLE_SECMEM, 0 );
+    gcry_control( GCRYCTL_INITIALIZATION_FINISHED, 0 );
+#endif // HAVE_GCRYPT_H
+    
+    fAuthMethod = AUTH_UNDEFINED;
+    fUsername = username;
+    fPassword = password;
+}
+
+Authenticator::~Authenticator() {
+	reset();
+}
+
+void Authenticator::reset() {
+	fRealm.clear(); 
+	fNonce.clear();
+	fUsername.clear(); 
+	fPassword.clear();
+	fAuthMethod = AUTH_UNDEFINED;
+}
+
+void Authenticator::authHandleHeader(std::string headerData) 
+{
+    const char* basic_match = "Basic ";
+    const char* digest_match = "Digest ";
+    size_t digest_match_len = strlen(digest_match);
+    
+    // Check if basic auth
+    if (strncasecmp(headerData.c_str(),basic_match,strlen(basic_match)) == 0)
+    {
+        fAuthMethod = AUTH_BASIC;
+        Debug( 2, "Set authMethod to Basic");
+    } 
+    // Check if digest auth
+    else if (strncasecmp( headerData.c_str(),digest_match,digest_match_len ) == 0)
+    {
+        fAuthMethod = AUTH_DIGEST;
+        Debug( 2, "Set authMethod to Digest");
+        StringVector subparts = split(headerData.substr(digest_match_len, headerData.length() - digest_match_len), ",");
+        // subparts are key="value"
+        for ( size_t i = 0; i < subparts.size(); i++ )
+        {
+            StringVector kvPair = split( trimSpaces( subparts[i] ), "=" );
+            std::string key = trimSpaces( kvPair[0] );
+            if (key == "realm") {
+                fRealm = trimSet( kvPair[1], "\"");
+                continue;
+            }
+            if (key == "nonce") {
+                fNonce = trimSet( kvPair[1], "\"");
+                continue;
+            }
+        }
+        Debug( 2, "Auth data completed. User: %s, realm: %s, nonce: %s", username().c_str(), fRealm.c_str(), fNonce.c_str());
+    }
+}
+
+std::string Authenticator::quote(std::string src)
+{
+    return replaceAll(replaceAll(src, "\\", "\\\\"), "\"", "\\\"");
+}
+
+std::string Authenticator::getAuthHeader(std::string method, std::string uri) 
+{
+    std::string result = "Authorization: ";
+    if (fAuthMethod == AUTH_BASIC) 
+    {
+        result += "Basic " + base64Encode( username() + ":" + password() );
+    }
+    else if (fAuthMethod == AUTH_DIGEST)
+    {
+        result += std::string("Digest ") + 
+        		  "username=\"" + quote(username()) + "\", realm=\"" + quote(realm()) + "\", " +
+                  "nonce=\"" + quote(nonce()) + "\", uri=\"" + quote(uri) + "\", " + 
+                  "response=\"" + computeDigestResponse(method, uri) + "\"";
+                  
+        //Authorization: Digest username="zm",
+        //                      realm="NC-336PW-HD-1080P",
+        //                      nonce="de8859d97609a6fcc16eaba490dcfd80",
+        //                      uri="rtsp://10.192.16.8:554/live/0/h264.sdp",
+        //                      response="4092120557d3099a163bd51a0d59744d",
+        //                      algorithm=MD5,
+        //                      opaque="5ccc069c403ebaf9f0171e9517f40e41",
+        //                      qop="auth",
+        //                      cnonce="c8051140765877dc",
+        //                      nc=00000001
+        
+    }
+    result += "\r\n";
+    return result;
+}
+
+std::string Authenticator::computeDigestResponse(std::string &method, std::string &uri) {
+#if HAVE_DECL_MD5 || HAVE_DECL_GNUTLS_FINGERPRINT
+    // The "response" field is computed as:
+    //    md5(md5(<username>:<realm>:<password>):<nonce>:md5(<cmd>:<url>))
+    size_t md5len = 16;
+    unsigned char md5buf[md5len];
+    char md5HexBuf[md5len*2+1];
+    
+    // Step 1: md5(<username>:<realm>:<password>)
+    std::string ha1Data = username() + ":" + realm() + ":" + password();
+#if HAVE_DECL_MD5
+    MD5((unsigned char*)ha1Data.c_str(), ha1Data.length(), md5buf);
+#elif HAVE_DECL_GNUTLS_FINGERPRINT
+    gnutls_datum_t md5dataha1 = { (unsigned char*)ha1Data.c_str(), ha1Data.length() };
+    gnutls_fingerprint( GNUTLS_DIG_MD5, &md5dataha1, md5buf, &md5len );
+#endif
+    for ( unsigned int j = 0; j < md5len; j++ )
+    {
+        sprintf(&md5HexBuf[2*j], "%02x", md5buf[j] );
+    }
+    md5HexBuf[md5len*2]='\0';
+    std::string ha1Hash = md5HexBuf;
+    
+    // Step 2: md5(<cmd>:<url>)
+    std::string ha2Data = method + ":" + uri;
+#if HAVE_DECL_MD5
+    MD5((unsigned char*)ha2Data.c_str(), ha2Data.length(), md5buf );
+#elif HAVE_DECL_GNUTLS_FINGERPRINT
+    gnutls_datum_t md5dataha2 = { (unsigned char*)ha2Data.c_str(), ha2Data.length() };
+    gnutls_fingerprint( GNUTLS_DIG_MD5, &md5dataha2, md5buf, &md5len );
+#endif
+    for ( unsigned int j = 0; j < md5len; j++ )
+    {
+        sprintf( &md5HexBuf[2*j], "%02x", md5buf[j] );
+    }
+    md5HexBuf[md5len*2]='\0';
+    std::string ha2Hash = md5HexBuf;
+
+    // Step 3: md5(ha1:<nonce>:ha2)
+    std::string digestData = ha1Hash + ":" + nonce() + ":" + ha2Hash;
+#if HAVE_DECL_MD5
+    MD5((unsigned char*)digestData.c_str(), digestData.length(), md5buf);
+#elif HAVE_DECL_GNUTLS_FINGERPRINT
+    gnutls_datum_t md5datadigest = { (unsigned char*)digestData.c_str(), digestData.length() };
+    gnutls_fingerprint( GNUTLS_DIG_MD5, &md5datadigest, md5buf, &md5len );
+#endif
+    for ( unsigned int j = 0; j < md5len; j++ )
+    {
+        sprintf( &md5HexBuf[2*j], "%02x", md5buf[j] );
+    }
+    md5HexBuf[md5len*2]='\0';
+   
+    return md5HexBuf;
+#else // HAVE_DECL_MD5
+	Error( "You need to build with gnutls or openssl installed to use digest authentication" );
+#endif // HAVE_DECL_MD5
+    return( 0 );
+}
--- a/src/zm_rtsp_auth.h
+++ b/src/zm_rtsp_auth.h
@ -0,0 +1,61 @@
+//
+// ZoneMinder RTSP Authentication Class Interface, $Date$, $Revision$
+// 
+// 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.
+// 
+
+#ifndef ZM_RTSP_AUTH_H
+#define ZM_RTSP_AUTH_H
+
+#if HAVE_GNUTLS_OPENSSL_H
+#include <gnutls/openssl.h>
+#endif
+#if HAVE_GNUTLS_GNUTLS_H
+#include <gnutls/gnutls.h>
+#endif
+
+#if HAVE_GCRYPT_H
+#include <gcrypt.h>
+#elif HAVE_LIBCRYPTO
+#include <openssl/md5.h>
+#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO
+
+class Authenticator
+{
+public:
+    typedef enum { AUTH_UNDEFINED, AUTH_BASIC, AUTH_DIGEST } RtspAuthMethod;
+    Authenticator(std::string &username, std::string password);
+    virtual ~Authenticator();
+    void reset();
+
+    std::string realm() { return fRealm; }
+    std::string nonce() { return fNonce; }
+    std::string username() { return fUsername; }
+    
+    std::string computeDigestResponse( std::string &cmd, std::string &url );
+    void authHandleHeader( std::string headerData );
+    std::string getAuthHeader( std::string method, std::string path );
+    
+private:
+  std::string password() { return fPassword; }
+  RtspAuthMethod fAuthMethod;
+  std::string fRealm; 
+  std::string fNonce;
+  std::string fUsername; 
+  std::string fPassword;
+  std::string quote( std::string src );
+};
+
+#endif // ZM_RTSP_AUTH_H
--- a/src/zm_sdp.h
+++ b/src/zm_sdp.h
@ -40,12 +40,12 @@ protected:
    {
        int payloadType;
        const char payloadName[6];
-        enum AVMediaType codecType;
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
-        enum AVCodecID codecId;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+        AVMediaType codecType;
 #else
-        enum CodecID codecId;
+		enum CodecType codecType;
 #endif
+        _AVCODECID codecId;
        int clockRate;
        int autoChannels;
    };
@ -53,12 +53,12 @@ protected:
    struct DynamicPayloadDesc
    {
        const char payloadName[32];
-        enum AVMediaType codecType;
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
-        enum AVCodecID codecId;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+        AVMediaType codecType;
 #else
-        enum CodecID codecId;
+		enum CodecType codecType;
 #endif
+        _AVCODECID codecId;

        //int clockRate;
        //int autoChannels;
--- a/src/zm_zone.cpp
+++ b/src/zm_zone.cpp
@ -939,7 +939,7 @@ bool Zone::ParseZoneString( const char *zone_string, int &zone_id, int &colour,

 int Zone::Load( Monitor *monitor, Zone **&zones )
 {
-   static char sql[ZM_SQL_MED_BUFSIZ];
+	static char sql[ZM_SQL_MED_BUFSIZ];
 	snprintf( sql, sizeof(sql), "select Id,Name,Type+0,Units,Coords,AlarmRGB,CheckMethod+0,MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels,FilterX,FilterY,MinFilterPixels,MaxFilterPixels,MinBlobPixels,MaxBlobPixels,MinBlobs,MaxBlobs,OverloadFrames,ExtendAlarmFrames from Zones where MonitorId = %d order by Type, Id", monitor->Id() );
 	if ( mysql_query( &dbconn, sql ) )
 	{
--- a/src/zmu.cpp
+++ b/src/zmu.cpp
@ -715,7 +715,7 @@ int main( int argc, char *argv[] )
 					if ( function > 1 )
 					{
 						Monitor *monitor = Monitor::Load( mon_id, false, Monitor::QUERY );
-						if ( monitor )
+						if ( monitor && monitor->connect() )
 						{
 							struct timeval tv = monitor->GetTimestamp();
 							printf( "%4d%5d%6d%9d%11ld.%02ld%6d%6d%8d%8.2f\n",
--- a/utils/docker/README.md
+++ b/utils/docker/README.md
@ -1,21 +1,47 @@
 # Overview

-Docker allows you to quickly spin up containers.  The ZoneMinder dockerfile will spin
-up an Ubuntu 12.04 container with mysql, apache, php and then compile and install ZoneMinder (from master).
+[Docker](https://www.docker.io/) allows you to quickly spin up application containers, 
+which are similar to very lightweight virtual machines. The ZoneMinder Dockerfile will
+start an Ubuntu 12.04 container with MySql, Apache, and PHP properly configured, and 
+will then compile and install ZoneMinder.

-Afterwards you can connect to this container over SSH to check out the latest code.
+It will also start an SSH server that you can use to log into the container.

 This is still a bit of a work in progress.

 ## How To Use

-1. Pull it
-```sudo docker pull ubuntu:precise```
-2. Built it
+1. Install [Docker](https://www.docker.io/)  
+2. Build ZoneMinder container
 ```sudo docker build -t yourname/zoneminder github.com/ZoneMinder/ZoneMinder```
 3. Run it
 ```CID=$(sudo docker run -d -p 222:22 -p 8080:80 -name zoneminder yourname/zoneminder)```
 4. Use it -- you can now SSH to port 222 on your host as user root with password root.
 You can also browse to your host on port 8080 to access the zoneminder web interface

+## Developing With Docker
+
+If you wish to contribute to ZoneMinder, Docker can be helpful. By re-running 
+```docker build``` in your working directory, any code modifications you have 
+made will be pulled into a new container, compiled, and started, all without 
+modifying your base system. 
+
+Development is not totally without annoyances, as any change
+to the project will require a full rebuild of all C++. Docker notices that the 
+directory which has been ADD'ed is now different, and therefore all steps after
+the ADD command must be recomputed. A fix for this is to update the Dockerfile to
+move the configure and make commands into start.sh, and then use a volume mount 
+to cache the build directory (I think it's ```/tmp```) on your host filesystem. 
+This would be really useful for a developer, and would remove the annoying build 
+problem, but some of the Docker push/pull benefits would be lost.  
+
+Docker containers can be both CPU and memory limited, so this can be a practical 
+method to compile or run multiple development builds of ZoneFinder simultaneously
+without taxing your host system. 
+
 ## Use Cases
+
+## TODO
+- Describe how to connect to monitors by mounting devices
+- Create a 'development' dockerfile to remove the need to rebuild the entire project
+  after each small change
--- a/utils/docker/apache-vhost
+++ b/utils/docker/apache-vhost
@ -0,0 +1,13 @@
+<VirtualHost *:80>
+        DocumentRoot /var/www/zm
+        DirectoryIndex index.php
+
+        ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+        <Directory "/usr/lib/cgi-bin">
+                AllowOverride None
+                Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+                Order allow,deny
+                Allow from all
+        </Directory>
+
+</VirtualHost>
--- a/utils/docker/start.sh
+++ b/utils/docker/start.sh
@ -2,7 +2,24 @@

 # Start MySQL
 /usr/bin/mysqld_safe & 
-sleep 5
+
+# Give MySQL time to wake up
+SECONDS_LEFT=120
+while true; do
+  sleep 1
+  mysqladmin ping
+  if [ $? -eq 0 ];then
+    break; # Success
+  fi
+  let SECONDS_LEFT=SECONDS_LEFT-1 
+
+  # If we have waited >120 seconds, give up
+  # ZM should never have a database that large!
+  # if $COUNTER -lt 120
+  if [ $SECONDS_LEFT -eq 0 ];then
+    return -1;
+  fi
+done

 # Create the ZoneMinder database
 mysql -u root < db/zm_create.sql
@ -10,9 +27,6 @@ mysql -u root < db/zm_create.sql
 # Add the ZoneMinder DB user
 mysql -u root -e "grant insert,select,update,delete,lock tables,alter on zm.* to 'zm'@'localhost' identified by 'zm'"

-# Install the ZoneMinder apache vhost file
-wget --quiet https://raw.github.com/kylejohnson/puppet-zoneminder/master/files/zoneminder -O /etc/apache2/sites-enabled/000-default
-
 # Restart apache
 service apache2 restart

@ -20,5 +34,4 @@ service apache2 restart
 /usr/local/bin/zmpkg.pl start

 # Start SSHD
-mkdir /var/run/sshd
 /usr/sbin/sshd -D
--- a/Show More
+++ b/Show More