pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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



Module Name:	pkgsrc-wip
Committed By:	davidsainty <david.sainty%gmail.com@localhost>
Pushed By:	dsainty
Date:		Thu Jan 13 01:03:59 2022 +1300
Changeset:	58f1dba88ef0253978113cd55706d3c0281c91bd

Modified Files:
	zoneminder/distinfo
	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

Applied: security/zoneminder/distinfo 1.19

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

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_comms_h | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs:
diff --git a/zoneminder/distinfo b/zoneminder/distinfo
index 7aad6fd8f9..d8822f5e09 100644
--- a/zoneminder/distinfo
+++ b/zoneminder/distinfo
@@ -19,7 +19,7 @@ SHA1 (patch-src_zm__timer.h) = d91d41ef987fa4cc67d6f55c25afc581ef3a273f
 SHA1 (patch-src_zm__utils.cpp) = d5012fb54b0a91640fa49a16daf7c5f0eb54228e
 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) = 3ad97a499643d9af5bbd1f86d9b4101bc24be4df
 SHA1 (patch-src_zm_remote_camera_h) = 0d4bd7dae0188df7e463586250ac2ed530230f3d
 SHA1 (patch-src_zm_signal_cpp) = e86a79f9ca8b5fba58907fc1c67d95fe29819dcc
diff --git a/zoneminder/patches/patch-src_zm_comms_h b/zoneminder/patches/patch-src_zm_comms_h
index 69e2d8821a..a397459bc0 100644
--- a/zoneminder/patches/patch-src_zm_comms_h
+++ b/zoneminder/patches/patch-src_zm_comms_h
@@ -1,9 +1,12 @@
-$NetBSD: patch-src_zm_comms_h,v 1.3 2013/04/29 21:31:13 joerg 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 NetBSD.
 -#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


Home | Main Index | Thread Index | Old Index