Merge remote-tracking branch 'upstream/master' into ai_server

Author: connortechnology

.eslintignore

@@ -21,7 +21,7 @@ web/skins/classic/js/video.js
 web/skins/classic/assets
 web/js/janus.js
 web/js/ajaxQueue.js
-web/js/hls-1.5.20/
+web/js/hls-1.6.13/
 web/js/noUiSlider-15.8.1/
 web/js/dms.js
 

.github/workflows/build-native-packages.yml

@@ -1,14 +1,16 @@
 name: build-native-packages-signed
+
 on:
   push:
     tags: ["v*"]
   workflow_dispatch:
 permissions:
   contents: write
 env:
-  GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
-  GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-  GPG_PRIVATE_KEY_B64: ${{ secrets.GPG_PRIVATE_KEY_B64 }}
+  GPG_KEY_ID: ${{ secrets.ZMREPO_GPG_KEY_ID }}
+  GPG_PASSPHRASE: ${{ secrets.ZMREPO_GPG_PASSPHRASE }}
+  GPG_PRIVATE_KEY_B64: ${{ secrets.ZMREPO_GPG_PRIVATE_KEY_B64 }}
+
 jobs:
   build-debian:
     name: Build & sign .deb (${{ matrix.distro }})
@@ -19,53 +21,65 @@ jobs:
         distro: ["debian:13", "debian:12", "ubuntu:22.04", "ubuntu:24.04"]
     container:
       image: ${{ matrix.distro }}
+
     steps:
-name: Prep apt
-        run:
+      - name: Prep apt
+        run: |
           set -eux
-          if grep -q '^deb http' /etc/apt/sources.list && ! grep -q '^deb-src' /etc/apt/sources.list; then
-            sed -n 's/^deb /deb-src /p' /etc/apt/sources.list >> /etc/apt/sources.list
+          if grep -q '^deb http' /etc/apt/sources.list && ! grep -q '^deb-src'\
+            /etc/apt/sources.list; then
+            sed -n 's/^deb /deb-src /p' /etc/apt/sources.list >> \
+              /etc/apt/sources.list
           fi
           apt-get update
-name: Install build tools
-        run:
+      - name: Install build tools
+        run: |
           set -eux
-          apt-get install -y --no-install-recommends \
+          apt install -y --no-install-recommends \
             git ca-certificates gnupg lsb-release tzdata \
             build-essential devscripts debhelper equivs fakeroot \
             cmake pkg-config ccache
-name: Checkout
-        uses: actions/checkout@v4
+          apt install -y debhelper sphinx-doc dh-linktree dh-apache2 cmake \
+            libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev \
+            libswresample-dev libswscale-dev libbz2-dev \
+            libturbojpeg0-dev default-libmysqlclient-dev \
+            libpolkit-gobject-1-dev libv4l-dev libvlc-dev libssl-dev \
+            libvncserver-dev libjwt-gnutls-dev libgsoap-dev gsoap \
+            libmosquittopp-dev
+
+      - name: Checkout
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
-name: Import GPG key (Debian)
-        run:
+      - name: Import GPG key (Debian)
+        run: |
           set -eux
           mkdir -p ~/.gnupg
           chmod 700 ~/.gnupg
           echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf
           echo "$GPG_PRIVATE_KEY_B64" | base64 -d > /tmp/priv.asc
           gpg --batch --import /tmp/priv.asc
           gpg --batch --yes --edit-key "$GPG_KEY_ID" trust quit <<< "5\ny"
