zoneminder: merge patch from security/zoneminder

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

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Jul 12 20:15:00 2020 -0400
Changeset:	1ac9c0ffeaf16b26d7a4daf5ab4eca7e570c4fb8

Modified Files:
	zoneminder/distinfo
Added Files:
	zoneminder/patches/patch-src_zm__rtp__ctrl.h

Log Message:
zoneminder: merge patch from security/zoneminder

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

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

diffstat:
 zoneminder/distinfo                          |  1 +
 zoneminder/patches/patch-src_zm__rtp__ctrl.h | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diffs:
diff --git a/zoneminder/distinfo b/zoneminder/distinfo
index f8aa459756..eb64b197ae 100644
--- a/zoneminder/distinfo
+++ b/zoneminder/distinfo
@@ -11,6 +11,7 @@ SHA1 (patch-scripts_zm_in) = a05727261bb8be6b707e9a14ae4ff52ea3770d51
 SHA1 (patch-src_Makefile_am) = 0f6571c9d5a3e688544f93d687d266e1b71f0f43
 SHA1 (patch-src_zm__event.cpp) = 83d0d3f5de5d3a7b1ea81917bd9c5264c8129637
 SHA1 (patch-src_zm__monitor.cpp) = 4a0f2bd9a180092e3aa7ba8c0626e0907d45ab32
+SHA1 (patch-src_zm__rtp__ctrl.h) = 052b41bf09d41d1d5f980db011603b3b04f6142f
 SHA1 (patch-src_zm__rtp__source.cpp) = 50d2621b474de5defb94b019ba2084f67a5b2665
 SHA1 (patch-src_zm__sdp.cpp) = ed89bc14ae557281bb43baca9c90b78d801d8eb1
 SHA1 (patch-src_zm__thread.h) = a2af2ae87ba07cd51695c73082f8da319ff5f9a7
diff --git a/zoneminder/patches/patch-src_zm__rtp__ctrl.h b/zoneminder/patches/patch-src_zm__rtp__ctrl.h
new file mode 100644
index 0000000000..244e7f1673
--- /dev/null
+++ b/zoneminder/patches/patch-src_zm__rtp__ctrl.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_zm__rtp__ctrl.h,v 1.1 2020/07/12 16:58:42 gdt Exp $
+
+Work around:
+  zm_rtp_ctrl.h:128:31: error: flexible array member 'RtpCtrlThread::RtcpPacket::<unnamed union>::Bye::srcN' in an otherwise empty 'struct RtpCtrlThread::RtcpPacket::<unnamed union>::Bye'
+
+Not reported upstream because pkgsrc is out of date; to be done if this is not resolved by updating.
+
+--- src/zm_rtp_ctrl.h.orig	2015-02-05 02:52:37.000000000 +0000
++++ src/zm_rtp_ctrl.h
+@@ -125,7 +125,7 @@ private:
+             // BYE
+             struct Bye
+             {
+-                uint32_t srcN[];     // list of sources
++                uint32_t srcN[0];     // list of sources
+                 // can't express trailing text for reason (what does this mean? it's not even english!)
+             } bye;
+          } body;