Skip to content

Releases: ZoneMinder/zoneminder

The Day that Never Comes (RC2)

06 Jul 23:02
@knight-of-ni knight-of-ni
v1.30.0-rc2
4873683
Compare
Choose a tag to compare
The Day that Never Comes (RC2) Pre-release
Pre-release

Important Changes!

This release has additional Perl dependencies associated with Onvif discovery and the telemetry daemon. If you are installing from a package, the package maintainer should take care of this for you.

As mentioned in the previous release notes, these features have been removed from the project:

  • Autotools – Build using cmake instead
  • Mobile Skin – Use a mobile app, such as zmNinja
  • XML Skin – Use the new API instead

Changes Included with RC2

  • An issue with the latest libjpeg-turbo 1.5.0 was discovered and fixed
  • Update Ubuntu and Debian documentation
  • Additional enhancements and fixes to zmonvif-probe
  • Zones were incorrectly reporting a size of 100% when they were smaller. This has been fixed.
  • Fixed an warning message from zmupdate.pl

New Features

Onvif discovery is now enabled by default. This features increases build time, but the benefit is auto-discovery of any Onvif compliant camera. Please note that this feature is still experimental. It has not been tested in a large environment or with a large variety of cameras. Using this tool is largely self explanatory, but if you are looking for documentation it can be found on the @altaroca ’s blog site. As time allows, we will bring the documentation over to our readthedocs site. Volunteers to do this work are welcome.

ZoneMinder now has a telemetry deamon which collects information about your machine. This was done to learn how our user base uses ZoneMinder, the most common system size, choice of distro, cpu, memory, and a couple of other things. This will help us focus our efforts on what features get used the most. Since this was written in Perl, you can easily see for yourself what information is being sent. Note that this feature defaults to ON. If this is not what you want, then you can turn it off under Options. In a future release, we plan to include an install wizard, which will prompt the user about this feature.

Have you ever wished for the motion detection zones to be live, rather than a static image? Well they are now! Creating or modifying zones works exactly the same as before, but with the live stream running in the background. If you need to freeze the stream, there is a Pause button at the bottom of the window to do just that.

Change Log

1.30.0 (2016-07-06)

Full Changelog

Merged pull requests:

v1.30.0-rc1 (2016-06-01)

Full Changelog

Merged pull requests:

Read more
Assets 3

The Day that Never Comes

01 Jun 01:01
@knight-of-ni knight-of-ni
v1.30.0-rc1
6950e33
Compare
Choose a tag to compare
The Day that Never Comes Pre-release
Pre-release

Important Changes!

This release has additional Perl dependencies associated with Onvif discovery and the telemetry daemon. If you are installing from a package, the package maintainer should take care of this for you.

As mentioned in the previous release notes, these features have been removed from the project:

  • Autotools – Build using cmake instead
  • Mobile Skin – Use a mobile app, such as zmNinja
  • XML Skin – Use the new API instead

New Features

Onvif discovery is now enabled by default. This features increases build time, but the benefit is auto-discovery of any Onvif compliant camera. Please note that this feature is still experimental. It has not been tested in a large environment or with a large variety of cameras. Using this tool is largely self explanatory, but if you are looking for documentation it can be found on the @altaroca ’s blog site. As time allows, we will bring the documentation over to our readthedocs site. Volunteers to do this work are welcome.

ZoneMinder now has a telemetry deamon which collects information about your machine. This was done to learn how our user base uses ZoneMinder, the most common system size, choice of distro, cpu, memory, and a couple of other things. This will help us focus our efforts on what features get used the most. Since this was written in Perl, you can easily see for yourself what information is being sent. Note that this feature defaults to ON. If this is not what you want, then you can turn it off under Options. In a future release, we plan to include an install wizard, which will prompt the user about this feature.

Have you ever wished for the motion detection zones to be live, rather than a static image? Well they are now! Creating or modifying zones works exactly the same as before, but with the live stream running in the background. If you need to freeze the stream, there is a Pause button at the bottom of the window to do just that.

Change Log

1.30.0 (2016-05-31)

Full Changelog

Merged pull requests:

Read more
Assets 3

Fade to Black

03 Feb 19:15
@knight-of-ni knight-of-ni
v1.29.0
6de2ab5
Compare
Choose a tag to compare
Fade to Black

In Memory of Emmanuel Papin

The ZoneMinder team would like to dedicate this release to Emmanuel Papin. Emmanuel was a significant contributor to this project and even went on to write a license plate plugin. You can view his work here: https://github.com/manupap1/libzoneminder-plugin-openalpr

It is with great sorrow that I must report his passing on August 19, 2015. He will be missed.

Important Feature Deprecation Announcement

The following features are planned to be removed from the ZoneMinder project in a future release:

  • Autotools – Build using cmake instead
  • Mobile Skin – Use a mobile app, such as zmNinja
  • XML Skin – Use the new API instead

Significant New Features and Changes

The ZoneMinder API! This is now the supported way for third party tools and apps to communicate with ZoneMinder. Please contact us if you find anything lacking in the API.

