Tags: justinlawrence/zoneminder-flat
Tags
Andrew Bauer (15): [79af2ad] When loading a new event, always set the current frame id to the first frame rather than the last [62dbb6e] Update README.Fedora [54a22e7] We need a toggle for x10 support [539c760] Create ZM_TARGET_DISTRO [72973ff] Add new zoneminder cmake specfile [6096256] cmake support files for redhat/centos distros [d544a92] change chkconfig default [183ce4b] Update zoneminder.cmake.el6.spec [c25a7ff] Update zoneminder.cmake.f19.spec [d0debfa] Update zoneminder.in [8265eb9] Add reference to zm_update-1.26.5.sql in Makefile.am [cd43496] Update zm.in [b0b471e] Update zm.in [8d2dac6] Update zoneminder.in [e68fd9d] Automatically grab all sql scripts in the db subfolder Andy Bauer (17): [8d33145] Update zoneminder.el6.spec [de16858] Update zoneminder.f19.spec [dbbf1d9] Create zoneminder-1.26.0-defaults.patch [c0878c5] Update README.Fedora [4336b6c] Update zoneminder.f19.spec [5c7674c] Update zoneminder.f19.spec [33f7673] Update README.Fedora [78effba] Update README.Fedora [4218ef0] Update README.Fedora [6f313ad] Update zoneminder.f19.spec [8f51272] Update zoneminder.el6.spec [1e756a1] Update zoneminder.cmake.el6.spec [e16c250] Update zoneminder.f19.spec [b7e69f0] Update zoneminder.cmake.f19.spec [a3dc2b5] Update README.CentOS [32cf366] Update README.Fedora [b1c76ad] Cmake support files for fedora distro Bartek Zdanowski (2): [d223303] Update README.md [f6dca0f] Fixing bug that stops installation/upgrade if DB is already at current version David Nesting (2): [79c7a1b] Apply INSERTs in Event::AddFrames in batches to avoid excessive query length [b368d30] Fix marker-out-of-bounds crash when defining zone points Edward Barnard (7): [560d9bd] RtpSource can now distinguish between payload types and handles some properly. [3665c3e] Fixed bug in mpeg4 depacketizer and RTCP implementation. [80d172e] The last packet of a fragmented mpeg4 frame is no longer rejected. [21946b5] H264 SPS and PPS frames are now handled correctly [5d9dcba] Adds support more H264 NAL types and tidies function [9a06ec5] Save a couple of cpu cycles. [c630174] Adds support for h264 cameras that fail to set m bit for end of fragmented frames. Isaac Connor (33): [3f4e13d] redo the patch that add the < 0 test. Since it isn't technically an error, there won't be an error message set by php. So I've made it it's own separate case and added whcih socket is having the problem to some of the other error messages as well. [7173b42] Merge branch 'master' of github.com:ZoneMinder/ZoneMinder [d664f3b] Merge branch 'master' of github.com:ZoneMinder/ZoneMinder [c34bc10] Merge branch 'master' of github.com:ZoneMinder/ZoneMinder [1ac731a] merge Debian build instructions, copy and modify for ubuntu [870a59b] fix missing <?php. The missing full size tag makes the file fail when short tags are turned off [355c10c] fix error when strict modes is on. [72b80d7] remake this branch off master instead of off mysql2PDO. Establish an automake substitution of @Version@ and use it throughotu to override whatever is in zm.conf [d428c83] blah [7b585d1] remove extra stuff that I don't think we need because we are the source. Also unconditionally call zmupdate.pl since it should do all the checking of versions to see if anything needs doing. We don't need to be doing that work in a postinst bash script. [3fa91a3] allow the value side of config lines potentially be empty. [4565068] Merge pull request ZoneMinder#233 from fastolfe/zone-marker-overflow [a1cb1e6] bump version # for snapshot [7a2f3b5] add in missing @ [0fd7d85] put back ZM_PATH_DATA [f6bf374] very sub-optimisation, removing duplicate comparisons [fe829e7] Merge branch 'master' of github.com:ZoneMinder/ZoneMinder [f4dfd88] handle bad config lines better [d877095] fix assigning DB_TYPE [e9c0509] add rules for a dbg package [2cd0d0b] repeat the dbh package lines for debian as well [b8f0754] fix for debian bug #725840 Javascript errors in updateButtons function of filter.js Also a slight optimisation using else's instead of continuing to evaluate after the true value has been set. [6d6503c] suggest mysql-server [c840f1b] suggest mysql-server [10dd0e1] Merge pull request ZoneMinder#250 from insidenothing/master [0f3f680] Merge branch 'master' of github.com:ZoneMinder/ZoneMinder [29e2cdf] split the innoDB upgrade out of the version section, so that it always checked for MyISAM tables and if found, offers to update them. [7da2cdd] cleanups, only connect and disconnect once. Remove unncessary require's of DBI cleanup MyISAM to InnoDB code [4555a8b] Merge pull request ZoneMinder#240 from ZoneMinder/postinstcleanup [729f036] Merge pull request ZoneMinder#255 from zdanek/master [2775752] use proper DBI parameter passing to improve security remark out call to zmupdate.pl -f [73dbe81] update to 1.26.5 [6a047a9] Merge branch 'master' of github.com:ZoneMinder/ZoneMinder Joe Evans (1): [5500404] Cast content_length to signed int for error-check comparison, preventing segfault when attempting to read buffer. Kfir Itzhak (62): [378d145] Fixed cmake not enabling mmap in perl modules [fcf969f] Fix cmake not enabling mmap in zm perl modules correctly this time [b558d42] Improvements to cmake: Better support for CMAKE_PREFIX_PATH enviroment variable (and similar ones), added ZM_PERL_SUBPREFIX and ZM_PERL_USE_PATH options and improved detection of libraries and headers [4950389] Added ZM_NO_FFMPEG option to skip ffmpeg checks and force building without ffmpeg [7d6cca1] Revert few changes that broke the cmake build in travis [8cecada] Fix rotation bug caused by commit 5a93647 [421d67e] Improvements to zm_ffmpeg.h [bb5b936] Fixed a bug with HAVE_LIBAVDEVICE_AVDEVICE_H in cmake [edcca74] Add detection status in cmake for optional libraries [4c80329] Merge pull request ZoneMinder#214 from knnniggett/cmake_fedora [9858c06] Merge pull request ZoneMinder#215 from knnniggett/cmake_nox10 [eeca592] Merge pull request ZoneMinder#216 from knnniggett/cmake_targetdistro [cdd2920] Merge pull request ZoneMinder#217 from knnniggett/cmake_redhat [17f2736] Merge pull request ZoneMinder#218 from ZoneMinder/ffmpegfixes [f5f573a] Added an uninstall target to cmake and few text corrections to the INSTALL file [a341778] Merge branch 'cmakefixes' [c2477eb] cmake text improvements [54512ff] Fixed a mistake in the INSTALL file [b743375] Attempt to get travis working again by skipping whole system update [0143969] Do not print progress while building zoneminder perl modules unless CMAKE_VERBOSE_MAKEFILE is enabled [234e742] Merge pull request ZoneMinder#223 from fastolfe/batch-frame-inserts [23ec826] Hard code man dir path into cmake to fix issues with some distros [604b7f4] Clean files generated by MakeMaker when running cmake's make clean target [910200c] Merge branch 'cmakeperlfixes' [36f525e] Correctly hard code man dir path into cmake this time hopefully [c2bd7c9] First attempt at enabling out-of-source building for zm with cmake [0695523] Fix zmc crashing when four field deinterlacing is enabled together with left or right rotation [21ae767] Merge branch 'rotatefix' [3c59961] Merge branch 'cmake-outofsource' [846fce0] Fixed out-of-source building not finding config.h [1d0e721] Attempt to get the perl modules to be fully out of source during an out-of-source build [833705b] Added alarm blend percent (useful for controlling how long an alarm lasts) and a dropdown list is used now if ZM_FAST_IMAGE_BLENDS is enabled [408cac5] Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now) [9d5ac7a] Fix cmake installing wrong files in an out-of-source build [4e1d236] Revert content_length to be int [fd656c5] Changed default blend percentages and the dropdown list for alarm reference image blend [891757d] Merge pull request ZoneMinder#232 from josephevans/master [be21a88] Merge pull request ZoneMinder#242 from ZoneMinder/removeversionnumberfromzm.conf [90d7ce9] Delete PATH_BUILD and TIME_BUILD from zm.conf and setup default for ZM_DB_TYPE [c08e4de] Added the database update file for 1.26.5 with includes the AlarmRefBlendPerc option [9979385] Remove the crashtrace option from configure.ac (autoconf) [cfc9a73] Fixed not installing mootools symlinks in an out-of-source build [47179f7] Fix make install failing to install mootools symlinks in an out-of-source build [91d42a8] Merge branch 'cmakemootoolsfix' [82a9263] Remove importing of binary directory in cmakecacheimport.sh [4a4018b] Add automatic finding of the ffmpeg executable to cmake [762e636] Few minor cmake improvements, especially for whitespaces in paths [bed30d3] Remove round() mess [56d3c75] Put CMAKE_INCLUDE_CURRENT_DIR back in [17129cf] Fix minor bug introduced by commit cfc9a73: Do not install mootools symlinks twice for out-of-source installations [6a23a05] Merge pull request ZoneMinder#252 from guotie/master [eff5836] IPv6 improvements [89689d8] Correctly fix mootools symlinks being installed twice in cmake this time [55ea674] Revert "Correctly fix mootools symlinks being installed twice in cmake this time" [88f2bc6] Fix zmc crashing on shutdown (for remote http cameras) caused by content_length sign mess [d50169c] Added SWScale wrapper class and FFMPEG PixelFormat match function [783bf4b] Fixed web/skins/*/includes/config.php not being installed [23ff402] Removed installation of web/README.md from cmake [219ada8] Merge pull request ZoneMinder#257 from Phhere/patch-2 [5a256eb] Merge pull request ZoneMinder#256 from Phhere/patch-1 [e9f4479] Added support for UYVY capture palette (required for some Bluecherry cards) [ca3a7c1] Merge pull request ZoneMinder#268 from Phhere/patch-3 Kyle Johnson (15): [7bf4de3] Merge pull request ZoneMinder#211 from kylejohnson/master [5ead2a4] Merge pull request ZoneMinder#207 from knnniggett/prev_btn [2c04690] Allow larger shared memory sizes. Fixes ZoneMinder#226 [fd03d89] Change mem_size in zm_monitor.h from long to unsigned long [36d94d1] Change zm_monitor.h mem_size from long to unsigned long. Fixes ZoneMinder#226. [3b07d99] Merge branch 'master' of github.com:ZoneMinder/ZoneMinder [2564512] Merge pull request ZoneMinder#243 from ZoneMinder/zmconfcleanup [5c369ff] Merge pull request ZoneMinder#246 from dtmf/patch-1 [b7aa85e] Merge pull request ZoneMinder#251 from ZoneMinder/betterInnoDBupdate [45ad839] Merge pull request ZoneMinder#259 from ebarnard/rtsp-fix [f39f2fa] Merge pull request ZoneMinder#241 from ZoneMinder/alarmrefblendoption [c3c3cfb] Merge pull request ZoneMinder#264 from ZoneMinder/improvezmpkg [dc0d305] Bump version to 1.26.5 [0667795] Merge branch 'master' of github.com:ZoneMinder/ZoneMinder [263f3a6] Merge pull request ZoneMinder#269 from knnniggett/zmupdate_1.26.5 Patrick McGuire (1): [8c0ad35] Fix shared memory errors on centos 6.4 Philipp Rehs (3): [d4babd2] Fix checkJsonError messages [55dadcf] Network Detection Support for Wansview [529c124] Detection Support for WansView Cams Will Scales (1): [82a3f46] Update zoneminder.service guotie (4): [e35c541] Update zm_remote_camera.h [e0728f7] Update zm_remote_camera.cpp [042e50e] Update zm_remote_camera_http.cpp [557c0a3] Update zm_remote_camera_http.cpp josephevans (1): [7bbcc6a] Merge pull request ZoneMinder#1 from mastertheknife/contentlengthfix kjohnson (1): [dff5b3a] ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler)
Andrew Bauer (3): Create pkgdatadir in make Change frameserver warnings to debug level 2 Changed debug levels to 4-6 Andy Bauer (39): Update zmupdate.pl.in for 1.26.3 release exclude zm_update-1.26.3.sql since it has already been added Merge pull request ZoneMinder#119 from knnniggett/zmupdate_zm.1.26.3 Delete zoneminder-1.25.0-installfix.patch Update zoneminder.1.26.el6.spec Merge pull request ZoneMinder#136 from knnniggett/redhat Merge pull request ZoneMinder#141 from knnniggett/redhat Update README.Fedora Move debian folder under distros Merge branch 'debian' of https://github.com/knnniggett/ZoneMinder into knnniggett-debian Can't seem to catch a break tonight. Moving dian files into correct folder. Merge branch 'debian2' of https://github.com/knnniggett/ZoneMinder into knnniggett-debian2 Update README.Fedora Create zoneminder.f19.spec Update README.Fedora Update README.CentOS Update zoneminder.f19.spec Rename redalart.wav to redalert.wav Create zoneminder.tmpfiles.d Rename zoneminder.tmpfiles.d to zoneminder.tmpfiles Update README.Fedora Create zoneminder-1.26.4-dbinstall.patch Update zoneminder.f19.spec Update zoneminder.f19.spec Update README.Fedora Update README.CentOS Update README.Fedora Merge pull request ZoneMinder#1 from ZoneMinder/datapathcmake Update zoneminder.1.26.el6.spec Rename zoneminder.1.26.el6.spec to zoneminder.el6.spec Update CMakeLists.txt Merge pull request ZoneMinder#203 from knnniggett/pkgdata Update configure.ac Update README.CentOS Create zoneminder.cmake.el6.spec Create zoneminder.cmake.f19.spec Update zoneminder.f19.spec Update zoneminder.el6.spec Update zm.conf.in Chris Wiggins (1): Merge pull request ZoneMinder#178 from ZoneMinder/cmake Isaac Connor (19): Redo the patch that added the <0 test. Since it isn't an actual error there won't be an error message set so I've made it another case entirely. Since this got renamed, have to rename it here too bump version add some more lines from iconnor tree to create and set permissions on dirs in /run and /tmp $DESTDIR needs to be added to paths to ensure that the changes are made in the chroot when building packages. new code to look for update scripts instead of having distinct lines for each clean out autogenerated files change eq's to le's so that it runs scripts for upgrading from 1.26.0 move this into the distros dir Merge branch 'master' of https://github.com/dukess/ZoneMinder into dukess-master Merge branch 'master' of github.com:ZoneMinder/ZoneMinder Merge branch 'dukess-master' into v1.26.4-beta blah increase the hegiht of the window a bit, the contents are larger Merge branch 'v1.26.4-beta' Merge branch 'master' of https://github.com/FoundationUniversity/ZoneMinder into FoundationUniversity-master This is a copy of the debian dir, the main change is to the Changelog so that the package gets built for precise Check the size of the mmap file before mmaping it. If the mmap file 0 ( can happen with remote cameras that can't be reached because it is offline ) we get sigbus. I think the mmap succeeds, but is zero sized, so the first access causes SIGBUS. Merge branch 'master' of github.com:ZoneMinder/ZoneMinder Jan Dennis Bungart (3): Fixing postinst script and changelog needed for successful debian build Fixing debian control file (libjpeg-turbo8 -> libjpeg8) fixing debian docs file (README -> README.md) Kevin Crider (2): Added missing word in readme Merge pull request ZoneMinder#194 from WDKevin/master Kfir Itzhak (19): Merge pull request ZoneMinder#172 from raulcaj/patch-1 Fix comparison sign warning introduced in pull request ZoneMinder#174 commit 33b6e5c Merge pull request ZoneMinder#199 from knnniggett/rmsourcedir Added support for @PKGDATADIR@ in CMakeLists.txt Fix detection of signal structures in cmake Signal and backtrace improvements Merge pull request ZoneMinder#200 from knnniggett/zm_path_data More signal improvements: 1) Cleaner code 2) Fixed the path displayed in the addr2line line 3) Improved dependency checking for backtrace 4) Few more improvements Remove accidently committed planned crash code in src/zmc.cpp Used indent -linux on src/zm_signal.cpp to convert all spaces to tabs 1) Removed the use of deprecated and undocumented sigcontext (Replaced by siginfo and ucontext) 2) Removed the checks for sigcontext, strsignal and siginfo.h 3) Added debugging code to the die handler 4) Using SA_RESTART in the hup and reload handlers to prevent certain functions returning EINTR 5) Added SIGINT and SIGQUIT to the term handler Always print cr2 and ip as long if siginfo and ucontext are available Push the debugging in zm_signal further down Remove the ZM_NO_CRASHTRACE option from cmake. Not needed now that we have proper dependency checking Fix ZM_NO_MMAP cmake option Changed default option of ZM_COLOUR_JPEG_FILES to no. It impacts performance and is not needed anymore, all modern image viewers support grayscale JPEG images Changed default HTTP version to 1.0 instead of 1.1, as we don't fully support important HTTP/1.1 features such as chunked encoding Merge pull request ZoneMinder#201 from ZoneMinder/signalfixes Merge pull request ZoneMinder#205 from knnniggett/debug Knniggett (5): initial upload of files used to build rpm Improve Chrome browser support & log streaming events Add fedora files to zoneminder source tree remove ${CMAKE_CURRENT_SOURCE_DIR} from add_custom_target create ZM_PATH_DATA and point zmupdate to ZM_PATH_DATA/db Kyle Johnson (39): Merge pull request ZoneMinder#121 from rkojedzinszky/master Initial commit of .travis.yml file, hopefully this builds. Added IRC notifications to .travis.yml cd back into the ZM dir, and run make after config Merge pull request ZoneMinder#163 from knnniggett/fedora Merge pull request ZoneMinder#162 from knnniggett/streaming Trying to find the correct directory where the ZM clone lives Run as many make jobs as there are CPUs for the ffmpeg build Use pushd and popd to move between ffmpeg and zoneminder Found an env variable to put me where I want to be Added missing build steps to generate build files to .travis.yml Split out the ffmpeg build options into individual steps Split out the zoneminder build options into individual steps Removed libtheora, libvorbis, libvpx and libx264 from apt dependencies. Revert "Removed libtheora, libvorbis, libvpx and libx264 from apt dependencies." Added travis build status image to readme [ci skip] Upgrade and install preqs quietly Tell Travis to skip building the modern branch for now [skip ci] Added steps to install ZM binaries, insert a monitor and start ZM Use the right database name Added a few steps to help me see the travis CI environment More work on the travis build steps Removed verbosity, extra db creation from travis build steps and fixed a db name Create and use a dedicated ZM database user for the travis build steps Output apt-get install to /dev/null in travis - we don't care about it Only grab the last 10 revisions and the master branch of ffmpeg for travis Create the database for travis during the before_script step Use the default travis user without a password Replace the ZM_DB_PASS with an empty password for the travis test steps Assign a monitor ID of 500 to the test monitor for the travis builds Proper number of columns 1.26.3 for travis Use only the needed fields for the travis test cam SQL syntax error in travis test monitor SQL syntax error in travis test monitor Merge pull request ZoneMinder#174 from POKKAHOH/rtsp-updates This shouldn't have been bumped yet Point zmupdate to the github pages site (non-https) for version numbers Readding version... Older versions still point at it. Bumping version to 1.26.4 POKKAHOH (3): Now can recive RTSP stream. Decode fragmented NAL Understand sprop-parametr-sets Don't check unsetted video format (zm_remote_camera_rtsp.cpp) Comment missed in determining stream header. Property 'title' and 'comment' not supported. remove #else errors for avutils/ffmpeg Raul Almeida (2): Update zm_timer.h Update zm_thread.h Richard Kojedzinszky (1): Rewritten the query to allow mysql to use indexes Serguei S. Dukachev (2): Error correction Update actions.php abauer (2): Move redhat folder to a subfolder called distros Removing the redhat folder from the root for real this time mastertheknife (26): Fix sign warning during compilation a better fix for the sign comparison warnings during compilation Fix an issue created by commit 2b56890: Log flooded with image dimensions differ errors Fix some compilation warnings Removed NumCoords entirely from zm_zone.cpp Proper checking for sys/syscall.h Fixed zm_logger not including zm_config.h first. Add cmake to zoneminder Add matrix to the .travis.yml file Modified .travis.yml to include kylejohnson's changes and fix it Fixed not logging in to mysql with a password Few cmake improvements Another attempt to create the ZM database in travis Attempt three at zm database stuff on travis Perl modules will be now be installed in <prefix>/<datadir>/zoneminder/perl5 Changed perl paths again, this time to <prefix>/<libdir>/perl5 and few improvements Merge branch 'cmake-improvements' Fixed typo in the last commit Fixed path issues when creating packages (rpms and such) Avoid trouble with whitespaces in current directory path Updated ZM version in cmake to 1.26.4 Attempt to fix issues with perl paths that andy is experiencing Fixed missing perl5 in path in the last commit Removed INSTALLDIRS from the cmake perl modules CMakeLists.txt Fixed compilation failure when zlib is not available Fix small zipped images bug introduced by commit e12a9dc
Small changes to get this version to build. Isaac Connor (5): update link to README to be README.md remove autogenerated files Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop rough in a quick script to help people generate the build files put this back so we can get on with life Knniggett (2): Modify zmupdate for 1.26.1 and 1.26.2 releases modify zmupdate.pl.in Kyle Johnson (5): Merge pull request ZoneMinder#116 from knnniggett/zmupdate_newrelease Point to the GitHub issues page for the list of current bugs Updated AUTHORS to reflect recent changes to the project Bumping the version numbers. Adding the db/zm_update file so that the upgrade script works mastertheknife (4): Merge remote-tracking branch 'origin/develop' Merge branch 'master' of github.com:ZoneMinder/ZoneMinder Fixed greyscale four field deinterlacing not processing last line, broken ssse3 color->greyscale conversion and improved error handling when readi Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into mybranch
Dotting some i's and crossing some t's. Forgot a few minor (major) steps that'll make this release usable. Shortlog appended. Kyle --- Chris Wiggins (1): Merge pull request ZoneMinder#111 from chriswiggins/master Kyle Johnson (3): Include missing make and configure files. Fixes ZoneMinder#107 Fixes ZoneMinder#107 for real this time. Forgot to bump the version number for 1.26.1. Fixes ZoneMinder#113
Merge pull request ZoneMinder#90 from knnniggett/patch-8 zms crashes with hashed authentication - fixes ZoneMinder#88 Previously, systems without gnutls were computing auth_md5 to be twice the size of what it was defined to be, thus causing zms to crash. The for loop at line 227 builds auth_md5 by looping every "2j", which means the upper limit (md5len) should be half the desired size of auth_md5.
The .deps directory shouldn't have been included. Removing it. .deps is generated during configure (or is it make?). Fixes ZoneMinder#52
Merge branch 'release-1.26' of https://github.com/ZoneMinder/ZoneMinder… … into release-1.26