zoneminder: Adjust patch comments

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: zoneminder: Adjust patch comments
From: Greg Troxel (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Thu, 30 Jul 2026 11:00:27 +0000
Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Thu Jul 30 06:59:33 2026 -0400
Changeset:	e5199e7a023636784e22334370d035c6fb03eea8

Modified Files:
	zoneminder/distinfo
	zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in
	zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm
	zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm
	zoneminder/patches/patch-scripts_zm_in
	zoneminder/patches/patch-src_zm__comms.h
	zoneminder/patches/patch-src_zm__remote__camera__nvsocket.cpp
	zoneminder/patches/patch-src_zm__utils.cpp
	zoneminder/patches/patch-src_zm_signal_cpp
	zoneminder/patches/patch-web_includes_database.php

Log Message:
zoneminder: Adjust patch comments

This commit is a full patrol of the patchfiles, checking and updating
each, including upstream status.

NFCI.

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

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

diffstat:
 zoneminder/distinfo                                | 18 ++++++-------
 ...ipts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in |  8 +++---
 ...ch-scripts_ZoneMinder_lib_ZoneMinder_General_pm | 31 +++++++++++++---------
 ...ipts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm |  6 +++--
 zoneminder/patches/patch-scripts_zm_in             |  2 ++
 zoneminder/patches/patch-src_zm__comms.h           |  2 ++
 .../patch-src_zm__remote__camera__nvsocket.cpp     |  4 +++
 zoneminder/patches/patch-src_zm__utils.cpp         |  2 +-
 zoneminder/patches/patch-src_zm_signal_cpp         |  4 +--
 zoneminder/patches/patch-web_includes_database.php |  3 +--
 10 files changed, 47 insertions(+), 33 deletions(-)

diffs:
diff --git a/zoneminder/distinfo b/zoneminder/distinfo
index 1d581645ee..24c22293b5 100644
--- a/zoneminder/distinfo
+++ b/zoneminder/distinfo
@@ -16,14 +16,14 @@ BLAKE2s (chmike-CxxUrl-eaf46c0207df24853a238d4499e7f4426d9d234c.tar.gz) = a3ad57
 SHA512 (chmike-CxxUrl-eaf46c0207df24853a238d4499e7f4426d9d234c.tar.gz) = acdf5a2877710d123246544c1f1543961275edcf09a8a8bb9fd587f59c3735af84f50277c27f07f783c7f56d841ad6bd8f5da1f1814d4aec825a6da507efc45f
 Size (chmike-CxxUrl-eaf46c0207df24853a238d4499e7f4426d9d234c.tar.gz) = 14299 bytes
 SHA1 (patch-CMakeLists.txt) = 85cbac6f60d4e42f2b5fb7e387efbcc81685d7dc
-SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in) = 3bf4e5e8276a682695db640e6608dd14c7315320
-SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = 996670d8a659c0624587da73f8083d9349aaa1ba
-SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm) = b3de55618915fad3d9263954db71270c800ad6f1
-SHA1 (patch-scripts_zm_in) = a05727261bb8be6b707e9a14ae4ff52ea3770d51
+SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in) = 9cf3f3f9da6a3cb4911bbb127a2d10d7edd8929f
+SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = 5350c37edb0d5d52613a734a20516ce6aefb417d
+SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm) = 38de6349f2071eef146009e029a3a0592aa9720a
+SHA1 (patch-scripts_zm_in) = e1e344b2bddaffa63c435541f6d5e78af73de80b
 SHA1 (patch-scripts_zmpkg_pl_in) = 429ea720574e19d96a34ad6a39f1196a90ac8a86
-SHA1 (patch-src_zm__comms.h) = 82f3fd744333913054fb10a07dcf84f1b91299a4
-SHA1 (patch-src_zm__remote__camera__nvsocket.cpp) = 7921c7cf74286ab63f26efb22aa3df9a402dd49e
+SHA1 (patch-src_zm__comms.h) = b6b68d50dfb73a72fd9609d50890aed6ecde9294
+SHA1 (patch-src_zm__remote__camera__nvsocket.cpp) = 2af57a1fe70369b0d377932570370838466c1535
 SHA1 (patch-src_zm__rtp__source.cpp) = ba46738d040ad0c83a49e0d5cc368f2752535b6e