Referred to by us as MultiServer, ZoneMinder now supports the display of cameras attached to multiple ZoneMinder servers via a single web console. Previously, something similar could be done by adding a camera with a url that pointed to another ZoneMinder server. While this worked, it was inefficient, as processing and storage were duplicated across both servers. The new MultiServer feature accomplishes the same thing, but leaves the processing and storage to the server the camera is assigned to. This feature is targeted towards two environments. The first is an enterprise environment where scalability is desired. The second is what I'll call a micro-server environment, where each "server" is something small, such as a Raspberry Pi. Documentation for this new feature can be found under the /docs folder or at http://zoneminder.readthedocs.org .

The option USE_DEEP_STORAGE has been hidden. This option has been enabled as the default for many years. Recently, it was identified that turning this option off resulted in the near immediate deletion of events from the disk. Not good. Consequently, this option can no longer be modified from Options. In the unlikely event that you have a working system not already using deep storage, please contact us so we can get that enabled without loss of your data.

ZoneMinder no longer uses php short open tags.

ZoneMinder has limited ONVIF discovery support, but it must be enabled at build time. We could use someone to build and test this on different makes and models of cameras.

For those using Groups, this feature has been expanded into its own permission group for greater flexibility. This change has a default permission of none or off. Consequently, if you are using Groups, you will need to enable this under each user account.

The libvlc source type should be more stable now. We finally discovered the cause of a rather nasty fault and have fixed it.

Change Log

v1.29.0 (2016-02-03)

Full Changelog

Merged pull requests:

v1.29.0-rc2 (2016-01-05)

Full Changelog

Merged pull requests:

v1.29.0-rc1 (2016-01-01)

Full Changelog

Merged pull requests:

Read more
Assets 3

Fade to Black (Release Candidate 2)

05 Jan 21:04
@knight-of-ni knight-of-ni
v1.29.0-rc2
3a19c3c
Compare
Choose a tag to compare
Fade to Black (Release Candidate 2) Pre-release
Pre-release

In Memory of Emmanuel Papin

The ZoneMinder team would like to dedicate this release to Emmanuel Papin. Emmanuel was a significant contributor to this project and even went on to write a license plate plugin. You can view his work here: https://github.com/manupap1/libzoneminder-plugin-openalpr

It is with great sorrow that I must report his passing on August 19, 2015. He will be missed.

Important Feature Deprecation Announcement

The following features are planned to be removed from the ZoneMinder project in a future release:

  • Autotools – Build using cmake instead
  • Mobile Skin – Use a mobile app, such as zmNinja
  • XML Skin – Use the new API instead

Significant New Features and Changes

The ZoneMinder API! This is now the supported way for third party tools and apps to communicate with ZoneMinder. Please contact us if you find anything lacking in the API.

Referred to by us as MultiServer, ZoneMinder now supports the display of cameras attached to multiple ZoneMinder servers via a single web console. Previously, something similar could be done by adding a camera with a url that pointed to another ZoneMinder server. While this worked, it was inefficient, as processing and storage were duplicated across both servers. The new MultiServer feature accomplishes the same thing, but leaves the processing and storage to the server the camera is assigned to. This feature is targeted towards two environments. The first is an enterprise environment where scalability is desired. The second is what I'll call a micro-server environment, where each "server" is something small, such as a Raspberry Pi. Documentation for this new feature can be found under the /docs folder or at http://zoneminder.readthedocs.org .

The option USE_DEEP_STORAGE has been hidden. This option has been enabled as the default for many years. Recently, it was identified that turning this option off resulted in the near immediate deletion of events from the disk. Not good. Consequently, this option can no longer be modified from Options. In the unlikely event that you have a working system not already using deep storage, please contact us so we can get that enabled without loss of your data.

ZoneMinder no longer uses php short open tags.

ZoneMinder has limited ONVIF discovery support, but it must be enabled at build time. We could use someone to build and test this on different makes and models of cameras.

For those using Groups, this feature has been expanded into its own permission group for greater flexibility. This change has a default permission of none or off. Consequently, if you are using Groups, you will need to enable this under each user account.

The libvlc source type should be more stable now. We finally discovered the cause of a rather nasty fault and have fixed it.

Changelog

v1.29.0-rc2 (2016-01-05)

Full Changelog

Merged pull requests:

Read more
Assets 3

Fade to Black (Release Candidate 1)

02 Jan 14:46
@knight-of-ni knight-of-ni
v1.29.0-rc1
f0495e8
Compare
Choose a tag to compare
Fade to Black (Release Candidate 1) Pre-release
Pre-release

In Memory of Emmanuel Papin

The ZoneMinder team would like to dedicate this release to Emmanuel Papin. Emmanuel was a significant contributor to this project and even went on to write a license plate plugin. You can view his work here: https://github.com/manupap1/libzoneminder-plugin-openalpr

It is with great sorrow that I must report his passing on August 19, 2015. He will be missed.

Important Feature Deprecation Announcement

The following features are planned to be removed from the ZoneMinder project in a future release:

  • Autotools – Build using cmake instead
  • Mobile Skin – Use a mobile app, such as zmNinja
  • XML Skin – Use the new API instead

