CVS commit: pkgsrc/security/zoneminder

["David Sainty" <dsainty%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dsainty
Date:           Wed Jan 12 11:53:26 UTC 2022

Modified Files:
        pkgsrc/security/zoneminder: Makefile distinfo
        pkgsrc/security/zoneminder/patches: patch-src_zm_comms_h

Log Message:
To fix Linux readv/writev, back-port:
https://github.com/ZoneMinder/zoneminder/commit/417421b1d869d1b71c8ec1a1e3b082fcede6ce58#diff-484f666f58ec13f38fa402143f2f6ad8e63a013909d3941ffbb3d66745b20c8d

This is also needed by the Pkgsrc WIP version.

Bump PKGREVISION - though this change is unlikely to alter the outcome of
previously successful builds.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/security/zoneminder/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/security/zoneminder/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/security/zoneminder/patches/patch-src_zm_comms_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/Makefile
diff -u pkgsrc/security/zoneminder/Makefile:1.59 pkgsrc/security/zoneminder/Makefile:1.60
--- pkgsrc/security/zoneminder/Makefile:1.59    Sun Jan  9 23:59:35 2022
+++ pkgsrc/security/zoneminder/Makefile Wed Jan 12 11:53:26 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.59 2022/01/09 23:59:35 dsainty Exp $
+# $NetBSD: Makefile,v 1.60 2022/01/12 11:53:26 dsainty Exp $
 
 VERSION=       1.29.0
 # Sometimes the distfile unpacks to ZoneMinder and sometimes zoneminder.
 NAME_DIST=     ZoneMinder
 NAME_LOWER=    zoneminder
-PKGREVISION=   8
+PKGREVISION=   9
 
 PKGNAME=       ${DISTNAME:S/${NAME_DIST}-/${NAME_LOWER}-/}
 DISTNAME=      ${NAME_DIST}-${VERSION}

Index: pkgsrc/security/zoneminder/distinfo
diff -u pkgsrc/security/zoneminder/distinfo:1.18 pkgsrc/security/zoneminder/distinfo:1.19
--- pkgsrc/security/zoneminder/distinfo:1.18    Tue Oct 26 11:18:06 2021
+++ pkgsrc/security/zoneminder/distinfo Wed Jan 12 11:53:26 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2021/10/26 11:18:06 nia Exp $
+$NetBSD: distinfo,v 1.19 2022/01/12 11:53:26 dsainty Exp $
 
 BLAKE2s (ZoneMinder-1.29.0.tar.gz) = 2a3ce6b328d5fb143d27ff4b68e986d2397df9d7e5fcf19426618ffb06987789
 SHA512 (ZoneMinder-1.29.0.tar.gz) = 4716e0788db29880eeafc817fe63662d07c3b805214b4d2eb29b346dd3493b0215c9e79370e3414220c812065eefbe253548a70d8128c253aa4535f66f9544df
@@ -19,7 +19,7 @@ SHA1 (patch-src_zm__timer.h) = 218dfae75
 SHA1 (patch-src_zm__utils.cpp) = f0e15990b7f801303259af8c9b86731b74327fe6
 SHA1 (patch-src_zm__utils.h) = 4ffb7eafa8602076766fd4ae00be797866a229d9
 SHA1 (patch-src_zm_comms_cpp) = bd3c3e6dd4d11ea0845d2da662e99169cd6e6680
-SHA1 (patch-src_zm_comms_h) = 75ceba7e2c725c02a09cb2203a94142b1a987bce
+SHA1 (patch-src_zm_comms_h) = 64c0a8e98f9ac551113f3428dafff12a61ea9afe
 SHA1 (patch-src_zm_logger_cpp) = f8f11cd1a969435d727186b816aec612d74e55db
 SHA1 (patch-src_zm_remote_camera_h) = 0d4bd7dae0188df7e463586250ac2ed530230f3d
 SHA1 (patch-src_zm_signal_cpp) = 0e53c30d408cf926d9a1f05a683e10cd8b9f2d8e

Index: pkgsrc/security/zoneminder/patches/patch-src_zm_comms_h
diff -u pkgsrc/security/zoneminder/patches/patch-src_zm_comms_h:1.4 pkgsrc/security/zoneminder/patches/patch-src_zm_comms_h:1.5
--- pkgsrc/security/zoneminder/patches/patch-src_zm_comms_h:1.4 Tue Aug 25 16:42:21 2020
+++ pkgsrc/security/zoneminder/patches/patch-src_zm_comms_h     Wed Jan 12 11:53:26 2022
@@ -1,9 +1,12 @@
-$NetBSD: patch-src_zm_comms_h,v 1.4 2020/08/25 16:42:21 gdt Exp $
+$NetBSD: patch-src_zm_comms_h,v 1.5 2022/01/12 11:53:26 dsainty Exp $
 
 extern "C" system headers.
 
 Include missing system headers for NetBSD.
 
+To fix Linux readv/writev, back-port:
+https://github.com/ZoneMinder/zoneminder/commit/417421b1d869d1b71c8ec1a1e3b082fcede6ce58#diff-484f666f58ec13f38fa402143f2f6ad8e63a013909d3941ffbb3d66745b20c8d
+
 --- src/zm_comms.h.orig        2016-02-03 18:40:30.000000000 +0000
 +++ src/zm_comms.h
 @@ -22,20 +22,24 @@
@@ -21,9 +24,10 @@ Include missing system headers for NetBS
 -#include <vector>
 +#include <stdlib.h>
 +#include <time.h>
++#include <sys/uio.h>
  
  #if defined(BSD)
- #include <sys/uio.h>
+-#include <sys/uio.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
  #endif