-SHA1 (patch-src_zm__utils.cpp) = 43b50688fa0d4f51b8474c8cc31e860b3a43f864
-SHA1 (patch-src_zm_signal_cpp) = 97177023eec823ff5cba124fd5f2b636fd54001e
-SHA1 (patch-web_includes_database.php) = 7a990d96b4e21d7ad60545c0202abb14b060f280
+SHA1 (patch-src_zm__utils.cpp) = c347ad18989ca83e4317fb7e7eb3ba9fed4e99fa
+SHA1 (patch-src_zm_signal_cpp) = 68c97ef3b3bc9b0be0069bee0842e31c9317582e
+SHA1 (patch-web_includes_database.php) = 0d7e455220a59e94d5dd9acfd83858b78dce889b
diff --git a/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in b/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in
index 3e35b1a0c5..123b45fef5 100644
--- a/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in
+++ b/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in
@@ -1,10 +1,10 @@
 $NetBSD: patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in,v 1.2 2024/12/01 13:49:48 gdt Exp $
 
-Inhibit a couple of "phone home" options that are enabled by default.  These
-should be opt-in rather than opt-out.
+Disable check-for-updates ("phone home") by default.  pkgsrc doctrine is
+that phone-home behavior, unless opted into by the user, is a bug.
 
-The ConfigData.pm module determines what the default setting is for new
-options during an upgrade as well as on an initial installation.
+\todo Perhaps discuss with upstream, but this is a difference in
+judgement rather than a clear bug.
 
 --- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in.orig	2018-12-08 14:22:36.000000000 +0000
 +++ scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
diff --git a/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm b/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm
index f2a5ceb09f..6777a9c435 100644
--- a/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm
+++ b/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm
@@ -1,24 +1,29 @@
 $NetBSD: patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm,v 1.4 2024/12/01 13:49:48 gdt Exp $
 
-Perl doesn't really support "> /dev/null", so just capture into $output.
+Comment that appears no longer relevant, probably because upstream has
+avoided the problem it was about.  Deletion  candidate.
 
-% ktruss -i perl -e 'qx(does-not-exist >/dev/null 2>&1);'|egrep 'dup2.*2'
-does-not-exist: not found
-% ktruss -i perl -e 'qx(does-not-exist 2>&1);'|egrep 'dup2.*2'           
- 16954      1 perl     dup2(0x1, 0x2)              = 2
+  Perl doesn't really support "> /dev/null", so just capture into $output.
 
-The problem is that, whilst Perl supports 2>&1 internally (and does not use
-the shell at all) if there is no other redirection, it does not support file
-redirection - it defers that (and therefore necessarily must also defer the
-stderr redirection) to the shell.  If the system's shell happens to report
-"Not found" errors before redirection is processed (E.g. NetBSD shell) then
-the stderr redirection is happening too late to be captured.
+  % ktruss -i perl -e 'qx(does-not-exist >/dev/null 2>&1);'|egrep 'dup2.*2'
+  does-not-exist: not found
+  % ktruss -i perl -e 'qx(does-not-exist 2>&1);'|egrep 'dup2.*2'           
+   16954      1 perl     dup2(0x1, 0x2)              = 2
 
-That leads to unintended errors reported on stderr - primarily if sudo is not
-installed on the system, or not in the $PATH.
+  The problem is that, whilst Perl supports 2>&1 internally (and does not use
+  the shell at all) if there is no other redirection, it does not support file
+  redirection - it defers that (and therefore necessarily must also defer the
+  stderr redirection) to the shell.  If the system's shell happens to report
+  "Not found" errors before redirection is processed (E.g. NetBSD shell) then
+  the stderr redirection is happening too late to be captured.
+
+  That leads to unintended errors reported on stderr - primarily if sudo is not
+  installed on the system, or not in the $PATH.
 
 Use the -m parameter to su, as ZM_WEB_USER shouldn't require a login shell.
 