Significant New Features and Changes

The ZoneMinder API! This is now the supported way for third party tools and apps to communicate with ZoneMinder. Please contact us if you find anything lacking in the API.

Referred to by us as MultiServer, ZoneMinder now supports the display of cameras attached to multiple ZoneMinder servers via a single web console. Previously, something similar could be done by adding a camera with a url that pointed to another ZoneMinder server. While this worked, it was inefficient, as processing and storage were duplicated across both servers. The new MultiServer feature accomplishes the same thing, but leaves the processing and storage to the server the camera is assigned to. This feature is targeted towards two environments. The first is an enterprise environment where scalability is desired. The second is what I'll call a micro-server environment, where each "server" is something small, such as a Raspberry Pi. Documentation for this new feature can be found under the /docs folder or at http://zoneminder.readthedocs.org .

The option USE_DEEP_STORAGE has been hidden. This option has been enabled as the default for many years. Recently, it was identified that turning this option off resulted in the near immediate deletion of events from the disk. Not good. Consequently, this option can no longer be modified from Options. In the unlikely event that you have a working system not already using deep storage, please contact us so we can get that enabled without loss of your data.

ZoneMinder no longer uses php short open tags.

ZoneMinder has limited ONVIF discovery support, but it must be enabled at build time. We could use someone to build and test this on different makes and models of cameras.

For those using Groups, this feature has been expanded into its own permission group for greater flexibility. This change has a default permission of none or off. Consequently, if you are using Groups, you will need to enable this under each user account.

The libvlc source type should be more stable now. We finally discovered the cause of a rather nasty fault and have fixed it.

Changelog

v1.29.0-rc1 (2016-01-01)

Full Changelog

Merged pull requests:

Read more
Assets 3

Disposable Heroes

14 Feb 16:27
@knight-of-ni knight-of-ni
v1.28.1
898b0fd
Compare
Choose a tag to compare
Disposable Heroes

We've been saying the next release will be "soon" for some time now. The wait is over.

This minor release brings further improvements to native RTSP support when using a source type of "remote". Newer h264 Foscam cameras should work now. We've made some inroads into getting Grandstream devices to work, but after fixing one issue we immediately ran into another, which has yet to be solved. These devices, along with Trendnet and others, currently experience an RTCP Timeout after streaming video for 10 seconds. We plan to have this fixed in a future release.

The folder location of zm.conf can now be specified at build time.

Instead of patching the source code, package maintainers can now use the /ustils/zmeditconfigdata.sh tool to change any of the values found in the Config dB table prior to building. For details on how to use this tool, execute the script from the command line, with no parameters, to display usage information.

A much improved SELinux policy file has been included for CentOS 6. This file lives under /distros/redhat. Users of zmrepo will automatically get this installed after a yum update to this version of zoneminder. Thanks go to Nate Dobbs for taking the time to do this work.

There are many other small, technical changes that can be viewed from the shortlog:

Isaac Connor (38):
[66ff569] fix console refresh in this skin too
[1b0b774] add avdevice55 as a dependcy instead of 53, which we need for utopic
[6f4b158] remove annoying warning.
[2b4c06c] Add a stringVector join function for future use
[f019289] Include monitor name in log otput so we know which monitor we are talking about. This informaton is not included when the error occurs in zms.
[89b76ac] implement http_Digest Auth, and improve it for rtsp
[7efd0b9] merge the rest of my Digest-AUth fixes: This should solve #399
[e017e0f] add libgnutls28-dev as an option to libgnutls-dev add the other libjpeg*-dev options, any of which should do
[dd9493a] Merge pull request #596 from manupap1/debian_dep
[7369114] fix saving groups
[ca6f0bf] Don't use Data::Dumper unless you are actually using it for debugging. No need to use ram. It is probably being included by one of the libraries anyways, but let's at least try to keep things as light as possible.
[03f28d4] more debug output when buffer is undersized.
[a6b880a] Merge pull request #575 from manupap1/memory_fix
[627f030] Merge pull request #574 from manupap1/rtsp_fix
[1fef262] Merge pull request #608 from knnniggett/RTSP_mUrl
[87b1d39] Merge pull request #607 from manupap1/memory_fix_leaks
[97c553f] Merge pull request #605 from manupap1/new_debian8_folder
[66cefd3] Merge pull request #582 from hanzese/patch-1
[e21d479] Merge pull request #615 from knnniggett/rtsp
[bdd929d] Merge pull request #567 from knnniggett/zm_config_dir
[8465803] Some cleanups, remove code that does nothing. Instead of using ControlDevice to store the password, parse the ControlAddress to get username, password enforce a port, which fixes the Digest Auth.
[fb28b86] default MoveRoot to empty to quiet an error in logs
[712df2a] alter the type of Device in the Monitors table to tinytext, which matches the MonitorPresets table, and increases the length to 255
[af4d413] fix auth requirement by checking for user when AUTH is on
[5f4e442] Merge pull request #636 from manupap1/debian_folder_fix
[a58c975] Merge pull request #634 from manupap1/debconf_support
[0ee2f7f] Merge pull request #640 from jrd288/offer_login
[f058861] update to what has been done in debian
[5326a1d] libjpeg updates to match debian
[5412817] this is in debian
[384e709] the debian packaging has this, and apparently we need it to build
[a0214fb] fix a bare ZM_PATH_BIN which should be $Config{ZM_PATH_BIN}
[0738fd5] this add some quoting, it's something debian and ubuntu packaging does, but it's pretty clear that it is good in a more general sense.
[1723aa9] bump version number to 1.28.1
[a16daba] already applied
[e68d3c6] fix merge conflict
[464e7ea] Merge pull request #660 from SteveGilvarry/patch-3
[9313280] Merge pull request #665 from knnniggett/rtp_ctrl

