pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/security/zoneminder
Module Name: pkgsrc
Committed By: gdt
Date: Tue Jan 6 17:51:37 UTC 2026
Modified Files:
pkgsrc/security/zoneminder: Makefile distinfo
pkgsrc/security/zoneminder/patches: patch-src_zm__event.cpp
patch-src_zm__rtp__source.cpp patch-src_zm_logger_cpp
Removed Files:
pkgsrc/security/zoneminder/patches:
patch-dep_RtspServer_src_net_EventLoop.cpp
patch-dep_RtspServer_src_net_Socket.h
patch-dep_RtspServer_src_net_SocketUtil.cpp
patch-dep_RtspServer_src_xop_rtsp.h
Log Message:
security/zoneminder: Update to 1.36.37.10
Drop patches that have been pushed upstream:
- adding NetBSD to RtspServer conditionals, via cherry-pick of upstream PR
- %jd/intmax_t for timeval.tv_sec
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/security/zoneminder/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/security/zoneminder/distinfo
cvs rdiff -u -r1.1 -r0 \
pkgsrc/security/zoneminder/patches/patch-dep_RtspServer_src_net_EventLoop.cpp \
pkgsrc/security/zoneminder/patches/patch-dep_RtspServer_src_net_Socket.h \
pkgsrc/security/zoneminder/patches/patch-dep_RtspServer_src_net_SocketUtil.cpp \
pkgsrc/security/zoneminder/patches/patch-dep_RtspServer_src_xop_rtsp.h
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/security/zoneminder/patches/patch-src_zm__event.cpp \
pkgsrc/security/zoneminder/patches/patch-src_zm__rtp__source.cpp
cvs rdiff -u -r1.8 -r1.9 \
pkgsrc/security/zoneminder/patches/patch-src_zm_logger_cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/security/zoneminder/Makefile
diff -u pkgsrc/security/zoneminder/Makefile:1.97 pkgsrc/security/zoneminder/Makefile:1.98
--- pkgsrc/security/zoneminder/Makefile:1.97 Mon Jan 5 16:02:44 2026
+++ pkgsrc/security/zoneminder/Makefile Tue Jan 6 17:51:37 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.97 2026/01/05 16:02:44 gdt Exp $
+# $NetBSD: Makefile,v 1.98 2026/01/06 17:51:37 gdt Exp $
# (1st-parent) commits past 1.36.37 on release-1.36
-VERSION= 1.36.37.7
+# git log --first-parent --oneline --reverse 1.36.37..
+VERSION= 1.36.37.10
# Distfile is ZoneMinder but package and tarball contents are zoneminder.
NAME_DIST= ZoneMinder
NAME_LOWER= zoneminder
@@ -16,7 +17,7 @@ MASTER_SITES= ${MASTER_SITE_GITHUB:=${NA
GITHUB_PROJECT= ${NAME_DIST}
GITHUB_TYPE= tag
#GITHUB_TAG= ${PKGVERSION_NOREV}
-GITHUB_TAG= 02e750c7b395f701ea68bb05b7b94520805c59ef
+GITHUB_TAG= 5ca31d88f7069ec4a4cc758e7ea05353573d3304
## Submodules (from ZoneMinder's .gitmodules file)
# We use a specific commit on each branch, to avoid distfile versioning woes
@@ -24,7 +25,9 @@ GITHUB_TAG= 02e750c7b395f701ea68bb05b7b9
# Beware that RtspServer might get updates and should be checked.
GITHUB_SUBMODULES+= FriendsOfCake crud 14292374ccf1328f2d5db20897bd06f99ba4d938 web/api/app/Plugin/Crud
GITHUB_SUBMODULES+= ZoneMinder CakePHP-Enum-Behavior ea90c0cd7f6e24333a90885e563b5d30b793db29 web/api/app/Plugin/CakePHP-Enum-Behavior
-GITHUB_SUBMODULES+= ZoneMinder RtspServer 055d81fe1293429e496b19104a9ed3360755a440 dep/RtspServer
+# cherry-pick https://github.com/ZoneMinder/RtspServer/pull/12
+#GITHUB_SUBMODULES+= ZoneMinder RtspServer 055d81fe1293429e496b19104a9ed3360755a440 dep/RtspServer
+GITHUB_SUBMODULES+= gdt RtspServer 2719899a3f74ef0a9bb213d34998bcc74cc1f17f dep/RtspServer
MAINTAINER= dsainty%NetBSD.org@localhost
#MAINTAINER+= gdt%NetBSD.org@localhost
Index: pkgsrc/security/zoneminder/distinfo
diff -u pkgsrc/security/zoneminder/distinfo:1.26 pkgsrc/security/zoneminder/distinfo:1.27
--- pkgsrc/security/zoneminder/distinfo:1.26 Mon Jan 5 16:02:44 2026
+++ pkgsrc/security/zoneminder/distinfo Tue Jan 6 17:51:37 2026
@@ -1,35 +1,31 @@
-$NetBSD: distinfo,v 1.26 2026/01/05 16:02:44 gdt Exp $
+$NetBSD: distinfo,v 1.27 2026/01/06 17:51:37 gdt Exp $
BLAKE2s (FriendsOfCake-crud-14292374ccf1328f2d5db20897bd06f99ba4d938.tar.gz) = 8877bf6718ecfe3cba2515629418fe5addc60cf8ce4650526b39db6a234922ad
SHA512 (FriendsOfCake-crud-14292374ccf1328f2d5db20897bd06f99ba4d938.tar.gz) =
da58528686baf05385ad08079f965bce10eba6d599133ab773e9ab1f9e4b7d82cf5431b4b773317b90effb16e0b026a029bdfabe08a9ef1a5e9b94e7a1c2ea9e
Size (FriendsOfCake-crud-14292374ccf1328f2d5db20897bd06f99ba4d938.tar.gz) = 73086 bytes
-BLAKE2s (ZoneMinder-1.36.37.7-02e750c7b395f701ea68bb05b7b94520805c59ef.tar.gz) = 03f1d0d287f06cac877d39fd20a827656fe775acd3f5a26c376c9a153ab60796
-SHA512 (ZoneMinder-1.36.37.7-02e750c7b395f701ea68bb05b7b94520805c59ef.tar.gz) =
556ebb4e25e2b76e3729d72cb652d6c9b253c3f5ca43809f2a8709e286420522f05e855b74bf50eff0c0f560f8ae1f215a06f20f2da203737deed2d6fea11ed7
-Size (ZoneMinder-1.36.37.7-02e750c7b395f701ea68bb05b7b94520805c59ef.tar.gz) = 13974395 bytes
+BLAKE2s (ZoneMinder-1.36.37.10-5ca31d88f7069ec4a4cc758e7ea05353573d3304.tar.gz) = a5431be1e59cc1e8cf9d723fe83d4e9c7aa6a7e5aa294bdb375b9877d8162b01
+SHA512 (ZoneMinder-1.36.37.10-5ca31d88f7069ec4a4cc758e7ea05353573d3304.tar.gz) =
aaff4529a54cf9b2d60932d768faf7c75570b0c7bfa59326b448f436f635be0d35474c72fed59ac789c6d618307190ba747d534fda037edbd5c3a5d31c2f2bee
+Size (ZoneMinder-1.36.37.10-5ca31d88f7069ec4a4cc758e7ea05353573d3304.tar.gz) = 13974266 bytes
BLAKE2s (ZoneMinder-CakePHP-Enum-Behavior-ea90c0cd7f6e24333a90885e563b5d30b793db29.tar.gz) = 4639184438becb1c33450a00e213fca9d11e92b7f2545fb701f40a664c716764
SHA512 (ZoneMinder-CakePHP-Enum-Behavior-ea90c0cd7f6e24333a90885e563b5d30b793db29.tar.gz) =
75f2188e548b98191c8df82fb76e918f3bda9788f541449df8fa92449ad19aa0b9c13420dd91c760e08a4d31956ad51602242ab97e3bd4460f01e99f49992453
Size (ZoneMinder-CakePHP-Enum-Behavior-ea90c0cd7f6e24333a90885e563b5d30b793db29.tar.gz) = 3504 bytes
-BLAKE2s (ZoneMinder-RtspServer-055d81fe1293429e496b19104a9ed3360755a440.tar.gz) = 0feba45357a746173378193be365b164061cc9f20e84210ecfe9e991ad9971e4
-SHA512 (ZoneMinder-RtspServer-055d81fe1293429e496b19104a9ed3360755a440.tar.gz) =
2f3bbd449269cba5afda3135e54cca114342956da3ce8fbfb05533ec7b1c3f75767d8b5f3d9b415254ad7b39817bc343b0790c591ef3cc64d2863819ab3a7551
-Size (ZoneMinder-RtspServer-055d81fe1293429e496b19104a9ed3360755a440.tar.gz) = 1396623 bytes
+BLAKE2s (gdt-RtspServer-2719899a3f74ef0a9bb213d34998bcc74cc1f17f.tar.gz) = 427ab3da339df34c610e0b6ec72f804f80ee32b22ca6ab8ead1c195f8b66950a
+SHA512 (gdt-RtspServer-2719899a3f74ef0a9bb213d34998bcc74cc1f17f.tar.gz) =
2891a0817e12be3ed9421e259878a31c97efb411f69339140be9c7f4a5f670574b887e921383d6602096e9c369fcb7b83e513fcc321c37abc87053be98f65050
+Size (gdt-RtspServer-2719899a3f74ef0a9bb213d34998bcc74cc1f17f.tar.gz) = 1396675 bytes
SHA1 (patch-CMakeLists.txt) = e54c1efea0b0cc99e9bbe8f493a0fe15b2c89663
-SHA1 (patch-dep_RtspServer_src_net_EventLoop.cpp) = bf1fe79c2ba1d602adf8895f29f61f7b961eece3
-SHA1 (patch-dep_RtspServer_src_net_Socket.h) = 789e90da4bfc15d6d43d942718538385cb6dfade
-SHA1 (patch-dep_RtspServer_src_net_SocketUtil.cpp) = c566652e8e7985a705682ef960118615b6777288
-SHA1 (patch-dep_RtspServer_src_xop_rtsp.h) = 20a014ce423d19549976c2158d39c46ea6892647
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_zmpkg_pl_in) = eb3166ae3cd9bb0ce1b828b64722506aa4e82368
-SHA1 (patch-src_zm__event.cpp) = 2831f586f140f682dd107a1adb09531c388a1df8
+SHA1 (patch-src_zm__event.cpp) = 2713e583bb0c5be1764cdbca77531d11725b0034
SHA1 (patch-src_zm__eventstream.cpp) = d2134edf09f142a6a545ca36d3263b13defcadd6
SHA1 (patch-src_zm__monitor.cpp) = ac6eb821d5d72455b46165e74ea1d321faf9e431
SHA1 (patch-src_zm__packet.h) = 96951004741f3d21434d3ca981f6214c07f77c88
-SHA1 (patch-src_zm__rtp__source.cpp) = 288b32cff869103b04e96487b92bb12533b29772
+SHA1 (patch-src_zm__rtp__source.cpp) = 9335686e0b353cc50eac51704546527bee5c180b
SHA1 (patch-src_zm__utils.cpp) = e16ffd3f41bd05a32c80142e7246307df12801a8
SHA1 (patch-src_zm_comms_h) = 33577ab0eac62eadc415fe6fb970b82eb473c8e7
-SHA1 (patch-src_zm_logger_cpp) = 1d3d2a6baef1abe762ede06aaf393e5bc2e2080e
+SHA1 (patch-src_zm_logger_cpp) = 3428e80f3e442a3ada147d3d4145564f6e949760
SHA1 (patch-src_zm_remote_camera_h) = 2f774924338b9e42e7bcaa1701af72861ea62c22
SHA1 (patch-src_zm_signal_cpp) = af9625702518648b8d62ed20d0d52c1a2a27841a
SHA1 (patch-src_zmu.cpp) = e5d92c9aa17c3a9e8b53c2cbd43712d80c76ab4e
Index: pkgsrc/security/zoneminder/patches/patch-src_zm__event.cpp
diff -u pkgsrc/security/zoneminder/patches/patch-src_zm__event.cpp:1.5 pkgsrc/security/zoneminder/patches/patch-src_zm__event.cpp:1.6
--- pkgsrc/security/zoneminder/patches/patch-src_zm__event.cpp:1.5 Sun Dec 1 13:49:48 2024
+++ pkgsrc/security/zoneminder/patches/patch-src_zm__event.cpp Tue Jan 6 17:51:37 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_zm__event.cpp,v 1.5 2024/12/01 13:49:48 gdt Exp $
+$NetBSD: patch-src_zm__event.cpp,v 1.6 2026/01/06 17:51:37 gdt Exp $
zoneminder uses %ld for time_t, which is troublesome on NetBSD arm and
presumably i386. (Note that there are multiple patch files for the
@@ -10,9 +10,9 @@ Also, this fix is expedient and probably
Avoid sendfile code when sendfile doesn't exist.
---- src/zm_event.cpp.orig 2023-02-23 21:44:01.000000000 +0000
+--- src/zm_event.cpp.orig 2026-01-06 13:05:00.000000000 +0000
+++ src/zm_event.cpp
-@@ -113,10 +113,10 @@ Event::Event(
+@@ -116,10 +116,10 @@ Event::Event(
"INSERT INTO `Events` "
"( `MonitorId`, `StorageId`, `Name`, `StartDateTime`, `Width`, `Height`, `Cause`, `Notes`, `StateId`, `Orientation`, `Videoed`, `DefaultVideo`, `SaveJPEGs`, `Scheme` )"
" VALUES "
@@ -25,34 +25,22 @@ Avoid sendfile code when sendfile doesn'
monitor->Width(),
monitor->Height(),
cause.c_str(),
-@@ -164,8 +164,8 @@ Event::~Event() {
- // Should not be static because we might be multi-threaded
- char sql[ZM_SQL_LGE_BUFSIZ];
- snprintf(sql, sizeof(sql),
-- "UPDATE Events SET Name='%s%" PRIu64 "', EndDateTime = from_unixtime(%ld), Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d WHERE Id = %"
PRIu64 " AND Name='New Event'",
-- monitor->EventPrefix(), id, end_time.tv_sec,
-+ "UPDATE Events SET Name='%s%" PRIu64 "', EndDateTime = from_unixtime(%jd), Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d WHERE Id = %"
PRIu64 " AND Name='New Event'",
-+ monitor->EventPrefix(), id, (intmax_t) end_time.tv_sec,
- delta_time.positive?"":"-", delta_time.sec, delta_time.fsec,
- frames, alarm_frames,
- tot_score, (int)(alarm_frames?(tot_score/alarm_frames):0), max_score,
-@@ -373,12 +373,12 @@ void Event::WriteDbFrames() {
+@@ -374,12 +374,12 @@ void Event::WriteDbFrames() {
while (frame_data.size()) {
Frame *frame = frame_data.front();
frame_data.pop();
-- frame_insert_sql += stringtf("\n( %" PRIu64 ", %d, '%s', from_unixtime( %ld ), %s%ld.%02ld, %d ),",
+- frame_insert_sql += stringtf("\n( %" PRIu64 ", %d, '%s', from_unixtime( %jd ), %s%ld.%02ld, %d ),",
+ frame_insert_sql += stringtf("\n( %" PRIu64 ", %d, '%s', from_unixtime( %jd ), %s%jd.%02ld, %d ),",
id, frame->frame_id,
frame_type_names[frame->type],
-- frame->timestamp.tv_sec,
-+ (intmax_t) frame->timestamp.tv_sec,
+ static_cast<intmax_t>(frame->timestamp.tv_sec),
frame->delta.positive ? "" : "-",
- frame->delta.sec,
-+ (intmax_t) frame->delta.sec,
++ static_cast<intmax_t>(frame->delta.sec),
frame->delta.fsec,
frame->score);
if (config.record_event_stats and frame->zone_stats.size()) {
-@@ -526,9 +526,9 @@ void Event::AddFrame(const std::shared_p
+@@ -527,9 +527,9 @@ void Event::AddFrame(const std::shared_p
char sql[ZM_SQL_MED_BUFSIZ];
snprintf(sql, sizeof(sql),
Index: pkgsrc/security/zoneminder/patches/patch-src_zm__rtp__source.cpp
diff -u pkgsrc/security/zoneminder/patches/patch-src_zm__rtp__source.cpp:1.5 pkgsrc/security/zoneminder/patches/patch-src_zm__rtp__source.cpp:1.6
--- pkgsrc/security/zoneminder/patches/patch-src_zm__rtp__source.cpp:1.5 Sun Dec 1 13:49:48 2024
+++ pkgsrc/security/zoneminder/patches/patch-src_zm__rtp__source.cpp Tue Jan 6 17:51:37 2026
@@ -1,29 +1,26 @@
-$NetBSD: patch-src_zm__rtp__source.cpp,v 1.5 2024/12/01 13:49:48 gdt Exp $
+$NetBSD: patch-src_zm__rtp__source.cpp,v 1.6 2026/01/06 17:51:37 gdt Exp $
Fix type issue with tv_sec; see earlier patches.
---- src/zm_rtp_source.cpp.orig 2023-02-23 21:44:01.000000000 +0000
+--- src/zm_rtp_source.cpp.orig 2026-01-06 13:05:00.000000000 +0000
+++ src/zm_rtp_source.cpp
-@@ -196,17 +196,17 @@ void RtpSource::updateRtcpData(
+@@ -196,7 +196,7 @@ void RtpSource::updateRtcpData(
uint32_t rtpTime) {
struct timeval ntpTime = tvMake(ntpTimeSecs, suseconds_t((USEC_PER_SEC*(ntpTimeFrac>>16))/(1<<16)));
-- Debug(5, "ntpTime: %ld.%06ld, rtpTime: %x", ntpTime.tv_sec, ntpTime.tv_usec, rtpTime);
-+ Debug(5, "ntpTime: %jd.%06ld, rtpTime: %x", (intmax_t) ntpTime.tv_sec, (long) ntpTime.tv_usec, rtpTime);
+- Debug(5, "ntpTime: %jd.%06ld, rtpTime: %x", static_cast<intmax_t>(ntpTime.tv_sec), ntpTime.tv_usec, rtpTime);
++ Debug(5, "ntpTime: %jd.%06ld, rtpTime: %x", static_cast<intmax_t>(ntpTime.tv_sec), static_cast<long>(ntpTime.tv_usec), rtpTime);
if ( mBaseTimeNtp.tv_sec == 0 ) {
mBaseTimeReal = tvNow();
- mBaseTimeNtp = ntpTime;
- mBaseTimeRtp = rtpTime;
+@@ -205,8 +205,8 @@ void RtpSource::updateRtcpData(
} else if ( !mRtpClock ) {
-- Debug(5, "lastSrNtpTime: %ld.%06ld, rtpTime: %x"
-- "ntpTime: %ld.%06ld, rtpTime: %x",
-- mLastSrTimeNtp.tv_sec, mLastSrTimeNtp.tv_usec, rtpTime,
-- ntpTime.tv_sec, ntpTime.tv_usec, rtpTime);
-+ Debug(5, "lastSrNtpTime: %jd.%06ld, rtpTime: %x"
-+ "ntpTime: %jd.%06ld, rtpTime: %x",
-+ (intmax_t) mLastSrTimeNtp.tv_sec, (long) mLastSrTimeNtp.tv_usec, rtpTime,
-+ (intmax_t) ntpTime.tv_sec, (long) ntpTime.tv_usec, rtpTime);
+ Debug(5, "lastSrNtpTime: %jd.%06ld, rtpTime: %x"
+ "ntpTime: %jd.%06ld, rtpTime: %x",
+- static_cast<intmax_t>( mLastSrTimeNtp.tv_sec), mLastSrTimeNtp.tv_usec, rtpTime,
+- static_cast<intmax_t>(ntpTime.tv_sec), ntpTime.tv_usec, rtpTime);
++ static_cast<intmax_t>( mLastSrTimeNtp.tv_sec), static_cast<long>(mLastSrTimeNtp.tv_usec), rtpTime,
++ static_cast<intmax_t>(ntpTime.tv_sec), static_cast<long>(ntpTime.tv_usec), rtpTime);
double diffNtpTime = tvDiffSec( mBaseTimeNtp, ntpTime );
uint32_t diffRtpTime = rtpTime - mBaseTimeRtp;
Index: pkgsrc/security/zoneminder/patches/patch-src_zm_logger_cpp
diff -u pkgsrc/security/zoneminder/patches/patch-src_zm_logger_cpp:1.8 pkgsrc/security/zoneminder/patches/patch-src_zm_logger_cpp:1.9
--- pkgsrc/security/zoneminder/patches/patch-src_zm_logger_cpp:1.8 Sun Dec 1 13:49:48 2024
+++ pkgsrc/security/zoneminder/patches/patch-src_zm_logger_cpp Tue Jan 6 17:51:37 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_zm_logger_cpp,v 1.8 2024/12/01 13:49:48 gdt Exp $
+$NetBSD: patch-src_zm_logger_cpp,v 1.9 2026/01/06 17:51:37 gdt Exp $
Use libgen.h for basename.
@@ -9,7 +9,7 @@ to use SYS_gettid.
Fix time types (sizes).
---- src/zm_logger.cpp.orig 2023-02-23 21:44:01.000000000 +0000
+--- src/zm_logger.cpp.orig 2026-01-06 13:05:00.000000000 +0000
+++ src/zm_logger.cpp
@@ -439,13 +439,13 @@ void Logger::logPrint(bool hex, const ch
@@ -27,14 +27,12 @@ Fix time types (sizes).
#if 0
}
#endif
-@@ -534,8 +534,8 @@ void Logger::logPrint(bool hex, const ch
- "INSERT INTO `Logs` "
+@@ -535,7 +535,7 @@ void Logger::logPrint(bool hex, const ch
"( `TimeKey`, `Component`, `ServerId`, `Pid`, `Level`, `Code`, `Message`, `File`, `Line` )"
" VALUES "
-- "( %ld.%06ld, '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
-- timeVal.tv_sec, timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString.c_str(), file, line
-+ "( %jd.%06ld, '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
-+ (intmax_t) timeVal.tv_sec, (long) timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString.c_str(), file, line
+ "( %jd.%06ld, '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
+- static_cast<intmax_t>(timeVal.tv_sec), timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString.c_str(), file, line
++ static_cast<intmax_t>(timeVal.tv_sec), static_cast<long>(timeVal.tv_usec), mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString.c_str(), file, line
);
dbQueue.push(std::move(sql_string));
} else {
Home |
Main Index |
Thread Index |
Old Index