+\todo Assess and report upstream.
+
 --- scripts/ZoneMinder/lib/ZoneMinder/General.pm.orig	2023-02-23 21:44:01.000000000 +0000
 +++ scripts/ZoneMinder/lib/ZoneMinder/General.pm
 @@ -92,7 +92,7 @@ sub getCmdFormat {
diff --git a/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm b/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm
index 93c3a14ff5..a7f426acc1 100644
--- a/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm
+++ b/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm
@@ -1,8 +1,10 @@
 $NetBSD: patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm,v 1.3 2024/12/01 13:49:48 gdt Exp $
 
-Adjust for (more) modern perl.
+Add a comment leftover from a previous debugging attempt.
+This entire patchfile is a deletion candidate.
 
-Not submitted upstream because pkgsrc is woefully out of date.
+Not submitted upstream because pkgsrc does not have a coherent story
+about this proposed patch.
 
 --- scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm.orig	2023-02-23 21:44:01.000000000 +0000
 +++ scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm
diff --git a/zoneminder/patches/patch-scripts_zm_in b/zoneminder/patches/patch-scripts_zm_in
index 70683bac20..4c7d12e2e9 100644
--- a/zoneminder/patches/patch-scripts_zm_in
+++ b/zoneminder/patches/patch-scripts_zm_in
@@ -5,6 +5,8 @@ $NetBSD: patch-scripts_zm_in,v 1.6 2024/12/01 13:49:48 gdt Exp $
 The LOCKFILE feature appears unused, and requires a /var/lock/subsys directory
 we don't have.
 
+\todo Address with upstream.
+
 --- scripts/zm.in.orig	2016-02-03 18:40:30.000000000 +0000
 +++ scripts/zm.in
 @@ -7,12 +7,12 @@
diff --git a/zoneminder/patches/patch-src_zm__comms.h b/zoneminder/patches/patch-src_zm__comms.h
index 1b16396ad9..3e6dfaa9db 100644
--- a/zoneminder/patches/patch-src_zm__comms.h
+++ b/zoneminder/patches/patch-src_zm__comms.h
@@ -1,5 +1,7 @@
 $NetBSD$
 
+\todo Disable, reproduce error, and file upstream.
+
 --- src/zm_comms.h.orig	2026-07-26 00:41:38.146240669 +0000
 +++ src/zm_comms.h
 @@ -26,6 +26,7 @@
diff --git a/zoneminder/patches/patch-src_zm__remote__camera__nvsocket.cpp b/zoneminder/patches/patch-src_zm__remote__camera__nvsocket.cpp
index 7967cb35a2..a452d8307e 100644
--- a/zoneminder/patches/patch-src_zm__remote__camera__nvsocket.cpp
+++ b/zoneminder/patches/patch-src_zm__remote__camera__nvsocket.cpp
@@ -1,5 +1,9 @@
 $NetBSD$
 
+Add missing include on NetBSD.
+
+\todo File upstream.
+
 --- src/zm_remote_camera_nvsocket.cpp.orig	2026-07-26 00:42:57.983592814 +0000
 +++ src/zm_remote_camera_nvsocket.cpp
 @@ -32,6 +32,9 @@
diff --git a/zoneminder/patches/patch-src_zm__utils.cpp b/zoneminder/patches/patch-src_zm__utils.cpp
index cc570f37e3..ccfa6cec19 100644
--- a/zoneminder/patches/patch-src_zm__utils.cpp
+++ b/zoneminder/patches/patch-src_zm__utils.cpp
@@ -1,6 +1,6 @@
 $NetBSD: patch-src_zm__utils.cpp,v 1.4 2024/12/01 13:49:48 gdt Exp $
 
-Fix time types (sizes).
+Fix time types.
 
 Hack around arm detection woes.
 
diff --git a/zoneminder/patches/patch-src_zm_signal_cpp b/zoneminder/patches/patch-src_zm_signal_cpp
index 026fe82383..be82aa32f3 100644
--- a/zoneminder/patches/patch-src_zm_signal_cpp
+++ b/zoneminder/patches/patch-src_zm_signal_cpp
@@ -2,9 +2,9 @@ $NetBSD: patch-src_zm_signal_cpp,v 1.4 2024/12/01 13:49:48 gdt Exp $
 
 Don't assume machine-dependent IP register details are available for any
 platform except Linux.  Only Linux is sure to have this style of mcontext_t.
+Instead, add an #else for NetBSD.
 
-Resolves build on systems that have ucontext_t but an mcontext_t that
-doesn't look like Linux.
+\todo File upstream.
 
 --- src/zm_signal.cpp.orig	2026-05-28 12:42:49.000000000 +0000
 +++ src/zm_signal.cpp
diff --git a/zoneminder/patches/patch-web_includes_database.php b/zoneminder/patches/patch-web_includes_database.php
index 70244c0880..219dd3c761 100644
--- a/zoneminder/patches/patch-web_includes_database.php
+++ b/zoneminder/patches/patch-web_includes_database.php
@@ -6,8 +6,7 @@ ZM_DB_TYPE to MariaDB so that the DBD::MariaDB is used.  However, in
 the land of PHP, there is only php-pdo_mysql, which does both.  Thus,
 point MariaDB-using systems at it.
 
-To be raised with upstream after zoneminder in pkgsrc has been working
-for a bit.
+https://github.com/ZoneMinder/zoneminder/issues/5008
 
 --- web/includes/database.php.orig	2026-05-28 08:42:49.000000000 -0400
 +++ web/includes/database.php	2026-07-28 18:39:21.597037296 -0400
Prev by Date: zoneminder: Prepare commit message
Previous by Thread: zoneminder: Prepare commit message
Indexes:
Home | Main Index | Thread Index | Old Index