Andrew Bauer (20):
[54b1919] Update skin.js
[c6f610e] Merge pull request #584 from ZoneMinder/zmupdatefixes
[c2dbd57] Update zm.in
[b3be653] Merge pull request #594 from ndobbs/feature-ndobbs_selinux_rhel6_support
[a76c867] Merge pull request #588 from ZoneMinder/digest_auth
[0e3fb36] Merge pull request #621 from manupap1/new_debian8_folder
[de11064] Output to stderror when zmu can't read zm.conf
[4866339] Merge pull request #631 from ZoneMinder/fix_security_on_watch
[f2bb36c] Merge pull request #635 from ZoneMinder/zmcontrol_improvements
[eb60468] Merge pull request #632 from ZoneMinder/better_security
[04cd580] Merge pull request #647 from ariscop/master
[1f42ce1] Merge pull request #657 from ZoneMinder/log_export_use_PATH_SWAP
[c26ca7f] Move script to /utils
[2d5e868] Update zoneminder.cmake.el6.spec
[56d5e14] Rename zoneminder.cmake.el6.spec to zoneminder.el6.spec
[9bec156] bump version to 1.28.1 for autotools
[16267ce] Update rpm specfiles to make use of zmeditconfigdata.sh
[dc01981] Update zoneminder.cmake.f20.spec
[70b69d3] Update zoneminder.cmake.f20.spec
[898b0fd] Rename zoneminder.cmake.f20.spec to zoneminder.f20.spec

Sune1337 (7):
[9b935fd] - Timeout when opening stream after 10 seconds Sometimes when restarting the camera ffmpeg hung itself in some state, when calling avformat_open_input, which seemed to last forever. - Reopen stream if av_read_frame returns EOF Sometimes ffmpeg starts returning an EOF error when calling av_read_frame. Once this happens it seems no more images will ever be captured. - Reopen stream if av_read_frame returns -110 Means something like Connection failed; cant remember. Anyway. Once this happens it seems no more images will ever be captured.
[c15e713] Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file.
[bfcf378] removed use of av_err2str. someone could not compile when using that macro.
[a803d85] Process should exit if ReopenFfmpeg function fails to create a worker thread.
[ce7fe85] Define AV_ERROR_MAX_STRING_SIZE to 64 if it is not already defined.
[0fa8bd5] Define AV_ERROR_MAX_STRING_SIZE after all include files to use ffmpeg define if it exists.
[b07ca21] - join reconnect thread when finished to clean up thread resources. - don't spawn a new thread for every attempt to open a stream while reconnecting.

Kyle Johnson (2):
[af2d893] Merge pull request #591 from SteveGilvarry/docs-updates
[b024f9c] Merge pull request #606 from manupap1/memory_fix_mismatches

SteveGilvarry (2):
[d3d2741] Put opts back in
[fb8a36c] Updating Options documentation

Emmanuel Papin (1):
[0da17db] Convert french lang file to UTF-8

hanzese (1):
[1d7e6f2] Update et_ee.php

manupap1 (1):
[811ec82] Fixed bug in rtsp streaming caused by a signed - unsigned conversion.

Assets 2

Ride the Lightning

18 Oct 20:49
@knight-of-ni knight-of-ni
v1.28.0
71b56a1
Compare
Choose a tag to compare
Ride the Lightning

Release 1.28.0 - Ride the Lightning

This is the first release of ZoneMinder to officially support the newer php found in Ubuntu 14.04. Since Ubuntu 14.10 is right around the corner, preliminary tests indicate ZoneMinder 1.28.0 works with that as well.

Speaking of Ubuntu 14.10, this version of Ubuntu will include the infamous systemd. This replaces the old sysv init system and will require a learning curve for those who have not yet been exposed to it. Nearly all the major Linux distros have migrated to systemd. Why am I mentioning this in the ZoneMinder release notes? Because we have recently added full support for systemd. For details, read #502.

ZoneMinder now requires the polkit package and the URI::Encode perl module.

Be advised that certain default folders have changed. ZM_TMPDIR now defaults to /var/tmp and ZM_SOCKDIR now defaults to /var/run. Be advised that ZoneMinder will not change these values on an existing database. For further details, read #524.

We've fixed an old "shared data size conflict" error that some users on certain 32bit distros experienced when running on hardware that was 64bit capable. For details, see #462.

I've probably forgotten to mention something so here is the shortlog.

