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

Author: connortechnology

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

@@ -10,6 +10,11 @@ env:
   GPG_KEY_ID: ${{ secrets.ZMREPO_GPG_KEY_ID }}
   GPG_PASSPHRASE: ${{ secrets.ZMREPO_GPG_PASSPHRASE }}
   GPG_PRIVATE_KEY_B64: ${{ secrets.ZMREPO_GPG_PRIVATE_KEY_B64 }}
+  DEBEMAIL: "info@zoneminder.com"
+  DEBFULLNAME: "Github CI"
+  TZ: America/New_York
+  DEBIAN_FRONTEND: noninteractive
+  DEBSIGN_KEYID: ${{ secrets.ZMREPO_GPG_KEY_ID }}
 
 jobs:
   build-debian:
@@ -31,14 +36,22 @@ jobs:
             sed -n 's/^deb /deb-src /p' /etc/apt/sources.list >> \
               /etc/apt/sources.list
           fi
+          if [ -f /etc/apt/sources.list.d/debian.sources ]; then
+            sed -i 's/^Types: deb$/Types: deb deb-src/g' \
+            /etc/apt/sources.list.d/debian.sources
+          fi
+          if [ -f /etc/apt/sources.list.d/ubuntu.sources ]; then
+            sed -i 's/^Types: deb$/Types: deb deb-src/g' \
+            /etc/apt/sources.list.d/ubuntu.sources
+          fi
           apt-get update
       - name: Install build tools
         run: |
           set -eux
           apt install -y --no-install-recommends \
             git ca-certificates gnupg lsb-release \
             build-essential devscripts debhelper equivs fakeroot \
-            cmake pkg-config ccache
+            cmake pkg-config ccache curl bash rsync openssh-client
           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 \
@@ -57,39 +70,53 @@ jobs:
         with:
           gpg_private_key: ${{ secrets.ZMREPO_GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.ZMREPO_GPG_PASSPHRASE }}
-          git_user_signingkey: true
-          git_commit_gpgsign: true
+          git_user_signingkey: false
+          git_commit_gpgsign: false
 
       - name: Install build-deps from debian/control
         run: |
           set -eux
+          ln -sf distros/ubuntu2004 debian
           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: |
-          set -eux
+          cd ../
+          ls -l
+          ln -sf zoneminder ZoneMinder_ZoneMinder.git
+          #git config --global --add safe.directory /__w/zoneminder/zoneminder
+          #git submodule init
+          #git submodule update --init --recursive
+          curl -s -o do_debian_package.sh https://raw.githubusercontent.com/ZoneMinder/zoneminder/refs/heads/master/utils/do_debian_package.sh
+          chmod +x do_debian_package.sh
+
           # 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
+          ls -l /bin/bash
+          ./do_debian_package.sh -s=CURRENT -t=binary 
       - name: Collect .deb artifacts (incl. signed metadata & public key)
         run: |
           set -eux
           mkdir -p artifacts/deb
-          shopt -s nullglob
-          mv ../*.deb ../*.buildinfo ../*.changes artifacts/deb/ || true
-          cp -v public.asc artifacts/deb/
+          mv ../*.deb ../*.buildinfo ../*.changes ../*.tar.gz artifacts/deb/ || true
           # quick verify signatures (non-fatal)
           gpg --verify artifacts/deb/*.changes || true
           gpg --verify artifacts/deb/*.buildinfo || true
+      - name: Sanitize Artifact name
+        id: prep_artifact_name
+        run: |
+          # Use `sed` to replace invalid characters with a hyphen
+          sanitized_distro_name=$(echo -n "${{ matrix.distro }}" | sed -e 's/[;\\\/:<>"|*?]/_/g' -e 's/__*/_/g')
+          echo "artifact_name=binary-${sanitized_distro_name}" >> $GITHUB_ENV
+
       - name: Upload .deb artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
-          name: debian-${{ matrix.distro }}
           path: artifacts/deb
+          name: ${{ env.artifact_name }}
       - name: Publish to ZMREPO
         uses: easingthemes/ssh-deploy@main
         env:

utils/do_debian_package.sh

@@ -1,18 +1,18 @@
 #!/bin/bash
 
 if [ "$1" == "clean" ]; then
-
-read -p "Do you really want to delete existing packages? [y/N]"
-[[ $REPLY == [yY] ]] && { rm -fr zoneminder*.build zoneminder*.changes zoneminder*.deb; echo "Existing package files deleted";  } || { echo "Packages have NOT been deleted"; }
-exit;
-
+  read -p "Do you really want to delete existing packages? [y/N]"
+  [[ $REPLY == [yY] ]] && { rm -fr zoneminder*.build zoneminder*.changes zoneminder*.deb; echo "Existing package files deleted";  } || { echo "Packages have NOT been deleted"; }
+  exit;
 fi
 
 DEBUILD=`which debuild`;
 
 if [ "$DEBUILD" == "" ]; then
   echo "You must install the devscripts package.  Try sudo apt-get install devscripts";
-  exit;
+  exit 1;
+else
+  echo "Found debuild at ${DEBUILD}"
 fi
 
 for i in "$@"
@@ -131,7 +131,7 @@ if [ ! -d "${GITHUB_FORK}_zoneminder_release" ]; then
   fi
 else
   echo "release dir already exists. Please remove it."
-  exit 0;
+  exit 1;
 fi;
 
 cd "${GITHUB_FORK}_zoneminder_release"
@@ -147,7 +147,7 @@ if [ "$SNAPSHOT" == "stable" ]; then
     fi
     if [ "$BRANCH" == "" ]; then
       echo "Unable to determine latest stable branch!"
-      exit 0;
+      exit 1;
     fi
     echo "Latest stable branch is $BRANCH";
   fi;
@@ -170,7 +170,6 @@ else
   fi;
 fi;
 
-
 echo "git checkout $BRANCH"
 git checkout $BRANCH
 if [ $? -ne 0 ]; then

web/includes/Monitor.php

@@ -1047,6 +1047,10 @@ function Manufacturer($new=-1) {
   function getMonitorStateHTML() {
     $html = '
 <div id="monitorStatus'.$this->Id().'" class="monitorStatus">
+      <div class="stream-info">
+          <div class="stream-info-status"></div>
+          <div class="stream-info-mode"></div>
+      </div>
 <span class="MonitorName">'.$this->Name().' (id='.$this->Id().')</span>
   <div id="monitorState'.$this->Id().'" class="monitorState">
     <span>'.translate('State').':<span id="stateValue'.$this->Id().'">'.$this->Status().'</span></span>
@@ -1215,16 +1219,8 @@ class="monitorStream imageFeed"
     } # end if showZones
     $html .= PHP_EOL.'</div><!--.zoompan--></div><!--monitorStream-->'.PHP_EOL;
     if (isset($options['state']) and $options['state']) {
-    $html .= '<div class="status">';
-    $html .= '
-      <div class="stream-info">
-          <div class="stream-info-status"></div>
-          <div class="stream-info-mode"></div>
-      </div>
-      '.PHP_EOL;
     //if ((!ZM_WEB_COMPACT_MONTAGE) && ($this->Type() != 'WebSite')) {
       $html .= $this->getMonitorStateHTML();
-      $html .= '</div><!--state-->';
     }
     $html .= PHP_EOL.'</div></div><!--.grid-stack-item-content--></div><!--.grid-stack-item-->'.PHP_EOL;
     return $html;