pyrox.dev
Merge pull request #141011 from ryantm/zoneminder
zoneminder: 1.34.22 -> 1.36.8
authored by Ryan Mulligan and committed by GitHub 91bb6da2 09d2e951
+5
-6
pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
+5
-6
pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
···
1
-
From db38a11228eceea10dc97ecc87023b4919caa918 Mon Sep 17 00:00:00 2001
1
+
From 8823e48b055b7e574c08069048ba21ffa4393699 Mon Sep 17 00:00:00 2001
2
2
From: Daniel Fullmer <danielrf12@gmail.com>
3
3
Date: Fri, 21 Feb 2020 21:52:00 -0500
4
4
Subject: [PATCH] Don't use file timestamp in cache filename
···
14
14
1 file changed, 2 insertions(+), 1 deletion(-)
15
15
16
16
diff --git a/web/includes/functions.php b/web/includes/functions.php
17
-
index 19567a5c1..0242c09bc 100644
17
+
index 89d2cc8ad..52cbb6f38 100644
18
18
--- a/web/includes/functions.php
19
19
+++ b/web/includes/functions.php
20
-
@@ -2223,7 +2223,8 @@ function cache_bust($file) {
20
+
@@ -1941,7 +1941,8 @@ function cache_bust($file) {
21
21
$parts = pathinfo($file);
22
22
global $css;
23
-
$dirname = preg_replace('/\//', '_', $parts['dirname']);
23
+
$dirname = str_replace('/', '_', $parts['dirname']);
24
24
- $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.filemtime($file).'.'.$parts['extension'];
25
25
+ $srcHash = '@srcHash@';
26
26
+ $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.$srcHash.'.'.$parts['extension'];
···
28
28
return 'cache/'.$cacheFile;
29
29
} else {
30
30
--
31
-
2.25.1
32
-
31
+
2.32.0
+4
-3
pkgs/servers/zoneminder/default.nix
+4
-3
pkgs/servers/zoneminder/default.nix
···
78
78
79
79
in stdenv.mkDerivation rec {
80
80
pname = "zoneminder";
81
-
version = "1.34.22";
81
+
version = "1.36.8";
82
82
83
83
src = fetchFromGitHub {
84
84
owner = "ZoneMinder";
85
85
repo = "zoneminder";
86
86
rev = version;
87
-
sha256 = "1144j9crm0q5pwxnkmy3ahw1vbkddpbk2ys2m2pxxxiqifdhll83";
87
+
sha256 = "sha256-UUpq4CCZq+EwVNGsLCQuVWdY3yoGw977AaMk1iJ6a5U=";
88
+
fetchSubmodules = true;
88
89
};
89
90
90
91
patches = [
···
130
131
131
132
for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \
132
133
scripts/zmupdate.pl.in \
133
-
src/zm_config.h.in \
134
+
src/zm_config_data.h.in \
134
135
web/api/app/Config/bootstrap.php.in \
135
136
web/includes/config.php.in ; do
136
137
substituteInPlace $f --replace @ZM_CONFIG_SUBDIR@ /etc/zoneminder