Isaac Connor (121):
[9e2d7cf] initial convert to PDO with no testing
[5eb313b] add config lline for DB type
[cd63b0a] add defaults for ZM_DB_TYPE
[b126c5a] fix typo
[36c4fad] remove extra quoets since dbEcape does quoting now
[0979830] more removal of exra quotes
[2a45506] more quoting removal
[09fbdc9] forget the updates to this file
[60e2703] fix missing n
[92591a6] more removal of quotes
[cde89a7] more quoting removal, some slight optimisations
[7fdb933] rework dbQuery, dbFetchOne to take a parameters array, and use it
[ae51ac5] redo changes to use new dbFetch functions with parameter arrays
[9356065] make sortorder be asc or desc, not something arbitrary which needs to be escaped other fixes to use parameter passing to PDO instead of escaping them ourselves
[59b8419] use parameter passing instead of explicit exscaping
[2d0f4df] Fix a missing NULL second paramter to dbFetchAll
[51455b5] more updates and removal of escaping and quoting
[4c6c415] fix: wrote dbCon instead of dbConn
[03809cf] improve error reporting
[a0c7b8d] add rules to build a dbg package
[a155082] use parameter passing instead of esacping
[9699187] more updates, currently the log updates are not enough. Filtering does not work.
[1519db7] add ServerHost filter
[86b04d0] fixup dbFetchMOnitor
[a2a3bda] remove unneccessary quoting and escaping
[ab93d92] add locking around the Config update. So far untested
[1c028e5] use parameter passing and remove extra escsaping
[ceca805] more updates
[4c348cf] more updates
[3393a63] more updates
[20f1b46] fix
[003b8c9] more removal of escaping
[0c58957] fixes
[626c7bd] pull this from the Wiki
[0cd3e33] add db inserts to add WanscamPT controls
[c7a8c06] wip
[967dda7] more copying mysql2PDO from classic. Also, some fixes in classic
[bfb52ab] fix groups
[957d6f1] remaining conversions
[d6a27b3] fix extra }
[afc7581] use zmDbConnect instead of all the DBI connect stuff
[b322622] remove uses of dbEscape
[8da9383] use PDO style
[1d9d84c] max executable
[a892991] add a NULL test for frame_coutn before calling atoi.
[00aad4a] frame_count should be an integer so don't use NULL
[a73e367] add libav-tools as an option instead of ffmpeg
[5ae3cb8] merge some security fixes from rogerroger288
[93aed26] escape username and password inside zm_user
[baf5da9] guard against monitor names being dangerous
[0689e84] guard against dangerous (old or new) monitor names
[5bf894d] guard against unsafe monitor name
[b48d06b] change commands to handle if db already has the User and Pass fields
[0f4e9eb] add these dependencies, apparently they are required for sftp upload
[0592276] fix mysql_escape_string calls after referring to docs
[11718f0] The users tab should always be available. It is useful to configure users BEFORE turning on auth.
[5fac727] Users tab should always be available
[6238371] fix missing ARRAY() around params to dbFetchOne
[c58c4a9] add the glue to define HOST_OS and use it to detect BSD and use different arguments to killall
[20bccdf] use the size of the username and password when calling mysql_escape_string
[90b0606] fix missing ExtendAlarmFrames column when add Default ZonePreset
[e298706] add avtools instead of ffmpg
[8f4fb8b] fix mysql_escape_String call. Must use strlen, not sizeof
[07dbbd4] only do mmap on demand
[6e22278] password might be null when auth_relay is none.
[7047193] get rid of escapeSql and replace it's calls with new PDO-style calls to FetchOne FetchALl,e etc
[2be38d7] fix problem editing users, a semi-colon screwed up the if statement. Also change behaviour so that if a user is specified, and doesn't load, generate an error. This also removes a search for empty user id in the db
[5c27ba8] I don't know why this never has the right # of coumns, so let's be specific
[f33b127] add curl dependencies
[eb5f299] increase max_socket_tries to 10 as #470
[9385471] move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
[99a3684] change the way v4l_multi_buffer is loaded. Since t's a bool, it theoretically is 1 byte, so can't use atoi
[4f694ee] fix
[8942e23] add Makefile to ignores
[edd794a] ensure captures_per_frame >0 add missing lang entries for MultiBuffer and CapturesPerFrame
[864f681] change mysql-server to Recommends
[b3f078e] add the word disabled after function if the monitor is not enabled.
[5e262f5] the var is remSockFile, not remSocketFile
[6d2be73] add mariadb as a dependency option
[e065e2b] add V4L
[0d22918] add the db updates for the V4L changes
[7147d47] Improve error messages when empty mmap file to reduce FAQ
[d5a7a18] make zmupdate re-run the most recent update.
[2087780] tweaks to make debian build with support for mariadb, update version and start using a fourth version digit set
[96322dd] remove v4l tab that I never used
[0834e1b] I see no reason for these to be posts. They retrieve info, that's it.
[a87f75e] any size discrepancy is caused for bailing
[f48f2db] update to same as ubuntu
[f0437c6] sync to ubuntu version
[7cbb079] revert size check for now
[5bc7242] spaces vs tabs are important in rules, debian is more picky than ubuntu fix placement of an if to prevent accessing unmapped mem_ptr
[3d8ad2c] fall back to Config table setting for v4l MultiBUgger and captures per frame.
[980a7a8] Add some text referencing the settings on the monitor settings page
[f93a28f] fixup multibuffering so it can have a null value which makes it fall back to config table
[c6d19b3] whitespace issue
[707f2e8] increase monitor popup height to fit v4l settings in
[6564c43] adjust monitor popup height
[5a7c989] remove some crap that I pushed
[83870b9] debugging in progress but builds
[2018228] fix V inputs
[2b4fb7a] drop not nuls from new V4L fields
[576aca0] sync with ubuntu version
[60d7f82] requirements to build on debian
[b8acac5] add polkit stuff required by systemd patch
[6aa1798] fix segfault for local cameras... strangely enough, in C you should treat an integer as a pointer to string
[9a3b685] fixes for vl_multi_buffer parsing when column is NULL fix in debug output for local cameras causing a segfault
[8891639] fix another segfault
[1076a62] fix crashes
[d1b1c35] these fields need to be able to be nul
[c9e04e4] Am remarking out some Debugs that would only be useful to someone debugging image code. Of no use to end users and get called so much that must cause a performance problem, especially when debug logging is actually turned on
[af53662] add libmime-tools-perl which provides MIME::Entity which is required for email sending
[bec58a6] fixes WRT to db logging. I believe fixes issue #504
[fa44376] Todays snapshot
[9eb88d3] add a check for db connection to handle the db going away and coming back
[348538b] distros/ubuntu1204/changelog
[525d411] bump snapshot #
[58b826b] more url documentation
[2a71973] make zm compile using libav on ubunut 14.04
[8a33f78] bugfix; coredump if no codec name was specified in url.
[61ebb56] add 1.28.0 release
[4fd2230] add release 1.28.0