-          gpg --batch --armor --export "$GPG_KEY_ID" > public.asc
+          gpg --batch --armor --export "$GPG_KEY_ID" --output public.asc
           chmod 600 ~/.gnupg/*
           export GPG_TTY=$(tty || true)
-name: Install build-deps from debian/control
-        run:
+      - name: Install build-deps from debian/control
+        run: |
           set -eux
-          mk-build-deps -ir -t "apt-get -y --no-install-recommends" debian/control
-name: Build (signed)
+          mk-build-deps -ir -t "apt-get -y --no-install-recommends" \
+            debian/control
+      - name: Build (signed)
         env:
           DEB_BUILD_OPTIONS: "parallel=$(nproc)"
           # gpg picks passphrase from environment via loopback
-        run:
+        run: |
           set -eux
           # Tell gpg to use loopback + passphrase
           export GPG_TTY=$(tty || true)
           export DEB_SIGN_KEYID="$GPG_KEY_ID"
           dpkg-buildpackage -k"$DEB_SIGN_KEYID" -b
-name: Collect .deb artifacts (incl. signed metadata & public key)
-        run:
+      - name: Collect .deb artifacts (incl. signed metadata & public key)
+        run: |
           set -eux
           mkdir -p artifacts/deb
           shopt -s nullglob
@@ -74,96 +88,32 @@ name: Collect .deb artifacts (incl. signed metadata & public key)
           # quick verify signatures (non-fatal)
           gpg --verify artifacts/deb/*.changes || true
           gpg --verify artifacts/deb/*.buildinfo || true
-name: Upload .deb artifacts
+      - name: Upload .deb artifacts
         uses: actions/upload-artifact@v4
         with:
           name: debian-${{ matrix.distro }}
           path: artifacts/deb
-  build-rpm:
-    name: Build & sign .rpm (${{ matrix.distro }})
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        distro: ["rockylinux:9", "fedora:40"]
-    container:
-      image: ${{ matrix.distro }}
-    steps:
-name: Install build tools
-        run:
-          set -eux
-          if command -v dnf >/dev/null; then PM=dnf; else PM=yum; fi
-          $PM -y install git rpm-build make gcc gcc-c++ cmake pkgconfig ccache which \
-            redhat-rpm-config gnupg2 rpm-sign
-name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-name: Import GPG key (RPM)
-        run:
-          set -eux
-          mkdir -p ~/.gnupg
-          chmod 700 ~/.gnupg
-          echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf
-          echo "$GPG_PRIVATE_KEY_B64" | base64 -d > /tmp/priv.asc
-          gpg --batch --import /tmp/priv.asc
-          gpg --batch --yes --edit-key "$GPG_KEY_ID" trust quit <<< "5\ny"
-          gpg --batch --armor --export "$GPG_KEY_ID" > public.asc
-          printf '%%_signature gpg\n'            >> ~/.rpmmacros
-          printf '%%_gpg_name %s\n' "$GPG_KEY_ID" >> ~/.rpmmacros
-          # custom sign cmd with loopback pinentry; rpmsign passes files via macros
-          cat >> ~/.rpmmacros <<'EOF'
-%__gpg /usr/bin/gpg
-%__gpg_sign_cmd %{__gpg} gpg --batch --no-verbose --no-armor --pinentry-mode loopback --passphrase %{?__gpg_passphrase} -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename}
-EOF
-name: Prepare rpmbuild tree & source
-        run:
-          set -eux
-          mkdir -p rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
-          VERSION="${GITHUB_REF_NAME:-dev}"
-          git archive --format=tar --prefix=zoneminder-${VERSION}/ HEAD | gzip -9 > rpmbuild/SOURCES/zoneminder-${VERSION}.tar.gz
-          cp packaging/zoneminder.spec rpmbuild/SPECS/zoneminder.spec
-name: Install BuildRequires
-        run:
-          set -eux
-          if command -v dnf >/dev/null; then PM=dnf; else PM=yum; fi
-          $PM -y builddep rpmbuild/SPECS/zoneminder.spec || true
-name: Build RPMs
-        run:
-          set -eux
-          rpmbuild -ba rpmbuild/SPECS/zoneminder.spec \
-            --define "_topdir $(pwd)/rpmbuild" \
-            --define "version ${GITHUB_REF_NAME:-dev}"
-name: Sign RPMs
+      - name: Publish to ZMREPO
+        uses: easingthemes/ssh-deploy@main
         env:
-          __gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
-        run:
-          set -eux
-          find rpmbuild/RPMS -name "*.rpm" -print0 | xargs -0 -n1 -I{} rpmsign --addsign {}
-          # quick verify (non-fatal if gpg keyring missing pub)
-          rpm -Kv rpmbuild/RPMS/*/*.rpm || true
-name: Collect .rpm artifacts (incl. public key)
-        run:
-          set -eux
-          mkdir -p artifacts/rpm
-          find rpmbuild/RPMS -name "*.rpm" -exec cp -v {} artifacts/rpm/ \;
-          cp -v public.asc artifacts/rpm/
-name: Upload .rpm artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: rpm-${{ matrix.distro }}
-          path: artifacts/rpm
+          SSH_PRIVATE_KEY: ${{ secrets.ZMREPO_SSH_KEY }}
+          ARGS: "-rltgoDzvO"
+          SOURCE: artifacts/deb/
+          REMOTE_HOST: ${{ secrets.ZMREPO_HOST }}
+          REMOTE_USER: ${{ secrets.ZMREPO_SSH_USER }}
+          TARGET: debian/master/mini-dinstall/incoming/
+
   release:
     name: Create GitHub Release (on tag)
