zoneminder: Update to 1.36.33

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Jan 14 13:23:57 2024 -0500
Changeset:	d5a4379dbf25c99e7cb2481f7da55fef7effd943

Modified Files:
	zoneminder/COMMIT_MSG
	zoneminder/Makefile
	zoneminder/TODO
	zoneminder/distinfo

Log Message:
zoneminder: Update to 1.36.33

This is broken; see ../zoneminder132 if you want 1.32.  Upstream
changes are to be folded into COMMIT_MSG and are thus omitted here.

It remains to merge patches, add deps, and build.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d5a4379dbf25c99e7cb2481f7da55fef7effd943

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zoneminder/COMMIT_MSG | 83 +++++++++++++++++++++++++++++----------------------
 zoneminder/Makefile   |  3 +-
 zoneminder/TODO       | 36 +++++++++++-----------
 zoneminder/distinfo   |  6 ++--
 4 files changed, 69 insertions(+), 59 deletions(-)

diffs:
diff --git a/zoneminder/COMMIT_MSG b/zoneminder/COMMIT_MSG
index 5ba073f570..b70208c02a 100644
--- a/zoneminder/COMMIT_MSG
+++ b/zoneminder/COMMIT_MSG
@@ -1,63 +1,76 @@
-security/zoneminder: Update to 1.32.3
+security/zoneminder: Update to 1.36.33
 
-Welcome to 2018.
 
 Packaging changes:
 
-  - Change config to etc/zm from etc, and provide etc/zm/conf.d, because
-    migration from 1.30 writes there.
-  - Rototill hard the cmake build options, and try to document what
-    must be set as path configuration.
-  - Upstream removed zmf; drop patch.
-  - Depend on mp4v2.
+  + 1.36
+
+
+  + 1.32
+
+    - Change config to etc/zm from etc, and provide etc/zm/conf.d, because
+      migration from 1.30 writes there.
+    - Rototill hard the cmake build options, and try to document what
+      must be set as path configuration.
+    - Upstream removed zmf; drop patch.
+    - Depend on mp4v2.
 
 Upstream NEWS:
 
-    A re-worked web console, compared to the previous 1.30.4 release
+  + 1.36:
 
-    record to mp4 container
+    \todo
 
-    record audio
+  + 1.34
 
-    support for php 7.x
+    \todo
 
-    Arbitrary website as a non-recordable, interactive monitor.
+  + 1.32
 
-    Updated Montage Review
+    - A re-worked web console, compared to the previous 1.30.4 release
 
-    Options-> Paths moved into config files under conf.d folder
+    - record to mp4 container
 
-    Multiple storage paths are supported. See Options -> Storage
+    - record audio
 
-    The old method of bind mounting the event folder is no longer needed nor recommended
+    - support for php 7.x
 
-    Additional system statistics on the web console
+    - Arbitrary website as a non-recordable, interactive monitor.
 
-    Raspberry pi OMX hardware h264 decoder support
+    - Updated Montage Review
 
-    Event thumbnails play video on mouseover
+    - Options-> Paths moved into config files under conf.d folder
 
-    Drag and drop sorting of monitors
+    - Multiple storage paths are supported. See Options -> Storage
 
-    Scalability improvements
+    - The old method of bind mounting the event folder is no longer needed nor recommended
 
-    Support for Redhat el6 distros and clones has been removed
+    - Additional system statistics on the web console
 
-Upstream upgrade notes (tweaked for pkgsrc):
+    - Raspberry pi OMX hardware h264 decoder support
+
+    - Event thumbnails play video on mouseover
 
-    The upgrade scripts will take longer than normal to run,
-    especially if you have many events.
+    - Drag and drop sorting of monitors
+
+    - Scalability improvements
+
+    - Support for Redhat el6 distros and clones has been removed
+
+Upstream upgrade notes (tweaked for pkgsrc):
 
-    Your previous settings on the Options -> Paths tab have been moved
-    into the file zmcustom.conf which is found under
-    ${PKGSYSCONFDIR}/etc/zm/conf.d
+    - The upgrade scripts will take longer than normal to run,
+      especially if you have many events.
 
-    Consider migrating your events folder from the former bind mount
-    method to the new method under Options -> Storage
+    - Your previous settings on the Options -> Paths tab have been
+      moved into the file zmcustom.conf which is found under
+      ${PKGSYSCONFDIR}/etc/zm/conf.d
 
-    You should no longer have symbolic links in your webroot
-    folder. This resolves a long standing security issue.
+    - Consider migrating your events folder from the former bind mount
+      method to the new method under Options -> Storage
 
-    The Apache config file has changed.  Hand merge it and review your
-    web setup.
+    - You should no longer have symbolic links in your webroot
+      folder. This resolves a long standing security issue.
 
+    - The Apache config file has changed.  Hand merge it and review
+      your web setup.
diff --git a/zoneminder/Makefile b/zoneminder/Makefile
index 164c612f92..b48ef4027e 100644
--- a/zoneminder/Makefile
+++ b/zoneminder/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.42 2019/06/18 12:36:59 gdt Exp $
 
