From fb5668c9ef7376ccc212eda0413aef8ef567537d Mon Sep 17 00:00:00 2001 From: Joergen Edelbo Date: Sat, 29 Apr 2017 09:02:35 +0200 Subject: [PATCH 1/5] Fix spelling of remSocketFile --- web/ajax/stream.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ajax/stream.php b/web/ajax/stream.php index 4f453d50f..93c35a46a 100644 --- a/web/ajax/stream.php +++ b/web/ajax/stream.php @@ -52,7 +52,7 @@ while ( !file_exists($remSockFile) && $max_socket_tries-- ) { //sometimes we are } if ( !file_exists($remSockFile) ) { - ajaxError("Socket $remSocketFile does not exist. This file is created by zms, and since it does not exist, either zms did not run, or zms exited early. Please check your zms logs and ensure that CGI is enabled in apache and check that the PATH_ZMS is set correctly. Make sure that ZM is actually recording. If you are trying to view a live stream and the capture process (zmc) is not running then zms will exit. Please go to http://zoneminder.readthedocs.io/en/latest/faq.html#why-can-t-i-see-streamed-images-when-i-can-see-stills-in-the-zone-window-etc for more information."); + ajaxError("Socket $remSockFile does not exist. This file is created by zms, and since it does not exist, either zms did not run, or zms exited early. Please check your zms logs and ensure that CGI is enabled in apache and check that the PATH_ZMS is set correctly. Make sure that ZM is actually recording. If you are trying to view a live stream and the capture process (zmc) is not running then zms will exit. Please go to http://zoneminder.readthedocs.io/en/latest/faq.html#why-can-t-i-see-streamed-images-when-i-can-see-stills-in-the-zone-window-etc for more information."); } else { if ( !@socket_sendto( $socket, $msg, strlen($msg), 0, $remSockFile ) ) { ajaxError( "socket_sendto( $remSockFile ) failed: ".socket_strerror(socket_last_error()) ); From fd8aa62927f72e62f39f3b0d20041cc8f8bca6bf Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Tue, 2 May 2017 13:25:56 -0500 Subject: [PATCH 2/5] bump 1.30.3 release --- db/zm_update-1.30.3.sql | 5 +++++ distros/redhat/zoneminder.spec | 7 +++++-- version | 2 +- version.enc | Bin 0 -> 16 bytes 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 db/zm_update-1.30.3.sql create mode 100644 version.enc diff --git a/db/zm_update-1.30.3.sql b/db/zm_update-1.30.3.sql new file mode 100644 index 000000000..d3a0c740d --- /dev/null +++ b/db/zm_update-1.30.3.sql @@ -0,0 +1,5 @@ +-- +-- This updates a 1.30.2 database to 1.30.3 +-- +-- No changes required +-- diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index 0984ba4f9..ba5e814f8 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -28,8 +28,8 @@ %global _hardened_build 1 Name: zoneminder -Version: 1.30.2 -Release: 2%{?dist} +Version: 1.30.3 +Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons # jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/ @@ -338,6 +338,9 @@ rm -rf %{_docdir}/%{name}-%{version} %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/run/zoneminder %changelog +* Tue May 02 2017 Andrew Bauer - 1.30.3-1 +- 1.30.3 release + * Thu Mar 30 2017 Andrew Bauer - 1.30.2-2 - 1.30.2 release diff --git a/version b/version index d1eaa3ba0..b0f33908d 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.30.2 +1.30.3 diff --git a/version.enc b/version.enc new file mode 100644 index 0000000000000000000000000000000000000000..46cec4186b183eee89aaceba621b873eca89ba90 GIT binary patch literal 16 XcmXR_Tk-fXXYw`PDZcV)b_^x}Jf8*; literal 0 HcmV?d00001 From ebe7c21984336a07a5bee9f95c762ec2006041ee Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 2 May 2017 13:44:34 -0500 Subject: [PATCH 3/5] Update rsync_xfer.sh --- utils/packpack/rsync_xfer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/packpack/rsync_xfer.sh b/utils/packpack/rsync_xfer.sh index 0eb12adda..e981f646f 100755 --- a/utils/packpack/rsync_xfer.sh +++ b/utils/packpack/rsync_xfer.sh @@ -17,7 +17,7 @@ done if [ "${TRAVIS_EVENT_TYPE}" == "cron" ]; then if [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ]; then - targetfolder="debian" + targetfolder="debian/master/mini-dinstall/incoming" else targetfolder="travis" fi From 752959f3fc7bc5896926bc118523abd12cbfefa4 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Wed, 3 May 2017 12:35:54 -0500 Subject: [PATCH 4/5] Update CMakeLists.txt typo - remove extra "/" --- web/api/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/api/CMakeLists.txt b/web/api/CMakeLists.txt index bc17cfa3b..d2a39ef13 100644 --- a/web/api/CMakeLists.txt +++ b/web/api/CMakeLists.txt @@ -15,4 +15,4 @@ configure_file(app/Config/core.php.default "${CMAKE_CURRENT_BINARY_DIR}/app/Conf configure_file(app/Config/bootstrap.php.in "${CMAKE_CURRENT_BINARY_DIR}/app/Config/bootstrap.php" @ONLY) # Configure lib/Cake/bootstrap.php -configure_file(lib/Cake/bootstrap.php.in "${CMAKE_CURRENT_BINARY_DIR}/lib/Cake//bootstrap.php" @ONLY) +configure_file(lib/Cake/bootstrap.php.in "${CMAKE_CURRENT_BINARY_DIR}/lib/Cake/bootstrap.php" @ONLY) From 895f5cc7c455e5529192a585c5e858ec955e111c Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Wed, 3 May 2017 13:25:11 -0500 Subject: [PATCH 5/5] Update CMakeLists.txt install the other bootstrap.php file under lib/cake --- web/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/web/CMakeLists.txt b/web/CMakeLists.txt index 201b5b511..fe9dc7a6f 100644 --- a/web/CMakeLists.txt +++ b/web/CMakeLists.txt @@ -18,6 +18,7 @@ if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/core.php" DESTINATION "${ZM_WEBDIR}/api/app/Config") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/database.php" DESTINATION "${ZM_WEBDIR}/api/app/Config") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/bootstrap.php" DESTINATION "${ZM_WEBDIR}/api/app/Config") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/lib/Cake/bootstrap.php" DESTINATION "${ZM_WEBDIR}/api/lib/Cake") endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) # Install the mootools symlinks (if its not in the source directory)