CVS commit: pkgsrc/security/zoneminder

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Jul 12 16:58:42 UTC 2020

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

Log Message:
security/zoneminder: Add workaround for stricter compiler

Add [0] to unspecified array; gcc 7 errors while gcc 5 was ok with the
previous code.  (Temporary until this package is updated.)


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/security/zoneminder/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/zoneminder/patches/patch-src_zm__rtp__ctrl.h

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/distinfo
diff -u pkgsrc/security/zoneminder/distinfo:1.14 pkgsrc/security/zoneminder/distinfo:1.15
--- pkgsrc/security/zoneminder/distinfo:1.14    Sun Mar 29 01:06:11 2020
+++ pkgsrc/security/zoneminder/distinfo Sun Jul 12 16:58:42 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2020/03/29 01:06:11 joerg Exp $
+$NetBSD: distinfo,v 1.15 2020/07/12 16:58:42 gdt Exp $
 
 SHA1 (ZoneMinder-1.28.1.tar.gz) = 3e173ae1aac529b60d79a5fc668c107f0679d0a2
 RMD160 (ZoneMinder-1.28.1.tar.gz) = b3cc305656cb5b73d4ac0e21fe937c237467cdd1
@@ -12,6 +12,7 @@ SHA1 (patch-src_Makefile_am) = 0f6571c9d
 SHA1 (patch-src_zm__event.cpp) = 5258e89486b1152f0ddcac9b0a6fd68b70f24256
 SHA1 (patch-src_zm__image.cpp) = 0cb4f56bdf2f4fb99ec673b5a4f81589a7bdfdb0
 SHA1 (patch-src_zm__monitor.cpp) = dcc3816686a6a7c375d4716d3663b4c922c90439
+SHA1 (patch-src_zm__rtp__ctrl.h) = 052b41bf09d41d1d5f980db011603b3b04f6142f
 SHA1 (patch-src_zm__rtp__source.cpp) = 5341938eefe5def49dc8f3e3b760d86cabd17772
 SHA1 (patch-src_zm__sdp.cpp) = ed89bc14ae557281bb43baca9c90b78d801d8eb1
 SHA1 (patch-src_zm__stream.cpp) = 64655550ff36576377cfdea918fe85253428e227

Added files:

Index: pkgsrc/security/zoneminder/patches/patch-src_zm__rtp__ctrl.h
diff -u /dev/null pkgsrc/security/zoneminder/patches/patch-src_zm__rtp__ctrl.h:1.1
--- /dev/null   Sun Jul 12 16:58:42 2020
+++ pkgsrc/security/zoneminder/patches/patch-src_zm__rtp__ctrl.h        Sun Jul 12 16:58:42 2020
@@ -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;