-VERSION=	1.32.3
-PKGREVISION=	9
+VERSION=	1.36.33
 # Distfile is ZoneMinder but package and tarball contents are zoneminder.
 NAME_DIST=	ZoneMinder
 NAME_LOWER=	zoneminder
diff --git a/zoneminder/TODO b/zoneminder/TODO
index 419b17bedf..094d92dd92 100644
--- a/zoneminder/TODO
+++ b/zoneminder/TODO
@@ -1,28 +1,26 @@
-1) for (stable final point releases):
+* 1.36
 
-   update to newer upstream
+  - Merge patches forward
+  - Add missing dependencies
+  - Compilation/PLIST
 
-   validate that it actually runs
+  - Add 1.34 release notes to COMMIT_MSG
+  - Add 1.36 release notes to COMMIT_MSG
+    + https://github.com/ZoneMinder/zoneminder/releases/tag/1.36.33
 
-   push to pkgsrc
+  - Stray items from 1.32, not clear if they are present still or not
 
-2) After updating to the current release
+    + Consider installing conf.d/zmpaths.conf setting the paths we set,
+      because that seems necessary.
 
-   File bugs upstream and add URLs
-
-3) 1.32
-
-   https://github.com/ZoneMinder/zoneminder/releases/tag/1.32.0
+    + Resolve zmc startup hang (zmdc expects zmc to exit, but it
+      doesn't??).
 
-   https://github.com/ZoneMinder/zoneminder/issues/2078#issuecomment-395094624
-   [I believe all items in this checklist have been dealt with.]
+    + Resolve nph-zms vs zms, or decide it's an upstream choice that
+      this package doesn't need to address.
 
-   Consider installing conf.d/zmpaths.conf setting the paths we set,
-   because that seems necessary.
+  - Test and find new issues
 
-   Resolve zmc startup hang (zmdc expects zmc to exit, but it doesn't??).
+* After becoming current
 
-   Resolve nph-zms vs zms, or decide it's an upstream choice that this
-   package doesn't need to address.
-
-   Add packages need for onvif to work.
+   File bugs upstream and add URLs
diff --git a/zoneminder/distinfo b/zoneminder/distinfo
index 273f84a9e3..d3f096da0b 100644
--- a/zoneminder/distinfo
+++ b/zoneminder/distinfo
@@ -3,9 +3,9 @@ $NetBSD: distinfo,v 1.12 2018/07/14 15:03:57 gdt Exp $
 BLAKE2s (FriendsOfCake-crud-v3.0.10.tar.gz) = e04238f274c6ce5b27f4a106630ef224fe6cb61a8172d32474e8660af7adea81
 SHA512 (FriendsOfCake-crud-v3.0.10.tar.gz) = 2f60557f2c783bb448e06c1ca40b536a1d7d5f3caf0626fa6716a28f808492d4799e238f16c022571be96921105b074b6763920fd7b9cc77b76d17ceadae2040
 Size (FriendsOfCake-crud-v3.0.10.tar.gz) = 72960 bytes
-BLAKE2s (ZoneMinder-1.32.3.tar.gz) = 7b82f17c3584afc882f0dbfc6ccdbaa9f5659cbd6aa0e4cf90f03f3a94a23ec7
-SHA512 (ZoneMinder-1.32.3.tar.gz) = 1226127a1352ebc6e80ba0cbdb3ecbae27cf64a75b7652abc651e1440b709456f71f5a7f700e37575a8f4c8cd2a0904e5be7721f61ae040365b60ed05447a9c8
-Size (ZoneMinder-1.32.3.tar.gz) = 10656921 bytes
+BLAKE2s (ZoneMinder-1.36.33.tar.gz) = 693d5a07ce03b6e97fd402170e05cc89cf2885a9a33215fc66e8615a12e90802
+SHA512 (ZoneMinder-1.36.33.tar.gz) = 7afd25d3fa5dd170bad552332dab5425b664e41d430f1514f2b038ec7391dae6fab165050b541cad50a6904341f77605fde845cc02e4d7ee10f42650cb9e8707
+Size (ZoneMinder-1.36.33.tar.gz) = 11501221 bytes
 BLAKE2s (ZoneMinder-CakePHP-Enum-Behavior-master.tar.gz) = 618af60eff56f659a700ff3bc9a3721c1b5a1ba8d15bc2a4213a4022297553bc
 SHA512 (ZoneMinder-CakePHP-Enum-Behavior-master.tar.gz) = fa51aa34749cf0e7c9c484c4d65718696230291780df1bac9a5ca8144a230d5cdfdf2ff2fae413248a09ddd14615dbe88b111713e11173aa9d9078c5b3c9064c
 Size (ZoneMinder-CakePHP-Enum-Behavior-master.tar.gz) = 3506 bytes