Kyle Johnson (51):
[ef2b495] Removed extra }. Fixes #354
[2c94183] Initial commit of CakePHP 2.5.0-RC1 for the API
[5e56a5a] Initial commit of Monitor Model
[8a70747] Initial commit of Config Model
[51eced4] Initial commit of Event Model
[92e2212] Initial commit of Zone Model
[53c8f05] Added htaccess file to allow rewriting
[8e88fbe] Added routes for monitors xml / json
[2ee9ffd] Initial index, view, edit, update and delete functions for Monitors
[f975688] Initial xml and json views for Monitor index
[485f1b6] Initial xml and json views for Monitor view
[30657db] Initial index, view, edit, update and delete functions for Zones
[bb7cd76] Initial xml and json views for Zone index and view
[ed8bc57] Added a route for zones
[b2ad265] Added a route for configs
[af91a14] Initial index, view, edit and delete functions for Configs
[159a1ec] Initial xml and json views for Config index and view
[710bb96] Added a route for events
[5385e20] Initial index, vi...

Read more
Assets 2

Battery

15 Mar 04:52
@kylejohnson kylejohnson
v1.27.0
This tag was signed with the committer’s verified signature.
kylejohnson Kyle Johnson
GPG key ID: E01143AA19C9BC01
Learn about vigilant mode.
75d390d
Compare
Choose a tag to compare
Battery

Release 1.27.0 - Battery

This is an exciting release as we are fixing a number of bugs, as well as releasing a few new features. Notable notables include:

A new skin!

This is the initial release of the 'flat' skin, courteously of Justin Lawrence (@justinlawrence). If you'd like to give it a try, you can do so by changing the ZM_SKIN variable in the options menu, or by appending ?skin=flat to your URL. Please report any bugs with this skin if you choose to use it.

zmcamtool.pl

Previously, there was no easy way to bring in new ptz controls and camera presets into an existing ZoneMinder system. For the non-technical, programming the same camera into a different system usually meant typing everything in by hand again. This new tool makes it possible to import and export these settings to or from a sql file. You can also use this tool to import any new controls or presets into your existing database, which were added to a new version of ZoneMinder. Execute "zmcamtool.pl --help" from the command line for further details.

Docker

This release contains an inital ZoneMinder Dockerfile. Docker, and Dockerfiles, allow you to spin up disposable 'containers', which are essentially self-contained linux virtual machines, each with a specific purpose (such as running ZoneMinder). This feature is an attempt to speed up testing of features and bugs.

This is still in early stages, however more information can be found here.

A new camera source type, libvlc.

Courtesy of @ebarnard! Yes, you can probably guess what this means. If the optional libvlc libraries are installed on your system, ZoneMinder will theoretically be able to stream from any camera the popular VLC media player can stream from. If you own an IP camera that previous versions of ZoneMinder did not support then try this new method. More information is here.

Assets 2

Master of Puppets

13 Dec 18:47
@kylejohnson kylejohnson
v1.26.5
This tag was signed with the committer’s verified signature.
kylejohnson Kyle Johnson
GPG key ID: E01143AA19C9BC01
Learn about vigilant mode.
263f3a6
Compare
Choose a tag to compare
Master of Puppets

