zoneminder: Patch more %ld/longlong bugs

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

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon Sep 26 19:55:38 2022 -0400
Changeset:	c8d6d9a109bd17e568ab431e92161fedeb834de1

Modified Files:
	zoneminder/distinfo
	zoneminder/patches/patch-src_zm__event.cpp

Log Message:
zoneminder: Patch more %ld/longlong bugs

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

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

diffstat:
 zoneminder/distinfo                        | 2 +-
 zoneminder/patches/patch-src_zm__event.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs:
diff --git a/zoneminder/distinfo b/zoneminder/distinfo
index cb5678b90f..dd136142cc 100644
--- a/zoneminder/distinfo
+++ b/zoneminder/distinfo
@@ -13,7 +13,7 @@ SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = bded373e318cd074b928
 SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm) = b97c104f6ac102fc4510eb0977169375cdd97197
 SHA1 (patch-scripts_zm_in) = a05727261bb8be6b707e9a14ae4ff52ea3770d51
 SHA1 (patch-scripts_zmpkg_pl_in) = 04f30a02ad5132a58c5396bbf5dbb92280eddb8f
-SHA1 (patch-src_zm__event.cpp) = c9ffa1f11c410b56b774be1879a227f2be361f36
+SHA1 (patch-src_zm__event.cpp) = 5908b0fd1390505d851172b1f6f449f1c48f7fde
 SHA1 (patch-src_zm__monitor.cpp) = f690dae0adee48faeb94a393ca22f1ec49e8331e
 SHA1 (patch-src_zm__rtp__ctrl.h) = 4e0fd8e80932de8d77b3386a356cc026ddc23113
 SHA1 (patch-src_zm__rtp__source.cpp) = 039257e76768df2e32a5550625ba7f8d1cb9ba26
diff --git a/zoneminder/patches/patch-src_zm__event.cpp b/zoneminder/patches/patch-src_zm__event.cpp
index 3332ade60c..726ab09700 100644
--- a/zoneminder/patches/patch-src_zm__event.cpp
+++ b/zoneminder/patches/patch-src_zm__event.cpp
@@ -40,7 +40,7 @@ Avoid sendfile code when sendfile doesn't exist.
      Debug( 1, "Adding closing frame %d to DB", frames );
      static char sql[ZM_SQL_SML_BUFSIZ];
 -    snprintf( sql, sizeof(sql), "insert into Frames ( EventId, FrameId, TimeStamp, Delta ) values ( %d, %d, from_unixtime( %ld ), %s%ld.%02ld )", id, frames, end_time.tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec );
-+    snprintf( sql, sizeof(sql), "insert into Frames ( EventId, FrameId, TimeStamp, Delta ) values ( %d, %d, from_unixtime( %jd ), %s%ld.%02ld )", id, frames, end_time.tv_sec, delta_time.positive?"":"-", (intmax_t) delta_time.sec, delta_time.fsec );
++    snprintf( sql, sizeof(sql), "insert into Frames ( EventId, FrameId, TimeStamp, Delta ) values ( %d, %d, from_unixtime( %jd ), %s%jd.%02ld )", id, frames, (intmax_t) end_time.tv_sec, delta_time.positive?"":"-", (intmax_t) delta_time.sec, delta_time.fsec );
      if ( mysql_query( &dbconn, sql ) )
      {
        Error( "Can't insert frame: %s", mysql_error( &dbconn ) );
@@ -67,7 +67,7 @@ Avoid sendfile code when sendfile doesn't exist.
      Debug( 1, "Adding frame %d of type \"%s\" to DB", frames, frame_type );
      static char sql[ZM_SQL_MED_BUFSIZ];
 -    snprintf( sql, sizeof(sql), "insert into Frames ( EventId, FrameId, Type, TimeStamp, Delta, Score ) values ( %d, %d, '%s', from_unixtime( %ld ), %s%ld.%02ld, %d )", id, frames, frame_type, timestamp.tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec, score );
-+    snprintf( sql, sizeof(sql), "insert into Frames ( EventId, FrameId, Type, TimeStamp, Delta, Score ) values ( %d, %d, '%s', from_unixtime( %jd ), %s%ld.%02ld, %d )", id, frames, frame_type, timestamp.tv_sec, delta_time.positive?"":"-", (intmax_t) delta_time.sec, delta_time.fsec, score );
++    snprintf( sql, sizeof(sql), "insert into Frames ( EventId, FrameId, Type, TimeStamp, Delta, Score ) values ( %d, %d, '%s', from_unixtime( %jd ), %s%jd.%02ld, %d )", id, frames, frame_type, (intmax_t) timestamp.tv_sec, delta_time.positive?"":"-", (intmax_t) delta_time.sec, delta_time.fsec, score );
      if ( mysql_query( &dbconn, sql ) )
      {
        Error( "Can't insert frame: %s", mysql_error( &dbconn ) );