From e6358290b4167c8ab39339efb82dccd979efc0cf Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 2 Feb 2021 17:30:42 -0500 Subject: [PATCH 1/6] this=>self --- scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm index f69441aff..8c1f2114e 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm @@ -65,7 +65,7 @@ sub sendCmd { my $self = shift; my $cmd = shift; my $result = undef; - $this->printMsg($cmd, 'Tx'); + $self->printMsg($cmd, 'Tx'); my $req = HTTP::Request->new(GET=>'http://'.$self->{Monitor}->{ControlAddress}.'/'.$cmd); my $res = $self->{ua}->request($req); From 4cfe777e9399cd1f5056cad096ee0b91e4eff2e7 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 16 Feb 2021 11:16:06 -0500 Subject: [PATCH 2/6] Fix path to Monitor.php --- web/includes/actions/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/includes/actions/settings.php b/web/includes/actions/settings.php index c33f3a54c..a4aa1b489 100644 --- a/web/includes/actions/settings.php +++ b/web/includes/actions/settings.php @@ -29,7 +29,7 @@ if ( ! canView('Control', $_REQUEST['mid']) ) { return; } -require_once('Monitor.php'); +require_once('includes/Monitor.php'); $mid = validInt($_REQUEST['mid']); if ( $action == 'settings' ) { $args = ' -m ' . escapeshellarg($mid); From c8e9c3dd838def00a2051a4aa14dfb5d317a6cfb Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 31 Mar 2021 12:40:02 -0400 Subject: [PATCH 3/6] Spacing, remove redundant public: --- src/zm_event.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/zm_event.h b/src/zm_event.h index 77199509c..65ed38e4e 100644 --- a/src/zm_event.h +++ b/src/zm_event.h @@ -135,20 +135,20 @@ class Event { void UpdateFramesDelta(double offset); public: - static const char *getSubPath( struct tm *time ) { + static const char *getSubPath(struct tm *time) { static char subpath[PATH_MAX] = ""; - snprintf( subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec ); - return( subpath ); + snprintf(subpath, sizeof(subpath), + "%02d/%02d/%02d/%02d/%02d/%02d", + time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec + ); + return subpath; } static const char *getSubPath( time_t *time ) { - return Event::getSubPath( localtime( time ) ); + return Event::getSubPath(localtime(time)); } - char* getEventFile(void) { - return video_file; - } + char* getEventFile(void) { return video_file; } - public: static int PreAlarmCount() { return pre_alarm_count; } From 64ab6dff956dc1ed2705a9b56ea30d123af5a690 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 10 Apr 2021 18:16:59 -0400 Subject: [PATCH 4/6] fix missing ) --- web/skins/classic/views/js/montage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js index 6cbd97e23..09f326605 100644 --- a/web/skins/classic/views/js/montage.js +++ b/web/skins/classic/views/js/montage.js @@ -181,7 +181,7 @@ function Monitor(monitorData) { } //console.log("Starting CmdQuery for " + this.connKey ); if ( this.type != 'WebSite' ) { - this.streamCmdReq.send(this.streamCmdParms+"&command="+CMD_QUERY+(auth_hash?'&auth='+auth_hash:''); + this.streamCmdReq.send(this.streamCmdParms+"&command="+CMD_QUERY+(auth_hash?'&auth='+auth_hash:'')); } }; From af025db7586d33fcbde4fdcc3fee07efa1e7f130 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 11 Apr 2021 17:33:24 -0400 Subject: [PATCH 5/6] Release 1.34.24 --- distros/redhat/zoneminder.spec | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index 59b7cd1bb..e9a0dc283 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -28,7 +28,7 @@ %global _hardened_build 1 Name: zoneminder -Version: 1.34.23 +Version: 1.34.24 Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons diff --git a/version b/version index a0e1e3085..47239c6ed 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.34.23 +1.34.24 From a341d2ef845f39a9afcb2012759578e62d544e5b Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 12 Apr 2021 16:02:02 -0400 Subject: [PATCH 6/6] Don't upload orig tarball by adding -sd --- utils/do_debian_package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh index c907fa64d..afb7554c0 100755 --- a/utils/do_debian_package.sh +++ b/utils/do_debian_package.sh @@ -297,7 +297,7 @@ EOF DEBUILD="debuild -i -us -uc -b" else # Source build, don't need build depends. - DEBUILD="debuild -S -sa" + DEBUILD="debuild -S -sa -sd" fi; fi; if [ "$DEBSIGN_KEYID" != "" ]; then