-    needs: [build-debian, build-rpm]
+    needs: build-debian
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
-name: Download artifacts
-        uses: actions/download-artifact@v4
+      - name: Download artifacts
+        uses: actions/download-artifact@v5
         with:
           path: dist
-name: Create release
+      - name: Create release
         uses: softprops/action-gh-release@v2
         with:
           files: dist/**/*

.github/workflows/codeql-analysis.yml

@@ -45,7 +45,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         config-file: ./.github/codeql/codeql-config.yml
@@ -68,7 +68,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl- 
@@ -83,4 +83,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

db/zm_update-1.37.73.sql

@@ -0,0 +1 @@
+UPDATE `Config` SET Value='https://telemetry.zoneminder.com/index.php' WHERE Value='https://zmanon:2b2d0b4skps@telemetry.zoneminder.com/zmtelemetry/testing5';

distros/redhat/zoneminder.spec

@@ -20,7 +20,7 @@
 %global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}}
 
 Name: zoneminder
-Version: 1.37.72
+Version: 1.37.73
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons

distros/ubuntu2004/control

@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 11), sphinx-doc, python3-sphinx, python3-sphinx-rtd
               ,libswscale-dev
               ,ffmpeg
               ,arp-scan
-              ,net-tools
+              ,net-tools, iproute2
               ,libbz2-dev
               ,libcurl4-gnutls-dev
               ,libjpeg-turbo8-dev | libjpeg62-turbo-dev | libjpeg8-dev | libjpeg9-dev

scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in

