CVS commit: pkgsrc/security/zoneminder/patches

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Jan  7 01:05:07 UTC 2026

Added Files:
        pkgsrc/security/zoneminder/patches: patch-src_zm__packetqueue.cpp
            patch-src_zm__regexp.cpp
            patch-src_zm__rtsp__server__fifo__source.cpp

Log Message:
security/zoneminder: Add missing patches, hoping to be before wizd


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/zoneminder/patches/patch-src_zm__packetqueue.cpp \
    pkgsrc/security/zoneminder/patches/patch-src_zm__regexp.cpp \
    pkgsrc/security/zoneminder/patches/patch-src_zm__rtsp__server__fifo__source.cpp

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

Added files:

Index: pkgsrc/security/zoneminder/patches/patch-src_zm__packetqueue.cpp
diff -u /dev/null pkgsrc/security/zoneminder/patches/patch-src_zm__packetqueue.cpp:1.1
--- /dev/null   Wed Jan  7 01:05:07 2026
+++ pkgsrc/security/zoneminder/patches/patch-src_zm__packetqueue.cpp    Wed Jan  7 01:05:07 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_zm__packetqueue.cpp,v 1.1 2026/01/07 01:05:07 gdt Exp $
+
+--- src/zm_packetqueue.cpp.orig        2026-01-07 00:37:01.465457236 +0000
++++ src/zm_packetqueue.cpp
+@@ -260,7 +260,7 @@ void PacketQueue::clearPackets(const std
+       --it;
+     }
+   }
+-  Debug(1, "Tail count is %d, queue size is %lu", tail_count, pktQueue.size());
++  Debug(1, "Tail count is %d, queue size is %ju", tail_count, static_cast<uintmax_t>(pktQueue.size()));
+ 
+   if (!keep_keyframes) {
+     // If not doing passthrough, we don't care about starting with a keyframe so logic is simpler
Index: pkgsrc/security/zoneminder/patches/patch-src_zm__regexp.cpp
diff -u /dev/null pkgsrc/security/zoneminder/patches/patch-src_zm__regexp.cpp:1.1
--- /dev/null   Wed Jan  7 01:05:07 2026
+++ pkgsrc/security/zoneminder/patches/patch-src_zm__regexp.cpp Wed Jan  7 01:05:07 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_zm__regexp.cpp,v 1.1 2026/01/07 01:05:07 gdt Exp $
+
+--- src/zm_regexp.cpp.orig     2026-01-07 00:38:46.457884202 +0000
++++ src/zm_regexp.cpp
+@@ -33,7 +33,7 @@ RegExpr::RegExpr( const char *pattern, i
+   {
+     PCRE2_UCHAR buffer[256];
+     pcre2_get_error_message(errorcode, buffer, sizeof(buffer));
+-    Panic( "pcre2_compile(%s): %s at %ld", pattern, buffer, erroffset );
++    Panic( "pcre2_compile(%s): %s at %jd", pattern, buffer, static_cast<intmax_t>(erroffset) );
+   }
+ 
+   if ( (ok = (bool)regex) )
Index: pkgsrc/security/zoneminder/patches/patch-src_zm__rtsp__server__fifo__source.cpp
diff -u /dev/null pkgsrc/security/zoneminder/patches/patch-src_zm__rtsp__server__fifo__source.cpp:1.1
--- /dev/null   Wed Jan  7 01:05:07 2026
+++ pkgsrc/security/zoneminder/patches/patch-src_zm__rtsp__server__fifo__source.cpp     Wed Jan  7 01:05:07 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_zm__rtsp__server__fifo__source.cpp,v 1.1 2026/01/07 01:05:07 gdt Exp $
+
+--- src/zm_rtsp_server_fifo_source.cpp.orig    2026-01-07 00:40:02.455387707 +0000
++++ src/zm_rtsp_server_fifo_source.cpp
+@@ -214,8 +214,8 @@ int ZoneMinderFifoSource::getNextFrame()
+       return 0;
+     }
+     if (header_start != m_buffer) {
+-      Debug(4, "ZM Packet didn't start at beginning of buffer %ld. %c%c",
+-            header_start - m_buffer.head(), m_buffer[0], m_buffer[1]);
++      Debug(4, "ZM Packet didn't start at beginning of buffer %jd. %c%c",
++            static_cast<intmax_t>(header_start - m_buffer.head()), m_buffer[0], m_buffer[1]);
+     }
+ 
+     // read_into may invalidate packet_start