Merge branch 'master' of github.com:ZoneMinder/zoneminder

db/zm_update-1.37.5.sql

@@ -7,7 +7,7 @@ SET @s = (SELECT IF(
 	FROM INFORMATION_SCHEMA.COLUMNS
 	WHERE table_name = 'Monitors'
 	AND table_schema = DATABASE()
-	AND column_name = 'AlarmEndCommand'
+	AND column_name = 'EventEndCommand'
 	) > 0,
 "SELECT 'Column EventEndCommand already exists in Monitors'",
 "ALTER TABLE `Monitors` ADD COLUMN `EventEndCommand` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`"
@@ -21,7 +21,7 @@ SET @s = (SELECT IF(
 	FROM INFORMATION_SCHEMA.COLUMNS
 	WHERE table_name = 'Monitors'
 	AND table_schema = DATABASE()
-	AND column_name = 'AlarmStartCommand'
+	AND column_name = 'EventStartCommand'
 	) > 0,
 "SELECT 'Column EventStartCommand already exists in Monitors'",
 "ALTER TABLE `Monitors` ADD COLUMN `EventStartCommand` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`"

docs/installationguide/debian.rst

@@ -4,7 +4,7 @@ Debian
 .. contents::
 
 Easy Way: Debian 11 (Bullseye)
-------------------------
+------------------------------
 
 This procedure will guide you through the installation of ZoneMinder on Debian 11 (Bullseye).
 
@@ -104,7 +104,7 @@ Add the following to the /etc/apt/sources.list.d/zoneminder.list file
 
 You can do this using:
 
-.. code-block::
+::
 
     echo "deb https://zmrepo.zoneminder.com/debian/release-1.36 buster/" | sudo tee /etc/apt/sources.list.d/zoneminder.list
 

src/zm_libvnc_camera.cpp

@@ -23,7 +23,7 @@ void bind_libvnc_symbols() {
   
   libvnc_lib = dlopen("libvncclient.so", RTLD_LAZY | RTLD_GLOBAL);
   if (!libvnc_lib) {
-    Error("Error loading libvncclient: %s", dlerror());
+    Error("Error loading libvncclient.so: %s", dlerror());
     return;
   }
 
@@ -135,11 +135,6 @@ VncCamera::VncCamera(
 }
 
 VncCamera::~VncCamera() {
-  if (capture and mRfb) {
-    if (mRfb->frameBuffer)
-      free(mRfb->frameBuffer);
-    (*rfbClientCleanup_f)(mRfb);
-  }
   if (libvnc_lib) {
     dlclose(libvnc_lib);
     libvnc_lib = nullptr;
@@ -253,6 +248,12 @@ int VncCamera::PostCapture() {
 }
 
 int VncCamera::Close() {
+  if (capture and mRfb) {
+    if (mRfb->frameBuffer)
+      free(mRfb->frameBuffer);
+    (*rfbClientCleanup_f)(mRfb);
+    mRfb = nullptr;
+  }
   return 1;
 }
 #endif

src/zm_utils.cpp

@@ -252,8 +252,15 @@ void HwCapsDetect() {
 #elif defined(__arm__)
   // ARM processor in 32bit mode
   // To see if it supports NEON, we need to get that information from the kernel
+  #ifdef __linux__
   unsigned long auxval = getauxval(AT_HWCAP);
   if (auxval & HWCAP_ARM_NEON) {
+  #elif defined(__FreeBSD__)
+  unsigned long auxval = 0;
+  elf_aux_info(AT_HWCAP, &auxval, sizeof(auxval));
+  if (auxval & HWCAP_NEON) {
+  #error Unsupported OS.
+  #endif
     Debug(1,"Detected ARM (AArch32) processor with Neon");
     neonversion = 1;
   } else {

utils/do_debian_package.sh

@@ -116,60 +116,6 @@ else
     echo "Defaulting to ZoneMinder upstream git"
     GITHUB_FORK="ZoneMinder"
   fi;
-  if [ "$SNAPSHOT" == "stable" ]; then
-    if [ "$BRANCH" == "" ]; then
-      #REV=$(git rev-list --tags --max-count=1)
-      BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`;
-      if [ -z "$BRANCH" ]; then
-        # This should only happen in CI environments where tag info isn't available
-        BRANCH=`cat version`
-        echo "Building branch $BRANCH"
-      fi
-      if [ "$BRANCH" == "" ]; then
-        echo "Unable to determine latest stable branch!"
-        exit 0;
-      fi
-      echo "Latest stable branch is $BRANCH";
-    fi;
-  else
-    if [ "$BRANCH" == "" ]; then
-      echo "Defaulting to master branch";
-      BRANCH="master";
-    fi;
-    if [ "$SNAPSHOT" == "NOW" ]; then
-      SNAPSHOT=`date +%Y%m%d%H%M%S`;
-    else
-      if [ "$SNAPSHOT" == "CURRENT" ]; then
-        SNAPSHOT="`date +%Y%m%d.`$(git rev-list ${versionhash}..HEAD --count)"
-      fi;
-    fi;
-  fi;
-fi
-
-if [ "$PACKAGE_VERSION" == "NOW" ]; then
-  PACKAGE_VERSION=`date +%Y%m%d%H%M%S`;
-else
-  if [ "$PACKAGE_VERSION" == "CURRENT" ]; then
-    PACKAGE_VERSION="`date +%Y%m%d.`$(git rev-list ${versionhash}..HEAD --count)"
-  fi;
-fi;
-
-IFS='.' read -r -a VERSION_PARTS <<< "$RELEASE"
-if [ "$PPA" == "" ]; then
-  if [ "$RELEASE" != "" ]; then
-    # We need to use our official tarball for the original source, so grab it and overwrite our generated one.
-    if [ "${VERSION_PARTS[0]}.${VERSION_PARTS[1]}" == "1.30" ]; then
-      PPA="ppa:iconnor/zoneminder-stable"
-    else
-      PPA="ppa:iconnor/zoneminder-${VERSION_PARTS[0]}.${VERSION_PARTS[1]}"
-    fi;
-  else
-    if [ "$BRANCH" == "" ]; then
-      PPA="ppa:iconnor/zoneminder-master";
-    else
-      PPA="ppa:iconnor/zoneminder-$BRANCH";
-    fi;
-  fi;
 fi;
 
 # Instead of cloning from github each time, if we have a fork lying around, update it and pull from there instead.
@@ -179,15 +125,8 @@ if [ ! -d "${GITHUB_FORK}_zoneminder_release" ]; then
     cd "${GITHUB_FORK}_ZoneMinder.git"
     echo "git fetch..."
     git fetch
-    echo "git checkout $BRANCH"
-    git checkout $BRANCH
-    if [ $? -ne 0 ]; then
-      echo "Failed to switch to branch."
-      exit 1;
-    fi;
-    echo "git pull..."
-    git pull
     cd ../
+
     echo "git clone ${GITHUB_FORK}_ZoneMinder.git ${GITHUB_FORK}_zoneminder_release"
     git clone "${GITHUB_FORK}_ZoneMinder.git" "${GITHUB_FORK}_zoneminder_release"
   else
@@ -200,14 +139,59 @@ else
 fi;
 
 cd "${GITHUB_FORK}_zoneminder_release"
-  git checkout $BRANCH
-cd ../
 
-VERSION=`cat ${GITHUB_FORK}_zoneminder_release/version`
+if [ "$SNAPSHOT" == "stable" ]; then
+  if [ "$BRANCH" == "" ]; then
+    #REV=$(git rev-list --tags --max-count=1)
+    BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`;
+    if [ -z "$BRANCH" ]; then
+      # This should only happen in CI environments where tag info isn't available
+      BRANCH=`cat version`
+      echo "Building branch $BRANCH"
+    fi
+    if [ "$BRANCH" == "" ]; then
+      echo "Unable to determine latest stable branch!"
+      exit 0;
+    fi
+    echo "Latest stable branch is $BRANCH";
+  fi;
+else
+  if [ "$BRANCH" == "" ]; then
+    echo "Defaulting to master branch";
+    BRANCH="master";
+  fi;
+  if [ "$SNAPSHOT" == "NOW" ]; then
+    SNAPSHOT=`date +%Y%m%d%H%M%S`;
+  else
+    if [ "$SNAPSHOT" == "CURRENT" ]; then
+      # git the latest (short) commit hash of the version file
+      versionhash=$(git log -n1 --pretty=format:%h version)
 
+      # Number of commits since the version file was last changed
+      numcommits=$(git rev-list ${versionhash}..HEAD --count)
+      SNAPSHOT="`date +%Y%m%d.`$(git rev-list ${versionhash}..HEAD --count)"
+    fi;
+  fi;
+fi;
+
+
+echo "git checkout $BRANCH"
+git checkout $BRANCH
+if [ $? -ne 0 ]; then
+  echo "Failed to switch to branch."
+  exit 1;
+fi;
+echo "git pull..."
+git pull
+# Grab the ZoneMinder version from the contents of the version file
+VERSION=$(cat version)
 if [ -z "$VERSION" ]; then
   exit 1;
 fi;
+IFS='.' read -r -a VERSION_PARTS <<< "$VERSION"
+
+cd ../
+
 if [ "$SNAPSHOT" != "stable" ] && [ "$SNAPSHOT" != "" ]; then
   VERSION="$VERSION~$SNAPSHOT";
 fi;
@@ -365,6 +349,22 @@ EOF
     fi;
   else
     SC="zoneminder_${VERSION}-${DISTRO}${PACKAGE_VERSION}_source.changes";
+    if [ "$PPA" == "" ]; then
+      if [ "$RELEASE" != "" ]; then
+        # We need to use our official tarball for the original source, so grab it and overwrite our generated one.
+        if [ "${VERSION_PARTS[0]}.${VERSION_PARTS[1]}" == "1.30" ]; then
+          PPA="ppa:iconnor/zoneminder-stable"
+        else
+          PPA="ppa:iconnor/zoneminder-${VERSION_PARTS[0]}.${VERSION_PARTS[1]}"
+        fi;
+      else
+        if [ "$BRANCH" == "" ]; then
+          PPA="ppa:iconnor/zoneminder-master";
+        else
+          PPA="ppa:iconnor/zoneminder-$BRANCH";
+        fi;
+      fi;
+    fi;
 
     dput="Y";
     if [ "$INTERACTIVE" != "no" ]; then

web/skins/classic/views/js/event.js

@@ -773,8 +773,9 @@ function manageDelConfirmModalBtns() {
       return;
     }
 
+    pauseClicked();
     evt.preventDefault();
-    $j.getJSON(thisUrl + '?request=event&task=delete&id='+eventData.Id)
+    $j.getJSON(thisUrl + '?request=event&action=delete&id='+eventData.Id)
         .done(function(data) {
           $j('#deleteConfirm').modal('hide');
           streamNext(true);