From 01b6b651b4864e68a44b47c9b9f65a411112be2a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 8 Oct 2021 12:32:04 -0700
Subject: [PATCH] zoneminder: 1.34.22 -> 1.36.8

---
 ...1-Don-t-use-file-timestamp-in-cache-filename.patch | 11 +++++------
 pkgs/servers/zoneminder/default.nix                   |  7 ++++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch b/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
index 6ca55a147688..ca2792099bd1 100644
--- a/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
+++ b/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
@@ -1,4 +1,4 @@
-From db38a11228eceea10dc97ecc87023b4919caa918 Mon Sep 17 00:00:00 2001
+From 8823e48b055b7e574c08069048ba21ffa4393699 Mon Sep 17 00:00:00 2001
 From: Daniel Fullmer <danielrf12@gmail.com>
 Date: Fri, 21 Feb 2020 21:52:00 -0500
 Subject: [PATCH] Don't use file timestamp in cache filename
@@ -14,13 +14,13 @@ unique.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/web/includes/functions.php b/web/includes/functions.php
-index 19567a5c1..0242c09bc 100644
+index 89d2cc8ad..52cbb6f38 100644
 --- a/web/includes/functions.php
 +++ b/web/includes/functions.php
-@@ -2223,7 +2223,8 @@ function cache_bust($file) {
+@@ -1941,7 +1941,8 @@ function cache_bust($file) {
    $parts = pathinfo($file);
    global $css;
-   $dirname = preg_replace('/\//', '_', $parts['dirname']);
+   $dirname = str_replace('/', '_', $parts['dirname']);
 -  $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.filemtime($file).'.'.$parts['extension'];
 +  $srcHash = '@srcHash@';
 +  $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.$srcHash.'.'.$parts['extension'];
@@ -28,5 +28,4 @@ index 19567a5c1..0242c09bc 100644
      return 'cache/'.$cacheFile;
    } else {
 -- 
-2.25.1
-
+2.32.0
diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix
index 2ea162b0d60e..3aed72eb8b8d 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/pkgs/servers/zoneminder/default.nix
@@ -78,13 +78,14 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "zoneminder";
-  version = "1.34.22";
+  version = "1.36.8";
 
   src = fetchFromGitHub {
     owner  = "ZoneMinder";
     repo   = "zoneminder";
     rev    = version;
-    sha256 = "1144j9crm0q5pwxnkmy3ahw1vbkddpbk2ys2m2pxxxiqifdhll83";
+    sha256 = "sha256-UUpq4CCZq+EwVNGsLCQuVWdY3yoGw977AaMk1iJ6a5U=";
+    fetchSubmodules = true;
   };
 
   patches = [
@@ -130,7 +131,7 @@ in stdenv.mkDerivation rec {
 
     for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \
              scripts/zmupdate.pl.in \
-             src/zm_config.h.in \
+             src/zm_config_data.h.in \
              web/api/app/Config/bootstrap.php.in \
              web/includes/config.php.in ; do
       substituteInPlace $f --replace @ZM_CONFIG_SUBDIR@ /etc/zoneminder