Another bug fix and improvement release. Notable notables include:

  • Better RTSP support! This fixed a regression in #221
  • Fixed that annoying bug where you could create zones larger than the image they belong to [b368d30]
  • Better WansView camera detection support

The full shortlog is attached

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 #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 #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 #240 from ZoneMinder/postinstcleanup
[729f036] Merge pull request #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 #214 from knnniggett/cmake_fedora
[9858c06] Merge pull request #215 from knnniggett/cmake_nox10
[eeca592] Merge pull request #216 from knnniggett/cmake_targetdistro
[cdd2920] Merge pull request #217 from knnniggett/cmake_redhat
[17f2736] Merge pull request #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 #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 #232 from josephevans/master
[be21a88] Merge pull request #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 #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 tim...

Read more
Assets 2

Hit The Lights

08 Oct 14:29
@kylejohnson kylejohnson
v1.26.4
This tag was signed with the committer’s verified signature.
kylejohnson Kyle Johnson
GPG key ID: E01143AA19C9BC01
Learn about vigilant mode.
fe7471a
Compare
Choose a tag to compare
Hit The Lights

A minor release focusing primarily on bug fixes. This was also the first release to see the introduction of our CI server.

Shortlog attached.

Andrew Bauer (3):
[e04cc4d] Create pkgdatadir in make
[32bd588] Change frameserver warnings to debug level 2
[70fb31c] Changed debug levels to 4-6

Andy Bauer (39):
[0bf9aac] Update zmupdate.pl.in for 1.26.3 release
[1d664f2] exclude zm_update-1.26.3.sql since it has already been added
[0dd98cc] Merge pull request #119 from knnniggett/zmupdate_zm.1.26.3
[a6d3b35] Delete zoneminder-1.25.0-installfix.patch
[4cc80d4] Update zoneminder.1.26.el6.spec
[ee5413f] Merge pull request #136 from knnniggett/redhat
[46aa2e0] Merge pull request #141 from knnniggett/redhat
[7d5e0d3] Update README.Fedora
[e30a43b] Move debian folder under distros
[d7dc4ce] Merge branch 'debian' of https://github.com/knnniggett/ZoneMinder into knnniggett-debian
[4123f2b] Can't seem to catch a break tonight. Moving dian files into correct folder.
[d02f6ee] Merge branch 'debian2' of https://github.com/knnniggett/ZoneMinder into knnniggett-debian2
[3896352] Update README.Fedora
[ead696e] Create zoneminder.f19.spec
[ea5c610] Update README.Fedora
[b505472] Update README.CentOS
[1afa526] Update zoneminder.f19.spec
[50fea88] Rename redalart.wav to redalert.wav
[2bdc1a3] Create zoneminder.tmpfiles.d
[2d1d0a3] Rename zoneminder.tmpfiles.d to zoneminder.tmpfiles
[5fe5015] Update README.Fedora
[d853e53] Create zoneminder-1.26.4-dbinstall.patch
[c2c8d18] Update zoneminder.f19.spec
[a09d690] Update zoneminder.f19.spec
[95a0480] Update README.Fedora
[665638c] Update README.CentOS
[b8f3124] Update README.Fedora
[28422d9] Merge pull request #1 from ZoneMinder/datapathcmake
[2393f6a] Update zoneminder.1.26.el6.spec
[02f33cc] Rename zoneminder.1.26.el6.spec to zoneminder.el6.spec
[6b11db1] Update CMakeLists.txt
[072b66b] Merge pull request #203 from knnniggett/pkgdata
[01be7a8] Update configure.ac
[0cbb818] Update README.CentOS
[1d76609] Create zoneminder.cmake.el6.spec
[667d755] Create zoneminder.cmake.f19.spec
[545275c] Update zoneminder.f19.spec
[85bca8d] Update zoneminder.el6.spec
[1c1a644] Update zm.conf.in

Chris Wiggins (1):
[ff4b2c0] Merge pull request #178 from ZoneMinder/cmake

Isaac Connor (19):
[fcf7e5b] 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.
[c612977] Since this got renamed, have to rename it here too
[f4a7101] bump version
[11d0428] add some more lines from iconnor tree to create and set permissions on dirs in /run and /tmp
[304e10e] $DESTDIR needs to be added to paths to ensure that the changes are made in the chroot when building packages.
[e21a08c] new code to look for update scripts instead of having distinct lines for each
[ab1314f] clean out autogenerated files
[ab4c091] change eq's to le's so that it runs scripts for upgrading from 1.26.0
[eba8b0d] move this into the distros dir
[c9ad6e6] Merge branch 'master' of https://github.com/dukess/ZoneMinder into dukess-master
[b80ac24] Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
[b08a825] Merge branch 'dukess-master' into v1.26.4-beta
[07fd2b1] blah
[7e91053] increase the hegiht of the window a bit, the contents are larger
[34f84a4] Merge branch 'v1.26.4-beta'
[80d97c7] Merge branch 'master' of https://github.com/FoundationUniversity/ZoneMinder into FoundationUniversity-master
[21caddf] This is a copy of the debian dir, the main change is to the Changelog so that the package gets built for precise
[60258e7] 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.
[4b1ee3c] Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