@@ -1679,7 +1679,7 @@ our @options = (
   },
   {
     name        => 'ZM_HOME_URL',
-    default     => 'http://zoneminder.com',
+    default     => 'https://zoneminder.com',
     description => 'The url used in the home/logo area of the navigation bar.',
     help        => q`
       By default this takes you to the zoneminder.com website,
@@ -2740,7 +2740,7 @@ our @options = (
   },
   {
     name        => 'ZM_TELEMETRY_SERVER_ENDPOINT',
-    default     => 'https://zmanon:2b2d0b4skps@telemetry.zoneminder.com/zmtelemetry/testing5',
+    default     => 'https://telemetry.zoneminder.com/index.php',
     description => 'URL that ZoneMinder will send usage data to',
     help        => '',
     type        => $types{url},

scripts/ZoneMinder/lib/ZoneMinder/Event.pm

@@ -419,7 +419,10 @@ sub delete {
     $ZoneMinder::Database::dbh->commit() if ! $in_transaction;
 
     my $storage = $event->Storage();
-    $storage->save({DiskSpace=>$storage->DiskSpace()-$event->DiskSpace()}) if $event->DiskSpace() and $storage->Id();
+    if ($event->DiskSpace() and $storage->Id()) {
+      $storage->lock_and_load();
+      $storage->save({DiskSpace=>$storage->DiskSpace()-$event->DiskSpace()});
+    }
   }
 
   if ( ( $in_zmaudit or (!$Config{ZM_OPT_FAST_DELETE})) and $event->Storage()->DoDelete() ) {
@@ -782,8 +785,14 @@ sub MoveTo {
   $ZoneMinder::Database::dbh->commit() if !$was_in_transaction;
 
   # Update storage diskspace.  The triggers no longer do this. This is ... less important so do it outside the transaction
-  $OldStorage->save({DiskSpace => $OldStorage->DiskSpace()-$old_diskspace}) if $old_diskspace and $$OldStorage{Id};
-  $NewStorage->save({DiskSpace => $NewStorage->DiskSpace()+$new_diskspace}) if $new_diskspace and $$NewStorage{Id};
+  if ($old_diskspace and $$OldStorage{Id}) {
+    $OldStorage->lock_and_load();
+    $OldStorage->save({DiskSpace => $OldStorage->DiskSpace()-$old_diskspace});
+  }
+  if ($new_diskspace and $$NewStorage{Id}) {
+    $NewStorage->lock_and_load();
+    $NewStorage->save({DiskSpace => $NewStorage->DiskSpace()+$new_diskspace});
+  }
 
   $self->delete_files($OldStorage);
   return $error;

scripts/zmtelemetry.pl.in

@@ -50,13 +50,17 @@ my $show = 0;
 # Interval between version checks
 my $interval;
 my $version;
+my $dry_run = 0;
+my $verbose;
 
 GetOptions(
-  force     => \$force,
-  help      => \$help,
-  show      => \$show,
-  interval  => \$interval,
-  version   => \$version
+  force   => \$force,
+  help    => \$help,
+  show    => \$show,
+  interval=> \$interval,
+  version => \$version,
+  verbose => \$verbose,
+  dry_run => \$dry_run,
 );
 
 if ($version) {
@@ -76,7 +80,7 @@ if ($show) {
   collectData($dbh, \%telemetry);
   my $result = jsonEncode(\%telemetry);
   print($result);
-  exit(0);
+  exit(0) if $dry_run;
 }
 
 if (!defined $interval) {
@@ -140,6 +144,7 @@ sub collectData {
   my $dbh = shift;
   my $telemetry = shift;
   $telemetry->{uuid} = getUUID($dbh);
+  $telemetry->{timezone} = $Config{ZM_TIMEZONE};
   @$telemetry{qw(city region country latitude longitude)} = getGeo();
   $telemetry->{timestamp} = strftime('%Y-%m-%dT%H:%M:%S%z', localtime());
   $telemetry->{monitor_count} = countQuery($dbh, 'Monitors');
@@ -188,7 +193,7 @@ sub sendData {
     $ua->proxy('https', $Config{ZM_UPDATE_CHECK_PROXY});
   }
 
-  Debug("Posting telemetry data to: $server_endpoint");
+  Debug("Posting telemetry data $msg to: $server_endpoint");
 
 # set custom HTTP request header fields
   my $req = HTTP::Request->new(POST => $server_endpoint);
@@ -286,8 +291,8 @@ sub getMonitorRef {
   my $dbh = shift;
 
   my $sql = 'SELECT `Id`,`Name`,`Type`,`Capturing`,`Analysing`,`Recording`,`Width`,`Height`,`Colours`,`MaxFPS`,`AlarmMaxFPS`,
-  (SELECT Name FROM Manufacturers WHERE Manufacturers.Id = ManufacturerId),
-  (SELECT Name FROM Models WHERE Models.Id = ModelId)
+  (SELECT Name FROM Manufacturers WHERE Manufacturers.Id = ManufacturerId) AS Manufacturer,
+  (SELECT Name FROM Models WHERE Models.Id = ModelId) AS Model
   FROM `Monitors`';
   my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
   my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );

src/zm_eventstream.cpp

@@ -230,9 +230,9 @@ bool EventStream::loadEventData(uint64_t event_id) {
 
   event_data->n_frames = mysql_num_rows(result);
   if (event_data->frame_count < event_data->n_frames) {
-    event_data->frame_count = event_data->n_frames;
     Warning("Event %" PRId64 " has more frames in the Frames table (%d) than in the Event record (%d)",
             event_data->event_id, event_data->n_frames, event_data->frame_count);
+    event_data->frame_count = event_data->n_frames;
   }
   event_data->frames.clear();
   event_data->frames.reserve(event_data->frame_count);