Merge pull request #1119 from SteveGilvarry/feature-h264-videostorage

Merging Master to feature-h264-videostorage
2015-10-23 22:22:37 +11:00 · 2015-10-23 22:22:37 +11:00 · adcd2dfdb5
parent 98c0f2478e d8494aba2d
commit adcd2dfdb5
299 changed files with 16313 additions and 1364 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,4 @@
 [submodule "web/api/app/Plugin/Crud"]
 	path = web/api/app/Plugin/Crud
 	url = https://github.com/FriendsOfCake/crud.git
+	branch = 3.0
--- a/.travis.yml
+++ b/.travis.yml
@ -24,7 +24,7 @@ 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:
-  - git clone -b n2.4.2 --depth=1 git://source.ffmpeg.org/ffmpeg.git
+  - git clone -b n2.7.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` 
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -0,0 +1,819 @@
+# Change Log
+
+## [Unreleased](https://github.com/ZoneMinder/ZoneMinder/tree/HEAD)
+
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.28.1...HEAD)
+
+**Closed issues:**
+
+- Zoneminder Signal Loss event [\#964](https://github.com/ZoneMinder/ZoneMinder/issues/964)
+- Default scale other than actual skews image [\#963](https://github.com/ZoneMinder/ZoneMinder/issues/963)
+- Monitor configured with ffmpeg shows last part of URL instead of hostname in overview [\#950](https://github.com/ZoneMinder/ZoneMinder/issues/950)
+- please update bundled CakePHP [\#945](https://github.com/ZoneMinder/ZoneMinder/issues/945)
+- Montage shows only feed from the first camera [\#940](https://github.com/ZoneMinder/ZoneMinder/issues/940)
+- zmtrigger: minor message format correction [\#939](https://github.com/ZoneMinder/ZoneMinder/issues/939)
+- error starting zoneminder after latest upgrade [\#935](https://github.com/ZoneMinder/ZoneMinder/issues/935)
+- Error "Attempt to directly assign buffer from an undersized buffer of size" [\#932](https://github.com/ZoneMinder/ZoneMinder/issues/932)
+- External access to snapshots of cameras [\#929](https://github.com/ZoneMinder/ZoneMinder/issues/929)
+- virtualbox - zoneminder shows only six cams [\#927](https://github.com/ZoneMinder/ZoneMinder/issues/927)
+- zm\_update-1.28.99.sql not executable [\#924](https://github.com/ZoneMinder/ZoneMinder/issues/924)
+- m [\#922](https://github.com/ZoneMinder/ZoneMinder/issues/922)
+- loop recording [\#914](https://github.com/ZoneMinder/ZoneMinder/issues/914)
+- Implement Passive Source Type for Cams that Support Event Uploading [\#912](https://github.com/ZoneMinder/ZoneMinder/issues/912)
+- incorrect encoding of Russian language [\#907](https://github.com/ZoneMinder/ZoneMinder/issues/907)
+- Can't compile Zoneminder v1.28.1 [\#904](https://github.com/ZoneMinder/ZoneMinder/issues/904)
+- Add isRunning field to States [\#898](https://github.com/ZoneMinder/ZoneMinder/issues/898)
+- updated 9831W control script [\#893](https://github.com/ZoneMinder/ZoneMinder/issues/893)
+- 404 error on Ubuntu 14.04 install [\#889](https://github.com/ZoneMinder/ZoneMinder/issues/889)
+- Video Smear - Vertical Striping [\#888](https://github.com/ZoneMinder/ZoneMinder/issues/888)
+- Zoneminder mobile theme broken. [\#887](https://github.com/ZoneMinder/ZoneMinder/issues/887)
+- cgi-bin -\> symlink on zms not work for me \(Gentoo/SystemD\) [\#878](https://github.com/ZoneMinder/ZoneMinder/issues/878)
+- Replay Event Stuck [\#869](https://github.com/ZoneMinder/ZoneMinder/issues/869)
+- cant add or edit monitor [\#868](https://github.com/ZoneMinder/ZoneMinder/issues/868)
+- Odd window size differences when viewing frame alarm image between Chrome & FF [\#865](https://github.com/ZoneMinder/ZoneMinder/issues/865)
+- On ubuntu 14.04 zoneminder 1.28.1 alarm never terminate!! [\#852](https://github.com/ZoneMinder/ZoneMinder/issues/852)
+- X-10 configuration not working ZM V1.28.1 [\#848](https://github.com/ZoneMinder/ZoneMinder/issues/848)
+- Global symbol requires explicit package name... [\#846](https://github.com/ZoneMinder/ZoneMinder/issues/846)
+- Adapt to changes in Ubuntu 15.04 [\#840](https://github.com/ZoneMinder/ZoneMinder/issues/840)
+- After initial setup, unable to start again [\#839](https://github.com/ZoneMinder/ZoneMinder/issues/839)
+- FFMPEG path finding error \(formerly: Are you switching to a totally CMake based build?\) [\#835](https://github.com/ZoneMinder/ZoneMinder/issues/835)
+- Purchase a Raspberry Pi 2 + PiCam for ZoneMinder development \[$114\] [\#832](https://github.com/ZoneMinder/ZoneMinder/issues/832)
+- Can't Login Web getting a Loop [\#831](https://github.com/ZoneMinder/ZoneMinder/issues/831)
+- Missing function drop down values \(db issue?\) [\#828](https://github.com/ZoneMinder/ZoneMinder/issues/828)
+- curl using HEAD instead of GET for http requests results in 404 on some servers [\#827](https://github.com/ZoneMinder/ZoneMinder/issues/827)
+- Empty string if missing index in lang files [\#819](https://github.com/ZoneMinder/ZoneMinder/issues/819)
+- fix for RTSP streaming over UDP [\#811](https://github.com/ZoneMinder/ZoneMinder/issues/811)
+- bundled CakePHP overhead [\#810](https://github.com/ZoneMinder/ZoneMinder/issues/810)
+- PHP session locks serialize access to all scripts causing UI hangs [\#806](https://github.com/ZoneMinder/ZoneMinder/issues/806)
+- How do I add authentication to ZM APIs? [\#797](https://github.com/ZoneMinder/ZoneMinder/issues/797)
+- Add man page for zmsystemctl.pl [\#788](https://github.com/ZoneMinder/ZoneMinder/issues/788)
+- man pages please; improve --help option [\#787](https://github.com/ZoneMinder/ZoneMinder/issues/787)
+- ZM\_CONTENTDIR issues [\#786](https://github.com/ZoneMinder/ZoneMinder/issues/786)
+- please update bundled jQuery [\#785](https://github.com/ZoneMinder/ZoneMinder/issues/785)
+- please update bundled Mootools [\#784](https://github.com/ZoneMinder/ZoneMinder/issues/784)
+- duplicated files in `cgi-bin` [\#777](https://github.com/ZoneMinder/ZoneMinder/issues/777)
+- FTBFS on kFreeBSD [\#771](https://github.com/ZoneMinder/ZoneMinder/issues/771)
+- CMake: incorrect installation of Perl modules \[patch\] [\#769](https://github.com/ZoneMinder/ZoneMinder/issues/769)
+- Issue when viewing events when users are restricted to limited cameras [\#766](https://github.com/ZoneMinder/ZoneMinder/issues/766)
+- zmupdate.pl: ignores ZM\_SERVER\_HOST in zm.conf [\#765](https://github.com/ZoneMinder/ZoneMinder/issues/765)
+- Remote Zoneminder installations [\#764](https://github.com/ZoneMinder/ZoneMinder/issues/764)
+- source code mess [\#760](https://github.com/ZoneMinder/ZoneMinder/issues/760)
+- bttv crashing zoneminder rpm [\#755](https://github.com/ZoneMinder/ZoneMinder/issues/755)
+- Make Uninstall no longer removes Perl modules [\#753](https://github.com/ZoneMinder/ZoneMinder/issues/753)
+- Playback video problem in v1.26.5 [\#752](https://github.com/ZoneMinder/ZoneMinder/issues/752)
+- Integrate Make Movie Branch [\#747](https://github.com/ZoneMinder/ZoneMinder/issues/747)
+- FI8620 ERR	Error while decoding frame [\#741](https://github.com/ZoneMinder/ZoneMinder/issues/741)
+- \[Critical\] 1.28.0 to 1.28.1 seems to have lost ability for RTSP Authentication [\#738](https://github.com/ZoneMinder/ZoneMinder/issues/738)
+- Disabling cambozola in options doesn't actually disable? [\#735](https://github.com/ZoneMinder/ZoneMinder/issues/735)
+- FI9821W v2 shows blue screen [\#734](https://github.com/ZoneMinder/ZoneMinder/issues/734)
+- Configure script checking for netpbm [\#731](https://github.com/ZoneMinder/ZoneMinder/issues/731)
+- Missing dependency for killall in rpm package [\#727](https://github.com/ZoneMinder/ZoneMinder/issues/727)
+- Build with ZM\_TARGET\_DISTRO=el7 fails to start under systemd [\#724](https://github.com/ZoneMinder/ZoneMinder/issues/724)
+- Issue with event page for users with restricted monitors [\#717](https://github.com/ZoneMinder/ZoneMinder/issues/717)
+- Unrecognised content type 'video/x-ms-asf' [\#716](https://github.com/ZoneMinder/ZoneMinder/issues/716)
+- Flat skin stopped working [\#715](https://github.com/ZoneMinder/ZoneMinder/issues/715)
+- Zone edit dots are gone [\#712](https://github.com/ZoneMinder/ZoneMinder/issues/712)
+- zm\_rtsp Use of avformat\_free\_context not version checked [\#710](https://github.com/ZoneMinder/ZoneMinder/issues/710)
+- Unable to generate video, check /usr/share/zoneminder/events/1/15/02/15/20/10/00/ffmpeg.log for details [\#705](https://github.com/ZoneMinder/ZoneMinder/issues/705)
+- Axis M5014 PTZ Control [\#703](https://github.com/ZoneMinder/ZoneMinder/issues/703)
+- 2nd network port breaks 'Probe' in 1.28 on Ubuntu 14.04LTS? [\#698](https://github.com/ZoneMinder/ZoneMinder/issues/698)
+- ZM's Develop actually [\#697](https://github.com/ZoneMinder/ZoneMinder/issues/697)
+- Release 1.28.1 [\#693](https://github.com/ZoneMinder/ZoneMinder/issues/693)
+- Image disappears \(flickers\) in monitor and event playback [\#689](https://github.com/ZoneMinder/ZoneMinder/issues/689)
+- Multiple issues.. [\#688](https://github.com/ZoneMinder/ZoneMinder/issues/688)
+-  short PHP open tags paragraph on zoneminder.com Troubleshooting page [\#684](https://github.com/ZoneMinder/ZoneMinder/issues/684)
+- The monitorprobe.php code does not work in FreeBSD [\#683](https://github.com/ZoneMinder/ZoneMinder/issues/683)
+- ZoneMinder problem [\#680](https://github.com/ZoneMinder/ZoneMinder/issues/680)
+- CMAKE ZM\_PERL\_SUBPREFIX Slash Issue [\#677](https://github.com/ZoneMinder/ZoneMinder/issues/677)
+- Centos 6.5 crashes [\#619](https://github.com/ZoneMinder/ZoneMinder/issues/619)
+- ZMS crashes after "Attempt to directly assign buffer from an undersized buffer of size" error [\#586](https://github.com/ZoneMinder/ZoneMinder/issues/586)
+- hi all, i'm under Linux Gentoo with systemd - ZM v1.27.99.0 [\#511](https://github.com/ZoneMinder/ZoneMinder/issues/511)
+- Event export with ZM\_USE\_DEEP\_STORAGE option set [\#506](https://github.com/ZoneMinder/ZoneMinder/issues/506)
+- Streaming not working on Chrome when authentication is ON [\#328](https://github.com/ZoneMinder/ZoneMinder/issues/328)
+- Can add a simple send mail function？ [\#311](https://github.com/ZoneMinder/ZoneMinder/issues/311)
+
+**Merged pull requests:**
+
+- Fixed Configs API to return all values [\#955](https://github.com/ZoneMinder/ZoneMinder/pull/955) ([pliablepixels](https://github.com/pliablepixels))
+- Change encoding of german language file to UTF-8 [\#952](https://github.com/ZoneMinder/ZoneMinder/pull/952) ([schrorg](https://github.com/schrorg))
+- Show correct part of URL \(hostname\) for ffmpeg sources in console [\#951](https://github.com/ZoneMinder/ZoneMinder/pull/951) ([schrorg](https://github.com/schrorg))
+- add php-gd to list of dependencies for debian and ubuntu builds [\#944](https://github.com/ZoneMinder/ZoneMinder/pull/944) ([connortechnology](https://github.com/connortechnology))
+- rpm packaging - require php-gd [\#943](https://github.com/ZoneMinder/ZoneMinder/pull/943) ([knnniggett](https://github.com/knnniggett))
+- add some utility db functions [\#942](https://github.com/ZoneMinder/ZoneMinder/pull/942) ([connortechnology](https://github.com/connortechnology))
+- add space instead of + to handle old Axis cameras [\#941](https://github.com/ZoneMinder/ZoneMinder/pull/941) ([connortechnology](https://github.com/connortechnology))
+- zmtrigger: POD documentation [\#938](https://github.com/ZoneMinder/ZoneMinder/pull/938) ([onlyjob](https://github.com/onlyjob))
+- improve log [\#937](https://github.com/ZoneMinder/ZoneMinder/pull/937) ([connortechnology](https://github.com/connortechnology))
+- add error handling on failure to open serial port [\#936](https://github.com/ZoneMinder/ZoneMinder/pull/936) ([connortechnology](https://github.com/connortechnology))
+- fix utf8 ' characters [\#934](https://github.com/ZoneMinder/ZoneMinder/pull/934) ([connortechnology](https://github.com/connortechnology))
+- roudn up when calculating buffer size for scaled image. Fixes \#932 [\#933](https://github.com/ZoneMinder/ZoneMinder/pull/933) ([connortechnology](https://github.com/connortechnology))
+- Added API routing [\#931](https://github.com/ZoneMinder/ZoneMinder/pull/931) ([pliablepixels](https://github.com/pliablepixels))
+- don't include .cpp in man [\#930](https://github.com/ZoneMinder/ZoneMinder/pull/930) ([connortechnology](https://github.com/connortechnology))
+- fix pod2man generation for out-of-source builds [\#928](https://github.com/ZoneMinder/ZoneMinder/pull/928) ([knnniggett](https://github.com/knnniggett))
+- Version to 1.28.99 [\#926](https://github.com/ZoneMinder/ZoneMinder/pull/926) ([connortechnology](https://github.com/connortechnology))
+- Introduce a read\_into function in the Buffer.  [\#923](https://github.com/ZoneMinder/ZoneMinder/pull/923) ([connortechnology](https://github.com/connortechnology))
+- Added "RewriteBase /zm/api" for API routing [\#921](https://github.com/ZoneMinder/ZoneMinder/pull/921) ([pliablepixels](https://github.com/pliablepixels))
+- Zms no crash [\#920](https://github.com/ZoneMinder/ZoneMinder/pull/920) ([connortechnology](https://github.com/connortechnology))
+- add check for gettime in librt, needed for building on pi [\#919](https://github.com/ZoneMinder/ZoneMinder/pull/919) ([connortechnology](https://github.com/connortechnology))
+- Add ServerId to Monitors [\#918](https://github.com/ZoneMinder/ZoneMinder/pull/918) ([connortechnology](https://github.com/connortechnology))
+- Dumb down Crud from 4.0 -\> 3.0.10 [\#915](https://github.com/ZoneMinder/ZoneMinder/pull/915) ([knnniggett](https://github.com/knnniggett))
+- Add Servers Table and add Id PRIMARY KEY to States [\#910](https://github.com/ZoneMinder/ZoneMinder/pull/910) ([connortechnology](https://github.com/connortechnology))
+- fix montage view issue in mobile skin [\#909](https://github.com/ZoneMinder/ZoneMinder/pull/909) ([knnniggett](https://github.com/knnniggett))
+- Solaris cmake [\#906](https://github.com/ZoneMinder/ZoneMinder/pull/906) ([knnniggett](https://github.com/knnniggett))
+- Fix el7 build [\#902](https://github.com/ZoneMinder/ZoneMinder/pull/902) ([bill-mcgonigle](https://github.com/bill-mcgonigle))
+- 898 is running states [\#899](https://github.com/ZoneMinder/ZoneMinder/pull/899) ([pliablepixels](https://github.com/pliablepixels))
+- Fixed events API to remove thumbnail code [\#897](https://github.com/ZoneMinder/ZoneMinder/pull/897) ([pliablepixels](https://github.com/pliablepixels))
+- Generate man pages for perl scripts & C Binaries in the bin folder [\#896](https://github.com/ZoneMinder/ZoneMinder/pull/896) ([knnniggett](https://github.com/knnniggett))
+- 893 foscam 9831 w and other foscams [\#895](https://github.com/ZoneMinder/ZoneMinder/pull/895) ([pliablepixels](https://github.com/pliablepixels))
+- 893 foscam 9831 w and other foscams [\#894](https://github.com/ZoneMinder/ZoneMinder/pull/894) ([pliablepixels](https://github.com/pliablepixels))
+- improve debugging for analysis check and restart if can't read shared data [\#892](https://github.com/ZoneMinder/ZoneMinder/pull/892) ([connortechnology](https://github.com/connortechnology))
+- Zmwatch cleanup2 [\#891](https://github.com/ZoneMinder/ZoneMinder/pull/891) ([connortechnology](https://github.com/connortechnology))
+- reverse the if statement to reduce indenting [\#890](https://github.com/ZoneMinder/ZoneMinder/pull/890) ([connortechnology](https://github.com/connortechnology))
+- Updated API document  [\#886](https://github.com/ZoneMinder/ZoneMinder/pull/886) ([pliablepixels](https://github.com/pliablepixels))
+- Use avconv as alternative to ffmpeg executable [\#884](https://github.com/ZoneMinder/ZoneMinder/pull/884) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- 881 bootstrap loading config [\#883](https://github.com/ZoneMinder/ZoneMinder/pull/883) ([pliablepixels](https://github.com/pliablepixels))
+- Merged Angular UI branch API to master [\#882](https://github.com/ZoneMinder/ZoneMinder/pull/882) ([pliablepixels](https://github.com/pliablepixels))
+- h264 GUI translate fixes [\#880](https://github.com/ZoneMinder/ZoneMinder/pull/880) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Merging Master to feature-h264-videostorage [\#879](https://github.com/ZoneMinder/ZoneMinder/pull/879) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- 799 api improvements [\#877](https://github.com/ZoneMinder/ZoneMinder/pull/877) ([pliablepixels](https://github.com/pliablepixels))
+- Fixed daemonStatus API to return string returned by ZMC in addition t… [\#876](https://github.com/ZoneMinder/ZoneMinder/pull/876) ([pliablepixels](https://github.com/pliablepixels))
+- Add version to the startup log line [\#875](https://github.com/ZoneMinder/ZoneMinder/pull/875) ([connortechnology](https://github.com/connortechnology))
+- German translation update [\#874](https://github.com/ZoneMinder/ZoneMinder/pull/874) ([seeebek](https://github.com/seeebek))
+- reduce the wait to 2/10ths instead of a whole second [\#873](https://github.com/ZoneMinder/ZoneMinder/pull/873) ([connortechnology](https://github.com/connortechnology))
+- alter the logic of ReadData. New behaviour is documented.   [\#870](https://github.com/ZoneMinder/ZoneMinder/pull/870) ([connortechnology](https://github.com/connortechnology))
+- analysis optimisations [\#867](https://github.com/ZoneMinder/ZoneMinder/pull/867) ([connortechnology](https://github.com/connortechnology))
+- Don't die if db goes away during logging [\#866](https://github.com/ZoneMinder/ZoneMinder/pull/866) ([connortechnology](https://github.com/connortechnology))
+- Move iostream inclusion in zm.h and declare explicitely the namespace [\#859](https://github.com/ZoneMinder/ZoneMinder/pull/859) ([manupap1](https://github.com/manupap1))
+- Fix detection of deprecated libav / ffmpeg functions [\#858](https://github.com/ZoneMinder/ZoneMinder/pull/858) ([manupap1](https://github.com/manupap1))
+- Correct bareword config entries with newer {} style [\#856](https://github.com/ZoneMinder/ZoneMinder/pull/856) ([connortechnology](https://github.com/connortechnology))
+- update german translation [\#854](https://github.com/ZoneMinder/ZoneMinder/pull/854) ([seeebek](https://github.com/seeebek))
+- ubuntu 15.04 [\#850](https://github.com/ZoneMinder/ZoneMinder/pull/850) ([seeebek](https://github.com/seeebek))
+- faster shutdown [\#847](https://github.com/ZoneMinder/ZoneMinder/pull/847) ([connortechnology](https://github.com/connortechnology))
+- Additional SLANG changes  [\#845](https://github.com/ZoneMinder/ZoneMinder/pull/845) ([knnniggett](https://github.com/knnniggett))
+- Cmake hostos [\#844](https://github.com/ZoneMinder/ZoneMinder/pull/844) ([knnniggett](https://github.com/knnniggett))
+- Port to OmniOS/Solaris [\#842](https://github.com/ZoneMinder/ZoneMinder/pull/842) ([whorfin](https://github.com/whorfin))
+- Zmaudit update1: Make MIN\_AGE Configurable [\#838](https://github.com/ZoneMinder/ZoneMinder/pull/838) ([connortechnology](https://github.com/connortechnology))
+- Update to FI982821W\_Y2k [\#836](https://github.com/ZoneMinder/ZoneMinder/pull/836) ([connortechnology](https://github.com/connortechnology))
+- add translate function [\#833](https://github.com/ZoneMinder/ZoneMinder/pull/833) ([knnniggett](https://github.com/knnniggett))
+- Separate css window sizes [\#829](https://github.com/ZoneMinder/ZoneMinder/pull/829) ([connortechnology](https://github.com/connortechnology))
+- Fix fast forward/reverse in event playback \(\#688\) [\#825](https://github.com/ZoneMinder/ZoneMinder/pull/825) ([rwg0](https://github.com/rwg0))
+- Fix: typo in options\_libvlc [\#824](https://github.com/ZoneMinder/ZoneMinder/pull/824) ([Lihis](https://github.com/Lihis))
+- close the session before requiring the page contents to fix the concurre... [\#823](https://github.com/ZoneMinder/ZoneMinder/pull/823) ([connortechnology](https://github.com/connortechnology))
+- Fix build issues on kFreeBSD. Fixes \#771 [\#822](https://github.com/ZoneMinder/ZoneMinder/pull/822) ([connortechnology](https://github.com/connortechnology))
+- beautifying \*.pm [\#821](https://github.com/ZoneMinder/ZoneMinder/pull/821) ([onlyjob](https://github.com/onlyjob))
+- Remove hardcoded localized strings in php files and update lang files [\#820](https://github.com/ZoneMinder/ZoneMinder/pull/820) ([manupap1](https://github.com/manupap1))
+- Fix french lang file [\#818](https://github.com/ZoneMinder/ZoneMinder/pull/818) ([manupap1](https://github.com/manupap1))
+- more perlcritic/PBP corrections [\#816](https://github.com/ZoneMinder/ZoneMinder/pull/816) ([onlyjob](https://github.com/onlyjob))
+- last batch of POD and readability conversions for \*.pl scripts [\#815](https://github.com/ZoneMinder/ZoneMinder/pull/815) ([onlyjob](https://github.com/onlyjob))
+- Fixes \#760 in part Clean up CMakeLists.txt [\#812](https://github.com/ZoneMinder/ZoneMinder/pull/812) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- upgrade bundled jQuery \(Closes: \#785\) [\#809](https://github.com/ZoneMinder/ZoneMinder/pull/809) ([onlyjob](https://github.com/onlyjob))
+- Update Mootools [\#803](https://github.com/ZoneMinder/ZoneMinder/pull/803) ([knnniggett](https://github.com/knnniggett))
+- hide USE\_DEEP\_STORAGE [\#802](https://github.com/ZoneMinder/ZoneMinder/pull/802) ([knnniggett](https://github.com/knnniggett))
+- link zms to nph-zms, rather than build identical [\#801](https://github.com/ZoneMinder/ZoneMinder/pull/801) ([knnniggett](https://github.com/knnniggett))
+- \* use pthread\_join instead of pthread\_tryjoin\_np [\#800](https://github.com/ZoneMinder/ZoneMinder/pull/800) ([Sune1337](https://github.com/Sune1337))
+- zmcontrol.pl, zmfilter.pl: pod2usage + readability improvements. [\#798](https://github.com/ZoneMinder/ZoneMinder/pull/798) ([onlyjob](https://github.com/onlyjob))
+- one small fix for a log line where the 4th parameter wasn't included.  T... [\#796](https://github.com/ZoneMinder/ZoneMinder/pull/796) ([connortechnology](https://github.com/connortechnology))
+- zmaudit.pl, zmcamtool.pl: pod2usage, PBP/5 + readability [\#795](https://github.com/ZoneMinder/ZoneMinder/pull/795) ([onlyjob](https://github.com/onlyjob))
+- as discussed... [\#794](https://github.com/ZoneMinder/ZoneMinder/pull/794) ([onlyjob](https://github.com/onlyjob))
+- Leftover short open tags [\#793](https://github.com/ZoneMinder/ZoneMinder/pull/793) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- cmake - use perl INSTALLDIRS [\#792](https://github.com/ZoneMinder/ZoneMinder/pull/792) ([knnniggett](https://github.com/knnniggett))
+- \#783 - related corrections [\#791](https://github.com/ZoneMinder/ZoneMinder/pull/791) ([onlyjob](https://github.com/onlyjob))
+- skins/classic: fix HTML export with USE\_DEEP\_STORAGE \(Closes: \#506\). [\#782](https://github.com/ZoneMinder/ZoneMinder/pull/782) ([onlyjob](https://github.com/onlyjob))
+- Check for libv4l1-videodev headers [\#781](https://github.com/ZoneMinder/ZoneMinder/pull/781) ([knnniggett](https://github.com/knnniggett))
+- build: add PATH\_MAX definitions \(needed on GNU Hurd\) [\#778](https://github.com/ZoneMinder/ZoneMinder/pull/778) ([onlyjob](https://github.com/onlyjob))
+- Freebsd fixes [\#775](https://github.com/ZoneMinder/ZoneMinder/pull/775) ([connortechnology](https://github.com/connortechnology))
+- Use tmpfiles.d to manage tmpdir and sockdir [\#774](https://github.com/ZoneMinder/ZoneMinder/pull/774) ([knnniggett](https://github.com/knnniggett))
+- Don't trigger linked cameras on new events [\#772](https://github.com/ZoneMinder/ZoneMinder/pull/772) ([balr0g](https://github.com/balr0g))
+- POD: zmupdate.pl converted to "pod2usage" [\#763](https://github.com/ZoneMinder/ZoneMinder/pull/763) ([onlyjob](https://github.com/onlyjob))
+- build: fix FTBFS with format-hardening \(please review\) [\#761](https://github.com/ZoneMinder/ZoneMinder/pull/761) ([onlyjob](https://github.com/onlyjob))
+- fixing POD errors [\#759](https://github.com/ZoneMinder/ZoneMinder/pull/759) ([onlyjob](https://github.com/onlyjob))
+- Fixed a missing bracket post merge and also SQL\_values now used for Even... [\#750](https://github.com/ZoneMinder/ZoneMinder/pull/750) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Keeping h264 updated. [\#749](https://github.com/ZoneMinder/ZoneMinder/pull/749) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Ignore autogenerated files in git [\#746](https://github.com/ZoneMinder/ZoneMinder/pull/746) ([manupap1](https://github.com/manupap1))
+- when auth is needed, try command again before dying. [\#739](https://github.com/ZoneMinder/ZoneMinder/pull/739) ([connortechnology](https://github.com/connortechnology))
+- remove NETPBM dependency from autotools [\#737](https://github.com/ZoneMinder/ZoneMinder/pull/737) ([knnniggett](https://github.com/knnniggett))
+- fix extra slash when adding trackurl to controlurl [\#732](https://github.com/ZoneMinder/ZoneMinder/pull/732) ([connortechnology](https://github.com/connortechnology))
+- Fix image and css import paths for style/skin named "flat" [\#730](https://github.com/ZoneMinder/ZoneMinder/pull/730) ([ljack](https://github.com/ljack))
+- Update control.css [\#729](https://github.com/ZoneMinder/ZoneMinder/pull/729) ([ljack](https://github.com/ljack))
+- Fix event view [\#728](https://github.com/ZoneMinder/ZoneMinder/pull/728) ([connortechnology](https://github.com/connortechnology))
+- User selectable arp tool [\#723](https://github.com/ZoneMinder/ZoneMinder/pull/723) ([knnniggett](https://github.com/knnniggett))
+- remove unneeded files [\#722](https://github.com/ZoneMinder/ZoneMinder/pull/722) ([knnniggett](https://github.com/knnniggett))
+- add onvif ptz control into update script [\#721](https://github.com/ZoneMinder/ZoneMinder/pull/721) ([knnniggett](https://github.com/knnniggett))
+- Don't show ONVIf probe link when ONVIF support is not enabled [\#720](https://github.com/ZoneMinder/ZoneMinder/pull/720) ([knnniggett](https://github.com/knnniggett))
+- Allow zm to build w/o ffmpeg [\#719](https://github.com/ZoneMinder/ZoneMinder/pull/719) ([knnniggett](https://github.com/knnniggett))
+- Removed el6 from endif arguments [\#718](https://github.com/ZoneMinder/ZoneMinder/pull/718) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Update fr\_fr.php [\#714](https://github.com/ZoneMinder/ZoneMinder/pull/714) ([Jypy](https://github.com/Jypy))
+- Check to make sure that skin and css are valid. [\#713](https://github.com/ZoneMinder/ZoneMinder/pull/713) ([connortechnology](https://github.com/connortechnology))
+- Fixes \#710 Added libavformat version check around free context functions [\#711](https://github.com/ZoneMinder/ZoneMinder/pull/711) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- try harder to find arp. [\#709](https://github.com/ZoneMinder/ZoneMinder/pull/709) ([connortechnology](https://github.com/connortechnology))
+- Merging Video and feature-h264-videostorage update [\#707](https://github.com/ZoneMinder/ZoneMinder/pull/707) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Update Version.txt to 1.28.1 [\#706](https://github.com/ZoneMinder/ZoneMinder/pull/706) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Make el6 and el7 build process a little more automated [\#704](https://github.com/ZoneMinder/ZoneMinder/pull/704) ([clipo1979](https://github.com/clipo1979))
+- small improvements: [\#702](https://github.com/ZoneMinder/ZoneMinder/pull/702) ([connortechnology](https://github.com/connortechnology))
+- Centos 7 rpm packaging [\#700](https://github.com/ZoneMinder/ZoneMinder/pull/700) ([knnniggett](https://github.com/knnniggett))
+- tmpfile.conf for systemd [\#699](https://github.com/ZoneMinder/ZoneMinder/pull/699) ([clipo1979](https://github.com/clipo1979))
+- Improve delete event [\#696](https://github.com/ZoneMinder/ZoneMinder/pull/696) ([connortechnology](https://github.com/connortechnology))
+- process RTSP DESCRIBE response header [\#687](https://github.com/ZoneMinder/ZoneMinder/pull/687) ([knnniggett](https://github.com/knnniggett))
+
+## [v1.28.1](https://github.com/ZoneMinder/ZoneMinder/tree/v1.28.1) (2015-02-05)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.28.0...v1.28.1)
+
+**Implemented enhancements:**
+
+- Implement unit testing [\#266](https://github.com/ZoneMinder/ZoneMinder/issues/266)
+- Replace PHP short tags [\#11](https://github.com/ZoneMinder/ZoneMinder/issues/11)
+
+**Fixed bugs:**
+
+- Streaming an Event as MPEG fails. [\#686](https://github.com/ZoneMinder/ZoneMinder/issues/686)
+- Zoneminder Web UI No Longer Refreshes After Change [\#534](https://github.com/ZoneMinder/ZoneMinder/issues/534)
+- Monster log messages [\#491](https://github.com/ZoneMinder/ZoneMinder/issues/491)
+- zmu fails silently when it cannot read zm.conf [\#339](https://github.com/ZoneMinder/ZoneMinder/issues/339)
+- Errors on Monitors page during first view [\#175](https://github.com/ZoneMinder/ZoneMinder/issues/175)
+- Logs screen overflows when too much text in message column [\#138](https://github.com/ZoneMinder/ZoneMinder/issues/138)
+- When filtering in the Events view, filter options are lost between pages [\#25](https://github.com/ZoneMinder/ZoneMinder/issues/25)
+
+**Closed issues:**
+
+- Gentoo Systemd ZM V1.28.0- New old bug with PATH\_SOCK and PATH\_SWAP [\#681](https://github.com/ZoneMinder/ZoneMinder/issues/681)
+- PDO\_MYSQL the only PHP driver needed? [\#679](https://github.com/ZoneMinder/ZoneMinder/issues/679)
+- Unable to probe local cameras, status is '127' [\#673](https://github.com/ZoneMinder/ZoneMinder/issues/673)
+- zmc won't start automatically + Can't open memory map file [\#669](https://github.com/ZoneMinder/ZoneMinder/issues/669)
+- Fake camera support [\#659](https://github.com/ZoneMinder/ZoneMinder/issues/659)
+- Horrible error message when pressing probe [\#658](https://github.com/ZoneMinder/ZoneMinder/issues/658)
+- socket\_sendto\( /var/run/zm/zms-256303s.sock \) failed: No such file or directory [\#656](https://github.com/ZoneMinder/ZoneMinder/issues/656)
+- update feature should be removed or easily disabled [\#655](https://github.com/ZoneMinder/ZoneMinder/issues/655)
+- zmfilter.pl crashes when processing background filter with no terms [\#652](https://github.com/ZoneMinder/ZoneMinder/issues/652)
+- Use of undefined constants ZM\_SKIN\_DEFAULT and ZM\_CSS\_DEFAULT in index.php [\#650](https://github.com/ZoneMinder/ZoneMinder/issues/650)
+- Improper track URL handling in zm\_rtsp.cpp [\#644](https://github.com/ZoneMinder/ZoneMinder/issues/644)
+- Cannot install on jessie when running systemd [\#642](https://github.com/ZoneMinder/ZoneMinder/issues/642)
+- Version detection [\#626](https://github.com/ZoneMinder/ZoneMinder/issues/626)
+- some trash in debian package [\#625](https://github.com/ZoneMinder/ZoneMinder/issues/625)
+- signed integers awesome [\#624](https://github.com/ZoneMinder/ZoneMinder/issues/624)
+- cmake does not honor SYSCONFDIR [\#623](https://github.com/ZoneMinder/ZoneMinder/issues/623)
+- PTZ Control Icons have disappeared [\#622](https://github.com/ZoneMinder/ZoneMinder/issues/622)
+- RTSP Improvements [\#612](https://github.com/ZoneMinder/ZoneMinder/issues/612)
+- CCTV Camera to IP converter [\#603](https://github.com/ZoneMinder/ZoneMinder/issues/603)
+- mjpg streamer installations on fedora 20 [\#600](https://github.com/ZoneMinder/ZoneMinder/issues/600)
+- Changing the skin in the options SHOULD be permanent. [\#598](https://github.com/ZoneMinder/ZoneMinder/issues/598)
+- Zoneminder requires SElinux disabled on RHEL & derivatives. [\#593](https://github.com/ZoneMinder/ZoneMinder/issues/593)
+- Editing control settings on a monitor should probably try to kill any running zmcontrol [\#590](https://github.com/ZoneMinder/ZoneMinder/issues/590)
+- 1.28 missing dependency on debian jessie [\#581](https://github.com/ZoneMinder/ZoneMinder/issues/581)
+- LibVLC MJPEG stream slows down [\#571](https://github.com/ZoneMinder/ZoneMinder/issues/571)
+- %EV% in EMAIL\_BODY in E-mail options send still video [\#569](https://github.com/ZoneMinder/ZoneMinder/issues/569)
+- Add documentation for EMAIL\_BODY variables [\#568](https://github.com/ZoneMinder/ZoneMinder/issues/568)
+- 3S PTZ [\#566](https://github.com/ZoneMinder/ZoneMinder/issues/566)
+- Live view wrong socket name [\#563](https://github.com/ZoneMinder/ZoneMinder/issues/563)
+- V4L1 Support removal? [\#558](https://github.com/ZoneMinder/ZoneMinder/issues/558)
+- feature-h264-videostorage compile errors [\#553](https://github.com/ZoneMinder/ZoneMinder/issues/553)
+- zmc -m 1 crashed, signal 6 [\#540](https://github.com/ZoneMinder/ZoneMinder/issues/540)
+- Attempt to assign buffer from a NULL pointer [\#538](https://github.com/ZoneMinder/ZoneMinder/issues/538)
+- Please recommend ffmpeg settings for best video quality [\#536](https://github.com/ZoneMinder/ZoneMinder/issues/536)
+- Modect Mode\(Active\) - How to revert from alarm to idle [\#509](https://github.com/ZoneMinder/ZoneMinder/issues/509)
+- Update v1.27.99.0. [\#503](https://github.com/ZoneMinder/ZoneMinder/issues/503)
+- Docker Container Broken [\#498](https://github.com/ZoneMinder/ZoneMinder/issues/498)
+- Nordmark IP camera [\#483](https://github.com/ZoneMinder/ZoneMinder/issues/483)
+- Release v1.28.0 [\#467](https://github.com/ZoneMinder/ZoneMinder/issues/467)
+- Let's make a new website [\#446](https://github.com/ZoneMinder/ZoneMinder/issues/446)
+- Zoneminder, Onvif CPU and RTSP capture [\#431](https://github.com/ZoneMinder/ZoneMinder/issues/431)
+- Right memory settings to capture 1080p cameras [\#425](https://github.com/ZoneMinder/ZoneMinder/issues/425)
+- Startup problem on Ubuntu [\#424](https://github.com/ZoneMinder/ZoneMinder/issues/424)
+- Feature Request: Support for digest authentication over RTSP [\#399](https://github.com/ZoneMinder/ZoneMinder/issues/399)
+- Install Zm V1.27.0 on Linux Gentoo x64 \(systemd\) [\#396](https://github.com/ZoneMinder/ZoneMinder/issues/396)
+- Missing Dependencies [\#368](https://github.com/ZoneMinder/ZoneMinder/issues/368)
+- Error "‘AVOutputFormat’ does not name a type   AVOutputFormat \*of;" [\#340](https://github.com/ZoneMinder/ZoneMinder/issues/340)
+- Add the ability to force RTSP over TCP in ffmpeg cameras. [\#323](https://github.com/ZoneMinder/ZoneMinder/issues/323)
+- limited maximum path length for the device path prevents use of some by-id names [\#301](https://github.com/ZoneMinder/ZoneMinder/issues/301)
+- Stream acquired via RTSP/FFMPEG  won't recover from connection loss - "Unable to read packet from stream 0" [\#299](https://github.com/ZoneMinder/ZoneMinder/issues/299)
+- Invalid response status 501: Method Not Implemented [\#298](https://github.com/ZoneMinder/ZoneMinder/issues/298)
+- Invalid SOS parameters for sequential JPEG [\#279](https://github.com/ZoneMinder/ZoneMinder/issues/279)
+
+**Merged pull requests:**
+
+- fix content-type parsing when there are options on it [\#692](https://github.com/ZoneMinder/ZoneMinder/pull/692) ([connortechnology](https://github.com/connortechnology))
+- this fixes Digest Auth for the mjpeg stream on a TV-IP302PI [\#691](https://github.com/ZoneMinder/ZoneMinder/pull/691) ([connortechnology](https://github.com/connortechnology))
+- small performance improvement when streaming. [\#675](https://github.com/ZoneMinder/ZoneMinder/pull/675) ([connortechnology](https://github.com/connortechnology))
+- Kill zmcontrol [\#666](https://github.com/ZoneMinder/ZoneMinder/pull/666) ([connortechnology](https://github.com/connortechnology))
+- Don't fail if an unexpected rtp packet type is received [\#665](https://github.com/ZoneMinder/ZoneMinder/pull/665) ([knnniggett](https://github.com/knnniggett))
+- Versions command line args [\#664](https://github.com/ZoneMinder/ZoneMinder/pull/664) ([connortechnology](https://github.com/connortechnology))
+- Update et\_ee.php [\#662](https://github.com/ZoneMinder/ZoneMinder/pull/662) ([hanzese](https://github.com/hanzese))
+- \#658 Fix error message for finding arp path [\#660](https://github.com/ZoneMinder/ZoneMinder/pull/660) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Make the log export use ZM\_PATH\_SWAP and report the full path on error [\#657](https://github.com/ZoneMinder/ZoneMinder/pull/657) ([connortechnology](https://github.com/connortechnology))
+- replace getLoad\(\) / getDiskPercent\(\) with PHP native functions [\#654](https://github.com/ZoneMinder/ZoneMinder/pull/654) ([lifeofguenter](https://github.com/lifeofguenter))
+- Modified zmfilter.pl.in to fix \#652, crashing while processing backgroun... [\#653](https://github.com/ZoneMinder/ZoneMinder/pull/653) ([thebostik](https://github.com/thebostik))
+- Remove no longer needed patch because applied to master [\#651](https://github.com/ZoneMinder/ZoneMinder/pull/651) ([manupap1](https://github.com/manupap1))
+- Don't check for zmdc.pl when stopping via systemd [\#647](https://github.com/ZoneMinder/ZoneMinder/pull/647) ([ariscop](https://github.com/ariscop))
+- Split the debian package into several packages [\#646](https://github.com/ZoneMinder/ZoneMinder/pull/646) ([manupap1](https://github.com/manupap1))
+- Skin css default [\#645](https://github.com/ZoneMinder/ZoneMinder/pull/645) ([connortechnology](https://github.com/connortechnology))
+- Offer login prompt instead of throwing error [\#640](https://github.com/ZoneMinder/ZoneMinder/pull/640) ([jrd288](https://github.com/jrd288))
+- zmfilter: Send message for events that are still ongoing [\#638](https://github.com/ZoneMinder/ZoneMinder/pull/638) ([KristofRobot](https://github.com/KristofRobot))
+- Some fixes to the debian folder [\#636](https://github.com/ZoneMinder/ZoneMinder/pull/636) ([manupap1](https://github.com/manupap1))
+- Improve zmcontrol.pl [\#635](https://github.com/ZoneMinder/ZoneMinder/pull/635) ([connortechnology](https://github.com/connortechnology))
+- Add debconf / dbconfig support to debian8 folder [\#634](https://github.com/ZoneMinder/ZoneMinder/pull/634) ([manupap1](https://github.com/manupap1))
+- better fix for the view=console security flaw. [\#632](https://github.com/ZoneMinder/ZoneMinder/pull/632) ([connortechnology](https://github.com/connortechnology))
+- add check to see if user has rights to view this monitor [\#631](https://github.com/ZoneMinder/ZoneMinder/pull/631) ([connortechnology](https://github.com/connortechnology))
+- fix auth requirement on view=console by checking for user when AUTH is on [\#628](https://github.com/ZoneMinder/ZoneMinder/pull/628) ([connortechnology](https://github.com/connortechnology))
+- Output to stderror when zmu can't read zm.conf [\#627](https://github.com/ZoneMinder/ZoneMinder/pull/627) ([knnniggett](https://github.com/knnniggett))
+- Add missing dependency to policykit-1 [\#621](https://github.com/ZoneMinder/ZoneMinder/pull/621) ([manupap1](https://github.com/manupap1))
+- Replace PHP Short Open Tags - Fixes \#11 [\#620](https://github.com/ZoneMinder/ZoneMinder/pull/620) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Video Highlander [\#618](https://github.com/ZoneMinder/ZoneMinder/pull/618) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Merge Master to feature-h264-videostorage [\#616](https://github.com/ZoneMinder/ZoneMinder/pull/616) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Rtsp [\#615](https://github.com/ZoneMinder/ZoneMinder/pull/615) ([knnniggett](https://github.com/knnniggett))
+- Merge flat css to classic [\#614](https://github.com/ZoneMinder/ZoneMinder/pull/614) ([connortechnology](https://github.com/connortechnology))
+- feature-h264-videostorage mp4 container [\#613](https://github.com/ZoneMinder/ZoneMinder/pull/613) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- echo the URL to the RTSP device during the OPTIONS directive [\#608](https://github.com/ZoneMinder/ZoneMinder/pull/608) ([knnniggett](https://github.com/knnniggett))
+- Fix some memory leaks in zma [\#607](https://github.com/ZoneMinder/ZoneMinder/pull/607) ([manupap1](https://github.com/manupap1))
+- Fix a mismatched free in zmc binary [\#606](https://github.com/ZoneMinder/ZoneMinder/pull/606) ([manupap1](https://github.com/manupap1))
+- New debian folder for jessie release [\#605](https://github.com/ZoneMinder/ZoneMinder/pull/605) ([manupap1](https://github.com/manupap1))
+- Css skins for classic [\#602](https://github.com/ZoneMinder/ZoneMinder/pull/602) ([connortechnology](https://github.com/connortechnology))
+- Fix package dependency on debian jessie [\#596](https://github.com/ZoneMinder/ZoneMinder/pull/596) ([manupap1](https://github.com/manupap1))
+- updated local\_zoneminder type extension file [\#594](https://github.com/ZoneMinder/ZoneMinder/pull/594) ([ndobbs](https://github.com/ndobbs))
+- Creating options documentation fixes \#568 [\#591](https://github.com/ZoneMinder/ZoneMinder/pull/591) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Convert french lang file to UTF-8 [\#589](https://github.com/ZoneMinder/ZoneMinder/pull/589) ([manupap1](https://github.com/manupap1))
+- Digest auth [\#588](https://github.com/ZoneMinder/ZoneMinder/pull/588) ([connortechnology](https://github.com/connortechnology))
+- Zmupdatefixes [\#584](https://github.com/ZoneMinder/ZoneMinder/pull/584) ([connortechnology](https://github.com/connortechnology))
+- Update et\_ee.php [\#582](https://github.com/ZoneMinder/ZoneMinder/pull/582) ([hanzese](https://github.com/hanzese))
+- Add zmeditconfigdata.sh script to source [\#577](https://github.com/ZoneMinder/ZoneMinder/pull/577) ([knnniggett](https://github.com/knnniggett))
+- Close logger and database on exit [\#575](https://github.com/ZoneMinder/ZoneMinder/pull/575) ([manupap1](https://github.com/manupap1))
+- Fix memory leaks with rtsp and a bug [\#574](https://github.com/ZoneMinder/ZoneMinder/pull/574) ([manupap1](https://github.com/manupap1))
+- Fix a bug when closing RTSP session over TCP [\#573](https://github.com/ZoneMinder/ZoneMinder/pull/573) ([manupap1](https://github.com/manupap1))
+- remove the case for level \>= 2.  Since level is a bool, this code can ne... [\#572](https://github.com/ZoneMinder/ZoneMinder/pull/572) ([connortechnology](https://github.com/connortechnology))
+- Add Control 3S N5071 Dome Ptz Camera [\#570](https://github.com/ZoneMinder/ZoneMinder/pull/570) ([jmcastro2014](https://github.com/jmcastro2014))
+- Add the ability to specify the zm configdir at build time. [\#567](https://github.com/ZoneMinder/ZoneMinder/pull/567) ([knnniggett](https://github.com/knnniggett))
+- Debian package migration to CMake and some improves with lintian help [\#565](https://github.com/ZoneMinder/ZoneMinder/pull/565) ([cosmedd](https://github.com/cosmedd))
+- Use gnutls-openssl instead of gnutls to fix build with CMake. [\#564](https://github.com/ZoneMinder/ZoneMinder/pull/564) ([cosmedd](https://github.com/cosmedd))
+- Use our own SSRC when sending packets on the RTP control stream [\#561](https://github.com/ZoneMinder/ZoneMinder/pull/561) ([manupap1](https://github.com/manupap1))
+- Send keepalive messages if the rtsp server supports this feature [\#560](https://github.com/ZoneMinder/ZoneMinder/pull/560) ([manupap1](https://github.com/manupap1))
+- Fixed bug in rtsp streaming caused by a bad string concatenation [\#557](https://github.com/ZoneMinder/ZoneMinder/pull/557) ([manupap1](https://github.com/manupap1))
+- Add a stringVector join function for future use [\#556](https://github.com/ZoneMinder/ZoneMinder/pull/556) ([connortechnology](https://github.com/connortechnology))
+- Fixed bug in rtsp streaming caused by a signed - unsigned conversion. [\#555](https://github.com/ZoneMinder/ZoneMinder/pull/555) ([manupap1](https://github.com/manupap1))
+- Keeping branch current, and fixing libvlc compile issues [\#554](https://github.com/ZoneMinder/ZoneMinder/pull/554) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Bumped version being found by zmupdate.pl [\#551](https://github.com/ZoneMinder/ZoneMinder/pull/551) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Update Ubuntu install instructions [\#550](https://github.com/ZoneMinder/ZoneMinder/pull/550) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Ignore more files and initial travis framework [\#544](https://github.com/ZoneMinder/ZoneMinder/pull/544) ([kylejohnson](https://github.com/kylejohnson))
+- Update Travis to ffmpeg 2.4.2 [\#539](https://github.com/ZoneMinder/ZoneMinder/pull/539) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Add libvlc to Travis [\#535](https://github.com/ZoneMinder/ZoneMinder/pull/535) ([knnniggett](https://github.com/knnniggett))
+- Merge master to feature-h264-videostorage and restore web GUI [\#532](https://github.com/ZoneMinder/ZoneMinder/pull/532) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- 351-Rebase Attempt for ffmpeg stability fixes [\#531](https://github.com/ZoneMinder/ZoneMinder/pull/531) ([SteveGilvarry](https://github.com/SteveGilvarry))
+
+## [v1.28.0](https://github.com/ZoneMinder/ZoneMinder/tree/v1.28.0) (2014-10-18)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.27.0...v1.28.0)
+
+**Implemented enhancements:**
+
+- Migrate completely to C++ [\#265](https://github.com/ZoneMinder/ZoneMinder/issues/265)
+- All of the Config table shouldn't be written in Configure::write [\#192](https://github.com/ZoneMinder/ZoneMinder/issues/192)
+- Translation stuff done, please pull in and test... [\#72](https://github.com/ZoneMinder/ZoneMinder/issues/72)
+
+**Fixed bugs:**
+
+- zms crashes due to monitor not running. [\#468](https://github.com/ZoneMinder/ZoneMinder/issues/468)
+- Flat Skins Export Functions missing $ [\#455](https://github.com/ZoneMinder/ZoneMinder/issues/455)
+- unexpected } in console.php [\#354](https://github.com/ZoneMinder/ZoneMinder/issues/354)
+- incomplete path to arp in zoneminder/skins/classic/views/monitorprobe.php causes probe code 127 failures [\#271](https://github.com/ZoneMinder/ZoneMinder/issues/271)
+- Minor errors when either OPT\_MAIL, OPT\_MESSAGE, or OPT\_UPLOAD are not set [\#34](https://github.com/ZoneMinder/ZoneMinder/issues/34)
+
+**Closed issues:**
+
+- Travis Build failing due to build issues with ffmpeg master [\#520](https://github.com/ZoneMinder/ZoneMinder/issues/520)
+- 'zmfilter.pl' exited abnormally, exit status 9 [\#516](https://github.com/ZoneMinder/ZoneMinder/issues/516)
+- Get the script on alarm feature working [\#515](https://github.com/ZoneMinder/ZoneMinder/issues/515)
+- cmake installation on Arch Linux creates extraneous lib/perl5/... and share/man/... directories [\#514](https://github.com/ZoneMinder/ZoneMinder/issues/514)
+- ZM Gui Stopped SU Syntax Error [\#512](https://github.com/ZoneMinder/ZoneMinder/issues/512)
+- Error using log filter [\#504](https://github.com/ZoneMinder/ZoneMinder/issues/504)
+- fps drop in latest snapshot 1.27.99 [\#495](https://github.com/ZoneMinder/ZoneMinder/issues/495)
+- mysql missing field error after update [\#494](https://github.com/ZoneMinder/ZoneMinder/issues/494)
+- Emails not including video when I add %EV% [\#487](https://github.com/ZoneMinder/ZoneMinder/issues/487)
+- Cameras don't show remotely [\#484](https://github.com/ZoneMinder/ZoneMinder/issues/484)
+- ZM Gui Stopped SU Syntax Error [\#482](https://github.com/ZoneMinder/ZoneMinder/issues/482)
+- Airlink101 AIC500 mjpeg stream [\#481](https://github.com/ZoneMinder/ZoneMinder/issues/481)
+- When a monitor's size is changed, the zone does not resize with it. [\#477](https://github.com/ZoneMinder/ZoneMinder/issues/477)
+- .. [\#472](https://github.com/ZoneMinder/ZoneMinder/issues/472)
+- Just A Note When Compiling [\#471](https://github.com/ZoneMinder/ZoneMinder/issues/471)
+- firefox on windows not load all monitors in montage view [\#470](https://github.com/ZoneMinder/ZoneMinder/issues/470)
+- Default to FLAT Skin [\#466](https://github.com/ZoneMinder/ZoneMinder/issues/466)
+- zmlinkcontent.sh chown and chmod on symlink instead of content directory [\#463](https://github.com/ZoneMinder/ZoneMinder/issues/463)
+- Cannot compile Zoneminder on CentOS 6.4 [\#461](https://github.com/ZoneMinder/ZoneMinder/issues/461)
+- Video is not attached to e-mail anymore \(zm 1.27\) [\#460](https://github.com/ZoneMinder/ZoneMinder/issues/460)
+- \[Video Branch\] Unknown column 'SaveJPEGs' in 'field list' [\#453](https://github.com/ZoneMinder/ZoneMinder/issues/453)
+- Log Ajax loading oldest to newest [\#450](https://github.com/ZoneMinder/ZoneMinder/issues/450)
+- '@' in password of a remote camera makes things go wrong [\#443](https://github.com/ZoneMinder/ZoneMinder/issues/443)
+- Current code segfaults [\#439](https://github.com/ZoneMinder/ZoneMinder/issues/439)
+- Crashing under Arch Linux [\#437](https://github.com/ZoneMinder/ZoneMinder/issues/437)
+- Email Montage view on schedule [\#436](https://github.com/ZoneMinder/ZoneMinder/issues/436)
+- \[question\] vmware image for latest ZM [\#428](https://github.com/ZoneMinder/ZoneMinder/issues/428)
+- Cannot Compile [\#423](https://github.com/ZoneMinder/ZoneMinder/issues/423)
+- seg in nph-zms/loadEventData atoi [\#417](https://github.com/ZoneMinder/ZoneMinder/issues/417)
+- ffmpeg problem [\#414](https://github.com/ZoneMinder/ZoneMinder/issues/414)
+- Minor fixes \(?\) for zmtrigger and mobile skin [\#410](https://github.com/ZoneMinder/ZoneMinder/issues/410)
+- Misleading Config Dump [\#402](https://github.com/ZoneMinder/ZoneMinder/issues/402)
+- Call to undefined function fixdevices\(\) [\#401](https://github.com/ZoneMinder/ZoneMinder/issues/401)
+- Option to execute arbitrary script for each event. \[$100 awarded\] [\#400](https://github.com/ZoneMinder/ZoneMinder/issues/400)
+- Zoneminder without Analysation [\#398](https://github.com/ZoneMinder/ZoneMinder/issues/398)
+- Viewing 31 monitors in montage [\#379](https://github.com/ZoneMinder/ZoneMinder/issues/379)
+- flat theme usability / Layout issues [\#378](https://github.com/ZoneMinder/ZoneMinder/issues/378)
+- Undefined index: filter in /usr/share/zoneminder/skins/zmc/views/filter.php [\#369](https://github.com/ZoneMinder/ZoneMinder/issues/369)
+- docker install not working [\#366](https://github.com/ZoneMinder/ZoneMinder/issues/366)
+- Events are not being reported to table on main index page [\#364](https://github.com/ZoneMinder/ZoneMinder/issues/364)
+- PatternFly for design commanality and improved user experience [\#363](https://github.com/ZoneMinder/ZoneMinder/issues/363)
+- Radio buttons rendering in events replay in flat skin [\#356](https://github.com/ZoneMinder/ZoneMinder/issues/356)
+- Pick a git branching strategy [\#350](https://github.com/ZoneMinder/ZoneMinder/issues/350)
+- Compile directive ZM\_CGIDIR is not interpreted correctly [\#347](https://github.com/ZoneMinder/ZoneMinder/issues/347)
+- 736516 - FTBFS: zm\_image.cpp:2991:165: error: \_\_attribute\_\_\(\(\_\_target\_\_\("sse2"\)\)\) is invalid [\#345](https://github.com/ZoneMinder/ZoneMinder/issues/345)
+- zmcamtool isn't installed [\#344](https://github.com/ZoneMinder/ZoneMinder/issues/344)
+- Overload Frame Ignore Count has no function [\#337](https://github.com/ZoneMinder/ZoneMinder/issues/337)
+- preclusive zones calculated twice [\#336](https://github.com/ZoneMinder/ZoneMinder/issues/336)
+- Build issue - In function `matroska\_decode\_buffer' [\#335](https://github.com/ZoneMinder/ZoneMinder/issues/335)
+- High Load with Low CPU usage [\#326](https://github.com/ZoneMinder/ZoneMinder/issues/326)
+- AUTH\_TYPE=remote not working in 1.26.4 [\#324](https://github.com/ZoneMinder/ZoneMinder/issues/324)
+- Filter / Purge And Delete not running [\#321](https://github.com/ZoneMinder/ZoneMinder/issues/321)
+- /root/zoneminder\_1.26.4-1\_amd64.deb not created [\#260](https://github.com/ZoneMinder/ZoneMinder/issues/260)
+- 721161 - depends on ffmpeg which is going away [\#100](https://github.com/ZoneMinder/ZoneMinder/issues/100)
+- 694131 - FTBFS against libav 9 [\#98](https://github.com/ZoneMinder/ZoneMinder/issues/98)
+- Request: Better API/Remote control [\#23](https://github.com/ZoneMinder/ZoneMinder/issues/23)
+
+**Merged pull requests:**
+
+- fixes ftbs with no ffmpeg support [\#530](https://github.com/ZoneMinder/ZoneMinder/pull/530) ([knnniggett](https://github.com/knnniggett))
+- 498-Docker-Container-Broken [\#527](https://github.com/ZoneMinder/ZoneMinder/pull/527) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Changes to handling of tmpdir & related variables [\#524](https://github.com/ZoneMinder/ZoneMinder/pull/524) ([knnniggett](https://github.com/knnniggett))
+- Fixes 520 travis build ffmpeg failure [\#521](https://github.com/ZoneMinder/ZoneMinder/pull/521) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- full systemd support [\#502](https://github.com/ZoneMinder/ZoneMinder/pull/502) ([knnniggett](https://github.com/knnniggett))
+- Minor corrections to README.OpenSuse [\#501](https://github.com/ZoneMinder/ZoneMinder/pull/501) ([PX03AFK](https://github.com/PX03AFK))
+- Allow use other webservers than apache. [\#493](https://github.com/ZoneMinder/ZoneMinder/pull/493) ([cosmedd](https://github.com/cosmedd))
+- Initial attempt to migrate wiki to readthedocs \#434 [\#492](https://github.com/ZoneMinder/ZoneMinder/pull/492) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Update FI9821W\_Y2k.pm [\#485](https://github.com/ZoneMinder/ZoneMinder/pull/485) ([florian-asche](https://github.com/florian-asche))
+- V4l to monitor [\#480](https://github.com/ZoneMinder/ZoneMinder/pull/480) ([connortechnology](https://github.com/connortechnology))
+- Modified zmlinkcontent to chown and chmod content folder. Fixes \#463 [\#465](https://github.com/ZoneMinder/ZoneMinder/pull/465) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Fix for shared data size conflict [\#462](https://github.com/ZoneMinder/ZoneMinder/pull/462) ([knnniggett](https://github.com/knnniggett))
+- Update rules [\#459](https://github.com/ZoneMinder/ZoneMinder/pull/459) ([whopperg](https://github.com/whopperg))
+- Determine full path to arp [\#458](https://github.com/ZoneMinder/ZoneMinder/pull/458) ([knnniggett](https://github.com/knnniggett))
+- Fixes errors when opening Filters \(issue \#34\) [\#457](https://github.com/ZoneMinder/ZoneMinder/pull/457) ([knnniggett](https://github.com/knnniggett))
+- Fixed missing $ on ARRAY\(event\[id\]\). Fixes \#455 [\#456](https://github.com/ZoneMinder/ZoneMinder/pull/456) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Wrap sort order. Fixes \#450 [\#451](https://github.com/ZoneMinder/ZoneMinder/pull/451) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Update downloads.html [\#448](https://github.com/ZoneMinder/ZoneMinder/pull/448) ([barjac](https://github.com/barjac))
+- scripts: BusyBox compatibility [\#445](https://github.com/ZoneMinder/ZoneMinder/pull/445) ([clandmeter](https://github.com/clandmeter))
+- Fixed issue DateTime handling in filter queries that broke timeline view... [\#442](https://github.com/ZoneMinder/ZoneMinder/pull/442) ([Tim-Craig](https://github.com/Tim-Craig))
+- Cleaning up the Contribution section of the README [\#440](https://github.com/ZoneMinder/ZoneMinder/pull/440) ([kylejohnson](https://github.com/kylejohnson))
+- Add Bountysource badge to README [\#438](https://github.com/ZoneMinder/ZoneMinder/pull/438) ([bountysource-support](https://github.com/bountysource-support))
+- Add new colums to zm\_create.sql.in [\#426](https://github.com/ZoneMinder/ZoneMinder/pull/426) ([m-bene](https://github.com/m-bene))
+- Ffmpegoptions [\#421](https://github.com/ZoneMinder/ZoneMinder/pull/421) ([m-bene](https://github.com/m-bene))
+- Update zm\_jpeg.cpp [\#418](https://github.com/ZoneMinder/ZoneMinder/pull/418) ([ghost](https://github.com/ghost))
+- Added an FAQ for AlarmCheckMethod [\#416](https://github.com/ZoneMinder/ZoneMinder/pull/416) ([kylejohnson](https://github.com/kylejohnson))
+- make skin selection persistent [\#415](https://github.com/ZoneMinder/ZoneMinder/pull/415) ([m-bene](https://github.com/m-bene))
+- Added a doc for contributing to the project [\#413](https://github.com/ZoneMinder/ZoneMinder/pull/413) ([kylejohnson](https://github.com/kylejohnson))
+- Update zmtrigger.pl.in [\#411](https://github.com/ZoneMinder/ZoneMinder/pull/411) ([martin67](https://github.com/martin67))
+- Add the web/api folder to cmake [\#409](https://github.com/ZoneMinder/ZoneMinder/pull/409) ([mastertheknife](https://github.com/mastertheknife))
+- Move API to under web dir [\#408](https://github.com/ZoneMinder/ZoneMinder/pull/408) ([kylejohnson](https://github.com/kylejohnson))
+- Rtsp digest [\#407](https://github.com/ZoneMinder/ZoneMinder/pull/407) ([m-bene](https://github.com/m-bene))
+- focus popup windows [\#406](https://github.com/ZoneMinder/ZoneMinder/pull/406) ([m-bene](https://github.com/m-bene))
+- remove call of undefined "fixDevices" function [\#405](https://github.com/ZoneMinder/ZoneMinder/pull/405) ([m-bene](https://github.com/m-bene))
+- Zms/videostream improvements [\#404](https://github.com/ZoneMinder/ZoneMinder/pull/404) ([Sune1337](https://github.com/Sune1337))
+- RESTful API in CakePHP, and docs [\#403](https://github.com/ZoneMinder/ZoneMinder/pull/403) ([kylejohnson](https://github.com/kylejohnson))
+- Remove SVN install from Travis CI [\#395](https://github.com/ZoneMinder/ZoneMinder/pull/395) ([hamiltont](https://github.com/hamiltont))
+- Remove Subversion from prerequesite lists [\#393](https://github.com/ZoneMinder/ZoneMinder/pull/393) ([hamiltont](https://github.com/hamiltont))
+- Dockerfile works properly, documentation updated [\#392](https://github.com/ZoneMinder/ZoneMinder/pull/392) ([hamiltont](https://github.com/hamiltont))
+- Remove apt-get upgrade [\#390](https://github.com/ZoneMinder/ZoneMinder/pull/390) ([hamiltont](https://github.com/hamiltont))
+- Update README.OpenSuse [\#389](https://github.com/ZoneMinder/ZoneMinder/pull/389) ([PX03AFK](https://github.com/PX03AFK))
+- Update CMakeLists.txt [\#388](https://github.com/ZoneMinder/ZoneMinder/pull/388) ([PX03AFK](https://github.com/PX03AFK))
+- Update zoneminder.cmake.OS13.spec - minor corrections [\#387](https://github.com/ZoneMinder/ZoneMinder/pull/387) ([PX03AFK](https://github.com/PX03AFK))
+- fix sql error which prevents remote login from working [\#385](https://github.com/ZoneMinder/ZoneMinder/pull/385) ([maciekczwa](https://github.com/maciekczwa))
+- Fix window sizes and input field sizes for flat skin [\#381](https://github.com/ZoneMinder/ZoneMinder/pull/381) ([m-bene](https://github.com/m-bene))
+- Fix reload loop on switching skins [\#380](https://github.com/ZoneMinder/ZoneMinder/pull/380) ([m-bene](https://github.com/m-bene))
+- Ability to skip frames in motion detection. [\#377](https://github.com/ZoneMinder/ZoneMinder/pull/377) ([Sune1337](https://github.com/Sune1337))
+- same dvr controlls in event as in monitor [\#375](https://github.com/ZoneMinder/ZoneMinder/pull/375) ([m-bene](https://github.com/m-bene))
+- do not quote column names in parse filter [\#374](https://github.com/ZoneMinder/ZoneMinder/pull/374) ([m-bene](https://github.com/m-bene))
+- Fix 'Undefined index: filter' php warnings for filter view when [\#373](https://github.com/ZoneMinder/ZoneMinder/pull/373) ([m-bene](https://github.com/m-bene))
+- Reduce window size to exclude task bar area [\#371](https://github.com/ZoneMinder/ZoneMinder/pull/371) ([m-bene](https://github.com/m-bene))
+- Update zoneminder.tmpfiles [\#367](https://github.com/ZoneMinder/ZoneMinder/pull/367) ([PX03AFK](https://github.com/PX03AFK))
+- Update zoneminder.cmake.OS13.spec [\#362](https://github.com/ZoneMinder/ZoneMinder/pull/362) ([PX03AFK](https://github.com/PX03AFK))
+- Update README.OpenSuse [\#361](https://github.com/ZoneMinder/ZoneMinder/pull/361) ([PX03AFK](https://github.com/PX03AFK))
+- fix eyezm authentication issue [\#359](https://github.com/ZoneMinder/ZoneMinder/pull/359) ([knnniggett](https://github.com/knnniggett))
+- Fix prev button while in gapless mode.  All buttons tested and working. [\#358](https://github.com/ZoneMinder/ZoneMinder/pull/358) ([knnniggett](https://github.com/knnniggett))
+- Update zmupdate.pl.in [\#353](https://github.com/ZoneMinder/ZoneMinder/pull/353) ([barjac](https://github.com/barjac))
+- make curl header check case insensitive [\#352](https://github.com/ZoneMinder/ZoneMinder/pull/352) ([m-bene](https://github.com/m-bene))
+- tie distro/opensuse folder into cmake build process [\#349](https://github.com/ZoneMinder/ZoneMinder/pull/349) ([knnniggett](https://github.com/knnniggett))
+- Initial upload for opensuse rpm [\#348](https://github.com/ZoneMinder/ZoneMinder/pull/348) ([PX03AFK](https://github.com/PX03AFK))
+- Patch for Debian bug 736516 - FTBFS on powerpc arch. [\#346](https://github.com/ZoneMinder/ZoneMinder/pull/346) ([knnniggett](https://github.com/knnniggett))
+- Nagyrobi [\#342](https://github.com/ZoneMinder/ZoneMinder/pull/342) ([knnniggett](https://github.com/knnniggett))
+- add feature to extend preclusive zone alarm state by x frames [\#338](https://github.com/ZoneMinder/ZoneMinder/pull/338) ([m-bene](https://github.com/m-bene))
+- Support building with new libavcodec versions. [\#325](https://github.com/ZoneMinder/ZoneMinder/pull/325) ([elenril](https://github.com/elenril))
+- Mysql2 pdo [\#231](https://github.com/ZoneMinder/ZoneMinder/pull/231) ([connortechnology](https://github.com/connortechnology))
+
+## [v1.27.0](https://github.com/ZoneMinder/ZoneMinder/tree/v1.27.0) (2014-03-15)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.5...v1.27.0)
+
+**Implemented enhancements:**
+
+- Change help text of source "Maximum FPS" and "Alarm Maximum FPS" to note that this should only be used on analog cameras [\#273](https://github.com/ZoneMinder/ZoneMinder/issues/273)
+- Make zmpkg.pl 'better' [\#272](https://github.com/ZoneMinder/ZoneMinder/issues/272)
+- Enhance security by creating SELinux policies. [\#248](https://github.com/ZoneMinder/ZoneMinder/issues/248)
+- Update wiki page \(please?\) [\#91](https://github.com/ZoneMinder/ZoneMinder/issues/91)
+- Better ffmpeg Version Checking [\#31](https://github.com/ZoneMinder/ZoneMinder/issues/31)
+- Proposed: Enable purgewhenfull filter by default [\#332](https://github.com/ZoneMinder/ZoneMinder/issues/332)
+- Exportable Camera Configs [\#86](https://github.com/ZoneMinder/ZoneMinder/issues/86)
+
+**Fixed bugs:**
+
+- Vivotek cameras, ultra slow FPS. [\#204](https://github.com/ZoneMinder/ZoneMinder/issues/204)
+- Script to remove auto-generated files [\#112](https://github.com/ZoneMinder/ZoneMinder/issues/112)
+- zm\_mpeg no longer uses correct ffmpeg API's [\#83](https://github.com/ZoneMinder/ZoneMinder/issues/83)
+- Not all options in Monitors/add.ctp are saved to the database [\#13](https://github.com/ZoneMinder/ZoneMinder/issues/13)
+- Flat skin needs window widths fixed [\#331](https://github.com/ZoneMinder/ZoneMinder/issues/331)
+- Configuration gets broken in database after crash [\#239](https://github.com/ZoneMinder/ZoneMinder/issues/239)
+- zmc crashes after a few minutes of usage in 1.26.4 [\#237](https://github.com/ZoneMinder/ZoneMinder/issues/237)
+
+**Closed issues:**
+
+- Apache using private /tmp space [\#307](https://github.com/ZoneMinder/ZoneMinder/issues/307)
+- zmtrigger.pl crashes, which keeps Monitors in alarm state. [\#295](https://github.com/ZoneMinder/ZoneMinder/issues/295)
+- SQL-ERR using Timeline after executing Filter matching on string with whitespace [\#291](https://github.com/ZoneMinder/ZoneMinder/issues/291)
+- zm\_signal.cpp crashing signal 11 \(Segmentation fault\) [\#288](https://github.com/ZoneMinder/ZoneMinder/issues/288)
+- Zoneminder no longer builds when using -DZM\_NO\_FFMPEG=ON [\#285](https://github.com/ZoneMinder/ZoneMinder/issues/285)
+- Can't to use chinese [\#278](https://github.com/ZoneMinder/ZoneMinder/issues/278)
+- jquery is embedded inside export\_functions.php [\#274](https://github.com/ZoneMinder/ZoneMinder/issues/274)
+- Implement live streaming of H264 camera streams [\#176](https://github.com/ZoneMinder/ZoneMinder/issues/176)
+- Support non-embedded password challenge [\#33](https://github.com/ZoneMinder/ZoneMinder/issues/33)
+- libvlc source type not working in Ubuntu 12.04.3 [\#330](https://github.com/ZoneMinder/ZoneMinder/issues/330)
+- zmupdate.pl InnoDB conversion silent failure [\#320](https://github.com/ZoneMinder/ZoneMinder/issues/320)
+- Release v1.27.0 \[$100 awarded\] [\#315](https://github.com/ZoneMinder/ZoneMinder/issues/315)
+- Default skin is flat, can't switch to classic.  ?skin doesn't help [\#313](https://github.com/ZoneMinder/ZoneMinder/issues/313)
+- make failure [\#304](https://github.com/ZoneMinder/ZoneMinder/issues/304)
+- Fix 'remote' AUTH\_TYPE [\#296](https://github.com/ZoneMinder/ZoneMinder/issues/296)
+- Use libcurl for http\(s\) authentication with remote cameras \[$400 awarded\] [\#238](https://github.com/ZoneMinder/ZoneMinder/issues/238)
+
+**Merged pull requests:**
+
+- Release 1.27 [\#341](https://github.com/ZoneMinder/ZoneMinder/pull/341) ([kylejohnson](https://github.com/kylejohnson))
+- Fix popup sizes in flat skins.  Fixes \#331 [\#334](https://github.com/ZoneMinder/ZoneMinder/pull/334) ([kylejohnson](https://github.com/kylejohnson))
+- zmcamtool.pl - import and export ptz camera controls & camera presets [\#318](https://github.com/ZoneMinder/ZoneMinder/pull/318) ([kylejohnson](https://github.com/kylejohnson))
+- Example script to react to monitor alarms [\#317](https://github.com/ZoneMinder/ZoneMinder/pull/317) ([kylejohnson](https://github.com/kylejohnson))
+- Change comments for many Camera subclasses [\#316](https://github.com/ZoneMinder/ZoneMinder/pull/316) ([nereocystis](https://github.com/nereocystis))
+- Enable universe in the Docker container \[ci skip\] [\#310](https://github.com/ZoneMinder/ZoneMinder/pull/310) ([kylejohnson](https://github.com/kylejohnson))
+- Add wget to Dockerfile prereq [\#309](https://github.com/ZoneMinder/ZoneMinder/pull/309) ([kylejohnson](https://github.com/kylejohnson))
+- Add paths to flat skin in configure.ac and Makefile.am [\#308](https://github.com/ZoneMinder/ZoneMinder/pull/308) ([kylejohnson](https://github.com/kylejohnson))
+- Zoneminder - flat theme. [\#303](https://github.com/ZoneMinder/ZoneMinder/pull/303) ([justinlawrence](https://github.com/justinlawrence))
+- Additional compile guards to allow compilation on non-x86 archs [\#302](https://github.com/ZoneMinder/ZoneMinder/pull/302) ([pjhacnau](https://github.com/pjhacnau))
+- Adding PTZ module for Toshiba IK-WB11A [\#300](https://github.com/ZoneMinder/ZoneMinder/pull/300) ([Tim-Craig](https://github.com/Tim-Craig))
+- Add cURL source type [\#297](https://github.com/ZoneMinder/ZoneMinder/pull/297) ([mastertheknife](https://github.com/mastertheknife))
+- glob ptz scripts under control folder [\#294](https://github.com/ZoneMinder/ZoneMinder/pull/294) ([knnniggett](https://github.com/knnniggett))
+- Enclose value of the Notes attribute with quotes. [\#293](https://github.com/ZoneMinder/ZoneMinder/pull/293) ([hankintosh](https://github.com/hankintosh))
+- Fix for few problems in Debian packaging [\#290](https://github.com/ZoneMinder/ZoneMinder/pull/290) ([dmak](https://github.com/dmak))
+- Foscam IP cameras control script [\#289](https://github.com/ZoneMinder/ZoneMinder/pull/289) ([dmak](https://github.com/dmak))
+- Specfile changes related to zmfix [\#284](https://github.com/ZoneMinder/ZoneMinder/pull/284) ([knnniggett](https://github.com/knnniggett))
+- Remove references to zmfix in /distros [\#283](https://github.com/ZoneMinder/ZoneMinder/pull/283) ([nkwood](https://github.com/nkwood))
+- Add zmMontageScale so montage scale is also 'saved' [\#282](https://github.com/ZoneMinder/ZoneMinder/pull/282) ([scottgrobinson](https://github.com/scottgrobinson))
+- In the web/includes/functions.php there were some html formatting errors... [\#281](https://github.com/ZoneMinder/ZoneMinder/pull/281) ([martonmiklos](https://github.com/martonmiklos))
+- Remove zmfix [\#280](https://github.com/ZoneMinder/ZoneMinder/pull/280) ([mastertheknife](https://github.com/mastertheknife))
+- Add libVLC monitor type [\#277](https://github.com/ZoneMinder/ZoneMinder/pull/277) ([ebarnard](https://github.com/ebarnard))
+- Disables non-POSIX warning when using gnu wildcard [\#276](https://github.com/ZoneMinder/ZoneMinder/pull/276) ([knnniggett](https://github.com/knnniggett))
+- remove embedded jquery. \(fixes \#274\) [\#275](https://github.com/ZoneMinder/ZoneMinder/pull/275) ([kylejohnson](https://github.com/kylejohnson))
+- Fixes \#313, initial commit of 'working' dockerfile [\#314](https://github.com/ZoneMinder/ZoneMinder/pull/314) ([kylejohnson](https://github.com/kylejohnson))
+
+## [v1.26.5](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.5) (2013-12-16)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.4...v1.26.5)
+
+**Implemented enhancements:**
+
+- ZoneMinder domain / website / email [\#225](https://github.com/ZoneMinder/ZoneMinder/issues/225)
+
+**Fixed bugs:**
+
+- Post shmget problem due to \*code\* not shmmax/shmall [\#226](https://github.com/ZoneMinder/ZoneMinder/issues/226)
+- SQL error when "pre event image count" \>150 or so due to insufficient ZM\_SQL\_LGE\_BUFSIZ [\#222](https://github.com/ZoneMinder/ZoneMinder/issues/222)
+- 'asm' operand has impossible constraints [\#219](https://github.com/ZoneMinder/ZoneMinder/issues/219)
+- ipv6 support [\#210](https://github.com/ZoneMinder/ZoneMinder/issues/210)
+- RTSP decoding errors in 1.26.4 \[$450 awarded\] [\#221](https://github.com/ZoneMinder/ZoneMinder/issues/221)
+- The Prev "\<+" button does not work [\#32](https://github.com/ZoneMinder/ZoneMinder/issues/32)
+
+**Closed issues:**
+
+- Strict subs error? [\#262](https://github.com/ZoneMinder/ZoneMinder/issues/262)
+- PHP depreciating [\#229](https://github.com/ZoneMinder/ZoneMinder/issues/229)
+- Add a feature to monitor camera\(s\) availability [\#228](https://github.com/ZoneMinder/ZoneMinder/issues/228)
+- Release 1.26.4 [\#202](https://github.com/ZoneMinder/ZoneMinder/issues/202)
+- 631969 - 2 problems with options screen [\#106](https://github.com/ZoneMinder/ZoneMinder/issues/106)
+- 657620 - Path issues for js scripts [\#102](https://github.com/ZoneMinder/ZoneMinder/issues/102)
+- Support http digest authentication for IP camera access [\#30](https://github.com/ZoneMinder/ZoneMinder/issues/30)
+
+**Merged pull requests:**
+
+- Add reference to zm\_update-1.26.5.sql in Makefile.am [\#269](https://github.com/ZoneMinder/ZoneMinder/pull/269) ([knnniggett](https://github.com/knnniggett))
+- Detection Support for WansView Cams [\#268](https://github.com/ZoneMinder/ZoneMinder/pull/268) ([Phhere](https://github.com/Phhere))
+- use proper DBI parameter passing to improve security [\#264](https://github.com/ZoneMinder/ZoneMinder/pull/264) ([connortechnology](https://github.com/connortechnology))
+- Network Detection Support for Wansview [\#257](https://github.com/ZoneMinder/ZoneMinder/pull/257) ([Phhere](https://github.com/Phhere))
+- Fix checkJsonError messages [\#256](https://github.com/ZoneMinder/ZoneMinder/pull/256) ([Phhere](https://github.com/Phhere))
+- Update README.md [\#255](https://github.com/ZoneMinder/ZoneMinder/pull/255) ([zdanek](https://github.com/zdanek))
+- ipv6 support [\#252](https://github.com/ZoneMinder/ZoneMinder/pull/252) ([guotie](https://github.com/guotie))
+- Better inno d bupdate [\#251](https://github.com/ZoneMinder/ZoneMinder/pull/251) ([connortechnology](https://github.com/connortechnology))
+- Fix shared memory errors on centos 6.4 [\#250](https://github.com/ZoneMinder/ZoneMinder/pull/250) ([insidenothing](https://github.com/insidenothing))
+- Update zoneminder.service [\#246](https://github.com/ZoneMinder/ZoneMinder/pull/246) ([dtmf](https://github.com/dtmf))
+- remove extra stuff that I don't think we need because we are the source.  Opinions? [\#240](https://github.com/ZoneMinder/ZoneMinder/pull/240) ([connortechnology](https://github.com/connortechnology))
+- Re-Add ZM\_PATH\_DATA [\#236](https://github.com/ZoneMinder/ZoneMinder/pull/236) ([knnniggett](https://github.com/knnniggett))
+- Cast content\_length to signed int for error-check comparison [\#232](https://github.com/ZoneMinder/ZoneMinder/pull/232) ([josephevans](https://github.com/josephevans))
+- Apply INSERTs in Event::AddFrames in batches to fix issue \#222 [\#223](https://github.com/ZoneMinder/ZoneMinder/pull/223) ([fastolfe](https://github.com/fastolfe))
+- Updates to the zones view and edit pages [\#220](https://github.com/ZoneMinder/ZoneMinder/pull/220) ([kylejohnson](https://github.com/kylejohnson))
+- ffmpeg detection improvements [\#218](https://github.com/ZoneMinder/ZoneMinder/pull/218) ([mastertheknife](https://github.com/mastertheknife))
+- cmake support files for redhat/centos distros [\#217](https://github.com/ZoneMinder/ZoneMinder/pull/217) ([knnniggett](https://github.com/knnniggett))
+- Create ZM\_TARGET\_DISTRO [\#216](https://github.com/ZoneMinder/ZoneMinder/pull/216) ([knnniggett](https://github.com/knnniggett))
+- We need a toggle for x10 support [\#215](https://github.com/ZoneMinder/ZoneMinder/pull/215) ([knnniggett](https://github.com/knnniggett))
+- Cmake support files for fedora distro [\#214](https://github.com/ZoneMinder/ZoneMinder/pull/214) ([knnniggett](https://github.com/knnniggett))
+- Initial zone editing in html5 canvas [\#213](https://github.com/ZoneMinder/ZoneMinder/pull/213) ([kylejohnson](https://github.com/kylejohnson))
+- ZoneMinder Dutch Translation updates by Alco \(a.k. nightcrawler\) [\#211](https://github.com/ZoneMinder/ZoneMinder/pull/211) ([kylejohnson](https://github.com/kylejohnson))
+- Change Prev Button functionality [\#207](https://github.com/ZoneMinder/ZoneMinder/pull/207) ([knnniggett](https://github.com/knnniggett))
+- Delete PATH\_BUILD and TIME\_BUILD from zm.conf and fix ZM\_DB\_TYPE [\#243](https://github.com/ZoneMinder/ZoneMinder/pull/243) ([mastertheknife](https://github.com/mastertheknife))
+- Removeversionnumberfromzm.conf [\#242](https://github.com/ZoneMinder/ZoneMinder/pull/242) ([connortechnology](https://github.com/connortechnology))
+- Add alarm reference image blend percentage option and replace the text field if fast blends are enabled [\#241](https://github.com/ZoneMinder/ZoneMinder/pull/241) ([mastertheknife](https://github.com/mastertheknife))
+- Fix marker-out-of-bounds crash when defining zone points [\#233](https://github.com/ZoneMinder/ZoneMinder/pull/233) ([fastolfe](https://github.com/fastolfe))
+
+## [v1.26.4](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.4) (2013-10-08)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.3...v1.26.4)
+
+**Implemented enhancements:**
+
+- Configuration options should be handled in the model, not the controller [\#191](https://github.com/ZoneMinder/ZoneMinder/issues/191)
+- Travis CI automatic building [\#168](https://github.com/ZoneMinder/ZoneMinder/issues/168)
+- Switch h264 feature branch to track the modern branch [\#167](https://github.com/ZoneMinder/ZoneMinder/issues/167)
+- Add redhat specific files to source tree [\#115](https://github.com/ZoneMinder/ZoneMinder/issues/115)
+- Performing count\(\) in SQL is slower than in PHP [\#2](https://github.com/ZoneMinder/ZoneMinder/issues/2)
+
+**Fixed bugs:**
+
+- New WebUI displays horizontal scroll bar with 100% width [\#169](https://github.com/ZoneMinder/ZoneMinder/issues/169)
+-  syntax error, unexpected $end on line 16 in LiveStreamHelper.php [\#147](https://github.com/ZoneMinder/ZoneMinder/issues/147)
+- Readme.fedora contains incorrect references [\#145](https://github.com/ZoneMinder/ZoneMinder/issues/145)
+- Bandwidth cookie issues [\#143](https://github.com/ZoneMinder/ZoneMinder/issues/143)
+- Monitor image invalid when monitor not enabled [\#140](https://github.com/ZoneMinder/ZoneMinder/issues/140)
+- Monitor image size too small [\#139](https://github.com/ZoneMinder/ZoneMinder/issues/139)
+
+**Closed issues:**
+
+- MJPEG without cambozola.jar on modern browsers \(including Linux ones\) [\#198](https://github.com/ZoneMinder/ZoneMinder/issues/198)
+- Ability to hide all 'controls' and menus [\#171](https://github.com/ZoneMinder/ZoneMinder/issues/171)
+- strace on zma gives "timer\_gettime...\(..\).. = -1 EINVAL \(Invalid argument\)" [\#170](https://github.com/ZoneMinder/ZoneMinder/issues/170)
+- Add ability to zms \(or use the segmenter\) to play back h264 video either directly or transcoded [\#166](https://github.com/ZoneMinder/ZoneMinder/issues/166)
+- I can delete multiple events at once. [\#137](https://github.com/ZoneMinder/ZoneMinder/issues/137)
+- I can view logs [\#135](https://github.com/ZoneMinder/ZoneMinder/issues/135)
+- I can update system config / options [\#134](https://github.com/ZoneMinder/ZoneMinder/issues/134)
+- I can change the order of monitors [\#132](https://github.com/ZoneMinder/ZoneMinder/issues/132)
+- When a new version is available, I am alerted [\#130](https://github.com/ZoneMinder/ZoneMinder/issues/130)
+- Bandwidth is updated on the UI after chaning it [\#129](https://github.com/ZoneMinder/ZoneMinder/issues/129)
+- I can change the bandwidth [\#128](https://github.com/ZoneMinder/ZoneMinder/issues/128)
+- I can delete events [\#126](https://github.com/ZoneMinder/ZoneMinder/issues/126)
+- I can view monitor streams individually [\#125](https://github.com/ZoneMinder/ZoneMinder/issues/125)
+- 667428 - ftbfs with GCC-4.7 [\#99](https://github.com/ZoneMinder/ZoneMinder/issues/99)
+- 707411 - FTBFS: zm\_local\_camera.cpp:742:49: error: invalid conversion from '\_\_u32 {aka unsigned int}' to 'v4l2\_buf\_type' [\#97](https://github.com/ZoneMinder/ZoneMinder/issues/97)
+- Change in monitor setup requested. [\#19](https://github.com/ZoneMinder/ZoneMinder/issues/19)
+
+**Merged pull requests:**
+
+- Change frameserver warnings to debug level 2 [\#205](https://github.com/ZoneMinder/ZoneMinder/pull/205) ([knnniggett](https://github.com/knnniggett))
+- Create pkgdatadir in make [\#203](https://github.com/ZoneMinder/ZoneMinder/pull/203) ([knnniggett](https://github.com/knnniggett))
+- Signal improvements and fixes [\#201](https://github.com/ZoneMinder/ZoneMinder/pull/201) ([mastertheknife](https://github.com/mastertheknife))
+- Create ZM\_PATH\_DATA and point zmupdate to ZM\_PATH\_DATA/db [\#200](https://github.com/ZoneMinder/ZoneMinder/pull/200) ([knnniggett](https://github.com/knnniggett))
+- remove ${CMAKE\_CURRENT\_SOURCE\_DIR} from add\_custom\_target [\#199](https://github.com/ZoneMinder/ZoneMinder/pull/199) ([knnniggett](https://github.com/knnniggett))
+- Updated cmake for the modern WebUI branch [\#196](https://github.com/ZoneMinder/ZoneMinder/pull/196) ([mastertheknife](https://github.com/mastertheknife))
+- Added missing word in readme [\#194](https://github.com/ZoneMinder/ZoneMinder/pull/194) ([WDKevin](https://github.com/WDKevin))
+- Moved writing of configure options from Controller to Model. Fixes \#191. [\#193](https://github.com/ZoneMinder/ZoneMinder/pull/193) ([kylejohnson](https://github.com/kylejohnson))
+- Moved zmBandwidth option from cookie to Configure:: option.  Might fix \#175 [\#190](https://github.com/ZoneMinder/ZoneMinder/pull/190) ([kylejohnson](https://github.com/kylejohnson))
+- Moved the Config tabs to the sidebar [\#185](https://github.com/ZoneMinder/ZoneMinder/pull/185) ([kylejohnson](https://github.com/kylejohnson))
+- Added datetime picker support and implemented on events sidebar [\#179](https://github.com/ZoneMinder/ZoneMinder/pull/179) ([WDKevin](https://github.com/WDKevin))
+- Add cmake to ZoneMinder [\#178](https://github.com/ZoneMinder/ZoneMinder/pull/178) ([mastertheknife](https://github.com/mastertheknife))
+- Fixes the fixed-width container bug in bootstrap [\#177](https://github.com/ZoneMinder/ZoneMinder/pull/177) ([WDKevin](https://github.com/WDKevin))
+- Rtsp updates [\#174](https://github.com/ZoneMinder/ZoneMinder/pull/174) ([POKKAHOH](https://github.com/POKKAHOH))
+- Minor patches to support older ffmpeg under distro's like Ubuntu 12.04 [\#173](https://github.com/ZoneMinder/ZoneMinder/pull/173) ([chetan-prime](https://github.com/chetan-prime))
+- Solution for Issue \#170 [\#172](https://github.com/ZoneMinder/ZoneMinder/pull/172) ([raulcaj](https://github.com/raulcaj))
+- Fixing debian build files including automated database setup [\#164](https://github.com/ZoneMinder/ZoneMinder/pull/164) ([jaydio](https://github.com/jaydio))
+- Add fedora rpm development files to zoneminder source tree [\#163](https://github.com/ZoneMinder/ZoneMinder/pull/163) ([knnniggett](https://github.com/knnniggett))
+- Improve Chrome browser support & log streaming events [\#162](https://github.com/ZoneMinder/ZoneMinder/pull/162) ([knnniggett](https://github.com/knnniggett))
+- Merge master into modern to keep changes up to date [\#161](https://github.com/ZoneMinder/ZoneMinder/pull/161) ([chriswiggins](https://github.com/chriswiggins))
+- Checks for updates every 5 minutes and notifies the user when there is one [\#158](https://github.com/ZoneMinder/ZoneMinder/pull/158) ([WDKevin](https://github.com/WDKevin))
+- Dynamic monitor resizing [\#157](https://github.com/ZoneMinder/ZoneMinder/pull/157) ([chriswiggins](https://github.com/chriswiggins))
+- Delete multiple events at once [\#156](https://github.com/ZoneMinder/ZoneMinder/pull/156) ([WDKevin](https://github.com/WDKevin))
+- Added missing jquery-2.0.1.min.map file [\#155](https://github.com/ZoneMinder/ZoneMinder/pull/155) ([WDKevin](https://github.com/WDKevin))
+- Add support to change order of monitors [\#154](https://github.com/ZoneMinder/ZoneMinder/pull/154) ([WDKevin](https://github.com/WDKevin))
+- Can't seem to catch a break tonight.  Moving debian files into correct folder [\#149](https://github.com/ZoneMinder/ZoneMinder/pull/149) ([knnniggett](https://github.com/knnniggett))
+- Move debian folder under distros [\#148](https://github.com/ZoneMinder/ZoneMinder/pull/148) ([knnniggett](https://github.com/knnniggett))
+- Removing the redhat folder from the root for real this time [\#141](https://github.com/ZoneMinder/ZoneMinder/pull/141) ([knnniggett](https://github.com/knnniggett))
+- Redhat [\#136](https://github.com/ZoneMinder/ZoneMinder/pull/136) ([knnniggett](https://github.com/knnniggett))
+- Error correction in database creation script [\#122](https://github.com/ZoneMinder/ZoneMinder/pull/122) ([dukess](https://github.com/dukess))
+- Rewritten the query to allow mysql to use indexes [\#121](https://github.com/ZoneMinder/ZoneMinder/pull/121) ([rkojedzinszky](https://github.com/rkojedzinszky))
+- Update zmupdate.pl.in for 1.26.3 release [\#119](https://github.com/ZoneMinder/ZoneMinder/pull/119) ([knnniggett](https://github.com/knnniggett))
+
+## [v1.26.3](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.3) (2013-09-10)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.2...v1.26.3)
+
+**Fixed bugs:**
+
+- syntax error near unexpected token `5.6.0' [\#118](https://github.com/ZoneMinder/ZoneMinder/issues/118)
+- Must modify zmupdate whenever the zm release number is incremented [\#114](https://github.com/ZoneMinder/ZoneMinder/issues/114)
+
+**Merged pull requests:**
+
+- Add 1.26.1 and 1.26.2 releases to zmupdate [\#116](https://github.com/ZoneMinder/ZoneMinder/pull/116) ([knnniggett](https://github.com/knnniggett))
+
+## [v1.26.2](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.2) (2013-09-06)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.1...v1.26.2)
+
+**Implemented enhancements:**
+
+- Update zmupdate to look at the github repo for the latest version [\#109](https://github.com/ZoneMinder/ZoneMinder/issues/109)
+
+**Fixed bugs:**
+
+- 666980 - hash authentication broken in update [\#105](https://github.com/ZoneMinder/ZoneMinder/issues/105)
+
+**Closed issues:**
+
+- 1.26.1 didn't get bumped from 1.26.0 [\#113](https://github.com/ZoneMinder/ZoneMinder/issues/113)
+- Migrate FAQ from ZoneMinder Wiki to GitHub Wiki [\#110](https://github.com/ZoneMinder/ZoneMinder/issues/110)
+
+**Merged pull requests:**
+
+- Use GitHub repo for version check [\#111](https://github.com/ZoneMinder/ZoneMinder/pull/111) ([chriswiggins](https://github.com/chriswiggins))
+
+## [v1.26.1](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.1) (2013-09-06)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.0...v1.26.1)
+
+**Fixed bugs:**
+
+- Make and configure files are not in v1.26.0 [\#107](https://github.com/ZoneMinder/ZoneMinder/issues/107)
+
+## [v1.26.0](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.0) (2013-09-05)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26-beta.3...v1.26.0)
+
+**Closed issues:**
+
+- AM is deprecated in automake-1.13 onwards [\#94](https://github.com/ZoneMinder/ZoneMinder/issues/94)
+- CVE-2013-0232 [\#93](https://github.com/ZoneMinder/ZoneMinder/issues/93)
+- \[CRITICAL\] zms crashes with hashed authentication [\#88](https://github.com/ZoneMinder/ZoneMinder/issues/88)
+
+**Merged pull requests:**
+
+- Fix "Can't stat : No such file or directory" message [\#95](https://github.com/ZoneMinder/ZoneMinder/pull/95) ([knnniggett](https://github.com/knnniggett))
+- Update getBrowser\(\) to match IE10 [\#92](https://github.com/ZoneMinder/ZoneMinder/pull/92) ([knnniggett](https://github.com/knnniggett))
+- Update zmupdate.pl.in to give option to convert to InnoDB tables [\#84](https://github.com/ZoneMinder/ZoneMinder/pull/84) ([knnniggett](https://github.com/knnniggett))
+
+## [v1.26-beta.3](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26-beta.3) (2013-08-28)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26-beta.2...v1.26-beta.3)
+
+**Fixed bugs:**
+
+- libjpeg turbo errors during make [\#52](https://github.com/ZoneMinder/ZoneMinder/issues/52)
+
+**Closed issues:**
+
+- configure.ac checking for libavcore incorrectly [\#64](https://github.com/ZoneMinder/ZoneMinder/issues/64)
+
+**Merged pull requests:**
+
+- Fix for Issue \#88 - ZMS crashing [\#90](https://github.com/ZoneMinder/ZoneMinder/pull/90) ([knnniggett](https://github.com/knnniggett))
+- Fixed typo [\#89](https://github.com/ZoneMinder/ZoneMinder/pull/89) ([knnniggett](https://github.com/knnniggett))
+- edit zmupdate function in init script [\#87](https://github.com/ZoneMinder/ZoneMinder/pull/87) ([knnniggett](https://github.com/knnniggett))
+- Add PTZ control files and camera presets for specific ptz cameras. [\#85](https://github.com/ZoneMinder/ZoneMinder/pull/85) ([knnniggett](https://github.com/knnniggett))
+- Update Makefile.am [\#81](https://github.com/ZoneMinder/ZoneMinder/pull/81) ([knnniggett](https://github.com/knnniggett))
+- Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library [\#80](https://github.com/ZoneMinder/ZoneMinder/pull/80) ([knnniggett](https://github.com/knnniggett))
+- Added frameserver patch from Zoneminder Wiki [\#79](https://github.com/ZoneMinder/ZoneMinder/pull/79) ([knnniggett](https://github.com/knnniggett))
+- Don't check for gnutls-openssl on systems with older gnutls [\#78](https://github.com/ZoneMinder/ZoneMinder/pull/78) ([knnniggett](https://github.com/knnniggett))
+- Change default dB Engine from MyISAM to InnoDB [\#77](https://github.com/ZoneMinder/ZoneMinder/pull/77) ([knnniggett](https://github.com/knnniggett))
+- Added build notes for CentOS & RHEL [\#76](https://github.com/ZoneMinder/ZoneMinder/pull/76) ([knnniggett](https://github.com/knnniggett))
+
+## [v1.26-beta.2](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26-beta.2) (2013-08-15)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26-beta.1...v1.26-beta.2)
+
+**Implemented enhancements:**
+
+- Updated Hungarian translation [\#35](https://github.com/ZoneMinder/ZoneMinder/issues/35)
+
+**Fixed bugs:**
+
+- 1.26 Beta does not install SkyIPCam7xx.pm Control Script [\#38](https://github.com/ZoneMinder/ZoneMinder/issues/38)
+
+**Closed issues:**
+
+- Store video in a \*video\* format [\#40](https://github.com/ZoneMinder/ZoneMinder/issues/40)
+
+**Merged pull requests:**
+
+- Update hu\_hu.php [\#37](https://github.com/ZoneMinder/ZoneMinder/pull/37) ([nagyrobi](https://github.com/nagyrobi))
+
+## [v1.26-beta.1](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26-beta.1) (2013-08-13)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.25...v1.26-beta.1)
+
+**Implemented enhancements:**
+
+- Scripts should only be loaded on the pages they're needed [\#15](https://github.com/ZoneMinder/ZoneMinder/issues/15)
+
+**Fixed bugs:**
+
+- Control Types always none using source Ffmpeg [\#16](https://github.com/ZoneMinder/ZoneMinder/issues/16)
+- No PTZ control option when adding a new monitor [\#4](https://github.com/ZoneMinder/ZoneMinder/issues/4)
+-  Monitors/index.ctp Undefined offset error [\#1](https://github.com/ZoneMinder/ZoneMinder/issues/1)
+
+**Closed issues:**
+
+- Please Add my code for 0-23Hour 0n/off  Zone Operation [\#24](https://github.com/ZoneMinder/ZoneMinder/issues/24)
+
+## [v1.25](https://github.com/ZoneMinder/ZoneMinder/tree/v1.25) (2013-04-12)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -4,7 +4,7 @@
 #
 cmake_minimum_required (VERSION 2.6)
 project (zoneminder)
-set(zoneminder_VERSION "1.28.100")
+set(zoneminder_VERSION "1.28.108")
 # make API version a minor of ZM version
 set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")

@ -141,14 +141,17 @@ set(ZM_PERL_SEARCH_PATH "" CACHE PATH
 	where ZM_PERL_MM_PARMS has been modified such that ZoneMinder's Perl modules are 
 	installed outside Perl's default search path.")
 set(ZM_TARGET_DISTRO "" CACHE STRING 
-    "Build ZoneMinder for a specific distribution.  Currently, valid names are: f21, f20, el6, OS13")
+    "Build ZoneMinder for a specific distribution.  Currently, valid names are: f21, f22, el6, el7, OS13")

 # Reassign some variables if a target distro has been specified
-if((ZM_TARGET_DISTRO STREQUAL "f21") OR (ZM_TARGET_DISTRO STREQUAL "f20"))
+if((ZM_TARGET_DISTRO STREQUAL "f21") OR (ZM_TARGET_DISTRO STREQUAL "f22"))
 	set(ZM_RUNDIR "/var/run/zoneminder")
 	set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
 	set(ZM_TMPDIR "/var/lib/zoneminder/temp")
 	set(ZM_LOGDIR "/var/log/zoneminder")
+	set(ZM_CONFIG_DIR "/etc/zm")
+	set(ZM_WEBDIR "/usr/share/zoneminder/www")
+	set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
 elseif(ZM_TARGET_DISTRO STREQUAL "el6")
 	set(ZM_RUNDIR "/var/run/zoneminder")
 	set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
@ -173,7 +176,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 "f21") OR (ZM_TARGET_DISTRO STREQUAL "f20"))
+endif((ZM_TARGET_DISTRO STREQUAL "f21") OR (ZM_TARGET_DISTRO STREQUAL "f22"))

 # Required for certain checks to work
 set(CMAKE_EXTRA_INCLUDE_FILES 
@ -191,13 +194,21 @@ if(NOT HAVE_LIBV4L1_VIDEODEV_H)
 endif(NOT HAVE_LIBV4L1_VIDEODEV_H)
 check_include_file("linux/videodev2.h" HAVE_LINUX_VIDEODEV2_H)
 check_include_file("execinfo.h" HAVE_EXECINFO_H)
+if (HAVE_EXECINFO_H)
+  check_function_exists("backtrace" HAVE_DECL_BACKTRACE)
+  if (NOT HAVE_DECL_BACKTRACE)
+    find_library (EXECINFO_LIBRARY NAMES execinfo)
+    if (EXECINFO_LIBRARY)
+        list(APPEND ZM_BIN_LIBS "-l${EXECINFO_LIBRARY}")
+    endif (EXECINFO_LIBRARY)
+  endif (NOT HAVE_DECL_BACKTRACE)
+  check_function_exists("backtrace_symbols" HAVE_DECL_BACKTRACE_SYMBOLS)
+endif (HAVE_EXECINFO_H)
 check_include_file("ucontext.h" HAVE_UCONTEXT_H)
 check_include_file("sys/sendfile.h" HAVE_SYS_SENDFILE_H)
 check_include_file("sys/syscall.h" HAVE_SYS_SYSCALL_H)
 check_function_exists("syscall" HAVE_SYSCALL)
 check_function_exists("sendfile" HAVE_SENDFILE)
-check_function_exists("backtrace" HAVE_DECL_BACKTRACE)
-check_function_exists("backtrace_symbols" HAVE_DECL_BACKTRACE_SYMBOLS)
 check_function_exists("posix_memalign" HAVE_POSIX_MEMALIGN)
 check_type_size("siginfo_t" HAVE_SIGINFO_T)
 check_type_size("ucontext_t" HAVE_UCONTEXT_T)
@ -733,13 +744,13 @@ if(ZM_ONVIF)
 endif(ZM_ONVIF)

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

 # Print optional libraries detection status
 message(STATUS "Optional libraries found:${optlibsfound}")
@ -757,7 +768,11 @@ else(zmconfgen_result EQUAL 0)
 endif(zmconfgen_result EQUAL 0)

 # Install zm.conf
+if(NOT EXISTS "${ZM_CONFIG_DIR}/zm.conf")
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}")
+else(NOT EXISTS "${ZM_CONFIG_DIR}/zm.conf")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}" RENAME "zm.conf.new")
+endif(NOT EXISTS "${ZM_CONFIG_DIR}/zm.conf")

 # Uninstall target
 configure_file(
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -0,0 +1,17 @@
+# Contributing
+
+The ZoneMinder project was originally written by Philip Coombes in 2001. It has since moved to Github and is maintained by just a few who volunteer their spare time.  
+
+Over the years, ZoneMinder has accumulated a rather large user base. This presents a challenge to the development team when it comes to managing communications. Welcome to the world of software development, right?
+
+In order to keep the kinds of issues, which require changes to the source code, separate from all other questions and comments, our methods of communication are organized in the following manner:
+
+- The ZoneMinder Github forum is intended for bug reports and serious feature requests only
+- The ZoneMinder user forum is intended for general questions and tech support
+- The ZoneMinder IRC channel is intended for general questions and tech support
+
+More details can be found in our [Github Posting Rules](https://github.com/ZoneMinder/ZoneMinder/wiki/Github-Posting-Rules). Please read this before creating an issue in our Github forum.
+
+Knowledge of Github is a necessary first step to contribute to the project. To contribute, one must generate a pull request. For those just starting out, [this guide](https://github.com/ZoneMinder/ZoneMinder/wiki/Understanding-Github-and-Pull-Requests) will step you through the process. 
+
+Note that pasting code into our Github forum, with the expectation we will do the work for you, is not acceptable.
--- a/5
+++ b/5
@ -92,8 +92,9 @@ NOTE: The database server, database name, user and password can be different and
 7) Populate the zoneminder database using the script zm_create.sql. This should be found in <prefix>/share/zoneminder/db or in the project/db directory.

 8) Create an apache virtual host for ZoneMinder. Make sure to use the same paths as ZM_WEBDIR and ZM_CGIDIR in /etc/zm.conf
-9) Create other config if desired (e.g. rsyslog, logrotate and such). Some of this can be found in <prefix>/share/zoneminder/misc or project/misc directory
-10) Setup an appropriate startup script for your system. Two generic startup scripts have been provided, a legacy Sys V Init script and a Systemd service file.
+9) Verify date.timezone is set to your timezone. This parameter is often found inside the system php.ini file. Consult your distribution's documentation for the proper way to set this value.
+10) Create other config if desired (e.g. rsyslog, logrotate and such). Some of this can be found in <prefix>/share/zoneminder/misc or project/misc directory
+11) Setup an appropriate startup script for your system. Two generic startup scripts have been provided, a legacy Sys V Init script and a Systemd service file.

 *Sys V Init Setup*
 - Copy the sys v init script /scripts/zm from the build folder to /etc/init. 
--- a/README.md
+++ b/README.md
@ -12,7 +12,7 @@ All documentation for ZoneMinder is now online at http://www.zoneminder.com/wiki

 ZoneMinder is an integrated set of applications which provide a complete surveillance solution allowing capture, analysis, recording and monitoring of any CCTV or security cameras attached to a Linux based machine. It is designed to run on distributions which support the Video For Linux (V4L) interface and has been tested with video cameras attached to BTTV cards, various USB cameras and also supports most IP network cameras. 

-## Contacting the Developement Team
+## Contacting the Development Team
 Before creating an issue in our github forum, please read our posting rules:
 https://github.com/ZoneMinder/ZoneMinder/wiki/Github-Posting-Rules

@ -47,7 +47,7 @@ Lastly, if you desire to build a development snapshot from the master branch, it

 What follows are instructions for various distros to build ZoneMinder into a package.

-### Package Maintainters
+### Package Maintainers
 Many of the ZoneMinder configration variable default values are not configurable at build time through autotools or cmake.  A new tool called *zmeditconfigdata.sh* has been added to allow package maintainers to manipulate any variable stored in ConfigData.pm without patching the source. 

 For example, let's say I have created a new ZoneMinder package that contains the cambolzola javascript file.  However, by default cambozola support is turned off.  To fix that, add this to the pacakging script:
@ -143,8 +143,6 @@ root@host:~# gdebi /root/zoneminder_1.26.4-1_amd64.deb;

 #### Fedora / CentOS / RHEL

-***DRAFT* ** Needs Testing
-
 ##### Background
 The following method documents how to build ZoneMinder into an RPM package, compatible with Fedora, Redhat, CentOS, and other compatible clones. This is exactly how the RPMS in zmrepo are built.

--- a/configure.ac
+++ b/configure.ac
@ -3,7 +3,7 @@
 # For instructions on building with cmake, please see INSTALL
 #
 AC_PREREQ(2.59)
-AC_INIT(zm,1.28.100,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
+AC_INIT(zm,1.28.108,[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)
@ -445,6 +445,7 @@ fi
 fi
 AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
 AC_CHECK_DECLS(backtrace_symbols,,,[#include <execinfo.h>])
+AC_CHECK_LIB(execinfo,backtrace)

 AC_SUBST(LDFLAGS)

@ -499,7 +500,7 @@ fi
 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 misc/com.zoneminder.systemctl.policy misc/com.zoneminder.systemctl.rules onvif/Makefile onvif/scripts/Makefile 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/css/classic/Makefile web/skins/classic/css/classic/views/Makefile web/skins/classic/css/flat/Makefile web/skins/classic/css/flat/views/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/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])
+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 onvif/Makefile onvif/scripts/Makefile 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/css/classic/Makefile web/skins/classic/css/classic/views/Makefile web/skins/classic/css/dark/Makefile web/skins/classic/css/dark/views/Makefile web/skins/classic/css/flat/Makefile web/skins/classic/css/flat/views/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/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])

 # Create the definitions for compilation and defaults for the database
 AC_CONFIG_COMMANDS([src/zm_config_defines.h],[perl ./zmconfgen.pl])
--- a/251
+++ b/251
@ -1,251 +0,0 @@
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm:	return( defined($monitor->{ShmKey})?$monitor->{ShmKey}:undef );
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm:	if ( !defined($monitor->{ShmId}) )
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm:		my $shm_key = (hex($Config{ZM_SHM_KEY})&0xffff0000)|$monitor->{Id};
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm:    		Error( sprintf( "Can't get shared memory id '%x', %d: $!\n", $shm_key, $monitor->{Id} ) );
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm:		$monitor->{ShmKey} = $shm_key;
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm:		$monitor->{ShmId} = $shm_id;
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm:	delete $monitor->{ShmId};
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm:	my $shm_key = $monitor->{ShmKey};
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm:	my $shm_id = $monitor->{ShmId};
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm:	my $shm_key = $monitor->{ShmKey};
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm:	my $shm_id = $monitor->{ShmId};
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:    return( defined($monitor->{MMapAddr})?$monitor->{MMapAddr}:undef );
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:	if ( !defined($monitor->{MMapAddr}) )
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:        my $mmap_file = $Config{ZM_PATH_MAP}."/zm.mmap.".$monitor->{Id};
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:		$monitor->{MMapHandle} = \*MMAP;
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:		$monitor->{MMapAddr} = $mmap_addr;
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:		$monitor->{MMap} = \$mmap;
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:    if ( $monitor->{MMap} )
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:        if ( ! munmap( ${$monitor->{MMap}} ) ) {
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:	    delete $monitor->{MMap};
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:    if ( $monitor->{MMapAddr} )
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:	    delete $monitor->{MMapAddr};
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:    if ( $monitor->{MMapHandle} )
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:        close( $monitor->{MMapHandle} );
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:	    delete $monitor->{MMapHandle};
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:	my $mmap = $monitor->{MMap};
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:        Error( sprintf( "Can't read from mapped memory for monitor '%d', gone away?", $monitor->{Id} ) );
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:	my $mmap = $monitor->{MMap};
-./scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm:        Error( sprintf( "Can't write mapped memory for monitor '%d', gone away?", $monitor->{Id} ) );
-./scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in:				Error( "Shared data size conflict in shared_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{shared_data}->{size}.", got ".$sd_size );
-./scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in:				Debug( "Shared data size conflict in shared_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{shared_data}->{size}.", got ".$sd_size );
-./scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in:				Error( "Shared data size conflict in trigger_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{triggger_data}->{size}.", got ".$td_size );
-./scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in:				Debug( "Shared data size conflict in trigger_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{triggger_data}->{size}.", got ".$td_size );
-./scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in:            Error( "Unable to read '$field' from memory for monitor ".$monitor->{Id} );
-./scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in:            Error( "Unable to write '$value' to '$field' in memory for monitor ".$monitor->{Id} );
-./scripts/zmtrigger.pl.in:		#print( "$monitor->{Id}: S:$state, LE:$last_event\n" );
-./scripts/zmtrigger.pl.in:		#print( "$monitor->{Id}: mS:$monitor->{LastState}, mLE:$monitor->{LastEvent}\n" );
-./scripts/zmtrigger.pl.in:			if ( !defined($monitor->{LastEvent}) || ($last_event != $monitor->{LastEvent}) ) # A new event
-./scripts/zmtrigger.pl.in:				push( @out_messages, $monitor->{Id}."|on|".time()."|".$last_event );
-./scripts/zmtrigger.pl.in:		elsif ( ($state == STATE_IDLE && $monitor->{LastState} != STATE_IDLE) || ($state == STATE_TAPE && $monitor->{LastState} != STATE_TAPE) ) # Out of alarm state
-./scripts/zmtrigger.pl.in:			push( @out_messages, $monitor->{Id}."|off|".time()."|".$last_event );
-./scripts/zmtrigger.pl.in:		elsif ( defined($monitor->{LastEvent}) && ($last_event != $monitor->{LastEvent}) ) # We've missed a whole event
-./scripts/zmtrigger.pl.in:			push( @out_messages, $monitor->{Id}."|on|".time()."|".$last_event );
-./scripts/zmtrigger.pl.in:			push( @out_messages, $monitor->{Id}."|off|".time()."|".$last_event );
-./scripts/zmtrigger.pl.in:		$monitor->{LastState} = $state;
-./scripts/zmtrigger.pl.in:		$monitor->{LastEvent} = $last_event;
-./scripts/zmtrigger.pl.in:		if ( defined($monitors{$monitor->{Id}}->{LastState}) )
-./scripts/zmtrigger.pl.in:			$monitor->{LastState} = $monitors{$monitor->{Id}}->{LastState};
-./scripts/zmtrigger.pl.in:			$monitor->{LastState} = zmGetMonitorState( $monitor );
-./scripts/zmtrigger.pl.in:		if ( defined($monitors{$monitor->{Id}}->{LastEvent}) )
-./scripts/zmtrigger.pl.in:			$monitor->{LastEvent} = $monitors{$monitor->{Id}}->{LastEvent};
-./scripts/zmtrigger.pl.in:			$monitor->{LastEvent} = zmGetLastEvent( $monitor );
-./scripts/zmtrigger.pl.in:		$new_monitors{$monitor->{Id}} = $monitor;
-./scripts/zmtrigger.pl.in:		next if ( !$monitor->{Enabled} );
-./scripts/zmx10.pl.in:				if ( defined( $monitor->{LastState} ) )
-./scripts/zmx10.pl.in:					if ( ($state == STATE_ALARM || $state == STATE_ALERT) && ($monitor->{LastState} == STATE_IDLE || $monitor->{LastState} == STATE_TAPE) ) # Gone into alarm state
-./scripts/zmx10.pl.in:						$task_list = $monitor->{"ON_list"};
-./scripts/zmx10.pl.in:					elsif ( ($state == STATE_IDLE && $monitor->{LastState} != STATE_IDLE) || ($state == STATE_TAPE && $monitor->{LastState} != STATE_TAPE) ) # Come out of alarm state
-./scripts/zmx10.pl.in:						$task_list = $monitor->{"OFF_list"};
-./scripts/zmx10.pl.in:				$monitor->{LastState} = $state;
-./scripts/zmx10.pl.in:	Debug( "Adding to device list, uc:$unit_code, ev:$event, mo:".$monitor->{Id}.", fu:$function, li:$limit\n" );
-./scripts/zmx10.pl.in:	Debug( "Adding to monitor list, uc:$unit_code, ev:$event, mo:".$monitor->{Id}.", fu:$function, li:$limit\n" );
-./scripts/zmx10.pl.in:	my $task = { type=>"monitor", device=>$device, id=>$monitor->{Id}, function=>$function };
-./scripts/zmx10.pl.in:	my $task_list = $monitor->{$event."_list"};
-./scripts/zmx10.pl.in:		$task_list = $monitor->{$event."_list"} = [];
-./scripts/zmx10.pl.in:		$monitor_hash{$monitor->{Id}} = $monitor;
-./scripts/zmx10.pl.in:		if ( $monitor->{Activation} )
-./scripts/zmx10.pl.in:			Debug( "$monitor->{Name} has active string '$monitor->{Activation}'\n" );
-./scripts/zmx10.pl.in:			foreach my $code_string ( split( /,/, $monitor->{Activation} ) )
-./scripts/zmx10.pl.in:		if ( $monitor->{AlarmInput} )
-./scripts/zmx10.pl.in:			Debug( "$monitor->{Name} has alarm input string '$monitor->{AlarmInput}'\n" );
-./scripts/zmx10.pl.in:			foreach my $code_string ( split( /,/, $monitor->{AlarmInput} ) )
-./scripts/zmx10.pl.in:		if ( $monitor->{AlarmOutput} )
-./scripts/zmx10.pl.in:			Debug( "$monitor->{Name} has alarm output string '$monitor->{AlarmOutput}'\n" );
-./scripts/zmx10.pl.in:			foreach my $code_string ( split( /,/, $monitor->{AlarmOutput} ) )
-./scripts/zmfilter.pl.in:    $text =~ s/%MET%/$monitor->{EventCount}/g;
-./scripts/zmfilter.pl.in:    $text =~ s/%MEH%/$monitor->{HourEventCount}/g;
-./scripts/zmfilter.pl.in:    $text =~ s/%MED%/$monitor->{DayEventCount}/g;
-./scripts/zmfilter.pl.in:    $text =~ s/%MEW%/$monitor->{WeekEventCount}/g;
-./scripts/zmfilter.pl.in:    $text =~ s/%MEM%/$monitor->{MonthEventCount}/g;
-./scripts/zmfilter.pl.in:    $text =~ s/%MEA%/$monitor->{ArchEventCount}/g;
-./scripts/zmaudit.pl.in:        Debug( "Found database monitor '$monitor->{Id}'" );
-./scripts/zmaudit.pl.in:        my $db_events = $db_monitors->{$monitor->{Id}} = {};
-./scripts/zmaudit.pl.in:        my $res = $eventSelectSth->execute( $monitor->{Id} ) or Fatal( "Can't execute: ".$eventSelectSth->errstr() );
-./scripts/zmpkg.pl.in:			if ( $monitor->{Id} =~ /^$definition->{Id}$/ )
-./scripts/zmpkg.pl.in:				$monitor->{NewFunction} = $definition->{Function};
-./scripts/zmpkg.pl.in:				$monitor->{NewEnabled} = $definition->{Enabled};
-./scripts/zmpkg.pl.in:		#next if ( !$monitor->{NewFunction} );
-./scripts/zmpkg.pl.in:		$monitor->{NewFunction} = 'None' if ( !$monitor->{NewFunction} );
-./scripts/zmpkg.pl.in:		$monitor->{NewEnabled} = 0 if ( !$monitor->{NewEnabled} );
-./scripts/zmpkg.pl.in:		if ( $monitor->{Function} ne $monitor->{NewFunction} || $monitor->{Enabled} ne $monitor->{NewEnabled} )
-./scripts/zmpkg.pl.in:			my $res = $sth->execute( $monitor->{NewFunction}, $monitor->{NewEnabled}, $monitor->{Id} ) or Fatal( "Can't execute: ".$sth->errstr() );
-./scripts/zmpkg.pl.in:			if ( $monitor->{Function} ne 'None' )
-./scripts/zmpkg.pl.in:				if ( $monitor->{Type} eq 'Local' )
-./scripts/zmpkg.pl.in:					runCommand( "zmdc.pl start zmc -d $monitor->{Device}" );
-./scripts/zmpkg.pl.in:					runCommand( "zmdc.pl start zmc -m $monitor->{Id}" );
-./scripts/zmpkg.pl.in:				if ( $monitor->{Function} ne 'Monitor' )
-./scripts/zmpkg.pl.in:						runCommand( "zmdc.pl start zmf -m $monitor->{Id}" );
-./scripts/zmpkg.pl.in:					runCommand( "zmdc.pl start zma -m $monitor->{Id}" );
-./scripts/zmpkg.pl.in:					if ( $monitor->{Function} eq 'Modect' || $monitor->{Function} eq 'Mocord' )
-./scripts/zmpkg.pl.in:						if ( $monitor->{Controllable} && $monitor->{TrackMotion} )
-./scripts/zmpkg.pl.in:							runCommand( "zmdc.pl start zmtrack.pl -m $monitor->{Id}" );
-./scripts/zmcontrol.pl.in:    my $protocol = $monitor->{Protocol};
-./scripts/zmupdate.pl.in:            if ( -d $monitor->{Name} )
-./scripts/zmupdate.pl.in:                rename( $monitor->{Name}, $monitor->{Id} ) or warn( "Can't rename existing monitor directory '$monitor->{Name}' to '$monitor->{Id}': $!" );
-./scripts/zmupdate.pl.in:                symlink( $monitor->{Id}, $monitor->{Name} ) or warn( "Can't symlink monitor directory '$monitor->{Id}' to '$monitor->{Name}': $!" );
-./scripts/zmupdate.pl.in:            my $res = $sth->execute( $monitor->{Width}, $monitor->{Height}, $monitor->{Id} ) or die( "Can't execute: ".$sth->errstr() );
-./scripts/zmupdate.pl.in:                my $res = $sth->execute( $sequence++, $monitor->{Id} ) or die( "Can't execute: ".$sth->errstr() );
-./scripts/zmupdate.pl.in:                if ( $db_monitor->{LabelFormat} =~ /\%\%s/ )
-./scripts/zmupdate.pl.in:                    $db_monitor->{LabelFormat} =~ s/\%\%s/%N/;
-./scripts/zmupdate.pl.in:                    $db_monitor->{LabelFormat} =~ s/\%\%s/%Q/;
-./scripts/zmupdate.pl.in:                    my $res = $sth->execute( $db_monitor->{LabelFormat}, $db_monitor->{Id} ) or die( "Can't execute: ".$sth->errstr() );
-./scripts/zmtrack.pl.in:if ( !$monitor->{Controllable} )
-./scripts/zmtrack.pl.in:if ( !$monitor->{TrackMotion} )
-./scripts/zmtrack.pl.in:if ( !$monitor->{CanMoveMap} )
-./scripts/zmtrack.pl.in:	if ( $monitor->{CanMoveRel} )
-./scripts/zmtrack.pl.in:	sleep( $monitor->{TrackDelay} );
-./scripts/zmtrack.pl.in:    my $ctrlCommand = ZM_PATH_BIN."/zmcontrol.pl -i ".$monitor->{Id};
-./scripts/zmtrack.pl.in:	$ctrlCommand .= " --command=".($monitor->{CanMoveMap}?"moveMap":"movePseudoMap")." --xcoord=$x --ycoord=$y";
-./scripts/zmtrack.pl.in:    my $ctrlCommand = ZM_PATH_BIN."/zmcontrol.pl -i ".$monitor->{Id};
-./scripts/zmtrack.pl.in:	if ( $monitor->{ReturnLocation} > 0 )
-./scripts/zmtrack.pl.in:		$ctrlCommand .= " --command=presetGoto --preset=".$monitor->{ReturnLocation};
-./scripts/zmtrack.pl.in:if ( ($monitor->{ReturnLocation} >= 0) )
-./scripts/zmtrack.pl.in:		if ( ($monitor->{ReturnLocation} >= 0) && ($last_alarm > 0) && ((time()-$last_alarm) > $monitor->{ReturnDelay}) )
-./scripts/zmtrack.pl.in:			Debug( "Returning to location ".$monitor->{ReturnLocation}."\n" );
-./scripts/zmwatch.pl.in:		if ( $monitor->{Function} ne 'None' )
-./scripts/zmwatch.pl.in:				my $max_image_delay = ($monitor->{MaxFPS}&&($monitor->{MaxFPS}>0)&&($monitor->{MaxFPS}<1))?(3/$monitor->{MaxFPS}):$Config{ZM_WATCH_MAX_DELAY};
-./scripts/zmwatch.pl.in:				Debug( "Monitor $monitor->{Id} last captured $image_delay seconds ago, max is $max_image_delay\n" );
-./scripts/zmwatch.pl.in:				    Info( "Restarting capture daemon for ".$monitor->{Name}.", time since last capture $image_delay seconds ($now-$image_time)\n" );
-./scripts/zmwatch.pl.in:				#Info( "Restarting capture daemon for ".$monitor->{Name}.", shared data not valid\n" );
-./scripts/zmwatch.pl.in:                if ( $monitor->{Type} eq 'Local' )
-./scripts/zmwatch.pl.in:                    $command = "zmdc.pl restart zmc -d $monitor->{Device}";
-./scripts/zmwatch.pl.in:                    $command = "zmdc.pl restart zmc -m $monitor->{Id}";
-./scripts/zmwatch.pl.in:            elsif ( $monitor->{Function} ne 'Monitor' )
-./scripts/zmwatch.pl.in:                    my $max_image_delay = ($monitor->{MaxFPS}&&($monitor->{MaxFPS}>0)&&($monitor->{MaxFPS}<1))?(3/$monitor->{MaxFPS}):$Config{ZM_WATCH_MAX_DELAY};
-./scripts/zmwatch.pl.in:                    Debug( "Monitor $monitor->{Id} last analysed $image_delay seconds ago, max is $max_image_delay\n" );
-./scripts/zmwatch.pl.in:                        Info( "Restarting analysis daemon for ".$monitor->{Name}.", time since last analysis $image_delay seconds ($now-$image_time)\n" );
-./scripts/zmwatch.pl.in:                        my $command = "zmdc.pl restart zma -m ".$monitor->{Id};
-./src/zm_monitor.cpp:            monitor->AddZones( n_zones, zones );
-./src/zm_monitor.cpp:    status_data.id = monitor->Id();
-./src/zm_monitor.cpp:    status_data.fps = monitor->GetFPS();
-./src/zm_monitor.cpp:    status_data.state = monitor->shared_data->state;
-./src/zm_monitor.cpp:    //status_data.enabled = monitor->shared_data->active;
-./src/zm_monitor.cpp:    status_data.enabled = monitor->trigger_data->trigger_state!=Monitor::TRIGGER_OFF;
-./src/zm_monitor.cpp:    status_data.forced = monitor->trigger_data->trigger_state==Monitor::TRIGGER_ON;
-./src/zm_monitor.cpp:    updateFrameRate( monitor->GetFPS() );
-./src/zm_monitor.cpp:        monitor->TimestampImage( send_image, timestamp );
-./src/zm_monitor.cpp:        monitor->SingleImage( scale );
-./src/zm_monitor.cpp:    updateFrameRate( monitor->GetFPS() );
-./src/zm_monitor.cpp:    int last_read_index = monitor->image_buffer_count;
-./src/zm_monitor.cpp:            snprintf( &(swap_path[strlen(swap_path)]), sizeof(swap_path)-strlen(swap_path), "/zmswap-m%d", monitor->Id() );
-./src/zm_monitor.cpp:        if ( feof( stdout ) || ferror( stdout ) || !monitor->ShmValid() )
-./src/zm_monitor.cpp:        if ( (unsigned int)last_read_index != monitor->shared_data->last_write_index )
-./src/zm_monitor.cpp:            int index = monitor->shared_data->last_write_index%monitor->image_buffer_count;
-./src/zm_monitor.cpp:            last_read_index = monitor->shared_data->last_write_index;
-./src/zm_monitor.cpp:                    Monitor::Snapshot *snap = &monitor->image_buffer[index];
-./src/zm_monitor.cpp:                if ( monitor->shared_data->valid )
-./src/zm_monitor.cpp:                    if ( monitor->image_buffer[index].timestamp->tv_sec )
-./src/zm_monitor.cpp:                        memcpy( &(temp_image_buffer[temp_index].timestamp), monitor->image_buffer[index].timestamp, sizeof(temp_image_buffer[0].timestamp) );
-./src/zm_monitor.cpp:                        monitor->image_buffer[index].image->WriteJpeg( temp_image_buffer[temp_index].file_name, config.jpeg_file_quality );
-./src/zm_monitor.cpp:        snprintf( swap_path, sizeof(swap_path), "%s/zmswap-m%d/zmswap-q%06d", config.path_swap, monitor->Id(), connkey );
-./src/zmu.cpp:				printf( "Monitor %d(%s)\n", monitor->Id(), monitor->Name() );
-./src/zmu.cpp:				Monitor::State state = monitor->GetState();
-./src/zmu.cpp:				struct timeval timestamp = monitor->GetTimestamp( image_idx );
-./src/zmu.cpp:					printf( "Last read index: %d\n", monitor->GetLastReadIndex() );
-./src/zmu.cpp:					printf( "%d", monitor->GetLastReadIndex() );
-./src/zmu.cpp:					printf( "Last write index: %d\n", monitor->GetLastWriteIndex() );
-./src/zmu.cpp:					printf( "%d", monitor->GetLastWriteIndex() );
-./src/zmu.cpp:					printf( "Last event id: %d\n", monitor->GetLastEvent() );
-./src/zmu.cpp:					printf( "%d", monitor->GetLastEvent() );
-./src/zmu.cpp:					printf( "Current capture rate: %.2f frames per second\n", monitor->GetFPS() );
-./src/zmu.cpp:					printf( "%.2f", monitor->GetFPS() );
-./src/zmu.cpp:						printf( "Dumping last image captured to Monitor%d.jpg", monitor->Id() );
-./src/zmu.cpp:						printf( "Dumping buffer image %d to Monitor%d.jpg", image_idx, monitor->Id() );
-./src/zmu.cpp:				monitor->GetImage( image_idx, scale>0?scale:100 );
-./src/zmu.cpp:					printf( "Dumping zone image to Zones%d.jpg\n", monitor->Id() );
-./src/zmu.cpp:				monitor->DumpZoneImage( zoneString );
-./src/zmu.cpp:				monitor->ForceAlarmOn( config.forced_alarm_score, "Forced Web" );
-./src/zmu.cpp:				monitor->ForceAlarmOff();
-./src/zmu.cpp:				monitor->CancelForced();
-./src/zmu.cpp:				monitor->actionReload();
-./src/zmu.cpp:				monitor->actionEnable();
-./src/zmu.cpp:				monitor->actionDisable();
-./src/zmu.cpp:				monitor->actionSuspend();
-./src/zmu.cpp:				monitor->actionResume();
-./src/zmu.cpp:				monitor->DumpSettings( monString, verbose );
-./src/zmu.cpp:						printf( "New brightness: %d\n", monitor->actionBrightness( brightness ) );
-./src/zmu.cpp:						printf( "Current brightness: %d\n", monitor->actionBrightness() );
-./src/zmu.cpp:						printf( "%d", monitor->actionBrightness( brightness ) );
-./src/zmu.cpp:						printf( "%d", monitor->actionBrightness() );
-./src/zmu.cpp:						printf( "New brightness: %d\n", monitor->actionContrast( contrast ) );
-./src/zmu.cpp:						printf( "Current contrast: %d\n", monitor->actionContrast() );
-./src/zmu.cpp:						printf( "%d", monitor->actionContrast( contrast ) );
-./src/zmu.cpp:						printf( "%d", monitor->actionContrast() );
-./src/zmu.cpp:						printf( "New hue: %d\n", monitor->actionHue( hue ) );
-./src/zmu.cpp:						printf( "Current hue: %d\n", monitor->actionHue() );
-./src/zmu.cpp:						printf( "%d", monitor->actionHue( hue ) );
-./src/zmu.cpp:						printf( "%d", monitor->actionHue() );
-./src/zmu.cpp:						printf( "New colour: %d\n", monitor->actionColour( colour ) );
-./src/zmu.cpp:						printf( "Current colour: %d\n", monitor->actionColour() );
-./src/zmu.cpp:						printf( "%d", monitor->actionColour( colour ) );
-./src/zmu.cpp:						printf( "%d", monitor->actionColour() );
-./src/zmu.cpp:							struct timeval tv = monitor->GetTimestamp();
-./src/zmu.cpp:								monitor->Id(),
-./src/zmu.cpp:								monitor->GetState(),
-./src/zmu.cpp:								monitor->GetTriggerState(),
-./src/zmu.cpp:								monitor->GetLastReadIndex(),
-./src/zmu.cpp:								monitor->GetLastWriteIndex(),
-./src/zmu.cpp:								monitor->GetLastEvent(),
-./src/zmu.cpp:								monitor->GetFPS()
-./src/zm_zone.cpp:	pg_image = new Image( monitor->Width(), monitor->Height(), 1, ZM_SUBPIX_ORDER_NONE);
-./src/zm_zone.cpp:	ranges = new Range[monitor->Height()];
-./src/zm_zone.cpp:	for ( unsigned int y = 0; y < monitor->Height(); y++)
-./src/zm_zone.cpp:		for ( unsigned int x = 0; x < monitor->Width(); x++, ppoly++ )
-./src/zm_zone.cpp:			snprintf( diag_path, sizeof(diag_path), "%s/%s/diag-%d-poly.jpg", config.dir_events, monitor->Name(), id);
-./src/zm_zone.cpp:	snprintf( sql, sizeof(sql), "insert into Stats set MonitorId=%d, ZoneId=%d, EventId=%d, FrameId=%d, PixelDiff=%d, AlarmPixels=%d, FilterPixels=%d, BlobPixels=%d, Blobs=%d, MinBlobSize=%d, MaxBlobSize=%d, MinX=%d, MinY=%d, MaxX=%d, MaxY=%d, Score=%d", monitor->Id(), id, event->Id(), event->Frames()+1, pixel_diff, alarm_pixels, alarm_filter_pixels, alarm_blob_pixels, alarm_blobs, min_blob_size, max_blob_size, alarm_box.LoX(), alarm_box.LoY(), alarm_box.HiX(), alarm_box.HiY(), score );
-./src/zm_zone.cpp:			snprintf( diag_path, sizeof(diag_path), "%s/%s/diag-%d-%d.jpg", config.dir_events, monitor->Name(), id, 1 );
-./src/zm_zone.cpp:				snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-%d-%d.jpg", config.dir_events, monitor->Id(), id, 2 );
-./src/zm_zone.cpp:					snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-%d-%d.jpg", config.dir_events, monitor->Id(), id, 3 );
-./src/zm_zone.cpp:					snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-%d-%d.jpg", config.dir_events, monitor->Id(), id, 4 );
-./src/zm_zone.cpp:		//if ( monitor->followMotion() )
-./src/zm_zone.cpp:			if( monitor->Colours() == ZM_COLOUR_GRAY8 ) {
-./src/zm_zone.cpp:				image = diff_image->HighlightEdges( alarm_rgb, monitor->Colours(), monitor->SubpixelOrder(), &polygon.Extent() );
-./src/zm_zone.cpp:	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 from Zones where MonitorId = %d order by Type, Id", monitor->Id() );
-./src/zm_zone.cpp:	Debug( 1, "Got %d zones for monitor %s", n_zones, monitor->Name() );
-./src/zm_zone.cpp:			Error( "Unable to parse polygon string '%s' for zone %d/%s for monitor %s, ignoring", Coords, Id, Name, monitor->Name() );
-./src/zm_zone.cpp:		if ( polygon.LoX() < 0 || polygon.HiX() >= (int)monitor->Width() 
-./src/zm_zone.cpp:           || polygon.LoY() < 0 || polygon.HiY() >= (int)monitor->Height() ) {
-./src/zm_zone.cpp:			Error( "Zone %d/%s for monitor %s extends outside of image dimensions, (%d,%d), (%d,%d), ignoring", Id, Name, monitor->Name(), polygon.LoX(), polygon.LoY(), polygon.HiX(), polygon.HiY() );
-./src/zmf.cpp:	snprintf( capt_path, sizeof(capt_path), "%s/%d/%%s/%%0%dd-capture.jpg", config.dir_events, monitor->Id(), config.event_image_digits );
-./src/zmf.cpp:	snprintf( anal_path, sizeof(anal_path), "%s/%d/%%s/%%0%dd-analyse.jpg", config.dir_events, monitor->Id(), config.event_image_digits );
-./src/zmf.cpp:	int sd = OpenSocket( monitor->Id() );
-./src/zmf.cpp:			ReopenSocket( sd, monitor->Id() );
-./src/zmf.cpp:			ReopenSocket( sd, monitor->Id() );
-./src/zmf.cpp:			ReopenSocket( sd, monitor->Id() );
-./src/zma.cpp:		Info( "In mode %d/%d, warming up", monitor->GetFunction(), monitor->Enabled() );
-./src/zma.cpp:			Event::OpenFrameSocket( monitor->Id() );
-./src/zma.cpp:			if ( !monitor->Analyse() )
-./src/zma.cpp:				usleep( monitor->Active()?ZM_SAMPLE_RATE:ZM_SUSPENDED_RATE );
-./src/zma.cpp:				monitor->Reload();
-./src/zm_stream.cpp:    Image image( monitor->Width(), monitor->Height(), monitor->Colours(), monitor->SubpixelOrder() );
-./src/zm_event.cpp:    snprintf( sql, sizeof(sql), "insert into Events ( MonitorId, Name, StartTime, Width, Height, Cause, Notes ) values ( %d, 'New Event', from_unixtime( %ld ), %d, %d, '%s', '%s' )", monitor->Id(), start_time.tv_sec, monitor->Width(), monitor->Height(), cause.c_str(), notes.c_str() );
-./src/zm_event.cpp:        path_ptr += snprintf( path_ptr, sizeof(path), "%s/%d", config.dir_events, monitor->Id() );
-./src/zm_event.cpp:        snprintf( path, sizeof(path), "%s/%d/%d", config.dir_events, monitor->Id(), id );
-./src/zm_event.cpp:    snprintf( sql, sizeof(sql), "update Events set Name='%s%d', EndTime = from_unixtime( %ld ), Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d where Id = %d", monitor->EventPrefix(), id, end_time.tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec, frames, alarm_frames, tot_score, (int)(alarm_frames?(tot_score/alarm_frames):0), max_score, id );
-./src/zm_event.cpp:    if ( !ValidateFrameSocket( monitor->Id() ) )
-./src/zm_event.cpp:        monitor->TimestampImage( &ts_image, &timestamp );
-./src/zm_event.cpp:        snprintf( diag_glob, sizeof(diag_glob), "%s/%d/diag-*.jpg", config.dir_events, monitor->Id() );
-./db/zm_create.sql.in:INSERT INTO MonitorPresets VALUES (NULL,'Remote ZoneMinder','Remote',NULL,NULL,NULL,'http','simple','<ip-address>',80,'/cgi-bin/nph-zms?mode=jpeg&monitor=<monitor-id>&scale=100&maxfps=5&buffer=0',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-./db/zm_update-1.24.2.sql:INSERT INTO `MonitorPresets` VALUES ('','Remote ZoneMinder','Remote',NULL,NULL,NULL,'http','simple','<ip-address>',80,'/cgi-bin/nph-zms?mode=jpeg&monitor=<monitor-id>&scale=100&maxfps=5&buffer=0',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-Binary file ./.git/objects/pack/pack-bd32ad3df5c1fff7110f575aae37c6a3ce09a23e.pack matches
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@ -236,13 +236,15 @@ CREATE TABLE `Filters` (

 DROP TABLE IF EXISTS `Frames`;
 CREATE TABLE `Frames` (
+  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
  `EventId` int(10) unsigned NOT NULL default '0',
  `FrameId` int(10) unsigned NOT NULL default '0',
  `Type` enum('Normal','Bulk','Alarm') NOT NULL default 'Normal',
  `TimeStamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
  `Delta` decimal(8,2) NOT NULL default '0.00',
  `Score` smallint(5) unsigned NOT NULL default '0',
-  PRIMARY KEY (`EventId`,`FrameId`),
+  PRIMARY KEY (`Id`),
+  INDEX `EventId_idx` (`EventId`),
  KEY `Type` (`Type`),
  KEY `TimeStamp` (`TimeStamp`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
@ -341,6 +343,7 @@ CREATE TABLE `Monitors` (
  `Palette` int(10) unsigned NOT NULL default '0',
  `Orientation` enum('0','90','180','270','hori','vert') NOT NULL default '0',
  `Deinterlacing` int(10) unsigned NOT NULL default '0',
+  `RTSPDescribe` tinyint(1) unsigned NOT NULL default '0',
  `Brightness` mediumint(7) NOT NULL default '-1',
  `Contrast` mediumint(7) NOT NULL default '-1',
  `Hue` mediumint(7) NOT NULL default '-1',
@ -349,6 +352,7 @@ CREATE TABLE `Monitors` (
  `LabelFormat` varchar(64) NOT NULL default '%N - %y/%m/%d %H:%M:%S',
  `LabelX` smallint(5) unsigned NOT NULL default '0',
  `LabelY` smallint(5) unsigned NOT NULL default '0',
+  `LabelSize` smallint(5) unsigned NOT NULL DEFAULT '1',
  `ImageBufferCount` smallint(5) unsigned NOT NULL default '100',
  `WarmupCount` smallint(5) unsigned NOT NULL default '25',
  `PreEventCount` smallint(5) unsigned NOT NULL default '10',
@ -358,6 +362,8 @@ CREATE TABLE `Monitors` (
  `SectionLength` int(10) unsigned NOT NULL default '600',
  `FrameSkip` smallint(5) unsigned NOT NULL default '0',
  `MotionFrameSkip` smallint(5) unsigned NOT NULL default '0',
+  `AnalysisFPS` decimal(5,2) default NULL,
+  `AnalysisUpdateDelay` smallint(5) unsigned NOT NULL default '0',
  `MaxFPS` decimal(5,2) default NULL,
  `AlarmMaxFPS` decimal(5,2) default NULL,
  `FPSReportInterval` smallint(5) unsigned NOT NULL default '250',
@ -377,14 +383,15 @@ CREATE TABLE `Monitors` (
  `DefaultScale` smallint(5) unsigned NOT NULL default '100',
  `SignalCheckColour` varchar(32) NOT NULL default '#0000BE',
  `WebColour` varchar(32) NOT NULL default 'red',
+  `Exif` tinyint(1) unsigned NOT NULL default '0',
  `Sequence` smallint(5) unsigned default NULL,
  PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;

 --
 -- Table structure for table `States`
-- Added IsActive to track custom run states
--
+-- PP - Added IsActive to track custom run states
+-- Also made sure Name is unique

 DROP TABLE IF EXISTS `States`;
 CREATE TABLE `States` (
@ -392,8 +399,11 @@ CREATE TABLE `States` (
  `Name` varchar(64) NOT NULL default '',
  `Definition` text NOT NULL,
  `IsActive` tinyint(3) unsigned NOT NULL default '0',
-  PRIMARY KEY (`Id`)
+  PRIMARY KEY (`Id`),
+  UNIQUE KEY (`Name`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
+INSERT INTO States (Name,Definition,IsActive) VALUES ('default','','1');
+

 --
 -- Table structure for table `Servers`
@ -461,6 +471,7 @@ CREATE TABLE `Users` (
  `Events` enum('None','View','Edit') NOT NULL default 'None',
  `Control` enum('None','View','Edit') NOT NULL default 'None',
  `Monitors` enum('None','View','Edit') NOT NULL default 'None',
+  `Groups` enum('None','View','Edit') NOT NULL default 'None',
  `Devices` enum('None','View','Edit') NOT NULL default 'None',
  `System` enum('None','View','Edit') NOT NULL default 'None',
  `MaxBandwidth` varchar(16) NOT NULL default '',
@ -477,7 +488,7 @@ DROP TABLE IF EXISTS `ZonePresets`;
 CREATE TABLE `ZonePresets` (
  `Id` int(10) unsigned NOT NULL auto_increment,
  `Name` varchar(64) NOT NULL default '',
-  `Type` enum('Active','Inclusive','Exclusive','Preclusive','Inactive') NOT NULL default 'Active',
+  `Type` enum('Active','Inclusive','Exclusive','Preclusive','Inactive','Privacy') NOT NULL default 'Active',
  `Units` enum('Pixels','Percent') NOT NULL default 'Pixels',
  `CheckMethod` enum('AlarmedPixels','FilteredPixels','Blobs') NOT NULL default 'Blobs',
  `MinPixelThreshold` smallint(5) unsigned default NULL,
@ -506,7 +517,7 @@ CREATE TABLE `Zones` (
  `Id` int(10) unsigned NOT NULL auto_increment,
  `MonitorId` int(10) unsigned NOT NULL default '0',
  `Name` varchar(64) NOT NULL default '',
-  `Type` enum('Active','Inclusive','Exclusive','Preclusive','Inactive') NOT NULL default 'Active',
+  `Type` enum('Active','Inclusive','Exclusive','Preclusive','Inactive','Privacy') NOT NULL default 'Active',
  `Units` enum('Pixels','Percent') NOT NULL default 'Pixels',
  `NumCoords` tinyint(3) unsigned NOT NULL default '0',
  `Coords` tinytext NOT NULL,
@ -546,7 +557,7 @@ CREATE TABLE `Zones` (
 --
 -- Create a default admin user.
 --
-insert into Users VALUES (NULL,'admin',password('admin'),'',1,'View','Edit','Edit','Edit','Edit','Edit','','');
+insert into Users VALUES (NULL,'admin',password('admin'),'',1,'View','Edit','Edit','Edit','Edit','Edit','Edit','','');

 --
 -- Add a sample filter to purge the oldest 100 events when the disk is 95% full
@ -576,7 +587,7 @@ INSERT INTO Controls VALUES (NULL,'3S Domo N5071', 'Remote', '3S', 0, 0, 1, 1, 0
 INSERT INTO Controls VALUES (NULL,'ONVIF Camera','Ffmpeg','onvif',0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Foscam 9831W','Ffmpeg','FI9831W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Foscam FI8918W','Ffmpeg','FI8918W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
-
+INSERT INTO `Controls` VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','SPP1802SWPTZ',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,0,0,0,0,1,1,0,0,0,0,1,0,64,0,0,1,0,0,0,0,1,0,64,0,0,0,0);



@ -650,6 +661,7 @@ INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI8608W FFMPEG H.264','Ffmpeg',N
 INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI9821W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:88/videoMain',NULL,1280,720,0,NULL,1,'12','<admin_pwd>','<ip-address>',100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Loftek Sentinel PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<ip-address>','80','/videostream.cgi?user=<username>&pwd=<password>&resolution=32&rate=11',NULL,640,480,4,NULL,1,'13','','<username>:<pwd>@<ip-address>',100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Airlink 777W PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<username>:<password>@<ip-address>','80','/cgi/mjpg/mjpg.cgi',NULL,640,480,4,NULL,1,'7','','<username>:<pwd>@<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','/dev/video<?>','0',255,'','rtpMulti','','80','rtsp://<ip-address>:554/11','',1920,1080,0,0.00,1,'16','-speed=64','<ip-address>:<port>',100,33);

 --
 -- Add some zone preset values
--- a/db/zm_update-1.28.101.sql
+++ b/db/zm_update-1.28.101.sql
@ -0,0 +1,22 @@
+--
+-- This updates a 1.28.100 database to 1.28.101
+--
+
+--
+-- Add Groups column to Users
+--
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE table_name = 'Users'
+    AND table_schema = DATABASE()
+    AND column_name = 'Groups'
+    ) > 0,
+"SELECT 'Column Groups exists in Users'",
+"ALTER TABLE Users ADD COLUMN `Groups` ENUM('None','View','Edit') NOT NULL DEFAULT 'None' AFTER `Monitors`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
--- a/db/zm_update-1.28.102.sql
+++ b/db/zm_update-1.28.102.sql
@ -0,0 +1,17 @@
+--
+-- Add Monitor Exif field
+-- Used to enable or disable processing of the remote camera RTSP DESCRIBE response header
+--
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'Exif'
+	) > 0,
+"SELECT 'Column Exif already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `Exif` tinyint(1) unsigned NOT NULL default '0' AFTER `WebColour`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
--- a/db/zm_update-1.28.103.sql
+++ b/db/zm_update-1.28.103.sql
@ -0,0 +1,22 @@
+--
+-- This updates a 1.28.102 database to 1.28.103
+--
+
+--
+-- Add LabelSize column to Monitors
+--
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE table_name = 'Monitors'
+    AND table_schema = DATABASE()
+    AND column_name = 'LabelSize'
+    ) > 0,
+"SELECT 'Column LabelSize exists in Monitors'",
+"ALTER TABLE Monitors ADD `LabelSize` smallint(5) unsigned NOT NULL DEFAULT '1' AFTER `LabelY`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
--- a/db/zm_update-1.28.104.sql
+++ b/db/zm_update-1.28.104.sql
@ -0,0 +1,40 @@
+--
+-- This updates a 1.28.103 database to 1.28.104
+--
+
+--
+-- Add AnalysisFPS column to Monitors
+--
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE table_name = 'Monitors'
+    AND table_schema = DATABASE()
+    AND column_name = 'AnalysisFPS'
+    ) > 0,
+"SELECT 'Column AnalysisFPS exists in Monitors'",
+"ALTER TABLE Monitors ADD `AnalysisFPS` decimal(5,2) default NULL AFTER `MotionFrameSkip`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+--
+-- Add AnalysisUpdateDelay column to Monitors
+--
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE table_name = 'Monitors'
+    AND table_schema = DATABASE()
+    AND column_name = 'AnalysisUpdateDelay'
+    ) > 0,
+"SELECT 'Column AnalysisUpdateDelay exists in Monitors'",
+"ALTER TABLE Monitors ADD `AnalysisUpdateDelay` smallint(5) unsigned not null default 0 AFTER `AnalysisFPS`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
--- a/db/zm_update-1.28.105.sql
+++ b/db/zm_update-1.28.105.sql
@ -0,0 +1,10 @@
+--
+-- This updates a 1.28.104 database to 1.28.105
+--
+
+--
+-- Add Privacy type to Zone Types
+--
+
+alter table Zones       modify Type enum('Active','Inclusive','Exclusive','Preclusive','Inactive','Privacy') NOT NULL DEFAULT 'Active';
+alter table ZonePresets modify Type enum('Active','Inclusive','Exclusive','Preclusive','Inactive','Privacy') NOT NULL DEFAULT 'Active';
--- a/db/zm_update-1.28.106.sql
+++ b/db/zm_update-1.28.106.sql
@ -0,0 +1,21 @@
+--
+-- This updates a 1.28.105 database to 1.28.106
+--
+
+--
+-- Add Monitor RTSPDescribe field
+-- Used to enable or disable processing of the remote camera RTSP DESCRIBE response header
+--
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'RTSPDescribe'
+	) > 0,
+"SELECT 'Column RTSPDescribe already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `RTSPDescribe` tinyint(1) unsigned NOT NULL default '0' AFTER `Deinterlacing`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
--- a/db/zm_update-1.28.107.sql
+++ b/db/zm_update-1.28.107.sql
@ -0,0 +1,21 @@
+--
+-- This updates a 1.28.106 database to 1.28.107
+--
+
+--
+-- Update Frame table to have a PrimaryKey of ID, insetad of a Composite Primary Key
+-- Used primarially for compatibility with CakePHP
+--
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Frames'
+	AND table_schema = DATABASE()
+	AND column_name = 'Id'
+	) > 0,
+"SELECT 'Column ID already exists in Monitors'",
+"ALTER TABLE `Frames` ADD COLUMN `Id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT FIRST, DROP PRIMARY KEY, ADD PRIMARY KEY(`Id`)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
--- a/db/zm_update-1.28.108.sql
+++ b/db/zm_update-1.28.108.sql
@ -0,0 +1,22 @@
+--
+-- This updates a 1.28.107 database to 1.28.108
+--
+
+--
+-- Update Frame table to have an Index on EventId, per the change made in 1.28.107
+--
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.STATISTICS
+	WHERE table_name = 'Frames'
+	AND table_schema = DATABASE()
+	AND index_name='EventId_idx';
+	) > 0,
+"SELECT 'EventId Index already exists on Frames table'",
+"CREATE INDEX `EventId_idx` ON `Frames` (`EventId`)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+
--- a/db/zm_update-1.28.99.sql
+++ b/db/zm_update-1.28.99.sql
@ -342,7 +342,7 @@ SET @s = (SELECT IF(
 PREPARE stmt FROM @s;
 EXECUTE stmt;

-- The States table will be updated to have a new column called IsActive
+-- PP:The States table will be updated to have a new column called IsActive
 -- used to keep track of which custom state is active (if any)
 SET @s = (SELECT IF(
 	(SELECT COUNT(*)
@ -358,6 +358,23 @@ SET @s = (SELECT IF(
 PREPARE stmt FROM @s;
 EXECUTE stmt;

+-- PP:If default state does not exist, create it and set its IsActive to 1
+INSERT INTO States (Name,Definition,IsActive) 
+	SELECT * FROM (SELECT 'default', '', '1') AS tmp
+	WHERE NOT EXISTS (
+		SELECT Name FROM States WHERE Name = 'default'
+	) LIMIT 1;
+
+-- PP:Start with a sane isActive state
+UPDATE States SET IsActive = '0';
+UPDATE States SET IsActive = '1' WHERE Name = 'default'; 
+
+-- PP:Finally convert States to make sure Names are unique
+-- If duplicate states existed while upgrading, that is
+-- very likely an error that ZM allowed earlier, so
+-- we are picking up the first one and deleting the others
+ALTER IGNORE TABLE States ADD UNIQUE (Name);
+
 SET @s = (SELECT IF( 
    (SELECT COUNT(*)
    FROM INFORMATION_SCHEMA.TABLES
--- a/distros/debian/init.d
+++ b/distros/debian/init.d
@ -23,6 +23,7 @@ command="$ZM_PATH_BIN/zmpkg.pl"

 start() {
 	echo -n "Starting $prog: "
+	export TZ=:/etc/localtime
 	mkdir -p $RUNDIR && chown www-data:www-data $RUNDIR
 	mkdir -p $TMPDIR && chown www-data:www-data $TMPDIR
 	$command start
--- a/distros/debian_cmake/control
+++ b/distros/debian_cmake/control
@ -23,12 +23,12 @@ Description: Video camera security and surveillance solution

 Package: zoneminder-dbg
 Architecture: any
-Priority: extra
 Section: debug
+Priority: extra
 Depends: zoneminder (= ${binary:Version}), ${misc:Depends}
-Description: debugging syumbols for zoneminder.
+Description: Debugging symbols for zoneminder.
 ZoneMinder is a video camera security and surveillance solution.
- ZoneMinder is intended for use in single or multi-camera video security 
+ ZoneMinder is intended for use in single or multi-camera video security
 applications, including commercial or home CCTV, theft prevention and child
 or family member or home monitoring and other care scenarios. It
 supports capture, analysis, recording, and monitoring of video data coming
--- a/distros/debian_cmake/init.d
+++ b/distros/debian_cmake/init.d
@ -23,6 +23,7 @@ command="$ZM_PATH_BIN/zmpkg.pl"

 start() {
 	echo -n "Starting $prog: "
+	export TZ=:/etc/localtime
 	mkdir -p $RUNDIR $TMPDIR && chown www-data:www-data $RUNDIR $TMPDIR
 	$command start
 	RETVAL=$?
--- a/distros/fedora/CMakeLists.txt
+++ b/distros/fedora/CMakeLists.txt
@ -1,5 +1,14 @@
 # CMakeLists.txt for the Fedora Target Distro.

+# Display a message to show the Fedora build options are being processed.
+message([STATUS] "Starting Fedora Build Options" ...)
+
+# Create the ZoneMinder Apache config file
+configure_file(zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
+configure_file(zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY)
+configure_file(zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY)
+configure_file(zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
+
 # Download jscalendar & move files into position
 file(DOWNLOAD http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar-1.0.zip STATUS download_jsc)
 if(download_jsc EQUAL 0)
@ -25,6 +34,7 @@ install(DIRECTORY events images temp DESTINATION /var/lib/zoneminder DIRECTORY_P
 install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/events \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/events\")")
 install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/images \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/images\")")
 install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/temp\")")
+install(CODE "execute_process(COMMAND ln -sf ../../../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/api/app/tmp\")")

 # Fedora requires cambozola as a separate package so just link to it
 install(CODE "execute_process(COMMAND ln -sf ../../java/cambozola.jar \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/cambozola.jar\")")
--- a/distros/fedora/README.Fedora
+++ b/distros/fedora/README.Fedora
@ -1,113 +1,145 @@
+What's New
+==========
+
+1. The Apache ScriptAlias has been changed from "/cgi-bin/zm/zms" to 
+   "/cgi-bin-zm/zms". This has been to done to avoid this bug:
+   https://bugzilla.redhat.com/show_bug.cgi?id=973067
+
+   IMPORTANT: ZoneMinder will not update this value during an upgrade. You must
+   manually update ZM_PATH_ZMS yourself under Options. This does not affect
+   new installs.
+
+2. The ZoneMinder config file, zm.conf, has been moved under /etc/zm.
+
+3. The ZoneMinder mysql account now requires "Create" permission. This change
+   must be done manually before ZoneMinder will run. See the installation steps
+   below.
+
+4. A new permission group called "Groups" has been added. This allows the
+   system administrator to assign "view", "edit", or "none" permission to
+   normal users, without giving them access to the rest of the ZoneMinder
+   system. During an upgrade, existing accounts will default to a Groups
+   permission of "none".
+
+5. This package now requires the HTTPS protocol to access the web portal.
+   Requests using HTTP will auto-redirect to HTTPS. See README.https for
+   more information.
+   
+6. This package ships with the new ZoneMinder API enabled.
+
 New installs
 ============

-1. Unless you are already using the MySQL server or you are running it
-   remotely you will need to ensure that the server is installed and secured:
+1. This package supports either community-mysql-server or mariadb-server with
+   mariadb being the preferred choice. Unless you are already using MariaDB or
+   Mysql server, you need to ensure that the server is configured to start
+   during boot and properly secured by running:

-	sudo yum install community-mysql-server
-
-	sudo systemctl enable mysqld
-
-	sudo systemctl start  mysqld.service
-     
+	sudo yum install mariadb-server
+	sudo systemctl enable mariadb
+	sudo systemctl start  mariadb.service
 	mysql_secure_installation

-   NOTE: The Fedora team currently recommends mysql-community over mariadb
-
-2. Using the password for the root account set during the previous step, you
-   will need to create the ZoneMinder database, assuming your database server
-   is local:
-
-     mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
-     mysqladmin -uroot -p reload
-
-3. The database needs a user.  One is not created by default because this would
-   introduce an obvious security issue.  The following should set this up:
+2. Assuming the database is local and using the password for the root account
+   set during the previous step, you will need to create the ZoneMinder
+   database and configure a database account for ZoneMinder to use:

+     mysql -u root -p < /usr/share/zoneminder/db/zm_create.sql
     mysql -u root -p
-     grant select,insert,update,delete,lock tables,alter on zm.* to 
-     'zmuser'@localhost identified by 'zmpass';
+         mysql> grant select,insert,update,delete,lock tables,alter,create
+                on zm.* to 'zmuser'@localhost identified by 'zmpass';
+         mysql> exit;
+     mysqladmin -u root -p reload

-   Obviously, change at least zmpass to an actual, secure password or
-   passphrase.  You can change zmuser as well if you like.
+   The database account credentials, zmuser/zmpass, are arbitrary. Set them to
+   anything that suits your envinroment.

-4. Edit /etc/zm.conf and, at the bottom, change ZM_DB_PASS and perhaps
-   ZM_DB_USER to match.
+3. If you have chosen to change the zoneminder database account credentials to
+   something other than zmuser/zmpass, you must now edit /etc/zm/zm.conf.
+   Change ZM_DB_USER and ZM_DB_PASS to the values you created in the previous
+   step.

-5. Edit /etc/php.ini, uncomment the date.timezone line, and add your local
-   timezone.  For whatever reason, PHP will complain loudly if this is not set,
-   or if it is set incorrectly, and these complaints will show up in the
-   zoneminder logging system as errors.
+4. Edit /etc/php.ini, uncomment the date.timezone line, and add your local
+   timezone.  PHP will complain loudly if this is not set, or if it is set
+   incorrectly, and these complaints will show up in the zoneminder logging
+   system as errors.

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

-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
-   ZoneMinder to function. This will be addressed in a later release.  Run
+5. Disable SELinux 
+
+   We currently do not have the resources to create and maintain an accurate
+   SELinux policy for ZoneMinder on Fedora. We will gladly accept pull
+   reqeusts from anyone who wishes to do the work. In the meantime, SELinux
+   will need to be disabled or put into permissive mode.
+   
+   To immediately disbale SELinux for the current seesion, issue the following
+   from the command line:

     sudo setenforce 0

-   for testing, and edit /etc/sysconfig/selinux to disable it at boot time.
+   To permanently disable SELinux, edit /etc/selinux/config and change the
+   SELINUX line from "enforcing" to "disabled". This change will take
+   effect after a reboot.

-7. IMPORTANT: Edit /etc/httpd/conf.d/zoneminder.conf and/or 
-   /etc/httpd/conf/httpd.conf.

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

-   Reference: http://httpd.apache.org/docs/2.4/mod/mod_alias.html#order
-   Bug Report: https://bugzilla.redhat.com/show_bug.cgi?id=973067
+	sudo systemctl enable httpd
+	sudo systemctl start httpd

-   WORKAROUND #1
-   If you are running zoneminder on a dedicated server then the simplest
-   solution may be to simply comment out the line in httpd.conf that reads:
+7. Now start zoneminder:

-	ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"
-
-   WORKAROUND #2
-   If you need both the default cgi-bin folder & the zoneminder cgi-bin folder
-   then a solution might be to move the following line before the default
-   ScriptAlias directive in the httpd.conf file:
-
-	IncludeOptional conf.d/*.conf
-
-8. Now start the web server:
-
-	sudo systemctl enable httpd.service
-	sudo systemctl start httpd.service
-
-9. Now start zoneminder:
-
-	sudo systemctl enable zoneminder.service
-	sudo systemctl start zoneminder.service
+	sudo systemctl enable zoneminder
+	sudo systemctl start zoneminder

 Upgrades
 ========

-1. Update /etc/zm.conf.  Check for any new settings and update the version
-   information.  Comparing /etc/zm.conf and /etc/zm.conf.rpmnew should help to
-   do this.
+1. Verify /etc/zm/zm.conf.

-2. Add additional permissions to the zmuser account:
+   If zm.conf was manually edited before running the upgrade, the installation
+   may not overwrite it. In this case, it will create the file
+   /etc/zm/zm.conf.rpmnew.
+
+   For example, this will happen if you are using database account credentials
+   other than zmuser/zmpass.
+
+   Compare /etc/zm/zm.conf to /etc/zm/zm.conf.rpmnew. Verify that zm.conf
+   contains any new config settings that may be in zm.conf.rpmnew.
+
+2. Verify permissions of the zmuser account.
+
+   Over time, the database account permissions required for normal operation
+   have changed. Verify the zmuser database account has been granted select,
+   insert, update, delete, lock tables, alter, and create permission to the
+   ZoneMinder database:

     mysql -u root -p
-     grant lock tables,alter on zm.* to 
-     'zmuser'@localhost identified by 'zmpass';
+         mysql> show grants for zmuser@localhost;
+         mysql> exit;

-   Since this is an upgrade, the assumption is that the zmuser account already
-   has select, insert, update, and delete permission.
+   See step 2 of the Installation section to add missing permissions.
   
-3. You will need to upgrade the ZoneMinder database as described in the
-   manual. Only if the previous step was succesful, may you run zmupdate like
-   so:
+3. Verify the ZoneMinder Apache configuration file in the folder 
+   /etc/httpd/conf.d. You will have a file called "zoneminder.conf" and there
+   may also be a file called "zoneminder.conf.rpmnew". If the rpmnew file
+   exists, inspect it and merge anything new in that file with zoneminder.conf.
+
+4. Upgrade the database before starting ZoneMinder.
+
+   Most upgrades can be performed by executing the following command:
   
-   sudo zmupdate.pl --version=<from version>
-   
-   
-   If unsure then run it this way:
+     sudo zmupdate.pl
+
+   Recent versions of ZoneMinder don't require any parameters added to the 
+   zmupdate command. However, if ZoneMinder complains, you may need to call
+   zmupdate in the following manner:

   sudo zmupdate.pl --user=root --pass=<mysql_root_pwd> --version=<from version>
+
+5. Now start zoneminder:
+
+	sudo systemctl start zoneminder
+
--- a/distros/fedora/README.https
+++ b/distros/fedora/README.https
@ -0,0 +1 @@
+../redhat/README.https
--- a/distros/fedora/archive/zoneminder.conf
+++ b/distros/fedora/archive/zoneminder.conf
@ -32,7 +32,7 @@ Alias /zm "/usr/share/zoneminder/www"
 ScriptAlias /cgi-bin/zm "/usr/libexec/zoneminder/cgi-bin"
 <Directory "/usr/libexec/zoneminder/cgi-bin">
    AllowOverride All
-    Options ExecCGI
+    Options +ExecCGI +FollowSymLinks
    <IfModule mod_authz_core.c>
       # Apache 2.4
       Require all granted
--- a/distros/fedora/archive/zoneminder.f20.spec
+++ b/distros/fedora/archive/zoneminder.f20.spec
--- a/distros/fedora/archive/zoneminder.logrotate
+++ b/distros/fedora/archive/zoneminder.logrotate
--- a/distros/fedora/archive/zoneminder.service
+++ b/distros/fedora/archive/zoneminder.service
--- a/distros/fedora/archive/zoneminder.tmpfiles
+++ b/distros/fedora/archive/zoneminder.tmpfiles
--- a/distros/fedora/redalert.wav
+++ b/distros/fedora/redalert.wav
@ -1 +0,0 @@
-../redhat/redalert.wav
--- a/distros/fedora/redalert.wav
+++ b/distros/fedora/redalert.wav
@ -0,0 +1 @@
+../redhat/redalert.wav
--- a/distros/fedora/zoneminder.conf.in
+++ b/distros/fedora/zoneminder.conf.in
@ -0,0 +1 @@
+../redhat/zoneminder.el7.conf.in
--- a/distros/fedora/zoneminder.f21.spec
+++ b/distros/fedora/zoneminder.f21.spec
@ -127,7 +127,7 @@ fi
 %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 %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
 %config(noreplace) /etc/tmpfiles.d/zoneminder.conf
 %config(noreplace) /etc/logrotate.d/zoneminder
--- a/distros/fedora/zoneminder.f22.spec
+++ b/distros/fedora/zoneminder.f22.spec
@ -0,0 +1,409 @@
+%define zmuid $(id -un)
+%define zmgid $(id -gn)
+%define zmuid_final apache
+%define zmgid_final apache
+
+%global _hardened_build 1
+
+### Delete the lines below to build with ffmpeg and/or x10
+%define _without_ffmpeg 1
+%define _without_x10 1
+
+Name: zoneminder
+Version: 1.28.1
+Release: 1%{?dist}
+Summary: A camera monitoring and analysis tool
+Group: System Environment/Daemons
+# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/
+# Mootools is inder the MIT license: http://mootools.net/
+License: GPLv2+ and LGPLv2+ and MIT
+URL: http://www.zoneminder.com/
+
+#Source: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz
+Source: ZoneMinder-%{version}.tar.gz
+
+BuildRequires: cmake gnutls-devel systemd-units bzip2-devel
+BuildRequires: mariadb-devel pcre-devel libjpeg-turbo-devel
+BuildRequires: perl(Archive::Tar) perl(Archive::Zip) perl-podlators
+BuildRequires: perl(Date::Manip) perl(DBD::mysql)
+BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
+BuildRequires: perl(MIME::Entity) perl(MIME::Lite)
+BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap)
+BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign)
+BuildRequires: perl(Expect) perl(Sys::Syslog)
+BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel
+%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel}
+%{!?_without_x10:BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime)}
+# cmake needs the following installed at build time due to the way it auto-detects certain parameters
+BuildRequires:  httpd polkit-devel
+%{!?_without_ffmpeg:BuildRequires: ffmpeg}
+
+Requires: httpd php php-gd php-mysql cambozola polkit net-tools psmisc
+Requires: libjpeg-turbo vlc-core libcurl
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
+Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP)
+Requires: perl(LWP::Protocol::https)
+%{!?_without_ffmpeg:Requires: ffmpeg}
+
+Requires(post): systemd-units systemd-sysv
+Requires(post): /usr/bin/gpasswd
+Requires(post): /usr/bin/less
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+
+%description
+ZoneMinder is a set of applications which is intended to provide a complete
+solution allowing you to capture, analyse, record and monitor any cameras you
+have attached to a Linux based machine. It is designed to run on kernels which
+support the Video For Linux (V4L) interface and has been tested with cameras
+attached to BTTV cards, various USB cameras and IP network cameras. It is
+designed to support as many cameras as you can attach to your computer without
+too much degradation of performance.
+
+%prep
+%setup -q -n ZoneMinder-%{version}
+
+# Change the following default values
+./utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin/zm/nph-zms
+./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
+./utils/zmeditconfigdata.sh ZM_PATH_SWAP /dev/shm
+./utils/zmeditconfigdata.sh ZM_UPLOAD_FTP_LOC_DIR /var/spool/zoneminder-upload
+./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes
+./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no
+./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no
+
+%build
+%cmake \
+	-DZM_TARGET_DISTRO="f22" \
+%{?_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
+
+# Upgrade from a previous version of zoneminder 
+if [ $1 -eq 2 ] ; then
+    # Freshen the database
+    /usr/bin/zmupdate.pl -f
+
+    # We can't run this automatically when new sql account permissions need to
+    # be manually added first
+    # Run zmupdate non-interactively
+    #/usr/bin/zmupdate.pl --nointeractive
+fi
+
+# Warn the end user to read the README file
+echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, read README.Fedora to finish the\ninstallation or upgrade!\n"
+echo -e "\nThe README file is located here: %{_docdir}/%{name}\n"
+
+%preun
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || :
+    /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || :
+fi
+
+%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
+fi
+
+%triggerun -- zoneminder < 1.25.0-4
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply zoneminder
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || :
+/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/jscalendar-doc
+%config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf
+%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
+%config(noreplace) /etc/tmpfiles.d/zoneminder.conf
+%config(noreplace) /etc/logrotate.d/zoneminder
+
+%{_unitdir}/zoneminder.service
+
+%{_bindir}/zma
+%{_bindir}/zmaudit.pl
+%{_bindir}/zmc
+%{_bindir}/zmcontrol.pl
+%{_bindir}/zmdc.pl
+%{_bindir}/zmf
+%{_bindir}/zmfilter.pl
+%{_bindir}/zmpkg.pl
+%{_bindir}/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*
+%{_mandir}/man*/*
+%dir %{_libexecdir}/zoneminder
+%{_libexecdir}/zoneminder/cgi-bin
+%dir %{_datadir}/zoneminder
+%{_datadir}/zoneminder/db
+%{_datadir}/zoneminder/www
+
+%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
+%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
+
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder
+
+
+%changelog
+* Sat Feb 14 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.1 
+- Bump version for 1.28.1 release on Fedora 21.
+
+* Sun Oct 5 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.0 
+- Bump version for 1.28.0 release.
+
+* Fri Mar 14 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27 
+- Tweak build requirements for cmake
+
+* Sat Feb 01 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
+- Add zmcamtool.pl. Bump version for 1.27 release. 
+
+* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
+- This is a bug fixe release
+- RTSP fixes, cmake enhancements, couple other misc fixes
+
+* Mon Oct 07 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
+- Initial cmake build.
+
+* Sat Oct 05 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
+- Fedora specific path changes have been moved to zoneminder-1.26.0-defaults.patch
+- All files are now part of the zoneminder source tree. Update specfile accordingly.
+
+* Sat Sep 21 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.3
+- Initial rebuild for ZoneMinder 1.26.3 release.
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.25.0-12
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Mon Jan 7 2013 Remi Collet <rcollet@redhat.com> - 1.25.0-11
+- fix configuration file for httpd 2.4, #871502
+
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
+- rebuild against new libjpeg
+
+* Thu Aug 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-9
+- Add patch to work around v4l2 api breakage in 3.5 kernel.
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jun 23 2012 Petr Pisar <ppisar@redhat.com> - 1.25.0-7
+- Perl 5.16 rebuild
+
+* Wed Mar 21 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-6
+- Fix stupid thinko in sql modifications.
+
+* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-5
+- Clean up macro usage.
+
+* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-4
+- Convert to systemd.
+- Add tmpfiles.d configuration since the initscript isn't around to create
+  /run/zoneminder.
+- Remove some pointless executable permissions.
+- Add logrotate file.
+
+* Wed Feb 22 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-3
+- Update README.Fedora to reference systemctl and mention timezone info in
+  php.ini.
+- Add proper default for EYEZM_LOG_TO_FILE.
+
+
+* Thu Feb 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-2
+- Rebuild for new pcre.
+
+* Thu Jan 19 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-1
+- Update to 1.25.0
+- Fix gcc4.7 build problems.
+- Drop gcc4.4 build fixes; for whatever reason they now break the build.
+- Clean up old patches.
+- Force setting of ZM_TMPDIR and ZM_RUNDIR.
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-3
+- Re-add the dist-tag that somehow got lost.
+
+* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-2
+- Add patch for bug 711780 - fix syntax issue in Mapped.pm.
+- Undo that patch, and undo another which was the cause of the whole mess.
+- Fix up other patches so ZM_PATH_BUILD is both defined and useful.
+- Make sure database creation mods actually take.
+- Update Fedora-specific docs with some additional info.
+- Use bundled mootools (javascript, so no guideline violation).
+- Update download location.
+- Update the gcrypt patch to actually work.
+- Upstream changed the tarball without changing the version to patch a
+  vulnerability, so redownload.
+
+* Sun Aug 14 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-1
+- Initial attempt to upgrade to 1.24.4.
+- Add patch from BZ 460310 to build against libgcrypt instead of requiring the
+  gnutls openssl libs.
+
+* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-7.20110324svn3310
+- Perl mass rebuild
+
+* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-6.20110324svn3310
+- Perl mass rebuild
+
+* Mon May 09 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-5.20110324svn3310
+- Bump for gnutls update.
+
+* Thu Mar 24 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-4.20110324svn3310
+- Update to latest 1.24.3 subversion. Turns out that what upstream was calling
+  1.24.3 is really just an occasionally updated devel snapshot.
+- Rebase various patches.
+
+* Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 1.24.3-3
+- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-1
+- Update to latest upstream version.
+- Rebase patches.
+- Initial incomplete attempt to disable v4l1 support.
+
+* Fri Jan 21 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-6
+- Unbundle cambozola; instead link to the separately pacakged copy.
+- Remove BuildRoot:, %%clean and buildroot cleaning in %%install.
+- Git rid of mixed space/tab usage by removing all tabs.
+- Remove unnecessary Conflicts: line.
+- Attempt to force short_open_tag on for the code directories.
+- Move default location of sockets, swaps, logfiles and some temporary files to
+  make more sense and allow things to work better with a future selinux policy.
+- Fix errors in README.Fedora.
+
+* Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.24.2-5
+- Mass rebuild with perl-5.12.0
+
+* Fri Dec 4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
+- rebuild against perl 5.10.1
+- use Perl vendorarch and archlib variables correctly
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-2
+- Bump release since 1.24.2-1 was mistakenly tagged a few months ago.
+
+* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-1
+- Initial update to 1.24.2.
+- Rebase patches.
+- Update mootools download location.
+- Update to mootools 1.2.3.
+- Add additional dependencies for some optional features.
+
+* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-3
+- Remove unused Sys::Mmap perl dependency RPM is finding
+
+* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-2
+- Update gcc44 patch to disable -frepo, seems to be broken with gcc44
+- Added noffmpeg patch to make building outside mock easier
+
+* Sat Mar 21 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-1
+- Patch for gcc 4.4 compilation errors
+- Upgrade to 1.24.1
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
+- rebuild for dependencies
+
+* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
+- Fix permissions on zm.conf
+
+* Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
+- Initial attempt at packaging 1.23.
+
+* Tue Jul 1 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-15
+- Add perl module compat dependency, bz #453590
+
+* Tue May 6 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-14
+- Remove default runlevel, bz #441315
+
+* Mon Apr 28 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.22.3-13
+- Backport patch for CVE-2008-1381 from 1.23.3 to 1.22.3.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.22.3-12
+- Autorebuild for GCC 4.3
+
+* Thu Jan 3 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-11
+- Fix compilation on gcc 4.3
+
+* Thu Dec 6 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-10
+- Rebuild for new openssl
+
+* Thu Aug 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-8
+- Fix licence tag
+
+* Thu Jul 12 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-7
+- Fixes from testing by Jitz including missing dependencies and database creation
+
+* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-6
+- Disable crashtrace on ppc
+
+* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-5
+- Fix uid for directories in /var/lib/zoneminder
+
+* Tue Jun 26 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-4
+- Added perl Archive::Tar dependency
+- Disabled web interface due to lack of access control on the event images
+
+* Sun Jun 10 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-3
+- Changes recommended in review by Jason Tibbitts
+
+* Mon Apr 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-2
+- Standardised on package name of zoneminder
+
+* Thu Dec 28 2006 Martin Ebourne <martin@zepler.org> - 1.22.3-1
+- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin
--- a/distros/fedora/zoneminder.logrotate.in
+++ b/distros/fedora/zoneminder.logrotate.in
@ -0,0 +1 @@
+../redhat/zoneminder.el7.logrotate.in
--- a/distros/fedora/zoneminder.service.in
+++ b/distros/fedora/zoneminder.service.in
@ -0,0 +1,18 @@
+# ZoneMinder systemd unit file for Fedora
+# Replace mariadb with community-mysql if using mysql service instead of mariadb
+
+[Unit]
+Description=ZoneMinder CCTV recording and security system
+After=network.target mariadb.service httpd.service
+Requires=mariadb.service httpd.service
+
+[Service]
+User=@WEB_USER@
+Type=forking
+ExecStart=@BINDIR@/zmpkg.pl start
+ExecReload=@BINDIR@/zmpkg.pl restart
+ExecStop=@BINDIR@/zmpkg.pl stop
+PIDFile="@ZM_RUNDIR@/zm.pid"
+
+[Install]
+WantedBy=multi-user.target
--- a/distros/fedora/zoneminder.tmpfiles.in
+++ b/distros/fedora/zoneminder.tmpfiles.in
@ -0,0 +1 @@
+../redhat/zoneminder.tmpfiles.in
--- a/distros/opensuse/redalert.wav
+++ b/distros/opensuse/redalert.wav
@ -1 +0,0 @@
-../redhat/redalert.wav
--- a/distros/opensuse/redalert.wav
+++ b/distros/opensuse/redalert.wav
@ -0,0 +1 @@
+../redhat/redalert.wav
--- a/distros/redhat/CMakeLists.txt
+++ b/distros/redhat/CMakeLists.txt
@ -16,7 +16,7 @@ else(ZM_TARGET_DISTRO STREQUAL "el7")
 endif(ZM_TARGET_DISTRO STREQUAL "el7")

 # Download jscalendar & move files into position
-file(DOWNLOAD http://nbtelecom.dl.sourceforge.net/project/jscalendar/jscalendar/1.0/jscalendar-1.0.zip ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar-1.0.zip LOG jsc_log STATUS download_jsc)
+file(DOWNLOAD http://skylineservers.dl.sourceforge.net/project/jscalendar/jscalendar/1.0/jscalendar-1.0.zip ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar-1.0.zip LOG jsc_log STATUS download_jsc)
 #message(STATUS "Log of jscalender script was: ${jsc_log}")
 if(download_jsc EQUAL 0)
 	message(STATUS "Jscalander successfully downloaded.  Installing...")
@ -26,15 +26,16 @@ else(download_jsc EQUAL 0)
 	message(STATUS "Unable to download optional jscalander. Skipping...")
 endif(download_jsc EQUAL 0)

+# Cambozola is now packaged in zmrepo
 # Download cambozola & move files into position
-file(DOWNLOAD http://www.andywilcock.com/code/cambozola/cambozola-0.931.tar.gz ${CMAKE_CURRENT_SOURCE_DIR}/cambozola-0.931.tar.gz STATUS download_camb)
-if(download_camb EQUAL 0)
-	message(STATUS "Cambozola successfully downloaded.  Installing...")
-	execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cambozola.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ERROR_VARIABLE untar_camb)
-	message(STATUS "Status of cambozola script was: ${untar_camb}")
-else(download_camb EQUAL 0)
-	message(STATUS "Unable to download optional Cambozola. Skipping...")
-endif(download_camb EQUAL 0)
+#file(DOWNLOAD http://www.andywilcock.com/code/cambozola/cambozola-0.931.tar.gz ${CMAKE_CURRENT_SOURCE_DIR}/cambozola-0.931.tar.gz STATUS download_camb)
+#if(download_camb EQUAL 0)
+#	message(STATUS "Cambozola successfully downloaded.  Installing...")
+#	execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cambozola.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ERROR_VARIABLE untar_camb)
+#	message(STATUS "Status of cambozola script was: ${untar_camb}")
+#else(download_camb EQUAL 0)
+#	message(STATUS "Unable to download optional Cambozola. Skipping...")
+#endif(download_camb EQUAL 0)

 # Create several empty folders
 file(MAKE_DIRECTORY sock swap zoneminder zoneminder-upload events images temp)
@ -51,6 +52,10 @@ install(DIRECTORY events images temp DESTINATION /var/lib/zoneminder DIRECTORY_P
 install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/events \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/events\")")
 install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/images \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/images\")")
 install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/temp\")")
+install(CODE "execute_process(COMMAND ln -sf ../../../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/api/app/tmp\")")
+
+# Link to Cambozola, which is now packaged in zmrepo
+install(CODE "execute_process(COMMAND ln -sf ../../java/cambozola.jar \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/cambozola.jar\")")

 # Install auxillary files required to run zoneminder on CentOS
 install(FILES redalert.wav DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/sounds PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
--- a/distros/redhat/README.CentOS
+++ b/distros/redhat/README.CentOS
@ -1,6 +1,22 @@
-================================================================================
-				NEW INSTALLS
-================================================================================
+What's New
+==========
+
+1. The ZoneMinder mysql account now requires "Create" permission. This change
+   must be done manually before ZoneMinder will run. See the installation steps
+   below.
+
+2. A new permission group called "Groups" has been added. This allows the
+   system administrator to assign "view", "edit", or "none" permission to
+   normal users, without giving them access to the rest of the ZoneMinder
+   system. During an upgrade, existing accounts will default to a Groups
+   permission of "none".
+
+3. This package now requires the HTTPS protocol to access the web portal.
+   Requests using HTTP will auto-redirect to HTTPS. See README.https for
+   more information.
+
+New installs
+============

 1. Unless you are already using MySQL server, you need to ensure that
   the server is confired to start during boot and properly secured
@ -11,30 +27,37 @@
     sudo chkconfig mysqld on

 2. Using the password for the root account set during the previous step, you
-   will need to create the ZoneMinder database:
+   will need to create the ZoneMinder database and configure a database
+   account for ZoneMinder to use:

     mysql -uroot -p
 	mysql> create database zm;
-	mysql> grant select,insert,update,delete,lock tables,alter on zm.* to
-               'zmuser'@localhost identified by 'zmpass';
+	mysql> grant select,insert,update,delete,lock tables,alter,create
+                on zm.* to 'zmuser'@localhost identified by 'zmpass';
 	mysql> exit;
     mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
     mysqladmin -uroot -p reload

+   The database account credentials, zmuser/zmpass, are arbitrary. Set them to
+   anything that suits your envinroment.
+
 3. If you have chosen to change the zoneminder mysql credentials to something
   other than zmuser/zmpass then you must now edit /etc/zm.conf. Change
   ZM_DB_USER and ZM_DB_PASS to the values you created in step 2.

-4. IMPORTANT: Edit /etc/php.ini and put in the appropriate timezone for
-   date.timezone!
+4. Edit /etc/php.ini, uncomment the date.timezone line, and add your local
+   timezone.  PHP will complain loudly if this is not set, or if it is set
+   incorrectly, and these complaints will show up in the zoneminder logging
+   system as errors

-5. The ZoneMinder web interface is disabled by default, you will need
-   to edit this file to enable it:
+   If you are not sure of the proper timezone specification to use, look at
+   http://php.net/date.timezone
+
+5. Verify the default ZoneMinder Apache configuration meets your needs:

     /etc/httpd/conf.d/zoneminder.conf

-   HINT: Most users will want to simply delete the line that says
-   "Deny from all".
+   When in doubt, leave this configuration as it is.

 6. Configure the web server to start automatically:

@ -45,8 +68,8 @@
   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:
+   It is still possible to run into SELinux issues, however. If this is case,
+   you can disable SELinux permanently by editing the following:
   
   /etc/selinux/conf
   
@ -66,27 +89,49 @@
 				UPGRADES
 ================================================================================

-1. Add additional permissions to the zmuser account:
+1. Verify /etc/zm.conf.
+
+   If zm.conf was manually edited before running the upgrade, the installation
+   may not overwrite it. In this case, it will create the file
+   /etc/zm.conf.rpmnew.
+
+   For example, this will happen if you are using database account credentials
+   other than zmuser/zmpass.
+
+   Compare /etc/zm.conf to /etc/zm.conf.rpmnew. Verify that zm.conf
+   contains any new config settings that may be in zm.conf.rpmnew.
+
+2. Verify permissions of the zmuser account.
+
+   Over time, the database account permissions required for normal operation
+   have changed. Verify the zmuser database account has been granted select,
+   insert, update, delete, lock tables, alter, and create permission to the
+   ZoneMinder database:

     mysql -u root -p
-     grant lock tables,alter on zm.* to
-     'zmuser'@localhost identified by 'zmpass';
+         mysql> show grants for zmuser@localhost;
+         mysql> exit;

-   Since this is an upgrade, the assumption is that the zmuser account exists
-   and already has select, insert, update, and delete permission.
+   See step 2 of the Installation section to add missing permissions.
+
+3. Verify the ZoneMinder Apache configuration file in the folder 
+   /etc/httpd/conf.d. You will have a file called "zoneminder.conf" and there
+   may also be a file called "zoneminder.conf.rpmnew". If the rpmnew file
+   exists, inspect it and merge anything new in that file with zoneminder.conf.
+
+4. Upgrade the database before starting ZoneMinder.
+
+   Most upgrades can be performed by executing the following command:
   
-2. If you have previsouly changed the zoneminder mysql credentials to something
-   other than zmuser/zmpass then you must now edit /etc/zm.conf. Change
-   ZM_DB_USER and ZM_DB_PASS to their appropriate values.
-   
-3. You will need to upgrade the ZoneMinder database as described in the manual.
-   Only if step 1 was succesfully applied, may you run zmupdate like so:
-   
-    sudo zmupdate.pl --version=<from version>
-   
-   
-   If unsure then run it this way:
+     sudo zmupdate.pl
+
+   Recent versions of ZoneMinder don't require any parameters added to the 
+   zmupdate command. However, if ZoneMinder complains, you may need to call
+   zmupdate in the following manner:

   sudo zmupdate.pl --user=root --pass=<mysql_root_pwd> --version=<from version>

+5. Now start zoneminder:
+
+	sudo service zoneminder start

--- a/distros/redhat/README.Centos7
+++ b/distros/redhat/README.Centos7
@ -1,23 +1,21 @@
-
 What's New
 ==========

-1. The Apache ScriptAlias has been changed from "/cgi-bin/zm/zms" to 
-   "/cgi-bin-zm/zms". This has been to done to avoid this bug:
-   https://bugzilla.redhat.com/show_bug.cgi?id=973067
+1. The ZoneMinder mysql account now requires "Create" permission. This change
+   must be done manually before ZoneMinder will run. See the installation steps
+   below.

-   IMPORTANT: ZoneMinder will not update this value during an upgrade. You must
-   manually update ZM_PATH_ZMS yourself under Options. This does not affect
-   new installs.
+2. A new permission group called "Groups" has been added. This allows the
+   system administrator to assign "view", "edit", or "none" permission to
+   normal users, without giving them access to the rest of the ZoneMinder
+   system. During an upgrade, existing accounts will default to a Groups
+   permission of "none".

-2. During an rpm package upgrade, zmupdate.pl will now auto-update the database
-   and the zonemidner service will restart automatically.
-
-3. The ZoneMinder config file, zm.conf, has been moved under /etc/zm.
-
-4. Systemd. CentOS 7 uses Systemd instead of the legacy Sys V Init. Under the
-   hood, Systemd does things quite a bit differently. Prepare to go through a
-   learning curve if you have not done so already.
+3. This package now requires the HTTPS protocol to access the web portal.
+   Requests using HTTP will auto-redirect to HTTPS. See README.https for
+   more information.
+   
+4. This package ships with the new ZoneMinder API enabled.

 New installs
 ============
@ -36,8 +34,8 @@ New installs

     mysql -u root -p < /usr/share/zoneminder/db/zm_create.sql
     mysql -u root -p
-         mysql> grant select,insert,update,delete,lock tables,alter on zm.* to
-               'zmuser'@localhost identified by 'zmpass';
+         mysql> grant select,insert,update,delete,lock tables,alter,create
+                on zm.* to 'zmuser'@localhost identified by 'zmpass';
         mysql> exit;
     mysqladmin -u root -p reload

@ -50,21 +48,22 @@ New installs
   step.

 4. Edit /etc/php.ini, uncomment the date.timezone line, and add your local
-   timezone.  For whatever reason, PHP will complain loudly if this is not set,
-   or if it is set incorrectly, and these complaints will show up in the
-   zoneminder logging system as errors.
+   timezone.  PHP will complain loudly if this is not set, or if it is set
+   incorrectly, and these complaints will show up in the zoneminder logging
+   system as errors.

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

-5. This package will automatically configure and install an SELinux policy
-   called local_zoneminder. A copy of this policy is in the documentation
-   folder.
+5. Disable SELinux 
+
+   We currently do not have the resources to create and maintain an accurate
+   SELinux policy for ZoneMinder on CentOS 7. We will gladly accept pull
+   reqeusts from anyone who wishes to do the work. In the meantime, SELinux
+   will need to be disabled or put into permissive mode.
   
-   Maintaining an accurate SELinux policy file that does not create issues has
-   been a struggle. If SELinux blocks nortmal ZoneMinder acitivity, or you
-   feel you just don't need it, SELinux can be disabled for the current running
-   session with the following command:
+   To immediately disbale SELinux for the current seesion, issue the following
+   from the command line:

     sudo setenforce 0

@ -99,29 +98,35 @@ Upgrades

 2. Verify permissions of the zmuser account.

-   Overtime, the database account permissions required for normal operation
+   Over time, the database account permissions required for normal operation
   have changed. Verify the zmuser database account has been granted select,
-   insert, update, delete, lock tables, and alter permission to the ZoneMinder
-   database:
+   insert, update, delete, lock tables, alter, and create permission to the
+   ZoneMinder database:

     mysql -u root -p
         mysql> show grants for zmuser@localhost;
         mysql> exit;

-3. Verify the database was upgraded automatically.
+   See step 2 of the Installation section to add missing permissions.

-   From the web console, ZoneMinder should show a status of "Running", and the
-   version number should have incremented.
+3. Verify the ZoneMinder Apache configuration file in the folder 
+   /etc/httpd/conf.d. You will have a file called "zoneminder.conf" and there
+   may also be a file called "zoneminder.conf.rpmnew". If the rpmnew file
+   exists, inspect it and merge anything new in that file with zoneminder.conf.

-   If it is not running, then try to start it. The web console will indicate
-   if there is a database version conflict. If this is the case, then you may
-   need to manually update the database from the command line:
+4. Upgrade the database before starting ZoneMinder.
+
+   Most upgrades can be performed by executing the following command:
   
     sudo zmupdate.pl

-   Modern versions of ZoneMinder don't require any parameters added to the 
+   Recent versions of ZoneMinder don't require any parameters added to the 
   zmupdate command. However, if ZoneMinder complains, you may need to call
   zmupdate in the following manner:

   sudo zmupdate.pl --user=root --pass=<mysql_root_pwd> --version=<from version>

+5. Now start zoneminder:
+
+	sudo systemctl start zoneminder
+
--- a/distros/redhat/README.https
+++ b/distros/redhat/README.https
@ -0,0 +1,25 @@
+HTTPS is now a requirement
+==========================
+
+This package now depends on Apache's mod_ssl pacakge. This will automatically
+be installed along with ZoneMinder. Upon installation, the mod_ssl package
+will create a default, self-signed certificate. This is the certificate that
+ZoneMinder will use out of the box. 
+
+Since the certificate is self-signed, you will get a warning from your browser
+the first time you access the web portal. This is normal.
+
+This is not intended to be an all encompasing solution for everyone. ZoneMinder
+will work just fine over HTTPS the way it is currently configured. However,
+here are a couple of considerations you may want to take.
+
+1. Create your own certificate. The CentOS wiki has a guide that describes how
+   to do this: https://wiki.centos.org/HowTos/Https . Additionally, Googling 
+   "centos certificate" reveals many articles on the subject. Note that some
+   third party applications, such as zmNinja, will require you to create a
+   certificate different than the default certificate on your machine.
+
+2. You can turn off HTTPS entirely by simply commenting out the SSLRequireSSL
+   directives found in /etc/httpd/conf.d/zoneminder.conf. You should also
+   comment out the HTTP -> HTTPS Rewrite rule.
+
--- a/distros/redhat/zoneminder.el6.conf.in
+++ b/distros/redhat/zoneminder.el6.conf.in
@ -1,28 +1,28 @@
-# When using Zoneminder's own authentication, recorded CCTV images are
-# accessible from the web directly without passing the authentication. This
-# means any attacker could see your CCTV images without a password. In order
-# to avoid this you can disable Zoneminder's authentication and configure
-# standard Apache authentication (see the Apache documentation for details on
-# this).
 #
-# If you still wish to use Zoneminder's own authentication, or have an
-# internal site which needs no authentication, you need to delete the line
-# marked below and restart Apache.
+# ZoneMinder Apache configuration file
+# With SSLRequire and HTTPS auto redirect
+# Modify this configuration to suit your requirements
+#
+
+# Auto Redirect HTTP requests to HTTPS
+RewriteEngine On
+RewriteCond %{HTTPS} !=on
+RewriteRule ^/?(zm)(.*) https://%{SERVER_NAME}/$1$2 [R,L]

 Alias /zm "@ZM_WEBDIR@"
 <Directory "@ZM_WEBDIR@">
+    SSLRequireSSL
    Options -Indexes MultiViews FollowSymLinks
    AllowOverride All
    Order allow,deny
    Allow from all
-    # ZoneMinder no longer uses short tags so this is safe to leave disabled
-    # php_value short_open_tag 1
 </Directory>

-ScriptAlias /cgi-bin/zm "@ZM_WEBDIR@"
-<Directory "@ZM_WEBDIR@">
+ScriptAlias /cgi-bin/zm "@ZM_CGIDIR@"
+<Directory "@ZM_CGIDIR@">
+    SSLRequireSSL
    AllowOverride All
-    Options ExecCGI
+    Options ExecCGI FollowSymLinks
    Order allow,deny
    Allow from all
 </Directory>
--- a/distros/redhat/zoneminder.el6.spec
+++ b/distros/redhat/zoneminder.el6.spec
@ -30,8 +30,8 @@ BuildRequires:  libcurl-devel vlc-devel ffmpeg-devel polkit-devel
 # cmake needs the following installed at build time due to the way it auto-detects certain parameters
 BuildRequires:  httpd ffmpeg

-Requires:   httpd php php-gd php-mysql mysql-server libjpeg-turbo polkit net-tools psmisc
-Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:   httpd php php-gd php-mysql mysql-server libjpeg-turbo cambozola polkit net-tools mod_ssl
+Requires:   psmisc perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:   perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
 Requires:   perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP)
 Requires:   libcurl vlc-core ffmpeg
@ -96,8 +96,20 @@ echo -e "\nCreating and installing a ZoneMinder SELinux policy module. Please wa
 /usr/bin/semodule_package -o %{_docdir}/%{name}-%{version}/local_zoneminder.pp -m %{_docdir}/%{name}-%{version}/local_zoneminder.mod > /dev/null 
 /usr/sbin/semodule -i %{_docdir}/%{name}-%{version}/local_zoneminder.pp > /dev/null

-# Display the README for post installation instructions
-/usr/bin/less %{_docdir}/%{name}-%{version}/README.CentOS
+# Upgrade from a previous version of zoneminder 
+if [ $1 -eq 2 ] ; then
+    # Freshen the database
+    /usr/bin/zmupdate.pl -f
+
+    # We can't run this automatically when new sql account permissions need to
+    # be manually added first
+    # Run zmupdate non-interactively
+    #/usr/bin/zmupdate.pl --nointeractive
+fi
+
+# Warn the end user to read the README file
+echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, read README.Centos to finish the\ninstallation or upgrade!\n"
+echo -e "\nThe README file is located here: %{_docdir}/%{name}-%{version}.\n"

 %preun
 if [ $1 -eq 0 ]; then
@ -119,7 +131,7 @@ rm -rf %{_docdir}/%{name}-%{version}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS ChangeLog COPYING LICENSE NEWS README.md distros/redhat/README.CentOS distros/redhat/jscalendar-doc
-%doc distros/redhat/cambozola-doc distros/redhat/local_zoneminder.te
+%doc distros/redhat/local_zoneminder.te
 %config %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm.conf
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/httpd/conf.d/zoneminder.conf
 %config(noreplace) /etc/logrotate.d/%{name}
@ -146,7 +158,7 @@ rm -rf %{_docdir}/%{name}-%{version}
 #%{_bindir}/zmonvif-probe.pl

 %{perl_vendorlib}/ZoneMinder*
-%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ZoneMinder*
+%{perl_vendorarch}/auto/ZoneMinder/.packlist
 #%{perl_vendorlib}/ONVIF*
 #%{perl_vendorlib}/WSDiscovery*
 #%{perl_vendorlib}/WSSecurity*
@ -170,6 +182,9 @@ rm -rf %{_docdir}/%{name}-%{version}
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload

 %changelog
+* Tue Sep 8 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.1 
+- Require https, freshen dB on updates.
+
 * Wed Feb 18 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.1 
 - Include ONVIF support files

--- a/distros/redhat/zoneminder.el7.conf.in
+++ b/distros/redhat/zoneminder.el7.conf.in
@ -1,16 +1,17 @@
-# When using Zoneminder's own authentication, recorded CCTV images are
-# accessible from the web directly without passing the authentication. This
-# means any attacker could see your CCTV images without a password. In order
-# to avoid this you can disable Zoneminder's authentication and configure
-# standard Apache authentication (see the Apache documentation for details on
-# this).
 #
-# If you still wish to use Zoneminder's own authentication, or have an
-# internal site which needs no authentication, you need to delete the line
-# marked below and restart Apache.
+# ZoneMinder Apache configuration file
+# With SSLRequire and HTTPS auto redirect
+# Modify this configuration to suit your requirements
+#
+
+# Auto Redirect HTTP requests to HTTPS
+RewriteEngine On
+RewriteCond %{HTTPS} !=on
+RewriteRule ^/?(zm)(.*) https://%{SERVER_NAME}/$1$2 [R,L]

 Alias /zm "@ZM_WEBDIR@"
 <Directory "@ZM_WEBDIR@">
+    SSLRequireSSL
    Options -Indexes +MultiViews +FollowSymLinks
    AllowOverride All
    <IfModule mod_authz_core.c>
@ -22,14 +23,13 @@ Alias /zm "@ZM_WEBDIR@"
        Order deny,allow
        Allow from all
    </IfModule>
-    # ZoneMinder no longer uses short tags so this is safe to leave disabled
-    # php_value short_open_tag 1
 </Directory>

 ScriptAlias /cgi-bin-zm "@ZM_CGIDIR@"
 <Directory "@ZM_CGIDIR@">
+    SSLRequireSSL
    AllowOverride All
-    Options ExecCGI
+    Options +ExecCGI +FollowSymLinks
    <IfModule mod_authz_core.c>
       # Apache 2.4
       Require all granted
@ -40,3 +40,4 @@ ScriptAlias /cgi-bin-zm "@ZM_CGIDIR@"
        Allow from all
    </IfModule>
 </Directory>
+
--- a/distros/redhat/zoneminder.el7.spec
+++ b/distros/redhat/zoneminder.el7.spec
@ -32,8 +32,8 @@ BuildRequires: ffmpeg ffmpeg-devel perl(X10::ActiveHome) perl(Astro::SunTime)
 # cmake needs the following installed at build time due to the way it auto-detects certain parameters
 BuildRequires:  httpd polkit-devel

-Requires: httpd php php-gd php-mysql mariadb-server polkit net-tools psmisc
-Requires: libjpeg-turbo vlc-core libcurl
+Requires: httpd php php-gd php-mysql mariadb-server cambozola polkit net-tools mod_ssl
+Requires: psmisc libjpeg-turbo vlc-core libcurl
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
 Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP)
@ -87,28 +87,35 @@ fi
 /usr/bin/gpasswd -a %{zmuid_final} video
 /usr/bin/gpasswd -a %{zmuid_final} dialout

+# Disabled. SELinux policy does not work for RHEL 7.
 # Create and load zoneminder selinux policy module
-echo -e "\nCreating and installing a ZoneMinder SELinux policy module. Please wait.\n"
-/usr/bin/checkmodule -M -m -o %{_docdir}/%{name}-%{version}/local_zoneminder.mod %{_docdir}/%{name}-%{version}/local_zoneminder.te > /dev/null
-/usr/bin/semodule_package -o %{_docdir}/%{name}-%{version}/local_zoneminder.pp -m %{_docdir}/%{name}-%{version}/local_zoneminder.mod > /dev/null
-/usr/sbin/semodule -i %{_docdir}/%{name}-%{version}/local_zoneminder.pp > /dev/null
+#echo -e "\nCreating and installing a ZoneMinder SELinux policy module. Please wait.\n"
+#/usr/bin/checkmodule -M -m -o %{_docdir}/%{name}-%{version}/local_zoneminder.mod %{_docdir}/%{name}-%{version}/local_zoneminder.te > /dev/null
+#/usr/bin/semodule_package -o %{_docdir}/%{name}-%{version}/local_zoneminder.pp -m %{_docdir}/%{name}-%{version}/local_zoneminder.mod > /dev/null
+#/usr/sbin/semodule -i %{_docdir}/%{name}-%{version}/local_zoneminder.pp > /dev/null

 # Upgrade from a previous version of zoneminder 
 if [ $1 -eq 2 ] ; then
+    # Freshen the database
+    /usr/bin/zmupdate.pl -f
+
+    # We can't run this automatically when new sql account permissions need to
+    # be manually added first
    # Run zmupdate non-interactively
-    /usr/bin/zmupdate.pl --nointeractive
+    #/usr/bin/zmupdate.pl --nointeractive
 fi

-# Display the README for post installation instructions
-/usr/bin/less %{_docdir}/%{name}-%{version}/README.Centos7
+# Warn the end user to read the README file
+echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, read README.Centos7 to finish the\ninstallation or upgrade!\n"
+echo -e "\nThe README file is located here: %{_docdir}/%{name}-%{version}.\n"

 %preun
 if [ $1 -eq 0 ] ; then
    # Package removal, not upgrade
    /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || :
    /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || :
-    echo -e "\nRemoving ZoneMinder SELinux policy module. Please wait.\n"
-    /usr/sbin/semodule -r local_zoneminder.pp
+#    echo -e "\nRemoving ZoneMinder SELinux policy module. Please wait.\n"
+#    /usr/sbin/semodule -r local_zoneminder.pp
 fi

 %postun
@ -131,7 +138,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS ChangeLog COPYING LICENSE NEWS README.md distros/redhat/README.Centos7 distros/redhat/jscalendar-doc
-%doc distros/redhat/cambozola-doc distros/redhat/local_zoneminder.te
+%doc distros/redhat/local_zoneminder.te
 %config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
 %config(noreplace) /etc/tmpfiles.d/zoneminder.conf
@ -184,6 +191,9 @@ fi


 %changelog
+* Mon Sep 7 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.1 
+- Require https, disable selinux module, freshen dB on updates.
+
 * Sun Feb 8 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.1 
 - Initial release for CentOS 7.

--- a/distros/redhat/zoneminder.tmpfiles.in
+++ b/distros/redhat/zoneminder.tmpfiles.in
@ -1 +1,3 @@
-d @ZM_RUNDIR@ 0755 @WEB_USER@ @WEB_GROUP@
+D @ZM_RUNDIR@ 0755 @WEB_USER@ @WEB_GROUP@
+D @ZM_TMPDIR@ 0755 @WEB_USER@ @WEB_GROUP@
+D @ZM_SOCKDIR@ 0755 @WEB_USER@ @WEB_GROUP@
--- a/distros/ubuntu1204/init.d
+++ b/distros/ubuntu1204/init.d
@ -23,6 +23,7 @@ command="$ZM_PATH_BIN/zmpkg.pl"

 start() {
 	echo -n "Starting $prog: "
+	export TZ=:/etc/localtime
 	mkdir -p $RUNDIR && chown www-data:www-data $RUNDIR
 	mkdir -p $TMPDIR && chown www-data:www-data $TMPDIR
 	$command start
--- a/distros/ubuntu1204_cmake/NEWS
+++ b/distros/ubuntu1204_cmake/NEWS
@ -0,0 +1,10 @@
+zoneminder (1.28.1-1) unstable; urgency=low
+
+  This version is no longer automatically initialize or upgrade database.
+  See README.Debian for details.
+
+  Changed installation paths (please correct your web server configuration):
+    /usr/share/zoneminder --> /usr/share/zoneminder/www
+    /usr/lib/cgi-bin --> /usr/lib/zoneminder/cgi-bin
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 31 Mar 2015 15:12:17 +1100
--- a/distros/ubuntu1204_cmake/README.Debian
+++ b/distros/ubuntu1204_cmake/README.Debian
@ -0,0 +1,160 @@
+Zoneminder for Debian
+---------------------
+
+Initializing database
+---------------------
+
+    pv /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
+OR
+    cat /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
+
+    echo 'grant lock tables,alter,create,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";'\
+    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
+
+Hint: generate secure password with `pwgen` and update "/etc/zm/zm.conf"
+accordingly.
+
+The following command can help to ensure that zoneminder can read its
+configuration file:
+
+    chgrp -c www-data /etc/zm/zm.conf
+
+
+Upgrading database
+------------------
+
+Prior to 1.28.1 database upgrade was performed automatically.
+"zoneminder" service will refuse to start with outdated database.
+
+Assuming that database is on "localhost" then the following command can be
+used to upgrade "zm" database:
+
+    zmupdate.pl
+
+Additional permissions may be required to perform upgrade:
+
+    echo 'grant lock tables, create, alter on zm.* to 'zmuser'@localhost identified by "zmpass";'\
+    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
+
+The following command prints the current version of zoneminder database:
+
+    echo 'select Value from Config where Name = "ZM_DYN_CURR_VERSION";' \
+    | sudo mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names zm
+
+
+Enabling service
+----------------
+
+By default Zoneminder service is not starting automatically and need to be
+manually activated once database is configured:
+
+On systemd:
+
+    sudo systemctl enable zoneminder.service
+
+On SysV:
+
+    sudo update-rc.d zoneminder enable
+
+
+Web server set-up
+-----------------
+
+There are few manual steps to get the web interface working:
+
+## Apache2
+
+Apache can be configured as folder "/zm" using sample .conf:
+
+    sudo a2enconf zoneminder
+
+Alternatively Apache web site configuration template can be used to setup
+zoneminder as "http://zoneminder":
+
+    sudo cp -v /usr/share/doc/zoneminder/examples/apache.conf /etc/apache2/sites-available/
+    sudo a2ensite zoneminder.conf
+
+Common configuration steps for Apache2:
+
+    sudo a2enmod cgi
+    sudo service apache2 reload
+
+
+## nginx / fcgiwrap
+
+Nginx needs "php5-fpm" package to support PHP and "fcgiwrap" package
+for binary "cgi-bin" applications:
+
+    sudo apt-get install php5-fpm fcgiwrap
+
+To enable a URL alias that makes Zoneminder available from
+
+    http://yourserver/zm
+
+the following line is to be added to "server" section of a web site
+configuration:
+
+    include /usr/share/doc/zoneminder/examples/nginx.conf;
+
+For "default" web site it would be sufficient to include the above
+statement to the file
+
+    /etc/nginx/sites-enabled/default
+
+To avoid problems with feeds from multiple cameras "fcgiwrap" should be
+configured to start at least as many processes as there are cameras.
+It can be done by adjusting DAEMON_OPTS in "/etc/default/fcgiwrap".
+Systemd users may be affected by the following bug:
+
+    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792705
+
+
+## Note:
+
+When Zoneminder web site is running it may be necessary to set
+Options/Paths/PATH_ZMS to "/zm/cgi-bin/nph-zms" or according to chosen web
+site configuration.
+
+
+Changing the location for images and events
+-------------------------------------------
+
+Zoneminder, in its upstream form, stores data in /usr/share/zoneminder/.  This
+package modifies that by changing /usr/share/zoneminder/images and
+/usr/share/zoneminder/events to symlinks to directories under
+/var/cache/zoneminder.
+
+There are numerous places these could be put and ways to do it.  But, at the
+moment, if you change this, an upgrade will fail with a warning about these
+locations having changed (the reason for this was that previously, an  upgrade
+would silently revert the changes and cause event loss - refer
+bug #608793).
+
+If you do want to change the location, here are a couple of suggestions.
+(thanks to vagrant@freegeek.org):
+
+These lines in fstab could allow you to bind-mount an alternate location
+
+         /dev/sdX1 /otherdrive ext3 defaults 0 2
+         /otherdrive/zoneminder/images /var/cache/zoneminder/images bind defaults 0 2
+         /otherdrive/zoneminder/events /var/cache/zoneminder/events bind defaults 0 2
+
+        or if you have a separate partition for each:
+
+         /dev/sdX1 /var/cache/zoneminder/images ext3 defaults 0 2
+         /dev/sdX2 /var/cache/zoneminder/events ext3 defaults 0 2
+
+ -- Peter Howard <pjh@northern-ridge.com.au>, Sun, 16 Jan 2010 01:35:51 +1100
+
+Access to /dev/video*
+---------------------
+
+For cameras which require access to /dev/video*, zoneminder may need the
+www-data user added to the video group in order to see those cameras:
+
+  adduser www-data video
+
+Note that all web applications running on the zoneminder server will then have
+access to all video devices on the system.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sun, 27 Mar 2011 13:06:56 -0700
--- a/distros/ubuntu1204_cmake/TODO.Debian
+++ b/distros/ubuntu1204_cmake/TODO.Debian
@ -0,0 +1,12 @@
+
+## Separate substantial /usr/share into its own arch-all package.
+
+## Decide how to handle database updates.
+
+  * Consider possibility that database may be on another machine (#469239).
+  * Consider dbconfig-common? Probably not (what if database is not on localhost?).
+
+### Run `zmupdate.pl` from service control scripts (init.d, service) on start?
+
+ Automatic upgrade will break "one DB, many zoneminders" setup (unimportant?).
+
--- a/distros/ubuntu1204_cmake/changelog
+++ b/distros/ubuntu1204_cmake/changelog
@ -0,0 +1,573 @@
+zoneminder (1.28.1+1-vivid-SNAPSHOT2015081701) vivid; urgency=medium
+
+  * include api, switch to cmake build
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Mon, 17 Aug 2015 10:29:23 -0400
+
+
+zoneminder (1.28.1-8) unstable; urgency=medium
+
+  * Patchworks:
+    + New upstream "980-fix-image-size.patch".
+    + New "default_cgi-path.patch" to correct default ZM_PATH_ZMS.
+  * postinst: set "root" as group owner for "/var/log/zm" to silence
+    logrotate warnings.
+  * Minor correction to README.Debian.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 16 Aug 2015 19:19:50 +1000
+
+zoneminder (1.28.1-7) unstable; urgency=medium
+
+  * Build-Depends += "cakephp (<< 3.0.0~)";
+    Zoneminder is not compatible with latest CakePHP.
+  * Handle conffile removal from maintscript.
+  * rules: build man pages reproducibly.
+  * gbp.conf: renamed old style config section [git-dch] to [dch].
+  * README
+    + added instructions to update owner of the "/etc/zm/zm.conf"
+      (Closes: #789327).
+    + zmupdate.pl needs CREATE rights.
+    + added note about required number of "fcgiwrap" workers.
+  * New upstream patch: "zmtrigger-plus.patch".
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 20 Jul 2015 16:30:15 +1000
+
+zoneminder (1.28.1-6) unstable; urgency=low
+
+  * New "zoneminder-doc" and "zoneminder-dbg" packages.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 19 Apr 2015 14:50:41 +1000
+
+zoneminder (1.28.1-5) unstable; urgency=low
+
+  * Move handling of "/var/run/zm" and "/tmp/zm" from .service into .tmpfile.
+    Let dh_installinit do the job. Thanks, Andrew Bauer.
+  * Use dh_apache2 to install Apache conf file; remove old conf and symlink.
+  * Promote "libapache2-mod-php5 | php5-fpm" to Recommends.
+  * Build-Depends:
+    + dh-linktree
+    + cakephp (>= 2.6.3)
+    + libjs-jquery
+    + libjs-mootools
+  * Depends:
+    - libjs-jquery
+    - libjs-mootools
+  * Build-time replace bundled CakePHP with system one using "dh-linktree".
+  * Use "dh-linktree" to handle mootools and jquery symlinks.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 19 Apr 2015 11:45:01 +1000
+
+zoneminder (1.28.1-4) unstable; urgency=low
+
+  * New patch to fix HTML export with USE_DEEP_STORAGE (closes: #723706).
+  * New "783.patch" to describe potential data loss in ZM_USE_DEEP_STORAGE.
+  * New patch to change default date format to region-neutral ISO notation
+    with time zone.
+  * Build sphinx documentation:
+    + Install "zoneminder.1" man page.
+    + Build-Depends += "python-sphinx | python3-sphinx"
+    + Added commented "zoneminder-doc" package.
+    + Added "docs.patch" to unlink distro-specific installation docs.
+  * rules:
+    + set ZM_CONTENTDIR, ZM_SOCKDIR and ZM_TMPDIR.
+    + remove mistakengly installed Perl module templates.
+  * Updated startup scripts to create ZM_TMPDIR.
+  * Hurd improvements:
+    + New patch to add PATH_MAX definitions.
+    + Build without MMAP support on Hurd.
+    + libsys-mmap-perl [!hurd-any].
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 06 Apr 2015 18:18:55 +1000
+
+zoneminder (1.28.1-3) unstable; urgency=low
+
+  * Updated Apache2 and nginx configuration templates to support CGI.
+  * Updated README.Debian to document cgi-bin setup.
+  * Removed "/usr/share/zoneminder/www/cgi-bin" symlink.
+  * Added "apache2.patch" to correct Apache2 site configuration example.
+  * control: Suggests += "fcgiwrap".
+  * rules: added dh_systemd overrides to prevent automatic service
+    activation and start.
+  * Added note about manual service activation to README.Debian
+    (Closes: #781733).
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 02 Apr 2015 23:20:20 +1100
+
+zoneminder (1.28.1-2) unstable; urgency=low
+
+  * Removed word "Linux" from short package description.
+  * Build-Depends: do not require "libv4l-dev" on Hurd i.e. [!hurd-any].
+  * Added run-time Perl Depends:
+     + libdbd-mysql-perl
+     + libimage-info-perl
+     + libmodule-load-conditional-perl
+     + libnet-sftp-foreign-perl
+     + liburi-encode-perl
+  * Prepare for package split: added commented "libzoneminder-perl"
+    and "zoneminder-dbg" packages to "debian/control".
+  * rules: do not install worthless ".packlist" file.
+  * Updated "libv4l1-videodev.h.patch" to fix v4lv1 detection in CMake.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 02 Apr 2015 13:25:19 +1100
+
+zoneminder (1.28.1-1) unstable; urgency=low
+
+  [ Dmitry Smirnov <onlyjob@debian.org> ]
+  * New upstream release [February 2015].
+  * Upload to unstable.
+  * Disabled automatic database upgrades: post(inst|rm) scripts no longer
+    touch database or do unexpected stuff (Closes: #779254).
+    See README.Debian for details.
+  * Updated installation paths:
+    + /usr/share/zoneminder --> /usr/share/zoneminder/www
+    + /usr/lib/cgi-bin --> /usr/lib/zoneminder/cgi-bin
+  * Added logrotate config (Closes: #544826).
+    Thanks, Alberto Reyes.
+  * Native systemd service; "--with systemd" added to dh.
+  * Build with CMake instead of autoconf; rules clean-up.
+  * Build with all hardening.
+  * Build and install "zmupdate.pl.1" man page.
+  * Added nginx/php5-fpm configuration example.
+  * Install upstream "apache.conf" example.
+  * Described setup of Zoneminer web site and database in README.Debian.
+  * Install "/etc/zm/zm.conf" with tighter permissions.
+  * Added TODO.Debian.
+  * Added "debian/clean"; "debian/gbp.conf"; bug-presubj.
+  * Remove bundled Cake tests to take ~5 MB off big-usr-share.
+  * Standards-Version: 3.9.6; compat/debhelper to version 9.
+  * Vcs links to new git repository at collab-maint.
+  * Build-Depends:
+    + dh-systemd
+    + libgcrypt11-dev --> libgcrypt-dev
+    + libcurl4-gnutls-dev
+    + libvlc-dev
+    + policykit-1 (required by "zmsystemctl.pl")
+    - dh-autoreconf, autoconf, automake
+  * Depends:
+    - apache2
+    - libapache2-mod-php5 (moved to Suggests)
+    - libpcre3 (invalid)
+    - libmodule-load-perl (obsolete; replaced with perl-modules)
+    - libarchive-tar-perl (obsolete; replaced with perl-modules)
+    - mysql-server (moved to Recommends, Closes: #759504).
+    - php5
+    + libav-tools
+    + libjs-jquery  (replaces bundled component)
+    + libjs-mootool (replaces bundled component)
+    + libjson-any-perl (Closes: #690803).
+    + perl-modules (Closes: #745819).
+  * Recommends:
+    + apache2 | httpd
+    + mysql-server | virtual-mysql-server (Closes: #732874).
+  * Suggests:
+    + libapache2-mod-php5 | php5-fpm
+    + logrotate
+  * Refreshed, renamed and re-ordered patches; added DEP-3 headers.
+  * Removed "vendor_perl" patch (applied-upstream).
+  * New patches:
+    + cmake-fix-confpath.patch
+    + cmake-gnutls.patch
+    + cmake-nossl.patch
+    + cmake.patch
+    + format-hardening.patch
+    + pod_man_fixes.patch
+    + pod_name_fixes.patch
+    + pod_zmupdate-to-pod2usage.patch
+  * Lintianisation (incomplete):
+    - extra-license-file
+    - init.d-script-missing-lsb-description
+    - init.d-script-does-not-source-init-functions
+    - privacy-breach-generic
+    - package-contains-empty-directory
+    - manpage-has-errors-from-pod2man
+    - manpage-has-bad-whatis-entry
+    - quilt-patch-missing-description
+    - no-dep5-copyright
+  * Lintian-overrides:
+    + unusual-interpreter usr/bin/zmsystemctl.pl #!/usr/bin/pkexec
+    + script-not-executable usr/share/zoneminder/www/api/*
+    + script-with-language-extension usr/bin/*.pl
+    + source-is-missing web/tools/mootools/mootools-*-yc.js
+    + source-is-missing web/skins/*/js/jquery-1.4.2.min.js
+    + source-contains-prebuilt-javascript-object
+  * Renamed files in "debian".
+  * watch: dfsg repacksuffix and dversionmangle.
+  * "debian/copyright" to Copyright-Format-1.0.
+  * Set myself as new Maintainer (Closes: #760314).
+
+  [ Vagrant Cascadian <vagrant@debian.org> ]
+  * Removed obsolete DM-Upload-Allowed flag.
+  * Update debian/watch to use tarballs from github.
+  * Add Build-Depends on libgcrypt11-dev (Closes: #745819).
+  * Use canonical alioth Vcs-Hg URL.
+  * debian/control: Add Build-Depends: libpolkit-gobject-1-dev.
+  * Removed configure flag "--enable-crashtrace=no", which is no longer
+    present upstream.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 31 Mar 2015 15:11:13 +1100
+
+zoneminder (1.26.5-3.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Add libav10.patch and compile against libav10 (Closes: #739461)
+
+ -- Reinhard Tartler <siretart@tauware.de>  Wed, 19 Mar 2014 00:31:22 +0000
+
+zoneminder (1.26.5-3) unstable; urgency=low
+
+
+  * Previous release still didn't build on PPC - this has been corrected.
+    (Closes: #736516)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 4 Feb 2014 02:02:10 +1000
+
+zoneminder (1.26.5-2) unstable; urgency=low
+
+  * Remove dependency on ffmpeg
+    (Closes: #721161)
+
+  * Builds again on non-x86 target architectures.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 23 Jan 2014 01:02:10 +1000
+
+zoneminder (1.26.5-1) unstable; urgency=low
+
+  * New upstream version
+    (Closes: #694131)
+  * Change Build-Depends on libgnutls-dev to libgnutls-openssl-dev
+    (Closes: #731560)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 17 Dec 2013 01:02:10 +1000
+
+zoneminder (1.25.0-4) unstable; urgency=high
+
+  * Add CVE-2013-0232 patch
+    [SECURITY] CVE-2013-0232: Shell escape commands with untrusted content.
+    Thanks to James McCoy <jamessan@debian.org> (Closes: #698910)
+    Thanks also to Salvatore Bonaccorso <carnil@debian.org>
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 12 Jun 2013 12:02:10 +1000
+
+zoneminder (1.25.0-3) unstable; urgency=low
+
+  * debian/rules: Export CFLAGS, CPPFLAGS, CXXFLAGS and LDFLAGS, to ensure
+    hardening build flags are enabled.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Tue, 28 Aug 2012 12:10:03 -0700
+
+zoneminder (1.25.0-2) unstable; urgency=low
+
+  [ Vagrant Cascadian ]
+  * Add a patch to disable checking for updated versions by default, as
+    upgrades should happen through package management.
+  * Use dpkg-buildflags in debian/rules to set default compiler flags.
+  * Ensure zoneminder is stopped before starting (Closes: #657407).
+
+  [ Peter Howard ]
+  * Fix postinst to add permission for table creation during upgrade
+    (Closes: #657407).
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Thu, 23 Aug 2012 12:40:34 -0700
+
+zoneminder (1.25.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with GCC-4.7": add patch Fix-FTBFS-with-gcc-4.7 from Cyril
+    Brulebois: fix missing <unistd.h> includes.
+    (Closes: #667428)
+
+ -- gregor herrmann <gregoa@debian.org>  Sun, 13 May 2012 17:02:21 +0200
+
+zoneminder (1.25.0-1) unstable; urgency=low
+
+  * Fix typo in libv4l1-videodev.h patch that caused v4l1 support to be
+    dropped.
+  * Fail to build if version in postinst doesn't match upstream version.
+  * Add Build-Depends: libavdevice-dev to fix MPEG streaming (Closes: #515558).
+  * debian/rules: Convert to using debhelper overrides.
+  * Set debian/compat to 7.
+  * Simplify debian/watch file.
+  * Refresh debian/patches/use_libjs-mootools.
+  * Refresh debian/patches/libv4l1-videodev.h.
+  * Remove dependencies on php4 and related packages.
+  * Remove build-dependencies on libmysqlclient14-dev and
+    libmysqlclient15-dev.
+  * Update Build-Depends to use libjpeg-dev instead of libjpeg62-dev
+    (Closes: #647114).
+  * Add patch to fix build by testing for C headers rather than C++ headers.
+    Thanks to Ryan Niebur. (Closes: #654230)
+  * Add a patch to fix build problems caused by API changes in libav 0.8.
+    Thanks again to Ryan Niebur. (Closes: #654230)
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Mon, 16 Jan 2012 11:58:05 -0800
+
+zoneminder (1.24.4-1) unstable; urgency=low
+
+  [ Peter Howard ]
+  * Initial release of 1.24.4 (Closes: #634985).
+    - Fix 32/64-bit type declarations (Closes: #614404).
+  * Update patches.
+
+  [ Vagrant Cascadian ]
+  * Add patch to fix FTBFS by using libv4l1-videodev.h from libv4l-dev.
+    Thanks to Andreas Metzler for reporting the issue.
+    (Closes: #619813).
+  * Document adding the www-data user to the video group in README.Debian.
+    (Closes: #611324)
+  * Depend on libsys-mmap-perl to enable mapped memory support.
+    (Closes: #607331)
+  * Update libjs-mootools patch to use -nc variants (Closes: #635075).
+  * Depend on javascript-common, to ensure that /javascript is available in
+    the web server.
+  * Set the upstream version in postinst at build time.
+  * Use dh-autoreconf to properly clean up autogenerated files during build.
+  * Add Vcs-HG to debian/control.
+  * Add Build-Depends: libv4l-dev, libbz2-dev, dh-autoreconf, libsys-mmap-perl.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sun, 24 Jul 2011 16:44:30 +0200
+
+zoneminder (1.24.2-9) unstable; urgency=low
+
+  * Apply patch from Ubuntu to fix FTBFS with ffmpeg 0.6:
+    - Add -D__STDC_CONSTANT_MACROS to CPPFLAGS (closes: 614080).
+  * Update Standards-Version to 3.9.1, no changes necessary.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sun, 20 Feb 2011 23:43:02 -0800
+
+zoneminder (1.24.2-8) unstable; urgency=medium
+
+  [ Vagrant Cascadian ]
+  * Apply patch to fix V4L2 cameras without crop support (closes: #608790).
+    Thanks to piratebab.
+  * Add preinst script which aborts if dangerous symlinks exist.
+    (closes: #608793)
+
+  [ Peter Howard ]
+  * Added to README.Debian with info about images and events directories.
+    (closes: #608793)
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sat, 15 Jan 2011 19:39:26 -0800
+
+zoneminder (1.24.2-7) unstable; urgency=medium
+
+  * Do not set ownership of /var/cache/zoneminder when upgrading, which fixes a
+    regression causing upgrades to take inordinately long with large
+    installations (closes: #597040).
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Fri, 17 Sep 2010 11:24:41 -0700
+
+zoneminder (1.24.2-6) unstable; urgency=low
+
+  * Only remove database on purge. This requires only creating the database if
+    it doesn't already exist, and upgrading the database only if the database
+    is an older version (closes: #497107).
+
+  * Do not prompt the user on database upgrades by using the --nointeractive
+    flag when calling zmupdate.pl from postinst (closes: #595902).
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Fri, 10 Sep 2010 10:06:06 -0700
+
+zoneminder (1.24.2-5) unstable; urgency=low
+
+  [ Peter Howard ]
+  * Add zip dependency
+    (closes: #494261)
+  * Add debian/watch file
+    (closes: #545552)
+  * Use packaged libjs-mootools
+    (closes: #585590)
+  * Miscellaneous cleanups
+
+  [ Vagrant Cascadian ]
+  * Add vagrant@debian.org as uploader
+  * Update Standards-Version to 3.9.0, no changes necessary.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Fri, 23 Jul 2010 18:12:50 -0500
+
+zoneminder (1.24.2-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "package removed, processes still running": apply patch to
+    debian/postinst by Vagrant Cascadian: use invoke-rc.d and run
+    mysql-related actions only when mysql is running (closes: #583648).
+
+ -- gregor herrmann <gregoa@debian.org>  Thu, 01 Jul 2010 19:47:10 +0200
+
+zoneminder (1.24.2-4) unstable; urgency=high
+  * Update init.d to list mysql dependency
+    (closes: #583505)
+  * Change depenency from libmime-perl to libmime-tools-perl
+    (closes: #585589)
+  * Problems in changelog format fixed
+    (closes: #585592)
+  * Fix debian-rules-ignores-make-clean-error
+    (closes: #585593)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 14 jun 2010 15:02:10 +1000
+
+zoneminder (1.24.2-3) unstable; urgency=high
+  * Changes symbols to build with libjpeg8
+    (closes: #565326, #568327)
+  * Note: location of all perl files should have been fixed in previous release
+    (closes: #553096)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 26 apr 2010 15:02:10 +1000
+
+zoneminder (1.24.2-2) unstable; urgency=high
+
+  * Remove custom perl parth from zmpkg.pl, fix location of manpages.
+    (closes: #551746, #553092)
+  * Fix GCC4.4 bug
+    (closes: #531717)
+  * Fix potential bug in postinst script
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Nov 2009 15:02:10 +1000
+
+zoneminder (1.24.2-1) unstable; urgency=high
+
+  * Initial release of zoneminder 1.24.2
+ -- Peter Howard <pjh@northern-ridge.com.au>  Fri, 11 Sep 2009 07:02:50 +1000
+
+zoneminder (1.24.1-1) unstable; urgency=high
+
+  * Initial release of zoneminder 1.24.1, closing CVE-2008-3882,
+    CVE-2008-3881, CVE-2008-3880
+    (closes: #497640)
+  * Change syslog dependency to rsyslog.
+    (closes: #526918)
+  * Add missing perl depenency.
+  * Restore patch to disable "check for updates" by default.
+  * Removed spurious '$' in init script.
+    (closes: #486064)
+  * Change permission of zm.conf from 0600 to 0400 for CVE-2008-6755
+    (closes: #528252)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 16 May 2009 07:02:50 +1000
+
+zoneminder (1.23.3-4) unstable; urgency=high
+
+  * update to get it building with latest unstable. Thanks to waldi@debian.org
+    (closes: #517569)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 16 Apr 2009 01:02:50 +1000
+
+zoneminder (1.23.3-3) unstable; urgency=high
+
+  * ffmpeg confirmed  working
+    (closes: #475145)
+  * Fix upgrade problem intrudouced in 1.23.3-1
+    (closes: #481637)
+  * Include libmime-lite-perl in dependencies
+    (closes: #486312)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 18 Sep 2008 01:02:50 +1000
+
+zoneminder (1.23.3-2) unstable; urgency=high
+
+  * ffmpeg finally working?
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 13 Aug 2008 01:02:50 +1000
+
+zoneminder (1.23.3-1) unstable; urgency=high
+
+  * Initial version for 1.23.3 - security fix.
+    (closes: #479034)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 19 Mar 2008 01:02:50 +1000
+
+zoneminder (1.23.2-2) unstable; urgency=low
+
+  * Update to init.d
+    (closes: #468856)
+  * Add dependency on logging daemon
+    (closes: #471277)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 19 Mar 2008 01:02:50 +1000
+
+zoneminder (1.23.2-1) unstable; urgency=low
+
+  * Initial version for 1.23.2
+    (closes: #464152)
+  * Zoneminder 1.23.2 upstream includes fix for GCC 4.3
+    (closes: #454980)
+  * Includes ffmpeg patch by Alexander Kushnirenko <kushnir@uni-protvino.ru>
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 01 Mar 2008 16:02:50 +1000
+
+zoneminder (1.22.3-10) unstable; urgency=low
+
+  * Fix bug introduced in -9 where perl is put under /usr/local
+    (closes: #457507)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 24 Dec 2007 16:02:50 +1000
+
+zoneminder (1.22.3-9) unstable; urgency=low
+
+  * Starting zoneminder via init script now  invokes "zmfix -a"
+    (closes: #481637)
+  * Change apache2-mpm-prefork dependency to apache2
+  * Temp dir for export under /var/cache/zoneminder (but linked back to
+    /usr/share/zoneminder for now)
+  * Redo use of gnutls rather than openssl for md5 hashes
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 10 Dec 2007 16:02:50 +1000
+
+zoneminder (1.22.3-8) unstable; urgency=low
+
+  * Build now includes libpcre3
+    (closes: #437533)
+  * "Monitor Presets" patch now applied to package during build.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 18 Aug 2007 14:35:23 +1000
+
+zoneminder (1.22.3-7) unstable; urgency=low
+
+  * Turn off debug trace and crash dump on build
+    (closes:#414857,#414891)
+  * Additional perl libraries added in dependencies
+    (closes:#416291)
+  * Change preferred PHP version from 4 to 5
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sun, 29 Jul 2007 15:11:13 +1000
+
+zoneminder (1.22.3-6) unstable; urgency=low
+
+  * Removed a similar bash only statment from zmpkg.pl
+    (closes:414882)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Apr 2007 11:46:56 +1000
+
+zoneminder (1.22.3-5) unstable; urgency=low
+
+  * Installs with "phone home" feature turned off by default, and permissions
+    on /etc/zm/zm.conf fixed (now the 0600 it s hould be)
+    (closes:415349)
+  * Removed "stupid bash-ism" on mysqld check in postinst file.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Fri,  6 Apr 2007 15:50:00 +1000
+
+zoneminder (1.22.3-4) unstable; urgency=low
+
+  * Put libmysqlclient-15-dev in front of -14-dev so sbuild works
+    (closes: #414410)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 12 Mar 2007 11:38:56 +1100
+
+zoneminder (1.22.3-3) unstable; urgency=low
+
+  * Clean up of postinstall, postrm ; user "zm" definitely was a mistake
+  * Also in postinstall: check and start MySQL if it's not running.
+  * init.d script now checks if zoneminder isn't running and still returns 0
+    (which helps uninstalling)
+  * Addition of php5 dependency options as well as php4.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 26 Feb 2007 10:40:52 +1100
+
+zoneminder (1.22.3-2) unstable; urgency=low
+
+  * Added zmuser in the mysql creation; this should fix the install problem
+    for people, but needs to be cleaned up (in -3)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Fri, 16 Feb 2007 14:16:03 +1100
+
+zoneminder (1.22.3-1) unstable; urgency=low
+
+  * Initial Version. (closes: #248393)
+  * Patched out use of openssl; uses gnutls instead for MD5 hashes.
+  * Removed MakeMaker-inserted Perl licensing (with authors permission) in
+    various scripts; replaced with GPL.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed,  7 Feb 2007 14:09:01 +1100
--- a/distros/ubuntu1204_cmake/clean
+++ b/distros/ubuntu1204_cmake/clean
@ -0,0 +1,3 @@
+.gitattributes
+web/api/.gitattributes
+web/api/.gitignore
--- a/distros/ubuntu1204_cmake/compat
+++ b/distros/ubuntu1204_cmake/compat
@ -0,0 +1 @@
+9
--- a/distros/ubuntu1204_cmake/conf/apache2/zoneminder.conf
+++ b/distros/ubuntu1204_cmake/conf/apache2/zoneminder.conf
@ -0,0 +1,20 @@
+# Remember to enable cgi mod (i.e. "a2enmod cgi").
+ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin"
+<Directory "/usr/lib/zoneminder/cgi-bin">
+    Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+    AllowOverride All
+    Require all granted
+</Directory>
+
+Alias /zm /usr/share/zoneminder/www
+<Directory /usr/share/zoneminder/www>
+  php_flag register_globals off
+  Options Indexes FollowSymLinks
+  <IfModule mod_dir.c>
+    DirectoryIndex index.php
+  </IfModule>
+</Directory>
+
+<Directory /usr/share/zoneminder/www/api>
+    AllowOverride All
+</Directory>
--- a/distros/ubuntu1204_cmake/control
+++ b/distros/ubuntu1204_cmake/control
@ -0,0 +1,140 @@
+Source: zoneminder
+Section: net
+Priority: optional
+Maintainer: Dmitry Smirnov <onlyjob@debian.org>
+Uploaders: Vagrant Cascadian <vagrant@debian.org>
+Build-Depends: debhelper (>= 9), python-sphinx | python3-sphinx, apache2-dev, dh-linktree
+              ,cmake
+			  ,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
+              ,libbz2-dev
+              ,libdate-manip-perl
+              ,libdbd-mysql-perl
+              ,libgcrypt-dev
+              ,libcurl4-gnutls-dev
+              ,libgnutls-openssl-dev
+			  ,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, 
+              ,libmysqlclient-dev
+              ,libpcre3-dev
+              ,libphp-serialization-perl
+              ,libpolkit-gobject-1-dev
+              ,libsys-mmap-perl [!hurd-any]
+              ,libv4l-dev (>= 0.8.3) [!hurd-any]
+              ,libvlc-dev
+              ,libwww-perl
+# Unbundled (dh_linktree):
+        ,libjs-jquery
+        ,libjs-mootools
+Standards-Version: 3.9.4
+Homepage: http://www.zoneminder.com/
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/zoneminder.git
+
+Package: zoneminder
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+        ,javascript-common
+        ,libav-tools|ffmpeg
+        ,libdate-manip-perl
+        ,libmime-lite-perl
+        ,libmime-tools-perl
+        ,libphp-serialization-perl
+        ,libmodule-load-conditional-perl
+        ,libnet-sftp-foreign-perl
+#       ,libzoneminder-perl (= ${source:Version})
+          ,libarchive-zip-perl
+          ,libdbd-mysql-perl
+          ,libdevice-serialport-perl
+          ,libimage-info-perl
+          ,libjson-any-perl
+          ,libsys-mmap-perl [!hurd-any]
+          ,liburi-encode-perl
+          ,libwww-perl
+        ,mysql-client | virtual-mysql-client
+        ,perl-modules
+        ,php5-mysql
+        ,policykit-1
+        ,rsyslog | system-log-daemon
+        ,zip
+Recommends: ${misc:Recommends}
+           ,libapache2-mod-php5 | php5-fpm
+           ,mysql-server | virtual-mysql-server
+           ,zoneminder-doc (>= ${source:Version})
+Suggests: fcgiwrap, logrotate
+Description: video camera security and surveillance solution
+ ZoneMinder is intended for use in single or multi-camera video security
+ applications, including commercial or home CCTV, theft prevention and child
+ or family member or home monitoring and other care scenarios. It
+ supports capture, analysis, recording, and monitoring of video data coming
+ from one or more video or network cameras attached to a Linux system.
+ ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
+ cameras using a variety of protocols. It is suitable for use as a home
+ video security system and for commercial or professional video security
+ and surveillance. It can also be integrated into a home automation system
+ via X.10 or other protocols.
+
+#Package: libzoneminder-perl
+#Section: perl
+#Architecture: all
+#Multi-Arch: foreign
+#Depends: ${misc:Depends}, ${perl:Depends}
+#        ,libarchive-zip-perl
+#        ,libdbd-mysql-perl
+#        ,libdevice-serialport-perl
+#        ,libimage-info-perl
+#        ,libjson-any-perl
+#        ,libsys-mmap-perl [!hurd-any]
+#        ,liburi-encode-perl
+#        ,libwww-perl
+#Description: ZoneMinder Perl libraries
+# ZoneMinder is intended for use in single or multi-camera video security
+# applications, including commercial or home CCTV, theft prevention and child
+# or family member or home monitoring and other care scenarios. It
+# supports capture, analysis, recording, and monitoring of video data coming
+# from one or more video or network cameras attached to a Linux system.
+# ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
+# cameras using a variety of protocols. It is suitable for use as a home
+# video security system and for commercial or professional video security
+# and surveillance. It can also be integrated into a home automation system
+# via X.10 or other protocols.
+# .
+# This package provides ZoneMinder Perl libraries; it can be used to
+# write custom interfaces as well.
+
+Package: zoneminder-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Suggests: www-browser
+Description: ZoneMinder documentation
+ ZoneMinder is intended for use in single or multi-camera video security
+ applications, including commercial or home CCTV, theft prevention and child
+ or family member or home monitoring and other care scenarios. It
+ supports capture, analysis, recording, and monitoring of video data coming
+ from one or more video or network cameras attached to a Linux system.
+ ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
+ cameras using a variety of protocols. It is suitable for use as a home
+ video security system and for commercial or professional video security
+ and surveillance. It can also be integrated into a home automation system
+ via X.10 or other protocols.
+ .
+ This package provides ZoneMinder documentation in HTML format.
+
+Package: zoneminder-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: zoneminder (= ${binary:Version}), ${misc:Depends}
+Description: Zoneminder -- debugging symbols
+ ZoneMinder is intended for use in single or multi-camera video security
+ applications, including commercial or home CCTV, theft prevention and child
+ or family member or home monitoring and other care scenarios. It
+ supports capture, analysis, recording, and monitoring of video data coming
+ from one or more video or network cameras attached to a Linux system.
+ ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
+ cameras using a variety of protocols. It is suitable for use as a home
+ video security system and for commercial or professional video security
+ and surveillance. It can also be integrated into a home automation system
+ via X.10 or other protocols.
+ .
+ This package provides debugging symbols
--- a/distros/ubuntu1204_cmake/copyright
+++ b/distros/ubuntu1204_cmake/copyright
@ -0,0 +1,174 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ZoneMinder
+Upstream-Contact: Philip Coombes <philip.coombes@zoneminder.com>
+Source: https://github.com/ZoneMinder/ZoneMinder
+Comment:
+ This package was originally debianized by matrix <matrix@cecilia>
+ on Mon,  7 Mar 2005 02:07:57 -0500.
+ It was re-done for submission to the Debian project by Peter Howard
+ <pjh@northern-ridge.com.au> on Fri, 8 Dec 2006 10:19:43 +1100
+Files-Excluded:
+    web/skins/*/js/jquery-*
+    web/tools/mootools/*-yc.js
+
+Files: *
+Copyright: 2001-2014 Philip Coombes <philip.coombes@zoneminder.com>
+           2008      Brian Rudy <brudyNO@SPAMpraecogito.com>
+           2014      Vincent Giovannone
+           2013      Tim Craig <timcraigNO@SPAMsonic.net>
+           2003-2008 Corey DeLasaux
+           2001-2010 Chris Kistner
+License: GPL-2+
+
+Files: distros/*
+Copyright: 2001-2008 Philip Coombes <philip.coombes@zoneminder.com>
+           2014      Isaac Connor <iconnor@connortechnology.com>
+           2005      Serg Oskin
+License: GPL-2+
+
+Files: web/skins/*/js/jquery-*
+Copyright: 2010 John Resig
+           2010 The Dojo Foundation
+License: GPL-2 or Expat
+Comment:
+ Dual licensed under the MIT or GPL Version 2 licenses.
+ http://jquery.org/license
+ .
+ Includes Sizzle.js http://sizzlejs.com/
+ Released under the MIT, BSD, and GPL Licenses.
+
+Files: web/tools/mootools/*.js
+Copyright: 2009      Marcelo Jorge Vieira (metal) <metal@alucinados.com>
+           2006-2010 Valerio Proietti (http://mad4milk.net/)
+License: Expat
+
+Files: web/api/*
+Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org)
+License: Expat
+
+Files:
+    cmake/Modules/CheckPrototypeDefinition*.cmake
+    cmake/Modules/FindGLIB2.cmake
+    cmake/Modules/FindPolkit.cmake
+    cmake/Modules/GNUInstallDirs.cmake
+Copyright:
+    2005-2011 Kitware, Inc.
+    2010-2011 Andreas Schneider <asn@cryptomilk.org>
+    2009      Dario Freddi <drf@kde.org>
+    2008      Laurent Montel, <montel@kde.org>
+    2011      Nikita Krupen'ko <krnekit@gmail.com>
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+ .
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+ .
+  * The names of Kitware, Inc., the Insight Consortium, or the names of
+    any consortium members, or of any contributors, may not be used to
+    endorse or promote products derived from this software without
+    specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: cmake/Modules/FindPerlModules.cmake
+Copyright: 2012 Iowa State University
+License: Boost-1.0
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+Files: debian/*
+Copyright: 2015      Dmitry Smirnov <onlyjob@debian.org>
+           2007-2014 Peter Howard <pjh@northern-ridge.com.au>
+           2010-2012 Vagrant Cascadian <vagrant@debian.org>
+           2001-2008 Philip Coombes <philip.coombes@zoneminder.com>
+License: GPL-2+
+
+License: Expat
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  .
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ The complete text of the GNU General Public License version 2
+ can be found in "/usr/share/common-licenses/GPL-2".
+
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; version 2 of the License.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ The complete text of the GNU General Public License version 2
+ can be found in "/usr/share/common-licenses/GPL-2".
--- a/distros/ubuntu1204_cmake/examples/nginx.conf
+++ b/distros/ubuntu1204_cmake/examples/nginx.conf
@ -0,0 +1,32 @@
+location /zm/cgi-bin {
+    gzip off;
+    alias /usr/lib/zoneminder/cgi-bin;
+
+    include /etc/nginx/fastcgi_params;
+    fastcgi_param SCRIPT_FILENAME $request_filename;
+    fastcgi_pass  unix:/var/run/fcgiwrap.socket;
+}
+
+location /zm {
+#   if ($scheme ~ ^http:){
+#       rewrite ^(.*)$  https://$host$1 permanent;
+#   }
+
+    gzip off;
+    alias                   /usr/share/zoneminder/www;
+    index                   index.php;
+
+    location ~ \.php$ {
+        if (!-f $request_filename) { return 404; }
+        expires             epoch;
+        include             /etc/nginx/fastcgi_params;
+        fastcgi_param       SCRIPT_FILENAME         $request_filename;
+        fastcgi_index       index.php;
+        fastcgi_pass        unix:/var/run/php5-fpm.sock;
+    }
+
+    location ~ \.(jpg|jpeg|gif|png|ico)$ {
+        access_log          off;
+        expires         33d;
+    }
+}
--- a/distros/ubuntu1204_cmake/gbp.conf
+++ b/distros/ubuntu1204_cmake/gbp.conf
@ -0,0 +1,7 @@
+
+[dch]
+id-length    = 0
+
+[import-orig]
+pristine-tar = False
+merge        = False
--- a/distros/ubuntu1204_cmake/libzoneminder-perl.install
+++ b/distros/ubuntu1204_cmake/libzoneminder-perl.install
@ -0,0 +1,2 @@
+usr/share/man/man3
+usr/share/perl5
--- a/distros/ubuntu1204_cmake/patches/default_cgi-path.patch
+++ b/distros/ubuntu1204_cmake/patches/default_cgi-path.patch
@ -0,0 +1,16 @@
+Last-Update: 2015-08-16
+Forwarded: no
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Description: correct path to CGI app according to default web server configuration.
+
+--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+@@ -428,7 +428,7 @@ our @options =
+     },
+     {
+         name        => "ZM_PATH_ZMS",
+-        default     => "/cgi-bin/nph-zms",
+        default     => "/zm/cgi-bin/nph-zms",
+         description => "Web path to zms streaming server",
+         help        => qqq("
+             The ZoneMinder streaming server is required to send streamed
--- a/distros/ubuntu1204_cmake/patches/series
+++ b/distros/ubuntu1204_cmake/patches/series
@ -0,0 +1,2 @@
+default_cgi-path.patch
+use_libjs-mootools.patch
--- a/distros/ubuntu1204_cmake/patches/use_libjs-mootools.patch
+++ b/distros/ubuntu1204_cmake/patches/use_libjs-mootools.patch
@ -0,0 +1,18 @@
+Last-Update: 2015-03-29
+Forwarded: no
+Bug-Debian: http://bugs.debian.org/585590
+Reviewed-By: Dmitry Smirnov <onlyjob@member.fsf.org>
+Description: use mootools shipped by debian, rather than the zoneminder included mootools.
+
+--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
+@@ -63,9 +63,8 @@
+     }
+ ?>
+   <script type="text/javascript" src="tools/mootools/mootools-core.js"></script>
+   <script type="text/javascript" src="tools/mootools/mootools-more.js"></script>
+-  <script type="text/javascript" src="js/mootools.ext.js"></script>
+   <script type="text/javascript" src="js/logger.js"></script>
+   <script type="text/javascript" src="js/overlay.js"></script>
+ <?php
+     if ( $skinJsPhpFile )
--- a/distros/ubuntu1204_cmake/rules
+++ b/distros/ubuntu1204_cmake/rules
@ -0,0 +1,87 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND += -Wl,--as-needed
+
+ifeq ($(DEB_BUILD_ARCH_OS),hurd)
+ARGS:= -DZM_NO_MMAP=ON
+endif
+
+%:
+	dh $@ --parallel --buildsystem=cmake --builddirectory=dbuild \
+            --with sphinxdoc,apache2,linktree
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(ARGS)                  \
+            -DCMAKE_VERBOSE_MAKEFILE=ON                \
+            -DCMAKE_BUILD_TYPE=Release                 \
+            -DZM_CONFIG_DIR="/etc/zm"                  \
+            -DZM_RUNDIR="/var/run/zm"                  \
+            -DZM_SOCKDIR="/var/run/zm"                 \
+            -DZM_TMPDIR="/tmp/zm"                      \
+            -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"  \
+            -DZM_CONTENTDIR="/var/cache/zoneminder"
+
+override_dh_clean:
+	dh_clean $(MANPAGES1)
+	$(RM) -r docs/_build docs/installationguide
+
+build-indep:
+	#$(MAKE) -C docs text
+	$(MAKE) -C docs html
+
+MANPAGES1 = dbuild/scripts/zmupdate.pl.1
+$(MANPAGES1):
+	# generate man page(s):
+	pod2man -s1 --stderr --utf8 $(patsubst %.1, %, $@) $@
+
+## reproducible build:
+LAST_CHANGE=$(shell dpkg-parsechangelog -S Date)
+BUILD_DATE=$(shell LC_ALL=C date -u "+%B %d, %Y" -d "$(LAST_CHANGE)")
+override_dh_installman: $(MANPAGES1)
+	$(MAKE) -C docs man SPHINXOPTS="-D today=\"$(BUILD_DATE)\""
+	dh_installman --language=C $(MANPAGES1)
+
+override_dh_auto_install:
+	dh_auto_install --destdir=$(CURDIR)/debian/tmp
+	# remove worthless files:
+	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*/*/.packlist
+	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*.in
+	# remove empty directories:
+	find $(CURDIR)/debian/tmp/usr -type d -empty -delete -printf 'removed %p\n'
+	# remove extra-license-file:
+	$(RM) -v $(CURDIR)/debian/tmp/usr/share/zoneminder/www/api/lib/Cake/LICENSE.txt
+
+override_dh_fixperms:
+	dh_fixperms
+	## 637685
+	chmod -c o-r $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
+
+override_dh_installinit:
+	dh_installinit --no-start
+
+override_dh_apache2:
+	dh_apache2 --noenable
+
+override_dh_strip:
+	[ -d "$(CURDIR)/debian/zoneminder-dbg" ] \
+        && dh_strip --dbg-package=zoneminder-dbg \
+        || dh_strip
+
+#%:
+#	dh $@ --parallel --buildsystem=autoconf --with autoreconf
+#
+#override_dh_auto_configure:
+#	dh_auto_configure -- \
+#            --sysconfdir=/etc/zm \
+#            --with-mysql=/usr \
+#            --with-webdir=/usr/share/zoneminder \
+#            --with-ffmpeg=/usr \
+#            --with-cgidir=/usr/lib/cgi-bin \
+#            --with-webuser=www-data \
+#            --with-webgroup=www-data \
+#            --enable-mmap=yes
--- a/distros/ubuntu1204_cmake/source/format
+++ b/distros/ubuntu1204_cmake/source/format
@ -0,0 +1 @@
+3.0 (quilt)
--- a/distros/ubuntu1204_cmake/source/lintian-overrides
+++ b/distros/ubuntu1204_cmake/source/lintian-overrides
@ -0,0 +1,9 @@
+## Actually sources are there: "*-nc.js".
+source-is-missing web/tools/mootools/mootools-*-yc.js
+
+## We're using "libjs-jquery" instead.
+source-is-missing web/skins/*/js/jquery-1.4.2.min.js
+
+## Acknowledged, will repack eventually.
+source-contains-prebuilt-javascript-object web/tools/mootools/mootools-*-yc.js
+source-contains-prebuilt-javascript-object web/skins/*/js/jquery-1.4.2.min.js
--- a/distros/ubuntu1204_cmake/watch
+++ b/distros/ubuntu1204_cmake/watch
@ -0,0 +1,7 @@
+version=3
+
+opts=\
+repacksuffix=+dfsg,\
+dversionmangle=s{\+dfsg\d*}{},\
+ https://github.com/ZoneMinder/ZoneMinder/releases \
+  .*/ZoneMinder/archive/v(.*).tar.gz
--- a/distros/ubuntu1204_cmake/zoneminder-doc.doc-base
+++ b/distros/ubuntu1204_cmake/zoneminder-doc.doc-base
@ -0,0 +1,8 @@
+Document: zoneminder-doc
+Title: Zoneminder documentation
+Abstract: This document describes how to use Zoneminder.
+Section: System/Administration
+
+Format: HTML
+Index: /usr/share/doc/zoneminder-doc/html/index.html
+Files: /usr/share/doc/zoneminder-doc/html/*
--- a/distros/ubuntu1204_cmake/zoneminder-doc.install
+++ b/distros/ubuntu1204_cmake/zoneminder-doc.install
@ -0,0 +1 @@
+docs/_build/html	usr/share/doc/zoneminder-doc/
--- a/distros/ubuntu1204_cmake/zoneminder-doc.links
+++ b/distros/ubuntu1204_cmake/zoneminder-doc.links
@ -0,0 +1,2 @@
+## Convenience symlink:
+/usr/share/doc/zoneminder-doc/html    /usr/share/doc/zoneminder/html
--- a/distros/ubuntu1204_cmake/zoneminder.apache2
+++ b/distros/ubuntu1204_cmake/zoneminder.apache2
@ -0,0 +1 @@
+conf debian/conf/apache2/zoneminder.conf  nginx
--- a/distros/ubuntu1204_cmake/zoneminder.bug-presubj
+++ b/distros/ubuntu1204_cmake/zoneminder.bug-presubj
@ -0,0 +1,5 @@
+Unless bug is specific to Debian please consider reporting it directly to
+upstream developer(s):
+
+    https://github.com/ZoneMinder/ZoneMinder/issues
+
--- a/distros/ubuntu1204_cmake/zoneminder.dirs
+++ b/distros/ubuntu1204_cmake/zoneminder.dirs
@ -0,0 +1,6 @@
+var/log/zm
+var/lib/zm
+var/cache/zoneminder/events
+var/cache/zoneminder/images
+var/cache/zoneminder/temp
+usr/share/zoneminder/db
--- a/distros/ubuntu1204_cmake/zoneminder.docs
+++ b/distros/ubuntu1204_cmake/zoneminder.docs
@ -0,0 +1 @@
+README.md
--- a/distros/ubuntu1204_cmake/zoneminder.examples
+++ b/distros/ubuntu1204_cmake/zoneminder.examples
@ -0,0 +1,2 @@
+debian/examples/*
+dbuild/misc/apache.conf
--- a/distros/ubuntu1204_cmake/zoneminder.init
+++ b/distros/ubuntu1204_cmake/zoneminder.init
@ -0,0 +1,91 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          zoneminder
+# Required-Start:    $network $remote_fs $syslog
+# Required-Stop:     $network $remote_fs $syslog
+# Should-Start:      mysql
+# Should-Stop:       mysql
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description:  Control ZoneMinder as a Service
+# Description: ZoneMinder CCTV recording and surveillance system
+### END INIT INFO
+# chkconfig: 2345 20 20
+
+# Source function library.
+. /lib/lsb/init-functions
+
+prog=ZoneMinder
+ZM_PATH_BIN="/usr/bin"
+RUNDIR="/var/run/zm"
+TMPDIR="/tmp/zm"
+command="$ZM_PATH_BIN/zmpkg.pl"
+
+start() {
+	echo -n "Starting $prog: "
+	export TZ=:/etc/localtime
+	mkdir -p "$RUNDIR" && chown www-data:www-data "$RUNDIR"
+	mkdir -p "$TMPDIR" && chown www-data:www-data "$TMPDIR"
+	$command start
+	RETVAL=$?
+	[ $RETVAL = 0 ] && echo success
+	[ $RETVAL != 0 ] && echo failure
+	echo
+	[ $RETVAL = 0 ] && touch /var/lock/zm
+	return $RETVAL
+}
+stop() {
+	echo -n "Stopping $prog: "
+	#
+	# Why is this status check being done?
+	# as $command stop returns 1 if zoneminder
+	# is stopped, which will result in
+	# this returning 1, which will stuff
+	# dpkg when it tries to stop zoneminder before
+	# uninstalling . . .
+	#
+	result=`$command status`
+	if [ ! "$result" = "running" ]; then
+		echo "Zoneminder already stopped"
+		echo
+		RETVAL=0
+	else
+		$command stop
+		RETVAL=$?
+		[ $RETVAL = 0 ] && echo success
+		[ $RETVAL != 0 ] && echo failure
+		echo
+		[ $RETVAL = 0 ] && rm -f /var/lock/zm
+	fi
+}
+status() {
+	result=`$command status`
+	if [ "$result" = "running" ]; then
+		echo "ZoneMinder is running"
+		RETVAL=0
+	else
+		echo "ZoneMinder is stopped"
+		RETVAL=1
+	fi
+}
+
+case "$1" in
+'start')
+	start
+	;;
+'stop')
+	stop
+	;;
+'restart' | 'force-reload')
+	stop
+	start
+	;;
+'status')
+	status
+	;;
+*)
+	echo "Usage: $0 { start | stop | restart | status }"
+	RETVAL=1
+	;;
+esac
+exit $RETVAL
--- a/distros/ubuntu1204_cmake/zoneminder.install
+++ b/distros/ubuntu1204_cmake/zoneminder.install
@ -0,0 +1,10 @@
+etc/zm/zm.conf
+usr/bin
+usr/lib/zoneminder
+usr/share/polkit-1
+usr/share/zoneminder/db
+usr/share/zoneminder/www
+
+# libzoneminder-perl files:
+usr/share/man/man3
+usr/share/perl5
--- a/distros/ubuntu1204_cmake/zoneminder.links
+++ b/distros/ubuntu1204_cmake/zoneminder.links
@ -0,0 +1,4 @@
+/var/cache/zoneminder/events	/usr/share/zoneminder/www/events
+/var/cache/zoneminder/images	/usr/share/zoneminder/www/images
+/var/cache/zoneminder/temp	/usr/share/zoneminder/www/temp
+/tmp/zm						/usr/share/zoneminder/www/api/app/tmp
--- a/distros/ubuntu1204_cmake/zoneminder.linktrees
+++ b/distros/ubuntu1204_cmake/zoneminder.linktrees
@ -0,0 +1,14 @@
+## cakephp
+#replace  /usr/share/php/Cake					/usr/share/zoneminder/www/api/lib/Cake
+
+## libjs-mootools
+replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core.js
+replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-nc.js
+replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-yc.js
+replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more.js
+replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-nc.js
+replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-yc.js
+
+## libjs-jquery
+replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/classic/js/jquery-1.4.2.min.js
+replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/flat/js/jquery-1.4.2.min.js
--- a/distros/ubuntu1204_cmake/zoneminder.lintian-overrides
+++ b/distros/ubuntu1204_cmake/zoneminder.lintian-overrides
@ -0,0 +1,14 @@
+# Depends: policykit-1
+unusual-interpreter usr/bin/zmsystemctl.pl #!/usr/bin/pkexec
+
+# Intentionally not others-readable, #637685.
+non-standard-file-perm etc/zm/zm.conf 0640 != 0644
+
+# Bundled Cake PHP framework, not intended for direct execution:
+script-not-executable usr/share/zoneminder/www/api/*
+
+# Annoying but seems to be too much troubles to fix; should be fixed upstream:
+script-with-language-extension usr/bin/*.pl
+
+# dh-linktree:
+package-contains-broken-symlink usr/share/zoneminder/www/api/lib/Cake/*
--- a/distros/ubuntu1204_cmake/zoneminder.logrotate
+++ b/distros/ubuntu1204_cmake/zoneminder.logrotate
@ -0,0 +1,10 @@
+/var/log/zm/*log {
+    missingok
+    notifempty
+    sharedscripts
+    postrotate
+        /usr/bin/zmpkg.pl logrot >>/dev/null 2>&1 || :
+    endscript
+    weekly
+    rotate 3
+}
--- a/distros/ubuntu1204_cmake/zoneminder.maintscript
+++ b/distros/ubuntu1204_cmake/zoneminder.maintscript
@ -0,0 +1 @@
+rm_conffile  /etc/zm/apache.conf  1.28.1-5~
--- a/distros/ubuntu1204_cmake/zoneminder.manpages
+++ b/distros/ubuntu1204_cmake/zoneminder.manpages
@ -0,0 +1 @@
+docs/_build/man/*.1
--- a/distros/ubuntu1204_cmake/zoneminder.postinst
+++ b/distros/ubuntu1204_cmake/zoneminder.postinst
@ -0,0 +1,13 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+		chown www-data:root /var/log/zm
+		chown www-data:www-data /var/lib/zm
+		if [ -z "$2" ]; then
+			chown www-data:www-data -R /var/cache/zoneminder
+		fi
+fi
+
+#DEBHELPER#
--- a/distros/ubuntu1204_cmake/zoneminder.postrm
+++ b/distros/ubuntu1204_cmake/zoneminder.postrm
@ -0,0 +1,14 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "purge" ]; then
+    echo "
+Reminder: to completely remove \"zoneminder\" it may be necessary
+ * to delete database using the following sample command:
+        sudo mysqladmin --defaults-file=/etc/mysql/debian.cnf -f drop zm
+ * to delete remaining data files in "/var/cache/zoneminder".
+"
+fi
+
+#DEBHELPER#
--- a/distros/ubuntu1204_cmake/zoneminder.preinst
+++ b/distros/ubuntu1204_cmake/zoneminder.preinst
@ -0,0 +1,36 @@
+#!/bin/sh
+
+set -e
+
+## Remove obsolete symlink which is in the way of dh_apache2:
+ol="/etc/apache2/conf-available/zoneminder.conf"
+if [ -h "${ol}" ]; then
+    [ "$(readlink ${ol})" = "/etc/zm/apache.conf" ] && rm -f "${ol}"
+fi
+
+abort=false
+if [ -h /usr/share/zoneminder/www/events ]; then
+    l=$(readlink /usr/share/zoneminder/www/events)
+    if [ "$l" != "/var/cache/zoneminder/events" ]; then
+        abort=true
+    fi
+fi
+if [ -h /usr/share/zoneminder/www/images ]; then
+    l=$(readlink /usr/share/zoneminder/www/images )
+    if [ "$l" != "/var/cache/zoneminder/images" ]; then
+        abort=true
+    fi
+fi
+
+if [ "$abort" = "true" ]; then
+    cat >&2 << EOF
+Aborting installation of zoneminder due to non-default symlinks in
+/usr/share/zoneminder for the images and/or events directory, which could
+result in loss of data. Please move your data in each of these directories to
+/var/cache/zoneminder before installing zoneminder from the package.
+EOF
+    exit 1
+
+fi
+
+#DEBHELPER#
--- a/distros/ubuntu1204_cmake/zoneminder.service
+++ b/distros/ubuntu1204_cmake/zoneminder.service
@ -0,0 +1,19 @@
+# ZoneMinder systemd unit file
+# This file is intended to work with Debian distributions
+
+[Unit]
+Description=ZoneMinder CCTV recording and surveillance system
+After=network.target mysql.service
+Requires=mysql.service
+
+[Service]
+#User=www-data
+Type=forking
+ExecStart=/usr/bin/zmpkg.pl start
+ExecReload=/usr/bin/zmpkg.pl restart
+ExecStop=/usr/bin/zmpkg.pl stop
+PIDFile=/var/run/zm/zm.pid
+Restart=on-abnormal
+
+[Install]
+WantedBy=multi-user.target
--- a/distros/ubuntu1204_cmake/zoneminder.tmpfile
+++ b/distros/ubuntu1204_cmake/zoneminder.tmpfile
@ -0,0 +1,2 @@
+d /var/run/zm 0755 www-data www-data
+d /tmp/zm     0755 www-data www-data
--- a/distros/ubuntu1504/apache.conf
+++ b/distros/ubuntu1504/apache.conf
@ -1,4 +1,4 @@
-Alias /zm /usr/share/zoneminder
+Alias /zm /usr/share/zoneminder/www

 <Directory /usr/share/zoneminder>
  php_flag register_globals off
--- a/distros/ubuntu1504/links
+++ b/distros/ubuntu1504/links
@ -1,4 +1,4 @@
-var/cache/zoneminder/events usr/share/zoneminder/events
-var/cache/zoneminder/images usr/share/zoneminder/images
-var/cache/zoneminder/temp   usr/share/zoneminder/temp
-usr/lib/cgi-bin             usr/share/zoneminder/cgi-bin
+var/cache/zoneminder/events usr/share/zoneminder/www/events
+var/cache/zoneminder/images usr/share/zoneminder/www/images
+var/cache/zoneminder/temp   usr/share/zoneminder/www/temp
+usr/lib/cgi-bin             usr/lib/zoneminder/cgi-bin
--- a/distros/ubuntu1504/preinst
+++ b/distros/ubuntu1504/preinst
@ -3,14 +3,14 @@
 set -e

 abort=false
-if [ -L /usr/share/zoneminder/events ]; then
-    l=$(readlink /usr/share/zoneminder/events)
+if [ -L /usr/share/zoneminder/www/events ]; then
+    l=$(readlink /usr/share/zoneminder/www/events)
    if [ "$l" != "/var/cache/zoneminder/events" ]; then
        abort=true
    fi
 fi
-if [ -L /usr/share/zoneminder/images ]; then
-    l=$(readlink /usr/share/zoneminder/images )
+if [ -L /usr/share/zoneminder/www/images ]; then
+    l=$(readlink /usr/share/zoneminder/www/images )
    if [ "$l" != "/var/cache/zoneminder/images" ]; then
        abort=true
    fi
@ -19,9 +19,9 @@ fi
 if [ "$abort" = "true" ]; then
    cat >&2 << EOF 
 Aborting installation of zoneminder due to non-default symlinks in
-/usr/share/zoneminder for the images and/or events directory, which could
+/usr/share/zoneminder/www for the images and/or events directory, which could
 result in loss of data. Please move your data in each of these directories to
-/var/cache/zoneminder before installing zoneminder from the package.
+/var/cache/zoneminder/www before installing zoneminder from the package.
 EOF
    exit 1

--- a/distros/ubuntu1504/rules
+++ b/distros/ubuntu1504/rules
@ -40,12 +40,12 @@ override_dh_install:
 	#
 	# NOTE: This is a short-term kludge; hopefully changes in the next
 	# upstream version will render this unnecessary.
-	rm -rf debian/zoneminder/usr/share/zoneminder/events
-	rm -rf debian/zoneminder/usr/share/zoneminder/images
+	rm -rf debian/zoneminder/usr/share/zoneminder/www/events
+	rm -rf debian/zoneminder/usr/share/zoneminder/www/images
 	rm -rf debian/zoneminder/usr/share/zoneminder/temp
-	dh_link var/cache/zoneminder/events usr/share/zoneminder/events
-	dh_link var/cache/zoneminder/images usr/share/zoneminder/images
-	dh_link var/cache/zoneminder/temp usr/share/zoneminder/temp
+	dh_link var/cache/zoneminder/events usr/share/zoneminder/www/events
+	dh_link var/cache/zoneminder/images usr/share/zoneminder/www/images
+	dh_link var/cache/zoneminder/temp usr/share/zoneminder/www/temp

 	#
 	# This is a slightly lesser kludge; moving the cgi stuff to
@ -53,7 +53,7 @@ override_dh_install:
 	# having it just in /usr/lib/cgi-bin breaks another bit of
 	# behavior.
 	#
-	dh_link usr/lib/cgi-bin usr/share/zoneminder/cgi-bin
+	dh_link usr/lib/cgi-bin usr/lib/zoneminder/cgi-bin

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