Jan Dennis Bungart (3):
[a3519fe] Fixing postinst script and changelog needed for successful debian build
[7172930] Fixing debian control file (libjpeg-turbo8 -> libjpeg8)
[b428272] fixing debian docs file (README -> README.md)

Kevin Crider (2):
[f4a37bb] Added missing word in readme
[2649b1f] Merge pull request #194 from WDKevin/master

Kfir Itzhak (19):
[171bf4a] Merge pull request #172 from raulcaj/patch-1
[96902c2] Fix comparison sign warning introduced in pull request #174 commit 33b6e5c
[38e2244] Merge pull request #199 from knnniggett/rmsourcedir
[9aaafbe] Added support for @PKGDATADIR@ in CMakeLists.txt
[18b72f9] Fix detection of signal structures in cmake
[b5c536b] Signal and backtrace improvements
[a248bc9] Merge pull request #200 from knnniggett/zm_path_data
[0bb2ee7] 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
[cd154e8] Remove accidently committed planned crash code in src/zmc.cpp
[e4b1be7] Used indent -linux on src/zm_signal.cpp to convert all spaces to tabs
[1d7f664] 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
[2cb65c6] Always print cr2 and ip as long if siginfo and ucontext are available
[25297bd] Push the debugging in zm_signal further down
[0a11d1b] Remove the ZM_NO_CRASHTRACE option from cmake. Not needed now that we have proper dependency checking
[6847e90] Fix ZM_NO_MMAP cmake option
[1609fd6] 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
[ba727a5] 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
[022ecf4] Merge pull request #201 from ZoneMinder/signalfixes
[8b4db03] Merge pull request #205 from knnniggett/debug

Knniggett (5):
[0268389] initial upload of files used to build rpm
[6d00540] Improve Chrome browser support & log streaming events
[b4da026] Add fedora files to zoneminder source tree
[d0cbb3f] remove ${CMAKE_CURRENT_SOURCE_DIR} from add_custom_target
[32ee0a8] create ZM_PATH_DATA and point zmupdate to ZM_PATH_DATA/db

Kyle Johnson (39):
[f000640] Merge pull request #121 from rkojedzinszky/master
[e438714] Initial commit of .travis.yml file, hopefully this builds.
[f4311ff] Added IRC notifications to .travis.yml
[3e7f762] cd back into the ZM dir, and run make after config
[304065c] Merge pull request #163 from knnniggett/fedora
[df13eb1] Merge pull request #162 from knnniggett/streaming
[2dce96f] Trying to find the correct directory where the ZM clone lives
[6f9fa0d] Run as many make jobs as there are CPUs for the ffmpeg build
[c5eb83c] Use pushd and popd to move between ffmpeg and zoneminder
[aa5290c] Found an env variable to put me where I want to be
[f2c58ac] Added missing build steps to generate build files to .travis.yml
[88a9b43] Split out the ffmpeg build options into individual steps
[50122f0] Split out the zoneminder build options into individual steps
[fb43fdf] Removed libtheora, libvorbis, libvpx and libx264 from apt dependencies.
[fa805ac] Revert "Removed libtheora, libvorbis, libvpx and libx264 from apt dependencies."
[87f0ba6] Added travis build status image to readme [ci skip]
[0b42922] Upgrade and install preqs quietly
[617cbc0] Tell Travis to skip building the modern branch for now [skip ci]
[3119ab7] Added steps to install ZM binaries, insert a monitor and start ZM
[186b1c3] Use the right database name
[44f4e2f] Added a few steps to help me see the travis CI environment
[beee057] More work on the travis build steps
[167eff5] Removed verbosity, extra db creation from travis build steps and fixed a db name
[fc6731e] Create and use a dedicated ZM database user for the travis build steps
[8983807] Output apt-get install to /dev/null in travis - we don't care about it
[27349f8] Only grab the last 10 revisions and the master branch of ffmpeg for travis
[cd902b5] Create the database for travis during the before_script step
[564fa21] Use the default travis user without a password
[9ac52b4] Replace the ZM_DB_PASS with an empty password for the travis test steps
[a5e526d] Assign a monitor ID of 500 to the test monitor for the travis builds
[de59dd8] Proper number of columns 1.26.3 for travis
[70841d3] Use only the needed fields for the travis test cam
[2c64c5d] SQL syntax error in travis test monitor
[598e830] SQL syntax error in travis test monitor
[02e1a5e] Merge pull request #174 from POKKAHOH/rtsp-updates
[b3b66d4] This shouldn't have been bumped yet
[03d12ef] Point zmupdate to the github pages site (non-https) for version numbers
[1ac0349] Readding version... Older versions still point at it.
[fe7471a] Bumping version to 1.26.4

POKKAHOH (3):
[33b6e5c] Now can recive RTSP stream. Decode fragmented NAL Understand sprop-parametr-sets Don't check unsetted video format (zm_remote_camera_rtsp.cpp)
[25ff325] Comment missed in determining stream header....

Read more
Assets 2